Set max lines for 'in reply to' view conditionally (#6612)

* Set max lines for 'in reply to' view conditionally. When there is enough screen space, use 2 lines as before. If the screen space is limited, use a single one. * Reduce vertical padding for reply-to view in compose * Add screenshot test with single line in reply to view * Update screenshots --------- Co-authored-by: ElementBot <android@element.io>
2026-11-02 12:07:28 +00:00 · 2026-04-23 15:15:52 +02:00
parent e036250539
commit 92ee479e91
102 changed files with 274 additions and 205 deletions
@@ -56,6 +56,7 @@ fun InReplyToView(
    inReplyTo: InReplyToDetails,
    hideImage: Boolean,
    modifier: Modifier = Modifier,
+    maxLines: Int = 2,
 ) {
    when (inReplyTo) {
        is InReplyToDetails.Ready -> {
@@ -63,11 +64,12 @@ fun InReplyToView(
                senderId = inReplyTo.senderId,
                senderProfile = inReplyTo.senderProfile,
                metadata = inReplyTo.metadata(hideImage),
+                maxLines = maxLines,
                modifier = modifier,
            )
        }
        is InReplyToDetails.Error ->
-            ReplyToErrorContent(data = inReplyTo, modifier = modifier)
+            ReplyToErrorContent(data = inReplyTo, maxLines = maxLines, modifier = modifier)
        is InReplyToDetails.Loading ->
            ReplyToLoadingContent(modifier = modifier)
    }
@@ -78,6 +80,7 @@ private fun ReplyToReadyContent(
    senderId: UserId,
    senderProfile: ProfileDetails,
    metadata: InReplyToMetadata?,
+    maxLines: Int,
    modifier: Modifier = Modifier,
 ) {
    val paddings = if (metadata is InReplyToMetadata.Thumbnail) {
@@ -115,7 +118,7 @@ private fun ReplyToReadyContent(
                    traversalIndex = 1f
                },
            )
-            ReplyToContentText(metadata)
+            ReplyToContentText(metadata, maxLines)
        }
    }
 }
@@ -140,6 +143,7 @@ private fun ReplyToLoadingContent(
@Composable
 private fun ReplyToErrorContent(
    data: InReplyToDetails.Error,
+    maxLines: Int,
    modifier: Modifier = Modifier,
 ) {
    val paddings = PaddingValues(horizontal = 12.dp, vertical = 4.dp)
@@ -152,14 +156,17 @@ private fun ReplyToErrorContent(
            text = data.message,
            style = ElementTheme.typography.fontBodyMdRegular,
            color = ElementTheme.colors.textCriticalPrimary,
-            maxLines = 2,
+            maxLines = maxLines,
            overflow = TextOverflow.Ellipsis,
        )
    }
 }

@Composable
-private fun ReplyToContentText(metadata: InReplyToMetadata?) {
+private fun ReplyToContentText(
+    metadata: InReplyToMetadata?,
+    maxLines: Int,
+) {
    val text = when (metadata) {
        InReplyToMetadata.Redacted -> stringResource(id = CommonStrings.common_message_removed)
        InReplyToMetadata.UnableToDecrypt -> stringResource(id = CommonStrings.common_waiting_for_decryption_key)
@@ -200,7 +207,7 @@ private fun ReplyToContentText(metadata: InReplyToMetadata?) {
            fontStyle = fontStyle,
            textAlign = TextAlign.Start,
            color = ElementTheme.colors.textSecondary,
-            maxLines = 2,
+            maxLines = maxLines,
            overflow = TextOverflow.Ellipsis,
        )
    }
@@ -24,6 +24,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -64,7 +65,7 @@ internal fun ComposerModeView(
        }
        is MessageComposerMode.Reply -> {
            ReplyToModeView(
-                modifier = modifier.padding(8.dp),
+                modifier = modifier.padding(top = 8.dp, start = 8.dp, end = 8.dp),
                replyToDetails = composerMode.replyToDetails,
                hideImage = composerMode.hideImage,
                onResetComposerMode = onResetComposerMode,
@@ -120,6 +121,9 @@ private fun EditingModeView(
    }
 }

+// This combination of density DPI and font scale is an approximation to a screen with little space to display the content
+private const val MAX_SCALING_VALUE = 3.5f
+
 /**
 * https://www.figma.com/design/G1xy0HDZKJf5TCRFmKb5d5/Compound-Android-Components?node-id=2019-6286
 */
@@ -137,9 +141,14 @@ private fun ReplyToModeView(
            .border(1.dp, ElementTheme.colors.separatorPrimary, RoundedCornerShape(6.dp))
            .padding(4.dp)
    ) {
+        // Larger density DPI and font scale means less space to display the content, so we limit it to 1 line to avoid overflow issues
+        val currentDensity = LocalDensity.current
+        val hasLowResolution = currentDensity.density * currentDensity.fontScale >= MAX_SCALING_VALUE
+        val maxReplyContentLines = if (hasLowResolution) 1 else 2
        InReplyToView(
            inReplyTo = replyToDetails,
            hideImage = hideImage,
+            maxLines = maxReplyContentLines,
            modifier = Modifier.weight(1f),
        )
        Icon(
@@ -29,6 +29,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -40,6 +41,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.stringResource
@@ -50,6 +52,7 @@ import androidx.compose.ui.semantics.onClick
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
@@ -66,10 +69,14 @@ import io.element.android.libraries.designsystem.theme.components.IconButton
 import io.element.android.libraries.designsystem.theme.components.IconColorButton
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.api.core.EventId
+import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
+import io.element.android.libraries.matrix.api.timeline.item.event.MessageContent
+import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.toEventOrTransactionId
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetails
 import io.element.android.libraries.matrix.ui.messages.reply.InReplyToDetailsProvider
+import io.element.android.libraries.matrix.ui.messages.reply.aProfileDetailsReady
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.testtags.testTag
 import io.element.android.libraries.textcomposer.components.SendButtonIcon
@@ -181,7 +188,7 @@ fun TextComposer(
                            placeholder = placeholder,
                            registerStateUpdates = true,
                            modifier = Modifier
-                                .padding(top = 6.dp, bottom = 6.dp)
+                                .padding(top = 4.dp, bottom = 6.dp)
                                .fillMaxWidth(),
                            style = ElementRichTextEditorStyle.composerStyle(hasFocus = state.richTextEditorState.hasFocus),
                            resolveMentionDisplay = resolveMentionDisplay,
@@ -651,10 +658,14 @@ private fun TextInputBox(
                composerMode = composerMode,
                onResetComposerMode = onResetComposerMode,
            )
+        } else {
+            // Top padding for the message composer box
+            Spacer(Modifier.height(4.dp))
        }
+
        Box(
            modifier = Modifier
-                .padding(top = 4.dp, bottom = 4.dp, start = 12.dp, end = 12.dp)
+                .padding(top = 1.dp, bottom = 4.dp, start = 12.dp, end = 12.dp)
                .then(Modifier.testTag(TestTags.textEditor)),
            contentAlignment = Alignment.CenterStart,
        ) {
@@ -664,7 +675,7 @@ private fun TextInputBox(
                Icon(
                    modifier = Modifier
                        .clickable { showBottomSheet = true }
-                        .padding(horizontal = 8.dp, vertical = 4.dp)
+                        .padding(start = 8.dp, end = 8.dp, top = 4.dp, bottom = 4.dp)
                        .align(Alignment.CenterEnd),
                    imageVector = CompoundIcons.InfoSolid(),
                    tint = ElementTheme.colors.iconCriticalPrimary,
@@ -983,6 +994,40 @@ internal fun TextComposerVoiceNotEncryptedPreview() = ElementPreview {
    }
 }

+@Preview
+@Composable
+internal fun TextComposerScaledDensityWithReplyPreview() {
+    ElementPreview {
+        CompositionLocalProvider(
+            LocalDensity provides Density(
+                density = 3f,
+                fontScale = 1.25f,
+            ),
+        ) {
+            val replyToDetails = InReplyToDetails.Ready(
+                eventId = EventId("\$1234"),
+                senderId = UserId("@alice:example.com"),
+                senderProfile = aProfileDetailsReady(),
+                eventContent = MessageContent(
+                    body = "Message which are being replied, and which was long enough to be displayed on two lines (only!).",
+                    inReplyTo = null,
+                    isEdited = false,
+                    threadInfo = null,
+                    type = TextMessageType("Message which are being replied, and which was long enough to be displayed on two lines (only!).", null)
+                ),
+                textContent = "Message which are being replied, and which was long enough to be displayed on two lines (only!).",
+            )
+            Box(modifier = Modifier.width(480.dp).height(120.dp)) {
+                ATextComposer(
+                    state = aTextEditorStateMarkdown(initialText = "", initialFocus = true),
+                    voiceMessageState = VoiceMessageState.Idle,
+                    composerMode = MessageComposerMode.Reply(replyToDetails, hideImage = false),
+                )
+            }
+        }
+    }
+}
+
@Composable
 private fun <T> PreviewColumn(
    items: ImmutableList<T>,
@@ -82,7 +82,7 @@ fun MarkdownTextInput(

    AndroidView(
        modifier = Modifier
-            .padding(top = 6.dp, bottom = 6.dp)
+            .padding(top = 5.dp, bottom = 6.dp)
            .fillMaxWidth(),
        factory = { context ->
            MarkdownEditText(context).apply {
@@ -22,6 +22,7 @@ import app.cash.paparazzi.DeviceConfig
 import app.cash.paparazzi.Paparazzi
 import app.cash.paparazzi.RenderExtension
 import app.cash.paparazzi.TestName
+import com.android.resources.Density.DEFAULT_DENSITY
 import com.android.resources.NightMode
 import com.android.resources.ScreenOrientation
 import io.element.android.compound.theme.ElementTheme
@@ -42,12 +43,13 @@ object ScreenshotTest {
        Locale.setDefault(locale)

        paparazzi.fixScreenshotName(preview, localeStr)
+
        paparazzi.snapshot {
            CompositionLocalProvider(
                LocalInspectionMode provides true,
                LocalDensity provides Density(
                    density = LocalDensity.current.density,
-                    fontScale = 1.0f,
+                    fontScale = preview.previewInfo.fontScale,
                ),
                LocalConfiguration provides Configuration().apply {
                    setLocales(LocaleList(locale))
@@ -121,19 +123,22 @@ object PaparazziPreviewRule {
        deviceConfig: DeviceConfig = ScreenshotTest.defaultDeviceConfig,
        renderExtensions: Set<RenderExtension> = setOf(),
    ): Paparazzi {
-        val densityScale = deviceConfig.density.dpiValue / 160f
+        val densityScale = deviceConfig.density.dpiValue.toFloat() / DEFAULT_DENSITY
+        val customScreenWidth = preview.previewInfo.widthDp.takeIf { it >= 0 }?.let { it * densityScale }?.toInt()
        val customScreenHeight = preview.previewInfo.heightDp.takeIf { it >= 0 }?.let { it * densityScale }?.toInt()
        val isLandscape = preview.previewInfo.device.contains("landscape")
        return Paparazzi(
            deviceConfig = deviceConfig.copy(
+                screenWidth = customScreenWidth ?: deviceConfig.screenWidth,
+                screenHeight = customScreenHeight ?: deviceConfig.screenHeight,
                nightMode = when (preview.previewInfo.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES) {
                    true -> NightMode.NIGHT
                    false -> NightMode.NOTNIGHT
                },
                locale = locale,
                softButtons = false,
-                screenHeight = customScreenHeight ?: deviceConfig.screenHeight,
                orientation = if (isLandscape) ScreenOrientation.LANDSCAPE else ScreenOrientation.PORTRAIT,
+                fontScale = preview.previewInfo.fontScale,
            ),
            maxPercentDifference = 0.01,
            renderExtensions = renderExtensions,
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54298b08251d3bd32c451dbb2076a40f20254f78806c30c0647f1bf062f3df7a
-size 399342
+oid sha256:22e3d682c4866bd5c519ab88d08290708929af805438a0bd093200cddcbd41b2
+size 399376
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e8aabdc6d15c46ee59ba0e9d2b3b3f19500801c96501b39732d7f9f95e9130f
-size 59204
+oid sha256:947ccb947f4a961ff7d17b936f2c866d66fea0361879d51ad4c65d18465c1a9f
+size 59226
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54298b08251d3bd32c451dbb2076a40f20254f78806c30c0647f1bf062f3df7a
-size 399342
+oid sha256:22e3d682c4866bd5c519ab88d08290708929af805438a0bd093200cddcbd41b2
+size 399376
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9eba0f1d35c5456b58a09ca8370c93f0d1959e8e9aa503501cc49ecfaf198522
-size 59075
+oid sha256:0d9e221ec2f4ee764967e94c32f52b1615b25dec8fc7697dd5bcd01fc4da8d69
+size 59098
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e078891f5a377bf42cb787f436dcb7471de959db0c4d3afa5d7cacee20b2bf15
-size 86126
+oid sha256:547bf4e3bec05c219f5a72cfd8d506eb7c39429970cced5c2b8f2999ae390265
+size 86149
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a56951545b00dc74fd7780648bb2a508176c47df6a2ce6920f2b8a63d15f58a5
-size 72675
+oid sha256:6d326595038160376db620a07a180de7af37ebfc76d4927ed1176ef6f4370aab
+size 72700
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c0008cd2827cf805678958567bbce2ca86640a5f27e95ebf1c9cdbc0b86edfd0
-size 405032
+oid sha256:a8e8bcb6fdffb2d8673e4ee4e16e21672ffe99e717c48fd35b8411a8aa0530e9
+size 405064
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b08c65638e961e2fa5f194e93c3a63ead0976b13c1b9821850c3ee865eac0a8
-size 82767
+oid sha256:3caecb171d3095ef5c3593c6289b2d99e6cd6a6c635d822ad24061e502bdeb2e
+size 82790
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ba76e7df81874aa6549a5f8ca7987046a4b43a63852c83fece541dc319e839d6
-size 131727
+oid sha256:c64b270815016ecd157fe430538090afc8f94c4ec2402a6c6de01ff1d762db94
+size 131744
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0bcb9f9715c5ecf3007c2128f68e040512645c5db10db1adf6cd2bf118d50b5
-size 50279
+oid sha256:6a9022d63fa2d6f972b94856ceae281a918bddbdb935962bd21088baf126e03c
+size 50165
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02bc44adb506a0a8b71ef96d8f3d5b9ce0ad2ec7dc9cba27eca8e0bfcaf804c0
-size 48113
+oid sha256:adf6cbfa0c5a85debf5f271e16c1cd6ea2d8bf092d8a5ff829e624212805e21e
+size 48034
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b170b771205f42a4aaf6e23b1043cc2b7ca591cc940fc729f8c7ca62e1778ccc
-size 51327
+oid sha256:6f8c5be5646019061349e6b3a7f358de7a0e2198f132be83cc44ddf5d82ac6da
+size 51339
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db1c5fb588286dd755213c2eadf23488ddaf9eac7e88585a339484511382cd4c
-size 49522
+oid sha256:734df31d9ad63ff8ce0877daaa7c1036a0a322209d16ff9c9cf544d26676bdf9
+size 49482
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:008f560c95d92128a7978478563d47bbf57bc0ed1d165f69c60f3d088a8b1798
-size 41741
+oid sha256:1d52e9f943bbefe5bc763dcd2b460c2e701625d427efc344b53b1ca38854bd8b
+size 41761
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e8f94bfe6ac910599edd6d2a49ed0369e2304dc589cb574cbf095157e2ae507
-size 39148
+oid sha256:aa6e7dae4a224c2911536a5fc956cdee78fb02b0af2549054dc3705c53aff481
+size 39131
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5de0b9b9e57b29ea1db60e136654359a05373788ed2ced2036fb536ca20d74f5
-size 50358
+oid sha256:d362911049fc57b2a321042c420e36a5685d29957e8da336babd9abac14d50c6
+size 50031
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc2fcfae3ff423b0c805a24f46e42a3321830a160f42e0d82026da1bef6cebcc
-size 48490
+oid sha256:827d8beccea22589652fde2e1b83de48429775301f7d68c43950605b92940fb7
+size 47849
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f26a02838efca6a91ab005822913eb770e9cf06799653532905814f97848567
-size 60599
+oid sha256:c62b0036ff3375f70003b21192a2e8e05871b54c960022bac57066eb390b47a3
+size 60597
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:008f75cc5a2bceeba54406ff74c2e5541ebf7a39c00489afd941cfcc79e6ada9
-size 58085
+oid sha256:d393c37651e18449f5f0fdd44fdd9e91d1a2d4fbb6afbd3a92c91dba5c125135
+size 57722
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b0bcb9f9715c5ecf3007c2128f68e040512645c5db10db1adf6cd2bf118d50b5
-size 50279
+oid sha256:8c17f3c52a425eb77760c6c3d5f9e18c4dc4f14ca5fb6e4e386d9205df3b4fbb
+size 49990
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02bc44adb506a0a8b71ef96d8f3d5b9ce0ad2ec7dc9cba27eca8e0bfcaf804c0
-size 48113
+oid sha256:70700bd9b3b3157f75336c7d4b6f56deb462bd30bbcea6ac773c2da5f993df90
+size 47773
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6dbcd0f76ceb070d1a7b3f9a22292b37c5bd9fa005915233db7bcb8f45d4ccef
-size 61775
+oid sha256:6af8b4ecc2845f6cc8ee6c15507852ead9bc76840e35deeeb0f0318ab9f7678e
+size 61702
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:335853740399624113c6e83d2cbc411691eb74759bcdcc1575b7fa3d10ad4ef6
-size 58751
+oid sha256:44d1604be0007f4db8585fd40ae56d4a346801c98388c3b69582d32be34cdd7a
+size 58533
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8cf7ee8e457e03a2abad0419fb8466f3f43b85abeabf705dd7af412dc4e4d45
-size 51250
+oid sha256:24debf9cd1db19d5e6245e556d871b9a2a756d6c9e80fd5b45cb930e9a50a394
+size 51429
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6db26883ef045ff984e8cbf6256a01b8221825efa29b82364187c6b4fcf9d2a
-size 48653
+oid sha256:5e9ce65239d7f8cee5ace51d9559ad4433cba28d762bf535228d9c4fe6755eac
+size 48818
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2703da4167bd0198f9666c2160bf95e4c99ac718864ae67d277fbbb4fd50014f
-size 71876
+oid sha256:08ea9ead35a143a4a14fa6b4185258417466d7d05659ac839c823d80a950a8f6
+size 71689
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:86f6e18357569284c223afb87195be656e6e6c90794e64ef6a13346c8de6c496
-size 58367
+oid sha256:aa695595ef8f487bf0503648024f4337ac8b39035a79d8c5612c366dd2c8c570
+size 58177
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:05f9317281ed84751b9f168c4495e94d1f68a9f9e7946270402db59e259d1ac5
-size 71392
+oid sha256:6e6e9f5972f3119468855637eb0ff4e975ffe1a36162bd88485ff34598bed6d5
+size 71258
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be4cda10c2b416d70d020c46abb00e41a2802e5d71f2dc416c506cffae147af1
-size 80226
+oid sha256:36d9ffefb8b575dbdf308b4075511edb2716f1b5d5de7dcb96a0a13dd68d9052
+size 79811
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d29017d9dca92779074b963ba29681bb6cc83728a15ba2f55846c8fb2751d1d
-size 61119
+oid sha256:27320b5230058ae90d35f681eb46a64fcdb0a83037b2e5ec2fce49a331e4f525
+size 61091
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a8d1701f1be6087e93d15bbeed97659e57e0d58b9d5087fad0253d5d3dd60194
-size 59972
+oid sha256:e159e59cc4fbcb7e33b4db5f0b04b486ab7d07426371e288c9bbc2b80c05097c
+size 59854
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d2d984f17ca414c523d6a2cdcf9fc4f82c0759b22b72b60e8f5bb28776350a72
-size 66958
+oid sha256:db7a7db0cd732c80d03b561ed3061843bdecd23c6f188a7117d3674a62fa15e7
+size 66757
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eeb25a0b7738b0a8b12a2fbdcfc469dcfc2c893ebfa4a50a3047491f817ff981
-size 88665
+oid sha256:2f4d9572d105726c07387f037e65092adcbb8b631d0406eabad30dbc8382383d
+size 88343
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f1f008fc8bc035bf9256e19e831691d3ac7c3347e83aaed2ae8d4b7a7f5b4213
-size 59285
+oid sha256:e9dd1cb61ef6b1a6f15d766882f6d748ff8b45c4cb45588ebf8e3787cfac269c
+size 59158
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e9294ee360463d72968ef89eeed7ff52c80da29e4a59f36f00422f1fe3cb7d9f
-size 59350
+oid sha256:b5286b5cea91c0f474d86413a1808129cecbf4a5b5992dee2059ec0cbe6e74ee
+size 59207
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5dd13cfda2b0f029a46477cbe9f8db1e3a191890072665adda02ec0750cddcd6
-size 66535
+oid sha256:5330b8699041f01a5874c92152f8b6524755d327612d976c7b731ac9def233e2
+size 66344
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9b32f9442e9088eec377f74127c99002aaf2c5668b0550047dd7b1c9e73ad619
-size 58783
+oid sha256:65f9224c7c4556477c362fe81057d3fc89fe9043e447d225809dbb66d1895f74
+size 58644
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:24baa66c2fced922b328987b51c1045af7111fb3c7e4bafdc46046eae61d0f87
-size 68773
+oid sha256:0ec9a6e9914fcaece7a5fc79a94437a6798a9ef9fe29da301a9b6b199bc90ecc
+size 68290
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e343b71b9f170fa7879510544cfc95af1ba15ebc128bc5d78afd49d10c70dc66
-size 55802
+oid sha256:a765b2e132737bb0213be31344fea05e60dc46b30b032c0c53b1a7adae59359c
+size 55167
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d76f37cc5bd2d6ee9b7c87bfe7b656b0095ce6ded4d07cdc48d255039aed3520
-size 68313
+oid sha256:c26f7171640584447f185263092281a44b25c2cb3cef9e470cd9d10474c1f241
+size 67857
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d24998e960d2d4d36c1ef0f589e9094d972203016b0a923268c1894bd09f267f
-size 76999
+oid sha256:9bf5ef7638d415bedef349848c03bdcc093e00f391d91c5d528b466ee8117a64
+size 76423
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:62592587ff02f0d36cb40f0b59fa3e7c6925cd42622ac76c4d561f6df999eba9
-size 58404
+oid sha256:dc76afb5738bb1cc70ce048a990cb428dce012eebbf503df59439cbd8546dbe4
+size 58006
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc54d34649b067af6e0daa7d2e1c8661572fe0139ea9aed209b28c3a99f44f12
-size 57353
+oid sha256:30b9d933c5e1cf1a5f4bc721cf8328b87ea025fae703c239a81a6d68748775d5
+size 56888
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:10f02c7de0575dc30c65cafa4adeb265d6ea1e487db240f1d4052be138a8b0b0
-size 64014
+oid sha256:5308541d962b0835476e6443a4dd1af53bebd477ab2f382daefda9121483cff5
+size 63637
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a196fe9e7c551fa7cc1145c9f8df12c5905678fae285884b71e7ea15cea1bf5b
-size 85088
+oid sha256:c2325468ef6b2c89b2989d7ce80526cae29eaab3708da4bedcbde0b2c4c2f9dd
+size 84835
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60b3b04167249a6283dccae1450645853df5e05ac7a31f419c674be0594dd413
-size 56710
+oid sha256:451ef300ac8c65887a1caccf643772dd331f59dd1181c97f0b9c53a0ff457f89
+size 56207
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d303c75fe252ee9d3fb0bd91131ed44b731ea6fbe120dc1379aeac4c4d43c467
-size 56693
+oid sha256:4bcfaa8bca539371c914e56ed1108282f0e4df826f99527ce982a720f22d2655
+size 56192
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:81d23de4f3afac7993f42ea8030f6a2392768b343761408d6737382492443267
-size 63586
+oid sha256:d65864db2aa76e16df454f6772c296ac4cb9efebe2a417560e2b0e8e65503a89
+size 63211
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c3a1636c58e8243f971f69ea3575e75a12526863f1304a32f65fc2991fd403f
-size 56250
+oid sha256:483daeec8b5d0be508de8f979ace30bdda1ee1c7b3ccb33af0938deacb8f0f40
+size 55673
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8eb6049cc99813238995f936022fd9fd5a43d1e917bfc69ab1069fe3da456cb5
-size 73316
+oid sha256:247d836caf3bed3b89c6a772861d8e302f0b9c5f9c299edd316ad83ce55c8d9e
+size 73090
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:611527e8c0bce7a9fb48b5eff42170cb9da5f40cf020c78209dee84615d300ba
-size 56514
+oid sha256:b3006fc80bef839cb8a2a1ad83f9572b157f0abfe8fd9f170de2c09f882e02d0
+size 56132
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77b28be1b95709082e0302cca5b65c2d57ab48786e6a22facb8c86116f058b11
-size 71667
+oid sha256:f3c5de24b62819c74c8183ea8a934e3e463bd2da4d00641341ade7e58b644e61
+size 71496
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31875ed4c6d9443418899de47eeb5b61d2246d8321e83579681cfa152ff4a056
-size 83174
+oid sha256:b60c12e4345b74815300f992b5c95a54c9ceb4d91e511f13e98e2f2805bfa1f9
+size 82673
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5cc4f388f677bf04259344b5bfc9033ef6a4a76ad161012abcd0239ef520a8d8
-size 59670
+oid sha256:04dca8661539bd8c9a4afd97f1882415d7c27858b2b489de4f857205543be4fc
+size 59397
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e57a614424396e36229d7877a0bb222a51e9e955a42e180acc1d43c048684da2
-size 58787
+oid sha256:8adec1a157ed614916988f563391dc817319bb27b10d5b4a3a41da531e9554a0
+size 58466
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4546f32ff1eeae0a923d473491926a6037eddf59c0c88c516c504b9875874c8a
-size 66402
+oid sha256:4bea8196d7650886772d346a013e85307005d9a3f24b5a681a14fc1f218b971e
+size 66295
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:acd25c00d9127c2c78f48b22296a5ab33f1e16ec5698c93dd29adc9172467aac
-size 101706
+oid sha256:d3e535259e6d81f396970531e095453989908e91f4a8ecaf47325430eb86c955
+size 101506
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d066e82aba5742c7e84a260de0e4578bb3bc8faac097225271cfdb14cd52f5f0
-size 57816
+oid sha256:cc534ed58d1faf6fbf1f4fdace08e02958e60b54c457436eac2a9c1357b39517
+size 57490
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2c037b4de113387ac7e28d256d28ce9308be184b4ebff988ed96760623acfafd
-size 57776
+oid sha256:a56524de1c9f55eb3d6d88342d6d8576508d6145b3fecb8dddc38c598c82a67c
+size 57356
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:81883325e2e450c33f38b3143c43a3fa3d659a210ff6e9ef40de71b1d0522f50
-size 66781
+oid sha256:0c7299aba8e5340b443223858d405f99ab1a4667721b0abbd895713111055116
+size 66570
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b6b5808bdde620cac3fe980aee1f8162a854965113d99d074442a2baa818d712
-size 57198
+oid sha256:4294a5f0c9b943ccf3e9c5ac6f9ecbd574c34cd5334a044342c72cf72f0ef80a
+size 56848
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7174f340d6e16be525da9a06270f07abc7496fc6c41a5670a71bd1b23f4a72c2
-size 69957
+oid sha256:d2a3c8af39fa40b72e95cc4191f820ab2b2b173e37b99178ff7c06a5870ca2c7
+size 69971
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dbb0c22089c063c18042c8778c1b69edb441af8071f7dfb9a3ffdaeab4ba4c71
-size 53340
+oid sha256:73a1a7607c6273081ef1b866be384fc40b65283cca4f72f701f174d913973c85
+size 52902
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e9a561ca3aa61371cc1bd0c1b51508469a0343de3bd8f404055041591c60d42f
-size 68231
+oid sha256:f5bbbd86cfe40fb6e861a9473f0a63bcbba808d915da99b14f085a27b9428e15
+size 68300
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c739add59dd40303652319c0b789ec4d0d2224cc097598ef717e8fb101031ad7
-size 79471
+oid sha256:b9610ae365f1cc089b17cb068e66c5f90414364c6bf181c1c7ea2800353a9914
+size 79614
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:61d30aca9b213938462659c2dcb8bc8ef10b28821f8492715003262f4cae142c
-size 56761
+oid sha256:072afde5059b3a90977929811f43402d396ac64debf2cbf17c1f6efd35394b46
+size 56298
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a84be2101e96ab4e7566e4fe1af14243466c7dba7e540fb7502acbbf70d33aaa
-size 55835
+oid sha256:563e94244304f75a1d64151fdc35e35a9eee2f0c88d4dd4e4872a580adfc434b
+size 55392
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f168b3af0e3679a2d7a5f2baddc1523c1afe9dc433d25c267572097d9ab7d15
-size 63284
+oid sha256:529ee850c430ea3bd54aac5b0a768cf49dbce44c6629e41ca4a8293e60d993f9
+size 63140
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:41799e15fad757a976b278d5d722fc755dcfdda3ad0880a1f4058a337b96d470
-size 97907
+oid sha256:38ab31d94f2252fc5a6bfa720529eaa1d0f9459395e77383cf55b06547ca6117
+size 97622
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c3d27473a9375edc590aeedf8dcb188e1c23785a8f8c62900aa439c33f86ca13
-size 54772
+oid sha256:a2b367cb2f3d35dce7c038c3358906e32669245537df0e4d6ec33c21ce6c23ff
+size 54362
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52a125268370bb369c53271f204b5f942da75f01639a39ae6b935d3f3ab4ef00
-size 54705
+oid sha256:57a1fbbce28ef24a5190758b2482622fafda8ec6206b68b8ed632e0e946dda87
+size 54131
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:56d531df665ae3baa6400b0fc83b1fe756ec0f452ddd2423457ed26ea18aed98
-size 63628
+oid sha256:261747f96fbf93367dae4819a2d4ae8883573cc75af1d6f43cae77f0eaf55736
+size 63307
--- a/Show More
+++ b/Show More