From b06f1c81bc885b89e9a14e87b4f73182f519d168 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 22 Feb 2020 12:38:06 -0500 Subject: [PATCH] Remove usages of incorrect platform yes/no strings --- .../tachiyomi/ui/library/DeleteLibraryMangasDialog.kt | 4 ++-- .../kanade/tachiyomi/ui/main/ChangelogDialogController.kt | 2 +- .../tachiyomi/ui/manga/chapter/DeleteChaptersDialog.kt | 6 +++--- .../java/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt | 4 ++-- .../ui/recent_updates/ConfirmDeleteChaptersDialog.kt | 6 +++--- .../tachiyomi/ui/setting/SettingsAdvancedController.kt | 4 ++-- .../kanade/tachiyomi/ui/setting/SettingsBackupController.kt | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/DeleteLibraryMangasDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/DeleteLibraryMangasDialog.kt index cbd48d134d..1eeb1f13d1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/DeleteLibraryMangasDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/DeleteLibraryMangasDialog.kt @@ -28,8 +28,8 @@ class DeleteLibraryMangasDialog(bundle: Bundle? = null) : return MaterialDialog.Builder(activity!!) .title(R.string.action_remove) .customView(view, true) - .positiveText(android.R.string.yes) - .negativeText(android.R.string.no) + .positiveText(android.R.string.ok) + .negativeText(android.R.string.cancel) .onPositive { _, _ -> val deleteChapters = view.isChecked() (targetController as? Listener)?.deleteMangasFromLibrary(mangas, deleteChapters) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/ChangelogDialogController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/ChangelogDialogController.kt index 5e659c5b5e..68fbbd0e28 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/ChangelogDialogController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/ChangelogDialogController.kt @@ -18,7 +18,7 @@ class ChangelogDialogController : DialogController() { return MaterialDialog.Builder(activity) .title(if (BuildConfig.DEBUG) "Notices" else "Changelog") .customView(view, false) - .positiveText(android.R.string.yes) + .positiveText(R.string.action_close) .build() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/DeleteChaptersDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/DeleteChaptersDialog.kt index 1ac72e7316..c382e5d446 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/DeleteChaptersDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/DeleteChaptersDialog.kt @@ -17,8 +17,8 @@ class DeleteChaptersDialog(bundle: Bundle? = null) : DialogController(bundle) override fun onCreateDialog(savedViewState: Bundle?): Dialog { return MaterialDialog.Builder(activity!!) .content(R.string.confirm_delete_chapters) - .positiveText(android.R.string.yes) - .negativeText(android.R.string.no) + .positiveText(android.R.string.ok) + .negativeText(android.R.string.cancel) .onPositive { _, _ -> (targetController as? Listener)?.deleteChapters() } @@ -29,4 +29,4 @@ class DeleteChaptersDialog(bundle: Bundle? = null) : DialogController(bundle) fun deleteChapters() } -} \ No newline at end of file +} 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 8a44c3cc34..ad06c7cc39 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 @@ -48,8 +48,8 @@ class ReaderPageSheet( MaterialDialog.Builder(activity) .content(activity.getString(R.string.confirm_set_image_as_cover)) - .positiveText(android.R.string.yes) - .negativeText(android.R.string.no) + .positiveText(android.R.string.ok) + .negativeText(android.R.string.cancel) .onPositive { _, _ -> activity.setAsCover(page) dismiss() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent_updates/ConfirmDeleteChaptersDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent_updates/ConfirmDeleteChaptersDialog.kt index 1e6c058dea..bb8f5c47df 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent_updates/ConfirmDeleteChaptersDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent_updates/ConfirmDeleteChaptersDialog.kt @@ -20,8 +20,8 @@ class ConfirmDeleteChaptersDialog(bundle: Bundle? = null) : DialogController( override fun onCreateDialog(savedViewState: Bundle?): Dialog { return MaterialDialog.Builder(activity!!) .content(R.string.confirm_delete_chapters) - .positiveText(android.R.string.yes) - .negativeText(android.R.string.no) + .positiveText(android.R.string.ok) + .negativeText(android.R.string.cancel) .onPositive { _, _ -> (targetController as? Listener)?.deleteChapters(chaptersToDelete) } @@ -31,4 +31,4 @@ class ConfirmDeleteChaptersDialog(bundle: Bundle? = null) : DialogController( interface Listener { fun deleteChapters(chaptersToDelete: List) } -} \ No newline at end of file +} diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt index 2853721e30..7637a7e866 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt @@ -143,8 +143,8 @@ class SettingsAdvancedController : SettingsController() { override fun onCreateDialog(savedViewState: Bundle?): Dialog { return MaterialDialog.Builder(activity!!) .content(R.string.clear_database_confirmation) - .positiveText(android.R.string.yes) - .negativeText(android.R.string.no) + .positiveText(android.R.string.ok) + .negativeText(android.R.string.cancel) .onPositive { _, _ -> (targetController as? SettingsAdvancedController)?.clearDatabase() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt index 5087c7ecd9..4ab8bde5f5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt @@ -364,7 +364,7 @@ class SettingsBackupController : SettingsController() { return MaterialDialog.Builder(activity) .title(R.string.restore_completed) .content(activity.getString(R.string.restore_completed_content, timeString, - if (errors > 0) "$errors" else activity.getString(android.R.string.no))) + if (errors > 0) "$errors" else activity.getString(android.R.string.cancel))) .positiveText(R.string.action_close) .negativeText(R.string.action_open_log) .onNegative { _, _ ->