From 199fb517b1b92e337b9fb19b91fc7e07c91fc206 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Wed, 18 Aug 2021 09:32:53 -0300
Subject: [PATCH] Fix dark theme coloring for forward bottom sheet.

---
 .../components/ContactFilterView.java          |  5 +++++
 ...edRoundedCornerBottomSheetDialogFragment.kt |  2 +-
 .../rounded_rectangle_dialog_secondary.xml     |  5 +++++
 .../main/res/layout/contact_filter_view.xml    |  1 +
 .../layout/multiselect_forward_fragment.xml    |  5 +++--
 ...multiselect_forward_fragment_bottom_bar.xml | 18 ++++++++++++++----
 app/src/main/res/values-night/dark_colors.xml  |  1 +
 app/src/main/res/values/attrs.xml              |  1 +
 app/src/main/res/values/light_colors.xml       |  1 +
 app/src/main/res/values/themes.xml             |  2 +-
 10 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/res/drawable/rounded_rectangle_dialog_secondary.xml

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ContactFilterView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ContactFilterView.java
index 06701eab34..11a0ba671f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ContactFilterView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ContactFilterView.java
@@ -126,6 +126,11 @@ public final class ContactFilterView extends FrameLayout {
       searchText.requestFocus();
     }
 
+    int backgroundRes = attributes.getResourceId(R.styleable.ContactFilterToolbar_cfv_background, -1);
+    if (backgroundRes != -1) {
+      findViewById(R.id.background_holder).setBackgroundResource(backgroundRes);
+    }
+
     attributes.recycle();
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/FixedRoundedCornerBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/FixedRoundedCornerBottomSheetDialogFragment.kt
index b6ba345ee4..49223c267a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/FixedRoundedCornerBottomSheetDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/FixedRoundedCornerBottomSheetDialogFragment.kt
@@ -38,7 +38,7 @@ abstract class FixedRoundedCornerBottomSheetDialogFragment : BottomSheetDialogFr
 
     val dialogBackground = MaterialShapeDrawable(shapeAppearanceModel)
 
-    dialogBackground.setTint(ContextCompat.getColor(requireContext(), R.color.signal_background_primary))
+    dialogBackground.setTint(ContextCompat.getColor(requireContext(), R.color.signal_background_dialog))
 
     dialog.behavior.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
       override fun onStateChanged(bottomSheet: View, newState: Int) {
diff --git a/app/src/main/res/drawable/rounded_rectangle_dialog_secondary.xml b/app/src/main/res/drawable/rounded_rectangle_dialog_secondary.xml
new file mode 100644
index 0000000000..4af901ed03
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_rectangle_dialog_secondary.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="@color/signal_background_dialog_secondary"/>
+    <corners android:radius="30dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/contact_filter_view.xml b/app/src/main/res/layout/contact_filter_view.xml
index b92daec939..e2868af358 100644
--- a/app/src/main/res/layout/contact_filter_view.xml
+++ b/app/src/main/res/layout/contact_filter_view.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
+        android:id="@+id/background_holder"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/rounded_rectangle_secondary"
diff --git a/app/src/main/res/layout/multiselect_forward_fragment.xml b/app/src/main/res/layout/multiselect_forward_fragment.xml
index bd16db7218..a285313e78 100644
--- a/app/src/main/res/layout/multiselect_forward_fragment.xml
+++ b/app/src/main/res/layout/multiselect_forward_fragment.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
     <View
@@ -30,7 +30,8 @@
         android:layout_marginTop="17dp"
         android:layout_marginRight="@dimen/dsl_settings_gutter"
         android:minHeight="44dp"
-        app:cfv_autoFocus="false" />
+        app:cfv_autoFocus="false"
+        app:cfv_background="@drawable/rounded_rectangle_dialog_secondary" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/contact_selection_list_fragment"
diff --git a/app/src/main/res/layout/multiselect_forward_fragment_bottom_bar.xml b/app/src/main/res/layout/multiselect_forward_fragment_bottom_bar.xml
index 1a42bf6d41..4558c67d3a 100644
--- a/app/src/main/res/layout/multiselect_forward_fragment_bottom_bar.xml
+++ b/app/src/main/res/layout/multiselect_forward_fragment_bottom_bar.xml
@@ -10,16 +10,26 @@
         android:id="@+id/divider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="@color/signal_divider_minor"
+        android:background="@color/signal_divider_major"
         app:layout_constraintBottom_toBottomOf="@id/share_confirm"
         app:layout_constraintTop_toTopOf="@id/share_confirm" />
 
+    <View
+        android:id="@+id/background_helper"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@color/signal_background_dialog"
+        app:layout_constraintBottom_toBottomOf="@id/selected_list"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/selected_list" />
+
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/selected_list"
         android:layout_width="0dp"
         android:layout_height="44dp"
         android:layout_marginEnd="@dimen/dsl_settings_gutter"
-        android:background="@color/signal_background_primary"
         android:clipToPadding="false"
         android:orientation="horizontal"
         android:paddingStart="@dimen/dsl_settings_gutter"
@@ -34,7 +44,7 @@
         android:id="@+id/add_message_wrapper"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/signal_background_primary"
+        android:background="@color/signal_background_dialog"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@id/selected_list">
 
@@ -45,7 +55,7 @@
             android:layout_marginStart="@dimen/dsl_settings_gutter"
             android:layout_marginEnd="@dimen/dsl_settings_gutter"
             android:layout_marginBottom="8dp"
-            android:background="@drawable/rounded_rectangle_secondary"
+            android:background="@drawable/rounded_rectangle_dialog_secondary"
             android:hint="@string/MultiselectForwardFragment__add_a_message"
             android:inputType="textCapSentences"
             android:minHeight="44dp"
diff --git a/app/src/main/res/values-night/dark_colors.xml b/app/src/main/res/values-night/dark_colors.xml
index de6401f3d7..44daa54508 100644
--- a/app/src/main/res/values-night/dark_colors.xml
+++ b/app/src/main/res/values-night/dark_colors.xml
@@ -12,6 +12,7 @@
     <color name="signal_background_secondary">@color/core_grey_75</color>
     <color name="signal_background_tertiary">@color/core_grey_90</color>
     <color name="signal_background_dialog">@color/core_grey_75</color>
+    <color name="signal_background_dialog_secondary">@color/core_grey_65</color>
 
     <color name="signal_text_primary">@color/core_grey_05</color>
     <color name="signal_text_primary_disabled">@color/core_grey_60</color>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 4f959e7861..816971f1cb 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -228,6 +228,7 @@
         <attr name="searchTextStyle" format="reference" />
         <attr name="showDialpad" format="boolean" />
         <attr name="cfv_autoFocus" format="boolean" />
+        <attr name="cfv_background" format="reference" />
     </declare-styleable>
 
     <declare-styleable name="SquareImageView">
diff --git a/app/src/main/res/values/light_colors.xml b/app/src/main/res/values/light_colors.xml
index 766bfbcfaa..458fc7ab3b 100644
--- a/app/src/main/res/values/light_colors.xml
+++ b/app/src/main/res/values/light_colors.xml
@@ -12,6 +12,7 @@
     <color name="signal_background_secondary">@color/core_grey_05</color>
     <color name="signal_background_tertiary">@color/core_grey_02</color>
     <color name="signal_background_dialog">@color/core_white</color>
+    <color name="signal_background_dialog_secondary">@color/signal_background_secondary</color>
 
     <color name="signal_text_primary">@color/core_grey_90</color>
     <color name="signal_text_primary_disabled">@color/core_grey_25</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a125dfae69..d652fb0e97 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -397,7 +397,7 @@
 
     <style name="Widget.Signal.FixedRoundedCorners.BottomSheet" parent="Widget.MaterialComponents.BottomSheet">
         <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Signal.BottomSheet.Rounded</item>
-        <item name="backgroundTint">@color/signal_background_primary</item>
+        <item name="backgroundTint">@color/signal_background_dialog</item>
     </style>
 
     <style name="ShapeAppearanceOverlay.Signal.BottomSheet.Rounded" parent="">