diff --git a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java index 7e58769d2..6926c8cd5 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java @@ -52,9 +52,7 @@ public class Newsfeed { public static boolean isBlockedByFilter(String str) { for (String str2 : mFilters) { - if (str.toLowerCase().contains(str2.toLowerCase())) { - return true; - } + if (str.toLowerCase().contains(str2.toLowerCase())) return true; } return false; } @@ -119,8 +117,7 @@ public class Newsfeed { if (!Preferences.captions()) { return true; } - boolean postsrecomm = postsrecomm(); - return (jSONObject2.getString(NavigatorKeys.j).equals("explorebait") && !postsrecomm) || ((jSONObject2.getString(NavigatorKeys.j).equals("shared") && postsrecomm) || ((jSONObject.getString(NavigatorKeys.j).equals("digest") && postsrecomm) || ((jSONObject2.getString(NavigatorKeys.j).equals("commented") && postsrecomm) || (jSONObject2.getString(NavigatorKeys.j).equals("voted") && postsrecomm)))); + return (jSONObject2.getString(NavigatorKeys.j).equals("explorebait") && !postsrecomm()) || ((jSONObject2.getString(NavigatorKeys.j).equals("shared") && postsrecomm()) || ((jSONObject.getString(NavigatorKeys.j).equals("digest") && postsrecomm()) || ((jSONObject2.getString(NavigatorKeys.j).equals("commented") && postsrecomm()) || (jSONObject2.getString(NavigatorKeys.j).equals("voted") && postsrecomm())))); } catch (JSONException unused) { return false; } @@ -174,92 +171,69 @@ public class Newsfeed { } public static String getCommentsSort(String def) { - String string = getPreferences().getString("commentssort", ""); - if (string.isEmpty()) { - return def; + switch (getPreferences().getString("commentssort", "")) { + case "new": + return "desc"; + case "old": + return "asc"; + default: + return def; } - if (string.equals("new")) { - return "desc"; - } - if (string.equals("old")) { - return "asc"; - } - return def; } public static long getUpdateNewsfeed(boolean refresh_timeout) { - String string = getPreferences().getString("newsupdate", ""); - if (string.isEmpty()) { - return Preference.b().getLong(refresh_timeout ? "refresh_timeout_top" : "refresh_timeout_recent", 600000L); + switch (getPreferences().getString("newsupdate", "")) { + case "no_update": + return MAX_VALUE; + case "imd_update": + return 10000L; + default: + return Preference.b().getLong(refresh_timeout ? "refresh_timeout_top" : "refresh_timeout_recent", 600000L); } - if (string.equals("no_update")) { - return MAX_VALUE; - } - if (string.equals("imd_update")) { - return 10000L; - } - return Preference.b().getLong(refresh_timeout ? "refresh_timeout_top" : "refresh_timeout_recent", 600000L); } public static Class getStartFragment() { - String string = getPreferences().getString("start_values", ""); - if (string.equals("default")) { - return getInstance().getSelectedTabs().get(0).fragmentClass; + switch (getPreferences().getString("start_values", "")) { + case "newsfeed": + return newfeed() ? HomeFragment.class : NewsfeedFragment.class; + case "messenger": + return DialogsFragment.class; + case "groups": + return GroupsFragment.class; + case "music": + return MusicFragment.class; + case "friends": + return FriendsFragment.class; + case "photos": + return PhotosFragment.class; + case "videos": + return VideosFragment.class; + case "settings": + return SettingsListFragment.class; + case "apps": + return AppsFragment.class; + case "discover": + return newfeed() ? GatewaysFragment.class : DiscoverFragment.class; + case "notifications": + return NotificationsContainerFragment.class; + case "money": + return MoneyTransfersFragment.class; + case "games": + return GamesFragment.class; + case "liked": + return FaveTabFragment.class; + case "menu": + return MenuFragment.class; + case "profile": + return ProfileFragment.class; + case "lives": + return LivesTabsFragment.class; + case "docs": + return DocumentsViewFragment.class; + case "brtd": + return BirthdaysFragment.class; + default: + return getInstance().getSelectedTabs().get(0).fragmentClass; } - if (string.equals("newsfeed")) { - return newfeed() ? HomeFragment.class : NewsfeedFragment.class; - } - if (string.equals("messenger")) { - return DialogsFragment.class; - } - if (string.equals("groups")) { - return GroupsFragment.class; - } - if (string.equals("music")) { - return MusicFragment.class; - } - if (string.equals("friends")) { - return FriendsFragment.class; - } - if (string.equals("photos")) { - return PhotosFragment.class; - } - if (string.equals("videos")) { - return VideosFragment.class; - } - if (string.equals("settings")) { - return SettingsListFragment.class; - } - if (string.equals("apps")) { - return AppsFragment.class; - } - if (string.equals("discover")) { - return newfeed() ? GatewaysFragment.class : DiscoverFragment.class; - } - if (string.equals("notifications")) { - return NotificationsContainerFragment.class; - } - if (string.equals("money")) { - return MoneyTransfersFragment.class; - } - if (string.equals("games")) { - return GamesFragment.class; - } - if (string.equals("liked")) { - return FaveTabFragment.class; - } - if (string.equals("menu")) { - return MenuFragment.class; - } - if (string.equals("profile")) { - return ProfileFragment.class; - } - if (string.equals("lives")) { - return LivesTabsFragment.class; - } - if (string.equals("docs")) { - return DocumentsViewFragment.class; - } - return string.equals("brtd") ? BirthdaysFragment.class : getInstance().getSelectedTabs().get(0).fragmentClass; } } 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 286feea7c..0adb31ec6 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java @@ -308,10 +308,7 @@ public class Preferences { public static String VKVersion() { String string = getPreferences().getString("vkversion", ""); - if (!string.isEmpty()) { - return string; - } - return "5.29"; + return !string.isEmpty() ? string : "5.29"; } public static String getLocale() { diff --git a/app/src/main/java/ru/vtosters/lite/utils/Themes.java b/app/src/main/java/ru/vtosters/lite/utils/Themes.java index 1ec4bd30a..4a0e69d95 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java @@ -55,41 +55,35 @@ public class Themes { } public static VKTheme getDarkTheme() { - String string = getPreferences().getString("darktheme", ""); - if (string.isEmpty()) { - return VKTheme.DARK; + switch (getPreferences().getString("darktheme", "")) { + case "amoled": + return VKTheme.AMOLED; + default: + return VKTheme.DARK; } - if (string.equals("amoled")) { - return VKTheme.AMOLED; - } - return VKTheme.DARK; } public static ImTheme getImDarkTheme() { - String string = getPreferences().getString("darktheme", ""); - if (string.isEmpty()) { - return ImTheme.VKAPP_DARK; + switch (getPreferences().getString("darktheme", "")) { + case "amoled": + return ImTheme.VKAPP_AMOLED; + default: + return ImTheme.VKAPP_DARK; } - if (string.equals("amoled")) { - return ImTheme.VKAPP_AMOLED; - } - return ImTheme.VKAPP_DARK; } public static VKTheme getLightTheme() { - String string = getPreferences().getString("lighttheme", ""); - if (string.isEmpty()) { - return VKTheme.DEFAULT_LIGHT; + switch (getPreferences().getString("lighttheme", "")) { + default: + return VKTheme.DEFAULT_LIGHT; } - return VKTheme.DEFAULT_LIGHT; } public static ImTheme getImLightTheme() { - String string = getPreferences().getString("lighttheme", ""); - if (string.isEmpty()) { - return ImTheme.VKAPP_LIGHT; + switch (getPreferences().getString("lighttheme", "")) { + default: + return ImTheme.VKAPP_LIGHT; } - return ImTheme.VKAPP_LIGHT; } public static int getColorFromAttr(int attr) { @@ -101,11 +95,7 @@ public class Themes { } public static boolean isAndroidMonet() { - if (color_grishka()) { - return Build.VERSION.SDK_INT >= 31; - } else { - return false; - } + return color_grishka() && Build.VERSION.SDK_INT >= 31; } public static boolean isColorRefAccented(int i) { diff --git a/smali/res/xml/preferences_debug.xml b/smali/res/xml/preferences_debug.xml index 43fa4a688..72dd06998 100644 --- a/smali/res/xml/preferences_debug.xml +++ b/smali/res/xml/preferences_debug.xml @@ -37,10 +37,6 @@ android:defaultValue="true" android:key="color_grishka" android:title="Фикс некоторых покрасок Monet" /> -