Skip to content

Commit

Permalink
Some very weird stuff. The old app intent is sticking around, even th…
Browse files Browse the repository at this point in the history 
…ough it is gone.

Boo
  • Loading branch information
@ChrisMarshallNY
ChrisMarshallNY committed Sep 10, 2024
1 parent dcfb215 commit 870c831
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 54 deletions.
28 changes: 6 additions & 22 deletions NACC.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,13 @@
/* Begin PBXBuildFile section */
D4070A3B2C8F22B60011F12D /* NACCGetCleantimeSummaryIntentHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = D4070A3A2C8F22B60011F12D /* NACCGetCleantimeSummaryIntentHandler.swift */; };
D41361C027F8D80B00DA1AD4 /* NACCBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D41361BF27F8D80B00DA1AD4 /* NACCBaseViewController.swift */; };
D414B34F2C863DF0005A12A4 /* NACCGetCleantimeSummaryAppIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = D414B34E2C863DF0005A12A4 /* NACCGetCleantimeSummaryAppIntent.swift */; };
D41657132C4846990015DDFD /* NACC.docc in Sources */ = {isa = PBXBuildFile; fileRef = D41657122C4846990015DDFD /* NACC.docc */; };
D42314F627FE150E00C5E5FC /* NACCTabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D42314F527FE150E00C5E5FC /* NACCTabBarController.swift */; };
D43C66D12694AC20007D5883 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D43C66C82694AC20007D5883 /* Assets.xcassets */; };
D43C66D42694AC20007D5883 /* NACCAppSceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D43C66CD2694AC20007D5883 /* NACCAppSceneDelegate.swift */; };
D46F8CC12C47ED0800A1E7F5 /* LGV_Cleantime in Frameworks */ = {isa = PBXBuildFile; productRef = D46F8CC02C47ED0800A1E7F5 /* LGV_Cleantime */; };
D46F8CC42C47EDA300A1E7F5 /* LGV_UICleantime in Frameworks */ = {isa = PBXBuildFile; productRef = D46F8CC32C47EDA300A1E7F5 /* LGV_UICleantime */; };
D474789F28073D5400212919 /* NACCPagePrintRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = D474789E28073D5400212919 /* NACCPagePrintRenderer.swift */; };
D47894B92C87A8970018B255 /* AppShortcuts.strings in Resources */ = {isa = PBXBuildFile; fileRef = D47894B82C87A8970018B255 /* AppShortcuts.strings */; };
D485259627FDBD2E002EE3E3 /* NACCExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D485259527FDBD2E002EE3E3 /* NACCExtensions.swift */; };
D485519428479C10005914FF /* RVS_Generic_Swift_Toolbox in Frameworks */ = {isa = PBXBuildFile; productRef = D485519328479C10005914FF /* RVS_Generic_Swift_Toolbox */; };
D485519628479C10005914FF /* RVS_GeneralObserver in Frameworks */ = {isa = PBXBuildFile; productRef = D485519528479C10005914FF /* RVS_GeneralObserver */; };
Expand All @@ -38,7 +36,6 @@
/* Begin PBXFileReference section */
D4070A3A2C8F22B60011F12D /* NACCGetCleantimeSummaryIntentHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NACCGetCleantimeSummaryIntentHandler.swift; sourceTree = "<group>"; };
D41361BF27F8D80B00DA1AD4 /* NACCBaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NACCBaseViewController.swift; sourceTree = "<group>"; };
D414B34E2C863DF0005A12A4 /* NACCGetCleantimeSummaryAppIntent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NACCGetCleantimeSummaryAppIntent.swift; sourceTree = "<group>"; };
D41657122C4846990015DDFD /* NACC.docc */ = {isa = PBXFileReference; lastKnownFileType = folder.documentationcatalog; path = NACC.docc; sourceTree = "<group>"; };
D41AC87D2C49813200C79B8C /* index.php */ = {isa = PBXFileReference; lastKnownFileType = text.script.php; path = index.php; sourceTree = "<group>"; };
D41AC87E2C4981B500C79B8C /* apple-app-site-association */ = {isa = PBXFileReference; lastKnownFileType = text; path = "apple-app-site-association"; sourceTree = "<group>"; };
Expand All @@ -49,7 +46,6 @@
D43C66D82694AC33007D5883 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
D45CF3632809AB4500065E87 /* NACC.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = NACC.entitlements; sourceTree = "<group>"; };
D474789E28073D5400212919 /* NACCPagePrintRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NACCPagePrintRenderer.swift; sourceTree = "<group>"; };
D47894B72C87A8970018B255 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/AppShortcuts.strings; sourceTree = "<group>"; };
D47C587228070BE40019FFD3 /* NACC.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NACC.app; sourceTree = BUILT_PRODUCTS_DIR; };
D485259527FDBD2E002EE3E3 /* NACCExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NACCExtensions.swift; sourceTree = "<group>"; };
D48F812A27FCD36D001A0B87 /* NACCInitialViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NACCInitialViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -170,7 +166,6 @@
isa = PBXGroup;
children = (
D4070A3A2C8F22B60011F12D /* NACCGetCleantimeSummaryIntentHandler.swift */,
D414B34E2C863DF0005A12A4 /* NACCGetCleantimeSummaryAppIntent.swift */,
);
path = Intents;
sourceTree = "<group>";
Expand All @@ -181,7 +176,6 @@
D4C79A1B27F9189800FBB7D3 /* NACC_Main.storyboard */,
D49F5F1D2C9075710039A098 /* NACCIntents.intentdefinition */,
D4E2F96727FCCA3200457AD4 /* Localizable.strings */,
D47894B82C87A8970018B255 /* AppShortcuts.strings */,
D49C9A7A280783C6008E9917 /* InfoPlist.strings */,
D43C66C82694AC20007D5883 /* Assets.xcassets */,
D4E2F96A27FCCD3400457AD4 /* Theme.xcassets */,
Expand Down Expand Up @@ -360,7 +354,6 @@
D49C9A7C280783C6008E9917 /* InfoPlist.strings in Resources */,
D4E2F96627FCCA2800457AD4 /* LGV_UICleantime.xcassets in Resources */,
D43C66D12694AC20007D5883 /* Assets.xcassets in Resources */,
D47894B92C87A8970018B255 /* AppShortcuts.strings in Resources */,
D4E2F96B27FCCD3400457AD4 /* Theme.xcassets in Resources */,
D4C79A2127F9189800FBB7D3 /* NACC_Main.storyboard in Resources */,
D4C79A2027F9189800FBB7D3 /* NACC_LaunchScreen.storyboard in Resources */,
Expand All @@ -374,33 +367,24 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D49F5F1E2C9075710039A098 /* NACCIntents.intentdefinition in Sources */,
D43C66D42694AC20007D5883 /* NACCAppSceneDelegate.swift in Sources */,
D48F812D27FCD3FA001A0B87 /* NACCTabBaseViewController.swift in Sources */,
D42314F627FE150E00C5E5FC /* NACCTabBarController.swift in Sources */,
D414B34F2C863DF0005A12A4 /* NACCGetCleantimeSummaryAppIntent.swift in Sources */,
D41657132C4846990015DDFD /* NACC.docc in Sources */,
D41361C027F8D80B00DA1AD4 /* NACCBaseViewController.swift in Sources */,
D4B80C7F27FCF1B400401F72 /* NACCPersistentPrefs.swift in Sources */,
D4BD88F1269E2FAA009015D1 /* NACCAboutViewController.swift in Sources */,
D48F812B27FCD36D001A0B87 /* NACCInitialViewController.swift in Sources */,
D49F5F1E2C9075710039A098 /* NACCIntents.intentdefinition in Sources */,
D4070A3B2C8F22B60011F12D /* NACCGetCleantimeSummaryIntentHandler.swift in Sources */,
D474789F28073D5400212919 /* NACCPagePrintRenderer.swift in Sources */,
D485259627FDBD2E002EE3E3 /* NACCExtensions.swift in Sources */,
D41657132C4846990015DDFD /* NACC.docc in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXVariantGroup section */
D47894B82C87A8970018B255 /* AppShortcuts.strings */ = {
isa = PBXVariantGroup;
children = (
D47894B72C87A8970018B255 /* en */,
);
name = AppShortcuts.strings;
sourceTree = "<group>";
};
D49C9A7A280783C6008E9917 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
Expand Down Expand Up @@ -584,7 +568,7 @@
CODE_SIGN_ENTITLEMENTS = "Project-Meta/NACC.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3008;
CURRENT_PROJECT_VERSION = 3009;
DEVELOPMENT_TEAM = P53V4JS928;
INFOPLIST_FILE = "$(SRCROOT)/Sources/NACC/Info.plist";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.lifestyle";
Expand All @@ -594,7 +578,7 @@
"@executable_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 5.2.2;
MARKETING_VERSION = 5.3.0;
PRODUCT_BUNDLE_IDENTIFIER = org.magshare.NACC;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -618,7 +602,7 @@
CODE_SIGN_ENTITLEMENTS = "Project-Meta/NACC.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3008;
CURRENT_PROJECT_VERSION = 3009;
DEVELOPMENT_TEAM = P53V4JS928;
INFOPLIST_FILE = "$(SRCROOT)/Sources/NACC/Info.plist";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.lifestyle";
Expand All @@ -628,7 +612,7 @@
"@executable_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 5.2.2;
MARKETING_VERSION = 5.3.0;
PRODUCT_BUNDLE_IDENTIFIER = org.magshare.NACC;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
2 changes: 2 additions & 0 deletions Project-Meta/NACC.entitlements
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<array>
<string>applinks:nacc.littlegreenviper.com/</string>
</array>
<key>com.apple.developer.siri</key>
<true/>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.files.user-selected.read-write</key>
Expand Down
12 changes: 8 additions & 4 deletions Sources/NACC/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@
<string>This app needs access to your contacts, in order to fill out an anniversary event. This information is never sent outside of your computer, and is not directly used by this app.</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>This app allows you to save images of keytags or medallions to your Photo Library</string>
<key>NSUserActivityTypes</key>
<array>
<string>GetCleantimeIntent</string>
</array>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
Expand All @@ -74,6 +70,10 @@
</array>
</dict>
</dict>
<key>INIntentsSupported</key>
<array>
<string>GetCleantimeIntent</string>
</array>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
<key>UILaunchStoryboardName</key>
Expand All @@ -98,5 +98,9 @@
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>NSUserActivityTypes</key>
<array>
<string>GetCleantimeIntent</string>
</array>
</dict>
</plist>
2 changes: 1 addition & 1 deletion Sources/NACC/Resources/Base.lproj/AppShortcuts.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
// -------------------------------------------- ------------------------------------------------------- *
//********************************************** **********************************************************

"SLUG-GET-CLEANTIME-SUMMARY-INTENT-${applicationName}" = "Calculate my cleantime with ${applicationName}";
"SLUG-GET-CLEANTIME-SUMMARY-INTENT-${applicationName}" = "What's My Cleantime (${applicationName})?";
27 changes: 0 additions & 27 deletions Sources/NACC/Resources/en.lproj/AppShortcuts.strings
View file

This file was deleted.

0 ...ts/NACCGetCleantimeSummaryAppIntent.swift → spec/NACCGetCleantimeSummaryAppIntent.swift
View file
File renamed without changes.

0 comments on commit 870c831

Please sign in to comment.