MengTo · sageibra · Feb 5, 2021 · Feb 5, 2021 · Feb 5, 2021 · Feb 5, 2021
diff --git a/Spring/AsyncButton.swift b/Spring/AsyncButton.swift
@@ -24,11 +24,10 @@ import UIKit
 
 public class AsyncButton: UIButton {
 
-    private var imageURL = [UInt:NSURL]()
-    private var placeholderImage = [UInt:UIImage]()
+    private var imageURL = [UInt: NSURL]()
+    private var placeholderImage = [UInt: UIImage]()
 
-
-    public func setImageURL(url: NSURL?, placeholderImage placeholder:UIImage?, forState state:UIControl.State) {
+    public func setImageURL(url: NSURL?, placeholderImage placeholder: UIImage?, forState state: UIControl.State) {
 
         imageURL[state.rawValue] = url
         placeholderImage[state.rawValue] = placeholder
@@ -47,5 +46,4 @@ public class AsyncButton: UIButton {
             }
         }
     }
-
 }
diff --git a/Spring/AsyncImageView.swift b/Spring/AsyncImageView.swift
@@ -24,9 +24,8 @@ import UIKit
 
 public class AsyncImageView: UIImageView {
 
-    public var placeholderImage : UIImage?
-
-    public var url : NSURL? {
+    public var placeholderImage: UIImage?
+    public var url: NSURL? {
         didSet {
             self.image = placeholderImage
             if let urlString = url?.absoluteString {

diff --git a/Spring/AutoTextView.swift b/Spring/AutoTextView.swift
@@ -9,7 +9,8 @@
 import UIKit
 
 public class AutoTextView: UITextView {
-
+
+    private let edgeInset: CGFloat = 4
     public override var intrinsicContentSize: CGSize {
         get {
             var size = self.sizeThatFits(CGSize(width: self.frame.size.width, height: CGFloat.greatestFiniteMagnitude))
@@ -18,7 +19,7 @@ public class AutoTextView: UITextView {
                 size.height = 0
             }
 
-            contentInset = UIEdgeInsets(top: -4, left: -4, bottom: -4, right: -4)
+            contentInset = UIEdgeInsets(top: -edgeInset, left: -edgeInset, bottom: -edgeInset, right: -edgeInset)
             layoutIfNeeded()
 
             return size

diff --git a/Spring/BlurView.swift b/Spring/BlurView.swift
@@ -23,7 +23,7 @@
 import UIKit
 
 public func insertBlurView (view: UIView, style: UIBlurEffect.Style) -> UIVisualEffectView {
-    view.backgroundColor = UIColor.clear
+    view.backgroundColor = .clear
 
     let blurEffect = UIBlurEffect(style: style)
     let blurEffectView = UIVisualEffectView(effect: blurEffect)

diff --git a/Spring/DesignableButton.swift b/Spring/DesignableButton.swift
@@ -23,8 +23,8 @@
 import UIKit
 
 @IBDesignable public class DesignableButton: SpringButton {
-
-    @IBInspectable public var borderColor: UIColor = UIColor.clear {
+    
+    @IBInspectable public var borderColor: UIColor = .clear {
         didSet {
             layer.borderColor = borderColor.cgColor
         }
@@ -42,7 +42,7 @@ import UIKit
         }
     }
 
-    @IBInspectable public var shadowColor: UIColor = UIColor.clear {
+    @IBInspectable public var shadowColor: UIColor = .clear {
         didSet {
             layer.shadowColor = shadowColor.cgColor
         }
@@ -65,5 +65,5 @@ import UIKit
             layer.shadowOffset.height = shadowOffsetY
         }
     }
-
+    
 }
diff --git a/Spring/DesignableImageView.swift b/Spring/DesignableImageView.swift
@@ -24,7 +24,7 @@ import UIKit
 
 @IBDesignable public class DesignableImageView: SpringImageView {
 
-    @IBInspectable public var borderColor: UIColor = UIColor.clear {
+    @IBInspectable public var borderColor: UIColor = .clear {
         didSet {
             layer.borderColor = borderColor.cgColor
         }
@@ -41,5 +41,5 @@ import UIKit
             layer.cornerRadius = cornerRadius
         }
     }
-
+    
 }
diff --git a/Spring/DesignableLabel.swift b/Spring/DesignableLabel.swift
@@ -23,7 +23,7 @@
 import UIKit
 
 @IBDesignable public class DesignableLabel: SpringLabel {
-
+    
     @IBInspectable public var lineHeight: CGFloat = 1.5 {
         didSet {
             let font = UIFont(name: self.font.fontName, size: self.font.pointSize)
@@ -39,5 +39,5 @@ import UIKit
             self.attributedText = attributedString
         }
     }
-
+    
 }
diff --git a/Spring/DesignableTabBarController.swift b/Spring/DesignableTabBarController.swift
@@ -24,14 +24,14 @@ import UIKit
 
 @IBDesignable class DesignableTabBarController: UITabBarController {
 
-    @IBInspectable var normalTint: UIColor = UIColor.clear {
+    @IBInspectable var normalTint: UIColor = .clear {
         didSet {
             UITabBar.appearance().tintColor = normalTint
             UITabBarItem.appearance().setTitleTextAttributes([NSAttributedString.Key.foregroundColor: normalTint], for: UIControl.State())
         }
     }
 
-    @IBInspectable var selectedTint: UIColor = UIColor.clear {
+    @IBInspectable var selectedTint: UIColor = .clear {
         didSet {
             UITabBar.appearance().tintColor = selectedTint
             UITabBarItem.appearance().setTitleTextAttributes([NSAttributedString.Key.foregroundColor: selectedTint], for:UIControl.State.selected)
@@ -47,16 +47,16 @@ import UIKit
     @IBInspectable var firstSelectedImage: UIImage? {
         didSet {
             if let image = firstSelectedImage {
-                var tabBarItems = self.tabBar.items as [UITabBarItem]?
-                tabBarItems?[0].selectedImage = image.withRenderingMode(UIImage.RenderingMode.alwaysTemplate)
+                let tabBarItems = self.tabBar.items as [UITabBarItem]?
+                tabBarItems?.first?.selectedImage = image.withRenderingMode(UIImage.RenderingMode.alwaysTemplate)
             }
         }
     }
 
     @IBInspectable var secondSelectedImage: UIImage? {
         didSet {
             if let image = secondSelectedImage {
-                var tabBarItems = self.tabBar.items as [UITabBarItem]?
+                let tabBarItems = self.tabBar.items as [UITabBarItem]?
                 tabBarItems?[1].selectedImage = image.withRenderingMode(UIImage.RenderingMode.alwaysTemplate)
             }
         }
@@ -65,7 +65,7 @@ import UIKit
     @IBInspectable var thirdSelectedImage: UIImage? {
         didSet {
             if let image = thirdSelectedImage {
-                var tabBarItems = self.tabBar.items as [UITabBarItem]?
+                let tabBarItems = self.tabBar.items as [UITabBarItem]?
                 tabBarItems?[2].selectedImage = image.withRenderingMode(UIImage.RenderingMode.alwaysTemplate)
             }
         }
@@ -74,7 +74,7 @@ import UIKit
     @IBInspectable var fourthSelectedImage: UIImage? {
         didSet {
             if let image = fourthSelectedImage {
-                var tabBarItems = self.tabBar.items as [UITabBarItem]?
+                let tabBarItems = self.tabBar.items as [UITabBarItem]?
                 tabBarItems?[3].selectedImage = image.withRenderingMode(UIImage.RenderingMode.alwaysTemplate)
             }
         }
@@ -83,7 +83,7 @@ import UIKit
     @IBInspectable var fifthSelectedImage: UIImage? {
         didSet {
             if let image = fifthSelectedImage {
-                var tabBarItems = self.tabBar.items as [UITabBarItem]?
+                let tabBarItems = self.tabBar.items as [UITabBarItem]?
                 tabBarItems?[4].selectedImage = image.withRenderingMode(UIImage.RenderingMode.alwaysTemplate)
             }
         }

diff --git a/Spring/DesignableTextField.swift b/Spring/DesignableTextField.swift
@@ -24,7 +24,7 @@ import UIKit
 
 @IBDesignable public class DesignableTextField: SpringTextField {
 
-    @IBInspectable public var placeholderColor: UIColor = UIColor.clear {
+    @IBInspectable public var placeholderColor: UIColor = .clear {
         didSet {
             guard let placeholder = placeholder else { return }
             attributedPlaceholder = NSAttributedString(string: placeholder, attributes: [NSAttributedString.Key.foregroundColor: placeholderColor])
@@ -63,7 +63,7 @@ import UIKit
         }
     }
 
-    @IBInspectable public var borderColor: UIColor = UIColor.clear {
+    @IBInspectable public var borderColor: UIColor = .clear {
         didSet {
             layer.borderColor = borderColor.cgColor
         }
@@ -80,7 +80,7 @@ import UIKit
             layer.cornerRadius = cornerRadius
         }
     }
-
+    
     @IBInspectable public var lineHeight: CGFloat = 1.5 {
         didSet {
             let font = UIFont(name: self.font!.fontName, size: self.font!.pointSize)

diff --git a/Spring/DesignableTextView.swift b/Spring/DesignableTextView.swift
@@ -24,7 +24,7 @@ import UIKit
 
 @IBDesignable public class DesignableTextView: SpringTextView {
 
-    @IBInspectable public var borderColor: UIColor = UIColor.clear {
+    @IBInspectable public var borderColor: UIColor = .clear {
         didSet {
             layer.borderColor = borderColor.cgColor
         }

diff --git a/Spring/DesignableView.swift b/Spring/DesignableView.swift
@@ -24,7 +24,7 @@ import UIKit
 
 @IBDesignable public class DesignableView: SpringView {
 
-    @IBInspectable public var borderColor: UIColor = UIColor.clear {
+    @IBInspectable public var borderColor: UIColor = .clear {
         didSet {
             layer.borderColor = borderColor.cgColor
         }
@@ -42,7 +42,7 @@ import UIKit
         }
     }
 
-    @IBInspectable public var shadowColor: UIColor = UIColor.clear {
+    @IBInspectable public var shadowColor: UIColor = .clear {
         didSet {
             layer.shadowColor = shadowColor.cgColor
         }

diff --git a/Spring/ImageLoader.swift b/Spring/ImageLoader.swift
@@ -21,16 +21,14 @@
 // SOFTWARE.
 
 import UIKit
-import Foundation
-
 
 public class ImageLoader {
 
     var cache = NSCache<NSString, NSData>()
 
-    public class var sharedLoader : ImageLoader {
+    public class var sharedLoader: ImageLoader {
         struct Static {
-            static let instance : ImageLoader = ImageLoader()
+            static let instance: ImageLoader = ImageLoader()
         }
         return Static.instance
     }

diff --git a/Spring/KeyboardLayoutConstraint.swift b/Spring/KeyboardLayoutConstraint.swift
@@ -26,8 +26,8 @@ import UIKit
 @available(tvOS, unavailable)
 public class KeyboardLayoutConstraint: NSLayoutConstraint {
 
-    private var offset : CGFloat = 0
-    private var keyboardVisibleHeight : CGFloat = 0
+    private var offset: CGFloat = 0
+    private var keyboardVisibleHeight: CGFloat = 0
 
     @available(tvOS, unavailable)
     override public func awakeFromNib() {
@@ -66,14 +66,12 @@ public class KeyboardLayoutConstraint: NSLayoutConstraint {
                         UIApplication.shared.keyWindow?.layoutIfNeeded()
                         return
                     }, completion: { finished in
-                })
+                    })
             default:
 
                 break
             }
-
         }
-
     }
 
     @objc func keyboardWillHideNotification(_ notification: NSNotification) {
@@ -95,7 +93,7 @@ public class KeyboardLayoutConstraint: NSLayoutConstraint {
                         UIApplication.shared.keyWindow?.layoutIfNeeded()
                         return
                     }, completion: { finished in
-                })
+                    })
             default:
                 break
             }
@@ -107,4 +105,5 @@ public class KeyboardLayoutConstraint: NSLayoutConstraint {
     }
 
 }
+
 #endif
diff --git a/Spring/LoadingView.swift b/Spring/LoadingView.swift
@@ -25,9 +25,9 @@ import UIKit
 #if !os(tvOS)
 @available(tvOS, unavailable)
 public class LoadingView: UIView {
-
+    
     @IBOutlet public weak var indicatorView: SpringView!
-
+    
     override public func awakeFromNib() {
         let animation = CABasicAnimation()
         animation.keyPath = "transform.rotation.z"
@@ -37,42 +37,41 @@ public class LoadingView: UIView {
         animation.repeatCount = HUGE
         indicatorView.layer.add(animation, forKey: "")
     }
-
+    
     class func designCodeLoadingView() -> UIView {
-
-        return Bundle(for: self).loadNibNamed("LoadingView", owner: self, options: nil)![0] as! UIView
+        return Bundle(for: self).loadNibNamed("LoadingView", owner: self, options: nil)!.first as! UIView
     }
 }
 
 public extension UIView {
-
+    
     struct LoadingViewConstants {
         static let Tag = 1000
     }
-
-    public func showLoading() {
-
+    
+    func showLoading() {
+        
         if self.viewWithTag(LoadingViewConstants.Tag) != nil {
             // If loading view is already found in current view hierachy, do nothing
             return
         }
-
+        
         let loadingXibView = LoadingView.designCodeLoadingView()
         loadingXibView.frame = self.bounds
         loadingXibView.tag = LoadingViewConstants.Tag
         self.addSubview(loadingXibView)
-
+        
         loadingXibView.alpha = 0
         SpringAnimation.spring(duration: 0.7, animations: {
             loadingXibView.alpha = 1
         })
     }
-
-    public func hideLoading() {
-
+    
+    func hideLoading() {
+        
         if let loadingXibView = self.viewWithTag(LoadingViewConstants.Tag) {
             loadingXibView.alpha = 1
-
+            
             SpringAnimation.springWithCompletion(duration: 0.7, animations: {
                 loadingXibView.alpha = 0
                 loadingXibView.transform = CGAffineTransform(scaleX: 3, y: 3)
@@ -81,6 +80,6 @@ public extension UIView {
             })
         }
     }
-
 }
+
 #endif