Merge pull request qnblackcat#1304 from qnblackcat/psyt

Update PoomSmart's YouTube tweak submodules
davit33 · Feb 12, 2024 · d7aee83 · d7aee83
2 parents dbc8c08 + 556c7d9
commit d7aee83
Show file tree

Hide file tree

Showing 20 changed files with 30 additions and 35 deletions.
diff --git 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
@@ -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
@@ -1,4 +1,4 @@
-#import "../Tweaks/YouTubeHeader/YTAlertView.h"
+#import <YouTubeHeader/YTAlertView.h>
 #import "uYouPlus.h"
 
 extern NSBundle *uYouPlusBundle();

diff --git a/Sources/YTNoPaidPromo.x b/Sources/YTNoPaidPromo.x
@@ -1,5 +1,5 @@
-#import "../Tweaks/YouTubeHeader/YTPlayerOverlayProvider.h"
-#import "../Tweaks/YouTubeHeader/YTPlayerOverlay.h"
+#import <YouTubeHeader/YTPlayerOverlayProvider.h>
+#import <YouTubeHeader/YTPlayerOverlay.h>
 #import "uYouPlus.h"
 
 // YTNoPaidPromo: https://github.com/PoomSmart/YTNoPaidPromo

diff --git 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 <YouTubeHeader/YTIPivotBarRenderer.h>
+#import <YouTubeHeader/YTIGuideResponse.h>
+#import <YouTubeHeader/YTIGuideResponseSupportedRenderers.h>
+#import <YouTubeHeader/YTIBrowseRequest.h>
 #import "uYouPlus.h"
 
 %group YTReExplore // https://github.com/PoomSmart/YTReExplore/

diff --git a/Sources/uYouPlus.h b/Sources/uYouPlus.h
@@ -7,10 +7,10 @@
 #import <rootless.h>
 
 #import "uYouPlusThemes.h" // Hide "Buy Super Thanks" banner (_ASDisplayView)
-#import "../Tweaks/YouTubeHeader/YTAppDelegate.h" // Activate FLEX
-#import "../Tweaks/YouTubeHeader/YTIMenuConditionalServiceItemRenderer.h"
+#import <YouTubeHeader/YTAppDelegate.h> // Activate FLEX
+#import <YouTubeHeader/YTIMenuConditionalServiceItemRenderer.h>
 
-// #import "../Tweaks/YouTubeHeader/YTISectionListRenderer.h" // Hide search ads by @PoomSmart - https://github.com/PoomSmart/YouTube-X
+// #import <YouTubeHeader/YTISectionListRenderer.h> // 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
@@ -1,4 +1,4 @@
-#import "../Tweaks/YouTubeHeader/YTCommonColorPalette.h"
+#import <YouTubeHeader/YTCommonColorPalette.h>
 #import "uYouPlus.h"
 
 @interface YTSingleVideoController : NSObject

diff --git 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 <YouTubeHeader/YTSettingsViewController.h>
+#import <YouTubeHeader/YTSearchableSettingsViewController.h>
+#import <YouTubeHeader/YTSettingsSectionItem.h>
+#import <YouTubeHeader/YTSettingsSectionItemManager.h>
+#import <YouTubeHeader/YTUIUtils.h>
+#import <YouTubeHeader/YTSettingsPickerViewController.h>
 #import "uYouPlus.h"
 
 // For displaying snackbars

diff --git a/Sources/uYouPlusThemes.h b/Sources/uYouPlusThemes.h
@@ -1,5 +1,5 @@
-#import "../Tweaks/YouTubeHeader/YTCommonColorPalette.h"
-#import "../Tweaks/YouTubeHeader/ASCollectionView.h"
+#import <YouTubeHeader/YTCommonColorPalette.h>
+#import <YouTubeHeader/ASCollectionView.h>
 #import "uYouPlus.h"
 
 @interface YCHLiveChatView : UIView

diff --git a/Tweaks/DontEatMyContent b/Tweaks/DontEatMyContent
diff --git a/Tweaks/IAmYouTube b/Tweaks/IAmYouTube
diff --git a/Tweaks/PSHeader b/Tweaks/PSHeader
diff --git a/Tweaks/Return-YouTube-Dislikes b/Tweaks/Return-YouTube-Dislikes
diff --git a/Tweaks/YTABConfig b/Tweaks/YTABConfig
diff --git a/Tweaks/YTUHD b/Tweaks/YTUHD
diff --git a/Tweaks/YTVideoOverlay b/Tweaks/YTVideoOverlay
diff --git a/Tweaks/YouMute b/Tweaks/YouMute
diff --git a/Tweaks/YouPiP b/Tweaks/YouPiP
diff --git a/Tweaks/YouQuality b/Tweaks/YouQuality
diff --git a/Tweaks/YouTubeHeader b/Tweaks/YouTubeHeader
+9 −23		Settings.x
+11 −11		Tweak.h
+50 −58		Tweak.x
+1 −1		layout/Library/Application Support/DontEatMyContent.bundle/es.lproj/Localizable.strings
+2 −2		Common.x
+7 −7		Header.h
+1 −1		Makefile
+5 −5		Settings.x
+1 −1		layout/Library/Application Support/YTUHD.bundle/zh_cn.lproj/Localizable.strings
+6 −6		Header.h
+1 −1		Init.x
+1 −1		Makefile
+1 −1		README.md
+1 −1		Template.x.example
+28 −12		Tweak.x
+ −		layout/Library/Application Support/YTVideoOverlay.bundle/Info.plist
+1 −1		LICENSE
+4 −4		Tweak.x
+ −		layout/Library/Application Support/YouMute.bundle/Info.plist
+51 −19		LegacyPiPCompat.x
+1 −1		Makefile
+6 −6		Settings.x
+32 −31		Tweak.x
+4 −0		YTLiveWatchPlaybackOverlayView.h
+16 −0		YTSettingsGroupData.h