diff --git a/Sources/Jetpack/Info.plist b/Sources/Jetpack/Info.plist index 27a91ccf8863..5f161d6e7013 100644 --- a/Sources/Jetpack/Info.plist +++ b/Sources/Jetpack/Info.plist @@ -265,7 +265,7 @@ CFBundleIconFiles - AppIcon + AppIconLegacy UIPrerenderedIcon @@ -523,7 +523,7 @@ CFBundleIconFiles - AppIcon + AppIconLegacy UIPrerenderedIcon diff --git a/Sources/Jetpack/Resources/AppIcon.icon/Assets/bg.png b/Sources/Jetpack/Resources/AppIcon.icon/Assets/bg.png new file mode 100644 index 000000000000..f130159ff38c Binary files /dev/null and b/Sources/Jetpack/Resources/AppIcon.icon/Assets/bg.png differ diff --git a/Sources/Jetpack/Resources/AppIcon.icon/Assets/logo.png b/Sources/Jetpack/Resources/AppIcon.icon/Assets/logo.png new file mode 100644 index 000000000000..aa2ddcbd8862 Binary files /dev/null and b/Sources/Jetpack/Resources/AppIcon.icon/Assets/logo.png differ diff --git a/Sources/Jetpack/Resources/AppIcon.icon/icon.json b/Sources/Jetpack/Resources/AppIcon.icon/icon.json new file mode 100644 index 000000000000..1c1b48c34ce8 --- /dev/null +++ b/Sources/Jetpack/Resources/AppIcon.icon/icon.json @@ -0,0 +1,53 @@ +{ + "fill" : { + "linear-gradient" : [ + "extended-gray:1.00000,1.00000", + "display-p3:0.32157,0.65490,0.23137,1.00000" + ] + }, + "groups" : [ + { + "blend-mode" : "normal", + "blur-material" : 0.5, + "hidden" : false, + "layers" : [ + { + "glass" : true, + "hidden" : false, + "image-name" : "logo.png", + "name" : "logo" + }, + { + "blend-mode" : "normal", + "fill" : "none", + "glass" : true, + "image-name" : "bg.png", + "name" : "bg", + "position" : { + "scale" : 1.09, + "translation-in-points" : [ + 0, + 0 + ] + } + } + ], + "lighting" : "individual", + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "specular" : true, + "translucency" : { + "enabled" : true, + "value" : 0.3 + } + } + ], + "supported-platforms" : { + "circles" : [ + "watchOS" + ], + "squares" : "shared" + } +} \ No newline at end of file diff --git a/Sources/Jetpack/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json b/Sources/Jetpack/Resources/Assets.xcassets/AppIconLegacy.appiconset/Contents.json similarity index 100% rename from Sources/Jetpack/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Sources/Jetpack/Resources/Assets.xcassets/AppIconLegacy.appiconset/Contents.json diff --git a/Sources/Jetpack/Resources/Assets.xcassets/AppIcon.appiconset/jetpack-dark.png b/Sources/Jetpack/Resources/Assets.xcassets/AppIconLegacy.appiconset/jetpack-dark.png similarity index 100% rename from Sources/Jetpack/Resources/Assets.xcassets/AppIcon.appiconset/jetpack-dark.png rename to Sources/Jetpack/Resources/Assets.xcassets/AppIconLegacy.appiconset/jetpack-dark.png diff --git a/Sources/Jetpack/Resources/Assets.xcassets/AppIcon.appiconset/jetpack-light.png b/Sources/Jetpack/Resources/Assets.xcassets/AppIconLegacy.appiconset/jetpack-light.png similarity index 100% rename from Sources/Jetpack/Resources/Assets.xcassets/AppIcon.appiconset/jetpack-light.png rename to Sources/Jetpack/Resources/Assets.xcassets/AppIconLegacy.appiconset/jetpack-light.png diff --git a/Sources/Jetpack/Resources/Assets.xcassets/AppIcon.appiconset/jetpack-tinted.png b/Sources/Jetpack/Resources/Assets.xcassets/AppIconLegacy.appiconset/jetpack-tinted.png similarity index 100% rename from Sources/Jetpack/Resources/Assets.xcassets/AppIcon.appiconset/jetpack-tinted.png rename to Sources/Jetpack/Resources/Assets.xcassets/AppIconLegacy.appiconset/jetpack-tinted.png diff --git a/Sources/Miniature/Assets.xcassets/AppIcon.appiconset/Contents.json b/Sources/Miniature/Assets.xcassets/AppIconLegacy.appiconset/Contents.json similarity index 100% rename from Sources/Miniature/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Sources/Miniature/Assets.xcassets/AppIconLegacy.appiconset/Contents.json diff --git a/Sources/Miniature/Assets.xcassets/AppIcon.appiconset/miniture-icon.png b/Sources/Miniature/Assets.xcassets/AppIconLegacy.appiconset/miniture-icon.png similarity index 100% rename from Sources/Miniature/Assets.xcassets/AppIcon.appiconset/miniture-icon.png rename to Sources/Miniature/Assets.xcassets/AppIconLegacy.appiconset/miniture-icon.png diff --git a/Sources/Reader/Resources/AppIcon.icon/Assets/Clip path group.png b/Sources/Reader/Resources/AppIcon.icon/Assets/Clip path group.png new file mode 100644 index 000000000000..0d74371956fe Binary files /dev/null and b/Sources/Reader/Resources/AppIcon.icon/Assets/Clip path group.png differ diff --git a/Sources/Reader/Resources/AppIcon.icon/Assets/Group 14.png b/Sources/Reader/Resources/AppIcon.icon/Assets/Group 14.png new file mode 100644 index 000000000000..6b948ed46c6c Binary files /dev/null and b/Sources/Reader/Resources/AppIcon.icon/Assets/Group 14.png differ diff --git a/Sources/Reader/Resources/AppIcon.icon/icon.json b/Sources/Reader/Resources/AppIcon.icon/icon.json new file mode 100644 index 000000000000..d02e05362c9d --- /dev/null +++ b/Sources/Reader/Resources/AppIcon.icon/icon.json @@ -0,0 +1,41 @@ +{ + "fill" : { + "automatic-gradient" : "extended-srgb:0.00000,0.47843,1.00000,1.00000" + }, + "groups" : [ + { + "layers" : [ + { + "glass" : false, + "image-name" : "Clip path group.png", + "name" : "path" + }, + { + "image-name" : "Group 14.png", + "name" : "bg", + "position" : { + "scale" : 1.09, + "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/Sources/Reader/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json b/Sources/Reader/Resources/Assets.xcassets/AppIconLegacy.appiconset/Contents.json similarity index 100% rename from Sources/Reader/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Sources/Reader/Resources/Assets.xcassets/AppIconLegacy.appiconset/Contents.json diff --git a/Sources/Reader/Resources/Assets.xcassets/AppIcon.appiconset/wordpress-tinted 1.png b/Sources/Reader/Resources/Assets.xcassets/AppIconLegacy.appiconset/wordpress-tinted 1.png similarity index 100% rename from Sources/Reader/Resources/Assets.xcassets/AppIcon.appiconset/wordpress-tinted 1.png rename to Sources/Reader/Resources/Assets.xcassets/AppIconLegacy.appiconset/wordpress-tinted 1.png diff --git a/Sources/Reader/Resources/Assets.xcassets/AppIcon.appiconset/wordpress-tinted 2.png b/Sources/Reader/Resources/Assets.xcassets/AppIconLegacy.appiconset/wordpress-tinted 2.png similarity index 100% rename from Sources/Reader/Resources/Assets.xcassets/AppIcon.appiconset/wordpress-tinted 2.png rename to Sources/Reader/Resources/Assets.xcassets/AppIconLegacy.appiconset/wordpress-tinted 2.png diff --git a/Sources/Reader/Resources/Assets.xcassets/AppIcon.appiconset/wordpress-tinted.png b/Sources/Reader/Resources/Assets.xcassets/AppIconLegacy.appiconset/wordpress-tinted.png similarity index 100% rename from Sources/Reader/Resources/Assets.xcassets/AppIcon.appiconset/wordpress-tinted.png rename to Sources/Reader/Resources/Assets.xcassets/AppIconLegacy.appiconset/wordpress-tinted.png diff --git a/Sources/WordPress/Info.plist b/Sources/WordPress/Info.plist index dcde3814be0c..b4cd495d06d0 100644 --- a/Sources/WordPress/Info.plist +++ b/Sources/WordPress/Info.plist @@ -191,13 +191,13 @@ UIPrerenderedIcon - Spectrum '22 + Spectrum '22 CFBundleIconFiles - spectrum-'22-icon-app-60x60 - spectrum-'22-icon-app-76x76 - spectrum-'22-icon-app-83.5x83.5 + spectrum-'22-icon-app-60x60 + spectrum-'22-icon-app-76x76 + spectrum-'22-icon-app-83.5x83.5 UIPrerenderedIcon @@ -233,7 +233,7 @@ CFBundleIconFiles - AppIcon + AppIconLegacy UIPrerenderedIcon @@ -406,13 +406,13 @@ UIPrerenderedIcon - Spectrum '22 + Spectrum '22 CFBundleIconFiles - spectrum-'22-icon-app-60x60 - spectrum-'22-icon-app-76x76 - spectrum-'22-icon-app-83.5x83.5 + spectrum-'22-icon-app-60x60 + spectrum-'22-icon-app-76x76 + spectrum-'22-icon-app-83.5x83.5 UIPrerenderedIcon @@ -448,7 +448,7 @@ CFBundleIconFiles - AppIcon + AppIconLegacy UIPrerenderedIcon diff --git a/Sources/WordPress/Resources/AppIcon.icon/Assets/Clip path group.png b/Sources/WordPress/Resources/AppIcon.icon/Assets/Clip path group.png new file mode 100644 index 000000000000..c5e7f61cc799 Binary files /dev/null and b/Sources/WordPress/Resources/AppIcon.icon/Assets/Clip path group.png differ diff --git a/Sources/WordPress/Resources/AppIcon.icon/Assets/Group 3.png b/Sources/WordPress/Resources/AppIcon.icon/Assets/Group 3.png new file mode 100644 index 000000000000..648df66cd0ad Binary files /dev/null and b/Sources/WordPress/Resources/AppIcon.icon/Assets/Group 3.png differ diff --git a/Sources/WordPress/Resources/AppIcon.icon/icon.json b/Sources/WordPress/Resources/AppIcon.icon/icon.json new file mode 100644 index 000000000000..cdd35d16951e --- /dev/null +++ b/Sources/WordPress/Resources/AppIcon.icon/icon.json @@ -0,0 +1,41 @@ +{ + "fill" : { + "automatic-gradient" : "extended-srgb:0.00000,0.47843,1.00000,1.00000" + }, + "groups" : [ + { + "layers" : [ + { + "glass" : false, + "image-name" : "Clip path group.png", + "name" : "Clip path group" + }, + { + "image-name" : "Group 3.png", + "name" : "Group 3", + "position" : { + "scale" : 1.09, + "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/Sources/WordPress/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json b/Sources/WordPress/Resources/Assets.xcassets/AppIconLegacy.appiconset/Contents.json similarity index 100% rename from Sources/WordPress/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Sources/WordPress/Resources/Assets.xcassets/AppIconLegacy.appiconset/Contents.json diff --git a/Sources/WordPress/Resources/Assets.xcassets/AppIcon.appiconset/wordpress-dark.png b/Sources/WordPress/Resources/Assets.xcassets/AppIconLegacy.appiconset/wordpress-dark.png similarity index 100% rename from Sources/WordPress/Resources/Assets.xcassets/AppIcon.appiconset/wordpress-dark.png rename to Sources/WordPress/Resources/Assets.xcassets/AppIconLegacy.appiconset/wordpress-dark.png diff --git a/Sources/WordPress/Resources/Assets.xcassets/AppIcon.appiconset/wordpress-light.png b/Sources/WordPress/Resources/Assets.xcassets/AppIconLegacy.appiconset/wordpress-light.png similarity index 100% rename from Sources/WordPress/Resources/Assets.xcassets/AppIcon.appiconset/wordpress-light.png rename to Sources/WordPress/Resources/Assets.xcassets/AppIconLegacy.appiconset/wordpress-light.png diff --git a/Sources/WordPress/Resources/Assets.xcassets/AppIcon.appiconset/wordpress-tinted.png b/Sources/WordPress/Resources/Assets.xcassets/AppIconLegacy.appiconset/wordpress-tinted.png similarity index 100% rename from Sources/WordPress/Resources/Assets.xcassets/AppIcon.appiconset/wordpress-tinted.png rename to Sources/WordPress/Resources/Assets.xcassets/AppIconLegacy.appiconset/wordpress-tinted.png diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj index ecaa52877096..1e4334855f37 100644 --- a/WordPress/WordPress.xcodeproj/project.pbxproj +++ b/WordPress/WordPress.xcodeproj/project.pbxproj @@ -4426,7 +4426,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 0C5A651A2D9B21CE00C25301 /* Reader.debug.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIconLegacy; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_ANALYZER_NONNULL = YES; @@ -4481,7 +4481,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 0C5A651B2D9B21CE00C25301 /* Reader.release.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIconLegacy; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_ANALYZER_NONNULL = YES; @@ -4532,7 +4532,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 0C5A651B2D9B21CE00C25301 /* Reader.release.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIconLegacy; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_ANALYZER_NONNULL = YES; @@ -4701,7 +4701,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 0C5A651A2D9B21CE00C25301 /* Reader.debug.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIconLegacy; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_ANALYZER_NONNULL = YES; @@ -4752,7 +4752,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 0C5A651B2D9B21CE00C25301 /* Reader.release.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIconLegacy; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_ANALYZER_NONNULL = YES; @@ -4799,7 +4799,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 0C5A65192D9B21CE00C25301 /* Reader.alpha.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIconLegacy; ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_ANALYZER_NONNULL = YES; @@ -5030,7 +5030,7 @@ baseConfigurationReference = F14B5F70208E648200439554 /* WordPress.debug.xcconfig */; buildSettings = { APPLICATION_EXTENSION_API_ONLY = NO; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIconLegacy; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN__ARC_BRIDGE_CAST_NONARC = NO; CODE_SIGN_ENTITLEMENTS = WordPress.entitlements; @@ -5086,7 +5086,7 @@ baseConfigurationReference = F14B5F71208E648200439554 /* WordPress.release.xcconfig */; buildSettings = { APPLICATION_EXTENSION_API_ONLY = NO; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIconLegacy; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN__ARC_BRIDGE_CAST_NONARC = NO; CODE_SIGN_ENTITLEMENTS = WordPress.entitlements; @@ -6696,7 +6696,7 @@ baseConfigurationReference = F14B5F73208E648300439554 /* WordPress.alpha.xcconfig */; buildSettings = { APPLICATION_EXTENSION_API_ONLY = NO; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIconLegacy; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN__ARC_BRIDGE_CAST_NONARC = NO; CODE_SIGN_ENTITLEMENTS = "WordPress-Alpha.entitlements"; @@ -7230,7 +7230,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 24350E7C264DB76E009BB2B6 /* Jetpack.debug.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIconLegacy; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN__ARC_BRIDGE_CAST_NONARC = NO; CODE_SIGN_ENTITLEMENTS = Jetpack/JetpackDebug.entitlements; @@ -7287,7 +7287,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 24351059264DC1E2009BB2B6 /* Jetpack.release.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIconLegacy; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN__ARC_BRIDGE_CAST_NONARC = NO; CODE_SIGN_ENTITLEMENTS = Jetpack/JetpackRelease.entitlements; @@ -7342,7 +7342,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 2439B1DB264ECBDF00239130 /* Jetpack.alpha.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIconLegacy; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN__ARC_BRIDGE_CAST_NONARC = NO; CODE_SIGN_ENTITLEMENTS = "Jetpack/JetpackRelease-Alpha.entitlements";