From b27669ee325dc3ca7a8cfbb160d0dd7b7aa940be Mon Sep 17 00:00:00 2001 From: len Date: Sun, 10 Apr 2016 17:49:48 +0200 Subject: [PATCH] Remove unused strings --- .../eu/kanade/tachiyomi/ui/category/CategoryActivity.kt | 4 ++-- .../kanade/tachiyomi/ui/setting/SettingsAdvancedFragment.kt | 4 ++-- app/src/main/res/values/strings.xml | 6 ------ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryActivity.kt index 34f8881abf..162c5aa319 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryActivity.kt @@ -82,7 +82,7 @@ class CategoryActivity : BaseRxActivity(), ActionMode.Callbac fab.setOnClickListener({ v -> MaterialDialog.Builder(this) .title(R.string.action_add_category) - .negativeText(R.string.button_cancel) + .negativeText(android.R.string.cancel) .input(R.string.name, 0, false) { dialog, input -> presenter.createCategory(input.toString()) } .show() @@ -125,7 +125,7 @@ class CategoryActivity : BaseRxActivity(), ActionMode.Callbac private fun editCategory(category: Category) { MaterialDialog.Builder(this) .title(R.string.action_rename_category) - .negativeText(R.string.button_cancel) + .negativeText(android.R.string.cancel) .onNegative { materialDialog, dialogAction -> destroyActionModeIfNeeded() } .input(getString(R.string.name), category.name, false) { dialog, input -> presenter.renameCategory(category, input.toString()) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedFragment.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedFragment.kt index 4a0a25cac2..c67f1ed167 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedFragment.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedFragment.kt @@ -85,8 +85,8 @@ class SettingsAdvancedFragment : SettingsNestedFragment() { private fun clearDatabase() { MaterialDialog.Builder(activity) .content(R.string.clear_database_confirmation) - .positiveText(R.string.button_yes) - .negativeText(R.string.button_no) + .positiveText(android.R.string.yes) + .negativeText(android.R.string.no) .onPositive { dialog, which -> db.deleteMangasNotInLibrary().executeAsBlocking() } .show() } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 57be641d28..6e23653c05 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -51,12 +51,6 @@ Cancel Sort - - OK - Cancel - Yes - No - Deleting… Loading…