From c42245abf31a304ed85121592b03df2708e77846 Mon Sep 17 00:00:00 2001 From: Vologhat <47892605+Vologhat@users.noreply.github.com> Date: Tue, 12 Jul 2022 23:17:22 +0300 Subject: [PATCH] added vkme mode checker --- .../ui/fragments/dockbar/DockBarManager.java | 58 +++++++++---------- .../BottomNavigationMenu.smali | 24 -------- 2 files changed, 29 insertions(+), 53 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 f68f333a2..ee6c7f7d4 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 @@ -55,6 +55,7 @@ public class DockBarManager{ public static final int MAX_SELECTED_TABS_LIMIT = 9; private static DockBarManager sInstance = new DockBarManager(); + private final List mSelectedTabs = new ArrayList<>(); private final List mDisabledTabs = new ArrayList<>(); private final List mCategoryTitles = Arrays.asList( @@ -76,6 +77,34 @@ public class DockBarManager{ private void init(){ mConfig = new File(getContext().getFilesDir(), "dockbar.json"); + if (vkme()) { + mSelectedTabs.add(DockBarTab.valuesOf( + "tab_settings", + R.drawable.ic_settings_outline_28, + R.string.menu_settings, + R.id.menu_settings, + useNewSettings())); + if (vkme_notifs()) + mSelectedTabs.add(DockBarTab.valuesOf( + "tab_feedback", + R.drawable.ic_menu_notification_outline_28, + R.string.feedback, + R.id.tab_feedback, + NotificationsContainerFragment.class)); + mSelectedTabs.add(DockBarTab.valuesOf( + "tab_messages", + R.drawable.ic_message_outline_28, + R.string.messages, + R.id.tab_messages, + DialogsFragment.class)); + mSelectedTabs.add(DockBarTab.valuesOf( + "tab_profile", + milkshake() ? R.drawable.ic_user_circle_outline_28 : R.drawable.ic_account_outline_28, + R.string.profile, + R.id.tab_menu, + milkshake() ? ProfileFragment.class : MenuFragment.class)); + return; + } if (mConfig.exists()) { readFromConfig(); } else { @@ -169,35 +198,6 @@ public class DockBarManager{ } private void fillDefault(){ - if (vkme()) { - mSelectedTabs.add(DockBarTab.valuesOf( - "tab_settings", - R.drawable.ic_settings_outline_28, - R.string.menu_settings, - R.id.menu_settings, - useNewSettings())); - if (vkme_notifs()) - mSelectedTabs.add(DockBarTab.valuesOf( - "tab_feedback", - R.drawable.ic_menu_notification_outline_28, - R.string.feedback, - R.id.tab_feedback, - NotificationsContainerFragment.class)); - mSelectedTabs.add(DockBarTab.valuesOf( - "tab_messages", - R.drawable.ic_message_outline_28, - R.string.messages, - R.id.tab_messages, - DialogsFragment.class)); - mSelectedTabs.add(DockBarTab.valuesOf( - "tab_profile", - R.drawable.ic_account_outline_28, - R.string.profile, - R.id.tab_menu, - ProfileFragment.class)); - return; - } - // fill selected tabs list mSelectedTabs.add(DockBarTab.valuesOf( "tab_news", diff --git a/smali/smali_classes5/com/vtosters/lite/ui/bottomnavigation/BottomNavigationMenu.smali b/smali/smali_classes5/com/vtosters/lite/ui/bottomnavigation/BottomNavigationMenu.smali index 227adc3f2..99e8217f5 100644 --- a/smali/smali_classes5/com/vtosters/lite/ui/bottomnavigation/BottomNavigationMenu.smali +++ b/smali/smali_classes5/com/vtosters/lite/ui/bottomnavigation/BottomNavigationMenu.smali @@ -18,35 +18,11 @@ .method protected addInternal(IIILjava/lang/CharSequence;)Landroid/view/MenuItem; .locals 2 - .line 1 - invoke-virtual {p0}, Landroidx/appcompat/view/menu/MenuBuilder;->size()I - - move-result v0 - - add-int/lit8 v0, v0, 0x1 - - invoke-static {}, Lru/vtosters/lite/ui/fragments/dockbar/DockBarInjector;->getItemCount()I - - move-result v1 - - if-gt v0, v1, :cond_0 - - .line 2 invoke-super {p0, p1, p2, p3, p4}, Landroidx/appcompat/view/menu/MenuBuilder;->addInternal(IIILjava/lang/CharSequence;)Landroid/view/MenuItem; move-result-object p1 return-object p1 - - .line 3 - :cond_0 - new-instance p1, Ljava/lang/IllegalArgumentException; - - const-string p2, "Maximum number of items supported by BottomNavigationView is 5. Limit can be checked with BottomNavigationView#getMaxItemCount()" - - invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/String;)V - - throw p1 .end method .method public addSubMenu(IIILjava/lang/CharSequence;)Landroid/view/SubMenu;