Bump version

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change log
 
+## [Version 3.3]()
+
+- [ADD] Support alpha channel with the hex strings (e.g. #FF0934CC)
+
 ## [Version 3.2.1](https://github.com/yannickl/DynamicColor/releases/tag/3.2.1)
 *Released on 2016-12-15.*
 

DynamicColor.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'DynamicColor'
-  s.version          = '3.2.1'
+  s.version          = '3.3'
   s.license          = 'MIT'
   s.summary          = 'Yet another extension to manipulate colors easily in Swift (UIColor and NSColor)'
   s.homepage         = 'https://github.com/yannickl/DynamicColor.git'

Examples/DynamicColor/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.2.1</string>
+	<string>3.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Examples/DynamicColorExample.xcodeproj/project.pbxproj

@@ -1519,6 +1519,7 @@
 				CE86888E1E2C163400207CAC /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		CE8688AC1E2C1AB300207CAC /* Build configuration list for PBXNativeTarget "DynamicColorTvOs" */ = {
 			isa = XCConfigurationList;
@@ -1527,6 +1528,7 @@
 				CE8688AE1E2C1AB300207CAC /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		CE8688C81E2C1B3000207CAC /* Build configuration list for PBXNativeTarget "DynamicColorWatchOs" */ = {
 			isa = XCConfigurationList;
@@ -1535,6 +1537,7 @@
 				CE8688CA1E2C1B3000207CAC /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		CEA4D1371D95642900B12DAB /* Build configuration list for PBXNativeTarget "iOSTests" */ = {
 			isa = XCConfigurationList;

Examples/DynamicColorMacOS/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.2.1</string>
+	<string>3.3</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>

Examples/DynamicColorTvOs/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.2.1</string>
+	<string>3.3</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

Examples/DynamicColorWatchOs/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.2.1</string>
+	<string>3.3</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

Examples/iOSExample/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.2.1</string>
+	<string>3.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Examples/tvOSExample/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.2.1</string>
+	<string>3.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

README.md

@@ -235,7 +235,7 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '8.0'
 
 use_frameworks!
-pod 'DynamicColor', '~> 3.2.1'
+pod 'DynamicColor', '~> 3.3'
 ```
 
 Install into your project:
@@ -266,7 +266,7 @@ $ brew install carthage
 To integrate `DynamicColor` into your Xcode project using Carthage, specify it in your `Cartfile` file:
 
 ```ogdl
-github "yannickl/DynamicColor" >= 3.2.1
+github "yannickl/DynamicColor" >= 3.3
 ```
 
 #### Swift Package Manager
@@ -278,7 +278,7 @@ let package = Package(
     name: "YOUR_PROJECT_NAME",
     targets: [],
     dependencies: [
-        .Package(url: "https://github.com/yannickl/DynamicColor.git", versions: "3.2.1" ..< Version.max)
+        .Package(url: "https://github.com/yannickl/DynamicColor.git", versions: "3.3" ..< Version.max)
     ]
 )
 ```

Sources/DynamicColor.swift

@@ -65,7 +65,7 @@ public extension DynamicColor {
     var color: UInt32 = 0
 
     if scanner.scanHexInt32(&color) {
-      self.init(hex: color, withAlphaChannel: hexString.characters.count > 7)
+      self.init(hex: color, useAlpha: hexString.characters.count > 7)
     }
     else {
       self.init(hex: 0x000000)
@@ -76,14 +76,15 @@ public extension DynamicColor {
    Creates a color from an hex integer (e.g. 0x3498db).
 
    - parameter hex: A hexa-decimal UInt32 that represents a color.
+   - parameter alphaChannel: If true the given hex-decimal UInt32 includes the alpha channel (e.g. 0xFF0000FF).
    */
-  public convenience init(hex: UInt32, withAlphaChannel: Bool = false) {
+  public convenience init(hex: UInt32, useAlpha alphaChannel: Bool = false) {
     let mask = 0xFF
 
-    let r = Int(hex >> (withAlphaChannel ? 24 : 16)) & mask
-    let g = Int(hex >> (withAlphaChannel ? 16 : 8)) & mask
-    let b = Int(hex >> (withAlphaChannel ? 8 : 0)) & mask
-    let a = withAlphaChannel ? Int(hex) & mask : 255
+    let r = Int(hex >> (alphaChannel ? 24 : 16)) & mask
+    let g = Int(hex >> (alphaChannel ? 16 : 8)) & mask
+    let b = Int(hex >> (alphaChannel ? 8 : 0)) & mask
+    let a = alphaChannel ? Int(hex) & mask : 255
 
     let red   = CGFloat(r) / 255
     let green = CGFloat(g) / 255