feat(theme): new themes: Darcula and Gruvbox (#138)

Co-authored-by: Joshua Kuestersteffen <[email protected]> Co-authored-by: Klaus-Hendrik Wolf <[email protected]>
jkuester · Dec 22, 2023 · 28de5e7 · 28de5e7
1 parent 2e0b302
commit 28de5e7
Show file tree

Hide file tree

Showing 18 changed files with 74 additions and 4 deletions.
diff --git a/app/src/main/java/com/sduduzog/slimlauncher/MainActivity.kt b/app/src/main/java/com/sduduzog/slimlauncher/MainActivity.kt
@@ -140,6 +140,8 @@ class MainActivity : AppCompatActivity(),
                 4 -> R.style.AppCandyTheme
                 5 -> R.style.AppPinkTheme
                 6 -> R.style.AppThemeLight
+                7 -> R.style.AppDarculaTheme
+                8 -> R.style.AppGruvBoxDarkTheme
                 else -> R.style.AppTheme
             }
         }

diff --git a/app/src/main/res/layout/customise_apps_fragment.xml b/app/src/main/res/layout/customise_apps_fragment.xml
@@ -12,7 +12,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/_16sdp"
-        android:layout_marginLeft="@dimen/_16sdp"
+        android:textColor="?headerTextColor"
         android:layout_marginTop="@dimen/_8sdp"
         android:text="@string/options_fragment_customise_apps"
         android:textAppearance="@style/TextAppearance.AppCompat"

diff --git a/app/src/main/res/layout/customize_app_drawer_fragment.xml b/app/src/main/res/layout/customize_app_drawer_fragment.xml
@@ -16,6 +16,7 @@
         android:layout_marginTop="32dp"
         android:layout_marginEnd="@dimen/_16sdp"
         android:layout_marginRight="@dimen/_16sdp"
+        android:textColor="?headerTextColor"
         android:text="@string/customize_app_drawer_fragment_visible_apps"
         android:textAppearance="@style/TextAppearance.AppCompat"
         android:textSize="@dimen/font_size_customize_options"
@@ -48,6 +49,6 @@
         android:textAppearance="@style/TextAppearance.AppCompat"
         android:textSize="@dimen/font_size_customize_options"
         app:layout_constraintStart_toStartOf="parent"
+        android:textColor="?switchTextColor"
         app:layout_constraintTop_toBottomOf="@id/customize_app_drawer_fragment_search_options" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/customize_quick_buttons_fragment.xml b/app/src/main/res/layout/customize_quick_buttons_fragment.xml
@@ -14,6 +14,7 @@
         android:layout_marginStart="@dimen/_16sdp"
         android:layout_marginTop="@dimen/_8sdp"
         android:text="@string/options_fragment_customize_quick_buttons"
+        android:textColor="?headerTextColor"
         android:textAppearance="@style/TextAppearance.AppCompat"
         android:textSize="@dimen/font_size_customize_title"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/options_fragment.xml b/app/src/main/res/layout/options_fragment.xml
@@ -18,11 +18,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/_16sdp"
-            android:layout_marginLeft="@dimen/_16sdp"
             android:layout_marginTop="@dimen/_8sdp"
             android:stateListAnimator="@xml/animate_scale"
             android:text="@string/main_fragment_options"
             android:textAppearance="@style/TextAppearance.AppCompat"
+            android:textColor="?headerTextColor"
             android:textSize="@dimen/font_size_customize_title"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -8,6 +8,8 @@
         <item>Candy</item>
         <item>Pastell</item>
         <item>Mittag</item>
+        <item>Vlad</item>
+        <item>Groovig</item>
     </string-array>
 
     <string-array name="time_format_array">

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -7,6 +7,8 @@
         <item>Candy</item>
         <item>Pastel</item>
         <item>Midi</item>
+        <item>Vlad</item>
+        <item>Groovy</item>
     </string-array>
 
     <string-array name="time_format_array">

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -7,6 +7,8 @@
         <item>Caramella</item>
         <item>Pastello</item>
         <item>Mezzogiorno</item>
+        <item>Vlad</item>
+        <item>Groovy</item>
     </string-array>
 
     <string-array name="time_format_array">

diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
@@ -12,6 +12,8 @@
         <item>Godteri</item>
         <item>Pastell</item>
         <item>Middag</item>
+        <item>Vlad</item>
+        <item>Groovy</item>
     </string-array>
 
     <string-array name="time_format_array">

diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
@@ -2,6 +2,8 @@
 <resources>
 
     <style name="AppTheme" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
+        <item name="headerTextColor">@color/accentColor</item>
+        <item name="switchTextColor">@color/accentColor</item>
         <item name="colorAccent">@color/accentColor</item>
         <item name="colorPrimary">@color/primaryColor</item>
         <item name="colorPrimaryDark">@color/primaryColor</item>

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
@@ -12,6 +12,8 @@
         <item>Snoep</item>
         <item>Pastel</item>
         <item>Middag</item>
+        <item>Vlad</item>
+        <item>Groovy</item>
     </string-array>
 
     <string-array name="time_format_array">

diff --git a/app/src/main/res/values-notnight/styles.xml b/app/src/main/res/values-notnight/styles.xml
@@ -2,6 +2,8 @@
 <resources>
 
     <style name="AppTheme" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
+        <item name="headerTextColor">@color/accentColor</item>
+        <item name="switchTextColor">@color/accentColor</item>
         <item name="colorAccent">@color/accentColor</item>
         <item name="android:colorForeground">@color/accentColor</item>
         <item name="colorPrimary">@color/primaryColor</item>

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -15,6 +15,8 @@
         <item>糖果色</item>
         <item>粉彩色</item>
         <item>正午</item>
+        <item>弗拉德</item>
+        <item>格罗维</item>
     </string-array>
 
     <string-array name="time_format_array">

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
@@ -12,6 +12,8 @@
         <item>糖果颜色主題</item>
         <item>粉色主題</item>
         <item>主题中午</item>
+        <item>弗拉德</item>
+        <item>格罗维</item>
     </string-array>
 
     <string-array name="time_format_array">

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <attr name="customColor" format="reference"/>
+    <attr name="headerTextColor" format="reference"/>
+    <attr name="switchTextColor" format="reference" />
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -16,6 +16,22 @@
 
     <color name="colorChineseWhite">#E0E0E0</color>
 
+    <color name="colorGunmetal">#282A36</color>
+
+    <color name="colorCultured">#F8F8F2</color>
+
+    <color name="colorOuterSpace">#44475A</color>
+
+    <color name="colorDarkBlueGray">#6272A4</color>
+
+    <color name="colorCharlestonGreen">#282828</color>
+
+    <color name="colorCinereous">#938274</color>
+
+    <color name="colorCookiesAndCream">#EBDBB2</color>
+
+    <color name="colorAcidGreen">#B8BB26</color>
+
     <!-- Default Primary Color   -->
     <color name="primaryColor">@color/lightPrimaryColor</color>
     <color name="primaryColorDark">@color/colorGray</color>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -15,6 +15,8 @@
         <item>Candy</item>
         <item>Pastel</item>
         <item>Noon</item>
+        <item>Vlad</item>
+        <item>Groovy</item>
     </string-array>
 
     <string-array name="time_format_array">

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -2,6 +2,8 @@
 <resources>
 
     <style name="AppThemeLight" parent="@style/Theme.AppCompat.Light.NoActionBar">
+        <item name="headerTextColor">@color/lightAccentColor</item>
+        <item name="switchTextColor">@color/lightAccentColor</item>
         <item name="colorAccent">@color/lightAccentColor</item>
         <item name="android:colorForeground">@color/lightAccentColor</item>
         <item name="colorPrimary">@color/lightPrimaryColor</item>
@@ -11,6 +13,8 @@
     </style>
 
     <style name="AppThemeDark" parent="@style/Theme.AppCompat.NoActionBar">
+        <item name="headerTextColor">@color/darkAccentColor</item>
+        <item name="switchTextColor">@color/darkAccentColor</item>
         <item name="colorAccent">@color/darkAccentColor</item>
         <item name="colorPrimary">@color/darkPrimaryColor</item>
         <item name="colorPrimaryDark">@color/darkPrimaryColor</item>
@@ -42,4 +46,29 @@
         <item name="colorPrimaryDark">@color/colorTeal</item>
         <item name="android:colorBackground">@color/colorTeal</item>
     </style>
+
+    <style name="AppDarculaTheme" parent="AppThemeDark">
+        <item name="headerTextColor">@color/colorDarkBlueGray</item>
+        <item name="colorPrimary">@color/colorGunmetal</item>
+        <item name="colorPrimaryDark">@color/colorOuterSpace</item>
+        <item name="android:colorBackground">@color/colorGunmetal</item>
+        <item name="colorAccent">@color/colorCultured</item>
+        <item name="android:textColor">@color/colorCultured</item>
+        <item name="android:colorForeground">@color/colorCultured</item>
+        <item name="android:navigationBarColor">@color/colorGunmetal</item>
+    </style>
+
+    <style name="AppGruvBoxDarkTheme" parent="AppThemeDark">
+        <item name="headerTextColor">@color/colorAcidGreen</item>
+        <item name="switchTextColor">@color/colorCookiesAndCream</item>
+        <item name="colorPrimary">@color/colorCharlestonGreen</item>
+        <item name="colorPrimaryDark">@color/colorCinereous</item>
+        <item name="android:colorBackground">@color/colorCharlestonGreen</item>
+        <item name="colorAccent">@color/colorCookiesAndCream</item>
+        <item name="android:textColor">@color/colorCookiesAndCream</item>
+        <item name="android:textColorHint">@color/colorCinereous</item>
+        <item name="android:colorForeground">@color/colorCookiesAndCream</item>
+        <item name="android:navigationBarColor">@color/colorCharlestonGreen</item>
+    </style>
+
 </resources>