From d3658804c638100f85ee2e4ece49e214f4b2adc3 Mon Sep 17 00:00:00 2001
From: cketti <cketti@thunderbird.net>
Date: Tue, 8 Nov 2022 21:26:25 +0100
Subject: [PATCH] Switch to MaterialComponents themes

---
 app/ui/base/src/main/res/layout/toolbar.xml   | 12 ++++----
 .../k9/ui/messageview/MessageViewFragment.kt  |  3 +-
 .../res/layout/activity_account_settings.xml  |  3 +-
 .../src/main/res/layout/message_list_item.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  | 30 +++++++++++++++----
 7 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/app/ui/base/src/main/res/layout/toolbar.xml b/app/ui/base/src/main/res/layout/toolbar.xml
index f4a5a6d54..ae6fcb2b9 100644
--- a/app/ui/base/src/main/res/layout/toolbar.xml
+++ b/app/ui/base/src/main/res/layout/toolbar.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.Toolbar
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:elevation="4dp"/>
\ No newline at end of file
+<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/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt
index e2d39f565..54fc76347 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt
@@ -238,7 +238,8 @@ class MessageViewFragment :
                 intArrayOf(R.attr.iconActionMarkAsRead)
             }
 
-            requireContext().withStyledAttributes(attrs = drawableAttr) {
+            val toolbarContext = requireActivity().findViewById<View>(R.id.toolbar).context
+            toolbarContext.withStyledAttributes(attrs = drawableAttr) {
                 menu.findItem(R.id.toggle_unread).icon = getDrawable(0)
             }
         }
diff --git a/app/ui/legacy/src/main/res/layout/activity_account_settings.xml b/app/ui/legacy/src/main/res/layout/activity_account_settings.xml
index 50494fbf3..e887c8dc6 100644
--- a/app/ui/legacy/src/main/res/layout/activity_account_settings.xml
+++ b/app/ui/legacy/src/main/res/layout/activity_account_settings.xml
@@ -8,10 +8,9 @@
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
+        style="?attr/toolbarStyle"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:elevation="4dp"
         tools:navigationIcon="@drawable/ic_arrow_back">
 
         <com.fsck.k9.ui.settings.account.AccountSelectionSpinner
diff --git a/app/ui/legacy/src/main/res/layout/message_list_item.xml b/app/ui/legacy/src/main/res/layout/message_list_item.xml
index 8b4fa3034..357660c57 100644
--- a/app/ui/legacy/src/main/res/layout/message_list_item.xml
+++ b/app/ui/legacy/src/main/res/layout/message_list_item.xml
@@ -148,6 +148,7 @@
                 android:textColor="?android:attr/textColorSecondary"
                 tools:text="Oct 27"/>
 
+        <!-- TODO: Replace with an ImageView. MaterialCheckBox comes with a lot of styling that we don't want. -->
         <CheckBox
                 android:id="@+id/star"
                 style="@style/MessageStarStyle"
diff --git a/app/ui/legacy/src/main/res/values/attrs.xml b/app/ui/legacy/src/main/res/values/attrs.xml
index e950d305d..4c8f7d1c3 100644
--- a/app/ui/legacy/src/main/res/values/attrs.xml
+++ b/app/ui/legacy/src/main/res/values/attrs.xml
@@ -2,6 +2,7 @@
 <resources>
 
     <declare-styleable name="K9Styles">
+        <attr name="toolbarColor" format="reference|color" />
         <attr name="bottomBarBackground" format="reference|color" />
         <attr name="iconUnifiedInbox" format="reference" />
         <attr name="iconFolder" format="reference" />
diff --git a/app/ui/legacy/src/main/res/values/styles.xml b/app/ui/legacy/src/main/res/values/styles.xml
index c49e4ac03..a0a8e425f 100644
--- a/app/ui/legacy/src/main/res/values/styles.xml
+++ b/app/ui/legacy/src/main/res/values/styles.xml
@@ -107,5 +107,17 @@
         <item name="android:layout_width">match_parent</item>
     </style>
 
+    <style name="Widget.K9.Toolbar" parent="Widget.MaterialComponents.Toolbar.Primary">
+        <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>
+
 </resources>
 
diff --git a/app/ui/legacy/src/main/res/values/themes.xml b/app/ui/legacy/src/main/res/values/themes.xml
index e5356dbb3..9fd416197 100644
--- a/app/ui/legacy/src/main/res/values/themes.xml
+++ b/app/ui/legacy/src/main/res/values/themes.xml
@@ -6,17 +6,26 @@
     </style>
 
     <!-- Empty base themes that can be easily replaced by RRO (Runtime Resource Overlay) themes -->
-    <style name="Theme.K9.Light.Base" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge" />
-    <style name="Theme.K9.Dark.Base" parent="Theme.MaterialComponents.NoActionBar.Bridge" />
+    <style name="Theme.K9.Light.Base" parent="Theme.MaterialComponents.Light.NoActionBar" />
+    <style name="Theme.K9.Dark.Base" parent="Theme.MaterialComponents.NoActionBar" />
 
     <style name="Theme.K9.Light.Common" parent="Theme.K9.Light.Base">
         <item name="windowActionModeOverlay">true</item>
+
         <item name="android:windowLightStatusBar" tools:targetApi="23">true</item>
-        <item name="colorPrimary">@color/material_gray_100</item>
-        <item name="colorPrimaryDark">@color/material_gray_100</item>
+        <item name="android:statusBarColor">@color/material_gray_100</item>
+        <item name="toolbarColor">@color/material_gray_100</item>
+
+        <item name="colorPrimary">@color/material_blue_600</item>
+        <item name="colorPrimaryVariant">@color/material_blue_800</item>
+        <item name="colorSecondary">@color/material_pink_400</item>
+        <item name="colorSecondaryVariant">@color/material_pink_200</item>
         <item name="bottomBarBackground">@color/material_gray_50</item>
 
+        <item name="toolbarStyle">@style/Widget.K9.Toolbar</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
+        <item name="textInputStyle">?attr/textInputOutlinedStyle</item>
+
         <item name="iconUnifiedInbox">@drawable/ic_inbox_multiple</item>
         <item name="iconFolder">@drawable/ic_folder</item>
         <item name="iconFolderInbox">@drawable/ic_inbox</item>
@@ -155,12 +164,21 @@
     <style name="Theme.K9.Dark.Common" parent="Theme.K9.Dark.Base">
         <item name="android:navigationBarColor">#000000</item>
         <item name="windowActionModeOverlay">true</item>
+
         <item name="android:windowLightStatusBar" tools:targetApi="23">false</item>
-        <item name="colorPrimary">@color/material_gray_900</item>
-        <item name="colorPrimaryDark">@color/material_gray_900</item>
+        <item name="android:statusBarColor">@color/material_gray_900</item>
+        <item name="toolbarColor">@color/material_gray_900</item>
+
+        <item name="colorPrimary">@color/material_blue_400</item>
+        <item name="colorPrimaryVariant">@color/material_blue_600</item>
+        <item name="colorSecondary">@color/material_pink_300</item>
+        <item name="colorSecondaryVariant">@color/material_pink_500</item>
         <item name="bottomBarBackground">@color/material_gray_900</item>
 
+        <item name="toolbarStyle">@style/Widget.K9.Toolbar</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
+        <item name="textInputStyle">?attr/textInputOutlinedStyle</item>
+
         <item name="iconUnifiedInbox">@drawable/ic_inbox_multiple</item>
         <item name="iconFolder">@drawable/ic_folder</item>
         <item name="iconFolderInbox">@drawable/ic_inbox</item>