Skip to content

Commit

Permalink
Merge pull request #4 from r-token/3.0
Browse files Browse the repository at this point in the history
Version 3.0
  • Loading branch information
r-token committed Apr 3, 2024
2 parents b771199 + 8a823ec commit 7737fae
Show file tree
Hide file tree
Showing 51 changed files with 2,519 additions and 1,756 deletions.
246 changes: 126 additions & 120 deletions CatchUp-SwiftUI.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,25 +1,15 @@
{
"object": {
"pins": [
{
"package": "PhoneNumberKit",
"repositoryURL": "https://github.com/marmelroy/PhoneNumberKit.git",
"state": {
"branch": null,
"revision": "5c8c906036dd44d0ac6d721c5fd0bf5602d1ff0e",
"version": "3.2.0"
}
},
{
"package": "SwiftUIKit",
"repositoryURL": "https://github.com/youjinp/SwiftUIKit.git",
"state": {
"branch": null,
"revision": "16dcc576034f92e3e3429e820e52f414f7f800cd",
"version": "0.0.11"
}
"originHash" : "d01b822f6446cef501cebe37b5b78101e0a82173bb523ee64501d3331d40b50c",
"pins" : [
{
"identity" : "phonenumberkit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/marmelroy/PhoneNumberKit.git",
"state" : {
"revision" : "ee5d7114934e60812c9b47c333f01b67d002be2d",
"version" : "3.7.10"
}
]
},
"version": 1
}
],
"version" : 3
}
Original file line number Diff line number Diff line change
@@ -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>
93 changes: 0 additions & 93 deletions CatchUp-SwiftUI/AppDelegate.swift

This file was deleted.

6 changes: 3 additions & 3 deletions CatchUp-SwiftUI/Assets.xcassets/Contents.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
Original file line number Diff line number Diff line change
@@ -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
}
}
26 changes: 0 additions & 26 deletions CatchUp-SwiftUI/Base.lproj/LaunchScreen.storyboard

This file was deleted.

10 changes: 10 additions & 0 deletions CatchUp-SwiftUI/CatchUp-SwiftUI.entitlements
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
46 changes: 46 additions & 0 deletions CatchUp-SwiftUI/CatchUpApp.swift
Original file line number Diff line number Diff line change
@@ -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)
}
}
10 changes: 10 additions & 0 deletions CatchUp-SwiftUI/CatchUp_SwiftUI.entitlements
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
@@ -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"/>
Expand All @@ -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>
14 changes: 14 additions & 0 deletions CatchUp-SwiftUI/Data/DataController.swift
Original file line number Diff line number Diff line change
@@ -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?
}
Loading

0 comments on commit 7737fae

Please sign in to comment.