From ef36051ebe2bba3e910e6bbc7fae22f46e11227e Mon Sep 17 00:00:00 2001
From: arichorn <78001398+arichorn@users.noreply.github.com>
Date: Tue, 15 Aug 2023 16:41:19 -0500
Subject: [PATCH] Update Themes.xm

---
 Source/Themes.xm | 169 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 163 insertions(+), 6 deletions(-)

diff --git a/Source/Themes.xm b/Source/Themes.xm
index 03b6684..89a8aaf 100644
--- a/Source/Themes.xm
+++ b/Source/Themes.xm
@@ -140,6 +140,9 @@ UIColor *originalColor = [UIColor colorWithRed:0.129 green:0.129 blue:0.129 alph
 - (UIColor *)background3 {
     return self.pageStyle == 1 ? originalColor : %orig;
 }
+- (UIColor *)baseBackground {
+    return self.pageStyle == 1 ? [UIColor blackColor] : %orig;
+}
 - (UIColor *)brandBackgroundSolid {
     return self.pageStyle == 1 ? originalColor : %orig;
 }
@@ -161,13 +164,39 @@ UIColor *originalColor = [UIColor colorWithRed:0.129 green:0.129 blue:0.129 alph
 - (UIColor *)generalBackgroundB {
     return self.pageStyle == 1 ? originalColor : %orig;
 }
-- (UIColor *)baseBackground {
-    return self.pageStyle == 1 ? originalColor : %orig;
-}
 - (UIColor *)menuBackground {
     return self.pageStyle == 1 ? originalColor : %orig;
 }
 %end
+
+%hook UITableViewCell
+- (void)_layoutSystemBackgroundView:(BOOL)animated {
+    %orig;
+    ((UIView *)[[self valueForKey:@"_systemBackgroundView"] valueForKey:@"_colorView"]).backgroundColor = originalColor;
+}
+%end
+
+%hook settingsReorderTable
+- (void)viewDidLayoutSubviews {
+    %orig;
+    self.tableView.backgroundColor = originalColor;
+}
+%end
+
+%hook FRPSelectListTable
+- (void)viewDidLayoutSubviews {
+    %orig;
+    self.tableView.backgroundColor = originalColor;
+}
+%end
+
+%hook FRPreferences
+- (void)viewDidLayoutSubviews {
+    %orig;
+    self.tableView.backgroundColor = originalColor;
+}
+%end
+
 %hook SponsorBlockSettingsController
 - (void)viewDidLoad {
     if (self.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark) {
@@ -176,6 +205,7 @@ UIColor *originalColor = [UIColor colorWithRed:0.129 green:0.129 blue:0.129 alph
     } else { return %orig; }
 }
 %end
+
 %hook SponsorBlockViewController
 - (void)viewDidLoad {
     if (self.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark) {
@@ -184,12 +214,14 @@ UIColor *originalColor = [UIColor colorWithRed:0.129 green:0.129 blue:0.129 alph
     } else { return %orig; }
 }
 %end
+
 %hook ELMView
 - (void)didMoveToWindow {
     %orig;
         self.subviews[0].backgroundColor = [UIColor clearColor];
 }
 %end
+
 %hook YTAsyncCollectionView
 - (void)layoutSubviews {
     %orig();
@@ -200,146 +232,175 @@ UIColor *originalColor = [UIColor colorWithRed:0.129 green:0.129 blue:0.129 alph
     }
 }
 %end
+
 %hook YTPivotBarView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTHeaderView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTSubheaderContainerView
 - (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 YTSettingsCell
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTSlideForActionsView
 - (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 YTPlaylistMiniBarView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTEngagementPanelView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTEngagementPanelHeaderView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTPlaylistPanelControlsView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTHorizontalCardListView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTWatchMiniBarView
 - (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;
 }
 %end
+
 %hook YTSearchView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTSearchBoxView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTTabTitlesView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTPrivacyTosFooterView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTOfflineStorageUsageView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTInlineSignInView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTFeedChannelFilterHeaderView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YCHLiveChatView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YCHLiveChatActionPanelView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTEmojiTextView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTTopAlignedView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
@@ -351,11 +412,13 @@ UIColor *originalColor = [UIColor colorWithRed:0.129 green:0.129 blue:0.129 alph
     }
 }
 %end
+
 %hook GOODialogView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTNavigationBar
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
@@ -364,76 +427,91 @@ UIColor *originalColor = [UIColor colorWithRed:0.129 green:0.129 blue:0.129 alph
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTChannelMobileHeaderView
 - (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 YTReelShelfCell
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTReelShelfItemView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTReelShelfView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTCommentView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTChannelListSubMenuAvatarView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTSearchBarView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTDialogContainerScrollView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTShareTitleView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTShareBusyView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTELMView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTActionSheetHeaderView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig(originalColor) : %orig;
 }
 %end
+
 %hook YTShareMainView
 - (void)layoutSubviews {
     %orig();
@@ -443,6 +521,7 @@ UIColor *originalColor = [UIColor colorWithRed:0.129 green:0.129 blue:0.129 alph
   }
 }
 %end
+
 %hook _ASDisplayView
 - (void)layoutSubviews {
     %orig;
@@ -499,6 +578,9 @@ UIColor* raisedColor = [UIColor blackColor];
 - (UIColor *)background3 {
     return self.pageStyle == 1 ? [UIColor blackColor] : %orig;
 }
+- (UIColor *)baseBackground {
+    return self.pageStyle == 1 ? [UIColor blackColor] : %orig;
+}
 - (UIColor *)brandBackgroundSolid {
     return self.pageStyle == 1 ? [UIColor blackColor] : %orig;
 }
@@ -520,13 +602,39 @@ UIColor* raisedColor = [UIColor blackColor];
 - (UIColor *)generalBackgroundB {
     return self.pageStyle == 1 ? [UIColor blackColor] : %orig;
 }
-- (UIColor *)baseBackground {
-    return self.pageStyle == 1 ? [UIColor blackColor] : %orig;
-}
 - (UIColor *)menuBackground {
     return self.pageStyle == 1 ? [UIColor blackColor] : %orig;
 }
 %end
+
+%hook UITableViewCell
+- (void)_layoutSystemBackgroundView:(BOOL)animated {
+    %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 SponsorBlockSettingsController
 - (void)viewDidLoad {
     if (self.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark) {
@@ -535,6 +643,7 @@ UIColor* raisedColor = [UIColor blackColor];
     } else { return %orig; }
 }
 %end
+
 %hook SponsorBlockViewController
 - (void)viewDidLoad {
     if (self.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark) {
@@ -549,6 +658,7 @@ UIColor* raisedColor = [UIColor blackColor];
         self.subviews[0].backgroundColor = [UIColor clearColor];
 }
 %end
+
 %hook YTAsyncCollectionView
 - (void)layoutSubviews {
     %orig();
@@ -559,146 +669,175 @@ UIColor* raisedColor = [UIColor blackColor];
     }
 }
 %end
+
 %hook YTPivotBarView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTHeaderView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTSubheaderContainerView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTAppView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTCollectionView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTChannelListSubMenuView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTSettingsCell
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTSlideForActionsView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTPageView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTWatchView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTPlaylistMiniBarView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTEngagementPanelView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTEngagementPanelHeaderView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTPlaylistPanelControlsView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTHorizontalCardListView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTWatchMiniBarView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTCreateCommentAccessoryView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTCreateCommentTextView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTSearchView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTSearchBoxView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTTabTitlesView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTPrivacyTosFooterView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTOfflineStorageUsageView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTInlineSignInView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTFeedChannelFilterHeaderView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YCHLiveChatView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YCHLiveChatActionPanelView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTEmojiTextView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTTopAlignedView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
@@ -710,11 +849,13 @@ UIColor* raisedColor = [UIColor blackColor];
     }
 }
 %end
+
 %hook GOODialogView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTNavigationBar
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
@@ -723,76 +864,91 @@ UIColor* raisedColor = [UIColor blackColor];
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTChannelMobileHeaderView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTChannelSubMenuView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTWrapperSplitView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTReelShelfCell
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTReelShelfItemView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTReelShelfView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTCommentView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTChannelListSubMenuAvatarView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTSearchBarView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTDialogContainerScrollView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTShareTitleView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTShareBusyView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTELMView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTActionSheetHeaderView
 - (void)setBackgroundColor:(UIColor *)color {
     return isDarkMode() ? %orig([UIColor blackColor]) : %orig;
 }
 %end
+
 %hook YTShareMainView
 - (void)layoutSubviews {
     %orig();
@@ -802,6 +958,7 @@ UIColor* raisedColor = [UIColor blackColor];
   }
 }
 %end
+
 %hook _ASDisplayView
 - (void)layoutSubviews {
     %orig;