From b695940114cc62e5d21b64efbf6bddf17408a681 Mon Sep 17 00:00:00 2001 From: AntsyLich <59261191+AntsyLich@users.noreply.github.com> Date: Sat, 29 Aug 2026 21:39:55 +0600 Subject: [PATCH] Switch to Material Symbols and use Valkyrie for ImageVector generation (#3873) * Add material symbols icon module Assisted-by: Claude:claude-opus-5 * Replace material icons with material symbols Assisted-by: Claude:claude-opus-5 * Add simple icons module and migrate CustomIcons Assisted-by: Claude:claude-opus-5 --- app/build.gradle.kts | 3 +- .../presentation/browse/BrowseSourceScreen.kt | 16 ++-- .../browse/ExtensionDetailsScreen.kt | 10 +- .../presentation/browse/ExtensionsScreen.kt | 30 +++--- .../browse/MigrateSourceScreen.kt | 18 ++-- .../presentation/browse/SourcesScreen.kt | 8 +- .../browse/components/BrowseBadges.kt | 6 +- .../browse/components/BrowseIcons.kt | 10 +- .../browse/components/BrowseSourceToolbar.kt | 10 +- .../components/GlobalSearchResultItems.kt | 10 +- .../browse/components/GlobalSearchToolbar.kt | 14 +-- .../CategoryFloatingActionButton.kt | 6 +- .../category/components/CategoryListItem.kt | 14 +-- .../kanade/presentation/components/AppBar.kt | 20 ++-- .../presentation/components/DropdownMenu.kt | 14 +-- .../presentation/components/EmptyScreen.kt | 10 +- .../presentation/components/TabbedDialog.kt | 6 +- .../kanade/presentation/crash/CrashScreen.kt | 6 +- .../presentation/history/HistoryScreen.kt | 6 +- .../history/components/HistoryItem.kt | 10 +- .../library/LibrarySettingsDialog.kt | 6 +- .../library/components/CommonMangaItem.kt | 6 +- .../library/components/LibraryBadges.kt | 6 +- .../library/components/LibraryToolbar.kt | 14 +-- .../manga/ChapterSettingsDialog.kt | 6 +- .../manga/DuplicateMangaDialog.kt | 46 +++++----- .../kanade/presentation/manga/MangaScreen.kt | 8 +- .../components/ChapterDownloadIndicator.kt | 14 +-- .../manga/components/MangaBottomActionMenu.kt | 46 +++++----- .../manga/components/MangaChapterListItem.kt | 34 +++---- .../manga/components/MangaCoverDialog.kt | 18 ++-- .../manga/components/MangaInfoHeader.kt | 60 ++++++------ .../manga/components/MangaNotesSection.kt | 6 +- .../manga/components/MangaNotesTextArea.kt | 22 ++--- .../manga/components/MangaToolbar.kt | 18 ++-- .../manga/components/MarkdownRender.kt | 6 +- .../manga/components/ScanlatorFilterDialog.kt | 10 +- .../eu/kanade/presentation/more/MoreScreen.kt | 38 ++++---- .../presentation/more/NewUpdateScreen.kt | 10 +- .../more/onboarding/OnboardingScreen.kt | 6 +- .../more/onboarding/PermissionStep.kt | 6 +- .../settings/screen/SettingsDataScreen.kt | 6 +- .../settings/screen/SettingsMainScreen.kt | 46 +++++----- .../settings/screen/SettingsSearchScreen.kt | 6 +- .../settings/screen/SettingsTrackingScreen.kt | 18 ++-- .../more/settings/screen/about/AboutScreen.kt | 28 +++--- .../screen/advanced/ClearDatabaseScreen.kt | 10 +- .../screen/appearance/AppLanguageScreen.kt | 6 +- .../components/ExtensionStoresContent.kt | 24 ++--- .../components/ExtensionStoresScreen.kt | 6 +- .../screen/debug/BackupSchemaScreen.kt | 6 +- .../settings/screen/debug/DebugInfoScreen.kt | 6 +- .../settings/screen/debug/WorkerInfoScreen.kt | 6 +- .../widget/AppThemePreferenceWidget.kt | 6 +- .../widget/EditTextPreferenceWidget.kt | 10 +- .../more/settings/widget/InfoWidget.kt | 6 +- .../settings/widget/SwitchPreferenceWidget.kt | 6 +- .../settings/widget/TextPreferenceWidget.kt | 6 +- .../widget/TrackingPreferenceWidget.kt | 6 +- .../settings/widget/TriStateListDialog.kt | 14 +-- .../more/stats/StatsScreenContent.kt | 14 +-- .../presentation/reader/ChapterTransition.kt | 14 +-- .../reader/ReaderPageActionsDialog.kt | 18 ++-- .../reader/appbars/ReaderBottomBar.kt | 6 +- .../reader/appbars/ReaderTopBar.kt | 10 +- .../reader/components/ChapterNavigator.kt | 14 +-- .../reader/components/ModeSelectionDialog.kt | 6 +- .../presentation/track/TrackInfoDialogHome.kt | 10 +- .../presentation/track/TrackerSearch.kt | 18 ++-- .../presentation/updates/UpdatesScreen.kt | 22 ++--- .../presentation/updates/UpdatesUiItem.kt | 10 +- .../webview/WebViewScreenContent.kt | 14 +-- .../migration/manga/MigrateMangaScreen.kt | 6 +- .../search/MigrateSourceSearchScreen.kt | 6 +- .../migration/sources/MigrateSourceTab.kt | 6 +- .../tachiyomi/ui/browse/source/SourcesTab.kt | 10 +- .../source/browse/BrowseSourceScreen.kt | 14 +-- .../ui/download/DownloadQueueScreen.kt | 14 +-- .../kanade/tachiyomi/ui/library/LibraryTab.kt | 6 +- .../kanade/tachiyomi/ui/main/MainActivity.kt | 10 +- .../ui/manga/track/TrackInfoDialog.kt | 8 +- .../ui/reader/setting/ReaderOrientation.kt | 26 +++--- .../migration/config/MigrationConfigScreen.kt | 20 ++-- .../config/MigrationConfigScreenSheet.kt | 10 +- .../list/MigrationListScreenContent.kt | 38 +++++--- .../mihon/feature/support/SupportUsScreen.kt | 20 ++-- .../feature/upcoming/UpcomingScreenContent.kt | 10 +- .../components/calendar/CalendarHeader.kt | 10 +- gradle/libs.versions.toml | 4 +- icons/material-symbols/build.gradle.kts | 57 ++++++++++++ .../autoMirroredRounded/arrow_back.svg | 6 ++ .../autoMirroredRounded/arrow_forward.svg | 6 ++ .../autoMirroredRounded/arrow_right.svg | 6 ++ .../chrome_reader_mode.svg | 6 ++ .../format_list_bulleted.svg | 6 ++ .../autoMirroredRounded/help.svg | 6 ++ .../autoMirroredRounded/label.svg | 6 ++ .../autoMirroredRounded/open_in_new.svg | 6 ++ .../autoMirroredRounded/sort.svg | 6 ++ .../autoMirroredRounded/view_list.svg | 6 ++ .../main/valkyrieResources/rounded/add.svg | 6 ++ .../rounded/arrow_downward.svg | 6 ++ .../rounded/arrow_upward.svg | 6 ++ .../rounded/attach_money.svg | 6 ++ .../valkyrieResources/rounded/autorenew.svg | 6 ++ .../main/valkyrieResources/rounded/block.svg | 6 ++ .../valkyrieResources/rounded/bookmark.svg | 6 ++ .../rounded/bookmark_add.svg | 6 ++ .../rounded/bookmark_remove.svg | 6 ++ .../main/valkyrieResources/rounded/brush.svg | 6 ++ .../valkyrieResources/rounded/bug_report.svg | 6 ++ .../rounded/calendar_month.svg | 6 ++ .../main/valkyrieResources/rounded/cancel.svg | 6 ++ .../main/valkyrieResources/rounded/check.svg | 6 ++ .../rounded/check_box_outline_blank.svg | 6 ++ .../main/valkyrieResources/rounded/close.svg | 6 ++ .../valkyrieResources/rounded/cloud_off.svg | 6 ++ .../main/valkyrieResources/rounded/code.svg | 6 ++ .../rounded/collections_bookmark.svg | 6 ++ .../rounded/content_copy.svg | 6 ++ .../valkyrieResources/rounded/copy_all.svg | 6 ++ .../valkyrieResources/rounded/dangerous.svg | 6 ++ .../main/valkyrieResources/rounded/delete.svg | 6 ++ .../rounded/delete_sweep.svg | 6 ++ .../valkyrieResources/rounded/deselect.svg | 6 ++ .../main/valkyrieResources/rounded/done.svg | 6 ++ .../valkyrieResources/rounded/done_all.svg | 6 ++ .../valkyrieResources/rounded/download.svg | 6 ++ .../valkyrieResources/rounded/drag_handle.svg | 6 ++ .../main/valkyrieResources/rounded/edit.svg | 6 ++ .../valkyrieResources/rounded/edit_note.svg | 6 ++ .../main/valkyrieResources/rounded/error.svg | 6 ++ .../valkyrieResources/rounded/expand_less.svg | 6 ++ .../valkyrieResources/rounded/expand_more.svg | 6 ++ .../valkyrieResources/rounded/explore.svg | 6 ++ .../valkyrieResources/rounded/favorite.svg | 6 ++ .../rounded/file_download_off.svg | 6 ++ .../valkyrieResources/rounded/filter_list.svg | 6 ++ .../rounded/flip_to_back.svg | 6 ++ .../main/valkyrieResources/rounded/folder.svg | 6 ++ .../valkyrieResources/rounded/format_bold.svg | 6 ++ .../rounded/format_italic.svg | 6 ++ .../rounded/format_list_numbered.svg | 6 ++ .../rounded/format_underlined.svg | 6 ++ .../rounded/hourglass_empty.svg | 6 ++ .../main/valkyrieResources/rounded/image.svg | 6 ++ .../main/valkyrieResources/rounded/info.svg | 6 ++ .../rounded/keyboard_arrow_left.svg | 6 ++ .../rounded/keyboard_arrow_right.svg | 6 ++ .../rounded/local_library.svg | 6 ++ .../valkyrieResources/rounded/more_vert.svg | 6 ++ .../rounded/new_releases.svg | 6 ++ .../valkyrieResources/rounded/newspaper.svg | 6 ++ .../valkyrieResources/rounded/numbers.svg | 6 ++ .../valkyrieResources/rounded/palette.svg | 6 ++ .../main/valkyrieResources/rounded/pause.svg | 6 ++ .../valkyrieResources/rounded/people_alt.svg | 6 ++ .../main/valkyrieResources/rounded/person.svg | 6 ++ .../main/valkyrieResources/rounded/photo.svg | 6 ++ .../valkyrieResources/rounded/play_arrow.svg | 6 ++ .../valkyrieResources/rounded/preview.svg | 6 ++ .../main/valkyrieResources/rounded/public.svg | 6 ++ .../valkyrieResources/rounded/push_pin.svg | 6 ++ .../valkyrieResources/rounded/query_stats.svg | 6 ++ .../rounded/radio_button_checked.svg | 6 ++ .../rounded/radio_button_unchecked.svg | 6 ++ .../valkyrieResources/rounded/refresh.svg | 6 ++ .../valkyrieResources/rounded/remove_done.svg | 6 ++ .../rounded/rocket_launch.svg | 6 ++ .../main/valkyrieResources/rounded/save.svg | 6 ++ .../valkyrieResources/rounded/schedule.svg | 6 ++ .../rounded/screen_lock_landscape.svg | 6 ++ .../rounded/screen_lock_portrait.svg | 6 ++ .../rounded/screen_rotation.svg | 6 ++ .../main/valkyrieResources/rounded/search.svg | 6 ++ .../valkyrieResources/rounded/security.svg | 6 ++ .../valkyrieResources/rounded/select_all.svg | 6 ++ .../valkyrieResources/rounded/settings.svg | 6 ++ .../main/valkyrieResources/rounded/share.svg | 6 ++ .../valkyrieResources/rounded/skip_next.svg | 6 ++ .../rounded/skip_previous.svg | 6 ++ .../rounded/sort_by_alpha.svg | 6 ++ .../rounded/stay_current_landscape.svg | 6 ++ .../rounded/stay_current_portrait.svg | 6 ++ .../valkyrieResources/rounded/storage.svg | 6 ++ .../valkyrieResources/rounded/swap_calls.svg | 6 ++ .../main/valkyrieResources/rounded/sync.svg | 6 ++ .../rounded/travel_explore.svg | 6 ++ .../rounded/verified_user.svg | 6 ++ .../valkyrieResources/rounded/view_module.svg | 6 ++ .../valkyrieResources/rounded/visibility.svg | 6 ++ .../rounded/visibility_off.svg | 6 ++ .../rounded/volunteer_activism.svg | 6 ++ .../valkyrieResources/rounded/warning.svg | 6 ++ .../roundedFilled/bookmark.svg | 6 ++ .../roundedFilled/check_box.svg | 6 ++ .../roundedFilled/check_circle.svg | 6 ++ .../roundedFilled/circle.svg | 6 ++ .../roundedFilled/disabled_by_default.svg | 6 ++ .../roundedFilled/favorite.svg | 6 ++ .../valkyrieResources/roundedFilled/pause.svg | 6 ++ .../roundedFilled/play_arrow.svg | 6 ++ .../roundedFilled/push_pin.svg | 6 ++ icons/simple-icons/build.gradle.kts | 38 ++++++++ .../src/main/valkyrieResources/discord.svg | 6 ++ .../src/main/valkyrieResources/facebook.svg | 6 ++ .../src/main/valkyrieResources/github.svg | 6 ++ .../valkyrieResources/open_collective.svg | 6 ++ .../src/main/valkyrieResources/patreon.svg | 6 ++ .../src/main/valkyrieResources/reddit.svg | 6 ++ .../src/main/valkyrieResources/x.svg | 6 ++ presentation-core/build.gradle.kts | 2 +- .../core/components/CollapsibleBox.kt | 8 +- .../core/components/SettingsItems.kt | 22 ++--- .../presentation/core/icons/CustomIcons.kt | 7 -- .../presentation/core/icons/Discord.kt | 86 ----------------- .../presentation/core/icons/Facebook.kt | 68 -------------- .../presentation/core/icons/Github.kt | 68 -------------- .../presentation/core/icons/OpenCollective.kt | 47 ---------- .../presentation/core/icons/Patreon.kt | 39 -------- .../presentation/core/icons/Reddit.kt | 92 ------------------- .../tachiyomi/presentation/core/icons/X.kt | 61 ------------ .../presentation/core/screens/InfoScreen.kt | 6 +- settings.gradle.kts | 2 + 224 files changed, 1449 insertions(+), 1083 deletions(-) create mode 100644 icons/material-symbols/build.gradle.kts create mode 100644 icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/arrow_back.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/arrow_forward.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/arrow_right.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/chrome_reader_mode.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/format_list_bulleted.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/help.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/label.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/open_in_new.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/sort.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/view_list.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/add.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/arrow_downward.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/arrow_upward.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/attach_money.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/autorenew.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/block.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/bookmark.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/bookmark_add.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/bookmark_remove.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/brush.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/bug_report.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/calendar_month.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/cancel.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/check.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/check_box_outline_blank.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/close.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/cloud_off.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/code.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/collections_bookmark.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/content_copy.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/copy_all.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/dangerous.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/delete.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/delete_sweep.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/deselect.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/done.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/done_all.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/download.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/drag_handle.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/edit.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/edit_note.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/error.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/expand_less.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/expand_more.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/explore.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/favorite.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/file_download_off.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/filter_list.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/flip_to_back.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/folder.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/format_bold.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/format_italic.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/format_list_numbered.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/format_underlined.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/hourglass_empty.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/image.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/info.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/keyboard_arrow_left.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/keyboard_arrow_right.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/local_library.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/more_vert.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/new_releases.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/newspaper.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/numbers.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/palette.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/pause.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/people_alt.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/person.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/photo.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/play_arrow.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/preview.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/public.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/push_pin.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/query_stats.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/radio_button_checked.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/radio_button_unchecked.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/refresh.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/remove_done.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/rocket_launch.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/save.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/schedule.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/screen_lock_landscape.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/screen_lock_portrait.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/screen_rotation.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/search.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/security.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/select_all.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/settings.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/share.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/skip_next.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/skip_previous.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/sort_by_alpha.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/stay_current_landscape.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/stay_current_portrait.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/storage.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/swap_calls.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/sync.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/travel_explore.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/verified_user.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/view_module.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/visibility.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/visibility_off.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/volunteer_activism.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/rounded/warning.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/roundedFilled/bookmark.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/roundedFilled/check_box.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/roundedFilled/check_circle.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/roundedFilled/circle.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/roundedFilled/disabled_by_default.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/roundedFilled/favorite.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/roundedFilled/pause.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/roundedFilled/play_arrow.svg create mode 100644 icons/material-symbols/src/main/valkyrieResources/roundedFilled/push_pin.svg create mode 100644 icons/simple-icons/build.gradle.kts create mode 100644 icons/simple-icons/src/main/valkyrieResources/discord.svg create mode 100644 icons/simple-icons/src/main/valkyrieResources/facebook.svg create mode 100644 icons/simple-icons/src/main/valkyrieResources/github.svg create mode 100644 icons/simple-icons/src/main/valkyrieResources/open_collective.svg create mode 100644 icons/simple-icons/src/main/valkyrieResources/patreon.svg create mode 100644 icons/simple-icons/src/main/valkyrieResources/reddit.svg create mode 100644 icons/simple-icons/src/main/valkyrieResources/x.svg delete mode 100644 presentation-core/src/main/java/tachiyomi/presentation/core/icons/CustomIcons.kt delete mode 100644 presentation-core/src/main/java/tachiyomi/presentation/core/icons/Discord.kt delete mode 100644 presentation-core/src/main/java/tachiyomi/presentation/core/icons/Facebook.kt delete mode 100644 presentation-core/src/main/java/tachiyomi/presentation/core/icons/Github.kt delete mode 100644 presentation-core/src/main/java/tachiyomi/presentation/core/icons/OpenCollective.kt delete mode 100644 presentation-core/src/main/java/tachiyomi/presentation/core/icons/Patreon.kt delete mode 100644 presentation-core/src/main/java/tachiyomi/presentation/core/icons/Reddit.kt delete mode 100644 presentation-core/src/main/java/tachiyomi/presentation/core/icons/X.kt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8f3cc96e1..796953e74 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -208,6 +208,8 @@ dependencies { baselineProfile(projects.baselineProfile) implementation(projects.i18n) + implementation(projects.icons.materialSymbols) + implementation(projects.icons.simpleIcons) implementation(projects.core.archive) implementation(projects.core.common) implementation(projects.core.metro) @@ -224,7 +226,6 @@ dependencies { implementation(libs.androidx.activity.compose) implementation(libs.androidx.compose.foundation) implementation(libs.androidx.compose.material3) - implementation(libs.androidx.compose.materialIcons) implementation(libs.androidx.compose.animation) implementation(libs.androidx.compose.animationGraphics) debugImplementation(libs.androidx.compose.uiTooling) diff --git a/app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt index a69c9ffed..08d211e7a 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt @@ -3,10 +3,6 @@ package eu.kanade.presentation.browse import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.grid.GridCells -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.HelpOutline -import androidx.compose.material.icons.outlined.Public -import androidx.compose.material.icons.outlined.Refresh import androidx.compose.material3.SnackbarDuration import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.SnackbarResult @@ -23,6 +19,10 @@ import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.util.formattedMessage import eu.kanade.tachiyomi.source.Source import kotlinx.coroutines.flow.StateFlow +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.Help +import mihon.icons.materialsymbols.rounded.Public +import mihon.icons.materialsymbols.rounded.Refresh import tachiyomi.core.common.i18n.stringResource import tachiyomi.domain.library.model.LibraryDisplayMode import tachiyomi.domain.manga.model.Manga @@ -88,7 +88,7 @@ fun BrowseSourceContent( listOf( EmptyScreenAction( stringRes = MR.strings.local_source_help_guide, - icon = Icons.AutoMirrored.Outlined.HelpOutline, + icon = MaterialSymbols.AutoMirroredRounded.Help, onClick = onLocalSourceHelpClick, ), ) @@ -96,17 +96,17 @@ fun BrowseSourceContent( listOf( EmptyScreenAction( stringRes = MR.strings.action_retry, - icon = Icons.Outlined.Refresh, + icon = MaterialSymbols.Rounded.Refresh, onClick = mangaList::refresh, ), EmptyScreenAction( stringRes = MR.strings.action_open_in_web_view, - icon = Icons.Outlined.Public, + icon = MaterialSymbols.Rounded.Public, onClick = onWebViewClick, ), EmptyScreenAction( stringRes = MR.strings.label_help, - icon = Icons.AutoMirrored.Outlined.HelpOutline, + icon = MaterialSymbols.AutoMirroredRounded.Help, onClick = onHelpClick, ), ) diff --git a/app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt index 2522c6c87..7c446a3b3 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt @@ -14,9 +14,6 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.items -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.Launch -import androidx.compose.material.icons.outlined.Settings import androidx.compose.material3.AlertDialog import androidx.compose.material3.Button import androidx.compose.material3.HorizontalDivider @@ -56,6 +53,9 @@ import eu.kanade.tachiyomi.source.ConfigurableSource import eu.kanade.tachiyomi.ui.browse.extension.details.ExtensionDetailsViewModel import eu.kanade.tachiyomi.util.system.LocaleHelper import eu.kanade.tachiyomi.util.system.copyToClipboard +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.OpenInNew +import mihon.icons.materialsymbols.rounded.Settings import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.ScrollbarLazyColumn import tachiyomi.presentation.core.components.material.Scaffold @@ -97,7 +97,7 @@ fun ExtensionDetailsScreen( add( AppBar.Action( title = stringResource(MR.strings.action_open_repo), - icon = Icons.AutoMirrored.Outlined.Launch, + icon = MaterialSymbols.AutoMirroredRounded.OpenInNew, onClick = { uriHandler.openUri(url) }, @@ -425,7 +425,7 @@ private fun SourceSwitchPreference( if (source.source is ConfigurableSource) { IconButton(onClick = { onClickSourcePreferences(source.source.id) }) { Icon( - imageVector = Icons.Outlined.Settings, + imageVector = MaterialSymbols.Rounded.Settings, contentDescription = stringResource(MR.strings.label_settings), tint = MaterialTheme.colorScheme.onSurface, ) diff --git a/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt index 914cb5e79..9a1811c00 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt @@ -13,13 +13,6 @@ import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.items -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Close -import androidx.compose.material.icons.outlined.GetApp -import androidx.compose.material.icons.outlined.Public -import androidx.compose.material.icons.outlined.Refresh -import androidx.compose.material.icons.outlined.Settings -import androidx.compose.material.icons.outlined.VerifiedUser import androidx.compose.material3.AlertDialog import androidx.compose.material3.Button import androidx.compose.material3.CircularProgressIndicator @@ -55,6 +48,13 @@ import eu.kanade.tachiyomi.ui.browse.extension.ExtensionUiModel import eu.kanade.tachiyomi.ui.browse.extension.ExtensionsViewModel import eu.kanade.tachiyomi.util.system.LocaleHelper import eu.kanade.tachiyomi.util.system.launchRequestPackageInstallsPermission +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Close +import mihon.icons.materialsymbols.rounded.Download +import mihon.icons.materialsymbols.rounded.Public +import mihon.icons.materialsymbols.rounded.Refresh +import mihon.icons.materialsymbols.rounded.Settings +import mihon.icons.materialsymbols.rounded.VerifiedUser import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.FastScrollLazyColumn import tachiyomi.presentation.core.components.material.PullRefresh @@ -105,7 +105,7 @@ fun ExtensionScreen( actions = listOf( EmptyScreenAction( stringRes = MR.strings.extensionStores, - icon = Icons.Outlined.Settings, + icon = MaterialSymbols.Rounded.Settings, onClick = { navigator.push(ExtensionStoresScreen()) }, ), ), @@ -425,7 +425,7 @@ private fun ExtensionItemActions( !isIdle -> { IconButton(onClick = { onClickItemCancel(extension) }) { Icon( - imageVector = Icons.Outlined.Close, + imageVector = MaterialSymbols.Rounded.Close, contentDescription = stringResource(MR.strings.action_cancel), ) } @@ -433,7 +433,7 @@ private fun ExtensionItemActions( installStep == InstallStep.Error -> { IconButton(onClick = { onClickItemAction(extension) }) { Icon( - imageVector = Icons.Outlined.Refresh, + imageVector = MaterialSymbols.Rounded.Refresh, contentDescription = stringResource(MR.strings.action_retry), ) } @@ -443,7 +443,7 @@ private fun ExtensionItemActions( is Extension.Installed -> { IconButton(onClick = { onClickItemSecondaryAction(extension) }) { Icon( - imageVector = Icons.Outlined.Settings, + imageVector = MaterialSymbols.Rounded.Settings, contentDescription = stringResource(MR.strings.action_settings), ) } @@ -451,7 +451,7 @@ private fun ExtensionItemActions( if (extension.hasUpdate) { IconButton(onClick = { onClickItemAction(extension) }) { Icon( - imageVector = Icons.Outlined.GetApp, + imageVector = MaterialSymbols.Rounded.Download, contentDescription = stringResource(MR.strings.ext_update), ) } @@ -460,7 +460,7 @@ private fun ExtensionItemActions( is Extension.Untrusted -> { IconButton(onClick = { onClickItemAction(extension) }) { Icon( - imageVector = Icons.Outlined.VerifiedUser, + imageVector = MaterialSymbols.Rounded.VerifiedUser, contentDescription = stringResource(MR.strings.ext_trust), ) } @@ -471,7 +471,7 @@ private fun ExtensionItemActions( onClick = { onClickItemSecondaryAction(extension) }, ) { Icon( - imageVector = Icons.Outlined.Public, + imageVector = MaterialSymbols.Rounded.Public, contentDescription = stringResource(MR.strings.action_open_in_web_view), ) } @@ -479,7 +479,7 @@ private fun ExtensionItemActions( IconButton(onClick = { onClickItemAction(extension) }) { Icon( - imageVector = Icons.Outlined.GetApp, + imageVector = MaterialSymbols.Rounded.Download, contentDescription = stringResource(MR.strings.ext_install), ) } diff --git a/app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt index cee92242d..6668840b2 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt @@ -7,11 +7,6 @@ import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.items -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.ArrowDownward -import androidx.compose.material.icons.outlined.ArrowUpward -import androidx.compose.material.icons.outlined.Numbers -import androidx.compose.material.icons.outlined.SortByAlpha import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme @@ -26,6 +21,11 @@ import eu.kanade.presentation.browse.components.BaseSourceItem import eu.kanade.presentation.browse.components.SourceIcon import eu.kanade.tachiyomi.ui.browse.migration.sources.MigrateSourceViewModel import eu.kanade.tachiyomi.util.system.copyToClipboard +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.ArrowDownward +import mihon.icons.materialsymbols.rounded.ArrowUpward +import mihon.icons.materialsymbols.rounded.Numbers +import mihon.icons.materialsymbols.rounded.SortByAlpha import tachiyomi.domain.source.model.Source import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.Badge @@ -103,11 +103,11 @@ private fun MigrateSourceList( IconButton(onClick = onToggleSortingMode) { when (sortingMode) { SetMigrateSorting.Mode.ALPHABETICAL -> Icon( - Icons.Outlined.SortByAlpha, + MaterialSymbols.Rounded.SortByAlpha, contentDescription = stringResource(MR.strings.action_sort_alpha), ) SetMigrateSorting.Mode.TOTAL -> Icon( - Icons.Outlined.Numbers, + MaterialSymbols.Rounded.Numbers, contentDescription = stringResource(MR.strings.action_sort_count), ) } @@ -115,11 +115,11 @@ private fun MigrateSourceList( IconButton(onClick = onToggleSortingDirection) { when (sortingDirection) { SetMigrateSorting.Direction.ASCENDING -> Icon( - Icons.Outlined.ArrowUpward, + MaterialSymbols.Rounded.ArrowUpward, contentDescription = stringResource(MR.strings.action_asc), ) SetMigrateSorting.Direction.DESCENDING -> Icon( - Icons.Outlined.ArrowDownward, + MaterialSymbols.Rounded.ArrowDownward, contentDescription = stringResource(MR.strings.action_desc), ) } diff --git a/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt index e796fe326..fb4572ac8 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt @@ -6,9 +6,6 @@ import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.items -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.PushPin -import androidx.compose.material.icons.outlined.PushPin import androidx.compose.material3.AlertDialog import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -24,6 +21,9 @@ import eu.kanade.presentation.browse.components.BaseSourceItem import eu.kanade.tachiyomi.ui.browse.source.SourcesViewModel import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceViewModel.Listing import eu.kanade.tachiyomi.util.system.LocaleHelper +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.PushPin +import mihon.icons.materialsymbols.roundedfilled.PushPin import tachiyomi.domain.source.model.Pin import tachiyomi.domain.source.model.Source import tachiyomi.i18n.MR @@ -143,7 +143,7 @@ private fun SourcePinButton( isPinned: Boolean, onClick: () -> Unit, ) { - val icon = if (isPinned) Icons.Filled.PushPin else Icons.Outlined.PushPin + val icon = if (isPinned) MaterialSymbols.RoundedFilled.PushPin else MaterialSymbols.Rounded.PushPin val tint = if (isPinned) { MaterialTheme.colorScheme.primary } else { diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseBadges.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseBadges.kt index 19ec4b55a..4071492e6 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseBadges.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseBadges.kt @@ -1,15 +1,15 @@ package eu.kanade.presentation.browse.components -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.CollectionsBookmark import androidx.compose.runtime.Composable +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.CollectionsBookmark import tachiyomi.presentation.core.components.Badge @Composable internal fun InLibraryBadge(enabled: Boolean) { if (enabled) { Badge( - imageVector = Icons.Outlined.CollectionsBookmark, + imageVector = MaterialSymbols.Rounded.CollectionsBookmark, ) } } diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseIcons.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseIcons.kt index 7bd1bc790..6cfa99373 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseIcons.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseIcons.kt @@ -5,9 +5,6 @@ import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.height -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Dangerous -import androidx.compose.material.icons.filled.Warning import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.State @@ -31,6 +28,9 @@ import eu.kanade.presentation.util.rememberResourceBitmapPainter import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.extension.model.Extension import eu.kanade.tachiyomi.extension.util.ExtensionLoader +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Dangerous +import mihon.icons.materialsymbols.rounded.Warning import tachiyomi.core.common.util.lang.withIOContext import tachiyomi.domain.source.model.Source import tachiyomi.source.local.isLocal @@ -49,7 +49,7 @@ fun SourceIcon( when { source.isStub && icon == null -> { Image( - imageVector = Icons.Filled.Warning, + imageVector = MaterialSymbols.Rounded.Warning, contentDescription = null, colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.error), modifier = modifier.then(defaultModifier), @@ -113,7 +113,7 @@ fun ExtensionIcon( } } is Extension.Untrusted -> Image( - imageVector = Icons.Filled.Dangerous, + imageVector = MaterialSymbols.Rounded.Dangerous, contentDescription = null, colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.error), modifier = modifier.then(defaultModifier), diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt index 44de96ef0..cf9c608b4 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt @@ -1,8 +1,5 @@ package eu.kanade.presentation.browse.components -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ViewList -import androidx.compose.material.icons.filled.ViewModule import androidx.compose.material3.Text import androidx.compose.material3.TopAppBarScrollBehavior import androidx.compose.runtime.Composable @@ -18,6 +15,9 @@ import eu.kanade.presentation.components.RadioMenuItem import eu.kanade.presentation.components.SearchToolbar import eu.kanade.tachiyomi.source.ConfigurableSource import eu.kanade.tachiyomi.source.Source +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.ViewList +import mihon.icons.materialsymbols.rounded.ViewModule import tachiyomi.domain.library.model.LibraryDisplayMode import tachiyomi.i18n.MR import tachiyomi.presentation.core.i18n.stringResource @@ -58,9 +58,9 @@ fun BrowseSourceToolbar( AppBar.Action( title = stringResource(MR.strings.action_display_mode), icon = if (displayMode == LibraryDisplayMode.List) { - Icons.AutoMirrored.Filled.ViewList + MaterialSymbols.AutoMirroredRounded.ViewList } else { - Icons.Filled.ViewModule + MaterialSymbols.Rounded.ViewModule }, onClick = { selectingDisplayMode = true }, ), diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchResultItems.kt b/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchResultItems.kt index 5de9a2142..80eb5703f 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchResultItems.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchResultItems.kt @@ -10,9 +10,6 @@ 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.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.ArrowForward -import androidx.compose.material.icons.outlined.Error import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -23,6 +20,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.ArrowForward +import mihon.icons.materialsymbols.rounded.Error import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.padding import tachiyomi.presentation.core.i18n.stringResource @@ -55,7 +55,7 @@ fun GlobalSearchResultItem( Text(text = subtitle) } IconButton(onClick = onClick) { - Icon(imageVector = Icons.AutoMirrored.Outlined.ArrowForward, contentDescription = null) + Icon(imageVector = MaterialSymbols.AutoMirroredRounded.ArrowForward, contentDescription = null) } } content() @@ -90,7 +90,7 @@ fun GlobalSearchErrorResultItem(message: String?) { horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center, ) { - Icon(imageVector = Icons.Outlined.Error, contentDescription = null) + Icon(imageVector = MaterialSymbols.Rounded.Error, contentDescription = null) Spacer(Modifier.height(4.dp)) Text( text = message ?: stringResource(MR.strings.unknown_error), diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchToolbar.kt b/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchToolbar.kt index db6796002..2184c57b7 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchToolbar.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchToolbar.kt @@ -11,10 +11,6 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.rememberScrollState -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.DoneAll -import androidx.compose.material.icons.outlined.FilterList -import androidx.compose.material.icons.outlined.PushPin import androidx.compose.material3.FilterChip import androidx.compose.material3.FilterChipDefaults import androidx.compose.material3.HorizontalDivider @@ -29,6 +25,10 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import eu.kanade.presentation.components.SearchToolbar import eu.kanade.tachiyomi.ui.browse.source.globalsearch.SourceFilter +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.DoneAll +import mihon.icons.materialsymbols.rounded.FilterList +import mihon.icons.materialsymbols.rounded.PushPin import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.padding import tachiyomi.presentation.core.i18n.stringResource @@ -82,7 +82,7 @@ fun GlobalSearchToolbar( onClick = { onChangeSearchFilter(SourceFilter.PinnedOnly) }, leadingIcon = { Icon( - imageVector = Icons.Outlined.PushPin, + imageVector = MaterialSymbols.Rounded.PushPin, contentDescription = null, modifier = Modifier .size(FilterChipDefaults.IconSize), @@ -97,7 +97,7 @@ fun GlobalSearchToolbar( onClick = { onChangeSearchFilter(SourceFilter.All) }, leadingIcon = { Icon( - imageVector = Icons.Outlined.DoneAll, + imageVector = MaterialSymbols.Rounded.DoneAll, contentDescription = null, modifier = Modifier .size(FilterChipDefaults.IconSize), @@ -116,7 +116,7 @@ fun GlobalSearchToolbar( onClick = { onToggleResults() }, leadingIcon = { Icon( - imageVector = Icons.Outlined.FilterList, + imageVector = MaterialSymbols.Rounded.FilterList, contentDescription = null, modifier = Modifier .size(FilterChipDefaults.IconSize), diff --git a/app/src/main/java/eu/kanade/presentation/category/components/CategoryFloatingActionButton.kt b/app/src/main/java/eu/kanade/presentation/category/components/CategoryFloatingActionButton.kt index bb246b066..6d88314eb 100644 --- a/app/src/main/java/eu/kanade/presentation/category/components/CategoryFloatingActionButton.kt +++ b/app/src/main/java/eu/kanade/presentation/category/components/CategoryFloatingActionButton.kt @@ -1,13 +1,13 @@ package eu.kanade.presentation.category.components import androidx.compose.foundation.lazy.LazyListState -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Add import androidx.compose.material3.Icon import androidx.compose.material3.SmallExtendedFloatingActionButton import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Add import tachiyomi.i18n.MR import tachiyomi.presentation.core.i18n.stringResource import tachiyomi.presentation.core.util.shouldExpandFAB @@ -20,7 +20,7 @@ fun CategoryFloatingActionButton( ) { SmallExtendedFloatingActionButton( text = { Text(text = stringResource(MR.strings.action_add)) }, - icon = { Icon(imageVector = Icons.Outlined.Add, contentDescription = null) }, + icon = { Icon(imageVector = MaterialSymbols.Rounded.Add, contentDescription = null) }, onClick = onCreate, expanded = lazyListState.shouldExpandFAB(), modifier = modifier, diff --git a/app/src/main/java/eu/kanade/presentation/category/components/CategoryListItem.kt b/app/src/main/java/eu/kanade/presentation/category/components/CategoryListItem.kt index 88558b97a..3ec96d278 100644 --- a/app/src/main/java/eu/kanade/presentation/category/components/CategoryListItem.kt +++ b/app/src/main/java/eu/kanade/presentation/category/components/CategoryListItem.kt @@ -4,10 +4,6 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Delete -import androidx.compose.material.icons.outlined.DragHandle -import androidx.compose.material.icons.outlined.Edit import androidx.compose.material3.ElevatedCard import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -16,6 +12,10 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Delete +import mihon.icons.materialsymbols.rounded.DragHandle +import mihon.icons.materialsymbols.rounded.Edit import sh.calvin.reorderable.ReorderableCollectionItemScope import tachiyomi.domain.category.model.Category import tachiyomi.i18n.MR @@ -42,7 +42,7 @@ fun ReorderableCollectionItemScope.CategoryListItem( verticalAlignment = Alignment.CenterVertically, ) { Icon( - imageVector = Icons.Outlined.DragHandle, + imageVector = MaterialSymbols.Rounded.DragHandle, contentDescription = null, modifier = Modifier .padding(MaterialTheme.padding.medium) @@ -54,13 +54,13 @@ fun ReorderableCollectionItemScope.CategoryListItem( ) IconButton(onClick = onRename) { Icon( - imageVector = Icons.Outlined.Edit, + imageVector = MaterialSymbols.Rounded.Edit, contentDescription = stringResource(MR.strings.action_rename_category), ) } IconButton(onClick = onDelete) { Icon( - imageVector = Icons.Outlined.Delete, + imageVector = MaterialSymbols.Rounded.Delete, contentDescription = stringResource(MR.strings.action_delete), ) } diff --git a/app/src/main/java/eu/kanade/presentation/components/AppBar.kt b/app/src/main/java/eu/kanade/presentation/components/AppBar.kt index 4bf782c06..17e01b67f 100644 --- a/app/src/main/java/eu/kanade/presentation/components/AppBar.kt +++ b/app/src/main/java/eu/kanade/presentation/components/AppBar.kt @@ -8,11 +8,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.text.BasicTextField import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.ArrowBack -import androidx.compose.material.icons.outlined.Close -import androidx.compose.material.icons.outlined.MoreVert -import androidx.compose.material.icons.outlined.Search import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -51,6 +46,11 @@ import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.ArrowBack +import mihon.icons.materialsymbols.rounded.Close +import mihon.icons.materialsymbols.rounded.MoreVert +import mihon.icons.materialsymbols.rounded.Search import tachiyomi.i18n.MR import tachiyomi.presentation.core.i18n.stringResource import tachiyomi.presentation.core.util.clearFocusOnSoftKeyboardHide @@ -133,7 +133,7 @@ fun AppBar( if (isActionMode) { IconButton(onClick = onCancelActionMode) { Icon( - imageVector = Icons.Outlined.Close, + imageVector = MaterialSymbols.Rounded.Close, contentDescription = stringResource(MR.strings.action_cancel), ) } @@ -231,7 +231,7 @@ fun AppBarActions( onClick = { showMenu = !showMenu }, ) { Icon( - Icons.Outlined.MoreVert, + MaterialSymbols.Rounded.MoreVert, contentDescription = stringResource(MR.strings.action_menu_overflow_description), ) } @@ -360,7 +360,7 @@ fun SearchToolbar( onClick = onClick, ) { Icon( - Icons.Outlined.Search, + MaterialSymbols.Rounded.Search, contentDescription = stringResource(MR.strings.action_search), ) } @@ -383,7 +383,7 @@ fun SearchToolbar( }, ) { Icon( - Icons.Outlined.Close, + MaterialSymbols.Rounded.Close, contentDescription = stringResource(MR.strings.action_reset), ) } @@ -404,7 +404,7 @@ fun UpIcon( navigationIcon: ImageVector? = null, ) { val icon = navigationIcon - ?: Icons.AutoMirrored.Outlined.ArrowBack + ?: MaterialSymbols.AutoMirroredRounded.ArrowBack Icon( imageVector = icon, contentDescription = stringResource(MR.strings.action_bar_up_description), diff --git a/app/src/main/java/eu/kanade/presentation/components/DropdownMenu.kt b/app/src/main/java/eu/kanade/presentation/components/DropdownMenu.kt index c1fcbf524..3ca7357bf 100644 --- a/app/src/main/java/eu/kanade/presentation/components/DropdownMenu.kt +++ b/app/src/main/java/eu/kanade/presentation/components/DropdownMenu.kt @@ -5,10 +5,6 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.sizeIn import androidx.compose.foundation.rememberScrollState -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.ArrowRight -import androidx.compose.material.icons.outlined.RadioButtonChecked -import androidx.compose.material.icons.outlined.RadioButtonUnchecked import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -21,6 +17,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.dp import androidx.compose.ui.window.PopupProperties +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.ArrowRight +import mihon.icons.materialsymbols.rounded.RadioButtonChecked +import mihon.icons.materialsymbols.rounded.RadioButtonUnchecked import tachiyomi.i18n.MR import tachiyomi.presentation.core.i18n.stringResource import androidx.compose.material3.DropdownMenu as ComposeDropdownMenu @@ -63,13 +63,13 @@ fun RadioMenuItem( trailingIcon = { if (isChecked) { Icon( - imageVector = Icons.Outlined.RadioButtonChecked, + imageVector = MaterialSymbols.Rounded.RadioButtonChecked, contentDescription = stringResource(MR.strings.selected), tint = MaterialTheme.colorScheme.primary, ) } else { Icon( - imageVector = Icons.Outlined.RadioButtonUnchecked, + imageVector = MaterialSymbols.Rounded.RadioButtonUnchecked, contentDescription = stringResource(MR.strings.not_selected), ) } @@ -93,7 +93,7 @@ fun NestedMenuItem( onClick = { nestedExpanded = true }, trailingIcon = { Icon( - imageVector = Icons.AutoMirrored.Outlined.ArrowRight, + imageVector = MaterialSymbols.AutoMirroredRounded.ArrowRight, contentDescription = null, ) }, diff --git a/app/src/main/java/eu/kanade/presentation/components/EmptyScreen.kt b/app/src/main/java/eu/kanade/presentation/components/EmptyScreen.kt index d68892ab4..9243b1917 100644 --- a/app/src/main/java/eu/kanade/presentation/components/EmptyScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/components/EmptyScreen.kt @@ -1,12 +1,12 @@ package eu.kanade.presentation.components -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.HelpOutline -import androidx.compose.material.icons.outlined.Refresh import androidx.compose.material3.Surface import androidx.compose.runtime.Composable import androidx.compose.ui.tooling.preview.PreviewLightDark import eu.kanade.presentation.theme.TachiyomiPreviewTheme +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.Help +import mihon.icons.materialsymbols.rounded.Refresh import tachiyomi.i18n.MR import tachiyomi.presentation.core.screens.EmptyScreen import tachiyomi.presentation.core.screens.EmptyScreenAction @@ -33,12 +33,12 @@ private fun WithActionPreview() { actions = listOf( EmptyScreenAction( stringRes = MR.strings.action_retry, - icon = Icons.Outlined.Refresh, + icon = MaterialSymbols.Rounded.Refresh, onClick = {}, ), EmptyScreenAction( stringRes = MR.strings.getting_started_guide, - icon = Icons.AutoMirrored.Outlined.HelpOutline, + icon = MaterialSymbols.AutoMirroredRounded.Help, onClick = {}, ), ), diff --git a/app/src/main/java/eu/kanade/presentation/components/TabbedDialog.kt b/app/src/main/java/eu/kanade/presentation/components/TabbedDialog.kt index 3a3e6d85a..38e1de434 100644 --- a/app/src/main/java/eu/kanade/presentation/components/TabbedDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/components/TabbedDialog.kt @@ -9,8 +9,6 @@ import androidx.compose.foundation.layout.wrapContentSize import androidx.compose.foundation.pager.HorizontalPager import androidx.compose.foundation.pager.PagerState import androidx.compose.foundation.pager.rememberPagerState -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.MoreVert import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -28,6 +26,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.util.fastForEachIndexed import kotlinx.coroutines.launch +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.MoreVert import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.TabText import tachiyomi.presentation.core.i18n.stringResource @@ -90,7 +90,7 @@ private fun MoreMenu( Box(modifier = Modifier.wrapContentSize(Alignment.TopStart)) { IconButton(onClick = { expanded = true }) { Icon( - imageVector = Icons.Default.MoreVert, + imageVector = MaterialSymbols.Rounded.MoreVert, contentDescription = stringResource(MR.strings.label_more), ) } diff --git a/app/src/main/java/eu/kanade/presentation/crash/CrashScreen.kt b/app/src/main/java/eu/kanade/presentation/crash/CrashScreen.kt index 1e6696105..19c6a7ce6 100644 --- a/app/src/main/java/eu/kanade/presentation/crash/CrashScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/crash/CrashScreen.kt @@ -4,8 +4,6 @@ import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.BugReport import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -18,6 +16,8 @@ import androidx.compose.ui.tooling.preview.PreviewLightDark import eu.kanade.presentation.theme.TachiyomiPreviewTheme import kotlinx.coroutines.launch import mihon.app.di.appGraph +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.BugReport import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.padding import tachiyomi.presentation.core.i18n.stringResource @@ -33,7 +33,7 @@ fun CrashScreen( val crashLogUtil = remember { context.appGraph.crashLogUtil } InfoScreen( - icon = Icons.Outlined.BugReport, + icon = MaterialSymbols.Rounded.BugReport, headingText = stringResource(MR.strings.crash_screen_title), subtitleText = stringResource(MR.strings.crash_screen_description, stringResource(MR.strings.app_name)), acceptText = stringResource(MR.strings.pref_dump_crash_logs), diff --git a/app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt b/app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt index 869284174..ee03975f9 100644 --- a/app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/history/HistoryScreen.kt @@ -3,8 +3,6 @@ package eu.kanade.presentation.history import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.items -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.DeleteSweep import androidx.compose.material3.SnackbarHost import androidx.compose.material3.SnackbarHostState import androidx.compose.runtime.Composable @@ -20,6 +18,8 @@ import eu.kanade.presentation.history.components.HistoryItem import eu.kanade.presentation.theme.TachiyomiPreviewTheme import eu.kanade.tachiyomi.ui.history.HistoryViewModel import kotlinx.datetime.LocalDate +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.DeleteSweep import tachiyomi.domain.history.model.HistoryWithRelations import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.FastScrollLazyColumn @@ -50,7 +50,7 @@ fun HistoryScreen( listOf( AppBar.Action( title = stringResource(MR.strings.pref_clear_history), - icon = Icons.Outlined.DeleteSweep, + icon = MaterialSymbols.Rounded.DeleteSweep, onClick = { onDialogChange(HistoryViewModel.Dialog.DeleteAll) }, diff --git a/app/src/main/java/eu/kanade/presentation/history/components/HistoryItem.kt b/app/src/main/java/eu/kanade/presentation/history/components/HistoryItem.kt index e8d391c03..6a08464cf 100644 --- a/app/src/main/java/eu/kanade/presentation/history/components/HistoryItem.kt +++ b/app/src/main/java/eu/kanade/presentation/history/components/HistoryItem.kt @@ -6,9 +6,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Delete -import androidx.compose.material.icons.outlined.FavoriteBorder import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme @@ -27,6 +24,9 @@ import eu.kanade.presentation.manga.components.MangaCover import eu.kanade.presentation.theme.TachiyomiPreviewTheme import eu.kanade.presentation.util.formatChapterNumber import eu.kanade.tachiyomi.util.lang.toTimestampString +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Delete +import mihon.icons.materialsymbols.rounded.Favorite import tachiyomi.domain.history.model.HistoryWithRelations import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.padding @@ -87,7 +87,7 @@ fun HistoryItem( if (!history.coverData.isMangaFavorite) { IconButton(onClick = onClickFavorite) { Icon( - imageVector = Icons.Outlined.FavoriteBorder, + imageVector = MaterialSymbols.Rounded.Favorite, contentDescription = stringResource(MR.strings.add_to_library), tint = MaterialTheme.colorScheme.onSurface, ) @@ -96,7 +96,7 @@ fun HistoryItem( IconButton(onClick = onClickDelete) { Icon( - imageVector = Icons.Outlined.Delete, + imageVector = MaterialSymbols.Rounded.Delete, contentDescription = stringResource(MR.strings.action_delete), tint = MaterialTheme.colorScheme.onSurface, ) diff --git a/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt b/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt index 955464512..ec12ed1ca 100644 --- a/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt @@ -6,8 +6,6 @@ import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Refresh import androidx.compose.material3.FilterChip import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -21,6 +19,8 @@ import eu.kanade.presentation.components.TabbedDialog import eu.kanade.presentation.components.TabbedDialogPaddings import eu.kanade.tachiyomi.ui.library.LibrarySettingsViewModel import eu.kanade.tachiyomi.util.system.isReleaseBuildType +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Refresh import tachiyomi.core.common.preference.TriState import tachiyomi.domain.category.model.Category import tachiyomi.domain.library.model.LibraryDisplayMode @@ -186,7 +186,7 @@ private fun ColumnScope.SortPage( if (mode == LibrarySort.Type.Random) { BaseSortItem( label = stringResource(titleRes), - icon = Icons.Default.Refresh + icon = MaterialSymbols.Rounded.Refresh .takeIf { sortingMode == LibrarySort.Type.Random }, onClick = { viewModel.setSort(category, mode, LibrarySort.Direction.Ascending) diff --git a/app/src/main/java/eu/kanade/presentation/library/components/CommonMangaItem.kt b/app/src/main/java/eu/kanade/presentation/library/components/CommonMangaItem.kt index a78462a75..2f4a11fe7 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/CommonMangaItem.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/CommonMangaItem.kt @@ -14,8 +14,6 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.PlayArrow import androidx.compose.material3.FilledIconButton import androidx.compose.material3.Icon import androidx.compose.material3.IconButtonDefaults @@ -39,6 +37,8 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import eu.kanade.presentation.manga.components.MangaCover +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.PlayArrow import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.BadgeGroup import tachiyomi.presentation.core.i18n.stringResource @@ -395,7 +395,7 @@ private fun ContinueReadingButton( modifier = Modifier.size(size), ) { Icon( - imageVector = Icons.Filled.PlayArrow, + imageVector = MaterialSymbols.Rounded.PlayArrow, contentDescription = stringResource(MR.strings.action_resume), modifier = Modifier.size(iconSize), ) diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryBadges.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryBadges.kt index 809fe50c5..a87fcebe1 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryBadges.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryBadges.kt @@ -1,12 +1,12 @@ package eu.kanade.presentation.library.components import androidx.compose.foundation.layout.Column -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Folder import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.tooling.preview.PreviewLightDark import eu.kanade.presentation.theme.TachiyomiPreviewTheme +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Folder import tachiyomi.presentation.core.components.Badge @Composable @@ -34,7 +34,7 @@ internal fun LanguageBadge( ) { if (isLocal) { Badge( - imageVector = Icons.Outlined.Folder, + imageVector = MaterialSymbols.Rounded.Folder, color = MaterialTheme.colorScheme.tertiary, iconColor = MaterialTheme.colorScheme.onTertiary, ) diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt index af699f291..d624b0d71 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryToolbar.kt @@ -2,10 +2,6 @@ package eu.kanade.presentation.library.components import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.Row -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.FilterList -import androidx.compose.material.icons.outlined.FlipToBack -import androidx.compose.material.icons.outlined.SelectAll import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -19,6 +15,10 @@ import androidx.compose.ui.unit.sp import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.AppBarActions import eu.kanade.presentation.components.SearchToolbar +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.FilterList +import mihon.icons.materialsymbols.rounded.FlipToBack +import mihon.icons.materialsymbols.rounded.SelectAll import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.Pill import tachiyomi.presentation.core.i18n.stringResource @@ -98,7 +98,7 @@ private fun LibraryRegularToolbar( listOf( AppBar.Action( title = stringResource(MR.strings.action_filter), - icon = Icons.Outlined.FilterList, + icon = MaterialSymbols.Rounded.FilterList, iconTint = filterTint, onClick = onClickFilter, ), @@ -135,12 +135,12 @@ private fun LibrarySelectionToolbar( listOf( AppBar.Action( title = stringResource(MR.strings.action_select_all), - icon = Icons.Outlined.SelectAll, + icon = MaterialSymbols.Rounded.SelectAll, onClick = onClickSelectAll, ), AppBar.Action( title = stringResource(MR.strings.action_select_inverse), - icon = Icons.Outlined.FlipToBack, + icon = MaterialSymbols.Rounded.FlipToBack, onClick = onClickInvertSelection, ), ), diff --git a/app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt b/app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt index 4aeb7b5e0..498cd5e8d 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt @@ -9,8 +9,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.PeopleAlt import androidx.compose.material3.AlertDialog import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.Icon @@ -32,6 +30,8 @@ import eu.kanade.domain.manga.model.downloadedFilter import eu.kanade.presentation.components.TabbedDialog import eu.kanade.presentation.components.TabbedDialogPaddings import mihon.app.di.appGraph +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.PeopleAlt import tachiyomi.core.common.preference.TriState import tachiyomi.domain.manga.model.Manga import tachiyomi.i18n.MR @@ -174,7 +174,7 @@ fun ScanlatorFilterItem( horizontalArrangement = Arrangement.spacedBy(24.dp), ) { Icon( - imageVector = Icons.Outlined.PeopleAlt, + imageVector = MaterialSymbols.Rounded.PeopleAlt, contentDescription = null, tint = if (active) { MaterialTheme.colorScheme.active diff --git a/app/src/main/java/eu/kanade/presentation/manga/DuplicateMangaDialog.kt b/app/src/main/java/eu/kanade/presentation/manga/DuplicateMangaDialog.kt index 6748d9bb9..879f35aba 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/DuplicateMangaDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/DuplicateMangaDialog.kt @@ -19,18 +19,6 @@ import androidx.compose.foundation.lazy.items import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Brush -import androidx.compose.material.icons.filled.PersonOutline -import androidx.compose.material.icons.filled.Warning -import androidx.compose.material.icons.outlined.Add -import androidx.compose.material.icons.outlined.AttachMoney -import androidx.compose.material.icons.outlined.Block -import androidx.compose.material.icons.outlined.Close -import androidx.compose.material.icons.outlined.Done -import androidx.compose.material.icons.outlined.DoneAll -import androidx.compose.material.icons.outlined.Pause -import androidx.compose.material.icons.outlined.Schedule import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -66,6 +54,18 @@ import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.model.SManga import mihon.app.di.appGraph +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Add +import mihon.icons.materialsymbols.rounded.AttachMoney +import mihon.icons.materialsymbols.rounded.Block +import mihon.icons.materialsymbols.rounded.Brush +import mihon.icons.materialsymbols.rounded.Close +import mihon.icons.materialsymbols.rounded.Done +import mihon.icons.materialsymbols.rounded.DoneAll +import mihon.icons.materialsymbols.rounded.Pause +import mihon.icons.materialsymbols.rounded.Person +import mihon.icons.materialsymbols.rounded.Schedule +import mihon.icons.materialsymbols.rounded.Warning import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.MangaWithChapterCount import tachiyomi.domain.source.model.StubSource @@ -141,7 +141,7 @@ fun DuplicateMangaDialog( TextPreferenceWidget( title = stringResource(MR.strings.action_add_anyway), - icon = Icons.Outlined.Add, + icon = MaterialSymbols.Rounded.Add, onPreferenceClick = { onDismissRequest() onConfirm() @@ -230,7 +230,7 @@ private fun DuplicateMangaListItem( if (!manga.author.isNullOrBlank()) { MangaDetailRow( text = manga.author!!, - iconImageVector = Icons.Filled.PersonOutline, + iconImageVector = MaterialSymbols.Rounded.Person, maxLines = 2, ) } @@ -238,7 +238,7 @@ private fun DuplicateMangaListItem( if (!manga.artist.isNullOrBlank() && manga.author != manga.artist) { MangaDetailRow( text = manga.artist!!, - iconImageVector = Icons.Filled.Brush, + iconImageVector = MaterialSymbols.Rounded.Brush, maxLines = 2, ) } @@ -254,13 +254,13 @@ private fun DuplicateMangaListItem( else -> stringResource(MR.strings.unknown) }, iconImageVector = when (manga.status) { - SManga.ONGOING.toLong() -> Icons.Outlined.Schedule - SManga.COMPLETED.toLong() -> Icons.Outlined.DoneAll - SManga.LICENSED.toLong() -> Icons.Outlined.AttachMoney - SManga.PUBLISHING_FINISHED.toLong() -> Icons.Outlined.Done - SManga.CANCELLED.toLong() -> Icons.Outlined.Close - SManga.ON_HIATUS.toLong() -> Icons.Outlined.Pause - else -> Icons.Outlined.Block + SManga.ONGOING.toLong() -> MaterialSymbols.Rounded.Schedule + SManga.COMPLETED.toLong() -> MaterialSymbols.Rounded.DoneAll + SManga.LICENSED.toLong() -> MaterialSymbols.Rounded.AttachMoney + SManga.PUBLISHING_FINISHED.toLong() -> MaterialSymbols.Rounded.Done + SManga.CANCELLED.toLong() -> MaterialSymbols.Rounded.Close + SManga.ON_HIATUS.toLong() -> MaterialSymbols.Rounded.Pause + else -> MaterialSymbols.Rounded.Block }, ) @@ -272,7 +272,7 @@ private fun DuplicateMangaListItem( ) { if (source is StubSource) { Icon( - imageVector = Icons.Filled.Warning, + imageVector = MaterialSymbols.Rounded.Warning, contentDescription = null, modifier = Modifier.size(16.dp), tint = MaterialTheme.colorScheme.error, diff --git a/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt b/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt index f8f91edbe..6b9acc7b7 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt @@ -21,8 +21,6 @@ import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.PlayArrow import androidx.compose.material3.Icon import androidx.compose.material3.SmallExtendedFloatingActionButton import androidx.compose.material3.SnackbarHost @@ -62,6 +60,8 @@ import eu.kanade.tachiyomi.source.getNameForMangaInfo import eu.kanade.tachiyomi.ui.manga.ChapterList import eu.kanade.tachiyomi.ui.manga.MangaViewModel import eu.kanade.tachiyomi.util.system.copyToClipboard +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.roundedfilled.PlayArrow import tachiyomi.domain.chapter.model.Chapter import tachiyomi.domain.chapter.service.missingChaptersCount import tachiyomi.domain.library.service.LibraryPreferences @@ -337,7 +337,7 @@ private fun MangaScreenSmallImpl( text = stringResource(if (isReading) MR.strings.action_resume else MR.strings.action_start), ) }, - icon = { Icon(imageVector = Icons.Filled.PlayArrow, contentDescription = null) }, + icon = { Icon(imageVector = MaterialSymbols.RoundedFilled.PlayArrow, contentDescription = null) }, onClick = onContinueReading, expanded = chapterListState.shouldExpandFAB(), modifier = Modifier.animateFloatingActionButton( @@ -579,7 +579,7 @@ fun MangaScreenLargeImpl( ), ) }, - icon = { Icon(imageVector = Icons.Filled.PlayArrow, contentDescription = null) }, + icon = { Icon(imageVector = MaterialSymbols.RoundedFilled.PlayArrow, contentDescription = null) }, onClick = onContinueReading, expanded = chapterListState.shouldExpandFAB(), modifier = Modifier.animateFloatingActionButton( diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/ChapterDownloadIndicator.kt b/app/src/main/java/eu/kanade/presentation/manga/components/ChapterDownloadIndicator.kt index 518f09d4b..2eabd65eb 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/ChapterDownloadIndicator.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/ChapterDownloadIndicator.kt @@ -5,10 +5,6 @@ import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.CheckCircle -import androidx.compose.material.icons.outlined.ArrowDownward -import androidx.compose.material.icons.outlined.ErrorOutline import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.Icon @@ -34,6 +30,10 @@ import androidx.compose.ui.unit.dp import eu.kanade.presentation.components.DropdownMenu import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.download.model.Download +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.ArrowDownward +import mihon.icons.materialsymbols.rounded.Error +import mihon.icons.materialsymbols.roundedfilled.CheckCircle import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.IconButtonTokens import tachiyomi.presentation.core.i18n.stringResource @@ -179,7 +179,7 @@ private fun DownloadingIndicator( ) } Icon( - imageVector = Icons.Outlined.ArrowDownward, + imageVector = MaterialSymbols.Rounded.ArrowDownward, contentDescription = null, modifier = ArrowModifier, tint = arrowColor, @@ -206,7 +206,7 @@ private fun DownloadedIndicator( contentAlignment = Alignment.Center, ) { Icon( - imageVector = Icons.Filled.CheckCircle, + imageVector = MaterialSymbols.RoundedFilled.CheckCircle, contentDescription = null, modifier = Modifier.size(IndicatorSize), tint = MaterialTheme.colorScheme.onSurfaceVariant, @@ -241,7 +241,7 @@ private fun ErrorIndicator( contentAlignment = Alignment.Center, ) { Icon( - imageVector = Icons.Outlined.ErrorOutline, + imageVector = MaterialSymbols.Rounded.Error, contentDescription = stringResource(MR.strings.chapter_error), modifier = Modifier.size(IndicatorSize), tint = MaterialTheme.colorScheme.error, diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaBottomActionMenu.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaBottomActionMenu.kt index 292ed8aaf..60df31061 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaBottomActionMenu.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaBottomActionMenu.kt @@ -22,16 +22,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.shape.ZeroCornerSize -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.Label -import androidx.compose.material.icons.outlined.BookmarkAdd -import androidx.compose.material.icons.outlined.BookmarkRemove -import androidx.compose.material.icons.outlined.Delete -import androidx.compose.material.icons.outlined.DoneAll -import androidx.compose.material.icons.outlined.Download -import androidx.compose.material.icons.outlined.MoreVert -import androidx.compose.material.icons.outlined.RemoveDone -import androidx.compose.material.icons.outlined.SwapCalls import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -62,6 +52,16 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.delay import kotlinx.coroutines.isActive import kotlinx.coroutines.launch +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.Label +import mihon.icons.materialsymbols.rounded.BookmarkAdd +import mihon.icons.materialsymbols.rounded.BookmarkRemove +import mihon.icons.materialsymbols.rounded.Delete +import mihon.icons.materialsymbols.rounded.DoneAll +import mihon.icons.materialsymbols.rounded.Download +import mihon.icons.materialsymbols.rounded.MoreVert +import mihon.icons.materialsymbols.rounded.RemoveDone +import mihon.icons.materialsymbols.rounded.SwapCalls import tachiyomi.i18n.MR import tachiyomi.presentation.core.i18n.stringResource import kotlin.time.Duration.Companion.seconds @@ -113,7 +113,7 @@ fun MangaBottomActionMenu( if (onBookmarkClicked != null) { Button( title = stringResource(MR.strings.action_bookmark), - icon = Icons.Outlined.BookmarkAdd, + icon = MaterialSymbols.Rounded.BookmarkAdd, toConfirm = confirm[0], onLongClick = { onLongClickItem(0) }, onClick = onBookmarkClicked, @@ -122,7 +122,7 @@ fun MangaBottomActionMenu( if (onRemoveBookmarkClicked != null) { Button( title = stringResource(MR.strings.action_remove_bookmark), - icon = Icons.Outlined.BookmarkRemove, + icon = MaterialSymbols.Rounded.BookmarkRemove, toConfirm = confirm[1], onLongClick = { onLongClickItem(1) }, onClick = onRemoveBookmarkClicked, @@ -131,7 +131,7 @@ fun MangaBottomActionMenu( if (onMarkAsReadClicked != null) { Button( title = stringResource(MR.strings.action_mark_as_read), - icon = Icons.Outlined.DoneAll, + icon = MaterialSymbols.Rounded.DoneAll, toConfirm = confirm[2], onLongClick = { onLongClickItem(2) }, onClick = onMarkAsReadClicked, @@ -140,7 +140,7 @@ fun MangaBottomActionMenu( if (onMarkAsUnreadClicked != null) { Button( title = stringResource(MR.strings.action_mark_as_unread), - icon = Icons.Outlined.RemoveDone, + icon = MaterialSymbols.Rounded.RemoveDone, toConfirm = confirm[3], onLongClick = { onLongClickItem(3) }, onClick = onMarkAsUnreadClicked, @@ -158,7 +158,7 @@ fun MangaBottomActionMenu( if (onDownloadClicked != null) { Button( title = stringResource(MR.strings.action_download), - icon = Icons.Outlined.Download, + icon = MaterialSymbols.Rounded.Download, toConfirm = confirm[5], onLongClick = { onLongClickItem(5) }, onClick = onDownloadClicked, @@ -167,7 +167,7 @@ fun MangaBottomActionMenu( if (onDeleteClicked != null) { Button( title = stringResource(MR.strings.action_delete), - icon = Icons.Outlined.Delete, + icon = MaterialSymbols.Rounded.Delete, toConfirm = confirm[6], onLongClick = { onLongClickItem(6) }, onClick = onDeleteClicked, @@ -273,21 +273,21 @@ fun LibraryBottomActionMenu( ) { Button( title = stringResource(MR.strings.action_move_category), - icon = Icons.AutoMirrored.Outlined.Label, + icon = MaterialSymbols.AutoMirroredRounded.Label, toConfirm = confirm[0], onLongClick = { onLongClickItem(0) }, onClick = onChangeCategoryClicked, ) Button( title = stringResource(MR.strings.action_mark_as_read), - icon = Icons.Outlined.DoneAll, + icon = MaterialSymbols.Rounded.DoneAll, toConfirm = confirm[1], onLongClick = { onLongClickItem(1) }, onClick = onMarkAsReadClicked, ) Button( title = stringResource(MR.strings.action_mark_as_unread), - icon = Icons.Outlined.RemoveDone, + icon = MaterialSymbols.Rounded.RemoveDone, toConfirm = confirm[2], onLongClick = { onLongClickItem(2) }, onClick = onMarkAsUnreadClicked, @@ -296,7 +296,7 @@ fun LibraryBottomActionMenu( var downloadExpanded by remember { mutableStateOf(false) } Button( title = stringResource(MR.strings.action_download), - icon = Icons.Outlined.Download, + icon = MaterialSymbols.Rounded.Download, toConfirm = confirm[3], onLongClick = { onLongClickItem(3) }, onClick = { downloadExpanded = !downloadExpanded }, @@ -312,14 +312,14 @@ fun LibraryBottomActionMenu( if (!itemOverflow) { Button( title = stringResource(MR.strings.migrate), - icon = Icons.Outlined.SwapCalls, + icon = MaterialSymbols.Rounded.SwapCalls, toConfirm = confirm[4], onLongClick = { onLongClickItem(4) }, onClick = onMigrateClicked, ) Button( title = stringResource(MR.strings.action_delete), - icon = Icons.Outlined.Delete, + icon = MaterialSymbols.Rounded.Delete, toConfirm = confirm[5], onLongClick = { onLongClickItem(5) }, onClick = onDeleteClicked, @@ -328,7 +328,7 @@ fun LibraryBottomActionMenu( var overflowMenuOpen by remember { mutableStateOf(false) } Button( title = stringResource(MR.strings.label_more), - icon = Icons.Outlined.MoreVert, + icon = MaterialSymbols.Rounded.MoreVert, toConfirm = false, onLongClick = {}, onClick = { overflowMenuOpen = true }, diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaChapterListItem.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaChapterListItem.kt index 730c98afe..f60393b53 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaChapterListItem.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaChapterListItem.kt @@ -7,16 +7,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.sizeIn -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Bookmark -import androidx.compose.material.icons.filled.Circle -import androidx.compose.material.icons.outlined.BookmarkAdd -import androidx.compose.material.icons.outlined.BookmarkRemove -import androidx.compose.material.icons.outlined.Delete -import androidx.compose.material.icons.outlined.Done -import androidx.compose.material.icons.outlined.Download -import androidx.compose.material.icons.outlined.FileDownloadOff -import androidx.compose.material.icons.outlined.RemoveDone import androidx.compose.material3.Icon import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme @@ -38,6 +28,16 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import eu.kanade.tachiyomi.data.download.model.Download import me.saket.swipe.SwipeableActionsBox +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.BookmarkAdd +import mihon.icons.materialsymbols.rounded.BookmarkRemove +import mihon.icons.materialsymbols.rounded.Delete +import mihon.icons.materialsymbols.rounded.Done +import mihon.icons.materialsymbols.rounded.Download +import mihon.icons.materialsymbols.rounded.FileDownloadOff +import mihon.icons.materialsymbols.rounded.RemoveDone +import mihon.icons.materialsymbols.roundedfilled.Bookmark +import mihon.icons.materialsymbols.roundedfilled.Circle import tachiyomi.domain.library.service.LibraryPreferences import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.DISABLED_ALPHA @@ -109,7 +109,7 @@ fun MangaChapterListItem( var textHeight by remember { mutableIntStateOf(0) } if (!read) { Icon( - imageVector = Icons.Filled.Circle, + imageVector = MaterialSymbols.RoundedFilled.Circle, contentDescription = stringResource(MR.strings.unread), modifier = Modifier .height(8.dp) @@ -119,7 +119,7 @@ fun MangaChapterListItem( } if (bookmark) { Icon( - imageVector = Icons.Filled.Bookmark, + imageVector = MaterialSymbols.RoundedFilled.Bookmark, contentDescription = stringResource(MR.strings.action_filter_bookmarked), modifier = Modifier .sizeIn(maxHeight = with(LocalDensity.current) { textHeight.toDp() - 2.dp }), @@ -192,22 +192,22 @@ private fun getSwipeAction( ): me.saket.swipe.SwipeAction? { return when (action) { LibraryPreferences.ChapterSwipeAction.ToggleRead -> swipeAction( - icon = if (!read) Icons.Outlined.Done else Icons.Outlined.RemoveDone, + icon = if (!read) MaterialSymbols.Rounded.Done else MaterialSymbols.Rounded.RemoveDone, background = background, isUndo = read, onSwipe = onSwipe, ) LibraryPreferences.ChapterSwipeAction.ToggleBookmark -> swipeAction( - icon = if (!bookmark) Icons.Outlined.BookmarkAdd else Icons.Outlined.BookmarkRemove, + icon = if (!bookmark) MaterialSymbols.Rounded.BookmarkAdd else MaterialSymbols.Rounded.BookmarkRemove, background = background, isUndo = bookmark, onSwipe = onSwipe, ) LibraryPreferences.ChapterSwipeAction.Download -> swipeAction( icon = when (downloadState) { - Download.State.NOT_DOWNLOADED, Download.State.ERROR -> Icons.Outlined.Download - Download.State.QUEUE, Download.State.DOWNLOADING -> Icons.Outlined.FileDownloadOff - Download.State.DOWNLOADED -> Icons.Outlined.Delete + Download.State.NOT_DOWNLOADED, Download.State.ERROR -> MaterialSymbols.Rounded.Download + Download.State.QUEUE, Download.State.DOWNLOADING -> MaterialSymbols.Rounded.FileDownloadOff + Download.State.DOWNLOADED -> MaterialSymbols.Rounded.Delete }, background = background, onSwipe = onSwipe, diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaCoverDialog.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaCoverDialog.kt index 9906db3e7..f35294390 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaCoverDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaCoverDialog.kt @@ -10,11 +10,6 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Close -import androidx.compose.material.icons.outlined.Edit -import androidx.compose.material.icons.outlined.Save -import androidx.compose.material.icons.outlined.Share import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -61,6 +56,11 @@ import eu.kanade.tachiyomi.ui.reader.viewer.ReaderPageImageView import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runBlocking import mihon.app.di.appGraph +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Close +import mihon.icons.materialsymbols.rounded.Edit +import mihon.icons.materialsymbols.rounded.Save +import mihon.icons.materialsymbols.rounded.Share import tachiyomi.domain.manga.model.Manga import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.Scaffold @@ -100,7 +100,7 @@ fun MangaCoverDialog( ActionsPill { IconButton(onClick = onDismissRequest) { Icon( - imageVector = Icons.Outlined.Close, + imageVector = MaterialSymbols.Rounded.Close, contentDescription = stringResource(MR.strings.action_close), ) } @@ -111,12 +111,12 @@ fun MangaCoverDialog( actions = listOf( AppBar.Action( title = stringResource(MR.strings.action_share), - icon = Icons.Outlined.Share, + icon = MaterialSymbols.Rounded.Share, onClick = onShareClick, ), AppBar.Action( title = stringResource(MR.strings.action_save), - icon = Icons.Outlined.Save, + icon = MaterialSymbols.Rounded.Save, onClick = onSaveClick, ), ), @@ -134,7 +134,7 @@ fun MangaCoverDialog( }, ) { Icon( - imageVector = Icons.Outlined.Edit, + imageVector = MaterialSymbols.Rounded.Edit, contentDescription = stringResource(MR.strings.action_edit_cover), ) } diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt index 9c2d8d95b..983dd05f4 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt @@ -25,22 +25,6 @@ import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.lazy.items import androidx.compose.foundation.text.appendInlineContent import androidx.compose.foundation.text.selection.SelectionContainer -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Brush -import androidx.compose.material.icons.filled.Favorite -import androidx.compose.material.icons.filled.HourglassEmpty -import androidx.compose.material.icons.filled.PersonOutline -import androidx.compose.material.icons.filled.Warning -import androidx.compose.material.icons.outlined.AttachMoney -import androidx.compose.material.icons.outlined.Block -import androidx.compose.material.icons.outlined.Close -import androidx.compose.material.icons.outlined.Done -import androidx.compose.material.icons.outlined.DoneAll -import androidx.compose.material.icons.outlined.FavoriteBorder -import androidx.compose.material.icons.outlined.Pause -import androidx.compose.material.icons.outlined.Public -import androidx.compose.material.icons.outlined.Schedule -import androidx.compose.material.icons.outlined.Sync import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.Icon import androidx.compose.material3.LocalContentColor @@ -93,6 +77,22 @@ import eu.kanade.tachiyomi.util.system.copyToClipboard import kotlinx.datetime.TimeZone import kotlinx.datetime.daysUntil import mihon.app.di.appGraph +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.AttachMoney +import mihon.icons.materialsymbols.rounded.Block +import mihon.icons.materialsymbols.rounded.Brush +import mihon.icons.materialsymbols.rounded.Close +import mihon.icons.materialsymbols.rounded.Done +import mihon.icons.materialsymbols.rounded.DoneAll +import mihon.icons.materialsymbols.rounded.Favorite +import mihon.icons.materialsymbols.rounded.HourglassEmpty +import mihon.icons.materialsymbols.rounded.Pause +import mihon.icons.materialsymbols.rounded.Person +import mihon.icons.materialsymbols.rounded.Public +import mihon.icons.materialsymbols.rounded.Schedule +import mihon.icons.materialsymbols.rounded.Sync +import mihon.icons.materialsymbols.rounded.Warning +import mihon.icons.materialsymbols.roundedfilled.Favorite import org.intellij.markdown.MarkdownElementTypes import org.intellij.markdown.MarkdownTokenTypes import org.intellij.markdown.ast.findChildOfType @@ -203,7 +203,7 @@ fun MangaActionRow( } else { stringResource(MR.strings.add_to_library) }, - icon = if (favorite) Icons.Filled.Favorite else Icons.Outlined.FavoriteBorder, + icon = if (favorite) MaterialSymbols.RoundedFilled.Favorite else MaterialSymbols.Rounded.Favorite, color = if (favorite) MaterialTheme.colorScheme.primary else defaultActionButtonColor, onClick = onAddToLibraryClicked, onLongClick = onEditCategory, @@ -218,7 +218,7 @@ fun MangaActionRow( nextUpdateDays, ) }, - icon = Icons.Default.HourglassEmpty, + icon = MaterialSymbols.Rounded.HourglassEmpty, color = if (isUserIntervalMode) MaterialTheme.colorScheme.primary else defaultActionButtonColor, onClick = { onEditIntervalClicked?.invoke() }, ) @@ -228,14 +228,14 @@ fun MangaActionRow( } else { pluralStringResource(MR.plurals.num_trackers, count = trackingCount, trackingCount) }, - icon = if (trackingCount == 0) Icons.Outlined.Sync else Icons.Outlined.Done, + icon = if (trackingCount == 0) MaterialSymbols.Rounded.Sync else MaterialSymbols.Rounded.Done, color = if (trackingCount == 0) defaultActionButtonColor else MaterialTheme.colorScheme.primary, onClick = onTrackingClicked, ) if (onWebViewClicked != null) { MangaActionButton( title = stringResource(MR.strings.action_web_view), - icon = Icons.Outlined.Public, + icon = MaterialSymbols.Rounded.Public, color = defaultActionButtonColor, onClick = onWebViewClicked, onLongClick = onWebViewLongClicked, @@ -458,7 +458,7 @@ private fun ColumnScope.MangaContentInfo( verticalAlignment = Alignment.CenterVertically, ) { Icon( - imageVector = Icons.Filled.PersonOutline, + imageVector = MaterialSymbols.Rounded.Person, contentDescription = null, modifier = Modifier.size(16.dp), ) @@ -489,7 +489,7 @@ private fun ColumnScope.MangaContentInfo( verticalAlignment = Alignment.CenterVertically, ) { Icon( - imageVector = Icons.Filled.Brush, + imageVector = MaterialSymbols.Rounded.Brush, contentDescription = null, modifier = Modifier.size(16.dp), ) @@ -514,13 +514,13 @@ private fun ColumnScope.MangaContentInfo( ) { Icon( imageVector = when (status) { - SManga.ONGOING.toLong() -> Icons.Outlined.Schedule - SManga.COMPLETED.toLong() -> Icons.Outlined.DoneAll - SManga.LICENSED.toLong() -> Icons.Outlined.AttachMoney - SManga.PUBLISHING_FINISHED.toLong() -> Icons.Outlined.Done - SManga.CANCELLED.toLong() -> Icons.Outlined.Close - SManga.ON_HIATUS.toLong() -> Icons.Outlined.Pause - else -> Icons.Outlined.Block + SManga.ONGOING.toLong() -> MaterialSymbols.Rounded.Schedule + SManga.COMPLETED.toLong() -> MaterialSymbols.Rounded.DoneAll + SManga.LICENSED.toLong() -> MaterialSymbols.Rounded.AttachMoney + SManga.PUBLISHING_FINISHED.toLong() -> MaterialSymbols.Rounded.Done + SManga.CANCELLED.toLong() -> MaterialSymbols.Rounded.Close + SManga.ON_HIATUS.toLong() -> MaterialSymbols.Rounded.Pause + else -> MaterialSymbols.Rounded.Block }, contentDescription = null, modifier = Modifier @@ -544,7 +544,7 @@ private fun ColumnScope.MangaContentInfo( DotSeparatorText() if (isStubSource) { Icon( - imageVector = Icons.Filled.Warning, + imageVector = MaterialSymbols.Rounded.Warning, contentDescription = null, modifier = Modifier .padding(end = 4.dp) diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaNotesSection.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaNotesSection.kt index 37adea58e..a117d4901 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaNotesSection.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaNotesSection.kt @@ -7,8 +7,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.EditNote import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -19,6 +17,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.dp +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.EditNote import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.Button import tachiyomi.presentation.core.components.material.ButtonDefaults @@ -57,7 +57,7 @@ fun MangaNotesSection( verticalAlignment = Alignment.CenterVertically, ) { Icon( - imageVector = Icons.Filled.EditNote, + imageVector = MaterialSymbols.Rounded.EditNote, contentDescription = null, modifier = Modifier .size(16.dp), diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaNotesTextArea.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaNotesTextArea.kt index 9e55d0189..e5f1bbfca 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaNotesTextArea.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaNotesTextArea.kt @@ -12,12 +12,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyRow -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.FormatListBulleted -import androidx.compose.material.icons.outlined.FormatBold -import androidx.compose.material.icons.outlined.FormatItalic -import androidx.compose.material.icons.outlined.FormatListNumbered -import androidx.compose.material.icons.outlined.FormatUnderlined import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -50,6 +44,12 @@ import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onEach +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.FormatListBulleted +import mihon.icons.materialsymbols.rounded.FormatBold +import mihon.icons.materialsymbols.rounded.FormatItalic +import mihon.icons.materialsymbols.rounded.FormatListNumbered +import mihon.icons.materialsymbols.rounded.FormatUnderlined import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.padding import tachiyomi.presentation.core.i18n.stringResource @@ -130,14 +130,14 @@ fun MangaNotesTextArea( MangaNotesTextAreaButton( onClick = { richTextState.toggleSpanStyle(SpanStyle(fontWeight = FontWeight.Bold)) }, isSelected = richTextState.currentSpanStyle.fontWeight == FontWeight.Bold, - icon = Icons.Outlined.FormatBold, + icon = MaterialSymbols.Rounded.FormatBold, ) } item { MangaNotesTextAreaButton( onClick = { richTextState.toggleSpanStyle(SpanStyle(fontStyle = FontStyle.Italic)) }, isSelected = richTextState.currentSpanStyle.fontStyle == FontStyle.Italic, - icon = Icons.Outlined.FormatItalic, + icon = MaterialSymbols.Rounded.FormatItalic, ) } item { @@ -148,7 +148,7 @@ fun MangaNotesTextArea( isSelected = richTextState.currentSpanStyle.textDecoration ?.contains(TextDecoration.Underline) ?: false, - icon = Icons.Outlined.FormatUnderlined, + icon = MaterialSymbols.Rounded.FormatUnderlined, ) } item { @@ -162,14 +162,14 @@ fun MangaNotesTextArea( MangaNotesTextAreaButton( onClick = { richTextState.toggleUnorderedList() }, isSelected = richTextState.isUnorderedList, - icon = Icons.AutoMirrored.Outlined.FormatListBulleted, + icon = MaterialSymbols.AutoMirroredRounded.FormatListBulleted, ) } item { MangaNotesTextAreaButton( onClick = { richTextState.toggleOrderedList() }, isSelected = richTextState.isOrderedList, - icon = Icons.Outlined.FormatListNumbered, + icon = MaterialSymbols.Rounded.FormatListNumbered, ) } } diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt index b2d33c3de..7bdc92162 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt @@ -1,10 +1,5 @@ package eu.kanade.presentation.manga.components -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Download -import androidx.compose.material.icons.outlined.FilterList -import androidx.compose.material.icons.outlined.FlipToBack -import androidx.compose.material.icons.outlined.SelectAll import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.material3.surfaceColorAtElevation @@ -21,6 +16,11 @@ import eu.kanade.presentation.components.AppBarActions import eu.kanade.presentation.components.AppBarTitle import eu.kanade.presentation.components.DownloadDropdownMenu import eu.kanade.presentation.manga.DownloadAction +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Download +import mihon.icons.materialsymbols.rounded.FilterList +import mihon.icons.materialsymbols.rounded.FlipToBack +import mihon.icons.materialsymbols.rounded.SelectAll import tachiyomi.i18n.MR import tachiyomi.presentation.core.i18n.stringResource import tachiyomi.presentation.core.theme.active @@ -80,14 +80,14 @@ fun MangaToolbar( add( AppBar.Action( title = stringResource(MR.strings.action_select_all), - icon = Icons.Outlined.SelectAll, + icon = MaterialSymbols.Rounded.SelectAll, onClick = onSelectAll, ), ) add( AppBar.Action( title = stringResource(MR.strings.action_select_inverse), - icon = Icons.Outlined.FlipToBack, + icon = MaterialSymbols.Rounded.FlipToBack, onClick = onInvertSelection, ), ) @@ -97,7 +97,7 @@ fun MangaToolbar( add( AppBar.Action( title = stringResource(MR.strings.manga_download), - icon = Icons.Outlined.Download, + icon = MaterialSymbols.Rounded.Download, onClick = { downloadExpanded = !downloadExpanded }, ), ) @@ -105,7 +105,7 @@ fun MangaToolbar( add( AppBar.Action( title = stringResource(MR.strings.action_filter), - icon = Icons.Outlined.FilterList, + icon = MaterialSymbols.Rounded.FilterList, iconTint = filterTint, onClick = onClickFilter, ), diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MarkdownRender.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MarkdownRender.kt index 6cda8df99..3aac5f4c0 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MarkdownRender.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MarkdownRender.kt @@ -5,8 +5,6 @@ import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.text.InlineTextContent -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Image import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable @@ -46,6 +44,8 @@ import com.mikepenz.markdown.model.MarkdownTypography import com.mikepenz.markdown.model.NoOpImageTransformerImpl import com.mikepenz.markdown.model.markdownAnnotator import com.mikepenz.markdown.model.rememberMarkdownState +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Image import org.intellij.markdown.MarkdownTokenTypes.Companion.HTML_TAG import org.intellij.markdown.flavours.MarkdownFlavourDescriptor import org.intellij.markdown.flavours.commonmark.CommonMarkFlavourDescriptor @@ -241,7 +241,7 @@ private fun getMarkdownInlineContent() = DefaultMarkdownInlineContent( ), children = { Icon( - imageVector = Icons.Outlined.Image, + imageVector = MaterialSymbols.Rounded.Image, contentDescription = null, tint = MaterialTheme.colorScheme.primary, ) diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/ScanlatorFilterDialog.kt b/app/src/main/java/eu/kanade/presentation/manga/components/ScanlatorFilterDialog.kt index 007dd8153..5a7e30b6d 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/ScanlatorFilterDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/ScanlatorFilterDialog.kt @@ -9,9 +9,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.rememberLazyListState -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.rounded.CheckBoxOutlineBlank -import androidx.compose.material.icons.rounded.DisabledByDefault import androidx.compose.material3.AlertDialog import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon @@ -27,6 +24,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.CheckBoxOutlineBlank +import mihon.icons.materialsymbols.roundedfilled.DisabledByDefault import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.TextButton import tachiyomi.presentation.core.components.material.padding @@ -74,9 +74,9 @@ fun ScanlatorFilterDialog( ) { Icon( imageVector = if (isExcluded) { - Icons.Rounded.DisabledByDefault + MaterialSymbols.RoundedFilled.DisabledByDefault } else { - Icons.Rounded.CheckBoxOutlineBlank + MaterialSymbols.Rounded.CheckBoxOutlineBlank }, tint = if (isExcluded) { MaterialTheme.colorScheme.primary diff --git a/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt b/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt index f96245ec4..c766947a9 100644 --- a/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt @@ -1,16 +1,6 @@ package eu.kanade.presentation.more import androidx.compose.foundation.layout.PaddingValues -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.HelpOutline -import androidx.compose.material.icons.automirrored.outlined.Label -import androidx.compose.material.icons.filled.VolunteerActivism -import androidx.compose.material.icons.outlined.CloudOff -import androidx.compose.material.icons.outlined.GetApp -import androidx.compose.material.icons.outlined.Info -import androidx.compose.material.icons.outlined.QueryStats -import androidx.compose.material.icons.outlined.Settings -import androidx.compose.material.icons.outlined.Storage import androidx.compose.material3.HorizontalDivider import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.vector.ImageVector @@ -21,6 +11,16 @@ import eu.kanade.presentation.more.settings.widget.SwitchPreferenceWidget import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.more.DownloadQueueState +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.Help +import mihon.icons.materialsymbols.automirroredrounded.Label +import mihon.icons.materialsymbols.rounded.CloudOff +import mihon.icons.materialsymbols.rounded.Download +import mihon.icons.materialsymbols.rounded.Info +import mihon.icons.materialsymbols.rounded.QueryStats +import mihon.icons.materialsymbols.rounded.Settings +import mihon.icons.materialsymbols.rounded.Storage +import mihon.icons.materialsymbols.rounded.VolunteerActivism import tachiyomi.core.common.Constants import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.ScrollbarLazyColumn @@ -56,7 +56,7 @@ fun MoreScreen( SwitchPreferenceWidget( title = stringResource(MR.strings.label_downloaded_only), subtitle = stringResource(MR.strings.downloaded_only_summary), - icon = Icons.Outlined.CloudOff, + icon = MaterialSymbols.Rounded.CloudOff, checked = downloadedOnly, onCheckedChanged = onDownloadedOnlyChange, ) @@ -98,28 +98,28 @@ fun MoreScreen( pluralStringResource(MR.plurals.download_queue_summary, count = pending, pending) } }, - icon = Icons.Outlined.GetApp, + icon = MaterialSymbols.Rounded.Download, onPreferenceClick = onClickDownloadQueue, ) } item { TextPreferenceWidget( title = stringResource(MR.strings.categories), - icon = Icons.AutoMirrored.Outlined.Label, + icon = MaterialSymbols.AutoMirroredRounded.Label, onPreferenceClick = onClickCategories, ) } item { TextPreferenceWidget( title = stringResource(MR.strings.label_stats), - icon = Icons.Outlined.QueryStats, + icon = MaterialSymbols.Rounded.QueryStats, onPreferenceClick = onClickStats, ) } item { TextPreferenceWidget( title = stringResource(MR.strings.label_data_storage), - icon = Icons.Outlined.Storage, + icon = MaterialSymbols.Rounded.Storage, onPreferenceClick = onClickDataAndStorage, ) } @@ -129,28 +129,28 @@ fun MoreScreen( item { TextPreferenceWidget( title = stringResource(MR.strings.label_settings), - icon = Icons.Outlined.Settings, + icon = MaterialSymbols.Rounded.Settings, onPreferenceClick = onClickSettings, ) } item { TextPreferenceWidget( title = stringResource(MR.strings.label_support_us), - icon = Icons.Default.VolunteerActivism, + icon = MaterialSymbols.Rounded.VolunteerActivism, onPreferenceClick = onClickSupport, ) } item { TextPreferenceWidget( title = stringResource(MR.strings.pref_category_about), - icon = Icons.Outlined.Info, + icon = MaterialSymbols.Rounded.Info, onPreferenceClick = onClickAbout, ) } item { TextPreferenceWidget( title = stringResource(MR.strings.label_help), - icon = Icons.AutoMirrored.Outlined.HelpOutline, + icon = MaterialSymbols.AutoMirroredRounded.Help, onPreferenceClick = { uriHandler.openUri(Constants.URL_HELP) }, ) } diff --git a/app/src/main/java/eu/kanade/presentation/more/NewUpdateScreen.kt b/app/src/main/java/eu/kanade/presentation/more/NewUpdateScreen.kt index 9dcac9e15..03d402abb 100644 --- a/app/src/main/java/eu/kanade/presentation/more/NewUpdateScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/NewUpdateScreen.kt @@ -5,9 +5,6 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.OpenInNew -import androidx.compose.material.icons.outlined.NewReleases import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -19,6 +16,9 @@ import androidx.compose.ui.tooling.preview.PreviewLightDark import eu.kanade.presentation.manga.components.MarkdownRender import eu.kanade.presentation.theme.TachiyomiPreviewTheme import eu.kanade.tachiyomi.ui.more.NewUpdateScreenModel +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.OpenInNew +import mihon.icons.materialsymbols.rounded.NewReleases import org.intellij.markdown.flavours.gfm.GFMFlavourDescriptor import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.padding @@ -36,7 +36,7 @@ fun NewUpdateScreen( onRejectUpdate: () -> Unit, ) { InfoScreen( - icon = Icons.Outlined.NewReleases, + icon = MaterialSymbols.Rounded.NewReleases, headingText = stringResource(MR.strings.update_check_notification_update_available), subtitleText = versionName, acceptText = when (stage) { @@ -69,7 +69,7 @@ fun NewUpdateScreen( ) { Text(text = stringResource(MR.strings.update_check_open)) Spacer(modifier = Modifier.width(MaterialTheme.padding.extraSmall)) - Icon(imageVector = Icons.AutoMirrored.Outlined.OpenInNew, contentDescription = null) + Icon(imageVector = MaterialSymbols.AutoMirroredRounded.OpenInNew, contentDescription = null) } } } diff --git a/app/src/main/java/eu/kanade/presentation/more/onboarding/OnboardingScreen.kt b/app/src/main/java/eu/kanade/presentation/more/onboarding/OnboardingScreen.kt index 2888b5935..9b6452a89 100644 --- a/app/src/main/java/eu/kanade/presentation/more/onboarding/OnboardingScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/onboarding/OnboardingScreen.kt @@ -6,8 +6,6 @@ import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.RocketLaunch import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -17,6 +15,8 @@ import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.RocketLaunch import soup.compose.material.motion.animation.materialSharedAxisX import soup.compose.material.motion.animation.rememberSlideDistance import tachiyomi.i18n.MR @@ -47,7 +47,7 @@ fun OnboardingScreen( } InfoScreen( - icon = Icons.Outlined.RocketLaunch, + icon = MaterialSymbols.Rounded.RocketLaunch, headingText = stringResource(MR.strings.onboarding_heading), subtitleText = stringResource(MR.strings.onboarding_description), acceptText = stringResource( diff --git a/app/src/main/java/eu/kanade/presentation/more/onboarding/PermissionStep.kt b/app/src/main/java/eu/kanade/presentation/more/onboarding/PermissionStep.kt index f5f68f06a..092bd115d 100644 --- a/app/src/main/java/eu/kanade/presentation/more/onboarding/PermissionStep.kt +++ b/app/src/main/java/eu/kanade/presentation/more/onboarding/PermissionStep.kt @@ -11,8 +11,6 @@ import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Check import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.ListItem @@ -40,6 +38,8 @@ import eu.kanade.presentation.util.rememberRequestPackageInstallsPermissionState import eu.kanade.tachiyomi.util.system.launchRequestPackageInstallsPermission import eu.kanade.tachiyomi.util.system.telemetryIncluded import mihon.app.di.appGraph +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Check import tachiyomi.i18n.MR import tachiyomi.presentation.core.i18n.stringResource import tachiyomi.presentation.core.util.collectAsState @@ -175,7 +175,7 @@ internal class PermissionStep : OnboardingStep { ) { if (granted) { Icon( - imageVector = Icons.Default.Check, + imageVector = MaterialSymbols.Rounded.Check, contentDescription = null, tint = MaterialTheme.colorScheme.primary, ) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt index bcca0462a..488cb08d9 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt @@ -15,8 +15,6 @@ import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.HelpOutline import androidx.compose.material3.AlertDialog import androidx.compose.material3.Checkbox import androidx.compose.material3.Icon @@ -60,6 +58,8 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import logcat.LogPriority import mihon.app.di.appGraph +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.Help import tachiyomi.core.common.i18n.stringResource import tachiyomi.core.common.storage.displayablePath import tachiyomi.core.common.util.lang.launchNonCancellable @@ -87,7 +87,7 @@ object SettingsDataScreen : SearchableSettings { val uriHandler = LocalUriHandler.current IconButton(onClick = { uriHandler.openUri(HELP_URL) }) { Icon( - imageVector = Icons.AutoMirrored.Outlined.HelpOutline, + imageVector = MaterialSymbols.AutoMirroredRounded.Help, contentDescription = stringResource(MR.strings.tracking_guide), ) } diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt index c539ab40f..a8c9e936a 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt @@ -7,18 +7,6 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.ChromeReaderMode -import androidx.compose.material.icons.outlined.Code -import androidx.compose.material.icons.outlined.CollectionsBookmark -import androidx.compose.material.icons.outlined.Explore -import androidx.compose.material.icons.outlined.GetApp -import androidx.compose.material.icons.outlined.Info -import androidx.compose.material.icons.outlined.Palette -import androidx.compose.material.icons.outlined.Search -import androidx.compose.material.icons.outlined.Security -import androidx.compose.material.icons.outlined.Storage -import androidx.compose.material.icons.outlined.Sync import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.material3.TopAppBarDefaults @@ -44,6 +32,18 @@ import eu.kanade.presentation.more.settings.screen.about.AboutScreen import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget import eu.kanade.presentation.util.LocalBackPress import eu.kanade.presentation.util.Screen +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.ChromeReaderMode +import mihon.icons.materialsymbols.rounded.Code +import mihon.icons.materialsymbols.rounded.CollectionsBookmark +import mihon.icons.materialsymbols.rounded.Download +import mihon.icons.materialsymbols.rounded.Explore +import mihon.icons.materialsymbols.rounded.Info +import mihon.icons.materialsymbols.rounded.Palette +import mihon.icons.materialsymbols.rounded.Search +import mihon.icons.materialsymbols.rounded.Security +import mihon.icons.materialsymbols.rounded.Storage +import mihon.icons.materialsymbols.rounded.Sync import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.i18n.stringResource @@ -90,7 +90,7 @@ object SettingsMainScreen : Screen() { listOf( AppBar.Action( title = stringResource(MR.strings.action_search), - icon = Icons.Outlined.Search, + icon = MaterialSymbols.Rounded.Search, onClick = { navigator.navigate(SettingsSearchScreen(), twoPane) }, ), ), @@ -174,55 +174,55 @@ object SettingsMainScreen : Screen() { Item( titleRes = MR.strings.pref_category_appearance, subtitleRes = MR.strings.pref_appearance_summary, - icon = Icons.Outlined.Palette, + icon = MaterialSymbols.Rounded.Palette, screen = SettingsAppearanceScreen, ), Item( titleRes = MR.strings.pref_category_library, subtitleRes = MR.strings.pref_library_summary, - icon = Icons.Outlined.CollectionsBookmark, + icon = MaterialSymbols.Rounded.CollectionsBookmark, screen = SettingsLibraryScreen, ), Item( titleRes = MR.strings.pref_category_reader, subtitleRes = MR.strings.pref_reader_summary, - icon = Icons.AutoMirrored.Outlined.ChromeReaderMode, + icon = MaterialSymbols.AutoMirroredRounded.ChromeReaderMode, screen = SettingsReaderScreen, ), Item( titleRes = MR.strings.pref_category_downloads, subtitleRes = MR.strings.pref_downloads_summary, - icon = Icons.Outlined.GetApp, + icon = MaterialSymbols.Rounded.Download, screen = SettingsDownloadScreen, ), Item( titleRes = MR.strings.pref_category_tracking, subtitleRes = MR.strings.pref_tracking_summary, - icon = Icons.Outlined.Sync, + icon = MaterialSymbols.Rounded.Sync, screen = SettingsTrackingScreen, ), Item( titleRes = MR.strings.browse, subtitleRes = MR.strings.pref_browse_summary, - icon = Icons.Outlined.Explore, + icon = MaterialSymbols.Rounded.Explore, screen = SettingsBrowseScreen, ), Item( titleRes = MR.strings.label_data_storage, subtitleRes = MR.strings.pref_backup_summary, - icon = Icons.Outlined.Storage, + icon = MaterialSymbols.Rounded.Storage, screen = SettingsDataScreen, ), Item( titleRes = MR.strings.pref_category_security, subtitleRes = MR.strings.pref_security_summary, - icon = Icons.Outlined.Security, + icon = MaterialSymbols.Rounded.Security, screen = SettingsSecurityScreen, ), Item( titleRes = MR.strings.pref_category_advanced, subtitleRes = MR.strings.pref_advanced_summary, - icon = Icons.Outlined.Code, + icon = MaterialSymbols.Rounded.Code, screen = SettingsAdvancedScreen, ), Item( @@ -230,7 +230,7 @@ object SettingsMainScreen : Screen() { formatSubtitle = { "${stringResource(MR.strings.app_name)} ${AboutScreen.getVersionName(withBuildDate = false)}" }, - icon = Icons.Outlined.Info, + icon = MaterialSymbols.Rounded.Info, screen = AboutScreen, ), ) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSearchScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSearchScreen.kt index b5a9ac937..3d3e2c7bd 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSearchScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSearchScreen.kt @@ -17,8 +17,6 @@ import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.text.input.TextFieldLineLimits import androidx.compose.foundation.text.input.clearText import androidx.compose.foundation.text.input.rememberTextFieldState -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Close import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -50,6 +48,8 @@ import cafe.adriel.voyager.navigator.currentOrThrow import eu.kanade.presentation.components.UpIcon import eu.kanade.presentation.more.settings.Preference import eu.kanade.presentation.util.Screen +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Close import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.i18n.stringResource @@ -128,7 +128,7 @@ class SettingsSearchScreen : Screen() { if (textFieldState.text.isNotEmpty()) { IconButton(onClick = { textFieldState.clearText() }) { Icon( - imageVector = Icons.Outlined.Close, + imageVector = MaterialSymbols.Rounded.Close, contentDescription = null, tint = MaterialTheme.colorScheme.onSurfaceVariant, ) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsTrackingScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsTrackingScreen.kt index 29aa399a5..69700bea4 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsTrackingScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsTrackingScreen.kt @@ -7,11 +7,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.HelpOutline -import androidx.compose.material.icons.filled.Visibility -import androidx.compose.material.icons.filled.VisibilityOff -import androidx.compose.material.icons.outlined.Close import androidx.compose.material3.AlertDialog import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults @@ -57,6 +52,11 @@ import eu.kanade.tachiyomi.data.track.shikimori.ShikimoriApi import eu.kanade.tachiyomi.util.system.openInBrowser import eu.kanade.tachiyomi.util.system.toast import mihon.app.di.appGraph +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.Help +import mihon.icons.materialsymbols.rounded.Close +import mihon.icons.materialsymbols.rounded.Visibility +import mihon.icons.materialsymbols.rounded.VisibilityOff import tachiyomi.core.common.util.lang.launchIO import tachiyomi.core.common.util.lang.withUIContext import tachiyomi.i18n.MR @@ -74,7 +74,7 @@ object SettingsTrackingScreen : SearchableSettings { val uriHandler = LocalUriHandler.current IconButton(onClick = { uriHandler.openUri("https://mihon.app/docs/guides/tracking") }) { Icon( - imageVector = Icons.AutoMirrored.Outlined.HelpOutline, + imageVector = MaterialSymbols.AutoMirroredRounded.Help, contentDescription = stringResource(MR.strings.tracking_guide), ) } @@ -219,7 +219,7 @@ object SettingsTrackingScreen : SearchableSettings { ) IconButton(onClick = onDismissRequest) { Icon( - imageVector = Icons.Outlined.Close, + imageVector = MaterialSymbols.Rounded.Close, contentDescription = stringResource(MR.strings.action_close), ) } @@ -251,9 +251,9 @@ object SettingsTrackingScreen : SearchableSettings { IconButton(onClick = { hidePassword = !hidePassword }) { Icon( imageVector = if (hidePassword) { - Icons.Filled.Visibility + MaterialSymbols.Rounded.Visibility } else { - Icons.Filled.VisibilityOff + MaterialSymbols.Rounded.VisibilityOff }, contentDescription = null, ) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/about/AboutScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/about/AboutScreen.kt index 70c2e4304..bf6e674ce 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/about/AboutScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/about/AboutScreen.kt @@ -8,8 +8,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Public import androidx.compose.material3.CircularProgressIndicator import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -43,6 +41,14 @@ import kotlinx.datetime.TimeZone import kotlinx.datetime.toLocalDateTime import logcat.LogPriority import mihon.app.di.appGraph +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Public +import mihon.icons.simpleicons.Discord +import mihon.icons.simpleicons.Facebook +import mihon.icons.simpleicons.Github +import mihon.icons.simpleicons.Reddit +import mihon.icons.simpleicons.SimpleIcons +import mihon.icons.simpleicons.X import tachiyomi.core.common.Constants import tachiyomi.core.common.util.lang.withIOContext import tachiyomi.core.common.util.lang.withUIContext @@ -53,12 +59,6 @@ import tachiyomi.presentation.core.components.LinkIcon import tachiyomi.presentation.core.components.ScrollbarLazyColumn import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.i18n.stringResource -import tachiyomi.presentation.core.icons.CustomIcons -import tachiyomi.presentation.core.icons.Discord -import tachiyomi.presentation.core.icons.Facebook -import tachiyomi.presentation.core.icons.Github -import tachiyomi.presentation.core.icons.Reddit -import tachiyomi.presentation.core.icons.X import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import kotlin.time.Instant @@ -175,32 +175,32 @@ object AboutScreen : Screen() { ) { LinkIcon( label = stringResource(MR.strings.website), - icon = Icons.Outlined.Public, + icon = MaterialSymbols.Rounded.Public, url = "https://mihon.app", ) LinkIcon( label = "Discord", - icon = CustomIcons.Discord, + icon = SimpleIcons.Discord, url = Constants.URL_DISCORD, ) LinkIcon( label = "X", - icon = CustomIcons.X, + icon = SimpleIcons.X, url = "https://x.com/mihonapp", ) LinkIcon( label = "Facebook", - icon = CustomIcons.Facebook, + icon = SimpleIcons.Facebook, url = "https://facebook.com/mihonapp", ) LinkIcon( label = "Reddit", - icon = CustomIcons.Reddit, + icon = SimpleIcons.Reddit, url = "https://www.reddit.com/r/mihonapp", ) LinkIcon( label = "GitHub", - icon = CustomIcons.Github, + icon = SimpleIcons.Github, url = "https://github.com/mihonapp", ) } diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/advanced/ClearDatabaseScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/advanced/ClearDatabaseScreen.kt index 9e89672da..e715f2991 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/advanced/ClearDatabaseScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/advanced/ClearDatabaseScreen.kt @@ -8,9 +8,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.items -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.FlipToBack -import androidx.compose.material.icons.outlined.SelectAll import androidx.compose.material3.AlertDialog import androidx.compose.material3.Checkbox import androidx.compose.material3.MaterialTheme @@ -49,6 +46,9 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.update +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.FlipToBack +import mihon.icons.materialsymbols.rounded.SelectAll import tachiyomi.core.common.util.lang.launchIO import tachiyomi.core.common.util.lang.launchUI import tachiyomi.core.common.util.lang.toLong @@ -147,12 +147,12 @@ class ClearDatabaseScreen : Screen() { actions = listOf( AppBar.Action( title = stringResource(MR.strings.action_select_all), - icon = Icons.Outlined.SelectAll, + icon = MaterialSymbols.Rounded.SelectAll, onClick = viewModel::selectAll, ), AppBar.Action( title = stringResource(MR.strings.action_select_inverse), - icon = Icons.Outlined.FlipToBack, + icon = MaterialSymbols.Rounded.FlipToBack, onClick = viewModel::invertSelection, ), ), diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/appearance/AppLanguageScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/appearance/AppLanguageScreen.kt index 0f863ca72..e93cdc650 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/appearance/AppLanguageScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/appearance/AppLanguageScreen.kt @@ -6,8 +6,6 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Check import androidx.compose.material3.Icon import androidx.compose.material3.ListItem import androidx.compose.material3.MaterialTheme @@ -27,6 +25,8 @@ import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.util.Screen import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.system.LocaleHelper +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Check import org.xmlpull.v1.XmlPullParser import tachiyomi.core.common.i18n.stringResource import tachiyomi.i18n.MR @@ -74,7 +74,7 @@ class AppLanguageScreen : Screen() { trailingContent = { if (currentLanguage == it.langTag) { Icon( - imageVector = Icons.Default.Check, + imageVector = MaterialSymbols.Rounded.Check, contentDescription = null, tint = MaterialTheme.colorScheme.primary, ) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/browse/components/ExtensionStoresContent.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/browse/components/ExtensionStoresContent.kt index 3d7c0a1b9..7aede9c9c 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/browse/components/ExtensionStoresContent.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/browse/components/ExtensionStoresContent.kt @@ -7,11 +7,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListState -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.Label -import androidx.compose.material.icons.outlined.ContentCopy -import androidx.compose.material.icons.outlined.Delete -import androidx.compose.material.icons.outlined.Public import androidx.compose.material3.ElevatedCard import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -21,11 +16,16 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import mihon.domain.extension.model.ExtensionStore +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.Label +import mihon.icons.materialsymbols.rounded.ContentCopy +import mihon.icons.materialsymbols.rounded.Delete +import mihon.icons.materialsymbols.rounded.Public +import mihon.icons.simpleicons.Discord +import mihon.icons.simpleicons.SimpleIcons import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.padding import tachiyomi.presentation.core.i18n.stringResource -import tachiyomi.presentation.core.icons.CustomIcons -import tachiyomi.presentation.core.icons.Discord @Composable fun ExtensionStoresContent( @@ -81,7 +81,7 @@ private fun ExtensionStoresListItem( ), verticalAlignment = Alignment.CenterVertically, ) { - Icon(imageVector = Icons.AutoMirrored.Outlined.Label, contentDescription = null) + Icon(imageVector = MaterialSymbols.AutoMirroredRounded.Label, contentDescription = null) Text( text = store.name, modifier = Modifier.padding(start = MaterialTheme.padding.medium), @@ -95,7 +95,7 @@ private fun ExtensionStoresListItem( ) { IconButton(onClick = onOpenWebsite) { Icon( - imageVector = Icons.Outlined.Public, + imageVector = MaterialSymbols.Rounded.Public, contentDescription = stringResource(MR.strings.action_open_in_browser), ) } @@ -103,7 +103,7 @@ private fun ExtensionStoresListItem( if (store.contact.discord != null) { IconButton(onClick = onOpenDiscord) { Icon( - imageVector = CustomIcons.Discord, + imageVector = SimpleIcons.Discord, contentDescription = null, ) } @@ -111,14 +111,14 @@ private fun ExtensionStoresListItem( IconButton(onClick = onCopy) { Icon( - imageVector = Icons.Outlined.ContentCopy, + imageVector = MaterialSymbols.Rounded.ContentCopy, contentDescription = stringResource(MR.strings.action_copy_to_clipboard), ) } IconButton(onClick = onDelete) { Icon( - imageVector = Icons.Outlined.Delete, + imageVector = MaterialSymbols.Rounded.Delete, contentDescription = stringResource(MR.strings.action_delete), ) } diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/browse/components/ExtensionStoresScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/browse/components/ExtensionStoresScreen.kt index e6595782a..684421a87 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/browse/components/ExtensionStoresScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/browse/components/ExtensionStoresScreen.kt @@ -3,8 +3,6 @@ package eu.kanade.presentation.more.settings.screen.browse.components import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.rememberLazyListState -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Refresh import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme @@ -14,6 +12,8 @@ import eu.kanade.presentation.category.components.CategoryFloatingActionButton import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.more.settings.screen.browse.ExtensionStoreScreenState import mihon.domain.extension.model.ExtensionStore +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Refresh import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.components.material.padding @@ -43,7 +43,7 @@ fun ExtensionStoresScreen( actions = { IconButton(onClick = onClickRefresh) { Icon( - imageVector = Icons.Outlined.Refresh, + imageVector = MaterialSymbols.Rounded.Refresh, contentDescription = stringResource(resource = MR.strings.action_webview_refresh), ) } diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/BackupSchemaScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/BackupSchemaScreen.kt index cf8a2e413..65d79c1dc 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/BackupSchemaScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/BackupSchemaScreen.kt @@ -3,8 +3,6 @@ package eu.kanade.presentation.more.settings.screen.debug import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ContentCopy import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -20,6 +18,8 @@ import eu.kanade.presentation.util.Screen import eu.kanade.tachiyomi.data.backup.models.Backup import eu.kanade.tachiyomi.util.system.copyToClipboard import kotlinx.serialization.protobuf.schema.ProtoBufSchemaGenerator +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.ContentCopy import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.i18n.stringResource @@ -47,7 +47,7 @@ class BackupSchemaScreen : Screen() { listOf( AppBar.Action( title = stringResource(MR.strings.action_copy_to_clipboard), - icon = Icons.Default.ContentCopy, + icon = MaterialSymbols.Rounded.ContentCopy, onClick = { context.copyToClipboard(TITLE, schema) }, diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/DebugInfoScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/DebugInfoScreen.kt index 84f4f1638..1d89c9ec6 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/DebugInfoScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/DebugInfoScreen.kt @@ -1,8 +1,6 @@ package eu.kanade.presentation.more.settings.screen.debug import android.os.Build -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Autorenew import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme @@ -27,6 +25,8 @@ import kotlinx.coroutines.guava.await import kotlinx.coroutines.launch import mihon.app.di.appGraph import mihon.core.common.FeatureFlags +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Autorenew import tachiyomi.i18n.MR import tachiyomi.presentation.core.util.collectAsState @@ -86,7 +86,7 @@ class DebugInfoScreen : Screen() { }, ) { Icon( - imageVector = Icons.Outlined.Autorenew, + imageVector = MaterialSymbols.Rounded.Autorenew, tint = MaterialTheme.colorScheme.primary, contentDescription = null, ) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/WorkerInfoScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/WorkerInfoScreen.kt index e2b0c9dd0..a2fe89642 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/WorkerInfoScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/debug/WorkerInfoScreen.kt @@ -6,8 +6,6 @@ import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.rememberScrollState -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ContentCopy import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -42,6 +40,8 @@ import kotlinx.coroutines.flow.stateIn import kotlinx.datetime.TimeZone import kotlinx.datetime.toLocalDateTime import mihon.app.di.appGraph +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.ContentCopy import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.i18n.stringResource @@ -75,7 +75,7 @@ class WorkerInfoScreen : Screen() { listOf( AppBar.Action( title = stringResource(MR.strings.action_copy_to_clipboard), - icon = Icons.Default.ContentCopy, + icon = MaterialSymbols.Rounded.ContentCopy, onClick = { context.copyToClipboard(TITLE, enqueued + finished + running) }, diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/AppThemePreferenceWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/AppThemePreferenceWidget.kt index 5e3f76efe..c5dbd1a06 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/AppThemePreferenceWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/AppThemePreferenceWidget.kt @@ -21,8 +21,6 @@ import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.lazy.items import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.CheckCircle import androidx.compose.material3.DividerDefaults import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -48,6 +46,8 @@ import eu.kanade.presentation.manga.components.MangaCover import eu.kanade.presentation.theme.TachiyomiTheme import eu.kanade.tachiyomi.util.system.DeviceUtil import eu.kanade.tachiyomi.util.system.isDynamicColorAvailable +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.roundedfilled.CheckCircle import tachiyomi.core.common.preference.InMemoryPreferenceStore import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.padding @@ -175,7 +175,7 @@ fun AppThemePreviewItem( ) { if (selected) { Icon( - imageVector = Icons.Filled.CheckCircle, + imageVector = MaterialSymbols.RoundedFilled.CheckCircle, contentDescription = stringResource(MR.strings.selected), tint = MaterialTheme.colorScheme.primary, ) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/EditTextPreferenceWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/EditTextPreferenceWidget.kt index 00d8f16d4..c35768d60 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/EditTextPreferenceWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/EditTextPreferenceWidget.kt @@ -1,9 +1,6 @@ package eu.kanade.presentation.more.settings.widget import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Cancel -import androidx.compose.material.icons.filled.Error import androidx.compose.material3.AlertDialog import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -22,6 +19,9 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.window.DialogProperties import kotlinx.coroutines.launch +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Cancel +import mihon.icons.materialsymbols.rounded.Error import tachiyomi.i18n.MR import tachiyomi.presentation.core.i18n.stringResource @@ -57,10 +57,10 @@ fun EditTextPreferenceWidget( onValueChange = { textFieldValue = it }, trailingIcon = { if (textFieldValue.text.isBlank()) { - Icon(imageVector = Icons.Filled.Error, contentDescription = null) + Icon(imageVector = MaterialSymbols.Rounded.Error, contentDescription = null) } else { IconButton(onClick = { textFieldValue = TextFieldValue("") }) { - Icon(imageVector = Icons.Filled.Cancel, contentDescription = null) + Icon(imageVector = MaterialSymbols.Rounded.Cancel, contentDescription = null) } } }, diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/InfoWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/InfoWidget.kt index 46fee1e1c..376084036 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/InfoWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/InfoWidget.kt @@ -3,8 +3,6 @@ package eu.kanade.presentation.more.settings.widget import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Info import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface @@ -13,6 +11,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.PreviewLightDark import eu.kanade.presentation.theme.TachiyomiPreviewTheme +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Info import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.padding import tachiyomi.presentation.core.i18n.stringResource @@ -30,7 +30,7 @@ internal fun InfoWidget(text: String) { verticalArrangement = Arrangement.spacedBy(MaterialTheme.padding.medium), ) { Icon( - imageVector = Icons.Outlined.Info, + imageVector = MaterialSymbols.Rounded.Info, contentDescription = null, ) Text( diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/SwitchPreferenceWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/SwitchPreferenceWidget.kt index 41690242d..f71f5d1a0 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/SwitchPreferenceWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/SwitchPreferenceWidget.kt @@ -2,8 +2,6 @@ package eu.kanade.presentation.more.settings.widget import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Preview import androidx.compose.material3.Surface import androidx.compose.material3.Switch import androidx.compose.runtime.Composable @@ -11,6 +9,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.tooling.preview.PreviewLightDark import eu.kanade.presentation.theme.TachiyomiPreviewTheme +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Preview @Composable fun SwitchPreferenceWidget( @@ -46,7 +46,7 @@ private fun SwitchPreferenceWidgetPreview() { SwitchPreferenceWidget( title = "Text preference with icon", subtitle = "Text preference summary", - icon = Icons.Filled.Preview, + icon = MaterialSymbols.Rounded.Preview, checked = true, onCheckedChanged = {}, ) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/TextPreferenceWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/TextPreferenceWidget.kt index f3423d8e4..a31918c2a 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/TextPreferenceWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/TextPreferenceWidget.kt @@ -2,8 +2,6 @@ package eu.kanade.presentation.more.settings.widget import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Preview import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface @@ -14,6 +12,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.tooling.preview.PreviewLightDark import eu.kanade.presentation.theme.TachiyomiPreviewTheme +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Preview import tachiyomi.presentation.core.util.secondaryItemAlpha @Composable @@ -68,7 +68,7 @@ private fun TextPreferenceWidgetPreview() { TextPreferenceWidget( title = "Text preference with icon", subtitle = "Text preference summary", - icon = Icons.Filled.Preview, + icon = MaterialSymbols.Rounded.Preview, onPreferenceClick = {}, ) TextPreferenceWidget( diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/TrackingPreferenceWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/TrackingPreferenceWidget.kt index 417008b5c..076b93f0d 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/TrackingPreferenceWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/TrackingPreferenceWidget.kt @@ -7,8 +7,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Done import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -22,6 +20,8 @@ import androidx.compose.ui.unit.dp import eu.kanade.presentation.more.settings.LocalPreferenceHighlighted import eu.kanade.presentation.track.components.TrackLogoIcon import eu.kanade.tachiyomi.data.track.Tracker +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Done import tachiyomi.i18n.MR import tachiyomi.presentation.core.i18n.stringResource @@ -66,7 +66,7 @@ fun TrackingPreferenceWidget( } if (isLoggedIn) { Icon( - imageVector = Icons.Outlined.Done, + imageVector = MaterialSymbols.Rounded.Done, modifier = Modifier .padding(4.dp) .size(32.dp), diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/TriStateListDialog.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/TriStateListDialog.kt index 4f396068a..94bc5c98c 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/TriStateListDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/TriStateListDialog.kt @@ -10,10 +10,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.lazy.rememberLazyListState -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.rounded.CheckBox -import androidx.compose.material.icons.rounded.CheckBoxOutlineBlank -import androidx.compose.material.icons.rounded.DisabledByDefault import androidx.compose.material3.AlertDialog import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon @@ -28,6 +24,10 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.CheckBoxOutlineBlank +import mihon.icons.materialsymbols.roundedfilled.CheckBox +import mihon.icons.materialsymbols.roundedfilled.DisabledByDefault import tachiyomi.i18n.MR import tachiyomi.presentation.core.i18n.stringResource @@ -93,9 +93,9 @@ fun TriStateListDialog( Icon( modifier = Modifier.padding(end = 20.dp), imageVector = when (state) { - State.UNCHECKED -> Icons.Rounded.CheckBoxOutlineBlank - State.CHECKED -> Icons.Rounded.CheckBox - State.INVERSED -> Icons.Rounded.DisabledByDefault + State.UNCHECKED -> MaterialSymbols.Rounded.CheckBoxOutlineBlank + State.CHECKED -> MaterialSymbols.RoundedFilled.CheckBox + State.INVERSED -> MaterialSymbols.RoundedFilled.DisabledByDefault }, tint = if (state == State.UNCHECKED) { LocalContentColor.current diff --git a/app/src/main/java/eu/kanade/presentation/more/stats/StatsScreenContent.kt b/app/src/main/java/eu/kanade/presentation/more/stats/StatsScreenContent.kt index 415f72ae5..c57949335 100644 --- a/app/src/main/java/eu/kanade/presentation/more/stats/StatsScreenContent.kt +++ b/app/src/main/java/eu/kanade/presentation/more/stats/StatsScreenContent.kt @@ -7,10 +7,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.height import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyItemScope -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.CollectionsBookmark -import androidx.compose.material.icons.outlined.LocalLibrary -import androidx.compose.material.icons.outlined.Schedule import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -20,6 +16,10 @@ import eu.kanade.presentation.more.stats.components.StatsItem import eu.kanade.presentation.more.stats.components.StatsOverviewItem import eu.kanade.presentation.more.stats.data.StatsData import eu.kanade.presentation.util.toDurationString +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.CollectionsBookmark +import mihon.icons.materialsymbols.rounded.LocalLibrary +import mihon.icons.materialsymbols.rounded.Schedule import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.SectionCard import tachiyomi.presentation.core.components.material.padding @@ -70,17 +70,17 @@ private fun LazyItemScope.OverviewSection( StatsOverviewItem( title = data.libraryMangaCount.toString(), subtitle = stringResource(MR.strings.in_library), - icon = Icons.Outlined.CollectionsBookmark, + icon = MaterialSymbols.Rounded.CollectionsBookmark, ) StatsOverviewItem( title = readDurationString, subtitle = stringResource(MR.strings.label_read_duration), - icon = Icons.Outlined.Schedule, + icon = MaterialSymbols.Rounded.Schedule, ) StatsOverviewItem( title = data.completedMangaCount.toString(), subtitle = stringResource(MR.strings.label_completed_titles), - icon = Icons.Outlined.LocalLibrary, + icon = MaterialSymbols.Rounded.LocalLibrary, ) } } diff --git a/app/src/main/java/eu/kanade/presentation/reader/ChapterTransition.kt b/app/src/main/java/eu/kanade/presentation/reader/ChapterTransition.kt index bbeaf19f9..c6d853fec 100644 --- a/app/src/main/java/eu/kanade/presentation/reader/ChapterTransition.kt +++ b/app/src/main/java/eu/kanade/presentation/reader/ChapterTransition.kt @@ -10,10 +10,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.text.InlineTextContent import androidx.compose.foundation.text.appendInlineContent -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.CheckCircle -import androidx.compose.material.icons.outlined.Info -import androidx.compose.material.icons.outlined.Warning import androidx.compose.material3.CardColors import androidx.compose.material3.CardDefaults import androidx.compose.material3.Icon @@ -37,6 +33,10 @@ import eu.kanade.presentation.theme.TachiyomiPreviewTheme import eu.kanade.tachiyomi.data.database.models.toDomainChapter import eu.kanade.tachiyomi.ui.reader.model.ChapterTransition import eu.kanade.tachiyomi.ui.reader.model.ReaderChapter +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Info +import mihon.icons.materialsymbols.rounded.Warning +import mihon.icons.materialsymbols.roundedfilled.CheckCircle import tachiyomi.domain.chapter.model.Chapter import tachiyomi.domain.chapter.service.calculateChapterGap import tachiyomi.i18n.MR @@ -156,7 +156,7 @@ private fun NoChapterNotification( verticalAlignment = Alignment.CenterVertically, ) { Icon( - imageVector = Icons.Outlined.Info, + imageVector = MaterialSymbols.Rounded.Info, tint = MaterialTheme.colorScheme.primary, contentDescription = null, ) @@ -184,7 +184,7 @@ private fun ChapterGapWarning( verticalAlignment = Alignment.CenterVertically, ) { Icon( - imageVector = Icons.Outlined.Warning, + imageVector = MaterialSymbols.Rounded.Warning, tint = MaterialTheme.colorScheme.error, contentDescription = null, ) @@ -243,7 +243,7 @@ private fun ChapterText( ), ) { Icon( - imageVector = Icons.Filled.CheckCircle, + imageVector = MaterialSymbols.RoundedFilled.CheckCircle, contentDescription = stringResource(MR.strings.label_downloaded), ) }, diff --git a/app/src/main/java/eu/kanade/presentation/reader/ReaderPageActionsDialog.kt b/app/src/main/java/eu/kanade/presentation/reader/ReaderPageActionsDialog.kt index 9e9afde8d..87a2ae9db 100644 --- a/app/src/main/java/eu/kanade/presentation/reader/ReaderPageActionsDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/reader/ReaderPageActionsDialog.kt @@ -3,11 +3,6 @@ package eu.kanade.presentation.reader import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.ContentCopy -import androidx.compose.material.icons.outlined.Photo -import androidx.compose.material.icons.outlined.Save -import androidx.compose.material.icons.outlined.Share import androidx.compose.material3.AlertDialog import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -20,6 +15,11 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import eu.kanade.presentation.components.AdaptiveSheet +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.ContentCopy +import mihon.icons.materialsymbols.rounded.Photo +import mihon.icons.materialsymbols.rounded.Save +import mihon.icons.materialsymbols.rounded.Share import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.ActionButton import tachiyomi.presentation.core.components.material.padding @@ -42,13 +42,13 @@ fun ReaderPageActionsDialog( ActionButton( modifier = Modifier.weight(1f), title = stringResource(MR.strings.set_as_cover), - icon = Icons.Outlined.Photo, + icon = MaterialSymbols.Rounded.Photo, onClick = { showSetCoverDialog = true }, ) ActionButton( modifier = Modifier.weight(1f), title = stringResource(MR.strings.action_copy_to_clipboard), - icon = Icons.Outlined.ContentCopy, + icon = MaterialSymbols.Rounded.ContentCopy, onClick = { onShare(true) onDismissRequest() @@ -57,7 +57,7 @@ fun ReaderPageActionsDialog( ActionButton( modifier = Modifier.weight(1f), title = stringResource(MR.strings.action_share), - icon = Icons.Outlined.Share, + icon = MaterialSymbols.Rounded.Share, onClick = { onShare(false) onDismissRequest() @@ -66,7 +66,7 @@ fun ReaderPageActionsDialog( ActionButton( modifier = Modifier.weight(1f), title = stringResource(MR.strings.action_save), - icon = Icons.Outlined.Save, + icon = MaterialSymbols.Rounded.Save, onClick = { onSave() onDismissRequest() diff --git a/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderBottomBar.kt b/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderBottomBar.kt index f730dceb4..6faedd7c1 100644 --- a/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderBottomBar.kt +++ b/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderBottomBar.kt @@ -2,8 +2,6 @@ package eu.kanade.presentation.reader.appbars import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Settings import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.runtime.Composable @@ -14,6 +12,8 @@ import androidx.compose.ui.res.painterResource import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.reader.setting.ReaderOrientation import eu.kanade.tachiyomi.ui.reader.setting.ReadingMode +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Settings import tachiyomi.i18n.MR import tachiyomi.presentation.core.i18n.stringResource @@ -57,7 +57,7 @@ fun ReaderBottomBar( IconButton(onClick = onClickSettings) { Icon( - imageVector = Icons.Outlined.Settings, + imageVector = MaterialSymbols.Rounded.Settings, contentDescription = stringResource(MR.strings.action_settings), ) } diff --git a/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderTopBar.kt b/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderTopBar.kt index 29152a466..515794936 100644 --- a/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderTopBar.kt +++ b/app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderTopBar.kt @@ -1,13 +1,13 @@ package eu.kanade.presentation.reader.appbars -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Bookmark -import androidx.compose.material.icons.outlined.BookmarkBorder import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.AppBarActions +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Bookmark +import mihon.icons.materialsymbols.roundedfilled.Bookmark import tachiyomi.i18n.MR import tachiyomi.presentation.core.i18n.stringResource @@ -42,9 +42,9 @@ fun ReaderTopBar( }, ), icon = if (bookmarked) { - Icons.Outlined.Bookmark + MaterialSymbols.RoundedFilled.Bookmark } else { - Icons.Outlined.BookmarkBorder + MaterialSymbols.Rounded.Bookmark }, onClick = onToggleBookmarked, ), diff --git a/app/src/main/java/eu/kanade/presentation/reader/components/ChapterNavigator.kt b/app/src/main/java/eu/kanade/presentation/reader/components/ChapterNavigator.kt index 3d1b4cbe9..47426807b 100644 --- a/app/src/main/java/eu/kanade/presentation/reader/components/ChapterNavigator.kt +++ b/app/src/main/java/eu/kanade/presentation/reader/components/ChapterNavigator.kt @@ -12,9 +12,6 @@ import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.SkipNext -import androidx.compose.material.icons.outlined.SkipPrevious import androidx.compose.material3.FilledIconButton import androidx.compose.material3.Icon import androidx.compose.material3.IconButtonColors @@ -46,6 +43,9 @@ import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp import eu.kanade.presentation.theme.TachiyomiPreviewTheme import eu.kanade.presentation.util.isTabletUi +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.SkipNext +import mihon.icons.materialsymbols.rounded.SkipPrevious import tachiyomi.i18n.MR import tachiyomi.presentation.core.i18n.stringResource import kotlin.math.roundToInt @@ -172,7 +172,7 @@ fun HorizontalChapterNavigator( colors = buttonColor, ) { Icon( - imageVector = Icons.Outlined.SkipPrevious, + imageVector = MaterialSymbols.Rounded.SkipPrevious, contentDescription = stringResource( if (isRtl) MR.strings.action_next_chapter else MR.strings.action_previous_chapter, ), @@ -216,7 +216,7 @@ fun HorizontalChapterNavigator( colors = buttonColor, ) { Icon( - imageVector = Icons.Outlined.SkipNext, + imageVector = MaterialSymbols.Rounded.SkipNext, contentDescription = stringResource( if (isRtl) MR.strings.action_previous_chapter else MR.strings.action_next_chapter, ), @@ -253,7 +253,7 @@ fun VerticalChapterNavigator( colors = buttonColor, ) { Icon( - imageVector = Icons.Outlined.SkipPrevious, + imageVector = MaterialSymbols.Rounded.SkipPrevious, contentDescription = stringResource(MR.strings.action_previous_chapter), modifier = Modifier.rotate(90f), ) @@ -290,7 +290,7 @@ fun VerticalChapterNavigator( colors = buttonColor, ) { Icon( - imageVector = Icons.Outlined.SkipNext, + imageVector = MaterialSymbols.Rounded.SkipNext, contentDescription = stringResource(MR.strings.action_next_chapter), modifier = Modifier.rotate(90f), ) diff --git a/app/src/main/java/eu/kanade/presentation/reader/components/ModeSelectionDialog.kt b/app/src/main/java/eu/kanade/presentation/reader/components/ModeSelectionDialog.kt index c6286bf22..db83f2686 100644 --- a/app/src/main/java/eu/kanade/presentation/reader/components/ModeSelectionDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/reader/components/ModeSelectionDialog.kt @@ -6,8 +6,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Check import androidx.compose.material3.FilledTonalButton import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -20,6 +18,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.dp import eu.kanade.presentation.theme.TachiyomiPreviewTheme +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Check import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.SettingsItemsPaddings import tachiyomi.presentation.core.components.material.padding @@ -56,7 +56,7 @@ fun ModeSelectionDialog( verticalAlignment = Alignment.CenterVertically, ) { Icon( - imageVector = Icons.Outlined.Check, + imageVector = MaterialSymbols.Rounded.Check, contentDescription = null, ) Text(text = stringResource(MR.strings.action_apply)) diff --git a/app/src/main/java/eu/kanade/presentation/track/TrackInfoDialogHome.kt b/app/src/main/java/eu/kanade/presentation/track/TrackInfoDialogHome.kt index 21b30cc4c..b6fde043a 100644 --- a/app/src/main/java/eu/kanade/presentation/track/TrackInfoDialogHome.kt +++ b/app/src/main/java/eu/kanade/presentation/track/TrackInfoDialogHome.kt @@ -22,9 +22,6 @@ import androidx.compose.foundation.layout.wrapContentSize import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.MoreVert -import androidx.compose.material.icons.filled.VisibilityOff import androidx.compose.material3.Badge import androidx.compose.material3.BadgedBox import androidx.compose.material3.DropdownMenuItem @@ -60,6 +57,9 @@ import eu.kanade.tachiyomi.util.lang.toJavaLocalDate import eu.kanade.tachiyomi.util.lang.toLocalDate import eu.kanade.tachiyomi.util.system.copyToClipboard import kotlinx.datetime.toJavaLocalDate +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.MoreVert +import mihon.icons.materialsymbols.rounded.VisibilityOff import tachiyomi.i18n.MR import tachiyomi.presentation.core.i18n.stringResource import java.time.format.DateTimeFormatter @@ -175,7 +175,7 @@ private fun TrackInfoItem( modifier = Modifier.absoluteOffset(x = (-5).dp), ) { Icon( - imageVector = Icons.Filled.VisibilityOff, + imageVector = MaterialSymbols.Rounded.VisibilityOff, contentDescription = stringResource(MR.strings.tracked_privately), modifier = Modifier.size(14.dp), ) @@ -334,7 +334,7 @@ private fun TrackInfoItemMenu( Box(modifier = Modifier.wrapContentSize(Alignment.TopStart)) { IconButton(onClick = { expanded = true }) { Icon( - imageVector = Icons.Default.MoreVert, + imageVector = MaterialSymbols.Rounded.MoreVert, contentDescription = stringResource(MR.strings.label_more), ) } diff --git a/app/src/main/java/eu/kanade/presentation/track/TrackerSearch.kt b/app/src/main/java/eu/kanade/presentation/track/TrackerSearch.kt index 0fa91c2ab..8d8388902 100644 --- a/app/src/main/java/eu/kanade/presentation/track/TrackerSearch.kt +++ b/app/src/main/java/eu/kanade/presentation/track/TrackerSearch.kt @@ -30,11 +30,6 @@ import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.text.input.TextFieldLineLimits import androidx.compose.foundation.text.input.TextFieldState import androidx.compose.foundation.text.input.clearText -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.ArrowBack -import androidx.compose.material.icons.filled.CheckCircle -import androidx.compose.material.icons.filled.Close -import androidx.compose.material.icons.filled.VisibilityOff import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.DropdownMenuItem @@ -76,6 +71,11 @@ import eu.kanade.presentation.theme.TachiyomiPreviewTheme import eu.kanade.tachiyomi.data.track.model.TrackSearch import eu.kanade.tachiyomi.util.system.openInBrowser import kotlinx.coroutines.launch +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.ArrowBack +import mihon.icons.materialsymbols.rounded.Close +import mihon.icons.materialsymbols.rounded.VisibilityOff +import mihon.icons.materialsymbols.roundedfilled.CheckCircle import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.ScrollbarLazyColumn import tachiyomi.presentation.core.components.material.Scaffold @@ -112,7 +112,7 @@ fun TrackerSearch( navigationIcon = { IconButton(onClick = onDismissRequest) { Icon( - imageVector = Icons.AutoMirrored.Outlined.ArrowBack, + imageVector = MaterialSymbols.AutoMirroredRounded.ArrowBack, contentDescription = null, tint = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -152,7 +152,7 @@ fun TrackerSearch( }, ) { Icon( - imageVector = Icons.Default.Close, + imageVector = MaterialSymbols.Rounded.Close, contentDescription = null, tint = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -189,7 +189,7 @@ fun TrackerSearch( elevation = ButtonDefaults.elevatedButtonElevation(), ) { Icon( - imageVector = Icons.Filled.VisibilityOff, + imageVector = MaterialSymbols.Rounded.VisibilityOff, contentDescription = stringResource(MR.strings.action_toggle_private_on), ) } @@ -274,7 +274,7 @@ private fun SearchResultItem( ) { if (selected) { Icon( - imageVector = Icons.Filled.CheckCircle, + imageVector = MaterialSymbols.RoundedFilled.CheckCircle, contentDescription = null, modifier = Modifier.align(Alignment.TopEnd), tint = MaterialTheme.colorScheme.primary, diff --git a/app/src/main/java/eu/kanade/presentation/updates/UpdatesScreen.kt b/app/src/main/java/eu/kanade/presentation/updates/UpdatesScreen.kt index fbd94fe07..e0eb6bfff 100644 --- a/app/src/main/java/eu/kanade/presentation/updates/UpdatesScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/updates/UpdatesScreen.kt @@ -3,12 +3,6 @@ package eu.kanade.presentation.updates import androidx.activity.compose.BackHandler import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.CalendarMonth -import androidx.compose.material.icons.outlined.FilterList -import androidx.compose.material.icons.outlined.FlipToBack -import androidx.compose.material.icons.outlined.Refresh -import androidx.compose.material.icons.outlined.SelectAll import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme import androidx.compose.material3.SnackbarHost @@ -33,6 +27,12 @@ import eu.kanade.tachiyomi.ui.updates.UpdatesViewModel import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.datetime.LocalDate +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.CalendarMonth +import mihon.icons.materialsymbols.rounded.FilterList +import mihon.icons.materialsymbols.rounded.FlipToBack +import mihon.icons.materialsymbols.rounded.Refresh +import mihon.icons.materialsymbols.rounded.SelectAll import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.FastScrollLazyColumn import tachiyomi.presentation.core.components.material.PullRefresh @@ -158,18 +158,18 @@ private fun UpdatesAppBar( listOf( AppBar.Action( title = stringResource(MR.strings.action_filter), - icon = Icons.Outlined.FilterList, + icon = MaterialSymbols.Rounded.FilterList, iconTint = if (hasFilters) MaterialTheme.colorScheme.active else LocalContentColor.current, onClick = onFilterClicked, ), AppBar.Action( title = stringResource(MR.strings.action_view_upcoming), - icon = Icons.Outlined.CalendarMonth, + icon = MaterialSymbols.Rounded.CalendarMonth, onClick = onCalendarClicked, ), AppBar.Action( title = stringResource(MR.strings.action_update_library), - icon = Icons.Outlined.Refresh, + icon = MaterialSymbols.Rounded.Refresh, onClick = onUpdateLibrary, ), ), @@ -182,12 +182,12 @@ private fun UpdatesAppBar( listOf( AppBar.Action( title = stringResource(MR.strings.action_select_all), - icon = Icons.Outlined.SelectAll, + icon = MaterialSymbols.Rounded.SelectAll, onClick = onSelectAll, ), AppBar.Action( title = stringResource(MR.strings.action_select_inverse), - icon = Icons.Outlined.FlipToBack, + icon = MaterialSymbols.Rounded.FlipToBack, onClick = onInvertSelection, ), ), diff --git a/app/src/main/java/eu/kanade/presentation/updates/UpdatesUiItem.kt b/app/src/main/java/eu/kanade/presentation/updates/UpdatesUiItem.kt index 2e1a1310b..4151a832c 100644 --- a/app/src/main/java/eu/kanade/presentation/updates/UpdatesUiItem.kt +++ b/app/src/main/java/eu/kanade/presentation/updates/UpdatesUiItem.kt @@ -12,9 +12,6 @@ import androidx.compose.foundation.layout.sizeIn import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.items -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Bookmark -import androidx.compose.material.icons.filled.Circle import androidx.compose.material3.Icon import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme @@ -40,6 +37,9 @@ import eu.kanade.presentation.manga.components.MangaCover import eu.kanade.presentation.util.relativeTimeSpanString import eu.kanade.tachiyomi.data.download.model.Download import eu.kanade.tachiyomi.ui.updates.UpdatesItem +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.roundedfilled.Bookmark +import mihon.icons.materialsymbols.roundedfilled.Circle import tachiyomi.domain.updates.model.UpdatesWithRelations import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.ListGroupHeader @@ -186,7 +186,7 @@ private fun UpdatesUiItem( var textHeight by remember { mutableIntStateOf(0) } if (!update.read) { Icon( - imageVector = Icons.Filled.Circle, + imageVector = MaterialSymbols.RoundedFilled.Circle, contentDescription = stringResource(MR.strings.unread), modifier = Modifier .height(8.dp) @@ -196,7 +196,7 @@ private fun UpdatesUiItem( } if (update.bookmark) { Icon( - imageVector = Icons.Filled.Bookmark, + imageVector = MaterialSymbols.RoundedFilled.Bookmark, contentDescription = stringResource(MR.strings.action_filter_bookmarked), modifier = Modifier .sizeIn(maxHeight = with(LocalDensity.current) { textHeight.toDp() - 2.dp }), diff --git a/app/src/main/java/eu/kanade/presentation/webview/WebViewScreenContent.kt b/app/src/main/java/eu/kanade/presentation/webview/WebViewScreenContent.kt index 7f34a8a05..418d6d3e8 100644 --- a/app/src/main/java/eu/kanade/presentation/webview/WebViewScreenContent.kt +++ b/app/src/main/java/eu/kanade/presentation/webview/WebViewScreenContent.kt @@ -14,10 +14,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.ArrowBack -import androidx.compose.material.icons.automirrored.outlined.ArrowForward -import androidx.compose.material.icons.outlined.Close import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface @@ -53,6 +49,10 @@ import eu.kanade.tachiyomi.util.system.getHtml import eu.kanade.tachiyomi.util.system.setDefaultSettings import eu.kanade.tachiyomi.util.system.setUserAgent import kotlinx.coroutines.launch +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.ArrowBack +import mihon.icons.materialsymbols.automirroredrounded.ArrowForward +import mihon.icons.materialsymbols.rounded.Close import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.i18n.stringResource @@ -232,13 +232,13 @@ fun WebViewScreenContent( title = currentWindow.state.pageTitle ?: initialTitle, subtitle = currentUrl, navigateUp = onNavigateUp, - navigationIcon = Icons.Outlined.Close, + navigationIcon = MaterialSymbols.Rounded.Close, actions = { AppBarActions( listOf( AppBar.Action( title = stringResource(MR.strings.action_webview_back), - icon = Icons.AutoMirrored.Outlined.ArrowBack, + icon = MaterialSymbols.AutoMirroredRounded.ArrowBack, onClick = { if (navigator.canGoBack) { navigator.navigateBack() @@ -248,7 +248,7 @@ fun WebViewScreenContent( ), AppBar.Action( title = stringResource(MR.strings.action_webview_forward), - icon = Icons.AutoMirrored.Outlined.ArrowForward, + icon = MaterialSymbols.AutoMirroredRounded.ArrowForward, onClick = { if (navigator.canGoForward) { navigator.navigateForward() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrateMangaScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrateMangaScreen.kt index 83c5beb4c..4044a1a4f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrateMangaScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrateMangaScreen.kt @@ -6,8 +6,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.rememberLazyListState -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.ArrowForward import androidx.compose.material3.Icon import androidx.compose.material3.SmallExtendedFloatingActionButton import androidx.compose.material3.Text @@ -30,6 +28,8 @@ import eu.kanade.tachiyomi.ui.manga.MangaScreen import eu.kanade.tachiyomi.util.system.toast import kotlinx.coroutines.flow.collectLatest import mihon.feature.migration.config.MigrationConfigScreen +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.ArrowForward import tachiyomi.domain.manga.model.Manga import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.FastScrollLazyColumn @@ -82,7 +82,7 @@ data class MigrateMangaScreen( SmallExtendedFloatingActionButton( text = { Text(text = stringResource(MR.strings.migrationConfigScreen_continueButtonText)) }, icon = { - Icon(imageVector = Icons.AutoMirrored.Outlined.ArrowForward, contentDescription = null) + Icon(imageVector = MaterialSymbols.AutoMirroredRounded.ArrowForward, contentDescription = null) }, onClick = { val selection = state.selection diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSourceSearchScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSourceSearchScreen.kt index 25d647f75..fe0e37a8f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSourceSearchScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSourceSearchScreen.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.ui.browse.migration.search -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.FilterList import androidx.compose.material3.Icon import androidx.compose.material3.SmallExtendedFloatingActionButton import androidx.compose.material3.SnackbarHost @@ -32,6 +30,8 @@ import eu.kanade.tachiyomi.ui.webview.WebViewScreen import kotlinx.coroutines.launch import mihon.feature.migration.dialog.MigrateMangaDialog import mihon.feature.migration.list.MigrationListScreen +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.FilterList import mihon.presentation.core.util.collectAsLazyPagingItems import tachiyomi.core.common.Constants import tachiyomi.domain.manga.model.Manga @@ -80,7 +80,7 @@ data class MigrateSourceSearchScreen( floatingActionButton = { SmallExtendedFloatingActionButton( text = { Text(text = stringResource(MR.strings.action_filter)) }, - icon = { Icon(Icons.Outlined.FilterList, contentDescription = null) }, + icon = { Icon(MaterialSymbols.Rounded.FilterList, contentDescription = null) }, onClick = viewModel::openFilterSheet, modifier = Modifier.animateFloatingActionButton( visible = state.filters.isNotEmpty(), diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrateSourceTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrateSourceTab.kt index 4081c9b26..14f5e6e94 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrateSourceTab.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrateSourceTab.kt @@ -1,7 +1,5 @@ package eu.kanade.tachiyomi.ui.browse.migration.sources -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.HelpOutline import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.platform.LocalUriHandler @@ -15,6 +13,8 @@ import eu.kanade.presentation.browse.MigrateSourceScreen import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.TabContent import eu.kanade.tachiyomi.ui.browse.migration.manga.MigrateMangaScreen +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.Help import tachiyomi.i18n.MR import tachiyomi.presentation.core.i18n.stringResource @@ -30,7 +30,7 @@ fun Screen.migrateSourceTab(): TabContent { actions = listOf( AppBar.Action( title = stringResource(MR.strings.migration_help_guide), - icon = Icons.AutoMirrored.Outlined.HelpOutline, + icon = MaterialSymbols.AutoMirroredRounded.Help, onClick = { uriHandler.openUri("https://mihon.app/docs/guides/source-migration") }, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt index 5d1469d54..7eee369bd 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt @@ -1,8 +1,5 @@ package eu.kanade.tachiyomi.ui.browse.source -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.FilterList -import androidx.compose.material.icons.outlined.TravelExplore import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -20,6 +17,9 @@ import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceScreen import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchScreen import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.FilterList +import mihon.icons.materialsymbols.rounded.TravelExplore import tachiyomi.i18n.MR import tachiyomi.presentation.core.i18n.stringResource @@ -34,12 +34,12 @@ fun Screen.sourcesTab(): TabContent { actions = listOf( AppBar.Action( title = stringResource(MR.strings.action_global_search), - icon = Icons.Outlined.TravelExplore, + icon = MaterialSymbols.Rounded.TravelExplore, onClick = { navigator.push(GlobalSearchScreen()) }, ), AppBar.Action( title = stringResource(MR.strings.action_filter), - icon = Icons.Outlined.FilterList, + icon = MaterialSymbols.Rounded.FilterList, onClick = { navigator.push(SourcesFilterScreen()) }, ), ), diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt index 49b145ee6..ae247b556 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt @@ -8,10 +8,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.rememberScrollState -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Favorite -import androidx.compose.material.icons.outlined.FilterList -import androidx.compose.material.icons.outlined.NewReleases import androidx.compose.material3.FilterChip import androidx.compose.material3.FilterChipDefaults import androidx.compose.material3.HorizontalDivider @@ -53,6 +49,10 @@ import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.receiveAsFlow import mihon.feature.migration.dialog.MigrateMangaDialog +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.FilterList +import mihon.icons.materialsymbols.rounded.NewReleases +import mihon.icons.materialsymbols.roundedfilled.Favorite import mihon.presentation.core.util.collectAsLazyPagingItems import tachiyomi.core.common.Constants import tachiyomi.core.common.util.lang.launchIO @@ -158,7 +158,7 @@ data class BrowseSourceScreen( }, leadingIcon = { Icon( - imageVector = Icons.Outlined.Favorite, + imageVector = MaterialSymbols.RoundedFilled.Favorite, contentDescription = null, modifier = Modifier .size(FilterChipDefaults.IconSize), @@ -177,7 +177,7 @@ data class BrowseSourceScreen( }, leadingIcon = { Icon( - imageVector = Icons.Outlined.NewReleases, + imageVector = MaterialSymbols.Rounded.NewReleases, contentDescription = null, modifier = Modifier .size(FilterChipDefaults.IconSize), @@ -194,7 +194,7 @@ data class BrowseSourceScreen( onClick = viewModel::openFilterSheet, leadingIcon = { Icon( - imageVector = Icons.Outlined.FilterList, + imageVector = MaterialSymbols.Rounded.FilterList, contentDescription = null, modifier = Modifier .size(FilterChipDefaults.IconSize), diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadQueueScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadQueueScreen.kt index 9876d69b4..0c5a2a450 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadQueueScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadQueueScreen.kt @@ -6,10 +6,6 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.Sort -import androidx.compose.material.icons.filled.PlayArrow -import androidx.compose.material.icons.outlined.Pause import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -52,6 +48,10 @@ import eu.kanade.presentation.components.DropdownMenu import eu.kanade.presentation.components.NestedMenuItem import eu.kanade.presentation.util.Screen import eu.kanade.tachiyomi.databinding.DownloadListBinding +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.Sort +import mihon.icons.materialsymbols.roundedfilled.Pause +import mihon.icons.materialsymbols.roundedfilled.PlayArrow import tachiyomi.core.common.util.lang.launchUI import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.Pill @@ -184,7 +184,7 @@ object DownloadQueueScreen : Screen() { listOf( AppBar.Action( title = stringResource(MR.strings.action_sort), - icon = Icons.AutoMirrored.Outlined.Sort, + icon = MaterialSymbols.AutoMirroredRounded.Sort, onClick = { sortExpanded = true }, ), AppBar.OverflowAction( @@ -211,9 +211,9 @@ object DownloadQueueScreen : Screen() { }, icon = { val icon = if (isRunning) { - Icons.Outlined.Pause + MaterialSymbols.RoundedFilled.Pause } else { - Icons.Filled.PlayArrow + MaterialSymbols.RoundedFilled.PlayArrow } Icon(imageVector = icon, contentDescription = null) }, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt index 09008bca2..bb662b2d5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt @@ -5,8 +5,6 @@ import androidx.compose.animation.graphics.res.animatedVectorResource import androidx.compose.animation.graphics.res.rememberAnimatedVectorPainter import androidx.compose.animation.graphics.vector.AnimatedImageVector import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.HelpOutline import androidx.compose.material3.SnackbarHost import androidx.compose.material3.SnackbarHostState import androidx.compose.runtime.Composable @@ -50,6 +48,8 @@ import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.launch import mihon.feature.migration.config.MigrationConfigScreen +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.Help import tachiyomi.core.common.i18n.stringResource import tachiyomi.core.common.util.lang.launchIO import tachiyomi.domain.category.model.Category @@ -172,7 +172,7 @@ data object LibraryTab : Tab { actions = listOf( EmptyScreenAction( stringRes = MR.strings.getting_started_guide, - icon = Icons.AutoMirrored.Outlined.HelpOutline, + icon = MaterialSymbols.AutoMirroredRounded.Help, onClick = { handler.openUri(GETTING_STARTED_URL) }, ), ), diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 83e2576a1..14a92a381 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -32,9 +32,6 @@ import androidx.compose.foundation.layout.windowInsetsBottomHeight import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.OpenInNew -import androidx.compose.material.icons.filled.VolunteerActivism import androidx.compose.material3.Button import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon @@ -111,6 +108,9 @@ import mihon.app.di.appGraph import mihon.core.metro.metroGraph import mihon.core.migration.Migrator import mihon.feature.support.SupportUsScreen +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.OpenInNew +import mihon.icons.materialsymbols.rounded.VolunteerActivism import tachiyomi.core.common.Constants import tachiyomi.core.common.util.lang.launchIO import tachiyomi.core.common.util.system.logcat @@ -418,7 +418,7 @@ class MainActivity : BaseActivity() { horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small), ) { Icon( - imageVector = Icons.Default.VolunteerActivism, + imageVector = MaterialSymbols.Rounded.VolunteerActivism, contentDescription = null, ) Text( @@ -447,7 +447,7 @@ class MainActivity : BaseActivity() { text = stringResource(MR.strings.donationCampaign_contactPlatform), ) Icon( - imageVector = Icons.AutoMirrored.Default.OpenInNew, + imageVector = MaterialSymbols.AutoMirroredRounded.OpenInNew, contentDescription = null, ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackInfoDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackInfoDialog.kt index b32e89c3c..95439480b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackInfoDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackInfoDialog.kt @@ -9,8 +9,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.systemBars import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.text.input.rememberTextFieldState -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Delete import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.FilledTonalButton import androidx.compose.material3.Icon @@ -73,6 +71,8 @@ import kotlinx.datetime.TimeZone import kotlinx.datetime.toLocalDateTime import logcat.LogPriority import mihon.app.di.appGraph +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Delete import tachiyomi.core.common.i18n.stringResource import tachiyomi.core.common.util.lang.launchNonCancellable import tachiyomi.core.common.util.lang.withIOContext @@ -630,7 +630,7 @@ data class TrackDateRemoverScreen( modifier = Modifier.windowInsetsPadding(WindowInsets.systemBars), icon = { Icon( - imageVector = Icons.Default.Delete, + imageVector = MaterialSymbols.Rounded.Delete, contentDescription = null, ) }, @@ -836,7 +836,7 @@ data class TrackerRemoveScreen( modifier = Modifier.windowInsetsPadding(WindowInsets.systemBars), icon = { Icon( - imageVector = Icons.Default.Delete, + imageVector = MaterialSymbols.Rounded.Delete, contentDescription = null, ) }, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderOrientation.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderOrientation.kt index ad0e58a15..f1acab71c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderOrientation.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderOrientation.kt @@ -1,14 +1,14 @@ package eu.kanade.tachiyomi.ui.reader.setting import android.content.pm.ActivityInfo -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ScreenLockLandscape -import androidx.compose.material.icons.filled.ScreenLockPortrait -import androidx.compose.material.icons.filled.ScreenRotation -import androidx.compose.material.icons.filled.StayCurrentLandscape -import androidx.compose.material.icons.filled.StayCurrentPortrait import androidx.compose.ui.graphics.vector.ImageVector import dev.icerock.moko.resources.StringResource +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.ScreenLockLandscape +import mihon.icons.materialsymbols.rounded.ScreenLockPortrait +import mihon.icons.materialsymbols.rounded.ScreenRotation +import mihon.icons.materialsymbols.rounded.StayCurrentLandscape +import mihon.icons.materialsymbols.rounded.StayCurrentPortrait import tachiyomi.i18n.MR enum class ReaderOrientation( @@ -20,43 +20,43 @@ enum class ReaderOrientation( DEFAULT( ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED, MR.strings.label_default, - Icons.Default.ScreenRotation, + MaterialSymbols.Rounded.ScreenRotation, 0x00000000, ), FREE( ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED, MR.strings.rotation_free, - Icons.Default.ScreenRotation, + MaterialSymbols.Rounded.ScreenRotation, 0x00000008, ), PORTRAIT( ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT, MR.strings.rotation_portrait, - Icons.Default.StayCurrentPortrait, + MaterialSymbols.Rounded.StayCurrentPortrait, 0x00000010, ), LANDSCAPE( ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, MR.strings.rotation_landscape, - Icons.Default.StayCurrentLandscape, + MaterialSymbols.Rounded.StayCurrentLandscape, 0x00000018, ), LOCKED_PORTRAIT( ActivityInfo.SCREEN_ORIENTATION_PORTRAIT, MR.strings.rotation_force_portrait, - Icons.Default.ScreenLockPortrait, + MaterialSymbols.Rounded.ScreenLockPortrait, 0x00000020, ), LOCKED_LANDSCAPE( ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, MR.strings.rotation_force_landscape, - Icons.Default.ScreenLockLandscape, + MaterialSymbols.Rounded.ScreenLockLandscape, 0x00000028, ), REVERSE_PORTRAIT( ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT, MR.strings.rotation_reverse_portrait, - Icons.Default.StayCurrentPortrait, + MaterialSymbols.Rounded.StayCurrentPortrait, 0x00000030, ), ; diff --git a/app/src/main/java/mihon/feature/migration/config/MigrationConfigScreen.kt b/app/src/main/java/mihon/feature/migration/config/MigrationConfigScreen.kt index 9db91f9b6..ac6de0631 100644 --- a/app/src/main/java/mihon/feature/migration/config/MigrationConfigScreen.kt +++ b/app/src/main/java/mihon/feature/migration/config/MigrationConfigScreen.kt @@ -9,11 +9,6 @@ import androidx.compose.foundation.lazy.LazyItemScope import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.ArrowForward -import androidx.compose.material.icons.outlined.Deselect -import androidx.compose.material.icons.outlined.DragHandle -import androidx.compose.material.icons.outlined.SelectAll import androidx.compose.material3.ElevatedCard import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon @@ -58,6 +53,11 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.update import mihon.feature.migration.list.MigrationListScreen +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.ArrowForward +import mihon.icons.materialsymbols.rounded.Deselect +import mihon.icons.materialsymbols.rounded.DragHandle +import mihon.icons.materialsymbols.rounded.SelectAll import sh.calvin.reorderable.ReorderableCollectionItemScope import sh.calvin.reorderable.ReorderableItem import sh.calvin.reorderable.ReorderableLazyListState @@ -125,12 +125,12 @@ class MigrationConfigScreen(private val mangaIds: Collection) : Screen() { listOf( AppBar.Action( title = stringResource(MR.strings.migrationConfigScreen_selectAllLabel), - icon = Icons.Outlined.SelectAll, + icon = MaterialSymbols.Rounded.SelectAll, onClick = { viewModel.toggleSelection(Model.SelectionConfig.All) }, ), AppBar.Action( title = stringResource(MR.strings.migrationConfigScreen_selectNoneLabel), - icon = Icons.Outlined.Deselect, + icon = MaterialSymbols.Rounded.Deselect, onClick = { viewModel.toggleSelection(Model.SelectionConfig.None) }, ), AppBar.OverflowAction( @@ -149,7 +149,9 @@ class MigrationConfigScreen(private val mangaIds: Collection) : Screen() { floatingActionButton = { SmallExtendedFloatingActionButton( text = { Text(text = stringResource(MR.strings.migrationConfigScreen_continueButtonText)) }, - icon = { Icon(imageVector = Icons.AutoMirrored.Outlined.ArrowForward, contentDescription = null) }, + icon = { + Icon(imageVector = MaterialSymbols.AutoMirroredRounded.ArrowForward, contentDescription = null) + }, onClick = { viewModel.saveSources() continueMigration(openSheet = true, extraSearchQuery = null) @@ -277,7 +279,7 @@ class MigrationConfigScreen(private val mangaIds: Collection) : Screen() { trailingContent = if (dragEnabled) { { Icon( - imageVector = Icons.Outlined.DragHandle, + imageVector = MaterialSymbols.Rounded.DragHandle, contentDescription = null, modifier = with(scope) { Modifier.draggableHandle() diff --git a/app/src/main/java/mihon/feature/migration/config/MigrationConfigScreenSheet.kt b/app/src/main/java/mihon/feature/migration/config/MigrationConfigScreenSheet.kt index d55c17a35..6421094d8 100644 --- a/app/src/main/java/mihon/feature/migration/config/MigrationConfigScreenSheet.kt +++ b/app/src/main/java/mihon/feature/migration/config/MigrationConfigScreenSheet.kt @@ -10,9 +10,6 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Check -import androidx.compose.material.icons.outlined.Warning import androidx.compose.material3.FilterChip import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon @@ -35,6 +32,9 @@ import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.presentation.components.AdaptiveSheet import mihon.domain.migration.models.MigrationFlag import mihon.feature.common.utils.getLabel +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Check +import mihon.icons.materialsymbols.rounded.Warning import tachiyomi.core.common.preference.Preference import tachiyomi.core.common.preference.getAndSet import tachiyomi.core.common.preference.toggle @@ -98,7 +98,7 @@ fun MigrationConfigScreenSheet( leadingIcon = { if (selected) { Icon( - imageVector = Icons.Outlined.Check, + imageVector = MaterialSymbols.Rounded.Check, contentDescription = null, ) } @@ -226,7 +226,7 @@ private fun MigrationSheetWarningItem( ListItem( leadingContent = { Icon( - imageVector = Icons.Outlined.Warning, + imageVector = MaterialSymbols.Rounded.Warning, contentDescription = null, tint = MaterialTheme.colorScheme.active, ) diff --git a/app/src/main/java/mihon/feature/migration/list/MigrationListScreenContent.kt b/app/src/main/java/mihon/feature/migration/list/MigrationListScreenContent.kt index d72abdca6..34ba545fe 100644 --- a/app/src/main/java/mihon/feature/migration/list/MigrationListScreenContent.kt +++ b/app/src/main/java/mihon/feature/migration/list/MigrationListScreenContent.kt @@ -17,14 +17,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.ArrowForward -import androidx.compose.material.icons.outlined.Close -import androidx.compose.material.icons.outlined.ContentCopy -import androidx.compose.material.icons.outlined.CopyAll -import androidx.compose.material.icons.outlined.Done -import androidx.compose.material.icons.outlined.DoneAll -import androidx.compose.material.icons.outlined.MoreVert import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem @@ -55,6 +47,14 @@ import eu.kanade.presentation.util.formatChapterNumber import eu.kanade.presentation.util.rememberResourceBitmapPainter import eu.kanade.tachiyomi.R import mihon.feature.migration.list.models.MigratingManga +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.ArrowForward +import mihon.icons.materialsymbols.rounded.Close +import mihon.icons.materialsymbols.rounded.ContentCopy +import mihon.icons.materialsymbols.rounded.CopyAll +import mihon.icons.materialsymbols.rounded.Done +import mihon.icons.materialsymbols.rounded.DoneAll +import mihon.icons.materialsymbols.rounded.MoreVert import tachiyomi.domain.manga.model.Manga import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.Badge @@ -91,13 +91,25 @@ fun MigrationListScreenContent( listOf( AppBar.Action( title = stringResource(MR.strings.migrationListScreen_copyActionLabel), - icon = if (items.size == 1) Icons.Outlined.ContentCopy else Icons.Outlined.CopyAll, + icon = if (items.size == + 1 + ) { + MaterialSymbols.Rounded.ContentCopy + } else { + MaterialSymbols.Rounded.CopyAll + }, onClick = { openMigrationDialog(true) }, enabled = migrationComplete, ), AppBar.Action( title = stringResource(MR.strings.migrationListScreen_migrateActionLabel), - icon = if (items.size == 1) Icons.Outlined.Done else Icons.Outlined.DoneAll, + icon = if (items.size == + 1 + ) { + MaterialSymbols.Rounded.Done + } else { + MaterialSymbols.Rounded.DoneAll + }, onClick = { openMigrationDialog(false) }, enabled = migrationComplete, ), @@ -135,7 +147,7 @@ fun MigrationListScreenContent( ) Icon( - imageVector = Icons.AutoMirrored.Outlined.ArrowForward, + imageVector = MaterialSymbols.AutoMirroredRounded.ArrowForward, contentDescription = null, modifier = Modifier.weight(0.2f), ) @@ -316,7 +328,7 @@ private fun MigrationListItemAction( MigratingManga.SearchResult.Searching -> { IconButton(onClick = onSkip) { Icon( - imageVector = Icons.Outlined.Close, + imageVector = MaterialSymbols.Rounded.Close, contentDescription = null, ) } @@ -324,7 +336,7 @@ private fun MigrationListItemAction( MigratingManga.SearchResult.NotFound, is MigratingManga.SearchResult.Success -> { IconButton(onClick = { menuExpanded = true }) { Icon( - imageVector = Icons.Outlined.MoreVert, + imageVector = MaterialSymbols.Rounded.MoreVert, contentDescription = null, ) } diff --git a/app/src/main/java/mihon/feature/support/SupportUsScreen.kt b/app/src/main/java/mihon/feature/support/SupportUsScreen.kt index a9f9d219b..fb0fe547e 100644 --- a/app/src/main/java/mihon/feature/support/SupportUsScreen.kt +++ b/app/src/main/java/mihon/feature/support/SupportUsScreen.kt @@ -8,8 +8,6 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.OpenInNew import androidx.compose.material3.Card import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -28,14 +26,16 @@ import cafe.adriel.voyager.navigator.currentOrThrow import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget import eu.kanade.presentation.util.Screen +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.OpenInNew +import mihon.icons.simpleicons.Discord +import mihon.icons.simpleicons.OpenCollective +import mihon.icons.simpleicons.Patreon +import mihon.icons.simpleicons.SimpleIcons import tachiyomi.core.common.Constants import tachiyomi.i18n.MR import tachiyomi.presentation.core.components.material.padding import tachiyomi.presentation.core.i18n.stringResource -import tachiyomi.presentation.core.icons.CustomIcons -import tachiyomi.presentation.core.icons.Discord -import tachiyomi.presentation.core.icons.OpenCollective -import tachiyomi.presentation.core.icons.Patreon class SupportUsScreen : Screen() { @@ -87,12 +87,12 @@ class SupportUsScreen : Screen() { ) SupportItem( - icon = CustomIcons.Patreon, + icon = SimpleIcons.Patreon, title = stringResource(MR.strings.supportUsScreen_donationPlatform_patreon), onClick = { uriHandler.openUri(Constants.URL_DONATE_PATREON) }, ) SupportItem( - icon = CustomIcons.OpenCollective, + icon = SimpleIcons.OpenCollective, title = stringResource(MR.strings.supportUsScreen_donationPlatform_opencollective), onClick = { uriHandler.openUri(Constants.URL_DONATE_OPENCOLLECTIVE) }, ) @@ -110,7 +110,7 @@ class SupportUsScreen : Screen() { ) SupportItem( - icon = CustomIcons.Discord, + icon = SimpleIcons.Discord, title = stringResource(MR.strings.supportUsScreen_contactPlatform), onClick = { uriHandler.openUri(Constants.URL_DISCORD) }, ) @@ -132,7 +132,7 @@ class SupportUsScreen : Screen() { icon = icon, widget = { Icon( - imageVector = Icons.AutoMirrored.Filled.OpenInNew, + imageVector = MaterialSymbols.AutoMirroredRounded.OpenInNew, contentDescription = null, ) }, diff --git a/app/src/main/java/mihon/feature/upcoming/UpcomingScreenContent.kt b/app/src/main/java/mihon/feature/upcoming/UpcomingScreenContent.kt index 33dc1ad17..abcddefa6 100644 --- a/app/src/main/java/mihon/feature/upcoming/UpcomingScreenContent.kt +++ b/app/src/main/java/mihon/feature/upcoming/UpcomingScreenContent.kt @@ -7,9 +7,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.rememberLazyListState -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.HelpOutline -import androidx.compose.material.icons.outlined.FilterList import androidx.compose.material3.Badge import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme @@ -31,6 +28,9 @@ import kotlinx.datetime.LocalDate import kotlinx.datetime.YearMonth import mihon.feature.upcoming.components.UpcomingItem import mihon.feature.upcoming.components.calendar.Calendar +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.automirroredrounded.Help +import mihon.icons.materialsymbols.rounded.FilterList import tachiyomi.core.common.Constants import tachiyomi.domain.manga.model.Manga import tachiyomi.i18n.MR @@ -110,13 +110,13 @@ private fun UpcomingToolbar( listOf( AppBar.Action( title = stringResource(MR.strings.action_filter), - icon = Icons.Outlined.FilterList, + icon = MaterialSymbols.Rounded.FilterList, iconTint = if (hasFilters) MaterialTheme.colorScheme.active else LocalContentColor.current, onClick = onClickFilter, ), AppBar.Action( title = stringResource(MR.strings.upcoming_guide), - icon = Icons.AutoMirrored.Outlined.HelpOutline, + icon = MaterialSymbols.AutoMirroredRounded.Help, onClick = { uriHandler.openUri(Constants.URL_HELP_UPCOMING) }, ), ), diff --git a/app/src/main/java/mihon/feature/upcoming/components/calendar/CalendarHeader.kt b/app/src/main/java/mihon/feature/upcoming/components/calendar/CalendarHeader.kt index 6d0b23942..471988c36 100644 --- a/app/src/main/java/mihon/feature/upcoming/components/calendar/CalendarHeader.kt +++ b/app/src/main/java/mihon/feature/upcoming/components/calendar/CalendarHeader.kt @@ -12,9 +12,6 @@ import androidx.compose.animation.slideOutVertically import androidx.compose.animation.togetherWith import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.KeyboardArrowLeft -import androidx.compose.material.icons.filled.KeyboardArrowRight import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme @@ -29,6 +26,9 @@ import kotlinx.datetime.YearMonth import kotlinx.datetime.toJavaYearMonth import kotlinx.datetime.toLocalDateTime import kotlinx.datetime.yearMonth +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.KeyboardArrowLeft +import mihon.icons.materialsymbols.rounded.KeyboardArrowRight import tachiyomi.i18n.MR import tachiyomi.presentation.core.i18n.stringResource import java.time.format.DateTimeFormatter @@ -60,11 +60,11 @@ fun CalenderHeader( Row { IconButton(onClick = onPreviousClick) { @Suppress("DEPRECATION") - Icon(Icons.Default.KeyboardArrowLeft, stringResource(MR.strings.upcoming_calendar_prev)) + Icon(MaterialSymbols.Rounded.KeyboardArrowLeft, stringResource(MR.strings.upcoming_calendar_prev)) } IconButton(onClick = onNextClick) { @Suppress("DEPRECATION") - Icon(Icons.Default.KeyboardArrowRight, stringResource(MR.strings.upcoming_calendar_next)) + Icon(MaterialSymbols.Rounded.KeyboardArrowRight, stringResource(MR.strings.upcoming_calendar_next)) } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4d366283b..ea4d1bd1d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -75,6 +75,7 @@ subsamplingScaleImageView = "94915e6f73" swipe = "1.3.0" tapmoc = "0.4.2" unifile = "08f224c8f9" +valkyrie = "0.5.2" voyager = "2.2.21-1.10.3" webgpuviewer = "39" xmlutil = "1.0.2" @@ -94,9 +95,9 @@ androidx-compose-bom = { module = "androidx.compose:compose-bom-alpha", version. androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" } androidx-compose-material3 = { module = "androidx.compose.material3:material3" } androidx-compose-material3NavSuite = { module = "androidx.compose.material3:material3-adaptive-navigation-suite" } -androidx-compose-materialIcons = { module = "androidx.compose.material:material-icons-extended" } androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" } androidx-compose-runtimeAnnotation = { module = "androidx.compose.runtime:runtime-annotation" } +androidx-compose-ui = { module = "androidx.compose.ui:ui" } androidx-compose-uiTooling = { module = "androidx.compose.ui:ui-tooling" } androidx-compose-uiToolingPreview = { module = "androidx.compose.ui:ui-tooling-preview" } androidx-compose-uiUtil = { module = "androidx.compose.ui:ui-util" } @@ -218,6 +219,7 @@ moko-resources = { id = "dev.icerock.mobile.multiplatform-resources", version.re metro = { id = "dev.zacsweers.metro", version.ref = "metro" } spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" } +valkyrie = { id = "io.github.composegears.valkyrie", version.ref = "valkyrie" } [bundles] androidx-lifecycle = ["androidx-lifecycle-common", "androidx-lifecycle-process", "androidx-lifecycle-runtime", "androidx-lifecycle-viewmodel", "androidx-lifecycle-viewmodelCompose"] diff --git a/icons/material-symbols/build.gradle.kts b/icons/material-symbols/build.gradle.kts new file mode 100644 index 000000000..ab76cbc9f --- /dev/null +++ b/icons/material-symbols/build.gradle.kts @@ -0,0 +1,57 @@ +plugins { + alias(mihonx.plugins.android.library) + alias(mihonx.plugins.compose) + + alias(mihonx.plugins.spotless) + + alias(libs.plugins.valkyrie) +} + +android { + namespace = "mihon.icons.materialsymbols" +} + +spotless { + format("svg") { + target("src/**/*.svg") + trimTrailingWhitespace() + endWithNewline() + } +} + +valkyrie { + packageName = "mihon.icons.materialsymbols" + generateAtSync = true + + imageVector { + suppressUnusedReceiverWarning = true + } + + iconPack { + name = "MaterialSymbols" + targetSourceSet = "main" + + nested { + name = "Rounded" + sourceFolder = "rounded" + autoMirror = false + } + + nested { + name = "RoundedFilled" + sourceFolder = "roundedFilled" + autoMirror = false + } + + // https://github.com/ComposeGears/Valkyrie/pull/1019 + nested { + name = "AutoMirroredRounded" + sourceFolder = "autoMirroredRounded" + autoMirror = true + } + } +} + +dependencies { + api(libs.androidx.compose.ui) +} diff --git a/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/arrow_back.svg b/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/arrow_back.svg new file mode 100644 index 000000000..ab222e84c --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/arrow_back.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/arrow_forward.svg b/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/arrow_forward.svg new file mode 100644 index 000000000..2182a7cf0 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/arrow_forward.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/arrow_right.svg b/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/arrow_right.svg new file mode 100644 index 000000000..c340540c0 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/arrow_right.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/chrome_reader_mode.svg b/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/chrome_reader_mode.svg new file mode 100644 index 000000000..59a7cf03a --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/chrome_reader_mode.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/format_list_bulleted.svg b/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/format_list_bulleted.svg new file mode 100644 index 000000000..4b6f4fecc --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/format_list_bulleted.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/help.svg b/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/help.svg new file mode 100644 index 000000000..5ac64ef3c --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/help.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/label.svg b/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/label.svg new file mode 100644 index 000000000..addc5590f --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/label.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/open_in_new.svg b/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/open_in_new.svg new file mode 100644 index 000000000..2dd627fa7 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/open_in_new.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/sort.svg b/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/sort.svg new file mode 100644 index 000000000..19fefccb3 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/sort.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/view_list.svg b/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/view_list.svg new file mode 100644 index 000000000..1175bbec7 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/autoMirroredRounded/view_list.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/add.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/add.svg new file mode 100644 index 000000000..02b88da4c --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/add.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/arrow_downward.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/arrow_downward.svg new file mode 100644 index 000000000..caa8de54f --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/arrow_downward.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/arrow_upward.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/arrow_upward.svg new file mode 100644 index 000000000..ccf1277ce --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/arrow_upward.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/attach_money.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/attach_money.svg new file mode 100644 index 000000000..c58d32838 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/attach_money.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/autorenew.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/autorenew.svg new file mode 100644 index 000000000..83cb16f76 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/autorenew.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/block.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/block.svg new file mode 100644 index 000000000..89de4aadc --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/block.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/bookmark.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/bookmark.svg new file mode 100644 index 000000000..7be16ff84 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/bookmark.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/bookmark_add.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/bookmark_add.svg new file mode 100644 index 000000000..e8b6ec4dc --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/bookmark_add.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/bookmark_remove.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/bookmark_remove.svg new file mode 100644 index 000000000..687329909 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/bookmark_remove.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/brush.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/brush.svg new file mode 100644 index 000000000..dc78f59c5 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/brush.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/bug_report.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/bug_report.svg new file mode 100644 index 000000000..f99c431ff --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/bug_report.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/calendar_month.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/calendar_month.svg new file mode 100644 index 000000000..7f10928aa --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/calendar_month.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/cancel.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/cancel.svg new file mode 100644 index 000000000..487b09679 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/cancel.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/check.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/check.svg new file mode 100644 index 000000000..361d134d7 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/check.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/check_box_outline_blank.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/check_box_outline_blank.svg new file mode 100644 index 000000000..e456e223c --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/check_box_outline_blank.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/close.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/close.svg new file mode 100644 index 000000000..50846c91c --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/close.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/cloud_off.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/cloud_off.svg new file mode 100644 index 000000000..c694a6f27 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/cloud_off.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/code.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/code.svg new file mode 100644 index 000000000..a9f67863c --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/code.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/collections_bookmark.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/collections_bookmark.svg new file mode 100644 index 000000000..b190aa0d2 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/collections_bookmark.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/content_copy.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/content_copy.svg new file mode 100644 index 000000000..17dd9c9df --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/content_copy.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/copy_all.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/copy_all.svg new file mode 100644 index 000000000..511cf884e --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/copy_all.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/dangerous.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/dangerous.svg new file mode 100644 index 000000000..51d543907 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/dangerous.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/delete.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/delete.svg new file mode 100644 index 000000000..b1e2afdf9 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/delete.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/delete_sweep.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/delete_sweep.svg new file mode 100644 index 000000000..8a6d01570 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/delete_sweep.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/deselect.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/deselect.svg new file mode 100644 index 000000000..31c150cc1 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/deselect.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/done.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/done.svg new file mode 100644 index 000000000..8a2bf742d --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/done.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/done_all.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/done_all.svg new file mode 100644 index 000000000..9fc32a078 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/done_all.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/download.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/download.svg new file mode 100644 index 000000000..7e0d4074d --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/download.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/drag_handle.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/drag_handle.svg new file mode 100644 index 000000000..d9435d463 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/drag_handle.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/edit.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/edit.svg new file mode 100644 index 000000000..63e644f5f --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/edit.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/edit_note.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/edit_note.svg new file mode 100644 index 000000000..ed7ff29c5 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/edit_note.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/error.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/error.svg new file mode 100644 index 000000000..2aa0e147b --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/error.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/expand_less.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/expand_less.svg new file mode 100644 index 000000000..f0f0f8bd7 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/expand_less.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/expand_more.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/expand_more.svg new file mode 100644 index 000000000..1aef6b4b7 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/expand_more.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/explore.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/explore.svg new file mode 100644 index 000000000..61afd826e --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/explore.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/favorite.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/favorite.svg new file mode 100644 index 000000000..0b68aa4d8 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/favorite.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/file_download_off.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/file_download_off.svg new file mode 100644 index 000000000..29c487901 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/file_download_off.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/filter_list.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/filter_list.svg new file mode 100644 index 000000000..f3d79098b --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/filter_list.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/flip_to_back.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/flip_to_back.svg new file mode 100644 index 000000000..ce82be632 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/flip_to_back.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/folder.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/folder.svg new file mode 100644 index 000000000..b898fe30c --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/folder.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/format_bold.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/format_bold.svg new file mode 100644 index 000000000..7974373c7 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/format_bold.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/format_italic.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/format_italic.svg new file mode 100644 index 000000000..266d67c00 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/format_italic.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/format_list_numbered.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/format_list_numbered.svg new file mode 100644 index 000000000..7158b3af9 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/format_list_numbered.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/format_underlined.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/format_underlined.svg new file mode 100644 index 000000000..5a2424a4d --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/format_underlined.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/hourglass_empty.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/hourglass_empty.svg new file mode 100644 index 000000000..e8bdabdd2 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/hourglass_empty.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/image.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/image.svg new file mode 100644 index 000000000..aba4abb8b --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/image.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/info.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/info.svg new file mode 100644 index 000000000..a6fe4b551 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/info.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/keyboard_arrow_left.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/keyboard_arrow_left.svg new file mode 100644 index 000000000..0aca857f2 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/keyboard_arrow_left.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/keyboard_arrow_right.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/keyboard_arrow_right.svg new file mode 100644 index 000000000..5421cfd08 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/keyboard_arrow_right.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/local_library.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/local_library.svg new file mode 100644 index 000000000..74ad46827 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/local_library.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/more_vert.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/more_vert.svg new file mode 100644 index 000000000..de7625cf7 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/more_vert.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/new_releases.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/new_releases.svg new file mode 100644 index 000000000..6faab341a --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/new_releases.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/newspaper.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/newspaper.svg new file mode 100644 index 000000000..3d923b50e --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/newspaper.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/numbers.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/numbers.svg new file mode 100644 index 000000000..ef90380df --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/numbers.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/palette.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/palette.svg new file mode 100644 index 000000000..0b68e0f00 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/palette.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/pause.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/pause.svg new file mode 100644 index 000000000..4141a0b6e --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/pause.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/people_alt.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/people_alt.svg new file mode 100644 index 000000000..afebc69d2 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/people_alt.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/person.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/person.svg new file mode 100644 index 000000000..d64a84599 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/person.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/photo.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/photo.svg new file mode 100644 index 000000000..a9df7d0b8 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/photo.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/play_arrow.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/play_arrow.svg new file mode 100644 index 000000000..ce1bbbb0d --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/play_arrow.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/preview.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/preview.svg new file mode 100644 index 000000000..e550ba7a8 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/preview.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/public.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/public.svg new file mode 100644 index 000000000..8dc5ca604 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/public.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/push_pin.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/push_pin.svg new file mode 100644 index 000000000..2573a536e --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/push_pin.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/query_stats.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/query_stats.svg new file mode 100644 index 000000000..89f3cb1d6 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/query_stats.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/radio_button_checked.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/radio_button_checked.svg new file mode 100644 index 000000000..996adb503 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/radio_button_checked.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/radio_button_unchecked.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/radio_button_unchecked.svg new file mode 100644 index 000000000..893512edb --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/radio_button_unchecked.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/refresh.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/refresh.svg new file mode 100644 index 000000000..a9f942db9 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/refresh.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/remove_done.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/remove_done.svg new file mode 100644 index 000000000..f14318f3c --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/remove_done.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/rocket_launch.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/rocket_launch.svg new file mode 100644 index 000000000..f49e72041 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/rocket_launch.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/save.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/save.svg new file mode 100644 index 000000000..b6a6e8373 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/save.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/schedule.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/schedule.svg new file mode 100644 index 000000000..15b283f59 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/schedule.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/screen_lock_landscape.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/screen_lock_landscape.svg new file mode 100644 index 000000000..4abbb6a82 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/screen_lock_landscape.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/screen_lock_portrait.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/screen_lock_portrait.svg new file mode 100644 index 000000000..595ef29b3 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/screen_lock_portrait.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/screen_rotation.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/screen_rotation.svg new file mode 100644 index 000000000..4dc3faa16 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/screen_rotation.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/search.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/search.svg new file mode 100644 index 000000000..a1049a938 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/search.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/security.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/security.svg new file mode 100644 index 000000000..54cd88a9b --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/security.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/select_all.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/select_all.svg new file mode 100644 index 000000000..7d0cc7101 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/select_all.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/settings.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/settings.svg new file mode 100644 index 000000000..7526a5672 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/settings.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/share.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/share.svg new file mode 100644 index 000000000..c9ec727e7 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/share.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/skip_next.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/skip_next.svg new file mode 100644 index 000000000..5d0952640 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/skip_next.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/skip_previous.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/skip_previous.svg new file mode 100644 index 000000000..e48a476b2 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/skip_previous.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/sort_by_alpha.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/sort_by_alpha.svg new file mode 100644 index 000000000..3bb349ed3 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/sort_by_alpha.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/stay_current_landscape.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/stay_current_landscape.svg new file mode 100644 index 000000000..c459d68c6 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/stay_current_landscape.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/stay_current_portrait.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/stay_current_portrait.svg new file mode 100644 index 000000000..66e3dbe06 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/stay_current_portrait.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/storage.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/storage.svg new file mode 100644 index 000000000..bf03be552 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/storage.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/swap_calls.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/swap_calls.svg new file mode 100644 index 000000000..416154843 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/swap_calls.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/sync.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/sync.svg new file mode 100644 index 000000000..f8a1964e4 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/sync.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/travel_explore.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/travel_explore.svg new file mode 100644 index 000000000..d99bc022e --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/travel_explore.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/verified_user.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/verified_user.svg new file mode 100644 index 000000000..23c9c05c7 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/verified_user.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/view_module.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/view_module.svg new file mode 100644 index 000000000..aa6ec6b53 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/view_module.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/visibility.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/visibility.svg new file mode 100644 index 000000000..e24cf4a60 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/visibility.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/visibility_off.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/visibility_off.svg new file mode 100644 index 000000000..b654f02a9 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/visibility_off.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/volunteer_activism.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/volunteer_activism.svg new file mode 100644 index 000000000..beafe437c --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/volunteer_activism.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/rounded/warning.svg b/icons/material-symbols/src/main/valkyrieResources/rounded/warning.svg new file mode 100644 index 000000000..99b05f0da --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/rounded/warning.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/roundedFilled/bookmark.svg b/icons/material-symbols/src/main/valkyrieResources/roundedFilled/bookmark.svg new file mode 100644 index 000000000..f7171932c --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/roundedFilled/bookmark.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/roundedFilled/check_box.svg b/icons/material-symbols/src/main/valkyrieResources/roundedFilled/check_box.svg new file mode 100644 index 000000000..faf7d26cc --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/roundedFilled/check_box.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/roundedFilled/check_circle.svg b/icons/material-symbols/src/main/valkyrieResources/roundedFilled/check_circle.svg new file mode 100644 index 000000000..89cff8d15 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/roundedFilled/check_circle.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/roundedFilled/circle.svg b/icons/material-symbols/src/main/valkyrieResources/roundedFilled/circle.svg new file mode 100644 index 000000000..fd88ec605 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/roundedFilled/circle.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/roundedFilled/disabled_by_default.svg b/icons/material-symbols/src/main/valkyrieResources/roundedFilled/disabled_by_default.svg new file mode 100644 index 000000000..b4a7f55c9 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/roundedFilled/disabled_by_default.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/roundedFilled/favorite.svg b/icons/material-symbols/src/main/valkyrieResources/roundedFilled/favorite.svg new file mode 100644 index 000000000..3a70a49ec --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/roundedFilled/favorite.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/roundedFilled/pause.svg b/icons/material-symbols/src/main/valkyrieResources/roundedFilled/pause.svg new file mode 100644 index 000000000..f8545d74b --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/roundedFilled/pause.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/roundedFilled/play_arrow.svg b/icons/material-symbols/src/main/valkyrieResources/roundedFilled/play_arrow.svg new file mode 100644 index 000000000..7df1f85bf --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/roundedFilled/play_arrow.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/material-symbols/src/main/valkyrieResources/roundedFilled/push_pin.svg b/icons/material-symbols/src/main/valkyrieResources/roundedFilled/push_pin.svg new file mode 100644 index 000000000..3cd4b8fa7 --- /dev/null +++ b/icons/material-symbols/src/main/valkyrieResources/roundedFilled/push_pin.svg @@ -0,0 +1,6 @@ + + diff --git a/icons/simple-icons/build.gradle.kts b/icons/simple-icons/build.gradle.kts new file mode 100644 index 000000000..8403f6968 --- /dev/null +++ b/icons/simple-icons/build.gradle.kts @@ -0,0 +1,38 @@ +plugins { + alias(mihonx.plugins.android.library) + alias(mihonx.plugins.compose) + + alias(mihonx.plugins.spotless) + + alias(libs.plugins.valkyrie) +} + +android { + namespace = "mihon.icons.simpleicons" +} + +spotless { + format("svg") { + target("src/**/*.svg") + trimTrailingWhitespace() + endWithNewline() + } +} + +valkyrie { + packageName = "mihon.icons.simpleicons" + generateAtSync = true + + imageVector { + suppressUnusedReceiverWarning = true + } + + iconPack { + name = "SimpleIcons" + targetSourceSet = "main" + } +} + +dependencies { + api(libs.androidx.compose.ui) +} diff --git a/icons/simple-icons/src/main/valkyrieResources/discord.svg b/icons/simple-icons/src/main/valkyrieResources/discord.svg new file mode 100644 index 000000000..a50d71b07 --- /dev/null +++ b/icons/simple-icons/src/main/valkyrieResources/discord.svg @@ -0,0 +1,6 @@ + +Discord diff --git a/icons/simple-icons/src/main/valkyrieResources/facebook.svg b/icons/simple-icons/src/main/valkyrieResources/facebook.svg new file mode 100644 index 000000000..9b275a373 --- /dev/null +++ b/icons/simple-icons/src/main/valkyrieResources/facebook.svg @@ -0,0 +1,6 @@ + +Facebook diff --git a/icons/simple-icons/src/main/valkyrieResources/github.svg b/icons/simple-icons/src/main/valkyrieResources/github.svg new file mode 100644 index 000000000..8c7e67401 --- /dev/null +++ b/icons/simple-icons/src/main/valkyrieResources/github.svg @@ -0,0 +1,6 @@ + +GitHub diff --git a/icons/simple-icons/src/main/valkyrieResources/open_collective.svg b/icons/simple-icons/src/main/valkyrieResources/open_collective.svg new file mode 100644 index 000000000..85e4bbccb --- /dev/null +++ b/icons/simple-icons/src/main/valkyrieResources/open_collective.svg @@ -0,0 +1,6 @@ + +Open Collective diff --git a/icons/simple-icons/src/main/valkyrieResources/patreon.svg b/icons/simple-icons/src/main/valkyrieResources/patreon.svg new file mode 100644 index 000000000..aa56d9161 --- /dev/null +++ b/icons/simple-icons/src/main/valkyrieResources/patreon.svg @@ -0,0 +1,6 @@ + +Patreon diff --git a/icons/simple-icons/src/main/valkyrieResources/reddit.svg b/icons/simple-icons/src/main/valkyrieResources/reddit.svg new file mode 100644 index 000000000..2d7f1fce7 --- /dev/null +++ b/icons/simple-icons/src/main/valkyrieResources/reddit.svg @@ -0,0 +1,6 @@ + +Reddit diff --git a/icons/simple-icons/src/main/valkyrieResources/x.svg b/icons/simple-icons/src/main/valkyrieResources/x.svg new file mode 100644 index 000000000..490c87d67 --- /dev/null +++ b/icons/simple-icons/src/main/valkyrieResources/x.svg @@ -0,0 +1,6 @@ + +X diff --git a/presentation-core/build.gradle.kts b/presentation-core/build.gradle.kts index a9dc143b1..b8f61d7f8 100644 --- a/presentation-core/build.gradle.kts +++ b/presentation-core/build.gradle.kts @@ -26,13 +26,13 @@ kotlin { dependencies { api(projects.core.common) api(projects.i18n) + implementation(projects.icons.materialSymbols) // Compose implementation(libs.androidx.activity.compose) implementation(libs.androidx.compose.foundation) implementation(libs.androidx.compose.material3) api(libs.androidx.compose.material3NavSuite) - implementation(libs.androidx.compose.materialIcons) implementation(libs.androidx.compose.animation) implementation(libs.androidx.compose.animationGraphics) debugImplementation(libs.androidx.compose.uiTooling) diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/components/CollapsibleBox.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/CollapsibleBox.kt index b70cb2705..2213ff62e 100644 --- a/presentation-core/src/main/java/tachiyomi/presentation/core/components/CollapsibleBox.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/CollapsibleBox.kt @@ -7,9 +7,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ExpandLess -import androidx.compose.material.icons.filled.ExpandMore import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -20,6 +17,9 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.ExpandLess +import mihon.icons.materialsymbols.rounded.ExpandMore import tachiyomi.presentation.core.theme.header @Composable @@ -44,7 +44,7 @@ fun CollapsibleBox( Spacer(modifier = Modifier.weight(1f)) Icon( - imageVector = if (expanded) Icons.Default.ExpandLess else Icons.Default.ExpandMore, + imageVector = if (expanded) MaterialSymbols.Rounded.ExpandLess else MaterialSymbols.Rounded.ExpandMore, contentDescription = null, ) } diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/components/SettingsItems.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/SettingsItems.kt index f812327ae..9cf64be9a 100644 --- a/presentation-core/src/main/java/tachiyomi/presentation/core/components/SettingsItems.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/SettingsItems.kt @@ -15,12 +15,6 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.grid.GridCells import androidx.compose.foundation.lazy.grid.LazyGridScope import androidx.compose.foundation.lazy.grid.LazyVerticalGrid -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ArrowDownward -import androidx.compose.material.icons.filled.ArrowUpward -import androidx.compose.material.icons.rounded.CheckBox -import androidx.compose.material.icons.rounded.CheckBoxOutlineBlank -import androidx.compose.material.icons.rounded.DisabledByDefault import androidx.compose.material3.Checkbox import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.ExposedDropdownMenuAnchorType @@ -50,6 +44,12 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.dp import dev.icerock.moko.resources.StringResource +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.ArrowDownward +import mihon.icons.materialsymbols.rounded.ArrowUpward +import mihon.icons.materialsymbols.rounded.CheckBoxOutlineBlank +import mihon.icons.materialsymbols.roundedfilled.CheckBox +import mihon.icons.materialsymbols.roundedfilled.DisabledByDefault import tachiyomi.core.common.preference.Preference import tachiyomi.core.common.preference.TriState import tachiyomi.core.common.preference.toggle @@ -103,8 +103,8 @@ fun IconItem(label: String, icon: ImageVector, onClick: () -> Unit) { @Composable fun SortItem(label: String, sortDescending: Boolean?, onClick: () -> Unit) { val arrowIcon = when (sortDescending) { - true -> Icons.Default.ArrowDownward - false -> Icons.Default.ArrowUpward + true -> MaterialSymbols.Rounded.ArrowDownward + false -> MaterialSymbols.Rounded.ArrowUpward null -> null } @@ -361,9 +361,9 @@ fun TriStateItem( Icon( imageVector = when (state) { - TriState.DISABLED -> Icons.Rounded.CheckBoxOutlineBlank - TriState.ENABLED_IS -> Icons.Rounded.CheckBox - TriState.ENABLED_NOT -> Icons.Rounded.DisabledByDefault + TriState.DISABLED -> MaterialSymbols.Rounded.CheckBoxOutlineBlank + TriState.ENABLED_IS -> MaterialSymbols.RoundedFilled.CheckBox + TriState.ENABLED_NOT -> MaterialSymbols.RoundedFilled.DisabledByDefault }, contentDescription = null, tint = if (!enabled || state == TriState.DISABLED) { diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/CustomIcons.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/icons/CustomIcons.kt deleted file mode 100644 index 8c8661b85..000000000 --- a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/CustomIcons.kt +++ /dev/null @@ -1,7 +0,0 @@ -package tachiyomi.presentation.core.icons - -/** - * Icons imported from https://simpleicons.org using - * https://github.com/DevSrSouza/svg-to-compose - */ -object CustomIcons diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Discord.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Discord.kt deleted file mode 100644 index b3499579d..000000000 --- a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Discord.kt +++ /dev/null @@ -1,86 +0,0 @@ -package tachiyomi.presentation.core.icons - -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.PathFillType.Companion.NonZero -import androidx.compose.ui.graphics.SolidColor -import androidx.compose.ui.graphics.StrokeCap.Companion.Butt -import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.graphics.vector.ImageVector.Builder -import androidx.compose.ui.graphics.vector.path -import androidx.compose.ui.unit.dp - -@Suppress("UnusedReceiverParameter", "BooleanLiteralArgument") -val CustomIcons.Discord: ImageVector - get() { - if (_discord != null) { - return _discord!! - } - _discord = Builder( - name = "Discord", - defaultWidth = 24.0.dp, - defaultHeight = 24.0.dp, - viewportWidth = 24.0f, - viewportHeight = 24.0f, - ).apply { - path( - fill = SolidColor(Color(0xFF000000)), - stroke = null, - strokeLineWidth = 0.0f, - strokeLineCap = Butt, - strokeLineJoin = Miter, - strokeLineMiter = 4.0f, - pathFillType = NonZero, - ) { - moveTo(20.317f, 4.3698f) - arcToRelative(19.7913f, 19.7913f, 0.0f, false, false, -4.8851f, -1.5152f) - arcToRelative(0.0741f, 0.0741f, 0.0f, false, false, -0.0785f, 0.0371f) - curveToRelative(-0.211f, 0.3753f, -0.4447f, 0.8648f, -0.6083f, 1.2495f) - curveToRelative(-1.8447f, -0.2762f, -3.68f, -0.2762f, -5.4868f, 0.0f) - curveToRelative(-0.1636f, -0.3933f, -0.4058f, -0.8742f, -0.6177f, -1.2495f) - arcToRelative(0.077f, 0.077f, 0.0f, false, false, -0.0785f, -0.037f) - arcToRelative(19.7363f, 19.7363f, 0.0f, false, false, -4.8852f, 1.515f) - arcToRelative(0.0699f, 0.0699f, 0.0f, false, false, -0.0321f, 0.0277f) - curveTo(0.5334f, 9.0458f, -0.319f, 13.5799f, 0.0992f, 18.0578f) - arcToRelative(0.0824f, 0.0824f, 0.0f, false, false, 0.0312f, 0.0561f) - curveToRelative(2.0528f, 1.5076f, 4.0413f, 2.4228f, 5.9929f, 3.0294f) - arcToRelative(0.0777f, 0.0777f, 0.0f, false, false, 0.0842f, -0.0276f) - curveToRelative(0.4616f, -0.6304f, 0.8731f, -1.2952f, 1.226f, -1.9942f) - arcToRelative(0.076f, 0.076f, 0.0f, false, false, -0.0416f, -0.1057f) - curveToRelative(-0.6528f, -0.2476f, -1.2743f, -0.5495f, -1.8722f, -0.8923f) - arcToRelative(0.077f, 0.077f, 0.0f, false, true, -0.0076f, -0.1277f) - curveToRelative(0.1258f, -0.0943f, 0.2517f, -0.1923f, 0.3718f, -0.2914f) - arcToRelative(0.0743f, 0.0743f, 0.0f, false, true, 0.0776f, -0.0105f) - curveToRelative(3.9278f, 1.7933f, 8.18f, 1.7933f, 12.0614f, 0.0f) - arcToRelative(0.0739f, 0.0739f, 0.0f, false, true, 0.0785f, 0.0095f) - curveToRelative(0.1202f, 0.099f, 0.246f, 0.1981f, 0.3728f, 0.2924f) - arcToRelative(0.077f, 0.077f, 0.0f, false, true, -0.0066f, 0.1276f) - arcToRelative(12.2986f, 12.2986f, 0.0f, false, true, -1.873f, 0.8914f) - arcToRelative(0.0766f, 0.0766f, 0.0f, false, false, -0.0407f, 0.1067f) - curveToRelative(0.3604f, 0.698f, 0.7719f, 1.3628f, 1.225f, 1.9932f) - arcToRelative(0.076f, 0.076f, 0.0f, false, false, 0.0842f, 0.0286f) - curveToRelative(1.961f, -0.6067f, 3.9495f, -1.5219f, 6.0023f, -3.0294f) - arcToRelative(0.077f, 0.077f, 0.0f, false, false, 0.0313f, -0.0552f) - curveToRelative(0.5004f, -5.177f, -0.8382f, -9.6739f, -3.5485f, -13.6604f) - arcToRelative(0.061f, 0.061f, 0.0f, false, false, -0.0312f, -0.0286f) - close() - moveTo(8.02f, 15.3312f) - curveToRelative(-1.1825f, 0.0f, -2.1569f, -1.0857f, -2.1569f, -2.419f) - curveToRelative(0.0f, -1.3332f, 0.9555f, -2.4189f, 2.157f, -2.4189f) - curveToRelative(1.2108f, 0.0f, 2.1757f, 1.0952f, 2.1568f, 2.419f) - curveToRelative(0.0f, 1.3332f, -0.9555f, 2.4189f, -2.1569f, 2.4189f) - close() - moveTo(15.9948f, 15.3312f) - curveToRelative(-1.1825f, 0.0f, -2.1569f, -1.0857f, -2.1569f, -2.419f) - curveToRelative(0.0f, -1.3332f, 0.9554f, -2.4189f, 2.1569f, -2.4189f) - curveToRelative(1.2108f, 0.0f, 2.1757f, 1.0952f, 2.1568f, 2.419f) - curveToRelative(0.0f, 1.3332f, -0.946f, 2.4189f, -2.1568f, 2.4189f) - close() - } - } - .build() - return _discord!! - } - -@Suppress("ObjectPropertyName") -private var _discord: ImageVector? = null diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Facebook.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Facebook.kt deleted file mode 100644 index 31bda658f..000000000 --- a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Facebook.kt +++ /dev/null @@ -1,68 +0,0 @@ -package tachiyomi.presentation.core.icons - -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.PathFillType.Companion.NonZero -import androidx.compose.ui.graphics.SolidColor -import androidx.compose.ui.graphics.StrokeCap.Companion.Butt -import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.graphics.vector.ImageVector.Builder -import androidx.compose.ui.graphics.vector.path -import androidx.compose.ui.unit.dp - -@Suppress("UnusedReceiverParameter") -val CustomIcons.Facebook: ImageVector - get() { - if (_facebook != null) { - return _facebook!! - } - _facebook = Builder( - name = "Facebook", - defaultWidth = 24.0.dp, - defaultHeight = 24.0.dp, - viewportWidth = 24.0f, - viewportHeight = 24.0f, - ).apply { - path( - fill = SolidColor(Color(0xFF000000)), - stroke = null, - strokeLineWidth = 0.0f, - strokeLineCap = Butt, - strokeLineJoin = Miter, - strokeLineMiter = 4.0f, - pathFillType = NonZero, - ) { - moveTo(9.101f, 23.691f) - verticalLineToRelative(-7.98f) - horizontalLineTo(6.627f) - verticalLineToRelative(-3.667f) - horizontalLineToRelative(2.474f) - verticalLineToRelative(-1.58f) - curveToRelative(0.0f, -4.085f, 1.848f, -5.978f, 5.858f, -5.978f) - curveToRelative(0.401f, 0.0f, 0.955f, 0.042f, 1.468f, 0.103f) - arcToRelative(8.68f, 8.68f, 0.0f, false, true, 1.141f, 0.195f) - verticalLineToRelative(3.325f) - arcToRelative(8.623f, 8.623f, 0.0f, false, false, -0.653f, -0.036f) - arcToRelative(26.805f, 26.805f, 0.0f, false, false, -0.733f, -0.009f) - curveToRelative(-0.707f, 0.0f, -1.259f, 0.096f, -1.675f, 0.309f) - arcToRelative(1.686f, 1.686f, 0.0f, false, false, -0.679f, 0.622f) - curveToRelative(-0.258f, 0.42f, -0.374f, 0.995f, -0.374f, 1.752f) - verticalLineToRelative(1.297f) - horizontalLineToRelative(3.919f) - lineToRelative(-0.386f, 2.103f) - lineToRelative(-0.287f, 1.564f) - horizontalLineToRelative(-3.246f) - verticalLineToRelative(8.245f) - curveTo(19.396f, 23.238f, 24.0f, 18.179f, 24.0f, 12.044f) - curveToRelative(0.0f, -6.627f, -5.373f, -12.0f, -12.0f, -12.0f) - reflectiveCurveToRelative(-12.0f, 5.373f, -12.0f, 12.0f) - curveToRelative(0.0f, 5.628f, 3.874f, 10.35f, 9.101f, 11.647f) - close() - } - } - .build() - return _facebook!! - } - -@Suppress("ObjectPropertyName") -private var _facebook: ImageVector? = null diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Github.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Github.kt deleted file mode 100644 index 846f2dcf9..000000000 --- a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Github.kt +++ /dev/null @@ -1,68 +0,0 @@ -package tachiyomi.presentation.core.icons - -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.PathFillType.Companion.NonZero -import androidx.compose.ui.graphics.SolidColor -import androidx.compose.ui.graphics.StrokeCap.Companion.Butt -import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.graphics.vector.ImageVector.Builder -import androidx.compose.ui.graphics.vector.path -import androidx.compose.ui.unit.dp - -@Suppress("UnusedReceiverParameter") -val CustomIcons.Github: ImageVector - get() { - if (_github != null) { - return _github!! - } - _github = Builder( - name = "Github", - defaultWidth = 24.0.dp, - defaultHeight = 24.0.dp, - viewportWidth = 24.0f, - viewportHeight = 24.0f, - ).apply { - path( - fill = SolidColor(Color(0xFF000000)), - stroke = null, - strokeLineWidth = 0.0f, - strokeLineCap = Butt, - strokeLineJoin = Miter, - strokeLineMiter = 4.0f, - pathFillType = NonZero, - ) { - moveTo(12.0f, 0.297f) - curveToRelative(-6.63f, 0.0f, -12.0f, 5.373f, -12.0f, 12.0f) - curveToRelative(0.0f, 5.303f, 3.438f, 9.8f, 8.205f, 11.385f) - curveToRelative(0.6f, 0.113f, 0.82f, -0.258f, 0.82f, -0.577f) - curveToRelative(0.0f, -0.285f, -0.01f, -1.04f, -0.015f, -2.04f) - curveToRelative(-3.338f, 0.724f, -4.042f, -1.61f, -4.042f, -1.61f) - curveTo(4.422f, 18.07f, 3.633f, 17.7f, 3.633f, 17.7f) - curveToRelative(-1.087f, -0.744f, 0.084f, -0.729f, 0.084f, -0.729f) - curveToRelative(1.205f, 0.084f, 1.838f, 1.236f, 1.838f, 1.236f) - curveToRelative(1.07f, 1.835f, 2.809f, 1.305f, 3.495f, 0.998f) - curveToRelative(0.108f, -0.776f, 0.417f, -1.305f, 0.76f, -1.605f) - curveToRelative(-2.665f, -0.3f, -5.466f, -1.332f, -5.466f, -5.93f) - curveToRelative(0.0f, -1.31f, 0.465f, -2.38f, 1.235f, -3.22f) - curveToRelative(-0.135f, -0.303f, -0.54f, -1.523f, 0.105f, -3.176f) - curveToRelative(0.0f, 0.0f, 1.005f, -0.322f, 3.3f, 1.23f) - curveToRelative(0.96f, -0.267f, 1.98f, -0.399f, 3.0f, -0.405f) - curveToRelative(1.02f, 0.006f, 2.04f, 0.138f, 3.0f, 0.405f) - curveToRelative(2.28f, -1.552f, 3.285f, -1.23f, 3.285f, -1.23f) - curveToRelative(0.645f, 1.653f, 0.24f, 2.873f, 0.12f, 3.176f) - curveToRelative(0.765f, 0.84f, 1.23f, 1.91f, 1.23f, 3.22f) - curveToRelative(0.0f, 4.61f, -2.805f, 5.625f, -5.475f, 5.92f) - curveToRelative(0.42f, 0.36f, 0.81f, 1.096f, 0.81f, 2.22f) - curveToRelative(0.0f, 1.606f, -0.015f, 2.896f, -0.015f, 3.286f) - curveToRelative(0.0f, 0.315f, 0.21f, 0.69f, 0.825f, 0.57f) - curveTo(20.565f, 22.092f, 24.0f, 17.592f, 24.0f, 12.297f) - curveToRelative(0.0f, -6.627f, -5.373f, -12.0f, -12.0f, -12.0f) - } - } - .build() - return _github!! - } - -@Suppress("ObjectPropertyName") -private var _github: ImageVector? = null diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/OpenCollective.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/icons/OpenCollective.kt deleted file mode 100644 index de061b886..000000000 --- a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/OpenCollective.kt +++ /dev/null @@ -1,47 +0,0 @@ -package tachiyomi.presentation.core.icons - -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.SolidColor -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.graphics.vector.path -import androidx.compose.ui.unit.dp - -@Suppress("UnusedReceiverParameter") -val CustomIcons.OpenCollective: ImageVector - get() { - if (_OpenCollective != null) { - return _OpenCollective!! - } - _OpenCollective = ImageVector.Builder( - name = "OpenCollective", - defaultWidth = 24.dp, - defaultHeight = 24.dp, - viewportWidth = 24f, - viewportHeight = 24f, - ).apply { - path(fill = SolidColor(Color.Black)) { - moveTo(12f, 0f) - curveTo(5.373f, 0f, 0f, 5.373f, 0f, 12f) - reflectiveCurveToRelative(5.373f, 12f, 12f, 12f) - curveToRelative(2.54f, 0f, 4.894f, -0.79f, 6.834f, -2.135f) - lineToRelative(-3.107f, -3.109f) - arcToRelative(7.715f, 7.715f, 0f, isMoreThanHalf = true, isPositiveArc = true, 0f, -13.512f) - lineToRelative(3.107f, -3.109f) - arcTo(11.943f, 11.943f, 0f, isMoreThanHalf = false, isPositiveArc = false, 12f, 0f) - close() - moveTo(21.865f, 5.166f) - lineToRelative(-3.109f, 3.107f) - arcTo(7.67f, 7.67f, 0f, isMoreThanHalf = false, isPositiveArc = true, 19.715f, 12f) - arcToRelative(7.682f, 7.682f, 0f, isMoreThanHalf = false, isPositiveArc = true, -0.959f, 3.727f) - lineToRelative(3.109f, 3.107f) - arcTo(11.943f, 11.943f, 0f, isMoreThanHalf = false, isPositiveArc = false, 24f, 12f) - curveToRelative(0f, -2.54f, -0.79f, -4.894f, -2.135f, -6.834f) - close() - } - }.build() - - return _OpenCollective!! - } - -@Suppress("ObjectPropertyName") -private var _OpenCollective: ImageVector? = null diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Patreon.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Patreon.kt deleted file mode 100644 index af5fa55fa..000000000 --- a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Patreon.kt +++ /dev/null @@ -1,39 +0,0 @@ -package tachiyomi.presentation.core.icons - -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.SolidColor -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.graphics.vector.path -import androidx.compose.ui.unit.dp - -@Suppress("UnusedReceiverParameter") -val CustomIcons.Patreon: ImageVector - get() { - if (_Patreon != null) { - return _Patreon!! - } - _Patreon = ImageVector.Builder( - name = "Patreon", - defaultWidth = 24.dp, - defaultHeight = 24.dp, - viewportWidth = 24f, - viewportHeight = 24f, - ).apply { - path(fill = SolidColor(Color.Black)) { - moveTo(22.957f, 7.21f) - curveToRelative(-0.004f, -3.064f, -2.391f, -5.576f, -5.191f, -6.482f) - curveToRelative(-3.478f, -1.125f, -8.064f, -0.962f, -11.384f, 0.604f) - curveTo(2.357f, 3.231f, 1.093f, 7.391f, 1.046f, 11.54f) - curveToRelative(-0.039f, 3.411f, 0.302f, 12.396f, 5.369f, 12.46f) - curveToRelative(3.765f, 0.047f, 4.326f, -4.804f, 6.068f, -7.141f) - curveToRelative(1.24f, -1.662f, 2.836f, -2.132f, 4.801f, -2.618f) - curveToRelative(3.376f, -0.836f, 5.678f, -3.501f, 5.673f, -7.031f) - close() - } - }.build() - - return _Patreon!! - } - -@Suppress("ObjectPropertyName") -private var _Patreon: ImageVector? = null diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Reddit.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Reddit.kt deleted file mode 100644 index 5cfb8bfe8..000000000 --- a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/Reddit.kt +++ /dev/null @@ -1,92 +0,0 @@ -package tachiyomi.presentation.core.icons - -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.PathFillType.Companion.NonZero -import androidx.compose.ui.graphics.SolidColor -import androidx.compose.ui.graphics.StrokeCap.Companion.Butt -import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.graphics.vector.ImageVector.Builder -import androidx.compose.ui.graphics.vector.path -import androidx.compose.ui.unit.dp - -@Suppress("UnusedReceiverParameter") -val CustomIcons.Reddit: ImageVector - get() { - if (_reddit != null) { - return _reddit!! - } - _reddit = Builder( - name = "Reddit", - defaultWidth = 24.0.dp, - defaultHeight = 24.0.dp, - viewportWidth = 24.0f, - viewportHeight = 24.0f, - ).apply { - path( - fill = SolidColor(Color(0xFF000000)), - stroke = null, - strokeLineWidth = 0.0f, - strokeLineCap = Butt, - strokeLineJoin = Miter, - strokeLineMiter = 4.0f, - pathFillType = NonZero, - ) { - moveTo(12.0f, 0.0f) - curveTo(5.373f, 0.0f, 0.0f, 5.373f, 0.0f, 12.0f) - curveToRelative(0.0f, 3.314f, 1.343f, 6.314f, 3.515f, 8.485f) - lineToRelative(-2.286f, 2.286f) - curveTo(0.775f, 23.225f, 1.097f, 24.0f, 1.738f, 24.0f) - lineTo(12.0f, 24.0f) - curveToRelative(6.627f, 0.0f, 12.0f, -5.373f, 12.0f, -12.0f) - reflectiveCurveTo(18.627f, 0.0f, 12.0f, 0.0f) - close() - moveTo(16.388f, 3.199f) - curveToRelative(1.104f, 0.0f, 1.999f, 0.895f, 1.999f, 1.999f) - curveToRelative(0.0f, 1.105f, -0.895f, 2.0f, -1.999f, 2.0f) - curveToRelative(-0.946f, 0.0f, -1.739f, -0.657f, -1.947f, -1.539f) - verticalLineToRelative(0.002f) - curveToRelative(-1.147f, 0.162f, -2.032f, 1.15f, -2.032f, 2.341f) - verticalLineToRelative(0.007f) - curveToRelative(1.776f, 0.067f, 3.4f, 0.567f, 4.686f, 1.363f) - curveToRelative(0.473f, -0.363f, 1.064f, -0.58f, 1.707f, -0.58f) - curveToRelative(1.547f, 0.0f, 2.802f, 1.254f, 2.802f, 2.802f) - curveToRelative(0.0f, 1.117f, -0.655f, 2.081f, -1.601f, 2.531f) - curveToRelative(-0.088f, 3.256f, -3.637f, 5.876f, -7.997f, 5.876f) - curveToRelative(-4.361f, 0.0f, -7.905f, -2.617f, -7.998f, -5.87f) - curveToRelative(-0.954f, -0.447f, -1.614f, -1.415f, -1.614f, -2.538f) - curveToRelative(0.0f, -1.548f, 1.255f, -2.802f, 2.803f, -2.802f) - curveToRelative(0.645f, 0.0f, 1.239f, 0.218f, 1.712f, 0.585f) - curveToRelative(1.275f, -0.79f, 2.881f, -1.291f, 4.64f, -1.365f) - verticalLineToRelative(-0.01f) - curveToRelative(0.0f, -1.663f, 1.263f, -3.034f, 2.88f, -3.207f) - curveToRelative(0.188f, -0.911f, 0.993f, -1.595f, 1.959f, -1.595f) - close() - moveTo(8.303f, 11.575f) - curveToRelative(-0.784f, 0.0f, -1.459f, 0.78f, -1.506f, 1.797f) - curveToRelative(-0.047f, 1.016f, 0.64f, 1.429f, 1.426f, 1.429f) - curveToRelative(0.786f, 0.0f, 1.371f, -0.369f, 1.418f, -1.385f) - curveToRelative(0.047f, -1.017f, -0.553f, -1.841f, -1.338f, -1.841f) - close() - moveTo(15.709f, 11.575f) - curveToRelative(-0.786f, 0.0f, -1.385f, 0.824f, -1.338f, 1.841f) - curveToRelative(0.047f, 1.017f, 0.634f, 1.385f, 1.418f, 1.385f) - curveToRelative(0.785f, 0.0f, 1.473f, -0.413f, 1.426f, -1.429f) - curveToRelative(-0.046f, -1.017f, -0.721f, -1.797f, -1.506f, -1.797f) - close() - moveTo(12.006f, 15.588f) - curveToRelative(-0.974f, 0.0f, -1.907f, 0.048f, -2.77f, 0.135f) - curveToRelative(-0.147f, 0.015f, -0.241f, 0.168f, -0.183f, 0.305f) - curveToRelative(0.483f, 1.154f, 1.622f, 1.964f, 2.953f, 1.964f) - curveToRelative(1.33f, 0.0f, 2.47f, -0.81f, 2.953f, -1.964f) - curveToRelative(0.057f, -0.137f, -0.037f, -0.29f, -0.184f, -0.305f) - curveToRelative(-0.863f, -0.087f, -1.795f, -0.135f, -2.769f, -0.135f) - close() - } - } - .build() - return _reddit!! - } - -@Suppress("ObjectPropertyName") -private var _reddit: ImageVector? = null diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/X.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/icons/X.kt deleted file mode 100644 index dadebfc08..000000000 --- a/presentation-core/src/main/java/tachiyomi/presentation/core/icons/X.kt +++ /dev/null @@ -1,61 +0,0 @@ -package tachiyomi.presentation.core.icons - -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.PathFillType.Companion.NonZero -import androidx.compose.ui.graphics.SolidColor -import androidx.compose.ui.graphics.StrokeCap.Companion.Butt -import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.graphics.vector.ImageVector.Builder -import androidx.compose.ui.graphics.vector.path -import androidx.compose.ui.unit.dp - -@Suppress("UnusedReceiverParameter") -val CustomIcons.X: ImageVector - get() { - if (_x != null) { - return _x!! - } - _x = Builder( - name = "X", - defaultWidth = 24.0.dp, - defaultHeight = 24.0.dp, - viewportWidth = - 24.0f, - viewportHeight = 24.0f, - ).apply { - path( - fill = SolidColor(Color(0xFF000000)), - stroke = null, - strokeLineWidth = 0.0f, - strokeLineCap = Butt, - strokeLineJoin = Miter, - strokeLineMiter = 4.0f, - pathFillType = NonZero, - ) { - moveTo(18.901f, 1.153f) - horizontalLineToRelative(3.68f) - lineToRelative(-8.04f, 9.19f) - lineTo(24.0f, 22.846f) - horizontalLineToRelative(-7.406f) - lineToRelative(-5.8f, -7.584f) - lineToRelative(-6.638f, 7.584f) - horizontalLineTo(0.474f) - lineToRelative(8.6f, -9.83f) - lineTo(0.0f, 1.154f) - horizontalLineToRelative(7.594f) - lineToRelative(5.243f, 6.932f) - close() - moveTo(17.61f, 20.644f) - horizontalLineToRelative(2.039f) - lineTo(6.486f, 3.24f) - horizontalLineTo(4.298f) - close() - } - } - .build() - return _x!! - } - -@Suppress("ObjectPropertyName") -private var _x: ImageVector? = null diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/screens/InfoScreen.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/screens/InfoScreen.kt index e3b65079f..e67dafa6b 100644 --- a/presentation-core/src/main/java/tachiyomi/presentation/core/screens/InfoScreen.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/screens/InfoScreen.kt @@ -11,8 +11,6 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Newspaper import androidx.compose.material3.Button import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -28,6 +26,8 @@ import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex +import mihon.icons.materialsymbols.MaterialSymbols +import mihon.icons.materialsymbols.rounded.Newspaper import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.components.material.padding import tachiyomi.presentation.core.util.secondaryItemAlpha @@ -130,7 +130,7 @@ fun InfoScreen( @Composable private fun InfoScaffoldPreview() { InfoScreen( - icon = Icons.Outlined.Newspaper, + icon = MaterialSymbols.Rounded.Newspaper, headingText = "Heading", subtitleText = "Subtitle", acceptText = "Accept", diff --git a/settings.gradle.kts b/settings.gradle.kts index 9ae27d3b9..27cec5f17 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -38,6 +38,8 @@ include(":core:metro") include(":data") include(":domain") include(":i18n") +include(":icons:material-symbols") +include(":icons:simple-icons") include(":presentation-core") include(":presentation-widget") include(":source-api")