Bump SwiftUINavigation and update examples

Examples/CaseStudies/SwiftUICaseStudies/01-GettingStarted-AlertsAndConfirmationDialogs.swift

@@ -40,41 +40,53 @@ struct AlertAndConfirmationDialog: ReducerProtocol {
   func reduce(into state: inout State, action: Action) -> EffectTask<Action> {
     switch action {
     case .alertButtonTapped:
-      state.alert = AlertState(
-        title: TextState("Alert!"),
-        message: TextState("This is an alert"),
-        primaryButton: .cancel(TextState("Cancel")),
-        secondaryButton: .default(TextState("Increment"), action: .send(.incrementButtonTapped))
-      )
+      state.alert = AlertState {
+        TextState("Alert!")
+      } actions: {
+        ButtonState(role: .cancel) {
+          TextState("Cancel")
+        }
+        ButtonState(action: .incrementButtonTapped) {
+          TextState("Increment")
+        }
+      } message: {
+        TextState("This is an alert")
+      }
       return .none
 
     case .alertDismissed:
       state.alert = nil
       return .none
 
     case .confirmationDialogButtonTapped:
-      state.confirmationDialog = ConfirmationDialogState(
-        title: TextState("Confirmation dialog"),
-        message: TextState("This is a confirmation dialog."),
-        buttons: [
-          .cancel(TextState("Cancel")),
-          .default(TextState("Increment"), action: .send(.incrementButtonTapped)),
-          .default(TextState("Decrement"), action: .send(.decrementButtonTapped)),
-        ]
-      )
+      state.confirmationDialog = ConfirmationDialogState {
+        TextState("Confirmation dialog")
+      } actions: {
+        ButtonState(role: .cancel) {
+          TextState("Cancel")
+        }
+        ButtonState(action: .incrementButtonTapped) {
+          TextState("Increment")
+        }
+        ButtonState(action: .decrementButtonTapped) {
+          TextState("Decrement")
+        }
+      } message: {
+        TextState("This is a confirmation dialog.")
+      }
       return .none
 
     case .confirmationDialogDismissed:
       state.confirmationDialog = nil
       return .none
 
     case .decrementButtonTapped:
-      state.alert = AlertState(title: TextState("Decremented!"))
+      state.alert = AlertState { TextState("Decremented!") }
       state.count -= 1
       return .none
 
     case .incrementButtonTapped:
-      state.alert = AlertState(title: TextState("Incremented!"))
+      state.alert = AlertState { TextState("Incremented!") }
       state.count += 1
       return .none
     }

Examples/CaseStudies/SwiftUICaseStudies/01-GettingStarted-Animations.swift

@@ -62,14 +62,19 @@ struct Animations: ReducerProtocol {
       .cancellable(id: CancelID.self)
 
     case .resetButtonTapped:
-      state.alert = AlertState(
-        title: TextState("Reset state?"),
-        primaryButton: .destructive(
-          TextState("Reset"),
+      state.alert = AlertState {
+        TextState("Reset state?")
+      } actions: {
+        ButtonState(
+          role: .destructive,
           action: .send(.resetConfirmationButtonTapped, animation: .default)
-        ),
-        secondaryButton: .cancel(TextState("Cancel"))
-      )
+        ) {
+          TextState("Reset")
+        }
+        ButtonState(role: .cancel) {
+          TextState("Cancel")
+        }
+      }
       return .none
 
     case .resetConfirmationButtonTapped:

Examples/CaseStudies/SwiftUICaseStudies/01-GettingStarted-SharedState.swift

@@ -107,13 +107,13 @@ struct SharedState: ReducerProtocol {
         return .none
 
       case .isPrimeButtonTapped:
-        state.alert = AlertState(
-          title: TextState(
+        state.alert = AlertState {
+          TextState(
             isPrime(state.count)
               ? "👍 The number \(state.count) is prime!"
               : "👎 The number \(state.count) is not prime :("
           )
-        )
+        }
         return .none
       }
     }

Examples/CaseStudies/SwiftUICaseStudies/02-Effects-WebSocket.swift

@@ -111,9 +111,9 @@ struct WebSocket: ReducerProtocol {
       .cancellable(id: WebSocketID.self)
 
     case .sendResponse(didSucceed: false):
-      state.alert = AlertState(
-        title: TextState(
-          "Could not send socket message. Connect to the server first, and try again."))
+      state.alert = AlertState {
+        TextState("Could not send socket message. Connect to the server first, and try again.")
+      }
       return .none
 
     case .sendResponse(didSucceed: true):

Examples/CaseStudies/SwiftUICaseStudies/04-HigherOrderReducers-ResuableOfflineDownloads/DownloadComponent.swift

@@ -85,29 +85,31 @@ struct DownloadComponent: ReducerProtocol {
   }
 
   private var deleteAlert: AlertState<AlertAction> {
-    AlertState(
-      title: TextState("Do you want to delete this map from your offline storage?"),
-      primaryButton: .destructive(
-        TextState("Delete"),
-        action: .send(.deleteButtonTapped, animation: .default)
-      ),
-      secondaryButton: self.nevermindButton
-    )
+    AlertState {
+      TextState("Do you want to delete this map from your offline storage?")
+    } actions: {
+      ButtonState(role: .destructive, action: .send(.deleteButtonTapped, animation: .default)) {
+        TextState("Delete")
+      }
+      self.nevermindButton
+    }
   }
 
   private var stopAlert: AlertState<AlertAction> {
-    AlertState(
-      title: TextState("Do you want to stop downloading this map?"),
-      primaryButton: .destructive(
-        TextState("Stop"),
-        action: .send(.stopButtonTapped, animation: .default)
-      ),
-      secondaryButton: self.nevermindButton
-    )
+    AlertState {
+      TextState("Do you want to stop downloading this map?")
+    } actions: {
+      ButtonState(role: .destructive, action: .send(.stopButtonTapped, animation: .default)) {
+        TextState("Stop")
+      }
+      self.nevermindButton
+    }
   }
 
-  private var nevermindButton: AlertState<AlertAction>.Button {
-    .cancel(TextState("Nevermind"), action: .send(.nevermindButtonTapped))
+  private var nevermindButton: ButtonState<AlertAction> {
+    ButtonState(role: .cancel, action: .nevermindButtonTapped) {
+      TextState("Nevermind")
+    }
   }
 }
 

Examples/CaseStudies/SwiftUICaseStudies/04-HigherOrderReducers-ReusableFavoriting.swift

@@ -56,7 +56,7 @@ struct Favoriting<ID: Hashable & Sendable>: ReducerProtocol {
       .cancellable(id: CancelID(id: state.id), cancelInFlight: true)
 
     case let .response(.failure(error)):
-      state.alert = AlertState(title: TextState(error.localizedDescription))
+      state.alert = AlertState { TextState(error.localizedDescription) }
       return .none
 
     case let .response(.success(isFavorite)):

Examples/CaseStudies/SwiftUICaseStudiesTests/01-GettingStarted-AlertsAndConfirmationDialogsTests.swift

@@ -12,15 +12,21 @@ final class AlertsAndConfirmationDialogsTests: XCTestCase {
     )
 
     await store.send(.alertButtonTapped) {
-      $0.alert = AlertState(
-        title: TextState("Alert!"),
-        message: TextState("This is an alert"),
-        primaryButton: .cancel(TextState("Cancel")),
-        secondaryButton: .default(TextState("Increment"), action: .send(.incrementButtonTapped))
-      )
+      $0.alert = AlertState {
+        TextState("Alert!")
+      } actions: {
+        ButtonState(role: .cancel) {
+          TextState("Cancel")
+        }
+        ButtonState(action: .incrementButtonTapped) {
+          TextState("Increment")
+        }
+      } message: {
+        TextState("This is an alert")
+      }
     }
     await store.send(.incrementButtonTapped) {
-      $0.alert = AlertState(title: TextState("Incremented!"))
+      $0.alert = AlertState { TextState("Incremented!") }
       $0.count = 1
     }
     await store.send(.alertDismissed) {
@@ -35,18 +41,24 @@ final class AlertsAndConfirmationDialogsTests: XCTestCase {
     )
 
     await store.send(.confirmationDialogButtonTapped) {
-      $0.confirmationDialog = ConfirmationDialogState(
-        title: TextState("Confirmation dialog"),
-        message: TextState("This is a confirmation dialog."),
-        buttons: [
-          .cancel(TextState("Cancel")),
-          .default(TextState("Increment"), action: .send(.incrementButtonTapped)),
-          .default(TextState("Decrement"), action: .send(.decrementButtonTapped)),
-        ]
-      )
+      $0.confirmationDialog = ConfirmationDialogState {
+        TextState("Confirmation dialog")
+      } actions: {
+        ButtonState(role: .cancel) {
+          TextState("Cancel")
+        }
+        ButtonState(action: .incrementButtonTapped) {
+          TextState("Increment")
+        }
+        ButtonState(action: .decrementButtonTapped) {
+          TextState("Decrement")
+        }
+      } message: {
+        TextState("This is a confirmation dialog.")
+      }
     }
     await store.send(.incrementButtonTapped) {
-      $0.alert = AlertState(title: TextState("Incremented!"))
+      $0.alert = AlertState { TextState("Incremented!") }
       $0.count = 1
     }
     await store.send(.confirmationDialogDismissed) {

Examples/CaseStudies/SwiftUICaseStudiesTests/01-GettingStarted-AnimationsTests.swift

@@ -78,14 +78,19 @@ final class AnimationTests: XCTestCase {
     }
 
     await store.send(.resetButtonTapped) {
-      $0.alert = AlertState(
-        title: TextState("Reset state?"),
-        primaryButton: .destructive(
-          TextState("Reset"),
+      $0.alert = AlertState {
+        TextState("Reset state?")
+      } actions: {
+        ButtonState(
+          role: .destructive,
           action: .send(.resetConfirmationButtonTapped, animation: .default)
-        ),
-        secondaryButton: .cancel(TextState("Cancel"))
-      )
+        ) {
+          TextState("Reset")
+        }
+        ButtonState(role: .cancel) {
+          TextState("Cancel")
+        }
+      }
     }
 
     await store.send(.resetConfirmationButtonTapped) {

Examples/CaseStudies/SwiftUICaseStudiesTests/01-GettingStarted-SharedStateTests.swift

@@ -76,9 +76,9 @@ final class SharedStateTests: XCTestCase {
     )
 
     await store.send(.isPrimeButtonTapped) {
-      $0.alert = AlertState(
-        title: TextState("👍 The number \($0.count) is prime!")
-      )
+      $0.alert = AlertState {
+        TextState("👍 The number 3 is prime!")
+      }
     }
     await store.send(.alertDismissed) {
       $0.alert = nil
@@ -94,9 +94,9 @@ final class SharedStateTests: XCTestCase {
     )
 
     await store.send(.isPrimeButtonTapped) {
-      $0.alert = AlertState(
-        title: TextState("👎 The number \($0.count) is not prime :(")
-      )
+      $0.alert = AlertState {
+        TextState("👎 The number 6 is not prime :(")
+      }
     }
     await store.send(.alertDismissed) {
       $0.alert = nil

Examples/CaseStudies/SwiftUICaseStudiesTests/02-Effects-WebSocketTests.swift

@@ -92,9 +92,9 @@ final class WebSocketTests: XCTestCase {
       $0.messageToSend = ""
     }
     await store.receive(.sendResponse(didSucceed: false)) {
-      $0.alert = AlertState(
-        title: TextState(
-          "Could not send socket message. Connect to the server first, and try again."))
+      $0.alert = AlertState {
+        TextState("Could not send socket message. Connect to the server first, and try again.")
+      }
     }
 
     // Disconnect from the socket

Examples/CaseStudies/SwiftUICaseStudiesTests/04-HigherOrderReducers-ReusableFavoritingTests.swift

@@ -52,8 +52,6 @@ final class ReusableComponentsFavoritingTests: XCTestCase {
   }
 
   func testUnhappyPath() async {
-    let clock = TestClock()
-
     let episodes: IdentifiedArrayOf<Episode.State> = [
       Episode.State(
         id: UUID(uuidString: "00000000-0000-0000-0000-000000000000")!,
@@ -76,9 +74,9 @@ final class ReusableComponentsFavoritingTests: XCTestCase {
       .episode(
         id: episodes[0].id, action: .favorite(.response(.failure(FavoriteError()))))
     ) {
-      $0.episodes[id: episodes[0].id]?.alert = AlertState(
-        title: TextState("Favoriting failed.")
-      )
+      $0.episodes[id: episodes[0].id]?.alert = AlertState {
+        TextState("Favoriting failed.")
+      }
     }
 
     await store.send(.episode(id: episodes[0].id, action: .favorite(.alertDismissed))) {