增加动态颜色支持

zhenglibao · Nov 1, 2024 · 65cc6a5 · 65cc6a5
1 parent 3e87772
commit 65cc6a5
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/FlexLib/Classes/Flexlib/FlexUtils.m b/FlexLib/Classes/Flexlib/FlexUtils.m
@@ -112,27 +112,26 @@
 UIColor* colorFromString(NSString* clr,
                          NSObject* owner)
 {
-    if (@available( iOS 13.0, *)) {
+    NSUInteger loc = [clr rangeOfString:@"|"].location;
+    if(loc!=NSNotFound)
+    {
+        UIColor* lightColor = colorFromString([clr substringToIndex:loc], owner);
+        UIColor* darkColor = colorFromString([clr substringFromIndex:loc+1], owner);
 
-        NSUInteger loc = [clr rangeOfString:@"|"].location;
-        if(loc!=NSNotFound)
+        if(lightColor!=nil && darkColor!=nil)
         {
-            UIColor* lightColor = colorFromString([clr substringToIndex:loc], owner);
-            UIColor* darkColor = colorFromString([clr substringFromIndex:loc+1], owner);
-
-            if(lightColor!=nil && darkColor!=nil)
-            {
+            if (@available( iOS 13.0, *)) {
                 return [UIColor colorWithDynamicProvider:^UIColor * _Nonnull(UITraitCollection * _Nonnull traitCollection) {
                     if (traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark) {
                         return darkColor;
                     } else {
                         return lightColor;
                     }
                 }];
-            }else{
-                return lightColor?:darkColor;
             }
+
         }
+        return lightColor?:darkColor;
     }
 
     if(![clr hasPrefix:@"#"]){