Merge pull request #7 from clutter/ios-13

Set default modal style to full-screen

Author: Erik Strottmann

TiltUp/Classes/Architecture/Coordinator.swift

@@ -66,19 +66,19 @@ public extension Router {
 
 public extension Router {
     // MARK: Presenting modals
-    func presentModal(_ viewController: UIViewController, retaining coordinator: Coordinating, animated: Bool = true, dismissHandler: (() -> Void)? = nil) {
+    func presentModal(_ viewController: UIViewController, retaining coordinator: Coordinating, animated: Bool = true, presentationStyle: UIModalPresentationStyle = .fullScreen, dismissHandler: (() -> Void)? = nil) {
         coordinator.appCoordinator.pushCoordinator(coordinator)
-        presentModal(viewController, animated: animated) { [weak coordinator] in
+        presentModal(viewController, animated: animated, presentationStyle: presentationStyle) { [weak coordinator] in
             dismissHandler?()
             if let coordinator = coordinator {
                 coordinator.appCoordinator.popCoordinator(coordinator)
             }
         }
     }
 
-    func presentModal(_ router: Router, retaining coordinator: Coordinating, animated: Bool = true, dismissHandler: (() -> Void)? = nil) {
+    func presentModal(_ router: Router, retaining coordinator: Coordinating, animated: Bool = true, presentationStyle: UIModalPresentationStyle = .fullScreen, dismissHandler: (() -> Void)? = nil) {
         coordinator.appCoordinator.pushCoordinator(coordinator)
-        presentModal(router, animated: animated) { [weak coordinator] in
+        presentModal(router, animated: animated, presentationStyle: presentationStyle) { [weak coordinator] in
             dismissHandler?()
             if let coordinator = coordinator {
                 coordinator.appCoordinator.popCoordinator(coordinator)

TiltUp/Classes/Architecture/Router.swift

@@ -89,15 +89,16 @@ public extension Router {
 
 public extension Router {
     // MARK: Presenting modals
-    func presentModal(_ viewController: UIViewController, animated: Bool = true, dismissHandler: (() -> Void)? = nil) {
+    func presentModal(_ viewController: UIViewController, animated: Bool = true, presentationStyle: UIModalPresentationStyle = .fullScreen, dismissHandler: (() -> Void)? = nil) {
+        viewController.modalPresentationStyle = presentationStyle
         navigationController.present(viewController, animated: animated) {
             self.dismissHandler = dismissHandler
         }
     }
 
-    func presentModal(_ router: Router, animated: Bool = true, dismissHandler: (() -> Void)? = nil) {
+    func presentModal(_ router: Router, animated: Bool = true, presentationStyle: UIModalPresentationStyle = .fullScreen, dismissHandler: (() -> Void)? = nil) {
         self.presentedRouter = router
-        presentModal(router.navigationController, animated: animated, dismissHandler: dismissHandler)
+        presentModal(router.navigationController, animated: animated, presentationStyle: presentationStyle, dismissHandler: dismissHandler)
     }
 
     // MARK: Dismissing modals