breadone/OnCue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: breadone:9319e8904b0f9706b8f14a2a8f2ebf858e7eaa22
Branches Tags
breadone:main
..
compare: breadone:71806c9ca4f590db6b4af0887c1dc48196298824
Branches Tags
breadone:main

No commits in common. "9319e8904b0f9706b8f14a2a8f2ebf858e7eaa22" and "71806c9ca4f590db6b4af0887c1dc48196298824" have entirely different histories.
9319e8904b ... 71806c9ca4

28 changed files with 140 additions and 379 deletions
Show Stats Expand all files Collapse all files

68
OnCue.xcodeproj/project.pbxproj
View File

@ -7,9 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
460D7DF62C2AE788002B623C /* TimerManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 460D7DF52C2AE788002B623C /* TimerManager.swift */; };
460D7DF72C2AE788002B623C /* TimerManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 460D7DF52C2AE788002B623C /* TimerManager.swift */; };
4614D4032C3DFD3E000799F5 /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46D3E1432C27DFCE0060722E /* Preferences.swift */; };
464787CB2C269CAF00A9C462 /* TeleprompterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 464787CA2C269CAF00A9C462 /* TeleprompterView.swift */; };
464787CC2C26A2E100A9C462 /* ColorModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46AD30F12C2672BD00486C25 /* ColorModel.swift */; };
464787CD2C26A2E500A9C462 /* PreviewData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46AD30F32C267D6400486C25 /* PreviewData.swift */; };
@ -22,7 +19,7 @@
46AD30D32C26559B00486C25 /* MainViewPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46AD30D22C26559B00486C25 /* MainViewPresenter.swift */; };
46AD30D52C26559D00486C25 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 46AD30D42C26559D00486C25 /* Assets.xcassets */; };
46AD30D82C26559D00486C25 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 46AD30D72C26559D00486C25 /* Preview Assets.xcassets */; };
46AD30DB2C26559D00486C25 /* OnCue.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 46AD30CE2C26559B00486C25 /* OnCue.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
46AD30DB2C26559D00486C25 /* OnCuePresenter Watch App.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 46AD30CE2C26559B00486C25 /* OnCuePresenter Watch App.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
46AD30E22C2656CB00486C25 /* OCCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46AD30E12C2656CB00486C25 /* OCCard.swift */; };
46AD30E32C2656CB00486C25 /* OCCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46AD30E12C2656CB00486C25 /* OCCard.swift */; };
46AD30E52C2656D100486C25 /* OCProject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46AD30E42C2656D100486C25 /* OCProject.swift */; };
@ -31,7 +28,7 @@
46AD30EF2C266F1900486C25 /* NewProjectForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46AD30EE2C266F1900486C25 /* NewProjectForm.swift */; };
46AD30F22C2672BD00486C25 /* ColorModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46AD30F12C2672BD00486C25 /* ColorModel.swift */; };
46AD30F42C267D6400486C25 /* PreviewData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46AD30F32C267D6400486C25 /* PreviewData.swift */; };
46AD30F62C26823B00486C25 /* EditCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46AD30F52C26823B00486C25 /* EditCardView.swift */; };
46AD30F62C26823B00486C25 /* AddNewCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46AD30F52C26823B00486C25 /* AddNewCardView.swift */; };
46AD30F82C2689B900486C25 /* ProjectSlideshowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46AD30F72C2689B900486C25 /* ProjectSlideshowView.swift */; };
46D3E13F2C26D6430060722E /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46D3E13E2C26D6430060722E /* Constants.swift */; };
46D3E1402C26D6430060722E /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46D3E13E2C26D6430060722E /* Constants.swift */; };
@ -58,7 +55,7 @@
dstPath = "$(CONTENTS_FOLDER_PATH)/Watch";
dstSubfolderSpec = 16;
files = (
46AD30DB2C26559D00486C25 /* OnCue.app in Embed Watch Content */,
46AD30DB2C26559D00486C25 /* OnCuePresenter Watch App.app in Embed Watch Content */,
);
name = "Embed Watch Content";
runOnlyForDeploymentPostprocessing = 0;
@ -66,10 +63,6 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
460D7DF52C2AE788002B623C /* TimerManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimerManager.swift; sourceTree = "<group>"; };
4614D4022C3DF680000799F5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
4614D4042C3DFEE8000799F5 /* OnCuePresenter.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = OnCuePresenter.entitlements; sourceTree = "<group>"; };
4614D4052C3DFF16000799F5 /* OnCuePresenter-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "OnCuePresenter-Info.plist"; sourceTree = "<group>"; };
464787CA2C269CAF00A9C462 /* TeleprompterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TeleprompterView.swift; sourceTree = "<group>"; };
46AD30B72C26557500486C25 /* OnCue.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OnCue.app; sourceTree = BUILT_PRODUCTS_DIR; };
46AD30BA2C26557500486C25 /* OnCueApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnCueApp.swift; sourceTree = "<group>"; };
@ -77,7 +70,7 @@
46AD30BE2C26557500486C25 /* Item.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Item.swift; sourceTree = "<group>"; };
46AD30C02C26557600486C25 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
46AD30C32C26557600486C25 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
46AD30CE2C26559B00486C25 /* OnCue.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OnCue.app; sourceTree = BUILT_PRODUCTS_DIR; };
46AD30CE2C26559B00486C25 /* OnCuePresenter Watch App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "OnCuePresenter Watch App.app"; sourceTree = BUILT_PRODUCTS_DIR; };
46AD30D02C26559B00486C25 /* OnCuePresenterApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnCuePresenterApp.swift; sourceTree = "<group>"; };
46AD30D22C26559B00486C25 /* MainViewPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewPresenter.swift; sourceTree = "<group>"; };
46AD30D42C26559D00486C25 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@ -88,7 +81,7 @@
46AD30EE2C266F1900486C25 /* NewProjectForm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewProjectForm.swift; sourceTree = "<group>"; };
46AD30F12C2672BD00486C25 /* ColorModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorModel.swift; sourceTree = "<group>"; };
46AD30F32C267D6400486C25 /* PreviewData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreviewData.swift; sourceTree = "<group>"; };
46AD30F52C26823B00486C25 /* EditCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditCardView.swift; sourceTree = "<group>"; };
46AD30F52C26823B00486C25 /* AddNewCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddNewCardView.swift; sourceTree = "<group>"; };
46AD30F72C2689B900486C25 /* ProjectSlideshowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProjectSlideshowView.swift; sourceTree = "<group>"; };
46D3E13E2C26D6430060722E /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
46D3E1412C27DD5C0060722E /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
@ -119,8 +112,6 @@
46AD30AE2C26557500486C25 = {
isa = PBXGroup;
children = (
4614D4052C3DFF16000799F5 /* OnCuePresenter-Info.plist */,
4614D4042C3DFEE8000799F5 /* OnCuePresenter.entitlements */,
46AD30F02C2672AC00486C25 /* Shared */,
46AD30B92C26557500486C25 /* OnCue */,
46AD30CF2C26559B00486C25 /* OnCuePresenter Watch App */,
@ -132,7 +123,7 @@
isa = PBXGroup;
children = (
46AD30B72C26557500486C25 /* OnCue.app */,
46AD30CE2C26559B00486C25 /* OnCue.app */,
46AD30CE2C26559B00486C25 /* OnCuePresenter Watch App.app */,
);
name = Products;
sourceTree = "<group>";
@ -140,7 +131,6 @@
46AD30B92C26557500486C25 /* OnCue */ = {
isa = PBXGroup;
children = (
4614D4022C3DF680000799F5 /* Info.plist */,
46D3E1472C27FAFC0060722E /* OnCue.entitlements */,
46AD30BA2C26557500486C25 /* OnCueApp.swift */,
46AD30E82C266AB900486C25 /* View */,
@ -185,7 +175,6 @@
46AD30BE2C26557500486C25 /* Item.swift */,
46AD30E12C2656CB00486C25 /* OCCard.swift */,
46AD30E42C2656D100486C25 /* OCProject.swift */,
460D7DF52C2AE788002B623C /* TimerManager.swift */,
);
path = Model;
sourceTree = "<group>";
@ -196,7 +185,7 @@
46AD30BC2C26557500486C25 /* MainView.swift */,
46AD30EC2C266C0B00486C25 /* CardsView.swift */,
46AD30EE2C266F1900486C25 /* NewProjectForm.swift */,
46AD30F52C26823B00486C25 /* EditCardView.swift */,
46AD30F52C26823B00486C25 /* AddNewCardView.swift */,
46AD30F72C2689B900486C25 /* ProjectSlideshowView.swift */,
464787CA2C269CAF00A9C462 /* TeleprompterView.swift */,
46D3E1412C27DD5C0060722E /* SettingsView.swift */,
@ -254,9 +243,9 @@
productReference = 46AD30B72C26557500486C25 /* OnCue.app */;
productType = "com.apple.product-type.application";
};
46AD30CD2C26559B00486C25 /* OnCuePresenter */ = {
46AD30CD2C26559B00486C25 /* OnCuePresenter Watch App */ = {
isa = PBXNativeTarget;
buildConfigurationList = 46AD30DC2C26559D00486C25 /* Build configuration list for PBXNativeTarget "OnCuePresenter" */;
buildConfigurationList = 46AD30DC2C26559D00486C25 /* Build configuration list for PBXNativeTarget "OnCuePresenter Watch App" */;
buildPhases = (
46AD30CA2C26559B00486C25 /* Sources */,
46AD30CB2C26559B00486C25 /* Frameworks */,
@ -266,9 +255,9 @@
);
dependencies = (
);
name = OnCuePresenter;
name = "OnCuePresenter Watch App";
productName = "OnCuePresenter Watch App";
productReference = 46AD30CE2C26559B00486C25 /* OnCue.app */;
productReference = 46AD30CE2C26559B00486C25 /* OnCuePresenter Watch App.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
@ -303,7 +292,7 @@
projectRoot = "";
targets = (
46AD30B62C26557500486C25 /* OnCue */,
46AD30CD2C26559B00486C25 /* OnCuePresenter */,
46AD30CD2C26559B00486C25 /* OnCuePresenter Watch App */,
);
};
/* End PBXProject section */
@ -337,7 +326,7 @@
46AD30F82C2689B900486C25 /* ProjectSlideshowView.swift in Sources */,
46AD30EF2C266F1900486C25 /* NewProjectForm.swift in Sources */,
46D3E1462C27EC3B0060722E /* AutoScrollView.swift in Sources */,
46AD30F62C26823B00486C25 /* EditCardView.swift in Sources */,
46AD30F62C26823B00486C25 /* AddNewCardView.swift in Sources */,
464787CB2C269CAF00A9C462 /* TeleprompterView.swift in Sources */,
46AD30ED2C266C0B00486C25 /* CardsView.swift in Sources */,
46AD30BD2C26557500486C25 /* MainView.swift in Sources */,
@ -350,7 +339,6 @@
46AD30BB2C26557500486C25 /* OnCueApp.swift in Sources */,
46AD30E52C2656D100486C25 /* OCProject.swift in Sources */,
46AD30E22C2656CB00486C25 /* OCCard.swift in Sources */,
460D7DF62C2AE788002B623C /* TimerManager.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -360,12 +348,10 @@
files = (
46AD30E32C2656CB00486C25 /* OCCard.swift in Sources */,
46AD30D32C26559B00486C25 /* MainViewPresenter.swift in Sources */,
4614D4032C3DFD3E000799F5 /* Preferences.swift in Sources */,
46E5FFD92C26A50D001191C9 /* CueCardViewPresenter.swift in Sources */,
464787CD2C26A2E500A9C462 /* PreviewData.swift in Sources */,
46AD30D12C26559B00486C25 /* OnCuePresenterApp.swift in Sources */,
46AD30E62C2656D100486C25 /* OCProject.swift in Sources */,
460D7DF72C2AE788002B623C /* TimerManager.swift in Sources */,
464787CC2C26A2E100A9C462 /* ColorModel.swift in Sources */,
46D3E1402C26D6430060722E /* Constants.swift in Sources */,
);
@ -376,7 +362,7 @@
/* Begin PBXTargetDependency section */
46AD30DA2C26559D00486C25 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 46AD30CD2C26559B00486C25 /* OnCuePresenter */;
target = 46AD30CD2C26559B00486C25 /* OnCuePresenter Watch App */;
targetProxy = 46AD30D92C26559D00486C25 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
@ -509,12 +495,11 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = OnCue/OnCue.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"OnCue/Preview Content\"";
DEVELOPMENT_TEAM = 9MP5435PRF;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = OnCue/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = OnCue;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@ -546,12 +531,11 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = OnCue/OnCue.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"OnCue/Preview Content\"";
DEVELOPMENT_TEAM = 9MP5435PRF;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = OnCue/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = OnCue;
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@ -580,14 +564,13 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = OnCuePresenter.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"OnCuePresenter Watch App/Preview Content\"";
DEVELOPMENT_TEAM = 9MP5435PRF;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "OnCuePresenter-Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = OnCuePresenter;
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
INFOPLIST_KEY_WKCompanionAppBundleIdentifier = xyz.breadone.oncue;
LD_RUNPATH_SEARCH_PATHS = (
@ -595,14 +578,14 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = xyz.breadone.oncue.presenter;
PRODUCT_NAME = OnCue;
PRODUCT_BUNDLE_IDENTIFIER = xyz.breadone.oncue.watchkitapp;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 10.0;
WATCHOS_DEPLOYMENT_TARGET = 10.5;
};
name = Debug;
};
@ -611,14 +594,13 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = OnCuePresenter.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"OnCuePresenter Watch App/Preview Content\"";
DEVELOPMENT_TEAM = 9MP5435PRF;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "OnCuePresenter-Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = OnCuePresenter;
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
INFOPLIST_KEY_WKCompanionAppBundleIdentifier = xyz.breadone.oncue;
LD_RUNPATH_SEARCH_PATHS = (
@ -626,14 +608,14 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = xyz.breadone.oncue.presenter;
PRODUCT_NAME = OnCue;
PRODUCT_BUNDLE_IDENTIFIER = xyz.breadone.oncue.watchkitapp;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = 4;
WATCHOS_DEPLOYMENT_TARGET = 10.0;
WATCHOS_DEPLOYMENT_TARGET = 10.5;
};
name = Release;
};
@ -658,7 +640,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
46AD30DC2C26559D00486C25 /* Build configuration list for PBXNativeTarget "OnCuePresenter" */ = {
46AD30DC2C26559D00486C25 /* Build configuration list for PBXNativeTarget "OnCuePresenter Watch App" */ = {
isa = XCConfigurationList;
buildConfigurations = (
46AD30DD2C26559D00486C25 /* Debug */,

12
OnCue.xcodeproj/xcshareddata/xcschemes/OnCuePresenter Watch App.xcscheme
View File

@ -16,8 +16,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "46AD30CD2C26559B00486C25"
BuildableName = "OnCue.app"
BlueprintName = "OnCuePresenter"
BuildableName = "OnCuePresenter Watch App.app"
BlueprintName = "OnCuePresenter Watch App"
ReferencedContainer = "container:OnCue.xcodeproj">
</BuildableReference>
</BuildActionEntry>
@ -59,8 +59,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "46AD30CD2C26559B00486C25"
BuildableName = "OnCue.app"
BlueprintName = "OnCuePresenter"
BuildableName = "OnCuePresenter Watch App.app"
BlueprintName = "OnCuePresenter Watch App"
ReferencedContainer = "container:OnCue.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
@ -76,8 +76,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "46AD30CD2C26559B00486C25"
BuildableName = "OnCue.app"
BlueprintName = "OnCuePresenter"
BuildableName = "OnCuePresenter Watch App.app"
BlueprintName = "OnCuePresenter Watch App"
ReferencedContainer = "container:OnCue.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>

1
OnCue/Assets.xcassets/AppIcon.appiconset/Contents.json
View File

@ -1,7 +1,6 @@
{
"images" : [
{
"filename" : "oncue_icon.png",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"

BIN
OnCue/Assets.xcassets/AppIcon.appiconset/oncue_icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 151 KiB

11
OnCue/Info.plist
View File

@ -1,11 +0,0 @@
<?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>UIBackgroundModes</key>
<array>
<string>fetch</string>
<string>remote-notification</string>
</array>
</dict>
</plist>

8
OnCue/Model/OCCard.swift
View File

@ -11,13 +11,11 @@ import SwiftData
@Model
final class OCCard: Identifiable {
let id = UUID()
var content: String = ""
var index: Int = 0
var parentProject: OCProject? = nil
var content: String
var index: Int
init(content: String, index: Int, parent: OCProject) {
init(content: String, index: Int) {
self.content = content
self.index = index
self.parentProject = parent
}
}

28
OnCue/Model/OCProject.swift
View File

@ -7,15 +7,14 @@
import Foundation
import SwiftData
import CloudKit
@Model
final class OCProject {
var name: String = "No Name"
var cards: [OCCard]? = []
let creationDate: Date = Date()
var lastEditedDate: Date = Date()
var color: String = "ff7e30"
var name: String
var cards: [OCCard]
let creationDate: Date
var lastEditedDate: Date
var color: String
var script: String {
var txt = ""
@ -25,7 +24,7 @@ final class OCProject {
var sortedCards: [OCCard] {
get {
return self.cards?.sorted(by: { $0.index < $1.index }) ?? []
return self.cards.sorted(by: { $0.index < $1.index })
}
}
@ -37,26 +36,15 @@ final class OCProject {
self.color = color
}
init(name: String, color: String, tCards: [String] = []) {
self.name = name
self.creationDate = Date()
self.lastEditedDate = Date()
self.color = color
for i in 0 ..< tCards.count {
self.cards?.append(OCCard(content: tCards[i], index: i, parent: self))
}
}
func updateEditedDate(newDate: Date = Date()) {
self.lastEditedDate = newDate
}
func addCards(cards: OCCard...) {
cards.forEach({ self.cards?.append($0) })
cards.forEach({ self.cards.append($0) })
}
func removeCard(_ card: OCCard) {
self.cards?.removeAll { $0.id == card.id }
self.cards.removeAll { $0.id == card.id }
}
}

42
OnCue/Model/TimerManager.swift
View File

@ -1,42 +0,0 @@
//
// TimerManager.swift
// OnCue
//
// Created by Pradyun Setti on 25/06/2024.
//
import Foundation
public class TimerManager: ObservableObject {
@Published public var secondsElapsed: Int = 0
@Published public var formattedTime: String = "00:00"
private var timer: Timer? = nil
public func startTimer() {
self.timer?.invalidate()
self.timer = Timer.scheduledTimer(timeInterval: 1,
target: self,
selector: #selector(update),
userInfo: nil,
repeats: true)
}
public func stopTimer() {
self.timer?.invalidate()
self.timer = nil
}
@objc public func update() {
secondsElapsed += 1
formattedTime = formatSeconds(secondsElapsed)
}
private func formatSeconds(_ seconds: Int) -> String {
let minutes = floor(Double(seconds) / 60)
let rSeconds = Double(seconds) - (minutes * 60)
return String(format: "%02.0f:%02.0f", minutes, rSeconds)
}
}

13
OnCue/OnCue.entitlements
View File

@ -1,16 +1,5 @@
<?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>aps-environment</key>
<string>development</string>
<key>com.apple.developer.icloud-container-identifiers</key>
<array>
<string>iCloud.xyz.breadone.oncue</string>
</array>
<key>com.apple.developer.icloud-services</key>
<array>
<string>CloudKit</string>
</array>
</dict>
<dict/>
</plist>

29
OnCue/OnCueApp.swift
View File

@ -7,7 +7,6 @@
import SwiftUI
import SwiftData
import CoreData
@main
struct OnCueApp: App {
@ -20,34 +19,6 @@ struct OnCueApp: App {
let modelConfiguration = ModelConfiguration(schema: schema, isStoredInMemoryOnly: false)
do {
// #if DEBUG
// // Use an autorelease pool to make sure Swift deallocates the persistent
// // container before setting up the SwiftData stack.
// try autoreleasepool {
// let desc = NSPersistentStoreDescription(url: modelConfiguration.url)
// let opts = NSPersistentCloudKitContainerOptions(containerIdentifier: "iCloud.xyz.breadone.oncue")
// desc.cloudKitContainerOptions = opts
// // Load the store synchronously so it completes before initializing the
// // CloudKit schema.
// desc.shouldAddStoreAsynchronously = false
// if let mom = NSManagedObjectModel.makeManagedObjectModel(for: [OCProject.self, OCCard.self]) {
// let container = NSPersistentCloudKitContainer(name: "OnCue", managedObjectModel: mom)
// container.persistentStoreDescriptions = [desc]
// container.loadPersistentStores {_, err in
// if let err {
// fatalError(err.localizedDescription)
// }
// }
// // Initialize the CloudKit schema after the store finishes loading.
// try container.initializeCloudKitSchema()
// // Remove and unload the store from the persistent container.
// if let store = container.persistentStoreCoordinator.persistentStores.first {
// try container.persistentStoreCoordinator.remove(store)
// }
// }
// }
// #endif
return try ModelContainer(for: schema, configurations: [modelConfiguration])
} catch {
fatalError("Could not create ModelContainer: \(error)")

19
OnCue/View/EditCardView.swift → OnCue/View/AddNewCardView.swift
View File

@ -1,5 +1,5 @@
//
// EditCardView.swift
// AddNewCardView.swift
// OnCue
//
// Created by Pradyun Setti on 22/06/2024.
@ -7,8 +7,8 @@
import SwiftUI
struct EditCardView: View {
@Binding var text: String
struct AddNewCardView: View {
@State private var newCardText = ""
@Environment(\.dismiss) var dismiss
let completionHandler: (String) -> Void
@ -16,12 +16,10 @@ struct EditCardView: View {
var body: some View {
NavigationView {
Form {
// TextEditor(text: $text)
// .foregroundStyle(.secondary)
TextField("Edit Card Text", text: $text, axis: .vertical)
.lineLimit(.max)
TextEditor(text: $newCardText)
.frame(minHeight: 100)
}
.navigationTitle("Edit Card")
.navigationTitle("Add New Card")
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .topBarLeading) {
@ -30,7 +28,7 @@ struct EditCardView: View {
}
ToolbarItem(placement: .topBarTrailing) {
Button("Done") {
completionHandler(text)
completionHandler(newCardText)
dismiss()
}
}
@ -40,6 +38,5 @@ struct EditCardView: View {
}
#Preview {
@State var test = "PreviewData.project.cards[4].con\ntentblabla\nksbdlaskdlaksd\naklsdbal\nkbsdal\nkbsdlasbd\nsdkfnsdlkfm"
return EditCardView(text: $test) { _ in }
AddNewCardView(completionHandler: {_ in})
}

41
OnCue/View/CardsView.swift
View File

@ -10,37 +10,29 @@ import SwiftData
struct CardsView: View {
let project: OCProject
@State private var editCard = false
@State private var addNewCard = false
@State private var newCardText = ""
@State private var editCardText = ""
@Environment(\.modelContext) private var ctx
@State private var showNoTextInNewCardError = false
var body: some View {
List {
// Section {
// TextEditor(text: $newCardText)
// } header: {
// Text("Add new card")
// }
TextField("Add New Card", text: $newCardText, axis: .vertical)
.lineLimit(.max)
Section {
TextEditor(text: $newCardText)
} header: {
Text("Add new card")
}
Section {
ForEach(project.sortedCards) { card in
Text(card.content)
.swipeActions {
Button(role: .destructive) { } label: { Image(systemName: "trash.fill") }
.background(Color.red)
Button { editCardText = card.content; editCard.toggle() } label: { Image(systemName: "pencil") }.tint(.blue)
}
}
.onDelete(perform: deleteItems)
} header: {
Text("\(project.cards?.count ?? 0) \(project.cards?.count ?? 0 == 1 ? "Card" : "Cards")")
Text("\(project.cards.count) \(project.cards.count == 1 ? "Card" : "Cards")")
}
}
.scrollDismissesKeyboard(.immediately)
.navigationTitle(project.name)
.navigationBarTitleDisplayMode(.inline)
.toolbar {
@ -63,8 +55,8 @@ struct CardsView: View {
}
}
.sheet(isPresented: $editCard) {
EditCardView(text: $editCardText) { editCard(txt: $0, offset: []) }
.sheet(isPresented: $addNewCard) {
AddNewCardView(completionHandler: addNewCard)
}
.alert("No Text In Card", isPresented: $showNoTextInNewCardError) {
Button("OK", role: .cancel) {}
@ -74,22 +66,15 @@ struct CardsView: View {
}
func editCard(txt: String, offset: IndexSet) {
}
func addNewCard(txt: String) {
guard txt != "" else {
showNoTextInNewCardError.toggle()
return
}
// adds one to the index, unless there arent any cards in which case default to 0
let card = OCCard(content: txt,
index: (project.sortedCards.last?.index ?? -1) + 1,
parent: project)
project.cards?.append(card)
try? ctx.save()
let card = OCCard(content: txt, index: (project.sortedCards.last?.index ?? -1) + 1) // adds one to the index, unless there arent any cards in which case default to 0
project.cards.append(card)
try! ctx.save()
newCardText = ""
}

29
OnCue/View/MainView.swift
View File

@ -24,7 +24,6 @@ struct MainView: View {
ProjectListView(sort: SortDescriptor(\.creationDate, order: .reverse),
searchString: searchText,
color: filterColor)
.swipeActions {}
}
.searchable(text: $searchText)
.toolbar {
@ -53,14 +52,7 @@ struct MainView: View {
private func addItem(name: String, color: String) {
withAnimation {
var newProject: OCProject
// if color == Color.clear.toHex()! {
// newProject = OCProject(name: name, color: themeColor)
// } else {
// newProject = OCProject(name: name, color: color)
// }
newProject = OCProject(name: name, color: color, cards: [])
let newProject = OCProject(name: name, color: color)
modelContext.insert(newProject)
}
}
@ -70,8 +62,6 @@ private struct ProjectListView: View {
@Environment(\.modelContext) private var modelContext
@Query private var projects: [OCProject]
@AppStorage(Preferences.themeColour) var themeColor = Color.blue.toHex()!
init(sort: SortDescriptor<OCProject>, searchString: String, color: String) {
_projects = Query(filter: #Predicate {
if searchString.isEmpty {
@ -88,18 +78,11 @@ private struct ProjectListView: View {
CardsView(project: project)
} label: {
VStack(alignment: .leading) {
if (project.color == Color.clear.toHex()!) {
Text("\(project.name)")
.bold()
.font(.title2)
.foregroundStyle(Color(hex: themeColor) ?? .blue)
} else {
Text("\(project.name)")
.bold()
.font(.title2)
.foregroundStyle(Color(hex: project.color) ?? .white)
}
Text("\(project.cards?.count ?? 0) \(project.cards?.count ?? 0 == 1 ? "Card" : "Cards")")
Text("\(project.name)")
.bold()
.font(.title2)
.foregroundStyle(Color(hex: project.color) ?? .white)
Text("\(project.cards.count) \(project.cards.count == 1 ? "Card" : "Cards")")
}
}
.padding(.vertical, 3)

46
OnCue/View/NewProjectForm.swift
View File

@ -10,41 +10,28 @@ import SwiftUI
struct NewProjectForm: View {
@State private var newProjectName = ""
@State private var chosenColor = Color.clear
@State private var chosenColor: Color = .blue
@Environment(\.dismiss) var dismiss
let completionHandler: (String, String) -> Void
let availColours: [String] = {
var c = Constants.colors.map { $0.toHex()! }
c.insert("Theme", at: 0)
return c
}()
var body: some View {
NavigationView {
Form {
TextField("Project Name", text: $newProjectName)
Section {
Section(header: Text("Project Colour")) {
HStack {
ForEach(Constants.colors, id: \.self) { color in
if chosenColor == color {
ZStack {
Circle()
.foregroundStyle(color)
Image(systemName: "checkmark")
ForEach(Constants.colors, id: \.self) { clr in
ColorChooserCircle(color: clr)
.padding(.vertical)
.onTapGesture {
self.chosenColor = clr
}
.onTapGesture { chooseColour(color) }
} else {
Circle()
.foregroundStyle(color)
.onTapGesture { chooseColour(color) }
}
}
}
} header: { Text("Project Colour") } footer: { Text("Leave unselected to use theme colour in settings" )}
}
}
.navigationTitle("Add New Project")
.navigationTitle("Add New Project").foregroundStyle(chosenColor)
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .topBarLeading) {
@ -60,13 +47,16 @@ struct NewProjectForm: View {
}
}
}
}
struct ColorChooserCircle: View {
var color: Color
private func chooseColour(_ color: Color) {
if color == chosenColor {
chosenColor = .clear
} else {
chosenColor = color
}
var body: some View {
Circle()
.strokeBorder(Color.gray,lineWidth: 2)
.background(Circle().foregroundColor(color))
.frame(minHeight: 25)
}
}

19
OnCue/View/ProjectSlideshowView.swift
View File

@ -9,21 +9,9 @@ import SwiftUI
struct ProjectSlideshowView: View {
let project: OCProject
@AppStorage(Preferences.cueDefaultSize) private var textSize = 25.0
@AppStorage(Preferences.showTimers) var showTimers = true
@StateObject private var timer = TimerManager()
@State private var textSize = 25.0
var body: some View {
if showTimers {
mainView
.navigationTitle(timer.formattedTime)
.onAppear { timer.startTimer() }
} else {
mainView
}
}
var mainView: some View {
TabView() {
ForEach(project.sortedCards) { card in
VStack(alignment: .leading) {
@ -34,7 +22,8 @@ struct ProjectSlideshowView: View {
.frame(height: 550)
Spacer()
}
.navigationBarTitleDisplayMode(.inline)
.navigationTitle("\(card.index+1)")
.navigationBarTitleDisplayMode(.inline)
}
}
.tabViewStyle(PageTabViewStyle(indexDisplayMode: .always))
@ -46,7 +35,7 @@ struct ProjectSlideshowView: View {
} label: {
Image(systemName: "ellipsis.circle")
}
}
ToolbarItem(placement: .topBarTrailing) {
NavigationLink(destination: { CardsView(project: project) }) {

35
OnCue/View/SettingsView.swift
View File

@ -23,7 +23,6 @@ struct SettingsView: View {
// @State private var themesColor: Color = .blue
@AppStorage(Preferences.themeColour) var themesColor = Color.blue.toHex()!
@AppStorage(Preferences.showTimers) var showTimers = true
var body: some View {
NavigationView {
@ -46,32 +45,24 @@ struct SettingsView: View {
var generalSettings: some View {
Section {
Text("Theme Color")
HStack {
Text("Theme Color")
// TODO: redo this as a grid
ScrollView(.horizontal) {
HStack {
ForEach(Constants.colors, id: \.self) { color in
if themesColor == color.toHex()! {
ZStack {
Circle()
.foregroundStyle(color)
// .strokeBorder(Color.white,lineWidth: 4)
// .background(Circle().foregroundStyle(color))
Image(systemName: "checkmark")
}
} else {
Circle()
.foregroundStyle(color)
.onTapGesture { themesColor = color.toHex()! }
}
ForEach(Constants.colors, id: \.self) { color in
if themesColor == color.toHex()! {
ZStack {
Circle()
.foregroundStyle(color)
// .strokeBorder(Color.white,lineWidth: 4)
// .background(Circle().foregroundStyle(color))
Image(systemName: "checkmark")
}
} else {
Circle()
.foregroundStyle(color)
.onTapGesture { themesColor = color.toHex()! }
}
}
.scrollIndicators(.hidden)
}
Toggle("Show Timers", isOn: $showTimers)
} header: { Text("General") }
}

1
OnCuePresenter Watch App/Assets.xcassets/AppIcon.appiconset/Contents.json
View File

@ -1,7 +1,6 @@
{
"images" : [
{
"filename" : "oncue_icon.png",
"idiom" : "universal",
"platform" : "watchos",
"size" : "1024x1024"

BIN
OnCuePresenter Watch App/Assets.xcassets/AppIcon.appiconset/oncue_icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 151 KiB

29
OnCuePresenter Watch App/OnCuePresenterApp.swift
View File

@ -7,7 +7,6 @@
import SwiftUI
import SwiftData
import CoreData
@main
struct OnCuePresenter_Watch_AppApp: App {
@ -15,37 +14,11 @@ struct OnCuePresenter_Watch_AppApp: App {
let schema = Schema([
OCProject.self,
OCCard.self,
// Item.self,
])
let modelConfiguration = ModelConfiguration(schema: schema, isStoredInMemoryOnly: false)
do {
// #if DEBUG
// // Use an autorelease pool to make sure Swift deallocates the persistent
// // container before setting up the SwiftData stack.
// try autoreleasepool {
// let desc = NSPersistentStoreDescription(url: modelConfiguration.url)
// let opts = NSPersistentCloudKitContainerOptions(containerIdentifier: "iCloud.xyz.breadone.oncue")
// desc.cloudKitContainerOptions = opts
// // Load the store synchronously so it completes before initializing the
// // CloudKit schema.
// desc.shouldAddStoreAsynchronously = false
// if let mom = NSManagedObjectModel.makeManagedObjectModel(for: [OCProject.self, OCCard.self]) {
// let container = NSPersistentCloudKitContainer(name: "OnCue", managedObjectModel: mom)
// container.persistentStoreDescriptions = [desc]
// container.loadPersistentStores {_, err in
// if let err {
// fatalError(err.localizedDescription)
// }
// }
// // Initialize the CloudKit schema after the store finishes loading.
// try container.initializeCloudKitSchema()
// // Remove and unload the store from the persistent container.
// if let store = container.persistentStoreCoordinator.persistentStores.first {
// try container.persistentStoreCoordinator.remove(store)
// }
// }
// }
// #endif
return try ModelContainer(for: schema, configurations: [modelConfiguration])
} catch {
fatalError("Could not create ModelContainer: \(error)")

2
OnCuePresenter Watch App/View/CueCardViewPresenter.swift
View File

@ -12,7 +12,7 @@ struct CueCardViewPresenter: View {
var body: some View {
TabView() {
ForEach(project.cards ?? []) { card in
ForEach(project.cards) { card in
CueCardView(card: card)
}
}

44
OnCuePresenter Watch App/View/MainViewPresenter.swift
View File

@ -16,19 +16,37 @@ struct MainViewPresenter: View {
@State private var addNewProject = false
var body: some View {
NavigationView {
NavigationSplitView {
List {
ForEach(items) { project in
NavigationLink {
CueCardViewPresenter(project: project)
} label: {
ProjectCard(project: project)
VStack(alignment: .leading) {
Text("\(project.name)")
.bold()
.font(.title2)
.foregroundStyle(Color(hex: project.color) ?? .white)
Text("\(project.cards.count) \(project.cards.count == 1 ? "Card" : "Cards")")
}
}
.padding(.vertical, 3)
}
}
.toolbar {
ToolbarItem(placement: .primaryAction) {
Button {
} label: {
Label("Sync", systemImage: "arrow.triangle.2.circlepath")
}
}
}
.navigationTitle("Projects")
} detail: {
Text("Select an item")
}
}
}
@ -42,25 +60,3 @@ struct MainViewPresenter: View {
return MainViewPresenter()
.modelContainer(container)
}
struct ProjectCard: View {
@AppStorage(Preferences.themeColour) var themeColor = Color.blue.toHex()!
let project: OCProject
var body: some View {
VStack(alignment: .leading) {
if (project.color == Color.clear.toHex()!) {
Text("\(project.name)")
.bold()
.font(.title2)
.foregroundStyle(Color(hex: themeColor) ?? .blue)
} else {
Text("\(project.name)")
.bold()
.font(.title2)
.foregroundStyle(Color(hex: project.color) ?? .white)
}
Text("\(project.cards?.count ?? 0) \(project.cards?.count ?? 0 == 1 ? "Card" : "Cards")")
}
}
}

10
OnCuePresenter-Info.plist
View File

@ -1,10 +0,0 @@
<?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>UIBackgroundModes</key>
<array>
<string>remote-notification</string>
</array>
</dict>
</plist>

16
OnCuePresenter.entitlements
View File

@ -1,16 +0,0 @@
<?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>aps-environment</key>
<string>development</string>
<key>com.apple.developer.icloud-container-identifiers</key>
<array>
<string>iCloud.xyz.breadone.oncue</string>
</array>
<key>com.apple.developer.icloud-services</key>
<array>
<string>CloudKit</string>
</array>
</dict>
</plist>

1
Shared/Constants.swift
View File

@ -9,4 +9,5 @@ import SwiftUI
public struct Constants {
static let colors: [Color] = [.red, .orange, .yellow, .green, .blue, .indigo]
static let colorText = ["None", "Red", "Orange", "Yellow", "Green", "Blue", "Indigo"]
}

2
Shared/Preferences.swift
View File

@ -18,6 +18,4 @@ public struct Preferences {
static let cueDefaultSize = "cueDefaultSize"
static let themeColour = "themeColour"
static let showTimers = "showTimers"
}

13
Shared/PreviewData.swift
View File

@ -12,5 +12,16 @@ public struct PreviewData {
private static let lorem = "colon three"
static let project = OCProject(name: "Test Project", color: "007AFF", tCards: Array<String>(repeating: lorem, count: 10) )
static let project = OCProject(name: "Test Project", color: "007AFF", cards: [
OCCard(content: lorem, index: 0),
OCCard(content: lorem, index: 1),
OCCard(content: lorem, index: 2),
OCCard(content: loreml, index: 3),
OCCard(content: lorem, index: 4),
OCCard(content: lorem, index: 5),
OCCard(content: lorem, index: 6),
OCCard(content: lorem, index: 7),
OCCard(content: lorem, index: 8),
OCCard(content: lorem, index: 9),
])
}

BIN
oncue_icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 151 KiB

BIN
oncue_icon.pxd
View File

Binary file not shown.