feat(YouTube): Add support version 19.25.39, drop support version `…

…19.23.40`
anddea · Jul 5, 2024 · dd95309 · dd95309
1 parent 2383172
commit dd95309
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/general/MiniplayerPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/general/MiniplayerPatch.java
@@ -4,7 +4,6 @@
 import static app.revanced.integrations.youtube.patches.general.MiniplayerPatch.MiniplayerType.MODERN_2;
 import static app.revanced.integrations.youtube.patches.general.MiniplayerPatch.MiniplayerType.MODERN_3;
 import static app.revanced.integrations.youtube.patches.general.MiniplayerPatch.MiniplayerType.ORIGINAL;
-import static app.revanced.integrations.youtube.patches.utils.PatchStatus.MiniplayerType1920;
 import static app.revanced.integrations.youtube.utils.ExtendedUtils.validateValue;
 
 import android.view.View;
@@ -72,7 +71,7 @@ public boolean isModern() {
             CURRENT_TYPE == MODERN_1 && Settings.MINIPLAYER_DRAG_AND_DROP.get();
 
     private static final boolean HIDE_EXPAND_CLOSE_ENABLED =
-            ((!MiniplayerType1920() && CURRENT_TYPE == MODERN_1) || CURRENT_TYPE == MODERN_3) && Settings.MINIPLAYER_HIDE_EXPAND_CLOSE.get();
+            (CURRENT_TYPE == MODERN_1 || CURRENT_TYPE == MODERN_3) && Settings.MINIPLAYER_HIDE_EXPAND_CLOSE.get();
 
     private static final boolean HIDE_SUBTEXT_ENABLED =
             (CURRENT_TYPE == MODERN_1 || CURRENT_TYPE == MODERN_3) && Settings.MINIPLAYER_HIDE_SUBTEXT.get();
@@ -155,10 +154,11 @@ public static void hideMiniplayerRewindForward(ImageView view) {
     /**
      * Injection point.
      */
-    public static void hideMiniplayerSubTexts(View view) {
+    public static boolean hideMiniplayerSubTexts(View view) {
         // Different subviews are passed in, but only TextView and layouts are of interest here.
         final boolean hideView = HIDE_SUBTEXT_ENABLED && (view instanceof TextView || view instanceof LinearLayout);
         Utils.hideViewByRemovingFromParentUnderCondition(hideView, view);
+        return hideView || view == null;
     }
 
     /**

diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/utils/PatchStatus.java b/app/src/main/java/app/revanced/integrations/youtube/patches/utils/PatchStatus.java
@@ -27,9 +27,4 @@ public static boolean ToolBarComponents() {
         return false;
     }
 
-    public static boolean MiniplayerType1920() {
-        // Replace this with true if the Miniplayer patch succeeds in YouTube 19.20.35+
-        return false;
-    }
-
 }
diff --git a/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java b/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java
@@ -9,7 +9,6 @@
 import static app.revanced.integrations.youtube.patches.general.MiniplayerPatch.MiniplayerType;
 import static app.revanced.integrations.youtube.patches.general.MiniplayerPatch.MiniplayerType.MODERN_1;
 import static app.revanced.integrations.youtube.patches.general.MiniplayerPatch.MiniplayerType.MODERN_3;
-import static app.revanced.integrations.youtube.patches.utils.PatchStatus.MiniplayerType1920;
 import static app.revanced.integrations.youtube.sponsorblock.objects.CategoryBehaviour.MANUAL_SKIP;
 import static app.revanced.integrations.youtube.sponsorblock.objects.CategoryBehaviour.SKIP_AUTOMATICALLY;
 import static app.revanced.integrations.youtube.sponsorblock.objects.CategoryBehaviour.SKIP_AUTOMATICALLY_ONCE;
@@ -158,11 +157,7 @@ public class Settings extends BaseSettings {
     // PreferenceScreen: General - Miniplayer
     public static final EnumSetting<MiniplayerType> MINIPLAYER_TYPE = new EnumSetting<>("revanced_miniplayer_type", MiniplayerType.ORIGINAL, true);
     public static final BooleanSetting MINIPLAYER_DRAG_AND_DROP = new BooleanSetting("revanced_miniplayer_enable_drag_and_drop", FALSE, true, MINIPLAYER_TYPE.availability(MODERN_1));
-    public static final BooleanSetting MINIPLAYER_HIDE_EXPAND_CLOSE = new BooleanSetting("revanced_miniplayer_hide_expand_close", FALSE, true,
-            MiniplayerType1920()
-                    ? MINIPLAYER_TYPE.availability(MODERN_3)
-                    : MINIPLAYER_TYPE.availability(MODERN_1, MODERN_3)
-    );
+    public static final BooleanSetting MINIPLAYER_HIDE_EXPAND_CLOSE = new BooleanSetting("revanced_miniplayer_hide_expand_close", FALSE, true, MINIPLAYER_TYPE.availability(MODERN_1, MODERN_3));
     public static final BooleanSetting MINIPLAYER_HIDE_SUBTEXT = new BooleanSetting("revanced_miniplayer_hide_subtext", FALSE, true, MINIPLAYER_TYPE.availability(MODERN_1, MODERN_3));
     public static final BooleanSetting MINIPLAYER_HIDE_REWIND_FORWARD = new BooleanSetting("revanced_miniplayer_hide_rewind_forward", FALSE, true, MINIPLAYER_TYPE.availability(MODERN_1));
     public static final IntegerSetting MINIPLAYER_OPACITY = new IntegerSetting("revanced_miniplayer_opacity", 100, true, MINIPLAYER_TYPE.availability(MODERN_1));