From c94249f792aa8405d2b16d5a57b26aee1598d028 Mon Sep 17 00:00:00 2001
From: mardous <mardous.contact@gmail.com>
Date: Sun, 22 Dec 2024 14:16:23 -0400
Subject: [PATCH] (ui): update collapsing toolbar style

---
 app/src/main/res/layout/fragment_about.xml             |  4 ++--
 app/src/main/res/layout/fragment_conversations.xml     |  4 ++--
 app/src/main/res/layout/fragment_message_a_number.xml  |  4 ++--
 app/src/main/res/layout/fragment_messages.xml          |  4 ++--
 app/src/main/res/layout/fragment_messageview_terms.xml |  4 ++--
 app/src/main/res/layout/fragment_settings.xml          |  4 ++--
 app/src/main/res/layout/fragment_statuses.xml          |  8 +-------
 app/src/main/res/layout/fragment_tool.xml              |  4 ++--
 app/src/main/res/values-night/themes.xml               |  2 +-
 app/src/main/res/values-v31/styles.xml                 |  2 +-
 app/src/main/res/values/styles.xml                     | 10 ++++++----
 app/src/main/res/values/themes.xml                     |  2 +-
 12 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index ccd97a3..94df46b 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -26,9 +26,9 @@
         android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
-            style="?collapsingToolbarLayoutLargeStyle"
+            style="?collapsingToolbarLayoutMediumStyle"
             android:layout_width="match_parent"
-            android:layout_height="?collapsingToolbarLayoutLargeSize"
+            android:layout_height="?collapsingToolbarLayoutMediumSize"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
             <com.google.android.material.appbar.MaterialToolbar
diff --git a/app/src/main/res/layout/fragment_conversations.xml b/app/src/main/res/layout/fragment_conversations.xml
index cfcb930..7283753 100644
--- a/app/src/main/res/layout/fragment_conversations.xml
+++ b/app/src/main/res/layout/fragment_conversations.xml
@@ -26,9 +26,9 @@
         android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
-            style="?collapsingToolbarLayoutLargeStyle"
+            style="?collapsingToolbarLayoutMediumStyle"
             android:layout_width="match_parent"
-            android:layout_height="?collapsingToolbarLayoutLargeSize"
+            android:layout_height="?collapsingToolbarLayoutMediumSize"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
             <com.google.android.material.appbar.MaterialToolbar
diff --git a/app/src/main/res/layout/fragment_message_a_number.xml b/app/src/main/res/layout/fragment_message_a_number.xml
index dfc9058..a42dbf5 100644
--- a/app/src/main/res/layout/fragment_message_a_number.xml
+++ b/app/src/main/res/layout/fragment_message_a_number.xml
@@ -27,9 +27,9 @@
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar_layout"
-            style="?collapsingToolbarLayoutLargeStyle"
+            style="?collapsingToolbarLayoutMediumStyle"
             android:layout_width="match_parent"
-            android:layout_height="?collapsingToolbarLayoutLargeSize"
+            android:layout_height="?collapsingToolbarLayoutMediumSize"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
             <com.google.android.material.appbar.MaterialToolbar
diff --git a/app/src/main/res/layout/fragment_messages.xml b/app/src/main/res/layout/fragment_messages.xml
index 18fd093..e31b2a0 100644
--- a/app/src/main/res/layout/fragment_messages.xml
+++ b/app/src/main/res/layout/fragment_messages.xml
@@ -27,9 +27,9 @@
         android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
-            style="?collapsingToolbarLayoutLargeStyle"
+            style="?collapsingToolbarLayoutMediumStyle"
             android:layout_width="match_parent"
-            android:layout_height="?collapsingToolbarLayoutLargeSize"
+            android:layout_height="?collapsingToolbarLayoutMediumSize"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
             <com.google.android.material.appbar.MaterialToolbar
diff --git a/app/src/main/res/layout/fragment_messageview_terms.xml b/app/src/main/res/layout/fragment_messageview_terms.xml
index 9db33e5..91ae3f9 100644
--- a/app/src/main/res/layout/fragment_messageview_terms.xml
+++ b/app/src/main/res/layout/fragment_messageview_terms.xml
@@ -28,9 +28,9 @@
         android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
-            style="?collapsingToolbarLayoutLargeStyle"
+            style="?collapsingToolbarLayoutMediumStyle"
             android:layout_width="match_parent"
-            android:layout_height="?collapsingToolbarLayoutLargeSize"
+            android:layout_height="?collapsingToolbarLayoutMediumSize"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
             <com.google.android.material.appbar.MaterialToolbar
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index d83878f..293261e 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -28,9 +28,9 @@
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar_layout"
-            style="?collapsingToolbarLayoutLargeStyle"
+            style="?collapsingToolbarLayoutMediumStyle"
             android:layout_width="match_parent"
-            android:layout_height="?collapsingToolbarLayoutLargeSize"
+            android:layout_height="?collapsingToolbarLayoutMediumSize"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
             <com.google.android.material.appbar.MaterialToolbar
diff --git a/app/src/main/res/layout/fragment_statuses.xml b/app/src/main/res/layout/fragment_statuses.xml
index d263b2e..7c32da0 100644
--- a/app/src/main/res/layout/fragment_statuses.xml
+++ b/app/src/main/res/layout/fragment_statuses.xml
@@ -30,14 +30,8 @@
             android:id="@+id/collapsing_toolbar_layout"
             style="?collapsingToolbarLayoutMediumStyle"
             android:layout_width="match_parent"
-            android:layout_height="?collapsingToolbarLayoutLargeSize"
-            app:collapsedTitleTextColor="?attr/colorOnSurface"
-            app:collapsedTitleTextAppearance="?textAppearanceTitleLarge"
-            app:expandedTitleTextColor="?attr/colorOnSurface"
-            app:expandedTitleTextAppearance="?textAppearanceHeadlineLarge"
-            app:expandedTitleMarginStart="24dp"
+            android:layout_height="?collapsingToolbarLayoutMediumSize"
             app:title="@string/app_name"
-            app:titleCollapseMode="scale"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
             <com.google.android.material.appbar.MaterialToolbar
diff --git a/app/src/main/res/layout/fragment_tool.xml b/app/src/main/res/layout/fragment_tool.xml
index a658c99..dc112de 100644
--- a/app/src/main/res/layout/fragment_tool.xml
+++ b/app/src/main/res/layout/fragment_tool.xml
@@ -28,9 +28,9 @@
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar_layout"
-            style="?collapsingToolbarLayoutLargeStyle"
+            style="?collapsingToolbarLayoutMediumStyle"
             android:layout_width="match_parent"
-            android:layout_height="?collapsingToolbarLayoutLargeSize"
+            android:layout_height="?collapsingToolbarLayoutMediumSize"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
             <com.google.android.material.appbar.MaterialToolbar
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 207e1ce..2684ab1 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -82,7 +82,7 @@
         <item name="materialButtonStyle">@style/MaterialButtonStyle</item>
         <item name="toolbarStyle">@style/ToolbarStyle</item>
         <item name="preferenceCategoryStyle">@style/MaterialPreferenceCategory</item>
-        <item name="collapsingToolbarLayoutLargeStyle">@style/CollapsingToolbarLargeStyle</item>
+        <item name="collapsingToolbarLayoutMediumStyle">@style/CollapsingToolbarMediumStyle</item>
     </style>
 
     <style name="AlertDialogTheme.Black">
diff --git a/app/src/main/res/values-v31/styles.xml b/app/src/main/res/values-v31/styles.xml
index 79593a0..f62fc52 100644
--- a/app/src/main/res/values-v31/styles.xml
+++ b/app/src/main/res/values-v31/styles.xml
@@ -33,7 +33,7 @@
         <item name="materialButtonStyle">@style/MaterialButtonStyle</item>
         <item name="toolbarStyle">@style/ToolbarStyle</item>
         <item name="preferenceCategoryStyle">@style/MaterialPreferenceCategory</item>
-        <item name="collapsingToolbarLayoutLargeStyle">@style/CollapsingToolbarLargeStyle</item>
+        <item name="collapsingToolbarLayoutMediumStyle">@style/CollapsingToolbarMediumStyle</item>
     </style>
 
     <style name="Theme.WhatSave" parent="Base.Theme.WhatSave.DynamicColors"/>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 228e489..a27b0a7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -29,11 +29,13 @@
         <item name="titleMarginStart">16dp</item>
     </style>
 
-    <style name="CollapsingToolbarLargeStyle" parent="Widget.Material3.CollapsingToolbar.Large">
-        <item name="expandedTitleMarginBottom">24dp</item>
-        <item name="expandedTitleMarginEnd">24dp</item>
+    <style name="CollapsingToolbarMediumStyle" parent="Widget.Material3.CollapsingToolbar.Medium">
+        <item name="collapsedTitleTextAppearance">?textAppearanceTitleLarge</item>
+        <item name="collapsedTitleTextColor">?attr/colorOnSurface</item>
+        <item name="expandedTitleTextAppearance">?textAppearanceHeadlineLarge</item>
+        <item name="expandedTitleTextColor">?attr/colorOnSurface</item>
         <item name="expandedTitleMarginStart">24dp</item>
-        <item name="expandedTitleTextAppearance">?textAppearanceHeadline4</item>
+        <item name="titleCollapseMode">scale</item>
     </style>
 
     <style name="BottomNavigationStyle" parent="Widget.Material3.BottomNavigationView"/>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 98a6dcd..e347f13 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -82,7 +82,7 @@
         <item name="materialButtonStyle">@style/MaterialButtonStyle</item>
         <item name="toolbarStyle">@style/ToolbarStyle</item>
         <item name="preferenceCategoryStyle">@style/MaterialPreferenceCategory</item>
-        <item name="collapsingToolbarLayoutLargeStyle">@style/CollapsingToolbarLargeStyle</item>
+        <item name="collapsingToolbarLayoutMediumStyle">@style/CollapsingToolbarMediumStyle</item>
     </style>
 
     <style name="Theme.WhatSave" parent="Base.Theme.WhatSave"/>