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 c0821e572..7e5f4e7ba 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 @@ -61,7 +61,7 @@ fun SavedSearchDeleteDialog( onDismissRequest = onDismissRequest, confirmButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, dismissButton = { diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationExitDialog.kt b/app/src/main/java/eu/kanade/presentation/browse/components/MigrationExitDialog.kt index 4a1898953..832c15271 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationExitDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/MigrationExitDialog.kt @@ -21,7 +21,7 @@ fun MigrationExitDialog( }, 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/browse/components/MigrationMangaDialog.kt b/app/src/main/java/eu/kanade/presentation/browse/components/MigrationMangaDialog.kt index de6836e96..0bb4c4caf 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationMangaDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/MigrationMangaDialog.kt @@ -34,7 +34,7 @@ fun MigrationMangaDialog( }, dismissButton = { TextButton(onClick = onDismissRequest) { - 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/browse/components/SourceFeedDialogs.kt b/app/src/main/java/eu/kanade/presentation/browse/components/SourceFeedDialogs.kt index 3ed5803df..505c3e98f 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/SourceFeedDialogs.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/SourceFeedDialogs.kt @@ -22,7 +22,7 @@ fun SourceFeedAddDialog( }, dismissButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, title = { @@ -48,7 +48,7 @@ fun SourceFeedDeleteDialog( }, 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/library/components/SyncFavoritesConfirmDialog.kt b/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesConfirmDialog.kt index c18d50010..428485221 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesConfirmDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesConfirmDialog.kt @@ -22,7 +22,7 @@ fun SyncFavoritesConfirmDialog( }, 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/manga/ChapterSettingsDialog.kt b/app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt index 7d1545e5e..e68ca961f 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt @@ -242,7 +242,7 @@ private fun SetAsDefaultDialog( }, 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/SettingsAdvancedScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt index a82428b41..ac55e61ce 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 @@ -542,7 +542,7 @@ object SettingsAdvancedScreen : SearchableSettings { }, 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/screen/SettingsBackupScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt index 455a48d4e..45998e516 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 @@ -250,7 +250,7 @@ object SettingsBackupScreen : SearchableSettings { onDismissRequest() }, ) { - Text(text = stringResource(android.R.string.copy)) + Text(text = stringResource(R.string.action_copy_to_clipboard)) } }, confirmButton = { diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsEhScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsEhScreen.kt index a777ec55a..6e57073c8 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsEhScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsEhScreen.kt @@ -308,7 +308,7 @@ object SettingsEhScreen : SearchableSettings { }, dismissButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, title = { @@ -593,7 +593,7 @@ object SettingsEhScreen : SearchableSettings { }, dismissButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, ) @@ -759,7 +759,7 @@ object SettingsEhScreen : SearchableSettings { }, dismissButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, ) @@ -889,7 +889,7 @@ object SettingsEhScreen : SearchableSettings { }, dismissButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, properties = DialogProperties( diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMangadexScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMangadexScreen.kt index 1a75e1e05..42439f477 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMangadexScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMangadexScreen.kt @@ -93,7 +93,7 @@ object SettingsMangadexScreen : SearchableSettings { }, dismissButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, ) @@ -238,7 +238,7 @@ object SettingsMangadexScreen : SearchableSettings { }, 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/screen/SettingsSecurityScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt index b37eb7817..28ae59c8a 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSecurityScreen.kt @@ -274,7 +274,7 @@ object SettingsSecurityScreen : SearchableSettings { }, dismissButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } }, ) @@ -349,7 +349,7 @@ object SettingsSecurityScreen : SearchableSettings { }, 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/screen/about/WhatsNewDialog.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/about/WhatsNewDialog.kt index ec1fbca67..c1de511a6 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/about/WhatsNewDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/about/WhatsNewDialog.kt @@ -39,7 +39,7 @@ fun WhatsNewDialog(onDismissRequest: () -> Unit) { onDismissRequest = onDismissRequest, confirmButton = { 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/track/TrackInfoDialogSelector.kt b/app/src/main/java/eu/kanade/presentation/track/TrackInfoDialogSelector.kt index a13112e5e..42ff82007 100644 --- a/app/src/main/java/eu/kanade/presentation/track/TrackInfoDialogSelector.kt +++ b/app/src/main/java/eu/kanade/presentation/track/TrackInfoDialogSelector.kt @@ -171,7 +171,7 @@ fun TrackDateSelector( Spacer(modifier = Modifier.weight(1f)) } TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } TextButton(onClick = { onConfirm(pickerState.selectedDateMillis!!) }) { Text(text = stringResource(R.string.action_ok)) @@ -209,7 +209,7 @@ private fun BaseSelector( Spacer(modifier = Modifier.weight(1f)) } TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } TextButton(onClick = onConfirm) { Text(text = stringResource(R.string.action_ok)) diff --git a/app/src/main/java/eu/kanade/presentation/webview/EhLoginWebViewScreen.kt b/app/src/main/java/eu/kanade/presentation/webview/EhLoginWebViewScreen.kt index 82cc9ae94..aa082865d 100644 --- a/app/src/main/java/eu/kanade/presentation/webview/EhLoginWebViewScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/webview/EhLoginWebViewScreen.kt @@ -139,7 +139,7 @@ fun EhLoginWebViewScreen( horizontalArrangement = Arrangement.SpaceBetween, ) { Button(onClick = onUp, Modifier.weight(0.5F)) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } Button(onClick = { showAdvancedOptions = true }, Modifier.weight(0.5F)) { Text(text = stringResource(R.string.pref_category_advanced)) @@ -194,7 +194,7 @@ fun EhLoginWebViewScreen( Text(text = stringResource(R.string.custom_igneous_cookie)) } Button(onClick = { showAdvancedOptions = false }, Modifier.fillMaxWidth()) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt index a0a3d9698..ca6930bd6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt @@ -88,7 +88,7 @@ fun EditMangaDialog( }, dismissButton = { TextButton(onClick = onDismissRequest) { - Text(stringResource(android.R.string.cancel)) + Text(stringResource(R.string.action_cancel)) } }, text = { @@ -240,7 +240,7 @@ private fun ChipGroup.setChips(items: List, scope: CoroutineScope) { .setPositiveButton(R.string.action_ok) { _, _ -> if (newTag != null) setChips(items + listOfNotNull(newTag), scope) } - .setNegativeButton(android.R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt index 11e91424a..9bdcdd7c2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt @@ -451,7 +451,7 @@ class MangaScreen( dialog.dismiss() openMangaInWebView(navigator, mergedManga[index], sources[index] as? HttpSource) } - .setNegativeButton(android.R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt index 89dfd7476..54ee4e557 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt @@ -91,7 +91,7 @@ class EditMergedSettingsState( onDeleteClick(mergeMangaReference) onDismissRequest() } - .setNegativeButton(android.R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } @@ -102,7 +102,7 @@ class EditMergedSettingsState( .setPositiveButton(R.string.action_ok) { _, _ -> toggleChapterUpdates(position) } - .setNegativeButton(android.R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } @@ -130,7 +130,7 @@ class EditMergedSettingsState( .setPositiveButton(R.string.action_ok) { _, _ -> toggleChapterDownloads(position) } - .setNegativeButton(android.R.string.cancel, null) + .setNegativeButton(R.string.action_cancel, null) .show() } @@ -177,7 +177,7 @@ fun EditMergedSettingsDialog( }, dismissButton = { TextButton(onClick = onDismissRequest) { - Text(stringResource(android.R.string.cancel)) + Text(stringResource(R.string.action_cancel)) } }, text = { 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 f25dab5c8..6c811b7ad 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 @@ -593,7 +593,7 @@ private data class TrackDateRemoverScreen( horizontalArrangement = Arrangement.spacedBy(MaterialTheme.padding.small, Alignment.End), ) { TextButton(onClick = navigator::pop) { - Text(text = stringResource(android.R.string.cancel)) + Text(text = stringResource(R.string.action_cancel)) } FilledTonalButton( onClick = { diff --git a/app/src/main/java/exh/pagepreview/components/PagePreviewScreen.kt b/app/src/main/java/exh/pagepreview/components/PagePreviewScreen.kt index 1a77b36a1..17f9d1a1e 100644 --- a/app/src/main/java/exh/pagepreview/components/PagePreviewScreen.kt +++ b/app/src/main/java/exh/pagepreview/components/PagePreviewScreen.kt @@ -141,7 +141,7 @@ fun PagePreviewPageDialog( }, dismissButton = { TextButton(onClick = onDismissPageDialog) { - Text(stringResource(android.R.string.cancel)) + Text(stringResource(R.string.action_cancel)) } }, title = {