Merge pull request #99 from JakeLin/hotfix/sample_layout_ipad

Fixed border designable and mask border
IBAnimatable · Feb 15, 2016 · d629a21 · d629a21
2 parents e7fe721 + 0d4a50f
commit d629a21
Show file tree

Hide file tree

Showing 14 changed files with 252 additions and 86 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,11 +16,14 @@ TBD
 - Customise mask draw from interface builder [#50](https://github.com/JakeLin/IBAnimatable/issues/50) [#8](https://github.com/JakeLin/IBAnimatable/issues/8) [#76](https://github.com/JakeLin/IBAnimatable/issues/76):
   - Star(6) -> draw star mask with 6 sides.
   - Wave(up,50,100) -> draw a wave up mask with 50 as width, and 100 as offset.
+- `BorderDesignable` can be used directly in playground
 
 #### Bugfixes
 
 - Fixed `GradientDesignable` rotation. [#86](https://github.com/JakeLin/IBAnimatable/issues/86)
+- Fixed `BorderDesignable` after rotation.
 - Fixed mask star drawing bug. [#95](https://github.com/JakeLin/IBAnimatable/issues/95)
+- Fixed the border color / width when using with a mask. [#95](https://github.com/JakeLin/IBAnimatable/issues/101)
 
 ### [1.1](https://github.com/JakeLin/IBAnimatable/releases/tag/V1.1)
 

diff --git a/IBAnimatable.playground/Pages/Predefined Animations.xcplaygroundpage/Contents.swift b/IBAnimatable.playground/Pages/Predefined Animations.xcplaygroundpage/Contents.swift
@@ -22,8 +22,11 @@ view.configAnimatableProperties()
 iPhoneView.addSubview(view)
 
 view.fillColor = UIColor(red: 0xba/0xff, green: 0x77/0xff, blue: 1, alpha: 1)
+view.borderWidth = 2
+view.borderColor = UIColor.purpleColor()
 view.maskType = "Circle"
 
+
 //: Animations, all supported predefined animations can be found in `enum AnimationType`  
 
 // Uncomment one line to play the animation

diff --git a/IBAnimatable/AnimatableButton.swift b/IBAnimatable/AnimatableButton.swift
@@ -34,9 +34,23 @@ import UIKit
   }
 
   // MARK: - BorderDesignable
-  @IBInspectable public var borderColor: UIColor?
-  @IBInspectable public var borderWidth: CGFloat = CGFloat.NaN
-  @IBInspectable public var borderSide: String?
+  @IBInspectable public var borderColor: UIColor? {
+    didSet {
+      configBorder()
+    }
+  }
+
+  @IBInspectable public var borderWidth: CGFloat = CGFloat.NaN {
+    didSet {
+      configBorder()
+    }
+  }
+
+  @IBInspectable public var borderSide: String? {
+    didSet {
+      configBorder()
+    }
+  }
 
   // MARK: - ShadowDesignable
   @IBInspectable public var shadowColor: UIColor? {
@@ -67,6 +81,7 @@ import UIKit
   @IBInspectable public var maskType: String? {
     didSet {
       configMask()
+      configBorder()
     }
   }
 
@@ -93,13 +108,16 @@ import UIKit
 
   public override func layoutSubviews() {
     super.layoutSubviews()
-
+    configAfterLayoutSubviews()
     autoRunAnimation()
   }
 
   // MARK: - Private
   private func configInspectableProperties() {
     configAnimatableProperties()
+  }
+
+  private func configAfterLayoutSubviews() {
     configBorder()
   }
 }
diff --git a/IBAnimatable/AnimatableCheckBox.swift b/IBAnimatable/AnimatableCheckBox.swift
@@ -53,9 +53,23 @@ import UIKit
   }
 
   // MARK: - BorderDesignable
-  @IBInspectable public var borderColor: UIColor?
-  @IBInspectable public var borderWidth: CGFloat = CGFloat.NaN
-  @IBInspectable public var borderSide: String?
+  @IBInspectable public var borderColor: UIColor? {
+    didSet {
+      configBorder()
+    }
+  }
+
+  @IBInspectable public var borderWidth: CGFloat = CGFloat.NaN {
+    didSet {
+      configBorder()
+    }
+  }
+
+  @IBInspectable public var borderSide: String? {
+    didSet {
+      configBorder()
+    }
+  }
 
   // MARK: - ShadowDesignable
   @IBInspectable public var shadowColor: UIColor? {
@@ -86,6 +100,7 @@ import UIKit
   @IBInspectable public var maskType: String? {
     didSet {
       configMask()
+      configBorder()
     }
   }
 
@@ -114,7 +129,7 @@ import UIKit
 
   public override func layoutSubviews() {
     super.layoutSubviews()
-
+    configAfterLayoutSubviews()
     autoRunAnimation()
   }
 
@@ -135,6 +150,9 @@ import UIKit
 
   private func configInspectableProperties() {
     configAnimatableProperties()
+  }
+
+  private func configAfterLayoutSubviews() {
     configBorder()
   }
 }
diff --git a/IBAnimatable/AnimatableImageView.swift b/IBAnimatable/AnimatableImageView.swift
@@ -34,9 +34,23 @@ import UIKit
   }
 
   // MARK: - BorderDesignable
-  @IBInspectable public var borderColor: UIColor?
-  @IBInspectable public var borderWidth: CGFloat = CGFloat.NaN
-  @IBInspectable public var borderSide: String?
+  @IBInspectable public var borderColor: UIColor? {
+    didSet {
+      configBorder()
+    }
+  }
+
+  @IBInspectable public var borderWidth: CGFloat = CGFloat.NaN {
+    didSet {
+      configBorder()
+    }
+  }
+
+  @IBInspectable public var borderSide: String? {
+    didSet {
+      configBorder()
+    }
+  }
 
   // MARK: - RotationDesignable
   @IBInspectable public var rotate: CGFloat = CGFloat.NaN {
@@ -90,6 +104,7 @@ import UIKit
   @IBInspectable public var maskType: String? {
     didSet {
       configMask()
+      configBorder()      
     }
   }
 
@@ -116,15 +131,19 @@ import UIKit
 
   public override func layoutSubviews() {
     super.layoutSubviews()
+    configAfterLayoutSubviews()
     autoRunAnimation()
   }
 
   // MARK: - Private
   private func configInspectableProperties() {
     configAnimatableProperties()
-    configBorder()
     configTintedColor()
     configBlurEffectStyle()
     configGradient()
   }
+
+  private func configAfterLayoutSubviews() {
+    configBorder()
+  }
 }
diff --git a/IBAnimatable/AnimatableStackView.swift b/IBAnimatable/AnimatableStackView.swift
@@ -36,9 +36,23 @@ import UIKit
   }
 
   // MARK: - BorderDesignable
-  @IBInspectable public var borderColor: UIColor?
-  @IBInspectable public var borderWidth: CGFloat = CGFloat.NaN
-  @IBInspectable public var borderSide: String?
+  @IBInspectable public var borderColor: UIColor? {
+    didSet {
+      configBorder()
+    }
+  }
+
+  @IBInspectable public var borderWidth: CGFloat = CGFloat.NaN {
+    didSet {
+      configBorder()
+    }
+  }
+
+  @IBInspectable public var borderSide: String? {
+    didSet {
+      configBorder()
+    }
+  }
 
   // MARK: - RotationDesignable
   @IBInspectable public var rotate: CGFloat = CGFloat.NaN {
@@ -92,6 +106,7 @@ import UIKit
   @IBInspectable public var maskType: String? {
     didSet {
       configMask()
+      configBorder()      
     }
   }
 
@@ -118,15 +133,19 @@ import UIKit
 
   public override func layoutSubviews() {
     super.layoutSubviews()
+    configAfterLayoutSubviews()
     autoRunAnimation()
   }
 
   // MARK: - Private
   private func configInspectableProperties() {
     configAnimatableProperties()
-    configBorder()
     configTintedColor()
     configBlurEffectStyle()
     configGradient()
   }
+
+  private func configAfterLayoutSubviews() {
+    configBorder()
+  }
 }
diff --git a/IBAnimatable/AnimatableTableView.swift b/IBAnimatable/AnimatableTableView.swift
@@ -27,9 +27,23 @@ import UIKit
   }
 
   // MARK: - BorderDesignable
-  @IBInspectable public var borderColor: UIColor?
-  @IBInspectable public var borderWidth: CGFloat = CGFloat.NaN
-  @IBInspectable public var borderSide: String?
+  @IBInspectable public var borderColor: UIColor? {
+    didSet {
+      configBorder()
+    }
+  }
+
+  @IBInspectable public var borderWidth: CGFloat = CGFloat.NaN {
+    didSet {
+      configBorder()
+    }
+  }
+
+  @IBInspectable public var borderSide: String? {
+    didSet {
+      configBorder()
+    }
+  }
 
   // MARK: - GradientDesignable
   @IBInspectable public var startColor: UIColor?
@@ -61,13 +75,17 @@ import UIKit
   public override func layoutSubviews() {
     super.layoutSubviews()
     autoRunAnimation()
+    configAfterLayoutSubviews()
   }
 
   // MARK: - Private
   private func configInspectableProperties() {
     configAnimatableProperties()
     configOpacity()
-    configBorder()
     configGradient()
   }
+
+  private func configAfterLayoutSubviews() {
+    configBorder()
+  }
 }
diff --git a/IBAnimatable/AnimatableTableViewCell.swift b/IBAnimatable/AnimatableTableViewCell.swift
@@ -27,9 +27,23 @@ import UIKit
   }
 
   // MARK: - BorderDesignable
-  @IBInspectable public var borderColor: UIColor?
-  @IBInspectable public var borderWidth: CGFloat = CGFloat.NaN
-  @IBInspectable public var borderSide: String?
+  @IBInspectable public var borderColor: UIColor? {
+    didSet {
+      configBorder()
+    }
+  }
+
+  @IBInspectable public var borderWidth: CGFloat = CGFloat.NaN {
+    didSet {
+      configBorder()
+    }
+  }
+
+  @IBInspectable public var borderSide: String? {
+    didSet {
+      configBorder()
+    }
+  }
 
   // MARK: - TableViewCellDesignable
   @IBInspectable public var removeSeparatorMargins: Bool = false
@@ -63,15 +77,19 @@ import UIKit
 
   public override func layoutSubviews() {
     super.layoutSubviews()
+    configAfterLayoutSubviews()
     autoRunAnimation()
   }
 
   // MARK: - Private
   private func configInspectableProperties() {
     configAnimatableProperties()
     configOpacity()
-    configBorder()
     configSeparatorMargins()
     configGradient()
   }
+
+  private func configAfterLayoutSubviews() {
+    configBorder()
+  }
 }
diff --git a/IBAnimatable/AnimatableTextField.swift b/IBAnimatable/AnimatableTextField.swift
@@ -34,9 +34,23 @@ import UIKit
   }
 
   // MARK: - BorderDesignable
-  @IBInspectable public var borderColor: UIColor?
-  @IBInspectable public var borderWidth: CGFloat = CGFloat.NaN
-  @IBInspectable public var borderSide: String?
+  @IBInspectable public var borderColor: UIColor? {
+    didSet {
+      configBorder()
+    }
+  }
+
+  @IBInspectable public var borderWidth: CGFloat = CGFloat.NaN {
+    didSet {
+      configBorder()
+    }
+  }
+
+  @IBInspectable public var borderSide: String? {
+    didSet {
+      configBorder()
+    }
+  }
 
   // MARK: - ShadowDesignable
   @IBInspectable public var shadowColor: UIColor? {
@@ -123,14 +137,17 @@ import UIKit
 
   public override func layoutSubviews() {
     super.layoutSubviews()
-
+    configAfterLayoutSubviews()
     autoRunAnimation()
   }
 
   // MARK: - Private
   private func configInspectableProperties() {
     configAnimatableProperties()
-    configBorder()
     configLeftImage()
   }
+
+  private func configAfterLayoutSubviews() {
+    configBorder()
+  }
 }