From 556c7d99a566b53533233a5b3de5ffc2c879d819 Mon Sep 17 00:00:00 2001 From: Thatchapon Unprasert Date: Mon, 12 Feb 2024 11:03:38 +0700 Subject: [PATCH] Update PoomSmart's YouTube tweak submodules --- .gitmodules | 4 ---- Makefile | 2 +- Sources/YTCastConfirm.xm | 2 +- Sources/YTNoPaidPromo.x | 4 ++-- Sources/YTReExplore.x | 8 ++++---- Sources/uYouPlus.h | 6 +++--- Sources/uYouPlusPatches.h | 2 +- Sources/uYouPlusSettings.h | 12 ++++++------ Sources/uYouPlusThemes.h | 4 ++-- Tweaks/DontEatMyContent | 2 +- Tweaks/IAmYouTube | 2 +- Tweaks/PSHeader | 1 - Tweaks/Return-YouTube-Dislikes | 2 +- Tweaks/YTABConfig | 2 +- Tweaks/YTUHD | 2 +- Tweaks/YTVideoOverlay | 2 +- Tweaks/YouMute | 2 +- Tweaks/YouPiP | 2 +- Tweaks/YouQuality | 2 +- Tweaks/YouTubeHeader | 2 +- 20 files changed, 30 insertions(+), 35 deletions(-) delete mode 160000 Tweaks/PSHeader diff --git a/.gitmodules b/.gitmodules index 420400b..235c849 100644 --- a/.gitmodules +++ b/.gitmodules @@ -26,10 +26,6 @@ path = Tweaks/YouTubeHeader url = https://github.com/PoomSmart/YouTubeHeader.git branch = main -[submodule "Tweaks/PSHeader"] - path = Tweaks/PSHeader - url = https://github.com/PoomSmart/PSHeader.git - branch = master [submodule "Extensions"] path = Extensions url = https://github.com/CokePokes/YoutubeExtensions.git diff --git a/Makefile b/Makefile index 0fed1a0..6140cd2 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ export libFLEX_ARCHS = arm64 export Alderis_XCODEOPTS = LD_DYLIB_INSTALL_NAME=@rpath/Alderis.framework/Alderis export Alderis_XCODEFLAGS = DYLIB_INSTALL_NAME_BASE=/Library/Frameworks BUILD_LIBRARY_FOR_DISTRIBUTION=YES ARCHS="$(ARCHS)" export libcolorpicker_LDFLAGS = -F$(TARGET_PRIVATE_FRAMEWORK_PATH) -install_name @rpath/libcolorpicker.dylib -export ADDITIONAL_CFLAGS = -I$(THEOS_PROJECT_DIR)/Tweaks/RemoteLog +export ADDITIONAL_CFLAGS = -I$(THEOS_PROJECT_DIR)/Tweaks/RemoteLog -I$(THEOS_PROJECT_DIR)/Tweaks ifneq ($(JAILBROKEN),1) export DEBUGFLAG = -ggdb -Wno-unused-command-line-argument -L$(THEOS_OBJ_DIR) -F$(_THEOS_LOCAL_DATA_DIR)/$(THEOS_OBJ_DIR_NAME)/install/Library/Frameworks diff --git a/Sources/YTCastConfirm.xm b/Sources/YTCastConfirm.xm index c5d5200..7586695 100644 --- a/Sources/YTCastConfirm.xm +++ b/Sources/YTCastConfirm.xm @@ -1,4 +1,4 @@ -#import "../Tweaks/YouTubeHeader/YTAlertView.h" +#import #import "uYouPlus.h" extern NSBundle *uYouPlusBundle(); diff --git a/Sources/YTNoPaidPromo.x b/Sources/YTNoPaidPromo.x index fb0ca3f..0d9caa3 100644 --- a/Sources/YTNoPaidPromo.x +++ b/Sources/YTNoPaidPromo.x @@ -1,5 +1,5 @@ -#import "../Tweaks/YouTubeHeader/YTPlayerOverlayProvider.h" -#import "../Tweaks/YouTubeHeader/YTPlayerOverlay.h" +#import +#import #import "uYouPlus.h" // YTNoPaidPromo: https://github.com/PoomSmart/YTNoPaidPromo diff --git a/Sources/YTReExplore.x b/Sources/YTReExplore.x index 275ae8c..471ae04 100644 --- a/Sources/YTReExplore.x +++ b/Sources/YTReExplore.x @@ -1,7 +1,7 @@ -#import "../Tweaks/YouTubeHeader/YTIPivotBarRenderer.h" -#import "../Tweaks/YouTubeHeader/YTIGuideResponse.h" -#import "../Tweaks/YouTubeHeader/YTIGuideResponseSupportedRenderers.h" -#import "../Tweaks/YouTubeHeader/YTIBrowseRequest.h" +#import +#import +#import +#import #import "uYouPlus.h" %group YTReExplore // https://github.com/PoomSmart/YTReExplore/ diff --git a/Sources/uYouPlus.h b/Sources/uYouPlus.h index befa6fb..35927c2 100644 --- a/Sources/uYouPlus.h +++ b/Sources/uYouPlus.h @@ -7,10 +7,10 @@ #import #import "uYouPlusThemes.h" // Hide "Buy Super Thanks" banner (_ASDisplayView) -#import "../Tweaks/YouTubeHeader/YTAppDelegate.h" // Activate FLEX -#import "../Tweaks/YouTubeHeader/YTIMenuConditionalServiceItemRenderer.h" +#import // Activate FLEX +#import -// #import "../Tweaks/YouTubeHeader/YTISectionListRenderer.h" // Hide search ads by @PoomSmart - https://github.com/PoomSmart/YouTube-X +// #import // Hide search ads by @PoomSmart - https://github.com/PoomSmart/YouTube-X #define LOC(x) [tweakBundle localizedStringForKey:x value:nil table:nil] #define IS_ENABLED(k) [[NSUserDefaults standardUserDefaults] boolForKey:k] diff --git a/Sources/uYouPlusPatches.h b/Sources/uYouPlusPatches.h index e0e8e37..6eedec6 100644 --- a/Sources/uYouPlusPatches.h +++ b/Sources/uYouPlusPatches.h @@ -1,4 +1,4 @@ -#import "../Tweaks/YouTubeHeader/YTCommonColorPalette.h" +#import #import "uYouPlus.h" @interface YTSingleVideoController : NSObject diff --git a/Sources/uYouPlusSettings.h b/Sources/uYouPlusSettings.h index ad4e37c..bba5547 100644 --- a/Sources/uYouPlusSettings.h +++ b/Sources/uYouPlusSettings.h @@ -1,9 +1,9 @@ -#import "../Tweaks/YouTubeHeader/YTSettingsViewController.h" -#import "../Tweaks/YouTubeHeader/YTSearchableSettingsViewController.h" -#import "../Tweaks/YouTubeHeader/YTSettingsSectionItem.h" -#import "../Tweaks/YouTubeHeader/YTSettingsSectionItemManager.h" -#import "../Tweaks/YouTubeHeader/YTUIUtils.h" -#import "../Tweaks/YouTubeHeader/YTSettingsPickerViewController.h" +#import +#import +#import +#import +#import +#import #import "uYouPlus.h" // For displaying snackbars diff --git a/Sources/uYouPlusThemes.h b/Sources/uYouPlusThemes.h index b153f93..5e007f2 100644 --- a/Sources/uYouPlusThemes.h +++ b/Sources/uYouPlusThemes.h @@ -1,5 +1,5 @@ -#import "../Tweaks/YouTubeHeader/YTCommonColorPalette.h" -#import "../Tweaks/YouTubeHeader/ASCollectionView.h" +#import +#import #import "uYouPlus.h" @interface YCHLiveChatView : UIView diff --git a/Tweaks/DontEatMyContent b/Tweaks/DontEatMyContent index fea6b06..2253bc3 160000 --- a/Tweaks/DontEatMyContent +++ b/Tweaks/DontEatMyContent @@ -1 +1 @@ -Subproject commit fea6b066e821672479e701bee8f29846da2c064b +Subproject commit 2253bc34fbb8a5f44993578db37024835bbccdd1 diff --git a/Tweaks/IAmYouTube b/Tweaks/IAmYouTube index f387294..fe1131b 160000 --- a/Tweaks/IAmYouTube +++ b/Tweaks/IAmYouTube @@ -1 +1 @@ -Subproject commit f3872945d98199c331b388aec1b9c26963e75cc7 +Subproject commit fe1131b4c567333ce53ee58fb81e4cae4e0650d7 diff --git a/Tweaks/PSHeader b/Tweaks/PSHeader deleted file mode 160000 index b836acf..0000000 --- a/Tweaks/PSHeader +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b836acf9c1f487879b74db63d077575e0bedc289 diff --git a/Tweaks/Return-YouTube-Dislikes b/Tweaks/Return-YouTube-Dislikes index 720578a..8da2b14 160000 --- a/Tweaks/Return-YouTube-Dislikes +++ b/Tweaks/Return-YouTube-Dislikes @@ -1 +1 @@ -Subproject commit 720578a621c960f473c2d61d5cf7f221462f5aa2 +Subproject commit 8da2b141724d0afd499c3b817a468c8858b79090 diff --git a/Tweaks/YTABConfig b/Tweaks/YTABConfig index c677a58..6d06236 160000 --- a/Tweaks/YTABConfig +++ b/Tweaks/YTABConfig @@ -1 +1 @@ -Subproject commit c677a585e20c053570a558cb0f0c471f6f9f9bf2 +Subproject commit 6d062368a29f5b612bfc309993a9026f3c51e46c diff --git a/Tweaks/YTUHD b/Tweaks/YTUHD index a535836..8296cbf 160000 --- a/Tweaks/YTUHD +++ b/Tweaks/YTUHD @@ -1 +1 @@ -Subproject commit a53583681d1019986a94f88fcaba7dcaf7e74c5a +Subproject commit 8296cbffe865a7894abb454f11d8873e439c6cfd diff --git a/Tweaks/YTVideoOverlay b/Tweaks/YTVideoOverlay index d255e19..f9dad30 160000 --- a/Tweaks/YTVideoOverlay +++ b/Tweaks/YTVideoOverlay @@ -1 +1 @@ -Subproject commit d255e192750ddf8c2e72d67d26f9095e6d3fc8ca +Subproject commit f9dad30594f32544a260a59af5b6836f69812708 diff --git a/Tweaks/YouMute b/Tweaks/YouMute index 7ffdb1e..6206fab 160000 --- a/Tweaks/YouMute +++ b/Tweaks/YouMute @@ -1 +1 @@ -Subproject commit 7ffdb1eda6697f718382f74b9310c6a2b3e92c62 +Subproject commit 6206fab1ccc721dd9510881b6e64ed678549ad58 diff --git a/Tweaks/YouPiP b/Tweaks/YouPiP index 0597b15..0feea3f 160000 --- a/Tweaks/YouPiP +++ b/Tweaks/YouPiP @@ -1 +1 @@ -Subproject commit 0597b15d57361e652557a33f0592667058c5145c +Subproject commit 0feea3fb000f2e516347fa9b7a1d77f8b2707071 diff --git a/Tweaks/YouQuality b/Tweaks/YouQuality index 7a98414..d99626f 160000 --- a/Tweaks/YouQuality +++ b/Tweaks/YouQuality @@ -1 +1 @@ -Subproject commit 7a9841410d3715a46f8a2c34aa58b17772f01d55 +Subproject commit d99626fb7a78615c4b142b26c2b8af48cb4ad34a diff --git a/Tweaks/YouTubeHeader b/Tweaks/YouTubeHeader index 4e9ea16..9a6f072 160000 --- a/Tweaks/YouTubeHeader +++ b/Tweaks/YouTubeHeader @@ -1 +1 @@ -Subproject commit 4e9ea16e22a67d00a83427d77f41fdc4d8a06c57 +Subproject commit 9a6f0726998e62864bc227d3a41094b871f1cb08