ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-04 10:33:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated details design (#3626)

Browse Source
This commit is contained in:
Mauro
2024-12-17 12:50:01 +01:00
committed by GitHub
parent a16f169a92
commit 1496d477a4
19 changed files with 47 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX.xcodeproj/project.pbxproj
+1 -1
View File
@@ -8539,7 +8539,7 @@
repositoryURL = "https://github.com/element-hq/compound-ios"; repositoryURL = "https://github.com/element-hq/compound-ios";
requirement = { requirement = {
kind = revision; kind = revision;
revision = 78e1290d2a9f903f929806221331d8b4e898f4fe; revision = 1a70bc7f3420647843b9c18748982c61ef7d2245;
}; };
}; };
F76A08D0EA29A07A54F4EB4D /* XCRemoteSwiftPackageReference "swift-collections" */ = { F76A08D0EA29A07A54F4EB4D /* XCRemoteSwiftPackageReference "swift-collections" */ = {
ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+5 -5
View File
@@ -6,8 +6,8 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/element-hq/compound-design-tokens", "location" : "https://github.com/element-hq/compound-design-tokens",
"state" : { "state" : {
"revision" : "31b236f02c811704b68e8aae429865fe8eb8d8ba", "revision" : "f79e05011ec3402c29ded19bcff95b5ead180991",
"version" : "2.1.1" "version" : "2.1.2"
} }
}, },
{ {
@@ -15,7 +15,7 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/element-hq/compound-ios", "location" : "https://github.com/element-hq/compound-ios",
"state" : { "state" : {
"revision" : "78e1290d2a9f903f929806221331d8b4e898f4fe" "revision" : "1a70bc7f3420647843b9c18748982c61ef7d2245"
} }
}, },
{ {
@@ -185,8 +185,8 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/BarredEwe/Prefire", "location" : "https://github.com/BarredEwe/Prefire",
"state" : { "state" : {
"revision" : "0b7b6e6fe98af7e12b1440ca8fe81b3033ecf873", "revision" : "172a7f0a95f99f6656f6b2d0531b648c08d26c56",
"version" : "2.9.0" "version" : "2.10.0"
} }
}, },
{ {
ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift
+10 -8
View File
@@ -163,14 +163,6 @@ struct RoomDetailsScreen: View {
}) })
.disabled(context.viewState.pinnedEventsActionState.isLoading) .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, ListRow(label: .default(title: L10n.screenPollsHistoryTitle,
icon: \.polls), icon: \.polls),
kind: .navigationLink { kind: .navigationLink {
@@ -226,6 +218,16 @@ struct RoomDetailsScreen: View {
context.send(viewAction: .processTapPeople) context.send(viewAction: .processTapPeople)
}) })
.accessibilityIdentifier(A11yIdentifiers.roomDetailsScreen.people) .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 { if context.viewState.canEditRolesOrPermissions, context.viewState.dmRecipient == nil {
ListRow(label: .default(title: L10n.screenRoomDetailsRolesAndPermissions, ListRow(label: .default(title: L10n.screenRoomDetailsRolesAndPermissions,
icon: \.admin), icon: \.admin),
PreviewTests/Sources/__Snapshots__/PreviewTests/test_composerToolbar-iPad-en-GB.Voice-Message.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:dab95df3048ab105500f46bb579e45d9fdf53f8a57d32c064c8764b150f6fe6f oid sha256:179231b4119308cd7c00233f00de90e943558d1aabbe94d5107455ccde161e24
size 98704 size 98675
PreviewTests/Sources/__Snapshots__/PreviewTests/test_composerToolbar-iPad-pseudo.Voice-Message.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:f70c8507a1b75e78ef1e7eea70d1671898606ecbf4d2bba80f3560b5197a24cd oid sha256:2b98edfa6801c0208c3c86e52e48c64d2ee54ec5c1085348a8ab8ca5365fa577
size 99501 size 99472
PreviewTests/Sources/__Snapshots__/PreviewTests/test_composerToolbar-iPhone-16-en-GB.Voice-Message.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:1d9b4542882589eaae56084aa0b4ae1e857c4b6413f5973d8f04bec275ef3bb2 oid sha256:b23b6fa54712013ff8dbf2b4e79163f3674f5228de362cc7c00a3b8a77b6a441
size 56171 size 56148
PreviewTests/Sources/__Snapshots__/PreviewTests/test_composerToolbar-iPhone-16-pseudo.Voice-Message.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:9ca4f5c2cc6386308227ef4cffd0f35e5b85a70c6937e259c7613458480975f9 oid sha256:45f1cd517d9a670f11159feab5b07cec1197760449551db46cf33f50b514969b
size 57003 size 56980
PreviewTests/Sources/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen-iPad-en-GB.1.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:82dba6239ccf06f14627c49f61eea25e3ca943a21dd5811fc78d0acf4f7ca4ce oid sha256:2a50f4860f6ce3fc2aff3a3f8a4d72899cda87c25fd4c9ec935cc623c9548c05
size 89609 size 89566
PreviewTests/Sources/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen-iPad-pseudo.1.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:556f5e38e0492a5e7988a47fd2e313a95549ac22b2c11e8e2a3d8f8aac8ca58f oid sha256:2fb4fdb396dd0828f9fa2704f5255663d11dc56986de6b69e5ce5391c33b5cad
size 90638 size 90595
PreviewTests/Sources/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen-iPhone-16-en-GB.1.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:b3c3400e1c061f646de17393763814b933aa22b8bf89f7f955a2f037bcca0e32 oid sha256:bfedafcdcf81ac2f74ae00c10d8c04445507a9f64c3b35685958d35099b773c4
size 48491 size 48446
PreviewTests/Sources/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen-iPhone-16-pseudo.1.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:b466476f1c7d93b79dd32a402384475488f8f7d2a9154f98c8b240f32f26284c oid sha256:566f7e7e5f227f2b13a76ffcb876007be5e5e6f06df89a23a6a424f84bf35e98
size 49351 size 49303
PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-en-GB.Generic-Room.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:060065ca3bd133753e075be975b29c5147bd5cde2eb3cb61cd1b376986bae37c oid sha256:2f3606c69ef13c10455f16b0dbe0f0ca0949e9b8d098a3e8f55db5e637cec5c9
size 174821 size 174737
PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-en-GB.Simple-Room.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:29136d24366425eaef80bd40fa69a332fcc92378f83b85a376f62ea40e22aa26 oid sha256:4d617ee77bb0c28caa1f497a5eb686da939efcc4cdcf65090a677ad85784e951
size 144375 size 150733
PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-pseudo.Generic-Room.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:002d4dc3993adddc0b07aa927be8d15a3cbd028f1dfb7c4176d44a1ba202091f oid sha256:2fd20f58c64f70ad239a1931bd641d5dae44fac435019bf7636a8242bb8ecf17
size 180485 size 181091
PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPad-pseudo.Simple-Room.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:1d90754cfbb2541edbc1e9d43dcbc7dd7067e440b230b1de0a8812ee091de655 oid sha256:ebe7c2ae984e6708d2bb380de749bed6cf6ad057617f2376a8eb732cfdf4c82b
size 152665 size 161418
PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPhone-16-en-GB.Generic-Room.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:12c7fd9be85bb2d5a245a4a8e5087068317c37c9116ff44492245dda2272aa2b oid sha256:c5b278b47754dd51580e98cf1941f48137662acab38c29c804bae6b0cf90b28e
size 112422 size 112164
PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPhone-16-en-GB.Simple-Room.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:9dc76892f1a8ad57ec5b39e477544761cc83abbe7ca2df49d3a5c02c4f784dd3 oid sha256:9fe74e979217cc6b8290a9600cd419c97111872bc28cef02ddc5c72c5a726e28
size 91560 size 97542
PreviewTests/Sources/__Snapshots__/PreviewTests/test_roomDetailsScreen-iPhone-16-pseudo.Simple-Room.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:f695712aa0f2caf38e73cab6a9b512d8534bc98c77b9c806dc088a8d7f4ae4df oid sha256:00cb4122a842fcad06774e2887681531bed4968b536c677fd010ebe223488086
size 112161 size 112130
project.yml
+1 -1
View File
@@ -65,7 +65,7 @@ packages:
# path: ../matrix-rust-sdk # path: ../matrix-rust-sdk
Compound: Compound:
url: https://github.com/element-hq/compound-ios url: https://github.com/element-hq/compound-ios
revision: 78e1290d2a9f903f929806221331d8b4e898f4fe revision: 1a70bc7f3420647843b9c18748982c61ef7d2245
# path: ../compound-ios # path: ../compound-ios
AnalyticsEvents: AnalyticsEvents:
url: https://github.com/matrix-org/matrix-analytics-events url: https://github.com/matrix-org/matrix-analytics-events