diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
index 1978c263cd..146815eb04 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
@@ -161,7 +161,7 @@ fun CreateRoomActionButtonsList(
onClick = onNewRoomClicked,
)
CreateRoomActionButton(
- iconRes = CommonDrawables.ic_share,
+ iconRes = CommonDrawables.ic_compound_share_android,
text = stringResource(id = CommonStrings.action_invite_friends_to_app, state.applicationName),
onClick = onInvitePeopleClicked,
)
diff --git a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/PollContentView.kt b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/PollContentView.kt
index 9a3b91b6bc..8e68c0a000 100644
--- a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/PollContentView.kt
+++ b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/PollContentView.kt
@@ -93,7 +93,7 @@ private fun PollTitle(
)
} else {
Icon(
- resourceId = CommonDrawables.ic_poll,
+ resourceId = CommonDrawables.ic_compound_polls,
contentDescription = stringResource(id = CommonStrings.a11y_poll),
modifier = Modifier.size(22.dp)
)
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollView.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollView.kt
index 9036fff083..8375ca38a4 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollView.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollView.kt
@@ -165,7 +165,7 @@ fun CreatePollView(
},
trailingContent = ListItemContent.Custom {
Icon(
- resourceId = CommonDrawables.ic_delete,
+ resourceId = CommonDrawables.ic_compound_delete,
contentDescription = null,
modifier = Modifier.clickable(answer.canDelete) {
state.eventSink(CreatePollEvents.RemoveAnswer(index))
diff --git a/features/roomdetails/impl/src/main/res/drawable/ic_door_open.xml b/features/roomdetails/impl/src/main/res/drawable/ic_door_open.xml
deleted file mode 100644
index 5247201807..0000000000
--- a/features/roomdetails/impl/src/main/res/drawable/ic_door_open.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
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 07e302ed06..bb72e92b90 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
@@ -28,6 +28,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
import androidx.compose.material.ripple.rememberRipple
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
@@ -190,14 +191,16 @@ private fun NotificationIcon(room: RoomListRoomSummary) {
null, RoomNotificationMode.ALL_MESSAGES -> return
RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY ->
Icon(
+ modifier = Modifier.size(16.dp),
contentDescription = stringResource(CommonStrings.screen_notification_settings_mode_mentions),
- imageVector = ImageVector.vectorResource(CommonDrawables.ic_mention),
+ imageVector = ImageVector.vectorResource(CommonDrawables.ic_compound_mention),
tint = tint,
)
RoomNotificationMode.MUTE ->
Icon(
+ modifier = Modifier.size(16.dp),
contentDescription = stringResource(CommonStrings.common_mute),
- imageVector = ImageVector.vectorResource(CommonDrawables.ic_mute),
+ imageVector = ImageVector.vectorResource(CommonDrawables.ic_compound_notifications_solid_off),
tint = tint,
)
}
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitleSubtitleMolecule.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitleSubtitleMolecule.kt
index 43b7c235f3..99f68e8c6f 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitleSubtitleMolecule.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/IconTitleSubtitleMolecule.kt
@@ -88,7 +88,7 @@ fun IconTitleSubtitleMolecule(
@Composable
internal fun IconTitleSubtitleMoleculePreview() = ElementPreview {
IconTitleSubtitleMolecule(
- iconResourceId = R.drawable.ic_edit,
+ iconResourceId = R.drawable.ic_compound_chat,
title = "Title",
subTitle = "Sub iitle",
)
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 8cbc9e9505..52773dc0ab 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
@@ -113,31 +113,20 @@ internal val iconsSeptember = listOf(
R.drawable.ic_september_view_source,
)
+// This list and all the drawable it contains should be removed at some point.
+// All the icons should be defined in Compound.
internal val iconsOther = listOf(
- R.drawable.ic_content_copy,
- R.drawable.ic_delete,
R.drawable.ic_developer_mode,
- R.drawable.ic_door_open_24,
- R.drawable.ic_edit,
- R.drawable.ic_edit_square,
- R.drawable.ic_forward,
R.drawable.ic_groups,
R.drawable.ic_indent_decrease,
R.drawable.ic_indent_increase,
R.drawable.ic_inline_code,
R.drawable.ic_italic,
R.drawable.ic_link,
- R.drawable.ic_mention,
- R.drawable.ic_mute,
R.drawable.ic_numbered_list,
R.drawable.ic_plus,
- R.drawable.ic_poll,
R.drawable.ic_poll_end,
R.drawable.ic_quote,
- R.drawable.ic_reply,
- R.drawable.ic_report_content,
- R.drawable.ic_search,
- R.drawable.ic_share,
R.drawable.ic_strikethrough,
R.drawable.ic_thread_decoration,
R.drawable.ic_underline,
diff --git a/libraries/designsystem/src/main/res/drawable/ic_content_copy.xml b/libraries/designsystem/src/main/res/drawable/ic_content_copy.xml
deleted file mode 100644
index 6baef28f55..0000000000
--- a/libraries/designsystem/src/main/res/drawable/ic_content_copy.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
diff --git a/libraries/designsystem/src/main/res/drawable/ic_delete.xml b/libraries/designsystem/src/main/res/drawable/ic_delete.xml
deleted file mode 100644
index d724c2e05f..0000000000
--- a/libraries/designsystem/src/main/res/drawable/ic_delete.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/libraries/designsystem/src/main/res/drawable/ic_door_open_24.xml b/libraries/designsystem/src/main/res/drawable/ic_door_open_24.xml
deleted file mode 100644
index dc10e22731..0000000000
--- a/libraries/designsystem/src/main/res/drawable/ic_door_open_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/libraries/designsystem/src/main/res/drawable/ic_edit.xml b/libraries/designsystem/src/main/res/drawable/ic_edit.xml
deleted file mode 100644
index f64fa2f5fb..0000000000
--- a/libraries/designsystem/src/main/res/drawable/ic_edit.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/libraries/designsystem/src/main/res/drawable/ic_edit_square.xml b/libraries/designsystem/src/main/res/drawable/ic_edit_square.xml
deleted file mode 100644
index 121486a4a2..0000000000
--- a/libraries/designsystem/src/main/res/drawable/ic_edit_square.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
diff --git a/libraries/designsystem/src/main/res/drawable/ic_forward.xml b/libraries/designsystem/src/main/res/drawable/ic_forward.xml
deleted file mode 100644
index 9608767c8d..0000000000
--- a/libraries/designsystem/src/main/res/drawable/ic_forward.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
diff --git a/libraries/designsystem/src/main/res/drawable/ic_mention.xml b/libraries/designsystem/src/main/res/drawable/ic_mention.xml
deleted file mode 100644
index ed1ca05d59..0000000000
--- a/libraries/designsystem/src/main/res/drawable/ic_mention.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
diff --git a/libraries/designsystem/src/main/res/drawable/ic_mute.xml b/libraries/designsystem/src/main/res/drawable/ic_mute.xml
deleted file mode 100644
index e7f29b72b5..0000000000
--- a/libraries/designsystem/src/main/res/drawable/ic_mute.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/libraries/designsystem/src/main/res/drawable/ic_poll.xml b/libraries/designsystem/src/main/res/drawable/ic_poll.xml
deleted file mode 100644
index 8e44350fd1..0000000000
--- a/libraries/designsystem/src/main/res/drawable/ic_poll.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/libraries/designsystem/src/main/res/drawable/ic_reply.xml b/libraries/designsystem/src/main/res/drawable/ic_reply.xml
deleted file mode 100644
index ac41dfaa55..0000000000
--- a/libraries/designsystem/src/main/res/drawable/ic_reply.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
diff --git a/libraries/designsystem/src/main/res/drawable/ic_report_content.xml b/libraries/designsystem/src/main/res/drawable/ic_report_content.xml
deleted file mode 100644
index 18c9c2f95e..0000000000
--- a/libraries/designsystem/src/main/res/drawable/ic_report_content.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/libraries/designsystem/src/main/res/drawable/ic_search.xml b/libraries/designsystem/src/main/res/drawable/ic_search.xml
deleted file mode 100644
index de51a40c31..0000000000
--- a/libraries/designsystem/src/main/res/drawable/ic_search.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
diff --git a/libraries/designsystem/src/main/res/drawable/ic_share.xml b/libraries/designsystem/src/main/res/drawable/ic_share.xml
deleted file mode 100644
index 450bc3375a..0000000000
--- a/libraries/designsystem/src/main/res/drawable/ic_share.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-