Updated to the Swift 5.2 branch of SwiftDux.

Author: StevenLambion

README.md

@@ -1,13 +1,13 @@
 # SwiftDux Todo List App
 
-A simple Todo app written for SwiftUI using the [SwiftDux](https://github.com/StevenLambion/SwiftDux) library. There's partial iPad support, but SwiftUI's split view and navigation functionality is not fully complete. It requires iOS 13.1+ to work properly.
+A simple Todo app written for SwiftUI using the [SwiftDux](https://github.com/StevenLambion/SwiftDux) library. There's partial iPad support, but SwiftUI's split view and navigation functionality is not fully complete. It's using the Swift 5.2 branch of SwiftDux, so it requires Xcode 11.4 or higher.
 
 <img src="./screenshots/todoLists-iPad-screenshot.png" width="100%"/>
 
 # Project Patterns
 
 ## Redux / Elm Architecture using Ducks
-SwiftDux helps build applications using an architecture popularized by elm and redux. There's a "Ducks" directory containing the application state and logic. "Ducks" is a common pattern to organize the application state into feature modules. Each feature has its own directory containing its state, actions, and reducer. One module (such as App), may require other modules. This builds the structure of the application's state.
+SwiftDux helps build applications using an architecture popularized by elm and redux. There's a "Ducks" directory containing the application state and logic. "Ducks" is a common pattern to organize the application state into feature modules. Each feature has its own directory containing its state, actions, and reducer. A module also defines a protocol suffixed with "Root" to provide the shape it requires in the application state.
 
 ## Container vs View
 This application uses a popular pattern from the React community know as the container ("smart") vs presentation ("dumb") components. The presentation component is stateless, and represents some kind of UI element. The container, however, is stateful. It tracks the application's state and connects functionality.
@@ -23,7 +23,7 @@ Each view and container has a preview to demonstrate how it works with SwiftDux.
 
 - Multi-window support with UIScene.
 - Split view navigation button to expand / collapse the master view.
-  - This is currently missing. It was also missing in Apple's SwiftUI Essentials video.
+  - This is currently missing.
 - Remove arrows from master view on iPad.
   - This is an implementation detail of NavigationLink.
 - Autofocus text fields when adding a new item.

Todo Lists.xcodeproj/project.pbxproj

@@ -8,8 +8,10 @@
 
 /* Begin PBXBuildFile section */
 		A9307ECA23D91EF0005F5C96 /* SwiftDux in Frameworks */ = {isa = PBXBuildFile; productRef = A9307EC923D91EF0005F5C96 /* SwiftDux */; };
+		A96EA6AC23F44F7C0024DBAA /* TodoListsRoot.swift in Sources */ = {isa = PBXBuildFile; fileRef = A96EA6AB23F44F7C0024DBAA /* TodoListsRoot.swift */; };
+		A96EA6AE23F44FB50024DBAA /* TodosRoot.swift in Sources */ = {isa = PBXBuildFile; fileRef = A96EA6AD23F44FB50024DBAA /* TodosRoot.swift */; };
+		A96EA6B023F452250024DBAA /* configureStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = A96EA6AF23F452250024DBAA /* configureStore.swift */; };
 		A976F54F23D3D88E00004B33 /* TodosAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = A976F54E23D3D88E00004B33 /* TodosAction.swift */; };
-		A991C7C523D4E63D00AD7AA3 /* AppAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = A991C7C423D4E63D00AD7AA3 /* AppAction.swift */; };
 		A991C7DF23D6519F00AD7AA3 /* TodoListNameContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = A991C7DE23D6519F00AD7AA3 /* TodoListNameContainer.swift */; };
 		A991C7E123D6568400AD7AA3 /* NewTodoContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = A991C7E023D6568400AD7AA3 /* NewTodoContainer.swift */; };
 		AA2F1A81231782D3003B088A /* CheckedToggleStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA2F1A80231782D3003B088A /* CheckedToggleStyle.swift */; };
@@ -32,7 +34,6 @@
 		AA9DA96922AD8E4C00617E46 /* TodoContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA9DA96822AD8E4C00617E46 /* TodoContainer.swift */; };
 		AA9DA96D22AD8FC600617E46 /* TodoListBrowserContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA9DA96C22AD8FC600617E46 /* TodoListBrowserContainer.swift */; };
 		AA9DA96F22AD8FED00617E46 /* AppState.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA9DA96E22AD8FED00617E46 /* AppState.swift */; };
-		AA9DA97122AD90B100617E46 /* AppReducer.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA9DA97022AD90B100617E46 /* AppReducer.swift */; };
 		AABF238C22D2B45800F332DC /* TodoListsAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = AABF238B22D2B45800F332DC /* TodoListsAction.swift */; };
 		AAEBBAD122AF159B0014D88C /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = AAEBBAD022AF159B0014D88C /* README.md */; };
 /* End PBXBuildFile section */
@@ -52,8 +53,10 @@
 /* Begin PBXFileReference section */
 		A904010A23D8BA63004D65F1 /* SwiftDux.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SwiftDux.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		A904010C23D8BA63004D65F1 /* SwiftDuxExtras.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SwiftDuxExtras.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		A96EA6AB23F44F7C0024DBAA /* TodoListsRoot.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TodoListsRoot.swift; sourceTree = "<group>"; };
+		A96EA6AD23F44FB50024DBAA /* TodosRoot.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TodosRoot.swift; sourceTree = "<group>"; };
+		A96EA6AF23F452250024DBAA /* configureStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = configureStore.swift; sourceTree = "<group>"; };
 		A976F54E23D3D88E00004B33 /* TodosAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TodosAction.swift; sourceTree = "<group>"; };
-		A991C7C423D4E63D00AD7AA3 /* AppAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppAction.swift; sourceTree = "<group>"; };
 		A991C7DE23D6519F00AD7AA3 /* TodoListNameContainer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TodoListNameContainer.swift; sourceTree = "<group>"; };
 		A991C7E023D6568400AD7AA3 /* NewTodoContainer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewTodoContainer.swift; sourceTree = "<group>"; };
 		AA2F1A80231782D3003B088A /* CheckedToggleStyle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CheckedToggleStyle.swift; sourceTree = "<group>"; };
@@ -78,7 +81,6 @@
 		AA9DA96822AD8E4C00617E46 /* TodoContainer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TodoContainer.swift; sourceTree = "<group>"; };
 		AA9DA96C22AD8FC600617E46 /* TodoListBrowserContainer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TodoListBrowserContainer.swift; sourceTree = "<group>"; };
 		AA9DA96E22AD8FED00617E46 /* AppState.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppState.swift; sourceTree = "<group>"; };
-		AA9DA97022AD90B100617E46 /* AppReducer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppReducer.swift; sourceTree = "<group>"; };
 		AABF238B22D2B45800F332DC /* TodoListsAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TodoListsAction.swift; sourceTree = "<group>"; };
 		AAEBBAD022AF159B0014D88C /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -95,9 +97,18 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		A96EA6B123F453580024DBAA /* App */ = {
+			isa = PBXGroup;
+			children = (
+				AA9DA96E22AD8FED00617E46 /* AppState.swift */,
+			);
+			path = App;
+			sourceTree = "<group>";
+		};
 		A976F54723D3D65E00004B33 /* TodoLists */ = {
 			isa = PBXGroup;
 			children = (
+				A96EA6AB23F44F7C0024DBAA /* TodoListsRoot.swift */,
 				AA9DA96222AD8B5900617E46 /* TodoList.swift */,
 				AABF238B22D2B45800F332DC /* TodoListsAction.swift */,
 				AA427B0822C3D097005A4368 /* TodoListsReducer.swift */,
@@ -113,19 +124,10 @@
 			path = Styles;
 			sourceTree = "<group>";
 		};
-		AA427B0022C31B28005A4368 /* App */ = {
-			isa = PBXGroup;
-			children = (
-				AA9DA96E22AD8FED00617E46 /* AppState.swift */,
-				AA9DA97022AD90B100617E46 /* AppReducer.swift */,
-				A991C7C423D4E63D00AD7AA3 /* AppAction.swift */,
-			);
-			path = App;
-			sourceTree = "<group>";
-		};
 		AA427B0122C31B35005A4368 /* Todos */ = {
 			isa = PBXGroup;
 			children = (
+				A96EA6AD23F44FB50024DBAA /* TodosRoot.swift */,
 				AA9DA96422AD8BA100617E46 /* Todo.swift */,
 				AA427AC922C02E75005A4368 /* TodosReducer.swift */,
 				A976F54E23D3D88E00004B33 /* TodosAction.swift */,
@@ -200,9 +202,10 @@
 		AA9DA96022AD8B2A00617E46 /* Ducks */ = {
 			isa = PBXGroup;
 			children = (
-				AA427B0022C31B28005A4368 /* App */,
+				A96EA6B123F453580024DBAA /* App */,
 				A976F54723D3D65E00004B33 /* TodoLists */,
 				AA427B0122C31B35005A4368 /* Todos */,
+				A96EA6AF23F452250024DBAA /* configureStore.swift */,
 			);
 			path = Ducks;
 			sourceTree = "<group>";
@@ -311,13 +314,14 @@
 				AA9DA96922AD8E4C00617E46 /* TodoContainer.swift in Sources */,
 				AA2F1A81231782D3003B088A /* CheckedToggleStyle.swift in Sources */,
 				A991C7E123D6568400AD7AA3 /* NewTodoContainer.swift in Sources */,
-				A991C7C523D4E63D00AD7AA3 /* AppAction.swift in Sources */,
 				AA9DA94722AD8A2100617E46 /* SceneDelegate.swift in Sources */,
 				AA94FB9822F4D869008D0272 /* TodoListNameField.swift in Sources */,
+				A96EA6B023F452250024DBAA /* configureStore.swift in Sources */,
+				A96EA6AE23F44FB50024DBAA /* TodosRoot.swift in Sources */,
 				AA94FB9522F4D7F8008D0272 /* TodoRow.swift in Sources */,
 				AA9DA96F22AD8FED00617E46 /* AppState.swift in Sources */,
 				AA427ACA22C02E75005A4368 /* TodosReducer.swift in Sources */,
-				AA9DA97122AD90B100617E46 /* AppReducer.swift in Sources */,
+				A96EA6AC23F44F7C0024DBAA /* TodoListsRoot.swift in Sources */,
 				AA94FB9C22F4D969008D0272 /* AddButton.swift in Sources */,
 				AA9DA94922AD8A2100617E46 /* TodoListContainer.swift in Sources */,
 				AA9DA96322AD8B5900617E46 /* TodoList.swift in Sources */,
@@ -521,7 +525,7 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/StevenLambion/SwiftDux.git";
 			requirement = {
-				branch = master;
+				branch = "swift-5.2";
 				kind = branch;
 			};
 		};

Todo/AppDelegate.swift

@@ -13,16 +13,7 @@ import SwiftDuxExtras
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
-  var store = Store(
-    state: AppState(),
-    reducer: AppReducer(),
-    middleware: [
-      // PrintActionMiddleware(),
-      PersistStateMiddleware(JSONStatePersistor<AppState>()) { state in
-        state.schemaVersion == AppState.currentSchemaVersion
-      }
-    ]
-  )
+  var store = configureStore()
 
   func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
     // Override point for customization after application launch.

Todo/Containers/AppContainer.swift

@@ -15,10 +15,7 @@ struct AppContainer : View {
 #if DEBUG
 public enum AppContainer_Previews: PreviewProvider {
   static var store: Store<AppState> {
-    Store(
-      state: AppState(),
-      reducer: AppReducer()
-    )
+    configureStore()
   }
 
   public static var previews: some View {

Todo/Containers/NewTodoContainer.swift

@@ -7,15 +7,21 @@ struct NewTodoContainer : ConnectableView {
 
   @MappedDispatch() private var dispatch
 
-  func map(state: AppState, binder: StateBinder) -> Binding<String>? {
+  struct Props: Equatable {
+    @ActionBinding var newTodoText: String
+  }
+  
+  func map(state: AppState, binder: ActionBinder) -> Props? {
     guard let todoList = state.todoLists[id] else { return nil }
-    return binder.bind(todoList.newTodoText) {
-      TodoListsAction.setNewTodoText(id: todoList.id, text: $0)
-    }
+    return Props(
+      newTodoText: binder.bind(todoList.newTodoText) {
+        TodoListsAction.setNewTodoText(id: todoList.id, text: $0)
+      }
+    )
   }
 
   func body(props: Props) -> some View {
-    NewTodoRow(text: props) {
+    NewTodoRow(text: props.$newTodoText) {
       self.dispatch(TodoListsAction.addTodo(id: self.id, text: $0))
     }.padding()
   }
@@ -25,10 +31,7 @@ struct NewTodoContainer : ConnectableView {
 #if DEBUG
 public enum NewTodoContainer_Previews: PreviewProvider {
   static var store: Store<AppState> {
-    Store(
-      state: AppState(),
-      reducer: AppReducer()
-    )
+    configureStore()
   }
 
   public static var previews: some View {

Todo/Containers/TodoContainer.swift

@@ -7,11 +7,11 @@ struct TodoContainer : ConnectableView {
   var todoId: String
 
   struct Props: Equatable {
-    @Binding var text: String
-    @Binding var completed: Bool
+    @ActionBinding var text: String
+    @ActionBinding var completed: Bool
   }
 
-  func map(state: AppState, binder: StateBinder) -> Props? {
+  func map(state: AppState, binder: ActionBinder) -> Props? {
     guard let todo = state.todos[todoId] else { return nil }
     return Props(
       text: binder.bind(todo.text) { TodosAction.setText(id: todo.id, text: $0) },
@@ -34,10 +34,7 @@ struct TodoContainer : ConnectableView {
 #if DEBUG
 public enum TodoListDetailsRowContainer_Previews: PreviewProvider {
   static var store: Store<AppState> {
-    Store(
-      state: AppState(),
-      reducer: AppReducer()
-    )
+    configureStore()
   }
 
   public static var previews: some View {

Todo/Containers/TodoListBrowserContainer.swift

@@ -62,23 +62,20 @@ struct TodoListBrowserContainer : ConnectableView {
   }
 
   func selectTodoList(id: String) {
-    dispatch(AppAction.selectTodoList(id: id))
+    dispatch(TodoListsAction.selectTodoList(id: id))
   }
 
   func selectDefaultTodoList(props: Props) {
     guard props.selectedTodoListId == nil && sizeClass == .regular else { return }
-    dispatch(AppAction.selectTodoList(id: props.todoLists.first?.id))
+    dispatch(TodoListsAction.selectTodoList(id: props.todoLists.first?.id))
   }
 
 }
 
 #if DEBUG
 public enum TodoListBrowserContainer_Previews: PreviewProvider {
   static var store: Store<AppState> {
-    Store(
-      state: AppState(),
-      reducer: AppReducer()
-    )
+    configureStore()
   }
 
   public static var previews: some View {

Todo/Containers/TodoListContainer.swift

@@ -45,18 +45,15 @@ struct TodoListContainer : ConnectableView {
 
   func deselectTodoList() {
     if self.sizeClass == .compact {
-      self.dispatch(AppAction.selectTodoList(id: nil))
+      self.dispatch(TodoListsAction.selectTodoList(id: nil))
     }
   }
 }
 
 #if DEBUG
 public enum TodoListContainer_Previews: PreviewProvider {
   static var store: Store<AppState> {
-    Store(
-      state: AppState(),
-      reducer: AppReducer()
-    )
+    configureStore()
   }
 
   public static var previews: some View {

Todo/Containers/TodoListNameContainer.swift

@@ -5,25 +5,22 @@ import SwiftDux
 struct TodoListNameContainer : ConnectableView {
   var id: String
 
-  func map(state: AppState, binder: StateBinder) -> Binding<String>? {
+  func map(state: AppState, binder: ActionBinder) -> ActionBinding<String>? {
     guard let todoList = state.todoLists[id] else { return nil }
     return binder.bind(todoList.name) {
       TodoListsAction.setName(id: todoList.id, name: $0)
     }
   }
 
-  func body(props: Binding<String>) -> some View {
-    TodoListNameField(name: props)
+  func body(props: ActionBinding<String>) -> some View {
+    TodoListNameField(name: props.projectedValue)
   }
 }
 
 #if DEBUG
 public enum TodoListNameContainer_Previews: PreviewProvider {
   static var store: Store<AppState> {
-    Store(
-      state: AppState(),
-      reducer: AppReducer()
-    )
+    configureStore()
   }
 
   public static var previews: some View {

Todo/Ducks/App/AppAction.swift

@@ -29,7 +29,7 @@ fileprivate let defaultTodos = [
     return todos
   }) { (_, new) in new }
 
-struct AppState : StateType {
+struct AppState: StateType, TodoListsRoot {
   static let currentSchemaVersion = 2
 
   var schemaVersion: Int = currentSchemaVersion