From 470ac9dd4d3f04ce61da1da65104893083ba9afb Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Fri, 8 Jul 2022 10:49:12 +0300 Subject: [PATCH] VTSettings fixes fixed design fixed proxy type null --- .../lite/ui/fragments/VTSettings.java | 68 +++++++++---------- .../ru/vtosters/lite/utils/Preferences.java | 4 ++ 2 files changed, 38 insertions(+), 34 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 588ca875f..09443e01d 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 @@ -8,7 +8,6 @@ import static ru.vtosters.lite.ui.vkui.VBottomSheetBuilder.VBSContent; import static ru.vtosters.lite.utils.About.getBuildNumber; import static ru.vtosters.lite.utils.About.getCommitLink; import static ru.vtosters.lite.utils.CacheUtils.humanReadableByteCountBin; -import static ru.vtosters.lite.utils.Globals.*; import static ru.vtosters.lite.utils.Globals.edit; import static ru.vtosters.lite.utils.Globals.getDrawableFromUrl; import static ru.vtosters.lite.utils.Globals.getIdentifier; @@ -17,6 +16,7 @@ import static ru.vtosters.lite.utils.Globals.getUserPhoto; import static ru.vtosters.lite.utils.Globals.getUsername; import static ru.vtosters.lite.utils.Globals.isGmsInstalled; import static ru.vtosters.lite.utils.Globals.restartApplication; +import static ru.vtosters.lite.utils.Preferences.DoNotUseOldIcons; import static ru.vtosters.lite.utils.Preferences.ads; import static ru.vtosters.lite.utils.Preferences.devmenu; import static ru.vtosters.lite.utils.Preferences.disableSettingsSumms; @@ -107,7 +107,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ if(disableSettingsSumms()) return null; - if(type.equals("noproxy")) type = Globals.getString("vtlsettdisabled"); + if(type.equals("noproxy") || type.isEmpty()) type = Globals.getString("vtlsettdisabled"); return Globals.getString("vtlproxysumm") + ": " + type; } @@ -157,7 +157,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ PreferencesUtil.addPreferenceCategory(this, Globals.getString("vtsettdarktheme")); - PreferencesUtil.addMaterialSwitchPreference(this, "isdark", Globals.getString("vtsettdarktheme"), "", !milkshake() ? "ic_palette_24" : "ic_palette_outline_28", false, (preference, o) -> { + PreferencesUtil.addMaterialSwitchPreference(this, "isdark", Globals.getString("vtsettdarktheme"), "", !DoNotUseOldIcons() ? "ic_palette_24" : "ic_palette_outline_28", false, (preference, o) -> { boolean value = (boolean) o; if(!value){ // inverted @@ -171,7 +171,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ }); if(Build.VERSION.SDK_INT >= 28 && false){ // TODO refactoring system theme - PreferencesUtil.addMaterialSwitchPreference(this, "systemtheme", Globals.getString("appearance_theme_use_system"), Globals.getString("appearance_theme_use_system_summary"), !milkshake() ? "ic_recent_24" : "ic_recent_outline_28", true, (preference, o) -> { + PreferencesUtil.addMaterialSwitchPreference(this, "systemtheme", Globals.getString("appearance_theme_use_system"), Globals.getString("appearance_theme_use_system_summary"), !DoNotUseOldIcons() ? "ic_recent_24" : "ic_recent_outline_28", true, (preference, o) -> { boolean value = (boolean) o; edit().putBoolean("systemtheme", value).commit(); @@ -180,7 +180,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ } if(!isGmsInstalled()){ - PreferencesUtil.addPreference(this, "", Globals.getString("installgms"), "", "ic_alert", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("installgms"), "", "ic_warning_24", preference -> { Context context = getContext(); Intent a2 = new Navigator(InstallGMSFragment.class).b(context); a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -192,7 +192,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ if(devmenu()){ PreferencesUtil.addPreferenceCategory(this, Globals.getString("sett_debug")); - PreferencesUtil.addPreference(this, "", Globals.getString("sett_debug"), "", !milkshake() ? "ic_bug_24" : "ic_bug_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("sett_debug"), "", !DoNotUseOldIcons() ? "ic_bug_24" : "ic_bug_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(SettingsDebugFragment.class).b(context); a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -200,7 +200,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ return false; }); - PreferencesUtil.addMaterialSwitchPreference(this, "ssl", Globals.getString("debug_developer_force_ssl"), Globals.getString("debug_developer_force_ssl_summary"), !milkshake() ? "ic_globe_20" : "ic_globe_outline_28", true, (preference, o) -> { + PreferencesUtil.addMaterialSwitchPreference(this, "ssl", Globals.getString("debug_developer_force_ssl"), Globals.getString("debug_developer_force_ssl_summary"), !DoNotUseOldIcons() ? "ic_globe_20" : "ic_globe_outline_28", true, (preference, o) -> { boolean value = (boolean) o; edit().putBoolean("ssl", value).commit(); return true; @@ -209,7 +209,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ PreferencesUtil.addPreferenceCategory(this, Globals.getString("vtsettaccount")); - PreferencesUtil.addPreference(this, "", Globals.getString("vkconnect"), "", !milkshake() ? "ic_tags_24" : "ic_user_circle_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("vkconnect"), "", !DoNotUseOldIcons() ? "ic_tags_24" : "ic_user_circle_outline_28", preference -> { Context context = getContext(); VKUIwrapper.officalLinks("account"); Intent a2 = new Navigator(VKUIwrapper.class).b(context); @@ -218,7 +218,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("privacy_settings"), "", !milkshake() ? "ic_privacy_24" : "ic_privacy_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("privacy_settings"), "", !DoNotUseOldIcons() ? "ic_privacy_24" : "ic_privacy_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(PrivacyFragment.class).b(context); a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -226,7 +226,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("sett_account"), "", !milkshake() ? "ic_user_24" : "ic_user_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("sett_account"), "", !DoNotUseOldIcons() ? "ic_user_24" : "ic_user_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(SettingsAccountFragment.class).b(context); a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -234,7 +234,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("bugs"), "", !milkshake() ? "ic_bug_24" : "ic_bug_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("bugs"), "", !DoNotUseOldIcons() ? "ic_bug_24" : "ic_bug_outline_28", preference -> { Context context = getContext(); VKUIwrapper.officalLinks("bugs"); Intent a2 = new Navigator(VKUIwrapper.class).b(context); @@ -243,7 +243,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("vtssfs"), ssfs, !milkshake() ? "ic_link_24" : "ic_link_circle_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("vtssfs"), ssfs, !DoNotUseOldIcons() ? "ic_link_24" : "ic_link_circle_outline_28", preference -> { Context context = getContext(); VKUIwrapper.setLink(SSFS.getSSFSLink()); Intent a2 = new Navigator(VKUIwrapper.class).b(context); @@ -254,7 +254,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ PreferencesUtil.addPreferenceCategory(this, Globals.getString("notification_settings")); - PreferencesUtil.addPreference(this, "", Globals.getString("sett_general"), "", !milkshake() ? "ic_settings_24" : "ic_settings_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("sett_general"), "", !DoNotUseOldIcons() ? "ic_settings_24" : "ic_settings_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(SettingsGeneralFragment.class).b(context); a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -262,7 +262,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("blacklist"), "", !milkshake() ? "ic_users_24" : "ic_users_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("blacklist"), "", !DoNotUseOldIcons() ? "ic_users_24" : "ic_users_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(BlacklistFragment.class).b(context); a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -270,7 +270,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("sett_notifications"), "", !milkshake() ? "ic_notification_24" : "ic_menu_notification_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("sett_notifications"), "", !DoNotUseOldIcons() ? "ic_notification_24" : "ic_menu_notification_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(NotificationsSettingsFragment.class).b(context); a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -279,7 +279,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ }); if(VKAccountManager.d().isMusicSubs()){ - PreferencesUtil.addPreference(this, "", Globals.getString("subscription_music"), "", !milkshake() ? "ic_music_24" : "ic_music_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("subscription_music"), "", !DoNotUseOldIcons() ? "ic_music_24" : "ic_music_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(MusicSubscriptionControlFragment.class).b(context); a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -288,7 +288,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ }); } - PreferencesUtil.addPreference(this, "", Globals.getString("votes"), "", !milkshake() ? "ic_coins_24" : "ic_coins_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("votes"), "", !DoNotUseOldIcons() ? "ic_coins_24" : "ic_coins_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(BalanceFragment.class).b(context); a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -299,7 +299,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ PreferencesUtil.addPreferenceCategory(this, Globals.getString("vtsettmod")); if(!vkme()){ - PreferencesUtil.addPreference(this, "", Globals.getString("vtlfeed"), feedsumm, !milkshake() ? "ic_newsfeed_24" : "ic_newsfeed_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("vtlfeed"), feedsumm, !DoNotUseOldIcons() ? "ic_newsfeed_24" : "ic_newsfeed_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(FeedFragment.class).b(context); a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -307,7 +307,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("dockbar_editor"), docksumm, !milkshake() ? "ic_list_24" : "ic_list_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("dockbar_editor"), docksumm, !DoNotUseOldIcons() ? "ic_list_24" : "ic_list_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(DockBarFragment.class).b(context); a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -316,7 +316,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ }); if(isValidSignature()) - PreferencesUtil.addPreference(this, "", Globals.getString("vtlmusic"), musicsumm, !milkshake() ? "ic_music_24" : "ic_music_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("vtlmusic"), musicsumm, !DoNotUseOldIcons() ? "ic_music_24" : "ic_music_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(MusicFragment.class).b(context); a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -325,7 +325,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ }); } - PreferencesUtil.addPreference(this, "", Globals.getString("vtlmessages"), msgsumm, !milkshake() ? "ic_message_24" : "ic_message_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("vtlmessages"), msgsumm, !DoNotUseOldIcons() ? "ic_message_24" : "ic_message_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(MessagesFragment.class).b(context); a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -333,7 +333,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("vtlactivity"), activitysumm, !milkshake() ? "ic_write_24" : "ic_write_outline_28_new_accent", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("vtlactivity"), activitysumm, !DoNotUseOldIcons() ? "ic_write_24" : "ic_write_outline_28_new_accent", preference -> { Context context = getContext(); Intent a2 = new Navigator(ActivityFragment.class).b(context); a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -341,7 +341,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("vtlthemes"), themessumm, !milkshake() ? "ic_palette_24" : "ic_palette_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("vtlthemes"), themessumm, !DoNotUseOldIcons() ? "ic_palette_24" : "ic_write_outline_24", preference -> { Context context = getContext(); Intent a2 = new Navigator(ThemesFragment.class).b(context); a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -349,7 +349,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("vtltgs"), tgssumm, !milkshake() ? "ic_telegram_24" : "ic_telegram_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("vtltgs"), tgssumm, !DoNotUseOldIcons() ? "ic_telegram_24" : "ic_telegram_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(StickersFragment.class).b(context); a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -357,7 +357,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("vtlinterface"), interfacesumm, !milkshake() ? "ic_interface_24" : "ic_interface_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("vtlinterface"), interfacesumm, !DoNotUseOldIcons() ? "ic_interface_24" : "ic_interface_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(InterfaceFragment.class).b(context); a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -372,7 +372,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ }); } - PreferencesUtil.addPreference(this, "", Globals.getString("vtlproxy"), proxysumm, !milkshake() ? "ic_globe_20" : "ic_globe_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("vtlproxy"), proxysumm, !DoNotUseOldIcons() ? "ic_globe_20" : "ic_globe_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(ProxySettingsFragment.class).b(context); a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -380,14 +380,14 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ return false; }); - PreferencesUtil.addListPreferenceIcon(this, "clearcache", "Default", Globals.getString("autoclearcache"), !milkshake() ? "ic_delete_24" : "ic_delete_outline_28", getCachesumm(), new CharSequence[]{ + PreferencesUtil.addListPreferenceIcon(this, "clearcache", "Default", Globals.getString("autoclearcache"), !DoNotUseOldIcons() ? "ic_delete_24" : "ic_delete_outline_28", getCachesumm(), 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, !milkshake() ? "ic_more_24" : "ic_more_horizontal_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("vtlother"), othersumm, !DoNotUseOldIcons() ? "ic_more_24" : "ic_more_horizontal_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(OtherFragment.class).b(context); a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -397,7 +397,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ PreferencesUtil.addPreferenceCategory(this, Globals.getString("vtsettaboutmod")); - PreferencesUtil.addPreference(this, "", Globals.getString("menu_about"), about, !milkshake() ? "ic_about_24" : "ic_about_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("menu_about"), about, !DoNotUseOldIcons() ? "ic_about_24" : "ic_about_outline_28", preference -> { Context context = getContext(); Intent a2 = new Navigator(AboutAppFragment.class).b(context); a2.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -405,17 +405,17 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ return false; }); - PreferencesUtil.addPreference(this, "", Globals.getString("opencommit"), "", !milkshake() ? "ic_link_24" : "ic_link_circle_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("opencommit"), "", !DoNotUseOldIcons() ? "ic_link_24" : "ic_link_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"), !milkshake() ? "ic_help_24" : "ic_help_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("vtfaq"), Globals.getString("vtfaqsumm"), !DoNotUseOldIcons() ? "ic_help_24" : "ic_help_outline_24", 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"), !milkshake() ? "ic_bug_24" : "ic_bug_outline_28", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("reportbug"), Globals.getString("reportbugsumm"), !DoNotUseOldIcons() ? "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; }); @@ -423,12 +423,12 @@ public class VTSettings extends MaterialPreferenceToolbarFragment{ if(isValidSignature()){ PreferencesUtil.addPreferenceCategory(this, Globals.getString("updates")); - PreferencesUtil.addPreference(this, "", Globals.getString("checkforupdates"), "", "ic_download_24", preference -> { + PreferencesUtil.addPreference(this, "", Globals.getString("checkforupdates"), "", "ic_download_outline_24", preference -> { OTADialog.checkUpdates(getActivity()); return false; }); - PreferencesUtil.addMaterialSwitchPreference(this, "checkupdates", Globals.getString("checkupdates"), "", "ic_recent_24", true, (preference, o) -> { + PreferencesUtil.addMaterialSwitchPreference(this, "checkupdates", Globals.getString("checkupdates"), "", "ic_recent_outline_28", true, (preference, o) -> { boolean value = (boolean) o; edit().putBoolean("checkupdates", value).commit(); 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 3fa06231a..1f2b65443 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java @@ -74,6 +74,10 @@ public class Preferences{ return getBoolValue("opusmodule", true); } + public static boolean DoNotUseOldIcons(){ + return true; + } + public static boolean systemtheme(){ return false; //getBoolValue("systemtheme", true) && VERSION.SDK_INT >= 28; }