From 706d1aadd833f6fa60de8ac308c62919adf45dc4 Mon Sep 17 00:00:00 2001
From: ThomasSession <thomas.r@getsession.org>
Date: Fri, 30 Aug 2024 09:49:48 +1000
Subject: [PATCH] fixing up clear data dialog

Removing unused code
---
 .../securesms/SessionDialogBuilder.kt         | 24 +------------------
 .../reactions/ReactionRecipientsAdapter.java  |  3 ---
 .../main/res/layout/dialog_clear_all_data.xml |  5 ++--
 app/src/main/res/values/colors.xml            |  4 ----
 app/src/main/res/values/dimens.xml            |  1 +
 5 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
index 8d40dd2785..f780c80870 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
@@ -46,27 +46,7 @@ class SessionDialogBuilder(val context: Context) {
         .apply { orientation = VERTICAL }
         .also(dialogBuilder::setCustomTitle)
 
-    // Maximum height of the dialog. This comes into play in the Open URL dialog where we
-    // might have a a very, very long URL (which we provide a ScrollView for) - but without
-    // limiting the height of the dialog, the WRAP_CONTENT part can allow the dialog to be
-    // super tall!
-    // Note: I eye-balled this DP value for the max dialog height to make it match the
-    // height of regular not-scrollable dialogs.
-    val maxHeightInDp = 137
-    val scale = context.resources.displayMetrics.density
-    val maxHeightInPx = (maxHeightInDp * scale + 0.5f).toInt()
-
-    val contentView = LinearLayout(context).apply {
-        orientation = VERTICAL
-
-        // Limit the max height of the dialog to the above value
-        viewTreeObserver.addOnGlobalLayoutListener {
-            if (height > maxHeightInPx) {
-                layoutParams.height = maxHeightInPx
-                requestLayout()
-            }
-        }
-    }
+    private val contentView = LinearLayout(context).apply { orientation = VERTICAL }
 
     private val buttonLayout = LinearLayout(context)
 
@@ -157,8 +137,6 @@ class SessionDialogBuilder(val context: Context) {
 
     fun cancelButton(listener: (() -> Unit) = {}) = button(android.R.string.cancel, R.string.AccessibilityId_cancel) { listener() }
 
-    fun copyUrlButton(listener: (() -> Unit) = {}) = button(android.R.string.copyUrl, R.string.AccessibilityId_copy) { listener() }
-
     fun button(
         @StringRes text: Int,
         @StringRes contentDescriptionRes: Int = text,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java
index 08a9077a86..37bd7e4695 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionRecipientsAdapter.java
@@ -62,9 +62,6 @@ final class ReactionRecipientsAdapter extends RecyclerView.Adapter<ReactionRecip
   @Override
   public @NonNull
   ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
-    // TODO: This will CRASH on Android 28 but it works on Android 34. The error is to do with a
-    // TODO: missing `secondary_text_material_dark` colour. Jira ticket: SES-2157
     switch (viewType) {
       case HEADER_TYPE:
         return new HeaderViewHolder(callback, LayoutInflater.from(parent.getContext()).inflate(R.layout.reactions_bottom_sheet_dialog_fragment_recycler_header, parent, false));
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 594555ae6d..e25d699fa5 100644
--- a/app/src/main/res/layout/dialog_clear_all_data.xml
+++ b/app/src/main/res/layout/dialog_clear_all_data.xml
@@ -40,14 +40,13 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
         android:orientation="horizontal">
 
         <Button
             style="@style/Widget.Session.Button.Dialog.DangerText"
             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:text="@string/clear" />
 
@@ -55,7 +54,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" />
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 4f09958da0..716d81601f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -119,8 +119,4 @@
     <color name="danger_light">#E12D19</color>
 
     <color name="outdated_client_banner_background_color">#00F782</color>
-
-    <!-- ACL attempt to stop API 28 crashing on long-press of emoji - doesn't work though... -->
-    <color name="secondary_text_material_dark">#61FFFF</color>
-
 </resources>
\ 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 2e94fa500d..3ec6cd1990 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -10,6 +10,7 @@
     <dimen name="very_large_font_size">26sp</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>