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 f86a88c31..d49e9185b 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 @@ -91,7 +91,7 @@ public class DockBarManager{ if(vkme_notifs()) mSelectedTabs.add(new DockBarTab("tab_feedback", R.drawable.ic_menu_notification_outline_28, R.string.feedback, R.id.tab_feedback, NotificationsContainerFragment.class)); mSelectedTabs.add(new DockBarTab("tab_messages", R.drawable.ic_message_outline_28, R.string.messages, R.id.tab_messages, DialogsFragment.class)); - mSelectedTabs.add(new DockBarTab("tab_profile", R.drawable.ic_account_outline_28, R.string.profile, R.id.profile, ProfileFragment.class)); + mSelectedTabs.add(new DockBarTab("tab_profile", R.drawable.ic_account_outline_28, R.string.profile, R.id.tab_menu, ProfileFragment.class)); return; } diff --git a/smali/smali_classes2/com/vk/dto/menu/MenuResponse$b.smali b/smali/smali_classes2/com/vk/dto/menu/MenuResponse$b.smali index 89855a9ca..5951663cf 100644 --- a/smali/smali_classes2/com/vk/dto/menu/MenuResponse$b.smali +++ b/smali/smali_classes2/com/vk/dto/menu/MenuResponse$b.smali @@ -55,7 +55,10 @@ if-eqz v0, :cond_1 - .line 2 + invoke-static {v0}, Lru/vtosters/lite/ui/fragments/dockbar/DockBarInjector;->injectMenuJSON(Lorg/json/JSONArray;)Lorg/json/JSONArray; + + move-result-object v0 + new-instance v3, Ljava/util/ArrayList; invoke-virtual {v0}, Lorg/json/JSONArray;->length()I diff --git a/smali/smali_classes3/com/vk/menu/MenuFragment.smali b/smali/smali_classes3/com/vk/menu/MenuFragment.smali index adba7f377..727b5a572 100644 --- a/smali/smali_classes3/com/vk/menu/MenuFragment.smali +++ b/smali/smali_classes3/com/vk/menu/MenuFragment.smali @@ -302,6 +302,8 @@ invoke-virtual {v3, v5, v1}, Landroid/view/MenuInflater;->inflate(ILandroid/view/Menu;)V + invoke-static {v1}, Lru/vtosters/lite/ui/fragments/dockbar/DockBarInjector;->injectMenuFragment(Landroid/view/Menu;)V + .line 5 invoke-direct {p0, v1}, Lcom/vk/menu/MenuFragment;->a(Landroidx/appcompat/view/menu/MenuBuilder;)Ljava/util/List; diff --git a/smali/smali_classes3/com/vk/menu/MenuUtils.smali b/smali/smali_classes3/com/vk/menu/MenuUtils.smali index 019133814..79b5d617e 100644 --- a/smali/smali_classes3/com/vk/menu/MenuUtils.smali +++ b/smali/smali_classes3/com/vk/menu/MenuUtils.smali @@ -43,9 +43,17 @@ .end method .method public static final a(Ljava/lang/String;)I - .locals 1 + .locals 3 - .line 3 + invoke-static {p0}, Lru/vtosters/lite/ui/fragments/dockbar/DockBarInjector;->injectId(Ljava/lang/String;)I + + move-result v0 + + if-eqz v0, :cond_7 + + return v0 + + :cond_7 invoke-virtual {p0}, Ljava/lang/String;->hashCode()I move-result v0 diff --git a/smali/smali_classes3/com/vk/navigation/NavigationDelegateBottom.smali b/smali/smali_classes3/com/vk/navigation/NavigationDelegateBottom.smali index f756ca0a8..5f39439ca 100644 --- a/smali/smali_classes3/com/vk/navigation/NavigationDelegateBottom.smali +++ b/smali/smali_classes3/com/vk/navigation/NavigationDelegateBottom.smali @@ -1725,6 +1725,16 @@ .line 63 :cond_0 + invoke-static {p1}, Lru/vtosters/lite/ui/fragments/dockbar/DockBarInjector;->interceptClick(I)Ljava/lang/Class; + + move-result-object p1 + + const/4 v2, 0x0 + + const/4 v0, 0x0 + + goto :goto_1 + invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; move-result-object v0 @@ -2823,7 +2833,17 @@ .method private final f(Lcom/vk/core/fragments/FragmentImpl;)Z .locals 1 - .line 2 + invoke-static {p1}, Lru/vtosters/lite/ui/fragments/dockbar/DockBarInjector;->isDockOpenAllowed(Lcom/vk/core/fragments/FragmentImpl;)Z + + move-result v0 + + if-nez v0, :cond_8 + + const/4 p1, 0x1 + + return p1 + + :cond_8 sget-object v0, Lcom/vk/navigation/NavigationDelegateBottom;->e0:Ljava/util/Map; invoke-interface {v0}, Ljava/util/Map;->keySet()Ljava/util/Set; @@ -3911,6 +3931,12 @@ .method public a(Lcom/vk/core/fragments/FragmentImpl;)Z .locals 1 + invoke-static {p1}, Lru/vtosters/lite/ui/fragments/dockbar/DockBarInjector;->isDockOpenAllowed(Lcom/vk/core/fragments/FragmentImpl;)Z + + move-result p1 + + return p1 + .line 54 iget-object v0, p0, Lcom/vk/navigation/NavigationDelegateBottom;->B:Lcom/vk/core/fragments/FragmentNavigationController; diff --git a/smali/smali_classes5/com/vtosters/lite/ui/bottomnavigation/BottomNavigationMenuView.smali b/smali/smali_classes5/com/vtosters/lite/ui/bottomnavigation/BottomNavigationMenuView.smali index c6b8137aa..c40a5f673 100644 --- a/smali/smali_classes5/com/vtosters/lite/ui/bottomnavigation/BottomNavigationMenuView.smali +++ b/smali/smali_classes5/com/vtosters/lite/ui/bottomnavigation/BottomNavigationMenuView.smali @@ -59,7 +59,9 @@ .line 1 new-instance v0, Landroidx/core/util/Pools$SynchronizedPool; - const/4 v1, 0x5 + invoke-static {}, Lru/vtosters/lite/ui/fragments/dockbar/DockBarInjector;->getItemCount()I + + move-result v1 invoke-direct {v0, v1}, Landroidx/core/util/Pools$SynchronizedPool;->(I)V @@ -162,7 +164,9 @@ iput-object p1, p0, Lcom/vtosters/lite/ui/bottomnavigation/BottomNavigationMenuView;->e:Landroid/view/View$OnClickListener; - const/4 p1, 0x5 + invoke-static {}, Lru/vtosters/lite/ui/fragments/dockbar/DockBarInjector;->getItemCount()I + + move-result p1 new-array p1, p1, [I diff --git a/smali/smali_classes5/com/vtosters/lite/ui/bottomnavigation/BottomNavigationView.smali b/smali/smali_classes5/com/vtosters/lite/ui/bottomnavigation/BottomNavigationView.smali index a82dd3278..e11ec86df 100644 --- a/smali/smali_classes5/com/vtosters/lite/ui/bottomnavigation/BottomNavigationView.smali +++ b/smali/smali_classes5/com/vtosters/lite/ui/bottomnavigation/BottomNavigationView.smali @@ -686,7 +686,9 @@ .method public getMaxItemCount()I .locals 1 - const/4 v0, 0x5 + invoke-static {}, Lru/vtosters/lite/ui/fragments/dockbar/DockBarInjector;->getItemCount()I + + move-result v0 return v0 .end method