Migrate CompendiumEntryDetail to the new reducer protocol

Author: Thomvis

App/App/Compendium/View/CompendiumContainerView.swift

@@ -59,8 +59,8 @@ let compendiumRootReducer: AnyReducer<CompendiumIndexState, CompendiumIndexActio
 extension CompendiumIndexAction {
     var onSaveMonsterAsNPCButtonMonster: Monster? {
         switch self {
-        case .nextScreen(.compendiumEntry(CompendiumItemDetailViewAction.onSaveMonsterAsNPCButton(let m))),
-             .detailScreen(.compendiumEntry(CompendiumItemDetailViewAction.onSaveMonsterAsNPCButton(let m))):
+        case .nextScreen(.compendiumEntry(CompendiumEntryDetailFeature.Action.onSaveMonsterAsNPCButton(let m))),
+             .detailScreen(.compendiumEntry(CompendiumEntryDetailFeature.Action.onSaveMonsterAsNPCButton(let m))):
             return m
         case .nextScreen(.compendiumIndex(let a)), .detailScreen(.compendiumIndex(let a)):
             return a.onSaveMonsterAsNPCButtonMonster

…dium/View/CompendiumItemDetailView.swift …ium/View/CompendiumEntryDetailView.swiftApp/App/Compendium/View/CompendiumItemDetailView.swift renamed to App/App/Compendium/View/CompendiumEntryDetailView.swift App/App/Compendium/View/CompendiumItemDetailView.swift renamed to App/App/Compendium/View/CompendiumEntryDetailView.swift

@@ -17,16 +17,16 @@ import ActionResolutionFeature
 import Compendium
 import SharedViews
 
-struct CompendiumItemDetailView: View {
+struct CompendiumEntryDetailView: View {
     @EnvironmentObject var env: Environment
     @SwiftUI.Environment(\.appNavigation) var appNavigation
 
-    var store: Store<CompendiumEntryDetailViewState, CompendiumItemDetailViewAction>
-    @ObservedObject var viewStore: ViewStore<CompendiumEntryDetailViewState, CompendiumItemDetailViewAction>
+    var store: Store<CompendiumEntryDetailFeature.State, CompendiumEntryDetailFeature.Action>
+    @ObservedObject var viewStore: ViewStore<CompendiumEntryDetailFeature.State, CompendiumEntryDetailFeature.Action>
 
-    init(store: Store<CompendiumEntryDetailViewState, CompendiumItemDetailViewAction>) {
+    init(store: Store<CompendiumEntryDetailFeature.State, CompendiumEntryDetailFeature.Action>) {
         self.store = store
-        self.viewStore = ViewStore(store, removeDuplicates: { $0.localStateForDeduplication == $1.localStateForDeduplication })
+        self.viewStore = ViewStore(store, observe: \.self, removeDuplicates: { $0.localStateForDeduplication == $1.localStateForDeduplication })
     }
 
     var item: CompendiumItem {
@@ -45,8 +45,8 @@ struct CompendiumItemDetailView: View {
         ScrollView {
             VStack {
                 contentView()
-
-                if var attribution = viewStore.state.entryAttribution {
+                
+                if let attribution = viewStore.state.entryAttribution {
                     Text(attribution)
                         .font(.footnote).italic()
                         .foregroundColor(Color(UIColor.secondaryLabel))
@@ -101,9 +101,9 @@ struct CompendiumItemDetailView: View {
         }
         .stateDrivenNavigationLink(
             store: store,
-            state: /CompendiumEntryDetailViewState.NextScreen.compendiumItemDetailView,
-            action: /CompendiumItemDetailViewAction.NextScreenAction.compendiumItemDetailView,
-            destination: CompendiumItemDetailView.init
+            state: /CompendiumEntryDetailFeature.State.NextScreen.compendiumItemDetailView,
+            action: /CompendiumEntryDetailFeature.Action.NextScreenAction.compendiumItemDetailView,
+            destination: CompendiumEntryDetailView.init
         )
         .safariView(
             item: viewStore.binding(get: { $0.presentedNextSafariView }, send: { _ in .setNextScreen(nil) }),
@@ -134,7 +134,7 @@ struct CompendiumItemDetailView: View {
     }
 
     @ViewBuilder
-    func sheetView(_ sheet: CompendiumEntryDetailViewState.Sheet) -> some View {
+    func sheetView(_ sheet: CompendiumEntryDetailFeature.State.Sheet) -> some View {
         switch viewStore.state.sheet {
         case .creatureEdit:
             IfLetStore(store.scope(state: replayNonNil({ $0.creatureEditSheet }), action: { .sheet(.creatureEdit($0)) })) { store in

App/App/Compendium/View/CompendiumIndexState.swift

@@ -59,7 +59,7 @@ struct CompendiumIndexState: NavigationStackSourceState, Equatable {
         res.presentedScreens = presentedScreens.mapValues {
             switch $0 {
             case .compendiumIndex: return .compendiumIndex(CompendiumIndexState.nullInstance)
-            case .itemDetail: return .itemDetail(CompendiumEntryDetailViewState.nullInstance)
+            case .itemDetail: return .itemDetail(CompendiumEntryDetailFeature.State(entry: CompendiumEntry.nullInstance))
             case .safariView: return .safariView(.nullInstance)
             }
         }
@@ -180,7 +180,7 @@ struct CompendiumIndexState: NavigationStackSourceState, Equatable {
 
     enum NextScreen: Equatable {
         indirect case compendiumIndex(CompendiumIndexState)
-        case itemDetail(CompendiumEntryDetailViewState)
+        case itemDetail(CompendiumEntryDetailFeature.State)
         case safariView(SafariViewState)
     }
 
@@ -205,8 +205,16 @@ struct CompendiumIndexState: NavigationStackSourceState, Equatable {
 
     static var reducer: AnyReducer<Self, CompendiumIndexAction, CompendiumIndexEnvironment> {
         return AnyReducer.combine(
-            CompendiumEntryDetailViewState.reducer.optional().pullback(state: \.presentedNextItemDetail, action: /CompendiumIndexAction.nextScreen..CompendiumIndexAction.NextScreenAction.compendiumEntry, environment: { $0 }),
-            CompendiumEntryDetailViewState.reducer.optional().pullback(state: \.presentedDetailItemDetail, action: /CompendiumIndexAction.detailScreen..CompendiumIndexAction.NextScreenAction.compendiumEntry, environment: { $0 }),
+            AnyReducer { env in
+                CompendiumEntryDetailFeature(environment: env)
+            }
+            .optional()
+            .pullback(state: \.presentedNextItemDetail, action: /CompendiumIndexAction.nextScreen..CompendiumIndexAction.NextScreenAction.compendiumEntry, environment: { $0 }),
+            AnyReducer { env in
+                CompendiumEntryDetailFeature(environment: env)
+            }
+            .optional()
+            .pullback(state: \.presentedDetailItemDetail, action: /CompendiumIndexAction.detailScreen..CompendiumIndexAction.NextScreenAction.compendiumEntry, environment: { $0 }),
             AnyReducer { state, action, env in
                 switch action {
                 case .results: break
@@ -521,7 +529,7 @@ enum CompendiumIndexAction: NavigationStackSourceAction, Equatable {
 
     enum NextScreenAction: Equatable {
         case compendiumIndex(CompendiumIndexAction)
-        case compendiumEntry(CompendiumItemDetailViewAction)
+        case compendiumEntry(CompendiumEntryDetailFeature.Action)
     }
 
     // Key-path support

App/App/Compendium/View/CompendiumIndexView.swift

@@ -361,7 +361,7 @@ struct CompendiumIndexView<BottomBarButtons>: View where BottomBarButtons: View
 
 struct CompendiumIndexViewProvider {
     let row: (Store<CompendiumIndexState, CompendiumIndexAction>, CompendiumEntry) -> AnyView
-    let detail: (Store<CompendiumEntryDetailViewState, CompendiumItemDetailViewAction>) -> AnyView
+    let detail: (Store<CompendiumEntryDetailFeature.State, CompendiumEntryDetailFeature.Action>) -> AnyView
 
     /// Can be used by the view to invalidate itself if the state changes
     let state: () -> any Equatable
@@ -371,7 +371,7 @@ struct CompendiumIndexViewProvider {
             CompendiumEntryRow(store: store, entry: entry).eraseToAnyView
         },
         detail: { store in
-            CompendiumItemDetailView(store: store).eraseToAnyView
+            CompendiumEntryDetailView(store: store).eraseToAnyView
         },
         state: { 0 }
     )
@@ -546,7 +546,7 @@ fileprivate struct CompendiumItemList: View, Equatable {
         Section(header: header) {
             ForEach(entries, id: \.item.key) { entry in
                 NavigationRowButton(action: {
-                    viewStore.send(.setNextScreen(.itemDetail(CompendiumEntryDetailViewState(entry: entry))))
+                    viewStore.send(.setNextScreen(.itemDetail(CompendiumEntryDetailFeature.State(entry: entry))))
                 }) {
                     let itemView = viewProvider.row(self.store, entry)