From f26159a295159332b868523d36b72543adf8211a Mon Sep 17 00:00:00 2001 From: Mauro <34335419+Velin92@users.noreply.github.com> Date: Wed, 23 Oct 2024 18:29:41 +0200 Subject: [PATCH 1/3] update compound, and updated tests (#3440) --- ElementX.xcodeproj/project.pbxproj | 2 +- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 2 +- .../test_createRoom-iPad-en-GB.Create-Public-Room.png | 4 ++-- .../test_createRoom-iPad-en-GB.Create-Room-without-users.png | 4 ++-- .../PreviewTests/test_createRoom-iPad-en-GB.Create-Room.png | 4 ++-- .../test_createRoom-iPad-pseudo.Create-Public-Room.png | 4 ++-- .../test_createRoom-iPad-pseudo.Create-Room-without-users.png | 4 ++-- .../PreviewTests/test_createRoom-iPad-pseudo.Create-Room.png | 4 ++-- .../test_createRoom-iPhone-16-en-GB.Create-Public-Room.png | 4 ++-- ...t_createRoom-iPhone-16-en-GB.Create-Room-without-users.png | 4 ++-- .../test_createRoom-iPhone-16-en-GB.Create-Room.png | 4 ++-- .../test_createRoom-iPhone-16-pseudo.Create-Public-Room.png | 4 ++-- ..._createRoom-iPhone-16-pseudo.Create-Room-without-users.png | 4 ++-- .../test_createRoom-iPhone-16-pseudo.Create-Room.png | 4 ++-- ...omChangePermissionsScreen-iPad-en-GB.Member-moderation.png | 4 ++-- ...hangePermissionsScreen-iPad-en-GB.Messages-and-Content.png | 4 ++-- ...st_roomChangePermissionsScreen-iPad-en-GB.Room-details.png | 4 ++-- ...mChangePermissionsScreen-iPad-pseudo.Member-moderation.png | 4 ++-- ...angePermissionsScreen-iPad-pseudo.Messages-and-Content.png | 4 ++-- ...t_roomChangePermissionsScreen-iPad-pseudo.Room-details.png | 4 ++-- ...ngePermissionsScreen-iPhone-16-en-GB.Member-moderation.png | 4 ++-- ...PermissionsScreen-iPhone-16-en-GB.Messages-and-Content.png | 4 ++-- ...omChangePermissionsScreen-iPhone-16-en-GB.Room-details.png | 4 ++-- ...gePermissionsScreen-iPhone-16-pseudo.Member-moderation.png | 4 ++-- ...ermissionsScreen-iPhone-16-pseudo.Messages-and-Content.png | 4 ++-- ...mChangePermissionsScreen-iPhone-16-pseudo.Room-details.png | 4 ++-- project.yml | 2 +- 27 files changed, 51 insertions(+), 51 deletions(-) diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 5d1487ca48..f36c1fb660 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -7942,7 +7942,7 @@ repositoryURL = "https://github.com/element-hq/compound-ios"; requirement = { kind = revision; - revision = 4535fa11bba2efec8463a79deb5722b6b487d845; + revision = e3f9665621872f60d3652579c3f0dc7bf806e72c; }; }; F76A08D0EA29A07A54F4EB4D /* XCRemoteSwiftPackageReference "swift-collections" */ = { diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index c011f4376f..ec71df9429 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -15,7 +15,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/compound-ios", "state" : { - "revision" : "4535fa11bba2efec8463a79deb5722b6b487d845" + "revision" : "e3f9665621872f60d3652579c3f0dc7bf806e72c" } }, { diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Public-Room.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Public-Room.png index 97c0f2fdb3..494741c06c 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Public-Room.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Public-Room.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2b6822fdd0ddc3b3c87d0142377a0951e9478c2fb1a1b840204589b2bc6270e -size 175831 +oid sha256:e1c6b345563649b24c3bda6b427c27f10965eb2bf7c0e0a1c7c58db3949d03e1 +size 175943 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Room-without-users.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Room-without-users.png index 040f987ee0..bc1f6a8fe9 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Room-without-users.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Room-without-users.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4472c871f2188a6d276ed4ef82e48b8a135afcc60ec83cbd974dfe98a8b332d -size 147686 +oid sha256:ec0202e335366e132947b3f4d1c97ce82e105acf45f398b9cf2bbe55414588ee +size 147726 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Room.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Room.png index d7c08ebcf4..11c561c9fc 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Room.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Room.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a4c6a7b0eddf99d68deee0202bfbe20d97e8bcd7c2560feb592954db198ee99 -size 147377 +oid sha256:8f4a9dc7137a6a072e2e0d76bdc5e8c22ecdaac32872bee5a6dc0179f19aabf5 +size 147402 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Public-Room.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Public-Room.png index 4a25b1b65f..321e4f6c8f 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Public-Room.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Public-Room.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b805b55944beb58caccd5dbf4e98261582fe006ce8c08014bfaf26c13eea75f -size 211876 +oid sha256:091968b37da82fb3f2ac667a605dc7336454a5fb96a1d23ba1ffde9c39bec622 +size 211937 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Room-without-users.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Room-without-users.png index 57c4ed90e8..69e54e34a9 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Room-without-users.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Room-without-users.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3bfa52c8580af52c0aa96a65cbe848f88ed7232b0a29270b2d7ebc2c769b35a -size 171707 +oid sha256:3dbbb98babb4ce5d4289bdf174c4e621a68be3ad11b4567f42e95d8884e006f1 +size 171700 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Room.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Room.png index 180cc761cf..672109113e 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Room.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Room.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b38d6fd62142d45fd83313d5a7af2954bd0b339cb875f36d59cf0e5f0fbb22cb -size 173026 +oid sha256:2d6f0a23bbebc6d474b3e79269d507674016ec47dda0a03c018f660274c8f041 +size 173042 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Public-Room.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Public-Room.png index 2106fa84dd..1a3b80ed0e 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Public-Room.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Public-Room.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fccdc54a2d88e39353bdb49f32040749072dd17ac3c6cacc165ab6f0812d500 -size 123697 +oid sha256:0d3e33cc4aca21c34c9975cfca6e9002579ab4d1c9e73ce6320c4768a47f7f4d +size 123703 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Room-without-users.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Room-without-users.png index c93ed1d395..ffe3ec6871 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Room-without-users.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Room-without-users.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:effcd533de2760ac2def29097a09147cf7d60fa2bd8844088c123dcce9e641a8 -size 99367 +oid sha256:9b8e2e588467837b31e03191cb116f437038dbb5fde756b2f80eeff10fe25ae8 +size 99369 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Room.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Room.png index 91834a38f6..7406d01af1 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Room.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Room.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:248815b3152639d27193e7ab2c412c76036ab6d0394c3b89cc827a4bf4634885 -size 100098 +oid sha256:3883d12090f025447534784ee3067ead0abb6a91f7128b2f9616633e64548665 +size 100102 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Public-Room.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Public-Room.png index 712e0347aa..16fc435376 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Public-Room.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Public-Room.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35ecf1e814eedd5f2d388224aee6fc885b1d9e1fe174b9199d9fe7bb9004a355 -size 164558 +oid sha256:2ba52fb45501af7ba6e80339749c38e6a975fbe58163c62c7ffe23e2eddc3e3b +size 164555 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Room-without-users.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Room-without-users.png index a8f7b5af29..5afeabb87d 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Room-without-users.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Room-without-users.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f14434bda971e011a023d6cfcba900be70ee07d583100a9db3bcc5c827cd6b2a -size 138818 +oid sha256:3bedde91879578d668626ee76161ec184854b4e950fbf51b68fc3733debae0b8 +size 138817 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Room.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Room.png index 442b2051c7..ec55d698f7 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Room.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Room.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6908ceac42a93152b2dfe3c4d2781f4f5cb96bfb165bf6896283cc529cd81e03 -size 139491 +oid sha256:db3ba5d41ecb661e54371b24970734e686f5ab7d6bec5150a0b4f8d7b8ada1d3 +size 139505 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-en-GB.Member-moderation.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-en-GB.Member-moderation.png index 333dd906f2..09effbea73 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-en-GB.Member-moderation.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-en-GB.Member-moderation.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:baacb9057ff518db7af67439e7fc89debf425599c19c209a131996c40e1ae359 -size 133463 +oid sha256:0d6d8f2cc5458cad1667a642f1048b5e30010379fad74d3bace8fb1e8d6df0ca +size 133608 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-en-GB.Messages-and-Content.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-en-GB.Messages-and-Content.png index 894cadfce0..1fddd9c214 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-en-GB.Messages-and-Content.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-en-GB.Messages-and-Content.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46ec065c952eb4e3afc3af7ce8ee345b93aacab3700153a76fed43a7c8782b66 -size 120238 +oid sha256:c32970e5430a601f966dc026851af7c8896559f56caa1fbb9fe591f1e3d69777 +size 120326 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-en-GB.Room-details.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-en-GB.Room-details.png index 3cd424cbb3..588230d5c1 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-en-GB.Room-details.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-en-GB.Room-details.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2154f032a8ffbcbac33f69832671055bb13637232ea12bcfb09b554bb95c398 -size 138563 +oid sha256:ff824cddfb19cd8229e34b75a4a3ff4604aeed346e35ebe4be53f5226dbbce18 +size 138754 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-pseudo.Member-moderation.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-pseudo.Member-moderation.png index 4555c20fce..1879dde39e 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-pseudo.Member-moderation.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-pseudo.Member-moderation.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d97086fdd2914b42f6e70a1741fe1cadf29e151db976128e2371a3e4b1502a6a -size 144048 +oid sha256:b6a86391e0e24bbf3b5bc6e43cc104de3c0a257a683ac42eb9285a4e9e178666 +size 144197 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-pseudo.Messages-and-Content.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-pseudo.Messages-and-Content.png index 2e37e27917..dc9faf3c3a 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-pseudo.Messages-and-Content.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-pseudo.Messages-and-Content.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c5a11b430c30cc17b69c340f5fcd4cd35c49c47c02927bb54a6fd6b406c18bf -size 128074 +oid sha256:32333fbc9f13d9d7fadc464c149bf83e7154bf5ffd8f472c2b0d0534b9ef07d6 +size 128169 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-pseudo.Room-details.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-pseudo.Room-details.png index 4be88b0c72..1fadaf9533 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-pseudo.Room-details.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPad-pseudo.Room-details.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:974117a157ffc697c369902c6e4b7ca37de6f78638e14c64449dcdb73b22d62c -size 153671 +oid sha256:5d18bf629121a10c2564fb84dec80beae3dee4e9ba662c494778db3f3a62e8e9 +size 153829 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-en-GB.Member-moderation.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-en-GB.Member-moderation.png index 6977fc0a90..f7b1fd3e6b 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-en-GB.Member-moderation.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-en-GB.Member-moderation.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9334d0273bfd78a7ec5e75067eba45ae443cba83f58859cbffbc02c7a3a2a39e -size 80837 +oid sha256:52c7361dcb14a4c259334254b4a45216a5d552817ca8ef421d9692a59dabfc7f +size 80996 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-en-GB.Messages-and-Content.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-en-GB.Messages-and-Content.png index d7871da462..4db5285351 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-en-GB.Messages-and-Content.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-en-GB.Messages-and-Content.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4715abe6c09498294ba2e7a413a080809f166ef0da42c5bd3be2deb1dd1ab11 -size 69489 +oid sha256:c9de739fc8e8b19077906f2859360521936738937c0b5aa060ad415b1ab09e5f +size 69600 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-en-GB.Room-details.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-en-GB.Room-details.png index 4dda036f2f..4ba497c293 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-en-GB.Room-details.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-en-GB.Room-details.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e42a536d87d54d944c68a97f3c845d8d978055aaf684c523c431caf951119bdd -size 85586 +oid sha256:f099aa53aa14bed1960ae2f20792611a10782b58cceefbeb07efa5d7223d3f04 +size 85759 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-pseudo.Member-moderation.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-pseudo.Member-moderation.png index 5661958632..7ece495c2c 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-pseudo.Member-moderation.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-pseudo.Member-moderation.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97839dd8b0691ee4c806d8e08d856f81d05edc9da5a36c784d06685f89efe53a -size 101917 +oid sha256:5827bfd5fbed1c2776b2825141154280b90040ce6273c04fd7cc39d0d388643a +size 102043 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-pseudo.Messages-and-Content.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-pseudo.Messages-and-Content.png index f1990cc897..3c424856a2 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-pseudo.Messages-and-Content.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-pseudo.Messages-and-Content.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1abea40f4acc7eb23e4ba5d926f61de3c0e8a332bd561e85f1f8ed6cf45f0e5 -size 84127 +oid sha256:f7d5df6d760c0cb0680f420c5d8175020df93605358dbc90770ee1285940eea8 +size 84219 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-pseudo.Room-details.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-pseudo.Room-details.png index ab624c0c06..893af37bbe 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-pseudo.Room-details.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomChangePermissionsScreen-iPhone-16-pseudo.Room-details.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a599243be1587e7eba59e715827ffb50f4fd669af4be8c81d8b210a45f5e3976 -size 107742 +oid sha256:20a8af13c9a547f2766d390b82328494092e26708b457beb1df6c731f739f923 +size 107844 diff --git a/project.yml b/project.yml index 9614142e27..250bbe97ca 100644 --- a/project.yml +++ b/project.yml @@ -64,7 +64,7 @@ packages: # path: ../matrix-rust-sdk Compound: url: https://github.com/element-hq/compound-ios - revision: 4535fa11bba2efec8463a79deb5722b6b487d845 + revision: e3f9665621872f60d3652579c3f0dc7bf806e72c # path: ../compound-ios AnalyticsEvents: url: https://github.com/matrix-org/matrix-analytics-events From 2b82959430fa476759369e0962dea1f1305f81ea Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Thu, 24 Oct 2024 11:26:53 +0100 Subject: [PATCH 2/3] Fix a bug where the pinned items banner could overlay the composer. (#3441) --- .../Screens/RoomScreen/View/RoomScreen.swift | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift b/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift index 72a77e4480..33023ad766 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift @@ -28,6 +28,14 @@ struct RoomScreen: View { var body: some View { timeline .background(Color.compound.bgCanvasDefault.ignoresSafeArea()) + .overlay(alignment: .top) { + Group { + if roomContext.viewState.shouldShowPinnedEventsBanner { + pinnedItemsBanner + } + } + .animation(.elementDefault, value: roomContext.viewState.shouldShowPinnedEventsBanner) + } .safeAreaInset(edge: .bottom, spacing: 0) { VStack(spacing: 0) { RoomScreenFooterView(details: roomContext.viewState.footerDetails, @@ -52,14 +60,6 @@ struct RoomScreen: View { .environment(\.shouldAutomaticallyLoadImages, !timelineContext.viewState.hideTimelineMedia) } } - .overlay(alignment: .top) { - Group { - if roomContext.viewState.shouldShowPinnedEventsBanner { - pinnedItemsBanner - } - } - .animation(.elementDefault, value: roomContext.viewState.shouldShowPinnedEventsBanner) - } .navigationTitle(L10n.screenRoomTitle) // Hidden but used for back button text. .navigationBarTitleDisplayMode(.inline) .navigationBarHidden(isNavigationBarHidden) From c903631a12efeeb0ad8b4de5581758aac6e93c24 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Thu, 24 Oct 2024 12:33:38 +0200 Subject: [PATCH 3/3] remove iOS 16 support --- ElementX.xcodeproj/project.pbxproj | 6 ++---- ElementX/Sources/Application/AppCoordinator.swift | 2 +- .../Application/Navigation/NavigationCoordinators.swift | 8 ++++---- ElementX/Sources/Other/Pills/PillView.swift | 2 +- ElementX/Sources/Other/SwiftUI/Search.swift | 2 +- .../AppLock/AppLockScreen/View/AppLockScreen.swift | 2 +- .../AppLock/AppLockSetupPINScreen/View/PINTextField.swift | 2 +- .../View/AppLockSetupSettingsScreen.swift | 2 +- .../Authentication/LoginScreen/View/LoginScreen.swift | 4 +++- .../View/ServerSelectionScreen.swift | 2 +- .../Screens/BugReportScreen/View/BugReportScreen.swift | 2 +- .../Screens/CreatePollScreen/View/PollFormScreen.swift | 4 ++-- .../EmojiPickerScreen/View/EmojiPickerScreen.swift | 2 +- .../GlobalSearchScreen/View/GlobalSearchScreen.swift | 2 +- .../Screens/HomeScreen/View/HomeScreenContent.swift | 4 ++-- .../InviteUsersScreen/View/InviteUsersScreen.swift | 2 +- .../Screens/JoinRoomScreen/View/JoinRoomScreen.swift | 2 +- .../View/RoomChangeRolesScreen.swift | 4 ++-- .../RoomDetailsScreen/View/RoomDetailsScreen.swift | 2 +- .../View/RoomNotificationSettingsScreen.swift | 2 +- .../View/RoomPollsHistoryScreen.swift | 4 ++-- .../RoomScreen/ComposerToolbar/View/ComposerToolbar.swift | 8 ++++---- .../View/VoiceMessagePreviewComposer.swift | 4 ++-- .../Screens/RoomScreen/View/SwipeRightAction.swift | 4 ++-- .../View/SecureBackupRecoveryKeyScreen.swift | 2 +- .../View/AnalyticsSettingsScreen.swift | 2 +- .../View/NotificationSettingsScreen.swift | 8 ++++---- .../Screens/Timeline/View/Style/TimelineStyler.swift | 2 +- .../View/Supplementary/ReactionsSummaryView.swift | 2 +- .../Screens/Timeline/View/TypingIndicatorView.swift | 2 +- .../VoiceMessages/VoiceMessageRoomPlaybackView.swift | 4 ++-- .../ElementX/View/TemplateScreen.swift | 2 +- project.yml | 3 +-- 33 files changed, 52 insertions(+), 53 deletions(-) diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index f36c1fb660..ee8cd18ff4 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -7458,9 +7458,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 16.4; + IPHONEOS_DEPLOYMENT_TARGET = 17.6; KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)"; - MACOSX_DEPLOYMENT_TARGET = 13.3; MARKETING_VERSION = 1.9.3; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -7535,9 +7534,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 16.4; + IPHONEOS_DEPLOYMENT_TARGET = 17.6; KEYCHAIN_ACCESS_GROUP_IDENTIFIER = "$(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER)"; - MACOSX_DEPLOYMENT_TARGET = 13.3; MARKETING_VERSION = 1.9.3; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; diff --git a/ElementX/Sources/Application/AppCoordinator.swift b/ElementX/Sources/Application/AppCoordinator.swift index 75fa3da1d3..1b878c7851 100644 --- a/ElementX/Sources/Application/AppCoordinator.swift +++ b/ElementX/Sources/Application/AppCoordinator.swift @@ -575,7 +575,7 @@ class AppCoordinator: AppCoordinatorProtocol, AuthenticationFlowCoordinatorDeleg // The user will log out, clear any existing notifications and unregister from receving new ones UNUserNotificationCenter.current().removeAllPendingNotificationRequests() UNUserNotificationCenter.current().removeAllDeliveredNotifications() - UIApplication.shared.applicationIconBadgeNumber = 0 + UNUserNotificationCenter.current().setBadgeCount(0) unregisterForRemoteNotifications() diff --git a/ElementX/Sources/Application/Navigation/NavigationCoordinators.swift b/ElementX/Sources/Application/Navigation/NavigationCoordinators.swift index 7441c85dfb..e17c247812 100644 --- a/ElementX/Sources/Application/Navigation/NavigationCoordinators.swift +++ b/ElementX/Sources/Application/Navigation/NavigationCoordinators.swift @@ -452,15 +452,15 @@ private struct NavigationSplitCoordinatorView: View { } // Handle `horizontalSizeClass` changes breaking the navigation bar // https://github.com/element-hq/element-x-ios/issues/617 - .onChange(of: horizontalSizeClass) { value in + .onChange(of: horizontalSizeClass) { _, newValue in guard scenePhase != .background else { return } - isInSplitMode = value == .regular + isInSplitMode = newValue == .regular } - .onChange(of: scenePhase) { value in - guard value == .active else { + .onChange(of: scenePhase) { _, newValue in + guard newValue == .active else { return } diff --git a/ElementX/Sources/Other/Pills/PillView.swift b/ElementX/Sources/Other/Pills/PillView.swift index 2a0deee763..2e51831a2d 100644 --- a/ElementX/Sources/Other/Pills/PillView.swift +++ b/ElementX/Sources/Other/Pills/PillView.swift @@ -30,7 +30,7 @@ struct PillView: View { .padding(.trailing, 6) .padding(.vertical, 1) .background { Capsule().foregroundColor(backgroundColor) } - .onChange(of: context.viewState.displayText) { _ in + .onChange(of: context.viewState.displayText) { didChangeText() } } diff --git a/ElementX/Sources/Other/SwiftUI/Search.swift b/ElementX/Sources/Other/SwiftUI/Search.swift index e9ba319837..cb951305d9 100644 --- a/ElementX/Sources/Other/SwiftUI/Search.swift +++ b/ElementX/Sources/Other/SwiftUI/Search.swift @@ -171,7 +171,7 @@ struct IsSearchingModifier: ViewModifier { func body(content: Content) -> some View { content - .onChange(of: isSearchingEnv) { isSearching = $0 } + .onChange(of: isSearchingEnv) { isSearching = $1 } } } diff --git a/ElementX/Sources/Screens/AppLock/AppLockScreen/View/AppLockScreen.swift b/ElementX/Sources/Screens/AppLock/AppLockScreen/View/AppLockScreen.swift index f607fbdc38..45c20b95b4 100644 --- a/ElementX/Sources/Screens/AppLock/AppLockScreen/View/AppLockScreen.swift +++ b/ElementX/Sources/Screens/AppLock/AppLockScreen/View/AppLockScreen.swift @@ -29,7 +29,7 @@ struct AppLockScreen: View { pinInputField .padding(.bottom, 16) .offset(x: pinInputFieldOffset) - .onChange(of: context.viewState.numberOfPINAttempts) { newValue in + .onChange(of: context.viewState.numberOfPINAttempts) { _, newValue in guard newValue > 0 else { return } // Reset without animation in Previews. accessibilitySubtitleFocus = true Task { await animatePINFailure() } diff --git a/ElementX/Sources/Screens/AppLock/AppLockSetupPINScreen/View/PINTextField.swift b/ElementX/Sources/Screens/AppLock/AppLockSetupPINScreen/View/PINTextField.swift index 09f10d3655..408a7f8381 100644 --- a/ElementX/Sources/Screens/AppLock/AppLockSetupPINScreen/View/PINTextField.swift +++ b/ElementX/Sources/Screens/AppLock/AppLockSetupPINScreen/View/PINTextField.swift @@ -20,7 +20,7 @@ struct PINTextField: View { .textFieldStyle(PINTextFieldStyle(pinCode: pinCode, isSecure: isSecure, maxLength: maxLength, size: size)) .keyboardType(.numberPad) .accessibilityIdentifier(A11yIdentifiers.appLockSetupPINScreen.textField) - .onChange(of: pinCode) { newValue in + .onChange(of: pinCode) { _, newValue in let sanitized = sanitize(newValue) if sanitized != newValue { MXLog.warning("PIN code input sanitized.") diff --git a/ElementX/Sources/Screens/AppLock/AppLockSetupSettingsScreen/View/AppLockSetupSettingsScreen.swift b/ElementX/Sources/Screens/AppLock/AppLockSetupSettingsScreen/View/AppLockSetupSettingsScreen.swift index 097b27079c..3cb1dfc362 100644 --- a/ElementX/Sources/Screens/AppLock/AppLockSetupSettingsScreen/View/AppLockSetupSettingsScreen.swift +++ b/ElementX/Sources/Screens/AppLock/AppLockSetupSettingsScreen/View/AppLockSetupSettingsScreen.swift @@ -29,7 +29,7 @@ struct AppLockSetupSettingsScreen: View { Section { ListRow(label: .plain(title: context.viewState.enableBiometricsTitle), kind: .toggle($context.enableBiometrics)) - .onChange(of: context.enableBiometrics) { _ in + .onChange(of: context.enableBiometrics) { context.send(viewAction: .enableBiometricsChanged) } } diff --git a/ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginScreen.swift b/ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginScreen.swift index b5e882ee63..560448feff 100644 --- a/ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginScreen.swift +++ b/ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginScreen.swift @@ -74,7 +74,9 @@ struct LoginScreen: View { .textContentType(.username) .autocapitalization(.none) .submitLabel(.next) - .onChange(of: isUsernameFocused, perform: usernameFocusChanged) + .onChange(of: isUsernameFocused) { _, newValue in + usernameFocusChanged(isFocussed: newValue) + } .onSubmit { isPasswordFocused = true } .padding(.bottom, 20) diff --git a/ElementX/Sources/Screens/Authentication/ServerSelectionScreen/View/ServerSelectionScreen.swift b/ElementX/Sources/Screens/Authentication/ServerSelectionScreen/View/ServerSelectionScreen.swift index 49e792fcb8..4e323ae426 100644 --- a/ElementX/Sources/Screens/Authentication/ServerSelectionScreen/View/ServerSelectionScreen.swift +++ b/ElementX/Sources/Screens/Authentication/ServerSelectionScreen/View/ServerSelectionScreen.swift @@ -59,7 +59,7 @@ struct ServerSelectionScreen: View { .keyboardType(.URL) .autocapitalization(.none) .disableAutocorrection(true) - .onChange(of: context.homeserverAddress) { _ in context.send(viewAction: .clearFooterError) } + .onChange(of: context.homeserverAddress) { context.send(viewAction: .clearFooterError) } .submitLabel(.done) .onSubmit(submit) diff --git a/ElementX/Sources/Screens/BugReportScreen/View/BugReportScreen.swift b/ElementX/Sources/Screens/BugReportScreen/View/BugReportScreen.swift index d972d1279f..1be9527292 100644 --- a/ElementX/Sources/Screens/BugReportScreen/View/BugReportScreen.swift +++ b/ElementX/Sources/Screens/BugReportScreen/View/BugReportScreen.swift @@ -30,7 +30,7 @@ struct BugReportScreen: View { .navigationBarTitleDisplayMode(.inline) .toolbar { toolbar } .interactiveDismissDisabled() - .onChange(of: selectedScreenshot) { newItem in + .onChange(of: selectedScreenshot) { _, newItem in Task { guard let data = try? await newItem?.loadTransferable(type: Data.self), let image = UIImage(data: data) diff --git a/ElementX/Sources/Screens/CreatePollScreen/View/PollFormScreen.swift b/ElementX/Sources/Screens/CreatePollScreen/View/PollFormScreen.swift index 16f85e5299..8ba9f9c7da 100644 --- a/ElementX/Sources/Screens/CreatePollScreen/View/PollFormScreen.swift +++ b/ElementX/Sources/Screens/CreatePollScreen/View/PollFormScreen.swift @@ -65,8 +65,8 @@ struct PollFormScreen: View { } .focused($focus, equals: .option(index: index)) .accessibilityIdentifier(A11yIdentifiers.pollFormScreen.optionID(index)) - .onChange(of: context.options[index].text) { optionText in - guard let lastCharacter = optionText.last, lastCharacter.isNewline else { + .onChange(of: context.options[index].text) { _, newOptionText in + guard let lastCharacter = newOptionText.last, lastCharacter.isNewline else { return } diff --git a/ElementX/Sources/Screens/EmojiPickerScreen/View/EmojiPickerScreen.swift b/ElementX/Sources/Screens/EmojiPickerScreen/View/EmojiPickerScreen.swift index ddbbeb75be..9f5e39325f 100644 --- a/ElementX/Sources/Screens/EmojiPickerScreen/View/EmojiPickerScreen.swift +++ b/ElementX/Sources/Screens/EmojiPickerScreen/View/EmojiPickerScreen.swift @@ -55,7 +55,7 @@ struct EmojiPickerScreen: View { } .presentationDetents([.medium, .large]) .presentationDragIndicator(isSearching ? .hidden : .visible) - .onChange(of: searchString) { _ in + .onChange(of: searchString) { context.send(viewAction: .search(searchString: searchString)) } } diff --git a/ElementX/Sources/Screens/GlobalSearchScreen/View/GlobalSearchScreen.swift b/ElementX/Sources/Screens/GlobalSearchScreen/View/GlobalSearchScreen.swift index 388ee539ae..f7f4a6fd00 100644 --- a/ElementX/Sources/Screens/GlobalSearchScreen/View/GlobalSearchScreen.swift +++ b/ElementX/Sources/Screens/GlobalSearchScreen/View/GlobalSearchScreen.swift @@ -49,7 +49,7 @@ struct GlobalSearchScreen: View { selectedRoom = context.viewState.rooms.first searchFieldFocus = true } - .onChange(of: context.viewState.rooms) { _ in + .onChange(of: context.viewState.rooms) { selectedRoom = context.viewState.rooms.first } .onTapGesture { diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenContent.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenContent.swift index ec65e9420a..7275684ddd 100644 --- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenContent.swift +++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenContent.swift @@ -66,10 +66,10 @@ struct HomeScreenContent: View { .onReceive(scrollViewAdapter.isScrolling) { _ in updateVisibleRange() } - .onChange(of: context.searchQuery) { _ in + .onChange(of: context.searchQuery) { updateVisibleRange() } - .onChange(of: context.viewState.visibleRooms) { _ in + .onChange(of: context.viewState.visibleRooms) { updateVisibleRange() // We have been seeing a lot of issues around the room list not updating properly after diff --git a/ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreen.swift b/ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreen.swift index d677031815..5e75198d69 100644 --- a/ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreen.swift +++ b/ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreen.swift @@ -110,7 +110,7 @@ struct InviteUsersScreen: View { .frame(width: cellWidth) } } - .onChange(of: context.viewState.scrollToLastID) { lastAddedID in + .onChange(of: context.viewState.scrollToLastID) { _, lastAddedID in guard let id = lastAddedID else { return } withElementAnimation(.easeInOut) { scrollView.scrollTo(id) diff --git a/ElementX/Sources/Screens/JoinRoomScreen/View/JoinRoomScreen.swift b/ElementX/Sources/Screens/JoinRoomScreen/View/JoinRoomScreen.swift index 87035a6a78..419e463297 100644 --- a/ElementX/Sources/Screens/JoinRoomScreen/View/JoinRoomScreen.swift +++ b/ElementX/Sources/Screens/JoinRoomScreen/View/JoinRoomScreen.swift @@ -107,7 +107,7 @@ struct JoinRoomScreen: View { VStack(alignment: .leading, spacing: 12) { HStack(spacing: 0) { TextField("", text: $context.knockMessage, axis: .vertical) - .onChange(of: context.knockMessage) { newValue in + .onChange(of: context.knockMessage) { _, newValue in context.knockMessage = String(newValue.prefix(1000)) } .lineLimit(4, reservesSpace: true) diff --git a/ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreen.swift b/ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreen.swift index 02975c9bcc..d116dc4c58 100644 --- a/ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreen.swift +++ b/ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreen.swift @@ -71,8 +71,8 @@ struct RoomChangeRolesScreen: View { .frame(width: cellWidth) } } - .onChange(of: context.viewState.lastPromotedMember) { member in - guard let member else { return } + .onChange(of: context.viewState.lastPromotedMember) { _, newValue in + guard let member = newValue else { return } withElementAnimation(.easeInOut) { scrollView.scrollTo(member.id) } diff --git a/ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift b/ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift index 1126194ab4..207f10796c 100644 --- a/ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift +++ b/ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift @@ -185,7 +185,7 @@ struct RoomDetailsScreen: View { ListRow(label: .default(title: L10n.commonFavourite, icon: \.favourite), kind: .toggle($context.isFavourite)) .accessibilityIdentifier(A11yIdentifiers.roomDetailsScreen.favourite) - .onChange(of: context.isFavourite) { newValue in + .onChange(of: context.isFavourite) { _, newValue in context.send(viewAction: .toggleFavourite(isFavourite: newValue)) } diff --git a/ElementX/Sources/Screens/RoomNotificationSettingsScreen/View/RoomNotificationSettingsScreen.swift b/ElementX/Sources/Screens/RoomNotificationSettingsScreen/View/RoomNotificationSettingsScreen.swift index 7c1ae23f76..ef3b58f7d9 100644 --- a/ElementX/Sources/Screens/RoomNotificationSettingsScreen/View/RoomNotificationSettingsScreen.swift +++ b/ElementX/Sources/Screens/RoomNotificationSettingsScreen/View/RoomNotificationSettingsScreen.swift @@ -35,7 +35,7 @@ struct RoomNotificationSettingsScreen: View { kind: .toggle($context.allowCustomSetting)) .accessibilityIdentifier(A11yIdentifiers.roomNotificationSettingsScreen.allowCustomSetting) .disabled(context.viewState.notificationSettingsState.isLoading) - .onChange(of: context.allowCustomSetting) { _ in + .onChange(of: context.allowCustomSetting) { context.send(viewAction: .changedAllowCustomSettings) } } footer: { diff --git a/ElementX/Sources/Screens/RoomPollsHistoryScreen/View/RoomPollsHistoryScreen.swift b/ElementX/Sources/Screens/RoomPollsHistoryScreen/View/RoomPollsHistoryScreen.swift index 96d4c8c548..0029e48b64 100644 --- a/ElementX/Sources/Screens/RoomPollsHistoryScreen/View/RoomPollsHistoryScreen.swift +++ b/ElementX/Sources/Screens/RoomPollsHistoryScreen/View/RoomPollsHistoryScreen.swift @@ -47,8 +47,8 @@ struct RoomPollsHistoryScreen: View { } .pickerStyle(.segmented) .readableFrame(maxWidth: 475) - .onChange(of: context.filter) { value in - context.send(viewAction: .filter(value)) + .onChange(of: context.filter) { _, newValue in + context.send(viewAction: .filter(newValue)) } } diff --git a/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/ComposerToolbar.swift b/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/ComposerToolbar.swift index 8f1dcaa6c6..0cb580d0ab 100644 --- a/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/ComposerToolbar.swift +++ b/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/ComposerToolbar.swift @@ -180,18 +180,18 @@ struct ComposerToolbar: View { guard !composerFocused else { return } composerFocused = true } - .onChange(of: context.composerFocused) { newValue in + .onChange(of: context.composerFocused) { _, newValue in guard composerFocused != newValue else { return } composerFocused = newValue } - .onChange(of: composerFocused) { newValue in + .onChange(of: composerFocused) { _, newValue in context.composerFocused = newValue } - .onChange(of: context.plainComposerText) { _ in + .onChange(of: context.plainComposerText) { context.send(viewAction: .plainComposerTextChanged) } - .onChange(of: context.composerFormattingEnabled) { _ in + .onChange(of: context.composerFormattingEnabled) { context.send(viewAction: .didToggleFormattingOptions) } .onAppear { diff --git a/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/VoiceMessagePreviewComposer.swift b/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/VoiceMessagePreviewComposer.swift index f290780761..0e20440141 100644 --- a/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/VoiceMessagePreviewComposer.swift +++ b/ElementX/Sources/Screens/RoomScreen/ComposerToolbar/View/VoiceMessagePreviewComposer.swift @@ -48,8 +48,8 @@ struct VoiceMessagePreviewComposer: View { showCursor: playerState.showProgressIndicator, onSeek: onSeek) } - .onChange(of: isDragging) { isDragging in - onScrubbing(isDragging) + .onChange(of: isDragging) { _, newValue in + onScrubbing(newValue) } .padding(.vertical, 4.0) .padding(.horizontal, 6.0) diff --git a/ElementX/Sources/Screens/RoomScreen/View/SwipeRightAction.swift b/ElementX/Sources/Screens/RoomScreen/View/SwipeRightAction.swift index 183af7a4ca..df0a3f5df9 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/SwipeRightAction.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/SwipeRightAction.swift @@ -32,8 +32,8 @@ struct SwipeRightAction: ViewModifier { .offset(x: xOffset, y: 0.0) .animation(.interactiveSpring().speed(0.5), value: xOffset) .timelineGesture(gesture) - .onChange(of: dragGestureActive) { value in - if value == true { + .onChange(of: dragGestureActive) { _, newValue in + if newValue == true { if shouldStartAction() { feedbackGenerator.prepare() canStartAction = true diff --git a/ElementX/Sources/Screens/SecureBackup/SecureBackupRecoveryKeyScreen/View/SecureBackupRecoveryKeyScreen.swift b/ElementX/Sources/Screens/SecureBackup/SecureBackupRecoveryKeyScreen/View/SecureBackupRecoveryKeyScreen.swift index 00f980ab5a..995963a445 100644 --- a/ElementX/Sources/Screens/SecureBackup/SecureBackupRecoveryKeyScreen/View/SecureBackupRecoveryKeyScreen.swift +++ b/ElementX/Sources/Screens/SecureBackup/SecureBackupRecoveryKeyScreen/View/SecureBackupRecoveryKeyScreen.swift @@ -19,7 +19,7 @@ struct SecureBackupRecoveryKeyScreen: View { ScrollViewReader { reader in mainContent .padding(16) - .onChange(of: focused) { newValue in + .onChange(of: focused) { _, newValue in guard newValue == true else { return } reader.scrollTo(textFieldIdentifier) } diff --git a/ElementX/Sources/Screens/Settings/AnalyticsSettingsScreen/View/AnalyticsSettingsScreen.swift b/ElementX/Sources/Screens/Settings/AnalyticsSettingsScreen/View/AnalyticsSettingsScreen.swift index 1972bdabba..916a9e6c23 100644 --- a/ElementX/Sources/Screens/Settings/AnalyticsSettingsScreen/View/AnalyticsSettingsScreen.swift +++ b/ElementX/Sources/Screens/Settings/AnalyticsSettingsScreen/View/AnalyticsSettingsScreen.swift @@ -24,7 +24,7 @@ struct AnalyticsSettingsScreen: View { Section { ListRow(label: .plain(title: L10n.screenAnalyticsSettingsShareData), kind: .toggle($context.enableAnalytics)) - .onChange(of: context.enableAnalytics) { _ in + .onChange(of: context.enableAnalytics) { context.send(viewAction: .toggleAnalytics) } } footer: { diff --git a/ElementX/Sources/Screens/Settings/NotificationSettingsScreen/View/NotificationSettingsScreen.swift b/ElementX/Sources/Screens/Settings/NotificationSettingsScreen/View/NotificationSettingsScreen.swift index dca3369aac..2c0319c140 100644 --- a/ElementX/Sources/Screens/Settings/NotificationSettingsScreen/View/NotificationSettingsScreen.swift +++ b/ElementX/Sources/Screens/Settings/NotificationSettingsScreen/View/NotificationSettingsScreen.swift @@ -86,7 +86,7 @@ struct NotificationSettingsScreen: View { Section { ListRow(label: .plain(title: L10n.screenNotificationSettingsEnableNotifications), kind: .toggle($context.enableNotifications)) - .onChange(of: context.enableNotifications) { _ in + .onChange(of: context.enableNotifications) { context.send(viewAction: .changedEnableNotifications) } } @@ -128,7 +128,7 @@ struct NotificationSettingsScreen: View { kind: .toggle($context.roomMentionsEnabled)) .disabled(context.viewState.settings?.roomMentionsEnabled == nil) .allowsHitTesting(!context.viewState.applyingChange) - .onChange(of: context.roomMentionsEnabled) { _ in + .onChange(of: context.roomMentionsEnabled) { context.send(viewAction: .roomMentionChanged) } } header: { @@ -143,7 +143,7 @@ struct NotificationSettingsScreen: View { kind: .toggle($context.callsEnabled)) .disabled(context.viewState.settings?.callsEnabled == nil) .allowsHitTesting(!context.viewState.applyingChange) - .onChange(of: context.callsEnabled) { _ in + .onChange(of: context.callsEnabled) { context.send(viewAction: .callsChanged) } } header: { @@ -158,7 +158,7 @@ struct NotificationSettingsScreen: View { kind: .toggle($context.invitationsEnabled)) .disabled(context.viewState.settings?.invitationsEnabled == nil) .allowsHitTesting(!context.viewState.applyingChange) - .onChange(of: context.invitationsEnabled) { _ in + .onChange(of: context.invitationsEnabled) { context.send(viewAction: .invitationsChanged) } } header: { diff --git a/ElementX/Sources/Screens/Timeline/View/Style/TimelineStyler.swift b/ElementX/Sources/Screens/Timeline/View/Style/TimelineStyler.swift index 1cafaf023e..f69da64db7 100644 --- a/ElementX/Sources/Screens/Timeline/View/Style/TimelineStyler.swift +++ b/ElementX/Sources/Screens/Timeline/View/Style/TimelineStyler.swift @@ -25,7 +25,7 @@ struct TimelineStyler: View { var body: some View { mainContent - .onChange(of: timelineItem.properties.deliveryStatus) { newStatus in + .onChange(of: timelineItem.properties.deliveryStatus) { _, newStatus in if case .sendingFailed = newStatus { guard task == nil else { return diff --git a/ElementX/Sources/Screens/Timeline/View/Supplementary/ReactionsSummaryView.swift b/ElementX/Sources/Screens/Timeline/View/Supplementary/ReactionsSummaryView.swift index 1920f2d64f..fccaf576c3 100644 --- a/ElementX/Sources/Screens/Timeline/View/Supplementary/ReactionsSummaryView.swift +++ b/ElementX/Sources/Screens/Timeline/View/Supplementary/ReactionsSummaryView.swift @@ -43,7 +43,7 @@ struct ReactionsSummaryView: View { scrollView.scrollTo(selectedReactionKey) } } - .onChange(of: selectedReactionKey) { _ in + .onChange(of: selectedReactionKey) { scrollView.scrollTo(selectedReactionKey) } } diff --git a/ElementX/Sources/Screens/Timeline/View/TypingIndicatorView.swift b/ElementX/Sources/Screens/Timeline/View/TypingIndicatorView.swift index da3d805e2c..e927cda08d 100644 --- a/ElementX/Sources/Screens/Timeline/View/TypingIndicatorView.swift +++ b/ElementX/Sources/Screens/Timeline/View/TypingIndicatorView.swift @@ -19,7 +19,7 @@ struct TypingIndicatorView: View { .truncationMode(.middle) .padding(.horizontal, 4) .animation(.elementDefault, value: typingMembers.members) - .onChange(of: typingMembers.members) { newValue in + .onChange(of: typingMembers.members) { _, newValue in if !newValue.isEmpty { didShowTextOnce = true } diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/Messages/VoiceMessages/VoiceMessageRoomPlaybackView.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/Messages/VoiceMessages/VoiceMessageRoomPlaybackView.swift index 1cda7b3bda..1928a55b4a 100644 --- a/ElementX/Sources/Services/Timeline/TimelineItems/Items/Messages/VoiceMessages/VoiceMessageRoomPlaybackView.swift +++ b/ElementX/Sources/Services/Timeline/TimelineItems/Items/Messages/VoiceMessages/VoiceMessageRoomPlaybackView.swift @@ -51,8 +51,8 @@ struct VoiceMessageRoomPlaybackView: View { } .padding(.leading, 2) .padding(.trailing, 8) - .onChange(of: isDragging) { isDragging in - onScrubbing(isDragging) + .onChange(of: isDragging) { _, newValue in + onScrubbing(newValue) } } diff --git a/Tools/Scripts/Templates/SimpleScreenExample/ElementX/View/TemplateScreen.swift b/Tools/Scripts/Templates/SimpleScreenExample/ElementX/View/TemplateScreen.swift index e5f72310a5..ce5e2d0bec 100644 --- a/Tools/Scripts/Templates/SimpleScreenExample/ElementX/View/TemplateScreen.swift +++ b/Tools/Scripts/Templates/SimpleScreenExample/ElementX/View/TemplateScreen.swift @@ -24,7 +24,7 @@ struct TemplateScreen: View { } .compoundList() .navigationTitle(context.viewState.title) - .onChange(of: context.composerText) { _ in + .onChange(of: context.composerText) { context.send(viewAction: .textChanged) } } diff --git a/project.yml b/project.yml index 250bbe97ca..f449b337a2 100644 --- a/project.yml +++ b/project.yml @@ -10,8 +10,7 @@ options: groupSortPosition: bottom createIntermediateGroups: true deploymentTarget: - iOS: '16.4' - macOS: '13.3' + iOS: '17.6' groupOrdering: - order: - ElementX