diff --git a/QuickDrop.xcodeproj/project.pbxproj b/QuickDrop.xcodeproj/project.pbxproj index 2770196..06bc0e6 100644 --- a/QuickDrop.xcodeproj/project.pbxproj +++ b/QuickDrop.xcodeproj/project.pbxproj @@ -111,6 +111,8 @@ EB704A822E4A7BB3008E608F /* DistributionDetector.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB704A812E4A7BAE008E608F /* DistributionDetector.swift */; }; EB704A832E4B10D4008E608F /* DistributionDetector.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB704A812E4A7BAE008E608F /* DistributionDetector.swift */; }; EB704A842E4B10D4008E608F /* DistributionDetector.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB704A812E4A7BAE008E608F /* DistributionDetector.swift */; }; + EB721EC02E75A0DA00F2099F /* QuickDropIcon.icon in Resources */ = {isa = PBXBuildFile; fileRef = EB721EBF2E75A0DA00F2099F /* QuickDropIcon.icon */; }; + EB721EC12E75A0DA00F2099F /* QuickDropIcon.icon in Resources */ = {isa = PBXBuildFile; fileRef = EB721EBF2E75A0DA00F2099F /* QuickDropIcon.icon */; }; EB7654782E525ACC006B4AA3 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB7654772E525ACC006B4AA3 /* MainMenu.xib */; }; EB7654A12E53252D006B4AA3 /* AttachmentDetails.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB950B762E521712002D68FA /* AttachmentDetails.swift */; }; EB7654C02E534A8E006B4AA3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 69DA9A1329E0BF5200A442DA /* Assets.xcassets */; }; @@ -332,6 +334,7 @@ EB5C383E2E38C49D0052EFD7 /* LaunchAtLogin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LaunchAtLogin.swift; sourceTree = ""; }; EB6F62D62D91F4AC00534EC2 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = ""; }; EB704A812E4A7BAE008E608F /* DistributionDetector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DistributionDetector.swift; sourceTree = ""; }; + EB721EBF2E75A0DA00F2099F /* QuickDropIcon.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = QuickDropIcon.icon; sourceTree = ""; }; EB7654772E525ACC006B4AA3 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = ""; }; EB7CD1442D6FB0C100CB0CB5 /* Logger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = ""; }; EB7F54112D78E95C00989564 /* TutorialView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TutorialView.swift; sourceTree = ""; }; @@ -444,6 +447,7 @@ 69DA9A0529E0BF5100A442DA = { isa = PBXGroup; children = ( + EB721EBF2E75A0DA00F2099F /* QuickDropIcon.icon */, 69DA9A1029E0BF5100A442DA /* QuickDrop */, 699DEBA22AB0573200115D22 /* ShareExtension */, 69DCF4822AB70D0600CBE2CC /* NearbyShare */, @@ -756,7 +760,7 @@ attributes = { BuildIndependentTargetsInParallel = 1; LastSwiftUpdateCheck = 1640; - LastUpgradeCheck = 1640; + LastUpgradeCheck = 2600; TargetAttributes = { 699DEBA02AB0573200115D22 = { CreatedOnToolsVersion = 14.3.1; @@ -842,6 +846,7 @@ EB5C36932E34EBBD0052EFD7 /* Localizable.xcstrings in Resources */, EBC05C8C2E33B59E00EECC18 /* timeIsNow.mp3 in Resources */, EB5C38392E38C1F60052EFD7 /* justMaybe.mp3 in Resources */, + EB721EC12E75A0DA00F2099F /* QuickDropIcon.icon in Resources */, EB7654782E525ACC006B4AA3 /* MainMenu.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -855,6 +860,7 @@ EB97A0142E51DD00008B8C5C /* License.txt in Resources */, EB97A0152E51DD00008B8C5C /* timeIsNow.mp3 in Resources */, EB886E552E4E50F40052B7D9 /* Localizable.xcstrings in Resources */, + EB721EC02E75A0DA00F2099F /* QuickDropIcon.icon in Resources */, EB7654C02E534A8E006B4AA3 /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1101,7 +1107,11 @@ COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = "${SHARED_BUILD}"; DEAD_CODE_STRIPPING = YES; + ENABLE_APP_SANDBOX = YES; ENABLE_HARDENED_RUNTIME = YES; + ENABLE_INCOMING_NETWORK_CONNECTIONS = YES; + ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES; + ENABLE_USER_SELECTED_FILES = readonly; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = ShareExtension/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = QuickDrop; @@ -1118,6 +1128,8 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; REGISTER_APP_GROUPS = YES; + SHARED_BUILD = 73; + SHARED_VERSION = 2.4; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) EXTENSION"; SWIFT_EMIT_LOC_STRINGS = YES; @@ -1135,7 +1147,11 @@ COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = "${SHARED_BUILD}"; DEAD_CODE_STRIPPING = YES; + ENABLE_APP_SANDBOX = YES; ENABLE_HARDENED_RUNTIME = YES; + ENABLE_INCOMING_NETWORK_CONNECTIONS = YES; + ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES; + ENABLE_USER_SELECTED_FILES = readonly; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = ShareExtension/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = QuickDrop; @@ -1152,6 +1168,8 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; REGISTER_APP_GROUPS = YES; + SHARED_BUILD = 73; + SHARED_VERSION = 2.4; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = EXTENSION; "SWIFT_ACTIVE_COMPILATION_CONDITIONS[arch=*]" = ""; @@ -1221,8 +1239,9 @@ MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; - SHARED_BUILD = 71; - SHARED_VERSION = 2.3; + SHARED_BUILD = 72; + SHARED_VERSION = 2.3.1; + STRING_CATALOG_GENERATE_SYMBOLS = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -1283,8 +1302,9 @@ MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = macosx; - SHARED_BUILD = 71; - SHARED_VERSION = 2.3; + SHARED_BUILD = 72; + SHARED_VERSION = 2.3.1; + STRING_CATALOG_GENERATE_SYMBOLS = YES; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OPTIMIZATION_LEVEL = "-O"; @@ -1294,7 +1314,7 @@ 69DA9A1C29E0BF5200A442DA /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = QuickDropIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = QuickDrop/QuickDrop.entitlements; @@ -1304,7 +1324,12 @@ COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = "${SHARED_BUILD}"; DEAD_CODE_STRIPPING = YES; + ENABLE_APP_SANDBOX = YES; + ENABLE_FILE_ACCESS_DOWNLOADS_FOLDER = readwrite; ENABLE_HARDENED_RUNTIME = YES; + ENABLE_INCOMING_NETWORK_CONNECTIONS = YES; + ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES; + ENABLE_USER_SELECTED_FILES = readwrite; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = QuickDrop/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = QuickDrop; @@ -1335,7 +1360,7 @@ 69DA9A1D29E0BF5200A442DA /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = QuickDropIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = QuickDrop/QuickDrop.entitlements; @@ -1345,7 +1370,12 @@ COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = "${SHARED_BUILD}"; DEAD_CODE_STRIPPING = YES; + ENABLE_APP_SANDBOX = YES; + ENABLE_FILE_ACCESS_DOWNLOADS_FOLDER = readwrite; ENABLE_HARDENED_RUNTIME = YES; + ENABLE_INCOMING_NETWORK_CONNECTIONS = YES; + ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES; + ENABLE_USER_SELECTED_FILES = readwrite; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = QuickDrop/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = QuickDrop; @@ -1375,7 +1405,7 @@ EB5C37EB2E377C310052EFD7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = QuickDropIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = QuickDropiOS/QuickDropiOS.entitlements; CODE_SIGN_STYLE = Automatic; @@ -1419,7 +1449,7 @@ EB5C37EC2E377C310052EFD7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = QuickDropIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = QuickDropiOS/QuickDropiOS.entitlements; CODE_SIGN_STYLE = Automatic; diff --git a/QuickDrop.xcodeproj/xcshareddata/xcschemes/QuickDrop.xcscheme b/QuickDrop.xcodeproj/xcshareddata/xcschemes/QuickDrop.xcscheme index 6e539b4..d2ce80f 100644 --- a/QuickDrop.xcodeproj/xcshareddata/xcschemes/QuickDrop.xcscheme +++ b/QuickDrop.xcodeproj/xcshareddata/xcschemes/QuickDrop.xcscheme @@ -1,6 +1,6 @@ - com.apple.security.app-sandbox - com.apple.security.application-groups group.com.leonboettger.neardrop - com.apple.security.files.downloads.read-write - - com.apple.security.files.user-selected.read-write - - com.apple.security.network.client - - com.apple.security.network.server - diff --git a/QuickDropIcon.icon/Assets/arrows.png b/QuickDropIcon.icon/Assets/arrows.png new file mode 100644 index 0000000..d8c8721 Binary files /dev/null and b/QuickDropIcon.icon/Assets/arrows.png differ diff --git a/QuickDropIcon.icon/Assets/circle.png b/QuickDropIcon.icon/Assets/circle.png new file mode 100644 index 0000000..62899be Binary files /dev/null and b/QuickDropIcon.icon/Assets/circle.png differ diff --git a/QuickDropIcon.icon/icon.json b/QuickDropIcon.icon/icon.json new file mode 100644 index 0000000..23927b3 --- /dev/null +++ b/QuickDropIcon.icon/icon.json @@ -0,0 +1,88 @@ +{ + "fill" : { + "linear-gradient" : [ + "display-p3:0.31249,0.68878,0.97563,1.00000", + "display-p3:0.22950,0.42793,0.95758,1.00000" + ] + }, + "groups" : [ + { + "blur-material" : 1, + "layers" : [ + { + "fill-specializations" : [ + { + "value" : "none" + }, + { + "appearance" : "dark", + "value" : "none" + } + ], + "image-name" : "arrows.png", + "name" : "arrows", + "opacity" : 1, + "position-specializations" : [ + { + "value" : { + "scale" : 1.24, + "translation-in-points" : [ + -0.69993986327107, + 9.689528950583849 + ] + } + }, + { + "idiom" : "square", + "value" : { + "scale" : 1.24, + "translation-in-points" : [ + 0.5, + 9.689528950583849 + ] + } + } + ] + }, + { + "blend-mode" : "normal", + "fill-specializations" : [ + { + "appearance" : "dark", + "value" : { + "automatic-gradient" : "display-p3:0.38142,0.62648,0.96783,1.00000" + } + } + ], + "glass" : true, + "image-name" : "circle.png", + "name" : "circle", + "opacity" : 0.5, + "position" : { + "scale" : 1.24, + "translation-in-points" : [ + 0, + 0 + ] + } + } + ], + "lighting" : "individual", + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "specular" : true, + "translucency" : { + "enabled" : true, + "value" : 0.52 + } + } + ], + "supported-platforms" : { + "circles" : [ + "watchOS" + ], + "squares" : "shared" + } +} \ No newline at end of file diff --git a/ShareExtension/ShareExtension.entitlements b/ShareExtension/ShareExtension.entitlements index 3b6a8fd..a8302e4 100644 --- a/ShareExtension/ShareExtension.entitlements +++ b/ShareExtension/ShareExtension.entitlements @@ -2,17 +2,9 @@ - com.apple.security.app-sandbox - com.apple.security.application-groups group.com.leonboettger.neardrop - com.apple.security.files.user-selected.read-only - - com.apple.security.network.client - - com.apple.security.network.server -