Das Theme folgt jetzt standardmäßig dem System

amarradi · Aug 24, 2023 · 52ad5e2 · 52ad5e2
1 parent a02773b
commit 52ad5e2
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 65 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,14 +3,13 @@ plugins {
 }
 
 android {
-
-
+    compileSdk 33
     defaultConfig {
         applicationId "com.git.amarradi.palatschinkencounter"
         minSdkVersion 28
         targetSdkVersion 33
-        versionCode 20
-        versionName "1.0.16"
+        versionCode 22
+        versionName "1.0.18"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/androidTest/java/com/git/amarradi/palatschinkencounter/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/git/amarradi/palatschinkencounter/ExampleInstrumentedTest.java
diff --git a/app/src/main/java/com/git/amarradi/palatschinkencounter/MainActivity.java b/app/src/main/java/com/git/amarradi/palatschinkencounter/MainActivity.java
@@ -43,7 +43,8 @@ public class MainActivity extends AppCompatActivity implements SharedPreferences
 
     public static final String SHARED_PREFS = "sharedPrefs";
     public static final String COUNTER = "text";
-    public static final String NIGHT_MODE = "night_mode";
+    public static final String DESIGN_MODE = "system";
+
     public static final String SCREENSHOT_PNG = "screenshot.png";
     private static final int SCREEN_ORIENTATION_UNSPECIFIED = SCREEN_ORIENTATION_PORTRAIT;
     private CoordinatorLayout coordinatorLayout;
@@ -100,7 +101,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
 
         SharedPreferences sharedPreferences = getSharedPreferences(SHARED_PREFS, MODE_PRIVATE);
-        String themes = sharedPreferences.getString(NIGHT_MODE, "");
+        String themes = sharedPreferences.getString(DESIGN_MODE, "");
         changeTheme(themes);
         load_data();
         updateViews();
@@ -193,7 +194,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
     }
 
     private void loadThemeFromPreference(SharedPreferences sharedPreferences) {
-        changeTheme(sharedPreferences.getString(getString(R.string.theme_key), getString(R.string.lightmode_preference_option_value)));
+        changeTheme(sharedPreferences.getString(getString(R.string.theme_key), getString(R.string.system_preference_option_value)));
     }
 
     private void changeTheme(String theme_value) {
@@ -202,23 +203,23 @@ private void changeTheme(String theme_value) {
                 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
                 SharedPreferences sharedPreferences = getSharedPreferences(SHARED_PREFS, MODE_PRIVATE);
                 SharedPreferences.Editor editor = sharedPreferences.edit();
-                editor.putString(NIGHT_MODE, theme_value);
+                editor.putString(DESIGN_MODE, theme_value);
                 editor.apply();
                 break;
             }
             case "darkmode": {
                 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
                 SharedPreferences sharedPreferences = getSharedPreferences(SHARED_PREFS, MODE_PRIVATE);
                 SharedPreferences.Editor editor = sharedPreferences.edit();
-                editor.putString(NIGHT_MODE, theme_value);
+                editor.putString(DESIGN_MODE, theme_value);
                 editor.apply();
                 break;
             }
-            case "system default": {
+            case "system": {
                 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
                 SharedPreferences sharedPreferences = getSharedPreferences(SHARED_PREFS, MODE_PRIVATE);
                 SharedPreferences.Editor editor = sharedPreferences.edit();
-                editor.putString(NIGHT_MODE, theme_value);
+                editor.putString(DESIGN_MODE, theme_value);
                 editor.apply();
                 break;
             }

diff --git a/app/src/main/res/raw/changelog.txt b/app/src/main/res/raw/changelog.txt
@@ -1,5 +1,3 @@
-## [1.0.16] - 2023-08-18
-kleine Fehler sind behoben worden
-Gradle update
-## Lizenzen
-ckChangeLog - http://www.apache.org/licenses/LICENSE-2.0
+## [1.0.18] - 2023-08-24
+
+Das Theme folgt jetzt standardmäßig dem System
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
@@ -91,9 +91,9 @@
 
 
     <string name="theme_preference">Farbschema</string>
-    <string name="lightmode_preference_key">Hell (standard)</string>
+    <string name="lightmode_preference_key">Hell</string>
     <string name="darkmode_preference_key">Dunkel</string>
-    <string name="system_preference_key">Systemstandard</string>
+    <string name="system_preference_key">Systemstandard (standard)</string>
     <string name="item_share">Teilen</string>
     <string name="share_with">Teilen mit</string>
     <string name="ready_to_share">Bereit zum Teilen</string>

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -2,14 +2,16 @@
 <resources>
     <!-- Label ordering must match values -->
     <array name="design_mode_preference_key">
+        <item>@string/system_preference_key</item>
         <item>@string/lightmode_preference_key</item>
         <item>@string/darkmode_preference_key</item>
-        <item>@string/system_preference_key</item>
+
     </array>
     <array name="design_mode_preference_value">
+        <item>@string/system_preference</item>
         <item>@string/lightmode_preference</item>
         <item>@string/darkmode_preference</item>
-        <item>@string/system_preference</item>
+
     </array>
     <!-- Ingredients -->
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -26,6 +26,8 @@
     <string name="lightmode_preference_option_value" translatable="false">lightmode</string>
     <!-- Value in SharedPreferences for darkmode option -->
     <string name="darkmode_preference_option_value" translatable="false">darkmode</string>
+    <!-- Value in SharedPreferences for system_preference option -->
+    <string name="system_preference_option_value" translatable="false">system</string>
 
 
     <string name="cancel" tools:ignore="ButtonCase">NO</string>
@@ -108,10 +110,10 @@
     <string name="theme_preference">Theme</string>
     <string name="darkmode_preference" translatable="false">darkmode</string>
     <string name="lightmode_preference" translatable="false">lightmode</string>
-    <string name="system_preference" translatable="false">system default</string>
+    <string name="system_preference" translatable="false">system</string>
     <string name="lightmode_preference_key">lightmode</string>
     <string name="darkmode_preference_key">darkmode</string>
-    <string name="system_preference_key">system standard</string>
+    <string name="system_preference_key">follow system (standard)</string>
     <string name="change">Changelog of the current version and licence</string>
     <string name="item_share">share</string>
     <string name="share_with">share via</string>

diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="1.0.18" versioncode="22" >
+        <change>Das Theme folgt jetzt standardmäßig dem System</change>
+    </release>
+    <release version="1.0.17" versioncode="21" >
+        <change>kleine Fehler sind behoben worden</change>
+    </release>
     <release version="1.0.16" versioncode="20" >
         <change>kleine Fehler sind behoben worden</change>
         <change>Gradle update</change>

diff --git a/app/src/test/java/com/git/amarradi/palatschinkencounter/ExampleUnitTest.java b/app/src/test/java/com/git/amarradi/palatschinkencounter/ExampleUnitTest.java