diff --git a/Safari/BlockerExtension/Info.plist b/Safari/BlockerExtension/Info.plist index 208be7c9..252261ad 100644 --- a/Safari/BlockerExtension/Info.plist +++ b/Safari/BlockerExtension/Info.plist @@ -32,6 +32,6 @@ NSHumanReadableCopyright Copyright © 2019 Dirk Hulverscheidt. All rights reserved. NSHumanReadableDescription - Add a description of what your extension does here. + This extension blocks annoying chat widgets. diff --git a/Safari/HelloGoodbye.xcodeproj/project.pbxproj b/Safari/HelloGoodbye.xcodeproj/project.pbxproj index 6d9649f1..89a38fb0 100644 --- a/Safari/HelloGoodbye.xcodeproj/project.pbxproj +++ b/Safari/HelloGoodbye.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + ED9F14A2225ABD4B008F7645 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = ED9F14A1225ABD4B008F7645 /* Assets.xcassets */; }; EDDE49D5225A9834005DE7A4 /* HelloGoodbye.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = EDDE49D4225A9834005DE7A4 /* HelloGoodbye.entitlements */; }; EDDE49D7225A9834005DE7A4 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDDE49D6225A9834005DE7A4 /* AppDelegate.swift */; }; EDDE49DA225A9834005DE7A4 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EDDE49D8225A9834005DE7A4 /* Main.storyboard */; }; @@ -43,6 +44,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + ED9F14A1225ABD4B008F7645 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = HelloGoodbye/Assets.xcassets; sourceTree = SOURCE_ROOT; }; EDDE49D1225A9834005DE7A4 /* HelloGoodbye.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloGoodbye.app; sourceTree = BUILT_PRODUCTS_DIR; }; EDDE49D4225A9834005DE7A4 /* HelloGoodbye.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = HelloGoodbye.entitlements; sourceTree = ""; }; EDDE49D6225A9834005DE7A4 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -120,6 +122,7 @@ EDDE4A08225A98DF005DE7A4 /* BlockerExtension */ = { isa = PBXGroup; children = ( + ED9F14A1225ABD4B008F7645 /* Assets.xcassets */, EDDE4A09225A98DF005DE7A4 /* blockerList.json */, EDDE4A0B225A98DF005DE7A4 /* ContentBlockerRequestHandler.swift */, EDDE4A0D225A98DF005DE7A4 /* Info.plist */, @@ -219,6 +222,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + ED9F14A2225ABD4B008F7645 /* Assets.xcassets in Resources */, EDDE4A0A225A98DF005DE7A4 /* blockerList.json in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -423,6 +427,7 @@ EDDE4A13225A98DF005DE7A4 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = BlockerExtension/BlockerExtension.entitlements; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = BN988BU552; @@ -442,6 +447,7 @@ EDDE4A14225A98DF005DE7A4 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = BlockerExtension/BlockerExtension.entitlements; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = BN988BU552; diff --git a/Safari/HelloGoodbye.xcodeproj/project.xcworkspace/xcuserdata/bruceroettgers.xcuserdatad/UserInterfaceState.xcuserstate b/Safari/HelloGoodbye.xcodeproj/project.xcworkspace/xcuserdata/bruceroettgers.xcuserdatad/UserInterfaceState.xcuserstate index 697eb7d3..9a315218 100644 Binary files a/Safari/HelloGoodbye.xcodeproj/project.xcworkspace/xcuserdata/bruceroettgers.xcuserdatad/UserInterfaceState.xcuserstate and b/Safari/HelloGoodbye.xcodeproj/project.xcworkspace/xcuserdata/bruceroettgers.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/1024.png b/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/1024.png new file mode 100755 index 00000000..814382b5 Binary files /dev/null and b/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/1024.png differ diff --git a/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/128.png b/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/128.png new file mode 100755 index 00000000..8f8098fb Binary files /dev/null and b/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/128.png differ diff --git a/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/16.png b/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/16.png new file mode 100755 index 00000000..0659c6c8 Binary files /dev/null and b/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/16.png differ diff --git a/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/256.png b/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/256.png new file mode 100755 index 00000000..861adb47 Binary files /dev/null and b/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/256.png differ diff --git a/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/32.png b/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/32.png new file mode 100755 index 00000000..42f921a4 Binary files /dev/null and b/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/32.png differ diff --git a/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/512.png b/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/512.png new file mode 100755 index 00000000..899f993c Binary files /dev/null and b/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/512.png differ diff --git a/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/64.png b/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/64.png new file mode 100755 index 00000000..252ca2a0 Binary files /dev/null and b/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/64.png differ diff --git a/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/Contents.json b/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/Contents.json old mode 100644 new mode 100755 index 2db2b1c7..a16697e7 --- a/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Safari/HelloGoodbye/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,58 +1 @@ -{ - "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" - }, - { - "idiom" : "mac", - "size" : "512x512", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file +{"images":[{"size":"1024x1024","expected-size":"1024","filename":"1024.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ios-marketing","scale":"1x"},{"size":"128x128","expected-size":"128","filename":"128.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"256x256","expected-size":"256","filename":"256.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"128x128","expected-size":"256","filename":"256.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"256x256","expected-size":"512","filename":"512.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"32","filename":"32.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"512x512","expected-size":"512","filename":"512.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"16","filename":"16.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"32","filename":"32.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"64","filename":"64.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"512x512","expected-size":"1024","filename":"1024.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"}]} \ No newline at end of file diff --git a/Safari/HelloGoodbye/Info.plist b/Safari/HelloGoodbye/Info.plist index fe03be31..227a3863 100644 --- a/Safari/HelloGoodbye/Info.plist +++ b/Safari/HelloGoodbye/Info.plist @@ -20,6 +20,8 @@ 1.0 CFBundleVersion 1 + LSApplicationCategoryType + public.app-category.productivity LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright diff --git a/photoshop/Exports/mac-icon.png b/photoshop/Exports/mac-icon.png new file mode 100644 index 00000000..94305bde Binary files /dev/null and b/photoshop/Exports/mac-icon.png differ diff --git a/photoshop/discuss-issue.psd b/photoshop/discuss-issue.psd index 5e453c4c..4a619dcf 100644 Binary files a/photoshop/discuss-issue.psd and b/photoshop/discuss-issue.psd differ