diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 0c6e3eb9bf..eb238163c6 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -8539,7 +8539,7 @@ repositoryURL = "https://github.com/element-hq/compound-ios"; requirement = { kind = revision; - revision = 78e1290d2a9f903f929806221331d8b4e898f4fe; + revision = 1a70bc7f3420647843b9c18748982c61ef7d2245; }; }; 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 08e1393876..2d5f0d98c0 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,8 +6,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/compound-design-tokens", "state" : { - "revision" : "31b236f02c811704b68e8aae429865fe8eb8d8ba", - "version" : "2.1.1" + "revision" : "f79e05011ec3402c29ded19bcff95b5ead180991", + "version" : "2.1.2" } }, { @@ -15,7 +15,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/compound-ios", "state" : { - "revision" : "78e1290d2a9f903f929806221331d8b4e898f4fe" + "revision" : "1a70bc7f3420647843b9c18748982c61ef7d2245" } }, { @@ -185,8 +185,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/BarredEwe/Prefire", "state" : { - "revision" : "0b7b6e6fe98af7e12b1440ca8fe81b3033ecf873", - "version" : "2.9.0" + "revision" : "172a7f0a95f99f6656f6b2d0531b648c08d26c56", + "version" : "2.10.0" } }, { diff --git a/ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift b/ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift index 74f6b5b00b..2b02060bb8 100644 --- a/ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift +++ b/ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift @@ -163,14 +163,6 @@ struct RoomDetailsScreen: View { }) .disabled(context.viewState.pinnedEventsActionState.isLoading) - if context.viewState.canSeeKnockingRequests { - ListRow(label: .default(title: L10n.screenRoomDetailsRequestsToJoinTitle, - icon: \.askToJoin), - details: context.viewState.knockRequestsCount > 0 ? .counter(context.viewState.knockRequestsCount) : nil, - kind: .navigationLink { - context.send(viewAction: .processTapRequestsToJoin) - }) - } ListRow(label: .default(title: L10n.screenPollsHistoryTitle, icon: \.polls), kind: .navigationLink { @@ -226,6 +218,16 @@ struct RoomDetailsScreen: View { context.send(viewAction: .processTapPeople) }) .accessibilityIdentifier(A11yIdentifiers.roomDetailsScreen.people) + + if context.viewState.canSeeKnockingRequests { + ListRow(label: .default(title: L10n.screenRoomDetailsRequestsToJoinTitle, + icon: \.askToJoin), + details: context.viewState.knockRequestsCount > 0 ? .counter(context.viewState.knockRequestsCount) : nil, + kind: .navigationLink { + context.send(viewAction: .processTapRequestsToJoin) + }) + } + if context.viewState.canEditRolesOrPermissions, context.viewState.dmRecipient == nil { ListRow(label: .default(title: L10n.screenRoomDetailsRolesAndPermissions, icon: \.admin), diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_composerToolbar-iPad-en-GB.Voice-Message.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_composerToolbar-iPad-en-GB.Voice-Message.png index 8786c82c0a..8315d613c6 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_composerToolbar-iPad-en-GB.Voice-Message.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_composerToolbar-iPad-en-GB.Voice-Message.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dab95df3048ab105500f46bb579e45d9fdf53f8a57d32c064c8764b150f6fe6f -size 98704 +oid sha256:179231b4119308cd7c00233f00de90e943558d1aabbe94d5107455ccde161e24 +size 98675 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_composerToolbar-iPad-pseudo.Voice-Message.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_composerToolbar-iPad-pseudo.Voice-Message.png index 06139d216c..03a5f27e4d 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_composerToolbar-iPad-pseudo.Voice-Message.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_composerToolbar-iPad-pseudo.Voice-Message.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f70c8507a1b75e78ef1e7eea70d1671898606ecbf4d2bba80f3560b5197a24cd -size 99501 +oid sha256:2b98edfa6801c0208c3c86e52e48c64d2ee54ec5c1085348a8ab8ca5365fa577 +size 99472 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_composerToolbar-iPhone-16-en-GB.Voice-Message.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_composerToolbar-iPhone-16-en-GB.Voice-Message.png index bb69c0a04e..82f1734b5f 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_composerToolbar-iPhone-16-en-GB.Voice-Message.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_composerToolbar-iPhone-16-en-GB.Voice-Message.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d9b4542882589eaae56084aa0b4ae1e857c4b6413f5973d8f04bec275ef3bb2 -size 56171 +oid sha256:b23b6fa54712013ff8dbf2b4e79163f3674f5228de362cc7c00a3b8a77b6a441 +size 56148 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_composerToolbar-iPhone-16-pseudo.Voice-Message.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_composerToolbar-iPhone-16-pseudo.Voice-Message.png index e5248c0e94..b574f2073b 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_composerToolbar-iPhone-16-pseudo.Voice-Message.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_composerToolbar-iPhone-16-pseudo.Voice-Message.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ca4f5c2cc6386308227ef4cffd0f35e5b85a70c6937e259c7613458480975f9 -size 57003 +oid sha256:45f1cd517d9a670f11159feab5b07cec1197760449551db46cf33f50b514969b +size 56980 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen-iPad-en-GB.1.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen-iPad-en-GB.1.png index a2b3a9a62d..b23be47db5 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen-iPad-en-GB.1.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen-iPad-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82dba6239ccf06f14627c49f61eea25e3ca943a21dd5811fc78d0acf4f7ca4ce -size 89609 +oid sha256:2a50f4860f6ce3fc2aff3a3f8a4d72899cda87c25fd4c9ec935cc623c9548c05 +size 89566 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen-iPad-pseudo.1.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen-iPad-pseudo.1.png index fa4b94ffc3..ede303a1d9 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen-iPad-pseudo.1.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen-iPad-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:556f5e38e0492a5e7988a47fd2e313a95549ac22b2c11e8e2a3d8f8aac8ca58f -size 90638 +oid sha256:2fb4fdb396dd0828f9fa2704f5255663d11dc56986de6b69e5ce5391c33b5cad +size 90595 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen-iPhone-16-en-GB.1.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen-iPhone-16-en-GB.1.png index 97c71aca7c..c7e3b42db2 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen-iPhone-16-en-GB.1.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen-iPhone-16-en-GB.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3c3400e1c061f646de17393763814b933aa22b8bf89f7f955a2f037bcca0e32 -size 48491 +oid sha256:bfedafcdcf81ac2f74ae00c10d8c04445507a9f64c3b35685958d35099b773c4 +size 48446 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen-iPhone-16-pseudo.1.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen-iPhone-16-pseudo.1.png index 938b436105..21d02a9129 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen-iPhone-16-pseudo.1.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen-iPhone-16-pseudo.1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b466476f1c7d93b79dd32a402384475488f8f7d2a9154f98c8b240f32f26284c -size 49351 +oid sha256:566f7e7e5f227f2b13a76ffcb876007be5e5e6f06df89a23a6a424f84bf35e98 +size 49303 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-en-GB.Generic-Room.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-en-GB.Generic-Room.png index 44d9cc85e3..8069346fd1 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-en-GB.Generic-Room.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-en-GB.Generic-Room.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:060065ca3bd133753e075be975b29c5147bd5cde2eb3cb61cd1b376986bae37c -size 174821 +oid sha256:2f3606c69ef13c10455f16b0dbe0f0ca0949e9b8d098a3e8f55db5e637cec5c9 +size 174737 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-en-GB.Simple-Room.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-en-GB.Simple-Room.png index e179ec66f7..a2d020632c 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-en-GB.Simple-Room.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-en-GB.Simple-Room.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29136d24366425eaef80bd40fa69a332fcc92378f83b85a376f62ea40e22aa26 -size 144375 +oid sha256:4d617ee77bb0c28caa1f497a5eb686da939efcc4cdcf65090a677ad85784e951 +size 150733 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-pseudo.Generic-Room.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-pseudo.Generic-Room.png index 0b872f47d6..4ccfbfcb69 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-pseudo.Generic-Room.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-pseudo.Generic-Room.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:002d4dc3993adddc0b07aa927be8d15a3cbd028f1dfb7c4176d44a1ba202091f -size 180485 +oid sha256:2fd20f58c64f70ad239a1931bd641d5dae44fac435019bf7636a8242bb8ecf17 +size 181091 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-pseudo.Simple-Room.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-pseudo.Simple-Room.png index 50e5b0eded..b3d8ffca8c 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-pseudo.Simple-Room.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-pseudo.Simple-Room.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d90754cfbb2541edbc1e9d43dcbc7dd7067e440b230b1de0a8812ee091de655 -size 152665 +oid sha256:ebe7c2ae984e6708d2bb380de749bed6cf6ad057617f2376a8eb732cfdf4c82b +size 161418 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPhone-16-en-GB.Generic-Room.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPhone-16-en-GB.Generic-Room.png index 20d1dd2c47..8b6229eb1e 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPhone-16-en-GB.Generic-Room.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPhone-16-en-GB.Generic-Room.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12c7fd9be85bb2d5a245a4a8e5087068317c37c9116ff44492245dda2272aa2b -size 112422 +oid sha256:c5b278b47754dd51580e98cf1941f48137662acab38c29c804bae6b0cf90b28e +size 112164 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPhone-16-en-GB.Simple-Room.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPhone-16-en-GB.Simple-Room.png index 92d81e70e1..03e1d94116 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPhone-16-en-GB.Simple-Room.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPhone-16-en-GB.Simple-Room.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9dc76892f1a8ad57ec5b39e477544761cc83abbe7ca2df49d3a5c02c4f784dd3 -size 91560 +oid sha256:9fe74e979217cc6b8290a9600cd419c97111872bc28cef02ddc5c72c5a726e28 +size 97542 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPhone-16-pseudo.Simple-Room.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPhone-16-pseudo.Simple-Room.png index ca90715e90..92da8eadc5 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPhone-16-pseudo.Simple-Room.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPhone-16-pseudo.Simple-Room.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f695712aa0f2caf38e73cab6a9b512d8534bc98c77b9c806dc088a8d7f4ae4df -size 112161 +oid sha256:00cb4122a842fcad06774e2887681531bed4968b536c677fd010ebe223488086 +size 112130 diff --git a/project.yml b/project.yml index 1f7ff2b2cc..239dd432ac 100644 --- a/project.yml +++ b/project.yml @@ -65,7 +65,7 @@ packages: # path: ../matrix-rust-sdk Compound: url: https://github.com/element-hq/compound-ios - revision: 78e1290d2a9f903f929806221331d8b4e898f4fe + revision: 1a70bc7f3420647843b9c18748982c61ef7d2245 # path: ../compound-ios AnalyticsEvents: url: https://github.com/matrix-org/matrix-analytics-events