diff options
author | H. Lehmann <ByteHamster@users.noreply.github.com> | 2019-09-20 23:47:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-20 23:47:31 +0200 |
commit | c5dba814d27ae37bb3b53dd011c5b80b6b654f5b (patch) | |
tree | 7671bf921a4bae52fedcbd81f5f31a02b1bfc140 /app/src/main | |
parent | fa3437960b705b443a1df996e228ec6713879916 (diff) | |
parent | 46c8679fe254ad23f0d055b3227a1fb2610086ef (diff) | |
download | AntennaPod-c5dba814d27ae37bb3b53dd011c5b80b6b654f5b.zip |
Merge pull request #3403 from ByteHamster/follow-system-theme
Add option to follow system theme
Diffstat (limited to 'app/src/main')
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java | 6 | ||||
-rw-r--r-- | app/src/main/res/xml/preferences_user_interface.xml | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java index a33faeb69..195d062f3 100644 --- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java +++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; import de.danoeh.antennapod.BuildConfig; +import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.util.gui.NotificationUtils; @@ -63,6 +64,11 @@ public class PreferenceUpgrader { } } if (oldVersion < 1070400) { + int theme = UserPreferences.getTheme(); + if (theme == R.style.Theme_AntennaPod_Light) { + prefs.edit().putString(UserPreferences.PREF_THEME, "system").apply(); + } + UserPreferences.setQueueLocked(false); } } diff --git a/app/src/main/res/xml/preferences_user_interface.xml b/app/src/main/res/xml/preferences_user_interface.xml index 1d970a5f7..c48e9adc8 100644 --- a/app/src/main/res/xml/preferences_user_interface.xml +++ b/app/src/main/res/xml/preferences_user_interface.xml @@ -10,7 +10,7 @@ android:title="@string/pref_set_theme_title" android:key="prefTheme" android:summary="@string/pref_set_theme_sum" - android:defaultValue="0" + android:defaultValue="system" app:useStockLayout="true"/> <Preference android:key="prefHiddenDrawerItems" |