From 620d3cbb99fd3c132bf6fd0f3ccf72457a689abb Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 18 Mar 2024 06:42:16 +0000 Subject: [PATCH 1/8] updated submodules --- Tweaks/YouTubeHeader | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tweaks/YouTubeHeader b/Tweaks/YouTubeHeader index 3031da8..84114ea 160000 --- a/Tweaks/YouTubeHeader +++ b/Tweaks/YouTubeHeader @@ -1 +1 @@ -Subproject commit 3031da85418ae89108850e9727e5d56653c4dae4 +Subproject commit 84114ea8a14cedaa2d70b711c19f4c9b8e96c776 From 068a3c3bd533357c70c455704ded3ceaa8155a00 Mon Sep 17 00:00:00 2001 From: Bryce Hackel <34104885+bhackel@users.noreply.github.com> Date: Mon, 18 Mar 2024 01:45:06 -0700 Subject: [PATCH 2/8] Add hide fullscreen buttons --- Sources/uYouPlus.xm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Sources/uYouPlus.xm b/Sources/uYouPlus.xm index 048285d..6f18ffa 100644 --- a/Sources/uYouPlus.xm +++ b/Sources/uYouPlus.xm @@ -509,6 +509,17 @@ static NSString *accessGroupID() { } %end +// Hide fullscreen actions buttons at the bottom - @bhackel +%hook YTFullscreenActionsView +- (void)layoutSubviews { + %orig; + if (IS_ENABLED(@"hideFullscreenActions_enabled")) { + self.fullscreenActionsButton.hidden = YES; + self.fullscreenActionsButton.frame = CGRectZero; + } +} +%end + # pragma mark - uYouPlus // Video Player Options // Skips content warning before playing *some videos - @PoomSmart From 70087d053efec0edda9c131893c60c4d93e29b89 Mon Sep 17 00:00:00 2001 From: Bryce Hackel <34104885+bhackel@users.noreply.github.com> Date: Mon, 18 Mar 2024 14:00:25 -0700 Subject: [PATCH 3/8] Revert default SDK. Add automated SDK change RYD does not build on 17.2, staying on 16.2 --- .github/workflows/buildapp.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/buildapp.yml b/.github/workflows/buildapp.yml index d79eb3d..952e4a3 100644 --- a/.github/workflows/buildapp.yml +++ b/.github/workflows/buildapp.yml @@ -129,8 +129,9 @@ jobs: id: build_package run: | cd ${{ github.workspace }}/main - sed -i '' "27s#.*#BUNDLE_ID = ${{ env.BUNDLE_ID }}#g" Makefile - sed -i '' "26s#.*#DISPLAY_NAME = ${{ env.APP_NAME }}#g" Makefile + sed -i '' "27s#.*#BUNDLE_ID = ${{ env.BUNDLE_ID }}#g" Makefile # Modify the bundle ID + sed -i '' "26s#.*#DISPLAY_NAME = ${{ env.APP_NAME }}#g" Makefile # Modify the app name + sed -i '' "1s#.*#export TARGET = iphone:clang:${{ inputs.sdk_version }}:14.0#g" Makefile # Modify the SDK version make package THEOS_PACKAGE_SCHEME=rootless IPA=Payload/YouTube.app FINALPACKAGE=1 echo "package=$(ls -t packages | head -n1)" >>$GITHUB_OUTPUT echo -e "==> \033[1mSHASUM256: $(shasum -a 256 packages/*.ipa | cut -f1 -d' ')\033[0m" From cda8e32fadb6b45878783213b935a4d0dc1e79bd Mon Sep 17 00:00:00 2001 From: Bryce Hackel <34104885+bhackel@users.noreply.github.com> Date: Mon, 18 Mar 2024 14:28:26 -0700 Subject: [PATCH 4/8] Fix fullscreen button bugs --- Sources/uYouPlus.h | 6 ++++++ Sources/uYouPlus.xm | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Sources/uYouPlus.h b/Sources/uYouPlus.h index 6a162b3..09f5c32 100644 --- a/Sources/uYouPlus.h +++ b/Sources/uYouPlus.h @@ -51,6 +51,12 @@ @property (nonatomic, strong) UIView *_scrimOverlay; @end +// Hide fullscreen action buttons at the bottom = @bhackel +@interface YTFullscreenActionsView : UIView +@property (atomic, assign, readwrite, getter=isHidden) BOOL hidden; +@property (atomic, assign, readwrite) CGRect frame; +@end + // uYouPlus @interface YTHeaderLogoController : UIView @property(readonly, nonatomic) long long pageStyle; diff --git a/Sources/uYouPlus.xm b/Sources/uYouPlus.xm index 6f18ffa..cfc1795 100644 --- a/Sources/uYouPlus.xm +++ b/Sources/uYouPlus.xm @@ -514,8 +514,8 @@ static NSString *accessGroupID() { - (void)layoutSubviews { %orig; if (IS_ENABLED(@"hideFullscreenActions_enabled")) { - self.fullscreenActionsButton.hidden = YES; - self.fullscreenActionsButton.frame = CGRectZero; + self.hidden = YES; + self.frame = CGRectZero; } } %end From bc98d3d535cf4bf9e795e517c8e1a8955e48e335 Mon Sep 17 00:00:00 2001 From: Bryce Hackel <34104885+bhackel@users.noreply.github.com> Date: Mon, 18 Mar 2024 14:55:22 -0700 Subject: [PATCH 5/8] Forgot to add a switch --- Sources/uYouPlusSettings.xm | 1 + 1 file changed, 1 insertion(+) diff --git a/Sources/uYouPlusSettings.xm b/Sources/uYouPlusSettings.xm index 5d8076b..75a4bfc 100644 --- a/Sources/uYouPlusSettings.xm +++ b/Sources/uYouPlusSettings.xm @@ -226,6 +226,7 @@ extern NSBundle *uYouPlusBundle(); 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"); + SWITCH_ITEM2(LOC(@"Hide Fullscreen Action Buttons"), LOC(@"Hides the buttons at the bottom of the screen when in landscape"), @"hideFullscreenActions_enabled"); SWITCH_ITEM2(LOC(@"Hide Suggested Video"), LOC(@"Remove the suggested video popup when finishing a video. Note that this will prevent autoplay from working."), @"noSuggestedVideo_enabled"); SWITCH_ITEM2(LOC(@"Hide Heatwaves"), LOC(@"Should hide the Heatwaves in the video player. App restart is required."), @"hideHeatwaves_enabled"); SWITCH_ITEM2(LOC(@"Hide Double Tap to Seek Overlay"), LOC(@"This hides the animated double tap to seek overlay in the video player. App restart is required."), @"hideDoubleTapToSeekOverlay_enabled"); From bda66bf8dd0b286a8059d62ec18e165ab024bbbc Mon Sep 17 00:00:00 2001 From: Bryce Hackel <34104885+bhackel@users.noreply.github.com> Date: Thu, 28 Mar 2024 03:10:51 -0700 Subject: [PATCH 6/8] Much better implementation --- Sources/uYouPlus.h | 6 ------ Sources/uYouPlus.xm | 12 ++++-------- Sources/uYouPlusSettings.xm | 2 +- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/Sources/uYouPlus.h b/Sources/uYouPlus.h index 09f5c32..6a162b3 100644 --- a/Sources/uYouPlus.h +++ b/Sources/uYouPlus.h @@ -51,12 +51,6 @@ @property (nonatomic, strong) UIView *_scrimOverlay; @end -// Hide fullscreen action buttons at the bottom = @bhackel -@interface YTFullscreenActionsView : UIView -@property (atomic, assign, readwrite, getter=isHidden) BOOL hidden; -@property (atomic, assign, readwrite) CGRect frame; -@end - // uYouPlus @interface YTHeaderLogoController : UIView @property(readonly, nonatomic) long long pageStyle; diff --git a/Sources/uYouPlus.xm b/Sources/uYouPlus.xm index cfc1795..f02edca 100644 --- a/Sources/uYouPlus.xm +++ b/Sources/uYouPlus.xm @@ -509,14 +509,10 @@ static NSString *accessGroupID() { } %end -// Hide fullscreen actions buttons at the bottom - @bhackel -%hook YTFullscreenActionsView -- (void)layoutSubviews { - %orig; - if (IS_ENABLED(@"hideFullscreenActions_enabled")) { - self.hidden = YES; - self.frame = CGRectZero; - } +// Hide fullscreen action buttons - @bhackel +%hook YTMainAppVideoPlayerOverlayViewController +- (BOOL)isFullscreenActionsEnabled { + return IS_ENABLED(@"hideFullscreenActions_enabled") ? NO : %orig; } %end diff --git a/Sources/uYouPlusSettings.xm b/Sources/uYouPlusSettings.xm index 75a4bfc..b5740fa 100644 --- a/Sources/uYouPlusSettings.xm +++ b/Sources/uYouPlusSettings.xm @@ -226,7 +226,7 @@ extern NSBundle *uYouPlusBundle(); 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"); - SWITCH_ITEM2(LOC(@"Hide Fullscreen Action Buttons"), LOC(@"Hides the buttons at the bottom of the screen when in landscape"), @"hideFullscreenActions_enabled"); + SWITCH_ITEM(LOC(@"Hide Fullscreen Action Buttons"), LOC(@"Hides the buttons at the bottom of the screen when in landscape"), @"hideFullscreenActions_enabled"); SWITCH_ITEM2(LOC(@"Hide Suggested Video"), LOC(@"Remove the suggested video popup when finishing a video. Note that this will prevent autoplay from working."), @"noSuggestedVideo_enabled"); SWITCH_ITEM2(LOC(@"Hide Heatwaves"), LOC(@"Should hide the Heatwaves in the video player. App restart is required."), @"hideHeatwaves_enabled"); SWITCH_ITEM2(LOC(@"Hide Double Tap to Seek Overlay"), LOC(@"This hides the animated double tap to seek overlay in the video player. App restart is required."), @"hideDoubleTapToSeekOverlay_enabled"); From 400687ad3caf9c89c7887bd3a74c01cd11b151bb Mon Sep 17 00:00:00 2001 From: Bryce Hackel <34104885+bhackel@users.noreply.github.com> Date: Mon, 1 Apr 2024 15:11:20 -0700 Subject: [PATCH 7/8] Avoid unused variable --- Sources/uYouPlus.xm | 22 +++++++++++++++++----- Sources/uYouPlusSettings.xm | 2 +- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Sources/uYouPlus.xm b/Sources/uYouPlus.xm index f02edca..fce9182 100644 --- a/Sources/uYouPlus.xm +++ b/Sources/uYouPlus.xm @@ -509,11 +509,20 @@ static NSString *accessGroupID() { } %end -// Hide fullscreen action buttons - @bhackel -%hook YTMainAppVideoPlayerOverlayViewController -- (BOOL)isFullscreenActionsEnabled { - return IS_ENABLED(@"hideFullscreenActions_enabled") ? NO : %orig; -} +// Hide Fullscreen Actions buttons - @bhackel +%group hideFullscreenActions + %hook YTMainAppVideoPlayerOverlayViewController + - (BOOL)isFullscreenActionsEnabled { + // This didn't work on its own - weird + return IS_ENABLED(@"hideFullscreenActions_enabled") ? NO : %orig; + } + %end + %hook YTFullscreenActionsView + - (BOOL)enabled { + // Attempt 2 + return IS_ENABLED(@"hideFullscreenActions_enabled") ? NO : %orig; + } + %end %end # pragma mark - uYouPlus @@ -1246,6 +1255,9 @@ static BOOL findCell(ASNodeController *nodeController, NSArray *ide if (IS_ENABLED(@"portraitFullscreen_enabled")) { %init(gPortraitFullscreen); } + if (IS_ENABLED(@"hideFullscreenActions_enabled")) { + %init(hideFullscreenActions); + } if (IS_ENABLED(@"iPhoneLayout_enabled") && (UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad)) { %init(giPhoneLayout); } diff --git a/Sources/uYouPlusSettings.xm b/Sources/uYouPlusSettings.xm index b5740fa..75a4bfc 100644 --- a/Sources/uYouPlusSettings.xm +++ b/Sources/uYouPlusSettings.xm @@ -226,7 +226,7 @@ extern NSBundle *uYouPlusBundle(); 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"); - SWITCH_ITEM(LOC(@"Hide Fullscreen Action Buttons"), LOC(@"Hides the buttons at the bottom of the screen when in landscape"), @"hideFullscreenActions_enabled"); + SWITCH_ITEM2(LOC(@"Hide Fullscreen Action Buttons"), LOC(@"Hides the buttons at the bottom of the screen when in landscape"), @"hideFullscreenActions_enabled"); SWITCH_ITEM2(LOC(@"Hide Suggested Video"), LOC(@"Remove the suggested video popup when finishing a video. Note that this will prevent autoplay from working."), @"noSuggestedVideo_enabled"); SWITCH_ITEM2(LOC(@"Hide Heatwaves"), LOC(@"Should hide the Heatwaves in the video player. App restart is required."), @"hideHeatwaves_enabled"); SWITCH_ITEM2(LOC(@"Hide Double Tap to Seek Overlay"), LOC(@"This hides the animated double tap to seek overlay in the video player. App restart is required."), @"hideDoubleTapToSeekOverlay_enabled"); From 9a9b5c70abe0f40fef08fea69fbbcd21408157ed Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 1 Apr 2024 23:05:53 +0000 Subject: [PATCH 8/8] updated submodules --- Tweaks/DontEatMyContent | 2 +- Tweaks/YTUHD | 2 +- Tweaks/YTVideoOverlay | 2 +- Tweaks/YouPiP | 2 +- Tweaks/YouQuality | 2 +- Tweaks/YouTubeHeader | 2 +- Tweaks/iSponsorBlock | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Tweaks/DontEatMyContent b/Tweaks/DontEatMyContent index 7b7c7e4..8513a0f 160000 --- a/Tweaks/DontEatMyContent +++ b/Tweaks/DontEatMyContent @@ -1 +1 @@ -Subproject commit 7b7c7e4c09aafa1959dac1a236eea9ab75d41a74 +Subproject commit 8513a0f3b4aeeb9f8aaf9b8d30002ba08f04d4da diff --git a/Tweaks/YTUHD b/Tweaks/YTUHD index a6d72f3..85b7c0a 160000 --- a/Tweaks/YTUHD +++ b/Tweaks/YTUHD @@ -1 +1 @@ -Subproject commit a6d72f333dedb7d9b0e94d7d8efdea19475f288d +Subproject commit 85b7c0a2e3ba540106439f9c109e4e4842f56c76 diff --git a/Tweaks/YTVideoOverlay b/Tweaks/YTVideoOverlay index 0f9f33f..40b974f 160000 --- a/Tweaks/YTVideoOverlay +++ b/Tweaks/YTVideoOverlay @@ -1 +1 @@ -Subproject commit 0f9f33f52d1a51efb7e13c66231b6ec0652999a8 +Subproject commit 40b974fb33677f1c066536277d7bee68f6fa5e23 diff --git a/Tweaks/YouPiP b/Tweaks/YouPiP index a310cef..8eafa0a 160000 --- a/Tweaks/YouPiP +++ b/Tweaks/YouPiP @@ -1 +1 @@ -Subproject commit a310cefd7832194757e62f926d097d52421c0bc1 +Subproject commit 8eafa0a163ffa8e7d25c54ed3c18e6c76266ea31 diff --git a/Tweaks/YouQuality b/Tweaks/YouQuality index b1c2178..b5cfbac 160000 --- a/Tweaks/YouQuality +++ b/Tweaks/YouQuality @@ -1 +1 @@ -Subproject commit b1c2178660a83fa68253fba0a961d1c9662691b1 +Subproject commit b5cfbac1c5ac1440a0d4c8ac1cea3fcd4083bee6 diff --git a/Tweaks/YouTubeHeader b/Tweaks/YouTubeHeader index 84114ea..a2a7539 160000 --- a/Tweaks/YouTubeHeader +++ b/Tweaks/YouTubeHeader @@ -1 +1 @@ -Subproject commit 84114ea8a14cedaa2d70b711c19f4c9b8e96c776 +Subproject commit a2a753975962e51cb834ff8f86759593dac58eb4 diff --git a/Tweaks/iSponsorBlock b/Tweaks/iSponsorBlock index c80d1f9..9b6d8db 160000 --- a/Tweaks/iSponsorBlock +++ b/Tweaks/iSponsorBlock @@ -1 +1 @@ -Subproject commit c80d1f91a11d004ab472421bb065be6a2d16cd9e +Subproject commit 9b6d8db494969546691e143aa1a1c4cbfbdcea03