From 3acbcf54dbc7a0efd2b7093c1c70e26467e17bf1 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 16 Jun 2022 12:50:27 -0300
Subject: [PATCH] Fix wrong color flashing when scrolling conversation
 settings.

---
 .../settings/conversation/ConversationSettingsFragment.kt       | 2 +-
 app/src/main/res/layout/dsl_settings_toolbar.xml                | 2 +-
 app/src/main/res/values-night/material3_colors.xml              | 1 +
 app/src/main/res/values/material3_colors.xml                    | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
index 1fd5c212d..6584b237d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
@@ -195,7 +195,7 @@ class ConversationSettingsFragment : DSLSettingsFragment(
   override fun getMaterial3OnScrollHelper(toolbar: Toolbar?): Material3OnScrollHelper {
     return object : Material3OnScrollHelper(requireActivity(), toolbar!!) {
       override val inactiveColorSet = ColorSet(
-        toolbarColorRes = R.color.transparent,
+        toolbarColorRes = R.color.signal_colorBackground_0,
         statusBarColorRes = R.color.signal_colorBackground
       )
     }
diff --git a/app/src/main/res/layout/dsl_settings_toolbar.xml b/app/src/main/res/layout/dsl_settings_toolbar.xml
index 4ce6e08a3..38493bfde 100644
--- a/app/src/main/res/layout/dsl_settings_toolbar.xml
+++ b/app/src/main/res/layout/dsl_settings_toolbar.xml
@@ -8,7 +8,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="@dimen/signal_m3_toolbar_height"
-        android:background="@color/signal_colorBackground"
+        android:background="@null"
         android:minHeight="@dimen/signal_m3_toolbar_height"
         android:theme="?attr/settingsToolbarStyle"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values-night/material3_colors.xml b/app/src/main/res/values-night/material3_colors.xml
index 3bd59f4b0..fe3476881 100644
--- a/app/src/main/res/values-night/material3_colors.xml
+++ b/app/src/main/res/values-night/material3_colors.xml
@@ -50,6 +50,7 @@
     <color name="signal_colorOnSurfaceVariant_60">#99BEBFC5</color>
     <color name="signal_colorOnBackground_60">#99E2E1E5</color>
     <color name="signal_colorOutline_38">#615C5E65</color>
+    <color name="signal_colorBackground_0">#001B1C1F</color>
 
     <!-- Core color alpha variants without alpha channel -->
     <color name="signal_colorSurfaceVariant_16_no_alpha">#3F4249</color>
diff --git a/app/src/main/res/values/material3_colors.xml b/app/src/main/res/values/material3_colors.xml
index 3b47e6fb0..07e25fee2 100644
--- a/app/src/main/res/values/material3_colors.xml
+++ b/app/src/main/res/values/material3_colors.xml
@@ -50,6 +50,7 @@
     <color name="signal_colorOnSurfaceVariant_60">#99545863</color>
     <color name="signal_colorOnBackground_60">#991B1D1D</color>
     <color name="signal_colorOutline_38">#61808389</color>
+    <color name="signal_colorBackground_0">#00FBFCFF</color>
 
     <!-- Core color alpha variants without alpha channel -->
     <color name="signal_colorSurfaceVariant_16_no_alpha">#D5D8DE</color>