From 0331fe1f9d962473ae4dcb0eb5cdcac6b8c7ff0b Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Mon, 15 Feb 2021 10:24:42 +0200
Subject: [PATCH] Toolbar and menu style improvements

---
 app/src/main/res/layout/activity_main.xml |  5 +++--
 app/src/main/res/values-night/colors.xml  |  1 +
 app/src/main/res/values/colors.xml        |  1 +
 app/src/main/res/values/styles.xml        | 25 ++++++++---------------
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b1978e01..0a71fdf1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -3,15 +3,16 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".MainActivity">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="@color/colorPrimary"
+        android:background="?attr/colorPrimary"
         android:elevation="4dp"
-        android:theme="@style/ActionBar.Main" >
+        app:theme="@style/ActionBar">
     </androidx.appcompat.widget.Toolbar>
 
     <ScrollView
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index c7ae52ae..1420daaf 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -14,6 +14,7 @@
     <color name="colorBlack">#000000</color>
     <color name="colorGreen">#01df01</color>
     <color name="colorRed">#df0101</color>
+    <color name="colorLight">@color/colorGrayLight</color>
     <color name="colorDark">#383838</color>
     <color name="colorSpinnerText">@color/colorDark</color>
     <color name="colorSpinnerDropdown">@color/colorGray</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 945a134c..d859bad1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -14,6 +14,7 @@
     <color name="colorBlack">#000000</color>
     <color name="colorGreen">#01df01</color>
     <color name="colorRed">#df0101</color>
+    <color name="colorLight">@color/colorWhite</color>
     <color name="colorDark">#383838</color>
     <color name="colorSpinnerText">@color/colorDark</color>
     <color name="colorSpinnerDropdown">@color/colorGrayLight</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fad0d509..c065aa88 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -4,10 +4,8 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
+        <item name="actionBarTheme">@style/ActionBar</item>
         <item name="android:dropDownListViewStyle">@style/Spinner</item>
-        <item name="actionOverflowMenuStyle">@style/ActionBarMenu</item>
-        <item name="android:itemTextAppearance">@style/itemTextStyle.AppTheme</item>
     </style>
 
     <style name="AppTheme.Main" parent="AppTheme">
@@ -15,6 +13,13 @@
         <item name="windowNoTitle">true</item>
     </style>
 
+    <style name="ActionBar" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+        <item name="android:colorBackground">@color/colorSecondaryDark</item>
+        <item name="android:textColor">@color/colorLight</item>
+        <item name="android:textColorPrimary">@color/colorLight</item>
+        <item name="android:textColorSecondary">@color/colorLight</item>
+    </style>
+
     <style name="Spinner" parent="Widget.AppCompat.ListView.DropDown">
         <item name="android:dividerHeight">1dp</item>
         <item name="android:divider">@color/colorSpinnerDivider</item>
@@ -25,20 +30,6 @@
         <item name="android:textColorPrimary">@color/colorAlertText</item>
     </style>
 
-    <style name="ActionBarMenu" parent="Widget.AppCompat.PopupMenu.Overflow">
-        <item name="android:popupBackground">@color/colorSecondaryDark</item>
-        <item name="android:textColorPrimary">@color/colorBaresip</item>
-    </style>
-
-    <style name="ActionBar.Main" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
-        <item name="android:textColorPrimary">@color/colorWhite</item>
-        <item name="actionOverflowMenuStyle">@style/ActionBarMenu</item>
-    </style>
-
-    <style name="itemTextStyle.AppTheme" parent="@android:style/TextAppearance.Widget.IconMenu.Item">
-        <item name="android:textColor">@color/colorItemText</item>
-    </style>
-
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar" />
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.DayNight" />