From f7f71ddf4a2f244a2dc76c02c4564ced3cfc0404 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 19 Dec 2023 18:35:12 +0100
Subject: [PATCH] Use Thread icon from Compound and delete ic_thread_decoration

---
 .../timeline/components/TimelineItemEventRow.kt   |  5 +++--
 .../libraries/designsystem/icons/IconsList.kt     |  1 -
 .../main/res/drawable/ic_thread_decoration.xml    | 15 ---------------
 3 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 libraries/designsystem/src/main/res/drawable/ic_thread_decoration.xml

diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
index ff98afabf3..d22cfedae7 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
@@ -62,6 +62,7 @@ import androidx.compose.ui.zIndex
 import androidx.constraintlayout.compose.ConstrainScope
 import androidx.constraintlayout.compose.ConstraintLayout
 import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.messages.impl.timeline.TimelineEvents
 import io.element.android.features.messages.impl.timeline.TimelineRoomInfo
 import io.element.android.features.messages.impl.timeline.aTimelineItemEvent
@@ -93,7 +94,6 @@ import io.element.android.libraries.designsystem.swipe.rememberSwipeableActionsS
 import io.element.android.libraries.designsystem.text.toPx
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Text
-import io.element.android.libraries.designsystem.utils.CommonDrawables
 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.permalink.PermalinkData
@@ -428,7 +428,8 @@ private fun MessageEventBubbleContent(
             verticalAlignment = Alignment.CenterVertically,
         ) {
             Icon(
-                resourceId = CommonDrawables.ic_thread_decoration,
+                modifier = Modifier.height(14.dp),
+                imageVector = CompoundIcons.Threads,
                 contentDescription = null,
                 tint = ElementTheme.colors.iconSecondary,
             )
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsList.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsList.kt
index a89bfbfa4f..663bf6c7b3 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsList.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/icons/IconsList.kt
@@ -49,7 +49,6 @@ internal val iconsOther = listOf(
     R.drawable.ic_strikethrough,
     R.drawable.ic_take_photo_camera,
     R.drawable.ic_text_formatting,
-    R.drawable.ic_thread_decoration,
     R.drawable.ic_underline,
     R.drawable.ic_user,
     R.drawable.ic_user_add,
diff --git a/libraries/designsystem/src/main/res/drawable/ic_thread_decoration.xml b/libraries/designsystem/src/main/res/drawable/ic_thread_decoration.xml
deleted file mode 100644
index b90c22f6b5..0000000000
--- a/libraries/designsystem/src/main/res/drawable/ic_thread_decoration.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="14dp"
-    android:height="13dp"
-    android:viewportWidth="14"
-    android:viewportHeight="13">
-  <path
-      android:pathData="M3.667,4.667C3.478,4.667 3.319,4.603 3.192,4.475C3.064,4.347 3,4.189 3,4C3,3.811 3.064,3.653 3.192,3.525C3.319,3.397 3.478,3.333 3.667,3.333H10.333C10.522,3.333 10.681,3.397 10.808,3.525C10.936,3.653 11,3.811 11,4C11,4.189 10.936,4.347 10.808,4.475C10.681,4.603 10.522,4.667 10.333,4.667H3.667Z"
-      android:fillColor="@android:color/white"/>
-  <path
-      android:pathData="M3.667,7.333C3.478,7.333 3.319,7.269 3.192,7.142C3.064,7.014 3,6.856 3,6.667C3,6.478 3.064,6.319 3.192,6.192C3.319,6.064 3.478,6 3.667,6H7.667C7.855,6 8.014,6.064 8.142,6.192C8.269,6.319 8.333,6.478 8.333,6.667C8.333,6.856 8.269,7.014 8.142,7.142C8.014,7.269 7.855,7.333 7.667,7.333H3.667Z"
-      android:fillColor="@android:color/white"/>
-  <path
-      android:pathData="M1.471,12.195C1.051,12.615 0.333,12.318 0.333,11.724V1.333C0.333,0.597 0.93,0 1.667,0H12.333C13.07,0 13.667,0.597 13.667,1.333V9.333C13.667,10.07 13.07,10.667 12.333,10.667H3L1.471,12.195ZM3,9.333H12.333V1.333H1.667V10.114L2.057,9.724C2.307,9.474 2.646,9.333 3,9.333Z"
-      android:fillColor="@android:color/white"/>
-</vector>