Merge branch 'release/1.1.5'

loregr · Feb 18, 2019 · 8e93b6d · 8e93b6d
2 parents d081e18 + 42f794d
commit 8e93b6d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/LGButton.podspec b/LGButton.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'LGButton'
-  s.version          = '1.1.4'
+  s.version          = '1.1.5'
   s.summary          = 'A fully customisable subclass of the native UIControl which allows you to create beautiful buttons without writing any line of code.'
   s.homepage         = 'https://cocoapods.org/pods/LGButton'
   s.license          = { :type => 'MIT', :file => 'LICENSE.md' }

diff --git a/LGButton/Classes/LGButton.swift b/LGButton/Classes/LGButton.swift
@@ -363,7 +363,7 @@ open class LGButton: UIControl {
     public var attributedString: NSAttributedString? {
         didSet {
             titleLbl.attributedText = attributedString
-         }
+        }
     }
 
     // MARK: - Overrides
@@ -631,7 +631,7 @@ open class LGButton: UIControl {
     // MARK: - Xib file
     // MARK:
     fileprivate func xibSetup() {
-		guard rootView == nil else { return }
+        guard rootView == nil else { return }
         rootView = loadViewFromNib()
         rootView.frame = bounds
         rootView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
@@ -662,7 +662,6 @@ open class LGButton: UIControl {
             if !showTouchFeedback {
                 return
             }
-
             touchAlpha = (pressed) ? .touched : .untouched
         }
     }
@@ -672,11 +671,10 @@ open class LGButton: UIControl {
     }
 
     override open func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?){
-        let shouldSendActions = pressed
-        pressed = false
-        if shouldSendActions{
+        if pressed {
             sendActions(for: .touchUpInside)
         }
+        pressed = false
     }
 
     override open func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent?){
@@ -706,10 +704,12 @@ open class LGButton: UIControl {
     }
 
     @IBAction func tapAction(_ sender: Any) {
-        let shouldSendActions = pressed
-        pressed = false
-        if shouldSendActions{
-            sendActions(for: .touchUpInside)
+        sendActions(for: .touchUpInside)
+        if !isLoading {
+            pressed = true
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+                self.pressed = false
+            }
         }
     }
 }
diff --git a/FontAwesome.ttf → LGButton/Resources/FontAwesome.ttf b/FontAwesome.ttf → LGButton/Resources/FontAwesome.ttf
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ Icons are managed by [SwiftIconFont](https://github.com/0x73/SwiftIconFont) inte
 
 | Collection         | Font name | Cheat Sheet                               |
 |--------------|--------|-------------------------------------------|
-| Font Awesome | fa    | [List](http://fontawesome.io/cheatsheet/) |
+| Font Awesome | fa    | [List](https://fontawesome.com/v4.7.0/icons/) |
 | Ion Icons    | io    | [List](http://ionicons.com)               |
 | Octicons     | oc    | [List](https://octicons.github.com)       |
 | Open Iconic  | ic    | [List](https://useiconic.com/open/)       |