Selaa lähdekoodia

Support following device theme (#109)

Co-authored-by: bakio86 <bakio86@mi.fu-berlin.de>
Co-authored-by: Joshua Kuestersteffen <jkuester@kuester7.com>
Hayri Bakici 3 vuotta sitten
vanhempi
sitoutus
e653507c15

+ 2 - 1
app/src/main/java/com/sduduzog/slimlauncher/MainActivity.kt

@@ -133,11 +133,12 @@ class MainActivity : AppCompatActivity(),
 
         fun resolveTheme(i: Int): Int {
             return when (i) {
-                1 -> R.style.AppDarkTheme
+                1 -> R.style.AppThemeDark
                 2 -> R.style.AppGreyTheme
                 3 -> R.style.AppTealTheme
                 4 -> R.style.AppCandyTheme
                 5 -> R.style.AppPinkTheme
+                6 -> R.style.AppThemeLight
                 else -> R.style.AppTheme
             }
         }

+ 1 - 3
app/src/main/java/com/sduduzog/slimlauncher/ui/dialogs/ChangeThemeDialog.kt

@@ -29,8 +29,6 @@ class ChangeThemeDialog : DialogFragment(){
     }
 
     companion object {
-        fun getThemeChooser(): ChangeThemeDialog{
-            return ChangeThemeDialog()
-        }
+        fun getThemeChooser(): ChangeThemeDialog = ChangeThemeDialog()
     }
 }

+ 10 - 0
app/src/main/res/values-de/strings.xml

@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string-array name="themes_array">
+        <item>Systemvorgabe</item>
+        <item>Mitternacht</item>
+        <item>Jupiter</item>
+        <item>Blaugrün</item>
+        <item>Candy</item>
+        <item>Pastell</item>
+        <item>Mittag</item>
+    </string-array>
+
     <string name="choose_theme_dialog_title">Aussehen ändern</string>
     <string name="choose_time_format_dialog_title">Zeitformat ändern</string>
     <string name="customise_apps_fragment_add">Hinzufügen</string>

+ 3 - 2
app/src/main/res/values-fr/strings.xml

@@ -1,11 +1,12 @@
 <resources>
     <string-array name="themes_array">
-        <item>Par défaut</item>
-        <item>Midnight</item>
+        <item>Système défaut</item>
+        <item>Minuit</item>
         <item>Jupiter</item>
         <item>Teal</item>
         <item>Candy</item>
         <item>Pastel</item>
+        <item>Midi</item>
     </string-array>
 
     <string-array name="time_format_array">

+ 2 - 1
app/src/main/res/values-nb/strings.xml

@@ -5,12 +5,13 @@
     <string name="main_placeholder_date" translatable="false">Sat, Apr 20</string>
 
     <string-array name="themes_array">
-        <item>Forvalg</item>
+        <item>System forvalg</item>
         <item>Midnatt</item>
         <item>Jupiter</item>
         <item>Turkis</item>
         <item>Godteri</item>
         <item>Pastell</item>
+        <item>Middag</item>
     </string-array>
 
     <string-array name="time_format_array">

+ 8 - 0
app/src/main/res/values-night/colors.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="primaryColor">@color/darkPrimaryColor</color>
+
+    <color name="accentColor">@color/darkAccentColor</color>
+
+</resources>

+ 14 - 0
app/src/main/res/values-night/styles.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
+        <item name="colorAccent">@color/accentColor</item>
+        <item name="colorPrimary">@color/primaryColor</item>
+        <item name="colorPrimaryDark">@color/primaryColor</item>
+        <item name="android:colorBackground">@color/primaryColor</item>
+        <item name="android:colorForeground">@color/accentColor</item>
+        <item name="android:fontFamily">@font/ubuntu</item>
+    </style>
+
+
+</resources>

+ 2 - 1
app/src/main/res/values-nl/strings.xml

@@ -5,12 +5,13 @@
     <string name="main_placeholder_date" translatable="false">Sat, Apr 20</string>
 
     <string-array name="themes_array">
-        <item>Standaard</item>
+        <item>System standaard</item>
         <item>Middernacht</item>
         <item>Jupiter</item>
         <item>Blauwgroen</item>
         <item>Snoep</item>
         <item>Pastel</item>
+        <item>Middag</item>
     </string-array>
 
     <string-array name="time_format_array">

+ 11 - 0
app/src/main/res/values-notnight/styles.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
+        <item name="colorAccent">@color/accentColor</item>
+        <item name="android:colorForeground">@color/accentColor</item>
+        <item name="colorPrimary">@color/primaryColor</item>
+        <item name="colorPrimaryDark">@color/primaryColorDark</item>
+        <item name="android:colorBackground">@color/primaryColor</item>
+    </style>
+</resources>

+ 1 - 0
app/src/main/res/values-zh-rCN/strings.xml

@@ -14,6 +14,7 @@
         <item>水鸭色</item>
         <item>糖果色</item>
         <item>粉彩色</item>
+        <item>正午</item>
     </string-array>
 
     <string-array name="time_format_array">

+ 1 - 0
app/src/main/res/values-zh-rTW/strings.xml

@@ -11,6 +11,7 @@
         <item>藍綠色主題</item>
         <item>糖果颜色主題</item>
         <item>粉色主題</item>
+        <item>主题中午</item>
     </string-array>
 
     <string-array name="time_format_array">

+ 19 - 6
app/src/main/res/values/colors.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <color name="colorWhite">#ffffff</color>
-    <color name="colorWhiteDark">#BDBDBD</color>
+    <!-- Colors for themes -->
+    <color name="colorGray">#BDBDBD</color>
 
-    <color name="primaryDarkColor">#000000</color>
+    <color name="colorVampireBlack">#080808</color>
 
     <color name="colorBlueGrey">#37474f</color>
 
@@ -12,9 +12,22 @@
 
     <color name="colorTeal">#E0F2F1</color>
 
-    <color name="lightAccentColor">#080808</color>
-    <color name="darkAccentColor">#e0e0e0</color>
-
     <color name="colorCandy">#f06292</color>
 
+    <color name="colorChineseWhite">#E0E0E0</color>
+
+    <!-- Default Primary Color   -->
+    <color name="primaryColor">@color/lightPrimaryColor</color>
+    <color name="primaryColorDark">@color/colorGray</color>
+
+    <!-- Default Accent Color   -->
+    <color name="accentColor">@color/lightAccentColor</color>
+
+    <color name="lightAccentColor">@color/colorVampireBlack</color>
+    <color name="darkAccentColor">@color/colorChineseWhite</color>
+
+    <color name="darkPrimaryColor">@android:color/black</color>
+    <color name="lightPrimaryColor">@android:color/white</color>
+
+
 </resources>

+ 2 - 1
app/src/main/res/values/strings.xml

@@ -8,12 +8,13 @@
     <string name="main_placeholder_date" translatable="false">Sat, Apr 20</string>
 
     <string-array name="themes_array">
-        <item>Default</item>
+        <item>System default</item>
         <item>Midnight</item>
         <item>Jupiter</item>
         <item>Teal</item>
         <item>Candy</item>
         <item>Pastel</item>
+        <item>Noon</item>
     </string-array>
 
     <string-array name="time_format_array">

+ 12 - 13
app/src/main/res/values/styles.xml

@@ -1,44 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
+    <style name="AppThemeLight" parent="@style/Theme.AppCompat.Light.NoActionBar">
         <item name="colorAccent">@color/lightAccentColor</item>
         <item name="android:colorForeground">@color/lightAccentColor</item>
-        <item name="colorPrimary">@color/colorWhite</item>
-        <item name="colorPrimaryDark">@color/colorWhiteDark</item>
-        <item name="android:colorBackground">@color/colorWhite</item>
+        <item name="colorPrimary">@color/lightPrimaryColor</item>
+        <item name="colorPrimaryDark">@color/primaryColorDark</item>
+        <item name="android:colorBackground">@color/lightPrimaryColor</item>
         <item name="android:fontFamily">@font/ubuntu</item>
     </style>
 
-    <style name="AppDarkTheme" parent="@style/Theme.AppCompat.NoActionBar">
+    <style name="AppThemeDark" parent="@style/Theme.AppCompat.NoActionBar">
         <item name="colorAccent">@color/darkAccentColor</item>
-        <item name="colorPrimary">@color/primaryDarkColor</item>
-        <item name="colorPrimaryDark">@color/primaryDarkColor</item>
-        <item name="android:colorBackground">@color/primaryDarkColor</item>
+        <item name="colorPrimary">@color/darkPrimaryColor</item>
+        <item name="colorPrimaryDark">@color/darkPrimaryColor</item>
+        <item name="android:colorBackground">@color/darkPrimaryColor</item>
         <item name="android:colorForeground">@color/darkAccentColor</item>
         <item name="android:fontFamily">@font/ubuntu</item>
     </style>
 
-    <style name="AppGreyTheme" parent="@style/AppDarkTheme">
+    <style name="AppGreyTheme" parent="AppThemeDark">
         <item name="colorPrimary">@color/colorBlueGrey</item>
         <item name="colorPrimaryDark">@color/colorBlueGrey</item>
         <item name="android:colorBackground">@color/colorBlueGrey</item>
-        <item name="colorAccent">@color/darkAccentColor</item>
     </style>
 
-    <style name="AppCandyTheme" parent="AppDarkTheme">
+    <style name="AppCandyTheme" parent="AppThemeDark">
         <item name="colorPrimary">@color/colorCandy</item>
         <item name="colorPrimaryDark">@color/colorCandy</item>
         <item name="android:colorBackground">@color/colorCandy</item>
     </style>
 
-    <style name="AppPinkTheme" parent="AppTheme">
+    <style name="AppPinkTheme" parent="AppThemeLight">
         <item name="colorPrimary">@color/colorPink</item>
         <item name="colorPrimaryDark">@color/colorPink</item>
         <item name="android:colorBackground">@color/colorPink</item>
     </style>
 
-    <style name="AppTealTheme" parent="AppTheme">
+    <style name="AppTealTheme" parent="AppThemeLight">
         <item name="colorPrimary">@color/colorTeal</item>
         <item name="colorPrimaryDark">@color/colorTeal</item>
         <item name="android:colorBackground">@color/colorTeal</item>