From 9ae521dd0b64a79d3e18460d79d91420ca050192 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 19 Dec 2023 18:38:54 +0100
Subject: [PATCH] Use Edit icon from Compound and delete ic_edit_solid

---
 .../libraries/designsystem/icons/IconsList.kt |  1 -
 .../src/main/res/drawable/ic_edit_solid.xml   | 25 -------------------
 .../libraries/textcomposer/TextComposer.kt    |  2 +-
 3 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 libraries/designsystem/src/main/res/drawable/ic_edit_solid.xml

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 663bf6c7b3..5240633320 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
@@ -28,7 +28,6 @@ internal val iconsOther = listOf(
     R.drawable.ic_devices,
     R.drawable.ic_edit,
     R.drawable.ic_edit_outline,
-    R.drawable.ic_edit_solid,
     R.drawable.ic_encryption_enabled,
     R.drawable.ic_forward,
     R.drawable.ic_groups,
diff --git a/libraries/designsystem/src/main/res/drawable/ic_edit_solid.xml b/libraries/designsystem/src/main/res/drawable/ic_edit_solid.xml
deleted file mode 100644
index 7c7b628201..0000000000
--- a/libraries/designsystem/src/main/res/drawable/ic_edit_solid.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-  ~ Copyright (c) 2023 New Vector Ltd
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:pathData="M12.867,5.95L10.033,3.15L10.967,2.217C11.222,1.961 11.536,1.833 11.908,1.833C12.281,1.833 12.594,1.961 12.85,2.217L13.783,3.15C14.039,3.406 14.172,3.714 14.183,4.075C14.194,4.436 14.072,4.744 13.817,5L12.867,5.95ZM2.667,14C2.478,14 2.319,13.936 2.192,13.808C2.064,13.68 2,13.522 2,13.333V11.45C2,11.361 2.017,11.275 2.05,11.192C2.083,11.108 2.133,11.033 2.2,10.967L9.067,4.1L11.9,6.933L5.033,13.8C4.967,13.867 4.892,13.917 4.808,13.95C4.725,13.983 4.639,14 4.55,14H2.667Z"
-      android:fillColor="@android:color/white"/>
-</vector>
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt
index 53dd591f36..f26b066860 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt
@@ -486,7 +486,7 @@ private fun EditingModeView(
             .padding(start = 12.dp)
     ) {
         Icon(
-            resourceId = CommonDrawables.ic_edit_solid,
+            imageVector = CompoundIcons.Edit,
             contentDescription = stringResource(CommonStrings.common_editing),
             tint = ElementTheme.materialColors.secondary,
             modifier = Modifier