From 4ca5f7d2c5f9ca9ab58681065d63f847a37522eb Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Mon, 3 Oct 2022 11:45:41 +0300 Subject: [PATCH] fixed def system theme val --- .../java/ru/vtosters/lite/ui/fragments/VTSettings.java | 9 +++------ .../main/java/ru/vtosters/lite/utils/Preferences.java | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java index 8348550f8..739db1880 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java @@ -115,13 +115,12 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { } public static String getThemesumm() { - var type = getPrefsValue("currsystemtheme"); - if (disableSettingsSumms()) return null; - String str = null; + String str; - switch (type) { + switch (getPrefsValue("currsystemtheme")) { + default: case "system": str = "Системная"; break; @@ -133,8 +132,6 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { break; } - if (str == null) return null; - return "Текущая тема" + ": " + str; } diff --git a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java index 2d7f7bdeb..8354a916b 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java @@ -62,7 +62,7 @@ public class Preferences { } public static boolean systemtheme() { - return Build.VERSION.SDK_INT >= 28 && getPreferences().getString("currsystemtheme", "system").equals("system"); + return Build.VERSION.SDK_INT >= 28 && (getPreferences().getString("currsystemtheme", "system").equals("system") || getPreferences().getString("currsystemtheme", "system").isEmpty()); } public static boolean authorsrecomm() {