From b9d1826c99c748bb03a0995a089e404ac16f6ade Mon Sep 17 00:00:00 2001
From: qnblackcat <qnblackcat@gmail.com>
Date: Tue, 13 Feb 2024 13:36:09 +0700
Subject: [PATCH] prepare for uYou v3.0.2+

---
 Sources/YTCastConfirm.xm    | 21 ---------------------
 Sources/YTStockVolumeHUD.xm | 21 ---------------------
 Sources/uYouPlus.xm         | 21 ++++++++++++++-------
 Sources/uYouPlusSettings.xm |  4 ++--
 4 files changed, 16 insertions(+), 51 deletions(-)
 delete mode 100644 Sources/YTCastConfirm.xm
 delete mode 100644 Sources/YTStockVolumeHUD.xm

diff --git a/Sources/YTCastConfirm.xm b/Sources/YTCastConfirm.xm
deleted file mode 100644
index 7586695..0000000
--- a/Sources/YTCastConfirm.xm
+++ /dev/null
@@ -1,21 +0,0 @@
-#import <YouTubeHeader/YTAlertView.h>
-#import "uYouPlus.h"
-
-extern NSBundle *uYouPlusBundle();
-
-// YTCastConfirm: https://github.com/JamieBerghmans/YTCastConfirm
-%hook MDXPlaybackRouteButtonController
-- (void)didPressButton:(id)arg1 {
-    if (IS_ENABLED(@"castConfirm_enabled")) {
-        NSBundle *tweakBundle = uYouPlusBundle();
-        YTAlertView *alertView = [%c(YTAlertView) confirmationDialogWithAction:^{
-            %orig;
-        } actionTitle:LOC(@"MSG_YES")];
-        alertView.title = LOC(@"CASTING");
-        alertView.subtitle = LOC(@"MSG_ARE_YOU_SURE");
-        [alertView show];
-	} else {
-        return %orig;
-    }
-}
-%end
\ No newline at end of file
diff --git a/Sources/YTStockVolumeHUD.xm b/Sources/YTStockVolumeHUD.xm
deleted file mode 100644
index 7f4a5bc..0000000
--- a/Sources/YTStockVolumeHUD.xm
+++ /dev/null
@@ -1,21 +0,0 @@
-#import "uYouPlus.h"
-
-%group YTStockVolumeHUD // https://github.com/lilacvibes/YTStockVolumeHUD
-%hook YTVolumeBarView
-- (void)volumeChanged:(id)arg1 {
-	%orig(nil);
-}
-%end
-
-%hook UIApplication 
-- (void)setSystemVolumeHUDEnabled:(BOOL)arg1 forAudioCategory:(id)arg2 {
-	%orig(true, arg2);
-}
-%end
-%end
-
-%ctor {
-    if (IS_ENABLED(@"stockVolumeHUD_enabled")) {
-        %init(YTStockVolumeHUD);
-    }
-}
\ No newline at end of file
diff --git a/Sources/uYouPlus.xm b/Sources/uYouPlus.xm
index 1f48f0a..ad364b0 100644
--- a/Sources/uYouPlus.xm
+++ b/Sources/uYouPlus.xm
@@ -54,7 +54,12 @@ NSBundle *tweakBundle = uYouPlusBundle();
 // See YTMiniPlayerEnabler.x
 
 // Use stock iOS volume HUD
-// See YTStockVolumeHUD.xm
+// Use YTColdConfig's method instead of YTStockVolumeHUD.xm, see https://x.com/PoomSmart/status/1756904290445332653
+%hook YTColdConfig
+- (BOOL)iosUseSystemVolumeControlInFullscreen {
+    return IS_ENABLED(@"stockVolumeHUD_enabled") ? YES : %orig;
+}
+%end
 
 # pragma mark - Video control overlay options
 
@@ -102,12 +107,13 @@ NSBundle *tweakBundle = uYouPlusBundle();
 %end
 
 // Replace next and previous buttons with fast forward and rewind
-%group gReplacePreviousAndNextButton
-%hook YTColdConfig
-- (BOOL)replaceNextPaddleWithFastForwardButtonForSingletonVods { return YES; }
-- (BOOL)replacePreviousPaddleWithRewindButtonForSingletonVods { return YES; }
-%end
-%end
+// Not needed anymore because uYou v3.0.2+ added this features
+// %group gReplacePreviousAndNextButton
+// %hook YTColdConfig
+// - (BOOL)replaceNextPaddleWithFastForwardButtonForSingletonVods { return YES; }
+// - (BOOL)replacePreviousPaddleWithRewindButtonForSingletonVods { return YES; }
+// %end
+// %end
 
 // Bring back the red progress bar - Broken?!
 %hook YTInlinePlayerBarContainerView
@@ -171,6 +177,7 @@ NSBundle *tweakBundle = uYouPlusBundle();
 
 // YTCastConfirm
 // See YTCastConfirm.xm
+// Not needed anymore because uYou v3.0.2+ added this features
 
 // Disable hints - https://github.com/LillieH001/YouTube-Reborn/blob/v4/
 %group gDisableHints
diff --git a/Sources/uYouPlusSettings.xm b/Sources/uYouPlusSettings.xm
index bab01b4..abae342 100644
--- a/Sources/uYouPlusSettings.xm
+++ b/Sources/uYouPlusSettings.xm
@@ -168,7 +168,7 @@ extern NSBundle *uYouPlusBundle();
     SWITCH_ITEM2(LOC(@"SNAP_TO_CHAPTER"), LOC(@"SNAP_TO_CHAPTER_DESC"), @"snapToChapter_enabled");
     SWITCH_ITEM2(LOC(@"PINCH_TO_ZOOM"), LOC(@"PINCH_TO_ZOOM_DESC"), @"pinchToZoom_enabled");
     SWITCH_ITEM(LOC(@"YT_MINIPLAYER"), LOC(@"YT_MINIPLAYER_DESC"), @"ytMiniPlayer_enabled");
-    SWITCH_ITEM(LOC(@"STOCK_VOLUME_HUD"), LOC(@"STOCK_VOLUME_HUD_DESC"), @"stockVolumeHUD_enabled");
+    SWITCH_ITEM2(LOC(@"STOCK_VOLUME_HUD"), LOC(@"STOCK_VOLUME_HUD_DESC"), @"stockVolumeHUD_enabled");
 
     # pragma mark - Video controls overlay options
     SECTION_HEADER(LOC(@"VIDEO_CONTROLS_OVERLAY_OPTIONS"));
@@ -179,7 +179,7 @@ extern NSBundle *uYouPlusBundle();
     SWITCH_ITEM(LOC(@"HIDE_PAID_PROMOTION_CARDS"), LOC(@"HIDE_PAID_PROMOTION_CARDS_DESC"), @"hidePaidPromotionCard_enabled");
     SWITCH_ITEM2(LOC(@"HIDE_CHANNEL_WATERMARK"), LOC(@"HIDE_CHANNEL_WATERMARK_DESC"), @"hideChannelWatermark_enabled");
     SWITCH_ITEM(LOC(@"HIDE_PREVIOUS_AND_NEXT_BUTTON"), LOC(@"HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC"), @"hidePreviousAndNextButton_enabled");
-    SWITCH_ITEM2(LOC(@"REPLACE_PREVIOUS_NEXT_BUTTON"), LOC(@"REPLACE_PREVIOUS_NEXT_BUTTON_DESC"), @"replacePreviousAndNextButton_enabled");
+    // SWITCH_ITEM2(LOC(@"REPLACE_PREVIOUS_NEXT_BUTTON"), LOC(@"REPLACE_PREVIOUS_NEXT_BUTTON_DESC"), @"replacePreviousAndNextButton_enabled");
     SWITCH_ITEM2(LOC(@"RED_PROGRESS_BAR"), LOC(@"RED_PROGRESS_BAR_DESC"), @"redProgressBar_enabled");
     SWITCH_ITEM(LOC(@"HIDE_HOVER_CARD"), LOC(@"HIDE_HOVER_CARD_DESC"), @"hideHoverCards_enabled");
     SWITCH_ITEM2(LOC(@"HIDE_RIGHT_PANEL"), LOC(@"HIDE_RIGHT_PANEL_DESC"), @"hideRightPanel_enabled");