diff options
| author | Mai M <mathew1800@gmail.com> | 2022-04-23 06:10:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-23 06:10:20 -0400 |
| commit | 19c71db782f81170cf7ac9eacc68aa17badaf960 (patch) | |
| tree | d043c1b86c4a7fbfeb1adfb813c0974a67e4d12a /Source/Android | |
| parent | 69ca38d35581c382d917f4ad2d9414ec34fc4a69 (diff) | |
| parent | f5f52625b9d5f613e49e05c55e9134be94b8643b (diff) | |
Merge pull request #10597 from Simonx22/fix-ingame-menu-design
Android: Fix in game menu rippleColor and colorEdgeEffect
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml | 3 | ||||
| -rw-r--r-- | Source/Android/app/src/main/res/values/styles.xml | 6 |
2 files changed, 7 insertions, 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 index 71dd4b6ad8..898adf6179 100644 --- 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 index 161afa826f..3d74213c15 100644 --- 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"> |