synced @arichorn change

Balackburn · Balackburn · commit 7be2cff6a652 · 2023-07-02T22:46:40.000+02:00
diff --git a/CercubePlus.xm b/CercubePlus.xm
@@ -204,11 +204,46 @@ static BOOL IsEnabled(NSString *key) {
 - (BOOL)shouldShowUpgradeDialog { return NO;}
 %end
 
-// Disable YouTube Ads - @arichorn
+// Disable YouTube Ads - @poomsmart
+%hook YTDataUtils
++ (id)spamSignalsDictionaryWithoutIDFA { return nil; }
+%end
+
 %hook YTHotConfig
 - (BOOL)disableAfmaIdfaCollection { return NO; }
 %end
 
+BOOL isAd(id node) {
+    if ([node isKindOfClass:NSClassFromString(@"YTVideoWithContextNode")]
+        && [node respondsToSelector:@selector(parentResponder)]
+        && [[(YTVideoWithContextNode *)node parentResponder] isKindOfClass:NSClassFromString(@"YTAdVideoElementsCellController")])
+        return YES;
+    if ([node isKindOfClass:NSClassFromString(@"ELMCellNode")]) {
+        NSString *description = [[[node controller] owningComponent] description];
+        if ([description containsString:@"brand_promo"]
+            || [description containsString:@"statement_banner"]
+            || [description containsString:@"product_carousel"]
+            || [description containsString:@"product_engagement_panel"]
+            || [description containsString:@"product_item"]
+            || [description containsString:@"text_search_ad"]
+            || [description containsString:@"square_image_layout"] // install app ad
+            || [description containsString:@"feed_ad_metadata"])
+            return YES;
+    }
+    return NO;
+}
+
+%hook YTAsyncCollectionView
+- (id)collectionView:(id)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
+    _ASCollectionViewCell *cell = %orig;
+    if ([cell isKindOfClass:NSClassFromString(@"_ASCollectionViewCell")]
+        && [cell respondsToSelector:@selector(node)]
+        && isAd([cell node]))
+            [self deleteItemsAtIndexPaths:[NSArray arrayWithObject:indexPath]];
+    return cell;
+}
+%end
+
 // Disable Wifi Related Settings - @arichorn
 %group gDisableWifiRelatedSettings
 %hook YTSettingsSectionItemManager
diff --git a/Header.h b/Header.h
@@ -109,9 +109,6 @@
 @end
 
 // YTNoShorts
-@interface ELMCellNode
-@end
-
 @interface _ASCollectionViewCell : UICollectionViewCell
 - (id)node;
 @end
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ ARCHS = arm64
 MODULES = jailed
 FINALPACKAGE = 1
 CODESIGN_IPA = 0
-PACKAGE_VERSION = 18.22.9-5.3.11
+PACKAGE_VERSION = 18.25.1-5.3.11
 
 TWEAK_NAME = CercubePlus
 DISPLAY_NAME = YouTube
diff --git a/Source/Settings.xm b/Source/Settings.xm
@@ -12,9 +12,7 @@ static BOOL IsEnabled(NSString *key) {
 static int GetSelection(NSString *key) {
     return [[NSUserDefaults standardUserDefaults] integerForKey:key];
 }
-static int colorContrastMode() {
-    return [[NSUserDefaults standardUserDefaults] integerForKey:@"lcmColor"];
-}
+
 static int appVersionSpoofer() {
     return [[NSUserDefaults standardUserDefaults] integerForKey:@"versionSpoofer"];
 }
diff --git a/lang/CercubePlus.bundle/en.lproj/Localizable.strings b/lang/CercubePlus.bundle/en.lproj/Localizable.strings
@@ -8,8 +8,8 @@
 "AUTO_FULLSCREEN" = "Auto Full Screen (YTAutoFullScreen)";
 "AUTO_FULLSCREEN_DESC" = "Autoplay videos at full screen.";
 
-"TAP_TO_SKIP" = "Disable tap to skip";
-"TAP_TO_SKIP_DESC" = "Disable the tap to skip feature in the video player. App restart is required.";
+"DISABLE_DOUBLE_TAP_TO_SKIP" = "Disable double tap to skip";
+"DISABLE_DOUBLE_TAP_TO_SKIP_DESC" = "Disables the double tap to skip gestures in the video player. App restart is required.";
 
 "SNAP_TO_CHAPTER" = "Disable snap to chapter";
 "SNAP_TO_CHAPTER_DESC" = "Disable auto snap to chapter when seeking in videos. App restart is required.";
@@ -68,9 +68,6 @@
 "HIDE_RIGHT_PANEL" = "Hide the right panel in fullscreen mode";
 "HIDE_RIGHT_PANEL_DESC" = "App restart is required.";
 
-"DONT_EAT_MY_CONTENT" = "Prevent Notch/Island on 2:1 Video Content (DontEatMyContent)";
-"DONT_EAT_MY_CONTENT_DESC" = "Prevent the notch/Dynamic Island from munching on 2:1 video content in YouTube. App restart is required.";
-
 "HIDE_HEATWAVES" = "Hide Heatwaves";
 "HIDE_HEATWAVES_DESC" = "Hides the Heatwaves in the video player. App restart is required.";
 
@@ -107,6 +104,11 @@
 "HIDE_SUBSCRIPTIONS" = "Hide Subscriptions button";
 "HIDE_SUBSCRIPTIONS_DESC" = "Hide Subscriptions button which shows up when paused.";
 
+// Version Spoofer
+"APP_VERSION_SPOOFER" = "Enable App Version Spoofer";
+"APP_VERSION_SPOOFER_DESC" = "Enable this to use the Version Spoofer and select your perferred version below. App restart is required.";
+"VERSION_SPOOFER_TITLE" = "Version Spoofer Picker";
+
 // Theme
 "THEME_OPTIONS" = "Theme Options";
 
@@ -126,29 +128,21 @@
 "LOW_CONTRAST_MODE" = "Low Contrast Mode";
 "LOW_CONTRAST_MODE_DESC" = "This option will Low Contrast of the texts and buttons just like how the old YouTube Interface was. App restart is required.";
 
-"LCM_CHOOSE_COLOR" = "Low contrast text color";
-"DEFAULT_UI" = "Default";
-"RED_UI" = "Red UI";
-"BLUE_UI" = "Blue UI";
-"GREEN_UI" = "Green UI";
-"YELLOW_UI" = "Yellow UI";
-"ORANGE_UI" = "Orange UI";
-"PURPLE_UI" = "Purple UI";
-"VIOLET_UI" = "Violet UI";
-"PINK_UI" = "Pink UI";
-
 // Miscellaneous
 "MISCELLANEOUS" = "Miscellaneous";
 
 "ENABLE_YT_STARTUP_ANIMATION" = "Enable YouTube startup animation";
 "ENABLE_YT_STARTUP_ANIMATION_DESC" = "";
 
-"HIDE_YOUTUBE_LOGO" = "Hide YouTube Logo";
-"HIDE_YOUTUBE_LOGO_DESC" = "this will Hide the YouTube Logo on the top left of the Interface. App restart is required.";
+"STICK_NAVIGATION_BAR" = "Stick Navigation Bar";
+"STICK_NAVIGATION_BAR_DESC" = "Enable to make the Navigation Bar stay on the App when scrolling.";
 
 "HIDE_CHIP_BAR" = "Hide the Upper bar";
 "HIDE_CHIP_BAR_DESC" = "Hide Upper bar in the Home feeds (Trends, Music, Gaming...) and Subscription feeds (All videos, Continue watching...).";
 
+"HIDE_YOUTUBE_LOGO" = "Hide YouTube Logo";
+"HIDE_YOUTUBE_LOGO_DESC" = "this will Hide the YouTube Logo on the top left of the Interface. App restart is required.";
+
 "HIDE_MODERN_INTERFACE" = "Hide Modern Interface (YTNoModernUI)";
 "HIDE_MODERN_INTERFACE_DESC" = "Toggle this on to hide any Modern Element added by YouTube. Removes Ambient Mode, Rounded Design & More. App restart is required.";
 
@@ -199,4 +193,4 @@
 "YT_SPEED_DESC" = "Enable YTSpeed to have more Playback Speed Options. App restart is required.";
 
 "ENABLE_FLEX" = "Enable FLEX";
-"ENABLE_FLEX_DESC" = "Enable FLEX for debugging (not recommended). Leave this off unless you know what you are doing.";
+"ENABLE_FLEX_DESC" = "Enable FLEX for debugging (not recommended). Leave this off unless you know what you are doing.";
diff --git a/lang/CercubePlus.bundle/ja.lproj/Localizable.strings b/lang/CercubePlus.bundle/ja.lproj/Localizable.strings
@@ -8,8 +8,8 @@
 "AUTO_FULLSCREEN" = "自動フルスクリーン (YTAutoFullScreen)";
 "AUTO_FULLSCREEN_DESC" = "フルスクリーンでビデオを自動再生します";
 
-"TAP_TO_SKIP" = "タップしてスキップする機能を無効化";
-"TAP_TO_SKIP_DESC" = "ビデオプレーヤーでタップしてスキップする機能を無効にします。アプリの再起動が必要です";
+"DISABLE_DOUBLE_TAP_TO_SKIP" = "Disable double tap to skip";
+"DISABLE_DOUBLE_TAP_TO_SKIP_DESC" = "Disables the double tap to skip gestures in the video player. App restart is required.";
 
 "SNAP_TO_CHAPTER" = "チャプターへのスナップを無効化";
 "SNAP_TO_CHAPTER_DESC" = "動画でシークする際にチャプターへの自動スナップを無効にします。アプリの再起動が必要です";
@@ -68,9 +68,6 @@
 "HIDE_RIGHT_PANEL" = "フルスクリーンモードで右パネルを非表示";
 "HIDE_RIGHT_PANEL_DESC" = "アプリの再起動が必要です";
 
-"DONT_EAT_MY_CONTENT" = "2:1比率の動画とノッチ/Dynamic Islandの最適化 (DontEatMyContent)";
-"DONT_EAT_MY_CONTENT_DESC" = "2:1比率の動画とノッチ/Dynamic Islandが干渉するのを防ぎます。アプリの再起動が必要です";
-
 "HIDE_HEATWAVES" = "ヒートウェーブを非表示";
 "HIDE_HEATWAVES_DESC" = "ビデオプレーヤーでヒートウェーブを非表示にします。アプリの再起動が必要です";
 
@@ -107,6 +104,11 @@
 "HIDE_SUBSCRIPTIONS" = "チャンネル登録ボタンを非表示";
 "HIDE_SUBSCRIPTIONS_DESC" = "一時停止時に表示されるチャンネル登録ボタンを非表示にします";
 
+// Version Spoofer
+"APP_VERSION_SPOOFER" = "Enable App Version Spoofer";
+"APP_VERSION_SPOOFER_DESC" = "Enable this to use the Version Spoofer and select your perferred version below. App restart is required.";
+"VERSION_SPOOFER_TITLE" = "Version Spoofer Picker";
+
 // Theme
 "THEME_OPTIONS" = "テーマオプション";
 
@@ -126,29 +128,21 @@
 "LOW_CONTRAST_MODE" = "低コントラストモード";
 "LOW_CONTRAST_MODE_DESC" = "このオプションは、テキストとボタンのコントラストを以前のYouTubeインターフェイスのように低くします。アプリの再起動が必要です";
 
-"LCM_CHOOSE_COLOR" = "低コントラストのテキストカラー";
-"DEFAULT_UI" = "デフォルト";
-"RED_UI" = "赤色のUI";
-"BLUE_UI" = "青色のUI";
-"GREEN_UI" = "緑色のUI";
-"YELLOW_UI" = "黄色のUI";
-"ORANGE_UI" = "オレンジ色のUI";
-"PURPLE_UI" = "紫色のUI";
-"VIOLET_UI" = "バイオレットUI";
-"PINK_UI" = "ピンク色のUI";
-
 // Miscellaneous
 "MISCELLANEOUS" = "その他";
 
 "ENABLE_YT_STARTUP_ANIMATION" = "YouTube起動時のアニメーションを有効化";
 "ENABLE_YT_STARTUP_ANIMATION_DESC" = "";
 
-"HIDE_YOUTUBE_LOGO" = "YouTubeロゴを非表示";
-"HIDE_YOUTUBE_LOGO_DESC" = "インターフェイスの左上にあるYouTubeロゴを非表示にします。アプリの再起動が必要です";
+"STICK_NAVIGATION_BAR" = "Stick Navigation Bar";
+"STICK_NAVIGATION_BAR_DESC" = "Enable to make the Navigation Bar stay on the App when scrolling.";
 
 "HIDE_CHIP_BAR" = "トップバーを非表示";
 "HIDE_CHIP_BAR_DESC" = "ホーム(トレンド,音楽,ゲーム など)と\n登録チャンネル(すべてのビデオ,視聴を続ける 等)リボンのトップバーを非表示にします。\nアプリの再起動が必要です";
 
+"HIDE_YOUTUBE_LOGO" = "YouTubeロゴを非表示";
+"HIDE_YOUTUBE_LOGO_DESC" = "インターフェイスの左上にあるYouTubeロゴを非表示にします。アプリの再起動が必要です";
+
 "HIDE_MODERN_INTERFACE" = "モダンインターフェイスを非表示 (YTNoModernUI)";
 "HIDE_MODERN_INTERFACE_DESC" = "YouTubeによって追加されたモダンな要素を隠すにはこれを有効にしてください。アンビエントモード,丸みを帯びたデザインなどを削除します。\nアプリの再起動が必要です";
 
diff --git a/lang/CercubePlus.bundle/template.lproj/Localizable.strings b/lang/CercubePlus.bundle/template.lproj/Localizable.strings
@@ -23,8 +23,8 @@ https://github.com/PoomSmart/Return-YouTube-Dislikes/tree/main/layout/Library/Ap
 "AUTO_FULLSCREEN" = "Auto Full Screen (YTAutoFullScreen)";
 "AUTO_FULLSCREEN_DESC" = "Autoplay videos at full screen.";
 
-"TAP_TO_SKIP" = "Disable tap to skip";
-"TAP_TO_SKIP_DESC" = "Disable the tap to skip feature in the video player. App restart is required.";
+"DISABLE_DOUBLE_TAP_TO_SKIP" = "Disable double tap to skip";
+"DISABLE_DOUBLE_TAP_TO_SKIP_DESC" = "Disables the double tap to skip gestures in the video player. App restart is required.";
 
 "SNAP_TO_CHAPTER" = "Disable snap to chapter";
 "SNAP_TO_CHAPTER_DESC" = "Disable auto snap to chapter when seeking in videos. App restart is required.";
@@ -83,9 +83,6 @@ https://github.com/PoomSmart/Return-YouTube-Dislikes/tree/main/layout/Library/Ap
 "HIDE_RIGHT_PANEL" = "Hide the right panel in fullscreen mode";
 "HIDE_RIGHT_PANEL_DESC" = "App restart is required.";
 
-"DONT_EAT_MY_CONTENT" = "Prevent Notch/Island on 2:1 Video Content (DontEatMyContent)";
-"DONT_EAT_MY_CONTENT_DESC" = "Prevent the notch/Dynamic Island from munching on 2:1 video content in YouTube. App restart is required.";
-
 "HIDE_HEATWAVES" = "Hide Heatwaves";
 "HIDE_HEATWAVES_DESC" = "Hides the Heatwaves in the video player. App restart is required.";
 
@@ -122,6 +119,11 @@ https://github.com/PoomSmart/Return-YouTube-Dislikes/tree/main/layout/Library/Ap
 "HIDE_SUBSCRIPTIONS" = "Hide Subscriptions button";
 "HIDE_SUBSCRIPTIONS_DESC" = "Hide Subscriptions button which shows up when paused.";
 
+// Version Spoofer
+"APP_VERSION_SPOOFER" = "Enable App Version Spoofer";
+"APP_VERSION_SPOOFER_DESC" = "Enable this to use the Version Spoofer and select your perferred version below. App restart is required.";
+"VERSION_SPOOFER_TITLE" = "Version Spoofer Picker";
+
 // Theme
 "THEME_OPTIONS" = "Theme Options";
 
@@ -141,29 +143,21 @@ https://github.com/PoomSmart/Return-YouTube-Dislikes/tree/main/layout/Library/Ap
 "LOW_CONTRAST_MODE" = "Low Contrast Mode";
 "LOW_CONTRAST_MODE_DESC" = "This option will Low Contrast of the texts and buttons just like how the old YouTube Interface was. App restart is required.";
 
-"LCM_CHOOSE_COLOR" = "Low contrast text color";
-"DEFAULT_UI" = "Default";
-"RED_UI" = "Red UI";
-"BLUE_UI" = "Blue UI";
-"GREEN_UI" = "Green UI";
-"YELLOW_UI" = "Yellow UI";
-"ORANGE_UI" = "Orange UI";
-"PURPLE_UI" = "Purple UI";
-"VIOLET_UI" = "Violet UI";
-"PINK_UI" = "Pink UI";
-
 // Miscellaneous
 "MISCELLANEOUS" = "Miscellaneous";
 
 "ENABLE_YT_STARTUP_ANIMATION" = "Enable YouTube startup animation";
 "ENABLE_YT_STARTUP_ANIMATION_DESC" = "";
 
-"HIDE_YOUTUBE_LOGO" = "Hide YouTube Logo";
-"HIDE_YOUTUBE_LOGO_DESC" = "this will Hide the YouTube Logo on the top left of the Interface. App restart is required.";
+"STICK_NAVIGATION_BAR" = "Stick Navigation Bar";
+"STICK_NAVIGATION_BAR_DESC" = "Enable to make the Navigation Bar stay on the App when scrolling.";
 
 "HIDE_CHIP_BAR" = "Hide the Upper bar";
 "HIDE_CHIP_BAR_DESC" = "Hide Upper bar in the Home feeds (Trends, Music, Gaming...) and Subscription feeds (All videos, Continue watching...).";
 
+"HIDE_YOUTUBE_LOGO" = "Hide YouTube Logo";
+"HIDE_YOUTUBE_LOGO_DESC" = "this will Hide the YouTube Logo on the top left of the Interface. App restart is required.";
+
 "HIDE_MODERN_INTERFACE" = "Hide Modern Interface (YTNoModernUI)";
 "HIDE_MODERN_INTERFACE_DESC" = "Toggle this on to hide any Modern Element added by YouTube. Removes Ambient Mode, Rounded Design & More. App restart is required.";
 

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,7 @@ static BOOL IsEnabled(NSString *key) {`
`12`	`12`	`static int GetSelection(NSString *key) {`
`13`	`13`	`return [[NSUserDefaults standardUserDefaults] integerForKey:key];`
`14`	`14`	`}`
`15`		`-static int colorContrastMode() {`
`16`		`- return [[NSUserDefaults standardUserDefaults] integerForKey:@"lcmColor"];`
`17`		`-}`
	`15`	`+`
`18`	`16`	`static int appVersionSpoofer() {`
`19`	`17`	`return [[NSUserDefaults standardUserDefaults] integerForKey:@"versionSpoofer"];`
`20`	`18`	`}`