diff --git a/Info.plist b/Info.plist index ac805ad8..53e31b29 100644 --- a/Info.plist +++ b/Info.plist @@ -38,5 +38,7 @@ https://raw.githubusercontent.com/lwouis/alt-tab-macos/master/appcast.xml SUPublicEDKey 2e9SQOBoaKElchSa/4QDli/nvYkyuDNfynfzBF6vJK4= + CFBundleIconFile + app-icon diff --git a/alt-tab-macos.xcodeproj/project.pbxproj b/alt-tab-macos.xcodeproj/project.pbxproj index 9d41d8b4..4861c5cb 100644 --- a/alt-tab-macos.xcodeproj/project.pbxproj +++ b/alt-tab-macos.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 4807A6C623A9CD190052A53E /* SkyLight.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4807A6C523A9CD190052A53E /* SkyLight.framework */; }; - 4858C9B323FBA80200A5BCD9 /* rasterized.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4858C9B223FBA80200A5BCD9 /* rasterized.xcassets */; }; 76D02BB22BFE7C9E0056008D /* Pods_alt_tab_macos.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0712B3BEA2B3780398C0999 /* Pods_alt_tab_macos.framework */; }; D04BA004884A273D4D2D3EF1 /* HelperExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04BAD91161791D42FEC4A60 /* HelperExtensions.swift */; }; D04BA084CD1236EC78D90A01 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = D04BACCBE5F97BE9B6CA645B /* Localizable.strings */; }; @@ -51,6 +50,8 @@ D04BABEECBC6D922298BC93A /* Spaces.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04BA7CF9C2D1BEC7C05AB24 /* Spaces.swift */; }; D04BAC011A71E0418154F8CD /* Preferences.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04BA9B93823398A542FF7A0 /* Preferences.swift */; }; D04BAC3169D54014CBA9ACE5 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = D04BAE7F55A4A3EC5F6D311A /* Localizable.strings */; }; + D04BAC61DCCB79B5D436F022 /* app-icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = D04BAE5D665680CB4B13CA26 /* app-icon.icns */; }; + D04BACE5702CEB1819866875 /* menubar-icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D04BA399F1DF2C61FC2C9599 /* menubar-icon@2x.png */; }; D04BAD1BE9DC22C48C53D195 /* AboutTab.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04BA4A26987F67DD94C827F /* AboutTab.swift */; }; D04BAD2A7F2E8BF64EE982E9 /* TextArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04BA7C836A8CE8C0B8D128B /* TextArea.swift */; }; D04BAD451966B43720120D2E /* Menubar.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04BAD905546AA93E5117B0A /* Menubar.swift */; }; @@ -66,7 +67,6 @@ /* Begin PBXFileReference section */ 38C426DAE17708EDD4FDADBF /* Pods-alt-tab-macos.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-alt-tab-macos.release.xcconfig"; path = "Target Support Files/Pods-alt-tab-macos/Pods-alt-tab-macos.release.xcconfig"; sourceTree = ""; }; 4807A6C523A9CD190052A53E /* SkyLight.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SkyLight.framework; path = ../../../../System/Library/PrivateFrameworks/SkyLight.framework; sourceTree = ""; }; - 4858C9B223FBA80200A5BCD9 /* rasterized.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = rasterized.xcassets; sourceTree = ""; }; BF12DEA89785CA78B0FE2706 /* Pods-alt-tab-macos.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-alt-tab-macos.debug.xcconfig"; path = "Target Support Files/Pods-alt-tab-macos/Pods-alt-tab-macos.debug.xcconfig"; sourceTree = ""; }; C0712B3BEA2B3780398C0999 /* Pods_alt_tab_macos.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_alt_tab_macos.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D04BA015A45DE7AFDC9794FE /* Window.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Window.swift; sourceTree = ""; }; @@ -82,6 +82,7 @@ D04BA107C8B8FE7FF8536606 /* too many windows - 4 lines - paginated.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "too many windows - 4 lines - paginated.jpg"; sourceTree = ""; }; D04BA1232AFEEFE90D5CC827 /* debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = debug.xcconfig; sourceTree = ""; }; D04BA123744B0C27E9F54B05 /* codesign_sparkle_embedded_apps.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = codesign_sparkle_embedded_apps.sh; sourceTree = ""; }; + D04BA1C3E42AC44CA2C5D3D8 /* app-icon.svg */ = {isa = PBXFileReference; lastKnownFileType = file.svg; path = "app-icon.svg"; sourceTree = ""; }; D04BA1D80F4EEF2A91BAD29C /* release.config.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = release.config.js; sourceTree = ""; }; D04BA1DF8CAB2FAB7FE9244B /* CollectionViewItemFontIcon.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollectionViewItemFontIcon.swift; sourceTree = ""; }; D04BA1FC9022590D7AA02486 /* 1 window - 1 line.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "1 window - 1 line.jpg"; sourceTree = ""; }; @@ -95,6 +96,7 @@ D04BA2A4F257F4DCE1421758 /* Podfile.lock */ = {isa = PBXFileReference; lastKnownFileType = file.lock; path = Podfile.lock; sourceTree = ""; }; D04BA2C7B51F68651B3C60E2 /* 6 windows - 1 line.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "6 windows - 1 line.jpg"; sourceTree = ""; }; D04BA32F25860B686DFE818A /* 3 windows - 1 line.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "3 windows - 1 line.jpg"; sourceTree = ""; }; + D04BA399F1DF2C61FC2C9599 /* menubar-icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "menubar-icon@2x.png"; sourceTree = ""; }; D04BA4336B6004A0A99849AD /* package.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = package.json; sourceTree = ""; }; D04BA44F7B5E58A08416706B /* TextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextField.swift; sourceTree = ""; }; D04BA459034C1885CA43A807 /* LICENCE.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = LICENCE.md; sourceTree = ""; }; @@ -128,7 +130,6 @@ D04BA82F792DF53958D92572 /* AltTab.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AltTab.app; sourceTree = BUILT_PRODUCTS_DIR; }; D04BA8DB8AA7E5570DAC568A /* Sysctl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Sysctl.swift; sourceTree = ""; }; D04BA926AF41D226EA1ACBA1 /* CONTRIBUTING.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = CONTRIBUTING.md; sourceTree = ""; }; - D04BA97D4F5B72B3AB87A4A5 /* app-icon.svg */ = {isa = PBXFileReference; lastKnownFileType = file.svg; path = "app-icon.svg"; sourceTree = ""; }; D04BA9B93823398A542FF7A0 /* Preferences.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Preferences.swift; sourceTree = ""; }; D04BA9EF65B2E7AF9E3ADCA3 /* 2 windows - 1 line.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "2 windows - 1 line.jpg"; sourceTree = ""; }; D04BAA34E0CB00DED7C04B4F /* 2-rows.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "2-rows.jpg"; sourceTree = ""; }; @@ -159,7 +160,8 @@ D04BAD91161791D42FEC4A60 /* HelperExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HelperExtensions.swift; sourceTree = ""; }; D04BADB20AB31BF83593E0BE /* greetings.yml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.yaml; path = greetings.yml; sourceTree = ""; }; D04BAE1243C9B4BE3ED1B524 /* 7 windows - 2 lines - extra wide window.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "7 windows - 2 lines - extra wide window.jpg"; sourceTree = ""; }; - D04BAE31C445719E8F8C60E1 /* menubar-icon.svg */ = {isa = PBXFileReference; lastKnownFileType = file.svg; path = "menubar-icon.svg"; sourceTree = ""; }; + D04BAE2DC036FD84446E1AE6 /* menubar-icon.svg */ = {isa = PBXFileReference; lastKnownFileType = file.svg; path = "menubar-icon.svg"; sourceTree = ""; }; + D04BAE5D665680CB4B13CA26 /* app-icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "app-icon.icns"; sourceTree = ""; }; D04BAE757BB2B605234FBF58 /* TabViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabViewController.swift; sourceTree = ""; }; D04BAE93A5854C501639C640 /* update_homebrew_cask.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = update_homebrew_cask.sh; sourceTree = ""; }; D04BAF076A30A1BAFEDBEA66 /* 5 windows - 2 lines.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "5 windows - 2 lines.jpg"; sourceTree = ""; }; @@ -238,7 +240,6 @@ D04BA1D80F4EEF2A91BAD29C /* release.config.js */, D04BAC02D60EF22D9CC7D969 /* commitlint.config.js */, D04BA4336B6004A0A99849AD /* package.json */, - D04BA92541D46EA4F6943A72 /* package-lock.json */, D04BAFA277EAE3BDDDB61110 /* CHANGELOG.md */, D04BA703DCD38D9757093312 /* scripts */, D04BA459034C1885CA43A807 /* LICENCE.md */, @@ -411,8 +412,10 @@ D04BA7568B7165A7726306A7 /* icons */ = { isa = PBXGroup; children = ( - 4858C9B223FBA80200A5BCD9 /* rasterized.xcassets */, - D04BAAE3B28A88C49177414C /* originals */, + D04BA399F1DF2C61FC2C9599 /* menubar-icon@2x.png */, + D04BAE2DC036FD84446E1AE6 /* menubar-icon.svg */, + D04BA1C3E42AC44CA2C5D3D8 /* app-icon.svg */, + D04BAE5D665680CB4B13CA26 /* app-icon.icns */, ); path = icons; sourceTree = ""; @@ -468,15 +471,6 @@ path = img; sourceTree = ""; }; - D04BAAE3B28A88C49177414C /* originals */ = { - isa = PBXGroup; - children = ( - D04BA97D4F5B72B3AB87A4A5 /* app-icon.svg */, - D04BAE31C445719E8F8C60E1 /* menubar-icon.svg */, - ); - path = originals; - sourceTree = ""; - }; D04BABCD12CA72B06290C248 /* preferences-window */ = { isa = PBXGroup; children = ( @@ -582,8 +576,9 @@ D04BA8D6055F6F2E42C976EA /* InfoPlist.strings in Resources */, D04BAC3169D54014CBA9ACE5 /* Localizable.strings in Resources */, D04BA100BD0F47828EB649FF /* InfoPlist.strings in Resources */, - 4858C9B323FBA80200A5BCD9 /* rasterized.xcassets in Resources */, D04BA3C24F4F644EA91DE38C /* Localizable.strings in Resources */, + D04BACE5702CEB1819866875 /* menubar-icon@2x.png in Resources */, + D04BAC61DCCB79B5D436F022 /* app-icon.icns in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/config/base.xcconfig b/config/base.xcconfig index c1356795..2252d987 100644 --- a/config/base.xcconfig +++ b/config/base.xcconfig @@ -10,4 +10,3 @@ IDEDerivedDataPathOverride = DerivedData FRAMEWORK_SEARCH_PATHS[config=*] = $(inherited) /System/Library/PrivateFrameworks // for SkyLight.framework ENABLE_HARDENED_RUNTIME = YES // for notarization OTHER_CODE_SIGN_FLAGS = --timestamp --deep --options runtime // for notarization -ASSETCATALOG_COMPILER_APPICON_NAME = app-icon diff --git a/resources/icons/app-icon.icns b/resources/icons/app-icon.icns new file mode 100644 index 00000000..0b8d312e Binary files /dev/null and b/resources/icons/app-icon.icns differ diff --git a/resources/icons/originals/app-icon.svg b/resources/icons/app-icon.svg similarity index 100% rename from resources/icons/originals/app-icon.svg rename to resources/icons/app-icon.svg diff --git a/resources/icons/originals/menubar-icon.svg b/resources/icons/menubar-icon.svg similarity index 100% rename from resources/icons/originals/menubar-icon.svg rename to resources/icons/menubar-icon.svg diff --git a/resources/icons/menubar-icon@2x.png b/resources/icons/menubar-icon@2x.png new file mode 100644 index 00000000..95ef7c39 Binary files /dev/null and b/resources/icons/menubar-icon@2x.png differ diff --git a/resources/icons/rasterized.xcassets/Contents.json b/resources/icons/rasterized.xcassets/Contents.json deleted file mode 100644 index da4a164c..00000000 --- a/resources/icons/rasterized.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/resources/icons/rasterized.xcassets/app-icon.appiconset/Contents.json b/resources/icons/rasterized.xcassets/app-icon.appiconset/Contents.json deleted file mode 100644 index 09056c40..00000000 --- a/resources/icons/rasterized.xcassets/app-icon.appiconset/Contents.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "size" : "16x16", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "16x16", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "32x32", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "32x32", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "128x128", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "128x128", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "256x256", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "256x256", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "512x512", - "scale" : "1x" - }, - { - "size" : "512x512", - "idiom" : "mac", - "filename" : "icon_512x512@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/resources/icons/rasterized.xcassets/app-icon.appiconset/icon_512x512@2x.png b/resources/icons/rasterized.xcassets/app-icon.appiconset/icon_512x512@2x.png deleted file mode 100644 index fbec5b4d..00000000 Binary files a/resources/icons/rasterized.xcassets/app-icon.appiconset/icon_512x512@2x.png and /dev/null differ diff --git a/resources/icons/rasterized.xcassets/menubar-icon.imageset/Contents.json b/resources/icons/rasterized.xcassets/menubar-icon.imageset/Contents.json deleted file mode 100644 index 426059c5..00000000 --- a/resources/icons/rasterized.xcassets/menubar-icon.imageset/Contents.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "scale" : "1x" - }, - { - "idiom" : "mac", - "filename" : "icon_16x16@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/resources/icons/rasterized.xcassets/menubar-icon.imageset/icon_16x16@2x.png b/resources/icons/rasterized.xcassets/menubar-icon.imageset/icon_16x16@2x.png deleted file mode 100644 index 4088de40..00000000 Binary files a/resources/icons/rasterized.xcassets/menubar-icon.imageset/icon_16x16@2x.png and /dev/null differ