From 7628ed153d06ff3e593eea1ee3e6056d048efe3d Mon Sep 17 00:00:00 2001
From: inotia00 <108592928+inotia00@users.noreply.github.com>
Date: Thu, 27 Jun 2024 23:38:19 +0900
Subject: [PATCH] feat(YouTube Music): Integrate `Hide double tap overlay
 filter` patch into the `Player components` patch

---
 .../integrations/music/patches/player/PlayerPatch.java       | 5 +++++
 .../app/revanced/integrations/music/settings/Settings.java   | 1 +
 .../java/app/revanced/integrations/shared/utils/Utils.java   | 1 +
 3 files changed, 7 insertions(+)

diff --git a/app/src/main/java/app/revanced/integrations/music/patches/player/PlayerPatch.java b/app/src/main/java/app/revanced/integrations/music/patches/player/PlayerPatch.java
index 09c0c9abd4..c461119288 100644
--- a/app/src/main/java/app/revanced/integrations/music/patches/player/PlayerPatch.java
+++ b/app/src/main/java/app/revanced/integrations/music/patches/player/PlayerPatch.java
@@ -1,5 +1,6 @@
 package app.revanced.integrations.music.patches.player;
 
+import static app.revanced.integrations.shared.utils.Utils.hideViewByRemovingFromParentUnderCondition;
 import static app.revanced.integrations.shared.utils.Utils.hideViewUnderCondition;
 
 import android.annotation.SuppressLint;
@@ -127,6 +128,10 @@ public static void hideAudioVideoSwitchToggle(View view) {
         }
     }
 
+    public static void hideDoubleTapOverlayFilter(View view) {
+        hideViewByRemovingFromParentUnderCondition(Settings.HIDE_DOUBLE_TAP_OVERLAY_FILTER, view);
+    }
+
     public static int hideFullscreenShareButton(int original) {
         return Settings.HIDE_FULLSCREEN_SHARE_BUTTON.get() ? 0 : original;
     }
diff --git a/app/src/main/java/app/revanced/integrations/music/settings/Settings.java b/app/src/main/java/app/revanced/integrations/music/settings/Settings.java
index 82dee5e0f5..7a6f02abf9 100644
--- a/app/src/main/java/app/revanced/integrations/music/settings/Settings.java
+++ b/app/src/main/java/app/revanced/integrations/music/settings/Settings.java
@@ -130,6 +130,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting HIDE_AUDIO_VIDEO_SWITCH_TOGGLE = new BooleanSetting("revanced_hide_audio_video_switch_toggle", FALSE, true);
     public static final BooleanSetting HIDE_COMMENT_CHANNEL_GUIDELINES = new BooleanSetting("revanced_hide_comment_channel_guidelines", TRUE);
     public static final BooleanSetting HIDE_COMMENT_TIMESTAMP_AND_EMOJI_BUTTONS = new BooleanSetting("revanced_hide_comment_timestamp_and_emoji_buttons", FALSE);
+    public static final BooleanSetting HIDE_DOUBLE_TAP_OVERLAY_FILTER = new BooleanSetting("revanced_hide_double_tap_overlay_filter", FALSE, true);
     public static final BooleanSetting HIDE_FULLSCREEN_SHARE_BUTTON = new BooleanSetting("revanced_hide_fullscreen_share_button", FALSE, true);
     public static final BooleanSetting REMEMBER_REPEAT_SATE = new BooleanSetting("revanced_remember_repeat_state", TRUE);
     public static final BooleanSetting REMEMBER_SHUFFLE_SATE = new BooleanSetting("revanced_remember_shuffle_state", TRUE);
diff --git a/app/src/main/java/app/revanced/integrations/shared/utils/Utils.java b/app/src/main/java/app/revanced/integrations/shared/utils/Utils.java
index 846b5484c1..c9979a4702 100644
--- a/app/src/main/java/app/revanced/integrations/shared/utils/Utils.java
+++ b/app/src/main/java/app/revanced/integrations/shared/utils/Utils.java
@@ -111,6 +111,7 @@ public static void hideViewByRemovingFromParentUnderCondition(BooleanSetting con
 
     public static void hideViewByRemovingFromParentUnderCondition(boolean condition, View view) {
         if (!condition) return;
+        if (view == null) return;
         if (!(view.getParent() instanceof ViewGroup viewGroup))
             return;