Fix Example + add bottom sheet to 2.0.0

Example/Example.xcodeproj/project.pbxproj

@@ -44,6 +44,39 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		353B5E132B91FCB20085900F /* UIComponents */ = {
+			isa = PBXGroup;
+			children = (
+				E239A3E12916E38300A03EB6 /* ButtonView.swift */,
+			);
+			path = UIComponents;
+			sourceTree = "<group>";
+		};
+		353B5E142B91FCD20085900F /* FirstScreen */ = {
+			isa = PBXGroup;
+			children = (
+				E239A3BD2915756C00A03EB6 /* FirstContentView.swift */,
+			);
+			path = FirstScreen;
+			sourceTree = "<group>";
+		};
+		353B5E152B91FCE00085900F /* SecondScreen */ = {
+			isa = PBXGroup;
+			children = (
+				E239A3DF2916E14800A03EB6 /* SecondContentView.swift */,
+			);
+			path = SecondScreen;
+			sourceTree = "<group>";
+		};
+		353B5E162B91FECC0085900F /* ThirdScreen */ = {
+			isa = PBXGroup;
+			children = (
+				4F45EBC62AFB701C00A92472 /* ThirdContentViewController.swift */,
+				4F45EBC82AFB8AD000A92472 /* ThirdContentTableViewCell.swift */,
+			);
+			path = ThirdScreen;
+			sourceTree = "<group>";
+		};
 		E239A3AF2915756C00A03EB6 = {
 			isa = PBXGroup;
 			children = (
@@ -65,10 +98,11 @@
 		E239A3BA2915756C00A03EB6 /* Example */ = {
 			isa = PBXGroup;
 			children = (
-				E239A3DE2916DE4700A03EB6 /* Info.plist */,
+				353B5E132B91FCB20085900F /* UIComponents */,
 				E239A3CF291578FD00A03EB6 /* Screens */,
 				E239A3CE291578F100A03EB6 /* App */,
 				E239A3BF2915756D00A03EB6 /* Assets.xcassets */,
+				E239A3DE2916DE4700A03EB6 /* Info.plist */,
 			);
 			path = Example;
 			sourceTree = "<group>";
@@ -92,11 +126,9 @@
 		E239A3CF291578FD00A03EB6 /* Screens */ = {
 			isa = PBXGroup;
 			children = (
-				E239A3BD2915756C00A03EB6 /* FirstContentView.swift */,
-				E239A3DF2916E14800A03EB6 /* SecondContentView.swift */,
-				E239A3E12916E38300A03EB6 /* ButtonView.swift */,
-				4F45EBC62AFB701C00A92472 /* ThirdContentViewController.swift */,
-				4F45EBC82AFB8AD000A92472 /* ThirdContentTableViewCell.swift */,
+				353B5E142B91FCD20085900F /* FirstScreen */,
+				353B5E152B91FCE00085900F /* SecondScreen */,
+				353B5E162B91FECC0085900F /* ThirdScreen */,
 			);
 			path = Screens;
 			sourceTree = "<group>";

Example/Example/Screens/FirstContentView.swift → Example/Example/Screens/FirstScreen/FirstContentView.swift

@@ -17,6 +17,12 @@ struct FirstContentView: View {
                 title: "Open fullscreen second screen"
             )
             .padding(.top, 40)
+            ButtonView(
+                action: { [weak navigation] in
+                    navigation?.perform(action: .push(.second, as: .bottomSheet(.auto, completion: nil)))
+                },
+                title: "Open second as bottom sheet"
+            )
         }
         .padding()
         .navigationBarBackButtonHidden()
@@ -25,12 +31,17 @@ struct FirstContentView: View {
 
 struct FirstContentModule: Module {
     func assembly(using coordinator: Coordinator) -> any NavigationScreen {
-        return HostingController(rootView: FirstContentView(navigation: coordinator))
+        HostingController(
+            title: "First",
+            isNeedBackButton: false,
+            coordinator: coordinator,
+            content: FirstContentView(navigation: coordinator)
+        )
     }
 }
 
 extension Module where Self == FirstContentModule {
     static var first: Self {
-        return FirstContentModule()
+        FirstContentModule()
     }
 }

Example/Example/Screens/SecondContentView.swift → Example/Example/Screens/SecondScreen/SecondContentView.swift

@@ -19,25 +19,25 @@ struct SecondContentView: View {
             .padding(.top, 40)
             ButtonView(
                 action: { [weak navigation] in
-                    // Bottom Sheet
+                    navigation?.perform(action: .push(.third, as: .bottomSheet(.auto, completion: nil)))
                 },
                 title: "Present bottom sheet - auto"
             )
             ButtonView(
                 action: { [weak navigation] in
-                    // Bottom Sheet with fixed height
+                    navigation?.perform(action: .push(.third, as: .bottomSheet(.fixed(120), completion: nil)))
                 },
                 title: "Present bottom sheet - fixed height"
             )
             ButtonView(
                 action: { [weak navigation] in
-                    // Bottom Sheet with full screen
+                    navigation?.perform(action: .push(.third, as: .bottomSheet(.fullScreen, completion: nil)))
                 },
                 title: "Present bottom sheet - full screen"
             )
             ButtonView(
                 action: { [weak navigation] in
-                    // Bottom Sheet with half screen
+                    navigation?.perform(action: .push(.third, as: .bottomSheet(.halfScreen, completion: nil)))
                 },
                 title: "Present bottom sheet - half screen"
             )
@@ -49,12 +49,16 @@ struct SecondContentView: View {
 
 struct SecondContentModule: Module {
     func assembly(using coordinator: Coordinator) -> any NavigationScreen {
-        return HostingController(rootView: SecondContentView(navigation: coordinator))
+        HostingController(
+            title: "Second",
+            coordinator: coordinator,
+            content: SecondContentView(navigation: coordinator)
+        )
     }
 }
 
 extension Module where Self == SecondContentModule {
     static var second: Self {
-        return SecondContentModule()
+        SecondContentModule()
     }
 }

Example/Example/Screens/ThirdContentTableViewCell.swift → Example/Example/Screens/ThirdScreen/ThirdContentTableViewCell.swift

@@ -30,7 +30,7 @@ final class ThirdContentTableViewCell: UITableViewCell {
     }
 
     func configureWith(image: UIImage, title: String) {
-        imageView?.image = image
+        iconImageView.image = image
         label.text = title
     }
 
@@ -43,16 +43,14 @@ final class ThirdContentTableViewCell: UITableViewCell {
 
         NSLayoutConstraint.activate([
             iconImageView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor, constant: 16),
-            iconImageView.topAnchor.constraint(equalTo: contentView.topAnchor),
-            iconImageView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor),
+            iconImageView.centerYAnchor.constraint(equalTo: contentView.centerYAnchor),
             iconImageView.heightAnchor.constraint(equalToConstant: 32),
             iconImageView.widthAnchor.constraint(equalToConstant: 32),
 
             label.leadingAnchor.constraint(equalTo: iconImageView.trailingAnchor, constant: 8),
             label.topAnchor.constraint(equalTo: contentView.topAnchor),
             label.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -16),
-            label.bottomAnchor.constraint(equalTo: contentView.bottomAnchor),
-            label.heightAnchor.constraint(equalToConstant: 64)
+            label.bottomAnchor.constraint(equalTo: contentView.bottomAnchor)
         ])
     }
 }

Example/Example/Screens/ThirdContentViewController.swift → Example/Example/Screens/ThirdScreen/ThirdContentViewController.swift

@@ -46,8 +46,8 @@ final class ThirdContentViewController: ViewController {
         return tableView
     }()
 
-    init() {
-        super.init()
+    init(coordinator: Coordinator?) {
+        super.init(title: "Third", coordinator: coordinator)
     }
 
     required init?(coder: NSCoder) { nil }
@@ -100,12 +100,12 @@ extension ThirdContentViewController: UITableViewDelegate {
 
 struct ThirdContent: Module {
     func assembly(using coordinator: Coordinator) -> any NavigationScreen {
-        return ThirdContentViewController()
+        ThirdContentViewController(coordinator: coordinator)
     }
 }
 
 extension Module where Self == ThirdContent {
     static var third: Self {
-        return ThirdContent()
+        ThirdContent()
     }
 }

Sources/Navidux/Core/Coordinator.swift

@@ -8,12 +8,16 @@
 import Foundation
 
 public final class Coordinator {
+    let bottomSheetTransitioningDelegate = BSTransitioningDelegate()
+
     public var navigationController: NavigationController
     public var dependencyContainer: DependencyContainer
+    public var store: NavigationStore
 
     public init(navigationController: NavigationController? = nil) {
         self.navigationController = navigationController ?? BaseNavigationController()
         self.dependencyContainer = DependencyContainer()
+        self.store = NavigationStore()
     }
 
     public func perform(action: NavigationAction) {

Sources/Navidux/Core/Navigation/NavigationAction/Actions/PopNavigationAction.swift

@@ -21,7 +21,12 @@ public struct PopNavigationAction: NavigationAction {
             let screenClass,
             let screen = coordinator.navigationController.screens.last(where: { $0.isKind(of: screenClass) })
         else {
-            coordinator.navigationController.popViewController(animated: self.animated)
+            if coordinator.store.hasOverlay {
+                coordinator.store.hasOverlay = false
+                coordinator.navigationController.dismiss(animated: self.animated, completion: nil)
+            } else {
+                coordinator.navigationController.popViewController(animated: self.animated)
+            }
             return
         }
 
@@ -31,14 +36,14 @@ public struct PopNavigationAction: NavigationAction {
 
 public extension NavigationAction where Self == PopNavigationAction {
     static var pop: Self {
-        return PopNavigationAction(screenClass: nil, animated: true)
+        PopNavigationAction(screenClass: nil, animated: true)
     }
 
     static func pop(animated: Bool) -> Self {
-        return PopNavigationAction(screenClass: nil, animated: animated)
+        PopNavigationAction(screenClass: nil, animated: animated)
     }
 
     static func popTo(_ screenClass: UIViewController.Type, animated: Bool = true) -> Self {
-        return PopNavigationAction(screenClass: screenClass, animated: animated)
+        PopNavigationAction(screenClass: screenClass, animated: animated)
     }
 }

Sources/Navidux/Core/Navigation/NavigationAction/Actions/PushNavigationAction.swift

@@ -11,6 +11,7 @@ public struct PushNavigationAction: NavigationAction {
     public enum PresentationStyle {
         case fullScreen
         case modal(completion: (() -> Void)?)
+        case bottomSheet(BSSize, completion: (() -> Void)?)
     }
 
     private let module: Module
@@ -29,13 +30,21 @@ public struct PushNavigationAction: NavigationAction {
         case .fullScreen:
             coordinator.navigationController.pushViewController(screen, animated: self.animated)
         case .modal(let completion):
+            coordinator.store.hasOverlay = true
+            coordinator.navigationController.present(screen, animated: self.animated, completion: completion)
+        case .bottomSheet(let size, let completion):
+            BSBuilder.buildBottomSheet(
+                coordinator: coordinator,
+                screen: screen,
+                size: size
+            )
             coordinator.navigationController.present(screen, animated: self.animated, completion: completion)
         }
     }
 }
 
 public extension NavigationAction where Self == PushNavigationAction {
     static func push(_ module: Module, as presentationStyle: Self.PresentationStyle = .fullScreen, animated: Bool = true) -> Self {
-        return PushNavigationAction(module: module, presentationStyle: presentationStyle, animated: animated)
+        PushNavigationAction(module: module, presentationStyle: presentationStyle, animated: animated)
     }
 }

Sources/Navidux/Core/Navigation/NavigationAction/Actions/RestructNavigationAction.swift

@@ -44,6 +44,6 @@ public struct RestructNavigationAction: NavigationAction {
 
 public extension NavigationAction where Self == RestructNavigationAction {
     static func restruct(with modules: [Module], animation: Self.AnimationType) -> Self {
-        return RestructNavigationAction(modules: modules, animationType: animation)
+        RestructNavigationAction(modules: modules, animationType: animation)
     }
 }

Sources/Navidux/Core/Navigation/NavigationScreen/Screens/BottomSheet/BSBuilder.swift

@@ -0,0 +1,35 @@
+//
+//  BSBuilder.swift
+//
+//
+//  Created by Петр Тартынских on 05.03.2024.
+//
+
+import Foundation
+
+class BSBuilder {
+
+    static func buildBottomSheet(
+        coordinator: Coordinator,
+        screen: any NavigationScreen,
+        size: BSSize
+    ) {
+        switch size {
+        case .auto:
+            coordinator.bottomSheetTransitioningDelegate.sheetSize = .auto
+            screen.transitioningDelegate = coordinator.bottomSheetTransitioningDelegate
+            screen.modalPresentationStyle = .custom
+        case .fixed(let height):
+            coordinator.bottomSheetTransitioningDelegate.sheetSize = .fixed(height)
+            screen.transitioningDelegate = coordinator.bottomSheetTransitioningDelegate
+            screen.modalPresentationStyle = .custom
+        case .halfScreen:
+            coordinator.bottomSheetTransitioningDelegate.sheetSize = .halfScreen
+            screen.transitioningDelegate = coordinator.bottomSheetTransitioningDelegate
+            screen.modalPresentationStyle = .custom
+        case .fullScreen:
+            screen.modalPresentationStyle = .formSheet
+        }
+        coordinator.store.hasOverlay = true
+    }
+}

Sources/Navidux/Core/Navigation/NavigationScreen/Screens/BottomSheet/BSPresentationController.swift

@@ -3,6 +3,8 @@ import UIKit
 
 final class BSPresentationController: UIPresentationController {
 
+    var sheetSize: BSSize = .auto
+
     private lazy var dimmView: UIView = {
         let view = UIView()
         view.backgroundColor = UIColor.black.withAlphaComponent(0.75)
@@ -52,6 +54,29 @@ final class BSPresentationController: UIPresentationController {
             dimmView.bottomAnchor.constraint(equalTo: containerView.bottomAnchor)
         ]
 
+        switch sheetSize {
+        case .fixed(let height):
+            constraints.append(
+                presentedView.heightAnchor.constraint(equalToConstant: height)
+            )
+        case .halfScreen:
+            constraints.append(
+                presentedView.heightAnchor.constraint(
+                    lessThanOrEqualTo: containerView.heightAnchor,
+                    constant: -(containerView.bounds.height / 2)
+                )
+            )
+        case .auto:
+            constraints.append(
+                presentedView.heightAnchor.constraint(
+                    lessThanOrEqualTo: containerView.heightAnchor,
+                    constant: -containerView.safeAreaInsets.top
+                )
+            )
+        case .fullScreen:
+            break
+        }
+
         NSLayoutConstraint.activate(constraints)
     }
 

Sources/Navidux/Core/Navigation/NavigationScreen/Screens/BottomSheet/BSSize.swift

@@ -0,0 +1,15 @@
+//
+//  BSSize.swift
+//
+//
+//  Created by Петр Тартынских on 05.03.2024.
+//
+
+import Foundation
+
+public enum BSSize {
+    case fixed(CGFloat)
+    case halfScreen
+    case fullScreen
+    case auto
+}