Browse Source

Fix background colors for popup menus and bottom sheets

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Álvaro Brey 2 years ago
parent
commit
f0f18b548f
2 changed files with 19 additions and 5 deletions
  1. 1 2
      app/src/main/res/layout/toolbar_standard.xml
  2. 18 3
      app/src/main/res/values/styles.xml

+ 1 - 2
app/src/main/res/layout/toolbar_standard.xml

@@ -111,8 +111,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
                 android:background="@color/appbar"
-                android:theme="@style/Theme.ToolbarWithDisabled"
-                app:popupTheme="@style/Theme.AppCompat.DayNight.NoActionBar"
+                android:theme="@style/Theme.ToolbarTheme"
                 tools:visibility="gone">
 
                 <androidx.appcompat.widget.AppCompatSpinner

+ 18 - 3
app/src/main/res/values/styles.xml

@@ -121,6 +121,8 @@
         <item name="windowActionModeOverlay">true</item>
         <item name="windowNoTitle">true</item>
         <item name="textInputStyle">@style/Widget.App.TextInputLayout</item>
+        <item name="popupMenuStyle">@style/Nextcloud.Widget.PopupMenu</item>
+        <item name="bottomSheetDialogTheme">@style/ThemeOverlay.App.BottomSheetDialog</item>
     </style>
 
     <style name="Theme.ownCloud.ToolbarBase" parent="BaseTheme.ownCloud.Toolbar">
@@ -378,12 +380,17 @@
         <item name="android:textColorPrimary">@color/text_color</item>
     </style>
 
-    <style name="Nextcloud.Widget.PopupMenu" parent="@style/Widget.AppCompat.PopupMenu">
-        <item name="android:textColor">@color/menu_item_text_color</item>
+    <style name="Nextcloud.Widget.PopupMenu" parent="@style/Widget.Material3.PopupMenu">
+        <item name="popupMenuBackground">@color/bg_default</item>
     </style>
 
-    <style name="Theme.ToolbarWithDisabled" parent="@style/ThemeOverlay.Material3.Dark.ActionBar">
+    <style name="Theme.ToolbarTheme" parent="@style/ThemeOverlay.Material3.Dark.ActionBar">
         <item name="android:textColor">@color/menu_item_text_color</item>
+        <item name="actionOverflowMenuStyle">@style/OverflowMenuStyle</item>
+    </style>
+
+    <style name="OverflowMenuStyle" parent="Widget.Material3.PopupMenu.Overflow">
+        <item name="android:popupBackground">@color/bg_default</item>
     </style>
 
     <style name="MaterialListItemSingleLine">
@@ -449,5 +456,13 @@
     </style>
 
 
+    <style name="ThemeOverlay.App.BottomSheetDialog" parent="@style/ThemeOverlay.MaterialComponents.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/App.BottomSheetDialog</item>
+    </style>
+
+    <style name="App.BottomSheetDialog" parent="Widget.MaterialComponents.BottomSheet.Modal">
+        <item name="backgroundTint">@color/bg_default</item>
+    </style>
+
 
 </resources>