From 02308ddb54627ad9cfbeda6b29c8be2354441412 Mon Sep 17 00:00:00 2001
From: Konstantin Ivanov <54908981+konstantiniiv@users.noreply.github.com>
Date: Fri, 16 Jun 2023 19:01:29 +0200
Subject: [PATCH] DROID-1397 Design | Secondary & warning buttons (#84)

---
 .../anytype/core_ui/views/DesignSystemButtons.kt          | 8 +++-----
 .../main/res/drawable/button_secondary_large_selector.xml | 2 --
 .../res/drawable/button_secondary_medium_selector.xml     | 2 --
 .../main/res/drawable/button_secondary_small_selector.xml | 2 --
 .../res/drawable/button_secondary_xsmall_selector.xml     | 2 --
 .../main/res/drawable/button_warning_large_selector.xml   | 1 -
 .../main/res/drawable/button_warning_medium_selector.xml  | 1 -
 .../main/res/drawable/button_warning_small_selector.xml   | 1 -
 .../main/res/drawable/button_warning_xsmall_selector.xml  | 1 -
 sample/src/main/AndroidManifest.xml                       | 4 ++++
 10 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/views/DesignSystemButtons.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/views/DesignSystemButtons.kt
index 7ea5049e81..602e7fc9b2 100644
--- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/views/DesignSystemButtons.kt
+++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/views/DesignSystemButtons.kt
@@ -158,9 +158,7 @@ fun ButtonSecondary(
     val interactionSource = remember { MutableInteractionSource() }
     val isPressed = interactionSource.collectIsPressedAsState()
     val backgroundColor =
-        if (isPressed.value) colorResource(id = R.color.shape_transparent) else colorResource(
-            id = R.color.background_primary
-        )
+        if (isPressed.value) colorResource(id = R.color.shape_transparent) else Color.Transparent
     val borderColor = if (enabled) colorResource(id = R.color.shape_primary) else colorResource(
         id = R.color.shape_secondary
     )
@@ -175,7 +173,7 @@ fun ButtonSecondary(
             colors = ButtonDefaults.buttonColors(
                 backgroundColor = backgroundColor,
                 contentColor = colorResource(id = R.color.text_primary),
-                disabledBackgroundColor = colorResource(id = R.color.background_primary),
+                disabledBackgroundColor = Color.Transparent,
                 disabledContentColor = colorResource(id = R.color.text_tertiary)
             ),
             modifier = modifier
@@ -216,7 +214,7 @@ fun ButtonWarning(
             shape = RoundedCornerShape(size.cornerSize),
             border = BorderStroke(width = 1.dp, color = borderColor),
             colors = ButtonDefaults.buttonColors(
-                backgroundColor = colorResource(id = R.color.background_primary),
+                backgroundColor = Color.Transparent,
                 contentColor = contentColor
             ),
             modifier = modifier
diff --git a/core-ui/src/main/res/drawable/button_secondary_large_selector.xml b/core-ui/src/main/res/drawable/button_secondary_large_selector.xml
index 6e2df53608..2ac04d4e61 100644
--- a/core-ui/src/main/res/drawable/button_secondary_large_selector.xml
+++ b/core-ui/src/main/res/drawable/button_secondary_large_selector.xml
@@ -4,14 +4,12 @@
         <shape android:shape="rectangle">
             <stroke android:color="@color/shape_secondary" android:width="1dp"/>
             <corners android:radius="@dimen/button_large_corner" />
-            <solid android:color="@color/background_primary" />
         </shape>
     </item>
     <item android:state_enabled="true" android:state_pressed="false">
         <shape android:shape="rectangle">
             <stroke android:color="@color/shape_primary" android:width="1dp"/>
             <corners android:radius="@dimen/button_large_corner" />
-            <solid android:color="@color/background_primary" />
         </shape>
     </item>
 
diff --git a/core-ui/src/main/res/drawable/button_secondary_medium_selector.xml b/core-ui/src/main/res/drawable/button_secondary_medium_selector.xml
index f0b09cead8..e601aa7d3d 100644
--- a/core-ui/src/main/res/drawable/button_secondary_medium_selector.xml
+++ b/core-ui/src/main/res/drawable/button_secondary_medium_selector.xml
@@ -4,14 +4,12 @@
         <shape android:shape="rectangle">
             <stroke android:color="@color/shape_secondary" android:width="1dp"/>
             <corners android:radius="@dimen/button_medium_corner" />
-            <solid android:color="@color/background_primary" />
         </shape>
     </item>
     <item android:state_enabled="true" android:state_pressed="false">
         <shape android:shape="rectangle">
             <stroke android:color="@color/shape_primary" android:width="1dp"/>
             <corners android:radius="@dimen/button_medium_corner" />
-            <solid android:color="@color/background_primary" />
         </shape>
     </item>
 
diff --git a/core-ui/src/main/res/drawable/button_secondary_small_selector.xml b/core-ui/src/main/res/drawable/button_secondary_small_selector.xml
index bbdbe90893..701314af96 100644
--- a/core-ui/src/main/res/drawable/button_secondary_small_selector.xml
+++ b/core-ui/src/main/res/drawable/button_secondary_small_selector.xml
@@ -4,14 +4,12 @@
         <shape android:shape="rectangle">
             <stroke android:color="@color/shape_secondary" android:width="1dp"/>
             <corners android:radius="@dimen/button_small_corner" />
-            <solid android:color="@color/background_primary" />
         </shape>
     </item>
     <item android:state_enabled="true" android:state_pressed="false">
         <shape android:shape="rectangle">
             <stroke android:color="@color/shape_primary" android:width="1dp"/>
             <corners android:radius="@dimen/button_small_corner" />
-            <solid android:color="@color/background_primary" />
         </shape>
     </item>
 
diff --git a/core-ui/src/main/res/drawable/button_secondary_xsmall_selector.xml b/core-ui/src/main/res/drawable/button_secondary_xsmall_selector.xml
index b24facfb1c..581827fb58 100644
--- a/core-ui/src/main/res/drawable/button_secondary_xsmall_selector.xml
+++ b/core-ui/src/main/res/drawable/button_secondary_xsmall_selector.xml
@@ -4,14 +4,12 @@
         <shape android:shape="rectangle">
             <stroke android:color="@color/shape_secondary" android:width="1dp"/>
             <corners android:radius="@dimen/button_xsmall_corner" />
-            <solid android:color="@color/background_primary" />
         </shape>
     </item>
     <item android:state_enabled="true" android:state_pressed="false">
         <shape android:shape="rectangle">
             <stroke android:color="@color/shape_primary" android:width="1dp"/>
             <corners android:radius="@dimen/button_xsmall_corner" />
-            <solid android:color="@color/background_primary" />
         </shape>
     </item>
 
diff --git a/core-ui/src/main/res/drawable/button_warning_large_selector.xml b/core-ui/src/main/res/drawable/button_warning_large_selector.xml
index 41b85afc00..603ebc48a7 100644
--- a/core-ui/src/main/res/drawable/button_warning_large_selector.xml
+++ b/core-ui/src/main/res/drawable/button_warning_large_selector.xml
@@ -4,7 +4,6 @@
         <shape android:shape="rectangle">
             <stroke android:color="@color/shape_primary" android:width="1dp"/>
             <corners android:radius="@dimen/button_large_corner" />
-            <solid android:color="@color/background_primary" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/button_warning_medium_selector.xml b/core-ui/src/main/res/drawable/button_warning_medium_selector.xml
index 21c2492384..3055f6f15a 100644
--- a/core-ui/src/main/res/drawable/button_warning_medium_selector.xml
+++ b/core-ui/src/main/res/drawable/button_warning_medium_selector.xml
@@ -4,7 +4,6 @@
         <shape android:shape="rectangle">
             <stroke android:color="@color/shape_primary" android:width="1dp"/>
             <corners android:radius="@dimen/button_medium_corner" />
-            <solid android:color="@color/background_primary" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/button_warning_small_selector.xml b/core-ui/src/main/res/drawable/button_warning_small_selector.xml
index 6a363856a3..a16a5e7bf2 100644
--- a/core-ui/src/main/res/drawable/button_warning_small_selector.xml
+++ b/core-ui/src/main/res/drawable/button_warning_small_selector.xml
@@ -4,7 +4,6 @@
         <shape android:shape="rectangle">
             <stroke android:color="@color/shape_primary" android:width="1dp"/>
             <corners android:radius="@dimen/button_small_corner" />
-            <solid android:color="@color/background_primary" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/button_warning_xsmall_selector.xml b/core-ui/src/main/res/drawable/button_warning_xsmall_selector.xml
index 0bd47809af..67d0ccc69d 100644
--- a/core-ui/src/main/res/drawable/button_warning_xsmall_selector.xml
+++ b/core-ui/src/main/res/drawable/button_warning_xsmall_selector.xml
@@ -4,7 +4,6 @@
         <shape android:shape="rectangle">
             <stroke android:color="@color/shape_primary" android:width="1dp"/>
             <corners android:radius="@dimen/button_xsmall_corner" />
-            <solid android:color="@color/background_primary" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 6a13db23d6..03797c6b2c 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -36,6 +36,10 @@
         <activity android:name=".StyleActivity" />
         <activity android:name=".MainActivity" />
         <activity android:name=".StyleToolbarActivity"/>
+
+        <meta-data
+            android:name="io.sentry.dsn"
+            android:value="" />
     </application>
 
 </manifest>
\ No newline at end of file