From 4b60138d41ea33e5e4c3defb0dc626b599216f3f Mon Sep 17 00:00:00 2001 From: stevenyomi <95685115+stevenyomi@users.noreply.github.com> Date: Sat, 29 Oct 2022 23:43:51 +0800 Subject: [PATCH] Clean up strings and icons (#8326) * Clean up strings and icons * fix incorrect usages of label_more * restore strings and reduce usage of android.R * removing icon desc of FABs anyway as app's not for visual impaired users --- .../presentation/browse/BrowseSourceScreen.kt | 14 ++--- .../presentation/browse/ExtensionsScreen.kt | 4 +- .../browse/components/BrowseIcons.kt | 4 +- .../browse/components/BrowseSourceDialogs.kt | 2 +- .../category/components/CategoryDialogs.kt | 2 +- .../category/components/CategoryListItem.kt | 6 +- .../kanade/presentation/components/AppBar.kt | 12 ++-- .../components/ChangeCategoryDialog.kt | 2 +- .../components/ChapterDownloadIndicator.kt | 14 ++--- .../components/DeleteLibraryMangaDialog.kt | 2 +- .../presentation/components/DropdownMenu.kt | 6 +- .../components/DuplicateMangaDialog.kt | 2 +- .../presentation/components/EmptyScreen.kt | 8 +-- .../components/MangaBottomActionMenu.kt | 20 +++---- .../history/components/HistoryDialog.kt | 4 +- .../presentation/library/LibraryScreen.kt | 4 +- .../library/components/LibraryToolbar.kt | 4 +- .../kanade/presentation/manga/MangaScreen.kt | 4 +- .../DownloadCustomChaptersDialog.kt | 10 ++-- .../manga/components/MangaChapterListItem.kt | 2 +- .../manga/components/MangaCoverDialog.kt | 4 +- .../manga/components/MangaDialogs.kt | 2 +- .../manga/components/MangaInfoHeader.kt | 58 +++++++++---------- .../manga/components/MangaToolbar.kt | 18 +++--- .../more/settings/PreferenceScaffold.kt | 4 +- .../settings/screen/ClearDatabaseScreen.kt | 2 +- .../settings/screen/SettingsAdvancedScreen.kt | 2 +- .../settings/screen/SettingsBackupScreen.kt | 4 +- .../settings/screen/SettingsLibraryScreen.kt | 2 +- .../settings/screen/SettingsMainScreen.kt | 4 +- .../settings/screen/SettingsSearchScreen.kt | 10 ++-- .../settings/screen/SettingsTrackingScreen.kt | 14 ++--- .../widget/AppThemePreferenceWidget.kt | 5 +- .../widget/EditTextPreferenceWidget.kt | 3 +- .../settings/widget/ListPreferenceWidget.kt | 3 +- .../widget/MultiSelectListPreferenceWidget.kt | 3 +- .../settings/widget/SwitchPreferenceWidget.kt | 2 +- .../settings/widget/TextPreferenceWidget.kt | 2 +- .../widget/TrackingPreferenceWidget.kt | 8 ++- .../settings/widget/TriStateListDialog.kt | 10 +++- .../presentation/updates/UpdatesDialog.kt | 2 +- .../presentation/updates/UpdatesScreen.kt | 12 ++-- .../presentation/updates/UpdatesUiItem.kt | 2 +- .../presentation/webview/WebViewScreen.kt | 12 ++-- .../data/library/LibraryUpdateNotifier.kt | 2 +- .../ui/download/DownloadController.kt | 8 +-- .../manga/chapter/SetChapterSettingsDialog.kt | 2 +- .../ui/manga/track/SetTrackChaptersDialog.kt | 2 +- .../ui/manga/track/SetTrackScoreDialog.kt | 2 +- .../ui/manga/track/SetTrackStatusDialog.kt | 2 +- .../tachiyomi/ui/reader/ReaderPageSheet.kt | 2 +- .../layout/global_search_controller_card.xml | 2 +- app/src/main/res/layout/track_item.xml | 2 +- 53 files changed, 176 insertions(+), 162 deletions(-) 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 1f249465c..b094a1289 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt @@ -13,12 +13,12 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.grid.GridCells import androidx.compose.foundation.rememberScrollState import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.HelpOutline -import androidx.compose.material.icons.filled.Public -import androidx.compose.material.icons.filled.Refresh import androidx.compose.material.icons.outlined.Favorite import androidx.compose.material.icons.outlined.FilterList +import androidx.compose.material.icons.outlined.HelpOutline import androidx.compose.material.icons.outlined.NewReleases +import androidx.compose.material.icons.outlined.Public +import androidx.compose.material.icons.outlined.Refresh import androidx.compose.material3.FilterChip import androidx.compose.material3.FilterChipDefaults import androidx.compose.material3.Icon @@ -253,7 +253,7 @@ fun BrowseSourceContent( listOf( EmptyScreenAction( stringResId = R.string.local_source_help_guide, - icon = Icons.Default.HelpOutline, + icon = Icons.Outlined.HelpOutline, onClick = onLocalSourceHelpClick, ), ) @@ -261,17 +261,17 @@ fun BrowseSourceContent( listOf( EmptyScreenAction( stringResId = R.string.action_retry, - icon = Icons.Default.Refresh, + icon = Icons.Outlined.Refresh, onClick = mangaList::refresh, ), EmptyScreenAction( stringResId = R.string.action_open_in_web_view, - icon = Icons.Default.Public, + icon = Icons.Outlined.Public, onClick = onWebViewClick, ), EmptyScreenAction( stringResId = R.string.label_help, - icon = Icons.Default.HelpOutline, + icon = Icons.Outlined.HelpOutline, onClick = onHelpClick, ), ) 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 33d322491..05f4d7a7b 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt @@ -12,7 +12,7 @@ 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.filled.Close +import androidx.compose.material.icons.outlined.Close import androidx.compose.material3.AlertDialog import androidx.compose.material3.Button import androidx.compose.material3.CircularProgressIndicator @@ -368,7 +368,7 @@ private fun ExtensionItemActions( } else { IconButton(onClick = { onClickItemCancel(extension) }) { Icon( - imageVector = Icons.Default.Close, + imageVector = Icons.Outlined.Close, contentDescription = stringResource(R.string.action_cancel), ) } 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 902551d54..9be627cd3 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 @@ -47,7 +47,7 @@ fun SourceIcon( when { source.isStub && icon == null -> { Image( - imageVector = Icons.Default.Warning, + imageVector = Icons.Filled.Warning, contentDescription = null, colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.error), modifier = modifier.then(defaultModifier), @@ -104,7 +104,7 @@ fun ExtensionIcon( } } is Extension.Untrusted -> Image( - imageVector = Icons.Default.Dangerous, + imageVector = Icons.Filled.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/BrowseSourceDialogs.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceDialogs.kt index 6a1d7d5d3..95158cce7 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceDialogs.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceDialogs.kt @@ -20,7 +20,7 @@ fun RemoveMangaDialog( onDismissRequest = onDismissRequest, dismissButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, confirmButton = { diff --git a/app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt b/app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt index f26ef4e4e..b4401f707 100644 --- a/app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt +++ b/app/src/main/java/eu/kanade/presentation/category/components/CategoryDialogs.kt @@ -130,7 +130,7 @@ fun CategoryDeleteDialog( }, dismissButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, title = { 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 0ad1868fa..33f106d81 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 @@ -18,8 +18,10 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource import eu.kanade.domain.category.model.Category import eu.kanade.presentation.util.horizontalPadding +import eu.kanade.tachiyomi.R @Composable fun CategoryListItem( @@ -64,10 +66,10 @@ fun CategoryListItem( } Spacer(modifier = Modifier.weight(1f)) IconButton(onClick = onRename) { - Icon(imageVector = Icons.Outlined.Edit, contentDescription = "") + Icon(imageVector = Icons.Outlined.Edit, contentDescription = stringResource(R.string.action_rename_category)) } IconButton(onClick = onDelete) { - Icon(imageVector = Icons.Outlined.Delete, contentDescription = "") + Icon(imageVector = Icons.Outlined.Delete, contentDescription = stringResource(R.string.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 2b9bbad5a..5e155e9a2 100644 --- a/app/src/main/java/eu/kanade/presentation/components/AppBar.kt +++ b/app/src/main/java/eu/kanade/presentation/components/AppBar.kt @@ -12,11 +12,9 @@ import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.TextFieldDefaults import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ArrowBack -import androidx.compose.material.icons.filled.Close -import androidx.compose.material.icons.filled.MoreVert import androidx.compose.material.icons.outlined.ArrowBack import androidx.compose.material.icons.outlined.Close +import androidx.compose.material.icons.outlined.MoreVert import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -55,7 +53,7 @@ fun AppBar( subtitle: String? = null, // Up button navigateUp: (() -> Unit)? = null, - navigationIcon: ImageVector = Icons.Default.ArrowBack, + navigationIcon: ImageVector = Icons.Outlined.ArrowBack, // Menu actions: @Composable RowScope.() -> Unit = {}, // Action mode @@ -105,7 +103,7 @@ fun AppBar( titleContent: @Composable () -> Unit, // Up button navigateUp: (() -> Unit)? = null, - navigationIcon: ImageVector = Icons.Default.ArrowBack, + navigationIcon: ImageVector = Icons.Outlined.ArrowBack, // Menu actions: @Composable RowScope.() -> Unit = {}, // Action mode @@ -125,7 +123,7 @@ fun AppBar( if (isActionMode) { IconButton(onClick = onCancelActionMode) { Icon( - imageVector = Icons.Default.Close, + imageVector = Icons.Outlined.Close, contentDescription = stringResource(R.string.action_cancel), ) } @@ -200,7 +198,7 @@ fun AppBarActions( val overflowActions = actions.filterIsInstance() if (overflowActions.isNotEmpty()) { IconButton(onClick = { showMenu = !showMenu }) { - Icon(Icons.Default.MoreVert, contentDescription = stringResource(R.string.label_more)) + Icon(Icons.Outlined.MoreVert, contentDescription = stringResource(R.string.abc_action_menu_overflow_description)) } DropdownMenu( diff --git a/app/src/main/java/eu/kanade/presentation/components/ChangeCategoryDialog.kt b/app/src/main/java/eu/kanade/presentation/components/ChangeCategoryDialog.kt index e4191391e..0e124ad69 100644 --- a/app/src/main/java/eu/kanade/presentation/components/ChangeCategoryDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/components/ChangeCategoryDialog.kt @@ -68,7 +68,7 @@ fun ChangeCategoryDialog( } Spacer(modifier = Modifier.weight(1f)) TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } TextButton( onClick = { diff --git a/app/src/main/java/eu/kanade/presentation/components/ChapterDownloadIndicator.kt b/app/src/main/java/eu/kanade/presentation/components/ChapterDownloadIndicator.kt index 7e17b6338..fd817fc25 100644 --- a/app/src/main/java/eu/kanade/presentation/components/ChapterDownloadIndicator.kt +++ b/app/src/main/java/eu/kanade/presentation/components/ChapterDownloadIndicator.kt @@ -7,9 +7,9 @@ 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.ArrowDownward import androidx.compose.material.icons.filled.CheckCircle -import androidx.compose.material.icons.filled.ErrorOutline +import androidx.compose.material.icons.outlined.ArrowDownward +import androidx.compose.material.icons.outlined.ErrorOutline import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.DropdownMenuItem @@ -78,7 +78,7 @@ private fun NotDownloadedIndicator( ) { Icon( painter = painterResource(id = R.drawable.ic_download_chapter_24dp), - contentDescription = null, + contentDescription = stringResource(R.string.manga_download), modifier = Modifier.size(IndicatorSize), tint = MaterialTheme.colorScheme.onSurfaceVariant, ) @@ -148,7 +148,7 @@ private fun DownloadingIndicator( ) } Icon( - imageVector = Icons.Default.ArrowDownward, + imageVector = Icons.Outlined.ArrowDownward, contentDescription = null, modifier = ArrowModifier, tint = arrowColor, @@ -172,7 +172,7 @@ private fun DownloadedIndicator( contentAlignment = Alignment.Center, ) { Icon( - imageVector = Icons.Default.CheckCircle, + imageVector = Icons.Filled.CheckCircle, contentDescription = null, modifier = Modifier.size(IndicatorSize), tint = MaterialTheme.colorScheme.onSurfaceVariant, @@ -204,8 +204,8 @@ private fun ErrorIndicator( contentAlignment = Alignment.Center, ) { Icon( - imageVector = Icons.Default.ErrorOutline, - contentDescription = null, + imageVector = Icons.Outlined.ErrorOutline, + contentDescription = stringResource(R.string.chapter_error), modifier = Modifier.size(IndicatorSize), tint = MaterialTheme.colorScheme.error, ) diff --git a/app/src/main/java/eu/kanade/presentation/components/DeleteLibraryMangaDialog.kt b/app/src/main/java/eu/kanade/presentation/components/DeleteLibraryMangaDialog.kt index 7eb6ba168..8154d5508 100644 --- a/app/src/main/java/eu/kanade/presentation/components/DeleteLibraryMangaDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/components/DeleteLibraryMangaDialog.kt @@ -39,7 +39,7 @@ fun DeleteLibraryMangaDialog( onDismissRequest = onDismissRequest, dismissButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, confirmButton = { 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 4fdb7dae6..0756be401 100644 --- a/app/src/main/java/eu/kanade/presentation/components/DropdownMenu.kt +++ b/app/src/main/java/eu/kanade/presentation/components/DropdownMenu.kt @@ -10,9 +10,11 @@ import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.dp import androidx.compose.ui.window.PopupProperties +import eu.kanade.tachiyomi.R import androidx.compose.material3.DropdownMenu as ComposeDropdownMenu @Composable @@ -46,13 +48,13 @@ fun RadioMenuItem( if (isChecked) { Icon( imageVector = Icons.Outlined.RadioButtonChecked, - contentDescription = "", + contentDescription = stringResource(R.string.selected), tint = MaterialTheme.colorScheme.primary, ) } else { Icon( imageVector = Icons.Outlined.RadioButtonUnchecked, - contentDescription = "", + contentDescription = stringResource(R.string.not_selected), ) } }, diff --git a/app/src/main/java/eu/kanade/presentation/components/DuplicateMangaDialog.kt b/app/src/main/java/eu/kanade/presentation/components/DuplicateMangaDialog.kt index a39a378ec..06e6fd9e4 100644 --- a/app/src/main/java/eu/kanade/presentation/components/DuplicateMangaDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/components/DuplicateMangaDialog.kt @@ -30,7 +30,7 @@ fun DuplicateMangaDialog( } Spacer(modifier = Modifier.weight(1f)) TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } TextButton( onClick = { 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 bc864e542..ac75fafa7 100644 --- a/app/src/main/java/eu/kanade/presentation/components/EmptyScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/components/EmptyScreen.kt @@ -11,8 +11,8 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.paddingFromBaseline import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.HelpOutline -import androidx.compose.material.icons.filled.Refresh +import androidx.compose.material.icons.outlined.HelpOutline +import androidx.compose.material.icons.outlined.Refresh import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface @@ -187,12 +187,12 @@ private fun WithActionPreview() { actions = listOf( EmptyScreenAction( stringResId = R.string.action_retry, - icon = Icons.Default.Refresh, + icon = Icons.Outlined.Refresh, onClick = {}, ), EmptyScreenAction( stringResId = R.string.getting_started_guide, - icon = Icons.Default.HelpOutline, + icon = Icons.Outlined.HelpOutline, onClick = {}, ), ), diff --git a/app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt b/app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt index 573e02114..a0ad1281a 100644 --- a/app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt +++ b/app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt @@ -22,13 +22,13 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.ZeroCornerSize import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.BookmarkAdd -import androidx.compose.material.icons.filled.BookmarkRemove -import androidx.compose.material.icons.filled.DoneAll -import androidx.compose.material.icons.filled.RemoveDone +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.Label +import androidx.compose.material.icons.outlined.RemoveDone import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -98,7 +98,7 @@ fun MangaBottomActionMenu( if (onBookmarkClicked != null) { Button( title = stringResource(R.string.action_bookmark), - icon = Icons.Default.BookmarkAdd, + icon = Icons.Outlined.BookmarkAdd, toConfirm = confirm[0], onLongClick = { onLongClickItem(0) }, onClick = onBookmarkClicked, @@ -107,7 +107,7 @@ fun MangaBottomActionMenu( if (onRemoveBookmarkClicked != null) { Button( title = stringResource(R.string.action_remove_bookmark), - icon = Icons.Default.BookmarkRemove, + icon = Icons.Outlined.BookmarkRemove, toConfirm = confirm[1], onLongClick = { onLongClickItem(1) }, onClick = onRemoveBookmarkClicked, @@ -116,7 +116,7 @@ fun MangaBottomActionMenu( if (onMarkAsReadClicked != null) { Button( title = stringResource(R.string.action_mark_as_read), - icon = Icons.Default.DoneAll, + icon = Icons.Outlined.DoneAll, toConfirm = confirm[2], onLongClick = { onLongClickItem(2) }, onClick = onMarkAsReadClicked, @@ -125,7 +125,7 @@ fun MangaBottomActionMenu( if (onMarkAsUnreadClicked != null) { Button( title = stringResource(R.string.action_mark_as_unread), - icon = Icons.Default.RemoveDone, + icon = Icons.Outlined.RemoveDone, toConfirm = confirm[3], onLongClick = { onLongClickItem(3) }, onClick = onMarkAsUnreadClicked, @@ -254,7 +254,7 @@ fun LibraryBottomActionMenu( if (onMarkAsReadClicked != null) { Button( title = stringResource(R.string.action_mark_as_read), - icon = Icons.Default.DoneAll, + icon = Icons.Outlined.DoneAll, toConfirm = confirm[1], onLongClick = { onLongClickItem(1) }, onClick = onMarkAsReadClicked, @@ -263,7 +263,7 @@ fun LibraryBottomActionMenu( if (onMarkAsUnreadClicked != null) { Button( title = stringResource(R.string.action_mark_as_unread), - icon = Icons.Default.RemoveDone, + icon = Icons.Outlined.RemoveDone, toConfirm = confirm[2], onLongClick = { onLongClickItem(2) }, onClick = onMarkAsUnreadClicked, diff --git a/app/src/main/java/eu/kanade/presentation/history/components/HistoryDialog.kt b/app/src/main/java/eu/kanade/presentation/history/components/HistoryDialog.kt index e354f41aa..587151eb4 100644 --- a/app/src/main/java/eu/kanade/presentation/history/components/HistoryDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/history/components/HistoryDialog.kt @@ -67,7 +67,7 @@ fun HistoryDeleteDialog( }, dismissButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, ) @@ -96,7 +96,7 @@ fun HistoryDeleteAllDialog( }, dismissButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, ) diff --git a/app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt b/app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt index c82ae93cd..d182ce8c2 100644 --- a/app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/library/LibraryScreen.kt @@ -2,7 +2,7 @@ package eu.kanade.presentation.library import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.HelpOutline +import androidx.compose.material.icons.outlined.HelpOutline import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier @@ -79,7 +79,7 @@ fun LibraryScreen( actions = listOf( EmptyScreenAction( stringResId = R.string.getting_started_guide, - icon = Icons.Default.HelpOutline, + icon = Icons.Outlined.HelpOutline, onClick = { handler.openUri("https://tachiyomi.org/help/guides/getting-started") }, ), ), 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 e097de7fa..30183dbdb 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 @@ -150,10 +150,10 @@ fun LibrarySelectionToolbar( titleContent = { Text(text = "${state.selection.size}") }, actions = { IconButton(onClick = onClickSelectAll) { - Icon(Icons.Outlined.SelectAll, contentDescription = "search") + Icon(Icons.Outlined.SelectAll, contentDescription = stringResource(R.string.action_select_all)) } IconButton(onClick = onClickInvertSelection) { - Icon(Icons.Outlined.FlipToBack, contentDescription = "invert") + Icon(Icons.Outlined.FlipToBack, contentDescription = stringResource(R.string.action_select_inverse)) } }, isActionMode = true, 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 d2166fee0..2c36a648f 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt @@ -273,7 +273,7 @@ private fun MangaScreenSmallImpl( } Text(text = stringResource(id)) }, - icon = { Icon(imageVector = Icons.Default.PlayArrow, contentDescription = null) }, + icon = { Icon(imageVector = Icons.Filled.PlayArrow, contentDescription = null) }, onClick = onContinueReading, expanded = chapterListState.isScrollingUp() || chapterListState.isScrolledToEnd(), modifier = Modifier @@ -486,7 +486,7 @@ fun MangaScreenLargeImpl( } Text(text = stringResource(id)) }, - icon = { Icon(imageVector = Icons.Default.PlayArrow, contentDescription = null) }, + icon = { Icon(imageVector = Icons.Filled.PlayArrow, contentDescription = null) }, onClick = onContinueReading, expanded = chapterListState.isScrollingUp() || chapterListState.isScrolledToEnd(), modifier = Modifier diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/DownloadCustomChaptersDialog.kt b/app/src/main/java/eu/kanade/presentation/manga/components/DownloadCustomChaptersDialog.kt index 0e46e0580..5b2b5b6cb 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/DownloadCustomChaptersDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/DownloadCustomChaptersDialog.kt @@ -37,7 +37,7 @@ fun DownloadCustomAmountDialog( onDismissRequest = onDismissRequest, dismissButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, confirmButton = { @@ -62,13 +62,13 @@ fun DownloadCustomAmountDialog( onClick = { setAmount(amount - 10) }, enabled = amount > 0, ) { - Icon(imageVector = Icons.Outlined.KeyboardDoubleArrowLeft, contentDescription = "") + Icon(imageVector = Icons.Outlined.KeyboardDoubleArrowLeft, contentDescription = "-10") } IconButton( onClick = { setAmount(amount - 1) }, enabled = amount > 0, ) { - Icon(imageVector = Icons.Outlined.ChevronLeft, contentDescription = "") + Icon(imageVector = Icons.Outlined.ChevronLeft, contentDescription = "-1") } OutlinedTextField( modifier = Modifier.weight(1f), @@ -81,13 +81,13 @@ fun DownloadCustomAmountDialog( onClick = { setAmount(amount + 1) }, enabled = amount < maxAmount, ) { - Icon(imageVector = Icons.Outlined.ChevronRight, contentDescription = "") + Icon(imageVector = Icons.Outlined.ChevronRight, contentDescription = "+1") } IconButton( onClick = { setAmount(amount + 10) }, enabled = amount < maxAmount, ) { - Icon(imageVector = Icons.Outlined.KeyboardDoubleArrowRight, contentDescription = "") + Icon(imageVector = Icons.Outlined.KeyboardDoubleArrowRight, contentDescription = "+10") } } }, 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 d81f740b1..0c491a78f 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 @@ -72,7 +72,7 @@ fun MangaChapterListItem( var textHeight by remember { mutableStateOf(0) } if (bookmark) { Icon( - imageVector = Icons.Default.Bookmark, + imageVector = Icons.Filled.Bookmark, contentDescription = stringResource(R.string.action_filter_bookmarked), modifier = Modifier .sizeIn(maxHeight = with(LocalDensity.current) { textHeight.toDp() - 2.dp }), 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 9900d74bc..b4be71bde 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 @@ -14,7 +14,7 @@ import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.systemBars import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Close +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 @@ -63,7 +63,7 @@ fun MangaCoverDialog( ) { IconButton(onClick = onDismissRequest) { Icon( - imageVector = Icons.Default.Close, + imageVector = Icons.Outlined.Close, contentDescription = stringResource(R.string.action_close), ) } diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaDialogs.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaDialogs.kt index 483fff0c2..31abd353e 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaDialogs.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaDialogs.kt @@ -16,7 +16,7 @@ fun DeleteChaptersDialog( onDismissRequest = onDismissRequest, dismissButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, confirmButton = { 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 d986cb454..df3697527 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 @@ -23,18 +23,18 @@ import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.lazy.items import androidx.compose.foundation.text.selection.SelectionContainer import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.AttachMoney -import androidx.compose.material.icons.filled.Block -import androidx.compose.material.icons.filled.Close -import androidx.compose.material.icons.filled.Done -import androidx.compose.material.icons.filled.DoneAll import androidx.compose.material.icons.filled.Favorite -import androidx.compose.material.icons.filled.FavoriteBorder -import androidx.compose.material.icons.filled.Pause -import androidx.compose.material.icons.filled.Public -import androidx.compose.material.icons.filled.Schedule -import androidx.compose.material.icons.filled.Sync 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.Icon import androidx.compose.material3.LocalContentColor import androidx.compose.material3.LocalMinimumTouchTargetEnforcement @@ -173,7 +173,7 @@ fun MangaActionRow( } else { stringResource(R.string.add_to_library) }, - icon = if (favorite) Icons.Default.Favorite else Icons.Default.FavoriteBorder, + icon = if (favorite) Icons.Filled.Favorite else Icons.Outlined.FavoriteBorder, color = if (favorite) MaterialTheme.colorScheme.primary else defaultActionButtonColor, onClick = onAddToLibraryClicked, onLongClick = onEditCategory, @@ -185,7 +185,7 @@ fun MangaActionRow( } else { pluralStringResource(id = R.plurals.num_trackers, count = trackingCount, trackingCount) }, - icon = if (trackingCount == 0) Icons.Default.Sync else Icons.Default.Done, + icon = if (trackingCount == 0) Icons.Outlined.Sync else Icons.Outlined.Done, color = if (trackingCount == 0) defaultActionButtonColor else MaterialTheme.colorScheme.primary, onClick = onTrackingClicked, ) @@ -193,7 +193,7 @@ fun MangaActionRow( if (onWebViewClicked != null) { MangaActionButton( title = stringResource(R.string.action_web_view), - icon = Icons.Default.Public, + icon = Icons.Outlined.Public, color = defaultActionButtonColor, onClick = onWebViewClicked, ) @@ -345,13 +345,13 @@ private fun MangaAndSourceTitlesLarge( ) { Icon( imageVector = when (status) { - SManga.ONGOING.toLong() -> Icons.Default.Schedule - SManga.COMPLETED.toLong() -> Icons.Default.DoneAll - SManga.LICENSED.toLong() -> Icons.Default.AttachMoney - SManga.PUBLISHING_FINISHED.toLong() -> Icons.Default.Done - SManga.CANCELLED.toLong() -> Icons.Default.Close - SManga.ON_HIATUS.toLong() -> Icons.Default.Pause - else -> Icons.Default.Block + 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 }, contentDescription = null, modifier = Modifier @@ -375,7 +375,7 @@ private fun MangaAndSourceTitlesLarge( DotSeparatorText() if (isStubSource) { Icon( - imageVector = Icons.Default.Warning, + imageVector = Icons.Filled.Warning, contentDescription = null, modifier = Modifier .padding(end = 4.dp) @@ -478,13 +478,13 @@ private fun MangaAndSourceTitlesSmall( ) { Icon( imageVector = when (status) { - SManga.ONGOING.toLong() -> Icons.Default.Schedule - SManga.COMPLETED.toLong() -> Icons.Default.DoneAll - SManga.LICENSED.toLong() -> Icons.Default.AttachMoney - SManga.PUBLISHING_FINISHED.toLong() -> Icons.Default.Done - SManga.CANCELLED.toLong() -> Icons.Default.Close - SManga.ON_HIATUS.toLong() -> Icons.Default.Pause - else -> Icons.Default.Block + 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 }, contentDescription = null, modifier = Modifier @@ -508,7 +508,7 @@ private fun MangaAndSourceTitlesSmall( DotSeparatorText() if (isStubSource) { Icon( - imageVector = Icons.Default.Warning, + imageVector = Icons.Filled.Warning, contentDescription = null, modifier = Modifier .padding(end = 4.dp) 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 47bbd20f6..14c0551f5 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 @@ -5,13 +5,13 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.statusBars import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ArrowBack -import androidx.compose.material.icons.filled.Close -import androidx.compose.material.icons.filled.FlipToBack -import androidx.compose.material.icons.filled.MoreVert -import androidx.compose.material.icons.filled.SelectAll +import androidx.compose.material.icons.outlined.ArrowBack +import androidx.compose.material.icons.outlined.Close 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.MoreVert +import androidx.compose.material.icons.outlined.SelectAll import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -71,7 +71,7 @@ fun MangaToolbar( navigationIcon = { IconButton(onClick = onBackClicked) { Icon( - imageVector = if (isActionMode) Icons.Default.Close else Icons.Default.ArrowBack, + imageVector = if (isActionMode) Icons.Outlined.Close else Icons.Outlined.ArrowBack, contentDescription = stringResource(R.string.abc_action_bar_up_description), ) } @@ -80,13 +80,13 @@ fun MangaToolbar( if (isActionMode) { IconButton(onClick = onSelectAll) { Icon( - imageVector = Icons.Default.SelectAll, + imageVector = Icons.Outlined.SelectAll, contentDescription = stringResource(R.string.action_select_all), ) } IconButton(onClick = onInvertSelection) { Icon( - imageVector = Icons.Default.FlipToBack, + imageVector = Icons.Outlined.FlipToBack, contentDescription = stringResource(R.string.action_select_inverse), ) } @@ -161,7 +161,7 @@ fun MangaToolbar( Box { IconButton(onClick = { onMoreExpanded(!moreExpanded) }) { Icon( - imageVector = Icons.Default.MoreVert, + imageVector = Icons.Outlined.MoreVert, contentDescription = stringResource(R.string.abc_action_menu_overflow_description), ) } diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceScaffold.kt b/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceScaffold.kt index 913b781cf..6fd4c070b 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceScaffold.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceScaffold.kt @@ -3,7 +3,7 @@ package eu.kanade.presentation.more.settings import androidx.annotation.StringRes import androidx.compose.foundation.layout.RowScope import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ArrowBack +import androidx.compose.material.icons.outlined.ArrowBack import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.Text @@ -28,7 +28,7 @@ fun PreferenceScaffold( if (onBackPressed != null) { IconButton(onClick = onBackPressed) { Icon( - imageVector = Icons.Default.ArrowBack, + imageVector = Icons.Outlined.ArrowBack, contentDescription = stringResource(R.string.abc_action_bar_up_description), ) } diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearDatabaseScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearDatabaseScreen.kt index d388d9888..878c18343 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearDatabaseScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearDatabaseScreen.kt @@ -81,7 +81,7 @@ class ClearDatabaseScreen : Screen { }, dismissButton = { TextButton(onClick = model::hideConfirmation) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, text = { diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt index 79e06afd8..ee8725c1b 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt @@ -345,7 +345,7 @@ class SettingsAdvancedScreen : SearchableSettings { text = { Text(text = stringResource(R.string.ext_installer_shizuku_unavailable_dialog)) }, dismissButton = { TextButton(onClick = dismiss) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, confirmButton = { diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt index aed1f0ad4..344720ef8 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt @@ -192,7 +192,7 @@ class SettingsBackupScreen : SearchableSettings { }, dismissButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, confirmButton = { @@ -252,7 +252,7 @@ class SettingsBackupScreen : SearchableSettings { onDismissRequest() }, ) { - Text(text = stringResource(R.string.copy)) + Text(text = stringResource(android.R.string.copy)) } }, confirmButton = { diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt index 5ff503ae7..62d4747e6 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt @@ -326,7 +326,7 @@ class SettingsLibraryScreen : SearchableSettings { }, dismissButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, confirmButton = { 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 599c8cc1b..47f11b91d 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 @@ -8,7 +8,7 @@ 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.filled.ArrowBack +import androidx.compose.material.icons.outlined.ArrowBack import androidx.compose.material.icons.outlined.ChromeReaderMode import androidx.compose.material.icons.outlined.Code import androidx.compose.material.icons.outlined.CollectionsBookmark @@ -98,7 +98,7 @@ object SettingsMainScreen : Screen { navigationIcon = { IconButton(onClick = backPress::invoke) { Icon( - imageVector = Icons.Default.ArrowBack, + imageVector = Icons.Outlined.ArrowBack, contentDescription = stringResource(R.string.abc_action_bar_up_description), ) } 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 3b3fbe33d..9911b368b 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,8 @@ 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.filled.ArrowBack -import androidx.compose.material.icons.filled.Close +import androidx.compose.material.icons.outlined.ArrowBack +import androidx.compose.material.icons.outlined.Close import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme @@ -95,8 +95,8 @@ class SettingsSearchScreen : Screen { if (canPop) { IconButton(onClick = navigator::pop) { Icon( - imageVector = Icons.Default.ArrowBack, - contentDescription = null, + imageVector = Icons.Outlined.ArrowBack, + contentDescription = stringResource(R.string.abc_action_bar_up_description), tint = MaterialTheme.colorScheme.onSurfaceVariant, ) } @@ -131,7 +131,7 @@ class SettingsSearchScreen : Screen { if (textFieldValue.text.isNotEmpty()) { IconButton(onClick = { textFieldValue = TextFieldValue() }) { Icon( - imageVector = Icons.Default.Close, + imageVector = Icons.Outlined.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 a2a6df172..6939777e0 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 @@ -10,10 +10,10 @@ 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.filled.Close -import androidx.compose.material.icons.filled.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.material.icons.outlined.HelpOutline import androidx.compose.material3.AlertDialog import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults @@ -71,7 +71,7 @@ class SettingsTrackingScreen : SearchableSettings { val uriHandler = LocalUriHandler.current IconButton(onClick = { uriHandler.openUri("https://tachiyomi.org/help/guides/tracking/") }) { Icon( - imageVector = Icons.Default.HelpOutline, + imageVector = Icons.Outlined.HelpOutline, contentDescription = stringResource(R.string.tracking_guide), ) } @@ -199,7 +199,7 @@ class SettingsTrackingScreen : SearchableSettings { ) IconButton(onClick = onDismissRequest) { Icon( - imageVector = Icons.Default.Close, + imageVector = Icons.Outlined.Close, contentDescription = stringResource(R.string.action_close), ) } @@ -227,9 +227,9 @@ class SettingsTrackingScreen : SearchableSettings { IconButton(onClick = { hidePassword = !hidePassword }) { Icon( imageVector = if (hidePassword) { - Icons.Default.Visibility + Icons.Filled.Visibility } else { - Icons.Default.VisibilityOff + Icons.Filled.VisibilityOff }, contentDescription = null, ) @@ -317,7 +317,7 @@ class SettingsTrackingScreen : SearchableSettings { modifier = Modifier.weight(1f), onClick = onDismissRequest, ) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } Button( modifier = Modifier.weight(1f), 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 d1520c7e4..c6de0330b 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 @@ -45,6 +45,7 @@ import eu.kanade.presentation.components.DIVIDER_ALPHA import eu.kanade.presentation.components.MangaCover import eu.kanade.presentation.theme.TachiyomiTheme import eu.kanade.presentation.util.secondaryItemAlpha +import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.system.DeviceUtil import eu.kanade.tachiyomi.util.system.isDynamicColorAvailable @@ -168,8 +169,8 @@ fun AppThemePreviewItem( ) { if (selected) { Icon( - imageVector = Icons.Default.CheckCircle, - contentDescription = null, + imageVector = Icons.Filled.CheckCircle, + contentDescription = stringResource(R.string.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 f867dea71..e7f4e5f78 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 @@ -17,6 +17,7 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.window.DialogProperties +import eu.kanade.tachiyomi.R import kotlinx.coroutines.launch @Composable @@ -71,7 +72,7 @@ fun EditTextPreferenceWidget( }, dismissButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, ) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/ListPreferenceWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/ListPreferenceWidget.kt index 8c13cfb20..ad16c748d 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/ListPreferenceWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/ListPreferenceWidget.kt @@ -25,6 +25,7 @@ import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.util.isScrolledToEnd import eu.kanade.presentation.util.isScrolledToStart import eu.kanade.presentation.util.minimumTouchTargetSize +import eu.kanade.tachiyomi.R @Composable fun ListPreferenceWidget( @@ -72,7 +73,7 @@ fun ListPreferenceWidget( }, confirmButton = { TextButton(onClick = { showDialog(false) }) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, ) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/MultiSelectListPreferenceWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/MultiSelectListPreferenceWidget.kt index 6aab4fd7c..963e7ef79 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/MultiSelectListPreferenceWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/MultiSelectListPreferenceWidget.kt @@ -22,6 +22,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties import eu.kanade.presentation.more.settings.Preference import eu.kanade.presentation.util.minimumTouchTargetSize +import eu.kanade.tachiyomi.R @Composable fun MultiSelectListPreferenceWidget( @@ -98,7 +99,7 @@ fun MultiSelectListPreferenceWidget( }, dismissButton = { TextButton(onClick = { showDialog(false) }) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, ) 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 da6b59189..83ed78d0d 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 @@ -44,7 +44,7 @@ private fun SwitchPreferenceWidgetPreview() { SwitchPreferenceWidget( title = "Text preference with icon", subtitle = "Text preference summary", - icon = Icons.Default.Preview, + icon = Icons.Filled.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 27e2a9851..aecf43181 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 @@ -67,7 +67,7 @@ private fun TextPreferenceWidgetPreview() { TextPreferenceWidget( title = "Text preference with icon", subtitle = "Text preference summary", - icon = Icons.Default.Preview, + icon = Icons.Filled.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 33c873c77..7dc1d1a28 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 @@ -11,7 +11,7 @@ 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.filled.Check +import androidx.compose.material.icons.outlined.Done import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -20,8 +20,10 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import eu.kanade.presentation.more.settings.LocalPreferenceHighlighted +import eu.kanade.tachiyomi.R @Composable fun TrackingPreferenceWidget( @@ -64,12 +66,12 @@ fun TrackingPreferenceWidget( ) if (checked) { Icon( - imageVector = Icons.Default.Check, + imageVector = Icons.Outlined.Done, modifier = Modifier .padding(4.dp) .size(32.dp), tint = Color(0xFF4CAF50), - contentDescription = null, + contentDescription = stringResource(R.string.login_success), ) } } 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 852efb375..7f3a2c8a6 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 @@ -102,7 +102,13 @@ fun TriStateListDialog( } else { MaterialTheme.colorScheme.primary }, - contentDescription = null, + contentDescription = stringResource( + when (state) { + State.UNCHECKED -> R.string.not_selected + State.CHECKED -> R.string.selected + State.INVERSED -> R.string.disabled + }, + ), ) Text(text = itemLabel(item)) } @@ -116,7 +122,7 @@ fun TriStateListDialog( }, dismissButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, confirmButton = { diff --git a/app/src/main/java/eu/kanade/presentation/updates/UpdatesDialog.kt b/app/src/main/java/eu/kanade/presentation/updates/UpdatesDialog.kt index a25d31a1f..4a9f4d862 100644 --- a/app/src/main/java/eu/kanade/presentation/updates/UpdatesDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/updates/UpdatesDialog.kt @@ -27,7 +27,7 @@ fun UpdatesDeleteConfirmationDialog( }, dismissButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, ) 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 2a9435693..1560ca44d 100644 --- a/app/src/main/java/eu/kanade/presentation/updates/UpdatesScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/updates/UpdatesScreen.kt @@ -8,9 +8,9 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.FlipToBack -import androidx.compose.material.icons.filled.Refresh -import androidx.compose.material.icons.filled.SelectAll +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.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.TopAppBarScrollBehavior @@ -215,7 +215,7 @@ private fun UpdatesAppBar( actions = { IconButton(onClick = onUpdateLibrary) { Icon( - imageVector = Icons.Default.Refresh, + imageVector = Icons.Outlined.Refresh, contentDescription = stringResource(R.string.action_update_library), ) } @@ -225,13 +225,13 @@ private fun UpdatesAppBar( actionModeActions = { IconButton(onClick = onSelectAll) { Icon( - imageVector = Icons.Default.SelectAll, + imageVector = Icons.Outlined.SelectAll, contentDescription = stringResource(R.string.action_select_all), ) } IconButton(onClick = onInvertSelection) { Icon( - imageVector = Icons.Default.FlipToBack, + imageVector = Icons.Outlined.FlipToBack, contentDescription = stringResource(R.string.action_select_inverse), ) } 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 277881d75..d67f73719 100644 --- a/app/src/main/java/eu/kanade/presentation/updates/UpdatesUiItem.kt +++ b/app/src/main/java/eu/kanade/presentation/updates/UpdatesUiItem.kt @@ -205,7 +205,7 @@ fun UpdatesUiItem( var textHeight by remember { mutableStateOf(0) } if (bookmark) { Icon( - imageVector = Icons.Default.Bookmark, + imageVector = Icons.Filled.Bookmark, contentDescription = stringResource(R.string.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/WebViewScreen.kt b/app/src/main/java/eu/kanade/presentation/webview/WebViewScreen.kt index 5569440cd..13c9ab075 100644 --- a/app/src/main/java/eu/kanade/presentation/webview/WebViewScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/webview/WebViewScreen.kt @@ -7,9 +7,9 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ArrowBack -import androidx.compose.material.icons.filled.ArrowForward -import androidx.compose.material.icons.filled.Close +import androidx.compose.material.icons.outlined.ArrowBack +import androidx.compose.material.icons.outlined.ArrowForward +import androidx.compose.material.icons.outlined.Close import androidx.compose.material3.LinearProgressIndicator import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -48,13 +48,13 @@ fun WebViewScreen( title = state.pageTitle ?: initialTitle, subtitle = state.content.getCurrentUrl(), navigateUp = onNavigateUp, - navigationIcon = Icons.Default.Close, + navigationIcon = Icons.Outlined.Close, actions = { AppBarActions( listOf( AppBar.Action( title = stringResource(R.string.action_webview_back), - icon = Icons.Default.ArrowBack, + icon = Icons.Outlined.ArrowBack, onClick = { if (navigator.canGoBack) { navigator.navigateBack() @@ -64,7 +64,7 @@ fun WebViewScreen( ), AppBar.Action( title = stringResource(R.string.action_webview_forward), - icon = Icons.Default.ArrowForward, + icon = Icons.Outlined.ArrowForward, onClick = { if (navigator.canGoForward) { navigator.navigateForward() diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt index c701ea9bf..19ecfb287 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateNotifier.kt @@ -59,7 +59,7 @@ class LibraryUpdateNotifier(private val context: Context) { setLargeIcon(notificationBitmap) setOngoing(true) setOnlyAlertOnce(true) - addAction(R.drawable.ic_close_24dp, context.getString(android.R.string.cancel), cancelIntent) + addAction(R.drawable.ic_close_24dp, context.getString(R.string.action_cancel), cancelIntent) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadController.kt index 832a6ef02..e30cf52c7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadController.kt @@ -13,9 +13,9 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Pause import androidx.compose.material.icons.filled.PlayArrow import androidx.compose.material.icons.outlined.MoreVert +import androidx.compose.material.icons.outlined.Pause import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -152,7 +152,7 @@ class DownloadController : IconButton(onClick = { onExpanded(!expanded) }) { Icon( imageVector = Icons.Outlined.MoreVert, - contentDescription = stringResource(R.string.label_more), + contentDescription = stringResource(R.string.abc_action_menu_overflow_description), ) } CascadeDropdownMenu( @@ -234,9 +234,9 @@ class DownloadController : }, icon = { val icon = if (isRunning) { - Icons.Default.Pause + Icons.Outlined.Pause } else { - Icons.Default.PlayArrow + Icons.Filled.PlayArrow } Icon(imageVector = icon, contentDescription = null) }, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/SetChapterSettingsDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/SetChapterSettingsDialog.kt index 516c6389a..ea89782f0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/SetChapterSettingsDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/SetChapterSettingsDialog.kt @@ -48,7 +48,7 @@ class SetChapterSettingsDialog(bundle: Bundle? = null) : DialogController(bundle activity?.toast(R.string.chapter_settings_updated) } - .setNegativeButton(android.R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .create() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackChaptersDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackChaptersDialog.kt index bb21d7906..5f3938546 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackChaptersDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackChaptersDialog.kt @@ -59,7 +59,7 @@ class SetTrackChaptersDialog : DialogController np.clearFocus() listener.setChaptersRead(item, np.value) } - .setNegativeButton(android.R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .create() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackScoreDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackScoreDialog.kt index 341c2befa..0e867724a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackScoreDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackScoreDialog.kt @@ -59,7 +59,7 @@ class SetTrackScoreDialog : DialogController np.clearFocus() listener.setScore(item, np.value) } - .setNegativeButton(android.R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .create() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackStatusDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackStatusDialog.kt index 3bc439fc6..b4832e8a6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackStatusDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackStatusDialog.kt @@ -48,7 +48,7 @@ class SetTrackStatusDialog : DialogController .setPositiveButton(android.R.string.ok) { _, _ -> listener.setStatus(item, selectedIndex) } - .setNegativeButton(android.R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .create() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt index 1c83f7279..5e8aee63b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt @@ -40,7 +40,7 @@ class ReaderPageSheet( .setPositiveButton(android.R.string.ok) { _, _ -> activity.setAsCover(page) } - .setNegativeButton(android.R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } diff --git a/app/src/main/res/layout/global_search_controller_card.xml b/app/src/main/res/layout/global_search_controller_card.xml index d0e981038..0d35b90db 100644 --- a/app/src/main/res/layout/global_search_controller_card.xml +++ b/app/src/main/res/layout/global_search_controller_card.xml @@ -46,7 +46,7 @@ android:id="@+id/title_more_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:contentDescription="@string/label_more" + android:contentDescription="@string/all" android:padding="16dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/track_item.xml b/app/src/main/res/layout/track_item.xml index 845a5eb93..df6e482d3 100644 --- a/app/src/main/res/layout/track_item.xml +++ b/app/src/main/res/layout/track_item.xml @@ -68,7 +68,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:background="?selectableItemBackgroundBorderless" - android:contentDescription="@string/label_more" + android:contentDescription="@string/abc_action_menu_overflow_description" android:padding="8dp" android:src="@drawable/ic_more_vert_24" />