From eeb742e7799e36b61f8649022645c57fe6580251 Mon Sep 17 00:00:00 2001 From: Bryce Hackel <34104885+bhackel@users.noreply.github.com> Date: Tue, 2 Apr 2024 19:40:37 -0700 Subject: [PATCH 01/13] Commit d7aee836acf8a8e56e78bbbafefd14151d2ca4c4 Merge pull request qnblackcat#1304 from qnblackcat/psyt --- .gitmodules | 4 ---- Makefile | 2 +- Sources/uYouPlus.h | 46 ++++++++++++++++++++-------------------- Sources/uYouPlusThemes.h | 6 +++--- 4 files changed, 27 insertions(+), 31 deletions(-) diff --git a/.gitmodules b/.gitmodules index a59e018..2e1d0f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -26,10 +26,6 @@ path = Tweaks/YouTubeHeader url = https://github.com/arichornlover/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 db5a54b..fe47f80 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/uYouPlus.h b/Sources/uYouPlus.h index 9e27478..f688d9c 100644 --- a/Sources/uYouPlus.h +++ b/Sources/uYouPlus.h @@ -9,33 +9,33 @@ #import #import "uYouPlusThemes.h" -#import "Tweaks/YouTubeHeader/YTAppDelegate.h" -#import "Tweaks/YouTubeHeader/YTIMenuConditionalServiceItemRenderer.h" -#import "Tweaks/YouTubeHeader/YTVideoQualitySwitchOriginalController.h" -#import "Tweaks/YouTubeHeader/YTIGuideResponse.h" -#import "Tweaks/YouTubeHeader/YTIGuideResponseSupportedRenderers.h" -#import "Tweaks/YouTubeHeader/YTIPivotBarSupportedRenderers.h" -#import "Tweaks/YouTubeHeader/YTIPivotBarItemRenderer.h" -#import "Tweaks/YouTubeHeader/YTIBrowseRequest.h" -#import "Tweaks/YouTubeHeader/YTIButtonRenderer.h" -#import "Tweaks/YouTubeHeader/YTIElementRenderer.h" -#import "Tweaks/YouTubeHeader/YTISectionListRenderer.h" -#import "Tweaks/YouTubeHeader/YTWatchNextResultsViewController.h" -#import "Tweaks/YouTubeHeader/YTPlayerOverlay.h" -#import "Tweaks/YouTubeHeader/YTPlayerOverlayProvider.h" -#import "Tweaks/YouTubeHeader/YTReelWatchPlaybackOverlayView.h" -#import "Tweaks/YouTubeHeader/YTInlinePlayerBarContainerView.h" -#import "Tweaks/YouTubeHeader/YTInnerTubeCollectionViewController.h" -#import "Tweaks/YouTubeHeader/YTPivotBarItemView.h" +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import // Hide buttons under the video player by @PoomSmart -#import "Tweaks/YouTubeHeader/ASCollectionElement.h" -#import "Tweaks/YouTubeHeader/ASCollectionView.h" -#import "Tweaks/YouTubeHeader/ELMNodeController.h" +#import +#import +#import // YouTube-X -#import "Tweaks/YouTubeHeader/YTVideoWithContextNode.h" -#import "Tweaks/YouTubeHeader/ELMCellNode.h" +#import +#import #define LOC(x) [tweakBundle localizedStringForKey:x value:nil table:nil] #define IS_ENABLED(k) [[NSUserDefaults standardUserDefaults] boolForKey:k] diff --git a/Sources/uYouPlusThemes.h b/Sources/uYouPlusThemes.h index 8ff7649..f2235de 100644 --- a/Sources/uYouPlusThemes.h +++ b/Sources/uYouPlusThemes.h @@ -1,6 +1,6 @@ -#import "Tweaks/YouTubeHeader/YTCommonColorPalette.h" -#import "Tweaks/YouTubeHeader/ASCollectionView.h" -#import "Tweaks/YouTubeHeader/_ASDisplayView.h" +#import +#import +#import #import "uYouPlus.h" // @interface YCHLiveChatView : UIView From 5da0c7d482bb8c76bd6aa88a9e080c7a8f4595be Mon Sep 17 00:00:00 2001 From: Bryce Hackel <34104885+bhackel@users.noreply.github.com> Date: Tue, 2 Apr 2024 19:59:21 -0700 Subject: [PATCH 02/13] Commit b9d1826c99c748bb03a0995a089e404ac16f6ade prepare for uYou v3.0.2+ --- Sources/uYouPlus.xm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Sources/uYouPlus.xm b/Sources/uYouPlus.xm index d81c284..f8eb7ac 100644 --- a/Sources/uYouPlus.xm +++ b/Sources/uYouPlus.xm @@ -560,11 +560,13 @@ BOOL isAd(YTIElementRenderer *self) { // YTStockVolumeHUD - https://github.com/lilacvibes/YTStockVolumeHUD %group gStockVolumeHUD -%hook YTVolumeBarView -- (void)volumeChanged:(id)arg1 { - %orig(nil); +// Use YTColdConfig's method instead of YTStockVolumeHUD.xm, see https://x.com/PoomSmart/status/1756904290445332653 +%hook YTColdConfig +- (BOOL)iosUseSystemVolumeControlInFullscreen { + return IS_ENABLED(@"stockVolumeHUD_enabled") ? YES : %orig; } %end +%end %hook UIApplication - (void)setSystemVolumeHUDEnabled:(BOOL)arg1 forAudioCategory:(id)arg2 { From d64797d471e2afcc9bd10166e52ffd4ed6e0eb38 Mon Sep 17 00:00:00 2001 From: Bryce Hackel <34104885+bhackel@users.noreply.github.com> Date: Wed, 3 Apr 2024 16:30:57 -0700 Subject: [PATCH 03/13] Localization Updates --- .../ar.lproj/Localizable.strings | 11 ++++- .../cz.lproj/Localizable.strings | 11 ++++- .../de.lproj/Localizable.strings | 11 ++++- .../el.lproj/Localizable.strings | 11 ++++- .../en.lproj/Localizable.strings | 11 ++++- .../es.lproj/Localizable.strings | 15 +++++-- .../fr.lproj/Localizable.strings | 11 ++++- .../he.lproj/Localizable.strings | 11 ++++- .../hu.lproj/Localizable.strings | 11 ++++- .../it.lproj/Localizable.strings | 11 ++++- .../ja.lproj/Localizable.strings | 41 +++++++++++-------- .../ko.lproj/Localizable.strings | 11 ++++- .../nl.lproj/Localizable.strings | 11 ++++- .../pl.lproj/Localizable.strings | 11 ++++- .../pt.lproj/Localizable.strings | 11 ++++- .../ro.lproj/Localizable.strings | 11 ++++- .../ru.lproj/Localizable.strings | 11 ++++- .../template.lproj/Localizable.strings | 11 ++++- .../th.lproj/Localizable.strings | 11 ++++- .../tr.lproj/Localizable.strings | 2 +- .../vi.lproj/Localizable.strings | 13 +++++- .../zh_cn.lproj/Localizable.strings | 11 ++++- .../zh_tw.lproj/Localizable.strings | 11 ++++- Sources/uYouPlusSettings.xm | 8 ++-- 24 files changed, 243 insertions(+), 45 deletions(-) diff --git a/Localizations/uYouPlus.bundle/ar.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/ar.lproj/Localizable.strings index aa154ae..840cfaa 100644 --- a/Localizations/uYouPlus.bundle/ar.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/ar.lproj/Localizable.strings @@ -48,11 +48,20 @@ "YT_MINIPLAYER" = "السماح بالمشغل المصغّر لكل فيديوهات يوتيوب"; "YT_MINIPLAYER_DESC" = "عند تصغير فيديوهات الأطفال مثلاً (قبل إغلاق المقطع)."; +"HIDE_REMIX_BUTTON" = "Hides Remix button"; +"HIDE_REMIX_BUTTON_DESC" = ""; + +"HIDE_CLIP_BUTTON" = "Hide Clip button"; +"HIDE_CLIP_BUTTON_DESC" = ""; + +"HIDE_DOWNLOAD_BUTTON" = "Hide Download button"; +"HIDE_DOWNLOAD_BUTTON_DESC" = ""; + "STOCK_VOLUME_HUD" = "استخدام مؤشر تغيير الصوت الخاص بالنظام"; "STOCK_VOLUME_HUD_DESC" = "إظهار مؤشر تغيير الصوت الرسمي الخاص بـ iOS بدلاً من مؤشر يوتيوب"; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 أزرار التحكم على الطبقة فوق الفيديو"; +"VIDEO_PLAYER_OPTIONS" = "📹 أزرار التحكم على الطبقة فوق الفيديو"; "HIDE_AUTOPLAY_SWITCH" = "إخفاء زر التشغيل التلقائي"; "HIDE_AUTOPLAY_SWITCH_DESC" = "إخفاء زر التشغيل التلقائي من أزرار التحكم على الفيديو."; diff --git a/Localizations/uYouPlus.bundle/cz.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/cz.lproj/Localizable.strings index ac5193c..fe528c4 100644 --- a/Localizations/uYouPlus.bundle/cz.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/cz.lproj/Localizable.strings @@ -48,11 +48,20 @@ "YT_MINIPLAYER" = "Povolit Minipřehrávač pro všechna videa"; "YT_MINIPLAYER_DESC" = "Například u videa pro děti"; +"HIDE_REMIX_BUTTON" = "Hides Remix button"; +"HIDE_REMIX_BUTTON_DESC" = ""; + +"HIDE_CLIP_BUTTON" = "Hide Clip button"; +"HIDE_CLIP_BUTTON_DESC" = ""; + +"HIDE_DOWNLOAD_BUTTON" = "Hide Download button"; +"HIDE_DOWNLOAD_BUTTON_DESC" = ""; + "STOCK_VOLUME_HUD" = "Use stock iOS volume HUD"; "STOCK_VOLUME_HUD_DESC" = ""; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 Video Controls Overlay Options"; +"VIDEO_PLAYER_OPTIONS" = "📹 Video Controls Overlay Options"; "HIDE_AUTOPLAY_SWITCH" = "Skrýt přepínač automatického přehrávání"; "HIDE_AUTOPLAY_SWITCH_DESC" = "Skryje přepínač automatického přehrávání v překrytí ovládání videa."; diff --git a/Localizations/uYouPlus.bundle/de.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/de.lproj/Localizable.strings index 4d7a2b2..fcc25fa 100755 --- a/Localizations/uYouPlus.bundle/de.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/de.lproj/Localizable.strings @@ -48,11 +48,20 @@ "YT_MINIPLAYER" = "Miniplayer für alle YouTube-Videos aktivieren"; "YT_MINIPLAYER_DESC" = "z.B. bei Videos für Kinder."; +"HIDE_REMIX_BUTTON" = "Hides Remix button"; +"HIDE_REMIX_BUTTON_DESC" = ""; + +"HIDE_CLIP_BUTTON" = "Hide Clip button"; +"HIDE_CLIP_BUTTON_DESC" = ""; + +"HIDE_DOWNLOAD_BUTTON" = "Hide Download button"; +"HIDE_DOWNLOAD_BUTTON_DESC" = ""; + "STOCK_VOLUME_HUD" = "Standard iOS Lautstärke HUD aktivieren"; "STOCK_VOLUME_HUD_DESC" = ""; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 Video Controls Overlay Optionen"; +"VIDEO_PLAYER_OPTIONS" = "📹 Video Controls Overlay Optionen"; "HIDE_AUTOPLAY_SWITCH" = "Autoplay-Schalter ausblenden"; "HIDE_AUTOPLAY_SWITCH_DESC" = "Autoplay-Schalter vom Videoplayer ausblenden."; diff --git a/Localizations/uYouPlus.bundle/el.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/el.lproj/Localizable.strings index d262131..4902206 100644 --- a/Localizations/uYouPlus.bundle/el.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/el.lproj/Localizable.strings @@ -48,11 +48,20 @@ "YT_MINIPLAYER" = "Ενεργοποιήστε το miniplayer για όλα τα βίντεο του YouTube"; "YT_MINIPLAYER_DESC" = "Τα παιδικά βίντεο για παράδειγμα."; +"HIDE_REMIX_BUTTON" = "Hides Remix button"; +"HIDE_REMIX_BUTTON_DESC" = ""; + +"HIDE_CLIP_BUTTON" = "Hide Clip button"; +"HIDE_CLIP_BUTTON_DESC" = ""; + +"HIDE_DOWNLOAD_BUTTON" = "Hide Download button"; +"HIDE_DOWNLOAD_BUTTON_DESC" = ""; + "STOCK_VOLUME_HUD" = "Use stock iOS volume HUD"; "STOCK_VOLUME_HUD_DESC" = ""; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 Video controls overlay options"; +"VIDEO_PLAYER_OPTIONS" = "📹 Video controls overlay options"; "HIDE_AUTOPLAY_SWITCH" = "Κρύψτε τον διακόπτη της αυτόματης αναπαραγωγής"; "HIDE_AUTOPLAY_SWITCH_DESC" = "Κρύψτε τον διακόπτη της αυτόματης αναπαραγωγής κατά την αναπαραγωγή βίντεο"; diff --git a/Localizations/uYouPlus.bundle/en.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/en.lproj/Localizable.strings index 3c5c831..d8cfa37 100644 --- a/Localizations/uYouPlus.bundle/en.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/en.lproj/Localizable.strings @@ -48,11 +48,20 @@ "YT_MINIPLAYER" = "Enable miniplayer for all videos"; "YT_MINIPLAYER_DESC" = "The miniplayer cannot be activated for certain videos (e.g., kids videos). This option bypasses that"; +"HIDE_REMIX_BUTTON" = "Hides Remix button"; +"HIDE_REMIX_BUTTON_DESC" = ""; + +"HIDE_CLIP_BUTTON" = "Hide Clip button"; +"HIDE_CLIP_BUTTON_DESC" = ""; + +"HIDE_DOWNLOAD_BUTTON" = "Hide Download button"; +"HIDE_DOWNLOAD_BUTTON_DESC" = ""; + "STOCK_VOLUME_HUD" = "Use stock iOS volume HUD"; "STOCK_VOLUME_HUD_DESC" = ""; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 Video controls overlay options"; +"VIDEO_PLAYER_OPTIONS" = "📹 Video controls overlay options"; "HIDE_AUTOPLAY_SWITCH" = "Hide autoplay switch"; "HIDE_AUTOPLAY_SWITCH_DESC" = ""; diff --git a/Localizations/uYouPlus.bundle/es.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/es.lproj/Localizable.strings index 1a26678..8b8fc07 100644 --- a/Localizations/uYouPlus.bundle/es.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/es.lproj/Localizable.strings @@ -48,11 +48,20 @@ "YT_MINIPLAYER" = "Activar el minirreproductor para todos los vídeos de YouTube"; "YT_MINIPLAYER_DESC" = "Vídeos infantiles por ejemplo."; +"HIDE_REMIX_BUTTON" = "Oculta el botón Remix"; +"HIDE_REMIX_BUTTON_DESC" = ""; + +"HIDE_CLIP_BUTTON" = "Ocultar botón Clip"; +"HIDE_CLIP_BUTTON_DESC" = ""; + +"HIDE_DOWNLOAD_BUTTON" = "Ocultar botón de descarga"; +"HIDE_DOWNLOAD_BUTTON_DESC" = ""; + "STOCK_VOLUME_HUD" = "Utiliza el HUD de volumen de iOS"; "STOCK_VOLUME_HUD_DESC" = ""; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 Opciones de superposición de controles de vídeo"; +"VIDEO_PLAYER_OPTIONS" = "📹 Opciones de superposición de controles de vídeo"; "HIDE_AUTOPLAY_SWITCH" = "Ocultar interruptor de Reproducir automáticamente"; "HIDE_AUTOPLAY_SWITCH_DESC" = "Ocultar el interruptor de Reproducir automáticamente en los botones superpuestos."; @@ -102,8 +111,8 @@ // Miscellaneous "MISCELLANEOUS" = "🔎 Varios"; -"HIDE_UYOU" = "Hide uYou tab"; -"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; +"HIDE_UYOU" = "Ocultar pestaña uYou"; +"HIDE_ISPONSORBLOCK" = "Ocultar botón iSponsorBlock"; "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 968215d..02f04ea 100644 --- a/Localizations/uYouPlus.bundle/fr.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/fr.lproj/Localizable.strings @@ -48,11 +48,20 @@ "YT_MINIPLAYER" = "Activer le mini-lecteur pour toutes les vidéos YouTube"; "YT_MINIPLAYER_DESC" = "Vidéos pour enfants par exemple"; +"HIDE_REMIX_BUTTON" = "Hides Remix button"; +"HIDE_REMIX_BUTTON_DESC" = ""; + +"HIDE_CLIP_BUTTON" = "Hide Clip button"; +"HIDE_CLIP_BUTTON_DESC" = ""; + +"HIDE_DOWNLOAD_BUTTON" = "Hide Download button"; +"HIDE_DOWNLOAD_BUTTON_DESC" = ""; + "STOCK_VOLUME_HUD" = "Utiliser l'affichage iOS du volume par défaut"; "STOCK_VOLUME_HUD_DESC" = ""; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 Options de superposition des contrôles vidéo"; +"VIDEO_PLAYER_OPTIONS" = "📹 Options de superposition des contrôles vidéo"; "HIDE_AUTOPLAY_SWITCH" = "Masquer l'interrupteur de lecture automatique"; "HIDE_AUTOPLAY_SWITCH_DESC" = "Masquer le bouton de lecture automatique dans la superposition des contrôles vidéo"; diff --git a/Localizations/uYouPlus.bundle/he.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/he.lproj/Localizable.strings index 21e5834..36f85b5 100644 --- a/Localizations/uYouPlus.bundle/he.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/he.lproj/Localizable.strings @@ -48,11 +48,20 @@ "YT_MINIPLAYER" = "אפשר את הנגן הקטן עבור כל הסרטונים ב-YouTube"; "YT_MINIPLAYER_DESC" = "סרטוני ילדים לדוגמה."; +"HIDE_REMIX_BUTTON" = "Hides Remix button"; +"HIDE_REMIX_BUTTON_DESC" = ""; + +"HIDE_CLIP_BUTTON" = "Hide Clip button"; +"HIDE_CLIP_BUTTON_DESC" = ""; + +"HIDE_DOWNLOAD_BUTTON" = "Hide Download button"; +"HIDE_DOWNLOAD_BUTTON_DESC" = ""; + "STOCK_VOLUME_HUD" = "Use stock iOS volume HUD"; "STOCK_VOLUME_HUD_DESC" = ""; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 Video controls overlay options"; +"VIDEO_PLAYER_OPTIONS" = "📹 Video controls overlay options"; "HIDE_AUTOPLAY_SWITCH" = "הסתר את כפתור ההפעלה האוטומטית"; "HIDE_AUTOPLAY_SWITCH_DESC" = "הסתר את כפתור ההפעלה האוטומטית בתצוגת השליטה בסרטון."; diff --git a/Localizations/uYouPlus.bundle/hu.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/hu.lproj/Localizable.strings index 593c00b..51ef1a2 100644 --- a/Localizations/uYouPlus.bundle/hu.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/hu.lproj/Localizable.strings @@ -48,11 +48,20 @@ "YT_MINIPLAYER" = "Engedélyezze a Minilejátszót az összes YouTube-videóhoz"; "YT_MINIPLAYER_DESC" = "Például gyermekvideók."; +"HIDE_REMIX_BUTTON" = "Hides Remix button"; +"HIDE_REMIX_BUTTON_DESC" = ""; + +"HIDE_CLIP_BUTTON" = "Hide Clip button"; +"HIDE_CLIP_BUTTON_DESC" = ""; + +"HIDE_DOWNLOAD_BUTTON" = "Hide Download button"; +"HIDE_DOWNLOAD_BUTTON_DESC" = ""; + "STOCK_VOLUME_HUD" = "Use iOS stock volume HUD"; "STOCK_VOLUME_HUD_DESC" = ""; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 Video controls overlay options"; +"VIDEO_PLAYER_OPTIONS" = "📹 Video controls overlay options"; "HIDE_AUTOPLAY_SWITCH" = "Az automatikus lejátszás kapcsoló elrejtése"; "HIDE_AUTOPLAY_SWITCH_DESC" = "Az Automatikus lejátszás kapcsoló elrejtése a videovezérlők fedvényében."; diff --git a/Localizations/uYouPlus.bundle/it.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/it.lproj/Localizable.strings index 9959160..ba62a3f 100644 --- a/Localizations/uYouPlus.bundle/it.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/it.lproj/Localizable.strings @@ -48,11 +48,20 @@ "YT_MINIPLAYER" = "Abilita il Miniplayer su tutti i video di YouTube"; "YT_MINIPLAYER_DESC" = "Video YouTube Kids per esempio."; +"HIDE_REMIX_BUTTON" = "Hides Remix button"; +"HIDE_REMIX_BUTTON_DESC" = ""; + +"HIDE_CLIP_BUTTON" = "Hide Clip button"; +"HIDE_CLIP_BUTTON_DESC" = ""; + +"HIDE_DOWNLOAD_BUTTON" = "Hide Download button"; +"HIDE_DOWNLOAD_BUTTON_DESC" = ""; + "STOCK_VOLUME_HUD" = "Usa l'HUD del volume stock di iOS"; "STOCK_VOLUME_HUD_DESC" = ""; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 Opzioni Sovrimpressione (Overlay) Video"; +"VIDEO_PLAYER_OPTIONS" = "📹 Opzioni Sovrimpressione (Overlay) Video"; "HIDE_AUTOPLAY_SWITCH" = "Nascondi Interruttore Riproduzione Automatica"; "HIDE_AUTOPLAY_SWITCH_DESC" = "Nasconde il controllo per la riproduzione automatica in sovrimpressione al video."; diff --git a/Localizations/uYouPlus.bundle/ja.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/ja.lproj/Localizable.strings index f93b144..59bd727 100644 --- a/Localizations/uYouPlus.bundle/ja.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/ja.lproj/Localizable.strings @@ -21,7 +21,7 @@ "DEFAULT_THEME_DESC" = ""; "OLD_DARK_THEME" = "明るいグレー"; -"OLD_DARK_THEME_DESC" = "YouTubeの古いダークテーマ"; +"OLD_DARK_THEME_DESC" = "以前のダークテーマ"; "OLED_DARK_THEME" = "OLED (実験的)"; "OLED_DARK_THEME_2" = "OLED"; @@ -31,28 +31,37 @@ "OLED_KEYBOARD_DESC" = ""; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "⏯️ 動画コントロールのオーバーレイ設定"; +"VIDEO_PLAYER_OPTIONS" = "⏯️ 動画コントロールのオーバーレイ設定"; "SLIDE_TO_SEEK" = "スライドシークを有効化"; -"SLIDE_TO_SEEK_DESC" = "スライドシークジェスチャーを復活させます。"; +"SLIDE_TO_SEEK_DESC" = "スライドシークジェスチャーを有効にします。"; -"DISABLE_DOUBLE_TAP_TO_SEEK" = "ダブルタップによるシークを無効化"; +"DISABLE_DOUBLE_TAP_TO_SEEK" = "ダブルタップシークを無効化"; "DISABLE_DOUBLE_TAP_TO_SEEK_DESC" = ""; -"SNAP_TO_CHAPTER" = "チャプターに合わせてのスクラブを無効にする"; -"SNAP_TO_CHAPTER_DESC" = "動画を飛ばす際にチャプターに沿ってスクラブされるのを無効化します。"; +"SNAP_TO_CHAPTER" = "チャプターに合わせてのスクラブを無効化"; +"SNAP_TO_CHAPTER_DESC" = "動画を飛ばす際にチャプターに沿ってスクラブされるのを無効にします。"; -"PINCH_TO_ZOOM" = "ピンチで拡大を無効にする"; +"PINCH_TO_ZOOM" = "ピンチで拡大を無効化"; "PINCH_TO_ZOOM_DESC" = ""; "YT_MINIPLAYER" = "すべての動画でミニプレーヤーを有効にする"; "YT_MINIPLAYER_DESC" = "ミニプレーヤーが使えない動画(子ども向けの動画など)がありますが、このオプションでバイパスできます。"; -"STOCK_VOLUME_HUD" = "iOSのstockボリュームHUDを利用する"; +"HIDE_REMIX_BUTTON" = "リミックスボタンを非表示"; +"HIDE_REMIX_BUTTON_DESC" = ""; + +"HIDE_CLIP_BUTTON" = "クリップボタンを非表示"; +"HIDE_CLIP_BUTTON_DESC" = ""; + +"HIDE_DOWNLOAD_BUTTON" = "オフラインボタンを非表示"; +"HIDE_DOWNLOAD_BUTTON_DESC" = ""; + +"STOCK_VOLUME_HUD" = "標準の音量HUDを利用する"; "STOCK_VOLUME_HUD_DESC" = ""; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 動画コントロールのオーバーレイ設定"; +"VIDEO_PLAYER_OPTIONS" = "📹 動画コントロールのオーバーレイ設定"; "HIDE_AUTOPLAY_SWITCH" = "自動再生ボタンを非表示"; "HIDE_AUTOPLAY_SWITCH_DESC" = ""; @@ -84,8 +93,8 @@ "HIDE_HOVER_CARD" = "YTNoHoverCards"; "HIDE_HOVER_CARD_DESC" = "動画のエンドスクリーンを非表示にします。"; -"HIDE_RIGHT_PANEL" = "フルスクリーン時のエンゲージパネルを非表示"; -"HIDE_RIGHT_PANEL_DESC" = "ランドスケープ時の右パネル(コメントなど)を非表示にします。"; +"HIDE_RIGHT_PANEL" = "フルスクリーン時の右側パネルを非表示"; +"HIDE_RIGHT_PANEL_DESC" = "横向きの時、右パネル(チャットなど)を非表示にします。"; // Shorts controls overlay options "SHORTS_CONTROLS_OVERLAY_OPTIONS" = "💥 ショート動画のオーバーレイ設定"; @@ -96,21 +105,21 @@ "HIDE_SUBCRIPTIONS" = "チャンネル登録ボタンを非表示"; "HIDE_SUBCRIPTIONS_DESC" = ""; -"DISABLE_RESUME_TO_SHORTS" = "ショートの再開を無効化"; +"DISABLE_RESUME_TO_SHORTS" = "ショート動画からの再開を無効化"; "DISABLE_RESUME_TO_SHORTS_DESC" = "ショート動画を視聴中にアプリを終了し、再度開いた際にショートから再開されるのを防ぎます。"; // Miscellaneous "MISCELLANEOUS" = "🔎 その他"; -"HIDE_UYOU" = "Hide uYou tab"; -"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; +"HIDE_UYOU" = "uYouタブを非表示"; +"HIDE_ISPONSORBLOCK" = "iSponsorBlockボタンを非表示"; "CAST_CONFIRM" = "YTCastConfirm"; "CAST_CONFIRM_DESC" = "キャスト前に確認の警告を表示します。"; "CASTING" = "キャスト"; "MSG_ARE_YOU_SURE" = "本当にキャストを開始しますか？"; "MSG_YES" = "はい"; -"MSG_CANCEL" = "キャンセル"; +"MSG_CANCEL" = "いいえ"; "DISABLE_HINTS" = "ヒントを非表示"; "DISABLE_HINTS_DESC" = "アプリ初回起動時に表示されるYouTubeのヒントを非表示にします。"; @@ -119,7 +128,7 @@ "ENABLE_YT_STARTUP_ANIMATION_DESC" = ""; "HIDE_CHIP_BAR" = "トップバーを非表示"; -"HIDE_CHIP_BAR_DESC" = "ホーム(トレンド,音楽,ゲーム...)とサブスクリプション(すべてのビデオ、視聴を続ける...)リボンのトップバーを非表示にします。"; +"HIDE_CHIP_BAR_DESC" = "ホームと登録チャンネルのトップバー(すべて,音楽,ゲーム,続きを見る など)を非表示にします。"; "HIDE_PLAY_NEXT_IN_QUEUE" = "「キューの最初に追加」を非表示"; "HIDE_PLAY_NEXT_IN_QUEUE_DESC" = ""; diff --git a/Localizations/uYouPlus.bundle/ko.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/ko.lproj/Localizable.strings index 85fd009..d797125 100644 --- a/Localizations/uYouPlus.bundle/ko.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/ko.lproj/Localizable.strings @@ -48,11 +48,20 @@ "YT_MINIPLAYER" = "모든 YouTube 영상에서 미니 플레이어 활성화"; "YT_MINIPLAYER_DESC" = "유튜브 키즈의 영상 같은 경우."; +"HIDE_REMIX_BUTTON" = "Hides Remix button"; +"HIDE_REMIX_BUTTON_DESC" = ""; + +"HIDE_CLIP_BUTTON" = "Hide Clip button"; +"HIDE_CLIP_BUTTON_DESC" = ""; + +"HIDE_DOWNLOAD_BUTTON" = "Hide Download button"; +"HIDE_DOWNLOAD_BUTTON_DESC" = ""; + "STOCK_VOLUME_HUD" = "iOS 기본 음량 표시기 사용"; "STOCK_VOLUME_HUD_DESC" = ""; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 비디오 재생 오버레이 설정"; +"VIDEO_PLAYER_OPTIONS" = "📹 비디오 재생 오버레이 설정"; "HIDE_AUTOPLAY_SWITCH" = "자동재생 스위치 숨기기"; "HIDE_AUTOPLAY_SWITCH_DESC" = "비디오 재생 오버레이에서 자동재생 스위치를 숨깁니다."; diff --git a/Localizations/uYouPlus.bundle/nl.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/nl.lproj/Localizable.strings index e6ff45b..a909ffc 100644 --- a/Localizations/uYouPlus.bundle/nl.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/nl.lproj/Localizable.strings @@ -48,11 +48,20 @@ "YT_MINIPLAYER" = "Schakel de Mini Speler in voor alle video's"; "YT_MINIPLAYER_DESC" = "Video's voor kinderen bijvoorbeeld."; +"HIDE_REMIX_BUTTON" = "Hides Remix button"; +"HIDE_REMIX_BUTTON_DESC" = ""; + +"HIDE_CLIP_BUTTON" = "Hide Clip button"; +"HIDE_CLIP_BUTTON_DESC" = ""; + +"HIDE_DOWNLOAD_BUTTON" = "Hide Download button"; +"HIDE_DOWNLOAD_BUTTON_DESC" = ""; + "STOCK_VOLUME_HUD" = "Use stock iOS volume HUD"; "STOCK_VOLUME_HUD_DESC" = ""; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 Video controls overlay options"; +"VIDEO_PLAYER_OPTIONS" = "📹 Video controls overlay options"; "HIDE_AUTOPLAY_SWITCH" = "Verberg Autoplay schakelaar"; "HIDE_AUTOPLAY_SWITCH_DESC" = "Verberg de Autoplay schakelaar in de video speler."; diff --git a/Localizations/uYouPlus.bundle/pl.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/pl.lproj/Localizable.strings index 39353b6..bff7015 100644 --- a/Localizations/uYouPlus.bundle/pl.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/pl.lproj/Localizable.strings @@ -48,11 +48,20 @@ "YT_MINIPLAYER" = "Włącz miniodtwarzach dla wszystkich filmów"; "YT_MINIPLAYER_DESC" = "Np. filmów dla dzieci."; +"HIDE_REMIX_BUTTON" = "Hides Remix button"; +"HIDE_REMIX_BUTTON_DESC" = ""; + +"HIDE_CLIP_BUTTON" = "Hide Clip button"; +"HIDE_CLIP_BUTTON_DESC" = ""; + +"HIDE_DOWNLOAD_BUTTON" = "Hide Download button"; +"HIDE_DOWNLOAD_BUTTON_DESC" = ""; + "STOCK_VOLUME_HUD" = "Use stock iOS volume HUD"; "STOCK_VOLUME_HUD_DESC" = ""; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 Video controls overlay options"; +"VIDEO_PLAYER_OPTIONS" = "📹 Video controls overlay options"; "HIDE_AUTOPLAY_SWITCH" = "Ukryj przycisk Autoodtwarzanie"; "HIDE_AUTOPLAY_SWITCH_DESC" = "Ukrywa przycisk Autoodtwarzanie w okładce odtwarzacza filmów."; diff --git a/Localizations/uYouPlus.bundle/pt.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/pt.lproj/Localizable.strings index e9249d7..7d278e7 100644 --- a/Localizations/uYouPlus.bundle/pt.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/pt.lproj/Localizable.strings @@ -48,11 +48,20 @@ "YT_MINIPLAYER" = "Ative o Miniplayer para todos os vídeos do YouTube"; "YT_MINIPLAYER_DESC" = "Vídeos infantis, por exemplo."; +"HIDE_REMIX_BUTTON" = "Hides Remix button"; +"HIDE_REMIX_BUTTON_DESC" = ""; + +"HIDE_CLIP_BUTTON" = "Hide Clip button"; +"HIDE_CLIP_BUTTON_DESC" = ""; + +"HIDE_DOWNLOAD_BUTTON" = "Hide Download button"; +"HIDE_DOWNLOAD_BUTTON_DESC" = ""; + "STOCK_VOLUME_HUD" = "Usar o HUD de volume padrão do iOS"; "STOCK_VOLUME_HUD_DESC" = ""; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 Opções de Sobreposição de Controles de Vídeo"; +"VIDEO_PLAYER_OPTIONS" = "📹 Opções de Sobreposição de Controles de Vídeo"; "HIDE_AUTOPLAY_SWITCH" = "Ocultar interruptor de Reprodução automática"; "HIDE_AUTOPLAY_SWITCH_DESC" = "Oculta o interruptor de Reprodução automática na sobreposição de controles de vídeo."; diff --git a/Localizations/uYouPlus.bundle/ro.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/ro.lproj/Localizable.strings index bc70470..f4f78f3 100644 --- a/Localizations/uYouPlus.bundle/ro.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/ro.lproj/Localizable.strings @@ -48,11 +48,20 @@ "YT_MINIPLAYER" = "Activare Miniplayer pentru toate videoclipurile YouTube"; "YT_MINIPLAYER_DESC" = "De exemplu, videoclipurile destinate pentri copii"; +"HIDE_REMIX_BUTTON" = "Hides Remix button"; +"HIDE_REMIX_BUTTON_DESC" = ""; + +"HIDE_CLIP_BUTTON" = "Hide Clip button"; +"HIDE_CLIP_BUTTON_DESC" = ""; + +"HIDE_DOWNLOAD_BUTTON" = "Hide Download button"; +"HIDE_DOWNLOAD_BUTTON_DESC" = ""; + "STOCK_VOLUME_HUD" = "Use stock iOS volume HUD"; "STOCK_VOLUME_HUD_DESC" = ""; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 Video controls overlay options"; +"VIDEO_PLAYER_OPTIONS" = "📹 Video controls overlay options"; "HIDE_AUTOPLAY_SWITCH" = "Ascunde comutatorul Redare automată"; "HIDE_AUTOPLAY_SWITCH_DESC" = "Ascunde comutatorul Redare automată din controalele video."; diff --git a/Localizations/uYouPlus.bundle/ru.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/ru.lproj/Localizable.strings index 92913f7..9c115f5 100644 --- a/Localizations/uYouPlus.bundle/ru.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/ru.lproj/Localizable.strings @@ -48,11 +48,20 @@ "YT_MINIPLAYER" = "Мини-плеер для всех видео"; "YT_MINIPLAYER_DESC" = "Принудительно активирует мини-плеер для всех видео, включая видео, предназначенное для детей."; +"HIDE_REMIX_BUTTON" = "Hides Remix button"; +"HIDE_REMIX_BUTTON_DESC" = ""; + +"HIDE_CLIP_BUTTON" = "Hide Clip button"; +"HIDE_CLIP_BUTTON_DESC" = ""; + +"HIDE_DOWNLOAD_BUTTON" = "Hide Download button"; +"HIDE_DOWNLOAD_BUTTON_DESC" = ""; + "STOCK_VOLUME_HUD" = "Использовать стоковый слайдер грмкости iOS"; "STOCK_VOLUME_HUD_DESC" = ""; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 Параметры элементов оверлея видеоплеера"; +"VIDEO_PLAYER_OPTIONS" = "📹 Параметры элементов оверлея видеоплеера"; "HIDE_AUTOPLAY_SWITCH" = "Скрыть «Автовоспроизведение»"; "HIDE_AUTOPLAY_SWITCH_DESC" = "Убирает тумблер «Автовоспроизведение» с оверлея плеера."; diff --git a/Localizations/uYouPlus.bundle/template.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/template.lproj/Localizable.strings index 1565e4a..657701f 100644 --- a/Localizations/uYouPlus.bundle/template.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/template.lproj/Localizable.strings @@ -63,11 +63,20 @@ https://github.com/PoomSmart/Return-YouTube-Dislikes/tree/main/layout/Library/Ap "YT_MINIPLAYER" = "Enable miniplayer for all videos"; "YT_MINIPLAYER_DESC" = "The miniplayer cannot be activated for certain videos (e.g., kids videos). This option bypasses that"; +"HIDE_REMIX_BUTTON" = "Hides Remix button"; +"HIDE_REMIX_BUTTON_DESC" = ""; + +"HIDE_CLIP_BUTTON" = "Hide Clip button"; +"HIDE_CLIP_BUTTON_DESC" = ""; + +"HIDE_DOWNLOAD_BUTTON" = "Hide Download button"; +"HIDE_DOWNLOAD_BUTTON_DESC" = ""; + "STOCK_VOLUME_HUD" = "Use stock iOS volume HUD"; "STOCK_VOLUME_HUD_DESC" = ""; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 Video controls overlay options"; +"VIDEO_PLAYER_OPTIONS" = "📹 Video controls overlay options"; "HIDE_AUTOPLAY_SWITCH" = "Hide autoplay switch"; "HIDE_AUTOPLAY_SWITCH_DESC" = ""; diff --git a/Localizations/uYouPlus.bundle/th.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/th.lproj/Localizable.strings index af0cc34..ef3b0a5 100644 --- a/Localizations/uYouPlus.bundle/th.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/th.lproj/Localizable.strings @@ -47,11 +47,20 @@ "YT_MINIPLAYER" = "เปิดใช้งานเครื่องเล่นขนาดเล็กสำหรับวิดีโอ YouTube ทั้งหมด"; "YT_MINIPLAYER_DESC" = "ตัวอย่างเช่น ภาพยนตร์สำหรับเด็ก"; +"HIDE_REMIX_BUTTON" = "Hides Remix button"; +"HIDE_REMIX_BUTTON_DESC" = ""; + +"HIDE_CLIP_BUTTON" = "Hide Clip button"; +"HIDE_CLIP_BUTTON_DESC" = ""; + +"HIDE_DOWNLOAD_BUTTON" = "Hide Download button"; +"HIDE_DOWNLOAD_BUTTON_DESC" = ""; + "STOCK_VOLUME_HUD" = "ใช้ HUD โวลุ่ม iOS ในตัว"; "STOCK_VOLUME_HUD_DESC" = ""; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 ตัวเลือกการควบคุมการซ้อนทับวิดีโอ"; +"VIDEO_PLAYER_OPTIONS" = "📹 ตัวเลือกการควบคุมการซ้อนทับวิดีโอ"; "HIDE_AUTOPLAY_SWITCH" = "ซ่อนสวิตช์เล่นอัตโนมัติ"; "HIDE_AUTOPLAY_SWITCH_DESC" = "ซ่อนสวิตช์เล่นอัตโนมัติในตัวควบคุมภาพยนตร์"; diff --git a/Localizations/uYouPlus.bundle/tr.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/tr.lproj/Localizable.strings index 26bf8b4..d557a05 100644 --- a/Localizations/uYouPlus.bundle/tr.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/tr.lproj/Localizable.strings @@ -52,7 +52,7 @@ "STOCK_VOLUME_HUD_DESC" = ""; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 Video Kontrolleri Kaplaması Seçenekleri"; +"VIDEO_PLAYER_OPTIONS" = "📹 Video Kontrolleri Kaplaması Seçenekleri"; "HIDE_AUTOPLAY_SWITCH" = "Otomatik oynatma anahtarını gizle"; "HIDE_AUTOPLAY_SWITCH_DESC" = "Otomatik oynatma anahtarını video kontrolleri katmanından gizler."; diff --git a/Localizations/uYouPlus.bundle/vi.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/vi.lproj/Localizable.strings index 70a3c8c..b9dd180 100644 --- a/Localizations/uYouPlus.bundle/vi.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/vi.lproj/Localizable.strings @@ -5,7 +5,7 @@ "VERSION_CHECK" = "Chạm để kiểm tra bản cập nhật!"; "REPORT_AN_ISSUE" = "Báo lỗi"; -"ADD_TITLE" = "Add your title here..."; +"ADD_TITLE" = "Thêm tiêu đề lỗi ở đây..."; "QUIT_YOUTUBE" = "Đóng YouTube"; @@ -48,11 +48,20 @@ "YT_MINIPLAYER" = "Cho phép sử dụng trình phát thu nhỏ với mọi video"; "YT_MINIPLAYER_DESC" = "Ví dụ: Video cho trẻ em."; +"HIDE_REMIX_BUTTON" = "Ẩn nút Phối lại"; +"HIDE_REMIX_BUTTON_DESC" = ""; + +"HIDE_CLIP_BUTTON" = "Ẩn nút Tạo đoạn video"; +"HIDE_CLIP_BUTTON_DESC" = ""; + +"HIDE_DOWNLOAD_BUTTON" = "Ẩn nút Tải xuống"; +"HIDE_DOWNLOAD_BUTTON_DESC" = ""; + "STOCK_VOLUME_HUD" = "Sử dụng thanh âm lượng mặc định của iOS"; "STOCK_VOLUME_HUD_DESC" = ""; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 Tùy chọn hiển thị trong trình phát video"; +"VIDEO_PLAYER_OPTIONS" = "📹 Tùy chọn hiển thị trong trình phát video"; "HIDE_AUTOPLAY_SWITCH" = "Ẩn nút Tự động phát"; "HIDE_AUTOPLAY_SWITCH_DESC" = "Ẩn nút Tự động phát trong trình phát video."; diff --git a/Localizations/uYouPlus.bundle/zh_cn.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/zh_cn.lproj/Localizable.strings index 465ae8c..0eb2daa 100644 --- a/Localizations/uYouPlus.bundle/zh_cn.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/zh_cn.lproj/Localizable.strings @@ -48,11 +48,20 @@ "YT_MINIPLAYER" = "为所有 YouTube 视频启用迷你播放器"; "YT_MINIPLAYER_DESC" = "例如：面向儿童的视频。"; +"HIDE_REMIX_BUTTON" = "Hides Remix button"; +"HIDE_REMIX_BUTTON_DESC" = ""; + +"HIDE_CLIP_BUTTON" = "Hide Clip button"; +"HIDE_CLIP_BUTTON_DESC" = ""; + +"HIDE_DOWNLOAD_BUTTON" = "Hide Download button"; +"HIDE_DOWNLOAD_BUTTON_DESC" = ""; + "STOCK_VOLUME_HUD" = "使用 iOS 自带音量指示"; "STOCK_VOLUME_HUD_DESC" = ""; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 视频播放器控制界面选项"; +"VIDEO_PLAYER_OPTIONS" = "📹 视频播放器控制界面选项"; "HIDE_AUTOPLAY_SWITCH" = "隐藏自动播放模式开关"; "HIDE_AUTOPLAY_SWITCH_DESC" = "隐藏视频播放器控制界面上的自动播放开关。"; diff --git a/Localizations/uYouPlus.bundle/zh_tw.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/zh_tw.lproj/Localizable.strings index bed8bae..ac0b19d 100644 --- a/Localizations/uYouPlus.bundle/zh_tw.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/zh_tw.lproj/Localizable.strings @@ -48,11 +48,20 @@ "YT_MINIPLAYER" = "為所有 YouTube 影片啟用迷你播放器"; "YT_MINIPLAYER_DESC" = "例如兒童影片"; +"HIDE_REMIX_BUTTON" = "Hides Remix button"; +"HIDE_REMIX_BUTTON_DESC" = ""; + +"HIDE_CLIP_BUTTON" = "Hide Clip button"; +"HIDE_CLIP_BUTTON_DESC" = ""; + +"HIDE_DOWNLOAD_BUTTON" = "Hide Download button"; +"HIDE_DOWNLOAD_BUTTON_DESC" = ""; + "STOCK_VOLUME_HUD" = "使用 iOS 內建的音量 HUD"; "STOCK_VOLUME_HUD_DESC" = ""; // Video controls overlay options -"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 影片懸浮控制選項"; +"VIDEO_PLAYER_OPTIONS" = "📹 影片懸浮控制選項"; "HIDE_AUTOPLAY_SWITCH" = "隱藏自動播放開關"; "HIDE_AUTOPLAY_SWITCH_DESC" = "在影片控制中隱藏自動播放開關。"; diff --git a/Sources/uYouPlusSettings.xm b/Sources/uYouPlusSettings.xm index 16b4e0a..3022690 100644 --- a/Sources/uYouPlusSettings.xm +++ b/Sources/uYouPlusSettings.xm @@ -210,7 +210,7 @@ extern NSBundle *uYouPlusBundle(); SWITCH_ITEM2(LOC(@"STOCK_VOLUME_HUD"), LOC(@"STOCK_VOLUME_HUD_DESC"), @"stockVolumeHUD_enabled"); # pragma mark - Video controls overlay options - SECTION_HEADER(LOC(@"VIDEO_CONTROLS_OVERLAY_OPTIONS")); + SECTION_HEADER(LOC(@"VIDEO_PLAYER_OPTIONS")); SWITCH_ITEM(LOC(@"Enable Share Button"), LOC(@"Enable the Share Button in video controls overlay."), @"enableShareButton_enabled"); SWITCH_ITEM(LOC(@"Enable 'Save To Playlist' Button"), LOC(@"Enable the 'Save To Playlist' Button in video controls overlay."), @"enableSaveToButton_enabled"); @@ -251,10 +251,10 @@ extern NSBundle *uYouPlusBundle(); // SWITCH_ITEM2(LOC(@"Hide Button Containers under player"), LOC(@"Hides Button Containers under the video player."), @"hideButtonContainers_enabled"); SWITCH_ITEM(LOC(@"Hide the Connect Button under player"), LOC(@"Hides the Connect Button under the video player."), @"hideConnectButton_enabled"); SWITCH_ITEM(LOC(@"Hide the Share Button under player"), LOC(@"Hides the Share Button under the video player."), @"hideShareButton_enabled"); - SWITCH_ITEM(LOC(@"Hide the Remix Button under player"), LOC(@"Hides the Remix Button under the video player."), @"hideRemixButton_enabled"); + SWITCH_ITEM(LOC(@"HIDE_REMIX_BUTTON"), LOC(@"HIDE_REMIX_BUTTON_DESC"), @"hideRemixButton_enabled"); SWITCH_ITEM(LOC(@"Hide the Thanks Button under player"), LOC(@"Hides the Thanks Button under the video player."), @"hideThanksButton_enabled"); - SWITCH_ITEM(LOC(@"Hide the Download Button under player"), LOC(@"Hides the Download Button under the video player."), @"hideDownloadButton_enabled"); - SWITCH_ITEM(LOC(@"Hide the Clip Button under player"), LOC(@"Hides the Clip Button under the video player."), @"hideClipButton_enabled"); + SWITCH_ITEM(LOC(@"HIDE_DOWNLOAD_BUTTON"), LOC(@"HIDE_DOWNLOAD_BUTTON_DESC"), @"hideDownloadButton_enabled"); + SWITCH_ITEM(LOC(@"HIDE_CLIP_BUTTON"), LOC(@"HIDE_CLIP_BUTTON_DESC"), @"hideClipButton_enabled"); SWITCH_ITEM(LOC(@"Hide the Save to playlist Button under player"), LOC(@"Hides the Save to playlist Button under the video player."), @"hideSaveToPlaylistButton_enabled"); SWITCH_ITEM(LOC(@"Hide the Report Button under player"), LOC(@"Hides the Report Button under the video player."), @"hideReportButton_enabled"); SWITCH_ITEM(LOC(@"Hide Comment Section previews"), LOC(@"Makes the comment section blank with no previews under the player."), @"hidePreviewCommentSection_enabled"); From 2b84cde27f28ecb84bc1d7420fe469dfa191e90d Mon Sep 17 00:00:00 2001 From: Bryce Hackel <34104885+bhackel@users.noreply.github.com> Date: Wed, 3 Apr 2024 16:36:24 -0700 Subject: [PATCH 04/13] Remove feature that uYou added --- Sources/uYouPlus.xm | 26 +++++++++++++------------- Sources/uYouPlusSettings.xm | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Sources/uYouPlus.xm b/Sources/uYouPlus.xm index f8eb7ac..2528135 100644 --- a/Sources/uYouPlus.xm +++ b/Sources/uYouPlus.xm @@ -696,16 +696,16 @@ BOOL isAd(YTIElementRenderer *self) { } %end -%group gHidePreviousAndNextButton -%hook YTColdConfig -- (BOOL)removeNextPaddleForAllVideos { - return YES; -} -- (BOOL)removePreviousPaddleForAllVideos { - return YES; -} -%end -%end +// %group gHidePreviousAndNextButton +// %hook YTColdConfig +// - (BOOL)removeNextPaddleForAllVideos { +// return YES; +// } +// - (BOOL)removePreviousPaddleForAllVideos { +// return YES; +// } +// %end +// %end // Hide Dark Overlay Background %group gHideOverlayDarkBackground @@ -1237,9 +1237,9 @@ static BOOL findCell(ASNodeController *nodeController, NSArray *ide if (IS_ENABLED(@"hideSubscriptionsNotificationBadge_enabled")) { %init(gHideSubscriptionsNotificationBadge); } - if (IS_ENABLED(@"hidePreviousAndNextButton_enabled")) { - %init(gHidePreviousAndNextButton); - } + // if (IS_ENABLED(@"hidePreviousAndNextButton_enabled")) { + // %init(gHidePreviousAndNextButton); + // } if (IS_ENABLED(@"hideOverlayDarkBackground_enabled")) { %init(gHideOverlayDarkBackground); } diff --git a/Sources/uYouPlusSettings.xm b/Sources/uYouPlusSettings.xm index 3022690..54a0c36 100644 --- a/Sources/uYouPlusSettings.xm +++ b/Sources/uYouPlusSettings.xm @@ -223,7 +223,7 @@ extern NSBundle *uYouPlusBundle(); SWITCH_ITEM(LOC(@"HIDE_PAID_PROMOTION_CARDS"), LOC(@"HIDE_PAID_PROMOTION_CARDS_DESC"), @"hidePaidPromotionCard_enabled"); SWITCH_ITEM2(LOC(@"HIDE_CHANNEL_WATERMARK"), LOC(@"HIDE_CHANNEL_WATERMARK_DESC"), @"hideChannelWatermark_enabled"); SWITCH_ITEM2(LOC(@"Hide Shadow Overlay Buttons"), LOC(@"Hide the Shadow Overlay on the Play/Pause, Previous, Next, Forward & Rewind Buttons."), @"hideVideoPlayerShadowOverlayButtons_enabled"); - SWITCH_ITEM(LOC(@"HIDE_PREVIOUS_AND_NEXT_BUTTON"), LOC(@"HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC"), @"hidePreviousAndNextButton_enabled"); + // SWITCH_ITEM(LOC(@"HIDE_PREVIOUS_AND_NEXT_BUTTON"), LOC(@"HIDE_PREVIOUS_AND_NEXT_BUTTON_DESC"), @"hidePreviousAndNextButton_enabled"); SWITCH_ITEM2(LOC(@"RED_PROGRESS_BAR"), LOC(@"RED_PROGRESS_BAR_DESC"), @"redProgressBar_enabled"); SWITCH_ITEM(LOC(@"HIDE_HOVER_CARD"), LOC(@"HIDE_HOVER_CARD_DESC"), @"hideHoverCards_enabled"); SWITCH_ITEM2(LOC(@"HIDE_RIGHT_PANEL"), LOC(@"HIDE_RIGHT_PANEL_DESC"), @"hideRightPanel_enabled"); From 37d01021b0091b270c12fefb8953f0bba2cc3c97 Mon Sep 17 00:00:00 2001 From: Bryce Hackel <34104885+bhackel@users.noreply.github.com> Date: Fri, 5 Apr 2024 01:13:11 -0700 Subject: [PATCH 05/13] Remove uYou feature, move comments --- Sources/uYouPlus.xm | 9 ++------- Sources/uYouPlusSettings.xm | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Sources/uYouPlus.xm b/Sources/uYouPlus.xm index 2528135..ba9ce1c 100644 --- a/Sources/uYouPlus.xm +++ b/Sources/uYouPlus.xm @@ -558,9 +558,9 @@ BOOL isAd(YTIElementRenderer *self) { } %end -// YTStockVolumeHUD - https://github.com/lilacvibes/YTStockVolumeHUD -%group gStockVolumeHUD +// Use stock iOS volume HUD // Use YTColdConfig's method instead of YTStockVolumeHUD.xm, see https://x.com/PoomSmart/status/1756904290445332653 +%group gStockVolumeHUD %hook YTColdConfig - (BOOL)iosUseSystemVolumeControlInFullscreen { return IS_ENABLED(@"stockVolumeHUD_enabled") ? YES : %orig; @@ -814,11 +814,6 @@ BOOL isAd(YTIElementRenderer *self) { } %end -%hook YTShortsStartupCoordinator -- (id)evaluateResumeToShorts { - return IS_ENABLED(@"disableResumeToShorts_enabled") ? nil : %orig; -} -%end // Hide Shorts Cells - @PoomSmart & @iCrazeiOS %hook YTIElementRenderer diff --git a/Sources/uYouPlusSettings.xm b/Sources/uYouPlusSettings.xm index 54a0c36..0c8f132 100644 --- a/Sources/uYouPlusSettings.xm +++ b/Sources/uYouPlusSettings.xm @@ -240,7 +240,7 @@ extern NSBundle *uYouPlusBundle(); SWITCH_ITEM(LOC(@"HIDE_SUPER_THANKS"), LOC(@"HIDE_SUPER_THANKS_DESC"), @"hideBuySuperThanks_enabled"); SWITCH_ITEM(LOC(@"HIDE_SUBCRIPTIONS"), LOC(@"HIDE_SUBCRIPTIONS_DESC"), @"hideSubcriptions_enabled"); - SWITCH_ITEM(LOC(@"DISABLE_RESUME_TO_SHORTS"), LOC(@"DISABLE_RESUME_TO_SHORTS_DESC"), @"disableResumeToShorts_enabled"); + // SWITCH_ITEM(LOC(@"DISABLE_RESUME_TO_SHORTS"), LOC(@"DISABLE_RESUME_TO_SHORTS_DESC"), @"disableResumeToShorts_enabled"); # pragma mark - Video player button options SECTION_HEADER(LOC(@"Video Player Button Options")); From a167caff11e38f8dd583e5c7e548955a27845b9e Mon Sep 17 00:00:00 2001 From: Bryce Hackel <34104885+bhackel@users.noreply.github.com> Date: Fri, 5 Apr 2024 01:21:40 -0700 Subject: [PATCH 06/13] Change switch --- Sources/uYouPlusSettings.xm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/uYouPlusSettings.xm b/Sources/uYouPlusSettings.xm index 0c8f132..502e3b8 100644 --- a/Sources/uYouPlusSettings.xm +++ b/Sources/uYouPlusSettings.xm @@ -916,7 +916,7 @@ extern NSBundle *uYouPlusBundle(); SWITCH_ITEM(LOC(@"YouTube Premium Logo"), LOC(@"Toggle this to use the official YouTube Premium Logo. App restart is required."), @"premiumYouTubeLogo_enabled"); // SWITCH_ITEM(LOC(@"Center YouTube Logo"), LOC(@"Toggle this to move the official YouTube Logo to the Center. App restart is required."), @"centerYouTubeLogo_enabled"); SWITCH_ITEM(LOC(@"Hide YouTube Logo"), LOC(@"Toggle this to hide the YouTube Logo in the YouTube App."), @"hideYouTubeLogo_enabled"); - SWITCH_ITEM(LOC(@"ENABLE_YT_STARTUP_ANIMATION"), LOC(@"ENABLE_YT_STARTUP_ANIMATION_DESC"), @"ytStartupAnimation_enabled"); + SWITCH_ITEM2(LOC(@"ENABLE_YT_STARTUP_ANIMATION"), LOC(@"ENABLE_YT_STARTUP_ANIMATION_DESC"), @"ytStartupAnimation_enabled"); SWITCH_ITEM(LOC(@"DISABLE_HINTS"), LOC(@"DISABLE_HINTS_DESC"), @"disableHints_enabled"); SWITCH_ITEM(LOC(@"Stick Navigation Bar"), LOC(@"Enable to make the Navigation Bar stay on the App when scrolling."), @"stickNavigationBar_enabled"); SWITCH_ITEM2(LOC(@"HIDE_ISPONSORBLOCK"), nil, @"hideSponsorBlockButton_enabled"); From 41bc0714261c227fb2e533f290c303dacc467927 Mon Sep 17 00:00:00 2001 From: Bryce Hackel <34104885+bhackel@users.noreply.github.com> Date: Fri, 5 Apr 2024 01:48:48 -0700 Subject: [PATCH 07/13] Theme updates 1 of 2 --- Sources/uYouPlusThemes.xm | 106 +++----------------------------------- 1 file changed, 8 insertions(+), 98 deletions(-) diff --git a/Sources/uYouPlusThemes.xm b/Sources/uYouPlusThemes.xm index 95277f6..f14f6f8 100644 --- a/Sources/uYouPlusThemes.xm +++ b/Sources/uYouPlusThemes.xm @@ -163,22 +163,19 @@ UIColor* raisedColor = [UIColor colorWithRed:0.035 green:0.035 blue:0.035 alpha: } %end -// Your videos +// Download sort +%hook GOODialogView +- (void)setBackgroundColor:(UIColor *)color { + return IS_DARK_APPEARANCE_ENABLED ? %orig([UIColor blackColor]) : %orig; +%end + +// Playlist sort %hook ASCollectionView - (void)didMoveToWindow { %orig; if (IS_DARK_APPEARANCE_ENABLED && [self.nextResponder isKindOfClass:%c(_ASDisplayView)]) { self.superview.backgroundColor = [UIColor blackColor]; - } -} -%end - -// Sub menu? -%hook ELMView -- (void)didMoveToWindow { - %orig; - if (IS_DARK_APPEARANCE_ENABLED) { - // self.subviews[0].backgroundColor = [UIColor clearColor]; + self.backgroundColor = [UIColor clearColor]; } } %end @@ -202,93 +199,6 @@ UIColor* raisedColor = [UIColor colorWithRed:0.035 green:0.035 blue:0.035 alpha: } %end -// Search view -%hook YTSearchBarView -- (void)setBackgroundColor:(UIColor *)color { - return IS_DARK_APPEARANCE_ENABLED ? %orig([UIColor blackColor]) : %orig; -} -%end - -// History search view -%hook YTSearchBoxView -- (void)setBackgroundColor:(UIColor *)color { - return IS_DARK_APPEARANCE_ENABLED ? %orig([UIColor blackColor]) : %orig; - -} -%end - -// Comment view -%hook YTCommentView -- (void)setBackgroundColor:(UIColor *)color { - return IS_DARK_APPEARANCE_ENABLED ? %orig([UIColor blackColor]) : %orig; -} -%end - -%hook YTCreateCommentAccessoryView -- (void)setBackgroundColor:(UIColor *)color { - return IS_DARK_APPEARANCE_ENABLED ? %orig([UIColor blackColor]) : %orig; -} -%end - -%hook YTCreateCommentTextView -- (void)setBackgroundColor:(UIColor *)color { - return IS_DARK_APPEARANCE_ENABLED ? %orig([UIColor blackColor]) : %orig; -} -- (void)setTextColor:(UIColor *)color { // fix black text in #Shorts video's comment - return IS_DARK_APPEARANCE_ENABLED ? %orig([UIColor whiteColor]) : %orig; -} -%end - -%hook YTCommentDetailHeaderCell -- (void)didMoveToWindow { - %orig; - if (IS_DARK_APPEARANCE_ENABLED) { - // self.subviews[2].backgroundColor = [UIColor blackColor]; - } -} -%end - -%hook YTFormattedStringLabel // YT is werid... -- (void)setBackgroundColor:(UIColor *)color { - return IS_DARK_APPEARANCE_ENABLED ? %orig([UIColor clearColor]) : %orig; -} -%end - -// Live chat comment -%hook YCHLiveChatActionPanelView -- (void)setBackgroundColor:(UIColor *)color { - return IS_DARK_APPEARANCE_ENABLED ? %orig([UIColor blackColor]) : %orig; -} -%end - -%hook YTEmojiTextView -- (void)setBackgroundColor:(UIColor *)color { - return IS_DARK_APPEARANCE_ENABLED ? %orig([UIColor blackColor]) : %orig; -} -%end - -%hook YCHLiveChatView -- (void)didMoveToWindow { - %orig; - if (IS_DARK_APPEARANCE_ENABLED) { - // self.subviews[1].backgroundColor = [UIColor blackColor]; - } -} -%end - -%hook YTCollectionView -- (void)setBackgroundColor:(UIColor *)color { - return IS_DARK_APPEARANCE_ENABLED ? %orig([UIColor blackColor]) : %orig; -} -%end - -// -%hook YTBackstageCreateRepostDetailView -- (void)setBackgroundColor:(UIColor *)color { - return IS_DARK_APPEARANCE_ENABLED ? %orig([UIColor blackColor]) : %orig; -} -%end - %hook UIApplication - (void)applicationDidFinishLaunching:(UIApplication *)application { if (@available(iOS 14.0, *)) { From cc5ce2ee0a78d1a9617a9fdb8ee58ace6c98bac0 Mon Sep 17 00:00:00 2001 From: Bryce Hackel <34104885+bhackel@users.noreply.github.com> Date: Mon, 8 Apr 2024 22:18:02 -0400 Subject: [PATCH 08/13] Theme updates 2 of 2 --- Sources/uYouPlusThemes.xm | 43 +++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/Sources/uYouPlusThemes.xm b/Sources/uYouPlusThemes.xm index f14f6f8..5c278b2 100644 --- a/Sources/uYouPlusThemes.xm +++ b/Sources/uYouPlusThemes.xm @@ -237,24 +237,46 @@ UIColor* raisedColor = [UIColor colorWithRed:0.035 green:0.035 blue:0.035 alpha: - (void)didMoveToWindow { %orig; if (IS_DARK_APPEARANCE_ENABLED) { - if ([self.nextResponder isKindOfClass:%c(ASScrollView)]) { self.backgroundColor = [UIColor clearColor]; } + // + UIResponder *responder = self.nextResponder; + UIViewController *closestViewController = nil; + + while (responder != nil) { + if ([responder isKindOfClass:[UIViewController class]]) { + closestViewController = (UIViewController *)responder; + break; + } + responder = responder.nextResponder; + } + + if ([NSStringFromClass([closestViewController class]) isEqualToString:@"YTActionSheetDialogViewController"] && + (([NSStringFromClass([self.superview class]) isEqualToString:@"YTELMView"]) || + [NSStringFromClass([self.superview class]) isEqualToString:@"_ASDisplayView"] || + [NSStringFromClass([self.superview class]) isEqualToString:@"ELMView"])) { + + self.backgroundColor = [UIColor clearColor]; + } + + // Save video bottom + if ([NSStringFromClass([closestViewController class]) isEqualToString:@"YTBottomSheetController"]) { self.backgroundColor = [UIColor clearColor]; } + + // Subcriptions header + if ([NSStringFromClass([closestViewController class]) isEqualToString:@"YTMySubsFilterHeaderViewController"] && + ([NSStringFromClass([self.superview class]) isEqualToString:@"YTELMView"])) { + self.backgroundColor = [UIColor clearColor]; + } if ([self.accessibilityIdentifier isEqualToString:@"brand_promo.view"]) { self.backgroundColor = [UIColor blackColor]; } - if ([self.accessibilityIdentifier isEqualToString:@"eml.cvr"]) { self.backgroundColor = [UIColor blackColor]; } if ([self.accessibilityIdentifier isEqualToString:@"eml.topic_channel_details"]) { self.backgroundColor = [UIColor blackColor]; } if ([self.accessibilityIdentifier isEqualToString:@"eml.live_chat_text_message"]) { self.backgroundColor = [UIColor blackColor]; } - if ([self.accessibilityIdentifier isEqualToString:@"rich_header"]) { self.backgroundColor = [UIColor blackColor]; } if ([self.accessibilityIdentifier isEqualToString:@"id.ui.comment_cell"]) { self.backgroundColor = [UIColor blackColor]; } if ([self.accessibilityIdentifier isEqualToString:@"id.ui.comment_thread"]) { self.backgroundColor = [UIColor blackColor]; } - if ([self.accessibilityIdentifier isEqualToString:@"id.ui.cancel.button"]) { self.superview.backgroundColor = [UIColor clearColor]; } if ([self.accessibilityIdentifier isEqualToString:@"id.elements.components.comment_composer"]) { self.backgroundColor = [UIColor blackColor]; } if ([self.accessibilityIdentifier isEqualToString:@"id.elements.components.filter_chip_bar"]) { self.backgroundColor = [UIColor blackColor]; } if ([self.accessibilityIdentifier isEqualToString:@"id.elements.components.video_list_entry"]) { self.backgroundColor = [UIColor blackColor]; } if ([self.accessibilityIdentifier isEqualToString:@"id.comment.guidelines_text"]) { self.superview.backgroundColor = [UIColor blackColor]; } if ([self.accessibilityIdentifier isEqualToString:@"id.comment.timed_comments_welcome"]) { self.superview.backgroundColor = self.backgroundColor = [UIColor blackColor]; } - if ([self.accessibilityIdentifier isEqualToString:@"id.comment.channel_guidelines_bottom_sheet_container"]) { self.backgroundColor = [UIColor blackColor]; } if ([self.accessibilityIdentifier isEqualToString:@"id.comment.channel_guidelines_entry_banner_container"]) { self.superview.backgroundColor = self.backgroundColor = [UIColor blackColor]; } if ([self.accessibilityIdentifier isEqualToString:@"id.comment.comment_group_detail_container"]) { self.backgroundColor = [UIColor clearColor]; } - if ([self.accessibilityIdentifier hasPrefix:@"id.elements.components.overflow_menu_item_"]) { self.backgroundColor = [UIColor clearColor]; } } } %end @@ -277,7 +299,6 @@ UIColor* raisedColor = [UIColor colorWithRed:0.035 green:0.035 blue:0.035 alpha: %orig; if (IS_DARK_APPEARANCE_ENABLED) { self.backgroundColor = raisedColor; - // self.subviews[1].backgroundColor = raisedColor; self.superview.backgroundColor = raisedColor; } } @@ -588,7 +609,13 @@ UIColor *customHexColor; # pragma mark - OLED keyboard by @ichitaso <3 - http://gist.github.com/ichitaso/935100fd53a26f18a9060f7195a1be0e -%group gOLEDKB +%group gOLEDKB +%hook TUIEmojiSearchView +- (void)didMoveToWindow { + %orig; + self.backgroundColor = [UIColor blackColor]; +} +%end %hook UIPredictionViewController - (void)loadView { %orig; From 161a56944168fb44deac73e2063f92a863472b19 Mon Sep 17 00:00:00 2001 From: Bryce Hackel <34104885+bhackel@users.noreply.github.com> Date: Mon, 8 Apr 2024 22:18:34 -0400 Subject: [PATCH 09/13] PT Localization --- .../pt.lproj/Localizable.strings | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Localizations/uYouPlus.bundle/pt.lproj/Localizable.strings b/Localizations/uYouPlus.bundle/pt.lproj/Localizable.strings index 7d278e7..a328626 100644 --- a/Localizations/uYouPlus.bundle/pt.lproj/Localizable.strings +++ b/Localizations/uYouPlus.bundle/pt.lproj/Localizable.strings @@ -1,21 +1,21 @@ // About -"ABOUT" = "About"; +"ABOUT" = "Sobre"; -"VERSION" = "Versão do uYouPlus: %@"; +"VERSION" = "Versão"; "VERSION_CHECK" = "Toque para verificar se há atualização!"; -"REPORT_AN_ISSUE" = "Report an issue"; -"ADD_TITLE" = "Add your title here..."; +"REPORT_AN_ISSUE" = "Informar um problema"; +"ADD_TITLE" = "Adicione seu título aqui..."; -"QUIT_YOUTUBE" = "Quit YouTube"; +"QUIT_YOUTUBE" = "Sair do YouTube"; -"RESTART_YOUTUBE" = "Restart YouTube to apply changes"; +"RESTART_YOUTUBE" = "Reinicie o YouTube para aplicar as alterações"; // App appearance -"APP_THEME" = "🎨 App appearance"; +"APP_THEME" = "🎨 Aparência do aplicativo"; "THEME_OPTIONS" = "Opções de Temas"; -"DARK_THEME" = "Dark theme"; +"DARK_THEME" = "Tema Escuro"; "DEFAULT_THEME" = "Padrão"; "DEFAULT_THEME_DESC" = "Tema escuro padrão do YouTube. A reinicialização do app é necessária."; @@ -33,8 +33,8 @@ // Video player options "VIDEO_PLAYER_OPTIONS" = "⏯️ Opções do Reprodutor de Vídeo"; -"SLIDE_TO_SEEK" = "Enable Slide to seek"; -"SLIDE_TO_SEEK_DESC" = "Bring back the Slide to seek gesture."; +"SLIDE_TO_SEEK" = "Ativar Deslizar para buscar"; +"SLIDE_TO_SEEK_DESC" = "Traz de volta o gesto Deslizar para buscar."; "DISABLE_DOUBLE_TAP_TO_SEEK" = "Desativar toque duplo para buscar"; "DISABLE_DOUBLE_TAP_TO_SEEK_DESC" = ""; @@ -48,20 +48,20 @@ "YT_MINIPLAYER" = "Ative o Miniplayer para todos os vídeos do YouTube"; "YT_MINIPLAYER_DESC" = "Vídeos infantis, por exemplo."; -"HIDE_REMIX_BUTTON" = "Hides Remix button"; +"HIDE_REMIX_BUTTON" = "Ocultar o botão Remix"; "HIDE_REMIX_BUTTON_DESC" = ""; -"HIDE_CLIP_BUTTON" = "Hide Clip button"; +"HIDE_CLIP_BUTTON" = "Ocultar o botão Clipe"; "HIDE_CLIP_BUTTON_DESC" = ""; -"HIDE_DOWNLOAD_BUTTON" = "Hide Download button"; +"HIDE_DOWNLOAD_BUTTON" = "Ocultar o botão de Download"; "HIDE_DOWNLOAD_BUTTON_DESC" = ""; "STOCK_VOLUME_HUD" = "Usar o HUD de volume padrão do iOS"; "STOCK_VOLUME_HUD_DESC" = ""; // Video controls overlay options -"VIDEO_PLAYER_OPTIONS" = "📹 Opções de Sobreposição de Controles de Vídeo"; +"VIDEO_CONTROLS_OVERLAY_OPTIONS" = "📹 Opções de Sobreposição de Controles de Vídeo"; "HIDE_AUTOPLAY_SWITCH" = "Ocultar interruptor de Reprodução automática"; "HIDE_AUTOPLAY_SWITCH_DESC" = "Oculta o interruptor de Reprodução automática na sobreposição de controles de vídeo."; @@ -112,7 +112,7 @@ "MISCELLANEOUS" = "🔎 Diversos"; "HIDE_UYOU" = "Hide uYou tab"; -"HIDE_ISPONSORBLOCK" = "Hide iSponsorBlock button"; +"HIDE_ISPONSORBLOCK" = "Ocultar o botão iSponsorBlock"; "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."; @@ -130,7 +130,7 @@ "HIDE_CHIP_BAR" = "Ocultar a Barra superior"; "HIDE_CHIP_BAR_DESC" = "Oculta a Barra superior nos Feeds iniciais (Tendências, Música, Jogos...) e Feeds de inscrições (Todos os vídeos, Continuar assistindo...). A reinicialização do app é necessária."; -"HIDE_PLAY_NEXT_IN_QUEUE" = "Hide \"Play next in queue\""; +"HIDE_PLAY_NEXT_IN_QUEUE" = "Ocultar \"Adicionar como próximo na fila\""; "HIDE_PLAY_NEXT_IN_QUEUE_DESC" = ""; "IPHONE_LAYOUT" = "Layout do iPhone"; @@ -146,4 +146,4 @@ "ENABLE_FLEX_DESC" = "Ativa o FLEX para depuração (não recomendado). Deixe isso desligado, a menos que você saiba o que está fazendo."; "FIX_GOOGLE_SIGNIN" = "Corrigir o login do Google (somente para usuários da TrollStore)"; -"FIX_GOOGLE_SIGNIN_DESC" = "Ative esta opção somente quando você não conseguir fazer login com sua conta do Google e o aplicativo foi instalado via TrollStore. Se você conseguir fazer login normalmente, mantenha-o desativado. A reinicialização do app é necessária."; +"FIX_GOOGLE_SIGNIN_DESC" = "Ative esta opção somente quando você não conseguir fazer login com sua conta do Google e o aplicativo foi instalado via TrollStore. Se você conseguir fazer login normalmente, mantenha-o desativado. A reinicialização do app é necessária."; \ No newline at end of file From 717d581a90b0b356fc2a7a1398e6fb4381c10b5a Mon Sep 17 00:00:00 2001 From: Bryce Hackel <34104885+bhackel@users.noreply.github.com> Date: Mon, 8 Apr 2024 22:49:18 -0400 Subject: [PATCH 10/13] Properly remove PSHeader submodule --- Tweaks/PSHeader | 1 - 1 file changed, 1 deletion(-) delete mode 160000 Tweaks/PSHeader diff --git a/Tweaks/PSHeader b/Tweaks/PSHeader deleted file mode 160000 index 8c163a8..0000000 --- a/Tweaks/PSHeader +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8c163a80a47aa265df3ee2cd55066979617c97e0 From 43d5e38056d96ae01d50559cdb1268141e064ad4 Mon Sep 17 00:00:00 2001 From: Bryce Hackel <34104885+bhackel@users.noreply.github.com> Date: Mon, 8 Apr 2024 23:00:59 -0400 Subject: [PATCH 11/13] Fix mistakes --- Sources/uYouPlus.h | 2 +- Sources/uYouPlus.xm | 4 +--- Sources/uYouPlusThemes.xm | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Sources/uYouPlus.h b/Sources/uYouPlus.h index 7f17339..ecc45ca 100644 --- a/Sources/uYouPlus.h +++ b/Sources/uYouPlus.h @@ -27,7 +27,7 @@ #import #import #import -#import +#import // Hide buttons under the video player by @PoomSmart #import diff --git a/Sources/uYouPlus.xm b/Sources/uYouPlus.xm index 2312bd5..c26a9bb 100644 --- a/Sources/uYouPlus.xm +++ b/Sources/uYouPlus.xm @@ -602,15 +602,13 @@ BOOL isAd(YTIElementRenderer *self) { %end // Use stock iOS volume HUD -// Use YTColdConfig's method instead of YTStockVolumeHUD.xm, see https://x.com/PoomSmart/status/1756904290445332653 +// Use YTColdConfig's method, see https://x.com/PoomSmart/status/1756904290445332653 %group gStockVolumeHUD %hook YTColdConfig - (BOOL)iosUseSystemVolumeControlInFullscreen { return IS_ENABLED(@"stockVolumeHUD_enabled") ? YES : %orig; } %end -%end - %hook UIApplication - (void)setSystemVolumeHUDEnabled:(BOOL)arg1 forAudioCategory:(id)arg2 { %orig(true, arg2); diff --git a/Sources/uYouPlusThemes.xm b/Sources/uYouPlusThemes.xm index 5c278b2..5386911 100644 --- a/Sources/uYouPlusThemes.xm +++ b/Sources/uYouPlusThemes.xm @@ -167,6 +167,7 @@ UIColor* raisedColor = [UIColor colorWithRed:0.035 green:0.035 blue:0.035 alpha: %hook GOODialogView - (void)setBackgroundColor:(UIColor *)color { return IS_DARK_APPEARANCE_ENABLED ? %orig([UIColor blackColor]) : %orig; +} %end // Playlist sort From 5b107a6791ed7fb966be6ae431951edca8c54902 Mon Sep 17 00:00:00 2001 From: Bryce Hackel <34104885+bhackel@users.noreply.github.com> Date: Mon, 8 Apr 2024 23:35:38 -0400 Subject: [PATCH 12/13] Switch all includes to <> --- Sources/YTNoPaidPromo.x.bak | 4 ++-- Sources/YTReExplore.x | 8 ++++---- Sources/uYouPlusPatches.h | 4 ++-- Sources/uYouPlusSettings.h | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Sources/YTNoPaidPromo.x.bak b/Sources/YTNoPaidPromo.x.bak index 61e9b51..3619827 100644 --- a/Sources/YTNoPaidPromo.x.bak +++ b/Sources/YTNoPaidPromo.x.bak @@ -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 4fb8009..e20689b 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/uYouPlusPatches.h b/Sources/uYouPlusPatches.h index 9c67c2b..03ebe29 100644 --- a/Sources/uYouPlusPatches.h +++ b/Sources/uYouPlusPatches.h @@ -1,5 +1,5 @@ -#import "../Tweaks/YouTubeHeader/YTColorPalette.h" -#import "../Tweaks/YouTubeHeader/YTCommonColorPalette.h" +#import +#import #import "uYouPlus.h" @interface PlayerManager : NSObject diff --git a/Sources/uYouPlusSettings.h b/Sources/uYouPlusSettings.h index 6aad211..d856b78 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 From c717633b24adea88c489824c4daaded0cea96bf8 Mon Sep 17 00:00:00 2001 From: Bryce Hackel <34104885+bhackel@users.noreply.github.com> Date: Mon, 8 Apr 2024 23:54:25 -0400 Subject: [PATCH 13/13] Fix more mistakes --- Sources/YTNoPaidPromo.x.bak | 4 ++-- Sources/YTReExplore.x | 8 +++---- Sources/uYouPlus.h | 42 ++++++++++++++++++------------------- Sources/uYouPlusPatches.h | 4 ++-- Sources/uYouPlusSettings.h | 12 +++++------ 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Sources/YTNoPaidPromo.x.bak b/Sources/YTNoPaidPromo.x.bak index 3619827..46825e0 100644 --- a/Sources/YTNoPaidPromo.x.bak +++ b/Sources/YTNoPaidPromo.x.bak @@ -1,5 +1,5 @@ -#import -#import +#import +#import #import "uYouPlus.h" // YTNoPaidPromo: https://github.com/PoomSmart/YTNoPaidPromo diff --git a/Sources/YTReExplore.x b/Sources/YTReExplore.x index e20689b..e7f329d 100644 --- a/Sources/YTReExplore.x +++ b/Sources/YTReExplore.x @@ -1,7 +1,7 @@ -#import -#import -#import -#import +#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 d9f4630..d1b2c6e 100644 --- a/Sources/uYouPlus.h +++ b/Sources/uYouPlus.h @@ -9,27 +9,27 @@ #import #import "uYouPlusThemes.h" // Hide "Buy Super Thanks" banner (_ASDisplayView) -#import // Activate FLEX -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import +#import // Activate FLEX +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import // Hide buttons under the video player by @PoomSmart #import diff --git a/Sources/uYouPlusPatches.h b/Sources/uYouPlusPatches.h index 03ebe29..a9231b6 100644 --- a/Sources/uYouPlusPatches.h +++ b/Sources/uYouPlusPatches.h @@ -1,5 +1,5 @@ -#import -#import +#import +#import #import "uYouPlus.h" @interface PlayerManager : NSObject diff --git a/Sources/uYouPlusSettings.h b/Sources/uYouPlusSettings.h index d856b78..5eab59b 100644 --- a/Sources/uYouPlusSettings.h +++ b/Sources/uYouPlusSettings.h @@ -1,9 +1,9 @@ -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import #import "uYouPlus.h" // For displaying snackbars