diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 60132dc0e..67c45d56b 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -607,6 +607,7 @@ 6C34237AFB808E38FC8776B9 /* RoomStateEventStringBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D55702474F279D910D2D162 /* RoomStateEventStringBuilder.swift */; }; 6C98153D60FF9B648C166C27 /* TimelineItemMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91FFE1F410969ECB23FE9BB2 /* TimelineItemMenu.swift */; }; 6CAADDC6318E41C7D7AA9526 /* SpaceScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 646B50583A2CE6DA67F7739A /* SpaceScreen.swift */; }; + 6CBC544A7CC4DDDBDED4D0A6 /* AppIcon.icon in Resources */ = {isa = PBXBuildFile; fileRef = 4B1F71AC585827E6C416C15A /* AppIcon.icon */; }; 6CD61FAF03E8986523C2ABB8 /* StartChatScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3005886F00029F058DB62BE /* StartChatScreenCoordinator.swift */; }; 6DC8E43BA04AC2AC4EB2EB97 /* AnalyticsPromptScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18486B87745B1811E7FBD3D2 /* AnalyticsPromptScreenModels.swift */; }; 6E03A710799E6C65C0AB36BC /* TargetConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D829FD8958376614504B18 /* TargetConfiguration.swift */; }; @@ -1913,6 +1914,7 @@ 4A2B5274C1D3D2999D643786 /* EncryptionResetPasswordScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncryptionResetPasswordScreenViewModelProtocol.swift; sourceTree = ""; }; 4A5B4CD611DE7E94F5BA87B2 /* AppLockTimerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockTimerTests.swift; sourceTree = ""; }; 4AB29A2D95D3469B5F016655 /* SecureBackupControllerMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureBackupControllerMock.swift; sourceTree = ""; }; + 4B1F71AC585827E6C416C15A /* AppIcon.icon */ = {isa = PBXFileReference; path = AppIcon.icon; sourceTree = ""; }; 4B2B564CA6570E1487A7C7CC /* SpaceRoomListProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpaceRoomListProxy.swift; sourceTree = ""; }; 4B2D4EEBE8C098BBADD10939 /* SecureBackupKeyBackupScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureBackupKeyBackupScreenCoordinator.swift; sourceTree = ""; }; 4B41FABA2B0AEF4389986495 /* LoginMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginMode.swift; sourceTree = ""; }; @@ -3369,6 +3371,7 @@ 2774D635E78D8B98390EA694 /* Resources */ = { isa = PBXGroup; children = ( + 4B1F71AC585827E6C416C15A /* AppIcon.icon */, 01C4C7DB37597D7D8379511A /* Assets.xcassets */, A0C06C0F6A8621B22BFAEB56 /* Localizations */, 8AEA6A91159FA0D3EAFCCB0D /* Sounds */, @@ -6987,6 +6990,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 6CBC544A7CC4DDDBDED4D0A6 /* AppIcon.icon in Resources */, 992F5E750F5030C4BA2D0D03 /* Assets.xcassets in Resources */, 2CA6ABBC9A88EB89EA52FCCB /* ConfettiScene.scn in Resources */, B6DA66EFC13A90846B625836 /* InfoPlist.strings in Resources */, diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon.png b/ElementX/Resources/AppIcon.icon/Assets/AppIcon.png similarity index 100% rename from ElementX/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon.png rename to ElementX/Resources/AppIcon.icon/Assets/AppIcon.png diff --git a/ElementX/Resources/AppIcon.icon/icon.json b/ElementX/Resources/AppIcon.icon/icon.json new file mode 100644 index 000000000..9886dc68e --- /dev/null +++ b/ElementX/Resources/AppIcon.icon/icon.json @@ -0,0 +1,27 @@ +{ + "fill" : "automatic", + "groups" : [ + { + "layers" : [ + { + "glass" : false, + "image-name" : "AppIcon.png", + "name" : "AppIcon" + } + ], + "name" : "Background", + "shadow" : { + "kind" : "none", + "opacity" : 0.5 + }, + "specular" : false, + "translucency" : { + "enabled" : false, + "value" : 0.5 + } + } + ], + "supported-platforms" : { + "squares" : "shared" + } +} \ No newline at end of file diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index cefcc878e..000000000 --- a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "images" : [ - { - "filename" : "AppIcon.png", - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Enterprise b/Enterprise index 8ba132fbc..6dcae22c7 160000 --- a/Enterprise +++ b/Enterprise @@ -1 +1 @@ -Subproject commit 8ba132fbc7c0d17bba037c770524ac8db169d56f +Subproject commit 6dcae22c7170b4e51cdf6a4a686d16eb07572c8c diff --git a/Gemfile.lock b/Gemfile.lock index 6e8571f00..920835495 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -140,12 +140,12 @@ GEM google-apis-core (>= 0.11.0, < 2.a) google-apis-storage_v1 (0.31.0) google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.8.0) + google-cloud-core (1.7.1) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.5.0) + google-cloud-errors (1.4.0) google-cloud-storage (1.47.0) addressable (~> 2.8) digest-crc (~> 0.4) @@ -172,7 +172,7 @@ GEM logger (1.7.0) mini_magick (4.13.2) mini_mime (1.1.5) - multi_json (1.17.0) + multi_json (1.15.0) multipart-post (2.4.1) mutex_m (0.3.0) nanaimo (0.4.0) @@ -182,7 +182,7 @@ GEM os (1.1.4) ostruct (0.6.3) plist (3.7.2) - public_suffix (6.0.2) + public_suffix (5.1.1) rake (13.3.0) representable (3.2.0) declarative (< 0.1.0) @@ -195,10 +195,10 @@ GEM rubyzip (2.4.1) security (0.1.5) semantic (1.6.1) - signet (0.21.0) + signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) - jwt (>= 1.5, < 4.0) + jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simctl (1.6.10) CFPropertyList diff --git a/Tools/Sources/Commands/AppIconBanner.swift b/Tools/Sources/Commands/AppIconBanner.swift index ed1d71319..edca7f1e9 100644 --- a/Tools/Sources/Commands/AppIconBanner.swift +++ b/Tools/Sources/Commands/AppIconBanner.swift @@ -53,12 +53,13 @@ struct BannerImage: View { Text(text) .foregroundColor(.white) - .font(.system(size: 140)) + .font(.system(size: 135, weight: .medium, design: .rounded)) .lineLimit(1) .minimumScaleFactor(0.5) .padding(.horizontal, image.size.width * 0.1) .frame(maxWidth: .infinity) - .background(Color.black.opacity(0.5)) + .padding(.top, 10) + .padding(.bottom, 30) } .frame(width: image.size.width, height: image.size.height) } diff --git a/Variants/Nightly/Resources/Nightly.xcassets/Contents.json b/Variants/Nightly/Resources/Nightly.xcassets/Contents.json deleted file mode 100644 index 73c00596a..000000000 --- a/Variants/Nightly/Resources/Nightly.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Variants/Nightly/Resources/Nightly.xcassets/NightlyAppIcon.appiconset/AppIcon.png b/Variants/Nightly/Resources/Nightly.xcassets/NightlyAppIcon.appiconset/AppIcon.png deleted file mode 100644 index b79b395e1..000000000 Binary files a/Variants/Nightly/Resources/Nightly.xcassets/NightlyAppIcon.appiconset/AppIcon.png and /dev/null differ diff --git a/Variants/Nightly/Resources/Nightly.xcassets/NightlyAppIcon.appiconset/Contents.json b/Variants/Nightly/Resources/Nightly.xcassets/NightlyAppIcon.appiconset/Contents.json deleted file mode 100644 index cefcc878e..000000000 --- a/Variants/Nightly/Resources/Nightly.xcassets/NightlyAppIcon.appiconset/Contents.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "images" : [ - { - "filename" : "AppIcon.png", - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Background.png b/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Background.png new file mode 100644 index 000000000..ce4001a96 Binary files /dev/null and b/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Background.png differ diff --git a/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Banner.svg b/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Banner.svg new file mode 100644 index 000000000..a05af833a --- /dev/null +++ b/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Banner.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Shapes.svg b/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Shapes.svg new file mode 100644 index 000000000..0a1bb6d1e --- /dev/null +++ b/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Shapes.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Surface.svg b/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Surface.svg new file mode 100644 index 000000000..fd7539ad0 --- /dev/null +++ b/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Surface.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Version.png b/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Version.png new file mode 100644 index 000000000..3b53b21cc Binary files /dev/null and b/Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Version.png differ diff --git a/Variants/Nightly/Resources/NightlyAppIcon.icon/icon.json b/Variants/Nightly/Resources/NightlyAppIcon.icon/icon.json new file mode 100644 index 000000000..d431304df --- /dev/null +++ b/Variants/Nightly/Resources/NightlyAppIcon.icon/icon.json @@ -0,0 +1,132 @@ +{ + "fill" : "automatic", + "groups" : [ + { + "layers" : [ + { + "glass" : true, + "image-name" : "Shapes.svg", + "name" : "Shapes", + "position-specializations" : [ + { + "idiom" : "square", + "value" : { + "scale" : 0.93, + "translation-in-points" : [ + 0, + 0 + ] + } + } + ] + } + ], + "name" : "Shapes", + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "specular" : true, + "translucency" : { + "enabled" : true, + "value" : 0.5 + } + }, + { + "blur-material" : 0.5, + "layers" : [ + { + "glass" : true, + "image-name" : "Version.png", + "name" : "Version" + }, + { + "blend-mode" : "normal", + "fill" : { + "solid" : "srgb:0.50711,0.71284,0.69177,1.00000" + }, + "glass" : true, + "image-name" : "Banner.svg", + "name" : "Banner", + "opacity" : 0.25, + "position" : { + "scale" : 1, + "translation-in-points" : [ + 0, + 418 + ] + } + } + ], + "name" : "Banner", + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "specular" : false, + "translucency" : { + "enabled" : false, + "value" : 0.5 + } + }, + { + "layers" : [ + { + "glass" : true, + "hidden-specializations" : [ + { + "idiom" : "square", + "value" : false + } + ], + "image-name" : "Surface.svg", + "name" : "Surface", + "position-specializations" : [ + { + "idiom" : "square", + "value" : { + "scale" : 0.93, + "translation-in-points" : [ + 0, + 0 + ] + } + } + ] + } + ], + "name" : "Surface", + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "specular" : true, + "translucency" : { + "enabled" : true, + "value" : 0.5 + } + }, + { + "layers" : [ + { + "glass" : false, + "image-name" : "Background.png", + "name" : "Background" + } + ], + "name" : "Background", + "shadow" : { + "kind" : "none", + "opacity" : 0.5 + }, + "specular" : false, + "translucency" : { + "enabled" : false, + "value" : 0.5 + } + } + ], + "supported-platforms" : { + "squares" : "shared" + } +} \ No newline at end of file diff --git a/fastlane/Fastfile b/fastlane/Fastfile index bb8069c1b..f1745f547 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -156,7 +156,7 @@ lane :config_nightly do |options| release_version = get_version_number(target: "ElementX") Dir.chdir ".." do - sh("swift run tools app-icon-banner Variants/Nightly/Resources/Nightly.xcassets/NightlyAppIcon.appiconset/AppIcon.png --banner-text '#{release_version} (#{build_number})'") + sh("swift run tools app-icon-banner Variants/Nightly/Resources/NightlyAppIcon.icon/Assets/Version.png --banner-text '#{release_version} (#{build_number})'") end end diff --git a/project.yml b/project.yml index 14a275c8e..01a234bf9 100644 --- a/project.yml +++ b/project.yml @@ -41,6 +41,9 @@ options: - Other - UITests - AccessibilityTests + fileTypes: + icon: + file: true # https://github.com/yonaskolb/XcodeGen/issues/1556 postGenCommand: cd Tools/XcodeGen && sh postGenCommand.sh settings: