Merge pull request #18 from andreyoshev/master

Hard support old iOS versions improvements

Author: subdan

README.md

@@ -55,12 +55,16 @@ import UIKit
 
 extension UIColor {
     static var primaryText: UIColor {
-        UIColor { traitCollection -> UIColor in
-            if traitCollection.userInterfaceStyle == .dark {
-                return UIColor(red: 0.000, green: 0.000, blue: 0.000, alpha: 1.000)
-            } else {
-                return UIColor(red: 1.000, green: 1.000, blue: 1.000, alpha: 1.000)
+        if #available(iOS 13.0, *) {
+            return UIColor { traitCollection -> UIColor in
+                if traitCollection.userInterfaceStyle == .dark {
+                    return UIColor(red: 0.000, green: 0.000, blue: 0.000, alpha: 1.000)
+                } else {
+                    return UIColor(red: 1.000, green: 1.000, blue: 1.000, alpha: 1.000)
+                }
             }
+        } else {
+            return UIColor(red: 1.000, green: 1.000, blue: 1.000, alpha: 1.000)
         }
     }
     static var backgroundVideo: UIColor {

Sources/XcodeExport/XcodeColorExporter.swift

@@ -88,7 +88,7 @@ final public class XcodeColorExporter {
                     contents.append("""
                         static var \(colorPair.light.name): UIColor {
                             if #available(iOS 13.0, *) {
-                                UIColor { traitCollection -> UIColor in
+                                return UIColor { traitCollection -> UIColor in
                                     if traitCollection.userInterfaceStyle == .dark {
                                         return UIColor(red: \(darkComponents.red), green: \(darkComponents.green), blue: \(darkComponents.blue), alpha: \(darkComponents.alpha))
                                     } else {

Tests/XcodeExportTests/XcodeColorExporterTests.swift

@@ -45,7 +45,7 @@ final class XcodeColorExporterTests: XCTestCase {
         extension UIColor {
             static var colorPair1: UIColor {
                 if #available(iOS 13.0, *) {
-                    UIColor { traitCollection -> UIColor in
+                    return UIColor { traitCollection -> UIColor in
                         if traitCollection.userInterfaceStyle == .dark {
                             return UIColor(red: 0.000, green: 0.000, blue: 0.000, alpha: 1.000)
                         } else {