y0zhyck/vtosters
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dockbar updates + updated gradle ver

Browse Source
This commit is contained in:
gdlbo
2022-08-16 23:51:34 +03:00
parent d4ab0a1366
commit ef0e2caabf
5 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/build.gradle
+2 -4
View File
@@ -73,12 +73,11 @@ android {
defaultConfig { defaultConfig {
applicationId "ru.vtosters.lite.utils.lite" applicationId "ru.vtosters.lite.utils.lite"
minSdkVersion 21 minSdk 22
targetSdkVersion 32 targetSdkVersion 32
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
multiDexEnabled false
multiDexEnabled true
} }
compileOptions { compileOptions {
@@ -89,7 +88,6 @@ android {
} }
dependencies { dependencies {
implementation "androidx.multidex:multidex:2.0.1"
implementation 'com.google.android.material:material:1.6.1' implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.exifinterface:exifinterface:1.3.3' implementation 'androidx.exifinterface:exifinterface:1.3.3'
implementation 'androidx.preference:preference:1.2.0' implementation 'androidx.preference:preference:1.2.0'
app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java
+3 -1
View File
@@ -35,6 +35,7 @@ import com.vk.core.fragments.FragmentImpl;
import com.vk.core.util.StringUtils; import com.vk.core.util.StringUtils;
import com.vk.navigation.right.RightMenu; import com.vk.navigation.right.RightMenu;
import com.vtosters.lite.MenuCountersState; import com.vtosters.lite.MenuCountersState;
import com.vtosters.lite.fragments.ProfileFragment;
import com.vtosters.lite.ui.bottomnavigation.BottomNavigationMenuView; import com.vtosters.lite.ui.bottomnavigation.BottomNavigationMenuView;
import com.vtosters.lite.ui.bottomnavigation.BottomNavigationView; import com.vtosters.lite.ui.bottomnavigation.BottomNavigationView;
@@ -286,7 +287,7 @@ public class DockBarInjector {
} }
public static Class<?> interceptClick(int id, RightMenu rightMenu) { public static Class<?> interceptClick(int id, RightMenu rightMenu) {
if (id == tab_menu) { if (id == tab_menu && rightMenu != null) {
rightMenu.a(); rightMenu.a();
} }
@@ -294,6 +295,7 @@ public class DockBarInjector {
if (id == tab.id) if (id == tab.id)
return tab.fragmentClass; return tab.fragmentClass;
} }
for (DockBarTab tab : sManager.getDisabledTabs()) { for (DockBarTab tab : sManager.getDisabledTabs()) {
if (id == tab.id) if (id == tab.id)
return tab.fragmentClass; return tab.fragmentClass;
app/src/main/java/ru/vtosters/lite/ui/components/DockBarEditorManager.java
+2 -5
View File
@@ -49,7 +49,6 @@ import ru.vtosters.lite.ui.items.DockBarTab;
import ru.vtosters.lite.utils.AndroidUtils; import ru.vtosters.lite.utils.AndroidUtils;
public class DockBarEditorManager { public class DockBarEditorManager {
public static final int MIN_SELECTED_TABS = 3; public static final int MIN_SELECTED_TABS = 3;
public static final int MAX_SELECTED_TABS = 9; public static final int MAX_SELECTED_TABS = 9;
@@ -99,18 +98,16 @@ public class DockBarEditorManager {
List<String> allTags = new ArrayList<>(Arrays.asList("tab_news", "tab_superapps", "tab_messages", "tab_feedback", "tab_profile", 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_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")); "tab_fave", "tab_documents", "tab_payments", "tab_vk_apps", "tab_settings", "tab_menu"));
for (String tag : selectedTabsTags) { for (String tag : selectedTabsTags) {
mSelectedTabs.add(getTabByTag(tag)); mSelectedTabs.add(getTabByTag(tag));
allTags.remove(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) { for (String tag : allTags) {
mDisabledTabs.add(getTabByTag(tag)); mDisabledTabs.add(getTabByTag(tag));
} }
} }
}
public void save() { public void save() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
gradle/wrapper/gradle-wrapper.properties
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
#Fri Apr 22 13:33:27 MSK 2022 #Tue Aug 16 21:49:57 MSK 2022
distributionBase=GRADLE_USER_HOME 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 distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
smali/smali_classes3/com/vk/navigation/NavigationDelegateBottom.smali
-6
View File
@@ -3925,12 +3925,6 @@
.method public a(Lcom/vk/core/fragments/FragmentImpl;)Z .method public a(Lcom/vk/core/fragments/FragmentImpl;)Z
.locals 1 .locals 1
invoke-static {p1}, Lru/vtosters/lite/hooks/DockBarInjector;->isDockOpenAllowed(Lcom/vk/core/fragments/FragmentImpl;)Z
move-result p1
return p1
.line 54 .line 54
iget-object v0, p0, Lcom/vk/navigation/NavigationDelegateBottom;->B:Lcom/vk/core/fragments/FragmentNavigationController; iget-object v0, p0, Lcom/vk/navigation/NavigationDelegateBottom;->B:Lcom/vk/core/fragments/FragmentNavigationController;