Update the toolbars in the Chats/Spaces screens. (#6043)

* Fix an issue with macro compilation when using Xcode previews. * Update the Chats/Spaces toolbars to match the Figma. Fixes a bug with the status emoji in the liquid glass button.
2026-10-31 08:15:24 +00:00 · 2026-08-18 17:50:15 +01:00
parent bf2561f937
commit b27a549ef8
80 changed files with 230 additions and 170 deletions
@@ -5,7 +5,10 @@ import PackageDescription

 let package = Package(
    name: "BuildExtensions",
-    platforms: [.macOS(.v15)],
+    platforms: [
+        .macOS(.v15),
+        .iOS(.v18) // Only necessary for Previews
+    ],
    products: [
        .library(name: "Macros", targets: ["Macros"])
    ],
@@ -61,7 +61,9 @@ enum Avatars {

 enum UserAvatarSizeOnScreen {
    case chats
+    case chatsCompact
    case spaces
+    case spacesCompact
    case timeline
    case settings
    case roomDetails
@@ -99,12 +101,14 @@ enum UserAvatarSizeOnScreen {
            24
        case .knockingUsersBannerStack:
            28
-        case .chats, .spaces, .map,
+        case .chatsCompact, .spacesCompact, .map,
             .timeline, .readReceiptSheet, .completionSuggestions,
             .blockedUsers, .roomMembersList, .knockingUserBanner:
            32
        case .startChat:
            36
+        case .chats, .spaces:
+            40
        case .roomDetails:
            44
        case .inviteUsers, .knockingUserList, .sessionVerification,
@@ -9,16 +9,24 @@ import Compound
 import SwiftUI

 struct AvatarSettingsButtonLabel: View {
+    @Environment(\.isInSidebar) private var isInSidebar
+    
    let userProfile: UserProfile
    let mediaProvider: MediaProviderProtocol?
    
+    var isCompact: Bool {
+        guard #available(iOS 26, *) else { return true }
+        return isInSidebar // iPad doesn't use glass buttons in the sidebar.
+    }
+    
    var body: some View {
        LoadableAvatarImage(url: userProfile.avatarURL,
                            name: userProfile.displayName,
                            contentID: userProfile.id,
-                            avatarSize: .user(on: .chats),
+                            avatarSize: .user(on: isCompact ? .chatsCompact : .chats),
                            mediaProvider: mediaProvider)
-            .modifier(StatusEmojiModifier(statusEmoji: userProfile.status.displayed?.emoji))
+            .modifier(StatusEmojiModifier(statusEmoji: userProfile.status.displayed?.emoji,
+                                          isCompact: isCompact))
            .geometryGroup()
            .accessibilityHidden(true) // Decorative, the enclosing button provides the description.
    }
@@ -26,6 +34,7 @@ struct AvatarSettingsButtonLabel: View {

 private struct StatusEmojiModifier: ViewModifier {
    let statusEmoji: Character?
+    let isCompact: Bool
    
    func body(content: Content) -> some View {
        if let emojiText {
@@ -46,17 +55,42 @@ private struct StatusEmojiModifier: ViewModifier {
    var emojiText: (some View)? {
        statusEmoji.map {
            Text(String($0))
-                // All values (inc font) scaled by 0.8 as our Liquid Glass avatar is 32pt and not 40pt.
-                .font(.compound.bodyXS)
+                .font(emojiFont)
                .padding(.vertical, 1) // Match Figma's line height.
-                .alignmentGuide(.trailing) { $0.width - 6.5 }
-                .alignmentGuide(.bottom) { $0.height + 1.5 }
+                .alignmentGuide(.trailing) { $0.width - trailingOffset }
+                .alignmentGuide(.bottom) { $0.height + bottomOffset }
        }
    }
+    
+    // Values scaled by 0.8 in the compact layout for a button size of 32pt instead of 40pt.
+    
+    var emojiFont: Font {
+        isCompact ? .compound.bodyXS : .compound.bodyMD
+    }
+    
+    nonisolated var trailingOffset: CGFloat {
+        isCompact ? 6.5 : 8
+    }
+    
+    nonisolated var bottomOffset: CGFloat {
+        isCompact ? 1.5 : 2
+    }
 }

 struct AvatarSettingsButtonLabel_Previews: PreviewProvider, TestablePreview {
    static var previews: some View {
+        VStack(spacing: 24) {
+            states
+                .environment(\.isInSidebar, false)
+            
+            states
+                .environment(\.isInSidebar, true)
+        }
+        .padding(16)
+        .previewLayout(.sizeThatFits)
+    }
+    
+    static var states: some View {
        HStack(spacing: 16) {
            AvatarSettingsButtonLabel(userProfile: .mockAlice,
                                      mediaProvider: MediaProviderMock(.init()))
@@ -66,7 +100,5 @@ struct AvatarSettingsButtonLabel_Previews: PreviewProvider, TestablePreview {
                                                         status: .mock(text: "", emoji: "🌴")),
                                      mediaProvider: MediaProviderMock(.init()))
        }
-        .padding(16)
-        .previewLayout(.sizeThatFits)
    }
 }
@@ -12,6 +12,8 @@ import SentrySwiftUI
 import SwiftUI

 struct HomeScreen: View {
+    @Environment(\.isInSidebar) private var isInSidebar
+    
    @ObservedObject var context: HomeScreenViewModel.Context
    
    @State private var scrollViewAdapter = ScrollViewAdapter()
@@ -28,10 +30,12 @@ struct HomeScreen: View {
                   actions: leaveRoomAlertActions,
                   message: leaveRoomAlertMessage)
            .navigationTitle(title)
+            .navigationBarTitleDisplayMode(Compound.supportsGlass ? .inline : .automatic)
            .toolbar { toolbar }
+            .toolbarRole(Compound.supportsGlass ? .editor : .automatic)
            .background(Color.compound.bgCanvasDefault.ignoresSafeArea())
            .track(screen: .Home)
-            .toolbarBloom(hasSearchBar: true)
+            .toolbarBloom(hasSearchBar: context.viewState.isRoomListSearchEnabled)
            .sentryTrace("\(Self.self)")
            .sheet(item: $context.spaceFiltersViewModel) { vm in
                ChatsSpaceFiltersScreen(context: vm.context)
@@ -52,10 +56,21 @@ struct HomeScreen: View {
    
    @ToolbarContentBuilder
    private var toolbar: some ToolbarContent {
-        ToolbarItem(placement: .navigationBarLeading) {
-            settingsButton
-                .buttonStyle(.borderless)
+        ToolbarItem(placement: Compound.supportsGlass ? .title : .navigationBarLeading) {
+            HStack(spacing: isInSidebar ? 8 : 12) {
+                // The settings button is inside the title on iOS 26 to workaround a
+                // weird liquid glass transition when pushing/popping a room.
+                settingsButton
+                    .buttonStyle(.borderless)
+                
+                if #available(iOS 26, *) {
+                    Text(title)
+                        .font(isInSidebar ? .compound.bodyLGSemibold : .compound.headingLGBold)
+                        .foregroundStyle(.compound.textPrimary)
+                }
+            }
        }
+        .backportSharedBackgroundVisibility(.hidden)
        
        ToolbarItem(placement: .primaryAction) {
            if #available(iOS 26, *) {
@@ -33,7 +33,7 @@ struct SearchScreen: View {
        VStack(alignment: .leading, spacing: 0) {
            // Rendered as content rather than a navigation title so it stays visible while the search field is focused.
            Text(L10n.actionSearch)
-                .font(.compound.headingXLBold)
+                .font(.compound.headingLGBold)
                .foregroundStyle(.compound.textPrimary)
                .accessibilityAddTraits(.isHeader)
                .frame(maxWidth: .infinity, alignment: .leading)
@@ -24,7 +24,7 @@ struct SpaceHeaderView: View {
            
            VStack(spacing: 8) {
                Text(spaceServiceRoom.name)
-                    .font(.compound.headingLGBold)
+                    .font(.compound.headingMDBold)
                    .foregroundStyle(.compound.textPrimary)
                    .multilineTextAlignment(.center)
                
@@ -17,6 +17,7 @@ struct SpacesScreen: View {
            .navigationTitle(L10n.screenSpaceListTitle)
            .navigationBarTitleDisplayMode(.inline)
            .toolbar { toolbar }
+            .toolbarRole(Compound.supportsGlass ? .editor : .automatic)
            .background(Color.compound.bgCanvasDefault.ignoresSafeArea())
            .toolbarBloom(hasSearchBar: false)
    }
@@ -54,7 +55,7 @@ struct SpacesScreen: View {
            
            VStack(spacing: 8) {
                Text(L10n.screenSpaceListTitle)
-                    .font(.compound.headingLGBold)
+                    .font(.compound.headingMDBold)
                    .foregroundStyle(.compound.textPrimary)
                    .multilineTextAlignment(.center)
                
@@ -92,7 +93,8 @@ struct SpacesScreen: View {
    
    @ToolbarContentBuilder
    private var toolbar: some ToolbarContent {
-        ToolbarItem(placement: .navigationBarLeading) {
+        // Use the title placement on iOS 26 to match the chats tab and fix a weird animation.
+        ToolbarItem(placement: Compound.supportsGlass ? .title : .navigationBarLeading) {
            Button {
                context.send(viewAction: .showSettings)
            } label: {
@@ -103,14 +105,18 @@ struct SpacesScreen: View {
            .accessibilityLabel(L10n.commonSettings)
            .accessibilityIdentifier(A11yIdentifiers.homeScreen.userAvatar)
        }
-        
-        ToolbarItem(placement: .principal) {
-            // Hides the navigationTitle (which is set for the navigation stack label).
-            Text("").accessibilityHidden(true)
-        }
        .backportSharedBackgroundVisibility(.hidden)
        
-        ToolbarItem(placement: .navigationBarTrailing) {
+        // No need to hide the title on iOS 26, as we use the .title placement for the settings
+        // button to workaround a weird liquid glass transition.
+        if #unavailable(iOS 26) {
+            ToolbarItem(placement: .principal) {
+                // Hides the navigationTitle (which is set for the navigation stack label).
+                Text("").accessibilityHidden(true)
+            }
+        }
+        
+        ToolbarItem(placement: .primaryAction) {
            Button {
                context.send(viewAction: .createSpace)
            } label: {
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:13d4ba218a8a95bb13e9ab23d85ba8092cff7fad4dd26d75a2c9a21d6e4204fe
-size 20207
+oid sha256:be81357e4416bbe4c153d9cf7a28235a1195ee08178fe3686e318898940d0f83
+size 47632
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:13d4ba218a8a95bb13e9ab23d85ba8092cff7fad4dd26d75a2c9a21d6e4204fe
-size 20207
+oid sha256:be81357e4416bbe4c153d9cf7a28235a1195ee08178fe3686e318898940d0f83
+size 47632
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4447de0f020576d2f892ce4b95799f9b417ac5bfd3707791a974bc27093e7023
-size 16365
+oid sha256:d997c2bd5310204089a48e2fc3a3386423471e701bcddbd48005a99b28049393
+size 39573
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4447de0f020576d2f892ce4b95799f9b417ac5bfd3707791a974bc27093e7023
-size 16365
+oid sha256:d997c2bd5310204089a48e2fc3a3386423471e701bcddbd48005a99b28049393
+size 39573
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fb8016783dc39fe08f8aba08c085ae80754b34ad0d82133952292029d919aeb5
-size 123008
+oid sha256:5c3f0e901ac5ed774635e2d481dcf7f8cc21d44bb1223958a5eea10338412f4f
+size 109681
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad70efe163d65d1f29a4ccaf2b4985d2a1e65204ddc1aec2e3a4c2d62c71163f
-size 127374
+oid sha256:d200a4a00a5b36ee4660b6a45ebf7ae3ce85e6a7b68fe7a581e8146757617b88
+size 113888
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:88979ad3f7439ce5266fa40851e01e2f3320a7f863334762f469ab00ecaa2ddd
-size 64833
+oid sha256:a4541c3f1c6a23cec42e7583425bb77f98497281609afedac2d5720e1ed5915e
+size 58566
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c075a8a7d8148b1382b821fa5ba4f0d27eb1c123b1c8a4a7ae9475ebfee2976
-size 74153
+oid sha256:caf0391c35cb49222cc20cf31375637394da5e25ac9cc487c2bb626ae5a15a65
+size 68680
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dfa75744064930bee14b2a10184fa0b456cfaff71a36665c66095597381aeb59
-size 295588
+oid sha256:d511ad9e759af987e9c9a984654afef51bc82bfd3db80b3b2694226a726f6534
+size 287447
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58a6c9d1d23cb1e3c51ec007cff963e042daf5fca3616718121500cf8f73512e
-size 302434
+oid sha256:e72af355e0500092626f0ee1890a472a041c96d8caf5029902b3590e4946a1bd
+size 298102
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:368f7826d875d097ef1a3384aeb00d69c61ffb79e9e88e483089ebacc1637d41
-size 210452
+oid sha256:f0fc89af541a00b64e99d69e51a507ebd721b6b84cdd26649742ad137eac8b21
+size 203489
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:82f64e22c5a2dbe3e0cecd79896f0e0014835f3bd478e394f7a1abb0bb33c0d9
-size 211749
+oid sha256:94c053581767d3e51f82b6fa7d22be470684c65e16459a81010fc9f3cbfd17e3
+size 208888
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:78a5364a262bb95e0a5c51c7227c4e866166bad62ea02a2e86e2a28416aa87aa
-size 123184
+oid sha256:00b4e0234074237c7d269cd9c5609429b14c7edd003980bde48cc4783f15f7fb
+size 110472
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9adfc2dcfeb8e2d16876cca2e3e8f703a4fee3d71c869759b39c7234be6502a0
-size 123904
+oid sha256:d625ba0b95dc430191d8c63768970de951f1220f8223e8556402f7ca1377b403
+size 111094
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:231b544ef2a7a5025766333fc00bca05ab318a3110603823fecf535185eba251
-size 63238
+oid sha256:9247b62b94d2fc1cde3a5c75e4267e349457c9852e1965bb786d0aee6205b202
+size 58266
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2499471f6aab6093a14eeff371202d0a0a8695dc96f67840909e88d847698004
-size 64001
+oid sha256:9ebe9c0ce2d54ea18014e8ded42e4fa8eae09a029cca0b673f2e708e4ee93f61
+size 58923
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:891746fb72e15eb52e9eedcb3577d374a643ee8123df2edad187bc867ee04399
-size 94527
+oid sha256:7bfea050d80105ee2383b4c53466ca42f2a17bebad5d8211882292f75803a3e2
+size 93453
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa6f9ebe2d40bf3199338fba84304ce32798d7dd2b588b6d0166d86dbf2d3d59
-size 101479
+oid sha256:e40f5ec001e372489b4ae212080364b779caaeb80e5cea0fbc42b0626d57e2a1
+size 100371
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0cbe5bfc57b172f94dd553a9f1599026a77532d09494bce5a7ef001a50d38eda
-size 50188
+oid sha256:2ad035e3a8905a8c16aa69cb6f7a640b022454812fd808eec45649995d85a4aa
+size 49390
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c61bef04e3fc3c0babf3a1b2c80100d252a4b5803ec2ac8819e2007127601db
-size 61252
+oid sha256:37a6276be4d882858a34511cbc743154c84630e080835980d3744b5d5f6cf080
+size 60230
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11f4fb72ae4e013ede2cf15badc4f606a63df54fa239aaf1495f63efcc546192
-size 79539
+oid sha256:9e57d3aaa2c52c81b83058d49f535e7eef8f882ea4b7796bb053e45f3ba06b26
+size 78549
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d655d7715048faea691bac61723b170f09f0976a5bd30afce8e013fc8ca7dfaf
-size 83176
+oid sha256:5e1cbc8d0e163edfa3ed11f098f072cc1abd69d588bdc2334508d4df1edf40af
+size 81939
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:97fcf1b74fabdf20969a45ca0bf01d5d4fefeb3da0e59eeb4406f709f3c3bef4
-size 37375
+oid sha256:0f46684c02cedca6141abe63b810134025301280c09e0112cfb0ba9e64b97386
+size 36548
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:108ad08965d887de946143b3b620e17449dd279e5b6f96af816d9cf3d153b9c3
-size 40806
+oid sha256:9a866a4b16189a2cbe0a611bb2d42b13b0f7663fd80028c18529ac225cb482de
+size 39608
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:11f4fb72ae4e013ede2cf15badc4f606a63df54fa239aaf1495f63efcc546192
-size 79539
+oid sha256:9e57d3aaa2c52c81b83058d49f535e7eef8f882ea4b7796bb053e45f3ba06b26
+size 78549
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d655d7715048faea691bac61723b170f09f0976a5bd30afce8e013fc8ca7dfaf
-size 83176
+oid sha256:5e1cbc8d0e163edfa3ed11f098f072cc1abd69d588bdc2334508d4df1edf40af
+size 81939
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:97fcf1b74fabdf20969a45ca0bf01d5d4fefeb3da0e59eeb4406f709f3c3bef4
-size 37375
+oid sha256:0f46684c02cedca6141abe63b810134025301280c09e0112cfb0ba9e64b97386
+size 36548
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:108ad08965d887de946143b3b620e17449dd279e5b6f96af816d9cf3d153b9c3
-size 40806
+oid sha256:9a866a4b16189a2cbe0a611bb2d42b13b0f7663fd80028c18529ac225cb482de
+size 39608
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:47c0d85785474ad482e16c45d1a76101d04c229a46f6a7a105d159e509800089
-size 79383
+oid sha256:54144e071c4de37f1aa1e8e8da36b0a8d31071d3efe3d4ede880d9b5a556c047
+size 78390
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c54d206972724b048cd4a35dba8e9373b384c6b48847beaf7abb64dc15505d7
-size 81556
+oid sha256:d1fccfa44e45a8002dd83ccc7b9fd5bc7b91b64131e283b5ddcee781e92b33c7
+size 80329
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e71048e4fc798d6a008802496a4fffd958330b36a3e8be7cc5fed4a0b84933b
-size 37231
+oid sha256:cb7843c84202b7e45bed43e588813ebf955e58b09fb8e6668e27d46145eb1b93
+size 36401
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7406bfb37485f5887656a505a26a9aa68e65230ed851122809cf3e626a63d0c1
-size 39329
+oid sha256:32a8c40f6eb298b3dd90e3b12b16135c09b271ccea687340eaf0cfa36b2b9b5b
+size 38158
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bff8cb1515228a7dedb057e40c7c9847bab7358050067f47248578d2913b59ff
-size 174780
+oid sha256:870e9bd828ce2adef8abdded6bd48d272aa73275050c78788a10cdbbbaa277ce
+size 173846
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e20a96e78b00722922232f43f9339d789a5cb8d8680edd6751db162c90d44b0
-size 177030
+oid sha256:70f32b361743d5f24153032177739a971d20cc0f6cf45aa310a8dd3b5be05e05
+size 175729
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee445d60715eb830391daeb07185031b7b8594816cc4203526d502664d4f208e
-size 123452
+oid sha256:0b7cebb62df71a0f07d6eb44b4552182629cae1e73b1241a8c3446acde18be1d
+size 122682
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc18344e26074e971ba431faac5a6192b2f60c5386b316939196553b05117e96
-size 125547
+oid sha256:b275c61545655c784c217c25865c455aaec537661ed54a3eaee095be45e24071
+size 124407
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a56937dcc44ef2f6a6d3831ab80df944fe2c9b449d44cfacb5fe4deb91a7ad8
-size 215153
+oid sha256:c1fb7152bd48a2da400a82a5d96a50ba632df5e288148e39cc7fc20f9d53bb25
+size 210177
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b944e5658e2ae4226b27c6d7cb824063ab48dfabd0c8314836eab41e183dca0
-size 220406
+oid sha256:4dc90731a78e3941a6284449fb13550835e1ef5e5647e93995384582cf06c690
+size 215779
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ccea063f7a92ed3c1a248bcecdf557153cb67b7f3b097778cd2cd880cd25079b
-size 143411
+oid sha256:20bd274868a7e650eb536c6c7999d4e698727f1b462fa73aa854e13e4fb9f954
+size 139812
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e6b2f80951db2a0d70679de8c43304856872522cfa09f15bfcc982ab819b3bd0
-size 147987
+oid sha256:e195656423d526c116618dfa2ca57d86f1d3ded2baf8057a2048fd8ffabeae42
+size 144263
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee0cf168e9615409ab3c679b58f82a90f8c4694453128aab99aa907d9daa57fe
-size 140321
+oid sha256:3b3547ee2120de8260bbbd00c0337a5d4fbdbbad836ad5383b3143dceb7df630
+size 139438
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b5b757358d4d26e12aaeb976da40417d95068909a9c8735ccbee6a960e0d8ed
-size 148616
+oid sha256:cc583a5b387521c2869d77e08981dc082f958e4635975d9448484721e3db0a77
+size 147411
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6c38790ccb923c578410bde37d78cef5f65cd66fd061c1211d1f7003648b204c
-size 93208
+oid sha256:372d46824983580755635139858a9939f916c1b486aa8aad7995e1d8fc3a9d4b
+size 92501
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a09bdc3bcfbb8f246fa905a0bb84ccf80b16ade253a3ae6c109d9f5eb31367d3
-size 106057
+oid sha256:a275192bb4b9db628e6293cc295e1b7ef28f6c577688e0d78c07452d960b7954
+size 105164
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb633f3375cfe7e7b4276c40c90b6d29994e499e9bf67e8ea1e8e306e825db42
-size 236025
+oid sha256:a798e48b3bc46b75f81cbcccb11e6160fc780d5ec9934c5ca16c5fb410518280
+size 235371
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d6ec85a0c4a09e448655c2e3f20eb5495ee72b7d511d43422e872db3da460a68
-size 266931
+oid sha256:c23385abe6d93324987cfed6dbe435641afce1f5fdbbd71f4ea33094ed2f4f1b
+size 267216
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:234d52c28e5453d09086017df24b77a72d75dd0fa1a888b69c314ca82655d4c4
-size 176873
+oid sha256:c1c30d513a6ec852f53b5156c2da99028fabaa9f2305146869e569399b73fd3b
+size 176959
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:820fa5ee82c3706c00fff8de4d85d7718c33df517af3cbaef7a026398a41cbfb
-size 200530
+oid sha256:14fbc2e98702e4624bbc864dcce493fbd6ccb7f14b21746ee7d3e9322369830a
+size 201637
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e27fa446df33f4b718c19f00231fa293663d376db6944d2d0942221da39f5f66
-size 114220
+oid sha256:bcd2bbab78d99f8eb8f86b5fa2e033959ccadf6dbb0ac122fe9af67b97009467
+size 115665
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:97d71b79f2d660d4d6d3c233658f71dd972b104b91ea48bf669556b7b68d440f
-size 121565
+oid sha256:35379d658d1635118fa583df8feae1d7f5c5db689fe3f223a4a3ece6962592a9
+size 122963
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c164e128b774f47817f040e2183227ef65d6bc2cb38ea35759ba2582c0aa199
-size 55845
+oid sha256:3c23e16af4e8a3833b075a32b374270c100b711df0dc94fd5f17b833d71ea9d6
+size 57638
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:83b061033ccb9cc7fa2bc2effaac73eb4534ed7c333a0eb06f5937c99759b772
-size 66047
+oid sha256:7b5c75b7081848d7a163fd21147166467f3abf50bb21396bd133afd86f58aa3a
+size 67731
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ca35d5ffe84d33bb1543afb28bd339b104baf5275071412ee8a7c05b9c9878e1
-size 195783
+oid sha256:1dcae13f09630c7b9f9f821378f4b49b9e47b966d3f23af0cca926be7141a854
+size 196334
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:667c80f11b62c14610743421adbef716541a608634a6bde5cddd5f5c0ffcd7f8
-size 226754
+oid sha256:bee54aa5987e45bdbd0c5b4b0ee2dfe55dec17e188e72ebae673a6cff126e3e2
+size 227186
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:38789539575c066aef112024b9eb391ea0bfaf7380087bbac2f25028ab364186
-size 128616
+oid sha256:c88de4eb75c11aba976255bcd7d08414992d170ae40b204c8a6e1e7c6365d102
+size 130749
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:29da80586d1664e8ee15dd9d8e5eaf53e107c0dd3d08f60013a079e1d21def77
-size 149093
+oid sha256:12d14b6d3bde79a4aa732e514df779ffbca6dd0115562df0d9fee64701fb2231
+size 149697
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:59b55768e0b172cea57188a1b230428940bb5d1264f0872135377131bd83d126
-size 709077
+oid sha256:58fca2c1ddd343d49eb264add70b60c1a233ea03be381303a12d1f1c8233c5b9
+size 614549
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b9e427522788fdc637160593fe85c72a827e9268612de2f3bc09ff375e453eb
-size 131982
+oid sha256:ae25dcbe580817a1522ea965a3df50663de11cfc739adff447c5a633eb07c733
+size 129860
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:427c4964a232d0e795b288909e3155b7707f7f4b14c60864079b8e9b1c143cdc
-size 282827
+oid sha256:677923a9e3e53944986ae248b59b8cce2519787b937b819a4a105d1e18822008
+size 283966
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db70cf216901b52c1f188338a6671cdf41ddcb755f65fe9ebcd8ed6cb148ff11
-size 347369
+oid sha256:7edb0a21fe6e3ab05b6752698c405fdd39f207ed356effef0956dc4b1fb4a52c
+size 345956
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:39bd09601f6a3c332220d821b8648b35c1ff4d64ebfcd729c3941e4f119cff19
-size 261578
+oid sha256:3c9b46363c9afea893b87e25946daf7e83a0d58959019df15d2ebcf8181e2072
+size 260892
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf19780d233244b32ea447978b9c4d4ea929807120fcb6034f7038764a2ca2d2
-size 266595
+oid sha256:eab45fe9469660d3f7033b2b920c64cc723001f9acbba59869f77746633067f7
+size 271151
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2290c4a8d134c230b22d09f00b523387b37983d5ce43d43e87be105a0aff58d3
-size 395143
+oid sha256:6ea8b13bf325ed545728f47a2a49a3fa38fa038882d1d1d5c3c99ce2e7032124
+size 394707
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a36929ab5ce8174274e3ce5696b186fde9f2f53dca059164cb6f1685e66436ed
-size 381346
+oid sha256:25d068ad42ed7d74648cb87f14357b619ddecf5999c7c3f1b9f06bc87d045c2c
+size 380848
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0dd571b92ce61e271bad7de55222aec850e7f1f8dfd94e3dc3309a626d88aead
-size 277024
+oid sha256:a8cbd39521cb4cbd0fa8e987c32018314b34ae4f2b34fde8576942ebde82b6e7
+size 276168
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9bdf4a952ed9337caa75c8ec3859cc47cc4a2f12432ce912c2b08063ca1f8c2a
-size 461910
+oid sha256:f997d05b9fb6dfd8ce933d2890d3588a8d721055fa4ada930166528dff99412a
+size 461854
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc42e32adfbb493ea6b89844d1080d7a025385b8a5dd75a6c5e2a70cb0271b6f
-size 250754
+oid sha256:42da07eea3f88bbc2a41c4b5cf91b93ca6d620effa48182154ba6c661bee230e
+size 249711
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e8e89c49bf01a1655714a962ad15f56f65cbdc1f9d706822980948c3b7b8c1df
-size 708767
+oid sha256:3b58a3c76798d46842699217d913c7d412db6fe415484aac69ccf75eed9743c2
+size 608258
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c11cd1113c96085d6c1165de796a6137d85a71947ac61dd2ff1d17f432b5f8a
-size 377855
+oid sha256:a316492b7e0a79784aedd46a4a9203427c98d69f0051536c23d351341fbf6141
+size 353871
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24d35d981096dce3f704ad604044523cc68d72a030293682098e7087d7c9bcee
-size 324275
+oid sha256:17aa970fcf4f36eaaeda8b240ddb2c63e9f3f1b69701726b069c9242f0615369
+size 325040
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d339e6a0dfab580fa501fe8295e0a4d0e106a677d153297412560e2f516110d
-size 139491
+oid sha256:64234e01d38859c62356a5c8de2d0ef76e8ddf59087aad75be78368c935d3474
+size 138644
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b05225930b29aa014258ee2e37b0f11aad0ec84da8670e70cfac7ce9b9023e3
-size 627803
+oid sha256:d1c5e63a579b145ea13a9e8e9bbf708358f798f8809d114409e9013af2ff6521
+size 545640
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2a73c02965f8e8f0f1440fe6bd0cf604887c7999c8fe0c35529cb5d074a14f90
-size 557729
+oid sha256:8ed5c32ef4581702320463a8531651e40842aecd7967a2c5390388ad64b055ce
+size 557341