From 8c13d9e7e1e155c9de66bdac8b59282cee2820bc Mon Sep 17 00:00:00 2001 From: Danil Nikolaev Date: Sat, 24 Jan 2026 16:02:02 +0300 Subject: [PATCH] update some icons --- .../dev/meloda/fast/ui/model/vk/ConvoOption.kt | 12 ++++++------ .../main/res/drawable/ic_archive_fill_round_24.xml | 9 +++++++++ .../ui/src/main/res/drawable/ic_archive_round_24.xml | 9 +++++++++ .../main/res/drawable/ic_delete_fill_round_24.xml | 9 +++++++++ core/ui/src/main/res/drawable/ic_delete_round_24.xml | 9 +++++++++ .../src/main/res/drawable/ic_done_all_round_24.xml | 9 +++++++++ .../src/main/res/drawable/ic_keep_fill_round_24.xml | 10 ++++++++++ .../main/res/drawable/ic_keep_off_fill_round_24.xml | 9 +++++++++ .../src/main/res/drawable/ic_keep_off_round_24.xml | 9 +++++++++ core/ui/src/main/res/drawable/ic_keep_round_24.xml | 9 +++++++++ .../src/main/res/drawable/ic_round_push_pin_24.xml | 10 ---------- .../main/res/drawable/ic_unarchive_fill_round_24.xml | 9 +++++++++ .../src/main/res/drawable/ic_unarchive_round_24.xml | 9 +++++++++ core/ui/src/main/res/drawable/outline_archive_24.xml | 11 ----------- .../src/main/res/drawable/outline_unarchive_24.xml | 11 ----------- core/ui/src/main/res/drawable/pin_off_outline_24.xml | 10 ---------- core/ui/src/main/res/drawable/pin_outline_24.xml | 10 ---------- .../main/res/drawable/round_delete_outline_24.xml | 9 --------- core/ui/src/main/res/drawable/round_done_all_24.xml | 9 --------- .../meloda/fast/convos/presentation/ConvosScreen.kt | 2 +- .../fast/messageshistory/model/MessageOption.kt | 6 +++--- .../fast/messageshistory/presentation/DateStatus.kt | 4 ++-- .../fast/messageshistory/presentation/InputBar.kt | 2 +- .../presentation/MessagesHistoryTopBar.kt | 2 +- .../presentation/PinnedMessageContainer.kt | 2 +- 25 files changed, 115 insertions(+), 85 deletions(-) create mode 100644 core/ui/src/main/res/drawable/ic_archive_fill_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_archive_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_delete_fill_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_delete_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_done_all_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_keep_fill_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_keep_off_fill_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_keep_off_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_keep_round_24.xml delete mode 100644 core/ui/src/main/res/drawable/ic_round_push_pin_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_unarchive_fill_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_unarchive_round_24.xml delete mode 100644 core/ui/src/main/res/drawable/outline_archive_24.xml delete mode 100644 core/ui/src/main/res/drawable/outline_unarchive_24.xml delete mode 100644 core/ui/src/main/res/drawable/pin_off_outline_24.xml delete mode 100644 core/ui/src/main/res/drawable/pin_outline_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_delete_outline_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_done_all_24.xml diff --git a/core/ui/src/main/kotlin/dev/meloda/fast/ui/model/vk/ConvoOption.kt b/core/ui/src/main/kotlin/dev/meloda/fast/ui/model/vk/ConvoOption.kt index fcedd14c..89169e26 100644 --- a/core/ui/src/main/kotlin/dev/meloda/fast/ui/model/vk/ConvoOption.kt +++ b/core/ui/src/main/kotlin/dev/meloda/fast/ui/model/vk/ConvoOption.kt @@ -11,31 +11,31 @@ sealed class ConvoOption( data object MarkAsRead : ConvoOption( title = UiText.Resource(R.string.action_mark_as_read), - icon = UiImage.Resource(R.drawable.round_done_all_24) + icon = UiImage.Resource(R.drawable.ic_done_all_round_24) ) data object Pin : ConvoOption( title = UiText.Resource(R.string.action_pin), - icon = UiImage.Resource(R.drawable.pin_outline_24) + icon = UiImage.Resource(R.drawable.ic_keep_round_24) ) data object Unpin : ConvoOption( title = UiText.Resource(R.string.action_unpin), - icon = UiImage.Resource(R.drawable.pin_off_outline_24) + icon = UiImage.Resource(R.drawable.ic_keep_off_round_24) ) data object Delete : ConvoOption( title = UiText.Resource(R.string.action_delete), - icon = UiImage.Resource(R.drawable.round_delete_outline_24) + icon = UiImage.Resource(R.drawable.ic_delete_round_24) ) data object Archive : ConvoOption( title = UiText.Resource(R.string.convo_context_action_archive), - icon = UiImage.Resource(R.drawable.outline_archive_24) + icon = UiImage.Resource(R.drawable.ic_archive_round_24) ) data object Unarchive : ConvoOption( title = UiText.Resource(R.string.convo_context_action_unarchive), - icon = UiImage.Resource(R.drawable.outline_unarchive_24) + icon = UiImage.Resource(R.drawable.ic_unarchive_round_24) ) } diff --git a/core/ui/src/main/res/drawable/ic_archive_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_archive_fill_round_24.xml new file mode 100644 index 00000000..4a2c6d18 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_archive_fill_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_archive_round_24.xml b/core/ui/src/main/res/drawable/ic_archive_round_24.xml new file mode 100644 index 00000000..192c1f60 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_archive_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_delete_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_delete_fill_round_24.xml new file mode 100644 index 00000000..4b537a42 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_delete_fill_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_delete_round_24.xml b/core/ui/src/main/res/drawable/ic_delete_round_24.xml new file mode 100644 index 00000000..13ec2291 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_delete_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_done_all_round_24.xml b/core/ui/src/main/res/drawable/ic_done_all_round_24.xml new file mode 100644 index 00000000..451fca14 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_done_all_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_keep_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_keep_fill_round_24.xml new file mode 100644 index 00000000..2b2c7b5b --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_keep_fill_round_24.xml @@ -0,0 +1,10 @@ + + + + diff --git a/core/ui/src/main/res/drawable/ic_keep_off_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_keep_off_fill_round_24.xml new file mode 100644 index 00000000..f27b8fe9 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_keep_off_fill_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_keep_off_round_24.xml b/core/ui/src/main/res/drawable/ic_keep_off_round_24.xml new file mode 100644 index 00000000..9eb541de --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_keep_off_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_keep_round_24.xml b/core/ui/src/main/res/drawable/ic_keep_round_24.xml new file mode 100644 index 00000000..e5cd7e53 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_keep_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_round_push_pin_24.xml b/core/ui/src/main/res/drawable/ic_round_push_pin_24.xml deleted file mode 100644 index 0f69fced..00000000 --- a/core/ui/src/main/res/drawable/ic_round_push_pin_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/core/ui/src/main/res/drawable/ic_unarchive_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_unarchive_fill_round_24.xml new file mode 100644 index 00000000..3a8f0a58 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_unarchive_fill_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_unarchive_round_24.xml b/core/ui/src/main/res/drawable/ic_unarchive_round_24.xml new file mode 100644 index 00000000..67d7987a --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_unarchive_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/outline_archive_24.xml b/core/ui/src/main/res/drawable/outline_archive_24.xml deleted file mode 100644 index 6fec2e7d..00000000 --- a/core/ui/src/main/res/drawable/outline_archive_24.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/outline_unarchive_24.xml b/core/ui/src/main/res/drawable/outline_unarchive_24.xml deleted file mode 100644 index a0d2b11c..00000000 --- a/core/ui/src/main/res/drawable/outline_unarchive_24.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/pin_off_outline_24.xml b/core/ui/src/main/res/drawable/pin_off_outline_24.xml deleted file mode 100644 index d5e30001..00000000 --- a/core/ui/src/main/res/drawable/pin_off_outline_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/core/ui/src/main/res/drawable/pin_outline_24.xml b/core/ui/src/main/res/drawable/pin_outline_24.xml deleted file mode 100644 index 9ba2578c..00000000 --- a/core/ui/src/main/res/drawable/pin_outline_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/core/ui/src/main/res/drawable/round_delete_outline_24.xml b/core/ui/src/main/res/drawable/round_delete_outline_24.xml deleted file mode 100644 index 606642f7..00000000 --- a/core/ui/src/main/res/drawable/round_delete_outline_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/core/ui/src/main/res/drawable/round_done_all_24.xml b/core/ui/src/main/res/drawable/round_done_all_24.xml deleted file mode 100644 index 9ae31682..00000000 --- a/core/ui/src/main/res/drawable/round_done_all_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvosScreen.kt b/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvosScreen.kt index 647f0d34..2cdea729 100644 --- a/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvosScreen.kt +++ b/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvosScreen.kt @@ -204,7 +204,7 @@ fun ConvosScreen( if (!screenState.isArchive) { IconButton(onClick = onArchiveActionClicked) { Icon( - painter = painterResource(R.drawable.outline_archive_24), + painter = painterResource(R.drawable.ic_archive_round_24), contentDescription = null ) } diff --git a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/model/MessageOption.kt b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/model/MessageOption.kt index b8374345..a341d281 100644 --- a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/model/MessageOption.kt +++ b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/model/MessageOption.kt @@ -34,12 +34,12 @@ sealed class MessageOption( data object Pin : MessageOption( titleResId = R.string.message_context_action_pin, - iconResId = R.drawable.pin_outline_24 + iconResId = R.drawable.ic_keep_round_24 ) data object Unpin : MessageOption( titleResId = R.string.message_context_action_unpin, - iconResId = R.drawable.pin_off_outline_24 + iconResId = R.drawable.ic_keep_off_round_24 ) data object Read : MessageOption( @@ -79,6 +79,6 @@ sealed class MessageOption( data object Delete : MessageOption( titleResId = R.string.message_context_action_delete, - iconResId = R.drawable.round_delete_outline_24 + iconResId = R.drawable.ic_delete_round_24 ) } diff --git a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/DateStatus.kt b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/DateStatus.kt index 3a88a680..16e31ea8 100644 --- a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/DateStatus.kt +++ b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/DateStatus.kt @@ -54,7 +54,7 @@ fun BoxScope.DateStatus( if (isPinned) { Spacer(modifier = Modifier.width(4.dp)) Icon( - painter = painterResource(R.drawable.ic_round_push_pin_24), + painter = painterResource(R.drawable.ic_keep_fill_round_24), contentDescription = null, modifier = Modifier .size(14.dp) @@ -85,7 +85,7 @@ fun BoxScope.DateStatus( when (sendingStatus) { SendingStatus.SENDING -> R.drawable.round_access_time_24 SendingStatus.SENT -> { - if (isRead) R.drawable.round_done_all_24 + if (isRead) R.drawable.ic_done_all_round_24 else R.drawable.ic_round_done_24 } diff --git a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/InputBar.kt b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/InputBar.kt index 2d467760..5fdf622d 100644 --- a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/InputBar.kt +++ b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/InputBar.kt @@ -324,7 +324,7 @@ fun InputBar( Icon( painter = painterResource( id = when (actionMode) { - ActionMode.DELETE -> R.drawable.round_delete_outline_24 + ActionMode.DELETE -> R.drawable.ic_delete_round_24 ActionMode.EDIT -> R.drawable.ic_round_done_24 ActionMode.RECORD_AUDIO -> R.drawable.ic_round_mic_none_24 ActionMode.RECORD_VIDEO -> R.drawable.rounded_photo_camera_24 diff --git a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessagesHistoryTopBar.kt b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessagesHistoryTopBar.kt index 887717e3..d27f4952 100644 --- a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessagesHistoryTopBar.kt +++ b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessagesHistoryTopBar.kt @@ -212,7 +212,7 @@ fun MessagesHistoryTopBar( } IconButton(onClick = onDeleteSelectedButtonClicked) { Icon( - painter = painterResource(R.drawable.round_delete_outline_24), + painter = painterResource(R.drawable.ic_delete_round_24), contentDescription = null ) } diff --git a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/PinnedMessageContainer.kt b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/PinnedMessageContainer.kt index 9206e840..6279b1b9 100644 --- a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/PinnedMessageContainer.kt +++ b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/PinnedMessageContainer.kt @@ -52,7 +52,7 @@ fun PinnedMessageContainer( horizontalArrangement = Arrangement.spacedBy(12.dp) ) { Icon( - painter = painterResource(R.drawable.ic_round_push_pin_24), + painter = painterResource(R.drawable.ic_keep_fill_round_24), contentDescription = null, modifier = Modifier .rotate(45f)