From 95d306eaedd2dafd7654665189b3896dfa2b8efc Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Mon, 13 Jun 2022 18:18:38 +0300 Subject: [PATCH] vkme mode updated --- .../lite/ui/fragments/dockbar/DockBarManager.java | 4 ++-- .../java/ru/vtosters/lite/utils/Preferences.java | 4 ++++ smali/res/values-ru/strings.xml | 2 +- smali/res/values/strings.xml | 2 +- smali/res/xml/preferences_debug.xml | 4 ---- smali/res/xml/preferences_messages.xml | 12 ++++++++++++ 6 files changed, 20 insertions(+), 8 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 db32a0040..f330881e8 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 @@ -5,6 +5,7 @@ import static ru.vtosters.lite.utils.Globals.getString; import static ru.vtosters.lite.utils.Preferences.newfeed; import static ru.vtosters.lite.utils.Preferences.oldicons; import static ru.vtosters.lite.utils.Preferences.vkme; +import static ru.vtosters.lite.utils.Preferences.vkme_notifs; import com.vk.apps.AppsFragment; import com.vk.discover.DiscoverFragment; @@ -79,11 +80,10 @@ public class DockBarManager { private void load() { File dockbar = new File(getContext().getFilesDir(), "dockbar.json"); - - if (!dockbar.exists()) { if(vkme()) { mSelectedTabs.add(new DockBarTab("tab_settings", R.drawable.ic_settings_24, R.string.menu_settings, R.id.menu_settings, SettingsListFragment.class)); + if(vkme_notifs()) 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_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_profile", R.drawable.libverify_ic_account_circle_white, R.string.profile, R.id.profile, ProfileFragment.class)); return; 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 236ec6bc6..d69d7b7bf 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java @@ -344,6 +344,10 @@ public class Preferences { return getBoolValue("vkme_msg", false); } + public static boolean vkme_notifs() { + return getBoolValue("vkme_notifs", false); + } + public static boolean roundedmsgs() { return getBoolValue("roundedmsgs", false); } diff --git a/smali/res/values-ru/strings.xml b/smali/res/values-ru/strings.xml index 19e538f19..307277519 100644 --- a/smali/res/values-ru/strings.xml +++ b/smali/res/values-ru/strings.xml @@ -4348,7 +4348,7 @@ Статистика страницы Вкшники вроде перестали отдавать инфу Шрифт VK Sans - Режим VK Me MSG + Режим VK Me для диалогов Поддержка libverify Включение может пофиксить 2фа вход Модуль Opus diff --git a/smali/res/values/strings.xml b/smali/res/values/strings.xml index c1de97653..d1808e52a 100644 --- a/smali/res/values/strings.xml +++ b/smali/res/values/strings.xml @@ -4474,7 +4474,7 @@ May look like a fake leaving the online" Page stats VK Devs seems to have stopped sending info VK Sans font - VK Me MSG mode + VK Me dialogs mode libverify support Turning on may fix 2fa login Opus Module diff --git a/smali/res/xml/preferences_debug.xml b/smali/res/xml/preferences_debug.xml index 498563d9f..28fd282b3 100644 --- a/smali/res/xml/preferences_debug.xml +++ b/smali/res/xml/preferences_debug.xml @@ -41,10 +41,6 @@ android:defaultValue="false" android:key="vksans" android:title="@string/debug_experimental_vk_sans_font" /> - + + + + +