Merge pull request #10 from mono0926/refactor

Change to AnimatablePathView class from HasAnimatablePath protocol🙇
mono0926 · May 21, 2017 · f7937ac · f7937ac
2 parents ebf72a7 + e14d890
commit f7937ac
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 20 deletions.
diff --git a/NativePopup/Animatable/Animatable.swift b/NativePopup/Animatable/Animatable.swift
@@ -8,11 +8,11 @@
 
 import Foundation
 
-public protocol Animatable {
+protocol Animatable {
     func animate()
     var duration: TimeInterval { get }
 }
 
-public extension Animatable {
+extension Animatable {
     var duration: TimeInterval { return 0.3 }
 }
diff --git a/NativePopup/Animatable/AnimatableCrossView.swift b/NativePopup/Animatable/AnimatableCrossView.swift
@@ -8,10 +8,9 @@
 
 import Foundation
 
-class AnimatableCrossView: UIView, HasAnimatablePath {
-    let animatableLayer = CAShapeLayer()
+class AnimatableCrossView: AnimatablePathView {
     var duration: TimeInterval { return 0.4 }
-    var path: UIBezierPath {
+    override var animatablePath: UIBezierPath {
         let length = frame.width
         let path = UIBezierPath()
         path.move(to: CGPoint(x: length * 0.1, y: length * 0.1))

diff --git a/NativePopup/Animatable/AnimatableDoneView.swift b/NativePopup/Animatable/AnimatableDoneView.swift
@@ -8,9 +8,8 @@
 
 import Foundation
 
-class AnimatableDoneView: UIView, HasAnimatablePath {
-    let animatableLayer = CAShapeLayer()
-    var path: UIBezierPath {
+class AnimatableDoneView: AnimatablePathView {
+    override var animatablePath: UIBezierPath {
         let length = frame.width
         let path = UIBezierPath()
         path.move(to: CGPoint(x: length * 0.196, y: length * 0.527))

diff --git a/NativePopup/Animatable/HasAnimatableLayer.swift b/NativePopup/Animatable/HasAnimatableLayer.swift
@@ -8,12 +8,12 @@
 
 import Foundation
 
-public protocol HasAnimatableLayer: Animatable {
+protocol HasAnimatableLayer: Animatable {
     var animatableLayer: CAShapeLayer { get }
 }
 
-public extension HasAnimatableLayer {
-    public func animate() {
+extension HasAnimatableLayer {
+    func animate() {
         let animation = CABasicAnimation(keyPath: "strokeEnd")
         animation.duration = duration
         animation.fromValue = 0

diff --git a/NativePopup/Animatable/HasAnimatablePath.swift b/NativePopup/Animatable/HasAnimatablePath.swift
@@ -8,14 +8,11 @@
 
 import Foundation
 
-public protocol HasAnimatablePath: HasAnimatableLayer {
-    var path: UIBezierPath { get }
-    func setupLayer()
-}
-
-public extension HasAnimatablePath where Self: UIView {
-    public func setupLayer() {
-        animatableLayer.path = path.cgPath
+open class AnimatablePathView: UIView, HasAnimatableLayer {
+    let animatableLayer = CAShapeLayer()
+    open var animatablePath: UIBezierPath { fatalError("Should be overridden.") }
+    func setupLayer() {
+        animatableLayer.path = animatablePath.cgPath
         animatableLayer.fillColor = UIColor.clear.cgColor
         animatableLayer.strokeColor = tintColor.cgColor
         animatableLayer.lineWidth = 9

diff --git a/NativePopup/NativePopup.swift b/NativePopup/NativePopup.swift
@@ -110,7 +110,7 @@ public class NativePopup: UIView {
 
         [self, effectView, imageView, titleLabel, messageLabel].forEach { $0.translatesAutoresizingMaskIntoConstraints = false }
 
-        if let animatable = imageView as? HasAnimatablePath {
+        if let animatable = imageView as? AnimatablePathView {
             imageView.layoutIfNeeded()
             animatable.setupLayer()
         }