r-token · r-token · Apr 3, 2024 · Mar 2, 2024 · Mar 3, 2024 · Mar 3, 2024
diff --git a/CatchUp-SwiftUI.xcodeproj/project.pbxproj b/CatchUp-SwiftUI.xcodeproj/project.pbxproj
diff --git a/CatchUp-SwiftUI.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/CatchUp-SwiftUI.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/CatchUp-SwiftUI.xcodeproj/xcshareddata/xcschemes/CatchUp-SwiftUI.xcscheme b/CatchUp-SwiftUI.xcodeproj/xcshareddata/xcschemes/CatchUp-SwiftUI.xcscheme
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1530"
+   version = "2.2">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <AutocreatedTestPlanReference>
+            </AutocreatedTestPlanReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F48E37ED22C455C3008B0B8B"
+            BuildableName = "CatchUp.app"
+            BlueprintName = "CatchUp-SwiftUI"
+            ReferencedContainer = "container:CatchUp-SwiftUI.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-com.apple.CoreData.CloudKitDebug 0"
+            isEnabled = "YES">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "-com.apple.CoreData.Logging.stderr 0"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F48E37ED22C455C3008B0B8B"
+            BuildableName = "CatchUp.app"
+            BlueprintName = "CatchUp-SwiftUI"
+            ReferencedContainer = "container:CatchUp-SwiftUI.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/CatchUp-SwiftUI/AppDelegate.swift b/CatchUp-SwiftUI/AppDelegate.swift
diff --git a/CatchUp-SwiftUI/Assets.xcassets/Contents.json b/CatchUp-SwiftUI/Assets.xcassets/Contents.json
@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}
diff --git a/CatchUp-SwiftUI/Assets.xcassets/LaunchScreenBackgroundColor.colorset/Contents.json b/CatchUp-SwiftUI/Assets.xcassets/LaunchScreenBackgroundColor.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x00",
+          "green" : "0x00",
+          "red" : "0x00"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x00",
+          "green" : "0x00",
+          "red" : "0x00"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/CatchUp-SwiftUI/Base.lproj/LaunchScreen.storyboard b/CatchUp-SwiftUI/Base.lproj/LaunchScreen.storyboard
diff --git a/CatchUp-SwiftUI/CatchUp-SwiftUI.entitlements b/CatchUp-SwiftUI/CatchUp-SwiftUI.entitlements
@@ -2,6 +2,16 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>aps-environment</key>
+	<string>development</string>
+	<key>com.apple.developer.icloud-container-identifiers</key>
+	<array>
+		<string>iCloud.com.ryantoken.CatchUp</string>
+	</array>
+	<key>com.apple.developer.icloud-services</key>
+	<array>
+		<string>CloudKit</string>
+	</array>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
 	<key>com.apple.security.network.client</key>

diff --git a/CatchUp-SwiftUI/CatchUpApp.swift b/CatchUp-SwiftUI/CatchUpApp.swift
@@ -0,0 +1,46 @@
+//
+//  CatchUpApp.swift
+//  CatchUp-SwiftUI
+//
+//  Created by Ryan Token on 3/3/24.
+//  Copyright © 2024 Token Solutions. All rights reserved.
+//
+
+import SwiftData
+import SwiftUI
+
+@main
+struct CatchUpApp: App {
+    // use the SQLite file created by Core Data originally, instead of SwiftData's default.store file
+    let url = URL.applicationSupportDirectory.appending(path: "CatchUp-SwiftUI.sqlite")
+    let modelContainer: ModelContainer
+
+    @State private var dataController = DataController()
+
+    init() {
+        do {
+            modelContainer = try ModelContainer(
+                for: SelectedContact.self,
+                configurations: ModelConfiguration(url: url))
+        } catch {
+            fatalError("Failed to initialize model container.")
+        }
+    }
+
+    var body: some Scene {
+        WindowGroup {
+            NavigationSplitView {
+                HomeScreen()
+            } detail: {
+                if let selectedContact = dataController.selectedContact {
+                    DetailScreen(contact: selectedContact)
+                } else {
+                    NoContactSelectedScreen()
+                }
+            }
+            .environment(dataController)
+            .accentColor(.orange)
+        }
+        .modelContainer(modelContainer)
+    }
+}
diff --git a/CatchUp-SwiftUI/CatchUp_SwiftUI.entitlements b/CatchUp-SwiftUI/CatchUp_SwiftUI.entitlements
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>com.apple.security.app-sandbox</key>
+    <true/>
+    <key>com.apple.security.files.user-selected.read-only</key>
+    <true/>
+</dict>
+</plist>
diff --git a/CatchUp-SwiftUI/CoreData/CatchUp-SwiftUI.xcdatamodeld/CatchUp_SwiftUI.xcdatamodel/contents b/CatchUp-SwiftUI/CoreData/CatchUp-SwiftUI.xcdatamodeld/CatchUp_SwiftUI.xcdatamodel/contents
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="16119" systemVersion="19E287" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22522" systemVersion="23D60" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithSwiftData="YES" userDefinedModelVersionIdentifier="">
     <entity name="SelectedContact" representedClassName="SelectedContact" syncable="YES">
         <attribute name="address" optional="YES" attributeType="String"/>
         <attribute name="anniversary" optional="YES" attributeType="String"/>
@@ -23,7 +23,4 @@
         <attribute name="secondary_email" optional="YES" attributeType="String"/>
         <attribute name="secondary_phone" optional="YES" attributeType="String"/>
     </entity>
-    <elements>
-        <element name="SelectedContact" positionX="-63" positionY="-18" width="128" height="28"/>
-    </elements>
 </model>
diff --git a/CatchUp-SwiftUI/Data/DataController.swift b/CatchUp-SwiftUI/Data/DataController.swift
@@ -0,0 +1,14 @@
+//
+//  DataController.swift
+//  CatchUp-SwiftUI
+//
+//  Created by Ryan Token on 3/31/24.
+//  Copyright © 2024 Token Solutions. All rights reserved.
+//
+
+import Foundation
+
+@Observable
+class DataController {
+    var selectedContact: SelectedContact?
+}