Improves navigation (#21)

* Reduces the delay time when a sheet is going to be presented

* Updates example

* Updates readme

Examples/SUICoordinatorExample/SUICoordinatorExample.xcodeproj/project.pbxproj

@@ -535,7 +535,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.felilo.SUICoordinatorExample;
+				PRODUCT_BUNDLE_IDENTIFIER = afl.SUICoordinatorExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

Examples/SUICoordinatorExample/SUICoordinatorExample/Coordinators/MainCoordinator/MainCoordinator.swift

@@ -29,7 +29,7 @@ class MainCoordinator: Coordinator<MainRoute> {
     override init() {
         super.init()
         Task {
-            let _ = await startFlow(route: .splash, animated: false)
+            await startFlow(route: .splash, animated: false)
         }
     }
 
@@ -39,6 +39,6 @@ class MainCoordinator: Coordinator<MainRoute> {
 
     override func start(animated: Bool = true) async {
         let coordinator = HomeCoordinator()
-        await navigate(to: coordinator, presentationStyle: .fullScreenCover)
+        await navigate(to: coordinator, presentationStyle: .fullScreenCover, animated: animated)
     }
 }

README.md

@@ -190,11 +190,13 @@ class MainCoordinator: Coordinator<MainRoute> {
 
     override init() {
         super.init()
+        Task {
+            await startFlow(route: .splash, animated: false)
+        }
     }
 
-    override func start(animated: Bool = false) async {
+    override func start(animated: Bool = true) async {
         let coordinator = HomeCoordinator()
-        async let _ = await startFlow(route: .splash, animated: false)
         await navigate(to: coordinator, presentationStyle: .fullScreenCover, animated: animated)
     }
 }
@@ -516,7 +518,3 @@ _____
 ## Contributing
 
 Contributions to the SUICoordinator library are welcome! To contribute, simply fork this repository and make your changes in a new branch. When your changes are ready, submit a pull request to this repository for review.
-
-License
-
-The SUICoordinator library is released under the MIT license. See the LICENSE file for more information.

Sources/SUICoordinator/CoordinatorType/CoordinatorType+Navigation.swift

@@ -74,14 +74,4 @@ public extension CoordinatorType {
         await router.restart(animated: animated)
         router.mainView = route
     }
-
-
-    @MainActor func restart(animated: Bool = true) async -> Void {
-        guard let mainView = router.mainView else {
-            return
-        }
-
-        await finishFlow(animated: animated)
-        await startFlow(route: mainView)
-    }
 }

Sources/SUICoordinator/Shared/View+Helpers/ViewDidLoadModifier.swift

@@ -34,7 +34,7 @@ public extension View {
         onDidLoad: ((Int) -> Void)? = nil
     ) -> some View {
         modifier(
-            SheetCoordinating(
+            SheetCoordinatorView(
                 coordinator: coordinator,
                 index: index,
                 isLast: isLast,

Sources/SUICoordinator/SheetCoordinator/SheetCoordinator.swift

@@ -83,11 +83,10 @@ final public class SheetCoordinator<T>: ObservableObject {
 
         if animated {
             items.append(nil)
-            await makeDelay(animated: animated, duration: .seconds(0.08))
+            await makeDelay(animated: animated, duration: .seconds(0))
         }
 
         items.append(sheet)
-        removeAllNilItems()
     }
 
     /// Removes the last presented sheet.

Sources/SUICoordinator/SheetCoordinator/SheetCoordinating.swift → Sources/SUICoordinator/SheetCoordinator/SheetCoordinatorView.swift

@@ -25,7 +25,7 @@
 import SwiftUI
 import Combine
 
-struct SheetCoordinating: ViewModifier {
+struct SheetCoordinatorView: ViewModifier {
 
     // ---------------------------------------------------------
     // MARK: typealias
@@ -83,7 +83,10 @@ struct SheetCoordinating: ViewModifier {
                             coordinator.removeAllNilItems()
                             onDissmis?($0)
                         },
-                        onDidLoad: onDidLoad
+                        onDidLoad: {
+                            coordinator.removeAllNilItems()
+                            onDidLoad?($0)
+                        }
                     )
                 }
             }

Tests/SUICoordinatorTests/CoordinatorTests.swift

@@ -28,24 +28,6 @@ import Combine
 
 final class CoordinatorTests: XCTestCase {
 
-    func test_restartMainCoordinator() async throws {
-        let sut = makeSUT()
-        let coordinator1 = OtherCoordinator()
-        let coordinator2 = AnyCoordinator()
-
-        await sut.start(animated: false)
-        await sut.router.navigate(to: .pushStep, animated: false )
-        await navigateToCoordinator(coordinator1, in: sut)
-        await navigateToCoordinator(coordinator2, in: coordinator1)
-
-        await sut.restart(animated: false )
-
-        XCTAssertEqual(sut.router.items.count, 0)
-        XCTAssertTrue(sut.children.isEmpty)
-        XCTAssertNotNil(sut.router.mainView)
-        XCTAssertEqual(sut.router.sheetCoordinator.items.count, 0)
-    }
-
     func test_finshFlow() async throws {
         let sut = makeSUT()
 

Tests/SUICoordinatorTests/RouterTests.swift

@@ -109,7 +109,6 @@ final class RouterTests: XCTestCase {
         let view = PushStepView.self
         sut.mainView = RouteBase(presentationStyle: .push, content: PushStepView())
 
-
         await sut.navigate(to: .init(presentationStyle: .push, content: PushStepView()), animated: false)
         await sut.navigate(to: .init(presentationStyle: .push, content: PushStep2View()), animated: false)
         await sut.navigate(to: .init(presentationStyle: .push, content: PushStep3View()), animated: false)

Tests/SUICoordinatorTests/SheetCoordinatorTests.swift

@@ -41,7 +41,7 @@ final class SheetCoordinatorTests: XCTestCase {
         let sut = makeSUT()
         let finalRoute = makeSheetItem("Final Item")
 
-        await sut.presentSheet(makeSheetItem("First Item"))
+        await presentSheet(makeSheetItem("First Item"), with: sut)
         await sut.presentSheet(finalRoute)
 
         XCTAssertEqual(sut.items.count, 2)
@@ -52,7 +52,7 @@ final class SheetCoordinatorTests: XCTestCase {
         let sut = makeSUT()
         let item = makeSheetItem("Custom Item")
 
-        await sut.presentSheet(item)
+        await presentSheet(item, with: sut)
         XCTAssertEqual(sut.items.count, 1)
 
         sut.removeLastSheet()
@@ -64,9 +64,9 @@ final class SheetCoordinatorTests: XCTestCase {
     func test_dismiss_route_atPositon() async throws {
         let sut = makeSUT()
 
-        await sut.presentSheet(makeSheetItem("First Item"))
-        await sut.presentSheet(makeSheetItem("Second Item"))
-        await sut.presentSheet(makeSheetItem("Third Item"))
+        await presentSheet(makeSheetItem("First Item"), with: sut)
+        await presentSheet(makeSheetItem("Second Item"), with: sut)
+        await presentSheet(makeSheetItem("Third Item"), with: sut)
 
         await sut.remove(at: 1)
 
@@ -77,9 +77,9 @@ final class SheetCoordinatorTests: XCTestCase {
     func test_cleanCoordinator() async throws {
         let sut = makeSUT()
 
-        await sut.presentSheet(makeSheetItem("First Item"))
-        await sut.presentSheet(makeSheetItem("Second Item"))
-        await sut.presentSheet(makeSheetItem("Third Item"))
+        await presentSheet(makeSheetItem("First Item"), with: sut)
+        await presentSheet(makeSheetItem("Second Item"), with: sut)
+        await presentSheet(makeSheetItem("Third Item"), with: sut)
         XCTAssertEqual(sut.items.count, 3)
 
         sut.clean(animated: false)
@@ -103,4 +103,9 @@ final class SheetCoordinatorTests: XCTestCase {
     ) -> SheetItem<String> {
         .init(view: item, animated: animated, presentationStyle: presentationStyle)
     }
+
+    private func presentSheet( _ item: SheetItem<String>, with sut: SheetCoordinator<String>) async {
+        await sut.presentSheet(item)
+        sut.removeAllNilItems()
+    }
 }