From fdc976d4f9bca0b325ce19721e0e80e8988bf41c Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Sun, 25 Apr 2021 12:05:30 -0400 Subject: [PATCH] using lowercased phrases for "search" screen titles Recents updated to say "search updates & history" which changes based on the tab you're in Library updated to say "search your library" --- .../tachiyomi/ui/library/LibraryController.kt | 7 ++----- .../tachiyomi/ui/recents/RecentsController.kt | 13 ++++++++++++- .../kanade/tachiyomi/ui/recents/RecentsPresenter.kt | 1 + .../tachiyomi/ui/setting/SettingsController.kt | 3 ++- .../kanade/tachiyomi/ui/source/BrowseController.kt | 3 ++- app/src/main/res/values/strings.xml | 2 ++ 6 files changed, 21 insertions(+), 8 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 6d421a0057..b09f0615b5 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 @@ -111,6 +111,7 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get +import java.util.Locale import kotlin.math.abs import kotlin.math.max import kotlin.math.roundToInt @@ -213,11 +214,7 @@ class LibraryController( override fun getTitle(): String? { setSubtitle() -// return if (!showCategoryInTitle || binding.headerTitle.text.isNullOrBlank() || binding.recyclerCover.isClickable) { - return searchTitle(view?.context?.getString(R.string.library)) -// } else { -// binding.headerTitle.text.toString() -// } + return searchTitle(view?.context?.getString(R.string.your_library)?.lowercase(Locale.ROOT)) } private var scrollListener = object : RecyclerView.OnScrollListener() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt index 514483c63d..8cdf760aae 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt @@ -58,6 +58,7 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.cancel +import java.util.Locale import kotlin.math.abs import kotlin.math.max import kotlin.math.min @@ -111,7 +112,15 @@ class RecentsController(bundle: Bundle? = null) : override fun getTitle(): String? { return if (showingDownloads) { resources?.getString(R.string.download_queue) - } else searchTitle(resources?.getString(R.string.recents)) + } else searchTitle( + view?.context?.getString( + when (presenter.viewType) { + RecentsPresenter.VIEW_TYPE_ONLY_HISTORY -> R.string.history + RecentsPresenter.VIEW_TYPE_ONLY_UPDATES -> R.string.updates + else -> R.string.updates_and_history + } + )?.lowercase(Locale.ROOT) + ) } override fun createBinding(inflater: LayoutInflater) = RecentsControllerBinding.inflate(inflater) @@ -476,11 +485,13 @@ class RecentsController(bundle: Bundle? = null) : fun tempJumpTo(viewType: Int) { presenter.toggleGroupRecents(viewType, false) activityBinding?.mainTabs?.selectTab(activityBinding?.mainTabs?.getTabAt(viewType)) + updateTitleAndMenu() } private fun setViewType(viewType: Int) { if (viewType != presenter.viewType) { presenter.toggleGroupRecents(viewType) + updateTitleAndMenu() } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsPresenter.kt index c39b837faf..34bcbd0858 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsPresenter.kt @@ -58,6 +58,7 @@ class RecentsPresenter( var heldItems: HashMap> = hashMapOf() private var shouldMoveToTop = false var viewType: Int = preferences.recentsViewType().get() + private set private fun resetOffsets() { finished = false diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt index 6c593c0582..edb1597cf0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt @@ -28,6 +28,7 @@ import rx.Subscription import rx.subscriptions.CompositeSubscription import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get +import java.util.Locale abstract class SettingsController : PreferenceController() { @@ -98,7 +99,7 @@ abstract class SettingsController : PreferenceController() { open fun getTitle(): String? { if (this is FloatingSearchInterface) { - return searchTitle(preferenceScreen?.title?.toString()) + return searchTitle(preferenceScreen?.title?.toString()?.lowercase(Locale.ROOT)) } return preferenceScreen?.title?.toString() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt index 5b796740c7..65340d7940 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt @@ -59,6 +59,7 @@ import kotlinx.android.parcel.Parcelize import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.util.Date +import java.util.Locale import kotlin.math.abs import kotlin.math.max @@ -110,7 +111,7 @@ class BrowseController : else -> R.string.source_migration } ) - } else searchTitle(view?.context?.getString(R.string.sources)) + } else searchTitle(view?.context?.getString(R.string.sources)?.lowercase(Locale.ROOT)) } val presenter = SourcePresenter(this) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8bfd733b9e..9a679afa8a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -113,6 +113,7 @@ Library + Your library Updating library Selected: %1$d Local @@ -213,6 +214,7 @@ Recents + Updates & history Updates Newly added History