From 1b231bfff3f4ab4cb6af34d5b5e06d01abd22c2a Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Wed, 24 May 2023 13:06:26 +0930
Subject: [PATCH] Fix dialog button style (#1214)

---
 app/src/main/res/layout/dialog_blocked.xml         |  4 ++--
 app/src/main/res/layout/dialog_download.xml        |  4 ++--
 app/src/main/res/layout/dialog_join_open_group.xml |  4 ++--
 app/src/main/res/layout/dialog_link_preview.xml    |  4 ++--
 app/src/main/res/layout/dialog_open_url.xml        |  4 ++--
 app/src/main/res/layout/dialog_send_seed.xml       |  4 ++--
 app/src/main/res/layout/dialog_share_logs.xml      |  4 ++--
 app/src/main/res/values/styles.xml                 | 11 +----------
 8 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/app/src/main/res/layout/dialog_blocked.xml b/app/src/main/res/layout/dialog_blocked.xml
index 479210f1df..4ad01ec8ee 100644
--- a/app/src/main/res/layout/dialog_blocked.xml
+++ b/app/src/main/res/layout/dialog_blocked.xml
@@ -35,7 +35,7 @@
         android:orientation="horizontal">
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
@@ -43,7 +43,7 @@
             android:text="@string/cancel" />
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/unblockButton"
             android:contentDescription="@string/AccessibilityId_block_confirm"
             android:layout_width="0dp"
diff --git a/app/src/main/res/layout/dialog_download.xml b/app/src/main/res/layout/dialog_download.xml
index 8c49cd3ab2..a54a0357c2 100644
--- a/app/src/main/res/layout/dialog_download.xml
+++ b/app/src/main/res/layout/dialog_download.xml
@@ -35,7 +35,7 @@
         android:orientation="horizontal">
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
@@ -44,7 +44,7 @@
             android:text="@string/cancel" />
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/downloadButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
diff --git a/app/src/main/res/layout/dialog_join_open_group.xml b/app/src/main/res/layout/dialog_join_open_group.xml
index 81289b6dd4..7c422a1e33 100644
--- a/app/src/main/res/layout/dialog_join_open_group.xml
+++ b/app/src/main/res/layout/dialog_join_open_group.xml
@@ -35,7 +35,7 @@
         android:orientation="horizontal">
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
@@ -43,7 +43,7 @@
             android:text="@string/cancel" />
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/joinButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
diff --git a/app/src/main/res/layout/dialog_link_preview.xml b/app/src/main/res/layout/dialog_link_preview.xml
index 6d4b29ea73..0344439f55 100644
--- a/app/src/main/res/layout/dialog_link_preview.xml
+++ b/app/src/main/res/layout/dialog_link_preview.xml
@@ -35,7 +35,7 @@
         android:orientation="horizontal">
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
@@ -44,7 +44,7 @@
             android:contentDescription="@string/AccessibilityId_cancel_link_preview_button"/>
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/enableLinkPreviewsButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
diff --git a/app/src/main/res/layout/dialog_open_url.xml b/app/src/main/res/layout/dialog_open_url.xml
index af5b09b9c7..ec0befef21 100644
--- a/app/src/main/res/layout/dialog_open_url.xml
+++ b/app/src/main/res/layout/dialog_open_url.xml
@@ -35,7 +35,7 @@
         android:orientation="horizontal">
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
@@ -43,7 +43,7 @@
             android:text="@string/cancel" />
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/openURLButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
diff --git a/app/src/main/res/layout/dialog_send_seed.xml b/app/src/main/res/layout/dialog_send_seed.xml
index 5bec0be4dd..1aed6f0428 100644
--- a/app/src/main/res/layout/dialog_send_seed.xml
+++ b/app/src/main/res/layout/dialog_send_seed.xml
@@ -35,7 +35,7 @@
         android:orientation="horizontal">
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
@@ -43,7 +43,7 @@
             android:text="@string/cancel" />
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Destructive"
+            style="@style/Widget.Session.Button.Dialog.DestructiveText"
             android:id="@+id/sendSeedButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
diff --git a/app/src/main/res/layout/dialog_share_logs.xml b/app/src/main/res/layout/dialog_share_logs.xml
index 5d1a94f686..adb3a9e2d8 100644
--- a/app/src/main/res/layout/dialog_share_logs.xml
+++ b/app/src/main/res/layout/dialog_share_logs.xml
@@ -33,7 +33,7 @@
         android:orientation="horizontal">
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
@@ -41,7 +41,7 @@
             android:text="@string/cancel" />
 
         <Button
-            style="@style/Widget.Session.Button.Dialog.Unimportant"
+            style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/shareButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/small_button_height"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 49fcdf4c2f..8c79423d55 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -122,19 +122,10 @@
         <item name="android:textColor">?android:textColorPrimary</item>
     </style>
 
-    <style name="Widget.Session.Button.Dialog.Unimportant">
-        <item name="android:background">@drawable/unimportant_dialog_button_background</item>
-    </style>
-
     <style name="Widget.Session.Button.Dialog.UnimportantText">
         <item name="android:background">@drawable/unimportant_dialog_text_button_background</item>
     </style>
-
-    <style name="Widget.Session.Button.Dialog.Destructive">
-        <item name="android:background">@drawable/destructive_dialog_button_background</item>
-        <item name="android:textColor">@color/black</item>
-    </style>
-
+    
     <style name="Widget.Session.Button.Dialog.DestructiveText">
         <item name="android:background">@drawable/destructive_dialog_text_button_background</item>
         <item name="android:textColor">@color/destructive</item>