Merge pull request #6459 from element-hq/feature/bma/iterateOnBadgeColors

Sync compound tokens https://github.com/element-hq/compound-design-tokens/releases/tag/v8.0.0
2026-11-02 12:07:28 +00:00 · 2026-03-25 14:28:15 +01:00
parent 16e9cb64ce e2eefdbf63
commit 087c159325
91 changed files with 244 additions and 174 deletions
@@ -17,7 +17,6 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Folder
 import androidx.compose.material.icons.outlined.SubdirectoryArrowLeft
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
@@ -112,7 +111,7 @@ private fun ItemRow(
        }
        is Item.Folder -> {
            ListItem(
-                leadingContent = ListItemContent.Icon(IconSource.Vector(Icons.Outlined.Folder)),
+                leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Folder())),
                headlineContent = {
                    Text(
                        text = item.name,
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:460ddd253f4029b29edde9d858237204acb55aca7e13e92bc691ea71ca34c53e
-size 237462
+oid sha256:37f6acca46890e98087ece62e2716fa60791479fab02999406050517e3b79307
+size 240187
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a0b76eee73be6a2ba58eb12883477ebce7daf039b6c60637e263a478a0bc68fe
-size 250668
+oid sha256:a2de5e6d24dcbe0baa75a69485f5a308466fa599625bcbdb0cb96e9bc5a1b708
+size 253233
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d12abdfa2a2d7d1943e0e377279134b44de0ad5d8fb12b09e23c2083b728989f
-size 251951
+oid sha256:ae1cb46d82acbb23cc172f41e20a41bbe88c350ab53c20e5b2a91f2c16590fbf
+size 254525
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:40f0940bd8a5ddee96ea2aac01d9672478fc15044621bfb10f5f0b20d61f035d
-size 93402
+oid sha256:8a8a9b6e61758a40d01028a4edb4a4d21b845b83b3e0793ed0934e48f3d9eea0
+size 94637
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:48d8c1bef4a59554649fab33aa716ca2e9fe24f29a6b7e0dae9c404afedd6695
-size 99735
+oid sha256:7f29d225df71587fefe07ec8739b84f1a0469786c6b1d6778da0bad33d19574e
+size 101183
@@ -122,6 +122,7 @@ private fun getSemanticColors(): ImmutableMap<String, Color> {
            "bgBadgeAccent" to bgBadgeAccent,
            "bgBadgeDefault" to bgBadgeDefault,
            "bgBadgeInfo" to bgBadgeInfo,
+            "bgBadgePrimary" to bgBadgePrimary,
            "bgCanvasDefault" to bgCanvasDefault,
            "bgCanvasDefaultLevel1" to bgCanvasDefaultLevel1,
            "bgCanvasDisabled" to bgCanvasDisabled,
@@ -148,6 +148,9 @@ object CompoundIcons {
    @Composable fun Delete(): ImageVector {
        return ImageVector.vectorResource(R.drawable.ic_compound_delete)
    }
+    @Composable fun DevicePasskey(): ImageVector {
+        return ImageVector.vectorResource(R.drawable.ic_compound_device_passkey)
+    }
    @Composable fun Devices(): ImageVector {
        return ImageVector.vectorResource(R.drawable.ic_compound_devices)
    }
@@ -226,6 +229,9 @@ object CompoundIcons {
    @Composable fun Filter(): ImageVector {
        return ImageVector.vectorResource(R.drawable.ic_compound_filter)
    }
+    @Composable fun Folder(): ImageVector {
+        return ImageVector.vectorResource(R.drawable.ic_compound_folder)
+    }
    @Composable fun Forward(): ImageVector {
        return ImageVector.vectorResource(R.drawable.ic_compound_forward)
    }
@@ -738,6 +744,7 @@ object CompoundIcons {
        Copy(),
        DarkMode(),
        Delete(),
+        DevicePasskey(),
        Devices(),
        DialPad(),
        Document(),
@@ -764,6 +771,7 @@ object CompoundIcons {
        FileError(),
        Files(),
        Filter(),
+        Folder(),
        Forward(),
        FullScreen(),
        Grid(),
@@ -965,6 +973,7 @@ object CompoundIcons {
        R.drawable.ic_compound_copy,
        R.drawable.ic_compound_dark_mode,
        R.drawable.ic_compound_delete,
+        R.drawable.ic_compound_device_passkey,
        R.drawable.ic_compound_devices,
        R.drawable.ic_compound_dial_pad,
        R.drawable.ic_compound_document,
@@ -991,6 +1000,7 @@ object CompoundIcons {
        R.drawable.ic_compound_file_error,
        R.drawable.ic_compound_files,
        R.drawable.ic_compound_filter,
+        R.drawable.ic_compound_folder,
        R.drawable.ic_compound_forward,
        R.drawable.ic_compound_full_screen,
        R.drawable.ic_compound_grid,
@@ -49,12 +49,12 @@ data class SemanticColors(
    val bgActionTertiaryRest: Color,
    /** Background colour for tertiary actions. State: Selected */
    val bgActionTertiarySelected: Color,
-    /** Badge accent background colour */
    val bgBadgeAccent: Color,
-    /** Badge default background colour */
+    val bgBadgeCritical: Color,
    val bgBadgeDefault: Color,
-    /** Badge info background colour */
    val bgBadgeInfo: Color,
+    val bgBadgePrimary: Color,
+    val bgBadgeSecondary: Color,
    /** Default global background for the user interface. Elevation: Default (Level 0) */
    val bgCanvasDefault: Color,
    /** Default global background for the user interface. Elevation: Level 1. */
@@ -37,9 +37,12 @@ val compoundColorsDark = SemanticColors(
    bgActionTertiaryHovered = DarkColorTokens.colorGray300,
    bgActionTertiaryRest = DarkColorTokens.colorThemeBg,
    bgActionTertiarySelected = DarkColorTokens.colorGray400,
-    bgBadgeAccent = DarkColorTokens.colorAlphaGreen500,
-    bgBadgeDefault = DarkColorTokens.colorAlphaGray500,
-    bgBadgeInfo = DarkColorTokens.colorAlphaBlue500,
+    bgBadgeAccent = DarkColorTokens.colorGreen400,
+    bgBadgeCritical = DarkColorTokens.colorRed300,
+    bgBadgeDefault = DarkColorTokens.colorThemeBg,
+    bgBadgeInfo = DarkColorTokens.colorBlue400,
+    bgBadgePrimary = DarkColorTokens.colorGray1400,
+    bgBadgeSecondary = DarkColorTokens.colorGray400,
    bgCanvasDefault = DarkColorTokens.colorThemeBg,
    bgCanvasDefaultLevel1 = DarkColorTokens.colorGray300,
    bgCanvasDisabled = DarkColorTokens.colorGray200,
@@ -37,9 +37,12 @@ val compoundColorsHcDark = SemanticColors(
    bgActionTertiaryHovered = DarkHcColorTokens.colorGray300,
    bgActionTertiaryRest = DarkHcColorTokens.colorThemeBg,
    bgActionTertiarySelected = DarkHcColorTokens.colorGray400,
-    bgBadgeAccent = DarkHcColorTokens.colorAlphaGreen500,
-    bgBadgeDefault = DarkHcColorTokens.colorAlphaGray500,
-    bgBadgeInfo = DarkHcColorTokens.colorAlphaBlue500,
+    bgBadgeAccent = DarkHcColorTokens.colorGreen400,
+    bgBadgeCritical = DarkHcColorTokens.colorRed300,
+    bgBadgeDefault = DarkHcColorTokens.colorThemeBg,
+    bgBadgeInfo = DarkHcColorTokens.colorBlue400,
+    bgBadgePrimary = DarkHcColorTokens.colorGray1400,
+    bgBadgeSecondary = DarkHcColorTokens.colorGray400,
    bgCanvasDefault = DarkHcColorTokens.colorThemeBg,
    bgCanvasDefaultLevel1 = DarkHcColorTokens.colorGray300,
    bgCanvasDisabled = DarkHcColorTokens.colorGray200,
@@ -37,9 +37,12 @@ val compoundColorsLight = SemanticColors(
    bgActionTertiaryHovered = LightColorTokens.colorGray300,
    bgActionTertiaryRest = LightColorTokens.colorThemeBg,
    bgActionTertiarySelected = LightColorTokens.colorGray400,
-    bgBadgeAccent = LightColorTokens.colorAlphaGreen400,
-    bgBadgeDefault = LightColorTokens.colorAlphaGray400,
-    bgBadgeInfo = LightColorTokens.colorAlphaBlue400,
+    bgBadgeAccent = LightColorTokens.colorGreen400,
+    bgBadgeCritical = LightColorTokens.colorRed300,
+    bgBadgeDefault = LightColorTokens.colorThemeBg,
+    bgBadgeInfo = LightColorTokens.colorBlue400,
+    bgBadgePrimary = LightColorTokens.colorGray1400,
+    bgBadgeSecondary = LightColorTokens.colorGray400,
    bgCanvasDefault = LightColorTokens.colorThemeBg,
    bgCanvasDefaultLevel1 = LightColorTokens.colorThemeBg,
    bgCanvasDisabled = LightColorTokens.colorGray200,
@@ -37,9 +37,12 @@ val compoundColorsHcLight = SemanticColors(
    bgActionTertiaryHovered = LightHcColorTokens.colorGray300,
    bgActionTertiaryRest = LightHcColorTokens.colorThemeBg,
    bgActionTertiarySelected = LightHcColorTokens.colorGray400,
-    bgBadgeAccent = LightHcColorTokens.colorAlphaGreen400,
-    bgBadgeDefault = LightHcColorTokens.colorAlphaGray400,
-    bgBadgeInfo = LightHcColorTokens.colorAlphaBlue400,
+    bgBadgeAccent = LightHcColorTokens.colorGreen400,
+    bgBadgeCritical = LightHcColorTokens.colorRed300,
+    bgBadgeDefault = LightHcColorTokens.colorThemeBg,
+    bgBadgeInfo = LightHcColorTokens.colorBlue400,
+    bgBadgePrimary = LightHcColorTokens.colorGray1400,
+    bgBadgeSecondary = LightHcColorTokens.colorGray400,
    bgCanvasDefault = LightHcColorTokens.colorThemeBg,
    bgCanvasDefaultLevel1 = LightHcColorTokens.colorThemeBg,
    bgCanvasDisabled = LightHcColorTokens.colorGray200,
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9.5,2 L11,6.5 15.5,8 11,9.5 9.5,14 8,9.5 3.5,8 8,6.5zM19,11 L20,14 23,15 20,16 19,19 18,16 15,15 18,14zM12,17 L12.75,19.25L15,20l-2.25,0.75L12,23l-0.75,-2.25L9,20l2.25,-0.75z"
+      android:fillColor="#FF000000"/>
+</vector>
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19.5,9.385q1.458,0 2.48,1.021Q23,11.426 23,12.885q0,1.122 -0.642,2.027a3.4,3.4 0,0 1,-1.691 1.269v0.204l0.758,0.759q0.088,0.087 0.124,0.189a0.7,0.7 0,0 1,0.036 0.219q0,0.116 -0.036,0.218a0.5,0.5 0,0 1,-0.124 0.19l-0.758,0.759 0.802,1.02a0.6,0.6 0,0 1,0.11 0.197,0.5 0.5,0 0,1 0.02,0.226 0.57,0.57 0,0 1,-0.204 0.38l-1.501,1.313a0.62,0.62 0,0 1,-0.409 0.145,0.5 0.5,0 0,1 -0.212,-0.044 0.6,0.6 0,0 1,-0.167 -0.116l-0.598,-0.599a0.58,0.58 0,0 1,-0.175 -0.423v-4.637a3.54,3.54 0,0 1,-1.875 -1.553A3.36,3.36 0,0 1,16 12.885q0,-1.458 1.02,-2.479 1.022,-1.02 2.48,-1.021m0,2.334q-0.481,0 -0.824,0.343a1.12,1.12 0,0 0,-0.343 0.823q0,0.48 0.343,0.824 0.342,0.343 0.824,0.343t0.824,-0.343q0.343,-0.342 0.343,-0.824 0,-0.48 -0.343,-0.823a1.12,1.12 0,0 0,-0.824 -0.343"
+      android:fillColor="#FF000000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M11,13.125q1.532,0 3.025,0.298a5.25,5.25 0,0 0,1.054 2.737q0.542,0.714 1.254,1.217v3.441q0,0.092 0.007,0.182H3.125q-0.478,0 -0.802,-0.323A1.1,1.1 0,0 1,2 19.875V17.85q0,-0.957 0.492,-1.758A3.3,3.3 0,0 1,3.8 14.869a16.7,16.7 0,0 1,3.544 -1.309A15.5,15.5 0,0 1,11 13.125M11,3q1.857,0 3.178,1.322Q15.5,5.644 15.5,7.5t-1.322,3.178T11,12t-3.178,-1.322T6.5,7.5t1.322,-3.178T11,3"
+      android:fillColor="#FF000000"/>
+</vector>
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,20q-0.824,0 -1.412,-0.587A1.93,1.93 0,0 1,2 18L2,6q0,-0.824 0.587,-1.412A1.93,1.93 0,0 1,4 4h6l2,2h8q0.824,0 1.413,0.588Q22,7.175 22,8v10q0,0.824 -0.587,1.413A1.93,1.93 0,0 1,20 20zM4,18h16L20,8h-8.825l-2,-2L4,6z"
+      android:fillColor="#FF000000"/>
+</vector>
@@ -8,14 +8,19 @@

 package io.element.android.libraries.designsystem.atomic.atoms

+import androidx.compose.foundation.BorderStroke
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.libraries.designsystem.components.Badge
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight

+/**
+ * https://www.figma.com/design/G1xy0HDZKJf5TCRFmKb5d5/Compound-Android-Components?node-id=1960-491
+ */
 object MatrixBadgeAtom {
    data class MatrixBadgeData(
        val text: String,
@@ -40,6 +45,12 @@ object MatrixBadgeAtom {
            Type.Negative -> ElementTheme.colors.bgCriticalSubtle
            Type.Info -> ElementTheme.colors.bgBadgeInfo
        }
+        val borderStroke = when (data.type) {
+            Type.Positive -> null
+            Type.Neutral -> BorderStroke(1.dp, ElementTheme.colors.borderInteractiveSecondary)
+            Type.Negative -> null
+            Type.Info -> null
+        }
        val textColor = when (data.type) {
            Type.Positive -> ElementTheme.colors.textBadgeAccent
            Type.Neutral -> ElementTheme.colors.textPrimary
@@ -58,6 +69,7 @@ object MatrixBadgeAtom {
            backgroundColor = backgroundColor,
            iconColor = iconColor,
            textColor = textColor,
+            borderStroke = borderStroke,
        )
    }
 }
@@ -55,14 +55,14 @@ class MentionSpan(

        backgroundColor = when (type) {
            is MentionType.User -> if (isCurrentUser) mentionSpanTheme.currentUserBackgroundColor else mentionSpanTheme.otherBackgroundColor
-            is MentionType.Everyone -> mentionSpanTheme.currentUserBackgroundColor
+            is MentionType.Everyone -> mentionSpanTheme.otherBackgroundColor
            is MentionType.Room -> mentionSpanTheme.otherBackgroundColor
            is MentionType.Message -> mentionSpanTheme.otherBackgroundColor
        }

        textColor = when (type) {
            is MentionType.User -> if (isCurrentUser) mentionSpanTheme.currentUserTextColor else mentionSpanTheme.otherTextColor
-            is MentionType.Everyone -> mentionSpanTheme.currentUserTextColor
+            is MentionType.Everyone -> mentionSpanTheme.otherTextColor
            is MentionType.Room -> mentionSpanTheme.otherTextColor
            is MentionType.Message -> mentionSpanTheme.otherTextColor
        }
@@ -54,6 +54,7 @@ import kotlinx.collections.immutable.persistentListOf
 * To make this work, you need to:
 * 1. Call [MentionSpanTheme.updateStyles] so the colors and sizes are computed.
 * 2. Use either [MentionSpanTheme.updateMentionStyles] or [MentionSpan.updateTheme] to update the styles of the mention spans.
+ * https://www.figma.com/design/G1xy0HDZKJf5TCRFmKb5d5/Compound-Android-Components?node-id=3236-11203
 */
@Stable
@SingleIn(SessionScope::class)
@@ -61,10 +62,14 @@ class MentionSpanTheme(val currentUserId: UserId) {
    @Inject
    constructor(matrixClient: MatrixClient) : this(matrixClient.sessionId)

-    internal var currentUserTextColor: Int = 0
+    internal var currentUserTextColor: Int = Color.BLACK
+        private set
    internal var currentUserBackgroundColor: Int = Color.WHITE
-    internal var otherTextColor: Int = 0
+        private set
+    internal var otherTextColor: Int = Color.BLACK
+        private set
    internal var otherBackgroundColor: Int = Color.WHITE
+        private set

    private val paddingValues = PaddingValues(start = 4.dp, end = 6.dp)
    internal val paddingValuesPx = mutableStateOf(0 to 0)
@@ -78,8 +83,8 @@ class MentionSpanTheme(val currentUserId: UserId) {
    fun updateStyles() {
        currentUserTextColor = ElementTheme.colors.textBadgeAccent.toArgb()
        currentUserBackgroundColor = ElementTheme.colors.bgBadgeAccent.toArgb()
-        otherTextColor = ElementTheme.colors.textPrimary.toArgb()
-        otherBackgroundColor = ElementTheme.colors.bgBadgeDefault.toArgb()
+        otherTextColor = ElementTheme.colors.textOnSolidPrimary.toArgb()
+        otherBackgroundColor = ElementTheme.colors.bgBadgePrimary.toArgb()

        typeface.value = ElementTheme.typography.fontBodyLgMedium.rememberTypeface().value
        val density = LocalDensity.current
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7f74b2d87e7dd5e431c6d6add3131472d31c9ffcce900736ed489af2c667783c
-size 78968
+oid sha256:dbbd62622843fbd1d8d35b63c7308eaed46b488e6b189e987983144e5395bd09
+size 78972
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c5ec03b736a2b1c641747a49be5417a3e9b6e034c865294bfd71a5bed8f53834
-size 42930
+oid sha256:31d18a5e250e531fd7b986690306366cf69eedcfdbaba28148e3edd1d36ae597
+size 42912
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7ecdd3041a962680b76ccfbc02872f4caef0df30d239cbc00c7c9759d573ee03
-size 41615
+oid sha256:a04a5aa9e35df5eb82a0a708b2b743bb83a1a9408fee91beff60d5a1ce2c6d5d
+size 41599
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0bbf72a26a32f180d1dddc276adda01fb8586e6c182b32dde35d7daca55bc6ae
-size 40765
+oid sha256:ef69f889a28afe5704da86296ebf9916a7af1de751eb4c1ee4995ca3f70ea12d
+size 40737
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5fb05bc1ca83f872c88b36097fca767c36fa0688c19bd504674846707eedc358
-size 42192
+oid sha256:1d4312936ba67965a8b35e714bbc3014214320311c5d077d33382ebb5aca5738
+size 42172
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7fe45d21c630e31b44ae7a8cb17b9f89b0b0f67d00b3769035516f0e827f64a2
-size 42098
+oid sha256:4b07f6c942ab083d94c22218010b4aa646cf03e87af41fbda89b16620f7b9752
+size 42079
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de164fd028b96c6c53ae2e33246bfb5bda1e6beba1c91cbd00111d2fbba92cd8
-size 42658
+oid sha256:1b6db26bd05f206661a5707a972cb6f843eef82c76e5e0035775625b4a6268a4
+size 42640
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dd7a8279d58ba0420c884cdcbf1972772d2d577024c3b766cd535c5cabfe8cba
-size 43196
+oid sha256:5f77eba1f623f67eba427312523def9a45c41581dd4e047701b2c75f787fcffc
+size 43178
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:59d38b1cde9e22b1c47b2c7932ba980b2c56af2fa8b6b25200cb46ee3a0cd145
-size 42440
+oid sha256:a62965a57fea6665739d8e8b2fda9e15abf119ea59f6bbd5d7d8a269512064b9
+size 42421
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de0c605c7845f2e590aba1d0484700bdecb80effc16899b6288301cd91a9d966
-size 41703
+oid sha256:39780082d7826422d70902ac2b7859013c30b41d31f20aefc25ada8aeae196c2
+size 41684
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:88a2e1d2000e3034fa2d9e37b3b69aa47a7f588fee40efb8a8c74f9292315ea1
-size 39678
+oid sha256:5917028dda35add5ed6b32fa9017a9cdcdfb8d273d230aa6d529bebfbf0b95c8
+size 39646
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:59c7e92e09d585e18f552db5e9fa55dfe79cb6af028493cafc11f0ffee8344bd
-size 39634
+oid sha256:f65f298b3f14ecb0da53f03a20a5464a7f6ae138dfdf417ad936601a521fbb30
+size 39601
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:405b81267a5a14771a69c8b06efea888b2fdc588bec26872b9564a66bb5496cf
-size 38110
+oid sha256:df3ceef42a59cc072e3aa21c89e9b90f0524ac422d1538804b6fcb8abf97752e
+size 38090
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b7b0f5cbfc01a4539757611a9800d18ed19cb732e44eee4f1bed41788d4b0918
-size 45142
+oid sha256:c66ebe3c16933495fe33596036363f95e20654b6ef5ee822f594a34531ea640f
+size 45211
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:acd1c2c73c21370b816792de80d0183bacadb213cf0bf005c73695df553fad3a
-size 44979
+oid sha256:de5ccdad3e08ed4fd4330697ad6c7085d5553cb889b7b7c12879aaaa6b34c1de
+size 44953
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ad520c5dc49852a8934bc85fcbcd982e500e8d9818635605abacfc51f29dfde
-size 44621
+oid sha256:e215296d864d34ceacaa53e7fec452643b63d72b253074eb50617bab50915ad1
+size 44670
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4bf88dda52209b3ff194c70a4c783a8e3765c352d58eb00cb0dd9aa16d3c6578
-size 36614
+oid sha256:0bf5c596196e64554117addd1247aa1e5be6e8095d85a595b1c2a6232ed483eb
+size 36591
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:09c7b2efe4a3dba7028810fb10dbc7a3c3be4e1fc012319bd868bb3d392487ae
-size 42344
+oid sha256:b0cc874a4ba2b8bd0f0b7e290d0ffc67e82d1222fd287360c3321143d5f87ad4
+size 42369
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5132f788bbfb0fe37254ebf53823f04ab0c303cc65770a3a089f8e7a3e2277e5
-size 41374
+oid sha256:6900db132e6b79de1c5ac986666af46e3f7ef65a9c4cc7d847dde6962eadd129
+size 41352
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f36006f661e4dfb2c8669983194f5b22cf54292bc975939c9a8c2832b47b799
-size 39320
+oid sha256:b7199817c8591ccf11241204af8a39d2ed1a60dfe238b06387749d57858cfa65
+size 39288
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:51100671549be5aee9e67f2e43f22015b75edb3d39fa1f900481416d1d65e8b3
-size 42689
+oid sha256:0fac98b00a99771b186e8146b98ab63602be7b4c5cc9febc3ca821c1d5cd6a1b
+size 42700
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:07ec8a7ab75acad9b31b6e6352f0e79cfc473fe7756c55c3101977b680136ce9
-size 43113
+oid sha256:ed4073d3b427b2a314667f5118b571e5896f1439582b9209077ec9c62ee0e061
+size 43097
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc85e38b6ec98b12c4fe40b0338dc80033120d5224007b1e8f641165d313ca0b
-size 42119
+oid sha256:c68c895b189a41c7edf8fee58202560ef47e0a98082ddc3a346546f4f1346de7
+size 42100
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2c13a57f8e460a7f6b06b1d81c10b3a2bc8dfbcda9bd2bd7c7d5224374a1b192
-size 42108
+oid sha256:e1879c3d54dfed55e4bb46d967c9c8c5a4f95f4e31e884afde4c9c517f35402e
+size 42093
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cdbbba4d6ebf3eac1d096fe13e5685aa10ab90972af322975fa2b3687737afb9
-size 43656
+oid sha256:e2b5dc5cd20ccfdb7e6a1accabf6e139ff343c16378af19232168f835b1c97df
+size 43650
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5ffc7f9970dcbb0510b37db1e2eeca3b41ebe9ff3437014d9ffef6935bd6733
-size 42330
+oid sha256:f9c7dce94908b2b0287c196f564c306a05306f058c71d75be3b298a45683bce4
+size 42321
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:446a52c50158d9855269dbe62746d6a5fea94a6850d16fb29763b6b3bda67cd9
-size 41472
+oid sha256:743fcac827e8df7742127491722c3ce617a54c0b64fd3336f939994b45376966
+size 41470
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e518928f4a23a4e72cd09e300d332ce75a700ca4baf573fe48af509fe73418a
-size 42929
+oid sha256:671ae1ee2f065705b38063cb354c4bb4a63247e01e1101dd155515b46decb660
+size 42926
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e5cdb25bd944c13580ff2f8b5142e2c2793965bb233c7f663cdf45bde96bf26
-size 42855
+oid sha256:8f352ad92472cb8b152ef0660c7f66b55b956ec05bd11dbeb2c9aa543d0db2ca
+size 42849
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a364c3b8edd68c4e4c944844db649cb22ac5db8931836a7f91d4d0f65329e4a5
-size 43374
+oid sha256:5742ffdefde6a9e3f01ba021a75eea20599cc520fa4976aa45cf1c10e394f62b
+size 43367
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4ab0a2daf8d2fc3b918b2fb3c9a860979476e0fa534a074089559d77952f9997
-size 43973
+oid sha256:0f6be8e586f9692013ce38c483c42fb23f8c135593e17a72f3be19381719fe6c
+size 43967
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d0c501c1b3f14d71af64d98c6487cbea150ca6b8e72f0f4675b16aa4fcaba4e
-size 43199
+oid sha256:7b4b470aa3f3650c26c6e1cf2491ffb7c3ea58db28dd00c0755a7f5727dc60f1
+size 43192
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef7b68c5f009bb02529313f0330e0c3563e1840395ac4d306cb52e1ce34bbc57
-size 42689
+oid sha256:656c300cea79355aa3b35cd59666f8e35aa4c09d69dd422e816f256cbe6d420d
+size 42685
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44fc7317e29697583ba1beace7a4cb0dd366e25d1e54878be5ebeb76eea9db3d
-size 40374
+oid sha256:93fe116bc34f9cf8ee3da2317948a98405e36a6fb98a58b2046a049af435e913
+size 40373
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77ad55f57eac496eec3d8f9dbbb448ed75d3bf0e9ecb0818c0fe2517c6936605
+oid sha256:09f89c67652965407ea147aef158d0b3281850b95cca35f7aec207693bb0af62
 size 40242
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:959c978957721a609fa30439b3fa6dabda4fad6bf270fe40b383b380f75e08f5
-size 38962
+oid sha256:04c7f8e85d58591c3dd6ade913b9fe0861ff7f774fdb4b46e63c9f86ef5a918a
+size 38959
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4608b96994eef19bd9f712324d1d0c53922dc9856aa4da8c6e2a645e6abc2d84
+oid sha256:389fcb65c5334f31b3d66731de2c65128d0a17e7380ca7c45be8a36023719732
 size 46097
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:37bfa4e42fdca66940aca53335958935d37f027ae38088d04117936caae83740
-size 45841
+oid sha256:567cefb525795b66704ccd1738bfe08247004814c947f6c60801588304c768c2
+size 45835
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b536ee9e04ee12f64ce37ffb27bb1e60100fd9f817e07ddc50e396eb567519e1
-size 45513
+oid sha256:f87512e18ca91237141d97ed03f4725a8a671268daf50f0a8049ee34bdc42a61
+size 45503
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0da00de6d2570c210920bfbeb0caec61390f795aa9f6ab08afdfc6ecb228fe8
-size 37385
+oid sha256:27918a9baa05b2cb8dee7219b6e19cc10be1421be190d1e35724d237270761af
+size 37382
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9eeb48387ff960b03efbd78eb360a75db4e997550a56613d9c577032c7254086
-size 43071
+oid sha256:cfd96490ce4509620efd7be72e6ecca219eafe73050417c0c3685339444457f1
+size 43060
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ea8aabb87ff7bd6c97e892183d1d680043024c2966ea2c846147f99198238e3b
-size 42076
+oid sha256:8ee0a79abd45fc9573e64b6f06491f33dfca34ddd96c0dbd3d8cf7a9052b47be
+size 42072
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:59a2ea7ae299bdc50c5fae263792034083837d6b693b7006e8f67b0d6ba53238
+oid sha256:e7146d365a105c86eecc34027d2b824e90ca1615fcf77ca0f49ed920dbffe22d
 size 39903
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e6dc12c6ede2e635bf99eca3d1d5994b7b15cceade074835d8751184203f902a
-size 43437
+oid sha256:dd455b5b492eb88bde4e985ca01ab97e23a337d7ac478782c09dbb10803960f2
+size 43430
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:237628b9401f68f6470fd27b31368959735209343226a7fc527042e02944bfce
-size 44062
+oid sha256:863c5db2d8fd863b057d0ddfe26bb3804d15126c2fdb58fc03c0087d79c6a3b3
+size 44056
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b86881ab66a8dc3168c12b26f376f7e1f8f906106c695f79d40c83450abdfb87
-size 42974
+oid sha256:16b815f5ec48c101a7bde78cd5a4e30e825138f359e415699ef2b14e6ea23869
+size 42968
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f37c7d7f53a3b45f5b1ba899b0aae0ad4d0fcf05e02ad5e3f22d0dc48ff99d8
-size 42920
+oid sha256:5c47ff32beec1987fdb9f92ef6e5c9b7eca04ab20ebab576a2028225a595ba12
+size 42911
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4748c82e6b7cdcb253b8ae66f3a864b853b917ee3c3e383ed2593f4a658ccb39
-size 24119
+oid sha256:c8185065602221f9bf675398d42c16f9e0c7ae65952b865689263878f43c545d
+size 24110
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c6416369951a98fcf0d9d47ab2334a5d4ddb4158e98ed4c7fe813c972086d17
-size 23406
+oid sha256:c2f2787f0aacfa36596b9fa0e25d990710870bf5ed25d831b47c5c71ac1d3de9
+size 23377
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9af7cbe72cb2e9905ed8b4eb7f9007eaf92bc8dec5b23e0af46d7b41f770b2a8
-size 113751
+oid sha256:ca6ffe10dd122a2c2df99160b4e318e591ef6d3b10b6173d36f6c9959a93277f
+size 114895
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae9e5cfc2a2e42d826ac473caa4e75d9809f67ac042dddba5a1179e8afa30148
-size 35483
+oid sha256:8e171ced0a7f9994d1e9addb093959fb455727d81912aecb377742541181535a
+size 35733
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db850df46ede0e167b4fc899a26251686cbf0e4e076adecc7664983bd6219168
-size 33680
+oid sha256:ba17ec26a4807e2cad64769b98140e2d77f133e39be72090a1f44ca143427833
+size 34106
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4422ff263313e4c635917621c989c827cb2f6fa1068d1d202bcc459a016c7970
-size 51379
+oid sha256:8366d3c9ea45d6b7e24184b5ba9756cfcfe8a592ec19b107be1168b307840192
+size 49433
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a252d6bc04efa61952f32336f7f1bcd0eac99938a74ef33782cc555c6f7fc5c
-size 48721
+oid sha256:79cc95b3838f24e85a87d5f0116575ad74e2abc03b77a28464d7fa82fb357840
+size 47343