From 8e0ff615970b479655be501ca82b05e105878f79 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Wed, 22 Jun 2022 17:56:34 +0300 Subject: [PATCH] added old icons --- .../lite/ui/fragments/VTSettings.java | 53 ++++++++++--------- .../ru/vtosters/lite/utils/Preferences.java | 2 +- 2 files changed, 28 insertions(+), 27 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 1c30b5d31..aaa5a2698 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 @@ -18,6 +18,7 @@ import static ru.vtosters.lite.utils.Preferences.hasSpecialVerif; import static ru.vtosters.lite.utils.Preferences.isValidSignature; import static ru.vtosters.lite.utils.Preferences.navbar; import static ru.vtosters.lite.utils.Preferences.offline; +import static ru.vtosters.lite.utils.Preferences.oldicons; import static ru.vtosters.lite.utils.Preferences.preferences; import static ru.vtosters.lite.utils.Preferences.shortinfo; import static ru.vtosters.lite.utils.Preferences.vkme; @@ -85,7 +86,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { PreferencesUtil.addPreferenceCategory(this, Globals.getString("vtsettdarktheme")); - PreferencesUtil.addMaterialSwitchPreference(this, "isdark", Globals.getString("vtsettdarktheme"), "", "ic_palette_outline_28", false, (preference, o) -> { + PreferencesUtil.addMaterialSwitchPreference(this, "isdark", Globals.getString("vtsettdarktheme"), "", oldicons() ? "ic_palette_24" : "ic_palette_outline_28", false, (preference, o) -> { boolean value = (boolean) o; edit().putBoolean("isdark", value).commit(); @@ -96,7 +97,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { }); if (Build.VERSION.SDK_INT >= 28) { - PreferencesUtil.addMaterialSwitchPreference(this, "systemtheme", Globals.getString("appearance_theme_use_system"), Globals.getString("appearance_theme_use_system_summary"), "ic_recent_24", true, (preference, o) -> { + PreferencesUtil.addMaterialSwitchPreference(this, "systemtheme", Globals.getString("appearance_theme_use_system"), Globals.getString("appearance_theme_use_system_summary"), oldicons() ? "ic_recent_outline_24" : "ic_recent_24", true, (preference, o) -> { boolean value = (boolean) o; edit().putBoolean("systemtheme", value).commit(); @@ -117,7 +118,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { if(devmenu()){ PreferencesUtil.addPreferenceCategory(this, Globals.getString("sett_debug")); - PreferencesUtil.addPreference(this, "", Globals.getString("sett_debug"), "", "ic_bug_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("sett_debug"), "", oldicons() ? "ic_bug_24" : "ic_bug_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(SettingsDebugFragment.class).b(context); context.startActivity(a2); @@ -133,7 +134,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { PreferencesUtil.addPreferenceCategory(this, Globals.getString("vtsettaccount")); - PreferencesUtil.addPreference(this, "", Globals.getString("vkconnect"), "", "ic_user_circle_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("vkconnect"), "", oldicons() ? "ic_tags_24" : "ic_user_circle_outline_28", preference -> { Context context = getContext(); VKUIwrapper.setLink("https://id.vk.com/account"); Intent a2 = new Navigator(VKUIwrapper.class).b(context); @@ -141,28 +142,28 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("privacy_settings"), "", "ic_privacy_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("privacy_settings"), "", oldicons() ? "ic_privacy_24" : "ic_privacy_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(PrivacyFragment.class).b(context); context.startActivity(a2); return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("sett_account"), "", "ic_user_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("sett_account"), "", oldicons() ? "ic_user_24" : "ic_user_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(SettingsAccountFragment.class).b(context); context.startActivity(a2); return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("bugs"), "", "ic_bug_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("bugs"), "", oldicons() ? "ic_bug_24" : "ic_bug_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(BugtrackerFragment.class).b(context); context.startActivity(a2); return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("vtssfs"), ssfs, "ic_link_circle_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("vtssfs"), ssfs, oldicons() ? "ic_link_24" : "ic_link_circle_outline_28", preference -> { Context context = getContext(); VKUIwrapper.setLink(SSFS.getSSFSLink()); Intent a2 = new Navigator(VKUIwrapper.class).b(context); @@ -172,21 +173,21 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { PreferencesUtil.addPreferenceCategory(this, Globals.getString("notification_settings")); - PreferencesUtil.addPreference(this, "", Globals.getString("sett_general"), "", "ic_settings_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("sett_general"), "", oldicons() ? "ic_settings_24" : "ic_settings_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(SettingsGeneralFragment.class).b(context); context.startActivity(a2); return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("blacklist"), "", "ic_users_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("blacklist"), "", oldicons() ? "ic_users_24" : "ic_users_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(BlacklistFragment.class).b(context); context.startActivity(a2); return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("sett_notifications"), "", "ic_menu_notification_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("sett_notifications"), "", oldicons() ? "ic_notification_24" : "ic_menu_notification_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(NotificationsSettingsFragment.class).b(context); context.startActivity(a2); @@ -194,7 +195,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { }); if (VKAccountManager.d().isMusicSubs()) { - PreferencesUtil.addPreference(this, "", Globals.getString("subscription_music"), "", "ic_music_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("subscription_music"), "", oldicons() ? "ic_music_24" : "ic_music_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(MusicSubscriptionControlFragment.class).b(context); context.startActivity(a2); @@ -203,7 +204,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { } if (VKAccountManager.d().N0()) { - PreferencesUtil.addPreference(this, "", Globals.getString("identity_title"), "", "ic_services_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("identity_title"), "", oldicons() ? "ic_services_24" : "ic_services_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(IdentityListFragment.class).b(context); context.startActivity(a2); @@ -214,14 +215,14 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { PreferencesUtil.addPreferenceCategory(this, Globals.getString("vtsettmod")); if (!vkme()) { - PreferencesUtil.addPreference(this, "", Globals.getString("vtlfeed"), feedsumm, "ic_newsfeed_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("vtlfeed"), feedsumm, oldicons() ? "ic_newsfeed_24" : "ic_newsfeed_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(FeedFragment.class).b(context); context.startActivity(a2); return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("dockbar_editor"), docksumm, "ic_list_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("dockbar_editor"), docksumm, oldicons() ? "ic_list_24" : "ic_list_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(DockBarFragment.class).b(context); context.startActivity(a2); @@ -229,7 +230,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { }); if (isValidSignature()) - PreferencesUtil.addPreference(this, "", Globals.getString("vtlmusic"), musicsumm, "ic_music_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("vtlmusic"), musicsumm, oldicons() ? "ic_music_24" : "ic_music_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(MusicFragment.class).b(context); context.startActivity(a2); @@ -237,21 +238,21 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { }); } - PreferencesUtil.addPreference(this, "", Globals.getString("vtlmessages"), msgsumm, "ic_message_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("vtlmessages"), msgsumm, oldicons() ? "ic_message_24" : "ic_message_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(MessagesFragment.class).b(context); context.startActivity(a2); return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("vtlactivity"), activitysumm, "ic_write_outline_28_new_accent", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("vtlactivity"), activitysumm, oldicons() ? "ic_write_24" : "ic_write_outline_28_new_accent", preference -> { Context context = getContext(); Intent a2 = new Navigator(ActivityFragment.class).b(context); context.startActivity(a2); return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("vtlthemes"), themessumm, "ic_palette_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("vtlthemes"), themessumm, oldicons() ? "ic_palette_24" : "ic_palette_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(ThemesFragment.class).b(context); context.startActivity(a2); @@ -274,21 +275,21 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("vtlproxy"), proxysumm, "ic_globe_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("vtlproxy"), proxysumm, oldicons() ? "ic_globe_20" : "ic_globe_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(ProxySettingsFragment.class).b(context); context.startActivity(a2); return false; }); - PreferencesUtil.addListPreferenceIcon(this, "clearcache", "Default", Globals.getString("autoclearcache"), "ic_delete_outline_28", Globals.getString("autoclearcachesumm") + " " + humanReadableByteCountBin(CacheUtils.getInstance().size), new CharSequence[]{ + PreferencesUtil.addListPreferenceIcon(this, "clearcache", "Default", Globals.getString("autoclearcache"), oldicons() ? "ic_delete_24" : "ic_delete_outline_28", Globals.getString("autoclearcachesumm") + " " + humanReadableByteCountBin(CacheUtils.getInstance().size), new CharSequence[]{ Globals.getString("autoclearcachedisabled"), "100 MB", "500 MB", "1 GB", "2 GB", "5 GB" }, new String[]{ "Default", "100mb", "500mb", "1gb", "2gb", "5gb" }); - PreferencesUtil.addPreference(this, "", Globals.getString("vtlother"), othersumm, "ic_more_horizontal_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("vtlother"), othersumm, oldicons() ? "ic_more_24" : "ic_more_horizontal_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(OtherFragment.class).b(context); context.startActivity(a2); @@ -297,24 +298,24 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { PreferencesUtil.addPreferenceCategory(this, Globals.getString("vtsettaboutmod")); - PreferencesUtil.addPreference(this, "", Globals.getString("menu_about"), about, "ic_about_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("menu_about"), about, oldicons() ? "ic_about_24" : "ic_about_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(AboutAppFragment.class).b(context); context.startActivity(a2); return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("opencommit"), "", "ic_link_circle_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("opencommit"), "", oldicons() ? "ic_link_24" : "ic_link_circle_outline_28", preference -> { getContext().startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse(getCommitLink()))); return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("vtfaq"), Globals.getString("vtfaqsumm"), "ic_help_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("vtfaq"), Globals.getString("vtfaqsumm"), oldicons() ? "ic_help_24" : "ic_help_outline_28", preference -> { getContext().startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://t.me/s/vtosters_faq"))); return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("reportbug"), Globals.getString("reportbugsumm"), "ic_bug_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("reportbug"), Globals.getString("reportbugsumm"), oldicons() ? "ic_bug_24" : "ic_bug_outline_28", preference -> { getContext().startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://github.com/vtosters/lite/issues"))); return false; }); 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 9a219de40..3e8b956ce 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java @@ -126,7 +126,7 @@ public class Preferences { } public static boolean oldicons() { - return getBoolValue("oldicons", false); + return !milkshake(); } public static boolean vkme() {