Refactoring for support of new iOS implementation (#13)

Gym Routine Tracker.xcodeproj/xcshareddata/xcschemes/Gym Routine Tracker Watch App.xcscheme → Gym Routine Tracker Watch.xcodeproj/xcshareddata/xcschemes/Gym Routine Tracker Watch App.xcscheme

@@ -17,7 +17,7 @@
                BlueprintIdentifier = "40CE1402293B0DBB00462D62"
                BuildableName = "Gym Routine Tracker Watch App.app"
                BlueprintName = "Gym Routine Tracker Watch App"
-               ReferencedContainer = "container:Gym Routine Tracker.xcodeproj">
+               ReferencedContainer = "container:Gym Routine Tracker Watch.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
@@ -29,9 +29,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "40CE13FC293B0DBB00462D62"
-               BuildableName = "Gym Routine Tracker.app"
-               BlueprintName = "Gym Routine Tracker"
-               ReferencedContainer = "container:Gym Routine Tracker.xcodeproj">
+               BuildableName = "Gym Routine Tracker Watch.app"
+               BlueprintName = "Gym Routine Tracker Watch"
+               ReferencedContainer = "container:Gym Routine Tracker Watch.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -61,14 +61,18 @@
             BlueprintIdentifier = "40CE1402293B0DBB00462D62"
             BuildableName = "Gym Routine Tracker Watch App.app"
             BlueprintName = "Gym Routine Tracker Watch App"
-            ReferencedContainer = "container:Gym Routine Tracker.xcodeproj">
+            ReferencedContainer = "container:Gym Routine Tracker Watch.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
       <CommandLineArguments>
          <CommandLineArgument
             argument = "-com.apple.CoreData.Logging.stderr 0"
             isEnabled = "YES">
          </CommandLineArgument>
+         <CommandLineArgument
+            argument = "-com.apple.CoreData.ConcurrencyDebug 0"
+            isEnabled = "YES">
+         </CommandLineArgument>
          <CommandLineArgument
             argument = "-com.apple.CoreData.CloudKitDebug 0"
             isEnabled = "YES">
@@ -88,7 +92,7 @@
             BlueprintIdentifier = "40CE1402293B0DBB00462D62"
             BuildableName = "Gym Routine Tracker Watch App.app"
             BlueprintName = "Gym Routine Tracker Watch App"
-            ReferencedContainer = "container:Gym Routine Tracker.xcodeproj">
+            ReferencedContainer = "container:Gym Routine Tracker Watch.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>

README.md

@@ -46,8 +46,9 @@ To any Apple product managers who like this app, please consider Sherlocking it!
 
 ## See Also
 
-* [GRT Website](https://gym-routine-tracker.github.io) - Website for GRT
+* [GRT Website](https://gym-routine-tracker.github.io) - Website for GRT (both watchOS and iOS implementations)
 * [GRT on the App Store](https://apps.apple.com/us/app/gym-routine-tracker/id6444747204) - App Store link for free download of GRT
+* [GroutUI](https://github.com/gym-routine-tracker/GroutUI) - shared UI layer for GRT (watchOS and iOS)
 * [GroutLib](https://github.com/gym-routine-tracker/GroutLib) - shared business logic and data layer for GRT
 
 Apps by the same author:
@@ -57,7 +58,7 @@ Apps by the same author:
 
 ## License
 
-Copyright 2022 OpenAlloc LLC
+Copyright 2022, 2023 OpenAlloc LLC
 
 All application code is licensed under the [Mozilla Public License 2](https://www.mozilla.org/en-US/MPL/2.0/), except where noted in individual modules.
 

Sources/Main View/ContentView.swift → Sources/ContentView.swift

@@ -1,7 +1,7 @@
 //
 //  ContentView.swift
 //
-// Copyright 2022  OpenAlloc LLC
+// Copyright 2022, 2023  OpenAlloc LLC
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -12,15 +12,15 @@ import CoreData
 import SwiftUI
 
 import GroutLib
+import GroutUI
 
 struct ContentView: View {
-    @State var router: NavigationPath = .init()
+    @SceneStorage("main-routines-nav") private var routinesNavData: Data?
 
     var body: some View {
-        NavigationStack(path: $router) {
-            RoutineList(router: $router)
+        NavStack(name: "main", navData: $routinesNavData) {
+            RoutineList()
         }
-        .interactiveDismissDisabled() // NOTE: needed to prevent home button from dismissing sheet
     }
 }