diff --git a/Makefile b/Makefile index 4dd81b4..eaf7f29 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ endif DEBUG=0 FINALPACKAGE=1 ARCHS = arm64 -PACKAGE_VERSION = 2.4.1 +PACKAGE_VERSION = 2.5 TARGET := iphone:clang:latest:11.0 include $(THEOS)/makefiles/common.mk diff --git a/Settings.x b/Settings.x index 8a9dbb9..c52f204 100644 --- a/Settings.x +++ b/Settings.x @@ -6,19 +6,6 @@ static const NSInteger YTLiteSection = 789; -NSBundle *YTLiteBundle() { - static NSBundle *bundle = nil; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - NSString *tweakBundlePath = [[NSBundle mainBundle] pathForResource:@"YTLite" ofType:@"bundle"]; - if (tweakBundlePath) - bundle = [NSBundle bundleWithPath:tweakBundlePath]; - else - bundle = [NSBundle bundleWithPath:ROOT_PATH_NS("/Library/Application Support/YTLite.bundle")]; - }); - return bundle; -} - // Settings %hook YTAppSettingsPresentationData + (NSArray *)settingsCategoryOrder { @@ -66,12 +53,30 @@ NSBundle *YTLiteBundle() { static YTSettingsSectionItem *createSwitchItem(NSString *title, NSString *titleDescription, NSString *key, BOOL *value, id selfObject) { Class YTSettingsSectionItemClass = %c(YTSettingsSectionItem); + Class YTAlertViewClass = %c(YTAlertView); YTSettingsSectionItem *item = [YTSettingsSectionItemClass switchItemWithTitle:title titleDescription:titleDescription accessibilityIdentifier:nil switchOn:*value switchBlock:^BOOL(YTSettingsCell *cell, BOOL enabled) { - [selfObject updatePrefsForKey:key enabled:enabled]; + if ([key isEqualToString:@"shortsOnlyMode"]) { + YTAlertView *alertView = [YTAlertViewClass confirmationDialogWithAction:^{ + [selfObject updatePrefsForKey:@"shortsOnlyMode" enabled:enabled]; + } + actionTitle:LOC(@"Yes") + cancelAction:^{ + [cell setSwitchOn:!enabled animated:YES]; + } + cancelTitle:LOC(@"No")]; + alertView.title = LOC(@"Warning"); + alertView.subtitle = LOC(@"ShortsOnlyWarning"); + [alertView show]; + } + + else { + [selfObject updatePrefsForKey:key enabled:enabled]; + } + return YES; } settingItemId:0]; @@ -150,6 +155,7 @@ static YTSettingsSectionItem *createSwitchItem(NSString *title, NSString *titleD createSwitchItem(LOC(@"NoDarkBg"), LOC(@"NoDarkBgDesc"), @"noDarkBg", &kNoDarkBg, selfObject), createSwitchItem(LOC(@"NoEndScreenCards"), LOC(@"NoEndScreenCardsDesc"), @"endScreenCards", &kEndScreenCards, selfObject), createSwitchItem(LOC(@"NoFullscreenActions"), LOC(@"NoFullscreenActionsDesc"), @"noFullscreenActions", &kNoFullscreenActions, selfObject), + createSwitchItem(LOC(@"PersistentProgressBar"), LOC(@"PersistentProgressBarDesc"), @"persistentProgressBar", &kPersistentProgressBar, selfObject), createSwitchItem(LOC(@"NoRelatedVids"), LOC(@"NoRelatedVidsDesc"), @"noRelatedVids", &kNoRelatedVids, selfObject), createSwitchItem(LOC(@"NoPromotionCards"), LOC(@"NoPromotionCardsDesc"), @"noPromotionCards", &kNoPromotionCards, selfObject), createSwitchItem(LOC(@"NoWatermarks"), LOC(@"NoWatermarksDesc"), @"noWatermarks", &kNoWatermarks, selfObject) @@ -172,6 +178,7 @@ static YTSettingsSectionItem *createSwitchItem(NSString *title, NSString *titleD createSwitchItem(LOC(@"PortraitFullscreen"), LOC(@"PortraitFullscreenDesc"), @"portraitFullscreen", &kPortraitFullscreen, selfObject), createSwitchItem(LOC(@"CopyWithTimestamp"), LOC(@"CopyWithTimestampDesc"), @"copyWithTimestamp", &kCopyWithTimestamp, selfObject), createSwitchItem(LOC(@"DisableAutoplay"), LOC(@"DisableAutoplayDesc"), @"disableAutoplay", &kDisableAutoplay, selfObject), + createSwitchItem(LOC(@"DisableAutoCaptions"), LOC(@"DisableAutoCaptionsDesc"), @"disableAutoCaptions", &kDisableAutoCaptions, selfObject), createSwitchItem(LOC(@"NoContentWarning"), LOC(@"NoContentWarningDesc"), @"noContentWarning", &kNoContentWarning, selfObject), createSwitchItem(LOC(@"ClassicQuality"), LOC(@"ClassicQualityDesc"), @"classicQuality", &kClassicQuality, selfObject), createSwitchItem(LOC(@"ExtraSpeedOptions"), LOC(@"ExtraSpeedOptionsDesc"), @"extraSpeedOptions", &kExtraSpeedOptions, selfObject), @@ -197,8 +204,11 @@ static YTSettingsSectionItem *createSwitchItem(NSString *title, NSString *titleD } selectBlock:^BOOL (YTSettingsCell *cell, NSUInteger arg1) { NSArray *rows = @[ + createSwitchItem(LOC(@"ShortsOnlyMode"), LOC(@"ShortsOnlyModeDesc"), @"shortsOnlyMode", &kShortsOnlyMode, selfObject), createSwitchItem(LOC(@"HideShorts"), LOC(@"HideShortsDesc"), @"hideShorts", &kHideShorts, selfObject), createSwitchItem(LOC(@"ShortsProgress"), LOC(@"ShortsProgressDesc"), @"shortsProgress", &kShortsProgress, selfObject), + createSwitchItem(LOC(@"PinchToFullscreenShorts"), LOC(@"PinchToFullscreenShortsDesc"), @"pinchToFullscreenShorts", &kPinchToFullscreenShorts, selfObject), + createSwitchItem(LOC(@"ShortsToRegular"), LOC(@"ShortsToRegularDesc"), @"shortsToRegular", &kShortsToRegular, selfObject), createSwitchItem(LOC(@"ResumeShorts"), LOC(@"ResumeShortsDesc"), @"resumeShorts", &kResumeShorts, selfObject), createSwitchItem(LOC(@"HideShortsLogo"), LOC(@"HideShortsLogoDesc"), @"hideShortsLogo", &kHideShortsLogo, selfObject), createSwitchItem(LOC(@"HideShortsSearch"), LOC(@"HideShortsSearchDesc"), @"hideShortsSearch", &kHideShortsSearch, selfObject), @@ -212,6 +222,7 @@ static YTSettingsSectionItem *createSwitchItem(NSString *title, NSString *titleD createSwitchItem(LOC(@"HideShortsShare"), LOC(@"HideShortsShareDesc"), @"hideShortsShare", &kHideShortsShare, selfObject), createSwitchItem(LOC(@"HideShortsAvatars"), LOC(@"HideShortsAvatarsDesc"), @"hideShortsAvatars", &kHideShortsAvatars, selfObject), createSwitchItem(LOC(@"HideShortsThanks"), LOC(@"HideShortsThanksDesc"), @"hideShortsThanks", &kHideShortsThanks, selfObject), + createSwitchItem(LOC(@"HideShortsSource"), LOC(@"HideShortsSourceDesc"), @"hideShortsSource", &kHideShortsSource, selfObject), createSwitchItem(LOC(@"HideShortsChannelName"), LOC(@"HideShortsChannelNameDesc"), @"hideShortsChannelName", &kHideShortsChannelName, selfObject), createSwitchItem(LOC(@"HideShortsDescription"), LOC(@"HideShortsDescriptionDesc"), @"hideShortsDescription", &kHideShortsDescription, selfObject), createSwitchItem(LOC(@"HideShortsAudioTrack"), LOC(@"HideShortsAudioTrackDesc"), @"hideShortsAudioTrack", &kHideShortsAudioTrack, selfObject), @@ -234,6 +245,7 @@ static YTSettingsSectionItem *createSwitchItem(NSString *title, NSString *titleD createSwitchItem(LOC(@"RemoveLabels"), LOC(@"RemoveLabelsDesc"), @"removeLabels", &kRemoveLabels, selfObject), createSwitchItem(LOC(@"RemoveIndicators"), LOC(@"RemoveIndicatorsDesc"), @"removeIndicators", &kRemoveIndicators, selfObject), createSwitchItem(LOC(@"ReExplore"), LOC(@"ReExploreDesc"), @"reExplore", &kReExplore, selfObject), + createSwitchItem(LOC(@"AddExplore"), LOC(@"AddExploreDesc"), @"addExplore", &kAddExplore, selfObject), createSwitchItem(LOC(@"HideShortsTab"), LOC(@"HideShortsTabDesc"), @"removeShorts", &kRemoveShorts, selfObject), createSwitchItem(LOC(@"HideSubscriptionsTab"), LOC(@"HideSubscriptionsTabDesc"), @"removeSubscriptions", &kRemoveSubscriptions, selfObject), createSwitchItem(LOC(@"HideUploadButton"), LOC(@"HideUploadButtonDesc"), @"removeUploads", &kRemoveUploads, selfObject), @@ -254,6 +266,10 @@ static YTSettingsSectionItem *createSwitchItem(NSString *title, NSString *titleD } selectBlock:^BOOL (YTSettingsCell *cell, NSUInteger arg1) { NSArray *rows = @[ + createSwitchItem(LOC(@"CopyPostText"), LOC(@"CopyPostTextDesc"), @"copyPostText", &kCopyPostText, selfObject), + createSwitchItem(LOC(@"SavePostImage"), LOC(@"SavePostImageDesc"), @"savePostImage", &kSavePostImage, selfObject), + createSwitchItem(LOC(@"SaveProfilePhoto"), LOC(@"SaveProfilePhotoDesc"), @"saveProfilePhoto", &kSaveProfilePhoto, selfObject), + createSwitchItem(LOC(@"FixAlbums"), LOC(@"FixAlbumsDesc"), @"fixAlbums", &kFixAlbums, selfObject), createSwitchItem(LOC(@"RemovePlayNext"), LOC(@"RemovePlayNextDesc"), @"removePlayNext", &kRemovePlayNext, selfObject), createSwitchItem(LOC(@"NoContinueWatching"), LOC(@"NoContinueWatchingDesc"), @"noContinueWatching", &kNoContinueWatching, selfObject), createSwitchItem(LOC(@"NoSearchHistory"), LOC(@"NoSearchHistoryDesc"), @"noSearchHistory", &kNoSearchHistory, selfObject), @@ -277,10 +293,12 @@ static YTSettingsSectionItem *createSwitchItem(NSString *title, NSString *titleD detailTextBlock:^NSString *() { switch (kPivotIndex) { case 1: - return LOC(@"ShortsTab"); + return LOC(@"Explore"); case 2: - return LOC(@"Subscriptions"); + return LOC(@"ShortsTab"); case 3: + return LOC(@"Subscriptions"); + case 4: return LOC(@"Library"); case 0: default: @@ -295,6 +313,20 @@ static YTSettingsSectionItem *createSwitchItem(NSString *title, NSString *titleD [self updateIntegerPrefsForKey:@"pivotIndex" intValue:kPivotIndex]; return YES; }], + [YTSettingsSectionItemClass checkmarkItemWithTitle:LOC(@"Explore") titleDescription:nil selectBlock:^BOOL (YTSettingsCell *library, NSUInteger arg1) { + if (!kReExplore && !kAddExplore) { + YTAlertView *alertView = [%c(YTAlertView) infoDialog]; + alertView.title = LOC(@"Warning"); + alertView.subtitle = LOC(@"TabIsHidden"); + [alertView show]; + return NO; + } else { + kPivotIndex = 1; + [settingsViewController reloadData]; + [self updateIntegerPrefsForKey:@"pivotIndex" intValue:kPivotIndex]; + return YES; + } + }], [YTSettingsSectionItemClass checkmarkItemWithTitle:LOC(@"ShortsTab") titleDescription:nil selectBlock:^BOOL (YTSettingsCell *shorts, NSUInteger arg1) { if (kRemoveShorts) { YTAlertView *alertView = [%c(YTAlertView) infoDialog]; @@ -303,7 +335,7 @@ static YTSettingsSectionItem *createSwitchItem(NSString *title, NSString *titleD [alertView show]; return NO; } else { - kPivotIndex = 1; + kPivotIndex = 2; [settingsViewController reloadData]; [self updateIntegerPrefsForKey:@"pivotIndex" intValue:kPivotIndex]; return YES; @@ -317,7 +349,7 @@ static YTSettingsSectionItem *createSwitchItem(NSString *title, NSString *titleD [alertView show]; return NO; } else { - kPivotIndex = 2; + kPivotIndex = 3; [settingsViewController reloadData]; [self updateIntegerPrefsForKey:@"pivotIndex" intValue:kPivotIndex]; return YES; @@ -331,7 +363,7 @@ static YTSettingsSectionItem *createSwitchItem(NSString *title, NSString *titleD [alertView show]; return NO; } else { - kPivotIndex = 3; + kPivotIndex = 4; [settingsViewController reloadData]; [self updateIntegerPrefsForKey:@"pivotIndex" intValue:kPivotIndex]; return YES; @@ -414,11 +446,9 @@ static YTSettingsSectionItem *createSwitchItem(NSString *title, NSString *titleD }]; [sectionItems addObject:version]; - NSString *title = @"YTLite"; - if ([settingsViewController respondsToSelector:@selector(setSectionItems:forCategory:title:icon:titleDescription:headerHidden:)]) - [settingsViewController setSectionItems:sectionItems forCategory:YTLiteSection title:title icon:nil titleDescription:nil headerHidden:NO]; - else - [settingsViewController setSectionItems:sectionItems forCategory:YTLiteSection title:title titleDescription:nil headerHidden:NO]; + BOOL isNew = [settingsViewController respondsToSelector:@selector(setSectionItems:forCategory:title:icon:titleDescription:headerHidden:)]; + isNew ? [settingsViewController setSectionItems:sectionItems forCategory:YTLiteSection title:@"YTLite" icon:nil titleDescription:nil headerHidden:NO] + : [settingsViewController setSectionItems:sectionItems forCategory:YTLiteSection title:@"YTLite" titleDescription:nil headerHidden:NO]; } @@ -440,15 +470,15 @@ static YTSettingsSectionItem *createSwitchItem(NSString *title, NSString *titleD dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ YTAlertView *alertView = [%c(YTAlertView) confirmationDialogWithAction:^{ - [prefs setObject:@(YES) forKey:@"advancedMode"]; - [prefs writeToFile:prefsPath atomically:NO]; - CFNotificationCenterPostNotification(CFNotificationCenterGetDarwinNotifyCenter(), CFSTR("com.dvntm.ytlite.prefschanged"), NULL, NULL, YES); - } - actionTitle:LOC(@"Yes") - cancelTitle:LOC(@"No")]; - alertView.title = @"YTLite"; - alertView.subtitle = [NSString stringWithFormat:LOC(@"AdvancedModeReminder"), @"YTLite", LOC(@"Version"), LOC(@"Advanced")]; - [alertView show]; + [prefs setObject:@(YES) forKey:@"advancedMode"]; + [prefs writeToFile:prefsPath atomically:NO]; + CFNotificationCenterPostNotification(CFNotificationCenterGetDarwinNotifyCenter(), CFSTR("com.dvntm.ytlite.prefschanged"), NULL, NULL, YES); + } + actionTitle:LOC(@"Yes") + cancelTitle:LOC(@"No")]; + alertView.title = @"YTLite"; + alertView.subtitle = [NSString stringWithFormat:LOC(@"AdvancedModeReminder"), @"YTLite", LOC(@"Version"), LOC(@"Advanced")]; + [alertView show]; }); } } \ No newline at end of file diff --git a/Sideloading.x b/Sideloading.x index 5779075..739a6cc 100644 --- a/Sideloading.x +++ b/Sideloading.x @@ -71,31 +71,39 @@ static NSString *accessGroupID() { } %end -%hook NSBundle -- (NSString *)bundleIdentifier { +BOOL isSelf() { NSArray *address = [NSThread callStackReturnAddresses]; Dl_info info = {0}; - if (dladdr((void *)[address[2] longLongValue], &info) == 0) - return %orig; + if (dladdr((void *)[address[2] longLongValue], &info) == 0) return NO; NSString *path = [NSString stringWithUTF8String:info.dli_fname]; - if ([path hasPrefix:NSBundle.mainBundle.bundlePath]) - return YT_BUNDLE_ID; - return %orig; + return [path hasPrefix:NSBundle.mainBundle.bundlePath]; } + +%hook NSBundle +- (NSString *)bundleIdentifier { + return isSelf() ? YT_BUNDLE_ID : %orig; +} + +- (NSDictionary *)infoDictionary { + NSDictionary *dict = %orig; + if (!isSelf()) + return %orig; + NSMutableDictionary *info = [dict mutableCopy]; + if (info[@"CFBundleIdentifier"]) info[@"CFBundleIdentifier"] = YT_BUNDLE_ID; + if (info[@"CFBundleDisplayName"]) info[@"CFBundleDisplayName"] = YT_NAME; + if (info[@"CFBundleName"]) info[@"CFBundleName"] = YT_NAME; + return info; +} + - (id)objectForInfoDictionaryKey:(NSString *)key { + if (!isSelf()) + return %orig; if ([key isEqualToString:@"CFBundleIdentifier"]) return YT_BUNDLE_ID; if ([key isEqualToString:@"CFBundleDisplayName"] || [key isEqualToString:@"CFBundleName"]) return YT_NAME; return %orig; } -// Fix Google Sign in by @PoomSmart and @level3tjg (qnblackcat/uYouPlus#684) -- (NSDictionary *)infoDictionary { - NSMutableDictionary *info = %orig.mutableCopy; - NSString *altBundleIdentifier = info[@"ALTBundleIdentifier"]; - if (altBundleIdentifier) info[@"CFBundleIdentifier"] = altBundleIdentifier; - return info; -} %end // Fix login for YouTube 18.13.2 and higher @@ -133,6 +141,6 @@ static NSString *accessGroupID() { %end %ctor { - if ([[NSFileManager defaultManager] fileExistsAtPath:[[NSBundle mainBundle] pathForResource:@"embedded" ofType:@"mobileprovision"]]) - %init(gSideloading); + BOOL isAppStoreApp = [[NSFileManager defaultManager] fileExistsAtPath:[[NSBundle mainBundle] appStoreReceiptURL].path]; + if (!isAppStoreApp) %init(gSideloading); } diff --git a/YTLite.h b/YTLite.h index 8230fac..c75b430 100644 --- a/YTLite.h +++ b/YTLite.h @@ -1,6 +1,8 @@ #import #import #import +#import +#import "../YouTubeHeader/YTAlertView.h" #import "../YouTubeHeader/YTIGuideResponse.h" #import "../YouTubeHeader/YTIGuideResponseSupportedRenderers.h" #import "../YouTubeHeader/YTIPivotBarSupportedRenderers.h" @@ -8,6 +10,7 @@ #import "../YouTubeHeader/YTIBrowseRequest.h" #import "../YouTubeHeader/YTISectionListRenderer.h" #import "../YouTubeHeader/YTQTMButton.h" +#import "../YouTubeHeader/YTIButtonRenderer.h" #import "../YouTubeHeader/YTVideoQualitySwitchOriginalController.h" #import "../YouTubeHeader/YTPlayerViewController.h" #import "../YouTubeHeader/YTWatchController.h" @@ -19,12 +22,25 @@ #import "../YouTubeHeader/YTSettingsPickerViewController.h" #import "../YouTubeHeader/YTUIUtils.h" #import "../YouTubeHeader/YTIMenuConditionalServiceItemRenderer.h" +#import "../YouTubeHeader/YTToastResponderEvent.h" +#import "../YouTubeHeader/YTPageStyleController.h" -extern NSBundle *YTLiteBundle(); +static inline NSBundle *YTLiteBundle() { + static NSBundle *bundle = nil; + static dispatch_once_t onceToken; + + dispatch_once(&onceToken, ^{ + NSString *tweakBundlePath = [[NSBundle mainBundle] pathForResource:@"YTLite" ofType:@"bundle"]; + NSString *rootlessBundlePath = ROOT_PATH_NS("/Library/Application Support/YTLite.bundle"); + + bundle = [NSBundle bundleWithPath:tweakBundlePath ?: rootlessBundlePath]; + }); + + return bundle; +} static inline NSString *LOC(NSString *key) { - NSBundle *tweakBundle = YTLiteBundle(); - return [tweakBundle localizedStringForKey:key value:nil table:nil]; + return [YTLiteBundle() localizedStringForKey:key value:nil table:nil]; } BOOL kNoAds; @@ -44,6 +60,7 @@ BOOL kReplacePrevNext; BOOL kNoDarkBg; BOOL kEndScreenCards; BOOL kNoFullscreenActions; +BOOL kPersistentProgressBar; BOOL kNoRelatedVids; BOOL kNoPromotionCards; BOOL kNoWatermarks; @@ -51,6 +68,7 @@ BOOL kMiniplayer; BOOL kPortraitFullscreen; BOOL kCopyWithTimestamp; BOOL kDisableAutoplay; +BOOL kDisableAutoCaptions; BOOL kNoContentWarning; BOOL kClassicQuality; BOOL kExtraSpeedOptions; @@ -61,8 +79,11 @@ BOOL kNoFreeZoom; BOOL kAutoFullscreen; BOOL kExitFullscreen; BOOL kNoDoubleTapToSeek; +BOOL kShortsOnlyMode; BOOL kHideShorts; BOOL kShortsProgress; +BOOL kPinchToFullscreenShorts; +BOOL kShortsToRegular; BOOL kResumeShorts; BOOL kHideShortsLogo; BOOL kHideShortsSearch; @@ -76,6 +97,7 @@ BOOL kHideShortsRemix; BOOL kHideShortsShare; BOOL kHideShortsAvatars; BOOL kHideShortsThanks; +BOOL kHideShortsSource; BOOL kHideShortsChannelName; BOOL kHideShortsDescription; BOOL kHideShortsAudioTrack; @@ -83,10 +105,16 @@ BOOL kHideShortsPromoCards; BOOL kRemoveLabels; BOOL kRemoveIndicators; BOOL kReExplore; +BOOL kAddExplore; BOOL kRemoveShorts; BOOL kRemoveSubscriptions; BOOL kRemoveUploads; BOOL kRemoveLibrary; +BOOL kCopyPostText; +BOOL kSavePostImage; +BOOL kSaveProfilePhoto; +BOOL kSavePost; +BOOL kFixAlbums; BOOL kRemovePlayNext; BOOL kNoContinueWatching; BOOL kNoSearchHistory; @@ -109,11 +137,13 @@ int kPivotIndex; @interface YTPivotBarView : UIView @end -@interface YTPivotBarItemView : UIView +@interface YTQTMButton () +@property (nonatomic, strong, readwrite) YTIButtonRenderer *buttonRenderer; +- (void)setSizeWithPaddingAndInsets:(BOOL)sizeWithPaddingAndInsets; @end -@interface YTPivotBarViewController : UIViewController -- (void)selectItemWithPivotIdentifier:(id)pivotIndentifier; +@interface YTPivotBarItemView : UIView +@property (nonatomic, strong, readwrite) YTQTMButton *navigationButton; @end @interface YTRightNavigationButtons : UIView @@ -121,10 +151,7 @@ int kPivotIndex; @property (nonatomic, strong) YTQTMButton *searchButton; @end -@interface YTSearchView : UIView -@end - -@interface YTSearchBarView : UIView +@interface YTSearchViewController : UIViewController @end @interface YTNavigationBarTitleView : UIView @@ -133,8 +160,51 @@ int kPivotIndex; @interface YTChipCloudCell : UICollectionViewCell @end +@interface YTAppViewController : UIViewController +- (void)hidePivotBar; +- (void)showPivotBar; +@end + +@interface YTPivotBarViewController : UIViewController +@property (nonatomic, weak, readwrite) YTAppViewController *parentViewController; +- (void)selectItemWithPivotIdentifier:(id)pivotIndentifier; +@end + +@interface YTScrollableNavigationController : UINavigationController +@property (nonatomic, weak, readwrite) YTAppViewController *parentViewController; +@end + +@interface YTReelWatchRootViewController : UIViewController +@property (nonatomic, weak, readwrite) YTScrollableNavigationController *navigationController; +@end + +@interface YTTabsViewController : UIViewController +@property (nonatomic, weak, readwrite) YTScrollableNavigationController *navigationController; +@end + +@interface YTReelWatchPlaybackOverlayView : UIView +@end + +@interface YTReelContentView : UIView +@property (nonatomic, assign, readonly) YTReelWatchPlaybackOverlayView *playbackOverlay; +@end + +@interface YTShortsPlayerViewController : UIViewController +@property (nonatomic, weak, readwrite) YTScrollableNavigationController *navigationController; +@end + @interface YTPlayerViewController (YTAFS) +@property (nonatomic, weak, readwrite) UIViewController *parentViewController; +@property (readonly, nonatomic) NSString *contentVideoID; +- (void)setActiveCaptionTrack:(id)arg1; +- (void)shortsToRegular; - (void)autoFullscreen; +- (void)turnOffCaptions; +@end + +@interface YTPlayerView : UIView +@property (nonatomic, weak, readwrite) YTPlayerViewController *playerViewDelegate; +- (void)turnShortsOnlyModeOff:(UILongPressGestureRecognizer *)gesture; @end @interface YTSegmentableInlinePlayerBarView @@ -159,19 +229,27 @@ int kPivotIndex; - (void)removeCellsAtIndexPath:(NSIndexPath *)indexPath; @end -@interface YTReelWatchPlaybackOverlayView : UIView -@end +// @interface YTReelWatchPlaybackOverlayView : UIView +// @end -@interface YTReelTransparentStackView : UIView -@end +// @interface YTReelWatchHeaderView : UIView +// @end -@interface YTReelWatchHeaderView : UIView +@interface YTReelTransparentStackView : UIStackView @end @interface YTELMView : UIView @end +@interface ASNetworkImageNode : NSObject +@property (atomic, copy, readwrite) NSURL *URL; +@end + @interface _ASDisplayView : UIView +@property (nonatomic, strong, readwrite) ASNetworkImageNode *keepalive_node; +- (void)copyText:(UILongPressGestureRecognizer *)sender; +- (void)saveImage:(UILongPressGestureRecognizer *)sender; +- (void)savePFP:(UILongPressGestureRecognizer *)sender; @end @interface MLHAMQueuePlayer : NSObject @@ -191,14 +269,6 @@ int kPivotIndex; - (void)broadcastRateChange:(float)rate; @end -@interface YTAlertView : UIView -@property (nonatomic, copy, readwrite) NSString *title; -@property (nonatomic, copy, readwrite) NSString *subtitle; -+ (instancetype)infoDialog; -+ (instancetype)confirmationDialogWithAction:(void (^)(void))action actionTitle:(NSString *)actionTitle cancelTitle:(NSString *)cancelTitle; -- (void)show; -@end - @interface YTMainAppVideoPlayerOverlayViewController : UIViewController @property (readonly, nonatomic) CGFloat mediaTime; @property (readonly, nonatomic) NSString *videoID; diff --git a/YTLite.x b/YTLite.x index b674b5b..f774081 100644 --- a/YTLite.x +++ b/YTLite.x @@ -32,11 +32,21 @@ - (NSData *)elementData { if (self.hasCompatibilityOptions && self.compatibilityOptions.hasAdLoggingData && kNoAds) return nil; - NSArray *adDescriptions = @[@"brand_promo", @"product_carousel", @"product_engagement_panel", @"product_item", @"text_search_ad", @"text_image_button_layout", @"carousel_headered_layout", @"carousel_footered_layout", @"square_image_layout", @"landscape_image_wide_button_layout", @"feed_ad_metadata"]; NSString *description = [self description]; - if (([adDescriptions containsObject:description] && kNoAds) || ([description containsString:@"inline_shorts"] && kHideShorts)) { + + NSArray *ads = @[@"brand_promo", @"product_carousel", @"product_engagement_panel", @"product_item", @"text_search_ad", @"text_image_button_layout", @"carousel_headered_layout", @"carousel_footered_layout", @"square_image_layout", @"landscape_image_wide_button_layout", @"feed_ad_metadata"]; + if (kNoAds && [ads containsObject:description]) { return [NSData data]; - } return %orig; + } + + NSArray *shortsToRemove = @[@"shorts_shelf.eml", @"shorts_video_cell.eml", @"6Shorts"]; + for (NSString *shorts in shortsToRemove) { + if (kHideShorts && [description containsString:shorts] && ![description containsString:@"history*"]) { + return nil; + } + } + + return %orig; } %end @@ -105,42 +115,29 @@ %hook YTRightNavigationButtons - (void)layoutSubviews { %orig; - if (kNoCast && self.subviews.count > 1 && [self.subviews[1].accessibilityIdentifier isEqualToString:@"id.mdx.playbackroute.button"]) self.subviews[1].hidden = YES; // Hide icon immediately + if (kNoNotifsButton) self.notificationButton.hidden = YES; if (kNoSearchButton) self.searchButton.hidden = YES; - NSInteger moreButtonIndex = -1; - for (NSInteger i = 0; i < self.subviews.count; i++) { - UIView *subview = self.subviews[i]; - if ([subview.accessibilityIdentifier isEqualToString:@"id.settings.overflow.button"]) { - moreButtonIndex = i; - break; - } - } - - if (moreButtonIndex != -1 && moreButtonIndex < self.subviews.count - 1 && kNoVoiceSearchButton) { - UIView *voiceButton = self.subviews[moreButtonIndex + 1]; - voiceButton.hidden = YES; + for (UIView *subview in self.subviews) { + if (kNoVoiceSearchButton && [subview.accessibilityLabel isEqualToString:NSLocalizedString(@"search.voice.access", nil)]) subview.hidden = YES; + if (kNoCast && [subview.accessibilityIdentifier isEqualToString:@"id.mdx.playbackroute.button"]) subview.hidden = YES; } } %end -%hook YTSearchView -- (void)layoutSubviews { +%hook YTSearchViewController +- (void)viewDidLoad { %orig; - // Hide Search History - if (kNoSearchHistory && self.subviews.count > 1) self.subviews[1].hidden = YES; - // Hide Voice Search Button - if (kNoVoiceSearchButton && self.subviews.count > 0) { - UIView *firstSubview = self.subviews.firstObject; - for (UIView *subview in firstSubview.subviews) { - if ([NSStringFromClass([subview class]) isEqualToString:@"UIView"]) { - [subview setValue:@(1) forKey:@"hidden"]; - break; - } - } - } + + if (kNoVoiceSearchButton) [self setValue:@(NO) forKey:@"_isVoiceSearchAllowed"]; } + +- (void)setSuggestions:(id)arg1 { if (!kNoSearchHistory) %orig; } +%end + +%hook YTPersonalizedSuggestionsCacheProvider +- (id)activeCache { return kNoSearchHistory ? nil : %orig; } %end // Remove Videos Section Under Player @@ -151,14 +148,13 @@ } %end -// Hide YouTube Logo -%hook YTNavigationBarTitleView -- (void)layoutSubviews { %orig; if (kNoYTLogo && self.subviews.count > 1 && [self.subviews[1].accessibilityIdentifier isEqualToString:@"id.yoodle.logo"]) self.subviews[1].hidden = YES; } -%end - -// Stick Navigation bar %hook YTHeaderView -- (BOOL)stickyNavHeaderEnabled { return kStickyNavbar ? YES : NO; } +// Stick Navigation bar +- (BOOL)stickyNavHeaderEnabled { return kStickyNavbar ? YES : %orig; } + +// Hide YouTube Logo +- (void)setCustomTitleView:(UIView *)customTitleView { if (!kNoYTLogo) %orig; } +- (void)setTitle:(NSString *)title { kNoYTLogo ? %orig(@"") : %orig; } %end // Remove Subbar @@ -190,7 +186,6 @@ - (id)initWithMessage:(id)arg1 dismissHandler:(id)arg2 { return kNoHUDMsgs ? nil : %orig; } %end - %hook YTColdConfig // Hide Next & Previous buttons - (BOOL)removeNextPaddleForSingletonVideos { return kHidePrevNext ? YES : %orig; } @@ -248,11 +243,19 @@ - (void)setPaidContentWithPlayerData:(id)data { if (!kNoPromotionCards) %orig; } %end +%hook YTInlinePlayerBarContainerView +- (void)setPlayerBarAlpha:(CGFloat)alpha { kPersistentProgressBar ? %orig(1.0) : %orig; } +%end + // Remove Watermarks %hook YTAnnotationsViewController - (void)loadFeaturedChannelWatermark { if (!kNoWatermarks) %orig; } %end +%hook YTMainAppVideoPlayerOverlayView +- (BOOL)isWatermarkEnabled { return kNoWatermarks ? NO : %orig; } +%end + // Forcibly Enable Miniplayer %hook YTWatchMiniBarViewController - (void)updateMiniBarPlayerStateFromRenderer { if (!kMiniplayer) %orig; } @@ -270,7 +273,7 @@ // Skip Content Warning (https://github.com/qnblackcat/uYouPlus/blob/main/uYouPlus.xm#L452-L454) %hook YTPlayabilityResolutionUserActionUIController -- (void)showConfirmAlert { if (kNoContentWarning) [self confirmAlertDidPressConfirm]; } +- (void)showConfirmAlert { kNoContentWarning ? [self confirmAlertDidPressConfirm] : %orig; } %end // Classic Video Quality (https://github.com/PoomSmart/YTClassicVideoQuality) @@ -374,7 +377,10 @@ %hook YTPlayerViewController - (void)loadWithPlayerTransition:(id)arg1 playbackConfig:(id)arg2 { %orig; + if (kAutoFullscreen) [NSTimer scheduledTimerWithTimeInterval:0.75 target:self selector:@selector(autoFullscreen) userInfo:nil repeats:NO]; + if (kShortsToRegular) [NSTimer scheduledTimerWithTimeInterval:0.75 target:self selector:@selector(shortsToRegular) userInfo:nil repeats:NO]; + if (kDisableAutoCaptions) [NSTimer scheduledTimerWithTimeInterval:0.75 target:self selector:@selector(turnOffCaptions) userInfo:nil repeats:NO]; } %new @@ -382,6 +388,21 @@ YTWatchController *watchController = [self valueForKey:@"_UIDelegate"]; [watchController showFullScreen]; } + +%new +- (void)shortsToRegular { + if (self.contentVideoID != nil && [self.parentViewController isKindOfClass:NSClassFromString(@"YTShortsPlayerViewController")]) { + NSString *vidLink = [NSString stringWithFormat:@"vnd.youtube://%@", self.contentVideoID]; + if ([[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:vidLink]]) { + [[UIApplication sharedApplication] openURL:[NSURL URLWithString:vidLink] options:@{} completionHandler:nil]; + } + } +} + +%new +- (void)turnOffCaptions { + [self setActiveCaptionTrack:nil]; +} %end // Exit Fullscreen on Finish @@ -458,7 +479,7 @@ if ([cell respondsToSelector:@selector(node)]) { NSString *idToRemove = [[cell node] accessibilityIdentifier]; if ([idToRemove isEqualToString:@"statement_banner.view"] || - (([idToRemove isEqualToString:@"eml.shorts-grid"] || [idToRemove isEqualToString:@"eml.shorts-shelf"] || [idToRemove isEqualToString:@"eml.inline_shorts"]) && kHideShorts)) { + (([idToRemove isEqualToString:@"eml.shorts-grid"] || [idToRemove isEqualToString:@"eml.shorts-shelf"]) && kHideShorts)) { [self removeCellsAtIndexPath:indexPath]; } } @@ -487,6 +508,11 @@ - (BOOL)shouldEnablePlayerBarOnlyOnPause { return kShortsProgress ? NO : YES; } %end +%hook YTShortsPlayerViewController +- (BOOL)shouldAlwaysEnablePlayerBar { return kShortsProgress ? YES : NO; } +- (BOOL)shouldEnablePlayerBarOnlyOnPause { return kShortsProgress ? NO : YES; } +%end + %hook YTColdConfig - (BOOL)iosEnableVideoPlayerScrubber { return kShortsProgress ? YES : NO; } - (BOOL)mobileShortsTabInlined { return kShortsProgress ? YES : NO; } @@ -512,16 +538,7 @@ - (void)setViewCommentButton:(id)arg1 { if (!kHideShortsComments) %orig; } - (void)setRemixButton:(id)arg1 { if (!kHideShortsRemix) %orig; } - (void)setShareButton:(id)arg1 { if (!kHideShortsShare) %orig; } -- (void)layoutSubviews { - %orig; - - for (UIView *subview in self.subviews) { - if (kHideShortsAvatars && [NSStringFromClass([subview class]) isEqualToString:@"YTELMView"]) { - subview.hidden = YES; - break; - } - } -} +- (void)setNativePivotButton:(id)arg1 { if (!kHideShortsAvatars) %orig; } %end %hook YTReelHeaderView @@ -531,31 +548,200 @@ %hook YTReelTransparentStackView - (void)layoutSubviews { %orig; - if (kHideShortsSearch && self.subviews.count >= 3 && [self.subviews[0].accessibilityIdentifier isEqualToString:@"id.ui.generic.button"]) self.subviews[0].hidden = YES; - if (kHideShortsCamera && self.subviews.count >= 3 && [self.subviews[1].accessibilityIdentifier isEqualToString:@"id.ui.generic.button"]) self.subviews[1].hidden = YES; - if (kHideShortsMore && self.subviews.count >= 3 && [self.subviews[2].accessibilityIdentifier isEqualToString:@"id.ui.generic.button"]) self.subviews[2].hidden = YES; -} -%end -%hook YTReelWatchHeaderView -- (void)layoutSubviews { - %orig; - if (kHideShortsDescription && [self.subviews[2].accessibilityIdentifier isEqualToString:@"id.reels_smv_player_title_label"]) self.subviews[2].hidden = YES; - if (kHideShortsChannelName) self.subviews[self.subviews.count - 2].hidden = YES; - if (kHideShortsAudioTrack) self.subviews.lastObject.hidden = YES; - for (UIView *subview in self.subviews) { - if (kHideShortsPromoCards && [NSStringFromClass([subview class]) isEqualToString:@"YTBadge"]) { - subview.hidden = YES; + for (YTQTMButton *button in self.subviews) { + if ([button respondsToSelector:@selector(buttonRenderer)]) { + if (kHideShortsSearch && button.buttonRenderer.icon.iconType == 1045) button.hidden = YES; + if (kHideShortsCamera && button.buttonRenderer.icon.iconType == 1046) button.hidden = YES; + if (kHideShortsMore && button.buttonRenderer.icon.iconType == 1047) button.hidden = YES; } } } %end +%hook YTReelWatchHeaderView +- (void)setChannelBarElementRenderer:(id)renderer { if (!kHideShortsChannelName) %orig; } +- (void)setHeaderRenderer:(id)renderer { if (!kHideShortsDescription) %orig; } +- (void)setSoundMetadataElementRenderer:(id)renderer { if (!kHideShortsAudioTrack) %orig; } +- (void)setActionElement:(id)renderer { if (!kHideShortsPromoCards) %orig; } +- (void)setBadgeRenderer:(id)renderer { if (!kHideShortsThanks) %orig; } +- (void)setMultiFormatLinkElementRenderer:(id)renderer { if (!kHideShortsSource) %orig; } +%end + +static BOOL isOverlayShown = YES; + +%hook YTPlayerView +- (void)didPinch:(UIPinchGestureRecognizer *)gesture { + %orig; + + if (kPinchToFullscreenShorts && [self.playerViewDelegate.parentViewController isKindOfClass:NSClassFromString(@"YTShortsPlayerViewController")]) { + YTShortsPlayerViewController *shortsPlayerVC = (YTShortsPlayerViewController *)self.playerViewDelegate.parentViewController; + YTReelContentView *contentView = (YTReelContentView *)shortsPlayerVC.view; + + if (gesture.scale > 1) { + if (!kShortsOnlyMode) [shortsPlayerVC.navigationController.parentViewController hidePivotBar]; + + [UIView animateWithDuration:0.3 animations:^{ + contentView.playbackOverlay.alpha = 0; + isOverlayShown = contentView.playbackOverlay.alpha; + }]; + } else { + if (!kShortsOnlyMode) [shortsPlayerVC.navigationController.parentViewController showPivotBar]; + + [UIView animateWithDuration:0.3 animations:^{ + contentView.playbackOverlay.alpha = 1; + isOverlayShown = contentView.playbackOverlay.alpha; + }]; + } + } +} -%hook _ASDisplayView - (void)layoutSubviews { %orig; - if (kHideShortsThanks && [self.accessibilityIdentifier isEqualToString:@"id.elements.components.suggested_action"]) self.hidden = YES; + + if (kShortsOnlyMode && [self.playerViewDelegate.parentViewController isKindOfClass:NSClassFromString(@"YTShortsPlayerViewController")]) { + UILongPressGestureRecognizer *longPressGesture = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(turnShortsOnlyModeOff:)]; + longPressGesture.numberOfTouchesRequired = 2; + longPressGesture.minimumPressDuration = 0.5; + + [self addGestureRecognizer:longPressGesture]; + } +} + +%new +- (void)turnShortsOnlyModeOff:(UILongPressGestureRecognizer *)gesture { + if (gesture.state == UIGestureRecognizerStateBegan) { + NSString *path = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES).firstObject stringByAppendingPathComponent:@"YTLite.plist"]; + NSMutableDictionary *prefs = [NSMutableDictionary dictionaryWithContentsOfFile:path]; + + [prefs setObject:@NO forKey:@"shortsOnlyMode"]; + [prefs writeToFile:path atomically:NO]; + + CFNotificationCenterPostNotification(CFNotificationCenterGetDarwinNotifyCenter(), CFSTR("com.dvntm.ytlite.prefschanged"), NULL, NULL, YES); + + UIResponder *responder = self.nextResponder; + while (responder && ![responder isKindOfClass:[UIViewController class]]) responder = responder.nextResponder; + if (responder) [[%c(YTToastResponderEvent) eventWithMessage:LOC(@"ShortsModeTurnedOff") firstResponder:responder] send]; + + YTShortsPlayerViewController *shortsPlayerVC = (YTShortsPlayerViewController *)self.playerViewDelegate.parentViewController; + [shortsPlayerVC.navigationController.parentViewController performSelector:@selector(showPivotBar) withObject:nil afterDelay:1.0]; + + } +} +%end + +%hook YTReelWatchPlaybackOverlayView +- (void)layoutSubviews { + %orig; + + self.alpha = isOverlayShown; +} +%end + +%hook _ASDisplayView +- (void)setKeepalive_node:(id)arg1 { + %orig; + + NSString *description = [self description]; + if (kCopyPostText && [description containsString:@"ELMExpandableTextNode-View"]) { + UILongPressGestureRecognizer *longPress = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(copyText:)]; + longPress.minimumPressDuration = 0.3; + [self addGestureRecognizer:longPress]; + } + + if (kSavePostImage && [description containsString:@"YTImageZoomNode-View"]) { + UILongPressGestureRecognizer *longPress = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(saveImage:)]; + longPress.minimumPressDuration = 0.3; + [self addGestureRecognizer:longPress]; + } + + if (kSaveProfilePhoto && [description containsString:@"ELMImageNode-View"] && [description containsString:@"eml.avatar"]) { + UILongPressGestureRecognizer *longPress = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(savePFP:)]; + longPress.minimumPressDuration = 0.3; + [self addGestureRecognizer:longPress]; + } +} + +%new +- (void)savePFP:(UILongPressGestureRecognizer *)sender { + if (sender.state == UIGestureRecognizerStateBegan) { + + NSString *URLString = self.keepalive_node.URL.absoluteString; + if (URLString) { + NSRange sizeRange = [URLString rangeOfString:@"=s"]; + if (sizeRange.location != NSNotFound) { + NSRange dashRange = [URLString rangeOfString:@"-" options:0 range:NSMakeRange(sizeRange.location, URLString.length - sizeRange.location)]; + if (dashRange.location != NSNotFound) { + NSString *newURLString = [URLString stringByReplacingCharactersInRange:NSMakeRange(sizeRange.location + 2, dashRange.location - sizeRange.location - 2) withString:@"1024"]; + NSURL *PFPURL = [NSURL URLWithString:newURLString]; + + UIImage *image = [UIImage imageWithData:[NSData dataWithContentsOfURL:PFPURL]]; + if (image) { + UIImageWriteToSavedPhotosAlbum(image, nil, nil, nil); + + UIResponder *responder = self.nextResponder; + while (responder && ![responder isKindOfClass:[UIViewController class]]) responder = responder.nextResponder; + if (responder) [[%c(YTToastResponderEvent) eventWithMessage:LOC(@"Saved") firstResponder:responder] send]; + } + } + } + } + } +} + +%new +- (void)copyText:(UILongPressGestureRecognizer *)sender { + if (sender.state == UIGestureRecognizerStateBegan) { + UIPasteboard *pasteboard = [UIPasteboard generalPasteboard]; + pasteboard.string = self.accessibilityLabel; + + UIResponder *responder = self.nextResponder; + while (responder && ![responder isKindOfClass:[UIViewController class]]) responder = responder.nextResponder; + if (responder) [[%c(YTToastResponderEvent) eventWithMessage:LOC(@"Copied") firstResponder:responder] send]; + } +} + +%new +- (void)saveImage:(UILongPressGestureRecognizer *)sender { + if (sender.state == UIGestureRecognizerStateBegan) { + + NSURL *imageURL = self.keepalive_node.URL; + if (imageURL) { + NSString *URLString = imageURL.absoluteString; + + if (kFixAlbums && [URLString hasPrefix:@"https://yt3."]) { + URLString = [URLString stringByReplacingOccurrencesOfString:@"https://yt3." withString:@"https://yt4."]; + } + + NSURL *downloadURL = nil; + if ([URLString containsString:@"c-fcrop"]) { + NSRange croppedURL = [URLString rangeOfString:@"c-fcrop"]; + if (croppedURL.location != NSNotFound) { + NSString *newURL = [URLString stringByReplacingOccurrencesOfString:[URLString substringFromIndex:croppedURL.location] withString:@"nd-v1"]; + downloadURL = [NSURL URLWithString:newURL]; + } + } else { + downloadURL = imageURL; + } + + UIResponder *responder = self.nextResponder; + while (responder && ![responder isKindOfClass:[UIViewController class]]) responder = responder.nextResponder; + + NSURLSession *session = [NSURLSession sharedSession]; + [[session dataTaskWithURL:downloadURL completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) { + if (data) { + [[PHPhotoLibrary sharedPhotoLibrary] performChanges:^{ + PHAssetCreationRequest *request = [PHAssetCreationRequest creationRequestForAsset]; + [request addResourceWithType:PHAssetResourceTypePhoto data:data options:nil]; + } completionHandler:^(BOOL success, NSError *error) { + if (responder) [[%c(YTToastResponderEvent) eventWithMessage:success ? LOC(@"Saved") : [NSString stringWithFormat:LOC(@"%@: %@"), LOC(@"Error"), error.localizedDescription] firstResponder:responder] send]; + }]; + } else { + if (responder) [[%c(YTToastResponderEvent) eventWithMessage:[NSString stringWithFormat:LOC(@"%@: %@"), LOC(@"Error"), error.localizedDescription] firstResponder:responder] send]; + } + }] resume]; + } + } } %end @@ -565,59 +751,39 @@ NSMutableArray *items = [renderer itemsArray]; NSDictionary *identifiersToRemove = @{ - @"FEshorts": @(kRemoveShorts), - @"FEsubscriptions": @(kRemoveSubscriptions), - @"FEuploads": @(kRemoveUploads), - @"FElibrary": @(kRemoveLibrary) + @"FEshorts": @[@(kRemoveShorts), @(kReExplore)], + @"FEsubscriptions": @[@(kRemoveSubscriptions)], + @"FEuploads": @[@(kRemoveUploads)], + @"FElibrary": @[@(kRemoveLibrary)] }; for (NSString *identifier in identifiersToRemove) { - BOOL shouldRemoveItem = [identifiersToRemove[identifier] boolValue]; - NSUInteger index = [items indexOfObjectPassingTest:^BOOL(YTIPivotBarSupportedRenderers *renderers, NSUInteger idx, BOOL *stop) { + NSArray *removeValues = identifiersToRemove[identifier]; + BOOL shouldRemoveItem = [removeValues containsObject:@(YES)]; + + NSUInteger index = [items indexOfObjectPassingTest:^BOOL(YTIPivotBarSupportedRenderers *renderer, NSUInteger idx, BOOL *stop) { if ([identifier isEqualToString:@"FEuploads"]) { - return shouldRemoveItem && [[[renderers pivotBarIconOnlyItemRenderer] pivotIdentifier] isEqualToString:identifier]; + return shouldRemoveItem && [[[renderer pivotBarIconOnlyItemRenderer] pivotIdentifier] isEqualToString:identifier]; } else { - return shouldRemoveItem && [[[renderers pivotBarItemRenderer] pivotIdentifier] isEqualToString:identifier]; + return shouldRemoveItem && [[[renderer pivotBarItemRenderer] pivotIdentifier] isEqualToString:identifier]; } }]; if (index != NSNotFound) { [items removeObjectAtIndex:index]; } - } %orig; -} -%end - -// Replace Shorts with Explore tab (https://github.com/PoomSmart/YTReExplore) -static void replaceTab(YTIGuideResponse *response) { - NSMutableArray *renderers = [response itemsArray]; - for (YTIGuideResponseSupportedRenderers *guideRenderers in renderers) { - YTIPivotBarRenderer *pivotBarRenderer = [guideRenderers pivotBarRenderer]; - NSMutableArray *items = [pivotBarRenderer itemsArray]; - NSUInteger shortIndex = [items indexOfObjectPassingTest:^BOOL(YTIPivotBarSupportedRenderers *renderers, NSUInteger idx, BOOL *stop) { - return [[[renderers pivotBarItemRenderer] pivotIdentifier] isEqualToString:@"FEshorts"]; - }]; - if (shortIndex != NSNotFound) { - [items removeObjectAtIndex:shortIndex]; - NSUInteger exploreIndex = [items indexOfObjectPassingTest:^BOOL(YTIPivotBarSupportedRenderers *renderers, NSUInteger idx, BOOL *stop) { - return [[[renderers pivotBarItemRenderer] pivotIdentifier] isEqualToString:[%c(YTIBrowseRequest) browseIDForExploreTab]]; - }]; - if (exploreIndex == NSNotFound) { - YTIPivotBarSupportedRenderers *exploreTab = [%c(YTIPivotBarRenderer) pivotSupportedRenderersWithBrowseId:[%c(YTIBrowseRequest) browseIDForExploreTab] title:LOC(@"Explore") iconType:292]; - [items insertObject:exploreTab atIndex:1]; - } - } } -} + + NSUInteger exploreIndex = [items indexOfObjectPassingTest:^BOOL(YTIPivotBarSupportedRenderers *renderers, NSUInteger idx, BOOL *stop) { + return [[[renderers pivotBarItemRenderer] pivotIdentifier] isEqualToString:[%c(YTIBrowseRequest) browseIDForExploreTab]]; + }]; -%hook YTGuideServiceCoordinator -- (void)handleResponse:(YTIGuideResponse *)response withCompletion:(id)completion { - if (kReExplore) replaceTab(response); - %orig(response, completion); -} -- (void)handleResponse:(YTIGuideResponse *)response error:(id)error completion:(id)completion { - if (kReExplore) replaceTab(response); - %orig(response, error, completion); + if (exploreIndex == NSNotFound && (kReExplore || kAddExplore)) { + YTIPivotBarSupportedRenderers *exploreTab = [%c(YTIPivotBarRenderer) pivotSupportedRenderersWithBrowseId:[%c(YTIBrowseRequest) browseIDForExploreTab] title:LOC(@"Explore") iconType:292]; + [items insertObject:exploreTab atIndex:1]; + } + + %orig; } %end @@ -628,76 +794,13 @@ static void replaceTab(YTIGuideResponse *response) { %end // Hide Tab Labels -BOOL hasHomeBar = NO; -CGFloat pivotBarViewHeight; - -%hook YTPivotBarView -- (void)layoutSubviews { - %orig; - pivotBarViewHeight = self.frame.size.height; -} -%end - %hook YTPivotBarItemView -- (void)layoutSubviews { +- (void)setRenderer:(YTIPivotBarRenderer *)renderer { %orig; - CGFloat pivotBarAccessibilityControlWidth; - if (kRemoveLabels) { - for (UIView *subview in self.subviews) { - if ([subview isKindOfClass:objc_lookUpClass("YTPivotBarItemViewAccessibilityControl")]) { - pivotBarAccessibilityControlWidth = CGRectGetWidth(subview.frame); - break; - } - } - - for (UIView *subview in self.subviews) { - if ([subview isKindOfClass:objc_lookUpClass("YTQTMButton")]) { - for (UIView *buttonSubview in subview.subviews) { - if ([buttonSubview isKindOfClass:[UILabel class]]) { - [buttonSubview removeFromSuperview]; - break; - } - } - - UIImageView *imageView = nil; - for (UIView *buttonSubview in subview.subviews) { - if ([buttonSubview isKindOfClass:[UIImageView class]]) { - imageView = (UIImageView *)buttonSubview; - break; - } - } - - if (imageView) { - CGFloat imageViewHeight = imageView.image.size.height; - CGFloat imageViewWidth = imageView.image.size.width; - CGRect buttonFrame = subview.frame; - - if (@available(iOS 13.0, *)) { - UIWindowScene *mainWindowScene = (UIWindowScene *)[[[UIApplication sharedApplication] connectedScenes] anyObject]; - if (mainWindowScene) { - UIEdgeInsets safeAreaInsets = mainWindowScene.windows.firstObject.safeAreaInsets; - if (safeAreaInsets.bottom > 0) { - hasHomeBar = YES; - } - } - } - - CGFloat yOffset = hasHomeBar ? 15.0 : 0.0; - CGFloat xOffset = (pivotBarAccessibilityControlWidth - imageViewWidth) / 2.0; - - buttonFrame.origin.y = (pivotBarViewHeight - imageViewHeight - yOffset) / 2.0; - buttonFrame.origin.x = xOffset; - - buttonFrame.size.height = imageViewHeight; - buttonFrame.size.width = imageViewWidth; - - subview.frame = buttonFrame; - subview.bounds = CGRectMake(0, 0, imageViewWidth, imageViewHeight); - } - } - } + [self.navigationButton setTitle:@"" forState:UIControlStateNormal]; + [self.navigationButton setSizeWithPaddingAndInsets:NO]; } } %end @@ -706,21 +809,24 @@ CGFloat pivotBarViewHeight; BOOL isTabSelected = NO; %hook YTPivotBarViewController - (void)viewDidAppear:(BOOL)animated { - %orig(); + %orig; - if (!isTabSelected) { + if (!isTabSelected && !kShortsOnlyMode) { NSString *pivotIdentifier; switch (kPivotIndex) { case 0: pivotIdentifier = @"FEwhat_to_watch"; break; case 1: - pivotIdentifier = @"FEshorts"; + pivotIdentifier = @"FEexplore"; break; case 2: - pivotIdentifier = @"FEsubscriptions"; + pivotIdentifier = @"FEshorts"; break; case 3: + pivotIdentifier = @"FEsubscriptions"; + break; + case 4: pivotIdentifier = @"FElibrary"; break; default: @@ -729,6 +835,35 @@ BOOL isTabSelected = NO; [self selectItemWithPivotIdentifier:pivotIdentifier]; isTabSelected = YES; } + + if (kShortsOnlyMode) { + [self selectItemWithPivotIdentifier:@"FEshorts"]; + [self.parentViewController hidePivotBar]; + } +} +%end + +%hook YTTabsViewController +- (void)viewDidAppear:(BOOL)animated { + %orig; + + if (kShortsOnlyMode) { + [self.navigationController.parentViewController hidePivotBar]; + } +} +%end + +%hook YTAppViewController +- (void)showPivotBar { if (!kShortsOnlyMode) %orig;} ; +%end + +%hook YTReelWatchRootViewController +- (void)viewDidAppear:(BOOL)animated { + %orig; + + if (kShortsOnlyMode) { + [self.navigationController.parentViewController hidePivotBar]; + } } %end @@ -738,6 +873,35 @@ BOOL isTabSelected = NO; + (NSWritingDirection)_defaultWritingDirection { return kDisableRTL ? NSWritingDirectionLeftToRight : %orig; } %end +// Fix Albums For Russian Users +static NSURL *newCoverURL(NSURL *originalURL) { + NSDictionary *hostsToReplace = @{ + @"yt3.ggpht.com": @"yt4.ggpht.com", + @"yt3.googleusercontent.com": @"yt4.googleusercontent.com", + }; + + NSString *const replacement = hostsToReplace[originalURL.host]; + if (kFixAlbums && replacement) { + NSURLComponents *components = [NSURLComponents componentsWithURL:originalURL resolvingAgainstBaseURL:NO]; + components.host = replacement; + return components.URL; + } + return originalURL; +} + +%hook ELMImageDownloader +- (id)downloadImageWithURL:(id)arg1 targetSize:(CGSize)arg2 callbackQueue:(id)arg3 downloadProgress:(id)arg4 completion:(id)arg5 { + return %orig(newCoverURL(arg1), arg2, arg3, arg4, arg5); +} +%end + +// Not necessary but preferred +%hook ASBasicImageDownloader +- (id)downloadImageWithURL:(id)arg1 shouldRetry:(BOOL)arg2 callbackQueue:(id)arg3 downloadProgress:(id)arg4 completion:(id)arg5 { + return %orig(newCoverURL(arg1), arg2, arg3, arg4, arg5); +} +%end + static void reloadPrefs() { NSString *path = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES).firstObject stringByAppendingPathComponent:@"YTLite.plist"]; NSDictionary *prefs = [NSDictionary dictionaryWithContentsOfFile:path]; @@ -759,6 +923,7 @@ static void reloadPrefs() { kNoDarkBg = [prefs[@"noDarkBg"] boolValue] ?: NO; kEndScreenCards = [prefs[@"endScreenCards"] boolValue] ?: NO; kNoFullscreenActions = [prefs[@"noFullscreenActions"] boolValue] ?: NO; + kPersistentProgressBar = [prefs[@"persistentProgressBar"] boolValue] ?: NO; kNoRelatedVids = [prefs[@"noRelatedVids"] boolValue] ?: NO; kNoPromotionCards = [prefs[@"noPromotionCards"] boolValue] ?: NO; kNoWatermarks = [prefs[@"noWatermarks"] boolValue] ?: NO; @@ -766,6 +931,7 @@ static void reloadPrefs() { kPortraitFullscreen = [prefs[@"portraitFullscreen"] boolValue] ?: NO; kCopyWithTimestamp = [prefs[@"copyWithTimestamp"] boolValue] ?: NO; kDisableAutoplay = [prefs[@"disableAutoplay"] boolValue] ?: NO; + kDisableAutoCaptions = [prefs[@"disableAutoCaptions"] boolValue] ?: NO; kNoContentWarning = [prefs[@"noContentWarning"] boolValue] ?: NO; kClassicQuality = [prefs[@"classicQuality"] boolValue] ?: NO; kExtraSpeedOptions = [prefs[@"extraSpeedOptions"] boolValue] ?: NO; @@ -776,8 +942,11 @@ static void reloadPrefs() { kAutoFullscreen = [prefs[@"autoFullscreen"] boolValue] ?: NO; kExitFullscreen = [prefs[@"exitFullscreen"] boolValue] ?: NO; kNoDoubleTapToSeek = [prefs[@"noDoubleTapToSeek"] boolValue] ?: NO; + kShortsOnlyMode = [prefs[@"shortsOnlyMode"] boolValue] ?: NO; kHideShorts = [prefs[@"hideShorts"] boolValue] ?: NO; kShortsProgress = [prefs[@"shortsProgress"] boolValue] ?: NO; + kPinchToFullscreenShorts = [prefs[@"pinchToFullscreenShorts"] boolValue] ?: NO; + kShortsToRegular = [prefs[@"shortsToRegular"] boolValue] ?: NO; kResumeShorts = [prefs[@"resumeShorts"] boolValue] ?: NO; kHideShortsLogo = [prefs[@"hideShortsLogo"] boolValue] ?: NO; kHideShortsSearch = [prefs[@"hideShortsSearch"] boolValue] ?: NO; @@ -791,6 +960,7 @@ static void reloadPrefs() { kHideShortsShare = [prefs[@"hideShortsShare"] boolValue] ?: NO; kHideShortsAvatars = [prefs[@"hideShortsAvatars"] boolValue] ?: NO; kHideShortsThanks = [prefs[@"hideShortsThanks"] boolValue] ?: NO; + kHideShortsSource = [prefs[@"hideShortsSource"] boolValue] ?: NO; kHideShortsChannelName = [prefs[@"hideShortsChannelName"] boolValue] ?: NO; kHideShortsDescription = [prefs[@"hideShortsDescription"] boolValue] ?: NO; kHideShortsAudioTrack = [prefs[@"hideShortsAudioTrack"] boolValue] ?: NO; @@ -798,10 +968,15 @@ static void reloadPrefs() { kRemoveLabels = [prefs[@"removeLabels"] boolValue] ?: NO; kRemoveIndicators = [prefs[@"removeIndicators"] boolValue] ?: NO; kReExplore = [prefs[@"reExplore"] boolValue] ?: NO; + kAddExplore = [prefs[@"addExplore"] boolValue] ?: NO; kRemoveShorts = [prefs[@"removeShorts"] boolValue] ?: NO; kRemoveSubscriptions = [prefs[@"removeSubscriptions"] boolValue] ?: NO; kRemoveUploads = (prefs[@"removeUploads"] != nil) ? [prefs[@"removeUploads"] boolValue] : YES; kRemoveLibrary = [prefs[@"removeLibrary"] boolValue] ?: NO; + kCopyPostText = [prefs[@"copyPostText"] boolValue] ?: NO; + kSavePostImage = [prefs[@"savePostImage"] boolValue] ?: NO; + kSaveProfilePhoto = [prefs[@"savePostImage"] boolValue] ?: NO; + kFixAlbums = [prefs[@"fixAlbums"] boolValue] ?: NO; kRemovePlayNext = [prefs[@"removePlayNext"] boolValue] ?: NO; kNoContinueWatching = [prefs[@"noContinueWatching"] boolValue] ?: NO; kNoSearchHistory = [prefs[@"noSearchHistory"] boolValue] ?: NO; @@ -832,6 +1007,7 @@ static void reloadPrefs() { @"noDarkBg" : @(kNoDarkBg), @"endScreenCards" : @(kEndScreenCards), @"noFullscreenActions" : @(kNoFullscreenActions), + @"persistentProgressBar" : @(kPersistentProgressBar), @"noRelatedVids" : @(kNoRelatedVids), @"noPromotionCards" : @(kNoPromotionCards), @"noWatermarks" : @(kNoWatermarks), @@ -839,6 +1015,7 @@ static void reloadPrefs() { @"portraitFullscreen" : @(kPortraitFullscreen), @"copyWithTimestamp" : @(kCopyWithTimestamp), @"disableAutoplay" : @(kDisableAutoplay), + @"disableAutoCaptions" : @(kDisableAutoCaptions), @"noContentWarning" : @(kNoContentWarning), @"classicQuality" : @(kClassicQuality), @"extraSpeedOptions" : @(kExtraSpeedOptions), @@ -849,8 +1026,11 @@ static void reloadPrefs() { @"autoFullscreen" : @(kAutoFullscreen), @"exitFullscreen" : @(kExitFullscreen), @"noDoubleTapToSeek" : @(kNoDoubleTapToSeek), + @"shortsOnlyMode" : @(kShortsOnlyMode), @"hideShorts" : @(kHideShorts), @"shortsProgress" : @(kShortsProgress), + @"pinchToFullscreenShorts" : @(kPinchToFullscreenShorts), + @"shortsToRegular" : @(kShortsToRegular), @"resumeShorts" : @(kResumeShorts), @"hideShortsLogo" : @(kHideShortsLogo), @"hideShortsSearch" : @(kHideShortsSearch), @@ -864,6 +1044,7 @@ static void reloadPrefs() { @"hideShortsShare" : @(kHideShortsShare), @"hideShortsAvatars" : @(kHideShortsAvatars), @"hideShortsThanks" : @(kHideShortsThanks), + @"hideShortsSource" : @(kHideShortsSource), @"hideShortsChannelName" : @(kHideShortsChannelName), @"hideShortsDescription" : @(kHideShortsDescription), @"hideShortsAudioTrack" : @(kHideShortsAudioTrack), @@ -871,10 +1052,15 @@ static void reloadPrefs() { @"removeLabels" : @(kRemoveLabels), @"removeIndicators" : @(kRemoveIndicators), @"reExplore" : @(kReExplore), + @"addExplore" : @(kAddExplore), @"removeShorts" : @(kRemoveShorts), @"removeSubscriptions" : @(kRemoveSubscriptions), @"removeUploads" : @(kRemoveUploads), @"removeLibrary" : @(kRemoveLibrary), + @"copyPostText" : @(kCopyPostText), + @"savePostImage" : @(kSavePostImage), + @"saveProfilePhoto" : @(kSaveProfilePhoto), + @"fixAlbums" : @(kFixAlbums), @"removePlayNext" : @(kRemovePlayNext), @"noContinueWatching" : @(kNoContinueWatching), @"noSearchHistory" : @(kNoSearchHistory), @@ -896,6 +1082,15 @@ static void prefsChanged(CFNotificationCenterRef center, void *observer, CFStrin } %ctor { + NSString *path = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES).firstObject stringByAppendingPathComponent:@"YTLite.plist"]; + NSMutableDictionary *prefs = [NSMutableDictionary dictionaryWithContentsOfFile:path]; + + if ([prefs[@"shortsOnlyMode"] boolValue] && ([prefs[@"removeShorts"] boolValue] || [prefs[@"reExplore"] boolValue])) { + [prefs setObject:@NO forKey:@"removeShorts"]; + [prefs setObject:@NO forKey:@"reExplore"]; + [prefs writeToFile:path atomically:NO]; + } + CFNotificationCenterAddObserver(CFNotificationCenterGetDarwinNotifyCenter(), NULL, (CFNotificationCallback)prefsChanged, CFSTR("com.dvntm.ytlite.prefschanged"), NULL, CFNotificationSuspensionBehaviorCoalesce); reloadPrefs(); } diff --git a/layout/Library/Application Support/YTLite.bundle/en.lproj/Localizable.strings b/layout/Library/Application Support/YTLite.bundle/en.lproj/Localizable.strings index 855642f..1eb5e6a 100644 --- a/layout/Library/Application Support/YTLite.bundle/en.lproj/Localizable.strings +++ b/layout/Library/Application Support/YTLite.bundle/en.lproj/Localizable.strings @@ -37,6 +37,8 @@ "NoEndScreenCardsDesc" = "Hides End screens (thumbnails) at the end of videos."; "NoFullscreenActions" = "Disable fullscreen actions"; "NoFullscreenActionsDesc" = "Disables actions panel in fullscreen mode."; +"PersistentProgressBar" = "Persistent progress bar"; +"PersistentProgressBarDesc" = "Always shows progress bar in the player."; "NoRelatedVids" = "No related videos in overlay"; "NoRelatedVidsDesc" = "Removes related videos displayed in the overlay by swiping up."; "NoPromotionCards" = "Hide Paid Promotion cards"; @@ -53,6 +55,8 @@ "CopyWithTimestampDesc" = "Allows to copy timestamped link to the clipboard by pressing pause button."; "DisableAutoplay" = "Disable Autoplay videos"; "DisableAutoplayDesc" = "Prevents video playback after opening."; +"DisableAutoCaptions" = "Disable auto captions"; +"DisableAutoCaptionsDesc" = "Prevents automatic activation of captions."; "NoContentWarning" = "Skip content warning"; "NoContentWarningDesc" = "Skips sensitive content warning message."; "ClassicQuality" = "Classic video quality"; @@ -81,20 +85,28 @@ "RemoveIndicatorsDesc" = "Removes tab indicators."; "ReExplore" = "Replace Shorts tab with Explore tab"; "ReExploreDesc" = "Shows Explore tab instead of Shorts tab as on old YouTube versions."; +"AddExplore" = "Add Explore tab"; +"AddExploreDesc" = "Adds Explore tab to the Tab bar."; "HideShortsTab" = "Hide Shorts tab"; -"HideShortsTabDesc" = "Hides Shorts tab from the Tab bar"; +"HideShortsTabDesc" = "Hides Shorts tab from the Tab bar."; "HideSubscriptionsTab" = "Hide Subscriptions tab"; -"HideSubscriptionsTabDesc" = "Hides Subscriptions tab from the Tab bar"; +"HideSubscriptionsTabDesc" = "Hides Subscriptions tab from the Tab bar."; "HideUploadButton" = "Hide Upload button"; -"HideUploadButtonDesc" = "Hides Upload button from the Tab bar"; +"HideUploadButtonDesc" = "Hides Upload button from the Tab bar."; "HideLibraryTab" = "Hide Library tab"; -"HideLibraryTabDesc" = "Hides Library tab from the Tab bar"; +"HideLibraryTabDesc" = "Hides Library tab from the Tab bar."; "Shorts" = "Shorts"; +"ShortsOnlyMode" = "Shorts Only Mode"; +"ShortsOnlyModeDesc" = "Limits YouTube functionality to viewing Shorts only."; "HideShorts" = "Hide Shorts videos"; "HideShortsDesc" = "Hides Shorts videos from Homepage, Recommended etc. (Not applied to Watch history)"; "ShortsProgress" = "Enable progress bar"; "ShortsProgressDesc" = "Displays progress bar in the Shorts overlay."; +"PinchToFullscreenShorts" = "Pinch to Fullscreen"; +"PinchToFullscreenShortsDesc" = "Manages visibility of the overlay with pinch in and pinch out gestures, displaying Shorts in fullscreen mode."; +"ShortsToRegular" = "Shorts to regular videos"; +"ShortsToRegularDesc" = "Opens Shorts videos as regular videos."; "ResumeShorts" = "Don't start from Shorts tab"; "ResumeShortsDesc" = "Prevents starting from Shorts videos at the opening app, which happens if YouTube was closed while watching Shorts."; "HideShortsLogo" = "Hide Shorts logo"; @@ -121,6 +133,8 @@ "HideShortsAvatarsDesc" = "Hides profile picture in the bottom right corner."; "HideShortsThanks" = "Hide Superthanks button"; "HideShortsThanksDesc" = "Hides Superthanks (Donate) button from the Shorts overlay."; +"HideShortsSource" = "Hide Shorts Source"; +"HideShortsSourceDesc" = "Hides the Shorts sources under the channel name."; "HideShortsChannelName" = "Hide Channel name"; "HideShortsChannelNameDesc" = "Hides Channel name and Subscribe button from the Shorts overlay."; "HideShortsDescription" = "Hide Description"; @@ -129,6 +143,14 @@ "HideShortsAudioTrackDesc" = "Hides AudioTrack under Shorts description."; "Other" = "Other"; +"CopyPostText" = "Copy community posts text"; +"CopyPostTextDesc" = "Copies community posts text to the clipboard by long tap."; +"SavePostImage" = "Save image from community posts"; +"SavePostImageDesc" = "Saves community post image to the Photos app by long tap."; +"SaveProfilePhoto" = "Save profile picture"; +"SaveProfilePhotoDesc" = "Saves profile picture to the Photos app by long tap."; +"FixAlbums" = "Fix covers"; +"FixAlbumsDesc" = "Fixes the display of covers for users from Russia."; "RemovePlayNext" = "Remove \"Play next in queue\""; "RemovePlayNextDesc" = "Removes \"Play next in queue\" option from menu."; "NoContinueWatching" = "Remove \"Continue watching\""; @@ -168,5 +190,11 @@ "AdvancedModeReminder" = "Would you like to activate Advanced mode for YTLite?\n\nThis mode provides more than 50 additional options to customize and optimize your YouTube experience. You can enable/disable it later from Settings → %@ → %@ → %@."; "ResetSettings" = "Reset YTLite settings"; "ResetMessage" = "This option will reset YTLite settings to default and close YouTube.\n\nAre you sure you want to continue?"; +"ShortsOnlyWarning" = "Are you sure you want to activate this mode?\n\nIn this mode, you will only be able to watch Shorts videos and won't be able to do anything else.\n\nYou can disable Shorts Only Mode by long pressing with two fingers in the Shorts player."; +"ShortsModeTurnedOff" = "Shorts Only Mode has been turned off"; "Yes" = "Yes"; -"No" = "No"; \ No newline at end of file +"No" = "No"; + +"Copied" = "Copied to clipboard"; +"Saved" = "Saved to Photos"; +"Error" = "Error"; \ No newline at end of file diff --git a/layout/Library/Application Support/YTLite.bundle/es.lproj/Localizable.strings b/layout/Library/Application Support/YTLite.bundle/es.lproj/Localizable.strings index 3f70775..d28cf21 100644 --- a/layout/Library/Application Support/YTLite.bundle/es.lproj/Localizable.strings +++ b/layout/Library/Application Support/YTLite.bundle/es.lproj/Localizable.strings @@ -37,6 +37,8 @@ "NoEndScreenCardsDesc" = "Oculta las tarjetas emergentes de fin de pantalla (miniaturas) al final de los vídeos."; "NoFullscreenActions" = "Desactivar acciones en pantalla completa"; "NoFullscreenActionsDesc" = "Desactiva el panel de acciones en el modo de pantalla completa."; +"PersistentProgressBar" = "Persistent progress bar"; +"PersistentProgressBarDesc" = "Always shows progress bar in the player."; "NoRelatedVids" = "Sin vídeos relacionados en la superposición"; "NoRelatedVidsDesc" = "Elimina los vídeos relacionados que se muestran en la superposición al deslizar hacia arriba."; "NoPromotionCards" = "Ocultar tarjetas de promoción pagada"; @@ -53,6 +55,8 @@ "CopyWithTimestampDesc" = "Permite copiar el enlace con marca de tiempo en el portapapeles pulsando el botón de pausa."; "DisableAutoplay" = "Desactivar reproducción automática"; "DisableAutoplayDesc" = "Evita la reproducción automática de vídeos después de abrirlos."; +"DisableAutoCaptions" = "Disable auto captions"; +"DisableAutoCaptionsDesc" = "Prevents automatic activation of captions."; "NoContentWarning" = "Omitir advertencia de contenido"; "NoContentWarningDesc" = "Omite el mensaje de advertencia de contenido sensible."; "ClassicQuality" = "Calidad de vídeo clásica"; @@ -81,6 +85,8 @@ "RemoveIndicatorsDesc" = "Elimina los indicadores de pestaña."; "ReExplore" = "Reemplazar pestaña Shorts con pestaña Explorar"; "ReExploreDesc" = "Muestra la pestaña Explorar en lugar de la pestaña Shorts como en versiones antiguas de YouTube."; +"AddExplore" = "Add Explore tab"; +"AddExploreDesc" = "Adds Explore tab to the Tab bar."; "HideShortsTab" = "Ocultar pestaña Shorts"; "HideShortsTabDesc" = "Oculta la pestaña Shorts de la barra de pestañas."; "HideSubscriptionsTab" = "Ocultar pestaña Suscripciones"; @@ -91,10 +97,16 @@ "HideLibraryTabDesc" = "Oculta la pestaña Biblioteca de la barra de pestañas."; "Shorts" = "Shorts"; +"ShortsOnlyMode" = "Shorts Only Mode"; +"ShortsOnlyModeDesc" = "Limits YouTube functionality to viewing Shorts only."; "HideShorts" = "Ocultar vídeos Shorts"; "HideShortsDesc" = "Oculta los vídeos Shorts de la página de inicio, Recomendados, etc. (No se aplica al historial de reproducciones)"; "ShortsProgress" = "Activar barra de progreso"; "ShortsProgressDesc" = "Muestra una barra de progreso en la superposición de Shorts."; +"PinchToFullscreenShorts" = "Pinch to Fullscreen"; +"PinchToFullscreenShortsDesc" = "Manages visibility of the overlay with pinch in and pinch out gestures, displaying Shorts in fullscreen mode."; +"ShortsToRegular" = "Shorts to regular videos"; +"ShortsToRegularDesc" = "Opens Shorts videos as regular videos."; "ResumeShorts" = "No empezar desde la pestaña Shorts"; "ResumeShortsDesc" = "Evita empezar desde los vídeos Shorts al abrir la aplicación, lo cual ocurre si YouTube se cerró mientras se veían Shorts."; "HideShortsLogo" = "Ocultar el logo de Shorts"; @@ -121,6 +133,8 @@ "HideShortsAvatarsDesc" = "Oculta la imagen de perfil en la esquina inferior derecha."; "HideShortsThanks" = "Ocultar botón de Supergracias"; "HideShortsThanksDesc" = "Oculta el botón de Supergracias (Donar) en la superposición de Shorts."; +"HideShortsSource" = "Hide Shorts Source"; +"HideShortsSourceDesc" = "Hides the Shorts sources under the channel name."; "HideShortsChannelName" = "Ocultar nombre del canal"; "HideShortsChannelNameDesc" = "Oculta el nombre del canal y el botón de Suscribirse en la superposición de Shorts."; "HideShortsDescription" = "Ocultar descripción"; @@ -129,6 +143,14 @@ "HideShortsAudioTrackDesc" = "Oculta la pista de audio debajo de la descripción de Shorts."; "Other" = "Otro"; +"CopyPostText" = "Copy community posts text"; +"CopyPostTextDesc" = "Copies community posts text to the clipboard by long tap."; +"SavePostImage" = "Save community posts image"; +"SavePostImageDesc" = "Saves community posts image to the Photos app by long tap."; +"SaveProfilePhoto" = "Save profile picture"; +"SaveProfilePhotoDesc" = "Saves profile picture to the Photos app by long tap."; +"FixAlbums" = "Fix covers"; +"FixAlbumsDesc" = "Fixes the display of covers for users from Russia."; "RemovePlayNext" = "Eliminar \"Reproducir siguiente en cola\""; "RemovePlayNextDesc" = "Elimina la opción \"Reproducir siguiente en cola\" del menú."; "NoContinueWatching" = "Eliminar \"Continuar viendo\""; @@ -168,5 +190,11 @@ "AdvancedModeReminder" = "¿Desea activar el modo Avanzado para YTLite?\n\nEste modo ofrece más de 50 opciones adicionales para personalizar y optimizar tu experiencia en YouTube. Puedes activarlo/desactivarlo más tarde desde Ajustes → %@ → %@ → %@."; "ResetSettings" = "Restablecer configuración de YTLite"; "ResetMessage" = "Esta opción restablecerá la configuración de YTLite a los valores predeterminados y cerrará YouTube.\n\n¿Estás seguro de que deseas continuar?"; +"ShortsOnlyWarning" = "Are you sure you want to activate this mode?\n\nIn this mode, you will only be able to watch Shorts videos and won't be able to do anything else.\n\nYou can disable Shorts Only Mode by long pressing with two fingers in the Shorts player."; +"ShortsModeTurnedOff" = "Shorts Only Mode has been turned off"; "Yes" = "Sí"; "No" = "No"; + +"Copied" = "Copied to clipboard"; +"Saved" = "Saved to Photos"; +"Error" = "Error"; \ No newline at end of file diff --git a/layout/Library/Application Support/YTLite.bundle/fr.lproj/Localizable.strings b/layout/Library/Application Support/YTLite.bundle/fr.lproj/Localizable.strings index d30e1a2..88b5d0a 100644 --- a/layout/Library/Application Support/YTLite.bundle/fr.lproj/Localizable.strings +++ b/layout/Library/Application Support/YTLite.bundle/fr.lproj/Localizable.strings @@ -37,6 +37,8 @@ "NoEndScreenCardsDesc" = "Masque les cartes de fin d'écran (vignettes) à la fin des vidéos."; "NoFullscreenActions" = "Désactiver les actions en plein écran"; "NoFullscreenActionsDesc" = "Désactive le panneau d'actions en mode plein écran."; +"PersistentProgressBar" = "Persistent progress bar"; +"PersistentProgressBarDesc" = "Always shows progress bar in the player."; "NoRelatedVids" = "Pas de vidéos associées dans l'overlay"; "NoRelatedVidsDesc" = "Supprime les vidéos associées affichées dans l'overlay en faisant glisser vers le haut."; "NoPromotionCards" = "Masquer les cartes de promotion payante"; @@ -53,6 +55,8 @@ "CopyWithTimestampDesc" = "Allows to copy timestamped link to the clipboard by pressing pause button."; "DisableAutoplay" = "Désactiver la lecture automatique des vidéos"; "DisableAutoplayDesc" = "Empêche la lecture des vidéos après ouverture."; +"DisableAutoCaptions" = "Disable auto captions"; +"DisableAutoCaptionsDesc" = "Prevents automatic activation of captions."; "NoContentWarning" = "Passer l'avertissement de contenu"; "NoContentWarningDesc" = "Ignore le message d'avertissement de contenu sensible."; "ClassicQuality" = "Qualité vidéo classique"; @@ -81,6 +85,8 @@ "RemoveIndicatorsDesc" = "Removes tab indicators."; "ReExplore" = "Remplacer l'onglet Shorts par l'onglet Explorer"; "ReExploreDesc" = "Affiche l'onglet Explorer à la place de l'onglet Shorts comme dans les anciennes versions de YouTube."; +"AddExplore" = "Add Explore tab"; +"AddExploreDesc" = "Adds Explore tab to the Tab bar."; "HideShortsTab" = "Masquer l'onglet Shorts"; "HideShortsTabDesc" = "Masque l'onglet Shorts de la barre d'onglets"; "HideSubscriptionsTab" = "Masquer l'onglet Abonnements"; @@ -91,10 +97,16 @@ "HideLibraryTabDesc" = "Masque l'onglet Bibliothèque de la barre d'onglets"; "Shorts" = "Shorts"; +"ShortsOnlyMode" = "Shorts Only Mode"; +"ShortsOnlyModeDesc" = "Limits YouTube functionality to viewing Shorts only."; "HideShorts" = "Masquer les vidéos Shorts"; "HideShortsDesc" = "Masque les vidéos Shorts de la page d'accueil, des recommandations, etc. (Non appliqué à l'historique de visionnage)"; "ShortsProgress" = "Activer la barre de progression"; "ShortsProgressDesc" = "Affiche la barre de progression dans l'overlay Shorts."; +"PinchToFullscreenShorts" = "Pinch to Fullscreen"; +"PinchToFullscreenShortsDesc" = "Manages visibility of the overlay with pinch in and pinch out gestures, displaying Shorts in fullscreen mode."; +"ShortsToRegular" = "Shorts to regular videos"; +"ShortsToRegularDesc" = "Opens Shorts videos as regular videos."; "ResumeShorts" = "Ne pas démarrer depuis l'onglet Shorts"; "ResumeShortsDesc" = "Empêche de démarrer depuis les vidéos Shorts lors de l'ouverture de l'application, ce qui se produit si YouTube était fermé pendant la lecture des Shorts."; "HideShortsLogo" = "Masquer le logo Shorts"; @@ -121,6 +133,8 @@ "HideShortsAvatarsDesc" = "Masque la photo de profil dans le coin inférieur droit."; "HideShortsThanks" = "Masquer le bouton Superthanks"; "HideShortsThanksDesc" = "Masque le bouton Superthanks (Don) de l'overlay Shorts."; +"HideShortsSource" = "Hide Shorts Source"; +"HideShortsSourceDesc" = "Hides the Shorts sources under the channel name."; "HideShortsChannelName" = "Masquer le nom de la chaîne"; "HideShortsChannelNameDesc" = "Masque le nom de la chaîne et le bouton S'abonner de l'overlay Shorts."; "HideShortsDescription" = "Masquer la description"; @@ -129,6 +143,14 @@ "HideShortsAudioTrackDesc" = "Masque la piste audio sous la description des Shorts."; "Other" = "Autre"; +"CopyPostText" = "Copy community posts text"; +"CopyPostTextDesc" = "Copies community posts text to the clipboard by long tap."; +"SavePostImage" = "Save community posts image"; +"SavePostImageDesc" = "Saves community posts image to the Photos app by long tap."; +"SaveProfilePhoto" = "Save profile picture"; +"SaveProfilePhotoDesc" = "Saves profile picture to the Photos app by long tap."; +"FixAlbums" = "Fix covers"; +"FixAlbumsDesc" = "Fixes the display of covers for users from Russia."; "RemovePlayNext" = "Supprimer \"Placer en première position dans la file d'attente\""; "RemovePlayNextDesc" = "Supprime l'option \"Placer en première position dans la file d'attente\" du menu."; "NoContinueWatching" = "Supprimer \"Continuer à regarder\""; @@ -168,5 +190,11 @@ "AdvancedModeReminder" = "Voulez-vous activer le mode avancé pour YTLite ?\n\nCe mode offre plus de 50 options supplémentaires pour personnaliser et optimiser votre expérience YouTube. Vous pouvez l'activer/désactiver ultérieurement depuis Paramètres → %@ → %@ → %@."; "ResetSettings" = "Réinitialiser les paramètres YTLite"; "ResetMessage" = "Cette option réinitialisera les paramètres YTLite par défaut et fermera YouTube.\n\nÊtes-vous sûr de vouloir continuer ?"; +"ShortsOnlyWarning" = "Are you sure you want to activate this mode?\n\nIn this mode, you will only be able to watch Shorts videos and won't be able to do anything else.\n\nYou can disable Shorts Only Mode by long pressing with two fingers in the Shorts player."; +"ShortsModeTurnedOff" = "Shorts Only Mode has been turned off"; "Yes" = "Oui"; -"No" = "Non"; \ No newline at end of file +"No" = "Non"; + +"Copied" = "Copied to clipboard"; +"Saved" = "Saved to Photos"; +"Error" = "Error"; \ No newline at end of file diff --git a/layout/Library/Application Support/YTLite.bundle/ja.lproj/Localizable.strings b/layout/Library/Application Support/YTLite.bundle/ja.lproj/Localizable.strings index b20e9dd..367341f 100644 --- a/layout/Library/Application Support/YTLite.bundle/ja.lproj/Localizable.strings +++ b/layout/Library/Application Support/YTLite.bundle/ja.lproj/Localizable.strings @@ -37,6 +37,8 @@ "NoEndScreenCardsDesc" = "動画の終わりに表示されるエンドスクリーン(サムネイル)を非表示にします"; "NoFullscreenActions" = "フルスクリーンアクションを無効化"; "NoFullscreenActionsDesc" = "フルスクリーンモードでのアクションパネルを無効にします"; +"PersistentProgressBar" = "Persistent progress bar"; +"PersistentProgressBarDesc" = "Always shows progress bar in the player."; "NoRelatedVids" = "オーバーレイの関連動画を非表示"; "NoRelatedVidsDesc" = "スワイプアップでオーバーレイに表示される関連動画を非表示にします"; "NoPromotionCards" = "有料プロモーションカードを非表示"; @@ -53,6 +55,8 @@ "CopyWithTimestampDesc" = "一時停止ボタンを押すことで、タイムスタンプ付きリンクをクリップボードにコピーできます"; "DisableAutoplay" = "自動再生を無効化"; "DisableAutoplayDesc" = "アプリを開いた後に動画の自動再生を防止します"; +"DisableAutoCaptions" = "Disable auto captions"; +"DisableAutoCaptionsDesc" = "Prevents automatic activation of captions."; "NoContentWarning" = "コンテンツ警告をスキップ"; "NoContentWarningDesc" = "不適切なコンテンツの警告メッセージをスキップします"; "ClassicQuality" = "クラシックなビデオ品質"; @@ -81,6 +85,8 @@ "RemoveIndicatorsDesc" = "タブインジケーターを削除します"; "ReExplore" = "ショートタブを探索タブに置き換え"; "ReExploreDesc" = "古いYouTubeバージョンのように、ショートタブの代わりに探索タブを表示します"; +"AddExplore" = "Add Explore tab"; +"AddExploreDesc" = "Adds Explore tab to the Tab bar."; "HideShortsTab" = "ショートタブを非表示"; "HideShortsTabDesc" = "タブバーからショートタブを非表示にします"; "HideSubscriptionsTab" = "登録チャンネルタブを非表示"; @@ -91,10 +97,16 @@ "HideLibraryTabDesc" = "タブバーからライブラリタブを非表示にします"; "Shorts" = "ショート"; +"ShortsOnlyMode" = "Shorts Only Mode"; +"ShortsOnlyModeDesc" = "Limits YouTube functionality to viewing Shorts only."; "HideShorts" = "ショート動画を非表示"; "HideShortsDesc" = "ホーム, おすすめなどからショート動画を非表示にします(視聴履歴には適用されません)"; "ShortsProgress" = "プログレスバーを有効化"; "ShortsProgressDesc" = "ショートオーバーレイにプログレスバーを表示します"; +"PinchToFullscreenShorts" = "Pinch to Fullscreen"; +"PinchToFullscreenShortsDesc" = "Manages visibility of the overlay with pinch in and pinch out gestures, displaying Shorts in fullscreen mode."; +"ShortsToRegular" = "Shorts to regular videos"; +"ShortsToRegularDesc" = "Opens Shorts videos as regular videos."; "ResumeShorts" = "ショートタブからの再開を防止"; "ResumeShortsDesc" = "ショートを視聴中にアプリを閉じた場合でも、ショートからの再開を防止します"; "HideShortsLogo" = "ショートロゴを非表示"; @@ -121,6 +133,8 @@ "HideShortsAvatarsDesc" = "右下隅のプロフィール画像を非表示にします"; "HideShortsThanks" = "スーパーサンクスボタンを非表示"; "HideShortsThanksDesc" = "ショートオーバーレイからスーパーサンクス(寄付)ボタンを非表示にします"; +"HideShortsSource" = "Hide Shorts Source"; +"HideShortsSourceDesc" = "Hides the Shorts sources under the channel name."; "HideShortsChannelName" = "チャンネル名を非表示"; "HideShortsChannelNameDesc" = "ショートオーバーレイからチャンネル名とチャンネル登録ボタンを非表示にします"; "HideShortsDescription" = "説明を非表示"; @@ -129,6 +143,14 @@ "HideShortsAudioTrackDesc" = "ショートの説明の下に表示されるオーディオトラックを非表示にします"; "Other" = "その他"; +"CopyPostText" = "Copy community posts text"; +"CopyPostTextDesc" = "Copies community posts text to the clipboard by long tap."; +"SavePostImage" = "Save community posts image"; +"SavePostImageDesc" = "Saves community posts image to the Photos app by long tap."; +"SaveProfilePhoto" = "Save profile picture"; +"SaveProfilePhotoDesc" = "Saves profile picture to the Photos app by long tap."; +"FixAlbums" = "Fix covers"; +"FixAlbumsDesc" = "Fixes the display of covers for users from Russia."; "RemovePlayNext" = "\"次に再生\"を削除"; "RemovePlayNextDesc" = "メニューから\"次に再生\"オプションを削除します"; "NoContinueWatching" = "\"続きを見る\"を削除"; @@ -168,5 +190,11 @@ "AdvancedModeReminder" = "YTLiteでアドバンスモードを有効にしますか?\n\nこのモードでは50以上の追加オプションを使用してYouTubeのカスタマイズと最適化が可能です。後で、設定 → %@ → %@ → %@から変更できます"; "ResetSettings" = "YTLiteの設定をリセット"; "ResetMessage" = "このオプションを選択するとYTLiteの設定がデフォルトにリセットされ、アプリが終了します。\n\n続行してもよろしいですか?"; +"ShortsOnlyWarning" = "Are you sure you want to activate this mode?\n\nIn this mode, you will only be able to watch Shorts videos and won't be able to do anything else.\n\nYou can disable Shorts Only Mode by long pressing with two fingers in the Shorts player."; +"ShortsModeTurnedOff" = "Shorts Only Mode has been turned off"; "Yes" = "はい"; "No" = "いいえ"; + +"Copied" = "Copied to clipboard"; +"Saved" = "Saved to Photos"; +"Error" = "Error"; \ No newline at end of file diff --git a/layout/Library/Application Support/YTLite.bundle/ru.lproj/Localizable.strings b/layout/Library/Application Support/YTLite.bundle/ru.lproj/Localizable.strings index 43927ad..0ca8ef3 100644 --- a/layout/Library/Application Support/YTLite.bundle/ru.lproj/Localizable.strings +++ b/layout/Library/Application Support/YTLite.bundle/ru.lproj/Localizable.strings @@ -37,6 +37,8 @@ "NoEndScreenCardsDesc" = "Скрывает эскизы, отображаемые по окончанию видеоролика."; "NoFullscreenActions" = "Отключить панель действий"; "NoFullscreenActionsDesc" = "Отключает панель действий, отображающуюся под прогресс-баром плеера."; +"PersistentProgressBar" = "Всегда отображать прогресс-бар"; +"PersistentProgressBarDesc" = "Всегда отображает прогресс-бар внутри плеера."; "NoRelatedVids" = "Скрыть рекомендации в оверлее"; "NoRelatedVidsDesc" = "Скрывает рекомендации, отображаемые по свайпу вверх в плеере."; "NoPromotionCards" = "Скрыть сообщение «Есть реклама»"; @@ -49,10 +51,12 @@ "MiniplayerDesc" = "Принудительно активирует миниплеер для видео, в которых изначально не был предназначен (например, видеоролики для детей)."; "PortraitFullscreen" = "Портретный полноэкранный режим"; "PortraitFullscreenDesc" = "Активирует поддержку портретного полноэкранного режима."; -"CopyWithTimestamp" = "Ссылки с временной отметкой"; +"CopyWithTimestamp" = "Ссылки с временными отметками"; "CopyWithTimestampDesc" = "Позволяет скопировать ссылку на видео с временной отметкой в буфер обмена нажатием на кнопку паузы."; "DisableAutoplay" = "Запретить автовоспроизведение"; "DisableAutoplayDesc" = "Принудительно запрещает автовоспроизведение видео при его открытии."; +"DisableAutoCaptions" = "Запретить автоматические субтитры"; +"DisableAutoCaptionsDesc" = "Отключает включенные по умолчанию субтитры"; "NoContentWarning" = "Пропускать предупреждения"; "NoContentWarningDesc" = "Пропускает предупреждения, всплывающие перед воспроизведением некоторого контента."; "ClassicQuality" = "Классический выбор качества"; @@ -81,6 +85,8 @@ "RemoveIndicatorsDesc" = "Скрывает индикаторы вкладок."; "ReExplore" = "Вкладка «Навигация» вместо «Shorts»"; "ReExploreDesc" = "Заменяет вкладку «Shorts» на привычную нам «Навигацию»."; +"AddExplore" = "Добавить вкладку «Навигация»"; +"AddExploreDesc" = "Добавляет вкладку «Навигация» в панель вкладок."; "HideShortsTab" = "Скрыть «Shorts»"; "HideShortsTabDesc" = "Скрывает вкладку «Shorts» с панели вкладок."; "HideSubscriptionsTab" = "Скрыть «Подписки»"; @@ -91,10 +97,16 @@ "HideLibraryTabDesc" = "Скрывает вкладку «Библиотека» с панели вкладок."; "Shorts" = "Настройки Shorts"; +"ShortsOnlyMode" = "Режим Shorts"; +"ShortsOnlyModeDesc" = "Ограничивает функциональность YouTube до отображения видеороликов Shorts"; "HideShorts" = "Скрыть видеоролики Shorts"; "HideShortsDesc" = "Скрывает видеоролики, помеченные как Shorts с Главного экрана, Рекомендаций и т.д. (Не применяется к истории просмотров)"; "ShortsProgress" = "Показывать прогресс-бар"; "ShortsProgressDesc" = "Отображает прогресс-бар в плеере Shorts."; +"PinchToFullscreenShorts" = "Полноэкранный режим щипком"; +"PinchToFullscreenShortsDesc" = "Скрывает панель вкладок, тем самым отображает Shorts на весь экран."; +"ShortsToRegular" = "Shorts как обычные видео"; +"ShortsToRegularDesc" = "Воспроизводит видеоролики Shorts в обычном проигрывателе."; "ResumeShorts" = "Всегда запускать с Главной страницы"; "ResumeShortsDesc" = "Предотвращает запуск видеороликов Shorts при открытии YouTube. Это происходит, если закрыть YouTube при просмотре Shorts."; "HideShortsLogo" = "Скрыть логотип Shorts"; @@ -121,6 +133,8 @@ "HideShortsAvatarsDesc" = "Скрывает аватарку пользователя в правом нижнем углу."; "HideShortsThanks" = "Скрыть «Суперспасибо»"; "HideShortsThanksDesc" = "Скрывает кнопку отправки доната (суперспасибо) с плеера Shorts."; +"HideShortsSource" = "Скрыть источник Shorts"; +"HideShortsSourceDesc" = "Скрывает источники Shorts под названием канала."; "HideShortsChannelName" = "Скрыть название канала"; "HideShortsChannelNameDesc" = "Скрывает название канала и кнопку «Подписаться» с плеера Shorts."; "HideShortsDescription" = "Скрыть описание ролика"; @@ -129,6 +143,14 @@ "HideShortsAudioTrackDesc" = "Скрывает информацию об аудиодорожке в нижней части плеера."; "Other" = "Другие настройки"; +"CopyPostText" = "Копировать текст постов"; +"CopyPostTextDesc" = "Копирует текст постов в буфер обмена долгим нажатием."; +"SavePostImage" = "Сохранять изображения постов"; +"SavePostImageDesc" = "Сохраняет изображения постов в «Фото» долгим нажатием по ним."; +"SaveProfilePhoto" = "Сохранять фото профиля"; +"SaveProfilePhotoDesc" = "Сохраняет фото профиля в «Фото» долгим нажатием по нему."; +"FixAlbums" = "Исправить отображение обложек"; +"FixAlbumsDesc" = "Исправляет отображение обложек в том случае, если вы из России."; "RemovePlayNext" = "Убрать «Добавить в начало очереди»"; "RemovePlayNextDesc" = "Убирает опцию «Добавить в начало очереди» из меню видео."; "NoContinueWatching" = "Отключить «Продолжить просмотр»"; @@ -168,5 +190,11 @@ "AdvancedModeReminder" = "Хотите ли вы активировать расширенный режим настроек YTLite?\n\nДанный режим добавляет более 50 опций для тонкой настройки YouTube. Вы всегда сможете включить/отключить расширенный режим перейдя в Настройки → %@ → %@ → %@."; "ResetSettings" = "Сбросить настройки твика"; "ResetMessage" = "Данное действие сбросит настройки YTLite к значениям по умолчанию и закроет YouTube.\n\nУверены, что хотите продолжить?"; +"ShortsOnlyWarning" = "Вы уверены, что хотите активировать данный режим?\n\nВ данном режиме вы не сможете ничего делать, кроме как смотреть видеоролики Shorts.\n\nРежим Shorts можно будет отключить зажав в плеере двумя пальцами."; +"ShortsModeTurnedOff" = "Режим Shorts был отключен"; "Yes" = "Да"; "No" = "Нет"; + +"Copied" = "Скопировано в буфер обмена"; +"Saved" = "Сохранено в Фото"; +"Error" = "Ошибка"; \ No newline at end of file diff --git a/layout/Library/Application Support/YTLite.bundle/zh-Hans.lproj/Localizable.strings b/layout/Library/Application Support/YTLite.bundle/zh-Hans.lproj/Localizable.strings index 546ee82..39d0039 100644 --- a/layout/Library/Application Support/YTLite.bundle/zh-Hans.lproj/Localizable.strings +++ b/layout/Library/Application Support/YTLite.bundle/zh-Hans.lproj/Localizable.strings @@ -37,6 +37,8 @@ "NoEndScreenCardsDesc" = "隐藏视频结尾处的片尾屏幕（缩略图）。"; "NoFullscreenActions" = "禁用全屏操作"; "NoFullscreenActionsDesc" = "在全屏模式下禁用操作面板。"; +"PersistentProgressBar" = "Persistent progress bar"; +"PersistentProgressBarDesc" = "Always shows progress bar in the player."; "NoRelatedVids" = "没有相关视频"; "NoRelatedVidsDesc" = "通过向上滑动删除播放界面中显示的相关视频。"; "NoPromotionCards" = "隐藏付费"; @@ -53,6 +55,8 @@ "CopyWithTimestampDesc" = "允许通过按下暂停按钮将带有时间戳的链接复制到剪贴板。"; "DisableAutoplay" = "禁用自动播放视频"; "DisableAutoplayDesc" = "打开后防止视频自动播放。"; +"DisableAutoCaptions" = "Disable auto captions"; +"DisableAutoCaptionsDesc" = "Prevents automatic activation of captions."; "NoContentWarning" = "跳过内容警告"; "NoContentWarningDesc" = "跳过敏感内容警告消息。"; "ClassicQuality" = "经典视频质量"; @@ -81,6 +85,8 @@ "RemoveIndicatorsDesc" = "删除选项卡“红点”指示。"; "ReExplore" = "“短视频”替换为“探索”"; "ReExploreDesc" = "在旧版本 YouTube 中将“短视频”选项卡替换为“探索”。"; +"AddExplore" = "Add Explore tab"; +"AddExploreDesc" = "Adds Explore tab to the Tab bar."; "HideShortsTab" = "隐藏短视频"; "HideShortsTabDesc" = "从选项卡栏中隐藏短视频。"; "HideSubscriptionsTab" = "隐藏订阅内容"; @@ -91,10 +97,16 @@ "HideLibraryTabDesc" = "从选项卡栏中隐藏媒体库。"; "Shorts" = "短视频"; +"ShortsOnlyMode" = "Shorts Only Mode"; +"ShortsOnlyModeDesc" = "Limits YouTube functionality to viewing Shorts only."; "HideShorts" = "隐藏短视频"; "HideShortsDesc" = "从首页、推荐等隐藏短视频（不适用于观看历史记录）。"; "ShortsProgress" = "启用进度条"; "ShortsProgressDesc" = "在短视频播放器中显示进度条。"; +"PinchToFullscreenShorts" = "Pinch to Fullscreen"; +"PinchToFullscreenShortsDesc" = "Manages visibility of the overlay with pinch in and pinch out gestures, displaying Shorts in fullscreen mode."; +"ShortsToRegular" = "Shorts to regular videos"; +"ShortsToRegularDesc" = "Opens Shorts videos as regular videos."; "ResumeShorts" = "不要从短视频开始"; "ResumeShortsDesc" = "防止在打开应用程序时首先启动短视频，如果在观看短视频时关闭，就会发生这种情况。"; "HideShortsLogo" = "隐藏短视频Logo"; @@ -121,6 +133,8 @@ "HideShortsAvatarsDesc" = "隐藏右下角的发布者个人资料头像。"; "HideShortsThanks" = "隐藏捐赠按钮"; "HideShortsThanksDesc" = "从短视频播放器中隐藏捐赠按钮。"; +"HideShortsSource" = "Hide Shorts Source"; +"HideShortsSourceDesc" = "Hides the Shorts sources under the channel name."; "HideShortsChannelName" = "隐藏发布者名称"; "HideShortsChannelNameDesc" = "从短视频播放器中隐藏发布者名称和订阅按钮。"; "HideShortsDescription" = "隐藏文案"; @@ -129,6 +143,14 @@ "HideShortsAudioTrackDesc" = "隐藏短视频文案下方的音轨。"; "Other" = "其他"; +"CopyPostText" = "Copy community posts text"; +"CopyPostTextDesc" = "Copies community posts text to the clipboard by long tap."; +"SavePostImage" = "Save community posts image"; +"SavePostImageDesc" = "Saves community posts image to the Photos app by long tap."; +"SaveProfilePhoto" = "Save profile picture"; +"SaveProfilePhotoDesc" = "Saves profile picture to the Photos app by long tap."; +"FixAlbums" = "Fix covers"; +"FixAlbumsDesc" = "Fixes the display of covers for users from Russia."; "RemovePlayNext" = "删除“播放队列中的下一个”"; "RemovePlayNextDesc" = "从菜单中删除“播放队列中的下一个”选项。"; "NoContinueWatching" = "删除“继续观看”"; @@ -168,5 +190,11 @@ "AdvancedModeReminder" = "想为YTLite激活高级模式吗？\n\n此模式提供了50多个额外的选项来自定义和优化您的YouTube体验。\n可以稍后从设置中启用/禁用它 → %@ → %@ → %@。"; "ResetSettings" = "重置YTLite设置"; "ResetMessage" = "此选项会将YTLite设置重置为默认值并关闭YouTube。\n\n确定要继续吗？"; +"ShortsOnlyWarning" = "Are you sure you want to activate this mode?\n\nIn this mode, you will only be able to watch Shorts videos and won't be able to do anything else.\n\nYou can disable Shorts Only Mode by long pressing with two fingers in the Shorts player."; +"ShortsModeTurnedOff" = "Shorts Only Mode has been turned off"; "Yes" = "是"; "No" = "不"; + +"Copied" = "Copied to clipboard"; +"Saved" = "Saved to Photos"; +"Error" = "Error"; \ No newline at end of file diff --git a/layout/Library/Application Support/YTLite.bundle/zh-Hant.lproj/Localizable.strings b/layout/Library/Application Support/YTLite.bundle/zh-Hant.lproj/Localizable.strings index f89e039..a40910c 100644 --- a/layout/Library/Application Support/YTLite.bundle/zh-Hant.lproj/Localizable.strings +++ b/layout/Library/Application Support/YTLite.bundle/zh-Hant.lproj/Localizable.strings @@ -37,6 +37,8 @@ "NoEndScreenCardsDesc" = "隱藏當影片結束時的懸停影片（縮圖）"; "NoFullscreenActions" = "停用全螢幕操作"; "NoFullscreenActionsDesc" = "在全螢幕模式下停用操作面板"; +"PersistentProgressBar" = "Persistent progress bar"; +"PersistentProgressBarDesc" = "Always shows progress bar in the player."; "NoRelatedVids" = "隱藏相關影片"; "NoRelatedVidsDesc" = "移除全螢幕模式向上滑動時所出現的相關影片"; "NoPromotionCards" = "隱藏付費推廣"; @@ -53,6 +55,8 @@ "CopyWithTimestampDesc" = "透過按下暫停按鈕，將帶有時間標記的連結複製到剪貼簿"; "DisableAutoplay" = "停用自動播放"; "DisableAutoplayDesc" = "在打開應用程式後防止自動播放影片"; +"DisableAutoCaptions" = "Disable auto captions"; +"DisableAutoCaptionsDesc" = "Prevents automatic activation of captions."; "NoContentWarning" = "略過內容警告"; "NoContentWarningDesc" = "略過敏感內容警告訊息"; "ClassicQuality" = "舊版本影片畫質"; @@ -81,6 +85,8 @@ "RemoveIndicatorsDesc" = "刪除標籤通知標記"; "ReExplore" = "用探索取代Shorts分頁"; "ReExploreDesc" = "如同舊版YouTube一樣顯示「探索」而非「Shorts」"; +"AddExplore" = "Add Explore tab"; +"AddExploreDesc" = "Adds Explore tab to the Tab bar."; "HideShortsTab" = "隱藏Shorts"; "HideShortsTabDesc" = "從標籤欄中隱藏Shorts標籤"; "HideSubscriptionsTab" = "隱藏訂閱內容"; @@ -91,10 +97,16 @@ "HideLibraryTabDesc" = "從標籤欄中隱藏媒體庫標籤"; "Shorts" = "Shorts"; +"ShortsOnlyMode" = "Shorts Only Mode"; +"ShortsOnlyModeDesc" = "Limits YouTube functionality to viewing Shorts only."; "HideShorts" = "隱藏Shorts影片"; "HideShortsDesc" = "從首頁、推薦...等，隱藏Shorts影片（不適用於觀看紀錄）"; "ShortsProgress" = "啟用時間進度條"; "ShortsProgressDesc" = "在Shorts底部顯示進度條"; +"PinchToFullscreenShorts" = "Pinch to Fullscreen"; +"PinchToFullscreenShortsDesc" = "Manages visibility of the overlay with pinch in and pinch out gestures, displaying Shorts in fullscreen mode."; +"ShortsToRegular" = "Shorts to regular videos"; +"ShortsToRegularDesc" = "Opens Shorts videos as regular videos."; "ResumeShorts" = "不要從Shorts開始"; "ResumeShortsDesc" = "防止重新開啟應用程式時從Shorts開始播放，如果在觀看Shorts時關閉，就會發生這種情況"; "HideShortsLogo" = "隱藏Shorts圖示"; @@ -121,6 +133,8 @@ "HideShortsAvatarsDesc" = "隱藏右下角的頻道圖片"; "HideShortsThanks" = "隱藏超級感謝按鈕"; "HideShortsThanksDesc" = "從Shorts中隱藏超級感謝 (贊助) 按鈕"; +"HideShortsSource" = "Hide Shorts Source"; +"HideShortsSourceDesc" = "Hides the Shorts sources under the channel name."; "HideShortsChannelName" = "隱藏頻道名稱"; "HideShortsChannelNameDesc" = "從Shorts中隱藏頻道名稱和訂閱按鈕"; "HideShortsDescription" = "隱藏描述"; @@ -129,6 +143,14 @@ "HideShortsAudioTrackDesc" = "隱藏Shorts描述下的原始音效"; "Other" = "其它"; +"CopyPostText" = "Copy community posts text"; +"CopyPostTextDesc" = "Copies community posts text to the clipboard by long tap."; +"SavePostImage" = "Save community posts image"; +"SavePostImageDesc" = "Saves community posts image to the Photos app by long tap."; +"SaveProfilePhoto" = "Save profile picture"; +"SaveProfilePhotoDesc" = "Saves profile picture to the Photos app by long tap."; +"FixAlbums" = "Fix covers"; +"FixAlbumsDesc" = "Fixes the display of covers for users from Russia."; "RemovePlayNext" = "移除「播放下一個」"; "RemovePlayNextDesc" = "從選單移除「播放下一個」"; "NoContinueWatching" = "移除「繼續觀看」"; @@ -168,5 +190,11 @@ "AdvancedModeReminder" = "您是否想啟用YTLite的進階模式？\n\n這個模式提供了50多個額外的選項，可以自訂義和優化您的YouTube使用體驗。您稍後可以在「設定」中 → %@ → %@ → %@ 啟用或停用它。"; "ResetSettings" = "重置YTLite設定"; "ResetMessage" = "這個選項會將YTLite重置為預設值，並關閉Youtube\n\n您確定要繼續嗎?"; +"ShortsOnlyWarning" = "Are you sure you want to activate this mode?\n\nIn this mode, you will only be able to watch Shorts videos and won't be able to do anything else.\n\nYou can disable Shorts Only Mode by long pressing with two fingers in the Shorts player."; +"ShortsModeTurnedOff" = "Shorts Only Mode has been turned off"; "Yes" = "是"; "No" = "否"; + +"Copied" = "Copied to clipboard"; +"Saved" = "Saved to Photos"; +"Error" = "Error"; \ No newline at end of file diff --git a/packages/com.dvntm.ytlite_2.5_iphoneos-arm.deb b/packages/com.dvntm.ytlite_2.5_iphoneos-arm.deb new file mode 100644 index 0000000..c82681d Binary files /dev/null and b/packages/com.dvntm.ytlite_2.5_iphoneos-arm.deb differ diff --git a/packages/com.dvntm.ytlite_2.5_iphoneos-arm64.deb b/packages/com.dvntm.ytlite_2.5_iphoneos-arm64.deb new file mode 100644 index 0000000..40686ef Binary files /dev/null and b/packages/com.dvntm.ytlite_2.5_iphoneos-arm64.deb differ