From eea9cf2e4e7231bc1adfb7c95c949e909350fd5a Mon Sep 17 00:00:00 2001 From: Foxster Date: Fri, 26 Jan 2024 11:56:37 -0800 Subject: [PATCH 1/7] Add option to hide uYou tab --- Localizations/uYouPlus.bundle/ar.lproj/Localizable.strings | 2 ++ Localizations/uYouPlus.bundle/cz.lproj/Localizable.strings | 2 ++ Localizations/uYouPlus.bundle/de.lproj/Localizable.strings | 2 ++ Localizations/uYouPlus.bundle/el.lproj/Localizable.strings | 2 ++ Localizations/uYouPlus.bundle/en.lproj/Localizable.strings | 2 ++ Localizations/uYouPlus.bundle/es.lproj/Localizable.strings | 2 ++ Localizations/uYouPlus.bundle/fr.lproj/Localizable.strings | 2 ++ Localizations/uYouPlus.bundle/he.lproj/Localizable.strings | 2 ++ Localizations/uYouPlus.bundle/hu.lproj/Localizable.strings | 2 ++ Localizations/uYouPlus.bundle/it.lproj/Localizable.strings | 2 ++ Localizations/uYouPlus.bundle/ja.lproj/Localizable.strings | 2 ++ Localizations/uYouPlus.bundle/ko.lproj/Localizable.strings | 2 ++ Localizations/uYouPlus.bundle/nl.lproj/Localizable.strings | 2 ++ Localizations/uYouPlus.bundle/pl.lproj/Localizable.strings | 2 ++ Localizations/uYouPlus.bundle/pt.lproj/Localizable.strings | 2 ++ Localizations/uYouPlus.bundle/ro.lproj/Localizable.strings | 2 ++ Localizations/uYouPlus.bundle/ru.lproj/Localizable.strings | 2 ++ .../uYouPlus.bundle/template.lproj/Localizable.strings | 2 ++ Localizations/uYouPlus.bundle/tr.lproj/Localizable.strings | 2 ++ Localizations/uYouPlus.bundle/vi.lproj/Localizable.strings | 2 ++ Localizations/uYouPlus.bundle/zh_cn.lproj/Localizable.strings | 2 ++ Localizations/uYouPlus.bundle/zh_tw.lproj/Localizable.strings | 2 ++ Sources/uYouPlusSettings.xm | 1 + 23 files changed, 45 insertions(+) diff --git a/Localizations/uYouPlus.bundle/ar.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/ar.lproj/Localizable.strings index 3b8f51b..c9f2c93 100644 --- a/Localizations/uYouPlus.bundle/ar.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/ar.lproj/Localizable.strings @@ -99,6 +99,8 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 خيارات متنوعة"; +"HIDE_UYOU" = "Hide uYou tab"; + "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 a2b2fcc..112c1ec 100644 --- a/Localizations/uYouPlus.bundle/cz.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/cz.lproj/Localizable.strings @@ -99,6 +99,8 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Miscellaneous"; +"HIDE_UYOU" = "Hide uYou tab"; + "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 5b48d52..964d56d 100755 --- a/Localizations/uYouPlus.bundle/de.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/de.lproj/Localizable.strings @@ -99,6 +99,8 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Sonstiges"; +"HIDE_UYOU" = "Hide uYou tab"; + "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 b4885e2..4900ab2 100644 --- a/Localizations/uYouPlus.bundle/el.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/el.lproj/Localizable.strings @@ -99,6 +99,8 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Miscellaneous"; +"HIDE_UYOU" = "Hide uYou tab"; + "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 28bca3f..6810ef7 100644 --- a/Localizations/uYouPlus.bundle/en.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/en.lproj/Localizable.strings @@ -99,6 +99,8 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Miscellaneous"; +"HIDE_UYOU" = "Hide uYou tab"; + "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 833f0d5..1616804 100644 --- a/Localizations/uYouPlus.bundle/es.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/es.lproj/Localizable.strings @@ -99,6 +99,8 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Varios"; +"HIDE_UYOU" = "Hide uYou tab"; + "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 07df070..6390957 100644 --- a/Localizations/uYouPlus.bundle/fr.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/fr.lproj/Localizable.strings @@ -99,6 +99,8 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Divers"; +"HIDE_UYOU" = "Hide uYou tab"; + "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 599221a..f97dc4f 100644 --- a/Localizations/uYouPlus.bundle/he.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/he.lproj/Localizable.strings @@ -99,6 +99,8 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Miscellaneous"; +"HIDE_UYOU" = "Hide uYou tab"; + "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 216a6b8..db6a011 100644 --- a/Localizations/uYouPlus.bundle/hu.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/hu.lproj/Localizable.strings @@ -99,6 +99,8 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Miscellaneous"; +"HIDE_UYOU" = "Hide uYou tab"; + "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 436af28..373fa88 100644 --- a/Localizations/uYouPlus.bundle/it.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/it.lproj/Localizable.strings @@ -99,6 +99,8 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Varie"; +"HIDE_UYOU" = "Hide uYou tab"; + "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 ecde25d..e573572 100644 --- a/Localizations/uYouPlus.bundle/ja.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/ja.lproj/Localizable.strings @@ -99,6 +99,8 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 その他"; +"HIDE_UYOU" = "Hide uYou tab"; + "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 ed6e154..74783fd 100644 --- a/Localizations/uYouPlus.bundle/ko.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/ko.lproj/Localizable.strings @@ -99,6 +99,8 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 기타 설정"; +"HIDE_UYOU" = "Hide uYou tab"; + "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 0dfdf29..cae73ee 100644 --- a/Localizations/uYouPlus.bundle/nl.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/nl.lproj/Localizable.strings @@ -99,6 +99,8 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Miscellaneous"; +"HIDE_UYOU" = "Hide uYou tab"; + "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 ee4740a..775ee0f 100644 --- a/Localizations/uYouPlus.bundle/pl.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/pl.lproj/Localizable.strings @@ -99,6 +99,8 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Miscellaneous"; +"HIDE_UYOU" = "Hide uYou tab"; + "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 b881a8c..e03763f 100644 --- a/Localizations/uYouPlus.bundle/pt.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/pt.lproj/Localizable.strings @@ -99,6 +99,8 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Diversos"; +"HIDE_UYOU" = "Hide uYou tab"; + "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 7a067c8..6b526c2 100644 --- a/Localizations/uYouPlus.bundle/ro.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/ro.lproj/Localizable.strings @@ -99,6 +99,8 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Miscellaneous"; +"HIDE_UYOU" = "Hide uYou tab"; + "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 aaaaad4..eafd76e 100644 --- a/Localizations/uYouPlus.bundle/ru.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/ru.lproj/Localizable.strings @@ -99,6 +99,8 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Другое"; +"HIDE_UYOU" = "Hide uYou tab"; + "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 6131040..be1b786 100644 --- a/Localizations/uYouPlus.bundle/template.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/template.lproj/Localizable.strings @@ -114,6 +114,8 @@ https://github.com/PoomSmart/Return-YouTube-Dislikes/tree/main/layout/Library/Ap // Miscellaneous "MISCELLANEOUS" = "🔎 Miscellaneous"; +"HIDE_UYOU" = "Hide uYou tab"; + "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 467aebd..c1b1284 100644 --- a/Localizations/uYouPlus.bundle/tr.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/tr.lproj/Localizable.strings @@ -99,6 +99,8 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Diğer"; +"HIDE_UYOU" = "Hide uYou tab"; + "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 0012fe9..7c4d811 100644 --- a/Localizations/uYouPlus.bundle/vi.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/vi.lproj/Localizable.strings @@ -99,6 +99,8 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Cài đặt khác"; +"HIDE_UYOU" = "Hide uYou tab"; + "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 44cc57c..00e3082 100644 --- a/Localizations/uYouPlus.bundle/zh_cn.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/zh_cn.lproj/Localizable.strings @@ -99,6 +99,8 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 其它选项"; +"HIDE_UYOU" = "Hide uYou tab"; + "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 a5529f3..a7cc9b0 100644 --- a/Localizations/uYouPlus.bundle/zh_tw.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/zh_tw.lproj/Localizable.strings @@ -99,6 +99,8 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 雜項"; +"HIDE_UYOU" = "Hide uYou tab"; + "CAST_CONFIRM" = "投放前確認 (YTCastConfirm)"; "CAST_CONFIRM_DESC" = "在投放前顯示確認訊息，以防止家人幹樵。"; "CASTING" = "投放中"; diff --git a/Sources/uYouPlusSettings.xm b/Sources/uYouPlusSettings.xm index 5f98fc4..146a8d9 100644 --- a/Sources/uYouPlusSettings.xm +++ b/Sources/uYouPlusSettings.xm @@ -194,6 +194,7 @@ extern NSBundle *uYouPlusBundle(); # pragma mark - Miscellaneous SECTION_HEADER(LOC(@"MISCELLANEOUS")); + SWITCH_ITEM2(LOC(@"HIDE_UYOU"), nil, @"hideUYouTab"); 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"); From e1591c2c891b8b8db1c7579e56eb479f99cdf719 Mon Sep 17 00:00:00 2001 From: Foxster Date: Fri, 26 Jan 2024 19:07:01 -0800 Subject: [PATCH 2/7] Rename key --- Sources/uYouPlusSettings.xm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/uYouPlusSettings.xm b/Sources/uYouPlusSettings.xm index 146a8d9..b343489 100644 --- a/Sources/uYouPlusSettings.xm +++ b/Sources/uYouPlusSettings.xm @@ -194,7 +194,7 @@ extern NSBundle *uYouPlusBundle(); # pragma mark - Miscellaneous SECTION_HEADER(LOC(@"MISCELLANEOUS")); - SWITCH_ITEM2(LOC(@"HIDE_UYOU"), nil, @"hideUYouTab"); + SWITCH_ITEM2(LOC(@"HIDE_UYOU"), nil, @"hideUYouTab_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"); From 7b0098cff54b17c6db85262a1a4f8146b4fbc322 Mon Sep 17 00:00:00 2001 From: Foxster Date: Fri, 26 Jan 2024 19:26:57 -0800 Subject: [PATCH 3/7] Add option to hide iSponsorBlock --- .../uYouPlus.bundle/ar.lproj/Localizable.strings | 1 + .../uYouPlus.bundle/cz.lproj/Localizable.strings | 1 + .../uYouPlus.bundle/de.lproj/Localizable.strings | 1 + .../uYouPlus.bundle/el.lproj/Localizable.strings | 1 + .../uYouPlus.bundle/en.lproj/Localizable.strings | 1 + .../uYouPlus.bundle/es.lproj/Localizable.strings | 1 + .../uYouPlus.bundle/fr.lproj/Localizable.strings | 1 + .../uYouPlus.bundle/he.lproj/Localizable.strings | 1 + .../uYouPlus.bundle/hu.lproj/Localizable.strings | 1 + .../uYouPlus.bundle/it.lproj/Localizable.strings | 1 + .../uYouPlus.bundle/ja.lproj/Localizable.strings | 1 + .../uYouPlus.bundle/ko.lproj/Localizable.strings | 1 + .../uYouPlus.bundle/nl.lproj/Localizable.strings | 1 + .../uYouPlus.bundle/pl.lproj/Localizable.strings | 1 + .../uYouPlus.bundle/pt.lproj/Localizable.strings | 1 + .../uYouPlus.bundle/ro.lproj/Localizable.strings | 1 + .../uYouPlus.bundle/ru.lproj/Localizable.strings | 1 + .../uYouPlus.bundle/template.lproj/Localizable.strings | 1 + .../uYouPlus.bundle/tr.lproj/Localizable.strings | 1 + .../uYouPlus.bundle/vi.lproj/Localizable.strings | 1 + .../uYouPlus.bundle/zh_cn.lproj/Localizable.strings | 1 + .../uYouPlus.bundle/zh_tw.lproj/Localizable.strings | 1 + Sources/uYouPlus.xm | 9 +++++++++ Sources/uYouPlusSettings.xm | 1 + 24 files changed, 32 insertions(+) diff --git a/Localizations/uYouPlus.bundle/ar.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/ar.lproj/Localizable.strings index c9f2c93..98afe0a 100644 --- a/Localizations/uYouPlus.bundle/ar.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/ar.lproj/Localizable.strings @@ -100,6 +100,7 @@ "MISCELLANEOUS" = "🔎 خيارات متنوعة"; "HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; "CAST_CONFIRM" = "التأكيد قبل البث (أداة YTCastConfirm)"; "CAST_CONFIRM_DESC" = "إظهار تنبيه للتأكيد قبل البث، من أجل منع البث للتلفاز عن طريق الخطأ."; diff --git a/Localizations/uYouPlus.bundle/cz.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/cz.lproj/Localizable.strings index 112c1ec..2cc27bf 100644 --- a/Localizations/uYouPlus.bundle/cz.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/cz.lproj/Localizable.strings @@ -100,6 +100,7 @@ "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."; diff --git a/Localizations/uYouPlus.bundle/de.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/de.lproj/Localizable.strings index 964d56d..062223a 100755 --- a/Localizations/uYouPlus.bundle/de.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/de.lproj/Localizable.strings @@ -100,6 +100,7 @@ "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."; diff --git a/Localizations/uYouPlus.bundle/el.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/el.lproj/Localizable.strings index 4900ab2..9e35b24 100644 --- a/Localizations/uYouPlus.bundle/el.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/el.lproj/Localizable.strings @@ -100,6 +100,7 @@ "MISCELLANEOUS" = "🔎 Miscellaneous"; "HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock"; "CAST_CONFIRM" = "Επιβεβαιωτικό μήνυμα πριν γίνει Cast(YTCastConfirm)"; "CAST_CONFIRM_DESC" = "Να φανεί ένα επιβεβαιωτικό μήνυμα πριν γίνει cast για να αποτρεπτεί η καταλάθως σύνδεση στην τηλεόραση."; diff --git a/Localizations/uYouPlus.bundle/en.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/en.lproj/Localizable.strings index 6810ef7..f29a94d 100644 --- a/Localizations/uYouPlus.bundle/en.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/en.lproj/Localizable.strings @@ -100,6 +100,7 @@ "MISCELLANEOUS" = "🔎 Miscellaneous"; "HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; "CAST_CONFIRM" = "YTCastConfirm"; "CAST_CONFIRM_DESC" = "Shows a confirmation alert before casting"; diff --git a/Localizations/uYouPlus.bundle/es.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/es.lproj/Localizable.strings index 1616804..59b1f2f 100644 --- a/Localizations/uYouPlus.bundle/es.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/es.lproj/Localizable.strings @@ -100,6 +100,7 @@ "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."; diff --git a/Localizations/uYouPlus.bundle/fr.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/fr.lproj/Localizable.strings index 6390957..bbf8c0b 100644 --- a/Localizations/uYouPlus.bundle/fr.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/fr.lproj/Localizable.strings @@ -100,6 +100,7 @@ "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"; diff --git a/Localizations/uYouPlus.bundle/he.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/he.lproj/Localizable.strings index f97dc4f..408e604 100644 --- a/Localizations/uYouPlus.bundle/he.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/he.lproj/Localizable.strings @@ -100,6 +100,7 @@ "MISCELLANEOUS" = "🔎 Miscellaneous"; "HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; "CAST_CONFIRM" = "התראת אישור לפני שידור לטלוויזיה (YTCastConfirm)"; "CAST_CONFIRM_DESC" = "הצג התראת אישור לפני שידור לטלוויזיה כדי למנוע לחיצה בטעות."; diff --git a/Localizations/uYouPlus.bundle/hu.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/hu.lproj/Localizable.strings index db6a011..bf67f56 100644 --- a/Localizations/uYouPlus.bundle/hu.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/hu.lproj/Localizable.strings @@ -100,6 +100,7 @@ "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."; diff --git a/Localizations/uYouPlus.bundle/it.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/it.lproj/Localizable.strings index 373fa88..805ed51 100644 --- a/Localizations/uYouPlus.bundle/it.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/it.lproj/Localizable.strings @@ -100,6 +100,7 @@ "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."; diff --git a/Localizations/uYouPlus.bundle/ja.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/ja.lproj/Localizable.strings index e573572..49c0cee 100644 --- a/Localizations/uYouPlus.bundle/ja.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/ja.lproj/Localizable.strings @@ -100,6 +100,7 @@ "MISCELLANEOUS" = "🔎 その他"; "HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; "CAST_CONFIRM" = "YTCastConfirm"; "CAST_CONFIRM_DESC" = "キャスト前に確認の警告を表示します。"; diff --git a/Localizations/uYouPlus.bundle/ko.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/ko.lproj/Localizable.strings index 74783fd..f181ec9 100644 --- a/Localizations/uYouPlus.bundle/ko.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/ko.lproj/Localizable.strings @@ -100,6 +100,7 @@ "MISCELLANEOUS" = "🔎 기타 설정"; "HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; "CAST_CONFIRM" = "TV 전송 알림 (YTCastConfirm)"; "CAST_CONFIRM_DESC" = "의도치 않게 TV로 영상을 전송하지 않도록 보내기 전에 확인 메시지를 표시합니다."; diff --git a/Localizations/uYouPlus.bundle/nl.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/nl.lproj/Localizable.strings index cae73ee..2aec0f9 100644 --- a/Localizations/uYouPlus.bundle/nl.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/nl.lproj/Localizable.strings @@ -100,6 +100,7 @@ "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."; diff --git a/Localizations/uYouPlus.bundle/pl.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/pl.lproj/Localizable.strings index 775ee0f..acdd36c 100644 --- a/Localizations/uYouPlus.bundle/pl.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/pl.lproj/Localizable.strings @@ -100,6 +100,7 @@ "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."; diff --git a/Localizations/uYouPlus.bundle/pt.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/pt.lproj/Localizable.strings index e03763f..752ff1b 100644 --- a/Localizations/uYouPlus.bundle/pt.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/pt.lproj/Localizable.strings @@ -100,6 +100,7 @@ "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."; diff --git a/Localizations/uYouPlus.bundle/ro.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/ro.lproj/Localizable.strings index 6b526c2..59907f1 100644 --- a/Localizations/uYouPlus.bundle/ro.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/ro.lproj/Localizable.strings @@ -100,6 +100,7 @@ "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."; diff --git a/Localizations/uYouPlus.bundle/ru.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/ru.lproj/Localizable.strings index eafd76e..a4de90d 100644 --- a/Localizations/uYouPlus.bundle/ru.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/ru.lproj/Localizable.strings @@ -100,6 +100,7 @@ "MISCELLANEOUS" = "🔎 Другое"; "HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; "CAST_CONFIRM" = "Подтверждение «Трансляции» (YTCastConfirm)"; "CAST_CONFIRM_DESC" = "Спрашивать подтверждение перед началом трансляции во избежание случайных подключений к ТВ."; diff --git a/Localizations/uYouPlus.bundle/template.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/template.lproj/Localizable.strings index be1b786..6c47637 100644 --- a/Localizations/uYouPlus.bundle/template.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/template.lproj/Localizable.strings @@ -115,6 +115,7 @@ https://github.com/PoomSmart/Return-YouTube-Dislikes/tree/main/layout/Library/Ap "MISCELLANEOUS" = "🔎 Miscellaneous"; "HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; "CAST_CONFIRM" = "YTCastConfirm"; "CAST_CONFIRM_DESC" = "Shows a confirmation alert before casting"; diff --git a/Localizations/uYouPlus.bundle/tr.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/tr.lproj/Localizable.strings index c1b1284..0e6bc9c 100644 --- a/Localizations/uYouPlus.bundle/tr.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/tr.lproj/Localizable.strings @@ -100,6 +100,7 @@ "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."; diff --git a/Localizations/uYouPlus.bundle/vi.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/vi.lproj/Localizable.strings index 7c4d811..44a8281 100644 --- a/Localizations/uYouPlus.bundle/vi.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/vi.lproj/Localizable.strings @@ -100,6 +100,7 @@ "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."; diff --git a/Localizations/uYouPlus.bundle/zh_cn.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/zh_cn.lproj/Localizable.strings index 00e3082..ba039f0 100644 --- a/Localizations/uYouPlus.bundle/zh_cn.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/zh_cn.lproj/Localizable.strings @@ -100,6 +100,7 @@ "MISCELLANEOUS" = "🔎 其它选项"; "HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; "CAST_CONFIRM" = "投屏前确认 （YTCastConfirm）"; "CAST_CONFIRM_DESC" = "在投屏前显示确认对话框以防意外劫屏。"; diff --git a/Localizations/uYouPlus.bundle/zh_tw.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/zh_tw.lproj/Localizable.strings index a7cc9b0..b13e9eb 100644 --- a/Localizations/uYouPlus.bundle/zh_tw.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/zh_tw.lproj/Localizable.strings @@ -100,6 +100,7 @@ "MISCELLANEOUS" = "🔎 雜項"; "HIDE_UYOU" = "Hide uYou tab"; +"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; "CAST_CONFIRM" = "投放前確認 (YTCastConfirm)"; "CAST_CONFIRM_DESC" = "在投放前顯示確認訊息，以防止家人幹樵。"; diff --git a/Sources/uYouPlus.xm b/Sources/uYouPlus.xm index 4fbc52c..2af91de 100644 --- a/Sources/uYouPlus.xm +++ b/Sources/uYouPlus.xm @@ -155,6 +155,15 @@ NSBundle *tweakBundle = uYouPlusBundle(); # pragma mark - Miscellaneous +// Hide iSponsorBlock +%hook YTRightNavigationButtons +- (void)setSponsorBlockButton:(id)sponsorBlockButton { + if (IS_ENABLED(@"hideiSponsorBlockButton_enabled")) + return; + %orig; +} +%end + // YTCastConfirm // See YTCastConfirm.xm diff --git a/Sources/uYouPlusSettings.xm b/Sources/uYouPlusSettings.xm index b343489..711890d 100644 --- a/Sources/uYouPlusSettings.xm +++ b/Sources/uYouPlusSettings.xm @@ -195,6 +195,7 @@ extern NSBundle *uYouPlusBundle(); SECTION_HEADER(LOC(@"MISCELLANEOUS")); SWITCH_ITEM2(LOC(@"HIDE_UYOU"), nil, @"hideUYouTab_enabled"); + 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"); From af082215e29b7e22279c1131a1ff766bfe8275ac Mon Sep 17 00:00:00 2001 From: Foxster Date: Fri, 26 Jan 2024 20:01:47 -0800 Subject: [PATCH 4/7] Fix hide iSponsorBlock option --- Sources/uYouPlus.h | 5 +++++ Sources/uYouPlus.xm | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Sources/uYouPlus.h b/Sources/uYouPlus.h index 0e470aa..3d13808 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 2af91de..5dd5b70 100644 --- a/Sources/uYouPlus.xm +++ b/Sources/uYouPlus.xm @@ -157,10 +157,10 @@ NSBundle *tweakBundle = uYouPlusBundle(); // Hide iSponsorBlock %hook YTRightNavigationButtons -- (void)setSponsorBlockButton:(id)sponsorBlockButton { - if (IS_ENABLED(@"hideiSponsorBlockButton_enabled")) - return; +- (void)layoutSubviews { %orig; + if (IS_ENABLED(@"hideiSponsorBlockButton_enabled")) + self.sponsorBlockButton.hidden = YES; } %end From b95f0874baf62d8007450aa3d99d7adbb21f0889 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20=C4=90=E1=BA=A1t?= <52943116+qnblackcat@users.noreply.github.com> Date: Sat, 27 Jan 2024 23:37:41 +0700 Subject: [PATCH 5/7] use didMoveToWindow --- Sources/uYouPlus.xm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/uYouPlus.xm b/Sources/uYouPlus.xm index 5dd5b70..e6d41a6 100644 --- a/Sources/uYouPlus.xm +++ b/Sources/uYouPlus.xm @@ -157,7 +157,7 @@ NSBundle *tweakBundle = uYouPlusBundle(); // Hide iSponsorBlock %hook YTRightNavigationButtons -- (void)layoutSubviews { +- (void)didMoveToWindow { %orig; if (IS_ENABLED(@"hideiSponsorBlockButton_enabled")) self.sponsorBlockButton.hidden = YES; From 1459b08e5540c9a22d204ccaef7865033139223b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20=C4=90=E1=BA=A1t?= <52943116+qnblackcat@users.noreply.github.com> Date: Sat, 27 Jan 2024 23:39:27 +0700 Subject: [PATCH 6/7] Update uYouPlusSettings.xm --- Sources/uYouPlusSettings.xm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/uYouPlusSettings.xm b/Sources/uYouPlusSettings.xm index 711890d..bab01b4 100644 --- a/Sources/uYouPlusSettings.xm +++ b/Sources/uYouPlusSettings.xm @@ -194,7 +194,7 @@ extern NSBundle *uYouPlusBundle(); # pragma mark - Miscellaneous SECTION_HEADER(LOC(@"MISCELLANEOUS")); - SWITCH_ITEM2(LOC(@"HIDE_UYOU"), nil, @"hideUYouTab_enabled"); + // 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"); From 880603f7f464412699d86a609f1b9c779eb927c0 Mon Sep 17 00:00:00 2001 From: Foxster Date: Sun, 28 Jan 2024 09:53:08 -0800 Subject: [PATCH 7/7] Actually prevent uYou's playback from colliding with YouTube's --- Sources/uYouPlusPatches.h | 6 +++++- Sources/uYouPlusPatches.xm | 15 +++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Sources/uYouPlusPatches.h b/Sources/uYouPlusPatches.h index 1efe8d2..e0e8e37 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 3df68de..99ec0b1 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