From 28113af98a31fd85342eaeab7eca8c93bfd2ff89 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Tue, 5 Nov 2019 20:10:06 -0600
Subject: [PATCH] Fix Main screen toolbar menu text color.

- Fixed the color of the text for Main screen's toolbar menu so that it looks nice and is readable in both day and night modes.
---
 app/src/main/res/menu/menu_home.xml |  2 +-
 app/src/main/res/values/styles.xml  | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/menu/menu_home.xml b/app/src/main/res/menu/menu_home.xml
index ece2682..390dc6f 100644
--- a/app/src/main/res/menu/menu_home.xml
+++ b/app/src/main/res/menu/menu_home.xml
@@ -12,7 +12,7 @@
         android:id="@+id/merchants_dest"
         android:icon="@drawable/ic_merchants"
         android:title="@string/title_merchants_and_tellers"
-        app:showAsAction="always"/>
+        app:showAsAction="ifRoom"/>
 
     <item
         android:id="@+id/settings_dest"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 18efb8d..f051fbf 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -7,6 +7,7 @@
         <item name="colorPrimaryVariant">@color/colorPrimaryVariant</item>
         <item name="colorSecondary">@color/colorSecondary</item>
         <item name="colorOnSecondary">#fff</item>
+        <item name="android:itemTextAppearance">@style/MenuItemTextStyle</item>
         <!--Custom attributes -->
         <item name="android:fontFamily">@font/p_f_beau_sans_pro</item>
         <item name="themedColorBackgroundFloating">@android:color/white</item>
@@ -21,6 +22,7 @@
         <item name="colorPrimaryVariant">@color/colorPrimaryVariant</item>
         <item name="colorSecondary">@color/colorSecondary</item>
         <item name="colorOnSecondary">#fff</item>
+        <item name="android:itemTextAppearance">@style/MenuItemTextStyle.Dark</item>
         <!--Custom attributes -->
         <item name="android:fontFamily">@font/p_f_beau_sans_pro</item>
         <item name="themedColorBackgroundFloating">@color/colorBackgroundFloating</item>
@@ -33,6 +35,14 @@
         <item name="android:windowBackground">@drawable/splash_screen</item>
     </style>
 
+    <style name="MenuItemTextStyle" parent="@android:style/TextAppearance.Widget.IconMenu.Item">
+        <item name="android:textColor">@color/black</item>
+    </style>
+
+    <style name="MenuItemTextStyle.Dark" >
+        <item name="android:textColor">@color/white</item>
+    </style>
+
     <style name="Widget.Bitsy.TextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox" />
 
     <style name="Widget.Bitsy.Button" parent="Widget.MaterialComponents.Button">