diff --git a/app/src/main/java/ru/vtosters/lite/hooks/StartFragmentHook.java b/app/src/main/java/ru/vtosters/lite/hooks/StartFragmentHook.java index 0d4ee604f..6460e892a 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/StartFragmentHook.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/StartFragmentHook.java @@ -5,6 +5,7 @@ import static ru.vtosters.lite.utils.Preferences.getBoolValue; import static ru.vtosters.lite.utils.Preferences.milkshake; import static ru.vtosters.lite.utils.Preferences.superapp; import static ru.vtosters.lite.utils.Preferences.useNewSettings; +import static ru.vtosters.lite.utils.Preferences.videoewcatalog; import static ru.vtosters.lite.utils.Preferences.vkme; import com.vk.apps.AppsFragment; @@ -27,6 +28,7 @@ import com.vtosters.lite.fragments.money.MoneyTransfersFragment; import com.vtosters.lite.fragments.p2.DocumentsViewFragment; import com.vtosters.lite.fragments.s2.GroupsFragment1; import com.vtosters.lite.fragments.t2.c.DialogsFragment; +import com.vtosters.lite.fragments.y2.VideoCatalogFragment; import com.vtosters.lite.fragments.y2.VideosFragment; import com.vtosters.lite.general.fragments.GamesFragment; import com.vtosters.lite.general.fragments.PhotosFragment; @@ -50,7 +52,7 @@ public class StartFragmentHook{ case "photos": return PhotosFragment.class; case "videos": - return VideosFragment.class; + return videoewcatalog() ? VideoCatalogFragment.class : VideosFragment.class; case "settings": return useNewSettings(); case "apps": diff --git a/app/src/main/java/ru/vtosters/lite/hooks/TogglesHook.java b/app/src/main/java/ru/vtosters/lite/hooks/TogglesHook.java index ccedd4cb2..d325ef40a 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/TogglesHook.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/TogglesHook.java @@ -47,7 +47,6 @@ public class TogglesHook{ case FEATURE_MOZJPEG: case FEATURE_MUSIC_ARTIST_CATALOG: case FEATURE_MUSIC_NEW_CATALOG: - case FEATURE_MUSIC_STOP_PLAYER_ON_TASK_REMOVAL: case FEATURE_NARRATIVE_SNIPPET_TYPE: case FEATURE_NEWS_GAMES_IN_DISCOVER: case FEATURE_NEWS_HEADER_SCROLL: @@ -144,8 +143,6 @@ public class TogglesHook{ return postsredesign(); case FEATURE_IMAGE_QUALITY_UPGRADE: return !getBoolValue("compressPhotos", true); - case FEATURE_MUSIC_STOP_PLAYER_ON_TASK_REMOVAL: - return getBoolValue("musictask", false); case FEATURE_MENU_GAMES_CAROUSEL: return miniapps(); default: diff --git a/app/src/main/java/ru/vtosters/lite/ui/components/DockBarEditorManager.java b/app/src/main/java/ru/vtosters/lite/ui/components/DockBarEditorManager.java index 1699de71e..5802dec57 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/components/DockBarEditorManager.java +++ b/app/src/main/java/ru/vtosters/lite/ui/components/DockBarEditorManager.java @@ -6,6 +6,7 @@ import static ru.vtosters.lite.utils.Preferences.getBoolValue; import static ru.vtosters.lite.utils.Preferences.milkshake; import static ru.vtosters.lite.utils.Preferences.superapp; import static ru.vtosters.lite.utils.Preferences.useNewSettings; +import static ru.vtosters.lite.utils.Preferences.videoewcatalog; import static ru.vtosters.lite.utils.Preferences.vkme; import static ru.vtosters.lite.utils.Preferences.vkme_notifs; @@ -32,6 +33,7 @@ import com.vtosters.lite.fragments.money.MoneyTransfersFragment; import com.vtosters.lite.fragments.p2.DocumentsViewFragment; import com.vtosters.lite.fragments.s2.GroupsFragment1; import com.vtosters.lite.fragments.t2.c.DialogsFragment; +import com.vtosters.lite.fragments.y2.VideoCatalogFragment; import com.vtosters.lite.fragments.y2.VideosFragment; import com.vtosters.lite.general.fragments.GamesFragment; import com.vtosters.lite.general.fragments.PhotosFragment; @@ -196,7 +198,7 @@ public class DockBarEditorManager { R.drawable.ic_video_outline_28, R.string.videos, R.id.menu_videos, - VideosFragment.class); + videoewcatalog() ? VideoCatalogFragment.class : VideosFragment.class); case "tab_lives": return DockBarTab.valuesOf( "tab_lives", 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 3e398899f..1e86df56c 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java @@ -214,6 +214,10 @@ public class Preferences{ return getBoolValue("musicnewcatalog", true); } + public static boolean videoewcatalog(){ + return getBoolValue("videoewcatalog", true); + } + public static boolean postsredesign(){ return getBoolValue("postsredesign", true); } diff --git a/smali/res/xml/preferences_media.xml b/smali/res/xml/preferences_media.xml index d58653716..0dbc1e2a9 100644 --- a/smali/res/xml/preferences_media.xml +++ b/smali/res/xml/preferences_media.xml @@ -37,11 +37,6 @@ android:title="@string/sett_compress_videos" /> - +