Add Green, Red, Yellow themes

DerTyp7214 · Aug 16, 2022 · 63e87d5 · 63e87d5
1 parent e3a0a89
commit 63e87d5
Show file tree

Hide file tree

Showing 17 changed files with 518 additions and 33 deletions.
diff --git a/app/src/debug/res/values-night/colors.xml b/app/src/debug/res/values-night/colors.xml
@@ -17,4 +17,25 @@
 
     <color name="ic_launcher_background">@color/background_icon_debug</color>
     <color name="ic_launcher_foreground">@color/background</color>
+
+    <!-- Green Theme -->
+    <color name="app_background_green">#0F1C1A</color>
+    <color name="foreground_green">#325B56</color>
+    <color name="accent_green">#3bdbc4</color>
+    <color name="accent_green_2">#aff0e7</color>
+    <color name="md3_green">#68AEA4</color>
+
+    <!-- Red Theme -->
+    <color name="app_background_red">#1C0F11</color>
+    <color name="foreground_red">#5B3237</color>
+    <color name="accent_red">#DB3B52</color>
+    <color name="accent_red_2">#F0AFB8</color>
+    <color name="md3_red">#AE6872</color>
+
+    <!-- Yellow Theme -->
+    <color name="app_background_yellow">#1C190F</color>
+    <color name="foreground_yellow">#5B5232</color>
+    <color name="accent_yellow">#DBB43B</color>
+    <color name="accent_yellow_2">#F0E1AF</color>
+    <color name="md3_yellow">#AE9D68</color>
 </resources>
diff --git a/app/src/debug/res/values/colors.xml b/app/src/debug/res/values/colors.xml
@@ -20,9 +20,25 @@
 
     <color name="ic_launcher_background">@color/background_icon_debug</color>
     <color name="ic_launcher_foreground">@color/background</color>
-    <color name="app_background_green">#0F1C1A</color>
-    <color name="foreground_green">#325B56</color>
+
+    <!-- Green Theme -->
+    <color name="app_background_green">#DBECE9</color>
+    <color name="foreground_green">#9CC9C3</color>
     <color name="accent_green">#3bdbc4</color>
     <color name="accent_green_2">#aff0e7</color>
-    <color name="md3_green">#68AEA4</color>
+    <color name="md3_green">#4D8F85</color>
+
+    <!-- Red Theme -->
+    <color name="app_background_red">#ECDBDE</color>
+    <color name="foreground_red">#C99CA2</color>
+    <color name="accent_red">#DB3B52</color>
+    <color name="accent_red_2">#F0AFB8</color>
+    <color name="md3_red">#8F4D57</color>
+
+    <!-- Yellow Theme -->
+    <color name="app_background_yellow">#ECE7DB</color>
+    <color name="foreground_yellow">#C9BF9C</color>
+    <color name="accent_yellow">#DBB43B</color>
+    <color name="accent_yellow_2">#F0E1AF</color>
+    <color name="md3_yellow">#8F7E4D</color>
 </resources>
diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/core/Activity.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/core/Activity.kt
@@ -52,19 +52,12 @@ fun Activity.applyTheme(
 ) {
     setTheme(
         when (preferences.getString("app_style", "default")) {
-            "pink" -> when {
-                main -> R.style.Theme_RboardThemeManagerV3_Main
-                info -> R.style.Theme_RboardThemeManagerV3_Info
-                shareFlags -> R.style.Theme_RboardThemeManagerV3_ShareFlags
-                installPack -> R.style.Theme_RboardThemeManagerV3_InstallPack
-                else -> R.style.Theme_RboardThemeManagerV3
-            }
             "red" -> when {
-                main -> R.style.Theme_RboardThemeManagerV3_Main
-                info -> R.style.Theme_RboardThemeManagerV3_Info
-                shareFlags -> R.style.Theme_RboardThemeManagerV3_ShareFlags
-                installPack -> R.style.Theme_RboardThemeManagerV3_InstallPack
-                else -> R.style.Theme_RboardThemeManagerV3
+                main -> R.style.Theme_RboardThemeManagerV3_Main_Red
+                info -> R.style.Theme_RboardThemeManagerV3_Info_Red
+                shareFlags -> R.style.Theme_RboardThemeManagerV3_ShareFlags_Red
+                installPack -> R.style.Theme_RboardThemeManagerV3_InstallPack_Red
+                else -> R.style.Theme_RboardThemeManagerV3_Red
             }
             "green" -> when {
                 main -> R.style.Theme_RboardThemeManagerV3_Main_Green
@@ -74,11 +67,11 @@ fun Activity.applyTheme(
                 else -> R.style.Theme_RboardThemeManagerV3_Green
             }
             "yellow" -> when {
-                main -> R.style.Theme_RboardThemeManagerV3_Main
-                info -> R.style.Theme_RboardThemeManagerV3_Info
-                shareFlags -> R.style.Theme_RboardThemeManagerV3_ShareFlags
-                installPack -> R.style.Theme_RboardThemeManagerV3_InstallPack
-                else -> R.style.Theme_RboardThemeManagerV3
+                main -> R.style.Theme_RboardThemeManagerV3_Main_Yellow
+                info -> R.style.Theme_RboardThemeManagerV3_Info_Yellow
+                shareFlags -> R.style.Theme_RboardThemeManagerV3_ShareFlags_Yellow
+                installPack -> R.style.Theme_RboardThemeManagerV3_InstallPack_Yellow
+                else -> R.style.Theme_RboardThemeManagerV3_Yellow
             }
             else -> when {
                 main -> R.style.Theme_RboardThemeManagerV3_Main

diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Settings.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/preferences/Settings.kt
@@ -27,7 +27,7 @@ import de.dertyp7214.rboardthememanager.Config.FLAG_PATH
 import de.dertyp7214.rboardthememanager.Config.MODULE_ID
 import de.dertyp7214.rboardthememanager.R
 import de.dertyp7214.rboardthememanager.core.*
-import de.dertyp7214.rboardthememanager.screens.PreferencesActivity
+import de.dertyp7214.rboardthememanager.screens.*
 import de.dertyp7214.rboardthememanager.utils.GboardUtils
 import de.dertyp7214.rboardthememanager.utils.MagiskUtils
 
@@ -183,8 +183,7 @@ class Settings(private val activity: Activity, private val args: SafeJSON) : Abs
                 SelectionItem("default", R.string.style_default, -1),
                 SelectionItem("green", R.string.style_green, -1),
                 SelectionItem("red", R.string.style_red, -1),
-                SelectionItem("yellow", R.string.style_yellow, -1),
-                SelectionItem("pink", R.string.style_pink, -1)
+                SelectionItem("yellow", R.string.style_yellow, -1)
             )
         ),
         USE_BLUR(
@@ -329,7 +328,7 @@ class Settings(private val activity: Activity, private val args: SafeJSON) : Abs
 
     override fun preferences(builder: PreferenceScreen.Builder) {
         SETTINGS.values().filter { it.visible }
-            .filter { !(it == SETTINGS.SHOW_SYSTEM_THEME && Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) && !(it == SETTINGS.USE_BLUR && Build.VERSION.SDK_INT < Build.VERSION_CODES.S) && !(it == SETTINGS.APP_STYLE && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) }
+            .filter { !(it == SETTINGS.SHOW_SYSTEM_THEME && Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) && !(it == SETTINGS.USE_BLUR && Build.VERSION.SDK_INT < Build.VERSION_CODES.S) && !(it == SETTINGS.APP_STYLE && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && BuildConfig.BUILD_TYPE.equals("release")) }
             .forEach { item ->
                 val pref: Preference = when (item.type) {
                     TYPE.BOOLEAN -> builder.switch(item.key) {
@@ -366,6 +365,21 @@ class Settings(private val activity: Activity, private val args: SafeJSON) : Abs
                                     PreferencesActivity::class.java[activity] = {
                                         putExtra("type", "settings")
                                     }
+                                    InstallPackActivity::class.java[activity] = {
+                                        putExtra("type", "packs")
+                                    }
+                                    ManageRepo::class.java[activity] = {
+                                        putExtra("type", "repo")
+                                    }
+                                    ShareFlags::class.java[activity] = {
+                                        putExtra("type", "shareflags")
+                                    }
+                                    ReadMoreReadFast::class.java[activity] = {
+                                        putExtra("type", "readmorefast")
+                                    }
+                                    MainActivity::class.java[activity] = {
+                                        putExtra("type", "main")
+                                    }
                                     activity.finish()
                                 }
                             }

diff --git a/app/src/main/res/layout/activity_preferences.xml b/app/src/main/res/layout/activity_preferences.xml
@@ -10,7 +10,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fitsSystemWindows="true"
-        android:theme="@style/Theme.RboardThemeManagerV3.AppBarOverlay"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -21,7 +20,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
             android:fitsSystemWindows="true"
-            app:contentScrim="@color/foreground"
+            app:contentScrim="?attr/colorBackgroundFloating"
             app:expandedTitleTextAppearance="?attr/textAppearanceHeadlineMedium"
             app:layout_scrollFlags="scroll|exitUntilCollapsed"
             app:toolbarId="@+id/toolbar">

diff --git a/app/src/main/res/values-night-v27/themes.xml b/app/src/main/res/values-night-v27/themes.xml
@@ -72,7 +72,8 @@
         <item name="android:statusBarColor">@color/foreground</item>
         <item name="android:navigationBarColor">@color/foreground</item>
     </style>
-    <style name="Theme.RboardThemeManagerV3.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+
+    <style name="Widget.Material3.AppBarLayout" parent="">
         <item name="colorPrimary">@color/foreground</item>
         <item name="colorPrimaryVariant">@color/foreground</item>
         <item name="colorOnPrimary">@color/text</item>

diff --git a/app/src/main/res/values-night-v30/themes.xml b/app/src/main/res/values-night-v30/themes.xml
@@ -70,7 +70,8 @@
         <item name="android:statusBarColor">@color/foreground</item>
         <item name="android:navigationBarColor">@color/foreground</item>
     </style>
-    <style name="Theme.RboardThemeManagerV3.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+
+    <style name="Theme.RboardThemeManagerV3.AppBarLayout" parent="Widget.Material3.AppBarLayout">
         <item name="colorPrimary">@color/foreground</item>
         <item name="colorPrimaryVariant">@color/foreground</item>
         <item name="colorOnPrimary">@color/text</item>

diff --git a/app/src/main/res/values-night-v30/themes_green.xml b/app/src/main/res/values-night-v30/themes_green.xml
@@ -0,0 +1,87 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.RboardThemeManagerV3_Green" parent="Theme.Material3.DayNight.NoActionBar">
+        <item name="android:colorBackground">@color/app_background_green</item>
+        <item name="colorBackgroundFloating">@color/foreground_green</item>
+        <item name="android:windowLightStatusBar">true</item>
+
+        <item name="colorPrimary">@color/accent_green</item>
+        <item name="colorPrimaryVariant">@color/accent_green</item>
+        <item name="colorPrimaryContainer">@color/accent_green_2</item>
+        <item name="colorOnPrimary">@color/text</item>
+
+        <item name="colorSecondary">@color/accent_green</item>
+        <item name="colorSecondaryVariant">@color/accent_green</item>
+        <item name="colorSecondaryContainer">@color/md3_green</item>
+        <item name="colorOnSecondary">@color/text</item>
+
+        <item name="android:statusBarColor" tools:targetApi="l">@color/app_background_green</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+
+        <item name="popupMenuStyle">@style/PopupStyle</item>
+        <item name="alertDialogTheme">@style/Dialog.RboardThemeManagerV3.MaterialAlertDialog</item>
+        <item name="materialAlertDialogTheme">
+            @style/Dialog.RboardThemeManagerV3.MaterialAlertDialog
+        </item>
+
+        <item name="switchStyle">@style/Widget.App.Switch_Green</item>
+        <item name="snackbarStyle">@style/Widget.App.Snackbar_Green</item>
+        <item name="snackbarTextViewStyle">@style/Widget.App.SnackbarTextView_Green</item>
+        <item name="snackbarButtonStyle">@style/Widget.App.SnackbarButton_Green</item>
+    </style>
+
+    <style name="Widget.App.Snackbar_Green" parent="Widget.Material3.Snackbar">
+        <item name="backgroundTint">?attr/colorBackgroundFloating</item>
+    </style>
+
+    <style name="Widget.App.SnackbarTextView_Green" parent="Widget.Material3.Snackbar.TextView">
+        <item name="android:textColor">@color/text</item>
+    </style>
+
+    <style name="Widget.App.SnackbarButton_Green" parent="Widget.Material3.Button.TextButton.Snackbar">
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textColor">?attr/colorAccent</item>
+    </style>
+
+    <style name="Widget.App.Switch_Green" parent="Widget.Material3.CompoundButton.Switch">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.App.Switch_Green</item>
+    </style>
+
+    <style name="ThemeOverlay.App.Switch_Green" parent="Theme.RboardThemeManagerV3_Green">
+        <item name="colorPrimary">@color/accent_green_2</item>
+        <item name="colorPrimaryContainer">@color/accent_green</item>
+        <item name="colorOnSurface">@color/switch_track</item>
+        <item name="colorOutline">@color/switch_thumb</item>
+    </style>
+
+    <style name="Theme.RboardThemeManagerV3.Main_Green" parent="Theme.RboardThemeManagerV3_Green">
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
+    </style>
+
+    <style name="Theme.RboardThemeManagerV3.Info_Green" parent="Theme.RboardThemeManagerV3_Green">
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:navigationBarColor">@color/foreground_green</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
+    </style>
+
+    <style name="Theme.RboardThemeManagerV3.InstallPack_Green" parent="Theme.RboardThemeManagerV3_Green">
+        <item name="android:statusBarColor">@color/foreground_green</item>
+        <item name="android:navigationBarColor">@color/foreground_green</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
+    </style>
+    <style name="Theme.RboardThemeManagerV3.ShareFlags_Green" parent="Theme.RboardThemeManagerV3_Green">
+        <item name="android:statusBarColor">@color/foreground_green</item>
+        <item name="android:navigationBarColor">@color/foreground_green</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
+    </style>
+
+    <style name="Theme.RboardThemeManagerV3.AppBarLayouts_Green" parent="Widget.Material3.AppBarLayout">
+        <item name="colorPrimary">@color/foreground_green</item>
+        <item name="colorPrimaryVariant">@color/foreground_green</item>
+        <item name="colorOnPrimary">@color/text</item>
+        <item name="colorSurface">@color/app_background_green</item>
+        <item name="android:textColorPrimary">@color/text</item>
+    </style>
+</resources>
diff --git a/app/src/main/res/values-night-v30/themes_red.xml b/app/src/main/res/values-night-v30/themes_red.xml
@@ -0,0 +1,87 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.RboardThemeManagerV3_Red" parent="Theme.Material3.DayNight.NoActionBar">
+        <item name="android:colorBackground">@color/app_background_red</item>
+        <item name="colorBackgroundFloating">@color/foreground_red</item>
+        <item name="android:windowLightStatusBar">true</item>
+
+        <item name="colorPrimary">@color/accent_red</item>
+        <item name="colorPrimaryVariant">@color/accent_red</item>
+        <item name="colorPrimaryContainer">@color/accent_red_2</item>
+        <item name="colorOnPrimary">@color/text</item>
+
+        <item name="colorSecondary">@color/accent_red</item>
+        <item name="colorSecondaryVariant">@color/accent_red</item>
+        <item name="colorSecondaryContainer">@color/md3_red</item>
+        <item name="colorOnSecondary">@color/text</item>
+
+        <item name="android:statusBarColor" tools:targetApi="l">@color/app_background_red</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+
+        <item name="popupMenuStyle">@style/PopupStyle</item>
+        <item name="alertDialogTheme">@style/Dialog.RboardThemeManagerV3.MaterialAlertDialog</item>
+        <item name="materialAlertDialogTheme">
+            @style/Dialog.RboardThemeManagerV3.MaterialAlertDialog
+        </item>
+
+        <item name="switchStyle">@style/Widget.App.Switch_Red</item>
+        <item name="snackbarStyle">@style/Widget.App.Snackbar_Red</item>
+        <item name="snackbarTextViewStyle">@style/Widget.App.SnackbarTextView_Red</item>
+        <item name="snackbarButtonStyle">@style/Widget.App.SnackbarButton_Red</item>
+    </style>
+
+    <style name="Widget.App.Snackbar_Red" parent="Widget.Material3.Snackbar">
+        <item name="backgroundTint">?attr/colorBackgroundFloating</item>
+    </style>
+
+    <style name="Widget.App.SnackbarTextView_Red" parent="Widget.Material3.Snackbar.TextView">
+        <item name="android:textColor">@color/text</item>
+    </style>
+
+    <style name="Widget.App.SnackbarButton_Red" parent="Widget.Material3.Button.TextButton.Snackbar">
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textColor">?attr/colorAccent</item>
+    </style>
+
+    <style name="Widget.App.Switch_Red" parent="Widget.Material3.CompoundButton.Switch">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.App.Switch_Red</item>
+    </style>
+
+    <style name="ThemeOverlay.App.Switch_Red" parent="Theme.RboardThemeManagerV3_Red">
+        <item name="colorPrimary">@color/accent_red_2</item>
+        <item name="colorPrimaryContainer">@color/accent_red</item>
+        <item name="colorOnSurface">@color/switch_track</item>
+        <item name="colorOutline">@color/switch_thumb</item>
+    </style>
+
+    <style name="Theme.RboardThemeManagerV3.Main_Red" parent="Theme.RboardThemeManagerV3_Red">
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
+    </style>
+
+    <style name="Theme.RboardThemeManagerV3.Info_Red" parent="Theme.RboardThemeManagerV3_Red">
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="android:navigationBarColor">@color/foreground_red</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
+    </style>
+
+    <style name="Theme.RboardThemeManagerV3.InstallPack_Red" parent="Theme.RboardThemeManagerV3_Red">
+        <item name="android:statusBarColor">@color/foreground_red</item>
+        <item name="android:navigationBarColor">@color/foreground_red</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
+    </style>
+    <style name="Theme.RboardThemeManagerV3.ShareFlags_Red" parent="Theme.RboardThemeManagerV3_Red">
+        <item name="android:statusBarColor">@color/foreground_red</item>
+        <item name="android:navigationBarColor">@color/foreground_red</item>
+        <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
+    </style>
+
+    <style name="Theme.RboardThemeManagerV3.AppBarLayouts_Red" parent="Widget.Material3.AppBarLayout">
+        <item name="colorPrimary">@color/foreground_red</item>
+        <item name="colorPrimaryVariant">@color/foreground_red</item>
+        <item name="colorOnPrimary">@color/text</item>
+        <item name="colorSurface">@color/app_background_red</item>
+        <item name="android:textColorPrimary">@color/text</item>
+    </style>
+</resources>