Merge remote-tracking branch 'origin/main' into renovate/androidx.com…

…pose.material3-material3-1.x

compound/src/main/kotlin/io/element/android/compound/theme/AvatarColors.kt

@@ -13,9 +13,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import io.element.android.compound.annotations.CoreColorToken
-import io.element.android.compound.tokens.generated.internal.DarkColorTokens
-import io.element.android.compound.tokens.generated.internal.LightColorTokens
 
 /**
  * Data class to hold avatar colors.
@@ -28,42 +25,25 @@ data class AvatarColors(
 )
 
 /**
- * Avatar colors are not yet part of SemanticColors, so create list here.
- * LightColorTokens is internal to the module.
+ * Avatar colors using semantic tokens.
  */
-@OptIn(CoreColorToken::class)
-val avatarColorsLight = listOf(
-    AvatarColors(background = LightColorTokens.colorBlue300, foreground = LightColorTokens.colorBlue1200),
-    AvatarColors(background = LightColorTokens.colorFuchsia300, foreground = LightColorTokens.colorFuchsia1200),
-    AvatarColors(background = LightColorTokens.colorGreen300, foreground = LightColorTokens.colorGreen1200),
-    AvatarColors(background = LightColorTokens.colorPink300, foreground = LightColorTokens.colorPink1200),
-    AvatarColors(background = LightColorTokens.colorOrange300, foreground = LightColorTokens.colorOrange1200),
-    AvatarColors(background = LightColorTokens.colorCyan300, foreground = LightColorTokens.colorCyan1200),
-    AvatarColors(background = LightColorTokens.colorPurple300, foreground = LightColorTokens.colorPurple1200),
-    AvatarColors(background = LightColorTokens.colorLime300, foreground = LightColorTokens.colorLime1200),
-)
-
-/**
- * Avatar colors are not yet part of SemanticColors, so create list here.
- * DarkColorTokens is internal to the module.
- */
-@OptIn(CoreColorToken::class)
-val avatarColorsDark = listOf(
-    AvatarColors(background = DarkColorTokens.colorBlue300, foreground = DarkColorTokens.colorBlue1200),
-    AvatarColors(background = DarkColorTokens.colorFuchsia300, foreground = DarkColorTokens.colorFuchsia1200),
-    AvatarColors(background = DarkColorTokens.colorGreen300, foreground = DarkColorTokens.colorGreen1200),
-    AvatarColors(background = DarkColorTokens.colorPink300, foreground = DarkColorTokens.colorPink1200),
-    AvatarColors(background = DarkColorTokens.colorOrange300, foreground = DarkColorTokens.colorOrange1200),
-    AvatarColors(background = DarkColorTokens.colorCyan300, foreground = DarkColorTokens.colorCyan1200),
-    AvatarColors(background = DarkColorTokens.colorPurple300, foreground = DarkColorTokens.colorPurple1200),
-    AvatarColors(background = DarkColorTokens.colorLime300, foreground = DarkColorTokens.colorLime1200),
-)
+@Composable
+fun avatarColors(): List<AvatarColors> {
+    return listOf(
+        AvatarColors(background = ElementTheme.colors.bgDecorative1, foreground = ElementTheme.colors.textDecorative1),
+        AvatarColors(background = ElementTheme.colors.bgDecorative2, foreground = ElementTheme.colors.textDecorative2),
+        AvatarColors(background = ElementTheme.colors.bgDecorative3, foreground = ElementTheme.colors.textDecorative3),
+        AvatarColors(background = ElementTheme.colors.bgDecorative4, foreground = ElementTheme.colors.textDecorative4),
+        AvatarColors(background = ElementTheme.colors.bgDecorative5, foreground = ElementTheme.colors.textDecorative5),
+        AvatarColors(background = ElementTheme.colors.bgDecorative6, foreground = ElementTheme.colors.textDecorative6),
+    )
+}
 
 @Preview
 @Composable
-internal fun AvatarColorsLightPreview() {
-    val chunks = avatarColorsLight.chunked(4)
+internal fun AvatarColorsPreviewLight() {
     ElementTheme {
+        val chunks = avatarColors().chunked(4)
         Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
             for (chunk in chunks) {
                 AvatarColorRow(chunk)
@@ -74,9 +54,9 @@ internal fun AvatarColorsLightPreview() {
 
 @Preview
 @Composable
-internal fun AvatarColorsDarkPreview() {
-    val chunks = avatarColorsDark.chunked(4)
-    ElementTheme {
+internal fun AvatarColorsPreviewDark() {
+    ElementTheme(darkTheme = true) {
+        val chunks = avatarColors().chunked(4)
         Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
             for (chunk in chunks) {
                 AvatarColorRow(chunk)

compound/src/main/kotlin/io/element/android/compound/tokens/generated/CompoundIcons.kt

@@ -60,6 +60,9 @@ object CompoundIcons {
     @Composable fun Bold(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_bold)
     }
+    @Composable fun Calendar(): ImageVector {
+        return ImageVector.vectorResource(R.drawable.ic_compound_calendar)
+    }
     @Composable fun Chart(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_chart)
     }
@@ -300,6 +303,9 @@ object CompoundIcons {
     @Composable fun MarkAsUnread(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_mark_as_unread)
     }
+    @Composable fun MarkThreadsAsRead(): ImageVector {
+        return ImageVector.vectorResource(R.drawable.ic_compound_mark_threads_as_read)
+    }
     @Composable fun MarkerReadReceipts(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_marker_read_receipts)
     }
@@ -402,6 +408,9 @@ object CompoundIcons {
     @Composable fun Restart(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_restart)
     }
+    @Composable fun Room(): ImageVector {
+        return ImageVector.vectorResource(R.drawable.ic_compound_room)
+    }
     @Composable fun Search(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_search)
     }
@@ -477,6 +486,9 @@ object CompoundIcons {
     @Composable fun UnknownSolid(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_unknown_solid)
     }
+    @Composable fun Unpin(): ImageVector {
+        return ImageVector.vectorResource(R.drawable.ic_compound_unpin)
+    }
     @Composable fun User(): ImageVector {
         return ImageVector.vectorResource(R.drawable.ic_compound_user)
     }
@@ -554,6 +566,7 @@ object CompoundIcons {
         Attachment(),
         Block(),
         Bold(),
+        Calendar(),
         Chart(),
         Chat(),
         ChatNew(),
@@ -634,6 +647,7 @@ object CompoundIcons {
         LockSolid(),
         MarkAsRead(),
         MarkAsUnread(),
+        MarkThreadsAsRead(),
         MarkerReadReceipts(),
         Mention(),
         Menu(),
@@ -668,6 +682,7 @@ object CompoundIcons {
         ReactionAdd(),
         Reply(),
         Restart(),
+        Room(),
         Search(),
         Send(),
         SendSolid(),
@@ -693,6 +708,7 @@ object CompoundIcons {
         Underline(),
         Unknown(),
         UnknownSolid(),
+        Unpin(),
         User(),
         UserAdd(),
         UserAddSolid(),
@@ -727,6 +743,7 @@ object CompoundIcons {
         R.drawable.ic_compound_attachment,
         R.drawable.ic_compound_block,
         R.drawable.ic_compound_bold,
+        R.drawable.ic_compound_calendar,
         R.drawable.ic_compound_chart,
         R.drawable.ic_compound_chat,
         R.drawable.ic_compound_chat_new,
@@ -807,6 +824,7 @@ object CompoundIcons {
         R.drawable.ic_compound_lock_solid,
         R.drawable.ic_compound_mark_as_read,
         R.drawable.ic_compound_mark_as_unread,
+        R.drawable.ic_compound_mark_threads_as_read,
         R.drawable.ic_compound_marker_read_receipts,
         R.drawable.ic_compound_mention,
         R.drawable.ic_compound_menu,
@@ -841,6 +859,7 @@ object CompoundIcons {
         R.drawable.ic_compound_reaction_add,
         R.drawable.ic_compound_reply,
         R.drawable.ic_compound_restart,
+        R.drawable.ic_compound_room,
         R.drawable.ic_compound_search,
         R.drawable.ic_compound_send,
         R.drawable.ic_compound_send_solid,
@@ -866,6 +885,7 @@ object CompoundIcons {
         R.drawable.ic_compound_underline,
         R.drawable.ic_compound_unknown,
         R.drawable.ic_compound_unknown_solid,
+        R.drawable.ic_compound_unpin,
         R.drawable.ic_compound_user,
         R.drawable.ic_compound_user_add,
         R.drawable.ic_compound_user_add_solid,

compound/src/main/kotlin/io/element/android/compound/tokens/generated/TypographyTokens.kt

@@ -40,7 +40,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W500,
         lineHeight = 22.sp,
         fontSize = 16.sp,
-        letterSpacing = 0.015629999999999998.em,
+        letterSpacing = 0.015625.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )
@@ -49,7 +49,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W400,
         lineHeight = 22.sp,
         fontSize = 16.sp,
-        letterSpacing = 0.015629999999999998.em,
+        letterSpacing = 0.015625.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )
@@ -58,7 +58,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W500,
         lineHeight = 20.sp,
         fontSize = 14.sp,
-        letterSpacing = 0.01786.em,
+        letterSpacing = 0.017857.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )
@@ -67,7 +67,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W400,
         lineHeight = 20.sp,
         fontSize = 14.sp,
-        letterSpacing = 0.01786.em,
+        letterSpacing = 0.017857.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )
@@ -76,7 +76,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W500,
         lineHeight = 17.sp,
         fontSize = 12.sp,
-        letterSpacing = 0.03333.em,
+        letterSpacing = 0.033333.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )
@@ -85,7 +85,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W400,
         lineHeight = 17.sp,
         fontSize = 12.sp,
-        letterSpacing = 0.03333.em,
+        letterSpacing = 0.033333.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )
@@ -94,7 +94,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W500,
         lineHeight = 15.sp,
         fontSize = 11.sp,
-        letterSpacing = 0.04545.em,
+        letterSpacing = 0.045454.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )
@@ -103,7 +103,7 @@ object TypographyTokens {
         fontWeight = FontWeight.W400,
         lineHeight = 15.sp,
         fontSize = 11.sp,
-        letterSpacing = 0.04545.em,
+        letterSpacing = 0.045454.em,
         platformStyle = PlatformTextStyle(includeFontPadding = false),
         lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
     )

compound/src/main/res/drawable/ic_compound_calendar.xml

@@ -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:fillColor="#FF000000"
+        android:pathData="M5 22c-0.55 0-1.02-0.2-1.41-0.59A1.93 1.93 0 0 1 3 20V6c0-0.55 0.2-1.02 0.59-1.41A1.93 1.93 0 0 1 5 4h1V2h2v2h8V2h2v2h1c0.55 0 1.02 0.2 1.41 0.59C20.81 4.98 21 5.45 21 6v14c0 0.55-0.2 1.02-0.59 1.41A1.93 1.93 0 0 1 19 22H5Zm0-2h14V10H5v10ZM5 8h14V6H5v2Zm7 6a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 11 13c0-0.28 0.1-0.52 0.29-0.71A0.97 0.97 0 0 1 12 12c0.28 0 0.52 0.1 0.71 0.29C12.91 12.48 13 12.72 13 13s-0.1 0.52-0.29 0.71A0.97 0.97 0 0 1 12 14Zm-4 0a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 7 13c0-0.28 0.1-0.52 0.29-0.71A0.97 0.97 0 0 1 8 12c0.28 0 0.52 0.1 0.71 0.29C8.91 12.48 9 12.72 9 13s-0.1 0.52-0.29 0.71A0.97 0.97 0 0 1 8 14Zm8 0a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 15 13c0-0.28 0.1-0.52 0.29-0.71A0.97 0.97 0 0 1 16 12a0.97 0.97 0 0 1 0.71 0.29C16.91 12.48 17 12.72 17 13s-0.1 0.52-0.29 0.71A0.97 0.97 0 0 1 16 14Zm-4 4a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 11 17a0.97 0.97 0 0 1 0.29-0.71A0.97 0.97 0 0 1 12 16a0.97 0.97 0 0 1 0.71 0.29C12.91 16.48 13 16.72 13 17s-0.1 0.52-0.29 0.71A0.97 0.97 0 0 1 12 18Zm-4 0a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 7 17a0.97 0.97 0 0 1 0.29-0.71A0.97 0.97 0 0 1 8 16a0.97 0.97 0 0 1 0.71 0.29C8.91 16.48 9 16.72 9 17s-0.1 0.52-0.29 0.71A0.97 0.97 0 0 1 8 18Zm8 0a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 15 17a0.97 0.97 0 0 1 0.29-0.71A0.97 0.97 0 0 1 16 16c0.28 0 0.52 0.1 0.71 0.29C16.91 16.48 17 16.72 17 17s-0.1 0.52-0.29 0.71A0.97 0.97 0 0 1 16 18Z"/>
+</vector>

compound/src/main/res/drawable/ic_compound_chat_problem.xml

@@ -5,8 +5,8 @@
     android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M12.71 16.71A0.97 0.97 0 0 1 12 17a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 11 16c0-0.28 0.1-0.52 0.29-0.71A0.97 0.97 0 0 1 12 15a0.97 0.97 0 0 1 0.71 0.29C12.91 15.48 13 15.72 13 16s-0.1 0.52-0.29 0.71Zm0-4A0.97 0.97 0 0 1 12 13a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 11 12V8c0-0.28 0.1-0.52 0.29-0.71A0.97 0.97 0 0 1 12 7a0.97 0.97 0 0 1 0.71 0.29C12.91 7.48 13 7.72 13 8v4a0.97 0.97 0 0 1-0.29 0.71Z"/>
+        android:pathData="M12.71 16.71A0.97 0.97 0 0 1 12 17a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 11 16c0-0.28 0.1-0.52 0.29-0.71A0.97 0.97 0 0 1 12 15c0.28 0 0.52 0.1 0.71 0.29C12.91 15.48 13 15.72 13 16s-0.1 0.52-0.29 0.71Zm0-4A0.97 0.97 0 0 1 12 13a0.97 0.97 0 0 1-0.71-0.29A0.97 0.97 0 0 1 11 12V8c0-0.28 0.1-0.52 0.29-0.71A0.97 0.97 0 0 1 12 7c0.28 0 0.52 0.1 0.71 0.29C12.91 7.48 13 7.72 13 8v4c0 0.28-0.1 0.52-0.29 0.71Z"/>
     <path
         android:fillColor="#FF000000"
-        android:pathData="M2.95 16.3a10.23 10.23 0 0 1-0.71-2.1A10.17 10.17 0 0 1 2 12a9.74 9.74 0 0 1 0.79-3.9 10.1 10.1 0 0 1 2.13-3.17c0.9-0.9 1.96-1.62 3.18-2.14A9.74 9.74 0 0 1 12 2a9.74 9.74 0 0 1 3.9 0.79 10.1 10.1 0 0 1 3.17 2.14c0.9 0.9 1.62 1.95 2.14 3.17A9.74 9.74 0 0 1 22 12a9.74 9.74 0 0 1-0.79 3.9 10.1 10.1 0 0 1-2.14 3.17 10.1 10.1 0 0 1-3.17 2.14A9.74 9.74 0 0 1 12 22c-0.75 0-1.48-0.08-2.2-0.24a10.23 10.23 0 0 1-2.1-0.71L2.75 22.5a0.94 0.94 0 0 1-1-0.25 0.94 0.94 0 0 1-0.25-1l1.45-4.95Zm4.2 2.8a0.95 0.95 0 0 1 0.28-0.06l0.27-0.01c0.15 0 0.3 0 0.44 0.03s0.28 0.07 0.41 0.14a7.43 7.43 0 0 0 1.68 0.6C10.8 19.93 11.4 20 12 20c2.23 0 4.13-0.77 5.68-2.32C19.23 16.13 20 14.23 20 12c0-2.23-0.78-4.13-2.33-5.67C16.13 4.78 14.24 4 12 4S7.87 4.78 6.33 6.33C4.78 7.87 4 9.77 4 12c0 0.6 0.07 1.2 0.2 1.77 0.13 0.59 0.33 1.15 0.6 1.68 0.12 0.22 0.18 0.45 0.19 0.69 0 0.24-0.02 0.48-0.09 0.71l-0.95 3.2 3.2-0.95Z"/>
+        android:pathData="M2.95 16.3a10.23 10.23 0 0 1-0.71-2.1A10.17 10.17 0 0 1 2 12a9.74 9.74 0 0 1 0.79-3.9 10.1 10.1 0 0 1 2.14-3.17c0.9-0.9 1.95-1.62 3.17-2.14A9.74 9.74 0 0 1 12 2a9.74 9.74 0 0 1 3.9 0.79 10.1 10.1 0 0 1 3.17 2.14c0.9 0.9 1.62 1.95 2.14 3.17A9.74 9.74 0 0 1 22 12a9.74 9.74 0 0 1-0.79 3.9 10.1 10.1 0 0 1-2.14 3.17c-0.9 0.9-1.95 1.62-3.17 2.14A9.74 9.74 0 0 1 12 22c-0.75 0-1.48-0.08-2.2-0.24a10.23 10.23 0 0 1-2.1-0.71L2.75 22.5a0.94 0.94 0 0 1-1-0.25 0.94 0.94 0 0 1-0.25-1l1.45-4.95Zm4.2 2.8a0.95 0.95 0 0 1 0.28-0.06l0.27-0.01c0.15 0 0.3 0 0.44 0.03s0.28 0.07 0.41 0.14a7.43 7.43 0 0 0 1.68 0.6C10.8 19.93 11.4 20 12 20c2.23 0 4.13-0.77 5.68-2.32C19.23 16.13 20 14.23 20 12c0-2.23-0.78-4.13-2.33-5.67C16.13 4.78 14.24 4 12 4S7.87 4.78 6.33 6.33C4.78 7.87 4 9.77 4 12c0 0.6 0.07 1.2 0.2 1.77s0.33 1.15 0.6 1.68c0.12 0.22 0.18 0.45 0.19 0.69a2.29 2.29 0 0 1-0.09 0.71l-0.95 3.2 3.2-0.95Z"/>
 </vector>

compound/src/main/res/drawable/ic_compound_check.xml

@@ -5,5 +5,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M9.55 17.57c-0.13 0-0.26-0.02-0.38-0.06a0.88 0.88 0 0 1-0.32-0.21L4.55 13c-0.18-0.18-0.27-0.42-0.26-0.71 0-0.3 0.1-0.53 0.28-0.71a0.95 0.95 0 0 1 0.7-0.28 0.95 0.95 0 0 1 0.7 0.28l3.58 3.57 8.47-8.47c0.19-0.19 0.42-0.28 0.72-0.28s0.53 0.1 0.71 0.28c0.18 0.18 0.28 0.42 0.28 0.7s-0.1 0.54-0.28 0.72l-9.2 9.2c-0.1 0.1-0.2 0.17-0.33 0.21a1.1 1.1 0 0 1-0.37 0.06Z"/>
+        android:pathData="M9.55 17.57c-0.13 0-0.26-0.02-0.38-0.06a0.88 0.88 0 0 1-0.32-0.21L4.55 13c-0.18-0.18-0.27-0.42-0.26-0.71 0-0.3 0.1-0.53 0.28-0.71a0.95 0.95 0 0 1 0.7-0.28 0.95 0.95 0 0 1 0.7 0.28l3.58 3.57 8.47-8.47c0.19-0.19 0.42-0.28 0.72-0.28 0.29 0 0.53 0.1 0.71 0.28 0.18 0.18 0.28 0.42 0.28 0.7 0 0.3-0.1 0.54-0.28 0.72l-9.2 9.2c-0.1 0.1-0.2 0.17-0.33 0.21a1.1 1.1 0 0 1-0.37 0.06Z"/>
 </vector>

compound/src/main/res/drawable/ic_compound_chevron_up_down.xml

@@ -5,5 +5,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M8.22 8.32C8.04 8.14 7.96 7.9 7.96 7.6s0.1-0.54 0.28-0.72L11.3 3.8c0.1-0.1 0.2-0.17 0.33-0.21a1.22 1.22 0 0 1 0.76 0A0.68 0.68 0 0 1 12.7 3.8l3.1 3.1c0.18 0.18 0.27 0.42 0.26 0.71 0 0.3-0.1 0.53-0.28 0.71-0.19 0.19-0.43 0.28-0.73 0.28s-0.54-0.1-0.72-0.28L12 6 9.65 8.35C9.47 8.53 9.23 8.62 8.94 8.61a1 1 0 0 1-0.71-0.28ZM12 20.57a0.94 0.94 0 0 1-0.38-0.07 1.31 1.31 0 0 1-0.32-0.2l-3.08-3.08c-0.18-0.18-0.27-0.42-0.27-0.72s0.1-0.54 0.28-0.72c0.18-0.19 0.42-0.28 0.72-0.28s0.54 0.1 0.73 0.28L12 18.1l2.35-2.35c0.18-0.18 0.42-0.27 0.71-0.26 0.3 0 0.53 0.1 0.71 0.29 0.19 0.18 0.28 0.42 0.28 0.72s-0.1 0.54-0.28 0.73L12.7 20.3a1.03 1.03 0 0 1-0.7 0.28Z"/>
+        android:pathData="M8.22 8.32C8.04 8.14 7.96 7.9 7.96 7.6s0.1-0.54 0.28-0.72L11.3 3.8c0.1-0.1 0.2-0.17 0.33-0.21a1.18 1.18 0 0 1 0.76 0C12.5 3.63 12.62 3.7 12.7 3.8l3.1 3.1c0.18 0.18 0.27 0.42 0.26 0.71a1 1 0 0 1-0.28 0.72C15.59 8.5 15.35 8.6 15.04 8.6s-0.54-0.1-0.72-0.27L12 6 9.65 8.35C9.47 8.53 9.23 8.62 8.94 8.61a1 1 0 0 1-0.71-0.28ZM12 20.57a0.94 0.94 0 0 1-0.38-0.07 1.31 1.31 0 0 1-0.32-0.2l-3.08-3.08c-0.18-0.18-0.27-0.42-0.27-0.72s0.1-0.54 0.28-0.72c0.18-0.19 0.42-0.28 0.72-0.28s0.54 0.1 0.73 0.28L12 18.1l2.35-2.35c0.18-0.18 0.42-0.27 0.71-0.26 0.3 0 0.53 0.1 0.71 0.29 0.19 0.18 0.28 0.42 0.28 0.72s-0.1 0.54-0.28 0.73L12.7 20.3a1.03 1.03 0 0 1-0.7 0.28Z"/>
 </vector>