Update popupmenu bg with rounded bg

UWU-TEAM · Sep 11, 2024 · d857700 · d857700
1 parent ec1b649
commit d857700
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/app/src/main/res/drawable/uwu_bg_popup.xml b/app/src/main/res/drawable/uwu_bg_popup.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    android:shape="rectangle"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid
+        android:color="@color/uwu_bg_card" />
+    <corners
+        android:radius="14.0dip" />
+    <padding
+        android:top="8.0dip"
+        android:bottom="8.0dip" />
+</shape>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
@@ -27,10 +27,17 @@
         <item name="elevation">0.0dip</item>
         <item name="materialAlertDialogTheme">@style/Uwu.Material3.MaterialAlertDialog</item>
         <item name="navigationViewStyle">@style/Widget.MaterialComponents.NavigationView</item>
+        <item name="popupTheme">?actionBarPopupTheme</item>
+        <item name="actionBarPopupTheme">@style/AppTheme.PopupOverlay</item>
+        <item name="popupMenuBackground">@drawable/uwu_bg_popup</item>
         <item name="preferenceCategoryStyle">@style/Uwu.Preference.Category</item>
         <item name="colorCard">?attr/colorSecondaryContainer</item>
     </style>
 
+    <style name="AppTheme.PopupOverlay" parent="@style/ThemeOverlay.Material3.Dark">
+        <item name="android:backgroundTint">@color/uwu_bg_card</item>
+    </style>
+
     <style name="Dialog.Signal" parent="Theme.MaterialComponents.DayNight.Dialog">
         <item name="colorPrimaryVariant">@color/flat_grey_dark_2</item>
         <item name="colorSecondary">@color/flat_grey_dark_2</item>

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -27,6 +27,9 @@
         <item name="elevation">0.0dip</item>
         <item name="materialAlertDialogTheme">@style/Uwu.Material3.MaterialAlertDialog</item>
         <item name="navigationViewStyle">@style/Widget.MaterialComponents.NavigationView</item>
+        <item name="popupTheme">?actionBarPopupTheme</item>
+        <item name="actionBarPopupTheme">@style/AppTheme.PopupOverlay</item>
+        <item name="popupMenuBackground">@drawable/uwu_bg_popup</item>
         <item name="preferenceCategoryStyle">@style/Uwu.Preference.Category</item>
         <item name="colorCard">@color/uwu_bg_card</item>
     </style>
@@ -70,15 +73,11 @@
         <item name="colorOnSurfaceInverse">@color/colorText_ActionBar</item>
         <item name="colorOnSurfaceVariant">@color/colorText_ActionBar</item>
         <item name="colorPrimaryDark">?attr/colorThemeUwu</item>
-        <item name="popupTheme">@style/AppTheme.PopupOverlay</item>
         <item name="titleTextColor">@color/colorText_ActionBar</item>
     </style>
 
-    <style name="AppTheme.PopupOverlay" parent="@style/Theme.MaterialComponents.DayNight.DarkActionBar.Bridge">
-        <item name="android:colorBackground">@color/uwu_bg_card</item>
-        <item name="android:textColor">@color/colorText</item>
-        <item name="android:tint">@color/colorText</item>
-        <item name="colorControlNormal">@color/colorText</item>
+    <style name="AppTheme.PopupOverlay" parent="@style/ThemeOverlay.Material3.Light">
+        <item name="android:backgroundTint">@color/uwu_bg_card</item>
     </style>
 
     <style name="fab_square">