From 84830f1ac61f5f8b4dca20b1133265905883c0c1 Mon Sep 17 00:00:00 2001 From: Masayuki Ono Date: Sun, 21 May 2017 12:58:24 +0900 Subject: [PATCH] Rename to animatablePath --- NativePopup/Animatable/AnimatableCrossView.swift | 2 +- NativePopup/Animatable/AnimatableDoneView.swift | 2 +- NativePopup/Animatable/HasAnimatablePath.swift | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NativePopup/Animatable/AnimatableCrossView.swift b/NativePopup/Animatable/AnimatableCrossView.swift index 42d799d..15ee8d7 100644 --- a/NativePopup/Animatable/AnimatableCrossView.swift +++ b/NativePopup/Animatable/AnimatableCrossView.swift @@ -11,7 +11,7 @@ import Foundation class AnimatableCrossView: UIView, HasAnimatablePath { let animatableLayer = CAShapeLayer() var duration: TimeInterval { return 0.4 } - var path: UIBezierPath { + 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 index e47dd99..5428aee 100644 --- a/NativePopup/Animatable/AnimatableDoneView.swift +++ b/NativePopup/Animatable/AnimatableDoneView.swift @@ -10,7 +10,7 @@ import Foundation class AnimatableDoneView: UIView, HasAnimatablePath { let animatableLayer = CAShapeLayer() - var path: UIBezierPath { + 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/HasAnimatablePath.swift b/NativePopup/Animatable/HasAnimatablePath.swift index 75f0c29..6f91377 100644 --- a/NativePopup/Animatable/HasAnimatablePath.swift +++ b/NativePopup/Animatable/HasAnimatablePath.swift @@ -9,13 +9,13 @@ import Foundation public protocol HasAnimatablePath: HasAnimatableLayer { - var path: UIBezierPath { get } + var animatablePath: UIBezierPath { get } func setupLayer() } public extension HasAnimatablePath where Self: UIView { public func setupLayer() { - animatableLayer.path = path.cgPath + animatableLayer.path = animatablePath.cgPath animatableLayer.fillColor = UIColor.clear.cgColor animatableLayer.strokeColor = tintColor.cgColor animatableLayer.lineWidth = 9