From dbc3c6338685da19d9c943d5ef507c02cb0bfa19 Mon Sep 17 00:00:00 2001 From: arichornlover <78001398+arichorn@users.noreply.github.com> Date: Tue, 28 Nov 2023 20:09:32 -0600 Subject: [PATCH] Themes Optimized for `v18.08.1-3.0.1` release --- Source/Themes.xm | 363 +++-------------------------------------------- 1 file changed, 20 insertions(+), 343 deletions(-) diff --git a/Source/Themes.xm b/Source/Themes.xm index 2efb8f8..4d1bb46 100644 --- a/Source/Themes.xm +++ b/Source/Themes.xm @@ -16,305 +16,46 @@ static BOOL oldDarkTheme() { // Themes.xm - Theme Options // Old dark theme (gray) %group gOldDarkTheme -UIColor *originalColor = [UIColor colorWithRed:0.129 green:0.129 blue:0.129 alpha:1.0]; -%hook YTCommonColorPalette -- (UIColor *)background1 { - return self.pageStyle == 1 ? originalColor : %orig; -} -- (UIColor *)background2 { - return self.pageStyle == 1 ? originalColor : %orig; -} -- (UIColor *)background3 { - return self.pageStyle == 1 ? originalColor : %orig; -} -- (UIColor *)baseBackground { - return self.pageStyle == 1 ? originalColor : %orig; -} -- (UIColor *)brandBackgroundSolid { - return self.pageStyle == 1 ? originalColor : %orig; -} -- (UIColor *)brandBackgroundPrimary { - return self.pageStyle == 1 ? originalColor : %orig; -} -- (UIColor *)brandBackgroundSecondary { - return self.pageStyle == 1 ? [originalColor colorWithAlphaComponent:0.9] : %orig; -} -- (UIColor *)raisedBackground { - return self.pageStyle == 1 ? originalColor : %orig; -} -- (UIColor *)staticBrandBlack { - return self.pageStyle == 1 ? originalColor : %orig; -} -- (UIColor *)generalBackgroundA { - return self.pageStyle == 1 ? originalColor : %orig; -} -- (UIColor *)generalBackgroundB { - return self.pageStyle == 1 ? originalColor : %orig; -} -- (UIColor *)menuBackground { - return self.pageStyle == 1 ? originalColor : %orig; -} +%hook YTColdConfig +- (BOOL)uiSystemsClientGlobalConfigUseDarkerPaletteBgColorForNative { return NO; } +- (BOOL)uiSystemsClientGlobalConfigUseDarkerPaletteTextColorForNative { return NO; } +- (BOOL)enableCinematicContainerOnClient { return NO; } %end -%hook YTInnerTubeCollectionViewController -- (UIColor *)backgroundColor:(NSInteger)pageStyle { - return pageStyle == 1 ? originalColor : %orig; -} -%end - -// Explore -%hook ASScrollView +%hook _ASDisplayView - (void)didMoveToWindow { %orig; - if (isDarkMode()) { - self.backgroundColor = [UIColor clearColor]; - } + if ([self.accessibilityIdentifier isEqualToString:@"id.elements.components.comment_composer"]) { self.backgroundColor = [UIColor clearColor]; } + if ([self.accessibilityIdentifier isEqualToString:@"id.elements.components.video_list_entry"]) { self.backgroundColor = [UIColor clearColor]; } } %end -// Your videos %hook ASCollectionView - (void)didMoveToWindow { %orig; - if (isDarkMode() && [self.nextResponder isKindOfClass:%c(_ASDisplayView)]) { - self.superview.backgroundColor = originalColor; - } + self.superview.backgroundColor = [UIColor colorWithRed:0.129 green:0.129 blue:0.129 alpha:1.0]; } %end -// Sub menu? -%hook ELMView +%hook YTFullscreenEngagementOverlayView - (void)didMoveToWindow { %orig; - if (isDarkMode()) { - self.subviews[0].backgroundColor = [UIColor clearColor]; - } + self.subviews[0].backgroundColor = [UIColor clearColor]; } %end -// iSponsorBlock -%hook SponsorBlockSettingsController -- (void)viewDidLoad { - if (self.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark) { - %orig; - self.tableView.backgroundColor = originalColor; - } else { return %orig; } -} -%end - -%hook SponsorBlockViewController -- (void)viewDidLoad { - if (self.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark) { - %orig; - self.view.backgroundColor = originalColor; - } else { return %orig; } -} -%end - -// Search View -%hook YTSearchBarView -- (void)setBackgroundColor:(UIColor *)color { - return isDarkMode() ? %orig(originalColor) : %orig; -} -%end - -// History Search view -%hook YTSearchBoxView -- (void)setBackgroundColor:(UIColor *)color { - return isDarkMode() ? %orig(originalColor) : %orig; - -} -%end - -// Comment view -%hook YTCommentView -- (void)setBackgroundColor:(UIColor *)color { - return isDarkMode() ? %orig(originalColor) : %orig; -} -%end - -%hook YTCreateCommentAccessoryView -- (void)setBackgroundColor:(UIColor *)color { - return isDarkMode() ? %orig(originalColor) : %orig; -} -%end - -%hook YTCreateCommentTextView -- (void)setBackgroundColor:(UIColor *)color { - return isDarkMode() ? %orig(originalColor) : %orig; -} -- (void)setTextColor:(UIColor *)color { // fix black text in #Shorts video's comment - return isDarkMode() ? %orig([UIColor whiteColor]) : %orig; -} -%end - -%hook YTCommentDetailHeaderCell +%hook YTRelatedVideosView - (void)didMoveToWindow { %orig; - if (isDarkMode()) { - self.subviews[2].backgroundColor = originalColor; - } -} -%end - -%hook YTAsyncCollectionView -- (void)layoutSubviews { - %orig(); - if ([self.nextResponder isKindOfClass:NSClassFromString(@"YTWatchNextResultsViewController")]) { - if (isDarkMode()) { - self.subviews[0].subviews[0].backgroundColor = originalColor; - } - } -} -%end - -%hook YTFormattedStringLabel // YT is werid... -- (void)setBackgroundColor:(UIColor *)color { - return isDarkMode() ? %orig([UIColor clearColor]) : %orig; -} -%end - -// Live chat comment -%hook YCHLiveChatActionPanelView -- (void)setBackgroundColor:(UIColor *)color { - return isDarkMode() ? %orig(originalColor) : %orig; -} -%end - -%hook YCHLiveChatView -- (void)setBackgroundColor:(UIColor *)color { - return isDarkMode() ? %orig(originalColor) : %orig; -} -- (void)didMoveToWindow { - %orig; - if (isDarkMode()) { - self.subviews[1].backgroundColor = originalColor; - } -} -%end - -%hook YTEmojiTextView -- (void)setBackgroundColor:(UIColor *)color { - return isDarkMode() ? %orig(originalColor) : %orig; -} -%end - -%hook YTAppView -- (void)setBackgroundColor:(UIColor *)color { - return isDarkMode() ? %orig(originalColor) : %orig; -} -%end - -%hook YTCollectionView -- (void)setBackgroundColor:(UIColor *)color { - return isDarkMode() ? %orig(originalColor) : %orig; -} -%end - -%hook YTChannelListSubMenuView -- (void)setBackgroundColor:(UIColor *)color { - return isDarkMode() ? %orig(originalColor) : %orig; -} -%end - -%hook YTChannelSubMenuView -- (void)setBackgroundColor:(UIColor *)color { - return isDarkMode() ? %orig(originalColor) : %orig; -} -%end - -%hook YTWrapperSplitView -- (void)setBackgroundColor:(UIColor *)color { - return isDarkMode() ? %orig(originalColor) : %orig; -} -%end - -%hook YTPageView -- (void)setBackgroundColor:(UIColor *)color { - return isDarkMode() ? %orig(originalColor) : %orig; -} -%end - -%hook YTWatchView -- (void)setBackgroundColor:(UIColor *)color { - return isDarkMode() ? %orig(originalColor) : %orig; -} -%end - -%hook YTPrivacyTosFooterView -- (void)setBackgroundColor:(UIColor *)color { - return isDarkMode() ? %orig(originalColor) : %orig; -} -%end - -// -%hook YTBackstageCreateRepostDetailView -- (void)setBackgroundColor:(UIColor *)color { - return isDarkMode() ? %orig(originalColor) : %orig; -} -%end - -// Others -%hook _ASDisplayView -- (void)layoutSubviews { - %orig; - if (isDarkMode()) { - UIResponder *responder = [self nextResponder]; - while (responder != nil) { - if ([responder isKindOfClass:NSClassFromString(@"YTActionSheetDialogViewController")]) { - self.backgroundColor = originalColor; - } - if ([responder isKindOfClass:NSClassFromString(@"YTPanelLoadingStrategyViewController")]) { - self.backgroundColor = originalColor; - } - if ([responder isKindOfClass:NSClassFromString(@"YTTabHeaderElementsViewController")]) { - self.backgroundColor = originalColor; - } - if ([responder isKindOfClass:NSClassFromString(@"YTEditSheetControllerElementsContentViewController")]) { - self.backgroundColor = originalColor; - } - responder = [responder nextResponder]; - } - } -} -- (void)didMoveToWindow { - %orig; - if (isDarkMode()) { - if ([self.nextResponder isKindOfClass:%c(ASScrollView)]) { self.backgroundColor = [UIColor clearColor]; } - if ([self.accessibilityIdentifier isEqualToString:@"brand_promo.view"]) { self.superview.backgroundColor = originalColor; } - if ([self.accessibilityIdentifier isEqualToString:@"eml.cvr"]) { self.backgroundColor = originalColor; } - if ([self.accessibilityIdentifier isEqualToString:@"eml.topic_channel_details"]) { self.backgroundColor = originalColor; } - if ([self.accessibilityIdentifier isEqualToString:@"eml.live_chat_text_message"]) { self.backgroundColor = originalColor; } - if ([self.accessibilityIdentifier isEqualToString:@"rich_header"]) { self.backgroundColor = originalColor; } - if ([self.accessibilityIdentifier isEqualToString:@"id.ui.comment_cell"]) { self.backgroundColor = originalColor; } - if ([self.accessibilityIdentifier isEqualToString:@"id.ui.comment_thread"]) { self.backgroundColor = originalColor; } - if ([self.accessibilityIdentifier isEqualToString:@"id.ui.cancel.button"]) { self.superview.backgroundColor = [UIColor clearColor]; } - if ([self.accessibilityIdentifier isEqualToString:@"id.elements.components.comment_composer"]) { self.backgroundColor = originalColor; } - if ([self.accessibilityIdentifier isEqualToString:@"id.elements.components.filter_chip_bar"]) { self.backgroundColor = originalColor; } - if ([self.accessibilityIdentifier isEqualToString:@"id.elements.components.video_list_entry"]) { self.backgroundColor = originalColor; } - if ([self.accessibilityIdentifier isEqualToString:@"id.comment.guidelines_text"]) { self.superview.backgroundColor = originalColor; } - if ([self.accessibilityIdentifier isEqualToString:@"id.comment.timed_comments_welcome"]) { self.superview.backgroundColor = self.backgroundColor = originalColor; } - if ([self.accessibilityIdentifier isEqualToString:@"id.comment.channel_guidelines_bottom_sheet_container"]) { self.backgroundColor = originalColor; } - if ([self.accessibilityIdentifier isEqualToString:@"id.comment.channel_guidelines_entry_banner_container"]) { self.superview.backgroundColor = self.backgroundColor = originalColor; } - if ([self.accessibilityIdentifier isEqualToString:@"id.comment.comment_group_detail_container"]) { self.backgroundColor = [UIColor clearColor]; } - } + self.subviews[0].backgroundColor = [UIColor clearColor]; } %end %end -// OLED dark mode by @BandarHL -UIColor* raisedColor = [UIColor blackColor]; +// OLED dark mode by BandarHL +UIColor* raisedColor = [UIColor colorWithRed:0.035 green:0.035 blue:0.035 alpha:1.0]; %group gOLED %hook YTCommonColorPalette -- (UIColor *)background1 { - return self.pageStyle == 1 ? [UIColor blackColor] : %orig; -} -- (UIColor *)background2 { - return self.pageStyle == 1 ? [UIColor blackColor] : %orig; -} -- (UIColor *)background3 { - return self.pageStyle == 1 ? [UIColor blackColor] : %orig; -} - (UIColor *)baseBackground { return self.pageStyle == 1 ? [UIColor blackColor] : %orig; } @@ -336,51 +77,8 @@ UIColor* raisedColor = [UIColor blackColor]; - (UIColor *)generalBackgroundA { return self.pageStyle == 1 ? [UIColor blackColor] : %orig; } -- (UIColor *)generalBackgroundB { - return self.pageStyle == 1 ? [UIColor blackColor] : %orig; -} -- (UIColor *)menuBackground { - return self.pageStyle == 1 ? [UIColor blackColor] : %orig; -} %end -/* -// uYou settings (Conflicts iSponsorBlock) -%hook UITableViewCell -- (void)_layoutSystemBackgroundView { - %orig; - UIView *systemBackgroundView = [self valueForKey:@"_systemBackgroundView"]; - NSString *backgroundViewKey = class_getInstanceVariable(systemBackgroundView.class, "_colorView") ? @"_colorView" : @"_backgroundView"; - ((UIView *)[systemBackgroundView valueForKey:backgroundViewKey]).backgroundColor = [UIColor blackColor]; -} -- (void)_layoutSystemBackgroundView:(BOOL)arg1 { - %orig; - ((UIView *)[[self valueForKey:@"_systemBackgroundView"] valueForKey:@"_colorView"]).backgroundColor = [UIColor blackColor]; -} -%end - -%hook settingsReorderTable -- (void)viewDidLayoutSubviews { - %orig; - self.tableView.backgroundColor = [UIColor blackColor]; -} -%end - -%hook FRPSelectListTable -- (void)viewDidLayoutSubviews { - %orig; - self.tableView.backgroundColor = [UIColor blackColor]; -} -%end - -%hook FRPreferences -- (void)viewDidLayoutSubviews { - %orig; - self.tableView.backgroundColor = [UIColor blackColor]; -} -%end -*/ - %hook YTInnerTubeCollectionViewController - (UIColor *)backgroundColor:(NSInteger)pageStyle { return pageStyle == 1 ? [UIColor blackColor] : %orig; @@ -525,46 +223,20 @@ UIColor* raisedColor = [UIColor blackColor]; // Others %hook _ASDisplayView -- (void)layoutSubviews { - %orig; - if (isDarkMode()) { - UIResponder *responder = [self nextResponder]; - while (responder != nil) { - if ([responder isKindOfClass:NSClassFromString(@"YTActionSheetDialogViewController")]) { - self.backgroundColor = [UIColor blackColor]; - } - if ([responder isKindOfClass:NSClassFromString(@"YTPanelLoadingStrategyViewController")]) { - self.backgroundColor = [UIColor blackColor]; - } - if ([responder isKindOfClass:NSClassFromString(@"YTTabHeaderElementsViewController")]) { - self.backgroundColor = [UIColor blackColor]; - } - if ([responder isKindOfClass:NSClassFromString(@"YTEditSheetControllerElementsContentViewController")]) { - self.backgroundColor = [UIColor blackColor]; - } - responder = [responder nextResponder]; - } - } -} - (void)didMoveToWindow { %orig; if (isDarkMode()) { if ([self.nextResponder isKindOfClass:%c(ASScrollView)]) { 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.channel_guidelines_entry_banner_container"]) { self.backgroundColor = [UIColor blackColor]; } if ([self.accessibilityIdentifier isEqualToString:@"id.comment.comment_group_detail_container"]) { self.backgroundColor = [UIColor clearColor]; } } } @@ -593,6 +265,11 @@ UIColor* raisedColor = [UIColor blackColor]; } } %end + +// Incompatibility with the new YT Dark theme +%hook YTColdConfig +- (BOOL)uiSystemsClientGlobalConfigUseDarkerPaletteBgColorForNative { return NO; } +%end %end // OLED keyboard by @ichitaso <3 - http://gist.github.com/ichitaso/935100fd53a26f18a9060f7195a1be0e