More strong blue and remove more unused lines

dolphin-emu · Jul 4, 2022 · 5d7dde9 · 5d7dde9
1 parent 418cf5d
commit 5d7dde9
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 94 deletions.
diff --git a/Source/Android/app/src/main/res/values-night-v31/themes.xml b/Source/Android/app/src/main/res/values-night-v31/themes.xml
@@ -29,5 +29,6 @@
 
         <item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog</item>
         <item name="popupTheme">@style/ThemeOverlay.Material3</item>
+        <item name="seekBarStyle">@style/Widget.AppCompat.SeekBar</item>
     </style>
 </resources>
diff --git a/Source/Android/app/src/main/res/values-night/dolphin_material_colors.xml b/Source/Android/app/src/main/res/values-night/dolphin_material_colors.xml
diff --git a/Source/Android/app/src/main/res/values-v31/themes.xml b/Source/Android/app/src/main/res/values-v31/themes.xml
@@ -28,6 +28,6 @@
         <item name="android:colorEdgeEffect">@color/m3_sys_color_dynamic_light_secondary</item>
 
         <item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog</item>
-        <item name="popupTheme">@style/ThemeOverlay.Material3</item>
+        <item name="seekBarStyle">@style/Widget.AppCompat.SeekBar</item>
     </style>
 </resources>
diff --git a/Source/Android/app/src/main/res/values/dolphin_material_colors.xml b/Source/Android/app/src/main/res/values/dolphin_material_colors.xml
diff --git a/Source/Android/app/src/main/res/values/styles.xml b/Source/Android/app/src/main/res/values/styles.xml
@@ -36,6 +36,7 @@
     <style name="DolphinMaterialDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
         <item name="colorPrimary">@color/dolphin_surface</item>
         <item name="colorSurface">@color/dolphin_surface</item>
+        <item name="colorSecondary">@color/dolphin_primary</item>
         <item name="buttonBarPositiveButtonStyle">@style/DolphinButton</item>
         <item name="buttonBarNegativeButtonStyle">@style/DolphinButton</item>
     </style>
@@ -48,4 +49,9 @@
     <style name="DolphinPopup" parent="ThemeOverlay.Material3">
         <item name="colorPrimary">@color/dolphin_surface</item>
     </style>
+
+    <style name="DolphinSeekBar" parent="Widget.AppCompat.SeekBar">
+        <item name="android:progressTint">@color/dolphin_primary</item>
+        <item name="android:thumbTint">@color/dolphin_primary</item>
+    </style>
 </resources>
diff --git a/Source/Android/app/src/main/res/values/themes.xml b/Source/Android/app/src/main/res/values/themes.xml
@@ -5,8 +5,8 @@
         <item name="colorPrimary">@color/dolphin_primary</item>
         <item name="colorOnPrimary">@color/dolphin_onPrimary</item>
         <item name="colorPrimaryInverse">@color/dolphin_inversePrimary</item>
-        <item name="colorPrimaryContainer">@color/dolphin_primaryContainer</item>
-        <item name="colorOnPrimaryContainer">@color/dolphin_onPrimaryContainer</item>
+        <item name="colorPrimaryContainer">@color/dolphin_primary</item>
+        <item name="colorOnPrimaryContainer">@color/dolphin_onPrimary</item>
         <item name="colorSecondary">@color/dolphin_secondary</item>
         <item name="colorOnSecondary">@color/dolphin_onSecondary</item>
         <item name="colorSecondaryContainer">@color/dolphin_secondaryContainer</item>
@@ -45,41 +45,19 @@
         <item name="alertDialogTheme">@style/DolphinMotionDialog</item>
         <item name="materialAlertDialogTheme">@style/DolphinMaterialDialog</item>
         <item name="popupTheme">@style/DolphinPopup</item>
+        <item name="seekBarStyle">@style/DolphinSeekBar</item>
     </style>
 
     <style name="Theme.Dolphin.Main.Material" parent="Theme.Dolphin.Main">
-        <item name="colorPrimary">@color/dolphin_material_primary</item>
-        <item name="colorOnPrimary">@color/dolphin_material_onPrimary</item>
-        <item name="colorPrimaryInverse">@color/dolphin_material_inversePrimary</item>
-        <item name="colorPrimaryContainer">@color/dolphin_material_primaryContainer</item>
-        <item name="colorOnPrimaryContainer">@color/dolphin_material_onPrimaryContainer</item>
-        <item name="colorSecondary">@color/dolphin_material_secondary</item>
-        <item name="colorOnSecondary">@color/dolphin_material_onSecondary</item>
-        <item name="colorSecondaryContainer">@color/dolphin_material_secondaryContainer</item>
-        <item name="colorOnSecondaryContainer">@color/dolphin_material_onSecondaryContainer</item>
-        <item name="colorTertiary">@color/dolphin_material_tertiary</item>
-        <item name="colorOnTertiary">@color/dolphin_material_onTertiary</item>
-        <item name="colorTertiaryContainer">@color/dolphin_material_tertiaryContainer</item>
-        <item name="colorOnTertiaryContainer">@color/dolphin_material_onTertiaryContainer</item>
-        <item name="colorError">@color/dolphin_material_error</item>
-        <item name="colorErrorContainer">@color/dolphin_material_errorContainer</item>
-        <item name="colorOnError">@color/dolphin_material_onError</item>
-        <item name="colorOnErrorContainer">@color/dolphin_material_onErrorContainer</item>
-        <item name="android:colorBackground">@color/dolphin_material_background</item>
-        <item name="colorOnBackground">@color/dolphin_material_onBackground</item>
-        <item name="colorSurface">@color/dolphin_material_surface</item>
-        <item name="colorOnSurface">@color/dolphin_material_onSurface</item>
-        <item name="colorSurfaceVariant">@color/dolphin_material_surfaceVariant</item>
-        <item name="colorOnSurfaceVariant">@color/dolphin_material_onSurfaceVariant</item>
-        <item name="colorOutline">@color/dolphin_material_outline</item>
-        <item name="colorOnSurfaceInverse">@color/dolphin_material_inverseOnSurface</item>
-        <item name="colorSurfaceInverse">@color/dolphin_material_inverseSurface</item>
-
-        <item name="android:colorControlHighlight">@color/dolphin_material_secondary</item>
-        <item name="android:colorEdgeEffect">@color/dolphin_material_onSurfaceVariant</item>
+        <item name="colorPrimaryContainer">@color/dolphin_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/dolphin_onPrimaryContainer</item>
+
+        <item name="android:colorControlHighlight">@color/dolphin_secondary</item>
+        <item name="android:colorEdgeEffect">@color/dolphin_onSurfaceVariant</item>
 
         <item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog</item>
         <item name="popupTheme">@style/ThemeOverlay.Material3</item>
+        <item name="seekBarStyle">@style/Widget.AppCompat.SeekBar</item>
     </style>
 
     <style name="Theme.Dolphin.Main.Green" parent="Theme.Dolphin.Main">
@@ -115,6 +93,7 @@
 
         <item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog</item>
         <item name="popupTheme">@style/ThemeOverlay.Material3</item>
+        <item name="seekBarStyle">@style/Widget.AppCompat.SeekBar</item>
     </style>
 
     <style name="Theme.Dolphin.Main.Pink" parent="Theme.Dolphin.Main">
@@ -149,6 +128,7 @@
 
         <item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3.MaterialAlertDialog</item>
         <item name="popupTheme">@style/ThemeOverlay.Material3</item>
+        <item name="seekBarStyle">@style/Widget.AppCompat.SeekBar</item>
     </style>
 
     <!-- Inherit from a base file picker theme that handles day/night -->