From ebfdfe4d9b40f20d0710741e70d24700b2d5e164 Mon Sep 17 00:00:00 2001 From: Jay Date: Sat, 8 Feb 2020 12:46:45 -0800 Subject: [PATCH] Update strings for master rebase --- .../java/eu/kanade/tachiyomi/ui/library/LibraryController.kt | 2 +- .../eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt | 2 +- app/src/main/res/values/strings.xml | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt index 11ccfa88e4..d27378ead0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt @@ -432,7 +432,7 @@ class LibraryController( /** * Called when a filter is changed. */ - private fun onFilterChanged(item: ExtendedNavigationView.Item?) { + private fun onFilterChanged(item: ExtendedNavigationView.Item? = null) { if (item is ExtendedNavigationView.Item.MultiStateGroup && item.resTitle == R.string.categories) { if (!MainActivity.bottomNav) activity?.invalidateOptionsMenu() presenter.requestFullUpdate() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt index bac5f8544f..33d3016224 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt @@ -284,7 +284,7 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri fun createTags() { categories = inflate(R.layout.filter_buttons) as FilterTagGroup - categories.setup(this, R.string.hide_categories) + categories.setup(this, R.string.action_hide_categories) downloaded = inflate(R.layout.filter_buttons) as FilterTagGroup downloaded.setup(this, R.string.action_filter_downloaded, R.string.action_filter_not_downloaded) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1038c7fa19..c54d0ec70c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -44,7 +44,7 @@ Read Tracked Not tracked - Hide categories + Hide categories Hiding categories Manga only Manwha only @@ -57,7 +57,6 @@ Total chapters Last read Drag & Drop - Hide categories Search Don\'t migrate Select all