From de4d7b554988a506079da8d468bdae4b6900b2e8 Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <info@niedermann.it>
Date: Sat, 12 Nov 2022 08:44:26 +0100
Subject: Material 3: Favorite checkbox

Signed-off-by: Stefan Niedermann <info@niedermann.it>
---
 app/src/main/res/layout/activity_edit.xml |  1 -
 app/src/main/res/values/styles.xml        | 14 ++++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml
index a5951fb2..8948c076 100644
--- a/app/src/main/res/layout/activity_edit.xml
+++ b/app/src/main/res/layout/activity_edit.xml
@@ -13,7 +13,6 @@
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
-            app:popupTheme="@style/PopUpDarkMenu"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:layout_marginHorizontal="@dimen/spacer_activity_sides"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d70d7660..661bcfd2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -21,16 +21,19 @@
 
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
 
+        <item name="toolbarStyle">@style/toolbarStyle</item>
         <item name="actionModeStyle">@style/actionModeStyle</item>
         <item name="tabStyle">@style/tabStyle</item>
     </style>
 
     <style name="AppTheme" parent="BaseTheme" />
 
-    <style name="PopUpDarkMenu" parent="Theme.Material3.DayNight">
+    <style name="toolbarStyle" parent="Widget.Material3.Toolbar">
+        <item name="popupTheme">@style/PopupTheme</item>
+    </style>
+
+    <style name="PopupTheme" parent="Theme.Material3.DayNight">
         <item name="colorPrimary">@color/primary</item>
-        <item name="colorPrimaryDark">?android:colorPrimary</item>
-        <item name="colorAccent">@color/accent</item>
         <item name="checkboxStyle">@style/checkboxStyle</item>
     </style>
 
@@ -39,12 +42,7 @@
     </style>
 
     <style name="materialThemeOverlay" parent="Widget.Material3.CompoundButton.CheckBox">
-        <!-- Container colors -->
         <item name="colorPrimary">@color/accent</item>
-        <item name="colorOnSurface">@color/accent</item>
-        <!-- Icon colors -->
-        <item name="colorSurface">@color/primary</item>
-        <item name="colorOnPrimary">@color/primary</item>
     </style>
 
     <style name="actionModeStyle" parent="@style/Widget.Material3.ActionMode">
-- 
cgit v1.2.3