From da9ded2ae1977480d97b10c3c2f8ad03dd33d7cb Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Sun, 12 Jun 2022 16:19:45 +0300 Subject: [PATCH] mini refactoring --- .../lite/ui/fragments/dockbar/DockBarManager.java | 12 ++++++------ .../java/ru/vtosters/lite/utils/Preferences.java | 4 ++-- app/src/main/java/ru/vtosters/lite/utils/Themes.java | 7 +++++++ smali/res/values-ru/strings.xml | 2 +- smali/res/values/strings.xml | 2 +- smali/res/xml/preferences_interface.xml | 5 ----- smali/res/xml/preferences_themes.xml | 5 +++++ .../com/vk/video/a/VideoMenuActionsBuilder.smali | 1 - 8 files changed, 22 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarManager.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarManager.java index 778d7ce31..c995ce424 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarManager.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/dockbar/DockBarManager.java @@ -3,7 +3,7 @@ package ru.vtosters.lite.ui.fragments.dockbar; import static ru.vtosters.lite.utils.Globals.getContext; import static ru.vtosters.lite.utils.Globals.getString; import static ru.vtosters.lite.utils.Preferences.newfeed; -import static ru.vtosters.lite.utils.Preferences.olddock; +import static ru.vtosters.lite.utils.Preferences.oldicons; import com.vk.apps.AppsFragment; import com.vk.discover.DiscoverFragment; @@ -79,11 +79,11 @@ public class DockBarManager { File dockbar = new File(getContext().getFilesDir(), "dockbar.json"); if (!dockbar.exists()) { - mSelectedTabs.add(new DockBarTab("tab_news", olddock() ? R.drawable.ic_newsfeed_28 : R.drawable.ic_menu_newsfeed_outline_28, R.string.newsfeed, R.id.tab_news, newfeed() ? HomeFragment.class : NewsfeedFragment.class)); - mSelectedTabs.add(new DockBarTab("tab_discover", olddock() ? R.drawable.ic_search_28 : R.drawable.ic_menu_search_outline_28, R.string.search, R.id.tab_discover, DiscoverFragment.class )); - mSelectedTabs.add(new DockBarTab("tab_messages", olddock() ? R.drawable.ic_menu_messages_28 : R.drawable.ic_message_28_outline, R.string.messages, R.id.tab_messages, DialogsFragment.class)); - mSelectedTabs.add(new DockBarTab("tab_feedback", olddock() ? R.drawable.ic_menu_notifications_28 : R.drawable.ic_menu_notification_outline_28, R.string.feedback, R.id.tab_feedback, NotificationsContainerFragment.class)); - mSelectedTabs.add(new DockBarTab("tab_menu", olddock() ? R.drawable.ic_menu_more_28 : R.drawable.ic_menu_more_outline_28, R.string.menu, R.id.tab_menu, MenuFragment.class)); + mSelectedTabs.add(new DockBarTab("tab_news", oldicons() ? R.drawable.ic_newsfeed_28 : R.drawable.ic_menu_newsfeed_outline_28, R.string.newsfeed, R.id.tab_news, newfeed() ? HomeFragment.class : NewsfeedFragment.class)); + mSelectedTabs.add(new DockBarTab("tab_discover", oldicons() ? R.drawable.ic_search_28 : R.drawable.ic_menu_search_outline_28, R.string.search, R.id.tab_discover, DiscoverFragment.class )); + mSelectedTabs.add(new DockBarTab("tab_messages", oldicons() ? R.drawable.ic_menu_messages_28 : R.drawable.ic_message_28_outline, R.string.messages, R.id.tab_messages, DialogsFragment.class)); + mSelectedTabs.add(new DockBarTab("tab_feedback", oldicons() ? R.drawable.ic_menu_notifications_28 : R.drawable.ic_menu_notification_outline_28, R.string.feedback, R.id.tab_feedback, NotificationsContainerFragment.class)); + mSelectedTabs.add(new DockBarTab("tab_menu", oldicons() ? R.drawable.ic_menu_more_28 : R.drawable.ic_menu_more_outline_28, R.string.menu, R.id.tab_menu, MenuFragment.class)); mDisabledTabs.add(new DockBarTab("tab_friends", R.drawable.ic_user_24, R.string.friends, R.id.menu_friends, FriendsFragment.class)); mDisabledTabs.add(new DockBarTab("tab_groups", R.drawable.ic_users_24, R.string.groups, R.id.menu_groups, GroupsFragment.class)); 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 9d4d8d200..37caf2b51 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java @@ -113,8 +113,8 @@ public class Preferences { return getBoolValue("adsgroup", false); } - public static boolean olddock() { - return getBoolValue("olddock", false); + public static boolean oldicons() { + return getBoolValue("oldicons", false); } public static boolean adsslider() { 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 21c4f9bee..685b6f5c6 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java @@ -229,6 +229,13 @@ public class Themes { return Color.argb(Color.alpha(color), red, green, blue); } + public static int fixTextColor(int resid) { + if (resid == R.color.music_action_button_gray || resid == R.color.cool_grey || resid == R.color.accent_blue){ + return isDarkTheme()? R.color.white : R.color.cool_grey; + } + return resid; + } + public static int halfAlpha(int src) { return ColorUtils.setAlphaComponent(src, 169); } diff --git a/smali/res/values-ru/strings.xml b/smali/res/values-ru/strings.xml index aba0c49bd..3c0afcb0c 100644 --- a/smali/res/values-ru/strings.xml +++ b/smali/res/values-ru/strings.xml @@ -4290,7 +4290,7 @@ Покраска страниц, таких как VKID, под тему приложения Старые иконки - Использовать старые иконки в докбаре. Необходимо сбросить настройки докбара для применения изменений + Необходимо сбросить настройки докбара для применения изменений Что это за функция? Функция позволяет вам не отправлять статус прочтения вами сообщения собеседника diff --git a/smali/res/values/strings.xml b/smali/res/values/strings.xml index 468f5fcfb..60bc3d3f4 100644 --- a/smali/res/values/strings.xml +++ b/smali/res/values/strings.xml @@ -4414,7 +4414,7 @@ May look like a fake leaving the online" Color pages such as VKID in app theme Old icons - Use old icons in dockbar. You should reset its setting to apply changes + You should reset its setting to apply changes What is it? Function lets you don\'t send read message status diff --git a/smali/res/xml/preferences_interface.xml b/smali/res/xml/preferences_interface.xml index 1b00fe41f..c31e63bd8 100644 --- a/smali/res/xml/preferences_interface.xml +++ b/smali/res/xml/preferences_interface.xml @@ -39,11 +39,6 @@ android:entryValues="@array/dateformat" android:key="dateformat" android:title="@string/interfaceglobaldates" /> - + diff --git a/smali/smali_classes5/com/vk/video/a/VideoMenuActionsBuilder.smali b/smali/smali_classes5/com/vk/video/a/VideoMenuActionsBuilder.smali index 0bde628fb..2e23c3c76 100644 --- a/smali/smali_classes5/com/vk/video/a/VideoMenuActionsBuilder.smali +++ b/smali/smali_classes5/com/vk/video/a/VideoMenuActionsBuilder.smali @@ -170,7 +170,6 @@ .line 31 invoke-virtual {p0, p1, v0, v1, v2}, Lcom/vk/video/a/VideoMenuActionsBuilder;->a(IIII)V - :cond_8 const p1, 0x7f0a0bcf