Update dependency element-hq/compound-design-tokens to v6.10.1 (#5123)

* Update dependency element-hq/compound-design-tokens to v6.10.0 * Further Compound updates. The gradients have been simplified and are now opaque. * Missed snapshots. --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Doug <douglase@element.io>
2026-02-25 21:45:10 +00:00
parent e71e3487c7
commit aafb467e85
25 changed files with 56 additions and 59 deletions
--- 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" : "d55164b64a67277c62ee4e4ccebea535168ea7be",
-        "version" : "6.9.0"
+        "revision" : "a3dedba504bd1a3d04ce2a62eef00b9eef799ec4",
+        "version" : "6.10.1"
      }
    },
    {
--- a/ElementX/Sources/Other/SwiftUI/Views/HorizontalHighlightGradient.swift
+++ b/ElementX/Sources/Other/SwiftUI/Views/HorizontalHighlightGradient.swift
@@ -10,15 +10,14 @@ import Compound
 import SwiftUI

 extension View {
-    func highlight(gradient: Gradient, borderColor: Color, backgroundColor: Color = .clear) -> some View {
-        modifier(HorizontalHighlightGradient(gradient: gradient, borderColor: borderColor, backgroundColor: backgroundColor))
+    func highlight(gradient: Gradient, borderColor: Color) -> some View {
+        modifier(HorizontalHighlightGradient(gradient: gradient, borderColor: borderColor))
    }
 }

 struct HorizontalHighlightGradient: ViewModifier {
    let gradient: Gradient
    let borderColor: Color
-    let backgroundColor: Color
    
    func body(content: Content) -> some View {
        ZStack(alignment: .top) {
@@ -28,7 +27,6 @@ struct HorizontalHighlightGradient: ViewModifier {
                LinearGradient(gradient: gradient,
                               startPoint: .top,
                               endPoint: .bottom)
-                    .background(backgroundColor)
            }
            content
                .layoutPriority(1)
--- a/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
@@ -133,9 +133,7 @@ struct RoomScreen: View {
        .padding(.top, 16)
        .padding(.horizontal, 16)
        .padding(.bottom, 12)
-        .highlight(gradient: .compound.info,
-                   borderColor: .compound.borderInfoSubtle,
-                   backgroundColor: .compound.bgCanvasDefault)
+        .highlight(gradient: .compound.info, borderColor: .compound.borderInfoSubtle)
    }
    
    @ViewBuilder
--- a/ElementX/Sources/Screens/RoomScreen/View/RoomScreenFooterView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/RoomScreenFooterView.swift
@@ -30,7 +30,7 @@ struct RoomScreenFooterView: View {
        case .pinViolation:
            .compound.info
        case .verificationViolation:
-            Gradient(colors: [.compound.bgCriticalSubtle, .clear])
+            .compound.critical
        case .none:
            Gradient(colors: [.clear])
        }
@@ -39,9 +39,7 @@ struct RoomScreenFooterView: View {
    var body: some View {
        if let details {
            detailsView(details)
-                .highlight(gradient: gradient,
-                           borderColor: borderColor,
-                           backgroundColor: .compound.bgCanvasDefault)
+                .highlight(gradient: gradient, borderColor: borderColor)
                .padding(.top, 8)
                .fixedSize(horizontal: false, vertical: true)
        }
--- a/PreviewTests/Sources/Snapshots/PreviewTests/roomScreen.Tombstoned-iPad-en-GB.png
+++ b/PreviewTests/Sources/Snapshots/PreviewTests/roomScreen.Tombstoned-iPad-en-GB.png
--- a/PreviewTests/Sources/Snapshots/PreviewTests/roomScreen.Tombstoned-iPad-pseudo.png
+++ b/PreviewTests/Sources/Snapshots/PreviewTests/roomScreen.Tombstoned-iPad-pseudo.png
--- a/PreviewTests/Sources/Snapshots/PreviewTests/roomScreen.Tombstoned-iPhone-en-GB.png
+++ b/PreviewTests/Sources/Snapshots/PreviewTests/roomScreen.Tombstoned-iPhone-en-GB.png
--- a/PreviewTests/Sources/Snapshots/PreviewTests/roomScreen.Tombstoned-iPhone-pseudo.png
+++ b/PreviewTests/Sources/Snapshots/PreviewTests/roomScreen.Tombstoned-iPhone-pseudo.png
--- a/PreviewTests/Sources/Snapshots/PreviewTests/roomScreenFooterView.With-displayname-iPad-en-GB.png
+++ b/PreviewTests/Sources/Snapshots/PreviewTests/roomScreenFooterView.With-displayname-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:016ee0b4eb77e60c78efd864d5af4eb6500ef150f7e9c606cc6949368152f92a
-size 150213
+oid sha256:a032f4be4d3ce9f22e6f57b330f83834d2414a395e191245e82bd29b6ca6fb09
+size 155249
--- a/PreviewTests/Sources/Snapshots/PreviewTests/roomScreenFooterView.With-displayname-iPad-pseudo.png
+++ b/PreviewTests/Sources/Snapshots/PreviewTests/roomScreenFooterView.With-displayname-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2fffc4e1ee932de48ae09e14c4c8414da423aae6062779fb8527621b61522eac
-size 163050
+oid sha256:603c1b0654b6252adb63cedf8a26c5478c02dc303b0e6eb34abc6005b8f55cab
+size 165263
--- a/PreviewTests/Sources/Snapshots/PreviewTests/roomScreenFooterView.With-displayname-iPhone-en-GB.png
+++ b/PreviewTests/Sources/Snapshots/PreviewTests/roomScreenFooterView.With-displayname-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:33889654d5af0ae1ec2ef13de6d22fbab185d9d171c247b5582ef87fa1ca9ce3
-size 75897
+oid sha256:85a14f8c2a6958e6ecf5cdb48749c2319be6389316341f9bcac43d528e1528d4
+size 76281
--- a/PreviewTests/Sources/Snapshots/PreviewTests/roomScreenFooterView.With-displayname-iPhone-pseudo.png
+++ b/PreviewTests/Sources/Snapshots/PreviewTests/roomScreenFooterView.With-displayname-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc6d2f6d5385bedb3ca3dd6cbe59226309e7619f838cdf0d9832ad6d024bde53
-size 93597
+oid sha256:db21e8a1c8cb22546992365a31f0f3100bb0594a7899c7c53fea98e0543fa064
+size 90980
--- a/PreviewTests/Sources/Snapshots/PreviewTests/roomScreenFooterView.Without-displayname-iPad-en-GB.png
+++ b/PreviewTests/Sources/Snapshots/PreviewTests/roomScreenFooterView.Without-displayname-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:005a8d737c2f53062d372cabfe17d6ceaeb724393a245299d4e11ffc8b445b0f
-size 152438
+oid sha256:7e574b67bfed862f5c6c3b5ff8a82d3533b1b60c915ae79096303f85b6c603e9
+size 157392
--- a/PreviewTests/Sources/Snapshots/PreviewTests/roomScreenFooterView.Without-displayname-iPad-pseudo.png
+++ b/PreviewTests/Sources/Snapshots/PreviewTests/roomScreenFooterView.Without-displayname-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16963a8e198f0e034a77f10ad0a95855e28e61db55046e42ab021c32712f71af
-size 166337
+oid sha256:f6213aac793497f7884e85e6e4f71fda331892e1a1a5acb10c43e6ef176acc16
+size 167929
--- a/PreviewTests/Sources/Snapshots/PreviewTests/roomScreenFooterView.Without-displayname-iPhone-en-GB.png
+++ b/PreviewTests/Sources/Snapshots/PreviewTests/roomScreenFooterView.Without-displayname-iPhone-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8165145f91e72fb6ae88b89c838664afa43266d8bf19741405dd6ddd14d45612
-size 78094
+oid sha256:6a8b52ec487a5a5b747c8e4752b35925b93665075a7e3208105dfe5221b15062
+size 78182
--- a/PreviewTests/Sources/Snapshots/PreviewTests/roomScreenFooterView.Without-displayname-iPhone-pseudo.png
+++ b/PreviewTests/Sources/Snapshots/PreviewTests/roomScreenFooterView.Without-displayname-iPhone-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b6c5ded9efa5317aba0606b9fe602dcc911fea6ac1a3738129cb2e6db9065fc
-size 106764
+oid sha256:933d8b9f6dd16cb8542b771205fca8e180e9f8f332f1c8f6fcbde30f6dd057d0
+size 101973
--- a/PreviewTests/Sources/Snapshots/PreviewTests/timelineStartRoomTimelineView.with-predecessor-iPad-en-GB.png
+++ b/PreviewTests/Sources/Snapshots/PreviewTests/timelineStartRoomTimelineView.with-predecessor-iPad-en-GB.png
--- a/PreviewTests/Sources/Snapshots/PreviewTests/timelineStartRoomTimelineView.with-predecessor-iPad-pseudo.png
+++ b/PreviewTests/Sources/Snapshots/PreviewTests/timelineStartRoomTimelineView.with-predecessor-iPad-pseudo.png
--- a/PreviewTests/Sources/Snapshots/PreviewTests/timelineStartRoomTimelineView.with-predecessor-iPhone-en-GB.png
+++ b/PreviewTests/Sources/Snapshots/PreviewTests/timelineStartRoomTimelineView.with-predecessor-iPhone-en-GB.png
--- a/PreviewTests/Sources/Snapshots/PreviewTests/timelineStartRoomTimelineView.with-predecessor-iPhone-pseudo.png
+++ b/PreviewTests/Sources/Snapshots/PreviewTests/timelineStartRoomTimelineView.with-predecessor-iPhone-pseudo.png
--- a/compound-ios/Inspector/Inspector.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/compound-ios/Inspector/Inspector.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,12 +1,13 @@
 {
+  "originHash" : "f1bd760161a06debbba4152a9ad83d70deae74ffe4d91dd85d4d412572c1cde9",
  "pins" : [
    {
      "identity" : "compound-design-tokens",
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/element-hq/compound-design-tokens.git",
      "state" : {
-        "revision" : "d55164b64a67277c62ee4e4ccebea535168ea7be",
-        "version" : "6.9.0"
+        "revision" : "a3dedba504bd1a3d04ce2a62eef00b9eef799ec4",
+        "version" : "6.10.1"
      }
    },
    {
@@ -64,5 +65,5 @@
      }
    }
  ],
-  "version" : 2
+  "version" : 3
 }
--- a/compound-ios/Inspector/Sources/Tokens/GradientsScreen.swift
+++ b/compound-ios/Inspector/Sources/Tokens/GradientsScreen.swift
@@ -11,7 +11,9 @@ import SwiftUI

 struct GradientsScreen: View {
    var body: some View {
-        ScreenContent(navigationTitle: "Colors") {
+        ScreenContent(navigationTitle: "Gradients") {
+            // allValues isn't currently working as gradients use computed properties
+            // in order for them to work with colour overrides.
            ForEach(Gradient.compound.allValues, id: \.name) { gradient in
                GradientItem(gradient: gradient.value, name: gradient.name)
            }
--- a/compound-ios/Package.resolved
+++ b/compound-ios/Package.resolved
@@ -1,12 +1,13 @@
 {
+  "originHash" : "f1bd760161a06debbba4152a9ad83d70deae74ffe4d91dd85d4d412572c1cde9",
  "pins" : [
    {
      "identity" : "compound-design-tokens",
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/element-hq/compound-design-tokens",
      "state" : {
-        "revision" : "d55164b64a67277c62ee4e4ccebea535168ea7be",
-        "version" : "6.9.0"
+        "revision" : "a3dedba504bd1a3d04ce2a62eef00b9eef799ec4",
+        "version" : "6.10.1"
      }
    },
    {
@@ -64,5 +65,5 @@
      }
    }
  ],
-  "version" : 2
+  "version" : 3
 }
--- a/compound-ios/Package.swift
+++ b/compound-ios/Package.swift
@@ -9,7 +9,7 @@ let package = Package(
        .library(name: "Compound", targets: ["Compound"])
    ],
    dependencies: [
-        .package(url: "https://github.com/element-hq/compound-design-tokens", exact: "6.9.0"),
+        .package(url: "https://github.com/element-hq/compound-design-tokens", exact: "6.10.1"),
        // .package(path: "../compound-design-tokens"),
        .package(url: "https://github.com/siteline/SwiftUI-Introspect", from: "26.0.0"),
        .package(url: "https://github.com/SFSafeSymbols/SFSafeSymbols", from: "7.0.0"),
--- a/compound-ios/Sources/Compound/Colors/CompoundGradients.swift
+++ b/compound-ios/Sources/Compound/Colors/CompoundGradients.swift
@@ -36,11 +36,10 @@ public struct CompoundGradients {
    }

    public var info: Gradient {
-        .init(colors: [.compound.gradientInfoStop1,
-                       .compound.gradientInfoStop2,
-                       .compound.gradientInfoStop3,
-                       .compound.gradientInfoStop4,
-                       .compound.gradientInfoStop5,
-                       .compound.gradientInfoStop6])
+        .init(colors: [.compound.gradientInfoStop1, .compound.gradientInfoStop2])
+    }
+    
+    public var critical: Gradient {
+        .init(colors: [.compound.gradientCriticalStop1, .compound.gradientCriticalStop2])
    }
 }