Dark mode.

Fixes #89
HDB-Li · Jun 20, 2020 · aaafc2c · aaafc2c
1 parent a2cf9a6
commit aaafc2c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/LLDebugTool/Core/Others/CommonUI/Base/LLBaseWindow.m b/LLDebugTool/Core/Others/CommonUI/Base/LLBaseWindow.m
@@ -35,7 +35,6 @@ - (instancetype)initWithFrame:(CGRect)frame {
         self.layer.masksToBounds = YES;
 #ifdef __IPHONE_13_0
         if (@available(iOS 13.0, *)) {
-            self.overrideUserInterfaceStyle = UIUserInterfaceStyleLight;
             [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didReceiveUISceneWillConnectNotification:) name:UISceneWillConnectNotification object:nil];
         }
 #endif

diff --git a/LLDebugTool/Core/Others/Manager/ThemeManager/LLThemeColor.m b/LLDebugTool/Core/Others/Manager/ThemeManager/LLThemeColor.m
@@ -42,7 +42,7 @@ + (LLThemeColor *)simpleThemeColor {
     static LLThemeColor *_simpleThemeColor = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        _simpleThemeColor = [self colorWithPrimaryColor:[UIColor darkTextColor] backgroundColor:[UIColor whiteColor] statusBarStyle:UIStatusBarStyleDefault];
+        _simpleThemeColor = [self colorWithPrimaryColor:[UIColor darkTextColor] backgroundColor:[UIColor whiteColor] statusBarStyle:[self darkStyle]];
     });
     return _simpleThemeColor;
 }
@@ -51,7 +51,7 @@ + (LLThemeColor *)systemThemeColor {
     static LLThemeColor *_systemThemeColor = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        _systemThemeColor = [self colorWithPrimaryColor:[LLThemeManager systemTintColor] backgroundColor:[UIColor whiteColor] statusBarStyle:UIStatusBarStyleDefault];
+        _systemThemeColor = [self colorWithPrimaryColor:[LLThemeManager systemTintColor] backgroundColor:[UIColor whiteColor] statusBarStyle:[self darkStyle]];
     });
     return _systemThemeColor;
 }
@@ -78,7 +78,7 @@ + (LLThemeColor *)manPageThemeColor {
     static LLThemeColor *_manPageThemeColor = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        _manPageThemeColor = [self colorWithPrimaryColor:[UIColor LL_colorWithHex:@"#000000"] backgroundColor:[UIColor LL_colorWithHex:@"#FEF49C"] statusBarStyle:UIStatusBarStyleDefault];
+        _manPageThemeColor = [self colorWithPrimaryColor:[UIColor LL_colorWithHex:@"#000000"] backgroundColor:[UIColor LL_colorWithHex:@"#FEF49C"] statusBarStyle:[self darkStyle]];
     });
     return _manPageThemeColor;
 }
@@ -87,7 +87,7 @@ + (LLThemeColor *)novelThemeColor {
     static LLThemeColor *_novelThemeColor = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        _novelThemeColor = [self colorWithPrimaryColor:[UIColor LL_colorWithHex:@"#3B2322"] backgroundColor:[UIColor LL_colorWithHex:@"#DFDBC3"] statusBarStyle:UIStatusBarStyleDefault];
+        _novelThemeColor = [self colorWithPrimaryColor:[UIColor LL_colorWithHex:@"#3B2322"] backgroundColor:[UIColor LL_colorWithHex:@"#DFDBC3"] statusBarStyle:[self darkStyle]];
     });
     return _novelThemeColor;
 }
@@ -123,7 +123,7 @@ + (LLThemeColor *)silverAerogelThemeColor {
     static LLThemeColor *_silverAerogelThemeColor = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        _silverAerogelThemeColor = [self colorWithPrimaryColor:[UIColor LL_colorWithHex:@"#000000"] backgroundColor:[UIColor LL_colorWithHex:@"#929292"] statusBarStyle:UIStatusBarStyleDefault];
+        _silverAerogelThemeColor = [self colorWithPrimaryColor:[UIColor LL_colorWithHex:@"#000000"] backgroundColor:[UIColor LL_colorWithHex:@"#929292"] statusBarStyle:[self darkStyle]];
     });
     return _silverAerogelThemeColor;
 }
@@ -132,7 +132,7 @@ + (LLThemeColor *)solidColorsThemeColor {
     static LLThemeColor *_solidColorsThemeColor = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        _solidColorsThemeColor = [self colorWithPrimaryColor:[UIColor LL_colorWithHex:@"#000000"] backgroundColor:[UIColor LL_colorWithHex:@"#FFFFFF"] statusBarStyle:UIStatusBarStyleDefault];
+        _solidColorsThemeColor = [self colorWithPrimaryColor:[UIColor LL_colorWithHex:@"#000000"] backgroundColor:[UIColor LL_colorWithHex:@"#FFFFFF"] statusBarStyle:[self darkStyle]];
     });
     return _solidColorsThemeColor;
 }
@@ -148,15 +148,15 @@ - (instancetype)initWithPrimaryColor:(UIColor *)primaryColor backgroundColor:(UI
 }
 
 - (instancetype)initWithPrimaryColor:(UIColor *)primaryColor backgroundColor:(UIColor *)backgroundColor {
-    return [self initWithPrimaryColor:primaryColor backgroundColor:backgroundColor statusBarStyle:UIStatusBarStyleDefault];
+    return [self initWithPrimaryColor:primaryColor backgroundColor:backgroundColor statusBarStyle:[LLThemeColor darkStyle]];
 }
 
 + (instancetype)colorWithPrimaryColor:(UIColor *)primaryColor backgroundColor:(UIColor *)backgroundColor statusBarStyle:(UIStatusBarStyle)statusBarStyle {
     return [[self alloc] initWithPrimaryColor:primaryColor backgroundColor:backgroundColor statusBarStyle:statusBarStyle];
 }
 
 + (instancetype)colorWithPrimaryColor:(UIColor *)primaryColor backgroundColor:(UIColor *)backgroundColor {
-    return [self colorWithPrimaryColor:primaryColor backgroundColor:backgroundColor statusBarStyle:UIStatusBarStyleDefault];
+    return [self colorWithPrimaryColor:primaryColor backgroundColor:backgroundColor statusBarStyle:[self darkStyle]];
 }
 
 #pragma mark - Primary
@@ -169,4 +169,13 @@ - (void)calculateColorIfNeeded {
     _placeHolderColor = [_primaryColor LL_mixtureWithColor:_backgroundColor radio:0.5];
 }
 
++ (UIStatusBarStyle)darkStyle {
+#ifdef __IPHONE_13_0
+    if (@available(iOS 13.0, *)) {
+        return UIStatusBarStyleDarkContent;
+    }
+#endif
+    return UIStatusBarStyleDefault;
+}
+
 @end
diff --git a/LLDebugToolDemo.xcodeproj/project.pbxproj b/LLDebugToolDemo.xcodeproj/project.pbxproj
@@ -3309,7 +3309,7 @@
 				INFOPLIST_FILE = LLDebugToolDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.3.8;
+				MARKETING_VERSION = 1.3.9;
 				PRODUCT_BUNDLE_IDENTIFIER = HDB.LLDebugToolDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3349,7 +3349,7 @@
 				INFOPLIST_FILE = LLDebugToolDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.3.8;
+				MARKETING_VERSION = 1.3.9;
 				PRODUCT_BUNDLE_IDENTIFIER = HDB.LLDebugToolDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";