From 5f5666c40d454f84be955a1c57085b3de0401bbd Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Fri, 10 Jun 2022 11:08:02 -0400 Subject: [PATCH] Catalyst, probably --- OTP.xcodeproj/project.pbxproj | 24 +++++++++++++++---- .../xcschemes/xcschememanagement.plist | 4 ++-- OTP/OTP.entitlements | 5 ++++ OTP/Views/AddKeyButton.swift | 1 + OTP/Views/PreferencesView.swift | 1 + 5 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 OTP/OTP.entitlements diff --git a/OTP.xcodeproj/project.pbxproj b/OTP.xcodeproj/project.pbxproj index 982efd5..890187c 100644 --- a/OTP.xcodeproj/project.pbxproj +++ b/OTP.xcodeproj/project.pbxproj @@ -12,7 +12,7 @@ D60E9D6E26D1998B009A4537 /* OTPGeneratorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D60E9D6D26D1998B009A4537 /* OTPGeneratorTests.swift */; }; D60E9D7226D1A863009A4537 /* KeyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D60E9D7126D1A863009A4537 /* KeyView.swift */; }; D60E9D7426D1ABF9009A4537 /* CircularProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D60E9D7326D1ABF9009A4537 /* CircularProgressView.swift */; }; - D60E9D7726D1B160009A4537 /* CodeScanner in Frameworks */ = {isa = PBXBuildFile; productRef = D60E9D7626D1B160009A4537 /* CodeScanner */; }; + D60E9D7726D1B160009A4537 /* CodeScanner in Frameworks */ = {isa = PBXBuildFile; platformFilter = ios; productRef = D60E9D7626D1B160009A4537 /* CodeScanner */; }; D60E9D7A26D1E985009A4537 /* EditKeyForm.swift in Sources */ = {isa = PBXBuildFile; fileRef = D60E9D7926D1E985009A4537 /* EditKeyForm.swift */; }; D61479D726D0AF1C00710B79 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61479D626D0AF1C00710B79 /* AppDelegate.swift */; }; D61479D926D0AF1C00710B79 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = D61479D826D0AF1C00710B79 /* SceneDelegate.swift */; }; @@ -88,6 +88,8 @@ /* Begin PBXFileReference section */ D60265472744012A00C77599 /* AddKeyButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddKeyButton.swift; sourceTree = ""; }; D60265492744014500C77599 /* AllKeysView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AllKeysView.swift; sourceTree = ""; }; + D602654B274401F800C77599 /* OTP.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = OTP.entitlements; sourceTree = ""; }; + D604B0F82744036F00960D31 /* CodeScanner */ = {isa = PBXFileReference; lastKnownFileType = folder; name = CodeScanner; path = ../CodeScanner; sourceTree = ""; }; D60E9D6D26D1998B009A4537 /* OTPGeneratorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OTPGeneratorTests.swift; sourceTree = ""; }; D60E9D7126D1A863009A4537 /* KeyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyView.swift; sourceTree = ""; }; D60E9D7326D1ABF9009A4537 /* CircularProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CircularProgressView.swift; sourceTree = ""; }; @@ -154,14 +156,22 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + D604B0F72744036F00960D31 /* Packages */ = { + isa = PBXGroup; + children = ( + D604B0F82744036F00960D31 /* CodeScanner */, + ); + name = Packages; + sourceTree = ""; + }; D60E9D7826D1E976009A4537 /* Views */ = { isa = PBXGroup; children = ( + D61479EA26D13DEF00710B79 /* AppView.swift */, D60265472744012A00C77599 /* AddKeyButton.swift */, D6A2BCAF26D313E7004DC4E3 /* AddQRView.swift */, D68B3D9F26D2937000CB35A2 /* AddURLForm.swift */, D60265492744014500C77599 /* AllKeysView.swift */, - D61479EA26D13DEF00710B79 /* AppView.swift */, D60E9D7326D1ABF9009A4537 /* CircularProgressView.swift */, D60E9D7926D1E985009A4537 /* EditKeyForm.swift */, D6A2BD1326D5707F004DC4E3 /* FolderRow.swift */, @@ -178,6 +188,7 @@ D61479CA26D0AF1C00710B79 = { isa = PBXGroup; children = ( + D604B0F72744036F00960D31 /* Packages */, D61479D526D0AF1C00710B79 /* OTP */, D61479F226D141F700710B79 /* OTPKit */, D6147A0026D141F800710B79 /* OTPKitTests */, @@ -198,6 +209,7 @@ D61479D526D0AF1C00710B79 /* OTP */ = { isa = PBXGroup; children = ( + D602654B274401F800C77599 /* OTP.entitlements */, D61479E426D0AF1E00710B79 /* Info.plist */, D61479D626D0AF1C00710B79 /* AppDelegate.swift */, D6A2BCCF26D3E888004DC4E3 /* BackupDocument.swift */, @@ -597,6 +609,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_ENTITLEMENTS = OTP/OTP.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = V4WK9KR9U2; @@ -614,9 +627,10 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = net.shadowfacts.OTP; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTS_MACCATALYST = YES; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = "1,2,6"; }; name = Debug; }; @@ -626,6 +640,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_ENTITLEMENTS = OTP/OTP.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = V4WK9KR9U2; @@ -643,9 +658,10 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = net.shadowfacts.OTP; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTS_MACCATALYST = YES; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = "1,2,6"; }; name = Release; }; diff --git a/OTP.xcodeproj/xcuserdata/shadowfacts.xcuserdatad/xcschemes/xcschememanagement.plist b/OTP.xcodeproj/xcuserdata/shadowfacts.xcuserdatad/xcschemes/xcschememanagement.plist index bdba5c9..1b484cc 100644 --- a/OTP.xcodeproj/xcuserdata/shadowfacts.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/OTP.xcodeproj/xcuserdata/shadowfacts.xcuserdatad/xcschemes/xcschememanagement.plist @@ -7,12 +7,12 @@ OTP.xcscheme_^#shared#^_ orderHint - 1 + 0 OTPKit.xcscheme_^#shared#^_ orderHint - 0 + 1 diff --git a/OTP/OTP.entitlements b/OTP/OTP.entitlements new file mode 100644 index 0000000..0c67376 --- /dev/null +++ b/OTP/OTP.entitlements @@ -0,0 +1,5 @@ + + + + + diff --git a/OTP/Views/AddKeyButton.swift b/OTP/Views/AddKeyButton.swift index 5c99536..21d2f2d 100644 --- a/OTP/Views/AddKeyButton.swift +++ b/OTP/Views/AddKeyButton.swift @@ -53,6 +53,7 @@ struct AddKeyButton: View { } label: { Label("Add Key", systemImage: "plus.circle") } + .menuStyle(.borderlessButton) .accessibilityLabel("Add Key") .sheet(isPresented: $isPresentingScanner, content: self.scannerSheet) .sheet(isPresented: $isPresentingManualAddFormSheet, content: self.manualAddFormSheet) diff --git a/OTP/Views/PreferencesView.swift b/OTP/Views/PreferencesView.swift index bdd255a..d4706cb 100644 --- a/OTP/Views/PreferencesView.swift +++ b/OTP/Views/PreferencesView.swift @@ -33,6 +33,7 @@ struct PreferencesView: View { isPresentingImport = true } } + .menuStyle(.borderlessButton) } } .navigationTitle("Preferences")