From 505c60cdf9873342cccf79d03b805ffc610bf040 Mon Sep 17 00:00:00 2001 From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Date: Sat, 5 Oct 2024 18:47:56 -0400 Subject: [PATCH 1/3] feat(YouTube - Hide layout components): Hide Yoodles (YouTube Doodles) --- .../integrations/youtube/patches/YoodlesPatch.java | 14 ++++++++++++++ .../integrations/youtube/settings/Settings.java | 1 + 2 files changed, 15 insertions(+) create mode 100644 app/src/main/java/app/revanced/integrations/youtube/patches/YoodlesPatch.java diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/YoodlesPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/YoodlesPatch.java new file mode 100644 index 0000000000..ca134f64e6 --- /dev/null +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/YoodlesPatch.java @@ -0,0 +1,14 @@ +package app.revanced.integrations.youtube.patches; + +import app.revanced.integrations.youtube.settings.Settings; + +@SuppressWarnings("unused") +public class YoodlesPatch { + + /** + * Injection point. + */ + public static boolean hideYoodles() { + return Settings.HIDE_YOODLES.get(); + } +} 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 index 3826d68a12..7f60ed6f83 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java +++ b/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java @@ -57,6 +57,7 @@ public class Settings extends BaseSettings { public static final BooleanSetting HIDE_ALBUM_CARDS = new BooleanSetting("revanced_hide_album_cards", FALSE, true); public static final BooleanSetting HIDE_ARTIST_CARDS = new BooleanSetting("revanced_hide_artist_cards", FALSE); public static final BooleanSetting HIDE_EXPANDABLE_CHIP = new BooleanSetting("revanced_hide_expandable_chip", TRUE); + public static final BooleanSetting HIDE_YOODLES = new BooleanSetting("revanced_hide_yoodles", TRUE, true); // Alternative thumbnails public static final EnumSetting ALT_THUMBNAIL_HOME = new EnumSetting<>("revanced_alt_thumbnail_home", ThumbnailOption.ORIGINAL); From b2b681c6100c3ebfb40d10f0158a61b0ff634541 Mon Sep 17 00:00:00 2001 From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Date: Sat, 5 Oct 2024 19:06:46 -0400 Subject: [PATCH 2/3] refactor: Move to `Hide layout components` patch --- .../youtube/patches/YoodlesPatch.java | 14 -------------- .../components/LayoutComponentsFilter.java | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 14 deletions(-) delete mode 100644 app/src/main/java/app/revanced/integrations/youtube/patches/YoodlesPatch.java diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/YoodlesPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/YoodlesPatch.java deleted file mode 100644 index ca134f64e6..0000000000 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/YoodlesPatch.java +++ /dev/null @@ -1,14 +0,0 @@ -package app.revanced.integrations.youtube.patches; - -import app.revanced.integrations.youtube.settings.Settings; - -@SuppressWarnings("unused") -public class YoodlesPatch { - - /** - * Injection point. - */ - public static boolean hideYoodles() { - return Settings.HIDE_YOODLES.get(); - } -} diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/components/LayoutComponentsFilter.java b/app/src/main/java/app/revanced/integrations/youtube/patches/components/LayoutComponentsFilter.java index 073505c8be..c2e7b74001 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/components/LayoutComponentsFilter.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/components/LayoutComponentsFilter.java @@ -2,6 +2,7 @@ import static app.revanced.integrations.youtube.shared.NavigationBar.NavigationButton; +import android.graphics.drawable.Drawable; import android.os.Build; import android.view.View; @@ -380,6 +381,21 @@ public static boolean showWatermark() { return !Settings.HIDE_VIDEO_CHANNEL_WATERMARK.get(); } + + private static final boolean HIDE_YOODLES_ENABLED = Settings.HIDE_YOODLES.get(); + + /** + * Injection point. + */ + @Nullable + public static Drawable hideYoodles(Drawable animatedYoodle) { + if (HIDE_YOODLES_ENABLED) { + return null; + } + + return animatedYoodle; + } + private static final boolean HIDE_SHOW_MORE_BUTTON_ENABLED = Settings.HIDE_SHOW_MORE_BUTTON.get(); /** From ece3e281aa125672060de31975eb11e137c3d67d Mon Sep 17 00:00:00 2001 From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Date: Sat, 5 Oct 2024 19:57:44 -0400 Subject: [PATCH 3/3] fix: Set to default off, add disclaimer about filter bar --- .../app/revanced/integrations/youtube/settings/Settings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 7f60ed6f83..77c843686b 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java +++ b/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java @@ -57,7 +57,7 @@ public class Settings extends BaseSettings { public static final BooleanSetting HIDE_ALBUM_CARDS = new BooleanSetting("revanced_hide_album_cards", FALSE, true); public static final BooleanSetting HIDE_ARTIST_CARDS = new BooleanSetting("revanced_hide_artist_cards", FALSE); public static final BooleanSetting HIDE_EXPANDABLE_CHIP = new BooleanSetting("revanced_hide_expandable_chip", TRUE); - public static final BooleanSetting HIDE_YOODLES = new BooleanSetting("revanced_hide_yoodles", TRUE, true); + public static final BooleanSetting HIDE_YOODLES = new BooleanSetting("revanced_hide_yoodles", FALSE, true, "revanced_hide_yoodles_user_dialog_message"); // Alternative thumbnails public static final EnumSetting ALT_THUMBNAIL_HOME = new EnumSetting<>("revanced_alt_thumbnail_home", ThumbnailOption.ORIGINAL);