From 39298a22f3e32691ce03750c2ac5a78790a165e8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 19 Dec 2023 18:13:43 +0100
Subject: [PATCH] Use VideoCallSolid and also delete local ic_video_call.xml
 icon.

---
 .../features/messages/impl/MessagesView.kt    |  8 +++---
 .../messagecomposer/AttachmentsBottomSheet.kt |  4 +--
 .../impl/components/RoomSummaryRow.kt         |  2 +-
 .../libraries/designsystem/icons/IconsList.kt |  1 -
 .../src/main/res/drawable/ic_video_call.xml   | 25 -------------------
 5 files changed, 8 insertions(+), 32 deletions(-)
 delete mode 100644 libraries/designsystem/src/main/res/drawable/ic_video_call.xml

diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
index 3a26079a3d..dd728aa274 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
@@ -91,7 +91,6 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
-import io.element.android.libraries.designsystem.icons.CompoundDrawables
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.BottomSheetDragHandle
@@ -479,7 +478,10 @@ private fun MessagesViewTopBar(
                 JoinCallMenuItem(onJoinCallClicked = onJoinCallClicked)
             } else {
                 IconButton(onClick = onJoinCallClicked, enabled = callState != RoomCallState.DISABLED) {
-                    Icon(CompoundIcons.VideoCall, contentDescription = stringResource(CommonStrings.a11y_start_call))
+                    Icon(
+                        imageVector = CompoundIcons.VideoCallSolid,
+                        contentDescription = stringResource(CommonStrings.a11y_start_call),
+                    )
                 }
             }
             Spacer(Modifier.width(8.dp))
@@ -504,7 +506,7 @@ private fun JoinCallMenuItem(
     ) {
         Icon(
             modifier = Modifier.size(20.dp),
-            resourceId = CompoundDrawables.ic_video_call,
+            imageVector = CompoundIcons.VideoCallSolid,
             contentDescription = null
         )
         Spacer(Modifier.width(8.dp))
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/AttachmentsBottomSheet.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/AttachmentsBottomSheet.kt
index 0566f85c25..b3b53db013 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/AttachmentsBottomSheet.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/AttachmentsBottomSheet.kt
@@ -128,7 +128,7 @@ private fun AttachmentSourcePickerMenu(
         )
         ListItem(
             modifier = Modifier.clickable { state.eventSink(MessageComposerEvents.PickAttachmentSource.VideoFromCamera) },
-            leadingContent = ListItemContent.Icon(IconSource.Resource(CommonDrawables.ic_video_call)),
+            leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.VideoCall)),
             headlineContent = { Text(stringResource(R.string.screen_room_attachment_source_camera_video)) },
             style = ListItemStyle.Primary,
         )
@@ -138,7 +138,7 @@ private fun AttachmentSourcePickerMenu(
                     state.eventSink(MessageComposerEvents.PickAttachmentSource.Location)
                     onSendLocationClicked()
                 },
-                leadingContent = ListItemContent.Icon(IconSource.Resource(CommonDrawables.ic_location_pin) ),
+                leadingContent = ListItemContent.Icon(IconSource.Resource(CommonDrawables.ic_location_pin)),
                 headlineContent = { Text(stringResource(R.string.screen_room_attachment_source_location)) },
                 style = ListItemStyle.Primary,
             )
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt
index c73addca05..effea847d0 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt
@@ -176,7 +176,7 @@ private fun RowScope.LastMessageAndIndicatorRow(room: RoomListRoomSummary) {
         if (room.hasOngoingCall) {
             Icon(
                 modifier = Modifier.size(16.dp),
-                imageVector = CompoundIcons.VideoCall,
+                imageVector = CompoundIcons.VideoCallSolid,
                 contentDescription = null,
                 tint = ElementTheme.colors.unreadIndicator,
             )
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 c5b20dd874..8585ad9339 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
@@ -54,6 +54,5 @@ internal val iconsOther = listOf(
     R.drawable.ic_underline,
     R.drawable.ic_user,
     R.drawable.ic_user_add,
-    R.drawable.ic_video_call,
     R.drawable.ic_waiting_to_decrypt,
 )
diff --git a/libraries/designsystem/src/main/res/drawable/ic_video_call.xml b/libraries/designsystem/src/main/res/drawable/ic_video_call.xml
deleted file mode 100644
index cd184f9448..0000000000
--- a/libraries/designsystem/src/main/res/drawable/ic_video_call.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="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M2,8C2,5.791 3.791,4 6,4H16C17.105,4 18,4.895 18,6V10.286L21.349,7.415C21.998,6.859 23,7.32 23,8.174V15.826C23,16.68 21.998,17.141 21.349,16.585L18,13.714V18C18,19.105 17.105,20 16,20H6C3.791,20 2,18.209 2,16V8ZM6,6C4.895,6 4,6.895 4,8V16C4,17.105 4.895,18 6,18H16V6H6ZM21,13.652V10.349L19.073,12L21,13.652Z"
-      android:fillColor="@android:color/white"/>
-</vector>