diff --git a/ComputerSolitaire.xcodeproj/project.pbxproj b/ComputerSolitaire.xcodeproj/project.pbxproj index e60ce07..d3121d6 100644 --- a/ComputerSolitaire.xcodeproj/project.pbxproj +++ b/ComputerSolitaire.xcodeproj/project.pbxproj @@ -293,7 +293,7 @@ 4B75C1E02F1A233500761A12 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = QueenOfHeartsAppIcon; + ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "ComputerSolitaireBlueAppIcon ComputerSolitairePinkAppIcon QueenOfHeartsAppIcon"; ASSETCATALOG_COMPILER_APPICON_NAME = ComputerSolitaireAppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; @@ -345,7 +345,7 @@ 4B75C1E12F1A233500761A12 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = QueenOfHeartsAppIcon; + ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "ComputerSolitaireBlueAppIcon ComputerSolitairePinkAppIcon QueenOfHeartsAppIcon"; ASSETCATALOG_COMPILER_APPICON_NAME = ComputerSolitaireAppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; diff --git a/ComputerSolitaire/AppIcons/ComputerSolitaireAppIcon.icon/icon.json b/ComputerSolitaire/AppIcons/ComputerSolitaireAppIcon.icon/icon.json index 57a15d5..64d9104 100644 --- a/ComputerSolitaire/AppIcons/ComputerSolitaireAppIcon.icon/icon.json +++ b/ComputerSolitaire/AppIcons/ComputerSolitaireAppIcon.icon/icon.json @@ -1,6 +1,6 @@ { "fill" : { - "automatic-gradient" : "display-p3:0.18250,0.41357,0.66016,1.00000", + "automatic-gradient" : "display-p3:0.36816,0.53076,0.53320,1.00000", "orientation" : { "start" : { "x" : 0.5, diff --git a/ComputerSolitaire/AppIcons/ComputerSolitaireBlueAppIcon.icon/Assets/cards.png b/ComputerSolitaire/AppIcons/ComputerSolitaireBlueAppIcon.icon/Assets/cards.png new file mode 100644 index 0000000..2a78c6a Binary files /dev/null and b/ComputerSolitaire/AppIcons/ComputerSolitaireBlueAppIcon.icon/Assets/cards.png differ diff --git a/ComputerSolitaire/AppIcons/ComputerSolitaireBlueAppIcon.icon/icon.json b/ComputerSolitaire/AppIcons/ComputerSolitaireBlueAppIcon.icon/icon.json new file mode 100644 index 0000000..57a15d5 --- /dev/null +++ b/ComputerSolitaire/AppIcons/ComputerSolitaireBlueAppIcon.icon/icon.json @@ -0,0 +1,48 @@ +{ + "fill" : { + "automatic-gradient" : "display-p3:0.18250,0.41357,0.66016,1.00000", + "orientation" : { + "start" : { + "x" : 0.5, + "y" : 1 + }, + "stop" : { + "x" : 0.5, + "y" : 0.3 + } + } + }, + "groups" : [ + { + "layers" : [ + { + "glass" : false, + "hidden" : false, + "image-name" : "cards.png", + "name" : "cards", + "position" : { + "scale" : 1, + "translation-in-points" : [ + 0, + 0 + ] + } + } + ], + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "translucency" : { + "enabled" : true, + "value" : 0.5 + } + } + ], + "supported-platforms" : { + "circles" : [ + "watchOS" + ], + "squares" : "shared" + } +} \ No newline at end of file diff --git a/ComputerSolitaire/AppIcons/ComputerSolitairePinkAppIcon.icon/Assets/cards.png b/ComputerSolitaire/AppIcons/ComputerSolitairePinkAppIcon.icon/Assets/cards.png new file mode 100644 index 0000000..2a78c6a Binary files /dev/null and b/ComputerSolitaire/AppIcons/ComputerSolitairePinkAppIcon.icon/Assets/cards.png differ diff --git a/ComputerSolitaire/AppIcons/ComputerSolitairePinkAppIcon.icon/icon.json b/ComputerSolitaire/AppIcons/ComputerSolitairePinkAppIcon.icon/icon.json new file mode 100644 index 0000000..bc933b9 --- /dev/null +++ b/ComputerSolitaire/AppIcons/ComputerSolitairePinkAppIcon.icon/icon.json @@ -0,0 +1,48 @@ +{ + "fill" : { + "automatic-gradient" : "display-p3:0.96387,0.82275,0.87598,1.00000", + "orientation" : { + "start" : { + "x" : 0.5, + "y" : 1 + }, + "stop" : { + "x" : 0.5, + "y" : 0.3 + } + } + }, + "groups" : [ + { + "layers" : [ + { + "glass" : false, + "hidden" : false, + "image-name" : "cards.png", + "name" : "cards", + "position" : { + "scale" : 1, + "translation-in-points" : [ + 0, + 0 + ] + } + } + ], + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "translucency" : { + "enabled" : true, + "value" : 0.5 + } + } + ], + "supported-platforms" : { + "circles" : [ + "watchOS" + ], + "squares" : "shared" + } +} \ No newline at end of file diff --git a/ComputerSolitaire/Assets.xcassets/AppIconPreviews/AppIconPreviewBlue.imageset/Contents.json b/ComputerSolitaire/Assets.xcassets/AppIconPreviews/AppIconPreviewBlue.imageset/Contents.json new file mode 100644 index 0000000..ecd0aa4 --- /dev/null +++ b/ComputerSolitaire/Assets.xcassets/AppIconPreviews/AppIconPreviewBlue.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "blue.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ComputerSolitaire/Assets.xcassets/AppIconPreviews/AppIconPreviewBlue.imageset/blue.png b/ComputerSolitaire/Assets.xcassets/AppIconPreviews/AppIconPreviewBlue.imageset/blue.png new file mode 100644 index 0000000..a768f86 Binary files /dev/null and b/ComputerSolitaire/Assets.xcassets/AppIconPreviews/AppIconPreviewBlue.imageset/blue.png differ diff --git a/ComputerSolitaire/Assets.xcassets/AppIconPreviews/AppIconPreviewDefault.imageset/default.png b/ComputerSolitaire/Assets.xcassets/AppIconPreviews/AppIconPreviewDefault.imageset/default.png index a768f86..d218759 100644 Binary files a/ComputerSolitaire/Assets.xcassets/AppIconPreviews/AppIconPreviewDefault.imageset/default.png and b/ComputerSolitaire/Assets.xcassets/AppIconPreviews/AppIconPreviewDefault.imageset/default.png differ diff --git a/ComputerSolitaire/Assets.xcassets/AppIconPreviews/AppIconPreviewPink.imageset/Contents.json b/ComputerSolitaire/Assets.xcassets/AppIconPreviews/AppIconPreviewPink.imageset/Contents.json new file mode 100644 index 0000000..b4bad23 --- /dev/null +++ b/ComputerSolitaire/Assets.xcassets/AppIconPreviews/AppIconPreviewPink.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "pink.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ComputerSolitaire/Assets.xcassets/AppIconPreviews/AppIconPreviewPink.imageset/pink.png b/ComputerSolitaire/Assets.xcassets/AppIconPreviews/AppIconPreviewPink.imageset/pink.png new file mode 100644 index 0000000..662023b Binary files /dev/null and b/ComputerSolitaire/Assets.xcassets/AppIconPreviews/AppIconPreviewPink.imageset/pink.png differ diff --git a/ComputerSolitaire/Views/AppIconPickerView.swift b/ComputerSolitaire/Views/AppIconPickerView.swift index b2aac5b..7b62d97 100644 --- a/ComputerSolitaire/Views/AppIconPickerView.swift +++ b/ComputerSolitaire/Views/AppIconPickerView.swift @@ -26,7 +26,19 @@ struct AppIcon: Identifiable, Equatable { previewImageName: "AppIconPreviewQueenOfHearts" ) - static let all: [AppIcon] = [.default, .queenOfHearts] + static let blue = AppIcon( + alternateIconName: "ComputerSolitaireBlueAppIcon", + name: "Blue", + previewImageName: "AppIconPreviewBlue" + ) + + static let pink = AppIcon( + alternateIconName: "ComputerSolitairePinkAppIcon", + name: "Pink", + previewImageName: "AppIconPreviewPink" + ) + + static let all: [AppIcon] = [.default, .blue, .pink, .queenOfHearts] static func current() -> AppIcon { let activeName = UIApplication.shared.alternateIconName diff --git a/docs/images/computer-solitaire-app-icon.png b/docs/images/computer-solitaire-app-icon.png index a768f86..d218759 100644 Binary files a/docs/images/computer-solitaire-app-icon.png and b/docs/images/computer-solitaire-app-icon.png differ