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

multi selection should have the accessory on the leading side

Browse Source
This commit is contained in:
Mauro Romito
2025-11-28 12:42:24 +01:00
committed by Mauro
parent 4a38e2cca6
commit 0cf5a9c618
28 changed files with 76 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrator-or-Owners-iPad-en-GB.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:31747cb106793a732577a3c2159acdb4147c1e3d7863e63e3725f1dc6732cdb0
size 219215
oid sha256:2f4c6058d144ac250c095c6382a48cc20e8e56fc199431671ce775486694b58d
size 219336
PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrator-or-Owners-iPad-pseudo.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c048d0e4bff9bcc45be03eecb34e4150b7f8b184654448943e454e79c34fbf30
size 232266
oid sha256:1336722aea534e4caeb2eee6eb3913b54326eca68aa1adc7f294a4792744745b
size 232371
PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrator-or-Owners-iPhone-en-GB.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f72059b3920a5aaf2a4eb083a7046607bfc9e6067007ee6b30ff24c37bcbf007
size 159314
oid sha256:edc85fbadfab63374a4c9252139f5ba1e32dca82b4811291bdd1569ed04ec3e9
size 159098
PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrator-or-Owners-iPhone-pseudo.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:38c787a7b8cfaefb171fd4594bf7d619be18c5346bd06edb8fdb1992b69bf6df
size 166097
oid sha256:c3440a86868c74402f187db3f22c6e912acb151999196886411fc94b3acb0a63
size 166063
PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrators-iPad-en-GB.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b1f34b0587f76f5355992c36195181caa0c2295d55550321ac2214e714cd3635
size 215694
oid sha256:5a5adce8b91ff7566a08a7ba87bff6e673ea35641ff62793d5f74756702e5dce
size 215965
PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrators-iPad-pseudo.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:42546ac3874cf56b296254674682410bf22bcde2a9deb15cf5660b72cf365674
size 226843
oid sha256:e8d121cd15157ea9cdf41741bad439c695c3cb3f4b1a03d24af112eae75ef6b0
size 227128
PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrators-iPhone-en-GB.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a8bb93d60f29c30ee98bcc6f734ee31b53b3dac3ad06fd4d29385002f791b20d
size 156455
oid sha256:3dd89170126ab834d68d8e07b1e236170912a90d649e30fda8c8b3bf974db440
size 156488
PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Administrators-iPhone-pseudo.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2690ec4617f689bc8543800ca22c60239e723698c79304f0c799ddbce0410761
size 163182
oid sha256:f86df1c62027193b38f41eef2c9073932ca6f260d7010524c9d1fbd401aefe94
size 163383
PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Moderators-iPad-en-GB.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bcf0895011c8f70b9a4064b6c48cc5b8ca7303f469244d84bf733d2c56285f0f
size 227663
oid sha256:6fc093aad1fb4c85e3215faf774336007a5dd3b79d518abcb5b40d4543e00602
size 227904
PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Moderators-iPad-pseudo.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:42665a61151124f7567c63f8a345bd44f137880c6a173bb2f1e187ce3eaa8f13
size 243767
oid sha256:887e49f48a4fbf3cf8d500732d064129de51c5963546b0ba639f623f4e14f3e6
size 244058
PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Moderators-iPhone-en-GB.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a495cb363d7d3063991b04c9d8361a2556abd5e2d5203b986fd61ca259886618
size 161176
oid sha256:0330ac9854242393c063db47fba43eca1ec18748d10493b8729f9bfbd8bda425
size 161300
PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Moderators-iPhone-pseudo.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f442e58bac75cd13c45ae5ad57fc03312683e2dba236f23a817555be5a2d28fc
size 175061
oid sha256:e27bdb7c6f0cf1d900fea8b4963267a952d747db8b639226edfccb1205b436db
size 175222
PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Owners-iPad-en-GB.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3aa37fdb6bab20b3eef8c2787937aa7dfc688a2e6a4c50e78cafc901b4ad86d0
size 209677
oid sha256:701b7b4c1ef1bef6a0c8ed79e515b2fb0bf595ee1187ee8ac3145b7e4fce478a
size 209832
PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Owners-iPad-pseudo.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8a82ae085aedbd14d2f9a54e9509c69cc3d26e55523c94c8cd0d86b3753a5a6b
size 217370
oid sha256:71009b4e3c2d226517062c78c27a55975efcd1a026c16bc18535f4f18eb9a758
size 217520
PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Owners-iPhone-en-GB.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6feda5e32a45710402285dd07e1eee1f8774508b6ab924436bd283380d7e8998
size 151547
oid sha256:4088e3e252f1ac08ab8ef7f81e2b4782461b7d9465b6ebdfc10f5595e3f677f1
size 151264
PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreen.Owners-iPhone-pseudo.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:07d2b2bca87cba694c73a9ec0a8f85f57e05b008328e224f3fef74bf23f57647
size 156542
oid sha256:f7919f5242a50e391bce847bab78f4156312f22d83a341fe3a11f549184d8395
size 156573
PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreenRow.iPad-en-GB-0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5f8e64d32a9e1b55a90b3f39c48c80a51ff16bf54bcec606b5b4f7e0123766a1
size 131481
oid sha256:8710aa790902d209158c0ccfbba4587278b8fa5daf7548d1c14d1f72a7226f64
size 131248
PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreenRow.iPad-pseudo-0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8cf4ed11f82e8f63fc67e3a684dc5e4b2717bda4a8606f07d2b6e1e368df312d
size 132893
oid sha256:0e62de1a3583c22a726970ef98446da37cde355b857522b4d5519c343929eb2c
size 132679
PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreenRow.iPhone-en-GB-0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3a9d5a305b64e17f150b1d0b0b5f37e981314ee1193e9194d81539784709b3c9
size 78502
oid sha256:0935842c6830f85e0867e48a2a706d34133de9a111fefa76a01d7dc9bd5d7622
size 77934
PreviewTests/Sources/__Snapshots__/PreviewTests/roomChangeRolesScreenRow.iPhone-pseudo-0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a6c82f07705ead0a6eea1963db610dd6b105e87b3b5158bef7e5e34c5cbce15f
size 79511
oid sha256:bb4f2ab5938d8c46d3d5bc77ac8c5bcce8d7bc821f41373a0261c7ccc9560828
size 78769
PreviewTests/Sources/__Snapshots__/PreviewTests/userProfileCell.iPad-en-GB-0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:61285c887fc31e6bf7201a22304643941f01aa6e81fda9be233becbdefc2c3d9
size 133828
oid sha256:e3e657317047e8a4075c1e08be816cad0708443fe7f3e5c191376b0e6a5c365f
size 133687
PreviewTests/Sources/__Snapshots__/PreviewTests/userProfileCell.iPad-pseudo-0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e1eb937fb1ea3a20c99c6a371af942f9efd51504b62eced77500eed6d151af3f
size 141864
oid sha256:c3edc115cb37e4983b90262168f6589d00d446a7195268fed402f4f88b5a4ea3
size 141700
PreviewTests/Sources/__Snapshots__/PreviewTests/userProfileCell.iPhone-en-GB-0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fba1795a21b070ebd3257c9cad601699d13ff1209da2bee559f2f9461b16d4e2
size 81946
oid sha256:1015c5b6b30380a62827fc7c42846d95a955b797c7c05eca57b8fb7f3ce048db
size 81860
PreviewTests/Sources/__Snapshots__/PreviewTests/userProfileCell.iPhone-pseudo-0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:87f785efdbb262e881c22150943d6703cad0226100064b963163a729437017d1
size 94724
oid sha256:1c1eac15d7019f393c48abef6ad11892afbe5b33e36d566e83fe5cfe0082f61b
size 95017
compound-ios/Sources/Compound/List/ListRow.swift
+15 -5
View File
@@ -218,12 +218,22 @@ private struct RowContent<Label: View, DetailsIcon: View>: View {
let label: () -> Label
var body: some View {
HStack(spacing: ListRowTrailingSectionSpacing.horizontal) {
label()
.frame(maxWidth: .infinity)
HStack(spacing: 0) {
// We should always have multi selection shown on the leading side
if let accessory, accessory.kind.isMultiSelection {
accessory
.padding(.leading, ListRowPadding.horizontal)
}
if details != nil || accessory != nil {
ListRowTrailingSection(details, accessory: accessory)
HStack(spacing: ListRowTrailingSectionSpacing.horizontal) {
label()
.frame(maxWidth: .infinity)
if details != nil || accessory != nil {
ListRowTrailingSection(details,
// Prevent multi selection to appear on the trailing side
accessory: accessory?.kind.isMultiSelection == true ? nil : accessory)
}
}
}
.frame(maxHeight: .infinity)
compound-ios/Sources/Compound/List/ListRowAccessory.swift
+9
View File
@@ -23,6 +23,15 @@ public struct ListRowAccessory: View {
case multiSelected
/// An empty circle.
case multiUnselected
var isMultiSelection: Bool {
switch self {
case .multiSelected, .multiUnselected:
true
default:
false
}
}
}
/// A chevron to indicate that the button pushes another screen.
compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/listRow.iPad-en-US-0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:56eeb69cb930a4a8768b9e965cb1b107d9e2d6e767284b20c720cbd026318977
size 397819
oid sha256:82772eb033bbbcd890f2fc4029430ba9436d9643535a73c4f368151149537edc
size 398298
compound-ios/Tests/CompoundTests/__Snapshots__/PreviewTests/listRow.iPhone-en-US-0.png
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b92722ff5a722dcf2f3815311d99149bf70ed8c146350a5ff83caab4ed63cb93
size 266194
oid sha256:de442478c2e805ffda381d0e309e16558dee99d6834fa76bd454138db0c1fb7a
size 265583