From 1638d70ef2a3169e78b309fac4160e98c653b62a Mon Sep 17 00:00:00 2001 From: Danil Nikolaev Date: Sat, 24 Jan 2026 21:36:41 +0300 Subject: [PATCH] update and refresh icons to Material Symbols; update MaterialDialog style --- .../dev/meloda/fast/navigation/MainGraph.kt | 12 +- .../meloda/fast/domain/util/ConvoMapper.kt | 71 ++-- .../meloda/fast/domain/util/ConvoUiMapper.kt | 2 +- .../meloda/fast/domain/util/MessageMapper.kt | 2 +- .../meloda/fast/ui/components/ErrorView.kt | 2 +- .../fast/ui/components/MaterialDialog.kt | 302 +++++++++++++----- .../meloda/fast/ui/extensions/Extensions.kt | 6 + .../dev/meloda/fast/ui/util/ImmutableList.kt | 2 + .../drawable/baseline_account_circle_24.xml | 11 - .../main/res/drawable/baseline_chat_24.xml | 12 - .../res/drawable/baseline_people_alt_24.xml | 27 -- .../res/drawable/ic_account_circle_cut.xml | 10 - .../ic_account_circle_fill_round_24.xml | 9 + .../drawable/ic_account_circle_round_24.xml | 10 + ...ck_24px.xml => ic_arrow_back_round_24.xml} | 10 +- .../ui/src/main/res/drawable/ic_arrow_end.xml | 9 - .../drawable/ic_arrow_forward_round_24.xml | 10 + .../res/drawable/ic_attach_file_round_24.xml | 9 + .../main/res/drawable/ic_attachment_audio.xml | 10 - .../main/res/drawable/ic_attachment_call.xml | 10 - .../main/res/drawable/ic_attachment_file.xml | 10 - .../ic_attachment_forwarded_message.xml | 9 - .../ic_attachment_forwarded_messages.xml | 10 - ...nt_gift.xml => ic_attachment_gift_old.xml} | 0 .../res/drawable/ic_attachment_graffiti.xml | 10 - .../res/drawable/ic_attachment_group_call.xml | 9 - .../main/res/drawable/ic_attachment_link.xml | 10 - .../res/drawable/ic_attachment_mini_app.xml | 10 - .../main/res/drawable/ic_attachment_photo.xml | 9 - .../main/res/drawable/ic_attachment_poll.xml | 10 - .../res/drawable/ic_attachment_sticker.xml | 10 - .../main/res/drawable/ic_attachment_story.xml | 9 - .../main/res/drawable/ic_attachment_video.xml | 10 - .../main/res/drawable/ic_attachment_voice.xml | 8 - .../main/res/drawable/ic_attachment_wall.xml | 10 - .../res/drawable/ic_attachment_wall_reply.xml | 10 - .../drawable/ic_baseline_attach_file_24.xml | 9 - .../res/drawable/ic_bookmark_round_24.xml | 9 + .../res/drawable/ic_brick_fill_round_24.xml | 9 + .../res/drawable/ic_cake_fill_round_24.xml | 9 + .../main/res/drawable/ic_call_round_24.xml | 9 + ...d_check_24px.xml => ic_check_round_24.xml} | 3 +- ...d_close_24px.xml => ic_close_round_24.xml} | 3 +- .../res/drawable/ic_comment_fill_round_24.xml | 10 + .../res/drawable/ic_content_copy_round_24.xml | 9 + .../res/drawable/ic_draft_fill_round_24.xml | 10 + ...und_edit_24px.xml => ic_edit_round_24.xml} | 2 - .../res/drawable/ic_error_fill_round_24.xml | 9 + .../main/res/drawable/ic_error_round_24.xml | 9 + .../res/drawable/ic_filter_list_round_24.xml | 9 + .../main/res/drawable/ic_forward_round_24.xml | 10 + .../drawable/ic_fragrance_fill_round_24.xml | 9 + .../res/drawable/ic_group_fill_round_24.xml | 9 + .../main/res/drawable/ic_group_round_24.xml | 9 + .../ic_history_toggle_off_round_24.xml | 9 + .../res/drawable/ic_image_fill_round_24.xml | 9 + ...round_info_24.xml => ic_info_round_24.xml} | 0 .../ic_insert_chart_fill_round_24.xml | 9 + ....xml => ic_keyboard_arrow_up_round_24.xml} | 3 +- .../res/drawable/ic_language_round_24.xml | 9 + .../res/drawable/ic_mail_fill_round_24.xml | 9 + ...und_mail_24px.xml => ic_mail_round_24.xml} | 3 +- .../res/drawable/ic_map_fill_round_24.xml | 9 + .../src/main/res/drawable/ic_map_marker.xml | 10 - .../res/drawable/ic_mic_fill_round_24.xml | 9 + .../src/main/res/drawable/ic_mic_round_24.xml | 9 + ...ert_24px.xml => ic_more_vert_round_24.xml} | 3 +- .../res/drawable/ic_music_note_round_24.xml | 9 + .../drawable/ic_outline_emoji_emotions_24.xml | 18 -- .../main/res/drawable/ic_pause_round_24.xml | 9 + .../ic_perm_phone_msg_fill_round_24.xml | 9 + .../main/res/drawable/ic_person_round_24.xml | 9 + ...ra_24.xml => ic_photo_camera_round_24.xml} | 6 +- .../drawable/ic_pin_drop_fill_round_24.xml | 9 + .../drawable/ic_play_arrow_fill_round_24.xml | 9 + .../main/res/drawable/ic_qr_code_round_24.xml | 9 + ...fresh_24px.xml => ic_refresh_round_24.xml} | 3 +- .../res/drawable/ic_reply_all_round_24.xml | 10 + .../main/res/drawable/ic_reply_round_24.xml | 10 + .../res/drawable/ic_report_off_round_24.xml | 9 + .../main/res/drawable/ic_report_round_24.xml | 9 + .../res/drawable/ic_restart_alt_round_24.xml | 9 + .../drawable/ic_round_bookmark_border_24.xml | 9 - .../main/res/drawable/ic_round_done_24.xml | 9 - .../res/drawable/ic_round_mic_none_24.xml | 9 - .../main/res/drawable/ic_round_person_24.xml | 9 - .../res/drawable/ic_schedule_round_24.xml | 9 + .../main/res/drawable/ic_send_round_24.xml | 10 + .../ic_sentiment_satisfied_round_24.xml | 9 + ...ings_24px.xml => ic_settings_round_24.xml} | 3 +- .../res/drawable/ic_sms_fill_round_24.xml | 9 + .../src/main/res/drawable/ic_sms_round_24.xml | 9 + .../main/res/drawable/ic_star_round_24.xml | 9 + .../res/drawable/ic_sticker_fill_round_24.xml | 9 + .../res/drawable/ic_video_fill_round_24.xml | 9 + .../drawable/ic_visibility_off_round_24.xml | 9 + .../res/drawable/ic_visibility_round_24.xml | 9 + .../main/res/drawable/ic_vpn_key_round_24.xml | 9 + .../res/drawable/ic_widgets_fill_round_24.xml | 9 + ...est_captcha.webp => img_test_captcha.webp} | Bin .../drawable/outline_account_circle_24.xml | 15 - .../src/main/res/drawable/outline_chat_24.xml | 12 - .../res/drawable/outline_people_alt_24.xml | 23 -- .../res/drawable/round_access_time_24.xml | 11 - .../res/drawable/round_attach_file_24.xml | 11 - .../src/main/res/drawable/round_cake_24.xml | 9 - .../res/drawable/round_content_copy_24.xml | 11 - .../src/main/res/drawable/round_create_24.xml | 11 - .../src/main/res/drawable/round_error_24.xml | 11 - .../res/drawable/round_error_outline_24.xml | 11 - .../drawable/round_fill_play_arrow_24px.xml | 11 - .../res/drawable/round_filter_list_24.xml | 11 - .../main/res/drawable/round_forward_24.xml | 12 - .../res/drawable/round_mark_email_read_24.xml | 11 - .../src/main/res/drawable/round_pause_24.xml | 5 - .../main/res/drawable/round_qr_code_24.xml | 39 --- .../src/main/res/drawable/round_reply_24.xml | 12 - .../main/res/drawable/round_reply_24px.xml | 11 - .../main/res/drawable/round_reply_all_24.xml | 12 - .../round_report_gmailerrorred_24.xml | 19 -- .../main/res/drawable/round_report_off_24.xml | 11 - .../res/drawable/round_restart_alt_24.xml | 12 - .../src/main/res/drawable/round_send_24.xml | 12 - .../ui/src/main/res/drawable/round_sms_24.xml | 9 - .../src/main/res/drawable/round_star_24.xml | 11 - .../res/drawable/round_star_outline_24.xml | 11 - .../res/drawable/round_visibility_24px.xml | 10 - .../res/drawable/round_visibility_off_24.xml | 9 - .../main/res/drawable/round_vpn_key_24.xml | 9 - .../captcha/presentation/CaptchaScreen.kt | 8 +- .../auth/login/presentation/LoginScreen.kt | 10 +- .../presentation/UserBannedScreen.kt | 2 +- .../presentation/ValidationScreen.kt | 10 +- .../presentation/ChatMaterialsScreen.kt | 2 +- .../materials/AudioMaterialsScreen.kt | 4 +- .../materials/FileMaterialsScreen.kt | 2 +- .../materials/LinkMaterialsScreen.kt | 2 +- .../materials/PhotoMaterialsScreen.kt | 2 +- .../materials/VideoMaterialsScreen.kt | 2 +- .../fast/convos/presentation/ConvoDialogs.kt | 25 +- .../fast/convos/presentation/ConvoItem.kt | 39 ++- .../fast/convos/presentation/ConvosList.kt | 2 +- .../fast/convos/presentation/ConvosRoute.kt | 1 - .../fast/convos/presentation/ConvosScreen.kt | 11 +- .../convos/presentation/CreateChatItem.kt | 4 +- .../convos/presentation/CreateChatList.kt | 2 +- .../convos/presentation/CreateChatScreen.kt | 4 +- .../fast/friends/presentation/FriendItem.kt | 6 +- .../fast/friends/presentation/FriendsList.kt | 2 +- .../friends/presentation/RootFriendsScreen.kt | 2 +- .../presentation/LanguagePickerScreen.kt | 4 +- .../messageshistory/model/MessageOption.kt | 22 +- .../presentation/DateStatus.kt | 10 +- .../messageshistory/presentation/InputBar.kt | 12 +- .../presentation/MessageBubbleIncoming.kt | 2 +- .../presentation/MessageBubbleOutgoing.kt | 2 +- .../presentation/MessagesHistoryDialogs.kt | 41 +-- .../presentation/MessagesHistoryTopBar.kt | 18 +- .../presentation/PinnedMessageContainer.kt | 2 +- .../presentation/ReplyContainer.kt | 4 +- .../presentation/attachments/Audio.kt | 2 +- .../presentation/attachments/AudioMessage.kt | 4 +- .../presentation/attachments/Gift.kt | 2 +- .../presentation/attachments/Previews.kt | 2 +- .../presentation/PhotoViewScreen.kt | 4 +- .../profile/presentation/ProfileScreen.kt | 4 +- .../settings/presentation/SettingsScreen.kt | 2 +- 167 files changed, 894 insertions(+), 949 deletions(-) delete mode 100644 core/ui/src/main/res/drawable/baseline_account_circle_24.xml delete mode 100644 core/ui/src/main/res/drawable/baseline_chat_24.xml delete mode 100644 core/ui/src/main/res/drawable/baseline_people_alt_24.xml delete mode 100644 core/ui/src/main/res/drawable/ic_account_circle_cut.xml create mode 100644 core/ui/src/main/res/drawable/ic_account_circle_fill_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_account_circle_round_24.xml rename core/ui/src/main/res/drawable/{round_arrow_back_24px.xml => ic_arrow_back_round_24.xml} (72%) delete mode 100644 core/ui/src/main/res/drawable/ic_arrow_end.xml create mode 100644 core/ui/src/main/res/drawable/ic_arrow_forward_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_attach_file_round_24.xml delete mode 100644 core/ui/src/main/res/drawable/ic_attachment_audio.xml delete mode 100644 core/ui/src/main/res/drawable/ic_attachment_call.xml delete mode 100644 core/ui/src/main/res/drawable/ic_attachment_file.xml delete mode 100644 core/ui/src/main/res/drawable/ic_attachment_forwarded_message.xml delete mode 100644 core/ui/src/main/res/drawable/ic_attachment_forwarded_messages.xml rename core/ui/src/main/res/drawable/{ic_attachment_gift.xml => ic_attachment_gift_old.xml} (100%) delete mode 100644 core/ui/src/main/res/drawable/ic_attachment_graffiti.xml delete mode 100644 core/ui/src/main/res/drawable/ic_attachment_group_call.xml delete mode 100644 core/ui/src/main/res/drawable/ic_attachment_link.xml delete mode 100644 core/ui/src/main/res/drawable/ic_attachment_mini_app.xml delete mode 100644 core/ui/src/main/res/drawable/ic_attachment_photo.xml delete mode 100644 core/ui/src/main/res/drawable/ic_attachment_poll.xml delete mode 100644 core/ui/src/main/res/drawable/ic_attachment_sticker.xml delete mode 100644 core/ui/src/main/res/drawable/ic_attachment_story.xml delete mode 100644 core/ui/src/main/res/drawable/ic_attachment_video.xml delete mode 100644 core/ui/src/main/res/drawable/ic_attachment_voice.xml delete mode 100644 core/ui/src/main/res/drawable/ic_attachment_wall.xml delete mode 100644 core/ui/src/main/res/drawable/ic_attachment_wall_reply.xml delete mode 100644 core/ui/src/main/res/drawable/ic_baseline_attach_file_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_bookmark_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_brick_fill_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_cake_fill_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_call_round_24.xml rename core/ui/src/main/res/drawable/{round_check_24px.xml => ic_check_round_24.xml} (85%) rename core/ui/src/main/res/drawable/{round_close_24px.xml => ic_close_round_24.xml} (88%) create mode 100644 core/ui/src/main/res/drawable/ic_comment_fill_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_content_copy_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_draft_fill_round_24.xml rename core/ui/src/main/res/drawable/{round_edit_24px.xml => ic_edit_round_24.xml} (94%) create mode 100644 core/ui/src/main/res/drawable/ic_error_fill_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_error_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_filter_list_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_forward_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_fragrance_fill_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_group_fill_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_group_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_history_toggle_off_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_image_fill_round_24.xml rename core/ui/src/main/res/drawable/{ic_round_info_24.xml => ic_info_round_24.xml} (100%) create mode 100644 core/ui/src/main/res/drawable/ic_insert_chart_fill_round_24.xml rename core/ui/src/main/res/drawable/{round_keyboard_arrow_up_24px.xml => ic_keyboard_arrow_up_round_24.xml} (85%) create mode 100644 core/ui/src/main/res/drawable/ic_language_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_mail_fill_round_24.xml rename core/ui/src/main/res/drawable/{round_mail_24px.xml => ic_mail_round_24.xml} (92%) create mode 100644 core/ui/src/main/res/drawable/ic_map_fill_round_24.xml delete mode 100644 core/ui/src/main/res/drawable/ic_map_marker.xml create mode 100644 core/ui/src/main/res/drawable/ic_mic_fill_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_mic_round_24.xml rename core/ui/src/main/res/drawable/{round_more_vert_24px.xml => ic_more_vert_round_24.xml} (90%) create mode 100644 core/ui/src/main/res/drawable/ic_music_note_round_24.xml delete mode 100644 core/ui/src/main/res/drawable/ic_outline_emoji_emotions_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_pause_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_perm_phone_msg_fill_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_person_round_24.xml rename core/ui/src/main/res/drawable/{rounded_photo_camera_24.xml => ic_photo_camera_round_24.xml} (93%) create mode 100644 core/ui/src/main/res/drawable/ic_pin_drop_fill_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_play_arrow_fill_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_qr_code_round_24.xml rename core/ui/src/main/res/drawable/{round_refresh_24px.xml => ic_refresh_round_24.xml} (91%) create mode 100644 core/ui/src/main/res/drawable/ic_reply_all_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_reply_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_report_off_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_report_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_restart_alt_round_24.xml delete mode 100644 core/ui/src/main/res/drawable/ic_round_bookmark_border_24.xml delete mode 100644 core/ui/src/main/res/drawable/ic_round_done_24.xml delete mode 100644 core/ui/src/main/res/drawable/ic_round_mic_none_24.xml delete mode 100644 core/ui/src/main/res/drawable/ic_round_person_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_schedule_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_send_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_sentiment_satisfied_round_24.xml rename core/ui/src/main/res/drawable/{round_settings_24px.xml => ic_settings_round_24.xml} (96%) create mode 100644 core/ui/src/main/res/drawable/ic_sms_fill_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_sms_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_star_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_sticker_fill_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_video_fill_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_visibility_off_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_visibility_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_vpn_key_round_24.xml create mode 100644 core/ui/src/main/res/drawable/ic_widgets_fill_round_24.xml rename core/ui/src/main/res/drawable/{test_captcha.webp => img_test_captcha.webp} (100%) delete mode 100644 core/ui/src/main/res/drawable/outline_account_circle_24.xml delete mode 100644 core/ui/src/main/res/drawable/outline_chat_24.xml delete mode 100644 core/ui/src/main/res/drawable/outline_people_alt_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_access_time_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_attach_file_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_cake_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_content_copy_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_create_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_error_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_error_outline_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_fill_play_arrow_24px.xml delete mode 100644 core/ui/src/main/res/drawable/round_filter_list_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_forward_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_mark_email_read_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_pause_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_qr_code_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_reply_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_reply_24px.xml delete mode 100644 core/ui/src/main/res/drawable/round_reply_all_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_report_gmailerrorred_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_report_off_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_restart_alt_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_send_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_sms_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_star_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_star_outline_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_visibility_24px.xml delete mode 100644 core/ui/src/main/res/drawable/round_visibility_off_24.xml delete mode 100644 core/ui/src/main/res/drawable/round_vpn_key_24.xml diff --git a/app/src/main/kotlin/dev/meloda/fast/navigation/MainGraph.kt b/app/src/main/kotlin/dev/meloda/fast/navigation/MainGraph.kt index 10ccfb2c..f1e2622b 100644 --- a/app/src/main/kotlin/dev/meloda/fast/navigation/MainGraph.kt +++ b/app/src/main/kotlin/dev/meloda/fast/navigation/MainGraph.kt @@ -29,20 +29,20 @@ fun NavGraphBuilder.mainScreen( val navigationItems = ImmutableList.of( BottomNavigationItem( titleResId = R.string.title_friends, - selectedIconResId = R.drawable.baseline_people_alt_24, - unselectedIconResId = R.drawable.outline_people_alt_24, + selectedIconResId = R.drawable.ic_group_fill_round_24, + unselectedIconResId = R.drawable.ic_group_round_24, route = Friends, ), BottomNavigationItem( titleResId = R.string.title_convos, - selectedIconResId = R.drawable.baseline_chat_24, - unselectedIconResId = R.drawable.outline_chat_24, + selectedIconResId = R.drawable.ic_mail_fill_round_24, + unselectedIconResId = R.drawable.ic_mail_round_24, route = ConvoGraph ), BottomNavigationItem( titleResId = R.string.title_profile, - selectedIconResId = R.drawable.baseline_account_circle_24, - unselectedIconResId = R.drawable.outline_account_circle_24, + selectedIconResId = R.drawable.ic_account_circle_fill_round_24, + unselectedIconResId = R.drawable.ic_account_circle_round_24, route = Profile ) ) diff --git a/core/domain/src/main/kotlin/dev/meloda/fast/domain/util/ConvoMapper.kt b/core/domain/src/main/kotlin/dev/meloda/fast/domain/util/ConvoMapper.kt index 9e231dc1..2d55cfed 100644 --- a/core/domain/src/main/kotlin/dev/meloda/fast/domain/util/ConvoMapper.kt +++ b/core/domain/src/main/kotlin/dev/meloda/fast/domain/util/ConvoMapper.kt @@ -40,7 +40,7 @@ fun VkConvo.extractAvatar(): UiImage = when (peerType) { PeerType.CHAT -> { photo200 } -}?.let(UiImage::Url) ?: UiImage.Resource(R.drawable.ic_account_circle_cut) +}?.let(UiImage::Url) ?: UiImage.Resource(R.drawable.ic_account_circle_fill_round_24) fun VkConvo.extractTitle( useContactName: Boolean, @@ -470,16 +470,25 @@ fun extractActionText( } } -private fun extractAttachmentIcon( +fun extractAttachmentIcon( lastMessage: VkMessage? ): UiImage? = when { lastMessage == null -> null lastMessage.text == null -> null + lastMessage.geoType != null -> { + val geoType = lastMessage.geoType + if (geoType == "point") { + UiImage.Resource(R.drawable.ic_pin_drop_fill_round_24) + } else { + UiImage.Resource(R.drawable.ic_map_fill_round_24) + } + } + !lastMessage.forwards.isNullOrEmpty() -> { if (lastMessage.forwards.orEmpty().size == 1) { - UiImage.Resource(R.drawable.ic_attachment_forwarded_message) + UiImage.Resource(R.drawable.ic_reply_round_24) } else { - UiImage.Resource(R.drawable.ic_attachment_forwarded_messages) + UiImage.Resource(R.drawable.ic_reply_all_round_24) } } @@ -487,13 +496,9 @@ private fun extractAttachmentIcon( lastMessage.attachments?.let { attachments -> if (attachments.isEmpty()) return null if (attachments.size == 1 || isAttachmentsHaveOneType(attachments)) { - lastMessage.geoType?.let { - return UiImage.Resource(R.drawable.ic_map_marker) - } - getAttachmentIconByType(attachments.first().type) } else { - UiImage.Resource(R.drawable.ic_baseline_attach_file_24) + UiImage.Resource(R.drawable.ic_attach_file_round_24) } } } @@ -565,22 +570,22 @@ fun extractAttachmentText( private fun getAttachmentIconByType(attachmentType: AttachmentType): UiImage? { return when (attachmentType) { - AttachmentType.PHOTO -> R.drawable.ic_attachment_photo - AttachmentType.VIDEO -> R.drawable.ic_attachment_video - AttachmentType.AUDIO -> R.drawable.ic_attachment_audio - AttachmentType.FILE -> R.drawable.ic_attachment_file - AttachmentType.LINK -> R.drawable.ic_attachment_link - AttachmentType.AUDIO_MESSAGE -> R.drawable.ic_attachment_voice - AttachmentType.MINI_APP -> R.drawable.ic_attachment_mini_app - AttachmentType.STICKER -> R.drawable.ic_attachment_sticker - AttachmentType.GIFT -> R.drawable.ic_attachment_gift - AttachmentType.WALL -> R.drawable.ic_attachment_wall - AttachmentType.GRAFFITI -> R.drawable.ic_attachment_graffiti - AttachmentType.POLL -> R.drawable.ic_attachment_poll - AttachmentType.WALL_REPLY -> R.drawable.ic_attachment_wall_reply - AttachmentType.CALL -> R.drawable.ic_attachment_call - AttachmentType.GROUP_CALL_IN_PROGRESS -> R.drawable.ic_attachment_group_call - AttachmentType.STORY -> R.drawable.ic_attachment_story + AttachmentType.PHOTO -> R.drawable.ic_image_fill_round_24 + AttachmentType.VIDEO -> R.drawable.ic_video_fill_round_24 + AttachmentType.AUDIO -> R.drawable.ic_music_note_round_24 + AttachmentType.FILE -> R.drawable.ic_draft_fill_round_24 + AttachmentType.LINK -> R.drawable.ic_language_round_24 + AttachmentType.AUDIO_MESSAGE -> R.drawable.ic_mic_fill_round_24 + AttachmentType.MINI_APP -> R.drawable.ic_widgets_fill_round_24 + AttachmentType.STICKER -> R.drawable.ic_sticker_fill_round_24 + AttachmentType.GIFT -> R.drawable.ic_attachment_gift_old + AttachmentType.WALL -> R.drawable.ic_brick_fill_round_24 + AttachmentType.GRAFFITI -> R.drawable.ic_fragrance_fill_round_24 + AttachmentType.POLL -> R.drawable.ic_insert_chart_fill_round_24 + AttachmentType.WALL_REPLY -> R.drawable.ic_comment_fill_round_24 + AttachmentType.CALL -> R.drawable.ic_call_round_24 + AttachmentType.GROUP_CALL_IN_PROGRESS -> R.drawable.ic_perm_phone_msg_fill_round_24 + AttachmentType.STORY -> R.drawable.ic_history_toggle_off_round_24 AttachmentType.UNKNOWN -> null AttachmentType.CURATOR -> null AttachmentType.EVENT -> null @@ -591,7 +596,7 @@ private fun getAttachmentIconByType(attachmentType: AttachmentType): UiImage? { AttachmentType.NARRATIVE -> null AttachmentType.ARTICLE -> null AttachmentType.VIDEO_MESSAGE -> null - AttachmentType.GROUP_CHAT_STICKER -> R.drawable.ic_attachment_sticker + AttachmentType.GROUP_CHAT_STICKER -> R.drawable.ic_sticker_fill_round_24 AttachmentType.STICKER_PACK_PREVIEW -> null }?.let(UiImage::Resource) } @@ -685,20 +690,6 @@ fun getAttachmentUiText( }.let(UiText::Resource) } -fun getAttachmentConvoIcon(message: VkMessage?): UiImage? { - return message?.attachments?.let { attachments -> - if (attachments.isEmpty()) return null - if (attachments.size == 1 || isAttachmentsHaveOneType(attachments)) { - message.geoType?.let { - return UiImage.Resource(R.drawable.ic_map_marker) - } - getAttachmentIconByType(attachments.first().type) - } else { - UiImage.Resource(R.drawable.ic_baseline_attach_file_24) - } - } -} - fun extractBirthday(convo: VkConvo): Boolean { val birthday = convo.user?.birthday ?: return false val splitBirthday = birthday.split(".").mapNotNull(String::toIntOrNull) diff --git a/core/domain/src/main/kotlin/dev/meloda/fast/domain/util/ConvoUiMapper.kt b/core/domain/src/main/kotlin/dev/meloda/fast/domain/util/ConvoUiMapper.kt index bfa03b61..4b77686e 100644 --- a/core/domain/src/main/kotlin/dev/meloda/fast/domain/util/ConvoUiMapper.kt +++ b/core/domain/src/main/kotlin/dev/meloda/fast/domain/util/ConvoUiMapper.kt @@ -31,7 +31,7 @@ fun VkConvo.asPresentation( ), message = extractMessage(resources, lastMessage, id, peerType), attachmentImage = if (lastMessage?.text == null) null - else getAttachmentConvoIcon(lastMessage), + else extractAttachmentIcon(lastMessage), isPinned = majorId > 0, actionImageId = ActionState.parse(isPhantom, isCallInProgress).getResourceId(), isBirthday = extractBirthday(this), diff --git a/core/domain/src/main/kotlin/dev/meloda/fast/domain/util/MessageMapper.kt b/core/domain/src/main/kotlin/dev/meloda/fast/domain/util/MessageMapper.kt index 6b774fa4..0cb986a5 100644 --- a/core/domain/src/main/kotlin/dev/meloda/fast/domain/util/MessageMapper.kt +++ b/core/domain/src/main/kotlin/dev/meloda/fast/domain/util/MessageMapper.kt @@ -27,7 +27,7 @@ fun VkMessage.extractAvatar() = when { } else -> null -}?.let(UiImage::Url) ?: UiImage.Resource(R.drawable.ic_account_circle_cut) +}?.let(UiImage::Url) ?: UiImage.Resource(R.drawable.ic_account_circle_fill_round_24) fun VkMessage.extractDate(): String = SimpleDateFormat("HH:mm", Locale.getDefault()).format(date * 1000L) diff --git a/core/ui/src/main/kotlin/dev/meloda/fast/ui/components/ErrorView.kt b/core/ui/src/main/kotlin/dev/meloda/fast/ui/components/ErrorView.kt index baad19d4..28956c07 100644 --- a/core/ui/src/main/kotlin/dev/meloda/fast/ui/components/ErrorView.kt +++ b/core/ui/src/main/kotlin/dev/meloda/fast/ui/components/ErrorView.kt @@ -25,7 +25,7 @@ import dev.meloda.fast.ui.R @Composable fun ErrorView( modifier: Modifier = Modifier, - iconResId: Int? = R.drawable.round_error_24, + iconResId: Int? = R.drawable.ic_error_fill_round_24, text: String, buttonText: String? = null, onButtonClick: (() -> Unit)? = null, diff --git a/core/ui/src/main/kotlin/dev/meloda/fast/ui/components/MaterialDialog.kt b/core/ui/src/main/kotlin/dev/meloda/fast/ui/components/MaterialDialog.kt index 357cde96..5e0b6284 100644 --- a/core/ui/src/main/kotlin/dev/meloda/fast/ui/components/MaterialDialog.kt +++ b/core/ui/src/main/kotlin/dev/meloda/fast/ui/components/MaterialDialog.kt @@ -2,6 +2,7 @@ package dev.meloda.fast.ui.components import androidx.compose.animation.AnimatedVisibility import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.Row @@ -9,19 +10,27 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll import androidx.compose.material3.AlertDialogDefaults import androidx.compose.material3.BasicAlertDialog +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.Checkbox import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedButton import androidx.compose.material3.RadioButton import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.material3.TextButton +import androidx.compose.material3.TextField +import androidx.compose.material3.contentColorFor import androidx.compose.runtime.Composable import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue @@ -30,9 +39,17 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.layout.onPlaced +import androidx.compose.ui.res.vectorResource +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties +import dev.meloda.fast.ui.R +import dev.meloda.fast.ui.theme.AppTheme import dev.meloda.fast.ui.util.ImmutableList import dev.meloda.fast.ui.util.ImmutableList.Companion.toImmutableList @@ -41,23 +58,31 @@ import dev.meloda.fast.ui.util.ImmutableList.Companion.toImmutableList fun MaterialDialog( onDismissRequest: () -> Unit, modifier: Modifier = Modifier, - confirmText: String? = null, - confirmAction: (() -> Unit)? = null, - cancelText: String? = null, - cancelAction: (() -> Unit)? = null, - neutralText: String? = null, - neutralAction: (() -> Unit)? = null, + icon: ImageVector? = null, + iconTint: Color = MaterialTheme.colorScheme.primary, title: String? = null, text: String? = null, selectionType: SelectionType = SelectionType.None, items: ImmutableList = ImmutableList.empty(), preSelectedItems: ImmutableList = ImmutableList.empty(), onItemClick: ((index: Int) -> Unit)? = null, + confirmText: String? = null, + confirmAction: (() -> Unit)? = null, + confirmContainerColor: Color = MaterialTheme.colorScheme.primary, + confirmContentColor: Color = MaterialTheme.colorScheme.contentColorFor(confirmContainerColor), + cancelText: String? = null, + cancelAction: (() -> Unit)? = null, + cancelContainerColor: Color = Color.Transparent, + cancelContentColor: Color = MaterialTheme.colorScheme.contentColorFor(cancelContainerColor), + neutralText: String? = null, + neutralAction: (() -> Unit)? = null, + neutralContainerColor: Color = Color.Transparent, + neutralContentColor: Color = MaterialTheme.colorScheme.contentColorFor(neutralContainerColor), properties: DialogProperties = DialogProperties(), actionInvokeDismiss: ActionInvokeDismiss = ActionInvokeDismiss.IfNoAction, customContent: (@Composable ColumnScope.() -> Unit)? = null ) { - var alertItems by remember { + var alertItems by remember(items, preSelectedItems) { mutableStateOf( items.mapIndexed { index, title -> DialogItem( @@ -77,6 +102,13 @@ fun MaterialDialog( val scrollState = rememberScrollState() val canScrollBackward by remember { derivedStateOf { scrollState.value > 0 } } val canScrollForward by remember { derivedStateOf { scrollState.value < scrollState.maxValue } } + val shouldAddVerticalPadding = remember( + icon, title, text, items, + confirmText, cancelText, neutralText + ) { + icon != null || title != null || text != null || items.isNotEmpty() || + confirmText != null || cancelText != null || neutralText != null + } Surface( modifier = Modifier.fillMaxWidth(), @@ -84,19 +116,33 @@ fun MaterialDialog( shape = AlertDialogDefaults.shape, tonalElevation = AlertDialogDefaults.TonalElevation ) { - Column(modifier = Modifier.padding(bottom = 10.dp)) { - if (title != null) { - Spacer(modifier = Modifier.height(20.dp)) + Column( + horizontalAlignment = Alignment.CenterHorizontally + ) { + if (shouldAddVerticalPadding) { + Spacer(modifier = Modifier.height(24.dp)) + } - Row { - Spacer(modifier = Modifier.width(24.dp)) - Text( - modifier = Modifier.weight(1f), - text = title, - style = MaterialTheme.typography.headlineSmall - ) - Spacer(modifier = Modifier.width(20.dp)) - } + if (icon != null) { + Icon( + imageVector = icon, + contentDescription = null, + tint = iconTint, + modifier = Modifier.size(30.dp) + ) + Spacer(modifier = Modifier.height(16.dp)) + } + + if (title != null) { + Text( + modifier = Modifier + .padding(horizontal = 24.dp) + .fillMaxWidth(), + text = title, + style = MaterialTheme.typography.headlineSmall, + textAlign = TextAlign.Center + ) + Spacer(modifier = Modifier.height(4.dp)) } AnimatedVisibility(isPlaced && canScrollBackward) { @@ -110,25 +156,22 @@ fun MaterialDialog( .verticalScroll(scrollState) .onPlaced { isPlaced = true } ) { - if (text != null && title == null) { - Spacer(modifier = Modifier.height(20.dp)) - } - if (text != null) { - Spacer(modifier = Modifier.height(8.dp)) - Row { - Spacer(modifier = Modifier.width(24.dp)) + Spacer(modifier = Modifier.height(10.dp)) + Row(modifier = Modifier.padding(horizontal = 24.dp)) { Text( - modifier = Modifier.weight(1f), + modifier = Modifier.fillMaxWidth(), text = text, style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant + color = MaterialTheme.colorScheme.onSurfaceVariant, + textAlign = TextAlign.Center ) - Spacer(modifier = Modifier.width(20.dp)) } } - Spacer(modifier = Modifier.height(8.dp)) + if (text != null || title != null) { + Spacer(modifier = Modifier.height(8.dp)) + } if (alertItems.isNotEmpty()) { Spacer(modifier = Modifier.height(4.dp)) @@ -158,7 +201,7 @@ fun MaterialDialog( alertItems = newItems.toImmutableList() } ) - Spacer(modifier = Modifier.height(10.dp)) + Spacer(modifier = Modifier.height(4.dp)) } else { customContent?.invoke(this) } @@ -168,67 +211,77 @@ fun MaterialDialog( HorizontalDivider() } - Row { - Spacer(modifier = Modifier.width(20.dp)) - if (neutralText != null) { - TextButton( - onClick = { - neutralAction?.invoke() ?: kotlin.run { - if (actionInvokeDismiss == ActionInvokeDismiss.IfNoAction) { + if (confirmText != null || cancelText != null || neutralText != null) { + Column( + modifier = Modifier + .padding(horizontal = 24.dp) + .padding(top = 10.dp), + verticalArrangement = Arrangement.spacedBy(4.dp) + ) { + if (confirmText != null) { + Button( + modifier = Modifier.fillMaxWidth(), + onClick = { + val hadAction = confirmAction != null + confirmAction?.invoke() + + if (actionInvokeDismiss == ActionInvokeDismiss.Always || (actionInvokeDismiss == ActionInvokeDismiss.IfNoAction && !hadAction)) { onDismissRequest() } - } - - if (actionInvokeDismiss == ActionInvokeDismiss.Always) { - onDismissRequest() - } + }, + colors = ButtonDefaults.buttonColors( + containerColor = confirmContainerColor, + contentColor = confirmContentColor + ) + ) { + Text(text = confirmText) } - ) { - Text(text = neutralText) } - } - Spacer(modifier = Modifier.weight(1f)) + if (cancelText != null) { + OutlinedButton( + modifier = Modifier.fillMaxWidth(), + onClick = { + val hadAction = cancelAction != null + cancelAction?.invoke() - if (cancelText != null) { - TextButton( - onClick = { - cancelAction?.invoke() ?: kotlin.run { - if (actionInvokeDismiss == ActionInvokeDismiss.IfNoAction) { + if (actionInvokeDismiss == ActionInvokeDismiss.Always || (actionInvokeDismiss == ActionInvokeDismiss.IfNoAction && !hadAction)) { onDismissRequest() } - } - - if (actionInvokeDismiss == ActionInvokeDismiss.Always) { - onDismissRequest() - } + }, + colors = ButtonDefaults.outlinedButtonColors( + containerColor = cancelContainerColor, + contentColor = cancelContentColor + ) + ) { + Text(text = cancelText) } - ) { - Text(text = cancelText) } - } - Spacer(modifier = Modifier.width(2.dp)) + if (neutralText != null) { + TextButton( + modifier = Modifier.fillMaxWidth(), + onClick = { + val hadAction = neutralAction != null + neutralAction?.invoke() - if (confirmText != null) { - TextButton( - onClick = { - confirmAction?.invoke() ?: kotlin.run { - if (actionInvokeDismiss == ActionInvokeDismiss.IfNoAction) { + if (actionInvokeDismiss == ActionInvokeDismiss.Always || (actionInvokeDismiss == ActionInvokeDismiss.IfNoAction && !hadAction)) { onDismissRequest() } - } - - if (actionInvokeDismiss == ActionInvokeDismiss.Always) { - onDismissRequest() - } + }, + colors = ButtonDefaults.textButtonColors( + containerColor = neutralContainerColor, + contentColor = neutralContentColor + ) + ) { + Text(text = neutralText) } - ) { - Text(text = confirmText) } } + } - Spacer(modifier = Modifier.width(20.dp)) + if (shouldAddVerticalPadding) { + Spacer(modifier = Modifier.height(24.dp)) } } } @@ -253,41 +306,40 @@ fun AlertItems( } else { onItemClick?.invoke(index) } - }, + } + .padding(horizontal = 10.dp), verticalAlignment = Alignment.CenterVertically ) { when (selectionType) { SelectionType.Multi -> { - Spacer(modifier = Modifier.width(10.dp)) Checkbox( checked = item.isSelected, onCheckedChange = { onItemCheckedChanged?.invoke(index) } ) + Spacer(modifier = Modifier.width(16.dp)) } SelectionType.Single -> { - Spacer(modifier = Modifier.width(10.dp)) RadioButton( selected = item.isSelected, onClick = { onItemClick?.invoke(index) } ) + Spacer(modifier = Modifier.width(16.dp)) } SelectionType.None -> { - Spacer(modifier = Modifier.width(26.dp)) + Spacer(modifier = Modifier.width(16.dp)) } } - Spacer(modifier = Modifier.width(4.dp)) Text( modifier = Modifier.weight(1f), text = item.title, style = MaterialTheme.typography.bodyLarge ) - Spacer(modifier = Modifier.width(20.dp)) } } } @@ -308,3 +360,93 @@ sealed class SelectionType { data object Multi : SelectionType() data object None : SelectionType() } + +@Preview +@Composable +private fun MaterialDialogPreview() { + AppTheme { + MaterialDialog( + onDismissRequest = {}, + title = "Material Dialog", + text = "This is a preview of a Material dialog.", + confirmText = "Confirm", + cancelText = "Cancel", + icon = ImageVector.vectorResource(R.drawable.ic_info_round_24) + ) + } +} + +@Preview +@Composable +private fun MaterialDialogWithListPreview() { + AppTheme { + MaterialDialog( + onDismissRequest = {}, + title = "Material Dialog", + text = "This is a preview of a Material dialog.", + confirmText = "Confirm", + cancelText = "Cancel", + items = listOf("Item 1", "Item 2", "Item 3").toImmutableList(), + selectionType = SelectionType.Single, + icon = ImageVector.vectorResource(R.drawable.ic_info_round_24) + ) + } +} + +@Preview +@Composable +private fun MaterialDialogWithCustomContent() { + AppTheme { + MaterialDialog( + onDismissRequest = {}, + title = "Material Dialog", + confirmText = "Confirm", + cancelText = "Cancel", + icon = ImageVector.vectorResource(R.drawable.ic_info_round_24) + ) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 20.dp) + ) { + TextField( + modifier = Modifier + .fillMaxWidth() + .clip(RoundedCornerShape(10.dp)) + .weight(1f), + value = "", + onValueChange = {}, + label = { Text(text = "Text") }, + placeholder = { Text(text = "Text") }, + shape = RoundedCornerShape(10.dp), + ) + } + } + } +} + +@Preview +@Composable +private fun MaterialDialogWithOnlyCustomContent() { + AppTheme { + MaterialDialog(onDismissRequest = {}) { + Row( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 20.dp) + ) { + TextField( + modifier = Modifier + .fillMaxWidth() + .clip(RoundedCornerShape(10.dp)) + .weight(1f), + value = "", + onValueChange = {}, + label = { Text(text = "Text") }, + placeholder = { Text(text = "Text") }, + shape = RoundedCornerShape(10.dp), + ) + } + } + } +} diff --git a/core/ui/src/main/kotlin/dev/meloda/fast/ui/extensions/Extensions.kt b/core/ui/src/main/kotlin/dev/meloda/fast/ui/extensions/Extensions.kt index 8a9b31b6..57a456f5 100644 --- a/core/ui/src/main/kotlin/dev/meloda/fast/ui/extensions/Extensions.kt +++ b/core/ui/src/main/kotlin/dev/meloda/fast/ui/extensions/Extensions.kt @@ -2,8 +2,14 @@ package dev.meloda.fast.ui.extensions import androidx.compose.runtime.Composable import androidx.compose.runtime.ProvidableCompositionLocal +import androidx.compose.ui.Modifier @Composable fun ProvidableCompositionLocal.getOrThrow(): T { return requireNotNull(current) } + +inline fun Modifier.ifTrue( + condition: Boolean, + block: Modifier.() -> Modifier +): Modifier = if (condition) block() else this diff --git a/core/ui/src/main/kotlin/dev/meloda/fast/ui/util/ImmutableList.kt b/core/ui/src/main/kotlin/dev/meloda/fast/ui/util/ImmutableList.kt index fb2c97de..8dcd6cc0 100644 --- a/core/ui/src/main/kotlin/dev/meloda/fast/ui/util/ImmutableList.kt +++ b/core/ui/src/main/kotlin/dev/meloda/fast/ui/util/ImmutableList.kt @@ -52,6 +52,8 @@ class ImmutableList(val values: List) : Collection { } override fun iterator(): Iterator = values.listIterator() + + val lastIndex: Int get() = this.size - 1 } fun emptyImmutableList(): ImmutableList = ImmutableList(emptyList()) diff --git a/core/ui/src/main/res/drawable/baseline_account_circle_24.xml b/core/ui/src/main/res/drawable/baseline_account_circle_24.xml deleted file mode 100644 index e8ee9bbd..00000000 --- a/core/ui/src/main/res/drawable/baseline_account_circle_24.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/baseline_chat_24.xml b/core/ui/src/main/res/drawable/baseline_chat_24.xml deleted file mode 100644 index e54982ff..00000000 --- a/core/ui/src/main/res/drawable/baseline_chat_24.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/baseline_people_alt_24.xml b/core/ui/src/main/res/drawable/baseline_people_alt_24.xml deleted file mode 100644 index 3864d497..00000000 --- a/core/ui/src/main/res/drawable/baseline_people_alt_24.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - diff --git a/core/ui/src/main/res/drawable/ic_account_circle_cut.xml b/core/ui/src/main/res/drawable/ic_account_circle_cut.xml deleted file mode 100644 index c5a6b15b..00000000 --- a/core/ui/src/main/res/drawable/ic_account_circle_cut.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/core/ui/src/main/res/drawable/ic_account_circle_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_account_circle_fill_round_24.xml new file mode 100644 index 00000000..c7d233fa --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_account_circle_fill_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_account_circle_round_24.xml b/core/ui/src/main/res/drawable/ic_account_circle_round_24.xml new file mode 100644 index 00000000..30337277 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_account_circle_round_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/core/ui/src/main/res/drawable/round_arrow_back_24px.xml b/core/ui/src/main/res/drawable/ic_arrow_back_round_24.xml similarity index 72% rename from core/ui/src/main/res/drawable/round_arrow_back_24px.xml rename to core/ui/src/main/res/drawable/ic_arrow_back_round_24.xml index 68720579..3dabbd25 100644 --- a/core/ui/src/main/res/drawable/round_arrow_back_24px.xml +++ b/core/ui/src/main/res/drawable/ic_arrow_back_round_24.xml @@ -1,12 +1,10 @@ - + android:viewportHeight="960" + android:autoMirrored="true"> + android:fillColor="@android:color/white" + android:pathData="M313,520L509,716Q521,728 520.5,744Q520,760 508,772Q496,783 480,783.5Q464,784 452,772L188,508Q182,502 179.5,495Q177,488 177,480Q177,472 179.5,465Q182,458 188,452L452,188Q463,177 479.5,177Q496,177 508,188Q520,200 520,216.5Q520,233 508,245L313,440L760,440Q777,440 788.5,451.5Q800,463 800,480Q800,497 788.5,508.5Q777,520 760,520L313,520Z"/> - diff --git a/core/ui/src/main/res/drawable/ic_arrow_end.xml b/core/ui/src/main/res/drawable/ic_arrow_end.xml deleted file mode 100644 index 1b975c48..00000000 --- a/core/ui/src/main/res/drawable/ic_arrow_end.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/core/ui/src/main/res/drawable/ic_arrow_forward_round_24.xml b/core/ui/src/main/res/drawable/ic_arrow_forward_round_24.xml new file mode 100644 index 00000000..5a03b0f1 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_arrow_forward_round_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_attach_file_round_24.xml b/core/ui/src/main/res/drawable/ic_attach_file_round_24.xml new file mode 100644 index 00000000..1e17b6a7 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_attach_file_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_attachment_audio.xml b/core/ui/src/main/res/drawable/ic_attachment_audio.xml deleted file mode 100644 index 17708598..00000000 --- a/core/ui/src/main/res/drawable/ic_attachment_audio.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_attachment_call.xml b/core/ui/src/main/res/drawable/ic_attachment_call.xml deleted file mode 100644 index 06d12089..00000000 --- a/core/ui/src/main/res/drawable/ic_attachment_call.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_attachment_file.xml b/core/ui/src/main/res/drawable/ic_attachment_file.xml deleted file mode 100644 index 7962438f..00000000 --- a/core/ui/src/main/res/drawable/ic_attachment_file.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_attachment_forwarded_message.xml b/core/ui/src/main/res/drawable/ic_attachment_forwarded_message.xml deleted file mode 100644 index 7e349136..00000000 --- a/core/ui/src/main/res/drawable/ic_attachment_forwarded_message.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/core/ui/src/main/res/drawable/ic_attachment_forwarded_messages.xml b/core/ui/src/main/res/drawable/ic_attachment_forwarded_messages.xml deleted file mode 100644 index d27bfe6f..00000000 --- a/core/ui/src/main/res/drawable/ic_attachment_forwarded_messages.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_attachment_gift.xml b/core/ui/src/main/res/drawable/ic_attachment_gift_old.xml similarity index 100% rename from core/ui/src/main/res/drawable/ic_attachment_gift.xml rename to core/ui/src/main/res/drawable/ic_attachment_gift_old.xml diff --git a/core/ui/src/main/res/drawable/ic_attachment_graffiti.xml b/core/ui/src/main/res/drawable/ic_attachment_graffiti.xml deleted file mode 100644 index 9f0e4c44..00000000 --- a/core/ui/src/main/res/drawable/ic_attachment_graffiti.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_attachment_group_call.xml b/core/ui/src/main/res/drawable/ic_attachment_group_call.xml deleted file mode 100644 index ba14499b..00000000 --- a/core/ui/src/main/res/drawable/ic_attachment_group_call.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/core/ui/src/main/res/drawable/ic_attachment_link.xml b/core/ui/src/main/res/drawable/ic_attachment_link.xml deleted file mode 100644 index 223a7101..00000000 --- a/core/ui/src/main/res/drawable/ic_attachment_link.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_attachment_mini_app.xml b/core/ui/src/main/res/drawable/ic_attachment_mini_app.xml deleted file mode 100644 index 26c6d396..00000000 --- a/core/ui/src/main/res/drawable/ic_attachment_mini_app.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_attachment_photo.xml b/core/ui/src/main/res/drawable/ic_attachment_photo.xml deleted file mode 100644 index 0fcf4994..00000000 --- a/core/ui/src/main/res/drawable/ic_attachment_photo.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/core/ui/src/main/res/drawable/ic_attachment_poll.xml b/core/ui/src/main/res/drawable/ic_attachment_poll.xml deleted file mode 100644 index 175877d1..00000000 --- a/core/ui/src/main/res/drawable/ic_attachment_poll.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_attachment_sticker.xml b/core/ui/src/main/res/drawable/ic_attachment_sticker.xml deleted file mode 100644 index e5b96be8..00000000 --- a/core/ui/src/main/res/drawable/ic_attachment_sticker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_attachment_story.xml b/core/ui/src/main/res/drawable/ic_attachment_story.xml deleted file mode 100644 index 29b8918d..00000000 --- a/core/ui/src/main/res/drawable/ic_attachment_story.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/core/ui/src/main/res/drawable/ic_attachment_video.xml b/core/ui/src/main/res/drawable/ic_attachment_video.xml deleted file mode 100644 index bd9c7dcd..00000000 --- a/core/ui/src/main/res/drawable/ic_attachment_video.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_attachment_voice.xml b/core/ui/src/main/res/drawable/ic_attachment_voice.xml deleted file mode 100644 index 695d3a62..00000000 --- a/core/ui/src/main/res/drawable/ic_attachment_voice.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_attachment_wall.xml b/core/ui/src/main/res/drawable/ic_attachment_wall.xml deleted file mode 100644 index e87a4dea..00000000 --- a/core/ui/src/main/res/drawable/ic_attachment_wall.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_attachment_wall_reply.xml b/core/ui/src/main/res/drawable/ic_attachment_wall_reply.xml deleted file mode 100644 index ab22cc7a..00000000 --- a/core/ui/src/main/res/drawable/ic_attachment_wall_reply.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/core/ui/src/main/res/drawable/ic_baseline_attach_file_24.xml b/core/ui/src/main/res/drawable/ic_baseline_attach_file_24.xml deleted file mode 100644 index 44931dfe..00000000 --- a/core/ui/src/main/res/drawable/ic_baseline_attach_file_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/core/ui/src/main/res/drawable/ic_bookmark_round_24.xml b/core/ui/src/main/res/drawable/ic_bookmark_round_24.xml new file mode 100644 index 00000000..f0790f89 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_bookmark_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_brick_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_brick_fill_round_24.xml new file mode 100644 index 00000000..02e13696 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_brick_fill_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_cake_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_cake_fill_round_24.xml new file mode 100644 index 00000000..0c182136 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_cake_fill_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_call_round_24.xml b/core/ui/src/main/res/drawable/ic_call_round_24.xml new file mode 100644 index 00000000..3d58a87e --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_call_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/round_check_24px.xml b/core/ui/src/main/res/drawable/ic_check_round_24.xml similarity index 85% rename from core/ui/src/main/res/drawable/round_check_24px.xml rename to core/ui/src/main/res/drawable/ic_check_round_24.xml index d18f57a5..f2d348ac 100644 --- a/core/ui/src/main/res/drawable/round_check_24px.xml +++ b/core/ui/src/main/res/drawable/ic_check_round_24.xml @@ -1,10 +1,9 @@ - diff --git a/core/ui/src/main/res/drawable/round_close_24px.xml b/core/ui/src/main/res/drawable/ic_close_round_24.xml similarity index 88% rename from core/ui/src/main/res/drawable/round_close_24px.xml rename to core/ui/src/main/res/drawable/ic_close_round_24.xml index ec59ab2b..3a076f38 100644 --- a/core/ui/src/main/res/drawable/round_close_24px.xml +++ b/core/ui/src/main/res/drawable/ic_close_round_24.xml @@ -1,10 +1,9 @@ - diff --git a/core/ui/src/main/res/drawable/ic_comment_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_comment_fill_round_24.xml new file mode 100644 index 00000000..73e12039 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_comment_fill_round_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_content_copy_round_24.xml b/core/ui/src/main/res/drawable/ic_content_copy_round_24.xml new file mode 100644 index 00000000..7de3211c --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_content_copy_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_draft_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_draft_fill_round_24.xml new file mode 100644 index 00000000..3fda2d11 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_draft_fill_round_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/core/ui/src/main/res/drawable/round_edit_24px.xml b/core/ui/src/main/res/drawable/ic_edit_round_24.xml similarity index 94% rename from core/ui/src/main/res/drawable/round_edit_24px.xml rename to core/ui/src/main/res/drawable/ic_edit_round_24.xml index 71d95a9f..1e4d5181 100644 --- a/core/ui/src/main/res/drawable/round_edit_24px.xml +++ b/core/ui/src/main/res/drawable/ic_edit_round_24.xml @@ -1,4 +1,3 @@ - - diff --git a/core/ui/src/main/res/drawable/ic_error_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_error_fill_round_24.xml new file mode 100644 index 00000000..7e80d55b --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_error_fill_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_error_round_24.xml b/core/ui/src/main/res/drawable/ic_error_round_24.xml new file mode 100644 index 00000000..9b87c8fa --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_error_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_filter_list_round_24.xml b/core/ui/src/main/res/drawable/ic_filter_list_round_24.xml new file mode 100644 index 00000000..d75fa8a4 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_filter_list_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_forward_round_24.xml b/core/ui/src/main/res/drawable/ic_forward_round_24.xml new file mode 100644 index 00000000..7e151088 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_forward_round_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_fragrance_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_fragrance_fill_round_24.xml new file mode 100644 index 00000000..47431983 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_fragrance_fill_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_group_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_group_fill_round_24.xml new file mode 100644 index 00000000..d87663e1 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_group_fill_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_group_round_24.xml b/core/ui/src/main/res/drawable/ic_group_round_24.xml new file mode 100644 index 00000000..7db44bb3 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_group_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_history_toggle_off_round_24.xml b/core/ui/src/main/res/drawable/ic_history_toggle_off_round_24.xml new file mode 100644 index 00000000..80a8e023 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_history_toggle_off_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_image_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_image_fill_round_24.xml new file mode 100644 index 00000000..964d7d12 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_image_fill_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_round_info_24.xml b/core/ui/src/main/res/drawable/ic_info_round_24.xml similarity index 100% rename from core/ui/src/main/res/drawable/ic_round_info_24.xml rename to core/ui/src/main/res/drawable/ic_info_round_24.xml diff --git a/core/ui/src/main/res/drawable/ic_insert_chart_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_insert_chart_fill_round_24.xml new file mode 100644 index 00000000..4ce7cbc2 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_insert_chart_fill_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/round_keyboard_arrow_up_24px.xml b/core/ui/src/main/res/drawable/ic_keyboard_arrow_up_round_24.xml similarity index 85% rename from core/ui/src/main/res/drawable/round_keyboard_arrow_up_24px.xml rename to core/ui/src/main/res/drawable/ic_keyboard_arrow_up_round_24.xml index ac8eceae..1c2f5cc3 100644 --- a/core/ui/src/main/res/drawable/round_keyboard_arrow_up_24px.xml +++ b/core/ui/src/main/res/drawable/ic_keyboard_arrow_up_round_24.xml @@ -1,10 +1,9 @@ - diff --git a/core/ui/src/main/res/drawable/ic_language_round_24.xml b/core/ui/src/main/res/drawable/ic_language_round_24.xml new file mode 100644 index 00000000..48155ead --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_language_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_mail_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_mail_fill_round_24.xml new file mode 100644 index 00000000..59c7c93b --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_mail_fill_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/round_mail_24px.xml b/core/ui/src/main/res/drawable/ic_mail_round_24.xml similarity index 92% rename from core/ui/src/main/res/drawable/round_mail_24px.xml rename to core/ui/src/main/res/drawable/ic_mail_round_24.xml index 8c0ce2b1..f50491d2 100644 --- a/core/ui/src/main/res/drawable/round_mail_24px.xml +++ b/core/ui/src/main/res/drawable/ic_mail_round_24.xml @@ -1,10 +1,9 @@ - diff --git a/core/ui/src/main/res/drawable/ic_map_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_map_fill_round_24.xml new file mode 100644 index 00000000..f7846566 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_map_fill_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_map_marker.xml b/core/ui/src/main/res/drawable/ic_map_marker.xml deleted file mode 100644 index df416cc9..00000000 --- a/core/ui/src/main/res/drawable/ic_map_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/core/ui/src/main/res/drawable/ic_mic_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_mic_fill_round_24.xml new file mode 100644 index 00000000..34524441 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_mic_fill_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_mic_round_24.xml b/core/ui/src/main/res/drawable/ic_mic_round_24.xml new file mode 100644 index 00000000..3d452d30 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_mic_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/round_more_vert_24px.xml b/core/ui/src/main/res/drawable/ic_more_vert_round_24.xml similarity index 90% rename from core/ui/src/main/res/drawable/round_more_vert_24px.xml rename to core/ui/src/main/res/drawable/ic_more_vert_round_24.xml index f4e102b5..1f01db4d 100644 --- a/core/ui/src/main/res/drawable/round_more_vert_24px.xml +++ b/core/ui/src/main/res/drawable/ic_more_vert_round_24.xml @@ -1,10 +1,9 @@ - diff --git a/core/ui/src/main/res/drawable/ic_music_note_round_24.xml b/core/ui/src/main/res/drawable/ic_music_note_round_24.xml new file mode 100644 index 00000000..c6df97a9 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_music_note_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_outline_emoji_emotions_24.xml b/core/ui/src/main/res/drawable/ic_outline_emoji_emotions_24.xml deleted file mode 100644 index cd3c6b7a..00000000 --- a/core/ui/src/main/res/drawable/ic_outline_emoji_emotions_24.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/core/ui/src/main/res/drawable/ic_pause_round_24.xml b/core/ui/src/main/res/drawable/ic_pause_round_24.xml new file mode 100644 index 00000000..aaffce37 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_pause_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_perm_phone_msg_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_perm_phone_msg_fill_round_24.xml new file mode 100644 index 00000000..270a303c --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_perm_phone_msg_fill_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_person_round_24.xml b/core/ui/src/main/res/drawable/ic_person_round_24.xml new file mode 100644 index 00000000..d2325382 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_person_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/rounded_photo_camera_24.xml b/core/ui/src/main/res/drawable/ic_photo_camera_round_24.xml similarity index 93% rename from core/ui/src/main/res/drawable/rounded_photo_camera_24.xml rename to core/ui/src/main/res/drawable/ic_photo_camera_round_24.xml index 294a0181..6f35149b 100644 --- a/core/ui/src/main/res/drawable/rounded_photo_camera_24.xml +++ b/core/ui/src/main/res/drawable/ic_photo_camera_round_24.xml @@ -3,9 +3,7 @@ android:height="24dp" android:viewportWidth="960" android:viewportHeight="960"> - - + android:fillColor="@android:color/white" + android:pathData="M480,700Q555,700 607.5,647.5Q660,595 660,520Q660,445 607.5,392.5Q555,340 480,340Q405,340 352.5,392.5Q300,445 300,520Q300,595 352.5,647.5Q405,700 480,700ZM480,620Q438,620 409,591Q380,562 380,520Q380,478 409,449Q438,420 480,420Q522,420 551,449Q580,478 580,520Q580,562 551,591Q522,620 480,620ZM160,840Q127,840 103.5,816.5Q80,793 80,760L80,280Q80,247 103.5,223.5Q127,200 160,200L286,200L336,146Q347,134 362.5,127Q378,120 395,120L565,120Q582,120 597.5,127Q613,134 624,146L674,200L800,200Q833,200 856.5,223.5Q880,247 880,280L880,760Q880,793 856.5,816.5Q833,840 800,840L160,840ZM160,760L800,760Q800,760 800,760Q800,760 800,760L800,280Q800,280 800,280Q800,280 800,280L638,280L565,200L395,200L322,280L160,280Q160,280 160,280Q160,280 160,280L160,760Q160,760 160,760Q160,760 160,760ZM480,520Q480,520 480,520Q480,520 480,520L480,520Q480,520 480,520Q480,520 480,520L480,520L480,520L480,520L480,520L480,520Q480,520 480,520Q480,520 480,520L480,520Q480,520 480,520Q480,520 480,520Z"/> diff --git a/core/ui/src/main/res/drawable/ic_pin_drop_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_pin_drop_fill_round_24.xml new file mode 100644 index 00000000..5c27a125 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_pin_drop_fill_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_play_arrow_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_play_arrow_fill_round_24.xml new file mode 100644 index 00000000..e33014b4 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_play_arrow_fill_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_qr_code_round_24.xml b/core/ui/src/main/res/drawable/ic_qr_code_round_24.xml new file mode 100644 index 00000000..56481fd8 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_qr_code_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/round_refresh_24px.xml b/core/ui/src/main/res/drawable/ic_refresh_round_24.xml similarity index 91% rename from core/ui/src/main/res/drawable/round_refresh_24px.xml rename to core/ui/src/main/res/drawable/ic_refresh_round_24.xml index 80fb7139..70607bdf 100644 --- a/core/ui/src/main/res/drawable/round_refresh_24px.xml +++ b/core/ui/src/main/res/drawable/ic_refresh_round_24.xml @@ -1,10 +1,9 @@ - diff --git a/core/ui/src/main/res/drawable/ic_reply_all_round_24.xml b/core/ui/src/main/res/drawable/ic_reply_all_round_24.xml new file mode 100644 index 00000000..0eb99589 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_reply_all_round_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_reply_round_24.xml b/core/ui/src/main/res/drawable/ic_reply_round_24.xml new file mode 100644 index 00000000..a37fa6f3 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_reply_round_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_report_off_round_24.xml b/core/ui/src/main/res/drawable/ic_report_off_round_24.xml new file mode 100644 index 00000000..ece2d952 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_report_off_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_report_round_24.xml b/core/ui/src/main/res/drawable/ic_report_round_24.xml new file mode 100644 index 00000000..cd8a528a --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_report_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_restart_alt_round_24.xml b/core/ui/src/main/res/drawable/ic_restart_alt_round_24.xml new file mode 100644 index 00000000..bf5abfd3 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_restart_alt_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_round_bookmark_border_24.xml b/core/ui/src/main/res/drawable/ic_round_bookmark_border_24.xml deleted file mode 100644 index fe8f2d5a..00000000 --- a/core/ui/src/main/res/drawable/ic_round_bookmark_border_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/core/ui/src/main/res/drawable/ic_round_done_24.xml b/core/ui/src/main/res/drawable/ic_round_done_24.xml deleted file mode 100644 index 4cfe9a89..00000000 --- a/core/ui/src/main/res/drawable/ic_round_done_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/core/ui/src/main/res/drawable/ic_round_mic_none_24.xml b/core/ui/src/main/res/drawable/ic_round_mic_none_24.xml deleted file mode 100644 index 24795bb3..00000000 --- a/core/ui/src/main/res/drawable/ic_round_mic_none_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/core/ui/src/main/res/drawable/ic_round_person_24.xml b/core/ui/src/main/res/drawable/ic_round_person_24.xml deleted file mode 100644 index 35ccc472..00000000 --- a/core/ui/src/main/res/drawable/ic_round_person_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/core/ui/src/main/res/drawable/ic_schedule_round_24.xml b/core/ui/src/main/res/drawable/ic_schedule_round_24.xml new file mode 100644 index 00000000..21b55220 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_schedule_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_send_round_24.xml b/core/ui/src/main/res/drawable/ic_send_round_24.xml new file mode 100644 index 00000000..c0b81fd4 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_send_round_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_sentiment_satisfied_round_24.xml b/core/ui/src/main/res/drawable/ic_sentiment_satisfied_round_24.xml new file mode 100644 index 00000000..15d82916 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_sentiment_satisfied_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/round_settings_24px.xml b/core/ui/src/main/res/drawable/ic_settings_round_24.xml similarity index 96% rename from core/ui/src/main/res/drawable/round_settings_24px.xml rename to core/ui/src/main/res/drawable/ic_settings_round_24.xml index 0ba18103..6115585b 100644 --- a/core/ui/src/main/res/drawable/round_settings_24px.xml +++ b/core/ui/src/main/res/drawable/ic_settings_round_24.xml @@ -1,10 +1,9 @@ - diff --git a/core/ui/src/main/res/drawable/ic_sms_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_sms_fill_round_24.xml new file mode 100644 index 00000000..c17b276e --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_sms_fill_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_sms_round_24.xml b/core/ui/src/main/res/drawable/ic_sms_round_24.xml new file mode 100644 index 00000000..dff1b308 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_sms_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_star_round_24.xml b/core/ui/src/main/res/drawable/ic_star_round_24.xml new file mode 100644 index 00000000..de4241f0 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_star_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_sticker_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_sticker_fill_round_24.xml new file mode 100644 index 00000000..4d40ee6c --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_sticker_fill_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_video_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_video_fill_round_24.xml new file mode 100644 index 00000000..1131a66f --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_video_fill_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_visibility_off_round_24.xml b/core/ui/src/main/res/drawable/ic_visibility_off_round_24.xml new file mode 100644 index 00000000..444d8e10 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_visibility_off_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_visibility_round_24.xml b/core/ui/src/main/res/drawable/ic_visibility_round_24.xml new file mode 100644 index 00000000..3a642028 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_visibility_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_vpn_key_round_24.xml b/core/ui/src/main/res/drawable/ic_vpn_key_round_24.xml new file mode 100644 index 00000000..721420d3 --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_vpn_key_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/ic_widgets_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_widgets_fill_round_24.xml new file mode 100644 index 00000000..738e28aa --- /dev/null +++ b/core/ui/src/main/res/drawable/ic_widgets_fill_round_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/ui/src/main/res/drawable/test_captcha.webp b/core/ui/src/main/res/drawable/img_test_captcha.webp similarity index 100% rename from core/ui/src/main/res/drawable/test_captcha.webp rename to core/ui/src/main/res/drawable/img_test_captcha.webp diff --git a/core/ui/src/main/res/drawable/outline_account_circle_24.xml b/core/ui/src/main/res/drawable/outline_account_circle_24.xml deleted file mode 100644 index 7188e425..00000000 --- a/core/ui/src/main/res/drawable/outline_account_circle_24.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - diff --git a/core/ui/src/main/res/drawable/outline_chat_24.xml b/core/ui/src/main/res/drawable/outline_chat_24.xml deleted file mode 100644 index 369eed9b..00000000 --- a/core/ui/src/main/res/drawable/outline_chat_24.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/outline_people_alt_24.xml b/core/ui/src/main/res/drawable/outline_people_alt_24.xml deleted file mode 100644 index f407263e..00000000 --- a/core/ui/src/main/res/drawable/outline_people_alt_24.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - diff --git a/core/ui/src/main/res/drawable/round_access_time_24.xml b/core/ui/src/main/res/drawable/round_access_time_24.xml deleted file mode 100644 index 2168cd02..00000000 --- a/core/ui/src/main/res/drawable/round_access_time_24.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/round_attach_file_24.xml b/core/ui/src/main/res/drawable/round_attach_file_24.xml deleted file mode 100644 index 821eb8f5..00000000 --- a/core/ui/src/main/res/drawable/round_attach_file_24.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/round_cake_24.xml b/core/ui/src/main/res/drawable/round_cake_24.xml deleted file mode 100644 index 531de3d8..00000000 --- a/core/ui/src/main/res/drawable/round_cake_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/core/ui/src/main/res/drawable/round_content_copy_24.xml b/core/ui/src/main/res/drawable/round_content_copy_24.xml deleted file mode 100644 index 0a8a837e..00000000 --- a/core/ui/src/main/res/drawable/round_content_copy_24.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/round_create_24.xml b/core/ui/src/main/res/drawable/round_create_24.xml deleted file mode 100644 index a9250a19..00000000 --- a/core/ui/src/main/res/drawable/round_create_24.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/round_error_24.xml b/core/ui/src/main/res/drawable/round_error_24.xml deleted file mode 100644 index be24953a..00000000 --- a/core/ui/src/main/res/drawable/round_error_24.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/round_error_outline_24.xml b/core/ui/src/main/res/drawable/round_error_outline_24.xml deleted file mode 100644 index ab6988e3..00000000 --- a/core/ui/src/main/res/drawable/round_error_outline_24.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/round_fill_play_arrow_24px.xml b/core/ui/src/main/res/drawable/round_fill_play_arrow_24px.xml deleted file mode 100644 index 3d339443..00000000 --- a/core/ui/src/main/res/drawable/round_fill_play_arrow_24px.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/round_filter_list_24.xml b/core/ui/src/main/res/drawable/round_filter_list_24.xml deleted file mode 100644 index e7cd0088..00000000 --- a/core/ui/src/main/res/drawable/round_filter_list_24.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/round_forward_24.xml b/core/ui/src/main/res/drawable/round_forward_24.xml deleted file mode 100644 index e576c440..00000000 --- a/core/ui/src/main/res/drawable/round_forward_24.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/round_mark_email_read_24.xml b/core/ui/src/main/res/drawable/round_mark_email_read_24.xml deleted file mode 100644 index 987e4fee..00000000 --- a/core/ui/src/main/res/drawable/round_mark_email_read_24.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/round_pause_24.xml b/core/ui/src/main/res/drawable/round_pause_24.xml deleted file mode 100644 index ec259631..00000000 --- a/core/ui/src/main/res/drawable/round_pause_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/round_qr_code_24.xml b/core/ui/src/main/res/drawable/round_qr_code_24.xml deleted file mode 100644 index 9254f706..00000000 --- a/core/ui/src/main/res/drawable/round_qr_code_24.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/core/ui/src/main/res/drawable/round_reply_24.xml b/core/ui/src/main/res/drawable/round_reply_24.xml deleted file mode 100644 index 7616cc1a..00000000 --- a/core/ui/src/main/res/drawable/round_reply_24.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/round_reply_24px.xml b/core/ui/src/main/res/drawable/round_reply_24px.xml deleted file mode 100644 index 380df664..00000000 --- a/core/ui/src/main/res/drawable/round_reply_24px.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - diff --git a/core/ui/src/main/res/drawable/round_reply_all_24.xml b/core/ui/src/main/res/drawable/round_reply_all_24.xml deleted file mode 100644 index aab70fcd..00000000 --- a/core/ui/src/main/res/drawable/round_reply_all_24.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/round_report_gmailerrorred_24.xml b/core/ui/src/main/res/drawable/round_report_gmailerrorred_24.xml deleted file mode 100644 index ef5de718..00000000 --- a/core/ui/src/main/res/drawable/round_report_gmailerrorred_24.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - diff --git a/core/ui/src/main/res/drawable/round_report_off_24.xml b/core/ui/src/main/res/drawable/round_report_off_24.xml deleted file mode 100644 index fc1ce00a..00000000 --- a/core/ui/src/main/res/drawable/round_report_off_24.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/round_restart_alt_24.xml b/core/ui/src/main/res/drawable/round_restart_alt_24.xml deleted file mode 100644 index a74b0882..00000000 --- a/core/ui/src/main/res/drawable/round_restart_alt_24.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/core/ui/src/main/res/drawable/round_send_24.xml b/core/ui/src/main/res/drawable/round_send_24.xml deleted file mode 100644 index 3ed700b4..00000000 --- a/core/ui/src/main/res/drawable/round_send_24.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/round_sms_24.xml b/core/ui/src/main/res/drawable/round_sms_24.xml deleted file mode 100644 index e8e06aa6..00000000 --- a/core/ui/src/main/res/drawable/round_sms_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/core/ui/src/main/res/drawable/round_star_24.xml b/core/ui/src/main/res/drawable/round_star_24.xml deleted file mode 100644 index 0c0cb8be..00000000 --- a/core/ui/src/main/res/drawable/round_star_24.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/round_star_outline_24.xml b/core/ui/src/main/res/drawable/round_star_outline_24.xml deleted file mode 100644 index d1a53f4c..00000000 --- a/core/ui/src/main/res/drawable/round_star_outline_24.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/core/ui/src/main/res/drawable/round_visibility_24px.xml b/core/ui/src/main/res/drawable/round_visibility_24px.xml deleted file mode 100644 index 854becc2..00000000 --- a/core/ui/src/main/res/drawable/round_visibility_24px.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/core/ui/src/main/res/drawable/round_visibility_off_24.xml b/core/ui/src/main/res/drawable/round_visibility_off_24.xml deleted file mode 100644 index 33391cb5..00000000 --- a/core/ui/src/main/res/drawable/round_visibility_off_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/core/ui/src/main/res/drawable/round_vpn_key_24.xml b/core/ui/src/main/res/drawable/round_vpn_key_24.xml deleted file mode 100644 index 6d21de48..00000000 --- a/core/ui/src/main/res/drawable/round_vpn_key_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/feature/auth/src/main/kotlin/dev/meloda/fast/auth/captcha/presentation/CaptchaScreen.kt b/feature/auth/src/main/kotlin/dev/meloda/fast/auth/captcha/presentation/CaptchaScreen.kt index c2eaa639..95e6ba2f 100644 --- a/feature/auth/src/main/kotlin/dev/meloda/fast/auth/captcha/presentation/CaptchaScreen.kt +++ b/feature/auth/src/main/kotlin/dev/meloda/fast/auth/captcha/presentation/CaptchaScreen.kt @@ -146,7 +146,7 @@ fun CaptchaScreen( }, icon = { Icon( - painter = painterResource(R.drawable.round_close_24px), + painter = painterResource(R.drawable.ic_close_round_24), contentDescription = "Close icon", tint = MaterialTheme.colorScheme.onPrimaryContainer, ) @@ -186,7 +186,7 @@ fun CaptchaScreen( if (LocalView.current.isInEditMode) { Image( - painter = painterResource(id = R.drawable.test_captcha), + painter = painterResource(id = R.drawable.img_test_captcha), contentDescription = "Captcha image", modifier = imageModifier ) @@ -218,7 +218,7 @@ fun CaptchaScreen( .clip(RoundedCornerShape(10.dp)), leadingIcon = { Icon( - painter = painterResource(id = R.drawable.round_qr_code_24), + painter = painterResource(id = R.drawable.ic_qr_code_round_24), contentDescription = "QR code icon", tint = if (showError) { MaterialTheme.colorScheme.error @@ -249,7 +249,7 @@ fun CaptchaScreen( modifier = Modifier.align(Alignment.CenterHorizontally) ) { Icon( - painter = painterResource(R.drawable.round_check_24px), + painter = painterResource(R.drawable.ic_check_round_24), contentDescription = "Done icon", tint = MaterialTheme.colorScheme.onSecondaryContainer ) diff --git a/feature/auth/src/main/kotlin/dev/meloda/fast/auth/login/presentation/LoginScreen.kt b/feature/auth/src/main/kotlin/dev/meloda/fast/auth/login/presentation/LoginScreen.kt index dc9ba0fa..b9859905 100644 --- a/feature/auth/src/main/kotlin/dev/meloda/fast/auth/login/presentation/LoginScreen.kt +++ b/feature/auth/src/main/kotlin/dev/meloda/fast/auth/login/presentation/LoginScreen.kt @@ -240,7 +240,7 @@ fun LoginScreen( placeholder = { Text(text = stringResource(id = R.string.login_hint)) }, leadingIcon = { Icon( - painter = painterResource(id = R.drawable.ic_round_person_24), + painter = painterResource(id = R.drawable.ic_person_round_24), contentDescription = "Login icon", tint = if (screenState.loginError) { MaterialTheme.colorScheme.error @@ -284,7 +284,7 @@ fun LoginScreen( placeholder = { Text(text = stringResource(id = R.string.password_login_hint)) }, leadingIcon = { Icon( - painter = painterResource(id = R.drawable.round_vpn_key_24), + painter = painterResource(id = R.drawable.ic_vpn_key_round_24), contentDescription = "Password icon", tint = if (screenState.passwordError) { MaterialTheme.colorScheme.error @@ -295,8 +295,8 @@ fun LoginScreen( }, trailingIcon = { val imagePainter = painterResource( - id = if (screenState.passwordVisible) R.drawable.round_visibility_off_24 - else R.drawable.round_visibility_24px + id = if (screenState.passwordVisible) R.drawable.ic_visibility_off_round_24 + else R.drawable.ic_visibility_round_24 ) IconButton(onClick = onPasswordVisibilityButtonClicked) { @@ -364,7 +364,7 @@ fun LoginScreen( label = "Sign in icon visibility" ) { Icon( - painter = painterResource(id = R.drawable.ic_arrow_end), + painter = painterResource(id = R.drawable.ic_arrow_forward_round_24), contentDescription = "Sign in icon", tint = MaterialTheme.colorScheme.onSecondaryContainer ) diff --git a/feature/auth/src/main/kotlin/dev/meloda/fast/auth/userbanned/presentation/UserBannedScreen.kt b/feature/auth/src/main/kotlin/dev/meloda/fast/auth/userbanned/presentation/UserBannedScreen.kt index 2863e4ce..2ba0c2ce 100644 --- a/feature/auth/src/main/kotlin/dev/meloda/fast/auth/userbanned/presentation/UserBannedScreen.kt +++ b/feature/auth/src/main/kotlin/dev/meloda/fast/auth/userbanned/presentation/UserBannedScreen.kt @@ -67,7 +67,7 @@ fun UserBannedScreen( navigationIcon = { IconButton(onClick = onBack) { Icon( - painter = painterResource(R.drawable.round_arrow_back_24px), + painter = painterResource(R.drawable.ic_arrow_back_round_24), contentDescription = null ) } diff --git a/feature/auth/src/main/kotlin/dev/meloda/fast/auth/validation/presentation/ValidationScreen.kt b/feature/auth/src/main/kotlin/dev/meloda/fast/auth/validation/presentation/ValidationScreen.kt index b3dc8fe9..b9374faa 100644 --- a/feature/auth/src/main/kotlin/dev/meloda/fast/auth/validation/presentation/ValidationScreen.kt +++ b/feature/auth/src/main/kotlin/dev/meloda/fast/auth/validation/presentation/ValidationScreen.kt @@ -170,7 +170,7 @@ fun ValidationScreen( }, icon = { Icon( - painter = painterResource(R.drawable.round_close_24px), + painter = painterResource(R.drawable.ic_close_round_24), contentDescription = "Close icon", tint = MaterialTheme.colorScheme.onPrimaryContainer, ) @@ -220,7 +220,7 @@ fun ValidationScreen( .semantics { contentType = ContentType.SmsOtpCode }, leadingIcon = { Icon( - painter = painterResource(id = R.drawable.round_qr_code_24), + painter = painterResource(id = R.drawable.ic_qr_code_round_24), contentDescription = "QR Code icon", tint = if (screenState.codeError) { MaterialTheme.colorScheme.error @@ -256,7 +256,7 @@ fun ValidationScreen( val canResendSms = screenState.isSmsButtonVisible AnimatedVisibility( - visible = canResendSms, + visible = true, ) { ExtendedFloatingActionButton( onClick = onRequestSmsButtonClicked, @@ -268,7 +268,7 @@ fun ValidationScreen( }, icon = { Icon( - painter = painterResource(id = R.drawable.round_sms_24), + painter = painterResource(id = R.drawable.ic_sms_round_24), tint = MaterialTheme.colorScheme.onPrimary, contentDescription = "SMS icon" ) @@ -284,7 +284,7 @@ fun ValidationScreen( containerColor = MaterialTheme.colorScheme.secondaryContainer, ) { Icon( - painter = painterResource(R.drawable.round_check_24px), + painter = painterResource(R.drawable.ic_check_round_24), contentDescription = "Done icon", tint = MaterialTheme.colorScheme.onSecondaryContainer ) diff --git a/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/ChatMaterialsScreen.kt b/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/ChatMaterialsScreen.kt index 9fccedee..9055fb59 100644 --- a/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/ChatMaterialsScreen.kt +++ b/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/ChatMaterialsScreen.kt @@ -167,7 +167,7 @@ fun ChatMaterialsScreen( navigationIcon = { IconButton(onClick = onBack) { Icon( - painter = painterResource(R.drawable.round_arrow_back_24px), + painter = painterResource(R.drawable.ic_arrow_back_round_24), contentDescription = null ) } diff --git a/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/materials/AudioMaterialsScreen.kt b/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/materials/AudioMaterialsScreen.kt index b05fbfd4..5f81954a 100644 --- a/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/materials/AudioMaterialsScreen.kt +++ b/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/materials/AudioMaterialsScreen.kt @@ -155,7 +155,7 @@ fun AudioMaterialsScreen( .background(MaterialTheme.colorScheme.primary) .size(42.dp) .padding(4.dp), - painter = painterResource(R.drawable.round_fill_play_arrow_24px), + painter = painterResource(R.drawable.ic_play_arrow_fill_round_24), contentDescription = null, tint = contentColorFor(MaterialTheme.colorScheme.primary) ) @@ -203,7 +203,7 @@ fun AudioMaterialsScreen( colors = IconButtonDefaults.filledIconButtonColors() ) { Icon( - painter = painterResource(R.drawable.round_keyboard_arrow_up_24px), + painter = painterResource(R.drawable.ic_keyboard_arrow_up_round_24), contentDescription = null ) } diff --git a/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/materials/FileMaterialsScreen.kt b/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/materials/FileMaterialsScreen.kt index 8934a27e..6a68d016 100644 --- a/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/materials/FileMaterialsScreen.kt +++ b/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/materials/FileMaterialsScreen.kt @@ -237,7 +237,7 @@ fun FileMaterialsScreen( colors = IconButtonDefaults.filledIconButtonColors() ) { Icon( - painter = painterResource(R.drawable.round_keyboard_arrow_up_24px), + painter = painterResource(R.drawable.ic_keyboard_arrow_up_round_24), contentDescription = null ) } diff --git a/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/materials/LinkMaterialsScreen.kt b/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/materials/LinkMaterialsScreen.kt index 0bd1a3f8..f4088bda 100644 --- a/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/materials/LinkMaterialsScreen.kt +++ b/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/materials/LinkMaterialsScreen.kt @@ -256,7 +256,7 @@ fun LinkMaterialsScreen( colors = IconButtonDefaults.filledIconButtonColors() ) { Icon( - painter = painterResource(R.drawable.round_keyboard_arrow_up_24px), + painter = painterResource(R.drawable.ic_keyboard_arrow_up_round_24), contentDescription = null ) } diff --git a/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/materials/PhotoMaterialsScreen.kt b/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/materials/PhotoMaterialsScreen.kt index c1790d48..cc6c67dc 100644 --- a/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/materials/PhotoMaterialsScreen.kt +++ b/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/materials/PhotoMaterialsScreen.kt @@ -177,7 +177,7 @@ fun PhotoMaterialsScreen( colors = IconButtonDefaults.filledIconButtonColors() ) { Icon( - painter = painterResource(R.drawable.round_keyboard_arrow_up_24px), + painter = painterResource(R.drawable.ic_keyboard_arrow_up_round_24), contentDescription = null ) } diff --git a/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/materials/VideoMaterialsScreen.kt b/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/materials/VideoMaterialsScreen.kt index 84b84be6..d7787ae8 100644 --- a/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/materials/VideoMaterialsScreen.kt +++ b/feature/chatmaterials/src/main/kotlin/dev/meloda/fast/chatmaterials/presentation/materials/VideoMaterialsScreen.kt @@ -229,7 +229,7 @@ fun VideoMaterialsScreen( colors = IconButtonDefaults.filledIconButtonColors() ) { Icon( - painter = painterResource(R.drawable.round_keyboard_arrow_up_24px), + painter = painterResource(R.drawable.ic_keyboard_arrow_up_round_24), contentDescription = null ) } diff --git a/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvoDialogs.kt b/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvoDialogs.kt index d8846928..44044c23 100644 --- a/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvoDialogs.kt +++ b/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvoDialogs.kt @@ -1,14 +1,16 @@ package dev.meloda.fast.convos.presentation import android.os.Bundle +import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.stringResource +import androidx.compose.ui.res.vectorResource import androidx.core.os.bundleOf import dev.meloda.fast.convos.model.ConvoDialog import dev.meloda.fast.convos.model.ConvosScreenState -import dev.meloda.fast.ui.components.MaterialDialog - import dev.meloda.fast.ui.R +import dev.meloda.fast.ui.components.MaterialDialog @Composable fun HandleDialogs( @@ -27,7 +29,8 @@ fun HandleDialogs( title = stringResource(id = R.string.confirm_archive_convo), confirmAction = { onConfirmed(dialog, bundleOf()) }, confirmText = stringResource(id = R.string.action_archive), - cancelText = stringResource(id = R.string.cancel) + cancelText = stringResource(id = R.string.cancel), + icon = ImageVector.vectorResource(R.drawable.ic_archive_fill_round_24) ) } @@ -37,17 +40,23 @@ fun HandleDialogs( title = stringResource(id = R.string.confirm_unarchive_convo), confirmAction = { onConfirmed(dialog, bundleOf()) }, confirmText = stringResource(id = R.string.action_unarchive), - cancelText = stringResource(id = R.string.cancel) + cancelText = stringResource(id = R.string.cancel), + icon = ImageVector.vectorResource(R.drawable.ic_unarchive_fill_round_24) ) } is ConvoDialog.ConvoDelete -> { + val errorColor = MaterialTheme.colorScheme.error + MaterialDialog( onDismissRequest = { onDismissed(dialog) }, + icon = ImageVector.vectorResource(R.drawable.ic_delete_fill_round_24), + iconTint = errorColor, title = stringResource(id = R.string.confirm_delete_convo), confirmAction = { onConfirmed(dialog, bundleOf()) }, confirmText = stringResource(id = R.string.action_delete), - cancelText = stringResource(id = R.string.cancel) + confirmContainerColor = errorColor, + cancelText = stringResource(id = R.string.cancel), ) } @@ -57,7 +66,8 @@ fun HandleDialogs( title = stringResource(id = R.string.confirm_pin_convo), confirmAction = { onConfirmed(dialog, bundleOf()) }, confirmText = stringResource(id = R.string.action_pin), - cancelText = stringResource(id = R.string.cancel) + cancelText = stringResource(id = R.string.cancel), + icon = ImageVector.vectorResource(R.drawable.ic_keep_fill_round_24) ) } @@ -67,7 +77,8 @@ fun HandleDialogs( title = stringResource(id = R.string.confirm_unpin_convo), confirmAction = { onConfirmed(dialog, bundleOf()) }, confirmText = stringResource(id = R.string.action_unpin), - cancelText = stringResource(id = R.string.cancel) + cancelText = stringResource(id = R.string.cancel), + icon = ImageVector.vectorResource(R.drawable.ic_keep_off_fill_round_24) ) } } diff --git a/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvoItem.kt b/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvoItem.kt index b1c3d529..587edce3 100644 --- a/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvoItem.kt +++ b/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvoItem.kt @@ -7,6 +7,7 @@ import androidx.compose.animation.fadeOut import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background import androidx.compose.foundation.combinedClickable +import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -19,12 +20,13 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyRow -import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.ElevatedAssistChip import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon +import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.surfaceColorAtElevation @@ -45,6 +47,7 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil.compose.AsyncImage +import dev.meloda.fast.ui.R import dev.meloda.fast.ui.basic.ContentAlpha import dev.meloda.fast.ui.basic.LocalContentAlpha import dev.meloda.fast.ui.components.DotsFlashing @@ -53,7 +56,6 @@ import dev.meloda.fast.ui.model.vk.UiConvo import dev.meloda.fast.ui.util.getImage import dev.meloda.fast.ui.util.getResourcePainter import dev.meloda.fast.ui.util.getString -import dev.meloda.fast.ui.R val BirthdayColor = Color(0xffb00b69) @@ -127,7 +129,7 @@ fun ConvoItem( modifier = Modifier .align(Alignment.Center) .size(32.dp), - painter = painterResource(id = R.drawable.ic_round_bookmark_border_24), + painter = painterResource(id = R.drawable.ic_bookmark_round_24), contentDescription = "Favorites icon", tint = MaterialTheme.colorScheme.onPrimary ) @@ -150,7 +152,7 @@ fun ConvoItem( modifier = Modifier .fillMaxSize() .clip(CircleShape), - placeholder = painterResource(id = R.drawable.ic_account_circle_cut) + placeholder = painterResource(id = R.drawable.ic_account_circle_fill_round_24) ) } } @@ -166,7 +168,7 @@ fun ConvoItem( modifier = Modifier .height(14.dp) .align(Alignment.Center), - painter = painterResource(id = R.drawable.ic_round_push_pin_24), + painter = painterResource(id = R.drawable.ic_keep_fill_round_24), contentDescription = "Pin icon", tint = Color.White ) @@ -222,7 +224,7 @@ fun ConvoItem( modifier = Modifier .align(Alignment.Center) .size(10.dp), - painter = painterResource(id = R.drawable.round_cake_24), + painter = painterResource(id = R.drawable.ic_cake_fill_round_24), contentDescription = "Birthday icon", tint = Color.White ) @@ -363,11 +365,18 @@ fun ConvoItem( Spacer(modifier = Modifier.height(4.dp)) LazyRow( - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 10.dp) + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(8.dp), + overscrollEffect = null, ) { - items(convo.options.toList()) { option -> + itemsIndexed( + items = convo.options.toList(), + key = { _, option -> option.hashCode() } + ) { index, option -> + if (index == 0) { + Spacer(modifier = Modifier.width(8.dp)) + } + ElevatedAssistChip( onClick = { onOptionClicked(convo, option) }, leadingIcon = { @@ -375,7 +384,10 @@ fun ConvoItem( Icon( painter = painter, contentDescription = "Chip icon", - modifier = Modifier.size(16.dp) + modifier = Modifier.size(16.dp), + tint = if (option is ConvoOption.Delete) { + MaterialTheme.colorScheme.error + } else LocalContentColor.current ) } }, @@ -383,7 +395,10 @@ fun ConvoItem( Text(text = option.title.getString().orEmpty()) } ) - Spacer(Modifier.width(8.dp)) + + if (index == convo.options.lastIndex) { + Spacer(modifier = Modifier.width(8.dp)) + } } } } diff --git a/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvosList.kt b/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvosList.kt index 8a5b79b1..35f65c0c 100644 --- a/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvosList.kt +++ b/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvosList.kt @@ -112,7 +112,7 @@ fun ConvosList( colors = IconButtonDefaults.filledIconButtonColors() ) { Icon( - painter = painterResource(R.drawable.round_keyboard_arrow_up_24px), + painter = painterResource(R.drawable.ic_keyboard_arrow_up_round_24), contentDescription = null ) } diff --git a/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvosRoute.kt b/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvosRoute.kt index 6ccb8fba..40b9c2a9 100644 --- a/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvosRoute.kt +++ b/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvosRoute.kt @@ -54,7 +54,6 @@ fun ConvosRoute( onConvoItemLongClicked = viewModel::onConvoItemLongClick, onOptionClicked = viewModel::onOptionClicked, onPaginationConditionsMet = viewModel::onPaginationConditionsMet, - onRefreshDropdownItemClicked = viewModel::onRefresh, onRefresh = viewModel::onRefresh, onCreateChatButtonClicked = viewModel::onCreateChatButtonClicked, onArchiveActionClicked = { onNavigateToArchive?.invoke() }, 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 2cdea729..5cfe39a8 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 @@ -92,7 +92,6 @@ fun ConvosScreen( onConvoItemLongClicked: (convo: UiConvo) -> Unit = {}, onOptionClicked: (UiConvo, ConvoOption) -> Unit = { _, _ -> }, onPaginationConditionsMet: () -> Unit = {}, - onRefreshDropdownItemClicked: () -> Unit = {}, onRefresh: () -> Unit = {}, onCreateChatButtonClicked: () -> Unit = {}, onArchiveActionClicked: () -> Unit = {}, @@ -194,7 +193,7 @@ fun ConvosScreen( if (screenState.isArchive) { IconButton(onClick = onBack) { Icon( - painter = painterResource(R.drawable.round_arrow_back_24px), + painter = painterResource(R.drawable.ic_arrow_back_round_24), contentDescription = null ) } @@ -216,7 +215,7 @@ fun ConvosScreen( dropDownItems += { DropdownMenuItem( onClick = { - onRefreshDropdownItemClicked() + onRefresh() dropDownMenuExpanded = false }, text = { @@ -224,7 +223,7 @@ fun ConvosScreen( }, leadingIcon = { Icon( - painter = painterResource(R.drawable.round_refresh_24px), + painter = painterResource(R.drawable.ic_refresh_round_24), contentDescription = null ) } @@ -235,7 +234,7 @@ fun ConvosScreen( if (dropDownItems.isNotEmpty()) { IconButton(onClick = { dropDownMenuExpanded = true }) { Icon( - painter = painterResource(R.drawable.round_more_vert_24px), + painter = painterResource(R.drawable.ic_more_vert_round_24), contentDescription = null ) } @@ -292,7 +291,7 @@ fun ConvosScreen( } ) { Icon( - painter = painterResource(id = R.drawable.round_create_24), + painter = painterResource(id = R.drawable.ic_edit_round_24), contentDescription = "Add chat button" ) } diff --git a/feature/createchat/src/main/kotlin/dev/meloda/fast/convos/presentation/CreateChatItem.kt b/feature/createchat/src/main/kotlin/dev/meloda/fast/convos/presentation/CreateChatItem.kt index 27fb1d28..ff2fbe9e 100644 --- a/feature/createchat/src/main/kotlin/dev/meloda/fast/convos/presentation/CreateChatItem.kt +++ b/feature/createchat/src/main/kotlin/dev/meloda/fast/convos/presentation/CreateChatItem.kt @@ -53,7 +53,7 @@ fun CreateChatItem( modifier = Modifier .fillMaxSize() .clip(CircleShape), - painter = painterResource(id = R.drawable.ic_account_circle_cut), + painter = painterResource(id = R.drawable.ic_account_circle_fill_round_24), contentDescription = "Avatar", colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onBackground) ) @@ -64,7 +64,7 @@ fun CreateChatItem( modifier = Modifier .fillMaxSize() .clip(CircleShape), - placeholder = painterResource(id = R.drawable.ic_account_circle_cut) + placeholder = painterResource(id = R.drawable.ic_account_circle_fill_round_24) ) } diff --git a/feature/createchat/src/main/kotlin/dev/meloda/fast/convos/presentation/CreateChatList.kt b/feature/createchat/src/main/kotlin/dev/meloda/fast/convos/presentation/CreateChatList.kt index 932bb8f4..9a71b3c4 100644 --- a/feature/createchat/src/main/kotlin/dev/meloda/fast/convos/presentation/CreateChatList.kt +++ b/feature/createchat/src/main/kotlin/dev/meloda/fast/convos/presentation/CreateChatList.kt @@ -80,7 +80,7 @@ fun CreateChatList( colors = IconButtonDefaults.filledIconButtonColors() ) { Icon( - painter = painterResource(R.drawable.round_keyboard_arrow_up_24px), + painter = painterResource(R.drawable.ic_keyboard_arrow_up_round_24), contentDescription = null ) } diff --git a/feature/createchat/src/main/kotlin/dev/meloda/fast/convos/presentation/CreateChatScreen.kt b/feature/createchat/src/main/kotlin/dev/meloda/fast/convos/presentation/CreateChatScreen.kt index 13018ed1..b6e2f2fa 100644 --- a/feature/createchat/src/main/kotlin/dev/meloda/fast/convos/presentation/CreateChatScreen.kt +++ b/feature/createchat/src/main/kotlin/dev/meloda/fast/convos/presentation/CreateChatScreen.kt @@ -207,7 +207,7 @@ fun CreateChatScreen( navigationIcon = { FastIconButton(onClick = onBack) { Icon( - painter = painterResource(R.drawable.round_arrow_back_24px), + painter = painterResource(R.drawable.ic_arrow_back_round_24), contentDescription = null ) } @@ -275,7 +275,7 @@ fun CreateChatScreen( text = { Text(text = stringResource(R.string.action_create)) }, icon = { Icon( - painter = painterResource(R.drawable.round_check_24px), + painter = painterResource(R.drawable.ic_check_round_24), contentDescription = null ) } diff --git a/feature/friends/src/main/kotlin/dev/meloda/fast/friends/presentation/FriendItem.kt b/feature/friends/src/main/kotlin/dev/meloda/fast/friends/presentation/FriendItem.kt index d5c7ba68..1b588cf0 100644 --- a/feature/friends/src/main/kotlin/dev/meloda/fast/friends/presentation/FriendItem.kt +++ b/feature/friends/src/main/kotlin/dev/meloda/fast/friends/presentation/FriendItem.kt @@ -49,7 +49,7 @@ fun FriendItem( modifier = Modifier .fillMaxSize() .clip(CircleShape), - painter = painterResource(id = R.drawable.ic_account_circle_cut), + painter = painterResource(id = R.drawable.ic_account_circle_fill_round_24), contentDescription = "Avatar", colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onBackground) ) @@ -64,7 +64,7 @@ fun FriendItem( ?.extractUrl() ?.let(onPhotoClicked) }, - placeholder = painterResource(id = R.drawable.ic_account_circle_cut) + placeholder = painterResource(id = R.drawable.ic_account_circle_fill_round_24) ) if (friend.onlineStatus.isOnline()) { @@ -104,7 +104,7 @@ fun FriendItem( } ) { Icon( - painter = painterResource(R.drawable.round_mail_24px), + painter = painterResource(R.drawable.ic_mail_fill_round_24), contentDescription = null, tint = MaterialTheme.colorScheme.primary ) diff --git a/feature/friends/src/main/kotlin/dev/meloda/fast/friends/presentation/FriendsList.kt b/feature/friends/src/main/kotlin/dev/meloda/fast/friends/presentation/FriendsList.kt index b0c5ee80..ef679198 100644 --- a/feature/friends/src/main/kotlin/dev/meloda/fast/friends/presentation/FriendsList.kt +++ b/feature/friends/src/main/kotlin/dev/meloda/fast/friends/presentation/FriendsList.kt @@ -92,7 +92,7 @@ fun FriendsList( colors = IconButtonDefaults.filledIconButtonColors() ) { Icon( - painter = painterResource(R.drawable.round_keyboard_arrow_up_24px), + painter = painterResource(R.drawable.ic_keyboard_arrow_up_round_24), contentDescription = null ) } diff --git a/feature/friends/src/main/kotlin/dev/meloda/fast/friends/presentation/RootFriendsScreen.kt b/feature/friends/src/main/kotlin/dev/meloda/fast/friends/presentation/RootFriendsScreen.kt index 90489634..c69d89dc 100644 --- a/feature/friends/src/main/kotlin/dev/meloda/fast/friends/presentation/RootFriendsScreen.kt +++ b/feature/friends/src/main/kotlin/dev/meloda/fast/friends/presentation/RootFriendsScreen.kt @@ -195,7 +195,7 @@ fun FriendsRoute( } ) { Icon( - painter = painterResource(R.drawable.round_filter_list_24), + painter = painterResource(R.drawable.ic_filter_list_round_24), contentDescription = null ) } diff --git a/feature/languagepicker/src/main/kotlin/dev/meloda/fast/languagepicker/presentation/LanguagePickerScreen.kt b/feature/languagepicker/src/main/kotlin/dev/meloda/fast/languagepicker/presentation/LanguagePickerScreen.kt index 34119915..5523f2dc 100644 --- a/feature/languagepicker/src/main/kotlin/dev/meloda/fast/languagepicker/presentation/LanguagePickerScreen.kt +++ b/feature/languagepicker/src/main/kotlin/dev/meloda/fast/languagepicker/presentation/LanguagePickerScreen.kt @@ -115,7 +115,7 @@ fun LanguagePickerScreen( navigationIcon = { IconButton(onClick = onBack) { Icon( - painter = painterResource(R.drawable.round_arrow_back_24px), + painter = painterResource(R.drawable.ic_arrow_back_round_24), contentDescription = "Navigate back" ) } @@ -132,7 +132,7 @@ fun LanguagePickerScreen( } ) { Icon( - painter = painterResource(R.drawable.round_more_vert_24px), + painter = painterResource(R.drawable.ic_more_vert_round_24), contentDescription = "Options" ) } 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 a341d281..5287730d 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 @@ -14,22 +14,22 @@ sealed class MessageOption( data object Retry : MessageOption( titleResId = R.string.message_context_action_retry, - iconResId = R.drawable.round_restart_alt_24 + iconResId = R.drawable.ic_restart_alt_round_24 ) data object Reply : MessageOption( titleResId = R.string.message_context_action_reply, - iconResId = R.drawable.round_reply_24 + iconResId = R.drawable.ic_reply_round_24 ) data object ForwardHere : MessageOption( titleResId = R.string.message_context_action_forward_here, - iconResId = R.drawable.round_reply_all_24 + iconResId = R.drawable.ic_reply_all_round_24 ) data object Forward : MessageOption( titleResId = R.string.message_context_action_forward, - iconResId = R.drawable.round_forward_24 + iconResId = R.drawable.ic_forward_round_24 ) data object Pin : MessageOption( @@ -44,37 +44,37 @@ sealed class MessageOption( data object Read : MessageOption( titleResId = R.string.message_context_action_read, - iconResId = R.drawable.round_mark_email_read_24 + iconResId = R.drawable.ic_done_all_round_24 ) data object Copy : MessageOption( titleResId = R.string.message_context_action_copy, - iconResId = R.drawable.round_content_copy_24 + iconResId = R.drawable.ic_content_copy_round_24 ) data object MarkAsImportant : MessageOption( titleResId = R.string.message_context_action_mark_as_important, - iconResId = R.drawable.round_star_24 + iconResId = R.drawable.ic_star_round_24 ) data object UnmarkAsImportant : MessageOption( titleResId = R.string.message_context_action_unmark_as_important, - iconResId = R.drawable.round_star_outline_24 + iconResId = R.drawable.ic_star_round_24 ) data object MarkAsSpam : MessageOption( titleResId = R.string.message_context_action_mark_as_spam, - iconResId = R.drawable.round_report_gmailerrorred_24 + iconResId = R.drawable.ic_report_round_24 ) data object UnmarkAsSpam : MessageOption( titleResId = R.string.message_context_action_unmark_as_spam, - iconResId = R.drawable.round_report_off_24 + iconResId = R.drawable.ic_report_off_round_24 ) data object Edit : MessageOption( titleResId = R.string.message_context_action_edit, - iconResId = R.drawable.round_create_24 + iconResId = R.drawable.ic_edit_round_24 ) data object Delete : MessageOption( 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 16e31ea8..1e854e15 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 @@ -45,7 +45,7 @@ fun BoxScope.DateStatus( if (isImportant) { Spacer(modifier = Modifier.width(4.dp)) Icon( - painter = painterResource(R.drawable.round_star_24), + painter = painterResource(R.drawable.ic_star_round_24), contentDescription = null, modifier = Modifier.size(14.dp) ) @@ -64,7 +64,7 @@ fun BoxScope.DateStatus( if (isEdited) { Spacer(modifier = Modifier.width(4.dp)) Icon( - painter = painterResource(R.drawable.round_edit_24px), + painter = painterResource(R.drawable.ic_edit_round_24), contentDescription = null, modifier = Modifier.size(14.dp) ) @@ -83,13 +83,13 @@ fun BoxScope.DateStatus( modifier = Modifier.size(14.dp), painter = painterResource( when (sendingStatus) { - SendingStatus.SENDING -> R.drawable.round_access_time_24 + SendingStatus.SENDING -> R.drawable.ic_schedule_round_24 SendingStatus.SENT -> { if (isRead) R.drawable.ic_done_all_round_24 - else R.drawable.ic_round_done_24 + else R.drawable.ic_check_round_24 } - SendingStatus.FAILED -> R.drawable.round_error_outline_24 + SendingStatus.FAILED -> R.drawable.ic_error_round_24 } ), tint = if (sendingStatus == SendingStatus.FAILED) MaterialTheme.colorScheme.error 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 5fdf622d..3df61efd 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 @@ -200,7 +200,7 @@ fun InputBar( }, ) { Icon( - painter = painterResource(id = R.drawable.ic_outline_emoji_emotions_24), + painter = painterResource(id = R.drawable.ic_sentiment_satisfied_round_24), contentDescription = "Emoji button", tint = MaterialTheme.colorScheme.primary ) @@ -291,7 +291,7 @@ fun InputBar( } ) { Icon( - painter = painterResource(id = R.drawable.round_attach_file_24), + painter = painterResource(id = R.drawable.ic_attach_file_round_24), contentDescription = "Add attachment button", tint = MaterialTheme.colorScheme.primary, ) @@ -325,10 +325,10 @@ fun InputBar( painter = painterResource( id = when (actionMode) { 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 - ActionMode.SEND -> R.drawable.round_send_24 + ActionMode.EDIT -> R.drawable.ic_check_round_24 + ActionMode.RECORD_AUDIO -> R.drawable.ic_mic_round_24 + ActionMode.RECORD_VIDEO -> R.drawable.ic_photo_camera_round_24 + ActionMode.SEND -> R.drawable.ic_send_round_24 } ), contentDescription = null, diff --git a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessageBubbleIncoming.kt b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessageBubbleIncoming.kt index 39008cf8..e238f62d 100644 --- a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessageBubbleIncoming.kt +++ b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessageBubbleIncoming.kt @@ -72,7 +72,7 @@ fun IncomingMessageBubble( ) { Box(modifier = Modifier.fillMaxWidth()) { Icon( - painter = painterResource(R.drawable.round_reply_24), + painter = painterResource(R.drawable.ic_reply_round_24), contentDescription = null, tint = MaterialTheme.colorScheme.secondary, modifier = Modifier diff --git a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessageBubbleOutgoing.kt b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessageBubbleOutgoing.kt index 99758989..f3af6cce 100644 --- a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessageBubbleOutgoing.kt +++ b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessageBubbleOutgoing.kt @@ -52,7 +52,7 @@ fun OutgoingMessageBubble( contentAlignment = Alignment.CenterEnd ) { Icon( - painter = painterResource(R.drawable.round_reply_24), + painter = painterResource(R.drawable.ic_reply_round_24), contentDescription = null, tint = MaterialTheme.colorScheme.secondary, modifier = Modifier diff --git a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessagesHistoryDialogs.kt b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessagesHistoryDialogs.kt index 01f49666..5cbd394f 100644 --- a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessagesHistoryDialogs.kt +++ b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessagesHistoryDialogs.kt @@ -5,6 +5,7 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.material3.Checkbox @@ -170,6 +171,7 @@ fun MessageOptionsDialog( } MaterialDialog(onDismissRequest = onDismissed) { + Spacer(modifier = Modifier.height(4.dp)) if (showReadPeers) { var viewCount by remember { mutableStateOf(null) @@ -181,31 +183,32 @@ fun MessageOptionsDialog( MessageOptionItem( title = viewCount?.let { "$it views" } ?: "...", - iconResId = R.drawable.round_visibility_24px, + iconResId = R.drawable.ic_visibility_round_24, tintColor = primaryColor, onClick = {} ) } - messageOptions - .forEachIndexed { index, (titleResId, iconResId, tintColor) -> - MessageOptionItem( - title = stringResource(titleResId), - iconResId = iconResId, - tintColor = tintColor, - onClick = { - onDismissed() - val pickedOption = options[index] - onItemPicked( - bundleOf( - "option" to pickedOption, - "messageId" to message.id, - "cmId" to message.cmId - ) + messageOptions.forEachIndexed { index, (titleResId, iconResId, tintColor) -> + MessageOptionItem( + title = stringResource(titleResId), + iconResId = iconResId, + tintColor = tintColor, + onClick = { + onDismissed() + val pickedOption = options[index] + onItemPicked( + bundleOf( + "option" to pickedOption, + "messageId" to message.id, + "cmId" to message.cmId ) - } - ) - } + ) + } + ) + } + + Spacer(modifier = Modifier.height(4.dp)) } } 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 d27f4952..39f101df 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 @@ -108,7 +108,7 @@ fun MessagesHistoryTopBar( modifier = Modifier .align(Alignment.Center) .size(24.dp), - painter = painterResource(id = R.drawable.ic_round_bookmark_border_24), + painter = painterResource(id = R.drawable.ic_bookmark_round_24), contentDescription = "Favorites icon", tint = MaterialTheme.colorScheme.onPrimary ) @@ -131,7 +131,7 @@ fun MessagesHistoryTopBar( modifier = Modifier .size(36.dp) .clip(CircleShape), - placeholder = painterResource(id = R.drawable.ic_account_circle_cut), + placeholder = painterResource(id = R.drawable.ic_account_circle_fill_round_24), ) } } @@ -158,9 +158,9 @@ fun MessagesHistoryTopBar( Icon( painter = painterResource( if (state) { - R.drawable.round_arrow_back_24px + R.drawable.ic_arrow_back_round_24 } else { - R.drawable.round_close_24px + R.drawable.ic_close_round_24 } ), contentDescription = if (state) "Close button" @@ -181,7 +181,7 @@ fun MessagesHistoryTopBar( } ) { Icon( - painter = painterResource(R.drawable.round_reply_24), + painter = painterResource(R.drawable.ic_reply_round_24), contentDescription = null ) } @@ -194,7 +194,7 @@ fun MessagesHistoryTopBar( } ) { Icon( - painter = painterResource(R.drawable.round_reply_all_24), + painter = painterResource(R.drawable.ic_reply_all_round_24), contentDescription = null ) } @@ -206,7 +206,7 @@ fun MessagesHistoryTopBar( } ) { Icon( - painter = painterResource(R.drawable.round_forward_24), + painter = painterResource(R.drawable.ic_forward_round_24), contentDescription = null ) } @@ -231,7 +231,7 @@ fun MessagesHistoryTopBar( }, leadingIcon = { Icon( - painter = painterResource(R.drawable.round_refresh_24px), + painter = painterResource(R.drawable.ic_refresh_round_24), contentDescription = null ) } @@ -244,7 +244,7 @@ fun MessagesHistoryTopBar( onClick = { dropDownMenuExpanded = true } ) { Icon( - painter = painterResource(R.drawable.round_more_vert_24px), + painter = painterResource(R.drawable.ic_more_vert_round_24), contentDescription = "Options" ) } 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 6279b1b9..5d115bf6 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 @@ -89,7 +89,7 @@ fun PinnedMessageContainer( onClick = onUnpinMessageButtonClicked ) { Icon( - painter = painterResource(R.drawable.round_close_24px), + painter = painterResource(R.drawable.ic_close_round_24), contentDescription = null, modifier = Modifier.alpha(0.5f), ) diff --git a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/ReplyContainer.kt b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/ReplyContainer.kt index f69202ff..7489d699 100644 --- a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/ReplyContainer.kt +++ b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/ReplyContainer.kt @@ -57,7 +57,7 @@ fun ReplyContainer( verticalAlignment = Alignment.CenterVertically ) { Icon( - painter = painterResource(R.drawable.round_reply_24px), + painter = painterResource(R.drawable.ic_reply_round_24), contentDescription = null, tint = MaterialTheme.colorScheme.primary ) @@ -90,7 +90,7 @@ fun ReplyContainer( onClick = onCloseClicked ) { Icon( - painter = painterResource(R.drawable.round_close_24px), + painter = painterResource(R.drawable.ic_close_round_24), contentDescription = null, ) } diff --git a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/attachments/Audio.kt b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/attachments/Audio.kt index 7384ca70..055ee80f 100644 --- a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/attachments/Audio.kt +++ b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/attachments/Audio.kt @@ -48,7 +48,7 @@ fun Audio( .background(MaterialTheme.colorScheme.primary) .size(36.dp) .padding(4.dp), - painter = painterResource(R.drawable.round_fill_play_arrow_24px), + painter = painterResource(R.drawable.ic_play_arrow_fill_round_24), contentDescription = null, tint = contentColorFor(MaterialTheme.colorScheme.primary) ) diff --git a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/attachments/AudioMessage.kt b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/attachments/AudioMessage.kt index a6fb3983..028eec90 100644 --- a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/attachments/AudioMessage.kt +++ b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/attachments/AudioMessage.kt @@ -90,8 +90,8 @@ fun AudioMessage( ) { Icon( painter = painterResource( - if (isPlaying) R.drawable.round_pause_24 - else R.drawable.round_fill_play_arrow_24px, + if (isPlaying) R.drawable.ic_pause_round_24 + else R.drawable.ic_play_arrow_fill_round_24, ), contentDescription = null ) diff --git a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/attachments/Gift.kt b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/attachments/Gift.kt index dad9cd93..a1d1819d 100644 --- a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/attachments/Gift.kt +++ b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/attachments/Gift.kt @@ -47,7 +47,7 @@ fun Gift( horizontalArrangement = Arrangement.Center ) { Icon( - imageVector = ImageVector.vectorResource(R.drawable.ic_attachment_gift), + imageVector = ImageVector.vectorResource(R.drawable.ic_attachment_gift_old), contentDescription = null, modifier = Modifier.size(16.dp) ) diff --git a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/attachments/Previews.kt b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/attachments/Previews.kt index e6477db7..9dd16509 100644 --- a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/attachments/Previews.kt +++ b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/attachments/Previews.kt @@ -110,7 +110,7 @@ fun DynamicPreviewGrid( ) { Icon( modifier = Modifier, - painter = painterResource(R.drawable.round_fill_play_arrow_24px), + painter = painterResource(R.drawable.ic_play_arrow_fill_round_24), contentDescription = null, tint = Color.White ) diff --git a/feature/photoviewer/src/main/kotlin/dev/meloda/fast/photoviewer/presentation/PhotoViewScreen.kt b/feature/photoviewer/src/main/kotlin/dev/meloda/fast/photoviewer/presentation/PhotoViewScreen.kt index 89f969bc..605f737d 100644 --- a/feature/photoviewer/src/main/kotlin/dev/meloda/fast/photoviewer/presentation/PhotoViewScreen.kt +++ b/feature/photoviewer/src/main/kotlin/dev/meloda/fast/photoviewer/presentation/PhotoViewScreen.kt @@ -243,7 +243,7 @@ private fun TopBar( navigationIcon = { IconButton(onClick = onBack) { Icon( - painter = painterResource(R.drawable.round_arrow_back_24px), + painter = painterResource(R.drawable.ic_arrow_back_round_24), contentDescription = "Back button", tint = Color.White ) @@ -254,7 +254,7 @@ private fun TopBar( onClick = { dropdownMenuShown = true } ) { Icon( - painter = painterResource(R.drawable.round_more_vert_24px), + painter = painterResource(R.drawable.ic_more_vert_round_24), contentDescription = "Options", tint = Color.White ) diff --git a/feature/profile/src/main/kotlin/dev/meloda/fast/profile/presentation/ProfileScreen.kt b/feature/profile/src/main/kotlin/dev/meloda/fast/profile/presentation/ProfileScreen.kt index c3150429..85afbf92 100644 --- a/feature/profile/src/main/kotlin/dev/meloda/fast/profile/presentation/ProfileScreen.kt +++ b/feature/profile/src/main/kotlin/dev/meloda/fast/profile/presentation/ProfileScreen.kt @@ -74,7 +74,7 @@ fun ProfileScreen( actions = { IconButton(onClick = onSettingsButtonClicked) { Icon( - painter = painterResource(R.drawable.round_settings_24px), + painter = painterResource(R.drawable.ic_settings_round_24), contentDescription = null ) } @@ -112,7 +112,7 @@ fun ProfileScreen( model = screenState.avatarUrl, contentDescription = null, contentScale = ContentScale.Crop, - placeholder = painterResource(id = R.drawable.ic_account_circle_cut) + placeholder = painterResource(id = R.drawable.ic_account_circle_fill_round_24) ) Spacer(modifier = Modifier.height(18.dp)) diff --git a/feature/settings/src/main/kotlin/dev/meloda/fast/settings/presentation/SettingsScreen.kt b/feature/settings/src/main/kotlin/dev/meloda/fast/settings/presentation/SettingsScreen.kt index dcc4ff1e..9898cdd5 100644 --- a/feature/settings/src/main/kotlin/dev/meloda/fast/settings/presentation/SettingsScreen.kt +++ b/feature/settings/src/main/kotlin/dev/meloda/fast/settings/presentation/SettingsScreen.kt @@ -92,7 +92,7 @@ fun SettingsScreen( navigationIcon = { IconButton(onClick = onBack) { Icon( - painter = painterResource(id = R.drawable.round_arrow_back_24px), + painter = painterResource(id = R.drawable.ic_arrow_back_round_24), contentDescription = "Back button" ) }