From 5e194d63af97989238eeda504c5cf72a3db0be52 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sat, 6 Jun 2020 10:17:18 -0400
Subject: [PATCH] Update source/extension filter controller titles

(cherry picked from commit 0b73f8b1ef1950d5d1b55f2ae510d4519636f12d)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt
---
 .../ui/browse/extension/ExtensionFilterController.kt        | 2 +-
 .../kanade/tachiyomi/ui/browse/source/SourceController.kt   | 4 ++--
 .../source/SourceFilterController.kt}                       | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename app/src/main/java/eu/kanade/tachiyomi/ui/{setting/SettingsSourcesController.kt => browse/source/SourceFilterController.kt} (98%)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionFilterController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionFilterController.kt
index b21940704..31f72bc72 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionFilterController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionFilterController.kt
@@ -14,7 +14,7 @@ import uy.kohesive.injekt.api.get
 class ExtensionFilterController : SettingsController() {
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) = with(screen) {
-        titleRes = R.string.action_filter
+        titleRes = R.string.label_extensions
 
         val activeLangs = preferences.enabledLanguages().get()
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
index 259f21dab..d36d88ebc 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
@@ -30,7 +30,6 @@ import eu.kanade.tachiyomi.ui.browse.BrowseController
 import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController
 import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController
 import eu.kanade.tachiyomi.ui.browse.source.latest.LatestUpdatesController
-import eu.kanade.tachiyomi.ui.setting.SettingsSourcesController
 import exh.ui.smartsearch.SmartSearchController
 import kotlinx.android.parcel.Parcelize
 import kotlinx.coroutines.flow.filterIsInstance
@@ -268,7 +267,8 @@ class SourceController(bundle: Bundle? = null) :
             // Initialize option to open catalogue settings.
             R.id.action_settings -> {
                 parentController!!.router.pushController(
-                    SettingsSourcesController().withFadeTransaction()
+                    SourceFilterController()
+                        .withFadeTransaction()
                 )
             }
         }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSourcesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt
similarity index 98%
rename from app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSourcesController.kt
rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt
index 0c59fd15f..845fd44e2 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSourcesController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt
@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.ui.setting
+package eu.kanade.tachiyomi.ui.browse.source
 
 import android.graphics.drawable.Drawable
 import android.view.Menu
@@ -26,7 +26,7 @@ import reactivecircus.flowbinding.appcompat.queryTextChanges
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
-class SettingsSourcesController : SettingsController() {
+class SourceFilterController : SettingsController() {
 
     init {
         setHasOptionsMenu(true)
@@ -46,7 +46,7 @@ class SettingsSourcesController : SettingsController() {
     private var sorting = SourcesSort.Alpha
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) = with(screen) {
-        titleRes = R.string.action_filter
+        titleRes = R.string.label_sources
 
         sorting = SourcesSort.from(preferences.sourceSorting().get()) ?: SourcesSort.Alpha
         activity?.invalidateOptionsMenu()