Update project structure

Author: yannickl

DynamicColor.podspec

@@ -20,6 +20,6 @@ Pod::Spec.new do |s|
   s.tvos.framework    = 'UIKit'
   s.watchos.framework = 'UIKit'
 
-  s.source_files = 'Sources/*.swift'
+  s.source_files = 'Sources/**/*.swift'
   s.requires_arc = true
 end

Examples/DynamicColor/DynamicColor.h

@@ -2,11 +2,11 @@
 //  DynamicColor.h
 //  DynamicColor
 //
-//  Created by Yannick LORIOT on 12/06/15.
-//  Copyright (c) 2015 Yannick LORIOT. All rights reserved.
+//  Created by Yannick Loriot on 16/07/2020.
+//  Copyright © 2020 Yannick LORIOT. All rights reserved.
 //
 
-#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
 
 //! Project version number for DynamicColor.
 FOUNDATION_EXPORT double DynamicColorVersionNumber;

Examples/DynamicColor/DynamicColor.swift

@@ -0,0 +1,11 @@
+//
+//  DynamicColor.swift
+//  DynamicColor
+//
+//  Created by Yannick Loriot on 16/07/2020.
+//  Copyright © 2020 Yannick LORIOT. All rights reserved.
+//
+
+class DynamicColor {
+
+}

Examples/DynamicColor/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -13,14 +13,10 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
+	<string>1.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
 </dict>
 </plist>

Examples/DynamicColorExample.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 import WatchKit
 import Foundation
+import DynamicColor
 
 class InterfaceController: WKInterfaceController {
   @IBOutlet var tableView: WKInterfaceTable!

Examples/WatchOSExample WatchKit Extension/InterfaceController.swift

@@ -2,67 +2,97 @@
   "images" : [
     {
       "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
       "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "20x20"
     },
     {
       "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
       "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "29x29"
     },
     {
       "idiom" : "iphone",
-      "size" : "60x60",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
       "idiom" : "iphone",
-      "size" : "60x60",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
     },
     {
       "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "1x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
       "idiom" : "ipad",
-      "size" : "29x29",
-      "scale" : "2x"
+      "scale" : "1x",
+      "size" : "29x29"
     },
     {
       "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "1x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
       "idiom" : "ipad",
-      "size" : "40x40",
-      "scale" : "2x"
+      "scale" : "1x",
+      "size" : "40x40"
     },
     {
       "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "1x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
       "idiom" : "ipad",
-      "size" : "76x76",
-      "scale" : "2x"
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

Examples/WatchOSExample.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import DynamicColor
 
 class ViewController: UIViewController {
   private let colorCellIdentifier = "ColorCell"

Examples/WatchOSExample/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -24,8 +24,6 @@
  *
  */
 
-import Foundation
-
 /**
  Defines the supported color spaces.
  */

Examples/iOSExample/ViewController.swift

@@ -0,0 +1,41 @@
+/*
+* DynamicColor
+*
+* Copyright 2015-present Yannick Loriot.
+* http://yannickloriot.com
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+*
+*/
+
+/**
+ Defines the mode (i.e color space) used for grayscaling.
+
+ [More info](https://en.wikipedia.org/wiki/Lightness#Lightness_and_human_perception)
+*/
+public enum GrayscalingMode {
+  /// XYZ luminance
+  case luminance
+  /// HSL lightness
+  case lightness
+  /// RGB average
+  case average
+  /// HSV value
+  case value
+}

Sources/Array.swift Sources/Core/Array.swift

@@ -24,6 +24,8 @@
  *
  */
 
+import SwiftUI
+
 #if os(iOS) || os(tvOS) || os(watchOS)
   import UIKit
 #elseif os(OSX)
@@ -106,14 +108,21 @@ internal struct HSL {
   - returns: A DynamicColor object corresponding to the current HSV color.
   */
   func toDynamicColor() -> DynamicColor {
+    let  (r, g, b, a) = rgbaComponents()
+
+    return DynamicColor(red: r, green: g, blue: b, alpha: a)
+  }
+
+  /// Returns the RGBA components  from the current HSV color.
+  func rgbaComponents() -> (CGFloat, CGFloat, CGFloat, CGFloat) {
     let m2 = l <= 0.5 ? l * (s + 1.0) : (l + s) - (l * s)
     let m1 = (l * 2.0) - m2
 
     let r = hueToRGB(m1: m1, m2: m2, h: h + (1.0 / 3.0))
     let g = hueToRGB(m1: m1, m2: m2, h: h)
     let b = hueToRGB(m1: m1, m2: m2, h: h - (1.0 / 3.0))
-
-    return DynamicColor(red: r, green: g, blue: b, alpha: CGFloat(a))
+    
+    return (r, g, b, CGFloat(a))
   }
 
   /// Hue to RGB helper function

Sources/ContrastDisplayContext.swift Sources/Core/ContrastDisplayContext.swift

@@ -71,19 +71,3 @@ internal func roundToHex(_ x: CGFloat) -> UInt32 {
 
   return UInt32(rounded)
 }
-
-/**
- Defines the mode (i.e color space) used for grayscaling.
-
- [More info](https://en.wikipedia.org/wiki/Lightness#Lightness_and_human_perception)
-*/
-public enum GrayscalingMode {
-    /// XYZ luminance
-    case luminance
-    /// HSL lightness
-    case lightness
-    /// RGB average
-    case average
-    /// HSV value
-    case value
-}

Sources/DynamicColor+Deriving.swift Sources/Core/DynamicColor+Deriving.swift

@@ -0,0 +1,46 @@
+/*
+ * DynamicColor
+ *
+ * Copyright 2015-present Yannick Loriot.
+ * http://yannickloriot.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ */
+
+import SwiftUI
+
+#if os(iOS) || os(tvOS) || os(watchOS)
+  import UIKit
+#elseif os(OSX)
+  import AppKit
+#endif
+
+/// Convert a DynamicColor to a  SwiftUI color
+extension DynamicColor {
+  /**
+  Returns the Color from  an Dynamic Color.
+  
+  - returns: A Color (SwiftUI).
+  */
+  @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
+  func toColor() -> Color {
+    return Color(self)
+  }
+}

Sources/DynamicColor+HSB.swift Sources/Core/DynamicColor+HSB.swift

@@ -0,0 +1,37 @@
+/*
+ * DynamicColor
+ *
+ * Copyright 2015-present Yannick Loriot.
+ * http://yannickloriot.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ */
+
+import SwiftUI
+
+extension HSL {
+  @available(iOS 13.0, tvOS 13.0, watchOS 6.0, macOS 10.15, *)
+  func toColor() -> Color {
+    let (r, g, b, a) = rgbaComponents()
+    
+    return SwiftUI.Color(red: Double(r), green: Double(g), blue: Double(b), opacity: Double(a))
+  }
+}
+