empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix wrong color flashing when scrolling conversation settings.

Browse source
This commit is contained in:
Alex Hart 2022-06-16 12:50:27 -03:00 • committed by Greyson Parrelli
parent 673a8f540b
commit 3acbcf54db
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt
View file

@ -195,7 +195,7 @@ class ConversationSettingsFragment : DSLSettingsFragment(
override fun getMaterial3OnScrollHelper(toolbar: Toolbar?): Material3OnScrollHelper { override fun getMaterial3OnScrollHelper(toolbar: Toolbar?): Material3OnScrollHelper {
return object : Material3OnScrollHelper(requireActivity(), toolbar!!) { return object : Material3OnScrollHelper(requireActivity(), toolbar!!) {
override val inactiveColorSet = ColorSet( override val inactiveColorSet = ColorSet(
toolbarColorRes = R.color.transparent, toolbarColorRes = R.color.signal_colorBackground_0,
statusBarColorRes = R.color.signal_colorBackground statusBarColorRes = R.color.signal_colorBackground
) )
} }

2
app/src/main/res/layout/dsl_settings_toolbar.xml
View file

@ -8,7 +8,7 @@
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/signal_m3_toolbar_height" android:layout_height="@dimen/signal_m3_toolbar_height"
android:background="@color/signal_colorBackground" android:background="@null"
android:minHeight="@dimen/signal_m3_toolbar_height" android:minHeight="@dimen/signal_m3_toolbar_height"
android:theme="?attr/settingsToolbarStyle" android:theme="?attr/settingsToolbarStyle"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

1
app/src/main/res/values-night/material3_colors.xml
View file

@ -50,6 +50,7 @@
<color name="signal_colorOnSurfaceVariant_60">#99BEBFC5</color> <color name="signal_colorOnSurfaceVariant_60">#99BEBFC5</color>
<color name="signal_colorOnBackground_60">#99E2E1E5</color> <color name="signal_colorOnBackground_60">#99E2E1E5</color>
<color name="signal_colorOutline_38">#615C5E65</color> <color name="signal_colorOutline_38">#615C5E65</color>
<color name="signal_colorBackground_0">#001B1C1F</color>
<!-- Core color alpha variants without alpha channel --> <!-- Core color alpha variants without alpha channel -->
<color name="signal_colorSurfaceVariant_16_no_alpha">#3F4249</color> <color name="signal_colorSurfaceVariant_16_no_alpha">#3F4249</color>

1
app/src/main/res/values/material3_colors.xml
View file

@ -50,6 +50,7 @@
<color name="signal_colorOnSurfaceVariant_60">#99545863</color> <color name="signal_colorOnSurfaceVariant_60">#99545863</color>
<color name="signal_colorOnBackground_60">#991B1D1D</color> <color name="signal_colorOnBackground_60">#991B1D1D</color>
<color name="signal_colorOutline_38">#61808389</color> <color name="signal_colorOutline_38">#61808389</color>
<color name="signal_colorBackground_0">#00FBFCFF</color>
<!-- Core color alpha variants without alpha channel --> <!-- Core color alpha variants without alpha channel -->
<color name="signal_colorSurfaceVariant_16_no_alpha">#D5D8DE</color> <color name="signal_colorSurfaceVariant_16_no_alpha">#D5D8DE</color>