From 314efca54bb0c53718f44a52773020d5b53bc07c Mon Sep 17 00:00:00 2001
From: qnblackcat <qnblackcat@gmail.com>
Date: Wed, 4 May 2022 11:10:06 +0700
Subject: [PATCH] avoid layoutSubviews

---
 Header.h    |  9 ++++++---
 uYouPlus.xm | 40 ++++++++++++++++++++++------------------
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/Header.h b/Header.h
index 7053976..9fa33e0 100644
--- a/Header.h
+++ b/Header.h
@@ -20,9 +20,6 @@
 @interface YTLightweightQTMButton : UIView
 @end
 
-@interface YTELMView : UIView
-@end
-
 @interface NIAttributedLabel : UIView
 @end
 
@@ -30,4 +27,10 @@
 @end
 
 @interface UICollectionViewControllerWrapperView : UIView
+@end
+
+@interface ASScrollView : UIView
+@end
+
+@interface ASCollectionView : UIView
 @end
\ No newline at end of file
diff --git a/uYouPlus.xm b/uYouPlus.xm
index 8dac8be..db0a4fd 100644
--- a/uYouPlus.xm
+++ b/uYouPlus.xm
@@ -205,9 +205,9 @@ UIColor* oledColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
     arg1 = oledColor;	
     %orig;
 }
-//- (void)layoutSubviews {
+//- (void)didMoveToWindow {
 //	%orig;	
-//  if ([self.nextResponder isKindOfClass:%c(YTALDialog)])
+//    if ([self.nextResponder isKindOfClass:%c(YTALDialog)]) // Connected apps
 //	self.backgroundColor = oledColor;
 //}
 %end
@@ -245,7 +245,7 @@ UIColor* oledColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
     arg1 = oledColor;
     %orig;
 }
--(void)layoutSubviews {  // Dune - https://github.com/Skittyblock/Dune/blob/9b1df9790230115b7553cc9dbadf36889018d7f9/Tweak.xm#L70
+-(void)didMoveToWindow {  // Dune - https://github.com/Skittyblock/Dune/blob/9b1df9790230115b7553cc9dbadf36889018d7f9/Tweak.xm#L70
     %orig;
     MSHookIvar<UIView *>(self, "_contentView").backgroundColor = oledColor;
 }
@@ -298,6 +298,10 @@ UIColor* oledColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
     arg1 = oledColor;
     %orig;
 }
+-(void)setTextColor:(id)arg1 {
+	arg1 = [UIColor whiteColor];
+	%orig;
+}
 %end
 
 %hook YCHLiveChatActionPanelView
@@ -435,7 +439,7 @@ UIColor* oledColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
     arg1 = oledColor;
     %orig;
 }
-- (void)layoutSubviews {}
+- (void)didMoveToWindow {}
 %end
 
 %hook YTLightweightQTMButton
@@ -490,13 +494,6 @@ UIColor* oledColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
 }
 %end
 
-%hook YTELMView // upload videos
--(void)layoutSubviews {
-    %orig;
-    self.backgroundColor = oledColor;
-}
-%end
-
 %hook YTMealBarPromoView
 -(void)setBackgroundColor:(id)arg1 { // Offline
     arg1 = oledColor;
@@ -512,6 +509,20 @@ UIColor* oledColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
 }
 %end
 
+%hook ASScrollView  // Explore
+-(void)didMoveToWindow { 
+	self.backgroundColor = oledColor;
+	%orig;
+}
+%end
+
+%hook ASCollectionView  // your videos
+-(void)didMoveToWindow {
+	self.backgroundColor = oledColor;
+	%orig;
+}
+%end
+
 ////
 /*
 %hook UICollectionView
@@ -536,13 +547,6 @@ UIColor* oledColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
 }
 %end
 
-%hook ASCollectionView
--(void)layoutSubviews {
-    self.backgroundColor = oledColor;
-    %orig;
-}
-%end
-
 %hook YTChannelProfileDescriptionEditorView // edit profile Description
 -(void)setBackgroundColor:(id)arg1 {
     arg1 = oledColor;