From 0279a77568761d6d49c54c132170011bfce871ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolf-Martell=20Montw=C3=A9?= <wolf@thunderbird.net>
Date: Tue, 13 Feb 2024 16:31:43 +0100
Subject: [PATCH] Remove toolbar style

---
 app/ui/base/src/main/res/layout/toolbar.xml  |  1 -
 app/ui/legacy/src/main/res/values/attrs.xml  |  1 -
 app/ui/legacy/src/main/res/values/styles.xml | 12 ------------
 app/ui/legacy/src/main/res/values/themes.xml |  6 ------
 4 files changed, 20 deletions(-)

diff --git a/app/ui/base/src/main/res/layout/toolbar.xml b/app/ui/base/src/main/res/layout/toolbar.xml
index ae6fcb2b9..963a4813b 100644
--- a/app/ui/base/src/main/res/layout/toolbar.xml
+++ b/app/ui/base/src/main/res/layout/toolbar.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.appbar.MaterialToolbar xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/toolbar"
-    style="?attr/toolbarStyle"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize" />
diff --git a/app/ui/legacy/src/main/res/values/attrs.xml b/app/ui/legacy/src/main/res/values/attrs.xml
index a45dec9bd..c315823f0 100644
--- a/app/ui/legacy/src/main/res/values/attrs.xml
+++ b/app/ui/legacy/src/main/res/values/attrs.xml
@@ -2,7 +2,6 @@
 <resources>
 
     <declare-styleable name="K9Styles">
-        <attr name="toolbarColor" format="reference|color" />
         <attr name="messageHeaderBackground" format="reference|color" />
         <attr name="extraMessageHeaderBackground" format="reference|color" />
         <attr name="floatingActionButtonBackgroundColor" format="reference|color" />
diff --git a/app/ui/legacy/src/main/res/values/styles.xml b/app/ui/legacy/src/main/res/values/styles.xml
index cb229e8dc..7bc9d7364 100644
--- a/app/ui/legacy/src/main/res/values/styles.xml
+++ b/app/ui/legacy/src/main/res/values/styles.xml
@@ -83,18 +83,6 @@
         <item name="android:layout_width">match_parent</item>
     </style>
 
-    <style name="Widget.K9.Toolbar" parent="Widget.Material3.Toolbar">
-        <item name="android:background">?attr/toolbarColor</item>
-        <item name="titleTextColor">?android:attr/textColorPrimary</item>
-        <item name="subtitleTextColor">?android:attr/textColorSecondary</item>
-        <item name="android:theme">@style/ThemeOverlay.K9.Toolbar</item>
-    </style>
-
-    <style name="ThemeOverlay.K9.Toolbar" parent="">
-        <item name="colorControlNormal">?android:attr/textColorSecondary</item>
-        <item name="actionMenuTextColor">?android:attr/textColorSecondary</item>
-    </style>
-
     <style name="Widget.K9.Button.Snackbar" parent="Widget.Material3.Button.TextButton.Snackbar">
         <item name="android:textColor">?attr/colorSecondary</item>
     </style>
diff --git a/app/ui/legacy/src/main/res/values/themes.xml b/app/ui/legacy/src/main/res/values/themes.xml
index b21aafc37..98b30b2e3 100644
--- a/app/ui/legacy/src/main/res/values/themes.xml
+++ b/app/ui/legacy/src/main/res/values/themes.xml
@@ -61,15 +61,12 @@
         // Legacy styles
         <item name="windowActionModeOverlay">true</item>
 
-        <item name="toolbarColor">@color/material_gray_100</item>
-
         <item name="messageHeaderBackground">@color/material_gray_200</item>
         <item name="extraMessageHeaderBackground">@color/material_gray_100</item>
         <item name="bottomBarBackground">@color/material_gray_50</item>
         <item name="floatingActionButtonBackgroundColor">?attr/colorPrimary</item>
         <item name="floatingActionButtonForegroundColor">?attr/colorOnPrimary</item>
 
-        <item name="toolbarStyle">@style/Widget.K9.Toolbar</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
         <item name="textInputStyle">?attr/textInputOutlinedStyle</item>
 
@@ -270,8 +267,6 @@
 
         // Legacy styles
         <item name="windowActionModeOverlay">true</item>
-        <item name="android:navigationBarColor">#000000</item>
-        <item name="toolbarColor">@color/material_gray_900</item>
 
         <item name="messageHeaderBackground">@color/material_gray_900</item>
         <item name="extraMessageHeaderBackground">@color/material_gray_900</item>
@@ -279,7 +274,6 @@
         <item name="floatingActionButtonBackgroundColor">?attr/colorPrimary</item>
         <item name="floatingActionButtonForegroundColor">?attr/colorOnPrimary</item>
 
-        <item name="toolbarStyle">@style/Widget.K9.Toolbar</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
         <item name="textInputStyle">?attr/textInputOutlinedStyle</item>