From fa20d04ff4fe46a3e09f93e368dc435ae2e4d3a7 Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <a_gadgetbridge@anymore.nl>
Date: Tue, 1 Aug 2023 11:13:09 +0200
Subject: [PATCH] Fix action menu icons color

---
 ...ctivity_hybridhr_watchface_designer_actionbar.xml |  6 ++++--
 app/src/main/res/menu/menu_charts.xml                | 12 ++++++++----
 app/src/main/res/values/attrs.xml                    |  1 +
 app/src/main/res/values/styles.xml                   |  4 ++++
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/menu/activity_hybridhr_watchface_designer_actionbar.xml b/app/src/main/res/menu/activity_hybridhr_watchface_designer_actionbar.xml
index fac80ec6b..5f38d16e4 100644
--- a/app/src/main/res/menu/activity_hybridhr_watchface_designer_actionbar.xml
+++ b/app/src/main/res/menu/activity_hybridhr_watchface_designer_actionbar.xml
@@ -3,13 +3,15 @@
     <item
         android:id="@+id/button_preview_watchface"
         android:title="@string/button_watchface_preview"
-        app:showAsAction="always"
         android:icon="@drawable/ic_watch_bw"
+        app:iconTint="?attr/actionmenu_icon_color"
+        app:showAsAction="always"
         />
     <item
         android:id="@+id/button_save_watchface"
         android:title="@string/button_watchface_save_apply"
-        app:showAsAction="always"
         android:icon="@drawable/ic_done"
+        app:iconTint="?attr/actionmenu_icon_color"
+        app:showAsAction="always"
         />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_charts.xml b/app/src/main/res/menu/menu_charts.xml
index cbec98937..edbe701ae 100644
--- a/app/src/main/res/menu/menu_charts.xml
+++ b/app/src/main/res/menu/menu_charts.xml
@@ -4,12 +4,16 @@
     tools:context="nodomain.freeyourgadget.gadgetbridge.activities.charts.ActivityChartsActivity">
     <item
         android:id="@+id/charts_fetch_activity_data"
-        app:showAsAction="ifRoom"
+        android:title="@string/controlcenter_fetch_activity_data"
         android:icon="@drawable/ic_refresh"
-        android:title="@string/controlcenter_fetch_activity_data"/>
+        app:iconTint="?attr/actionmenu_icon_color"
+        app:showAsAction="ifRoom"
+        />
     <item
         android:id="@+id/prefs_charts_menu"
-        android:icon="@drawable/ic_settings"
         android:title="@string/pref_header_charts"
-        app:showAsAction="ifRoom" />
+        android:icon="@drawable/ic_settings"
+        app:iconTint="?attr/actionmenu_icon_color"
+        app:showAsAction="ifRoom"
+        />
 </menu>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 152459aba..c0d0068db 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -7,6 +7,7 @@
     <attr name="drawer_header_color" format="color" />
     <attr name="drawer_title_color" format="color" />
     <attr name="cardview_background_color" format="color" />
+    <attr name="actionmenu_icon_color" format="color" />
 
     <attr name="chart_deep_sleep" format="color" />
     <attr name="chart_light_sleep" format="color" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 03e88b183..b314ea33b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -21,6 +21,7 @@
         <item name="drawer_header_color">?attr/colorPrimaryDark</item>
         <item name="drawer_title_color">@android:color/white</item>
         <item name="cardview_background_color">@color/cardview_light_background</item>
+        <item name="actionmenu_icon_color">@android:color/white</item>
         <item name="chart_deep_sleep">@color/chart_deep_sleep_light</item>
         <item name="chart_light_sleep">@color/chart_light_sleep_light</item>
         <item name="chart_rem_sleep">@color/chart_rem_sleep_light</item>
@@ -52,6 +53,7 @@
         <item name="drawer_header_color">?attr/colorPrimaryDark</item>
         <item name="drawer_title_color">@android:color/white</item>
         <item name="cardview_background_color">@color/cardview_dark_background</item>
+        <item name="actionmenu_icon_color">@android:color/white</item>
         <item name="chart_deep_sleep">@color/chart_deep_sleep_dark</item>
         <item name="chart_light_sleep">@color/chart_light_sleep_dark</item>
         <item name="chart_rem_sleep">@color/chart_rem_sleep_dark</item>
@@ -75,6 +77,7 @@
         <item name="drawer_header_color">?attr/colorSurface</item>
         <item name="drawer_title_color">?attr/colorOnSurface</item>
         <item name="cardview_background_color">?attr/colorSurface</item>
+        <item name="actionmenu_icon_color">?attr/colorOnSurface</item>
         <item name="alternate_row_background">?attr/colorSecondaryContainer</item>
     </style>
     <style name="GadgetbridgeThemeDynamicDark" parent="Theme.Material3.DynamicColors.Dark">
@@ -84,6 +87,7 @@
         <item name="drawer_header_color">?attr/colorSurface</item>
         <item name="drawer_title_color">?attr/colorOnSurface</item>
         <item name="cardview_background_color">?attr/colorSurface</item>
+        <item name="actionmenu_icon_color">?attr/colorOnSurface</item>
         <item name="alternate_row_background">?attr/colorSecondaryContainer</item>
     </style>
     <style name="GadgetbridgeThemeDynamicDarkAmoled" parent="GadgetbridgeThemeDynamicDark">