Remove join room screen graphic and align platforms

2024-04-24 16:16:19 +03:00
parent 4e52940fe6
commit 18081fbe48
20 changed files with 24 additions and 102 deletions
--- a/ElementX/Resources/Assets.xcassets/images/join-room-graphic.imageset/Contents.json
+++ b/ElementX/Resources/Assets.xcassets/images/join-room-graphic.imageset/Contents.json
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "join-room-graphic.svg",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  },
-  "properties" : {
-    "preserves-vector-representation" : true
-  }
-}
--- a/ElementX/Resources/Assets.xcassets/images/join-room-graphic.imageset/join-room-graphic.svg
+++ b/ElementX/Resources/Assets.xcassets/images/join-room-graphic.imageset/join-room-graphic.svg
@@ -1,47 +0,0 @@
-<svg width="199" height="144" viewBox="0 0 199 144" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="32.5" cy="32" r="32" fill="url(#paint0_linear_570_20378)" fill-opacity="0.9"/>
-<circle cx="32.5" cy="32" r="32" fill="url(#paint1_linear_570_20378)" fill-opacity="0.2"/>
-<circle cx="32.5" cy="32" r="32" fill="url(#paint2_linear_570_20378)" fill-opacity="0.6"/>
-<rect x="80.5" y="11.7856" width="88" height="16" rx="8" fill="url(#paint3_linear_570_20378)" fill-opacity="0.9"/>
-<rect x="80.5" y="11.7856" width="88" height="16" rx="8" fill="url(#paint4_linear_570_20378)" fill-opacity="0.8"/>
-<rect x="80.5" y="36.2141" width="68" height="16" rx="8" fill="#E3E8F0"/>
-<rect x="152.5" y="36.2141" width="46" height="16" rx="8" fill="#E3E8F0"/>
-<circle cx="32.5" cy="112" r="32" fill="#AC3BA8" fill-opacity="0.3"/>
-<circle cx="32.5" cy="112" r="32" fill="url(#paint5_linear_570_20378)" fill-opacity="0.5"/>
-<rect x="80.5" y="94" width="88" height="16" rx="8" fill="#AC3BA8" fill-opacity="0.3"/>
-<rect x="80.5" y="94" width="88" height="16" rx="8" fill="url(#paint6_linear_570_20378)" fill-opacity="0.25"/>
-<rect x="72.5" y="102" width="44" height="28" rx="14" fill="#F4F6FA"/>
-<circle cx="84.5001" cy="114.964" r="4" fill="#C1C6CD"/>
-<circle cx="94.4997" cy="116.964" r="4" fill="#C1C6CD"/>
-<circle cx="104.5" cy="116.964" r="4" fill="#C1C6CD"/>
-<defs>
-<linearGradient id="paint0_linear_570_20378" x1="32.5" y1="0" x2="32.5" y2="64" gradientUnits="userSpaceOnUse">
-<stop stop-color="#0D5CBD"/>
-<stop offset="1" stop-color="#0DBDA8"/>
-</linearGradient>
-<linearGradient id="paint1_linear_570_20378" x1="32.5" y1="0" x2="32.5" y2="64" gradientUnits="userSpaceOnUse">
-<stop offset="0.535" stop-color="white"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint2_linear_570_20378" x1="32.5" y1="7.45058e-09" x2="33" y2="144.5" gradientUnits="userSpaceOnUse">
-<stop offset="0.085" stop-color="white"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint3_linear_570_20378" x1="124.5" y1="11.7856" x2="124.5" y2="27.7856" gradientUnits="userSpaceOnUse">
-<stop stop-color="#0D5CBD"/>
-<stop offset="1" stop-color="#0DBDA8"/>
-</linearGradient>
-<linearGradient id="paint4_linear_570_20378" x1="124.5" y1="11.7856" x2="125" y2="42.9999" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint5_linear_570_20378" x1="32.5" y1="80" x2="32.5" y2="144" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint6_linear_570_20378" x1="124.5" y1="94" x2="124.5" y2="110" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="white" stop-opacity="0"/>
-</linearGradient>
-</defs>
-</svg>
--- a/ElementX/Sources/Generated/Assets.swift
+++ b/ElementX/Sources/Generated/Assets.swift
@@ -39,7 +39,6 @@ internal enum Asset {
    internal static let stopRecording = ImageAsset(name: "images/stop-recording")
    internal static let settingsIconWithBadge = ImageAsset(name: "images/settings-icon-with-badge")
    internal static let joinRoomBackground = ImageAsset(name: "images/join-room-background")
-    internal static let joinRoomGraphic = ImageAsset(name: "images/join-room-graphic")
    internal static let launchBackground = ImageAsset(name: "images/launch-background")
    internal static let locationMarkerShape = ImageAsset(name: "images/location-marker-shape")
    internal static let mediaPause = ImageAsset(name: "images/media-pause")
--- a/ElementX/Sources/Screens/JoinRoomScreen/View/JoinRoomScreen.swift
+++ b/ElementX/Sources/Screens/JoinRoomScreen/View/JoinRoomScreen.swift
@@ -72,9 +72,6 @@ struct JoinRoomScreen: View {
                        .lineLimit(3)
                }
            }
-            
-            Image(asset: Asset.Images.joinRoomGraphic)
-                .padding(.top, 40)
        }
    }
    
--- a/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPad-en-GB.Invite.png
+++ b/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPad-en-GB.Invite.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:95b4eb933dfcab0a5da9c608a0defc26a62206ab665e3a9af0dd6ac4a29bba72
-size 2099891
+oid sha256:24240c615369ecec63deb00d7e3c769e53c3f32e058d8b2f9bb6acb80703bf59
+size 2090752
--- a/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPad-en-GB.Join.png
+++ b/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPad-en-GB.Join.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b1b5884816d8998bc519d62fb538d961d878e79c62c386c152aa7d6910f3acf
-size 2064569
+oid sha256:9ded60f53fc4f83eab959054963650e401f89835d490c1abec2e19116811b186
+size 2055404
--- a/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPad-en-GB.Knock.png
+++ b/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPad-en-GB.Knock.png
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1e227ebf40207f27f1e9ad19881d274a6e6b87bdc2ea40051b6e7fa1e59c84c4
-size 2054048
--- a/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPad-en-GB.Unknown.png
+++ b/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPad-en-GB.Unknown.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:991acd0c4f868421686daa929e1c52bc7c1d47afcc39e23da19d17f0f19c8a0a
-size 2048512
+oid sha256:fc05a95c3f86b9688cda9db8f0f7f6579b2117cf14788101573f9913dc1a91eb
+size 2040241
--- a/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPad-pseudo.Invite.png
+++ b/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPad-pseudo.Invite.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da004ba89cda86c27b44ee6acf78c69d845d887ede2776e90e4194f2819a4e1a
-size 2104970
+oid sha256:cd441ec297bd47099d7725da0ada2d55fa13d3eea842efe09c51495a4263ce7d
+size 2096043
--- a/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPad-pseudo.Join.png
+++ b/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPad-pseudo.Join.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3a663cf0f68bc9ed2ac0df7e88a9b144a4cc25205fc71d9a3f0e25f892c86788
-size 2069238
+oid sha256:148dd7600b3cb26e80ab3c842167e20fcada4b2f6494396b7766c75763a23729
+size 2060058
--- a/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPad-pseudo.Knock.png
+++ b/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPad-pseudo.Knock.png
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:09dca383db2dfc978c9f0d78bda8331783aca72a1650c60cba1262fb73637af3
-size 2059391
--- a/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPad-pseudo.Unknown.png
+++ b/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPad-pseudo.Unknown.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac085ce2465a37d69978c118fba9b35b301449f1a8c5acd97fb5632cb0a8fe47
-size 2062324
+oid sha256:260dbb0cf2b3b9f1ad424aedb7ff3daa05e9e35c49461e0774c0f771f8fc6ea6
+size 2054334
--- a/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPhone-15-en-GB.Invite.png
+++ b/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPhone-15-en-GB.Invite.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2806fc99ef156ed9b0d9e97bc7329a00905eabe5bac5200a17e59124de5b94c1
-size 857415
+oid sha256:b0347efd11f230b930e412009b88127743aa2c585cf8a280e1ecea4d29e582a1
+size 856878
--- a/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPhone-15-en-GB.Join.png
+++ b/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPhone-15-en-GB.Join.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5691851137a7bd9c6fd1e6b18597ed4f5b6aa6d89cba714224f54e620e24fb96
-size 837040
+oid sha256:61174c674503c8bb0612198748744b39a32ad4cfff10a86faa270e2f8ceb0592
+size 836264
--- a/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPhone-15-en-GB.Knock.png
+++ b/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPhone-15-en-GB.Knock.png
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c28a125af66dac1dbdfe12cb8dc588b51a1c4611693275113caf522ffe1c68c8
-size 829240
--- a/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPhone-15-en-GB.Unknown.png
+++ b/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPhone-15-en-GB.Unknown.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:32985fbf4c2f829638965222ef31392e490fd260ff0d07bc777571eed90d25de
-size 810769
+oid sha256:c38795f5344a0d17c752b420014a9d93fa880dc3b1fc2f7cf9773dd03d676142
+size 809333
--- a/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPhone-15-pseudo.Invite.png
+++ b/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPhone-15-pseudo.Invite.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52d999afeabc4fd6dded6ad2ece35968c59c955b90c53961ee1fd42179aeb706
-size 861376
+oid sha256:03c26dc5009ab9e55549d853911835fcc18e5f36425c9452d280781e2095c893
+size 860959
--- a/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPhone-15-pseudo.Join.png
+++ b/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPhone-15-pseudo.Join.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0bae4ecdbf0b1a8d06e4115af0add88ea5dadd6dc43f61e6a6c0a4aa55dbd34e
-size 840927
+oid sha256:d31a84c4289bfcad9b57ca493ebb36404560ab160ddf9c6c96806741675316c3
+size 840086
--- a/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPhone-15-pseudo.Knock.png
+++ b/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPhone-15-pseudo.Knock.png
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:32d350137393e9ca3ab38f481c57fa7eacf9c0a89be63de6cdacc2274d0f26cb
-size 834432
--- a/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPhone-15-pseudo.Unknown.png
+++ b/PreviewTests/Snapshots/PreviewTests/test_joinRoomScreen-iPhone-15-pseudo.Unknown.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d1a65eab7cb10c6918f1a4efa9ae210b5b55959d90128a3a21536d5235948daf
-size 825025
+oid sha256:63675c37731e2bd5bd87580010d2ef33b6e276f592caf881fe970daaca50289d
+size 823864