Reworking/refactoring to share functionality with Daily Calorie Tracker (#17)

Author: reedes

.swiftformat

@@ -0,0 +1,7 @@
+--wraparguments after-first
+
+# was changing
+#  let routine: Routine = Routine.get(viewContext, forURIRepresentation: routineURI)
+# to 
+#  let routine = Routine.get(viewContext, forURIRepresentation: routineURI)
+--disable redundantType

Gym Routine Tracker Watch.xcodeproj/project.pbxproj

@@ -175,7 +175,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1410;
-				LastUpgradeCheck = 1410;
+				LastUpgradeCheck = 1420;
 				TargetAttributes = {
 					40CE13FC293B0DBB00462D62 = {
 						CreatedOnToolsVersion = 14.1;
@@ -284,6 +284,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -344,6 +345,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -378,14 +380,14 @@
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = Sources/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "Gym Routine Tracker";
+				INFOPLIST_KEY_CFBundleDisplayName = "Gym Routines";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				INFOPLIST_KEY_WKWatchOnly = YES;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.1;
+				MARKETING_VERSION = 1.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = org.openalloc.grout.watch;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = watchos;
@@ -411,14 +413,14 @@
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = Sources/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "Gym Routine Tracker";
+				INFOPLIST_KEY_CFBundleDisplayName = "Gym Routines";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				INFOPLIST_KEY_WKWatchOnly = YES;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.1;
+				MARKETING_VERSION = 1.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = org.openalloc.grout.watch;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = watchos;
@@ -440,7 +442,7 @@
 				DEVELOPMENT_TEAM = J735QC5U38;
 				INFOPLIST_FILE = Sources/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Gym Routine Tracker";
-				MARKETING_VERSION = 1.6.1;
+				MARKETING_VERSION = 1.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = org.openalloc.grout;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -457,7 +459,7 @@
 				DEVELOPMENT_TEAM = J735QC5U38;
 				INFOPLIST_FILE = Sources/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Gym Routine Tracker";
-				MARKETING_VERSION = 1.6.1;
+				MARKETING_VERSION = 1.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = org.openalloc.grout;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1410"
+   LastUpgradeVersion = "1420"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Sources/Assets.xcassets/grt_icon.imageset/Contents.json renamed to Sources/Assets.xcassets/app_icon.imageset/Contents.json

@@ -15,26 +15,42 @@ import GroutLib
 import GroutUI
 
 struct ContentView: View {
+    @Environment(\.managedObjectContext) private var viewContext
+    @EnvironmentObject private var manager: CoreDataStack
+
     @SceneStorage("main-routines-nav") private var routinesNavData: Data?
 
     var body: some View {
-        NavStack(name: "main", navData: $routinesNavData) {
+        NavStack(navData: $routinesNavData, destination: destination) {
             RoutineList()
         }
+        .onContinueUserActivity(startRoutineActivityType) {
+            handleStartRoutineUA(viewContext, $0)
+        }
+    }
+
+    // handle routes for watchOS-specific views here
+    @ViewBuilder
+    private func destination(_ router: GroutRouter, _ route: GroutRoute) -> some View {
+        switch route {
+        default:
+            GroutDestination(route)
+                .environmentObject(router)
+                .environment(\.managedObjectContext, viewContext)
+        }
     }
 }
 
 struct ContentView_Previews: PreviewProvider {
     static var previews: some View {
-        let ctx = PersistenceManager.getPreviewContainer().viewContext
+        let manager = CoreDataStack.getPreviewStack()
+        let ctx = manager.container.viewContext
         let routine = Routine.create(ctx, userOrder: 0)
         routine.name = "Back & Bicep"
-        let e1 = Exercise.create(ctx, userOrder: 0)
+        let e1 = Exercise.create(ctx, routine: routine, userOrder: 0)
         e1.name = "Lat Pulldown"
-        e1.routine = routine
-        let e2 = Exercise.create(ctx, userOrder: 1)
+        let e2 = Exercise.create(ctx, routine: routine, userOrder: 1)
         e2.name = "Arm Curl"
-        e2.routine = routine
         return ContentView()
             .environment(\.managedObjectContext, ctx)
     }

Sources/Assets.xcassets/grt_icon.imageset/grt_logo_120.png renamed to Sources/Assets.xcassets/app_icon.imageset/grt_logo_120.png

@@ -12,28 +12,32 @@ import os
 import SwiftUI
 
 import GroutLib
+import TrackerLib
 
 @main
 struct Gym_Routine_Tracker_Watch_App: App {
-    let persistenceManager = PersistenceManager.shared
-
     @Environment(\.scenePhase) var scenePhase
 
-    private let logger = Logger(
-        subsystem: Bundle.main.bundleIdentifier!,
-        category: "App"
-    )
+    // MARK: - Locals
+
+    private let coreDataStack = CoreDataStack(isCloud: true)
+
+    private let logger = Logger(subsystem: Bundle.main.bundleIdentifier!,
+                                category: "App")
+
+    // MARK: - Scene
 
     var body: some Scene {
         WindowGroup {
             ContentView()
                 .environment(\.managedObjectContext,
-                             persistenceManager.container.viewContext)
+                             coreDataStack.container.viewContext)
+                .environmentObject(coreDataStack)
         }
         .onChange(of: scenePhase) { _ in
             // save if: (1) app moved to background, and (2) changes are pending
             do {
-                try persistenceManager.container.viewContext.save()
+                try coreDataStack.container.viewContext.save()
             } catch {
                 logger.error("\(#function): \(error.localizedDescription)")
             }