A couple of fixes to match the Figma more closely.

2026-10-31 08:15:24 +00:00 · 2026-05-27 11:19:20 +01:00
parent bf1d84bf5e
commit e0b7f1b3fa
50 changed files with 127 additions and 127 deletions
@@ -8,7 +8,6 @@

 import Combine
 import Compound
-import Foundation
 import SwiftUI

 enum UserIndicatorType: Equatable {
@@ -25,7 +25,7 @@ struct UserIndicatorModalView: View {

                HStack(spacing: 8) {
                    if let icon = indicator.icon {
-                        CompoundIcon(icon, size: .medium, relativeTo: .compound.headingMDBold)
+                        CompoundIcon(icon, size: iconSize, relativeTo: titleFont)
                            .foregroundColor(.compound.iconPrimary)
                    }
                    
@@ -69,6 +69,14 @@ struct UserIndicatorModalView: View {
            .compound.bodyLG
        }
    }
+    
+    private var iconSize: CompoundIcon.Size {
+        if indicator.message != nil {
+            .custom(32)
+        } else {
+            .medium
+        }
+    }
 }

 struct UserIndicatorModalView_Previews: PreviewProvider, TestablePreview {
@@ -58,16 +58,17 @@ struct RoomListFiltersView: View {
    }
    
    private func clearButton(scrollViewProxy: ScrollViewProxy) -> some View {
-        Button(action: {
+        Button {
            withAnimation(.easeInOut(duration: 0.2).disabledDuringTests()) {
                state.clearFilters()
                scrollViewProxy.scrollTo(leadingID, anchor: .leading)
            }
-        }, label: {
-            CompoundIcon(\.close, size: .small, relativeTo: .compound.bodyLG)
-                .foregroundColor(.compound.iconOnSolidPrimary)
-                .background(Circle().fill(Color.compound.bgActionPrimaryRest))
-        })
+        } label: {
+            CompoundIcon(\.close, size: .xSmall, relativeTo: .compound.bodyLG)
+                .foregroundStyle(.compound.iconOnSolidPrimary)
+                .padding(4)
+                .background(.compound.bgActionPrimaryRest, in: .circle)
+        }
        .accessibilityLabel(L10n.screenRoomlistClearFilters)
    }
    
@@ -25,14 +25,14 @@ struct HomeScreenNewSoundBanner: View {
    
    var content: some View {
        VStack(alignment: .leading, spacing: 4) {
-            HStack(alignment: .firstTextBaseline, spacing: 16) {
+            HStack(alignment: .center, spacing: 16) {
                Text(L10n.bannerNewSoundTitle)
                    .font(.compound.bodyLGSemibold)
                    .foregroundColor(.compound.textPrimary)
                    .frame(maxWidth: .infinity, alignment: .leading)
                
                Button(action: dismissAction) {
-                    CompoundIcon(\.close, size: .small, relativeTo: .compound.bodyMD)
+                    CompoundIcon(\.close, size: .medium, relativeTo: .compound.bodyLGSemibold)
                        .foregroundColor(.compound.iconSecondary)
                }
            }
@@ -56,7 +56,7 @@ struct HomeScreenRecoveryKeyConfirmationBanner: View {
    
    var content: some View {
        VStack(alignment: .leading, spacing: 4) {
-            HStack(alignment: .firstTextBaseline, spacing: 16) {
+            HStack(alignment: .center, spacing: 16) {
                Text(title)
                    .font(.compound.bodyLGSemibold)
                    .foregroundColor(.compound.textPrimary)
@@ -66,7 +66,7 @@ struct HomeScreenRecoveryKeyConfirmationBanner: View {
                    Button {
                        context.send(viewAction: .skipRecoveryKeyConfirmation)
                    } label: {
-                        CompoundIcon(\.close, size: .small, relativeTo: .compound.bodyMD)
+                        CompoundIcon(\.close, size: .medium, relativeTo: .compound.bodyLGSemibold)
                            .foregroundColor(.compound.iconSecondary)
                    }
                }
@@ -15,21 +15,12 @@ struct RoomChangeRolesScreenSelectedItem: View {
    let dismissAction: (() -> Void)?
    
    var body: some View {
-        mainContent
-            .accessibilityActions {
-                if let dismissAction {
-                    Button(L10n.actionDismiss) {
-                        dismissAction()
-                    }
-                }
-            }
-    }
-    
-    // MARK: - Private
-    
-    private var mainContent: some View {
        VStack(spacing: 4) {
-            avatar
+            if let dismissAction {
+                avatar.overlayRemoveItemButton(action: dismissAction)
+            } else {
+                avatar
+            }
            
            Text(member.name ?? member.id)
                .font(.compound.bodyMD)
@@ -37,6 +28,13 @@ struct RoomChangeRolesScreenSelectedItem: View {
                .lineLimit(1)
        }
        .accessibilityElement(children: .combine)
+        .accessibilityActions {
+            if let dismissAction {
+                Button(L10n.actionDismiss) {
+                    dismissAction()
+                }
+            }
+        }
    }
    
    var avatar: some View {
@@ -46,18 +44,6 @@ struct RoomChangeRolesScreenSelectedItem: View {
                            avatarSize: .user(on: .roomChangeRoles),
                            mediaProvider: mediaProvider)
            .accessibilityHidden(true)
-            .overlay(alignment: .topTrailing) {
-                if let dismissAction {
-                    Button(action: dismissAction) {
-                        CompoundIcon(\.close, size: .xSmall, relativeTo: .compound.bodyMD)
-                            .foregroundColor(.compound.iconOnSolidPrimary)
-                            .background(Circle().fill(Color.compound.iconPrimary))
-                    }
-                    // We will use the accessibility action
-                    .accessibilityHidden(true)
-                    .offset(x: 4)
-                }
-            }
    }
 }

@@ -37,7 +37,7 @@ struct CollapsibleRoomTimelineView: View {
                    isExpanded.toggle()
                }
            } label: {
-                HStack(alignment: .center, spacing: 8) {
+                HStack(alignment: .center, spacing: 4) {
                    Text(L10n.screenRoomTimelineStateChanges(timelineItem.items.count))
                        .font(.compound.bodySM)
                    CompoundIcon(\.chevronRight, size: .small, relativeTo: .compound.bodySM)
@@ -63,14 +63,20 @@ struct VideoRoomTimelineView: View {
    }
    
    var playIcon: some View {
-        CompoundIcon(\.playSolid, size: .custom(50), relativeTo: .compound.headingLG)
-            .background(.ultraThinMaterial, in: Circle())
-            .foregroundColor(.white)
+        CompoundIcon(\.playSolid, size: .medium, relativeTo: .compound.headingLG)
+            .foregroundStyle(.compound.iconPrimary)
+            .padding(13)
+            .background {
+                ZStack {
+                    Circle().fill(.compound.bgSubtleSecondary)
+                    Circle().stroke(.compound.borderInteractiveSecondary)
+                }
+            }
    }
    
    var placeholder: some View {
        Rectangle()
-            .foregroundColor(timelineItem.isOutgoing ? .compound._bgBubbleOutgoing : .compound._bgBubbleIncoming)
+            .foregroundStyle(timelineItem.isOutgoing ? .compound._bgBubbleOutgoing : .compound._bgBubbleIncoming)
            .opacity(0.3)
    }
 }
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3adae6454833b8202f3a81f9dfe71e1d38887dab1e1c0bcf7b5465afc26d724f
-size 70160
+oid sha256:30717f3786376396d90f2e49f82c8ca619c77cefa2e3f79304c9ffba44c1bc2a
+size 70186
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3befbafa56d0bf929894f377b48ab0dbed5280f9f0cc816aea18b44ee9e0bb52
-size 72905
+oid sha256:82e50c690a3fed9228050cc681af84ff6a63d2f2c4350a9a746775b4885f220a
+size 72747
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11d930b2f7fc68a32883bebacac38055e5ae77c165d98164cfa54f7b2c7f15e7
-size 29573
+oid sha256:e0e8553156b4f6b21b3dde3926d9c47437dbd6be68f05741827740cabac18fd9
+size 29528
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1dfa3be64df154d03562acb51ac744fd79fd599b4015cf5b697b75af642aa73b
-size 31704
+oid sha256:59a15dcd568fc11134dbdf77e3a17c4508f32f1743191e083817976454db1e98
+size 31547
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:967f744c000e7e1cb1ac6cc364e0f4cf5a992294e242e9c542230f9207483e47
-size 93468
+oid sha256:a1ca2307a49b94124067a71b1560425145d176ba0f3efe609b727a4086b9a4de
+size 93533
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be0f722aa2efc9355f5d535690f87444331d04c678c14516a5615bb27c270e65
-size 103566
+oid sha256:3d309f575358ef4eee201162dffc0d8e89528cb4ad735eb92c9136ebafbbe92c
+size 103582
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fed3dd39727a59de958927d89fe521e9f89d39d042b7556fda5870de7b2bffb0
-size 52336
+oid sha256:2f5783a8ec7adfc5671bda7636f0d86f8df8caaef122efead1cbdc49377cdcf1
+size 52381
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f1867c392007546714e032483a5e5bc0e5d692d828803edd54058a56377ae56a
-size 72121
+oid sha256:6ffff79c7e3a63ed72f577fba8934c0b2efaa10956a858f84e08ea2986e34253
+size 72311
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:67b31e4418f077fb46c90030fab224901935a9db31a804a6032635b00bfeaa79
-size 109410
+oid sha256:a90da143f32ad06b1fba79e293b12232ce40048d7518749e91cfe25987ff0876
+size 109428
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e933b5cc144bc3dc3b780033509ae0d4abf1f101ed74a38f3de3e010bc1031e9
-size 133304
+oid sha256:e186dbb65a6fa6a91b3817489c056b0d0321b6fb3b55d7e1acda3cd4b40f1be8
+size 133301
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2def7dabff688c009fe480e389ffd189e0fd79310593c673cceae82ac3ff4fd3
-size 72414
+oid sha256:25a95a0f9c869c97e5fbe39d61db940df2725a0b98f99663eee169ca593f5e79
+size 72450
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b89af8d01695bdcf915ae7765a457de9b02672066f74d531f5212822660d89e
-size 106479
+oid sha256:37d4b71b28e04968a69782b9234be81ad33a648341c050515dda2875e05ceb57
+size 106459
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd7ffab99917712ee1c25579e9e56d65fd20b5e9d01e45fe003f1ea4e08610c1
-size 217349
+oid sha256:f633b9fc6661ee55c2e4db60bad48db79ba73a9f591abe49c7f3837a64b71c72
+size 217464
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28121329299d70c4a83e567128b2fed005e337c2f2f2e6543ae1972cc30ad8d4
-size 230794
+oid sha256:f12e89d82d7bbc833888eb67e92ac5d60851ac9f79e87f656269946a97fd642c
+size 230916
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a932dff1e5ca14f89bd5b695c7e9af265fb107a7ce6893bca11e737e7e6ded1
-size 157129
+oid sha256:3b841336ac86831e88752fee5cf50f13a341ac27b4a5686a38cfe80b5d4accc9
+size 157204
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9bc16656a6baf1d5f9b243b1bdf09a3b92b4a29c31f4c608d304481b6a9a0b94
-size 167655
+oid sha256:3586f7cf96c3d73640ce3cdc5c86dd84b77ac22d163e2ac6527cfa3cf500e4c6
+size 167780
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31c2a1341baceb3525c27c35eba5fa144b1616242e6aef7c6b81829c5dec6dc9
-size 226196
+oid sha256:c5df5f8ed64a6c4310d184bf647ff891563cf300372f0c94b8658353e5cd2eca
+size 226759
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d1165ebe2cbc8d2f10f908baff3bac514e2da27550020358298490b7e786759
-size 243251
+oid sha256:153f8e7c838c06afc670c16b77f5a7c3447a5aab2edcb8da625e3d70572bf9cd
+size 243752
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f1499b537575b67d5051fb51471a62b23db1e8deca5cc2e2a32b184bfe87c2a0
-size 206252
+oid sha256:422e351fc3f0f3501fdd8f09290777e3888bf85396772be0712197a0a7507c11
+size 206365
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:89548b940d5fe68be05863e011c4ed12d1a133ce421862a5a6971879688a4a59
-size 215025
+oid sha256:5f9aec4b5f673fd47d5a7ddae1afd06a0f56d20a21b594dca0197db09462807f
+size 215119
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12f804b51eed6f412826bc5517d0972caf2c3f43b69c6945ad92cfba433a5e68
-size 150514
+oid sha256:36dcfee203006573436e26a83c40cacbbe1168d325f15016a5191e70727bff6e
+size 150603
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c48a88226a134316ae965df8c767d25af2a70182e2c02c115796a6d8783f90d
-size 158694
+oid sha256:442db3438dc4b619f704a917bacc6e600a5bc0d84b4de00409d419e8dc1c6e2c
+size 158775
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:35744324ff95b69bfd3e69d3798d0aa8872bcaaaeaa891e76d8dab92fd244548
-size 63343
+oid sha256:6f768bd720b60ace15fd9b1c4cbda91a28c36e7b54686115703ddf0e155b929f
+size 62856
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:35744324ff95b69bfd3e69d3798d0aa8872bcaaaeaa891e76d8dab92fd244548
-size 63343
+oid sha256:6f768bd720b60ace15fd9b1c4cbda91a28c36e7b54686115703ddf0e155b929f
+size 62856
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04776b7f2bed75dde4bd65340dc5da5676580fbd335ee36730b7fb466274a6c9
-size 52825
+oid sha256:595d9ab38cc6bc77534a7ee79753333da84e0ad6ea99772e56b192c7866cfd1e
+size 52445
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04776b7f2bed75dde4bd65340dc5da5676580fbd335ee36730b7fb466274a6c9
-size 52825
+oid sha256:595d9ab38cc6bc77534a7ee79753333da84e0ad6ea99772e56b192c7866cfd1e
+size 52445
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be93d1214cb9e5fa82fed74e46425e016da75215294ba7b6111731d144ffe5c5
-size 78217
+oid sha256:f7ad05300c076f49e3650ce850af924ca8b0849b7efd8808fdb3a7fee8edab91
+size 77338
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c63b3f9f85966245332b854c1f36dac6d6e2442689682204b695ed700f16c9e
-size 79094
+oid sha256:0464cfa06488e721bfce7d002cd6526f7f07c796edb1d89ec5e6d9f6f46a89c0
+size 79335
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:34c867d6515643e0c52bced21879abe2c5096ee8812c99f9242ea9b3772568a2
-size 80984
+oid sha256:78dca2d0c1ad22f5064a3b62f513c122b34270fd1890831e9470fd0c9ac1e922
+size 81045
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:20af8913784a070dde20c29d24e84f720b6d11056eaf86e8e1818db7e70e38b0
-size 82858
+oid sha256:72aacee8bd73561f7cd0773bc8c650e065d495fbbedb9597dd5a2d540a4ee111
+size 82939
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ad7151cf1e4e885c0e3994b72dd238f95a436007b2d7ee2340ccb63bf1734b1
-size 35786
+oid sha256:5d46c3bfdfbf1c0cc1466baf1a438590a6cc6437dcccf4806fc92c9f345a2977
+size 36151
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f98cf5953fd486ae82f3ca7b940bcc4de75e0930a3dc950ef5c4d5b037e600e
-size 37649
+oid sha256:cd6d7949a03be6726268461fa2c3dfec5f5408310c63ff19918517c8160c6cb4
+size 37747
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:97b469806f08ff3040b605cef7926af720134b4866d7fb1fe0fab4bba9705421
-size 36020
+oid sha256:1bd24f2d9c151bb5acd25a1ec5312392ab4620dbcf63f516456813f498738f65
+size 35939
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2bd2276b5e30196b796c97820485ac22fd3d05faa04366540566b37c36abc69f
-size 37177
+oid sha256:0fed065dcf652394c8e019a5ac850f3b6276aa4c7880752a36aba0a52cea2bd6
+size 37319
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:41fe13a6a0b5db20f9d4d7591f0df1019f663e681d26eac666a914a13257a2c8
-size 150402
+oid sha256:d1777ecb9b769fad5538e2e4a313a9c5175fe1db95a510b6f5e1a42a6205482a
+size 150724
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:41fe13a6a0b5db20f9d4d7591f0df1019f663e681d26eac666a914a13257a2c8
-size 150402
+oid sha256:d1777ecb9b769fad5538e2e4a313a9c5175fe1db95a510b6f5e1a42a6205482a
+size 150724
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0609dc84fdb42c92d3c9237d4a47072139fe06675b1a1ddac633735dc1aa0d3e
-size 87579
+oid sha256:f35d4d9cbe86947e2ffd4716d8d66811e1873c7a0c7528a5b498975c44585fd4
+size 87791
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0609dc84fdb42c92d3c9237d4a47072139fe06675b1a1ddac633735dc1aa0d3e
-size 87579
+oid sha256:f35d4d9cbe86947e2ffd4716d8d66811e1873c7a0c7528a5b498975c44585fd4
+size 87791
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e266ee47ce41ad70ce325914157709cd26d8bc077c70c79d91d03a14bed4fd4c
-size 5342546
+oid sha256:050e655cd892630d1afc7cc5d84e1dd66fa44261b8229b3cf26138ff12dffa2b
+size 5292356
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6832bd3395e17a57b39312578296aaf08b8b2f17151f1639275add9c438ade8c
-size 5333002
+oid sha256:a653f6dc96de9ac995a2e75c442199ab00362ce8af9987b81e08380f7f60bed1
+size 5281081
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a002998a229caa31386ad65c56e7a35bf3a036339f2f7ed492b61a9ca18d041
-size 1492283
+oid sha256:074f5754c1689725709571ddfb6271d51192422b522ae3b2b5953950f41e27bd
+size 1450274
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2151f4d26c345860cf72640a48fae7fbfd82c35f23af5e8aae80decfa695a69d
-size 1486142
+oid sha256:ad1697dc27e44b6c9522fd8efc97a3f89e948cc342e9638fcc35e630817c5611
+size 1443058