fix: bug #149 animation stopped when modal is presented

Juanpe · Aug 26, 2019 · 2f2e542 · 2f2e542
1 parent 15764de
commit 2f2e542
Show file tree

Hide file tree

Showing 10 changed files with 130 additions and 67 deletions.
diff --git a/Example/TableView/Base.lproj/Main.storyboard b/Example/TableView/Base.lproj/Main.storyboard
@@ -41,7 +41,7 @@
                                                         <userDefinedRuntimeAttribute type="boolean" keyPath="isSkeletonable" value="YES"/>
                                                     </userDefinedRuntimeAttributes>
                                                 </imageView>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="15" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VhU-1t-AaI">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VhU-1t-AaI">
                                                     <rect key="frame" x="118" y="29" width="237" height="20.5"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" relation="lessThanOrEqual" constant="71" id="HRL-cI-ieC"/>

diff --git a/Example/TableView/ViewController.swift b/Example/TableView/ViewController.swift
@@ -46,10 +46,6 @@ class ViewController: UIViewController {
         super.viewDidLoad()
         tableview.isSkeletonable = true
     }
-
-    override func viewDidLayoutSubviews() {
-        view.layoutSkeletonIfNeeded()
-    }
 
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)

diff --git a/SkeletonView.xcodeproj/project.pbxproj b/SkeletonView.xcodeproj/project.pbxproj
@@ -78,6 +78,8 @@
 		F54CF5E52024CEB000330B0D /* UITableView+CollectionSkeleton.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54CF5E22024CEAF00330B0D /* UITableView+CollectionSkeleton.swift */; };
 		F54CF5E62024CEB000330B0D /* UICollectionView+CollectionSkeleton.swift in Sources */ = {isa = PBXBuildFile; fileRef = F54CF5E32024CEB000330B0D /* UICollectionView+CollectionSkeleton.swift */; };
 		F56B94461FAE20AF0095662F /* PrepareForSkeletonProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = F56B94451FAE20AF0095662F /* PrepareForSkeletonProtocol.swift */; };
+		F570ABF42314629700390248 /* Swizzling.swift in Sources */ = {isa = PBXBuildFile; fileRef = F570ABF32314629700390248 /* Swizzling.swift */; };
+		F570ABF52314629700390248 /* Swizzling.swift in Sources */ = {isa = PBXBuildFile; fileRef = F570ABF32314629700390248 /* Swizzling.swift */; };
 		F5804772230ECD0000066D02 /* UIView+IBInspectable.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5804771230ECD0000066D02 /* UIView+IBInspectable.swift */; };
 		F5804773230ECD0000066D02 /* UIView+IBInspectable.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5804771230ECD0000066D02 /* UIView+IBInspectable.swift */; };
 		F587FB84202CBFC8002DB5FE /* SkeletonFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = F587FB83202CBFC8002DB5FE /* SkeletonFlow.swift */; };
@@ -185,6 +187,7 @@
 		F54CF5E22024CEAF00330B0D /* UITableView+CollectionSkeleton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UITableView+CollectionSkeleton.swift"; sourceTree = "<group>"; };
 		F54CF5E32024CEB000330B0D /* UICollectionView+CollectionSkeleton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UICollectionView+CollectionSkeleton.swift"; sourceTree = "<group>"; };
 		F56B94451FAE20AF0095662F /* PrepareForSkeletonProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrepareForSkeletonProtocol.swift; sourceTree = "<group>"; };
+		F570ABF32314629700390248 /* Swizzling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Swizzling.swift; sourceTree = "<group>"; };
 		F5804771230ECD0000066D02 /* UIView+IBInspectable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+IBInspectable.swift"; sourceTree = "<group>"; };
 		F587FB83202CBFC8002DB5FE /* SkeletonFlow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SkeletonFlow.swift; sourceTree = "<group>"; };
 		F587FB85202CEC95002DB5FE /* UIView+UIApplicationDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+UIApplicationDelegate.swift"; sourceTree = "<group>"; };
@@ -437,6 +440,7 @@
 				F5F899D11FAB9630002E8FDA /* AssociationPolicy.swift */,
 				F56B94451FAE20AF0095662F /* PrepareForSkeletonProtocol.swift */,
 				F5307E311FB0F42F00EE67C5 /* RecursiveProtocol.swift */,
+				F570ABF32314629700390248 /* Swizzling.swift */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
@@ -684,6 +688,7 @@
 				17DD0E0C207FB28900C56334 /* UICollectionView+CollectionSkeleton.swift in Sources */,
 				F5804773230ECD0000066D02 /* UIView+IBInspectable.swift in Sources */,
 				17DD0E13207FB28C00C56334 /* UIView+UIApplicationDelegate.swift in Sources */,
+				F570ABF52314629700390248 /* Swizzling.swift in Sources */,
 				F5D3FB0C209DCAA300003FCF /* SubviewsSkeletonables.swift in Sources */,
 				17DD0E14207FB28F00C56334 /* SkeletonAnimationBuilder.swift in Sources */,
 				17DD0E11207FB28C00C56334 /* UIView+Frame.swift in Sources */,
@@ -740,6 +745,7 @@
 				F5F622411FAC6E31007C062A /* UIColor+Skeleton.swift in Sources */,
 				F5804772230ECD0000066D02 /* UIView+IBInspectable.swift in Sources */,
 				F587FB84202CBFC8002DB5FE /* SkeletonFlow.swift in Sources */,
+				F570ABF42314629700390248 /* Swizzling.swift in Sources */,
 				F5D3FB0B209DCAA300003FCF /* SubviewsSkeletonables.swift in Sources */,
 				F5F899D21FAB9630002E8FDA /* AssociationPolicy.swift in Sources */,
 				F54CF5E62024CEB000330B0D /* UICollectionView+CollectionSkeleton.swift in Sources */,
@@ -1038,7 +1044,7 @@
 		52D6D9911BEFF229002C0205 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				APPLICATION_EXTENSION_API_ONLY = YES;
+				APPLICATION_EXTENSION_API_ONLY = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
@@ -1063,7 +1069,7 @@
 		52D6D9921BEFF229002C0205 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				APPLICATION_EXTENSION_API_ONLY = YES;
+				APPLICATION_EXTENSION_API_ONLY = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";

diff --git a/Sources/Extensions/CALayer+Extensions.swift b/Sources/Extensions/CALayer+Extensions.swift
@@ -117,15 +117,18 @@ public extension CALayer {
         animGroup.duration = 1.5
         animGroup.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeIn)
         animGroup.repeatCount = .infinity
-        
+
         return animGroup
     }
 
-    func playAnimation(_ anim: SkeletonLayerAnimation, key: String) {
+    func playAnimation(_ anim: SkeletonLayerAnimation, key: String, completion: (() -> Void)? = nil) {
         skeletonSublayers.recursiveSearch(leafBlock: {
+            DispatchQueue.main.async { CATransaction.begin() }
+            DispatchQueue.main.async { CATransaction.setCompletionBlock(completion) }
             add(anim(self), forKey: key)
+            DispatchQueue.main.async { CATransaction.commit() }
         }) {
-            $0.playAnimation(anim, key: key)
+            $0.playAnimation(anim, key: key, completion: completion)
         }
     }
 
@@ -140,15 +143,14 @@ public extension CALayer {
 
 extension CALayer {
 	func setOpacity(from: Int, to: Int, duration: TimeInterval, completion: (() -> Void)?) {
-		CATransaction.begin()
+        DispatchQueue.main.async { CATransaction.begin() }
 		let animation = CABasicAnimation(keyPath: #keyPath(CALayer.opacity))
 		animation.fromValue = from
 		animation.toValue = to
 		animation.duration = duration
 		animation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)
-//		layer.contentLayer.opacity = 1
-		CATransaction.setCompletionBlock(completion)
+        DispatchQueue.main.async { CATransaction.setCompletionBlock(completion) }
 		add(animation, forKey: "setOpacityAnimation")
-		CATransaction.commit()
+        DispatchQueue.main.async { CATransaction.commit() }
 	}
 }
diff --git a/Sources/Extensions/UIView+Extension.swift b/Sources/Extensions/UIView+Extension.swift
@@ -42,7 +42,7 @@ extension UIView {
         set { ao_set(newValue ?? .off, pkey: &ViewAssociatedKeys.status) }
     }
 
-    var skeletonIsAnimated: Bool! {
+    var isSkeletonAnimated: Bool! {
         get { return ao_get(pkey: &ViewAssociatedKeys.isSkeletonAnimated) as? Bool ?? false }
         set { ao_set(newValue ?? false, pkey: &ViewAssociatedKeys.isSkeletonAnimated) }
     }

diff --git a/Sources/Extensions/UIView+IBInspectable.swift b/Sources/Extensions/UIView+IBInspectable.swift
@@ -13,7 +13,7 @@ public extension UIView {
         return status == .on || (subviewsSkeletonables.first(where: { $0.isSkeletonActive }) != nil)
     }
 
-    fileprivate var skeletonable: Bool! {
+    private var skeletonable: Bool! {
         get { return ao_get(pkey: &ViewAssociatedKeys.skeletonable) as? Bool ?? false }
         set { ao_set(newValue ?? false, pkey: &ViewAssociatedKeys.skeletonable) }
     }

diff --git a/Sources/Helpers/Swizzling.swift b/Sources/Helpers/Swizzling.swift
@@ -0,0 +1,27 @@
+// Copyright © 2019 SkeletonView. All rights reserved.
+
+import Foundation
+
+extension DispatchQueue {
+    private static var _onceTracker = [String]()
+
+    class func once(token: String, block:()->Void) {
+        objc_sync_enter(self); defer { objc_sync_exit(self) }
+        guard !_onceTracker.contains(token) else { return }
+
+        _onceTracker.append(token)
+        block()
+    }
+}
+
+func swizzle(selector originalSelector: Selector, with swizzledSelector: Selector, inClass: AnyClass, usingClass: AnyClass) {
+    guard let originalMethod = class_getInstanceMethod(inClass, originalSelector),
+        let swizzledMethod = class_getInstanceMethod(usingClass, swizzledSelector)
+        else { return }
+
+    if (class_addMethod(inClass, swizzledSelector, method_getImplementation(originalMethod), method_getTypeEncoding(originalMethod))) {
+        class_replaceMethod(inClass, originalSelector, method_getImplementation(swizzledMethod), method_getTypeEncoding(swizzledMethod))
+    } else {
+        method_exchangeImplementations(originalMethod, swizzledMethod)
+    }
+}
diff --git a/Sources/SkeletonFlow.swift b/Sources/SkeletonFlow.swift
@@ -14,7 +14,6 @@ protocol SkeletonFlowDelegate {
 }
 
 class SkeletonFlowHandler: SkeletonFlowDelegate {
-
     func willBeginShowingSkeletons(rootView: UIView) {
         rootView.addAppNotificationsObservers()
     }

diff --git a/Sources/SkeletonLayer.swift b/Sources/SkeletonLayer.swift
@@ -91,9 +91,9 @@ struct SkeletonLayer {
 }
 
 extension SkeletonLayer {
-    func start(_ anim: SkeletonLayerAnimation? = nil) {
+    func start(_ anim: SkeletonLayerAnimation? = nil, completion: (() -> Void)? = nil) {
         let animation = anim ?? type.layerAnimation
-        contentLayer.playAnimation(animation, key: "skeletonAnimation")
+        contentLayer.playAnimation(animation, key: "skeletonAnimation", completion: completion)
     }
 
     func stopAnimation() {