diff options
author | Andrew Dolgov <[email protected]> | 2019-11-28 14:43:19 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2019-11-28 14:43:19 +0300 |
commit | 3d5f135289192af0d994def1b94ac1c52ac5e1ae (patch) | |
tree | 429d61376e0002a232b777205fdc752bc7bfa436 | |
parent | 64b96bff353e96c48a2c52df98af867962c0d503 (diff) |
support MODE_NIGHT_FOLLOW_SYSTEM
-rwxr-xr-x | org.fox.ttrss/src/main/AndroidManifest.xml | 4 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java | 19 | ||||
-rw-r--r-- | org.fox.ttrss/src/main/res/values/arrays.xml | 5 |
3 files changed, 17 insertions, 11 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index 929534e3..7d1a5ba3 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="508" - android:versionName="1.274"> + android:versionCode="509" + android:versionName="1.275"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java index bd7eee87..e7aa1a4d 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java @@ -31,6 +31,15 @@ import android.view.Display; import android.view.View; import android.widget.CheckBox; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatDelegate; +import androidx.browser.customtabs.CustomTabsCallback; +import androidx.browser.customtabs.CustomTabsClient; +import androidx.browser.customtabs.CustomTabsIntent; +import androidx.browser.customtabs.CustomTabsServiceConnection; +import androidx.browser.customtabs.CustomTabsSession; +import androidx.core.app.JobIntentService; + import com.bumptech.glide.Glide; import com.google.android.material.snackbar.Snackbar; import com.livefront.bridge.Bridge; @@ -46,14 +55,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.app.AppCompatDelegate; -import androidx.browser.customtabs.CustomTabsCallback; -import androidx.browser.customtabs.CustomTabsClient; -import androidx.browser.customtabs.CustomTabsIntent; -import androidx.browser.customtabs.CustomTabsServiceConnection; -import androidx.browser.customtabs.CustomTabsSession; -import androidx.core.app.JobIntentService; import icepick.State; public class CommonActivity extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener { @@ -322,6 +323,8 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); } else if ("THEME_LIGHT".equals(theme)) { AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO); + } else if ("THEME_FOLLOW_DEVICE".equals(theme)) { + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM); } else { AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_AUTO_TIME); } diff --git a/org.fox.ttrss/src/main/res/values/arrays.xml b/org.fox.ttrss/src/main/res/values/arrays.xml index 60053955..894957e3 100644 --- a/org.fox.ttrss/src/main/res/values/arrays.xml +++ b/org.fox.ttrss/src/main/res/values/arrays.xml @@ -1,11 +1,13 @@ <resources> <string-array name="pref_theme_names"> <item>@string/theme_auto</item> + <item>@string/theme_follow_device</item> <item>@string/theme_light</item> <item>@string/theme_dark</item> </string-array> <string-array name="pref_theme_values" translatable="false"> <item>THEME_AUTO</item> + <item>THEME_FOLLOW_DEVICE</item> <item>THEME_LIGHT</item> <item>THEME_DARK</item> </string-array> @@ -52,5 +54,6 @@ <item>30</item> <item>45</item> </string-array> - <string name="theme_auto">Automatic</string> + <string name="theme_auto">Auto (by time)</string> + <string name="theme_follow_device">Same as device</string> </resources>
\ No newline at end of file |