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 a93c64448..f590f2810 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt @@ -437,7 +437,7 @@ private fun NsfwWarningDialog( }, confirmButton = { TextButton(onClick = onClickConfirm) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, onDismissRequest = onClickConfirm, diff --git a/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt index 7c988747d..147b766a4 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt @@ -169,7 +169,7 @@ fun FeedAddDialog( onDismissRequest = onDismiss, confirmButton = { TextButton(onClick = { onClickAdd(selected?.let { sources[it] }) }) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, ) @@ -205,7 +205,7 @@ fun FeedAddSearchDialog( onDismissRequest = onDismiss, confirmButton = { TextButton(onClick = { onClickAdd(source, selected?.let { savedSearches[it] }) }) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, ) 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 12426ce72..7c5a670ed 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt @@ -302,7 +302,7 @@ fun SourceCategoriesDialog( onDismissRequest = onDismissRequest, confirmButton = { TextButton(onClick = { onClickCategories(newCategories.toList()) }) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, ) 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 235d7a534..c0821e572 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 @@ -71,7 +71,7 @@ fun SavedSearchDeleteDialog( onDismissRequest() }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, title = { @@ -122,7 +122,7 @@ fun SavedSearchCreateDialog( } }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { 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 bc38db240..715beb56b 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 @@ -132,7 +132,7 @@ fun CategoryRenameDialog( onDismissRequest() }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { @@ -185,7 +185,7 @@ fun CategoryDeleteDialog( onDelete() onDismissRequest() },) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { @@ -255,7 +255,7 @@ fun ChangeCategoryDialog( ) }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } } }, diff --git a/app/src/main/java/eu/kanade/presentation/history/components/HistoryDialogs.kt b/app/src/main/java/eu/kanade/presentation/history/components/HistoryDialogs.kt index 587151eb4..55cd0aac4 100644 --- a/app/src/main/java/eu/kanade/presentation/history/components/HistoryDialogs.kt +++ b/app/src/main/java/eu/kanade/presentation/history/components/HistoryDialogs.kt @@ -91,7 +91,7 @@ fun HistoryDeleteAllDialog( onDelete() onDismissRequest() },) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { diff --git a/app/src/main/java/eu/kanade/presentation/library/DeleteLibraryMangaDialog.kt b/app/src/main/java/eu/kanade/presentation/library/DeleteLibraryMangaDialog.kt index beb231baf..1f6317a97 100644 --- a/app/src/main/java/eu/kanade/presentation/library/DeleteLibraryMangaDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/library/DeleteLibraryMangaDialog.kt @@ -53,7 +53,7 @@ fun DeleteLibraryMangaDialog( ) }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, 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 6329a5ab7..c18d50010 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 @@ -17,7 +17,7 @@ fun SyncFavoritesConfirmDialog( onDismissRequest = onDismissRequest, confirmButton = { TextButton(onClick = onAccept) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { diff --git a/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesProgressDialog.kt b/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesProgressDialog.kt index f9cb20695..dc0a2b876 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesProgressDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesProgressDialog.kt @@ -46,21 +46,21 @@ fun SyncFavoritesProgressDialog( openManga(status.manga) setStatusIdle() }, - negativeButtonText = context.getString(android.R.string.ok), + negativeButtonText = context.getString(R.string.action_ok), negativeButton = setStatusIdle, ) is FavoritesSyncStatus.CompleteWithErrors -> value = SyncFavoritesProgressProperties( title = context.getString(R.string.favorites_sync_done_errors), text = context.getString(R.string.favorites_sync_done_errors_message, status.message), canDismiss = false, - positiveButtonText = context.getString(android.R.string.ok), + positiveButtonText = context.getString(R.string.action_ok), positiveButton = setStatusIdle, ) is FavoritesSyncStatus.Error -> value = SyncFavoritesProgressProperties( title = context.getString(R.string.favorites_sync_error), text = context.getString(R.string.favorites_sync_error_string, status.message), canDismiss = false, - positiveButtonText = context.getString(android.R.string.ok), + positiveButtonText = context.getString(R.string.action_ok), positiveButton = setStatusIdle, ) is FavoritesSyncStatus.Idle -> value = null diff --git a/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesWarningDialog.kt b/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesWarningDialog.kt index c72af24d1..095e484d1 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesWarningDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/SyncFavoritesWarningDialog.kt @@ -29,7 +29,7 @@ fun SyncFavoritesWarningDialog( onDismissRequest = onDismissRequest, confirmButton = { TextButton(onClick = onAccept) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, 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 cd1387e2f..589f4def9 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/ChapterSettingsDialog.kt @@ -252,7 +252,7 @@ private fun SetAsDefaultDialog( onDismissRequest() }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, ) 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 a1cd8f1a0..076ef4314 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 @@ -41,7 +41,7 @@ fun DeleteChaptersDialog( onConfirm() }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, title = { @@ -113,7 +113,7 @@ fun SelectScanlatorsDialog( onDismissRequest() }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { 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 9015a57b7..7b1b7d856 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 @@ -92,7 +92,7 @@ class ClearDatabaseScreen : Screen() { } }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/ConfigureExhDialog.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/ConfigureExhDialog.kt index 867b0fad3..0d8cf76ae 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/ConfigureExhDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/ConfigureExhDialog.kt @@ -61,7 +61,7 @@ fun ConfigureExhDialog(run: Boolean, onRunning: () -> Unit) { warnDialogOpen = false }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, title = { @@ -110,7 +110,7 @@ fun ConfigureExhDialog(run: Boolean, onRunning: () -> Unit) { onDismissRequest = { configureFailedDialogOpen = null }, confirmButton = { TextButton(onClick = { configureFailedDialogOpen = null }) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, title = { 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 4262fb916..64d8c2555 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 @@ -449,7 +449,7 @@ object SettingsAdvancedScreen : SearchableSettings { uriHandler.openUri("https://shizuku.rikka.app/download") }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, ) @@ -533,7 +533,7 @@ object SettingsAdvancedScreen : SearchableSettings { onCleanupDownloads(removeRead, removeNonFavorite) }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { @@ -777,7 +777,7 @@ object SettingsAdvancedScreen : SearchableSettings { securityPreferences.encryptDatabase().set(true) }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, ) 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 a838c06c8..3f75bdb02 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 @@ -200,7 +200,7 @@ object SettingsBackupScreen : SearchableSettings { onConfirm(flag) }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, ) @@ -253,7 +253,7 @@ object SettingsBackupScreen : SearchableSettings { }, confirmButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, ) 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 2c962123d..f98d168b9 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 @@ -304,7 +304,7 @@ object SettingsEhScreen : SearchableSettings { onClick = { onValueChange(value.toIntOrNull() ?: return@TextButton) }, enabled = isValid, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { @@ -589,7 +589,7 @@ object SettingsEhScreen : SearchableSettings { }, confirmButton = { TextButton(onClick = { onValueChange(state.toPreference()) }) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { @@ -755,7 +755,7 @@ object SettingsEhScreen : SearchableSettings { }, confirmButton = { TextButton(onClick = { onValueChange(state.toPreference()) }) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { @@ -885,7 +885,7 @@ object SettingsEhScreen : SearchableSettings { }, confirmButton = { TextButton(onClick = onStartReset) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { @@ -1033,7 +1033,7 @@ object SettingsEhScreen : SearchableSettings { }, confirmButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, ) 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 8ba4d1b2b..22214ee8e 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 @@ -394,7 +394,7 @@ object SettingsLibraryScreen : SearchableSettings { }, confirmButton = { TextButton(onClick = { onValueChanged(leadValue, followValue) }) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, ) 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 615a1f9ae..124b39986 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 @@ -204,7 +204,7 @@ object SettingsMangadexScreen : SearchableSettings { }, confirmButton = { TextButton(onClick = { onSelectionConfirmed(items.filterIndexed { index, _ -> selection[index] }) }) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { 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 11014f7e2..8292aa580 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 @@ -269,7 +269,7 @@ object SettingsSecurityScreen : SearchableSettings { ) }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { @@ -344,7 +344,7 @@ object SettingsSecurityScreen : SearchableSettings { onReturnPassword(password) }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { 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 6191206ec..d5cb689ad 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 @@ -83,7 +83,7 @@ fun EditTextPreferenceWidget( } }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { 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 98b3d7f99..74ed60e01 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 @@ -96,7 +96,7 @@ fun MultiSelectListPreferenceWidget( isDialogShown = false }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { 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 5c810f9e8..6983e206f 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 @@ -137,7 +137,7 @@ fun TriStateListDialog( onValueChanged(included, excluded) }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, ) 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 53c985a6c..ba2322ad8 100644 --- a/app/src/main/java/eu/kanade/presentation/track/TrackInfoDialogSelector.kt +++ b/app/src/main/java/eu/kanade/presentation/track/TrackInfoDialogSelector.kt @@ -174,7 +174,7 @@ fun TrackDateSelector( Text(text = stringResource(android.R.string.cancel)) } TextButton(onClick = { onConfirm(pickerState.selectedDateMillis!!) }) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } } } @@ -212,7 +212,7 @@ private fun BaseSelector( Text(text = stringResource(android.R.string.cancel)) } TextButton(onClick = onConfirm) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } } }, 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 4a9f4d862..45e28127e 100644 --- a/app/src/main/java/eu/kanade/presentation/updates/UpdatesDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/updates/UpdatesDialog.kt @@ -22,7 +22,7 @@ fun UpdatesDeleteConfirmationDialog( onConfirm() onDismissRequest() },) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { diff --git a/app/src/main/java/eu/kanade/presentation/webview/components/IgneousDialog.kt b/app/src/main/java/eu/kanade/presentation/webview/components/IgneousDialog.kt index 881054ae8..eea66e168 100644 --- a/app/src/main/java/eu/kanade/presentation/webview/components/IgneousDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/webview/components/IgneousDialog.kt @@ -49,7 +49,7 @@ fun IgneousDialog( onDismissRequest() }, ) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, dismissButton = { 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 be51aa48e..0e7a6094f 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 @@ -237,7 +237,7 @@ private fun ChipGroup.setChips(items: List, scope: CoroutineScope) { .setTextInput { newTag = it.trimOrNull() } - .setPositiveButton(android.R.string.ok) { _, _ -> + .setPositiveButton(R.string.action_ok) { _, _ -> if (newTag != null) setChips(items + listOfNotNull(newTag), scope) } .setNegativeButton(android.R.string.cancel, null) 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 0bc60f41f..89dfd7476 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 @@ -87,7 +87,7 @@ class EditMergedSettingsState( MaterialAlertDialogBuilder(context) .setTitle(R.string.delete_merged_entry) .setMessage(R.string.delete_merged_entry_desc) - .setPositiveButton(android.R.string.ok) { _, _ -> + .setPositiveButton(R.string.action_ok) { _, _ -> onDeleteClick(mergeMangaReference) onDismissRequest() } @@ -99,7 +99,7 @@ class EditMergedSettingsState( MaterialAlertDialogBuilder(context) .setTitle(R.string.chapter_updates_merged_entry) .setMessage(R.string.chapter_updates_merged_entry_desc) - .setPositiveButton(android.R.string.ok) { _, _ -> + .setPositiveButton(R.string.action_ok) { _, _ -> toggleChapterUpdates(position) } .setNegativeButton(android.R.string.cancel, null) @@ -127,7 +127,7 @@ class EditMergedSettingsState( MaterialAlertDialogBuilder(context) .setTitle(R.string.download_merged_entry) .setMessage(R.string.download_merged_entry_desc) - .setPositiveButton(android.R.string.ok) { _, _ -> + .setPositiveButton(R.string.action_ok) { _, _ -> toggleChapterDownloads(position) } .setNegativeButton(android.R.string.cancel, null) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt index 02d107a65..afd5d00e6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt @@ -832,7 +832,7 @@ class ReaderActivity : BaseActivity() { MaterialAlertDialogBuilder(this) .setTitle(R.string.eh_autoscroll_help) .setMessage(R.string.eh_autoscroll_help_message) - .setPositiveButton(android.R.string.ok, null) + .setPositiveButton(R.string.action_ok, null) .show() } @@ -882,7 +882,7 @@ class ReaderActivity : BaseActivity() { MaterialAlertDialogBuilder(this) .setTitle(R.string.eh_retry_all_help) .setMessage(R.string.eh_retry_all_help_message) - .setPositiveButton(android.R.string.ok, null) + .setPositiveButton(R.string.action_ok, null) .show() } @@ -914,7 +914,7 @@ class ReaderActivity : BaseActivity() { MaterialAlertDialogBuilder(this) .setTitle(R.string.eh_boost_page_help) .setMessage(R.string.eh_boost_page_help_message) - .setPositiveButton(android.R.string.ok, null) + .setPositiveButton(R.string.action_ok, null) .show() } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageDialog.kt index 82009642b..42636c1d3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageDialog.kt @@ -185,7 +185,7 @@ private fun SetCoverDialog( }, confirmButton = { TextButton(onClick = onConfirm) { - Text(stringResource(android.R.string.ok)) + Text(stringResource(R.string.action_ok)) } }, dismissButton = { diff --git a/app/src/main/java/exh/pagepreview/components/PagePreviewScreen.kt b/app/src/main/java/exh/pagepreview/components/PagePreviewScreen.kt index ddc5b3d37..1483f0a6d 100644 --- a/app/src/main/java/exh/pagepreview/components/PagePreviewScreen.kt +++ b/app/src/main/java/exh/pagepreview/components/PagePreviewScreen.kt @@ -136,7 +136,7 @@ fun PagePreviewPageDialog( onPageSelected(page.roundToInt()) onDismissPageDialog() },) { - Text(stringResource(android.R.string.ok)) + Text(stringResource(R.string.action_ok)) } }, dismissButton = { diff --git a/app/src/main/java/exh/ui/batchadd/BatchAddScreen.kt b/app/src/main/java/exh/ui/batchadd/BatchAddScreen.kt index 743113ff8..8d173593a 100644 --- a/app/src/main/java/exh/ui/batchadd/BatchAddScreen.kt +++ b/app/src/main/java/exh/ui/batchadd/BatchAddScreen.kt @@ -157,7 +157,7 @@ class BatchAddScreen : Screen() { onDismissRequest = onDismissRequest, confirmButton = { TextButton(onClick = onDismissRequest) { - Text(text = stringResource(android.R.string.ok)) + Text(text = stringResource(R.string.action_ok)) } }, title = { diff --git a/app/src/main/java/exh/ui/intercept/InterceptActivity.kt b/app/src/main/java/exh/ui/intercept/InterceptActivity.kt index 71865d7d5..4f06165ce 100755 --- a/app/src/main/java/exh/ui/intercept/InterceptActivity.kt +++ b/app/src/main/java/exh/ui/intercept/InterceptActivity.kt @@ -122,7 +122,7 @@ class InterceptActivity : BaseActivity() { MaterialAlertDialogBuilder(this) .setTitle(R.string.chapter_error) .setMessage(getString(R.string.could_not_open_entry, it.reason)) - .setPositiveButton(android.R.string.ok, null) + .setPositiveButton(R.string.action_ok, null) .setOnCancelListener { onBackPressed() } .setOnDismissListener { onBackPressed() } .show()