From cba3c8a927483831174ea7e109832c5df447dbf3 Mon Sep 17 00:00:00 2001
From: machiav3lli <antonios.hazim@tutanota.com>
Date: Sat, 2 Apr 2022 03:16:43 +0200
Subject: [PATCH] Update: Simplify app/tool bar styles

---
 src/main/res/drawable/appbar_background.xml |  7 -----
 src/main/res/values/styles.xml              | 35 ++++-----------------
 2 files changed, 6 insertions(+), 36 deletions(-)
 delete mode 100644 src/main/res/drawable/appbar_background.xml

diff --git a/src/main/res/drawable/appbar_background.xml b/src/main/res/drawable/appbar_background.xml
deleted file mode 100644
index 58b1f17f..00000000
--- a/src/main/res/drawable/appbar_background.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?colorSurface" />
-    <corners
-        android:bottomRightRadius="@dimen/shape_large_corner"
-        android:bottomLeftRadius="@dimen/shape_large_corner" />
-</shape>
\ No newline at end of file
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index c6d042e5..b8e1d208 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -35,13 +35,12 @@
 
         <item name="tabStyle">@style/Theme.Tab</item>
         <item name="switchStyle">@style/Theme.Switch</item>
-        <item name="toolbarStyle">@style/Theme.Toolbar</item>
+        <item name="toolbarStyle">@style/Widget.Material3.Toolbar.Surface</item>
         <item name="textInputStyle">@style/Theme.EditText</item>
         <item name="materialAlertDialogTheme">@style/Theme.Alert</item>
-        <item name="appBarLayoutStyle">@style/Theme.AppBarLayout</item>
+        <item name="appBarLayoutStyle">@style/Widget.Material3.AppBarLayout</item>
         <item name="materialCardViewStyle">@style/Theme.Card</item>
         <item name="materialCardViewElevatedStyle">@style/Theme.Card.Elevated</item>
-        <item name="collapsingToolbarLayoutLargeStyle">@style/Theme.CollapsingToolbar</item>
         <item name="bottomNavigationStyle">@style/Theme.BottomNavigation</item>
     </style>
 
@@ -74,13 +73,12 @@
 
         <item name="tabStyle">@style/Theme.Tab</item>
         <item name="switchStyle">@style/Theme.Switch</item>
-        <item name="toolbarStyle">@style/Theme.Toolbar</item>
+        <item name="toolbarStyle">@style/Widget.Material3.Toolbar.Surface</item>
         <item name="textInputStyle">@style/Theme.EditText</item>
         <item name="materialAlertDialogTheme">@style/Theme.Alert</item>
-        <item name="appBarLayoutStyle">@style/Theme.AppBarLayout</item>
+        <item name="appBarLayoutStyle">@style/Widget.Material3.AppBarLayout</item>
         <item name="materialCardViewStyle">@style/Theme.Card</item>
         <item name="materialCardViewElevatedStyle">@style/Theme.Card.Elevated</item>
-        <item name="collapsingToolbarLayoutLargeStyle">@style/Theme.CollapsingToolbar</item>
         <item name="bottomNavigationStyle">@style/Theme.BottomNavigation</item>
     </style>
 
@@ -113,36 +111,15 @@
 
         <item name="tabStyle">@style/Theme.Tab</item>
         <item name="switchStyle">@style/Theme.Switch</item>
-        <item name="toolbarStyle">@style/Theme.Toolbar</item>
+        <item name="toolbarStyle">@style/Widget.Material3.Toolbar.Surface</item>
         <item name="textInputStyle">@style/Theme.EditText</item>
         <item name="materialAlertDialogTheme">@style/Theme.Alert</item>
-        <item name="appBarLayoutStyle">@style/Theme.AppBarLayout</item>
+        <item name="appBarLayoutStyle">@style/Widget.Material3.AppBarLayout</item>
         <item name="materialCardViewStyle">@style/Theme.Card</item>
         <item name="materialCardViewElevatedStyle">@style/Theme.Card.Elevated</item>
-        <item name="collapsingToolbarLayoutLargeStyle">@style/Theme.CollapsingToolbar</item>
         <item name="bottomNavigationStyle">@style/Theme.BottomNavigation</item>
     </style>
 
-    <style name="Theme.AppBarLayout" parent="Widget.Material3.AppBarLayout">
-        <item name="android:background">@drawable/appbar_background</item>
-        <item name="android:backgroundTint">?attr/colorSurface</item>
-        <item name="android:fitsSystemWindows">true</item>
-    </style>
-
-    <style name="Theme.CollapsingToolbar" parent="Widget.Material3.CollapsingToolbar.Large">
-        <item name="titleCollapseMode">scale</item>
-        <item name="expandedTitleMarginStart">32dp</item>
-        <item name="contentScrim">@android:color/transparent</item>
-        <item name="android:backgroundTint">?attr/colorSurface</item>
-        <item name="expandedTitleTextAppearance">?textAppearanceHeadlineLarge</item>
-    </style>
-
-    <style name="Theme.Toolbar" parent="Widget.Material3.Toolbar.Surface">
-        <item name="android:background">@drawable/appbar_background</item>
-        <item name="layout_collapseMode">pin</item>
-        <item name="android:backgroundTint">?attr/colorSurface</item>
-    </style>
-
     <style name="Theme.Chip.Category" parent="Widget.Material3.Chip.Suggestion.Elevated">
         <item name="android:backgroundTint">@color/selector_chip_background</item>
         <item name="android:textAppearance">@style/TextAppearance.Material3.TitleMedium</item>