From c652606f568ff2def7521be2f328ee77e100ae14 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 20 Sep 2023 11:45:15 +0200 Subject: [PATCH] Remove VectorIcons object, inline the values. --- .../impl/root/CreateRoomRootView.kt | 6 +-- .../actionlist/model/TimelineItemAction.kt | 20 ++++---- .../components/ReplySwipeIndicator.kt | 4 +- .../components/TimelineItemEventRow.kt | 8 ++- .../features/poll/api/PollContentView.kt | 6 +-- .../poll/impl/create/CreatePollView.kt | 4 +- .../roomlist/impl/RoomListContextMenu.kt | 4 +- .../impl/components/RoomSummaryRow.kt | 6 +-- .../libraries/designsystem/VectorIcons.kt | 49 ------------------- .../libraries/textcomposer/TextComposer.kt | 32 ++++++------ .../components/FormattingOption.kt | 8 +-- 11 files changed, 51 insertions(+), 96 deletions(-) delete mode 100644 libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.kt 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 3bea37300c..5ae4c4d896 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 @@ -41,7 +41,6 @@ import androidx.compose.ui.unit.dp import io.element.android.features.createroom.impl.R import io.element.android.features.createroom.impl.components.UserListView import io.element.android.libraries.architecture.Async -import io.element.android.libraries.designsystem.VectorIcons import io.element.android.libraries.designsystem.components.ProgressDialog import io.element.android.libraries.designsystem.components.dialogs.RetryDialog import io.element.android.libraries.designsystem.preview.DayNightPreviews @@ -52,6 +51,7 @@ import io.element.android.libraries.designsystem.theme.components.IconButton import io.element.android.libraries.designsystem.theme.components.Scaffold import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.theme.components.TopAppBar +import io.element.android.libraries.designsystem.utils.CommonDrawables import io.element.android.libraries.matrix.api.core.RoomId import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.ui.strings.CommonStrings @@ -161,12 +161,12 @@ fun CreateRoomActionButtonsList( ) { Column(modifier = modifier) { CreateRoomActionButton( - iconRes = VectorIcons.Groups, + iconRes = CommonDrawables.ic_groups, text = stringResource(id = R.string.screen_create_room_action_create_room), onClick = onNewRoomClicked, ) CreateRoomActionButton( - iconRes = VectorIcons.Share, + iconRes = CommonDrawables.ic_share, text = stringResource(id = CommonStrings.action_invite_friends_to_app, state.applicationName), onClick = onInvitePeopleClicked, ) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemAction.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemAction.kt index 948c0b0cb1..23d99ed192 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemAction.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemAction.kt @@ -19,7 +19,7 @@ package io.element.android.features.messages.impl.actionlist.model import androidx.annotation.DrawableRes import androidx.annotation.StringRes import androidx.compose.runtime.Immutable -import io.element.android.libraries.designsystem.VectorIcons +import io.element.android.libraries.designsystem.utils.CommonDrawables import io.element.android.libraries.ui.strings.CommonStrings @Immutable @@ -28,13 +28,13 @@ sealed class TimelineItemAction( @DrawableRes val icon: Int, val destructive: Boolean = false ) { - data object Forward : TimelineItemAction(CommonStrings.action_forward, VectorIcons.Forward) - data object Copy : TimelineItemAction(CommonStrings.action_copy, VectorIcons.Copy) - data object Redact : TimelineItemAction(CommonStrings.action_remove, VectorIcons.Delete, destructive = true) - data object Reply : TimelineItemAction(CommonStrings.action_reply, VectorIcons.Reply) - data object ReplyInThread : TimelineItemAction(CommonStrings.action_reply_in_thread, VectorIcons.Reply) - data object Edit : TimelineItemAction(CommonStrings.action_edit, VectorIcons.Edit) - data object ViewSource : TimelineItemAction(CommonStrings.action_view_source, VectorIcons.DeveloperMode) - data object ReportContent : TimelineItemAction(CommonStrings.action_report_content, VectorIcons.ReportContent, destructive = true) - data object EndPoll : TimelineItemAction(CommonStrings.action_end_poll, VectorIcons.PollEnd) + data object Forward : TimelineItemAction(CommonStrings.action_forward, CommonDrawables.ic_forward) + data object Copy : TimelineItemAction(CommonStrings.action_copy, CommonDrawables.ic_content_copy) + data object Redact : TimelineItemAction(CommonStrings.action_remove, CommonDrawables.ic_delete, destructive = true) + data object Reply : TimelineItemAction(CommonStrings.action_reply, CommonDrawables.ic_reply) + data object ReplyInThread : TimelineItemAction(CommonStrings.action_reply_in_thread, CommonDrawables.ic_reply) + data object Edit : TimelineItemAction(CommonStrings.action_edit, CommonDrawables.ic_edit) + data object ViewSource : TimelineItemAction(CommonStrings.action_view_source, CommonDrawables.ic_developer_mode) + data object ReportContent : TimelineItemAction(CommonStrings.action_report_content, CommonDrawables.ic_report_content, destructive = true) + data object EndPoll : TimelineItemAction(CommonStrings.action_end_poll, CommonDrawables.ic_poll_end) } diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ReplySwipeIndicator.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ReplySwipeIndicator.kt index ba061a7918..48523ebc44 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ReplySwipeIndicator.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ReplySwipeIndicator.kt @@ -25,10 +25,10 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.unit.dp -import io.element.android.libraries.designsystem.VectorIcons import io.element.android.libraries.designsystem.preview.DayNightPreviews import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.theme.components.Icon +import io.element.android.libraries.designsystem.utils.CommonDrawables /** * A swipe indicator that appears when swiping to reply to a message. @@ -49,7 +49,7 @@ fun RowScope.ReplySwipeIndicator( alpha = swipeProgress() }, contentDescription = null, - resourceId = VectorIcons.Reply, + resourceId = CommonDrawables.ic_reply, ) } 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 6f51ec8ac7..c6878d3b35 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 @@ -76,7 +76,6 @@ import io.element.android.features.messages.impl.timeline.model.event.TimelineIt import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemImageContent import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemPollContent import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemTextContent -import io.element.android.libraries.designsystem.VectorIcons import io.element.android.libraries.designsystem.colors.AvatarColorsProvider import io.element.android.libraries.designsystem.components.EqualWidthColumn import io.element.android.libraries.designsystem.components.avatar.Avatar @@ -89,6 +88,7 @@ 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.timeline.item.event.AudioMessageType @@ -403,7 +403,11 @@ private fun MessageEventBubbleContent( horizontalArrangement = spacedBy(4.dp, Alignment.Start), verticalAlignment = Alignment.CenterVertically, ) { - Icon(resourceId = VectorIcons.ThreadDecoration, contentDescription = null, tint = ElementTheme.colors.iconSecondary) + Icon( + resourceId = CommonDrawables.ic_thread_decoration, + contentDescription = null, + tint = ElementTheme.colors.iconSecondary, + ) Text( text = stringResource(CommonStrings.common_thread), style = ElementTheme.typography.fontBodyXsRegular, 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 a47d69c780..9a3b91b6bc 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 @@ -32,11 +32,11 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.Role import androidx.compose.ui.unit.dp -import io.element.android.libraries.designsystem.VectorIcons import io.element.android.libraries.designsystem.preview.DayNightPreviews import io.element.android.libraries.designsystem.preview.ElementPreview 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.poll.PollAnswer import io.element.android.libraries.matrix.api.poll.PollKind @@ -87,13 +87,13 @@ private fun PollTitle( ) { if (isPollEnded) { Icon( - resourceId = VectorIcons.PollEnd, + resourceId = CommonDrawables.ic_poll_end, contentDescription = stringResource(id = CommonStrings.a11y_poll_end), modifier = Modifier.size(22.dp) ) } else { Icon( - resourceId = VectorIcons.Poll, + resourceId = CommonDrawables.ic_poll, 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 0355b34375..9036fff083 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 @@ -44,7 +44,6 @@ import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp import io.element.android.features.poll.impl.R -import io.element.android.libraries.designsystem.VectorIcons import io.element.android.libraries.designsystem.components.button.BackButton import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog import io.element.android.libraries.designsystem.components.list.ListItemContent @@ -61,6 +60,7 @@ import io.element.android.libraries.designsystem.theme.components.Scaffold import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.theme.components.TextButton import io.element.android.libraries.designsystem.theme.components.TopAppBar +import io.element.android.libraries.designsystem.utils.CommonDrawables import io.element.android.libraries.matrix.api.poll.PollKind import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.ui.strings.CommonStrings @@ -165,7 +165,7 @@ fun CreatePollView( }, trailingContent = ListItemContent.Custom { Icon( - resourceId = VectorIcons.Delete, + resourceId = CommonDrawables.ic_delete, contentDescription = null, modifier = Modifier.clickable(answer.canDelete) { state.eventSink(CreatePollEvents.RemoveAnswer(index)) diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenu.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenu.kt index 32acdeb6f1..bc076759d7 100644 --- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenu.kt +++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenu.kt @@ -31,12 +31,12 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import io.element.android.libraries.designsystem.VectorIcons import io.element.android.libraries.designsystem.preview.DayNightPreviews import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.designsystem.theme.components.ModalBottomSheet 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.RoomId import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.ui.strings.CommonStrings @@ -110,7 +110,7 @@ private fun RoomListModalBottomSheetContent( modifier = Modifier.clickable { onLeaveRoomClicked(contextMenu.roomId) }, leadingContent = { Icon( - resourceId = VectorIcons.DoorOpen, + resourceId = CommonDrawables.ic_door_open_24, contentDescription = stringResource(id = CommonStrings.action_leave_room), modifier = Modifier.size(20.dp), tint = MaterialTheme.colorScheme.error, 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 6e9df51a44..07e302ed06 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 @@ -44,7 +44,6 @@ import androidx.compose.ui.unit.dp import io.element.android.features.roomlist.impl.model.RoomListRoomSummary import io.element.android.features.roomlist.impl.model.RoomListRoomSummaryProvider import io.element.android.libraries.core.extensions.orEmpty -import io.element.android.libraries.designsystem.VectorIcons import io.element.android.libraries.designsystem.atomic.atoms.UnreadIndicatorAtom import io.element.android.libraries.designsystem.components.avatar.Avatar import io.element.android.libraries.designsystem.preview.DayNightPreviews @@ -55,6 +54,7 @@ import io.element.android.libraries.designsystem.theme.roomListRoomMessage import io.element.android.libraries.designsystem.theme.roomListRoomMessageDate import io.element.android.libraries.designsystem.theme.roomListRoomName import io.element.android.libraries.designsystem.theme.unreadIndicator +import io.element.android.libraries.designsystem.utils.CommonDrawables import io.element.android.libraries.matrix.api.room.RoomNotificationMode import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.ui.strings.CommonStrings @@ -191,13 +191,13 @@ private fun NotificationIcon(room: RoomListRoomSummary) { RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY -> Icon( contentDescription = stringResource(CommonStrings.screen_notification_settings_mode_mentions), - imageVector = ImageVector.vectorResource(VectorIcons.Mention), + imageVector = ImageVector.vectorResource(CommonDrawables.ic_mention), tint = tint, ) RoomNotificationMode.MUTE -> Icon( contentDescription = stringResource(CommonStrings.common_mute), - imageVector = ImageVector.vectorResource(VectorIcons.Mute), + imageVector = ImageVector.vectorResource(CommonDrawables.ic_mute), tint = tint, ) } diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.kt deleted file mode 100644 index 919c505439..0000000000 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/VectorIcons.kt +++ /dev/null @@ -1,49 +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. - */ - -package io.element.android.libraries.designsystem - -object VectorIcons { - val Copy = R.drawable.ic_content_copy - val Forward = R.drawable.ic_forward - val Delete = R.drawable.ic_delete - val Reply = R.drawable.ic_reply - val Edit = R.drawable.ic_edit - val DoorOpen = R.drawable.ic_door_open_24 - val DeveloperMode = R.drawable.ic_developer_mode - val ReportContent = R.drawable.ic_report_content - val Groups = R.drawable.ic_groups - val Share = R.drawable.ic_share - val Poll = R.drawable.ic_poll - val PollEnd = R.drawable.ic_poll_end - val Bold = R.drawable.ic_bold - val BulletList = R.drawable.ic_bullet_list - val CodeBlock = R.drawable.ic_code_block - val IndentIncrease = R.drawable.ic_indent_increase - val IndentDecrease = R.drawable.ic_indent_decrease - val InlineCode = R.drawable.ic_inline_code - val Italic = R.drawable.ic_italic - val Link = R.drawable.ic_link - val NumberedList = R.drawable.ic_numbered_list - val Quote = R.drawable.ic_quote - val Strikethrough = R.drawable.ic_strikethrough - val Underline = R.drawable.ic_underline - val Mention = R.drawable.ic_mention - val Mute = R.drawable.ic_mute - val ThreadDecoration = R.drawable.ic_thread_decoration - val Plus = R.drawable.ic_plus - val Cancel = R.drawable.ic_cancel -} 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 cf30a3600f..9c9fdb047a 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 @@ -61,13 +61,13 @@ import androidx.compose.ui.unit.dp import androidx.constraintlayout.compose.ConstraintLayout import androidx.constraintlayout.compose.Dimension.Companion.fillToConstraints import androidx.constraintlayout.compose.Visibility -import io.element.android.libraries.designsystem.VectorIcons import io.element.android.libraries.designsystem.preview.DayNightPreviews import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.text.applyScaleUp import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.designsystem.theme.components.IconButton 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.TransactionId import io.element.android.libraries.matrix.api.media.MediaSource @@ -137,7 +137,7 @@ fun TextComposer( ) { Icon( modifier = Modifier.size(30.dp.applyScaleUp()), - resourceId = VectorIcons.Plus, + resourceId = CommonDrawables.ic_plus, contentDescription = stringResource(R.string.rich_text_editor_a11y_add_attachment), tint = ElementTheme.colors.iconPrimary, ) @@ -316,7 +316,7 @@ private fun TextFormatting( ) { Icon( modifier = Modifier.size(30.dp.applyScaleUp()), - resourceId = VectorIcons.Cancel, + resourceId = CommonDrawables.ic_cancel, contentDescription = stringResource(CommonStrings.action_close), tint = ElementTheme.colors.iconPrimary, ) @@ -339,25 +339,25 @@ private fun TextFormatting( FormattingOption( state = state.actions[ComposerAction.BOLD].toButtonState(), onClick = { state.toggleInlineFormat(InlineFormat.Bold) }, - imageVector = ImageVector.vectorResource(VectorIcons.Bold), + imageVector = ImageVector.vectorResource(CommonDrawables.ic_bold), contentDescription = stringResource(R.string.rich_text_editor_format_bold) ) FormattingOption( state = state.actions[ComposerAction.ITALIC].toButtonState(), onClick = { state.toggleInlineFormat(InlineFormat.Italic) }, - imageVector = ImageVector.vectorResource(VectorIcons.Italic), + imageVector = ImageVector.vectorResource(CommonDrawables.ic_italic), contentDescription = stringResource(R.string.rich_text_editor_format_italic) ) FormattingOption( state = state.actions[ComposerAction.UNDERLINE].toButtonState(), onClick = { state.toggleInlineFormat(InlineFormat.Underline) }, - imageVector = ImageVector.vectorResource(VectorIcons.Underline), + imageVector = ImageVector.vectorResource(CommonDrawables.ic_underline), contentDescription = stringResource(R.string.rich_text_editor_format_underline) ) FormattingOption( state = state.actions[ComposerAction.STRIKE_THROUGH].toButtonState(), onClick = { state.toggleInlineFormat(InlineFormat.StrikeThrough) }, - imageVector = ImageVector.vectorResource(VectorIcons.Strikethrough), + imageVector = ImageVector.vectorResource(CommonDrawables.ic_strikethrough), contentDescription = stringResource(R.string.rich_text_editor_format_strikethrough) ) @@ -376,50 +376,50 @@ private fun TextFormatting( FormattingOption( state = state.actions[ComposerAction.LINK].toButtonState(), onClick = { linkDialogAction = state.linkAction }, - imageVector = ImageVector.vectorResource(VectorIcons.Link), + imageVector = ImageVector.vectorResource(CommonDrawables.ic_link), contentDescription = stringResource(R.string.rich_text_editor_link) ) FormattingOption( state = state.actions[ComposerAction.UNORDERED_LIST].toButtonState(), onClick = { state.toggleList(ordered = false) }, - imageVector = ImageVector.vectorResource(VectorIcons.BulletList), + imageVector = ImageVector.vectorResource(CommonDrawables.ic_bullet_list), contentDescription = stringResource(R.string.rich_text_editor_bullet_list) ) FormattingOption( state = state.actions[ComposerAction.ORDERED_LIST].toButtonState(), onClick = { state.toggleList(ordered = true) }, - imageVector = ImageVector.vectorResource(VectorIcons.NumberedList), + imageVector = ImageVector.vectorResource(CommonDrawables.ic_numbered_list), contentDescription = stringResource(R.string.rich_text_editor_numbered_list) ) FormattingOption( state = state.actions[ComposerAction.INDENT].toButtonState(), onClick = { state.indent() }, - imageVector = ImageVector.vectorResource(VectorIcons.IndentIncrease), + imageVector = ImageVector.vectorResource(CommonDrawables.ic_indent_increase), contentDescription = stringResource(R.string.rich_text_editor_indent) ) FormattingOption( state = state.actions[ComposerAction.UNINDENT].toButtonState(), onClick = { state.unindent() }, - imageVector = ImageVector.vectorResource(VectorIcons.IndentDecrease), + imageVector = ImageVector.vectorResource(CommonDrawables.ic_indent_decrease), contentDescription = stringResource(R.string.rich_text_editor_unindent) ) FormattingOption( state = state.actions[ComposerAction.INLINE_CODE].toButtonState(), onClick = { state.toggleInlineFormat(InlineFormat.InlineCode) }, - imageVector = ImageVector.vectorResource(VectorIcons.InlineCode), + imageVector = ImageVector.vectorResource(CommonDrawables.ic_inline_code), contentDescription = stringResource(R.string.rich_text_editor_inline_code) ) FormattingOption( state = state.actions[ComposerAction.CODE_BLOCK].toButtonState(), onClick = { state.toggleCodeBlock() }, - imageVector = ImageVector.vectorResource(VectorIcons.CodeBlock), + imageVector = ImageVector.vectorResource(CommonDrawables.ic_code_block), contentDescription = stringResource(R.string.rich_text_editor_code_block) ) FormattingOption( state = state.actions[ComposerAction.QUOTE].toButtonState(), onClick = { state.toggleQuote() }, - imageVector = ImageVector.vectorResource(VectorIcons.Quote), + imageVector = ImageVector.vectorResource(CommonDrawables.ic_quote), contentDescription = stringResource(R.string.rich_text_editor_quote) ) } @@ -477,7 +477,7 @@ private fun EditingModeView( .padding(start = 12.dp) ) { Icon( - resourceId = VectorIcons.Edit, + resourceId = CommonDrawables.ic_edit, contentDescription = stringResource(CommonStrings.common_editing), tint = ElementTheme.materialColors.secondary, modifier = Modifier diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/FormattingOption.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/FormattingOption.kt index a3635b28c3..17ab1f5230 100644 --- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/FormattingOption.kt +++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/FormattingOption.kt @@ -32,12 +32,12 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.vectorResource import androidx.compose.ui.unit.dp -import io.element.android.libraries.designsystem.VectorIcons import io.element.android.libraries.designsystem.preview.DayNightPreviews import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.text.applyScaleUp import io.element.android.libraries.designsystem.theme.components.Icon import io.element.android.libraries.designsystem.theme.iconSuccessPrimaryBackground +import io.element.android.libraries.designsystem.utils.CommonDrawables import io.element.android.libraries.theme.ElementTheme import io.element.android.libraries.theme.compound.generated.SemanticColors @@ -96,19 +96,19 @@ internal fun FormattingButtonPreview() = ElementPreview { FormattingOption( state = FormattingOptionState.Default, onClick = { }, - imageVector = ImageVector.vectorResource(VectorIcons.Bold), + imageVector = ImageVector.vectorResource(CommonDrawables.ic_bold), contentDescription = "", ) FormattingOption( state = FormattingOptionState.Selected, onClick = { }, - imageVector = ImageVector.vectorResource(VectorIcons.Italic), + imageVector = ImageVector.vectorResource(CommonDrawables.ic_italic), contentDescription = "", ) FormattingOption( state = FormattingOptionState.Disabled, onClick = { }, - imageVector = ImageVector.vectorResource(VectorIcons.Underline), + imageVector = ImageVector.vectorResource(CommonDrawables.ic_underline), contentDescription = "", ) }