From d59297d348bca25c11da345d79b70e8d47ab960b Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Thu, 15 Sep 2022 16:15:55 +0300
Subject: [PATCH] deleted old video frag

---
 .../main/java/ru/vtosters/lite/hooks/StartFragmentHook.java  | 3 +--
 .../ru/vtosters/lite/ui/components/DockBarEditorManager.java | 3 +--
 app/src/main/java/ru/vtosters/lite/utils/Preferences.java    | 4 ----
 smali/res/xml/preferences_media.xml                          | 5 -----
 .../com/vtosters/lite/fragments/y2/VideosFragment$f.smali    | 2 +-
 5 files changed, 3 insertions(+), 14 deletions(-)

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 7ab245278..f62d29ae6 100644
--- a/app/src/main/java/ru/vtosters/lite/hooks/StartFragmentHook.java
+++ b/app/src/main/java/ru/vtosters/lite/hooks/StartFragmentHook.java
@@ -6,7 +6,6 @@ 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.videonewcatalog;
 import static ru.vtosters.lite.utils.Preferences.vkme;
 
 import com.vk.apps.AppsFragment;
@@ -52,7 +51,7 @@ public class StartFragmentHook {
             case "photos":
                 return PhotosFragment.class;
             case "videos":
-                return videonewcatalog() ? VideoCatalogFragment.class : VideosFragment.class;
+                return VideoCatalogFragment.class;
             case "settings":
                 return useNewSettings();
             case "apps":
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 8b9b8af08..013544d3e 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,7 +6,6 @@ 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.videonewcatalog;
 import static ru.vtosters.lite.utils.Preferences.vkme;
 import static ru.vtosters.lite.utils.Preferences.vkme_notifs;
 
@@ -209,7 +208,7 @@ public class DockBarEditorManager {
                         R.drawable.ic_video_outline_28,
                         R.string.videos,
                         R.id.menu_videos,
-                        videonewcatalog() ? VideoCatalogFragment.class : VideosFragment.class);
+                        VideoCatalogFragment.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 d8fdc6bb2..c45028ada 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
@@ -197,10 +197,6 @@ public class Preferences {
         return getBoolValue("milkshake", true);
     }
 
-    public static boolean videonewcatalog() {
-        return getBoolValue("videonewcatalog", 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 d5754912c..86247d92f 100644
--- a/smali/res/xml/preferences_media.xml
+++ b/smali/res/xml/preferences_media.xml
@@ -60,11 +60,6 @@
         <Preference
             android:key="download_video"
             android:title="@string/vtl_download_video_title" />
-        <com.vtosters.lite.ui.MaterialSwitchPreference
-            android:defaultValue="true"
-            android:key="videonewcatalog"
-            android:summary="@string/videonewcatalog_summ"
-            android:title="@string/videonewcatalog_title" />
         <com.vtosters.lite.ui.MaterialSwitchPreference
             android:defaultValue="false"
             android:key="isEnableExternalOpening"
diff --git a/smali/smali_classes5/com/vtosters/lite/fragments/y2/VideosFragment$f.smali b/smali/smali_classes5/com/vtosters/lite/fragments/y2/VideosFragment$f.smali
index 3c669bc13..9785e53b9 100644
--- a/smali/smali_classes5/com/vtosters/lite/fragments/y2/VideosFragment$f.smali
+++ b/smali/smali_classes5/com/vtosters/lite/fragments/y2/VideosFragment$f.smali
@@ -19,7 +19,7 @@
     .locals 1
 
     .line 1
-    const-class v0, Lcom/vtosters/lite/fragments/y2/VideosFragment;
+    const-class v0, Lcom/vtosters/lite/fragments/y2/VideoCatalogFragment;
 
     invoke-direct {p0, v0}, Lcom/vk/navigation/Navigator;-><init>(Ljava/lang/Class;)V