From cf217b5733e36d1ded43e4059efa7f90ad1e8781 Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Tue, 28 Dec 2021 13:07:18 +0530
Subject: [PATCH] Fixed Material Cab colors

---
 app/src/main/res/layout/activity_settings.xml | 3 ++-
 app/src/main/res/values-night/styles.xml      | 2 ++
 app/src/main/res/values/styles.xml            | 7 ++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index d0e8d2833..89b542036 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -22,7 +22,8 @@
             app:expandedTitleMarginBottom="24dp"
             app:expandedTitleMarginEnd="24dp"
             app:expandedTitleMarginStart="24dp"
-            app:expandedTitleTextAppearance="@style/TextAppearance.Material3.HeadlineLarge"
+            app:expandedTitleTextAppearance="@style/TextViewHeadline4"
+            app:collapsedTitleTextAppearance="@style/TextViewHeadline6"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap|enterAlwaysCollapsed">
 
             <com.google.android.material.appbar.MaterialToolbar
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 7ab94a344..5780ad13a 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -35,4 +35,6 @@
         </item>
         <item name="popupMenuBackground">@drawable/popup_background</item>
     </style>
+
+    <style name="mcab_theme" parent="@style/ThemeOverlay.MaterialComponents.Dark" />
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ddfb5a421..f137c7ce9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -46,12 +46,13 @@
         <item name="titleMarginStart">16dp</item>
     </style>
 
-    <style name="mcab_theme" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
-        <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
+    <style name="mcab_theme" parent="@style/ThemeOverlay.MaterialComponents.Light">
+        <item name="android:actionOverflowButtonStyle">@style/mcab_overflow_style</item>
     </style>
 
-    <style name="mcab_overflow_style">
+    <style name="mcab_overflow_style" parent="Widget.AppCompat.ActionButton.Overflow">
         <item name="srcCompat">@drawable/ic_more_vert</item>
+        <item name="android:tint">?colorSurface</item>
     </style>
 
     <style name="ToolbarTextAppearanceNormal">