Remove DesignKit package (#1886)

- Move button styles to Compound
- Rename text style to AuthenticationTextStyle as its only in the auth flow.
- Add the brand colour locally for now until its included in Compound.

* Update snapshots.

---------

Co-authored-by: Stefan Ceriu <stefan.ceriu@gmail.com>

DesignKit/Package.resolved

@@ -1,39 +0,0 @@
-{
-  "pins" : [
-    {
-      "identity" : "compound-design-tokens",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/vector-im/compound-design-tokens.git",
-      "state" : {
-        "revision" : "d9d1a792d8a124708c7e15becd359893ee9e9ea6"
-      }
-    },
-    {
-      "identity" : "compound-ios",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/vector-im/compound-ios.git",
-      "state" : {
-        "revision" : "a6aec9a77bf008c86a296ba17d60005b5a8bfae4"
-      }
-    },
-    {
-      "identity" : "element-design-tokens",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/vector-im/element-design-tokens.git",
-      "state" : {
-        "revision" : "63e40f10b336c136d6d05f7967e4565e37d3d760",
-        "version" : "0.0.3"
-      }
-    },
-    {
-      "identity" : "swiftui-introspect",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/siteline/SwiftUI-Introspect.git",
-      "state" : {
-        "revision" : "5b3f3996c7a2a84d5f4ba0e03cd7d584154778f2",
-        "version" : "0.3.1"
-      }
-    }
-  ],
-  "version" : 2
-}

DesignKit/Package.swift

@@ -1,31 +0,0 @@
-// swift-tools-version: 5.7
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
-import PackageDescription
-
-let package = Package(
-    name: "DesignKit",
-    platforms: [
-        .iOS(.v16)
-    ],
-    products: [
-        .library(name: "DesignKit", targets: ["DesignKit"])
-    ],
-    dependencies: [
-        .package(url: "https://github.com/vector-im/compound-ios", revision: "0966ff92b2670e3a96259c87016edd92d7ea7797"),
-        .package(url: "https://github.com/vector-im/element-design-tokens", exact: "0.0.3"),
-        .package(url: "https://github.com/siteline/SwiftUI-Introspect", from: "0.9.0")
-    ],
-    targets: [
-        .target(name: "DesignKit",
-                dependencies: [
-                    .product(name: "Compound", package: "compound-ios"),
-                    .product(name: "DesignTokens", package: "element-design-tokens"),
-                    .product(name: "SwiftUIIntrospect", package: "SwiftUI-Introspect")
-                ],
-                path: "Sources"),
-        .testTarget(name: "DesignKitTests",
-                    dependencies: ["DesignKit"],
-                    path: "Tests")
-    ]
-)

DesignKit/Sources/Buttons/ElementActionButtonStyle.swift

@@ -1,91 +0,0 @@
-//
-// Copyright 2022 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Compound
-import DesignTokens
-import SwiftUI
-
-public extension ButtonStyle where Self == ElementActionButtonStyle {
-    /// The CTA button style as defined in Compound.
-    /// - Parameter size: The control size to use. Defaults to regular.
-    /// - Parameter color: The color of the button's background. Defaults to the accent color.
-    static func elementAction(_ size: ElementControlSize = .regular,
-                              color: Color = .compound.textActionPrimary) -> ElementActionButtonStyle {
-        ElementActionButtonStyle(size: size, color: color)
-    }
-}
-
-public struct ElementActionButtonStyle: ButtonStyle {
-    @Environment(\.isEnabled) private var isEnabled
-    @Environment(\.colorScheme) private var colorScheme
-    
-    public var size: ElementControlSize
-    public var color: Color
-    
-    private var cornerRadius: CGFloat { size == .xLarge ? 14 : 8 }
-    private var verticalPadding: CGFloat { size == .xLarge ? 14 : 4 }
-    private var maxWidth: CGFloat? { size == .xLarge ? .infinity : nil }
-    
-    private var fontColor: Color {
-        Color.compound.textOnSolidPrimary
-            .opacity(colorScheme == .dark && !isEnabled ? 0.3 : 1.0)
-    }
-    
-    public init(size: ElementControlSize = .regular, color: Color = .compound.textActionPrimary) {
-        self.size = size
-        self.color = color
-    }
-    
-    public func makeBody(configuration: Self.Configuration) -> some View {
-        configuration.label
-            .padding(.horizontal, 12)
-            .padding(.vertical, verticalPadding)
-            .frame(maxWidth: maxWidth)
-            .foregroundColor(fontColor)
-            .font(.compound.bodyLGSemibold)
-            .background(Capsule()
-                .fill(color)
-                .opacity(backgroundOpacity(when: configuration.isPressed)))
-    }
-    
-    private func backgroundOpacity(when isPressed: Bool) -> CGFloat {
-        guard isEnabled else { return colorScheme == .dark ? 0.2 : 0.1 }
-        return isPressed ? 0.3 : 1.0
-    }
-}
-
-public struct ElementActionButtonStyle_Previews: PreviewProvider {
-    public static var previews: some View {
-        VStack {
-            Button("Enabled") { /* preview */ }
-                .buttonStyle(ElementActionButtonStyle())
-            
-            Button("Disabled") { /* preview */ }
-                .buttonStyle(ElementActionButtonStyle())
-                .disabled(true)
-            
-            Button { /* preview */ } label: {
-                Text("Clear BG")
-                    .foregroundColor(.compound.textCriticalPrimary)
-            }
-            .buttonStyle(ElementActionButtonStyle(color: .clear))
-            
-            Button("Red BG") { /* preview */ }
-                .buttonStyle(ElementActionButtonStyle(color: .compound.textCriticalPrimary))
-        }
-        .padding()
-    }
-}

DesignKit/Sources/Buttons/ElementCapsuleButtonStyle.swift

@@ -1,81 +0,0 @@
-//
-// Copyright 2022 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import SwiftUI
-
-public extension ButtonStyle where Self == ElementCapsuleButtonStyle {
-    /// A button style that uses a capsule shape with a regular appearance.
-    static var elementCapsule: ElementCapsuleButtonStyle {
-        ElementCapsuleButtonStyle(isProminent: false)
-    }
-    
-    /// A button style that uses a capsule shape with a prominent appearance.
-    static var elementCapsuleProminent: ElementCapsuleButtonStyle {
-        ElementCapsuleButtonStyle(isProminent: true)
-    }
-}
-
-public struct ElementCapsuleButtonStyle: ButtonStyle {
-    let isProminent: Bool
-    
-    public func makeBody(configuration: Configuration) -> some View {
-        configuration.label
-            .padding(7)
-            .frame(maxWidth: .infinity)
-            .font(.compound.bodyLGSemibold)
-            .foregroundColor(fontColor)
-            .multilineTextAlignment(.center)
-            .background(background)
-            .opacity(configuration.isPressed ? 0.6 : 1)
-            .contentShape(Capsule())
-    }
-    
-    @ViewBuilder
-    var background: some View {
-        if isProminent {
-            Capsule()
-                .foregroundColor(Color.compound.textActionPrimary)
-        } else {
-            Capsule()
-                .stroke(Color.compound.textActionPrimary)
-        }
-    }
-    
-    var fontColor: Color {
-        isProminent ? .compound.textOnSolidPrimary : .compound.textPrimary
-    }
-}
-
-struct ElementCapsuleButtonStyle_Previews: PreviewProvider {
-    public static var previews: some View {
-        VStack {
-            Button("Enabled") { /* preview */ }
-                .buttonStyle(.elementCapsuleProminent)
-            
-            Button("Disabled") { /* preview */ }
-                .buttonStyle(.elementCapsuleProminent)
-                .disabled(true)
-            
-            Button("Enabled") { /* preview */ }
-                .buttonStyle(.elementCapsule)
-            
-            Button("Disabled") { /* preview */ }
-                .buttonStyle(.elementCapsule)
-                .disabled(true)
-        }
-        .padding()
-    }
-}

DesignKit/Sources/Buttons/ElementGhostButtonStyle.swift

@@ -1,89 +0,0 @@
-//
-// Copyright 2022 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Compound
-import DesignTokens
-import SwiftUI
-
-public extension ButtonStyle where Self == ElementGhostButtonStyle {
-    /// The Ghost button style as defined in Compound.
-    /// - Parameter size: The control size to use. Defaults to `regular`.
-    /// - Parameter color: The color of the label and border. Defaults to the accent color.
-    static func elementGhost(_ size: ElementControlSize = .regular,
-                             color: Color = .compound.textActionAccent) -> ElementGhostButtonStyle {
-        ElementGhostButtonStyle(size: size, color: color)
-    }
-}
-
-public struct ElementGhostButtonStyle: ButtonStyle {
-    @Environment(\.isEnabled) private var isEnabled
-    
-    public var size: ElementControlSize
-    public var color: Color
-    
-    private var verticalPadding: CGFloat { size == .xLarge ? 12 : 4 }
-    private var maxWidth: CGFloat? { size == .xLarge ? .infinity : nil }
-    
-    public init(size: ElementControlSize = .regular, color: Color = .compound.textActionAccent) {
-        self.size = size
-        self.color = color
-    }
-    
-    public func makeBody(configuration: Self.Configuration) -> some View {
-        configuration.label
-            .padding(.horizontal, 12)
-            .padding(.vertical, verticalPadding)
-            .frame(maxWidth: maxWidth)
-            .foregroundColor(color)
-            .font(.compound.bodySMSemibold)
-            .background(border)
-            .opacity(opacity(when: configuration.isPressed))
-    }
-    
-    private var border: some View {
-        Capsule()
-            .strokeBorder()
-            .foregroundColor(color)
-    }
-    
-    private func opacity(when isPressed: Bool) -> CGFloat {
-        guard isEnabled else { return 0.5 }
-        return isPressed ? 0.6 : 1.0
-    }
-}
-
-public struct ElementGhostButtonStyle_Previews: PreviewProvider {
-    public static var previews: some View {
-        VStack {
-            Button("Enabled") { /* preview */ }
-                .buttonStyle(ElementGhostButtonStyle())
-            
-            Button("Disabled") { /* preview */ }
-                .buttonStyle(ElementGhostButtonStyle())
-                .disabled(true)
-            
-            Button("Red BG") { /* preview */ }
-                .buttonStyle(ElementGhostButtonStyle(color: .compound.textCriticalPrimary))
-            
-            Button { /* preview */ } label: {
-                Text("Custom")
-                    .foregroundColor(.compound.iconInfoPrimary)
-            }
-            .buttonStyle(ElementGhostButtonStyle(color: .compound.borderInfoSubtle))
-        }
-        .padding()
-    }
-}

DesignKit/Sources/Colors/ElementColors.swift

@@ -1,40 +0,0 @@
-//
-// Copyright 2022 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import DesignTokens
-import SwiftUI
-
-// MARK: SwiftUI
-
-public extension Color {
-    static let element = ElementColors()
-}
-
-public struct ElementColors {
-    // MARK: - Legacy Compound
-    
-    private let colors = DesignTokens.CompoundColors()
-    
-    @available(swift, deprecated: 5.0, message: "Use textActionAccent/iconAccentTertiary from Compound.")
-    public var brand: Color { colors.accent }
-        
-    // MARK: - Temp
-    
-    /// The background colour of a row in a Form or grouped List.
-    ///
-    /// This colour will be removed once Compound form styles are used everywhere.
-    public var formRowBackground = Color.compound.bgCanvasDefaultLevel1
-}

DesignKit/Sources/Common/ElementControlSize.swift

@@ -1,22 +0,0 @@
-//
-// Copyright 2022 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-public enum ElementControlSize {
-    case regular
-    case xLarge
-}

DesignKit/Sources/Extensions/PlatformViewVersionPredicate.swift

@@ -1,26 +0,0 @@
-//
-// Copyright 2023 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import UIKit
-
-import SwiftUIIntrospect
-
-// This can be removed once DesignKit has been migrated in the main app
-extension PlatformViewVersionPredicate<TextFieldType, UITextField> {
-    static var supportedVersions: Self {
-        .iOS(.v16, .v17)
-    }
-}

DesignKit/Sources/Shapes/RoundedCornerShape.swift

@@ -1,32 +0,0 @@
-//
-// Copyright 2022 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import SwiftUI
-
-public struct RoundedCornerShape: Shape {
-    let radius: CGFloat
-    let corners: UIRectCorner
-    
-    public init(radius: CGFloat, corners: UIRectCorner) {
-        self.radius = radius
-        self.corners = corners
-    }
-    
-    public func path(in rect: CGRect) -> Path {
-        let path = UIBezierPath(roundedRect: rect, byRoundingCorners: corners, cornerRadii: CGSize(width: radius, height: radius))
-        return Path(path.cgPath)
-    }
-}

DesignKit/Tests/DesignKitTests.swift

@@ -1,8 +0,0 @@
-@testable import DesignKit
-import XCTest
-
-final class DesignKitTests: XCTestCase {
-    func testExample() throws {
-        XCTAssert(true)
-    }
-}

ElementX.xcodeproj/project.pbxproj

@@ -34,7 +34,6 @@
 		09713669577CDA8D012EE380 /* MatrixRustSDK in Frameworks */ = {isa = PBXBuildFile; productRef = 6647C55D93508C7CE9D954A5 /* MatrixRustSDK */; };
 		09AAF04B27732046C755D914 /* SoftLogoutViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32C5DAA1773F57653BF1C4F9 /* SoftLogoutViewModelTests.swift */; };
 		09C83DDDB07C28364F325209 /* MockRoomTimelineController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52D7074991B3267B26D89B22 /* MockRoomTimelineController.swift */; };
-		0A003B39C82C28BDA41FD2AA /* Version in Frameworks */ = {isa = PBXBuildFile; productRef = 2B9ACE4FCACB5A8812154424 /* Version */; };
 		0A194F5E70B5A628C1BF4476 /* AdvancedSettingsScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4999B5FD50AED7CB0F590FF8 /* AdvancedSettingsScreenModels.swift */; };
 		0AA0477E063E72B786A983CF /* AnalyticsPromptScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63E1FF2DA52B1DE7CAEC5422 /* AnalyticsPromptScreenViewModel.swift */; };
 		0ACAA31FD0399CEEBA3ECC21 /* UserDetailsEditScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85149F56BA333619900E2410 /* UserDetailsEditScreenViewModelProtocol.swift */; };
@@ -50,7 +49,7 @@
 		0C932A5158C1D0604DFC5750 /* ComposerToolbarViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA29952595B804DA221A0C1D /* ComposerToolbarViewModelTests.swift */; };
 		0DC815CA24E1BD7F408F37D3 /* CollapsibleTimelineItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7C4EA55DA62F9D0F984A2AE /* CollapsibleTimelineItem.swift */; };
 		0DCDF49AB95F75BFC8B1879C /* SwipeToReplyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49E45C3DC740D3AB9A47FD32 /* SwipeToReplyView.swift */; };
-		0E08BB72B2258652CF501A8B /* LRUCache in Frameworks */ = {isa = PBXBuildFile; productRef = 78B28D75FF7AF8E6146DEE2A /* LRUCache */; };
+		0E08BB72B2258652CF501A8B /* Prefire in Frameworks */ = {isa = PBXBuildFile; productRef = 9B68DE8678BF67D4612BCC16 /* Prefire */; };
 		0E8C480700870BB34A2A360F /* DeviceKit in Frameworks */ = {isa = PBXBuildFile; productRef = 4003BC24B24C9E63D3304177 /* DeviceKit */; };
 		0EA6537A07E2DC882AEA5962 /* Localizable.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = 187853A7E643995EE49FAD43 /* Localizable.stringsdict */; };
 		0EAEA507586717B055441970 /* AppLockScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C80AD634BF0A1767FE8941C5 /* AppLockScreenCoordinator.swift */; };
@@ -100,7 +99,7 @@
 		1D69E31913DF66426985909B /* EmojiPickerScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11151E78D6BB2B04A8FBD389 /* EmojiPickerScreenViewModelProtocol.swift */; };
 		1E59B77A0B2CE83DCC1B203C /* LoginViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A05707BF550D770168A406DB /* LoginViewModelTests.swift */; };
 		1F04C63D4FA95948E3F52147 /* FileRoomTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E51E3D86A84341C3A0CB8A40 /* FileRoomTimelineView.swift */; };
-		1F3232BD368DF430AB433907 /* DesignKit in Frameworks */ = {isa = PBXBuildFile; productRef = A5A56C4F47C368EBE5C5E870 /* DesignKit */; };
+		1F3232BD368DF430AB433907 /* Compound in Frameworks */ = {isa = PBXBuildFile; productRef = 07FEEEDB11543A7DED420F04 /* Compound */; };
 		1FE593ECEC40A43789105D80 /* KeychainController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E36CB905A2B9EC2C92A2DA7C /* KeychainController.swift */; };
 		1FEC0A4EC6E6DF693C16B32A /* StringTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CEBCB9676FCD1D0F13188DD /* StringTests.swift */; };
 		206F0DBAB6AF042CA1FF2C0D /* SettingsViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D487C1185D658F8B15B8F55 /* SettingsViewModelTests.swift */; };
@@ -175,9 +174,9 @@
 		35E975CFDA60E05362A7CF79 /* target.yml in Resources */ = {isa = PBXBuildFile; fileRef = 1222DB76B917EB8A55365BA5 /* target.yml */; };
 		368C8758FCD079E6AAA18C2C /* NoticeRoomTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5B243E7818E5E9F6A4EDC7A /* NoticeRoomTimelineView.swift */; };
 		36AC963F2F04069B7FF1AA0C /* UIConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E6D88E8AFFBF2C1D589C0FA /* UIConstants.swift */; };
-		36AD4DD4C798E22584ED3200 /* Version in Frameworks */ = {isa = PBXBuildFile; productRef = A05AF81DDD14AD58CB0E1B9B /* Version */; };
-		36CD6E11B37396E14F032CB6 /* Emojibase in Frameworks */ = {isa = PBXBuildFile; productRef = C05729B1684C331F5FFE9232 /* Emojibase */; };
-		377980ABF16525114E72DDE2 /* Prefire in Frameworks */ = {isa = PBXBuildFile; productRef = 9B68DE8678BF67D4612BCC16 /* Prefire */; };
+		36AD4DD4C798E22584ED3200 /* Emojibase in Frameworks */ = {isa = PBXBuildFile; productRef = C05729B1684C331F5FFE9232 /* Emojibase */; };
+		36CD6E11B37396E14F032CB6 /* WysiwygComposer in Frameworks */ = {isa = PBXBuildFile; productRef = CA07D57389DACE18AEB6A5E2 /* WysiwygComposer */; };
+		377980ABF16525114E72DDE2 /* Version in Frameworks */ = {isa = PBXBuildFile; productRef = 2B9ACE4FCACB5A8812154424 /* Version */; };
 		37D789F24199B32E3FD1AA7B /* FileRoomTimelineItemContent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 216F0DDC98F2A2C162D09C28 /* FileRoomTimelineItemContent.swift */; };
 		383055C6ABE5BE058CEE1DDB /* WelcomeScreenScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57FE5EF0AFFE360C66420AAE /* WelcomeScreenScreenCoordinator.swift */; };
 		38546A6010A2CF240EC9AF73 /* BindableState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6EA1D2CBAEA5D0BD00B90D1B /* BindableState.swift */; };
@@ -194,7 +193,7 @@
 		3A7DD0D13B0FB8876D69D829 /* TextBasedRoomTimelineTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AB2C848BB9A7A9B618B7B89 /* TextBasedRoomTimelineTests.swift */; };
 		3B0F9B57D25B07E66F15762A /* MediaUploadPreviewScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2E7C987AE5DC9087BB19F7D /* MediaUploadPreviewScreenModels.swift */; };
 		3B28408450BCAED911283AA2 /* UserPreference.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35FA991289149D31F4286747 /* UserPreference.swift */; };
-		3C549A0BF39F8A854D45D9FD /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = 020597E28A4BC8E1BE8EDF6E /* KeychainAccess */; };
+		3C549A0BF39F8A854D45D9FD /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = 0DD568A494247444A4B56031 /* Kingfisher */; };
 		3C73442084BF8A6939F0F80B /* AnalyticsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5445FCE0CE15E634FDC1A2E2 /* AnalyticsService.swift */; };
 		3DA57CA0D609A6B37CA1DC2F /* BugReportService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D6DC38E64A5ED3FDB201029A /* BugReportService.swift */; };
 		3DAF325D8AE461F7CDB282BD /* StartChatScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6861FE915C7B5466E6962BBA /* StartChatScreen.swift */; };
@@ -204,12 +203,12 @@
 		3F327A62D233933F54F0F33A /* SwiftOGG in Frameworks */ = {isa = PBXBuildFile; productRef = 3FE40E79C36E7903121E6E3B /* SwiftOGG */; };
 		3F70E237CE4C3FAB02FC227F /* NotificationConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = C830A64609CBD152F06E0457 /* NotificationConstants.swift */; };
 		401BB28CD6B7DD6B4E7863E7 /* ServerConfirmationScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9342F5D6729627B6393AF853 /* ServerConfirmationScreenModels.swift */; };
-		407DCE030E0F9B7C9861D38A /* LRUCache in Frameworks */ = {isa = PBXBuildFile; productRef = 1081D3630AAD3ACEDDEC3A98 /* LRUCache */; };
+		407DCE030E0F9B7C9861D38A /* Mapbox in Frameworks */ = {isa = PBXBuildFile; productRef = C1BF15833233CD3BDB7E2B1D /* Mapbox */; };
 		40B79D20A873620F7F128A2C /* UserPreference.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35FA991289149D31F4286747 /* UserPreference.swift */; };
 		414F50CFCFEEE2611127DCFB /* RestorationToken.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3558A15CFB934F9229301527 /* RestorationToken.swift */; };
 		4166A7DD2A4E2EFF0EB9369B /* FormRowLabelStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1897720266C036471AD9D1B /* FormRowLabelStyle.swift */; };
 		41CE5E1289C8768FC5B6490C /* RoomTimelineItemViewState.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C2D52E36AD614B3C003EF6 /* RoomTimelineItemViewState.swift */; };
-		41DFDD212D1BE57CA50D783B /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = 0DD568A494247444A4B56031 /* Kingfisher */; };
+		41DFDD212D1BE57CA50D783B /* KZFileWatchers in Frameworks */ = {isa = PBXBuildFile; productRef = 81DB3AB6CE996AB3954F4F03 /* KZFileWatchers */; };
 		41F553349AF44567184822D8 /* APNSPayload.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94D670124FC3E84F23A62CCF /* APNSPayload.swift */; };
 		4219391CD2351E410554B3E8 /* AggregratedReaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B858A61F2A570DFB8DE570A7 /* AggregratedReaction.swift */; };
 		422E8D182CA688D4565CD1E1 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40B21E611DADDEF00307E7AC /* String.swift */; };
@@ -222,7 +221,7 @@
 		43F35A7E5703D64DB0519C59 /* ServerSelectionScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD469F7513574341181F7EAA /* ServerSelectionScreen.swift */; };
 		440123E29E2F9B001A775BBE /* TimelineItemProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D505843AB66822EB91F0DF0 /* TimelineItemProxy.swift */; };
 		44121202B4A260C98BF615A7 /* RoomMembersListScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5B7A755E985FA14469E86B2 /* RoomMembersListScreenUITests.swift */; };
-		44F0E1B576C7599DF8022071 /* Prefire in Frameworks */ = {isa = PBXBuildFile; productRef = 2629CF48B33643CD5F69C612 /* Prefire */; };
+		44F0E1B576C7599DF8022071 /* SwiftOGG in Frameworks */ = {isa = PBXBuildFile; productRef = 391D11F92DFC91666AA1503F /* SwiftOGG */; };
 		4557192F5B15A8D9BB920232 /* AdvancedSettingsScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E492690C8B27A892C194CC4 /* AdvancedSettingsScreenCoordinator.swift */; };
 		46562110EE202E580A5FFD9C /* RoomScreenViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93CF7B19FFCF8EFBE0A8696A /* RoomScreenViewModelTests.swift */; };
 		4681820102DAC8BA586357D4 /* VoiceMessageCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAB8D7926A5684E18196B538 /* VoiceMessageCache.swift */; };
@@ -308,13 +307,14 @@
 		5F5488FBC9CFEB6F433D74A4 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7109E709A7738E6BCC4553E6 /* Localizable.strings */; };
 		5F8E96263497FFB7D3254EB2 /* AudioConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1CD5EC6265A09315772DB7 /* AudioConverter.swift */; };
 		60ED66E63A169E47489348A8 /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = 886A0A498FA01E8EDD451D05 /* Sentry */; };
+		6146996D5C4DDD5DA816FC87 /* AuthenticationTextFieldStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCACD75595C40EACD6AD4A74 /* AuthenticationTextFieldStyle.swift */; };
 		617624A97BDBB75ED3DD8156 /* RoomScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A00C7A331B72C0F05C00392F /* RoomScreenViewModelProtocol.swift */; };
 		6189B4ABD535CE526FA1107B /* StartChatViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DF438EAFC732D2D95D34BF6 /* StartChatViewModelTests.swift */; };
 		61941DEE5F3834765770BE01 /* InviteUsersScreenSelectedItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10F32E0B4B83D2A11EE8D011 /* InviteUsersScreenSelectedItem.swift */; };
 		61A36B9BB2ADE36CEFF5E98C /* Array.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E93A1BE7D8A2EBCAD51EEB4 /* Array.swift */; };
 		6213C897001F953E21D3CC16 /* CompletionSuggestionService.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCF54536699ACEE3DB6BA3CB /* CompletionSuggestionService.swift */; };
 		62910B515BCB4B455E24D7C1 /* AdvancedSettingsScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D086854995173E897F993C26 /* AdvancedSettingsScreenViewModelProtocol.swift */; };
-		6298AB0906DDD3525CD78C6B /* KZFileWatchers in Frameworks */ = {isa = PBXBuildFile; productRef = 81DB3AB6CE996AB3954F4F03 /* KZFileWatchers */; };
+		6298AB0906DDD3525CD78C6B /* LRUCache in Frameworks */ = {isa = PBXBuildFile; productRef = 1081D3630AAD3ACEDDEC3A98 /* LRUCache */; };
 		63E46D18B91D08E15FC04125 /* ExpiringTaskRunner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B25F959A434BB9923A3223F /* ExpiringTaskRunner.swift */; };
 		642DF13C49ED4121C148230E /* TestablePreview.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1E227F34BE43B08E098796E /* TestablePreview.swift */; };
 		6448F8D1D3CA4CD27BB4CADD /* RoomMemberProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F36C5D9B37E50915ECBD3EE /* RoomMemberProxy.swift */; };
@@ -357,8 +357,8 @@
 		6E47D126DD7585E8F8237CE7 /* LoadableAvatarImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = B590BD4507D4F0A377FDE01A /* LoadableAvatarImage.swift */; };
 		6E63704717F17593A475D152 /* RoomNotificationSettingsScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA14564EE143F73F7E4D1F79 /* RoomNotificationSettingsScreenModels.swift */; };
 		6EC7A40A537CFB3D526A111C /* Strings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47EBB5D698CE9A25BB553A2D /* Strings.swift */; };
-		6F26CBC84AE87EB4068D398B /* DTCoreText in Frameworks */ = {isa = PBXBuildFile; productRef = 593FBBF394712F2963E98A0B /* DTCoreText */; };
-		6F2AB43A1EFAD8A97AF41A15 /* AnalyticsEvents in Frameworks */ = {isa = PBXBuildFile; productRef = 2A3F7BCCB18C15B30CCA39A9 /* AnalyticsEvents */; };
+		6F26CBC84AE87EB4068D398B /* LRUCache in Frameworks */ = {isa = PBXBuildFile; productRef = 78B28D75FF7AF8E6146DEE2A /* LRUCache */; };
+		6F2AB43A1EFAD8A97AF41A15 /* Collections in Frameworks */ = {isa = PBXBuildFile; productRef = 9C73F37731C9FDED1BB24C1C /* Collections */; };
 		6F2D5D4F2590310DFAE973E4 /* WaitingDialog.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6D698BFD68B061350553930 /* WaitingDialog.swift */; };
 		6FC10A00D268FCD48B631E37 /* ViewFrameReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = EFF7BF82A950B91BC5469E91 /* ViewFrameReader.swift */; };
 		6FD8053301C5FEFA82D2F246 /* URLComponents.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2BFDCA5A09EE70BC17F2EFA7 /* URLComponents.swift */; };
@@ -378,7 +378,7 @@
 		74604ACFDBE7F54260E7B617 /* ApplicationProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8903A9F615BBD0E6D7CD133 /* ApplicationProtocol.swift */; };
 		748F482FEF4E04D61C39AAD7 /* EmojiPickerScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = F174A5627CDB3CAF280D1880 /* EmojiPickerScreenModels.swift */; };
 		7501442D52A65F73DF79FFD4 /* PaginationIndicatorRoomTimelineItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B987FC3FDBAA0E1C5AA235C /* PaginationIndicatorRoomTimelineItem.swift */; };
-		754602A7B2AAD443C4228ED4 /* GZIP in Frameworks */ = {isa = PBXBuildFile; productRef = 997C7385E1A07E061D7E2100 /* GZIP */; };
+		754602A7B2AAD443C4228ED4 /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = 7731767AE437BA3BD2CC14A8 /* Sentry */; };
 		755727E0B756430DFFEC4732 /* SessionVerificationViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF05DA24F71B455E8EFEBC3B /* SessionVerificationViewModelTests.swift */; };
 		762DAF94846C7AC8550F1CC1 /* MediaPlayerProviderProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5E23D8EE6CBACF32F1EC874 /* MediaPlayerProviderProtocol.swift */; };
 		764AFCC225B044CF5F9B41E5 /* PaginationIndicatorRoomTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42EEA67A6796BDC2761619C5 /* PaginationIndicatorRoomTimelineView.swift */; };
@@ -474,7 +474,7 @@
 		8DDC6F28C797D8685F2F8E32 /* AnalyticsConsentState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57B6B383F1FD04CC0E7B60C6 /* AnalyticsConsentState.swift */; };
 		8E650379587C31D7912ED67B /* UNNotification+Creator.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC0AEA686E425F86F6BA0404 /* UNNotification+Creator.swift */; };
 		8EF63DDDC1B54F122070B04D /* ReadMarkerRoomTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6311F21F911E23BE4DF51B4 /* ReadMarkerRoomTimelineView.swift */; };
-		8F2FAA98457750D9D664136F /* Mapbox in Frameworks */ = {isa = PBXBuildFile; productRef = C1BF15833233CD3BDB7E2B1D /* Mapbox */; };
+		8F2FAA98457750D9D664136F /* PostHog in Frameworks */ = {isa = PBXBuildFile; productRef = 4278261E147DB2DE5CFB7FC5 /* PostHog */; };
 		90733645AE76FB33DAD28C2B /* URLSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE40D4A5DD857AC16EED945A /* URLSession.swift */; };
 		9095B9E40DB5CF8BA26CE0D8 /* ReactionsSummaryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 153726EDCE1ACBB3D466A916 /* ReactionsSummaryView.swift */; };
 		90DF83A6A347F7EE7EDE89EE /* AttributedStringBuilderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF25E364AE85090A70AE4644 /* AttributedStringBuilderTests.swift */; };
@@ -484,8 +484,8 @@
 		9219640F4D980CFC5FE855AD /* target.yml in Resources */ = {isa = PBXBuildFile; fileRef = 536E72DCBEEC4A1FE66CFDCE /* target.yml */; };
 		92D9088B901CEBB1A99ECA4E /* RoomMemberProxyMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36FD673E24FBFCFDF398716A /* RoomMemberProxyMock.swift */; };
 		93875ADD456142D20823ED24 /* ServerSelectionViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDAA4472821985BF868CC21C /* ServerSelectionViewModelTests.swift */; };
-		93A549135E6C027A0D823BFE /* DeviceKit in Frameworks */ = {isa = PBXBuildFile; productRef = 385D4C28F9DC5CF53BD9ECDB /* DeviceKit */; };
-		93BA4A81B6D893271101F9F0 /* Collections in Frameworks */ = {isa = PBXBuildFile; productRef = 9C73F37731C9FDED1BB24C1C /* Collections */; };
+		93A549135E6C027A0D823BFE /* DTCoreText in Frameworks */ = {isa = PBXBuildFile; productRef = 593FBBF394712F2963E98A0B /* DTCoreText */; };
+		93BA4A81B6D893271101F9F0 /* DeviceKit in Frameworks */ = {isa = PBXBuildFile; productRef = A7CA6F33C553805035C3B114 /* DeviceKit */; };
 		9408CE8B8865C0C8DD4C9869 /* NoticeRoomTimelineItemContent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FD51B4D5173F7FC886F5360 /* NoticeRoomTimelineItemContent.swift */; };
 		9462C62798F47E39DCC182D2 /* Application.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA89A2DD51B6BBE1DA55E263 /* Application.swift */; };
 		94A65DD8A353DF112EBEF67A /* SessionVerificationControllerProxyProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D56469A9EE0CFA2B7BA9760 /* SessionVerificationControllerProxyProtocol.swift */; };
@@ -507,7 +507,7 @@
 		99ED42B8F8D6BFB1DBCF4C45 /* AnalyticsEvents in Frameworks */ = {isa = PBXBuildFile; productRef = D661CAB418C075A94306A792 /* AnalyticsEvents */; };
 		9A3B0CDF097E3838FB1B9595 /* Bundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E89E530A8E92EC44301CA1 /* Bundle.swift */; };
 		9A4E3D5AA44B041DAC3A0D81 /* OIDCAuthenticationPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92390F9FA98255440A6BF5F8 /* OIDCAuthenticationPresenter.swift */; };
-		9AC5F8142413862A9E3A2D98 /* DeviceKit in Frameworks */ = {isa = PBXBuildFile; productRef = A7CA6F33C553805035C3B114 /* DeviceKit */; };
+		9AC5F8142413862A9E3A2D98 /* DTCoreText in Frameworks */ = {isa = PBXBuildFile; productRef = 531CE4334AC5CA8DFF6AEB84 /* DTCoreText */; };
 		9AFEE46B03B7E995B3E1A53D /* WaitlistScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80C4927D09099497233E9980 /* WaitlistScreen.swift */; };
 		9B356742E035D90A8BB5CABE /* ProposedViewSize.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DFE0E493FB55E5A62E7852A /* ProposedViewSize.swift */; };
 		9B582B3EEFEA615D4A6FBF1A /* TimelineReactionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 351E89CE2ED9B73C5CC47955 /* TimelineReactionsView.swift */; };
@@ -518,7 +518,7 @@
 		9C45CE85325CD591DADBC4CA /* ElementXTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBFEAC3AC691CBB84983E275 /* ElementXTests.swift */; };
 		9C5A07E7C33F3F40287D7861 /* SettingsScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8EC57A32ABC80D774CC663DB /* SettingsScreenUITests.swift */; };
 		9CCC77C31CB399661A034739 /* UserProperties+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A6C4BE591FE5C38CE9C7EF3 /* UserProperties+Element.swift */; };
-		9D2E03DB175A6AB14589076D /* Algorithms in Frameworks */ = {isa = PBXBuildFile; productRef = 290FDEDA4D764B9F7EBE55A9 /* Algorithms */; };
+		9D2E03DB175A6AB14589076D /* AnalyticsEvents in Frameworks */ = {isa = PBXBuildFile; productRef = 2A3F7BCCB18C15B30CCA39A9 /* AnalyticsEvents */; };
 		9D79B94493FB32249F7E472F /* PlaceholderAvatarImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = C705E605EF57C19DBE86FFA1 /* PlaceholderAvatarImage.swift */; };
 		9D9690D2FD4CD26FF670620F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C75EF87651B00A176AB08E97 /* AppDelegate.swift */; };
 		9DC5FB22B8F86C3B51E907C1 /* HomeScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D6E4C37E9F0E53D3DF951AC /* HomeScreenUITests.swift */; };
@@ -534,7 +534,7 @@
 		A009BDFB0A6816D4C392ADCB /* SettingsScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AF715D4FD4710EBB637D661 /* SettingsScreenViewModelProtocol.swift */; };
 		A021827B528F1EDC9101CA58 /* AppCoordinatorProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = FBC776F301D374A3298C69DA /* AppCoordinatorProtocol.swift */; };
 		A0A0D2A9564BDA3FDE2E360F /* FormattedBodyText.swift in Sources */ = {isa = PBXBuildFile; fileRef = F73FF1A33198F5FAE9D34B1F /* FormattedBodyText.swift */; };
-		A0D7E5BD0298A97DCBDCE40B /* WysiwygComposer in Frameworks */ = {isa = PBXBuildFile; productRef = CA07D57389DACE18AEB6A5E2 /* WysiwygComposer */; };
+		A0D7E5BD0298A97DCBDCE40B /* Prefire in Frameworks */ = {isa = PBXBuildFile; productRef = 2629CF48B33643CD5F69C612 /* Prefire */; };
 		A10D6CCDE2010C09EEA1A593 /* HomeScreenRoomList.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7661EFFCAA307A97D71132A /* HomeScreenRoomList.swift */; };
 		A14A9419105A1CD42F0511C4 /* UserIndicatorModalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E43005941B3A2C9671E23C85 /* UserIndicatorModalView.swift */; };
 		A17FAD2EBC53E17B5FD384DB /* InviteUsersScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22730A30C50AC2E3D5BA8642 /* InviteUsersScreenViewModelProtocol.swift */; };
@@ -569,7 +569,6 @@
 		A851635B3255C6DC07034A12 /* RoomScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8108C8F0ACF6A7EB72D0117 /* RoomScreenCoordinator.swift */; };
 		A8771F5975A82759FA5138AE /* RoomMemberDetailsScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0F19DBE940499D3E3DD405D8 /* RoomMemberDetailsScreenUITests.swift */; };
 		A896998A6784DB6F16E912F4 /* MockMediaLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AB7D7DAAAF662DED9D02379 /* MockMediaLoader.swift */; };
-		A93661C962B12942C08864B6 /* SwiftOGG in Frameworks */ = {isa = PBXBuildFile; productRef = 391D11F92DFC91666AA1503F /* SwiftOGG */; };
 		A9482B967FC85DA611514D35 /* VoiceMessageRoomPlaybackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CCD41CD67DB5DA0D436BFE9 /* VoiceMessageRoomPlaybackView.swift */; };
 		A969147E0EEE0E27EE226570 /* MediaUploadPreviewScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F29139BC2A804CE5E0757E /* MediaUploadPreviewScreenViewModel.swift */; };
 		A975D60EA49F6AF73308809F /* RoomMembersListScreenMemberCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC03209FDE8CE0810617BFFF /* RoomMembersListScreenMemberCell.swift */; };
@@ -597,7 +596,7 @@
 		B037C365CF8A58A0D149A2DB /* AuthenticationIconImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97755C01C3971474EFAD5367 /* AuthenticationIconImage.swift */; };
 		B064D42BA087649ACAE462E8 /* SoftLogoutUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55F30E764BED111C81739844 /* SoftLogoutUITests.swift */; };
 		B09DC6E3D0EE87C4D4ABFAB3 /* EncryptedHistoryRoomTimelineItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0140615D2232612C813FD6C /* EncryptedHistoryRoomTimelineItem.swift */; };
-		B0CB16349B96262AA65A04AF /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = 7731767AE437BA3BD2CC14A8 /* Sentry */; };
+		B0CB16349B96262AA65A04AF /* Version in Frameworks */ = {isa = PBXBuildFile; productRef = A05AF81DDD14AD58CB0E1B9B /* Version */; };
 		B1069F361E604D5436AE9FFD /* StaticLocationScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B06663F7858E45882E63471 /* StaticLocationScreen.swift */; };
 		B14BC354E56616B6B7D9A3D7 /* NotificationServiceExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27A1AD6389A4659AF0CEAE62 /* NotificationServiceExtension.swift */; };
 		B22D857D1E8FCA6DD74A58E3 /* UserSessionScreenTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F899D02CF26EA7675EEBE74C /* UserSessionScreenTests.swift */; };
@@ -694,7 +693,7 @@
 		C9BE065FA7D4E77E4C61CB69 /* MapLibreModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = B81B6170DB690013CEB646F4 /* MapLibreModels.swift */; };
 		C9F5B48D15B9BCAE1F8D564E /* RoomNotificationModeProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1511766C534367700C8DD75 /* RoomNotificationModeProxy.swift */; };
 		CAF8755E152204F55F8D6B5B /* RoomMembersListViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69B63F817FE305548DB4B512 /* RoomMembersListViewModelTests.swift */; };
-		CB137BFB3E083C33E398A6CB /* DTCoreText in Frameworks */ = {isa = PBXBuildFile; productRef = 531CE4334AC5CA8DFF6AEB84 /* DTCoreText */; };
+		CB137BFB3E083C33E398A6CB /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = 020597E28A4BC8E1BE8EDF6E /* KeychainAccess */; };
 		CB498F4E27AA0545DCEF0F6F /* DTCoreText in Frameworks */ = {isa = PBXBuildFile; productRef = 36B7FC232711031AA2B0D188 /* DTCoreText */; };
 		CB6BCBF28E4B76EA08C2926D /* StateRoomTimelineItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B16048D30F0438731C41F775 /* StateRoomTimelineItem.swift */; };
 		CB99B0FA38A4AC596F38CC13 /* KeychainControllerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5E94DCFEE803E5ABAE8ACCE /* KeychainControllerProtocol.swift */; };
@@ -756,7 +755,7 @@
 		DDB47D29C6865669288BF87C /* UIFont+AttributedStringBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = E8CA187FE656EE5A3F6C7DE5 /* UIFont+AttributedStringBuilder.m */; };
 		DE4F8C4E0F1DB4832F09DE97 /* HomeScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31D6764D6976D235926FE5FC /* HomeScreenViewModel.swift */; };
 		DF004A5B2EABBD0574D06A04 /* SplashScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 854BCEAF2A832176FAACD2CB /* SplashScreenCoordinator.swift */; };
-		DF05F9C9D3D977EB77E13692 /* DesignKit in Frameworks */ = {isa = PBXBuildFile; productRef = A593735D882778FD2C9A185B /* DesignKit */; };
+		DF05F9C9D3D977EB77E13692 /* DeviceKit in Frameworks */ = {isa = PBXBuildFile; productRef = 385D4C28F9DC5CF53BD9ECDB /* DeviceKit */; };
 		DF504B10A4918F971A57BEF2 /* PostHogAnalyticsClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1715E3D7F53C0748AA50C91C /* PostHogAnalyticsClient.swift */; };
 		DFCA89C4EC2A5332ED6B441F /* DataProtectionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4959CECEC984B3995616F427 /* DataProtectionManager.swift */; };
 		DFD5AA8688A34C72D48AF3B1 /* StaticLocationScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5311C989EC15B4C2D699025 /* StaticLocationScreenViewModel.swift */; };
@@ -800,7 +799,7 @@
 		EA6613B29BA671F39CE1B1D2 /* ConfirmationDialog.swift in Sources */ = {isa = PBXBuildFile; fileRef = B383DCD3DCB19E00FD478A5F /* ConfirmationDialog.swift */; };
 		EA78A7512AFB1E5451744EB1 /* AppRouteURLParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E461B3C8BBBFCA400B268D14 /* AppRouteURLParserTests.swift */; };
 		EA974337FA7D040E7C74FE6E /* RoomDetailsViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EFE1922F39398ABFB36DF3F /* RoomDetailsViewModelTests.swift */; };
-		EAC6FE2CD4F50A43068ADCD8 /* SwiftState in Frameworks */ = {isa = PBXBuildFile; productRef = 9573B94B1C86C6DF751AF3FD /* SwiftState */; };
+		EAC6FE2CD4F50A43068ADCD8 /* GZIP in Frameworks */ = {isa = PBXBuildFile; productRef = 997C7385E1A07E061D7E2100 /* GZIP */; };
 		EAF2B3E6C6AEC4AD3A8BD454 /* RoomMemberDetailsScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A87D0471D438A233C2CF4A /* RoomMemberDetailsScreenViewModel.swift */; };
 		EB88DBD77221E2CFE463018C /* NSE.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 0D8F620C8B314840D8602E3F /* NSE.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		EBE13FAB4E29738AC41BD3E5 /* InfoPlistReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A580295A56B55A856CC4084 /* InfoPlistReader.swift */; };
@@ -839,7 +838,7 @@
 		F519DE17A3A0F760307B2E6D /* InviteUsersScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02D155E09BF961BBA8F85263 /* InviteUsersScreenViewModel.swift */; };
 		F54E2D6CAD96E1AC15BC526F /* MessageForwardingScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8E60332509665C00179ACF6 /* MessageForwardingScreenViewModel.swift */; };
 		F5D2270B5021D521C0D22E11 /* FlowCoordinatorProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B9FCA1CFD07B8CF9BD21266 /* FlowCoordinatorProtocol.swift */; };
-		F656F92A63D3DC1978D79427 /* Compound in Frameworks */ = {isa = PBXBuildFile; productRef = 07FEEEDB11543A7DED420F04 /* Compound */; };
+		F656F92A63D3DC1978D79427 /* Algorithms in Frameworks */ = {isa = PBXBuildFile; productRef = 290FDEDA4D764B9F7EBE55A9 /* Algorithms */; };
 		F66BCCC825D6CA51724A94D0 /* MediaPlayerProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8A1F98AE670377B20679FF5 /* MediaPlayerProvider.swift */; };
 		F692D4AF571333C0D785725A /* MigrationScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBBC5E7C0F8337D2A46EB2DD /* MigrationScreenViewModelProtocol.swift */; };
 		F697284B9B5F2C00CFEA3B12 /* EmojiDetectionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58E93D91DE3288010390DEE /* EmojiDetectionTests.swift */; };
@@ -864,7 +863,7 @@
 		FB9A1DD83EF641A75ABBCE69 /* WaitlistScreenViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C796FC1DFDBCDD5573D0360F /* WaitlistScreenViewModelTests.swift */; };
 		FBCCF1EA25A071324FCD8544 /* TimelineItemDebugView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7023EB4F3B7C7D1FBA68638B /* TimelineItemDebugView.swift */; };
 		FBF09B6C900415800DDF2A21 /* EmojiProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C113E0CB7E15E9765B1817A /* EmojiProvider.swift */; };
-		FC10228E73323BDC09526F97 /* PostHog in Frameworks */ = {isa = PBXBuildFile; productRef = 4278261E147DB2DE5CFB7FC5 /* PostHog */; };
+		FC10228E73323BDC09526F97 /* SwiftState in Frameworks */ = {isa = PBXBuildFile; productRef = 9573B94B1C86C6DF751AF3FD /* SwiftState */; };
 		FCD3F2B82CAB29A07887A127 /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = 2B43F2AF7456567FE37270A7 /* KeychainAccess */; };
 		FCDA202B246F75BA28E10C5F /* MapTilerAuthorization.swift in Sources */ = {isa = PBXBuildFile; fileRef = E062C1750EFC8627DE4CAB8E /* MapTilerAuthorization.swift */; };
 		FD29471C72872F8B7580E3E1 /* KeychainControllerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39C0D861FC397AC34BCF089E /* KeychainControllerMock.swift */; };
@@ -1147,7 +1146,6 @@
 		47111410B6E659A697D472B5 /* RoomProxyProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomProxyProtocol.swift; sourceTree = "<group>"; };
 		471EB7D96AFEA8D787659686 /* EmoteRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmoteRoomTimelineView.swift; sourceTree = "<group>"; };
 		47873756E45B46683D97DC32 /* LegalInformationScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LegalInformationScreenModels.swift; sourceTree = "<group>"; };
-		478BE8591BD13E908EF70C0C /* DesignKit */ = {isa = PBXFileReference; lastKnownFileType = folder; name = DesignKit; path = DesignKit; sourceTree = SOURCE_ROOT; };
 		4798B3B7A1E8AE3901CEE8C6 /* FramePreferenceKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FramePreferenceKey.swift; sourceTree = "<group>"; };
 		47EBB5D698CE9A25BB553A2D /* Strings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Strings.swift; sourceTree = "<group>"; };
 		47F29139BC2A804CE5E0757E /* MediaUploadPreviewScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaUploadPreviewScreenViewModel.swift; sourceTree = "<group>"; };
@@ -1559,6 +1557,7 @@
 		CC14E5209C262530E19BC4C1 /* InvitesScreenViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvitesScreenViewModelTests.swift; sourceTree = "<group>"; };
 		CC680E0E79D818706CB28CF8 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
 		CC743C7A85E3171BCBF0A653 /* AvatarHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvatarHeaderView.swift; sourceTree = "<group>"; };
+		CCACD75595C40EACD6AD4A74 /* AuthenticationTextFieldStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationTextFieldStyle.swift; sourceTree = "<group>"; };
 		CD469F7513574341181F7EAA /* ServerSelectionScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerSelectionScreen.swift; sourceTree = "<group>"; };
 		CD6613DE16AD26B3A74DA1F5 /* LocationRoomTimelineItemContent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationRoomTimelineItemContent.swift; sourceTree = "<group>"; };
 		CD6B0C4639E066915B5E6463 /* target.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = target.yml; sourceTree = "<group>"; };
@@ -1755,12 +1754,11 @@
 				F06CE9132855E81EBB6DDC32 /* Kingfisher in Frameworks */,
 				67D6E0700A9C1E676F6231F8 /* Collections in Frameworks */,
 				D63974A88CF2BC721F109C77 /* Compound in Frameworks */,
-				DF05F9C9D3D977EB77E13692 /* DesignKit in Frameworks */,
-				93A549135E6C027A0D823BFE /* DeviceKit in Frameworks */,
-				6F26CBC84AE87EB4068D398B /* DTCoreText in Frameworks */,
-				0E08BB72B2258652CF501A8B /* LRUCache in Frameworks */,
-				377980ABF16525114E72DDE2 /* Prefire in Frameworks */,
-				0A003B39C82C28BDA41FD2AA /* Version in Frameworks */,
+				DF05F9C9D3D977EB77E13692 /* DeviceKit in Frameworks */,
+				93A549135E6C027A0D823BFE /* DTCoreText in Frameworks */,
+				6F26CBC84AE87EB4068D398B /* LRUCache in Frameworks */,
+				0E08BB72B2258652CF501A8B /* Prefire in Frameworks */,
+				377980ABF16525114E72DDE2 /* Version in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1790,27 +1788,26 @@
 			buildActionMask = 2147483647;
 			files = (
 				1A70A2199394B5EC660934A5 /* MatrixRustSDK in Frameworks */,
-				1F3232BD368DF430AB433907 /* DesignKit in Frameworks */,
-				F656F92A63D3DC1978D79427 /* Compound in Frameworks */,
-				9D2E03DB175A6AB14589076D /* Algorithms in Frameworks */,
-				6F2AB43A1EFAD8A97AF41A15 /* AnalyticsEvents in Frameworks */,
-				93BA4A81B6D893271101F9F0 /* Collections in Frameworks */,
-				9AC5F8142413862A9E3A2D98 /* DeviceKit in Frameworks */,
-				CB137BFB3E083C33E398A6CB /* DTCoreText in Frameworks */,
-				3C549A0BF39F8A854D45D9FD /* KeychainAccess in Frameworks */,
-				41DFDD212D1BE57CA50D783B /* Kingfisher in Frameworks */,
-				6298AB0906DDD3525CD78C6B /* KZFileWatchers in Frameworks */,
-				407DCE030E0F9B7C9861D38A /* LRUCache in Frameworks */,
-				8F2FAA98457750D9D664136F /* Mapbox in Frameworks */,
-				FC10228E73323BDC09526F97 /* PostHog in Frameworks */,
-				EAC6FE2CD4F50A43068ADCD8 /* SwiftState in Frameworks */,
-				754602A7B2AAD443C4228ED4 /* GZIP in Frameworks */,
-				B0CB16349B96262AA65A04AF /* Sentry in Frameworks */,
-				36AD4DD4C798E22584ED3200 /* Version in Frameworks */,
-				36CD6E11B37396E14F032CB6 /* Emojibase in Frameworks */,
-				A0D7E5BD0298A97DCBDCE40B /* WysiwygComposer in Frameworks */,
-				44F0E1B576C7599DF8022071 /* Prefire in Frameworks */,
-				A93661C962B12942C08864B6 /* SwiftOGG in Frameworks */,
+				1F3232BD368DF430AB433907 /* Compound in Frameworks */,
+				F656F92A63D3DC1978D79427 /* Algorithms in Frameworks */,
+				9D2E03DB175A6AB14589076D /* AnalyticsEvents in Frameworks */,
+				6F2AB43A1EFAD8A97AF41A15 /* Collections in Frameworks */,
+				93BA4A81B6D893271101F9F0 /* DeviceKit in Frameworks */,
+				9AC5F8142413862A9E3A2D98 /* DTCoreText in Frameworks */,
+				CB137BFB3E083C33E398A6CB /* KeychainAccess in Frameworks */,
+				3C549A0BF39F8A854D45D9FD /* Kingfisher in Frameworks */,
+				41DFDD212D1BE57CA50D783B /* KZFileWatchers in Frameworks */,
+				6298AB0906DDD3525CD78C6B /* LRUCache in Frameworks */,
+				407DCE030E0F9B7C9861D38A /* Mapbox in Frameworks */,
+				8F2FAA98457750D9D664136F /* PostHog in Frameworks */,
+				FC10228E73323BDC09526F97 /* SwiftState in Frameworks */,
+				EAC6FE2CD4F50A43068ADCD8 /* GZIP in Frameworks */,
+				754602A7B2AAD443C4228ED4 /* Sentry in Frameworks */,
+				B0CB16349B96262AA65A04AF /* Version in Frameworks */,
+				36AD4DD4C798E22584ED3200 /* Emojibase in Frameworks */,
+				36CD6E11B37396E14F032CB6 /* WysiwygComposer in Frameworks */,
+				A0D7E5BD0298A97DCBDCE40B /* Prefire in Frameworks */,
+				44F0E1B576C7599DF8022071 /* SwiftOGG in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2340,7 +2337,6 @@
 				823ED0EC3F1B6CF47D284011 /* Tools */,
 				040A58C2A22F7195740EBF5C /* NCE */,
 				B04B538A859CD012755DC19C /* NSE */,
-				9413F680ECDFB2B0DDB0DEF2 /* Packages */,
 				681566846AF307E9BA4C72C6 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -3244,14 +3240,6 @@
 			path = WelcomeScreenScreen;
 			sourceTree = "<group>";
 		};
-		9413F680ECDFB2B0DDB0DEF2 /* Packages */ = {
-			isa = PBXGroup;
-			children = (
-				478BE8591BD13E908EF70C0C /* DesignKit */,
-			);
-			name = Packages;
-			sourceTree = SOURCE_ROOT;
-		};
 		948DD12A5533BE1BC260E437 /* LocationSharing */ = {
 			isa = PBXGroup;
 			children = (
@@ -4031,6 +4019,7 @@
 			children = (
 				D6CA5F386C7701C129398945 /* AuthenticationCoordinator.swift */,
 				97755C01C3971474EFAD5367 /* AuthenticationIconImage.swift */,
+				CCACD75595C40EACD6AD4A74 /* AuthenticationTextFieldStyle.swift */,
 				92390F9FA98255440A6BF5F8 /* OIDCAuthenticationPresenter.swift */,
 				9E6D88E8AFFBF2C1D589C0FA /* UIConstants.swift */,
 				90F48FEF84016ED42A94BA24 /* LoginScreen */,
@@ -4230,7 +4219,6 @@
 			name = ElementX;
 			packageProductDependencies = (
 				A678E40E917620059695F067 /* MatrixRustSDK */,
-				A5A56C4F47C368EBE5C5E870 /* DesignKit */,
 				07FEEEDB11543A7DED420F04 /* Compound */,
 				290FDEDA4D764B9F7EBE55A9 /* Algorithms */,
 				2A3F7BCCB18C15B30CCA39A9 /* AnalyticsEvents */,
@@ -4304,7 +4292,6 @@
 				940C605265DD82DA0C655E23 /* Kingfisher */,
 				AD544C0FA48DFFB080920061 /* Collections */,
 				DCA3C4A997AD28E6918D4CE5 /* Compound */,
-				A593735D882778FD2C9A185B /* DesignKit */,
 				385D4C28F9DC5CF53BD9ECDB /* DeviceKit */,
 				593FBBF394712F2963E98A0B /* DTCoreText */,
 				78B28D75FF7AF8E6146DEE2A /* LRUCache */,
@@ -4782,6 +4769,7 @@
 				B037C365CF8A58A0D149A2DB /* AuthenticationIconImage.swift in Sources */,
 				7F08F4BC1312075E2B5EAEFA /* AuthenticationServiceProxy.swift in Sources */,
 				64FF5CB4E35971255872E1BB /* AuthenticationServiceProxyProtocol.swift in Sources */,
+				6146996D5C4DDD5DA816FC87 /* AuthenticationTextFieldStyle.swift in Sources */,
 				4AAA8606FBA290E23D15422E /* AvatarHeaderView.swift in Sources */,
 				D876EC0FED3B6D46C806912A /* AvatarSize.swift in Sources */,
 				E0A4DCA633D174EB43AD599F /* BackgroundTaskProtocol.swift in Sources */,
@@ -6012,7 +6000,7 @@
 			repositoryURL = "https://github.com/vector-im/compound-ios";
 			requirement = {
 				kind = revision;
-				revision = 0966ff92b2670e3a96259c87016edd92d7ea7797;
+				revision = 3daf2cc662eb10181cf15d717745e0f2ba744372;
 			};
 		};
 		9A472EE0218FE7DCF5283429 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */ = {
@@ -6324,14 +6312,6 @@
 			package = 395DE6AE429B7ACC7C7FE31D /* XCRemoteSwiftPackageReference "KZFileWatchers" */;
 			productName = KZFileWatchers;
 		};
-		A593735D882778FD2C9A185B /* DesignKit */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = DesignKit;
-		};
-		A5A56C4F47C368EBE5C5E870 /* DesignKit */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = DesignKit;
-		};
 		A678E40E917620059695F067 /* MatrixRustSDK */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 80B898A3AD2AC63F3ABFC218 /* XCRemoteSwiftPackageReference "matrix-rust-components-swift" */;

ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -13,7 +13,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/vector-im/compound-ios",
       "state" : {
-        "revision" : "0966ff92b2670e3a96259c87016edd92d7ea7797"
+        "revision" : "3daf2cc662eb10181cf15d717745e0f2ba744372"
       }
     },
     {
@@ -43,15 +43,6 @@
         "version" : "1.7.18"
       }
     },
-    {
-      "identity" : "element-design-tokens",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/vector-im/element-design-tokens.git",
-      "state" : {
-        "revision" : "63e40f10b336c136d6d05f7967e4565e37d3d760",
-        "version" : "0.0.3"
-      }
-    },
     {
       "identity" : "emojibase-bindings",
       "kind" : "remoteSourceControl",

ElementX/Resources/Assets.xcassets/colors/brand-color.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.545",
+          "green" : "0.741",
+          "red" : "0.051"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ElementX/Sources/Generated/Assets.swift

@@ -27,6 +27,7 @@ internal enum Asset {
   internal enum Colors {
     internal static let accentColor = ColorAsset(name: "colors/accent-color")
     internal static let backgroundColor = ColorAsset(name: "colors/background-color")
+    internal static let brandColor = ColorAsset(name: "colors/brand-color")
     internal static let grabber = ColorAsset(name: "colors/grabber")
   }
   internal enum Images {

ElementX/Sources/Other/SwiftUI/Layout/FullscreenDialog.swift

@@ -149,7 +149,7 @@ struct FullscreenDialog_Previews: PreviewProvider, TestablePreview {
                 Text("Continue")
                     .font(.compound.bodyLGSemibold)
             }
-            .buttonStyle(.elementAction(.xLarge))
+            .buttonStyle(.compound(.primary))
             
             Button { } label: {
                 Text("More options")

ElementX/Sources/Other/SwiftUI/Views/PlaceholderAvatarImage.swift

@@ -14,10 +14,8 @@
 // limitations under the License.
 //
 
-import SwiftUI
-
 import Compound
-import DesignKit
+import SwiftUI
 
 struct PlaceholderAvatarImage: View {
     @Environment(\.redactionReasons) private var redactionReasons

ElementX/Sources/Screens/AnalyticsPromptScreen/View/AnalyticsPromptScreen.swift

@@ -92,7 +92,7 @@ struct AnalyticsPromptScreen: View {
                 Text(L10n.actionOk)
                     .font(.compound.bodyLGSemibold)
             }
-            .buttonStyle(.elementAction(.xLarge))
+            .buttonStyle(.compound(.primary))
             .accessibilityIdentifier(A11yIdentifiers.analyticsPromptScreen.enable)
             
             Button { context.send(viewAction: .disable) } label: {

ElementX/Sources/Screens/AppLockScreen/View/AppLockScreen.swift

@@ -17,11 +17,6 @@
 import Compound
 import SwiftUI
 
-// Move this to Compound.
-extension ShapeStyle where Self == Color {
-    static var compound: CompoundColors { Self.compound }
-}
-
 // This implementation is only for development purposes.
 
 struct AppLockScreen: View {
@@ -43,7 +38,7 @@ struct AppLockScreen: View {
             Button(UntranslatedL10n.commonUnlock) {
                 context.send(viewAction: .submitPINCode("0000"))
             }
-            .buttonStyle(.elementAction(.xLarge))
+            .buttonStyle(.compound(.primary))
         }
     }
 }

ElementX/Sources/Screens/Authentication/AuthenticationTextFieldStyle.swift

@@ -14,38 +14,35 @@
 // limitations under the License.
 //
 
-import DesignTokens
+import Compound
 import SwiftUI
 import SwiftUIIntrospect
 
-public extension TextFieldStyle where Self == ElementTextFieldStyle {
-    static func elementInput(labelText: String? = nil,
-                             footerText: String? = nil,
-                             isError: Bool = false,
-                             accessibilityIdentifier: String? = nil) -> ElementTextFieldStyle {
-        ElementTextFieldStyle(labelText: labelText.map(Text.init),
-                              footerText: footerText.map(Text.init),
-                              isError: isError,
-                              accessibilityIdentifier: accessibilityIdentifier)
+public extension TextFieldStyle where Self == AuthenticationTextFieldStyle {
+    static func authentication(labelText: String? = nil,
+                               footerText: String? = nil,
+                               isError: Bool = false,
+                               accessibilityIdentifier: String? = nil) -> AuthenticationTextFieldStyle {
+        AuthenticationTextFieldStyle(labelText: labelText.map(Text.init),
+                                     footerText: footerText.map(Text.init),
+                                     isError: isError,
+                                     accessibilityIdentifier: accessibilityIdentifier)
     }
     
     @_disfavoredOverload
-    static func elementInput(labelText: Text? = nil,
-                             footerText: Text? = nil,
-                             isError: Bool = false,
-                             accessibilityIdentifier: String? = nil) -> ElementTextFieldStyle {
-        ElementTextFieldStyle(labelText: labelText,
-                              footerText: footerText,
-                              isError: isError,
-                              accessibilityIdentifier: accessibilityIdentifier)
+    static func authentication(labelText: Text? = nil,
+                               footerText: Text? = nil,
+                               isError: Bool = false,
+                               accessibilityIdentifier: String? = nil) -> AuthenticationTextFieldStyle {
+        AuthenticationTextFieldStyle(labelText: labelText,
+                                     footerText: footerText,
+                                     isError: isError,
+                                     accessibilityIdentifier: accessibilityIdentifier)
     }
 }
 
-/// A bordered style of text input with a label and a footer
-///
-/// As defined in:
-/// https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=2039%3A26415
-public struct ElementTextFieldStyle: TextFieldStyle {
+/// The text field style used in authentication screens.
+public struct AuthenticationTextFieldStyle: TextFieldStyle {
     @Environment(\.isEnabled) private var isEnabled
     @Environment(\.colorScheme) private var colorScheme
     
@@ -153,24 +150,24 @@ struct ElementTextFieldStyle_Previews: PreviewProvider {
             VStack(spacing: 20) {
                 // Plain text field.
                 TextField("Placeholder", text: .constant(""))
-                    .textFieldStyle(.elementInput())
+                    .textFieldStyle(.authentication())
                 TextField("Placeholder", text: .constant("Web"))
-                    .textFieldStyle(.elementInput())
+                    .textFieldStyle(.authentication())
                 TextField("Placeholder", text: .constant("Web"))
-                    .textFieldStyle(.elementInput())
+                    .textFieldStyle(.authentication())
                     .disabled(true)
                 TextField("Placeholder", text: .constant("Web"))
-                    .textFieldStyle(.elementInput(isError: true))
+                    .textFieldStyle(.authentication(isError: true))
                 
                 // Text field with labels
                 TextField("Placeholder", text: .constant(""))
-                    .textFieldStyle(.elementInput(labelText: "Label", footerText: "Footer"))
+                    .textFieldStyle(.authentication(labelText: "Label", footerText: "Footer"))
                 TextField("Placeholder", text: .constant("Input text"))
-                    .textFieldStyle(.elementInput(labelText: "Title", footerText: "Footer"))
+                    .textFieldStyle(.authentication(labelText: "Title", footerText: "Footer"))
                 TextField("Placeholder", text: .constant("Bad text"))
-                    .textFieldStyle(.elementInput(labelText: "Title", footerText: "Footer", isError: true))
+                    .textFieldStyle(.authentication(labelText: "Title", footerText: "Footer", isError: true))
                 TextField("Placeholder", text: .constant(""))
-                    .textFieldStyle(.elementInput(labelText: "Title", footerText: "Footer"))
+                    .textFieldStyle(.authentication(labelText: "Title", footerText: "Footer"))
                     .disabled(true)
             }
             .padding()

ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginScreen.swift

@@ -76,7 +76,7 @@ struct LoginScreen: View {
                 Text(L10n.commonUsername).foregroundColor(.compound.textPlaceholder)
             }
             .focused($isUsernameFocused)
-            .textFieldStyle(.elementInput(accessibilityIdentifier: A11yIdentifiers.loginScreen.emailUsername))
+            .textFieldStyle(.authentication(accessibilityIdentifier: A11yIdentifiers.loginScreen.emailUsername))
             .disableAutocorrection(true)
             .textContentType(.username)
             .autocapitalization(.none)
@@ -89,7 +89,7 @@ struct LoginScreen: View {
                 Text(L10n.commonPassword).foregroundColor(.compound.textPlaceholder)
             }
             .focused($isPasswordFocused)
-            .textFieldStyle(.elementInput(accessibilityIdentifier: A11yIdentifiers.loginScreen.password))
+            .textFieldStyle(.authentication(accessibilityIdentifier: A11yIdentifiers.loginScreen.password))
             .textContentType(.password)
             .submitLabel(.done)
             .onSubmit(submit)
@@ -99,7 +99,7 @@ struct LoginScreen: View {
             Button(action: submit) {
                 Text(L10n.actionContinue)
             }
-            .buttonStyle(.elementAction(.xLarge))
+            .buttonStyle(.compound(.primary))
             .disabled(!context.viewState.canSubmit)
             .accessibilityIdentifier(A11yIdentifiers.loginScreen.continue)
         }

ElementX/Sources/Screens/Authentication/ServerConfirmationScreen/View/ServerConfirmationScreen.swift

@@ -58,7 +58,7 @@ struct ServerConfirmationScreen: View {
             Button { context.send(viewAction: .confirm) } label: {
                 Text(L10n.actionContinue)
             }
-            .buttonStyle(.elementAction(.xLarge))
+            .buttonStyle(.compound(.primary))
             .accessibilityIdentifier(A11yIdentifiers.serverConfirmationScreen.continue)
             
             Button { context.send(viewAction: .changeServer) } label: {

ElementX/Sources/Screens/Authentication/ServerSelectionScreen/View/ServerSelectionScreen.swift

@@ -60,10 +60,10 @@ struct ServerSelectionScreen: View {
     var serverForm: some View {
         VStack(alignment: .leading, spacing: 24) {
             TextField(L10n.commonServerUrl, text: $context.homeserverAddress)
-                .textFieldStyle(.elementInput(labelText: Text(L10n.screenChangeServerFormHeader),
-                                              footerText: Text(context.viewState.footerMessage),
-                                              isError: context.viewState.isShowingFooterError,
-                                              accessibilityIdentifier: A11yIdentifiers.changeServerScreen.server))
+                .textFieldStyle(.authentication(labelText: Text(L10n.screenChangeServerFormHeader),
+                                                footerText: Text(context.viewState.footerMessage),
+                                                isError: context.viewState.isShowingFooterError,
+                                                accessibilityIdentifier: A11yIdentifiers.changeServerScreen.server))
                 .keyboardType(.URL)
                 .autocapitalization(.none)
                 .disableAutocorrection(true)
@@ -74,7 +74,7 @@ struct ServerSelectionScreen: View {
             Button(action: submit) {
                 Text(context.viewState.buttonTitle)
             }
-            .buttonStyle(.elementAction(.xLarge))
+            .buttonStyle(.compound(.primary))
             .disabled(context.viewState.hasValidationError)
             .accessibilityIdentifier(A11yIdentifiers.changeServerScreen.continue)
         }

ElementX/Sources/Screens/Authentication/SoftLogoutScreen/View/SoftLogoutScreen.swift

@@ -83,7 +83,7 @@ struct SoftLogoutScreen: View {
         VStack(spacing: 14) {
             SecureField(L10n.commonPassword, text: $context.password)
                 .focused($isPasswordFocused)
-                .textFieldStyle(.elementInput())
+                .textFieldStyle(.authentication())
                 .textContentType(.password)
                 .submitLabel(.done)
                 .onSubmit(submit)
@@ -100,7 +100,7 @@ struct SoftLogoutScreen: View {
             Button(action: submit) {
                 Text(L10n.actionNext)
             }
-            .buttonStyle(.elementAction(.xLarge))
+            .buttonStyle(.compound(.primary))
             .disabled(!context.viewState.canSubmit)
             .accessibilityIdentifier(A11yIdentifiers.softLogoutScreen.next)
         }
@@ -111,7 +111,7 @@ struct SoftLogoutScreen: View {
         Button { context.send(viewAction: .continueWithOIDC) } label: {
             Text(L10n.actionContinue)
         }
-        .buttonStyle(.elementAction(.xLarge))
+        .buttonStyle(.compound(.primary))
     }
 
     /// Text shown if neither password or OIDC login is supported.
@@ -139,10 +139,10 @@ struct SoftLogoutScreen: View {
                 .accessibilityIdentifier(A11yIdentifiers.softLogoutScreen.clearDataMessage)
                 .padding(.bottom, 12)
 
-            Button(action: clearData) {
+            Button(role: .destructive, action: clearData) {
                 Text(UntranslatedL10n.softLogoutClearDataSubmit)
             }
-            .buttonStyle(.elementAction(.xLarge, color: .compound.textCriticalPrimary))
+            .buttonStyle(.compound(.primary))
             .accessibilityIdentifier(A11yIdentifiers.softLogoutScreen.clearData)
             .alert(UntranslatedL10n.softLogoutClearDataDialogTitle,
                    isPresented: $showingClearDataConfirmation) {

ElementX/Sources/Screens/Authentication/WaitlistScreen/View/WaitlistScreen.swift

@@ -32,7 +32,7 @@ struct WaitlistScreen: View {
     /// The main content of the view to be shown in a scroll view.
     var content: some View {
         VStack(spacing: 16) {
-            Text(context.viewState.title.tinting(".", color: .element.brand))
+            Text(context.viewState.title.tinting(".", color: Asset.Colors.brandColor.swiftUIColor))
                 .font(.compound.headingXLBold)
                 .multilineTextAlignment(.center)
                 .foregroundColor(.compound.textPrimary)
@@ -52,7 +52,7 @@ struct WaitlistScreen: View {
             Button { context.send(viewAction: .continue(userSession)) } label: {
                 Text(L10n.actionContinue)
             }
-            .buttonStyle(.elementAction(.xLarge))
+            .buttonStyle(.compound(.primary))
         }
     }
     

ElementX/Sources/Screens/ComposerToolbar/View/ComposerToolbar.swift

@@ -111,7 +111,7 @@ struct ComposerToolbar: View {
             submitButtonImage
                 .symbolVariant(.fill)
                 .font(.compound.bodyLG)
-                .foregroundColor(context.viewState.sendButtonDisabled ? .compound.iconDisabled : .global.white)
+                .foregroundColor(context.viewState.sendButtonDisabled ? .compound.iconDisabled : .white)
                 .background {
                     Circle()
                         .foregroundColor(context.viewState.sendButtonDisabled ? .clear : .compound.iconAccentTertiary)

ElementX/Sources/Screens/CreateRoom/View/CreateRoomScreen.swift

@@ -92,7 +92,7 @@ struct CreateRoomScreen: View {
                         .focused($focus, equals: .name)
                         .accessibilityIdentifier(A11yIdentifiers.createRoomScreen.roomName)
                         .padding(EdgeInsets(top: 10, leading: 16, bottom: 10, trailing: 16))
-                        .background(Color.element.formRowBackground)
+                        .background(Color.compound.bgCanvasDefaultLevel1)
                         .clipShape(RoundedRectangle(cornerRadius: 8))
                 }
             }
@@ -188,7 +188,7 @@ struct CreateRoomScreen: View {
                 .padding(.top, 40)
         }
         .listRowSeparatorTint(.compound.borderDisabled)
-        .listRowBackground(Color.element.formRowBackground)
+        .listRowBackground(Color.compound.bgCanvasDefaultLevel1)
     }
     
     private var createButton: some View {

ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift

@@ -232,7 +232,7 @@ struct HomeScreen: View {
                 context.send(viewAction: .verifySession)
             }
             .frame(maxWidth: .infinity)
-            .buttonStyle(.elementCapsuleProminent)
+            .buttonStyle(.compound(.primary, size: .medium))
             .accessibilityIdentifier(A11yIdentifiers.homeScreen.verificationBannerContinue)
         }
         .padding(16)

ElementX/Sources/Screens/InvitesScreen/View/InvitesScreenCell.swift

@@ -105,11 +105,11 @@ struct InvitesScreenCell: View {
     private var buttons: some View {
         HStack(spacing: 12) {
             Button(L10n.actionDecline, action: declineAction)
-                .buttonStyle(.elementCapsule)
+                .buttonStyle(.compound(.secondary, size: .medium))
                 .accessibilityIdentifier(A11yIdentifiers.invitesScreen.decline)
             
             Button(L10n.actionAccept, action: acceptAction)
-                .buttonStyle(.elementCapsuleProminent)
+                .buttonStyle(.compound(.primary, size: .medium))
                 .accessibilityIdentifier(A11yIdentifiers.invitesScreen.accept)
         }
     }

ElementX/Sources/Screens/MigrationScreen/View/MigrationScreen.swift

@@ -34,7 +34,7 @@ struct MigrationScreen: View {
                 .tint(.compound.iconPrimary)
                 .padding(.bottom, 4)
             
-            Text(L10n.screenMigrationTitle.tinting(".", color: .element.brand))
+            Text(L10n.screenMigrationTitle.tinting(".", color: Asset.Colors.brandColor.swiftUIColor))
                 .font(.compound.headingXLBold)
                 .multilineTextAlignment(.center)
                 .foregroundColor(.compound.textPrimary)

ElementX/Sources/Screens/OnboardingScreen/View/OnboardingScreen.swift

@@ -14,7 +14,6 @@
 // limitations under the License.
 //
 
-import DesignKit
 import SwiftUI
 
 /// The screen shown at the beginning of the onboarding flow.
@@ -87,7 +86,7 @@ struct OnboardingScreen: View {
             Button { context.send(viewAction: .login) } label: {
                 Text(L10n.actionContinue)
             }
-            .buttonStyle(.elementAction(.xLarge))
+            .buttonStyle(.compound(.primary))
             .accessibilityIdentifier(A11yIdentifiers.onboardingScreen.signIn)
         }
         .padding(.horizontal, verticalSizeClass == .compact ? 128 : 24)

ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift

@@ -55,7 +55,7 @@ struct TimelineItemPlainStylerView<Content: View>: View {
                 if let replyDetails = messageTimelineItem.replyDetails {
                     HStack(spacing: 4.0) {
                         Rectangle()
-                            .foregroundColor(.global.melon)
+                            .foregroundColor(.compound.iconTertiary)
                             .frame(width: 4.0)
                         TimelineReplyView(placement: .timeline, timelineItemReplyDetails: replyDetails)
                     }

ElementX/Sources/Screens/SessionVerificationScreen/View/SessionVerificationScreen.swift

@@ -130,20 +130,20 @@ struct SessionVerificationScreen: View {
             Button(L10n.actionStartVerification) {
                 context.send(viewAction: .requestVerification)
             }
-            .buttonStyle(.elementAction(.xLarge))
+            .buttonStyle(.compound(.primary))
             .accessibilityIdentifier(A11yIdentifiers.sessionVerificationScreen.requestVerification)
         
         case .cancelled:
             Button(L10n.actionRetry) {
                 context.send(viewAction: .restart)
             }
-            .buttonStyle(.elementAction(.xLarge))
+            .buttonStyle(.compound(.primary))
             
         case .verificationRequestAccepted:
             Button(L10n.actionStart) {
                 context.send(viewAction: .startSasVerification)
             }
-            .buttonStyle(.elementAction(.xLarge))
+            .buttonStyle(.compound(.primary))
             .accessibilityIdentifier(A11yIdentifiers.sessionVerificationScreen.startSasVerification)
         
         case .showingChallenge:
@@ -151,7 +151,7 @@ struct SessionVerificationScreen: View {
                 Button { context.send(viewAction: .accept) } label: {
                     Label(L10n.screenSessionVerificationTheyMatch, systemImage: "checkmark")
                 }
-                .buttonStyle(.elementAction(.xLarge))
+                .buttonStyle(.compound(.primary))
                 .accessibilityIdentifier(A11yIdentifiers.sessionVerificationScreen.acceptChallenge)
                 
                 Button(L10n.screenSessionVerificationTheyDontMatch) {
@@ -170,7 +170,7 @@ struct SessionVerificationScreen: View {
                         Label(L10n.screenSessionVerificationTheyMatch, systemImage: "checkmark")
                     }
                 }
-                .buttonStyle(.elementAction(.xLarge))
+                .buttonStyle(.compound(.primary))
                 .accessibilityIdentifier(A11yIdentifiers.sessionVerificationScreen.acceptChallenge)
                 .disabled(true)
 

ElementX/Sources/Screens/Settings/NotificationSettingsScreen/View/NotificationSettingsScreen.swift

@@ -169,7 +169,7 @@ struct NotificationSettingsScreen: View {
                     } label: {
                         Text(L10n.actionContinue)
                     }
-                    .buttonStyle(.elementCapsuleProminent)
+                    .buttonStyle(.compound(.primary, size: .medium))
                     .disabled(context.viewState.fixingConfigurationMismatch)
                     .accessibilityIdentifier(A11yIdentifiers.notificationSettingsScreen.fixMismatchConfiguration)
                 }

ElementX/Sources/Screens/WelcomeScreenScreen/View/WelcomeScreen.swift

@@ -92,7 +92,7 @@ struct WelcomeScreen: View {
         } label: {
             Text(context.viewState.buttonTitle)
         }
-        .buttonStyle(.elementAction(.xLarge))
+        .buttonStyle(.compound(.primary))
         .accessibilityIdentifier(A11yIdentifiers.welcomeScreen.letsGo)
     }
 }

ElementX/SupportingFiles/target.yml

@@ -174,7 +174,6 @@ targets:
     dependencies:
     - target: NSE
     - package: MatrixRustSDK
-    - package: DesignKit
     - package: Compound
     - package: Algorithms
     - package: AnalyticsEvents

NSE/SupportingFiles/target.yml

@@ -37,7 +37,6 @@ targets:
       - package: Kingfisher
       - package: Collections
       - package: Compound
-      - package: DesignKit
       - package: DeviceKit
       - package: DTCoreText
       - package: LRUCache

UnitTests/__Snapshots__/PreviewTests/test_fullscreenDialog.1.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d3cccc8d5928139de2f6c3b6a253485ebbe89af4ac395356b6b07853c3894654
-size 125092
+oid sha256:f6904057ab5b88999885ac534f6aafb448e7efeb450456e785be51e9c1f4873b
+size 125103

UnitTests/__Snapshots__/PreviewTests/test_locationRoomTimelineView.Plain.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:181d95114288170d533f21560d08b6e640e0dd6080fa946972c5998769933613
-size 1291613
+oid sha256:a10530690e2b2b934bc6bcf430b928bf25233f0dbd5d8799a4a726ba2c1b65b1
+size 1291612

UnitTests/__Snapshots__/PreviewTests/test_loginScreen.Credentials-Entered.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3dda276cd65cc15a2dfd5612d96ed6cd01911a9695a44f0d783164c8a0a4a935
-size 94039
+oid sha256:ba15a627382ea19828450bab14f0e551bb4cb403fa39774272d491eabd136fd4
+size 94047

UnitTests/__Snapshots__/PreviewTests/test_loginScreen.OIDC-Fallback.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:73ec305889896c23ecea7e1676afebe659be139555b96bca4ebb942cf6454762
-size 96850
+oid sha256:ac7b9d58c05af04db5b5d4834578a4254f458f61464ef693b48c992a49344db4
+size 98377

UnitTests/__Snapshots__/PreviewTests/test_loginScreen.Unsupported.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:73ec305889896c23ecea7e1676afebe659be139555b96bca4ebb942cf6454762
-size 96850
+oid sha256:ac7b9d58c05af04db5b5d4834578a4254f458f61464ef693b48c992a49344db4
+size 98377

UnitTests/__Snapshots__/PreviewTests/test_loginScreen.matrix-org.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:73ec305889896c23ecea7e1676afebe659be139555b96bca4ebb942cf6454762
-size 96850
+oid sha256:ac7b9d58c05af04db5b5d4834578a4254f458f61464ef693b48c992a49344db4
+size 98377

UnitTests/__Snapshots__/PreviewTests/test_onboardingScreen.1.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:62943be9f4713c99206f3a046dc6d1356033d66fe0619b67445801a382d9e8ed
-size 827274
+oid sha256:e75df7eb1304fe861770a0a6bb2706537bec137b11407ea53502ee1ac303551f
+size 827287

UnitTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Login.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:26504c75ead0a0d9fe59a56eae78a12da4886e75124d26fbd3c49803be71088d
-size 109519
+oid sha256:b3b0a7e1ec8bde779c25a8c396579362c8e103cc42cbc2254cf2373033587c3e
+size 109530

UnitTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Register.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cdf6da0f23816c09e9eda1c18bb7df4fa586a1ed15f4bd7c325d8fe8ea891724
-size 118019
+oid sha256:15d0f8157f2ed7f68d1bcdfae02d8ac53734882ab7c8c6c47294a3ecfdefe796
+size 118030

UnitTests/__Snapshots__/PreviewTests/test_serverSelection.1.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9cbf2e502cdb3f9f297e3f753677acaa97702ea60e0c97f8f374c8b97fefa27d
-size 124162
+oid sha256:8070f17be77ae86e6281f5be07783787c9c10288e76d34bbec7bd0ae33fffc32
+size 124171

UnitTests/__Snapshots__/PreviewTests/test_serverSelection.2.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c5cd81d9d11ecd3877eb64e1af288eb6a5058e500267cb287354897493bba1f8
-size 118908
+oid sha256:fade713ff6a809e595d036e3755c9d495d78744e3ea1cc31ce6cd080a72be729
+size 120388

UnitTests/__Snapshots__/PreviewTests/test_serverSelection.3.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4144356d079e8526748fbc7db00528d848b26b12741d58a1b598dfce8213301d
-size 104176
+oid sha256:f7b23449b1aa238ca4b2e6df830e5c205078432be73aae1ef462fee71443f563
+size 105713

UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Cancelled.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f43f990e068eda0b66d8b9acb8f2f3418b6ebd8039fd54d44873c3c99e67761
-size 96767
+oid sha256:930a404f3bdae561fd92e2c0756b5ddbebcf322fe40f672554d4c7e63f99d5ed
+size 96758

UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Request-Accepted.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac861ab88ea57e82e9852a24fe3ab9091fc5cc7470806177cccd53724ac55817
-size 94616
+oid sha256:e361cdf9c392bcfd44735c2f137135150cfcd0e72504b2b23361f69f15c9dba4
+size 94646

UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.1.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e9a52b60299bd3eeb4031e35baec18720c950e424f400db9d205a39b4572c2a8
-size 168665
+oid sha256:dc0985943936fdc40fd1f430b64a8d2b6f9d6a99329797c0d13d57c23d405678
+size 169485

UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.2.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6254e617e3d0f62f50c101f45f175f7a49f1c2b547fb7a5ad5cccffb61196ffd
-size 166012
+oid sha256:45fff7190872cc3fad3415322e06adc7ceca403c943b609978fcd95c240db59e
+size 165949

UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.3.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f897c947473966955b3a6512af183d3edeac0afed71a7905f0a72652d10d61b0
-size 157209
+oid sha256:01b87fdb53b417cc79f08ee1113cba9a8b21fe63211205788591c04d975d1d14
+size 157167

UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.4.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5de934d4a60d3f5dcad141dbf2878c6a2aa7f5995f8ff633950bbdebe862a0b
-size 162085
+oid sha256:2fc38d338d8e036e5882d58b45fdc6a76539bf67e493c5add13a50a150f889f4
+size 162039

UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.5.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb9b86220b2e7dda7e8354deb8a5ddbd38984b97429133555f7caf83191fbd20
-size 199745
+oid sha256:347458792d1aa7c2bf44ad51d6a704bcc75af6d72234b97bad7e7fdaa05216b7
+size 200667

UnitTests/__Snapshots__/PreviewTests/test_timelineItemPlainStylerView.Threads.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f17d00d726a34f0b9949cfd98aac4e0c22e15063ca13882b0c875c8001b61f7
-size 258723
+oid sha256:33c4c1bcbc235818c6d57015334490ed610927cc81eeae48f92a93ef040907a0
+size 258728

UnitTests/__Snapshots__/PreviewTests/test_waitlistScreen.Success.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04bbb0e08ca720e623511340f8e22972ef64c79fbf931766a07d93290f4df8a0
+oid sha256:14912bee35771a7ea4c1d5849add7b44b2aa7241b3320860f1ce3e1cf6153632
 size 520204

UnitTests/__Snapshots__/PreviewTests/test_welcomeScreen.1.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:56441b160222e3b233cf3bd53eb59d9f3169852ba46060dfd980dbb0c27f459a
-size 814992
+oid sha256:59f9e3a817e49f7f258014d05595bba1c14a7cbb701f11ba6d092fd7c9f55f17
+size 814989

changelog.d/pr-1886.change

@@ -0,0 +1 @@
+Remove DesignKit package.

project.yml

@@ -48,11 +48,9 @@ packages:
     url: https://github.com/matrix-org/matrix-rust-components-swift
     exactVersion: 1.1.22
     # path: ../matrix-rust-sdk
-  DesignKit:
-    path: DesignKit
   Compound:
     url: https://github.com/vector-im/compound-ios
-    revision: 0966ff92b2670e3a96259c87016edd92d7ea7797
+    revision: 3daf2cc662eb10181cf15d717745e0f2ba744372
     # path: ../compound-ios
   AnalyticsEvents:
     url: https://github.com/matrix-org/matrix-analytics-events