Merge pull request #10597 from Simonx22/fix-ingame-menu-design

Android: Fix in game menu rippleColor and colorEdgeEffect
dolphin-emu · Apr 23, 2022 · 19c71db · 19c71db
2 parents 69ca38d + f5f5262
commit 19c71db
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml b/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml
@@ -27,7 +27,8 @@
         android:layout_height="0dp"
         android:layout_weight="1"
         android:scrollbarSize="8dp"
-        android:fadeScrollbars="false">
+        android:fadeScrollbars="false"
+        android:theme="@style/InGameScrollView">
 
         <LinearLayout
             android:id="@+id/layout_options"

diff --git a/Source/Android/app/src/main/res/values/styles.xml b/Source/Android/app/src/main/res/values/styles.xml
@@ -29,7 +29,6 @@
     </style>
 
     <!-- Themes for Dialogs -->
-
     <style name="DolphinDialogBase" parent="Theme.Material3.DayNight.Dialog.Alert">
         <item name="colorPrimary">@color/dolphin_blue</item>
         <item name="colorAccent">@color/dolphin_blue_secondary</item>
@@ -70,6 +69,10 @@
         <item name="browseTitleViewLayout">@layout/titleview</item>
     </style>
 
+    <style name="InGameScrollView">
+        <item name="android:colorEdgeEffect">@color/dolphin_blue_secondary</item>
+    </style>
+
     <style name="InGameMenuOption" parent="Widget.Material3.Button.TextButton">
         <item name="android:textSize">16sp</item>
         <item name="android:fontFamily">sans-serif-condensed</item>
@@ -81,6 +84,7 @@
         <item name="android:paddingLeft">32dp</item>
         <item name="android:paddingRight">32dp</item>
         <item name="android:layout_margin">0dp</item>
+        <item name="rippleColor">@color/dolphin_blue_secondary</item>
     </style>
 
     <style name="OverlayInGameMenuOption" parent="InGameMenuOption">