dockbar updates + updated gradle ver

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
+2 -4
View File
@@ -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'
@@ -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;
@@ -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));
}
}