diff options
Diffstat (limited to 'Source/Android/app/src')
6 files changed, 22 insertions, 9 deletions
diff --git a/Source/Android/app/src/main/res/layout/activity_main.xml b/Source/Android/app/src/main/res/layout/activity_main.xml index 3ff9ddae0f..95b631a698 100644 --- a/Source/Android/app/src/main/res/layout/activity_main.xml +++ b/Source/Android/app/src/main/res/layout/activity_main.xml @@ -13,10 +13,11 @@ <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar_main" + android:background="?colorPrimary" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" app:layout_scrollFlags="scroll|enterAlways" - app:popupTheme="@style/ThemeOverlay.AppCompat.Light" /> + app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight"/> <com.google.android.material.tabs.TabLayout android:id="@+id/tabs_platforms" diff --git a/Source/Android/app/src/main/res/layout/fragment_settings.xml b/Source/Android/app/src/main/res/layout/fragment_settings.xml index ce381beb57..1fef71b426 100644 --- a/Source/Android/app/src/main/res/layout/fragment_settings.xml +++ b/Source/Android/app/src/main/res/layout/fragment_settings.xml @@ -5,7 +5,7 @@ <androidx.recyclerview.widget.RecyclerView android:id="@+id/list_settings" - android:background="@android:color/white" + android:background="?android:attr/colorBackground" android:layout_width="match_parent" android:layout_height="match_parent"/> diff --git a/Source/Android/app/src/main/res/values-night/colors.xml b/Source/Android/app/src/main/res/values-night/colors.xml new file mode 100644 index 0000000000..61b58361b3 --- /dev/null +++ b/Source/Android/app/src/main/res/values-night/colors.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="dolphin_purple">#A277FF</color> +</resources> diff --git a/Source/Android/app/src/main/res/values-night/styles_filepicker.xml b/Source/Android/app/src/main/res/values-night/styles_filepicker.xml new file mode 100644 index 0000000000..79af40c030 --- /dev/null +++ b/Source/Android/app/src/main/res/values-night/styles_filepicker.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <style name="FilePickerBaseTheme" parent="NNF_BaseTheme" /> +</resources> diff --git a/Source/Android/app/src/main/res/values/styles.xml b/Source/Android/app/src/main/res/values/styles.xml index a714116bf0..086b4c6082 100644 --- a/Source/Android/app/src/main/res/values/styles.xml +++ b/Source/Android/app/src/main/res/values/styles.xml @@ -2,7 +2,7 @@ <resources> <!-- Inherit from the material theme --> - <style name="DolphinBase" parent="Theme.AppCompat.Light.NoActionBar"> + <style name="DolphinBase" parent="Theme.AppCompat.DayNight.NoActionBar"> <!-- Main theme colors --> <!-- Branding color for the app bar --> <item name="colorPrimary">@color/dolphin_blue</item> @@ -19,7 +19,7 @@ </style> <!-- Same as above, but use default action bar, and mandate margins. --> - <style name="DolphinSettingsBase" parent="Theme.AppCompat.Light.DarkActionBar"> + <style name="DolphinSettingsBase" parent="Theme.AppCompat.DayNight.DarkActionBar"> <item name="colorPrimary">@color/dolphin_blue</item> <item name="colorPrimaryDark">@color/dolphin_blue_dark</item> <item name="colorAccent">@color/dolphin_purple</item> @@ -29,7 +29,7 @@ <!-- Inherit from the Base Dolphin Dialog Theme --> - <style name="DolphinEmulationBase" parent="Theme.AppCompat.Light.DarkActionBar"> + <style name="DolphinEmulationBase" parent="Theme.AppCompat.DayNight.DarkActionBar"> <item name="colorPrimary">@color/dolphin_blue</item> <item name="colorPrimaryDark">@color/dolphin_blue_dark</item> <item name="colorAccent">@color/dolphin_purple</item> @@ -43,7 +43,7 @@ <item name="android:windowAllowReturnTransitionOverlap">true</item> </style> - <style name="DolphinEmulationTvBase" parent="Theme.AppCompat.Light.NoActionBar"> + <style name="DolphinEmulationTvBase" parent="Theme.AppCompat.DayNight.NoActionBar"> <item name="colorPrimary">@color/dolphin_blue</item> <item name="colorPrimaryDark">@color/dolphin_blue_dark</item> <item name="colorAccent">@color/dolphin_purple</item> @@ -94,8 +94,8 @@ <item name="android:textColor">@color/button_text_color</item> </style> - <!-- You can also inherit from NNF_BaseTheme.Light --> - <style name="FilePickerTheme" parent="NNF_BaseTheme.Light"> + <!-- Inherit from a base file picker theme that handles day/night --> + <style name="FilePickerTheme" parent="FilePickerBaseTheme"> <item name="colorPrimary">@color/dolphin_blue</item> <item name="colorPrimaryDark">@color/dolphin_blue_dark</item> <item name="colorAccent">@color/dolphin_accent_gamecube</item> @@ -111,7 +111,7 @@ <item name="nnf_toolbarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item> </style> - <style name="FilePickerAlertDialogTheme" parent="Theme.AppCompat.Dialog.Alert"> + <style name="FilePickerAlertDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert"> <item name="colorPrimary">@color/dolphin_blue</item> <item name="colorPrimaryDark">@color/dolphin_blue_dark</item> <item name="colorAccent">@color/dolphin_accent_gamecube</item> diff --git a/Source/Android/app/src/main/res/values/styles_filepicker.xml b/Source/Android/app/src/main/res/values/styles_filepicker.xml new file mode 100644 index 0000000000..880c901287 --- /dev/null +++ b/Source/Android/app/src/main/res/values/styles_filepicker.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <style name="FilePickerBaseTheme" parent="NNF_BaseTheme.Light" /> +</resources> |