Updated to SwiftDux 0.11.0

Author: StevenLambion

README.md

@@ -2,22 +2,15 @@
 
 A reference implementation of a todo app to test out SwiftUI using [SwiftDux](https://github.com/StevenLambion/SwiftDux). This example is still a work in progress. There's partial iPad support, but SwiftUI's split view and navigation functionality is still not fully complete. It currently requires iOS 13.1 to work properly.
 
-<div style="text-align: center">
-  <div>
-    <img style="border: 1px solid #aaa; box-shadow: 0px 2px 12px #ccc" src="./screenshots/todoLists-iPad-screenshot.png" width="600"/>
-  </div>
-</div>
+<img src="./screenshots/todoLists-iPad-screenshot.png" width="100%"/>
 
-## Things left to do:
+## Things to do:
 
-Some of the items below are possible now if using a custom built SplitView and deprecated APIs. The point of this project though is to see where SwiftUI is at while it develops. It's still in an early preview stage, so many parts of it are in flux or missing.
+Some of the items below are possible now if using a custom built SplitView and deprecated APIs. The point of this project though is to see what's possible in SwiftUI while it develops.
 
 - Multi-window support with UIScene.
-- Initially selected todo list on iPad.
 - Split view navigation button to expand / collapse the master view.
   - This is currently missing. It was also missing in the SwiftUI Essentials video.
 - Remove arrows from master view on iPad.
   - This is an implemenation detail of NavigationLink.
 - Autofocus text fields when adding a new item.
-- Persist state.
-- Restore previous navigation on relaunch.

Todo.xcodeproj/project.pbxproj

@@ -117,6 +117,14 @@
 			path = TodoListDetails;
 			sourceTree = "<group>";
 		};
+		AA2606122318D3E500B46F56 /* Styles */ = {
+			isa = PBXGroup;
+			children = (
+				AA2F1A80231782D3003B088A /* CheckedToggleStyle.swift */,
+			);
+			path = Styles;
+			sourceTree = "<group>";
+		};
 		AA427B0022C31B28005A4368 /* App */ = {
 			isa = PBXGroup;
 			children = (
@@ -158,9 +166,7 @@
 		AA94FB9122F4D0E8008D0272 /* Views */ = {
 			isa = PBXGroup;
 			children = (
-				AA427ACB22C143AE005A4368 /* MainSceneView.swift */,
 				AA94FB9B22F4D969008D0272 /* AddButton.swift */,
-				AA2F1A80231782D3003B088A /* CheckedToggleStyle.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -196,6 +202,7 @@
 		AA9DA94322AD8A2100617E46 /* Todo */ = {
 			isa = PBXGroup;
 			children = (
+				AA2606122318D3E500B46F56 /* Styles */,
 				AA94FB9122F4D0E8008D0272 /* Views */,
 				AA9DA97622ADA74C00617E46 /* Containers */,
 				AA9DA96022AD8B2A00617E46 /* State */,
@@ -238,6 +245,7 @@
 		AA9DA97622ADA74C00617E46 /* Containers */ = {
 			isa = PBXGroup;
 			children = (
+				AA427ACB22C143AE005A4368 /* MainSceneView.swift */,
 				AA116DD022D25AB50046D5A3 /* TodoListDetails */,
 				AA116DCC22D257850046D5A3 /* TodoLists */,
 			);
@@ -556,7 +564,7 @@
 			repositoryURL = "https://github.com/StevenLambion/SwiftDux.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 0.10.0;
+				minimumVersion = 0.11.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

Todo/AppDelegate.swift

@@ -8,14 +8,20 @@
 
 import UIKit
 import SwiftDux
+import SwiftDuxExtras
 
 @UIApplicationMain
 	class AppDelegate: UIResponder, UIApplicationDelegate {
 
-  let store = Store(
+  var store = Store(
     state: AppState(),
     reducer: AppReducer(),
-    middleware: PrintActionMiddleware()
+    middleware: [
+      PrintActionMiddleware(),
+      PersistStateMiddleware(JSONStatePersistor<AppState>()) { state in
+        state.schemaVersion == AppState.currentSchemaVersion
+      }
+    ]
   )
 
   func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {

Todo/Views/MainSceneView.swift renamed to Todo/Containers/MainSceneView.swift

@@ -3,7 +3,7 @@ import Combine
 import SwiftDux
 
 struct TodoListDetailsContainer : View {
-  
+  @Environment(\.horizontalSizeClass) var sizeClass
   @MappedState private var todoList: TodoList
   @MappedDispatch() private var dispatch
 
@@ -21,7 +21,9 @@ struct TodoListDetailsContainer : View {
     )
     .environment(\.editMode, $editMode)
     .onDisappear {
-      self.dispatch(MainSceneAction.selectList(byId: nil))
+      if self.sizeClass == .compact {
+        self.dispatch(MainSceneAction.selectList(byId: nil))
+      }
     }
   }
 

Todo/Containers/TodoListDetails/TodoListDetailsContainer.swift

@@ -1,6 +1,5 @@
 import Foundation
 import SwiftDux
-import SwiftUI
 
 func createTodos() -> [Todo] {
   let count = 1
@@ -25,14 +24,11 @@ fileprivate let defaultTodoList = OrderedState(
 )
 
 struct AppState : StateType {
-  var mainScene: MainScene
-  var todoLists: OrderedState<TodoList>
 
-  init(
-    mainScene: MainScene = MainScene(),
-    todoLists: OrderedState<TodoList> = defaultTodoList
-  ) {
-    self.mainScene = mainScene
-    self.todoLists = todoLists
-  }
+  static let currentSchemaVersion = 1
+  
+  var schemaVersion: Int = currentSchemaVersion
+  var mainScene: MainScene = MainScene()
+  var todoLists: OrderedState<TodoList> = defaultTodoList
+
 }

Todo/State/App/AppState.swift

@@ -14,9 +14,4 @@ struct MainScene: StateType {
   private enum CodingKeys: String, CodingKey {
     case selectedListId
   }
-  
-  init(displayMode: MainSceneDisplayMode = .compact, selectedListId: String? = nil) {
-    self.displayMode = displayMode
-    self.selectedListId = selectedListId
-  }
 }

Todo/State/MainScene/MainScene.swift

@@ -1,5 +1,4 @@
 import Foundation
-import SwiftUI
 import SwiftDux
 
 struct TodoList: IdentifiableState {

Todo/State/TodoLists/TodoList.swift

@@ -1,8 +1,7 @@
 import Foundation
-import SwiftUI
 import SwiftDux
 
-struct Todo: IdentifiableState, Identifiable {
+struct Todo: IdentifiableState {
   var id: String
   var text: String
   var completed: Bool = false

Todo/State/Todos/Todo.swift

@@ -1,6 +1,5 @@
 
 import Foundation
-import SwiftUI
 import SwiftDux
 
 enum TodosAction: Action {