Merge pull request #25 from nodes-ios/feature/allowAnimationTypeForCu…

…stomViews animaton type added to custom view
ml-opensource · Nov 21, 2019 · 936b65e · 936b65e
2 parents 9b14222 + 5a72931
commit 936b65e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Rye/Rye/RyeType+Configuration.swift b/Rye/Rye/RyeType+Configuration.swift
@@ -25,7 +25,7 @@ public struct Rye {
 
     public enum ViewType {
         case standard(configuration: RyeConfiguration?)
-        case custom(UIView)
+        case custom(UIView, animationType: AnimationType = .slideInOut)
     }
 
     public enum Configuration {

diff --git a/Rye/Rye/RyeViewController.swift b/Rye/Rye/RyeViewController.swift
@@ -85,9 +85,9 @@ public class RyeViewController: UIViewController {
         case .standard(let configuration):
             animationDuration = configuration?[Rye.Configuration.Key.animationDuration] as? TimeInterval ?? 0.3
             animationType = configuration?[Rye.Configuration.Key.animationType] as? Rye.AnimationType ?? .slideInOut
-        default:
+        case .custom(_, let animationType):
             animationDuration = 0.3
-            animationType = .slideInOut
+            self.animationType = animationType
         }
 
         super.init(nibName: nil, bundle: nil)
@@ -161,8 +161,7 @@ public class RyeViewController: UIViewController {
 
             addRyeView(ryeView)
 
-        case .custom(let ryeView):
-
+        case .custom(let ryeView, _):
             addRyeView(ryeView)
 
         }