From 3be07cb21185e16443573446080ae01399e116e2 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Tue, 27 Sep 2022 18:27:24 +0300 Subject: [PATCH] some themes ref --- .../lite/ui/dialogs/ThemeChanging.java | 1 + .../lite/ui/fragments/VTSettings.java | 29 +++++++++++++++++-- smali/res/values-ru/strings.xml | 2 +- smali/res/values/strings.xml | 2 +- 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/ui/dialogs/ThemeChanging.java b/app/src/main/java/ru/vtosters/lite/ui/dialogs/ThemeChanging.java index 8087d363e..5a857d6a8 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/dialogs/ThemeChanging.java +++ b/app/src/main/java/ru/vtosters/lite/ui/dialogs/ThemeChanging.java @@ -28,6 +28,7 @@ public class ThemeChanging { .show(); } else { VKThemeHelper.b(activity, f); + edit().putString("currsystemtheme", isDarkTheme() ? "dark" : "light").commit(); VKUIHook.clearWebCache(); } } 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 25814d8c7..8348550f8 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 @@ -1,5 +1,6 @@ package ru.vtosters.lite.ui.fragments; +import static com.vtosters.lite.NotificationUtils.Type.Default; import static ru.vtosters.lite.ui.PreferencesUtil.addListPreferenceIcon; import static ru.vtosters.lite.ui.PreferencesUtil.addMaterialSwitchPreference; import static ru.vtosters.lite.ui.PreferencesUtil.addPreference; @@ -113,6 +114,30 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { return AndroidUtils.getString("vtlproxysumm") + ": " + type; } + public static String getThemesumm() { + var type = getPrefsValue("currsystemtheme"); + + if (disableSettingsSumms()) return null; + + String str = null; + + switch (type) { + case "system": + str = "Системная"; + break; + case "dark": + str = "Темная"; + break; + case "light": + str = "Светлая"; + break; + } + + if (str == null) return null; + + return "Текущая тема" + ": " + str; + } + public static SharedPreferences getCurrentAccount() { return AndroidUtils.getGlobalContext().getSharedPreferences("pref_account_manager", Context.MODE_PRIVATE); } @@ -179,7 +204,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { return false; }); - addPreferenceCategory(this, AndroidUtils.getString("vtsettdarktheme")); + addPreferenceCategory(this, AndroidUtils.getString("appearance_theme_use_system")); if (Build.VERSION.SDK_INT >= 28) { addListPreferenceIcon( @@ -187,7 +212,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { "currsystemtheme", "system", AndroidUtils.getString("appearance_theme_use_system"), - "ic_palette_outline_28", "", + "ic_palette_outline_28", getThemesumm(), new String[] { "Системная тема", "Тёмная тема", "Светлая тема" }, new String[] { "system", "dark", "light" }, (preference, o) -> { diff --git a/smali/res/values-ru/strings.xml b/smali/res/values-ru/strings.xml index 200e29cdb..f68034867 100644 --- a/smali/res/values-ru/strings.xml +++ b/smali/res/values-ru/strings.xml @@ -5730,7 +5730,7 @@ Выберите тему Тёмная тема приложения Светлая тема приложения - Использовать системную тему + Тема приложения Применение системной темы при запуске приложения Если системно имеется diff --git a/smali/res/values/strings.xml b/smali/res/values/strings.xml index f8d983932..fa7811d0d 100644 --- a/smali/res/values/strings.xml +++ b/smali/res/values/strings.xml @@ -5863,7 +5863,7 @@ May look like a fake leaving the online" Choose a theme Dark app theme Light app theme - Use system theme + App theme Apply system theme on app start If systemically available