6 changes: 6 additions & 0 deletions Source/Android/app/src/main/res/menu/menu_game_grid.xml
View file
Expand Up @@ -8,6 +8,12 @@
android:icon="@drawable/ic_settings"
app:showAsAction="ifRoom"/>

<item
android:id="@+id/menu_grid_options"
android:title="@string/grid_menu_settings"
android:icon="@drawable/ic_list"
app:showAsAction="ifRoom"/>

<item
android:id="@+id/menu_refresh"
android:title="@string/grid_menu_refresh"
Expand Down
1 change: 1 addition & 0 deletions Source/Android/app/src/main/res/values-night-v31/themes.xml
View file
Expand Up @@ -26,5 +26,6 @@

<item name="materialAlertDialogTheme">@style/MaterialDialog</item>
<item name="popupTheme">@style/ThemeOverlay.Material3</item>
<item name="extendedFloatingActionButtonStyle">@style/Widget.Material3.ExtendedFloatingActionButton.Primary</item>
</style>
</resources>
1 change: 1 addition & 0 deletions Source/Android/app/src/main/res/values-v31/themes.xml
View file
Expand Up @@ -26,5 +26,6 @@

<item name="materialAlertDialogTheme">@style/MaterialDialog</item>
<item name="popupTheme">@style/ThemeOverlay.Material3</item>
<item name="extendedFloatingActionButtonStyle">@style/Widget.Material3.ExtendedFloatingActionButton.Primary</item>
</style>
</resources>
4 changes: 2 additions & 2 deletions Source/Android/app/src/main/res/values/strings.xml
View file
Expand Up @@ -193,8 +193,7 @@
<string name="osd_messages">Show On-Screen Display Messages</string>
<string name="osd_messages_description">Display messages over the emulation screen area. These messages include memory card writes, video backend and CPU information, and JIT cache clearing.</string>
<string name="download_game_covers">Download Game Covers from GameTDB.com</string>
<string name="show_titles_in_game_list">Show Titles in Game List</string>
<string name="show_titles_in_game_list_description">Show the title and creator below each game cover.</string>
<string name="show_titles_in_game_list">Show Titles</string>
<string name="change_theme">Change App Theme</string>
<string name="change_theme_mode">Change Theme Mode</string>
<string name="use_black_backgrounds">Use Black Backgrounds</string>
Expand Down Expand Up @@ -442,6 +441,7 @@
<string name="add_games">Add Games</string>
<string name="add_directory_title">Add Folder to Library</string>
<string name="grid_menu_settings">Settings</string>
<string name="grid_menu_grid_options">Grid Options</string>
<string name="grid_menu_refresh">Refresh Library</string>
<string name="grid_menu_open_file">Open File</string>
<string name="grid_menu_install_wad">Install WAD</string>
Expand Down
13 changes: 13 additions & 0 deletions Source/Android/app/src/main/res/values/styles.xml
View file
Expand Up @@ -60,4 +60,17 @@
<style name="DolphinDivider" parent="Widget.Material3.MaterialDivider">
<item name="dividerColor">?attr/colorSurfaceVariant</item>
</style>

<style name="ThemeOverlay.Dolphin.BottomSheetDialog" parent="ThemeOverlay.Material3.BottomSheetDialog">
<item name="android:navigationBarColor">@android:color/transparent</item>
</style>

<style name="Widget.Dolphin.ExtendedFloatingActionButton" parent="Widget.Material3.ExtendedFloatingActionButton.Primary">
<item name="materialThemeOverlay">@style/ThemeOverlay.Dolphin.ExtendedFloatingActionButton</item>
</style>

<style name="ThemeOverlay.Dolphin.ExtendedFloatingActionButton" parent="">
<item name="colorContainer">@color/dolphin_primary</item>
<item name="colorOnContainer">@color/dolphin_onPrimary</item>
</style>
</resources>
12 changes: 7 additions & 5 deletions Source/Android/app/src/main/res/values/themes.xml
View file
Expand Up @@ -16,8 +16,8 @@
<style name="Theme.Dolphin" parent="Theme.Material3.DayNight.NoActionBar">
<item name="colorPrimary">@color/dolphin_primary</item>
<item name="colorOnPrimary">@color/dolphin_onPrimary</item>
<item name="colorPrimaryContainer">@color/dolphin_primary</item>
<item name="colorOnPrimaryContainer">@color/dolphin_onPrimary</item>
<item name="colorPrimaryContainer">@color/dolphin_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/dolphin_onPrimaryContainer</item>
<item name="colorSecondary">@color/dolphin_secondary</item>
<item name="colorOnSecondary">@color/dolphin_onSecondary</item>
<item name="colorSecondaryContainer">@color/dolphin_secondaryContainer</item>
Expand Down Expand Up @@ -53,17 +53,17 @@
<item name="popupTheme">@style/DolphinPopup</item>
<item name="sliderStyle">@style/DolphinSlider</item>
<item name="materialDividerStyle">@style/DolphinDivider</item>
<item name="bottomSheetDialogTheme">@style/ThemeOverlay.Dolphin.BottomSheetDialog</item>
<item name="extendedFloatingActionButtonStyle">@style/Widget.Dolphin.ExtendedFloatingActionButton</item>
</style>

<!-- Trick for API >= 29 specific changes -->
<style name="Theme.Dolphin.Main" parent="Theme.Dolphin" />

<style name="Theme.Dolphin.Main.Material" parent="Theme.Dolphin.Main">
<item name="colorPrimaryContainer">@color/dolphin_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/dolphin_onPrimaryContainer</item>

<item name="materialAlertDialogTheme">@style/MaterialDialog</item>
<item name="popupTheme">@style/ThemeOverlay.Material3</item>
<item name="extendedFloatingActionButtonStyle">@style/Widget.Material3.ExtendedFloatingActionButton.Primary</item>
</style>

<style name="Theme.Dolphin.Main.Green" parent="Theme.Dolphin.Main">
Expand Down Expand Up @@ -95,6 +95,7 @@

<item name="materialAlertDialogTheme">@style/MaterialDialog</item>
<item name="popupTheme">@style/ThemeOverlay.Material3</item>
<item name="extendedFloatingActionButtonStyle">@style/Widget.Material3.ExtendedFloatingActionButton.Primary</item>
</style>

<style name="Theme.Dolphin.Main.Pink" parent="Theme.Dolphin.Main">
Expand Down Expand Up @@ -126,6 +127,7 @@

<item name="materialAlertDialogTheme">@style/MaterialDialog</item>
<item name="popupTheme">@style/ThemeOverlay.Material3</item>
<item name="extendedFloatingActionButtonStyle">@style/Widget.Material3.ExtendedFloatingActionButton.Primary</item>
</style>

<!-- Inherit from a base file picker theme that handles day/night -->
Expand Down