From 7e7f091ab5ab380ccf2d66eb44aa7a9a6ddc7382 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Sun, 19 Jun 2022 15:32:24 +0300 Subject: [PATCH] fixes --- .../ui/fragments/dockbar/DockBarManager.java | 19 +++++++++++-------- .../java/ru/vtosters/lite/utils/Newsfeed.java | 4 ++-- 2 files changed, 13 insertions(+), 10 deletions(-) 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 f7c283ed7..ec8fb6f0e 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 @@ -13,9 +13,11 @@ import com.vk.discover.DiscoverFragment; import com.vk.fave.fragments.FaveTabFragment; import com.vk.feedlikes.d.FeedLikesFragment; import com.vk.menu.MenuFragment; +import com.vk.music.fragment.MusicFragment; import com.vk.newsfeed.HomeFragment; import com.vk.newsfeed.NewsfeedFragment; import com.vk.notifications.NotificationsContainerFragment; +import com.vk.search.fragment.GroupsSearchFragment; import com.vtosters.lite.fragments.GamesFragment; import com.vtosters.lite.fragments.PhotosFragment; import com.vtosters.lite.fragments.ProfileFragment; @@ -24,6 +26,7 @@ import com.vtosters.lite.fragments.gifts.BirthdaysFragment; import com.vtosters.lite.fragments.lives.LivesPostListFragment; import com.vtosters.lite.fragments.money.MoneyTransfersFragment; import com.vtosters.lite.fragments.p2.DocumentsViewFragment; + import com.vtosters.lite.fragments.t2.c.DialogsFragment; import com.vtosters.lite.fragments.y2.VideosFragment; @@ -43,7 +46,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import ru.vtosters.lite.R; +import com.vtosters.lite.R; public class DockBarManager { public static final int MIN_SELECTED_TABS_LIMIT = 3; @@ -82,27 +85,27 @@ public class DockBarManager { if (!dockbar.exists()) { if(vkme()) { mSelectedTabs.add(new DockBarTab("tab_settings", R.drawable.ic_settings_24, R.string.menu_settings, R.id.menu_settings, useNewSettings())); - if(vkme_notifs()) mSelectedTabs.add(new DockBarTab("tab_feedback", oldicons() ? R.drawable.ic_menu_notifications_28 : R.drawable.ic_menu_notification_outline_28, R.string.feedback, R.id.tab_feedback, NotificationsContainerFragment.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)); + if(vkme_notifs()) mSelectedTabs.add(new DockBarTab("tab_feedback", oldicons() ? R.drawable.ic_notification_24 : R.drawable.ic_menu_notification_outline_28, R.string.feedback, R.id.tab_feedback, NotificationsContainerFragment.class)); + mSelectedTabs.add(new DockBarTab("tab_messages", oldicons() ? R.drawable.ic_message_24 : R.drawable.ic_message_outline_24, 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)); - mSelectedTabs.add(new DockBarTab("tab_feedback", oldicons() ? R.drawable.ic_menu_notifications_28 : R.drawable.ic_menu_notification_outline_28, R.string.feedback, R.id.tab_feedback, NotificationsContainerFragment.class)); + mSelectedTabs.add(new DockBarTab("tab_discover", oldicons() ? R.drawable.ic_menu_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_message_24 : R.drawable.ic_message_outline_24, R.string.messages, R.id.tab_messages, DialogsFragment.class)); + mSelectedTabs.add(new DockBarTab("tab_feedback", oldicons() ? R.drawable.ic_notification_24 : R.drawable.ic_menu_notification_outline_28, R.string.feedback, R.id.tab_feedback, NotificationsContainerFragment.class)); mSelectedTabs.add(new DockBarTab("tab_menu", oldicons() ? R.drawable.ic_menu_more_28 : R.drawable.ic_menu_more_outline_28, R.string.menu, R.id.tab_menu, MenuFragment.class)); mDisabledTabs.add(new DockBarTab("tab_friends", R.drawable.ic_user_24, R.string.friends, R.id.menu_friends, FriendsFragment.class)); - mDisabledTabs.add(new DockBarTab("tab_groups", R.drawable.ic_users_24, R.string.groups, R.id.menu_groups, GroupsFragment.class)); + mDisabledTabs.add(new DockBarTab("tab_groups", R.drawable.ic_users_24, R.string.groups, R.id.menu_groups, GroupsSearchFragment.class)); mDisabledTabs.add(new DockBarTab("tab_photos", R.drawable.ic_camera_24, R.string.photos, R.id.menu_photos, PhotosFragment.class)); mDisabledTabs.add(new DockBarTab("tab_audios", R.drawable.ic_music_24, R.string.music, R.id.menu_audios, MusicFragment.class)); mDisabledTabs.add(new DockBarTab("tab_videos", R.drawable.ic_video_24, R.string.videos, R.id.menu_videos, VideosFragment.class)); mDisabledTabs.add(new DockBarTab("tab_lives", R.drawable.ic_live_filter_24dp, R.string.sett_live, R.id.menu_lives, LivesPostListFragment.class)); mDisabledTabs.add(new DockBarTab("tab_games", R.drawable.ic_games_24, R.string.games, R.id.menu_games, GamesFragment.class)); mDisabledTabs.add(new DockBarTab("tab_liked", R.drawable.ic_menu_like_24, R.string.sett_likes, R.id.menu_feed_likes, FeedLikesFragment.class)); - mDisabledTabs.add(new DockBarTab("tab_fave", R.drawable.ic_favorite_24, R.string.exo_track_selection_title_video_res_0x7f11031e, R.id.menu_fave, FaveTabFragment.class)); + mDisabledTabs.add(new DockBarTab("tab_fave", R.drawable.ic_favorite_24, R.string.video, R.id.menu_fave, FaveTabFragment.class)); mDisabledTabs.add(new DockBarTab("tab_documents", R.drawable.ic_document_24, R.string.docs, R.id.menu_documents, DocumentsViewFragment.class)); mDisabledTabs.add(new DockBarTab("tab_payments", R.drawable.ic_money_transfer_24, R.string.money_transfer_money_transfers, R.id.menu_payments, MoneyTransfersFragment.class)); mDisabledTabs.add(new DockBarTab("tab_vk_apps", R.drawable.ic_services_24, R.string.menu_apps, R.id.menu_vk_apps, AppsFragment.class)); diff --git a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java index b84ce109e..ba805f402 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java @@ -26,6 +26,7 @@ import com.vk.navigation.NavigatorKeys; import com.vk.newsfeed.HomeFragment; import com.vk.newsfeed.NewsfeedFragment; import com.vk.notifications.NotificationsContainerFragment; +import com.vk.search.fragment.GroupsSearchFragment; import com.vtosters.lite.fragments.GamesFragment; import com.vtosters.lite.fragments.PhotosFragment; import com.vtosters.lite.fragments.ProfileFragment; @@ -34,7 +35,6 @@ import com.vtosters.lite.fragments.gifts.BirthdaysFragment; import com.vtosters.lite.fragments.lives.LivesTabsFragment; import com.vtosters.lite.fragments.money.MoneyTransfersFragment; import com.vtosters.lite.fragments.p2.DocumentsViewFragment; -import com.vtosters.lite.fragments.s2.AllGroupsFragment; import com.vtosters.lite.fragments.t2.c.DialogsFragment; import com.vtosters.lite.fragments.y2.VideosFragment; @@ -199,7 +199,7 @@ public class Newsfeed { case "messenger": return DialogsFragment.class; case "groups": - return AllGroupsFragment.class; + return GroupsSearchFragment.class; case "music": return MusicFragment.class; case "friends":