wip

Author: stephencelis

Examples/TicTacToe/tic-tac-toe/Sources/TwoFactorCore/TwoFactorCore.swift

@@ -5,7 +5,7 @@ import Dispatch
 
 public struct TwoFactor: ReducerProtocol, Sendable {
   public struct State: Equatable {
-    @PresentationState public var alert: AlertState<Never>?
+    @PresentationState public var alert: AlertState<Action.Alert>?
     @BindingState public var code = ""
     public var isFormValid = false
     public var isTwoFactorRequestInFlight = false
@@ -16,29 +16,44 @@ public struct TwoFactor: ReducerProtocol, Sendable {
     }
   }
 
-  public enum Action: BindableAction, Equatable {
-    case alert(PresentationAction<Never>)
-    case binding(BindingAction<State>)
-    case submitButtonTapped
+  public enum Action: Equatable {
+    case alert(PresentationAction<Alert>)
     case twoFactorResponse(TaskResult<AuthenticationResponse>)
+    case view(View)
+
+    public enum Alert: Equatable {}
+
+    public enum View: BindableAction, Equatable {
+      case binding(BindingAction<State>)
+      case submitButtonTapped
+    }
   }
 
   @Dependency(\.authenticationClient) var authenticationClient
 
   public init() {}
 
   public var body: some ReducerProtocol<State, Action> {
-    BindingReducer()
+    BindingReducer(action: /Action.view)
     Reduce { state, action in
       switch action {
       case .alert:
         return .none
 
-      case .binding:
+      case let .twoFactorResponse(.failure(error)):
+        state.alert = AlertState { TextState(error.localizedDescription) }
+        state.isTwoFactorRequestInFlight = false
+        return .none
+
+      case .twoFactorResponse(.success):
+        state.isTwoFactorRequestInFlight = false
+        return .none
+
+      case .view(.binding):
         state.isFormValid = state.code.count >= 4
         return .none
 
-      case .submitButtonTapped:
+      case .view(.submitButtonTapped):
         state.isTwoFactorRequestInFlight = true
         return .task { [code = state.code, token = state.token] in
           .twoFactorResponse(
@@ -47,15 +62,6 @@ public struct TwoFactor: ReducerProtocol, Sendable {
             }
           )
         }
-
-      case let .twoFactorResponse(.failure(error)):
-        state.alert = AlertState { TextState(error.localizedDescription) }
-        state.isTwoFactorRequestInFlight = false
-        return .none
-
-      case .twoFactorResponse(.success):
-        state.isTwoFactorRequestInFlight = false
-        return .none
       }
     }
     .ifLet(\.$alert, action: /Action.alert)

Examples/TicTacToe/tic-tac-toe/Sources/TwoFactorSwiftUI/TwoFactorView.swift

@@ -7,7 +7,7 @@ public struct TwoFactorView: View {
   let store: StoreOf<TwoFactor>
 
   struct ViewState: Equatable {
-    var alert: AlertState<Never>?
+    var alert: AlertState<TwoFactor.Action.Alert>?
     @BindingViewState var code: String
     var isActivityIndicatorVisible: Bool
     var isFormDisabled: Bool
@@ -27,7 +27,7 @@ public struct TwoFactorView: View {
   }
 
   public var body: some View {
-    WithViewStore(self.store, observe: ViewState.init) { viewStore in
+    WithViewStore(self.store, observe: ViewState.init, send: { .view($0) }) { viewStore in
       Form {
         Text(#"To confirm the second factor enter "1234" into the form."#)
 

Examples/TicTacToe/tic-tac-toe/Sources/TwoFactorUIKit/TwoFactorViewController.swift

@@ -9,7 +9,7 @@ public final class TwoFactorViewController: UIViewController {
   private var cancellables: Set<AnyCancellable> = []
 
   struct ViewState: Equatable {
-    let alert: AlertState<Never>?
+    let alert: AlertState<TwoFactor.Action.Alert>?
     let code: String?
     let isActivityIndicatorHidden: Bool
     let isLoginButtonEnabled: Bool
@@ -124,9 +124,9 @@ extension TwoFactor.Action {
     case .alertDismissed:
       self = .alert(.dismiss)
     case let .codeChanged(code):
-      self = .set(\.$code, code ?? "")
+      self = .view(.set(\.$code, code ?? ""))
     case .loginButtonTapped:
-      self = .submitButtonTapped
+      self = .view(.submitButtonTapped)
     }
   }
 }