diff --git a/Localizations/uYouPlus.bundle/ar.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/ar.lproj/Localizable.strings index 3b8f51bbb9..98afe0a2a6 100644 --- a/Localizations/uYouPlus.bundle/ar.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/ar.lproj/Localizable.strings @@ -99,6 +99,9 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 خيارات متنوعة"; +"HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; + "CAST_CONFIRM" = "التأكيد قبل البث (أداة YTCastConfirm)"; "CAST_CONFIRM_DESC" = "إظهار تنبيه للتأكيد قبل البث، من أجل منع البث للتلفاز عن طريق الخطأ."; "CASTING" = "البث"; diff --git a/Localizations/uYouPlus.bundle/cz.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/cz.lproj/Localizable.strings index a2b2fcc14c..2cc27bf9b3 100644 --- a/Localizations/uYouPlus.bundle/cz.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/cz.lproj/Localizable.strings @@ -99,6 +99,9 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Miscellaneous"; +"HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; + "CAST_CONFIRM" = "Zobrazit potvrzení před začátkem sdílení obrazu (YTCastConfirm)"; "CAST_CONFIRM_DESC" = "Zobrazí potvrzení aby se zamezilo nechtěnému sdílení do televize."; "CASTING" = "Sdílení obrazu"; diff --git a/Localizations/uYouPlus.bundle/de.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/de.lproj/Localizable.strings index 5b48d5202c..062223a64a 100755 --- a/Localizations/uYouPlus.bundle/de.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/de.lproj/Localizable.strings @@ -99,6 +99,9 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Sonstiges"; +"HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; + "CAST_CONFIRM" = "Warnung vor TV-Übertragungen (YTCastConfirm)"; "CAST_CONFIRM_DESC" = "Zeigt eine Warnung an, um eine ausversehene TV-Übertragung zu verhindern."; "CASTING" = "TV-Übertragung"; diff --git a/Localizations/uYouPlus.bundle/el.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/el.lproj/Localizable.strings index b4885e25a3..9e35b24d3b 100644 --- a/Localizations/uYouPlus.bundle/el.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/el.lproj/Localizable.strings @@ -99,6 +99,9 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Miscellaneous"; +"HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock"; + "CAST_CONFIRM" = "Επιβεβαιωτικό μήνυμα πριν γίνει Cast(YTCastConfirm)"; "CAST_CONFIRM_DESC" = "Να φανεί ένα επιβεβαιωτικό μήνυμα πριν γίνει cast για να αποτρεπτεί η καταλάθως σύνδεση στην τηλεόραση."; "CASTING" = "Μετάδοση"; diff --git a/Localizations/uYouPlus.bundle/en.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/en.lproj/Localizable.strings index 28bca3fe30..f29a94d17c 100644 --- a/Localizations/uYouPlus.bundle/en.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/en.lproj/Localizable.strings @@ -99,6 +99,9 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Miscellaneous"; +"HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; + "CAST_CONFIRM" = "YTCastConfirm"; "CAST_CONFIRM_DESC" = "Shows a confirmation alert before casting"; "CASTING" = "Casting"; diff --git a/Localizations/uYouPlus.bundle/es.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/es.lproj/Localizable.strings index 52fca4a3c9..42993ba5c9 100644 --- a/Localizations/uYouPlus.bundle/es.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/es.lproj/Localizable.strings @@ -99,6 +99,9 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Varios"; +"HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; + "CAST_CONFIRM" = "Alerta de confirmación antes de Enviar contenido (YTCastConfirm)"; "CAST_CONFIRM_DESC" = "Mostrar una alerta de confirmación antes de Enviar contenido para prevenir el secuestro accidental del TV."; "CASTING" = "Enviar contenido"; diff --git a/Localizations/uYouPlus.bundle/fr.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/fr.lproj/Localizable.strings index 07df070c95..bbf8c0bab7 100644 --- a/Localizations/uYouPlus.bundle/fr.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/fr.lproj/Localizable.strings @@ -99,6 +99,9 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Divers"; +"HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; + "CAST_CONFIRM" = "Confirmer l'alerte avant le casting (YTCastConfirm)"; "CAST_CONFIRM_DESC" = "Afficher une alerte de confirmation avant de lancer le casting afin d'éviter de déclencher accidentellement la télévision"; "CASTING" = "Cast"; diff --git a/Localizations/uYouPlus.bundle/he.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/he.lproj/Localizable.strings index 599221a71b..408e6041ee 100644 --- a/Localizations/uYouPlus.bundle/he.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/he.lproj/Localizable.strings @@ -99,6 +99,9 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Miscellaneous"; +"HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; + "CAST_CONFIRM" = "התראת אישור לפני שידור לטלוויזיה (YTCastConfirm)"; "CAST_CONFIRM_DESC" = "הצג התראת אישור לפני שידור לטלוויזיה כדי למנוע לחיצה בטעות."; "CASTING" = "משדר"; diff --git a/Localizations/uYouPlus.bundle/hu.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/hu.lproj/Localizable.strings index 216a6b8888..bf67f56bc6 100644 --- a/Localizations/uYouPlus.bundle/hu.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/hu.lproj/Localizable.strings @@ -99,6 +99,9 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Miscellaneous"; +"HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; + "CAST_CONFIRM" = "Megerősítés átküldés előtt (YTCastConfirm)"; "CAST_CONFIRM_DESC" = "Az átküldés előtt mutasson megerősítő figyelmeztetést, hogy megakadályozza a TV véletlen eltérítését."; "CASTING" = "Casting"; diff --git a/Localizations/uYouPlus.bundle/it.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/it.lproj/Localizable.strings index 436af28311..805ed51815 100644 --- a/Localizations/uYouPlus.bundle/it.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/it.lproj/Localizable.strings @@ -99,6 +99,9 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Varie"; +"HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; + "CAST_CONFIRM" = "Avviso di conferma prima della condivisione su TV (YTCastConfirm)"; "CAST_CONFIRM_DESC" = "Mostra un avviso di conferma prima della condivisione per evitar e di irrompere accidentalmente sulla TV."; "CASTING" = "Condivisione su TV"; diff --git a/Localizations/uYouPlus.bundle/ja.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/ja.lproj/Localizable.strings index ecde25d75d..49c0cee78d 100644 --- a/Localizations/uYouPlus.bundle/ja.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/ja.lproj/Localizable.strings @@ -99,6 +99,9 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 その他"; +"HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; + "CAST_CONFIRM" = "YTCastConfirm"; "CAST_CONFIRM_DESC" = "キャスト前に確認の警告を表示します。"; "CASTING" = "キャスト"; diff --git a/Localizations/uYouPlus.bundle/ko.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/ko.lproj/Localizable.strings index ed6e154892..f181ec9c84 100644 --- a/Localizations/uYouPlus.bundle/ko.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/ko.lproj/Localizable.strings @@ -99,6 +99,9 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 기타 설정"; +"HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; + "CAST_CONFIRM" = "TV 전송 알림 (YTCastConfirm)"; "CAST_CONFIRM_DESC" = "의도치 않게 TV로 영상을 전송하지 않도록 보내기 전에 확인 메시지를 표시합니다."; "CASTING" = "TV로 전송"; diff --git a/Localizations/uYouPlus.bundle/nl.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/nl.lproj/Localizable.strings index 0dfdf29d49..2aec0f9534 100644 --- a/Localizations/uYouPlus.bundle/nl.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/nl.lproj/Localizable.strings @@ -99,6 +99,9 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Miscellaneous"; +"HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; + "CAST_CONFIRM" = "Bevestig casten (YTCastConfirm)"; "CAST_CONFIRM_DESC" = "Toon een melding na het drukken op de cast knop om te voorkomen dat je per ongeluk cast."; "CASTING" = "Castings"; diff --git a/Localizations/uYouPlus.bundle/pl.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/pl.lproj/Localizable.strings index ee4740abc4..acdd36c9d6 100644 --- a/Localizations/uYouPlus.bundle/pl.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/pl.lproj/Localizable.strings @@ -99,6 +99,9 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Miscellaneous"; +"HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; + "CAST_CONFIRM" = "Alert przed przesyłaniem (YTCastConfirm)"; "CAST_CONFIRM_DESC" = "Pokaż alert przed przesyłaniem aby nie łączyć się przez przypadek z telewizorem."; "CASTING" = "Przesyłania"; diff --git a/Localizations/uYouPlus.bundle/pt.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/pt.lproj/Localizable.strings index b881a8cd0d..752ff1bc8b 100644 --- a/Localizations/uYouPlus.bundle/pt.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/pt.lproj/Localizable.strings @@ -99,6 +99,9 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Diversos"; +"HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; + "CAST_CONFIRM" = "Alerta de confirmação antes de transmitir (YTCastConfirm)"; "CAST_CONFIRM_DESC" = "Mostra um alerta de confirmação antes da transmissão para evitar o sequestro acidental da TV."; "CASTING" = "Transmissão"; diff --git a/Localizations/uYouPlus.bundle/ro.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/ro.lproj/Localizable.strings index 7a067c8a1b..59907f1bf4 100644 --- a/Localizations/uYouPlus.bundle/ro.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/ro.lproj/Localizable.strings @@ -99,6 +99,9 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Miscellaneous"; +"HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; + "CAST_CONFIRM" = "Alertă de confirmare înainte de proiectare (YTCastConfirm)"; "CAST_CONFIRM_DESC" = "Afișează o alertă de confirmare înainte de a proiecta, pentru a preveni deturnarea accidentală a TV-ului."; "CASTING" = "Proiectare"; diff --git a/Localizations/uYouPlus.bundle/ru.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/ru.lproj/Localizable.strings index aaaaad45a3..a4de90dade 100644 --- a/Localizations/uYouPlus.bundle/ru.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/ru.lproj/Localizable.strings @@ -99,6 +99,9 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Другое"; +"HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; + "CAST_CONFIRM" = "Подтверждение «Трансляции» (YTCastConfirm)"; "CAST_CONFIRM_DESC" = "Спрашивать подтверждение перед началом трансляции во избежание случайных подключений к ТВ."; "CASTING" = "Трансляция"; diff --git a/Localizations/uYouPlus.bundle/template.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/template.lproj/Localizable.strings index 613104032d..6c4763772a 100644 --- a/Localizations/uYouPlus.bundle/template.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/template.lproj/Localizable.strings @@ -114,6 +114,9 @@ https://github.com/PoomSmart/Return-YouTube-Dislikes/tree/main/layout/Library/Ap // Miscellaneous "MISCELLANEOUS" = "🔎 Miscellaneous"; +"HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; + "CAST_CONFIRM" = "YTCastConfirm"; "CAST_CONFIRM_DESC" = "Shows a confirmation alert before casting"; "CASTING" = "Casting"; diff --git a/Localizations/uYouPlus.bundle/tr.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/tr.lproj/Localizable.strings index 467aebd9f3..0e6bc9c79f 100644 --- a/Localizations/uYouPlus.bundle/tr.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/tr.lproj/Localizable.strings @@ -99,6 +99,9 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Diğer"; +"HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; + "CAST_CONFIRM" = "Yayınlamadan önce uyarıyı onayla (YTCastConfirm)"; "CAST_CONFIRM_DESC" = "TV'nin yanlışlıkla ele geçirilmesini önlemek için yayınlamadan önce bir onay uyarısı gösterir."; "CASTING" = "Yayınlar"; diff --git a/Localizations/uYouPlus.bundle/vi.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/vi.lproj/Localizable.strings index 0012fe91e0..44a82811b7 100644 --- a/Localizations/uYouPlus.bundle/vi.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/vi.lproj/Localizable.strings @@ -99,6 +99,9 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Cài đặt khác"; +"HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; + "CAST_CONFIRM" = "Xác nhận trước khi cast video (YTCastConfirm)"; "CAST_CONFIRM_DESC" = "Hiện hộp thoại xác nhận trước khi cast video sang TV để tránh vô tình chiếm quyền điều khiển TV."; "CASTING" = "Truyền video"; diff --git a/Localizations/uYouPlus.bundle/zh_cn.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/zh_cn.lproj/Localizable.strings index 44cc57ca99..ba039f074e 100644 --- a/Localizations/uYouPlus.bundle/zh_cn.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/zh_cn.lproj/Localizable.strings @@ -99,6 +99,9 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 其它选项"; +"HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; + "CAST_CONFIRM" = "投屏前确认 (YTCastConfirm)"; "CAST_CONFIRM_DESC" = "在投屏前显示确认对话框以防意外劫屏。"; "CASTING" = "准备投屏"; diff --git a/Localizations/uYouPlus.bundle/zh_tw.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/zh_tw.lproj/Localizable.strings index a5529f3fde..b13e9ebeee 100644 --- a/Localizations/uYouPlus.bundle/zh_tw.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/zh_tw.lproj/Localizable.strings @@ -99,6 +99,9 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 雜項"; +"HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; + "CAST_CONFIRM" = "投放前確認 (YTCastConfirm)"; "CAST_CONFIRM_DESC" = "在投放前顯示確認訊息,以防止家人幹樵。"; "CASTING" = "投放中"; diff --git a/Sources/uYouPlus.h b/Sources/uYouPlus.h index 0e470aaaa4..3d13808e82 100644 --- a/Sources/uYouPlus.h +++ b/Sources/uYouPlus.h @@ -28,6 +28,11 @@ - (void)confirmAlertDidPressConfirm; @end +// Hide iSponsorBlock +@interface YTRightNavigationButtons : UIView +@property (nonatomic, readwrite, strong) UIView *sponsorBlockButton; +@end + // Hide YouTube annoying banner in Home page? - @MiRO92 - YTNoShorts: https://github.com/MiRO92/YTNoShorts @interface _ASCollectionViewCell : UICollectionViewCell - (id)node; diff --git a/Sources/uYouPlus.xm b/Sources/uYouPlus.xm index 4fbc52ca75..e6d41a6692 100644 --- a/Sources/uYouPlus.xm +++ b/Sources/uYouPlus.xm @@ -155,6 +155,15 @@ NSBundle *tweakBundle = uYouPlusBundle(); # pragma mark - Miscellaneous +// Hide iSponsorBlock +%hook YTRightNavigationButtons +- (void)didMoveToWindow { + %orig; + if (IS_ENABLED(@"hideiSponsorBlockButton_enabled")) + self.sponsorBlockButton.hidden = YES; +} +%end + // YTCastConfirm // See YTCastConfirm.xm diff --git a/Sources/uYouPlusPatches.h b/Sources/uYouPlusPatches.h index 1efe8d24ae..e0e8e373ce 100644 --- a/Sources/uYouPlusPatches.h +++ b/Sources/uYouPlusPatches.h @@ -10,9 +10,13 @@ -(YTSingleVideoController *)activeVideo; @end -// Prevent uYou player bar from showing when not playing downloaded media @interface PlayerManager : NSObject +// Prevent uYou player bar from showing when not playing downloaded media - (float)progress; +// Prevent uYou's playback from colliding with YouTube's +- (void)setSource:(id)source; +- (void)pause; ++ (id)sharedInstance; @end // iOS 16 uYou crash fix - @level3tjg: https://github.com/qnblackcat/uYouPlus/pull/224 diff --git a/Sources/uYouPlusPatches.xm b/Sources/uYouPlusPatches.xm index 3df68de3e8..99ec0b197d 100644 --- a/Sources/uYouPlusPatches.xm +++ b/Sources/uYouPlusPatches.xm @@ -173,14 +173,17 @@ static void refreshUYouAppearance() { %end // Prevent uYou's playback from colliding with YouTube's -BOOL isYTPlaybackActive = NO; -%hook HAMPlayerInternal -- (void)play { %orig; isYTPlaybackActive = YES; } -- (void)terminate { %orig; isYTPlaybackActive = NO; } +%hook PlayerVC +- (void)close { + %orig; + [[%c(PlayerManager) sharedInstance] setSource:nil]; +} %end -%hook PlayerManager +%hook HAMPlayerInternal - (void)play { - if (isYTPlaybackActive) return; + dispatch_async(dispatch_get_main_queue(), ^{ + [[%c(PlayerManager) sharedInstance] pause]; + }); %orig; } %end diff --git a/Sources/uYouPlusSettings.xm b/Sources/uYouPlusSettings.xm index 5f98fc4f30..bab01b4c44 100644 --- a/Sources/uYouPlusSettings.xm +++ b/Sources/uYouPlusSettings.xm @@ -194,6 +194,8 @@ extern NSBundle *uYouPlusBundle(); # pragma mark - Miscellaneous SECTION_HEADER(LOC(@"MISCELLANEOUS")); + // SWITCH_ITEM2(LOC(@"HIDE_UYOU"), nil, @"hideUYouTab_enabled"); // We stay on 19.02.1 until MiRO92 update uYou? + SWITCH_ITEM2(LOC(@"HIDE_ISPONSORBLOCK"), nil, @"hideiSponsorBlockButton_enabled"); SWITCH_ITEM(LOC(@"CAST_CONFIRM"), LOC(@"CAST_CONFIRM_DESC"), @"castConfirm_enabled"); SWITCH_ITEM(LOC(@"DISABLE_HINTS"), LOC(@"DISABLE_HINTS_DESC"), @"disableHints_enabled"); SWITCH_ITEM(LOC(@"ENABLE_YT_STARTUP_ANIMATION"), LOC(@"ENABLE_YT_STARTUP_ANIMATION_DESC"), @"ytStartupAnimation_enabled");