Merge pull request MengTo#214 from MengTo/swift3

ImageLoader fix

Author: MengTo

Spring/ImageLoader.swift

@@ -37,7 +37,19 @@ public class ImageLoader {
 
     public func imageForUrl(urlString: String, completionHandler: @escaping(_ image: UIImage?, _ url: String) -> ()) {
         DispatchQueue.global(qos: DispatchQoS.QoSClass.background).async { 
-            let data: NSData? = self.cache.object(forKey: urlString as NSString)! as NSData
+            var data: NSData?
+            
+            if let dataCache = self.cache.object(forKey: urlString as NSString){
+                data = (dataCache) as NSData
+                
+            }else{
+                if (URL(string: urlString) != nil)
+                {
+                    data = NSData(contentsOf: URL(string: urlString)!)
+                }else{
+                    return
+                }
+            }
 
             if let goodData = data {
                 let image = UIImage(data: goodData as Data)

Spring/SpringButton.swift

@@ -22,7 +22,7 @@
 
 import UIKit
 
-public class SpringButton: UIButton, Springable {
+open class SpringButton: UIButton, Springable {
     @IBInspectable public var autostart: Bool = false
     @IBInspectable public var autohide: Bool = false
     @IBInspectable public var animation: String = ""
@@ -43,12 +43,12 @@ public class SpringButton: UIButton, Springable {
 
     lazy private var spring : Spring = Spring(self)
 
-    override public func awakeFromNib() {
+    override open func awakeFromNib() {
         super.awakeFromNib()
         self.spring.customAwakeFromNib()
     }
 
-    public override func layoutSubviews() {
+    open override func layoutSubviews() {
         super.layoutSubviews()
         spring.customLayoutSubviews()
     }

Spring/SpringImageView.swift

@@ -22,7 +22,7 @@
 
 import UIKit
 
-public class SpringImageView: UIImageView, Springable {
+open class SpringImageView: UIImageView, Springable {
     @IBInspectable public var autostart: Bool = false
     @IBInspectable public var autohide: Bool = false
     @IBInspectable public var animation: String = ""
@@ -43,12 +43,12 @@ public class SpringImageView: UIImageView, Springable {
 
     lazy private var spring : Spring = Spring(self)
 
-    override public func awakeFromNib() {
+    override open func awakeFromNib() {
         super.awakeFromNib()
         self.spring.customAwakeFromNib()
     }
 
-    public override func layoutSubviews() {
+    open override func layoutSubviews() {
         super.layoutSubviews()
         spring.customLayoutSubviews()
     }

Spring/SpringLabel.swift

@@ -22,7 +22,7 @@
 
 import UIKit
 
-public class SpringLabel: UILabel, Springable {
+open class SpringLabel: UILabel, Springable {
     @IBInspectable public var autostart: Bool = false
     @IBInspectable public var autohide: Bool = false
     @IBInspectable public var animation: String = ""
@@ -43,12 +43,12 @@ public class SpringLabel: UILabel, Springable {
 
     lazy private var spring : Spring = Spring(self)
 
-    override public func awakeFromNib() {
+    override open func awakeFromNib() {
         super.awakeFromNib()
         self.spring.customAwakeFromNib()
     }
 
-    public override func layoutSubviews() {
+    open override func layoutSubviews() {
         super.layoutSubviews()
         spring.customLayoutSubviews()
     }

Spring/SpringTextField.swift

@@ -22,7 +22,7 @@
 
 import UIKit
 
-public class SpringTextField: UITextField, Springable {
+open class SpringTextField: UITextField, Springable {
     @IBInspectable public var autostart: Bool = false
     @IBInspectable public var autohide: Bool = false
     @IBInspectable public var animation: String = ""
@@ -43,12 +43,12 @@ public class SpringTextField: UITextField, Springable {
 
     lazy private var spring : Spring = Spring(self)
 
-    override public func awakeFromNib() {
+    override open func awakeFromNib() {
         super.awakeFromNib()
         self.spring.customAwakeFromNib()
     }
 
-    public override func layoutSubviews() {
+    open override func layoutSubviews() {
         super.layoutSubviews()
         spring.customLayoutSubviews()
     }

Spring/SpringTextView.swift

@@ -22,7 +22,7 @@
 
 import UIKit
 
-public class SpringTextView: UITextView, Springable {
+open class SpringTextView: UITextView, Springable {
     @IBInspectable public var autostart: Bool = false
     @IBInspectable public var autohide: Bool = false
     @IBInspectable public var animation: String = ""
@@ -43,12 +43,12 @@ public class SpringTextView: UITextView, Springable {
 
     lazy private var spring : Spring = Spring(self)
 
-    override public func awakeFromNib() {
+    override open func awakeFromNib() {
         super.awakeFromNib()
         self.spring.customAwakeFromNib()
     }
 
-    public override func layoutSubviews() {
+    open override func layoutSubviews() {
         super.layoutSubviews()
         spring.customLayoutSubviews()
     }

Spring/SpringView.swift

@@ -22,7 +22,7 @@
 
 import UIKit
 
-public class SpringView: UIView, Springable {
+open class SpringView: UIView, Springable {
     @IBInspectable public var autostart: Bool = false
     @IBInspectable public var autohide: Bool = false
     @IBInspectable public var animation: String = ""
@@ -43,12 +43,12 @@ public class SpringView: UIView, Springable {
 
     lazy private var spring : Spring = Spring(self)
 
-    override public func awakeFromNib() {
+    override open func awakeFromNib() {
         super.awakeFromNib()
         self.spring.customAwakeFromNib()
     }
 
-    public override func layoutSubviews() {
+    open override func layoutSubviews() {
         super.layoutSubviews()
         spring.customLayoutSubviews()
     }