From 4cb9372d0f11d13a4c250c0c14b95b034ea9ee6d Mon Sep 17 00:00:00 2001
From: ThomasSession <thomas.r@getsession.org>
Date: Wed, 11 Sep 2024 14:24:02 +1000
Subject: [PATCH] SES-2713 - band dialog strings

Also tweaking xml dialog's margin so they look like Compose's material dialogs
---
 .../securesms/conversation/v2/ConversationActivityV2.kt    | 6 +++---
 .../main/res/drawable/default_dialog_background_inset.xml  | 7 +++++++
 app/src/main/res/values/dimens.xml                         | 2 +-
 app/src/main/res/values/styles.xml                         | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/drawable/default_dialog_background_inset.xml

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 5a3a14564a..b7933b7bbb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -2122,16 +2122,16 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         showSessionDialog {
             title(R.string.banUser)
             text(R.string.communityBanDescription)
-            button(R.string.banUser) { viewModel.banUser(messages.first().individualRecipient); endActionMode() }
+            dangerButton(R.string.theContinue) { viewModel.banUser(messages.first().individualRecipient); endActionMode() }
             cancelButton(::endActionMode)
         }
     }
 
     override fun banAndDeleteAll(messages: Set<MessageRecord>) {
         showSessionDialog {
-            title(R.string.banUser)
+            title(R.string.banDeleteAll)
             text(R.string.communityBanDeleteDescription)
-            button(R.string.banUser) { viewModel.banAndDeleteAll(messages.first()); endActionMode() }
+            dangerButton(R.string.theContinue) { viewModel.banAndDeleteAll(messages.first()); endActionMode() }
             cancelButton(::endActionMode)
         }
     }
diff --git a/app/src/main/res/drawable/default_dialog_background_inset.xml b/app/src/main/res/drawable/default_dialog_background_inset.xml
new file mode 100644
index 0000000000..5352b3a3db
--- /dev/null
+++ b/app/src/main/res/drawable/default_dialog_background_inset.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/default_dialog_background"
+    android:insetRight="24dp"
+    android:insetLeft="24dp"> <!-- Using Material's inset size -->
+</inset>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 81cca8417e..5504aba7ee 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -30,7 +30,7 @@
     <dimen name="text_view_corner_radius">8dp</dimen>
     <dimen name="fake_chat_view_bubble_corner_radius">10dp</dimen>
     <dimen name="setting_button_height">64dp</dimen>
-    <dimen name="dialog_corner_radius">8dp</dimen>
+    <dimen name="dialog_corner_radius">12dp</dimen>
     <dimen name="video_inset_radius">11dp</dimen>
     <dimen name="pn_option_corner_radius">8dp</dimen>
     <dimen name="path_status_view_size">8dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 339139e8fc..7841191e1e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -33,7 +33,7 @@
     </style>
 
     <style name="ThemeOverlay.Session.AlertDialog" parent="ThemeOverlay.AppCompat.Dialog.Alert">
-        <item name="android:windowBackground">@drawable/default_dialog_background</item>
+        <item name="android:windowBackground">@drawable/default_dialog_background_inset</item>
         <item name="android:colorBackground">?backgroundSecondary</item>
         <item name="android:colorBackgroundFloating">?colorPrimary</item>
         <item name="backgroundTint">?colorPrimary</item>