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 c995ce424..db32a0040 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 @@ -4,6 +4,7 @@ import static ru.vtosters.lite.utils.Globals.getContext; import static ru.vtosters.lite.utils.Globals.getString; import static ru.vtosters.lite.utils.Preferences.newfeed; import static ru.vtosters.lite.utils.Preferences.oldicons; +import static ru.vtosters.lite.utils.Preferences.vkme; import com.vk.apps.AppsFragment; import com.vk.discover.DiscoverFragment; @@ -78,7 +79,16 @@ public class DockBarManager { private void load() { File dockbar = new File(getContext().getFilesDir(), "dockbar.json"); + + if (!dockbar.exists()) { + if(vkme()) { + mSelectedTabs.add(new DockBarTab("tab_settings", R.drawable.ic_settings_24, R.string.menu_settings, R.id.menu_settings, SettingsListFragment.class)); + mSelectedTabs.add(new DockBarTab("tab_messages", oldicons() ? R.drawable.ic_menu_messages_28 : R.drawable.ic_message_28_outline, R.string.messages, R.id.tab_messages, DialogsFragment.class)); + mSelectedTabs.add(new DockBarTab("tab_profile", R.drawable.libverify_ic_account_circle_white, R.string.profile, R.id.profile, ProfileFragment.class)); + return; + } + mSelectedTabs.add(new DockBarTab("tab_news", oldicons() ? R.drawable.ic_newsfeed_28 : R.drawable.ic_menu_newsfeed_outline_28, R.string.newsfeed, R.id.tab_news, newfeed() ? HomeFragment.class : NewsfeedFragment.class)); mSelectedTabs.add(new DockBarTab("tab_discover", oldicons() ? R.drawable.ic_search_28 : R.drawable.ic_menu_search_outline_28, R.string.search, R.id.tab_discover, DiscoverFragment.class )); mSelectedTabs.add(new DockBarTab("tab_messages", oldicons() ? R.drawable.ic_menu_messages_28 : R.drawable.ic_message_28_outline, R.string.messages, R.id.tab_messages, DialogsFragment.class)); @@ -225,8 +235,11 @@ public class DockBarManager { int target = adapter.getIndexByViewType(toPosition, adapter.getItemType(toPosition)); if (fromPosition < toPosition) { - if (mSelectedTabs.size() <= MIN_SELECTED_TABS_LIMIT || mSelectedTabs.get(curr).tag.equals("tab_menu")) - return; + if(!vkme()){ + if (mSelectedTabs.size() <= MIN_SELECTED_TABS_LIMIT || mSelectedTabs.get(curr).tag.equals("tab_menu")){ + return; + } + } DockBarTab tab = mSelectedTabs.get(curr); mSelectedTabs.remove(tab); diff --git a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java index 37caf2b51..145e64717 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java @@ -117,6 +117,10 @@ public class Preferences { return getBoolValue("oldicons", false); } + public static boolean vkme() { + return getBoolValue("vkme", false); + } + public static boolean adsslider() { return getBoolValue("__dbg_no_slider_ads", false); } @@ -182,7 +186,7 @@ public class Preferences { } public static boolean dockcounter() { - return getBoolValue("dockcounter", true); + return getBoolValue("dockcounter", true) && !vkme(); } public static boolean feedcache() { diff --git a/app/src/main/java/ru/vtosters/lite/utils/Themes.java b/app/src/main/java/ru/vtosters/lite/utils/Themes.java index 685b6f5c6..e8b3c91ed 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java @@ -9,6 +9,7 @@ import static ru.vtosters.lite.utils.Preferences.isBGStickersEnabled; import static ru.vtosters.lite.utils.Preferences.navbar; import static ru.vtosters.lite.utils.Preferences.roundedmsgs; import static ru.vtosters.lite.utils.Preferences.systemtheme; +import static ru.vtosters.lite.utils.Preferences.vkme; import static ru.vtosters.lite.utils.Preferences.vksans; import android.content.Context; @@ -311,6 +312,18 @@ public class Themes { return "images"; } + public static int getNavigationHeight(int Default) { + int VKME = R.dimen.design_bottom_sheet_peek_height_min; + + return vkme()? VKME : Default; + } + + public static int getNavigationWidth(int Default) { + int VKME = R.dimen.app_minimumsize_h; + + return vkme()? VKME : Default; + } + public static void systemThemeChanger() { if (isDarkTheme()){ applyTheme(getDarkTheme(), getImDarkTheme()); diff --git a/smali/res/xml/preferences_debug.xml b/smali/res/xml/preferences_debug.xml index 498563d9f..0b5cd61cc 100644 --- a/smali/res/xml/preferences_debug.xml +++ b/smali/res/xml/preferences_debug.xml @@ -10,6 +10,10 @@ android:key="devmenu" android:title="@string/debug_show_settings_item" /> + getNavigationHeight(I)I + + move-result v0 + invoke-virtual {p2, v0}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I move-result p2 diff --git a/smali/smali_classes4/com/vtosters/lite/ui/bottomnavigation/BottomNavigationMenuView.smali b/smali/smali_classes4/com/vtosters/lite/ui/bottomnavigation/BottomNavigationMenuView.smali index c81a41e1c..54d9b81df 100644 --- a/smali/smali_classes4/com/vtosters/lite/ui/bottomnavigation/BottomNavigationMenuView.smali +++ b/smali/smali_classes4/com/vtosters/lite/ui/bottomnavigation/BottomNavigationMenuView.smali @@ -127,6 +127,10 @@ const p2, 0x7f07005b + invoke-static {p2}, Lru/vtosters/lite/utils/Themes;->getNavigationWidth(I)I + + move-result p2 + .line 57 invoke-virtual {p1, p2}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I @@ -136,6 +140,10 @@ const p2, 0x7f07005c + invoke-static {p2}, Lru/vtosters/lite/utils/Themes;->getNavigationWidth(I)I + + move-result p2 + .line 58 invoke-virtual {p1, p2}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I @@ -145,6 +153,10 @@ const p2, 0x7f070062 + invoke-static {p2}, Lru/vtosters/lite/utils/Themes;->getNavigationHeight(I)I + + move-result p2 + .line 59 invoke-virtual {p1, p2}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I diff --git a/smali/smali_classes5/com/vtosters/lite/ui/layout/ExpandableBarLayout.smali b/smali/smali_classes5/com/vtosters/lite/ui/layout/ExpandableBarLayout.smali index 12a7c96e4..447b3a6af 100644 --- a/smali/smali_classes5/com/vtosters/lite/ui/layout/ExpandableBarLayout.smali +++ b/smali/smali_classes5/com/vtosters/lite/ui/layout/ExpandableBarLayout.smali @@ -87,6 +87,10 @@ const v0, 0x7f070062 + invoke-static {v0}, Lru/vtosters/lite/utils/Themes;->getNavigationHeight(I)I + + move-result v0 + invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getDimension(I)F move-result p1 @@ -157,6 +161,10 @@ const p2, 0x7f070062 + invoke-static {p2}, Lru/vtosters/lite/utils/Themes;->getNavigationHeight(I)I + + move-result p2 + invoke-virtual {p1, p2}, Landroid/content/res/Resources;->getDimension(I)F move-result p1 @@ -227,6 +235,10 @@ const p2, 0x7f070062 + invoke-static {p2}, Lru/vtosters/lite/utils/Themes;->getNavigationHeight(I)I + + move-result p2 + invoke-virtual {p1, p2}, Landroid/content/res/Resources;->getDimension(I)F move-result p1 @@ -300,6 +312,10 @@ const p2, 0x7f070062 + invoke-static {p2}, Lru/vtosters/lite/utils/Themes;->getNavigationHeight(I)I + + move-result p2 + invoke-virtual {p1, p2}, Landroid/content/res/Resources;->getDimension(I)F move-result p1