From e2c526e2ba14500071a0c91e270c943e5807c5aa Mon Sep 17 00:00:00 2001
From: Bryce Hackel <34104885+bhackel@users.noreply.github.com>
Date: Sun, 7 Jul 2024 01:03:56 -0700
Subject: [PATCH] Fix headers

---
 .gitmodules          |  6 +++---
 Tweaks/YouTubeHeader |  2 +-
 YTLitePlus.h         | 10 ++++++----
 YTLitePlus.xm        |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index c42e546..236dae9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,9 +8,6 @@
 	path = Tweaks/Return-YouTube-Dislikes
 	url = https://github.com/arichornloverALT/Return-YouTube-Dislikes.git
 	branch = uYouEnhanced
-[submodule "Tweaks/YouTubeHeader"]
-	path = Tweaks/YouTubeHeader
-	url = https://github.com/arichornloverALT/YouTubeHeader.git
 [submodule "Tweaks/Alderis"]
 	path = Tweaks/Alderis
 	url = https://github.com/hbang/Alderis.git
@@ -50,3 +47,6 @@
 [submodule "Tweaks/YouGroupSettings"]
 	path = Tweaks/YouGroupSettings
 	url = https://github.com/arichornloverALT/YouGroupSettings.git
+[submodule "Tweaks/YouTubeHeader"]
+	path = Tweaks/YouTubeHeader
+	url = https://github.com/PoomSmart/YouTubeHeader.git
diff --git a/Tweaks/YouTubeHeader b/Tweaks/YouTubeHeader
index 2a9bef8..2f41196 160000
--- a/Tweaks/YouTubeHeader
+++ b/Tweaks/YouTubeHeader
@@ -1 +1 @@
-Subproject commit 2a9bef8e9dbcd379c860fb1a07f7449076d58c41
+Subproject commit 2f411967bfe9f7b74ed58256b34992f132207d4c
diff --git a/YTLitePlus.h b/YTLitePlus.h
index 508adf6..28c764e 100644
--- a/YTLitePlus.h
+++ b/YTLitePlus.h
@@ -33,6 +33,11 @@
 #import "Tweaks/YouTubeHeader/YTVideoWithContextNode.h"
 #import "Tweaks/YouTubeHeader/ELMCellNode.h"
 #import "Tweaks/YouTubeHeader/ELMNodeController.h"
+#import "Tweaks/YouTubeHeader/YTMainAppVideoPlayerOverlayViewController.h"
+#import "Tweaks/YouTubeHeader/YTInlinePlayerBarContainerView.h"
+#import "Tweaks/YouTubeHeader/YTWatchViewController.h"
+#import "Tweaks/YouTubeHeader/YTWatchPullToFullController.h"
+#import "Tweaks/YouTubeHeader/YTPlayerBarController.h"
 
 #define LOC(x) [tweakBundle localizedStringForKey:x value:nil table:nil]
 #define YT_BUNDLE_ID @"com.google.ios.youtube"
@@ -73,9 +78,6 @@
 - (void)confirmAlertDidPressConfirm;
 @end 
 
-@interface YTMainAppControlsOverlayView: UIView
-@end
-
 @interface YTTransportControlsButtonView : UIView
 @end
 
@@ -112,7 +114,7 @@
 @end
 
 // BigYTMiniPlayer
-@interface YTMainAppVideoPlayerOverlayView : UIView
+@interface YTMainAppVideoPlayerOverlayView (YTLitePlus)
 - (UIViewController *)_viewControllerForAncestor;
 @end
 
diff --git a/YTLitePlus.xm b/YTLitePlus.xm
index 4b5939b..a34b5e1 100644
--- a/YTLitePlus.xm
+++ b/YTLitePlus.xm
@@ -453,7 +453,7 @@ BOOL isTabSelected = NO;
 %hook YTWatchPullToFullController
 - (BOOL)shouldRecognizeOverscrollEventsFromWatchOverscrollController:(id)arg1 {
     // Get the current player orientation
-    YTWatchViewController *watchViewController = self.playerViewSource;
+    YTWatchViewController *watchViewController = (YTWatchViewController *) self.playerViewSource;
     NSUInteger allowedFullScreenOrientations = [watchViewController allowedFullScreenOrientations];
     // Check if the current player orientation is portrait
     if (allowedFullScreenOrientations == UIInterfaceOrientationMaskAllButUpsideDown