From 6da986a9740edf9874e05c8e8848cc25d34a6c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leon=20B=C3=B6ttger?= Date: Sat, 4 Jan 2025 19:59:11 +0100 Subject: [PATCH] New Menubar icon, show welcome screen only on first launch --- NearDrop.xcodeproj/project.pbxproj | 28 ++++++++++++------ .../xcshareddata/xcschemes/NearDrop.xcscheme | 2 +- .../xcschemes/ShareExtension.xcscheme | 2 +- NearDrop/AppDelegate.swift | 9 +++++- .../MenuBarIcon.imageset/Contents.json | 10 +++---- .../MenuBarIcon.imageset/NearbyShare.png | Bin 2043 -> 0 bytes .../MenuBarIcon.imageset/NearbyShare@2x.png | Bin 2254 -> 0 bytes .../MenuBarIcon.imageset/menubar1x.png | Bin 0 -> 1489 bytes .../MenuBarIcon.imageset/menubar2x.png | Bin 0 -> 1838 bytes 9 files changed, 34 insertions(+), 17 deletions(-) delete mode 100644 NearDrop/Assets.xcassets/MenuBarIcon.imageset/NearbyShare.png delete mode 100644 NearDrop/Assets.xcassets/MenuBarIcon.imageset/NearbyShare@2x.png create mode 100644 NearDrop/Assets.xcassets/MenuBarIcon.imageset/menubar1x.png create mode 100644 NearDrop/Assets.xcassets/MenuBarIcon.imageset/menubar2x.png diff --git a/NearDrop.xcodeproj/project.pbxproj b/NearDrop.xcodeproj/project.pbxproj index 66d67a0..fca9ae2 100644 --- a/NearDrop.xcodeproj/project.pbxproj +++ b/NearDrop.xcodeproj/project.pbxproj @@ -419,7 +419,7 @@ attributes = { BuildIndependentTargetsInParallel = 1; LastSwiftUpdateCheck = 1430; - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1620; TargetAttributes = { 699DEBA02AB0573200115D22 = { CreatedOnToolsVersion = 14.3.1; @@ -686,6 +686,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 9; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = 92SDAWLN76; ENABLE_HARDENED_RUNTIME = YES; GENERATE_INFOPLIST_FILE = YES; @@ -697,7 +698,7 @@ "@executable_path/../Frameworks", "@executable_path/../../../../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.15; + MACOSX_DEPLOYMENT_TARGET = 11.0; MARKETING_VERSION = 2.1.0; PRODUCT_BUNDLE_IDENTIFIER = com.leonboettger.neardrop.ShareExtension; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -714,6 +715,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 9; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = 92SDAWLN76; ENABLE_HARDENED_RUNTIME = YES; GENERATE_INFOPLIST_FILE = YES; @@ -725,7 +727,7 @@ "@executable_path/../Frameworks", "@executable_path/../../../../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.15; + MACOSX_DEPLOYMENT_TARGET = 11.0; MARKETING_VERSION = 2.1.0; PRODUCT_BUNDLE_IDENTIFIER = com.leonboettger.neardrop.ShareExtension; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -739,6 +741,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -769,9 +772,11 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -800,6 +805,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -830,9 +836,11 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -853,7 +861,6 @@ 69DA9A1C29E0BF5200A442DA /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_ENABLE_MODULES = YES; @@ -861,6 +868,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 9; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = 92SDAWLN76; ENABLE_HARDENED_RUNTIME = YES; GENERATE_INFOPLIST_FILE = YES; @@ -875,7 +883,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.15; + MACOSX_DEPLOYMENT_TARGET = 11.0; MARKETING_VERSION = 2.1.0; PRODUCT_BUNDLE_IDENTIFIER = com.leonboettger.neardrop; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -889,7 +897,6 @@ 69DA9A1D29E0BF5200A442DA /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_ENABLE_MODULES = YES; @@ -897,6 +904,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 9; + DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = 92SDAWLN76; ENABLE_HARDENED_RUNTIME = YES; GENERATE_INFOPLIST_FILE = YES; @@ -911,7 +919,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.15; + MACOSX_DEPLOYMENT_TARGET = 11.0; MARKETING_VERSION = 2.1.0; PRODUCT_BUNDLE_IDENTIFIER = com.leonboettger.neardrop; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -925,12 +933,13 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; + DEAD_CODE_STRIPPING = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks"; EXECUTABLE_PREFIX = lib; LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; - MACOSX_DEPLOYMENT_TARGET = 10.15; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; @@ -941,12 +950,13 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; + DEAD_CODE_STRIPPING = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks"; EXECUTABLE_PREFIX = lib; LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; - MACOSX_DEPLOYMENT_TARGET = 10.15; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; diff --git a/NearDrop.xcodeproj/xcshareddata/xcschemes/NearDrop.xcscheme b/NearDrop.xcodeproj/xcshareddata/xcschemes/NearDrop.xcscheme index 3a735a3..ab39b02 100644 --- a/NearDrop.xcodeproj/xcshareddata/xcschemes/NearDrop.xcscheme +++ b/NearDrop.xcodeproj/xcshareddata/xcschemes/NearDrop.xcscheme @@ -1,6 +1,6 @@ 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 diff --git a/NearDrop/Assets.xcassets/MenuBarIcon.imageset/menubar1x.png b/NearDrop/Assets.xcassets/MenuBarIcon.imageset/menubar1x.png new file mode 100644 index 0000000000000000000000000000000000000000..b46b27ec17433e1f9453c382156d17c5feaac379 GIT binary patch literal 1489 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1IgHK`GvX}-P; zT0k}j0~@0d12aeo5Hc`IF|dN!3=Cn6(r|VhqXtwB6HtvI1CV5p2I92#Oa>OH`X(R^ z0v2(s|s5sunH?68zii+qySb@l5MLL;TxdfoL`ixV5VoFXP{)qrJ$f- zQgvAQxDHqczecGdDG_80a56BLf?- z(=a3uoLex2&9tQbCC*BtJjL4tJWe(MMN{W{fW|(o+&k5?vBYQh|;( zGSxLO)HN^(F|@QYHMcS{&^9o%G64DoWDJU0By&K)ViggTTAZI#3W`iSb0Y&F&^H8; zHu@OS=vomvL-R6A?2MpV(1g)-MIz*}S%@r+uGPONGZmO5!EQB#+J-C!Rd1sYN|i{d z6p{tNqQE?0#{~=)SbnnO`thed517v#JY5_^ECkP9w)H<0Aad+u*ZWNZ7Y?43IDF)g zdcuUp)+4=*1}0LmJ|)I(j~*;9NW9W|@ZyG@A2<_SdoOnOo}KXHQ~iNSMU&%ZU2B~D z=a%>RmoJ~*yH@zjR!mnoMlJjZ+plT60yIsnj~K67_-=#9+6mSNx%D>oUD%iqvg)Sc ztBM1%c7h`JRqh#l;5yS*trB(PpmklswSr8c_@2Ci_pyQ#ZhgoeR;or-%`14^yAd>_FD^#KJ7cbyJu@4t4r3a*QQd- zEX*z(wG--)on3O_SZTnakl^B5l3aZg+H@zW@Gmew;3~b?AYS@y24D2!k_UmCgVyf* z9LZn)MK*hSbB65t3(fnqa^s#{&@SfPdq(fehlq(!->F|o&__I!DABd;# WRp;n7_+SbuuRLA-T-G@yGywotLfR<+ literal 0 HcmV?d00001 diff --git a/NearDrop/Assets.xcassets/MenuBarIcon.imageset/menubar2x.png b/NearDrop/Assets.xcassets/MenuBarIcon.imageset/menubar2x.png new file mode 100644 index 0000000000000000000000000000000000000000..9874c2d38738b9194e12ae7a06219f762f87e36c GIT binary patch literal 1838 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEjKx9jP7LeL$-D$|)}%&wruq6Z zXaU(A3~Y=-49p-UK*+!-#lQ+?GcbfPO2gT4j2ciiOh7e;3_y}W8i>={GZ|Q*>YIQx z2zUT7&?E>QkXezMlbcwQU!)LFl&=s{l$n^LV611RX8}~fynqp5^8zNgNg4~75p1A3 z2KA||AYXA7ctjR6FmMZlFeAgPITAoKiZVkYN+NuHtdjF{^%7I^lT!66atlDZ7;Gx6 zfXv*~l0=1y+?>2(s|s5sunH?68zii+qySb@l5MLL;TxdfoL`ixV5VoFXP{)qrJ$f- zQgvAQxDHqczecGdDG_80a5669XHt z(=a3uoLex2&9tQbCC*BtJjL4tJWe(MMN{W{fW|(o+&k5?vBYQtgZk zj7)V640R1mLJTdfOwFwf4YUmmtqg#E0U3j$7Rek?uvkR|r55Msl!7AD&fLfV2=om> zq>Vm?G`d!V&d|Kf5<4TP7BpdWU6BZRY!)I*qigjq%1i|&Nw8ZDp|&B5LDk#ngHk0@ zDurYLuqZGO*l_`a1(u)exZbt*+c7XO&GmF~42j@;JKZu{G*F`LvCwt5-i{`r7=h@G zn>aWe0~R?sO-NX{Xi@L28EURwB4wQm_B$LD$<#Tbl(clNf?4E=Ht(1~5p$6{k3O@o z>z%VG-kbbx&ZB)F42qxUysvpaC;!~q)vH&EH6|%%3JZ^LkQZ@b@$_CrsrY#I6;ir+gFdoL)+TqnBBu{i&M ziB8+0tpe=q4>>c=y-ti^Db@>inWa>`HzbOE-A?WTcAe8%{!>H#E-4XOG`&CcoK%9f z?z+Rj?(6O^{>zgmw%m68oQby!IASgvO17Fr#zh?$FUs1RW%QbLa$J=Wh|A=em| z^(Pm|Ngdd}hvWOfP5aAyA}x!$+7HI8y4kg4;^PloZ;qHg?$hhlvG1O$c6X<~<7E8@ z96xL%Bn`zs7hiaiZNVApY2Fh&&EzKId56hrZ-ND`l+2F1rFbef`Hp*L$L$$w;yb6&KGCvWjpQG>Zprn24D=zFPnbo%%Iy}SRg)HKc5 z#ItVMQLzZY?8uwU#Val?xb!6L!-=UG2CFU^6<@ddm4|Uzf<8;)xztOn@(#tq8>E{IulLUE zU$C<