Some more tweaks to compound for User Status. (#5708)

* Add a plain list modifier to Compound. * Move ElementTextFieldStyle into Compound and support more styles from the Figma - More accurately reflects our Liquid Glass updates. - Adds support for the .raised style. * Update Element X snapshots.
2026-11-04 19:44:05 +00:00 · 2026-06-05 15:59:34 +01:00
parent 21d2f59b26
commit 097d055dbe
151 changed files with 574 additions and 531 deletions
@@ -123,10 +123,6 @@ extension AccessibilityTests {
        try await performAccessibilityAudit(named: "EditRoomAddressScreen_Previews")
    }
    func testElementTextFieldStyle() async throws {
        try await performAccessibilityAudit(named: "ElementTextFieldStyle_Previews")
    }
    func testEmojiPickerScreenHeaderView() async throws {
        try await performAccessibilityAudit(named: "EmojiPickerScreenHeaderView_Previews")
    }
@@ -1032,7 +1032,6 @@
 		A808DC3F72D15C6C5A52317E /* TimelineItemDebugView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCDA016D05107DED3B9495CB /* TimelineItemDebugView.swift */; };
 		A816F7087C495D85048AC50E /* RoomMemberDetailsScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B6E30BB748F3F480F077969 /* RoomMemberDetailsScreenModels.swift */; };
 		A851635B3255C6DC07034A12 /* RoomScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8108C8F0ACF6A7EB72D0117 /* RoomScreenCoordinator.swift */; };
 		A87DC550659C5176AC1829DE /* ElementTextFieldStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7673F2B0B038FAB2A8D16AD /* ElementTextFieldStyle.swift */; };
 		A88328D7E17F73AB64501B51 /* SwiftSoup in Frameworks */ = {isa = PBXBuildFile; productRef = EDFB92E97D9AC4BA8540C18C /* SwiftSoup */; };
 		A8DB299C5C891EDAE74A22F4 /* UserLocationCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F7482D5D1526E3399B00174 /* UserLocationCell.swift */; };
 		A8E324E700E596E36B0A311B /* BootDetectionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F054DE7D47849687662C9D9 /* BootDetectionManager.swift */; };
@@ -2862,7 +2861,6 @@
 		D6DC38E64A5ED3FDB201029A /* BugReportService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BugReportService.swift; sourceTree = "<group>"; };
 		D7149BDDE47F8AD104E644E2 /* TraceLogPack.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TraceLogPack.swift; sourceTree = "<group>"; };
 		D751AA05AD2182BFC4608DE6 /* ur */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ur; path = ur.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		D7673F2B0B038FAB2A8D16AD /* ElementTextFieldStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ElementTextFieldStyle.swift; sourceTree = "<group>"; };
 		D77F75B3E9F99864048A422A /* DeactivateAccountScreenViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeactivateAccountScreenViewModelTests.swift; sourceTree = "<group>"; };
 		D78C13EF5035879B6131030F /* Room.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Room.swift; sourceTree = "<group>"; };
 		D79BB714D28C9F588DD69353 /* SecureBackupScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureBackupScreenViewModelProtocol.swift; sourceTree = "<group>"; };
@@ -6829,7 +6827,6 @@
 		E6E1D07163F8752D62DA4A93 /* Styles */ = {
 			isa = PBXGroup;
 			children = (
 				D7673F2B0B038FAB2A8D16AD /* ElementTextFieldStyle.swift */,
 				89FBFC09F9DAFF1E4BA97849 /* FormButtonStyles.swift */,
 			);
 			path = Styles;
@@ -8377,7 +8374,6 @@
 				07CC13C5729C24255348CBBD /* ElementCallWidgetDriver.swift in Sources */,
 				370AF5BFCD4384DD455479B6 /* ElementCallWidgetDriverProtocol.swift in Sources */,
 				D29E999538E5ABC00E1668F8 /* ElementNavigationStack.swift in Sources */,
 				A87DC550659C5176AC1829DE /* ElementTextFieldStyle.swift in Sources */,
 				7C1A7B594B2F8143F0DD0005 /* ElementXAttributeScope.swift in Sources */,
 				3A08584ECDD4A4541DBF21F8 /* EmojiLoaderProtocol.swift in Sources */,
 				340D39DB87F3800D53A6A621 /* EmojiPickerScreen.swift in Sources */,
@@ -1,217 +0,0 @@
 //
 // Copyright 2025 Element Creations Ltd.
 // Copyright 2022-2025 New Vector Ltd.
 //
 // SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
 // Please see LICENSE files in the repository root for full details.
 //
 import Compound
 import SwiftUI
 import SwiftUIIntrospect
@MainActor
 extension TextFieldStyle where Self == ElementTextFieldStyle {
    static func element(labelText: String? = nil,
                        footerText: String? = nil,
                        state: ElementTextFieldStyle.State = .default,
                        accessibilityIdentifier: String? = nil) -> ElementTextFieldStyle {
        ElementTextFieldStyle(labelText: labelText.map(Text.init),
                              footerText: footerText.map(Text.init),
                              state: state,
                              accessibilityIdentifier: accessibilityIdentifier)
    }
    @_disfavoredOverload
    static func element(labelText: Text? = nil,
                        footerText: Text? = nil,
                        state: ElementTextFieldStyle.State = .default,
                        accessibilityIdentifier: String? = nil) -> ElementTextFieldStyle {
        ElementTextFieldStyle(labelText: labelText,
                              footerText: footerText,
                              state: state,
                              accessibilityIdentifier: accessibilityIdentifier)
    }
 }
 /// The text field style used in authentication screens.
@MainActor
 struct ElementTextFieldStyle: @MainActor TextFieldStyle {
    enum State {
        case success
        case error
        case `default`
    }
    @Environment(\.isEnabled) private var isEnabled
    @FocusState private var isFocused: Bool
    let labelText: Text?
    let footerText: Text?
    let state: State
    let accessibilityIdentifier: String?
    private var isError: Bool {
        state == .error
    }
    /// The color of the text field's border.
    private var borderColor: Color {
        isError ? .compound.textCriticalPrimary : .compound._borderTextFieldFocused
    }
    /// The width of the text field's border.
    private var borderWidth: CGFloat {
        isFocused || isError ? 1.0 : 0
    }
    private var accentColor: Color {
        isError ? .compound.textCriticalPrimary : .compound.iconAccentTertiary
    }
    /// The color of the text inside the text field.
    private var textColor: Color {
        isEnabled ? .compound.textPrimary : .compound.textDisabled
    }
    /// The color of the text field's background.
    private var backgroundColor: Color {
        isError ? .compound.bgCriticalSubtleHovered :
            .compound.bgSubtleSecondary.opacity(isEnabled ? 1 : 0.5)
    }
    /// The color of the placeholder text inside the text field.
    private var placeholderColor: UIColor {
        .compound.textSecondary
    }
    /// The color of the label above the text field.
    private var labelColor: Color {
        isEnabled ? .compound.textPrimary : .compound.textDisabled
    }
    /// The color of the footer label below the text field.
    private var footerTextColor: Color {
        switch state {
        case .default:
            .compound.textSecondary
        case .error:
            .compound.textCriticalPrimary
        case .success:
            .compound.textSuccessPrimary
        }
    }
    private var footerIconColor: Color {
        switch state {
        // Doesn't matter we don't render it
        case .default:
            .clear
        case .error:
            .compound.iconCriticalPrimary
        case .success:
            .compound.iconSuccessPrimary
        }
    }
    /// Creates the text field style configured as required.
    /// - Parameters:
    ///   - labelText: The text shown in the label above the field.
    ///   - footerText: The text shown in the footer label below the field.
    ///   - isError: Whether or not the text field is currently in the error state.
    init(labelText: Text? = nil, footerText: Text? = nil, state: State = .default, accessibilityIdentifier: String? = nil) {
        self.labelText = labelText
        self.footerText = footerText
        self.state = state
        self.accessibilityIdentifier = accessibilityIdentifier
    }
    @MainActor
    func _body(configuration: TextField<_Label>) -> some View {
        let rectangle = RoundedRectangle(cornerRadius: 14.0)
        return VStack(alignment: .leading, spacing: 8) {
            labelText
                .font(.compound.bodySMSemibold)
                .foregroundColor(labelColor)
                .padding(.horizontal, 16)
            configuration
                .focused($isFocused)
                .font(.compound.bodyLG)
                .foregroundColor(textColor)
                .accentColor(accentColor)
                .padding(.leading, 16.0)
                .padding([.vertical, .trailing], 11.0)
                .background {
                    ZStack {
                        backgroundColor
                            .clipShape(rectangle)
                        rectangle
                            .stroke(borderColor, lineWidth: borderWidth)
                    }
                    .onTapGesture { isFocused = true } // Set focus with taps outside of the text field
                }
                .introspect(.textField, on: .supportedVersions) { textField in
                    textField.clearButtonMode = .whileEditing
                    textField.attributedPlaceholder = NSAttributedString(string: textField.placeholder ?? "",
                                                                         attributes: [NSAttributedString.Key.foregroundColor: placeholderColor])
                    textField.accessibilityIdentifier = accessibilityIdentifier
                }
            if let footerText {
                Label {
                    footerText
                        .tint(.compound.textLinkExternal)
                        .font(.compound.bodySM)
                        .foregroundColor(footerTextColor)
                } icon: {
                    switch state {
                    case .success:
                        CompoundIcon(\.checkCircleSolid, size: .xSmall, relativeTo: .compound.bodySM)
                            .foregroundStyle(.compound.iconSuccessPrimary)
                    case .error:
                        CompoundIcon(\.errorSolid, size: .xSmall, relativeTo: .compound.bodySM)
                            .foregroundStyle(.compound.iconCriticalPrimary)
                    case .default:
                        EmptyView()
                    }
                }
                .labelStyle(.custom(spacing: 4, alignment: .top))
                .padding(.horizontal, 16)
            }
        }
    }
 }
 struct ElementTextFieldStyle_Previews: PreviewProvider, TestablePreview {
    static var previews: some View {
        VStack(spacing: 20) {
            // Plain text field.
            TextField("Placeholder", text: .constant(""))
                .textFieldStyle(.element())
            TextField("Placeholder", text: .constant("Web"))
                .textFieldStyle(.element())
            TextField("Placeholder", text: .constant("Web"))
                .textFieldStyle(.element())
                .disabled(true)
            TextField("Placeholder", text: .constant("Web"))
                .textFieldStyle(.element(state: .error))
            // Text field with labels
            TextField("Placeholder", text: .constant(""))
                .textFieldStyle(.element(labelText: "Label", footerText: "Footer"))
            TextField("Placeholder", text: .constant("Input text"))
                .textFieldStyle(.element(labelText: "Title", footerText: "Footer"))
            TextField("Placeholder", text: .constant("Bad text"))
                .textFieldStyle(.element(labelText: "Title", footerText: "Footer", state: .error))
            TextField("Placeholder", text: .constant(""))
                .textFieldStyle(.element(labelText: "Title", footerText: "Footer"))
                .disabled(true)
            TextField("Placeholder", text: .constant(""))
                .textFieldStyle(.element(labelText: "Title", footerText: "Footer", state: .success))
        }
        .previewLayout(.sizeThatFits)
        .padding()
    }
 }
@@ -38,7 +38,6 @@ enum TestablePreviewsDictionary {
        "DeactivateAccountScreen_Previews" : DeactivateAccountScreen_Previews.self,
        "DeclineAndBlockScreen_Previews" : DeclineAndBlockScreen_Previews.self,
        "EditRoomAddressScreen_Previews" : EditRoomAddressScreen_Previews.self,
        "ElementTextFieldStyle_Previews" : ElementTextFieldStyle_Previews.self,
        "EmojiPickerScreenHeaderView_Previews" : EmojiPickerScreenHeaderView_Previews.self,
        "EmojiPickerScreen_Previews" : EmojiPickerScreen_Previews.self,
        "EmoteRoomTimelineView_Previews" : EmoteRoomTimelineView_Previews.self,
@@ -61,17 +61,11 @@ struct LoginScreen: View {
    /// The form with text fields for username and password, along with a submit button.
    var loginForm: some View {
        VStack(alignment: .leading, spacing: 0) {
            Text(L10n.screenLoginFormHeader)
                .font(.compound.bodySM)
                .foregroundColor(.compound.textPrimary)
                .padding(.horizontal, 16)
                .padding(.bottom, 8)
            TextField(text: $context.username) {
                Text(L10n.commonUsername).foregroundColor(.compound.textSecondary)
            }
            .focused($isUsernameFocused)
-            .textFieldStyle(.element(accessibilityIdentifier: A11yIdentifiers.loginScreen.emailUsername))
+            .textFieldStyle(.compound(labelText: L10n.screenLoginFormHeader, accessibilityIdentifier: A11yIdentifiers.loginScreen.emailUsername))
            .disableAutocorrection(true)
            .textContentType(.username)
            .autocapitalization(.none)
@@ -86,7 +80,7 @@ struct LoginScreen: View {
                Text(L10n.commonPassword).foregroundColor(.compound.textSecondary)
            }
            .focused($isPasswordFocused)
-            .textFieldStyle(.element(accessibilityIdentifier: A11yIdentifiers.loginScreen.password))
+            .textFieldStyle(.compound(accessibilityIdentifier: A11yIdentifiers.loginScreen.password))
            .textContentType(.password)
            .submitLabel(.done)
            .onSubmit(submit)
@@ -53,7 +53,7 @@ struct ServerSelectionScreen: View {
    var serverForm: some View {
        VStack(alignment: .leading, spacing: 24) {
            TextField(L10n.commonServerUrl, text: $context.homeserverAddress)
-                .textFieldStyle(.element(labelText: Text(L10n.screenChangeServerFormHeader),
+                .textFieldStyle(.compound(labelText: Text(L10n.screenChangeServerFormHeader),
                                          footerText: Text(context.viewState.footerMessage),
                                          state: context.viewState.isShowingFooterError ? .error : .default,
                                          accessibilityIdentifier: A11yIdentifiers.changeServerScreen.server))
@@ -6,6 +6,7 @@
 // Please see LICENSE files in the repository root for full details.
 //
 import Compound
 import SwiftUI
 struct SoftLogoutScreen: View {
@@ -75,7 +76,7 @@ struct SoftLogoutScreen: View {
        VStack(spacing: 14) {
            SecureField(L10n.commonPassword, text: $context.password)
                .focused($isPasswordFocused)
-                .textFieldStyle(.element())
+                .textFieldStyle(.compound())
                .textContentType(.password)
                .submitLabel(.done)
                .onSubmit(submit)
@@ -42,10 +42,8 @@ struct CreateRoomSpaceSelectionSheet: View {
                    }
                }
            }
            .listStyle(.plain)
            .environment(\.defaultMinListRowHeight, 66)
-            .scrollContentBackground(.hidden)
+            .compoundList(.plain)
            .background(Color.compound.bgCanvasDefault.ignoresSafeArea())
            .navigationTitle(L10n.screenCreateRoomSpaceSelectionSheetTitle)
            .navigationBarTitleDisplayMode(.inline)
            .toolbar {
@@ -42,10 +42,7 @@ struct RoomDirectorySearchScreen: View {
                    .listRowSeparator(.hidden)
                }
            }
-            .listStyle(.plain)
+            .compoundList(.plain)
            .environment(\.defaultMinListRowHeight, 48)
            .scrollContentBackground(.hidden)
            .background(Color.compound.bgCanvasDefault.ignoresSafeArea())
            .isSearching($context.isSearching)
            .searchable(text: $context.searchString, placement: .navigationBarDrawer(displayMode: .always))
            .navigationTitle(L10n.screenRoomDirectorySearchTitle)
@@ -31,7 +31,7 @@ struct JoinRoomByAddressView: View {
        }
    }
-    private var textFieldState: ElementTextFieldStyle.State {
+    private var textFieldState: CompoundTextFieldStyle.State {
        switch context.viewState.joinByAddressState {
        case .addressFound:
            .success
@@ -47,7 +47,7 @@ struct JoinRoomByAddressView: View {
            VStack(spacing: 24) {
                TextField(L10n.screenStartChatJoinRoomByAddressPlaceholder,
                          text: $context.roomAddress)
-                    .textFieldStyle(.element(labelText: L10n.screenStartChatJoinRoomByAddressAction,
+                    .textFieldStyle(.compound(labelText: L10n.screenStartChatJoinRoomByAddressAction,
                                              footerText: footerText,
                                              state: textFieldState))
                    .textInputAutocapitalization(.never)
@@ -214,13 +214,6 @@ extension PreviewTests {
        }
    }
    @Test
    func elementTextFieldStyle() async throws {
        for (index, preview) in ElementTextFieldStyle_Previews._allPreviews.enumerated() {
            try await assertSnapshots(matching: preview, step: index)
        }
    }
    @Test
    func emojiPickerScreenHeaderView() async throws {
        for (index, preview) in EmojiPickerScreenHeaderView_Previews._allPreviews.enumerated() {
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7cf54519ba66ea01ee0fbb2cac517ad99bdb0018409d6a70e66c5d6f383ecf8f
+oid sha256:56e04212685761c32b5fa58f35f28cc2ba9e5d4a077af3f7374a9cd6223bba74
-size 192815
+size 195083
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f9ebe7f8b2081eaa353a8c6cc491d9667e9d58785d792d05dceb1c6b499285c
+oid sha256:10a35d2b36c6515e5b3f6f982b560d2e3d5949ee168b678b1b28663d7fb84866
-size 241765
+size 234864
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b9c19149684f37a1b483cc20edb3164573564a495ef328481276cdb72431d4d
+oid sha256:8f1f0fb80f66172f1c0520d1fabc779ccb4e1c0a113f390f50f4beb15303af1a
-size 94814
+size 95170
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1d809ed228edd340a8ea0be3b87f67f526412826bcd92a6950c9f4bf3ff3edf0
+oid sha256:e8233f462c57de3a8aceaf4208022395a3e25e1e0b1415855eb21509442238d9
-size 102620
+size 99148
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3899e9945ac54eed79872b377551627ea92b60e4136e058be92c89bbc6a7138f
+oid sha256:09aad74b063cdeaa4f2e857529e8c30101d941023214fc20cb7206f27177a503
-size 88327
+size 88402
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:537428ef2559a77b877a652272555600134d48452efaea9e8c6c69672402a996
+oid sha256:5810762290fa7d9902d448cbc973592b9c333e6b0d4b4162b6b1a78ae2c023b2
-size 92845
+size 90181
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:47534df1787d88eee732a9a30b1feaa65ce391996420293219795602791f6541
+oid sha256:9df6abf3219fb7549876a69ec97831f709c91ecb1526fc57a6b888d7af0601b7
-size 90631
+size 91137
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e0ce06ed886d4813844c6d4ad07c6c83dd38424318a170a419901403e671cd88
+oid sha256:7bf02df7113f65146397bb10330d5bfc7afcfd7e1e9cd8a4e56c5d333b5f5c11
-size 98035
+size 95204
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84458dd952958b7043bbd4b760b46269bbed86d3b3ecbf36d38eeba27373dd55
+oid sha256:f223253f78a3926b6176b02f213775c5dedf56b1b60043ae0233ab7fdd38a972
-size 200116
+size 202773
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8dac9384ecc27ac5fa2f1e0d437d8e0a5a632aa945fcc95c3b9e84cf09fe36ef
+oid sha256:40af53ab413a1d856ccf1c07b7c732690bc33de8dfecfff082acff26a070c8fc
-size 238305
+size 240476
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ca8a4623abaf30a24cb2e6e851eb3d0a1ed05156b9c59bb0b7a2e3887675173d
+oid sha256:2d649b6615fcf568db389d501ce619901f984e0faa158cbe74112631d5ccacec
-size 150141
+size 153789
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:25d3fa6110b9d758fee81c43300319cdc556654a318b6dc9cbb350540810f39a
+oid sha256:54a403f48aa87b0ef240572ebaa54ec566d7a4662f0a6e80755a80b1e7af969e
-size 193023
+size 192797
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de68a8e99fcd025ea4e41ea7f556599fe7ca6fd188c9f8ff03ebd3659f9f7c8f
+oid sha256:cd0bbc272b35fbc8bf003a24a8e9c3c560b58a76f1f319f1fc462f4ab151ef30
-size 111622
+size 112343
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c67615a189a5d02cabb4b1794b22f9c4564297f827debe5334f50ca64dccd0f
+oid sha256:59ddccaea206d88ae2130a51a8ee9391ce681b6888233d82ee326d45abb89fa7
-size 114215
+size 113653
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db79e0990daf69fabce2bb3145d712192a690c2f318135c1fa2fce506b7e6c42
+oid sha256:17d74ceb7cea09398f7b42b9f5c087527b912a5abe4b4fb75839047339e7c32d
-size 161763
+size 165705
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cfcd0d08071a85f5c08cfae75f5b49048bd5397a955f70f1ff60b16d6335c847
+oid sha256:73ee9ead97095b0e2b199fcc96cc86b9c097a74ca371be605b762f60436698fe
-size 204534
+size 213136
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:659227df135be49875ec5c2849a53342c668a0e2f77fc30022b793808993764d
+oid sha256:5ab3b88c733750845d0dd0ef22708207028c698ba7c6b5dfd41786a7bb4525dd
-size 108912
+size 110435
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:90705465666db61b6f871bea3100e4806e8f8d28b2c7e99e522feca5912317d0
+oid sha256:191ba6b02c1386722a24a67579f709208619d9467f04967c693fe24e0166d8b4
-size 122711
+size 120821
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fd979421e0197588631c2ccc7f725a068b2590dda9a6d6cadd0662fe9ae1be36
+oid sha256:88ddeec810a0b90d464a8d302ad1c498496881efc6f12169e847ecd769b61078
-size 120283
+size 121549
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d36f885b788eb906d548b792d327ee30d2ea1ce350233ce8b51b41e3d52a7464
+oid sha256:b75f91c938a18cff4dc04be63f28830665505c78d18d01f6b73db44d51a725d5
-size 135023
+size 133346
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54acedf1751cafe21a07f164852d817d14cae88dfc75dd7afe01e8c5090fdea5
+oid sha256:4d22e9d817768147affb1a679a5ac25bc982dd18eb4ed7194998c898624d77d3
-size 111952
+size 115030
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80079aed54df0a12c5cdaa0986d91e31eae197ab900f25c80964c48c1607f8cd
+oid sha256:bc633c1b917af6ad65c286c3c8f95f32063a6549bf2d590a61fc85ea9216f54e
-size 126926
+size 131426
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d60029837ffb3a9332943c195d1467060b73889aeaa2e339079d0dd99e93ae45
+oid sha256:3a2ce2314c191470e5d0794b65bd93dce72529a56e896a64d61c2d02fb7daae4
-size 117582
+size 120179
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:00d1555a9f1a2435a76a35dc5cfecaf33046456a1fe23b3e759e136e53869ca5
+oid sha256:0259827d2d813194aa8937a49571ec2175340a93b78a2ccff2c2498b3f6fdbbb
-size 137627
+size 140255
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:06584e61d4562a9c445df4f8bce8fd0304c44ba27681a472b7056237e1430c8b
+oid sha256:4ceca2c24cd613ba17e1dfb7d73af8bd2cf2f37f576066f8375037943cf78a3a
-size 99866
+size 100914
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e27e019e35bb2936e24435ddabf92a39f6d391d08f4c641a907f9dcf30820d18
+oid sha256:cb159e4f9623856476701665b0c98071953c919ce332a66e40c0bba8071c1dc9
-size 106316
+size 107387
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11e2f9da7472a352ca56374d5745d9766884b97c00e0cd67665ba13a64069799
+oid sha256:ff22e635564ebcf3383070a1a791ea03a6243e6397b378167d8067cd5902b3c1
-size 99661
+size 100946
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de8a24af031b1290016f03e008ac41354484e61701e4bef1037f8db8add26745
+oid sha256:38fe771eaa87cc40b0ed8694eac9c2a4ccaf481463cb7734f25cce39767a66c4
-size 106115
+size 107411
@@ -1,3 +0,0 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:f2f6a609f3336d5a8c8fb37e9354c086d9cd7085aa71f02529fdcf51c447f9e7
 size 130717
@@ -1,3 +0,0 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:d94ca4b007147f92e99553c6d034419d4330608f2b3000c1162cd8c49e434b8c
 size 134208
@@ -1,3 +0,0 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:3cf33d50d94bb496eccadc724916df7a2841f0eb501f7c109b4afaff83916e8b
 size 80329
@@ -1,3 +0,0 @@
 version https://git-lfs.github.com/spec/v1
 oid sha256:4136610cc4b6111c1edc66384d459ebedb608e92f46e7532e0d740ab4d06ad56
 size 83630
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0716a25f07db8ef0102ccca52926b447b37aa2ecb4be3d5fdf8720fd8753ac68
+oid sha256:7735ae78abb834e3b593fb6261542526a17a32b085ae535af0659860968049c2
-size 85553
+size 86474
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:516bd3124180b92a97ae51e03c49cb198514f79f3009d455f85d58b6b5eb2d77
+oid sha256:2228318fd0c9f5a5b48ee1f39b48f14c67f01f828ee45f55e0aa9042126cb588
-size 91094
+size 92616
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee39442de2eea25a841a7f67aec3e07028a79e5a59b98ec642d01cacf6f1f7e7
+oid sha256:46bae0a3d6441cef71e8772f07d8318c46717a64a2a47b40cb3403488579e59c
-size 42058
+size 43060
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf9c032e81666891764cfa27b2aafe0fbfd050137164d1cf886bd08b53f858e0
+oid sha256:0c95bbede0d51e8cb724cfdd977f45d83b1b4f404debe737061d20a42bd96cb1
-size 48041
+size 49274
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c30fdc9f2828d9e386f2d0b7b0dcc72b169ecf488b8e99aa3d1a5acdd539aa5
+oid sha256:596b880af417ee76145eb04c279f2ef871790369cfe8a32af61997f73ef86ce5
-size 114902
+size 116682
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:271b3ab395f73b15bf4555b9c1f01a351efc1cb08df35dbd148bc4a83c7ded50
+oid sha256:b611d1d7d04d06148949f5ba526c83960e5da6ec9d61dffd29b730a7bc9d4c62
-size 130088
+size 134943
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:39e1e12846935a24e8b43b1b5c326f366ca7d3fc4f5f67821a41e17e5b03bd2e
+oid sha256:495ccc670fa018a6d57c5832c8cc339b0b8ed612e4eeef0ea8879ea4a2a58e01
-size 91787
+size 93217
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aba4aaa5b372873a58486fe9d292cc8aa31ebe29e4cdcc9aaeabc155fb14ba83
+oid sha256:198f6e05f22c20eb1c4497cf95e4d62e199180b9b33fd76430c159a141d0d8ff
-size 97585
+size 98917
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36fc8d2e7d1699aa6979e29fa896d3249d3081578b720ebc11d86248b1759b84
+oid sha256:3dcee043fed5b8113dbb873c20e70c364622bdc6c1ea88cd90a4aea00159125b
-size 48462
+size 49668
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:263e9b47e53c2b4b79ca35b1b8aae0b3c0e5abeb9cc8ad54c64e69cfd5766013
+oid sha256:ad0d37641f0cc4db92bf07c90466fa3e7ff65eda9820bb5684bfae95c94e9d44
-size 55415
+size 56492
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6f876b8fd1f725204230e94f0cf9897bc49d6ed3716aa46756b1c5f9c57276f
+oid sha256:e3de9e0b063c8ba2efa584ba4342c5c2e41bff12f4602cc83910e04944f6696b
-size 95601
+size 97129
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d8e1f89e4cda3a6976aa82d5213981098c10e6f380f7c8b1f798540f151854f
+oid sha256:be9aa81262845f9e81698b1844c0016abd76f1da621e2fd2cfb20f25164d77af
-size 103289
+size 104730
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44de57c66ac161df59178d0e0592a70083813ebc5ba3fa4eb30ad8c19f74b984
+oid sha256:9607ae02df6dcb1671a85f60829cbc85844faad5aaf651f0ac7daa117ef3f12b
-size 51579
+size 52716
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4fb1ffb92cd715710e43f5d9b55f25321f2191dda9028f08dcfa0ebbaa4aeb23
+oid sha256:515de659bb3db8f1d1ab92f5d8acf0a68b6ce554062942a09179b58247374181
-size 59800
+size 60959
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:978bc40426158b9ab474f4396c2d7726b063dc8b9e27956809540a7244412d9e
+oid sha256:978cd81029a94bf911ed9df8efdb6edf6b98816ed82656e525c96fa4c93b6bc2
-size 182780
+size 185856
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:133bd7708d84286c3100fb25cd3b8ded741ea2a0e1aa2cde2906f1acfb3fbd46
+oid sha256:09582d2408d7e2a5cc81df9bbf83ac422c62e110f112afb2c799c597b36c1792
-size 208276
+size 205986
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc0ad3dc3d0a0448ff7e805fea1d45dc939d15d8eac1732e9f976af6a512e143
+oid sha256:6d1e61757255d91886d2dfe0efdc4dc86c8508b801f3f89822cd865431603070
-size 120604
+size 121784
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ebdd34ed207adcf48fd8bd2c98874ad884f6c27cbfe6813ff12babd52590025d
+oid sha256:cee417bf89109a9d1c7fb16fb297b84e025882a68547d60875dbbf06788d197e
-size 141729
+size 142823
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ab055612f060cb9373bb059513b0a828906d926cda20677a93b17f2898e6389
+oid sha256:ef52134f31d4aee6c81a08e43d502b8d86f968ef8603479a0700e33075270a2d
-size 109560
+size 110649
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1666f6061e8872027bd0181e145e957cdb045682d037ecfd6bc268bdb659b3a5
+oid sha256:9afffce77e86b19390a72165712218181dada79d51c6fefd9ab6dfa4673be3a2
-size 123945
+size 125293
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:00e021ea09e721592cbd4857b115dc70749dd3a2260dd805a788e4d7cb58d53f
+oid sha256:36d0e963ecb52b8f3d1c1aa9e8b2554aae0f543e37ce6dfd973e3dde27ffba8f
-size 162651
+size 162624
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad780e3af22d1a34035bdc4c139cabb37d4cc45cb0f4703bc9d3b74b7ed51747
+oid sha256:4756cfe857d8679134b8cb251864cb8ee9f9ecfeb30832e37999d045ba5d8cc7
-size 190423
+size 178445
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:85dad53977c47697e230e65e2958b9945dd3ee98b3a1dee47a3a5db1926dc541
+oid sha256:6271efbe84f5525c3a4870fe0bdb062fe6e37c69a49f5ec5c7f9aa16c18b1812
-size 167621
+size 166873
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa82b3084050d09857bbad7ad94bbf56e70c799107e5de881159735eea47b629
+oid sha256:0c35600b87cfbdb66a255286415a4c056684e05662eaa5c059938348042bb7c9
-size 195983
+size 182420
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c5fcc835a3de2e65b1112c6afc7b7250bc5ba4e540dd1c80fef2994f4b27d6ac
+oid sha256:0ec3f194d1817de3671cc3f5fb6d4654d73b44a6ff51bfbc0e6a24e08eeac0c4
-size 150854
+size 149829
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a2ae1282baccf63fab2606ab1cc2bcba32b261f6f2b34e1f0c8d5b662f4a5b0b
+oid sha256:f68cb0e85218eb7aa1af6ac4675b02a87feb405579ce8b8db14e4ab8274d7b53
-size 173907
+size 162431
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c3c491d9958bdc80618ecdf132bfa3ee8dbc9b196d19325237fb20b88356a159
+oid sha256:6c05093ce6a08c3cc68d05c714ee90b7d0ad5c3f7473e0a2f71cd6e62c35aa83
-size 107256
+size 107319
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2cdc317bbadb121afdb1ea2e80f3253cdb8e66b5c6a8eb9b24fc6cd9c6082682
+oid sha256:822add4744b21228cd939b891e93922e8168b6597b3967c5263fcc833adf3255
-size 115846
+size 112909
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:62b1fc8176a793e990fcf4417c8daecf53323db7ec965c14b68bbf82852a8db8
+oid sha256:48c12319da3ad4deeeb5a92dfabd97022376f0e44b5d77d52e2c7a72f31f9b40
-size 95986
+size 96263
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cd8a44d0825329a7fbaac6d6008d744e4e2b17581f837cc2235eeede385b4e7d
+oid sha256:20700f43b15d3495dcc17ca4bade6bd7f8c6a8961274cfbddb83ed6432e3475d
-size 100749
+size 100475
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5660e7e8e2923dece48caaba208eb7ece4237ad1aaccbca883ed28e3399fcf47
+oid sha256:6ca8bb6f5872582066dc8566dec94c0014f6c65e252ebd54f11bf31debda48b8
-size 109885
+size 109617
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e9dd3991f0a06afd9668be98204ba73f1e535367f375901e23436d5d971b923
+oid sha256:9d328f71b573f9decf2e6e0cef228fcd3cd4e5c9edc3eb7a0bbfc78fc8c7b3ca
-size 117998
+size 115281
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d06ba8fc6faf1d5995f6000a0aba83e590ba0a6e7f7914b544e3f9c39a1dfb09
+oid sha256:2839f5dc356ee88c67df4dc63802faf3c57e4e2cc4ef9c095a104e33fdda4b01
-size 111420
+size 111658
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:118549997c39eaf888de0976ddca8c3aa7695e8abc7cf9c2fb3360c252a53c75
+oid sha256:1f7c3881e0aa251a7abb26f9ac9126b20a4f2902068787536cf4a3853a3454c5
-size 120979
+size 116254
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc820346adc083628ed3c045f9f464afdaa5abf92188013478b3bd7be618f4d6
+oid sha256:a3c58afaabd6ffc55dd12d3b697c7a37cc91b9e7658aa0b9bc92e43dfde210a7
-size 107554
+size 106956
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f045f96e1dec9e1d34f2b5a5a0c2120779e06108b0ae2ff3e528edb422544fdd
+oid sha256:5c2327860d7651c4afa2cf7ef8e9a9507226f2d9ffbcf5c9f68fa99bd6c4d7f7
-size 118043
+size 111706
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65b91bad21d91a973bf4f3ee4813c4b8e0d9b9ea9c74c6ea1f800d66607bf192
+oid sha256:5547d393b03a085d5f16c6017e08bcd1f3b7ac857b0f82e6483af9cadf29612e
-size 131364
+size 134735
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60715313eee0904cf475474662d4b698c202dc6090b0fe165ea2619cffd5c6ec
+oid sha256:6a3aa556681b07b8b600f6192f4cfe178c531d8c8f01a7f60e1ef3ffa33b6cef
-size 163509
+size 167324
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d45d00643cb4a7e5980f7278ae897715d0ff744f83114def8ae5e1ed3232d8e6
+oid sha256:8a32da4904f6b884d92823af64ea6e3a26bc615fc9786b4e75d5af8d130cb3ec
-size 110769
+size 113094
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:99066f71e9b7530b01843746e4dc8c5a058bd8022bc8913b2d2b943a2e6f0b1b
+oid sha256:1e17622c0b31805cba8d255d3b01a2e4a8fc7bdc86bc3b2983358a4873162504
-size 131097
+size 133324
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f7fbcabfd8ad4884a5c6261fb3e8bb69133dfd513c5bfaa63a4d485d225487b
+oid sha256:e26bfeb1d3012326ab369c6fa9ab1701ed91f85af0ee232efabfdc085b348ee0
-size 130415
+size 133688
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1341d2c72312a9e377166062c52d73f2be8710f328972e8d8fc9b183fe7af5b7
+oid sha256:c73efb91e3ca8632f20faf021474c8c1b56da388bfdd8cd9c3248529f7b1fc25
-size 162057
+size 166370
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:734fe7f23776b416ff7c2104047101f04c532b8e4b9b9737de75bda9568dfa7d
+oid sha256:7c4a58cf737d6eff6f18735f40f5cac0968b47d1d7e208857ea40d236fbefc9e
-size 90444
+size 90774
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3da2c4a0e192b1861aa681589786eb17df6b2815dc22e52566d3f49d609563ed
+oid sha256:93203650b30f386fc8e76748cd7825f949cc68cb443e9e70e37403ff5cef7402
-size 95202
+size 95690
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5880ffa8670318679f5b27023b6e2d2397f540a1d2fc9ac7164b2ebde2e15566
+oid sha256:a3d488007d654fb8486781a8c3267ee6dbe37aeff9d711ffbf8315631971ddcd
-size 192774
+size 190528
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4303cf46dfecd8ce7301df6d284569e70706e74f118c5c88db1b3fec07259ca4
+oid sha256:a548fb5456e80fb8186ed4c1e4adea01633d3e796756631f672d0df9a8eb11b5
-size 230870
+size 232850
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae893ce11b9189c852bf846ec586c0d3f9b43e36e8d319cd852c24126017c827
+oid sha256:fe9769c920dce9cca6f9067961730f2e017f6da4e83c445e3f443fa1299399fd
-size 207851
+size 207300
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fdbbf8869cc98c7bffeb5d1a0d66da037f4ec970a29045b63e1c24251d51443f
+oid sha256:d4d07ad6251946cae5dff02c72e9c3ee4442a11196c68450d24c4d61e2ebab95
-size 257264
+size 253877
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9049063d62a4dc411b6f34febeb9a2e36a267676f7e3a735d5752b5dffcab4af
+oid sha256:f435378013b1325a04ffbffa85ca764b2f7b8a31e4563588c44eb7f6ada40a70
-size 194777
+size 198765
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d127e43ed7e14accd614a555b5328840ec8320a371ae0ddb28f4786094f83c04
+oid sha256:76efd3a08c9bfe5f18a3902f6aac0bcc472a5aecca8aa24923931f105d5dd871
-size 244823
+size 237384
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:10e1c6471a14951ccae6efd8eb1590f9722a5d126cdc9afc8f079b1066d9b0f1
+oid sha256:b19e5a03483e7aefc9d707ff835621e384effdef3a2f449f0c6343d3ea2728b0
-size 170744
+size 174013
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0feac7394b7e3016281cae6f16a595460a95bb2a9424ef84bf8ec206d2c1f304
+oid sha256:811be1da4f53d2f2dc8eb046a3d8397e47400b69ed48bd4f6997a2afe55829ef
-size 211373
+size 213207
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ddca3a59e5d2a3d9d3c94a75fcafc0eae054c8f3d8cd34336d4ba050107a3646
+oid sha256:8aa8e5df9b2514e23b8635ef2eb78438dcf2102a13fd9f86652a7cf5718c8489
-size 147324
+size 149453
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96bdbb56ad54c42eec3ac3419dc1348d73f9e1113a425dbb11f5bc7d8ee597e0
+oid sha256:bc8cb589e9ad4f67171d5c90e5015ebbaf52279925fe7993d5745b840695d8f4
-size 176066
+size 174554
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42d33d3492b0a3e09f37e61478c7655d81f4dcf97d559a6178a2e33f0651120b
+oid sha256:d9ed9429dd57043be3fb057852651e5eef19060d9d1341398fe5c0e04429fcec
-size 196931
+size 200515
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:260276cd85cf2bd8e5858e5a1839a2ef5dd8423191c96dc7f99991440d120b82
+oid sha256:90ebf7970b562dae41e20bee0927338c4681db56e2476e91d30f99c1f7ad3562
-size 248740
+size 230032
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d34e197c1a90d687dfac7b8a1c331679b10cc418d9a8dda968261297906441b
+oid sha256:800af9e73485bcff3fded4ce979ed520d5a73256313fde1da488ea22d1b81adf
-size 169114
+size 171894
--- a/Show More
+++ b/Show More