replace optional force unwrapping with more safe way (HeroTransitions…

…#653)
sudheer5013 · Jan 2, 2020 · e4ebbb0 · e4ebbb0
1 parent 9631cb9
commit e4ebbb0
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/Sources/Animator/HeroCoreAnimationViewContext.swift b/Sources/Animator/HeroCoreAnimationViewContext.swift
@@ -36,14 +36,13 @@ extension CALayer {
   }()
 
   @objc dynamic func hero_add(anim: CAAnimation, forKey: String?) {
-    if CALayer.heroAddedAnimations != nil {
-      let copiedAnim = anim.copy() as! CAAnimation
-      copiedAnim.delegate = nil // having delegate resulted some weird animation behavior
-      CALayer.heroAddedAnimations!.append((self, forKey!, copiedAnim))
-      hero_add(anim: anim, forKey: forKey)
-    } else {
-      hero_add(anim: anim, forKey: forKey)
+    if let animationKey = forKey,
+        CALayer.heroAddedAnimations != nil,
+        let copiedAnim = anim.copy() as? CAAnimation {
+        copiedAnim.delegate = nil // having delegate resulted some weird animation behavior
+        CALayer.heroAddedAnimations?.append((self, animationKey, copiedAnim))
     }
+    hero_add(anim: anim, forKey: forKey)
   }
 }