From ef0e2caabf2e7826bedebc947e4be45ed2d1200a Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Tue, 16 Aug 2022 23:51:34 +0300
Subject: [PATCH] dockbar updates + updated gradle ver

---
 app/build.gradle                                      |  6 ++----
 .../java/ru/vtosters/lite/hooks/DockBarInjector.java  |  4 +++-
 .../lite/ui/components/DockBarEditorManager.java      | 11 ++++-------
 gradle/wrapper/gradle-wrapper.properties              |  4 ++--
 .../com/vk/navigation/NavigationDelegateBottom.smali  |  6 ------
 5 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0505115cf..0c4f2ec79 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -73,12 +73,11 @@ android {
 
     defaultConfig {
         applicationId "ru.vtosters.lite.utils.lite"
-        minSdkVersion 21
+        minSdk 22
         targetSdkVersion 32
         versionCode 1
         versionName "1.0"
-
-        multiDexEnabled true
+        multiDexEnabled false
     }
 
     compileOptions {
@@ -89,7 +88,6 @@ android {
 }
 
 dependencies {
-    implementation "androidx.multidex:multidex:2.0.1"
     implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.exifinterface:exifinterface:1.3.3'
     implementation 'androidx.preference:preference:1.2.0'
diff --git a/app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java b/app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java
index 7ec1f5531..31a956c9e 100644
--- a/app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java
+++ b/app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java
@@ -35,6 +35,7 @@ import com.vk.core.fragments.FragmentImpl;
 import com.vk.core.util.StringUtils;
 import com.vk.navigation.right.RightMenu;
 import com.vtosters.lite.MenuCountersState;
+import com.vtosters.lite.fragments.ProfileFragment;
 import com.vtosters.lite.ui.bottomnavigation.BottomNavigationMenuView;
 import com.vtosters.lite.ui.bottomnavigation.BottomNavigationView;
 
@@ -286,7 +287,7 @@ public class DockBarInjector {
     }
 
     public static Class<?> interceptClick(int id, RightMenu rightMenu) {
-        if (id == tab_menu) {
+        if (id == tab_menu && rightMenu != null) {
             rightMenu.a();
         }
 
@@ -294,6 +295,7 @@ public class DockBarInjector {
             if (id == tab.id)
                 return tab.fragmentClass;
         }
+
         for (DockBarTab tab : sManager.getDisabledTabs()) {
             if (id == tab.id)
                 return tab.fragmentClass;
diff --git a/app/src/main/java/ru/vtosters/lite/ui/components/DockBarEditorManager.java b/app/src/main/java/ru/vtosters/lite/ui/components/DockBarEditorManager.java
index 53a9cfb18..5b799985b 100644
--- a/app/src/main/java/ru/vtosters/lite/ui/components/DockBarEditorManager.java
+++ b/app/src/main/java/ru/vtosters/lite/ui/components/DockBarEditorManager.java
@@ -49,7 +49,6 @@ import ru.vtosters.lite.ui.items.DockBarTab;
 import ru.vtosters.lite.utils.AndroidUtils;
 
 public class DockBarEditorManager {
-
     public static final int MIN_SELECTED_TABS = 3;
     public static final int MAX_SELECTED_TABS = 9;
 
@@ -99,16 +98,14 @@ public class DockBarEditorManager {
         List<String> allTags = new ArrayList<>(Arrays.asList("tab_news", "tab_superapps", "tab_messages", "tab_feedback", "tab_profile",
                 "tab_friends", "tab_groups", "tab_photos", "tab_audios", "tab_videos", "tab_lives", "tab_games", "tab_liked",
                 "tab_fave", "tab_documents", "tab_payments", "tab_vk_apps", "tab_settings", "tab_menu"));
+
         for (String tag : selectedTabsTags) {
             mSelectedTabs.add(getTabByTag(tag));
             allTags.remove(tag);
         }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            allTags.forEach(tag -> mDisabledTabs.add(getTabByTag(tag)));
-        } else {
-            for (String tag : allTags) {
-                mDisabledTabs.add(getTabByTag(tag));
-            }
+
+        for (String tag : allTags) {
+            mDisabledTabs.add(getTabByTag(tag));
         }
     }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 648b950c2..629d28829 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Apr 22 13:33:27 MSK 2022
+#Tue Aug 16 21:49:57 MSK 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/smali/smali_classes3/com/vk/navigation/NavigationDelegateBottom.smali b/smali/smali_classes3/com/vk/navigation/NavigationDelegateBottom.smali
index b11ebf359..8eba23186 100644
--- a/smali/smali_classes3/com/vk/navigation/NavigationDelegateBottom.smali
+++ b/smali/smali_classes3/com/vk/navigation/NavigationDelegateBottom.smali
@@ -3925,12 +3925,6 @@
 .method public a(Lcom/vk/core/fragments/FragmentImpl;)Z
     .locals 1
 
-    invoke-static {p1}, Lru/vtosters/lite/hooks/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;