From cbc93cfd48c45697b3f0eb1e169c6bc0268410c6 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 9 Nov 2023 15:09:42 +0100
Subject: [PATCH] Move icons to the design system to reuse them (and use new
 ic_devices).

---
 .../features/signedout/impl/SignedOutView.kt  |  7 +++--
 .../impl/src/main/res/drawable/ic_devices.xml | 29 -------------------
 .../main/res/drawable/ic_do_disturb_alt.xml   |  0
 .../src/main/res/drawable/ic_lock_outline.xml |  0
 4 files changed, 4 insertions(+), 32 deletions(-)
 delete mode 100644 features/signedout/impl/src/main/res/drawable/ic_devices.xml
 rename {features/signedout/impl => libraries/designsystem}/src/main/res/drawable/ic_do_disturb_alt.xml (100%)
 rename {features/signedout/impl => libraries/designsystem}/src/main/res/drawable/ic_lock_outline.xml (100%)

diff --git a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutView.kt b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutView.kt
index 63845ead90..5732346220 100644
--- a/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutView.kt
+++ b/features/signedout/impl/src/main/kotlin/io/element/android/features/signedout/impl/SignedOutView.kt
@@ -43,6 +43,7 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Button
 import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.temporaryColorBgSpecial
+import io.element.android.libraries.designsystem.utils.CommonDrawables
 import io.element.android.libraries.theme.ElementTheme
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.persistentListOf
@@ -94,15 +95,15 @@ private fun SignedOutContent(
             items = persistentListOf(
                 InfoListItem(
                     message = stringResource(id = R.string.screen_signed_out_reason_1),
-                    iconComposable = { Icon(R.drawable.ic_lock_outline) },
+                    iconComposable = { Icon(CommonDrawables.ic_lock_outline) },
                 ),
                 InfoListItem(
                     message = stringResource(id = R.string.screen_signed_out_reason_2),
-                    iconComposable = { Icon(R.drawable.ic_devices) },
+                    iconComposable = { Icon(CommonDrawables.ic_devices) },
                 ),
                 InfoListItem(
                     message = stringResource(id = R.string.screen_signed_out_reason_3),
-                    iconComposable = { Icon(R.drawable.ic_do_disturb_alt) },
+                    iconComposable = { Icon(CommonDrawables.ic_do_disturb_alt) },
                 ),
             ),
             textStyle = ElementTheme.typography.fontBodyMdMedium,
diff --git a/features/signedout/impl/src/main/res/drawable/ic_devices.xml b/features/signedout/impl/src/main/res/drawable/ic_devices.xml
deleted file mode 100644
index e01de99a1d..0000000000
--- a/features/signedout/impl/src/main/res/drawable/ic_devices.xml
+++ /dev/null
@@ -1,29 +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="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <group>
-    <clip-path
-        android:pathData="M0,0h20v20h-20z"/>
-    <path
-        android:pathData="M3.333,5.833C3.333,5.375 3.708,5 4.167,5H17.5C17.958,5 18.333,4.625 18.333,4.167C18.333,3.708 17.958,3.333 17.5,3.333H3.333C2.417,3.333 1.667,4.083 1.667,5V14.167H1.25C0.558,14.167 0,14.725 0,15.417C0,16.108 0.558,16.667 1.25,16.667H11.667V14.167H3.333V5.833ZM19.167,6.667H14.167C13.708,6.667 13.333,7.042 13.333,7.5V15.833C13.333,16.292 13.708,16.667 14.167,16.667H19.167C19.625,16.667 20,16.292 20,15.833V7.5C20,7.042 19.625,6.667 19.167,6.667ZM18.333,14.167H15V8.333H18.333V14.167Z"
-        android:fillColor="@android:color/white"/>
-  </group>
-</vector>
diff --git a/features/signedout/impl/src/main/res/drawable/ic_do_disturb_alt.xml b/libraries/designsystem/src/main/res/drawable/ic_do_disturb_alt.xml
similarity index 100%
rename from features/signedout/impl/src/main/res/drawable/ic_do_disturb_alt.xml
rename to libraries/designsystem/src/main/res/drawable/ic_do_disturb_alt.xml
diff --git a/features/signedout/impl/src/main/res/drawable/ic_lock_outline.xml b/libraries/designsystem/src/main/res/drawable/ic_lock_outline.xml
similarity index 100%
rename from features/signedout/impl/src/main/res/drawable/ic_lock_outline.xml
rename to libraries/designsystem/src/main/res/drawable/ic_lock_outline.xml