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 e1f88bf3b..80ec895f9 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 @@ -11,7 +11,7 @@ import com.vk.fave.fragments.FaveTabFragment; import com.vk.feedlikes.fragments.FeedLikesFragment; import com.vk.menu.MenuFragment; import com.vk.music.fragment.MusicFragment; -import com.vk.newsfeed.Feed2049; +import com.vk.newsfeed.HomeFragment; import com.vk.newsfeed.NewsfeedFragment; import com.vk.notifications.NotificationsContainerFragment; import com.vtosters.lite.R; @@ -79,7 +79,7 @@ public class DockBarManager { File dockbar = new File(getContext().getFilesDir(), "dockbar.json"); if (!dockbar.exists()) { - mSelectedTabs.add(new DockBarTab("tab_news", olddock() ? R.drawable.ic_newsfeed_28 : R.drawable.ic_menu_newsfeed_outline_28, R.string.newsfeed, R.id.tab_news, newfeed() ? Feed2049.b.c() : NewsfeedFragment.class)); + mSelectedTabs.add(new DockBarTab("tab_news", olddock() ? 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", olddock() ? R.drawable.ic_search_28 : R.drawable.ic_menu_search_outline_28, R.string.search, R.id.tab_discover, newfeed() ? DiscoverFragment.class : DiscoverFeedFragment.class)); mSelectedTabs.add(new DockBarTab("tab_messages", olddock() ? 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", olddock() ? R.drawable.ic_menu_notifications_28 : R.drawable.ic_menu_notification_outline_28, R.string.feedback, R.id.tab_feedback, NotificationsContainerFragment.class)); @@ -117,12 +117,12 @@ public class DockBarManager { ); if (newfeed()) { if (tab.fragmentClass == NewsfeedFragment.class) { - tab.fragmentClass = Feed2049.b.c(); + tab.fragmentClass = HomeFragment.class; } else if (tab.fragmentClass == DiscoverFeedFragment.class) { tab.fragmentClass = DiscoverFragment.class; } } else { - if (tab.fragmentClass == Feed2049.b.c()) { + if (tab.fragmentClass == HomeFragment.class) { tab.fragmentClass = NewsfeedFragment.class; } else if (tab.fragmentClass == DiscoverFragment.class) { tab.fragmentClass = DiscoverFeedFragment.class; @@ -143,12 +143,12 @@ public class DockBarManager { ); if (newfeed()) { if (tab.fragmentClass == NewsfeedFragment.class) { - tab.fragmentClass = Feed2049.b.c(); + tab.fragmentClass = HomeFragment.class; } else if (tab.fragmentClass == DiscoverFeedFragment.class) { tab.fragmentClass = DiscoverFragment.class; } } else { - if (tab.fragmentClass == Feed2049.b.c()) { + if (tab.fragmentClass == HomeFragment.class) { tab.fragmentClass = NewsfeedFragment.class; } else if (tab.fragmentClass == DiscoverFragment.class) { tab.fragmentClass = DiscoverFeedFragment.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 c6e8d9b70..1af7f1843 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java @@ -10,15 +10,19 @@ import static ru.vtosters.lite.utils.Preferences.adsstories; import static ru.vtosters.lite.utils.Preferences.authorsrecomm; import static ru.vtosters.lite.utils.Preferences.copyright_post; import static ru.vtosters.lite.utils.Preferences.friendsrecomm; +import static ru.vtosters.lite.utils.Preferences.newfeed; import static ru.vtosters.lite.utils.Preferences.postsrecomm; import com.vk.apps.AppsFragment; import com.vk.core.preference.Preference; +import com.vk.discover.DiscoverFeedFragment; +import com.vk.discover.DiscoverFragment; import com.vk.fave.fragments.FaveTabFragment; import com.vk.menu.MenuFragment; import com.vk.music.fragment.MusicFragment; import com.vk.navigation.NavigatorKeys; -import com.vk.newsfeed.Feed2049; +import com.vk.newsfeed.HomeFragment; +import com.vk.newsfeed.NewsfeedFragment; import com.vk.notifications.NotificationsContainerFragment; import com.vtosters.lite.fragments.GamesFragment; import com.vtosters.lite.fragments.PhotosFragment; @@ -203,7 +207,7 @@ public class Newsfeed { return getInstance().getSelectedTabs().get(0).fragmentClass; } if (string.equals("newsfeed")) { - return Feed2049.b.c(); + return newfeed() ? HomeFragment.class : NewsfeedFragment.class; } if (string.equals("messenger")) { return DialogsFragment.class; @@ -230,7 +234,7 @@ public class Newsfeed { return AppsFragment.class; } if (string.equals("discover")) { - return Feed2049.b.e(); + return newfeed() ? DiscoverFragment.class : DiscoverFeedFragment.class; } if (string.equals("notifications")) { return NotificationsContainerFragment.class;