From 1f6542eff367b96e733c4f488700330715937ce8 Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Fri, 22 Sep 2023 00:16:10 +0930
Subject: [PATCH 1/2] Fix dialog button style

---
 .../org/thoughtcrime/securesms/SessionDialogBuilder.kt    | 7 ++-----
 .../destructive_dialog_text_button_background.xml         | 1 -
 .../unimportant_dialog_text_button_background.xml         | 1 -
 app/src/main/res/layout/dialog_clear_all_data.xml         | 8 +++-----
 app/src/main/res/layout/dialog_send_seed.xml              | 4 ++--
 app/src/main/res/values/dimens.xml                        | 1 +
 app/src/main/res/values/styles.xml                        | 1 +
 7 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
index 44c30741ef..18113ea474 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
@@ -14,14 +14,12 @@ import androidx.annotation.LayoutRes
 import androidx.annotation.StringRes
 import androidx.annotation.StyleRes
 import androidx.appcompat.app.AlertDialog
-import androidx.core.view.setMargins
 import androidx.core.view.setPadding
 import androidx.core.view.updateMargins
 import androidx.fragment.app.Fragment
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.util.toPx
 
-
 @DslMarker
 @Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE)
 annotation class DialogDsl
@@ -31,6 +29,7 @@ class SessionDialogBuilder(val context: Context) {
 
     private val dp20 = toPx(20, context.resources)
     private val dp40 = toPx(40, context.resources)
+    private val dp60 = toPx(60, context.resources)
 
     private val dialogBuilder: AlertDialog.Builder = AlertDialog.Builder(context)
 
@@ -64,7 +63,6 @@ class SessionDialogBuilder(val context: Context) {
         }
     }
 
-
     private fun text(text: CharSequence?, @StyleRes style: Int, modify: TextView.() -> Unit) {
         text ?: return
         TextView(context, null, 0, style)
@@ -125,8 +123,7 @@ class SessionDialogBuilder(val context: Context) {
     ) = Button(context, null, 0, style).apply {
             setText(text)
             contentDescription = resources.getString(contentDescriptionRes)
-            layoutParams = LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT, 1f)
-                .apply { setMargins(toPx(20, resources)) }
+            layoutParams = LinearLayout.LayoutParams(MATCH_PARENT, dp60, 1f)
             setOnClickListener {
                 listener.invoke()
                 if (dismiss) dismiss()
diff --git a/app/src/main/res/drawable/destructive_dialog_text_button_background.xml b/app/src/main/res/drawable/destructive_dialog_text_button_background.xml
index f3e13c8000..3ba98c4992 100644
--- a/app/src/main/res/drawable/destructive_dialog_text_button_background.xml
+++ b/app/src/main/res/drawable/destructive_dialog_text_button_background.xml
@@ -4,7 +4,6 @@
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
             <solid android:color="?android:textColorPrimary"/>
-            <corners android:radius="@dimen/medium_button_corner_radius" />
         </shape>
     </item>
 </ripple>
diff --git a/app/src/main/res/drawable/unimportant_dialog_text_button_background.xml b/app/src/main/res/drawable/unimportant_dialog_text_button_background.xml
index f3e13c8000..3ba98c4992 100644
--- a/app/src/main/res/drawable/unimportant_dialog_text_button_background.xml
+++ b/app/src/main/res/drawable/unimportant_dialog_text_button_background.xml
@@ -4,7 +4,6 @@
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
             <solid android:color="?android:textColorPrimary"/>
-            <corners android:radius="@dimen/medium_button_corner_radius" />
         </shape>
     </item>
 </ripple>
diff --git a/app/src/main/res/layout/dialog_clear_all_data.xml b/app/src/main/res/layout/dialog_clear_all_data.xml
index db95647dad..94d4828e21 100644
--- a/app/src/main/res/layout/dialog_clear_all_data.xml
+++ b/app/src/main/res/layout/dialog_clear_all_data.xml
@@ -6,8 +6,7 @@
     android:layout_height="match_parent"
     android:gravity="center_horizontal"
     android:orientation="vertical"
-    android:elevation="4dp"
-    android:padding="@dimen/medium_spacing">
+    android:elevation="4dp">
 
     <TextView
         android:layout_width="wrap_content"
@@ -46,16 +45,15 @@
             style="@style/Widget.Session.Button.Dialog.DestructiveText"
             android:id="@+id/clearAllDataButton"
             android:layout_width="0dp"
-            android:layout_height="@dimen/small_button_height"
+            android:layout_height="@dimen/dialog_button_height"
             android:layout_weight="1"
-            android:layout_marginStart="@dimen/medium_spacing"
             android:text="@string/dialog_clear_all_data_clear" />
 
         <Button
             style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
-            android:layout_height="@dimen/small_button_height"
+            android:layout_height="@dimen/dialog_button_height"
             android:layout_weight="1"
             android:text="@string/cancel" />
 
diff --git a/app/src/main/res/layout/dialog_send_seed.xml b/app/src/main/res/layout/dialog_send_seed.xml
index 1aed6f0428..725c9c4d83 100644
--- a/app/src/main/res/layout/dialog_send_seed.xml
+++ b/app/src/main/res/layout/dialog_send_seed.xml
@@ -38,7 +38,7 @@
             style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
-            android:layout_height="@dimen/small_button_height"
+            android:layout_height="@dimen/dialog_button_height"
             android:layout_weight="1"
             android:text="@string/cancel" />
 
@@ -46,7 +46,7 @@
             style="@style/Widget.Session.Button.Dialog.DestructiveText"
             android:id="@+id/sendSeedButton"
             android:layout_width="0dp"
-            android:layout_height="@dimen/small_button_height"
+            android:layout_height="@dimen/dialog_button_height"
             android:layout_weight="1"
             android:layout_marginStart="@dimen/medium_spacing"
             android:text="@string/dialog_send_seed_send_button_title" />
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 99e0aa197f..b3b60c1b04 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -10,6 +10,7 @@
     <dimen name="massive_font_size">50sp</dimen>
 
     <!-- Element Sizes -->
+    <dimen name="dialog_button_height">60dp</dimen>
     <dimen name="small_button_height">34dp</dimen>
     <dimen name="medium_button_height">38dp</dimen>
     <dimen name="large_button_height">54dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2928fc7718..243a106545 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -115,6 +115,7 @@
         <item name="android:textAllCaps">false</item>
         <item name="android:textSize">@dimen/small_font_size</item>
         <item name="android:textColor">?android:textColorPrimary</item>
+        <item name="android:textStyle">bold</item>
     </style>
 
     <style name="Widget.Session.Button.Dialog.UnimportantText">

From c942bbac259e33c9815e0ff4ffbc3bd5c176c031 Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Wed, 17 Apr 2024 17:46:42 +0930
Subject: [PATCH 2/2] Fix margins

---
 .../java/org/thoughtcrime/securesms/SessionDialogBuilder.kt     | 1 -
 app/src/main/res/layout/dialog_clear_all_data.xml               | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
index a9b5476aa5..598977392b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
@@ -131,7 +131,6 @@ class SessionDialogBuilder(val context: Context) {
             setText(text)
             contentDescription = resources.getString(contentDescriptionRes)
             layoutParams = LinearLayout.LayoutParams(WRAP_CONTENT, dp60, 1f)
-                .apply { setMargins(dp20) }
             setOnClickListener {
                 listener.invoke()
                 if (dismiss) dismiss()
diff --git a/app/src/main/res/layout/dialog_clear_all_data.xml b/app/src/main/res/layout/dialog_clear_all_data.xml
index 94d4828e21..4ef5c40e8e 100644
--- a/app/src/main/res/layout/dialog_clear_all_data.xml
+++ b/app/src/main/res/layout/dialog_clear_all_data.xml
@@ -20,6 +20,8 @@
         android:id="@+id/dialogDescriptionText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
         android:layout_marginTop="@dimen/large_spacing"
         android:text="@string/dialog_clear_all_data_message"
         android:textAlignment="center"