Update source/extension filter controller titles

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()
 

app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt

@@ -28,7 +28,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 kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -235,7 +234,8 @@ class SourceController :
             // Initialize option to open catalogue settings.
             R.id.action_settings -> {
                 parentController!!.router.pushController(
-                    SettingsSourcesController().withFadeTransaction()
+                    SourceFilterController()
+                        .withFadeTransaction()
                 )
             }
         }

app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt

@@ -0,0 +1,58 @@
+package eu.kanade.tachiyomi.ui.browse.source
+
+import android.graphics.drawable.Drawable
+import androidx.preference.PreferenceScreen
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.source.SourceManager
+import eu.kanade.tachiyomi.ui.setting.SettingsController
+import eu.kanade.tachiyomi.util.preference.onChange
+import eu.kanade.tachiyomi.util.preference.switchPreference
+import eu.kanade.tachiyomi.util.preference.titleRes
+import eu.kanade.tachiyomi.util.system.LocaleHelper
+import java.util.TreeMap
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+class SourceFilterController : SettingsController() {
+
+    private val onlineSources by lazy { Injekt.get<SourceManager>().getOnlineSources() }
+
+    override fun setupPreferenceScreen(screen: PreferenceScreen) = with(screen) {
+        titleRes = R.string.label_sources
+
+        // Get the list of active language codes.
+        val activeLangsCodes = preferences.enabledLanguages().get()
+
+        // Get a map of sources grouped by language.
+        val sourcesByLang = onlineSources.groupByTo(TreeMap(), { it.lang })
+
+        // Order first by active languages, then inactive ones
+        val orderedLangs = sourcesByLang.keys.sortedWith(compareBy({ it !in activeLangsCodes }, { LocaleHelper.getSourceDisplayName(it, context) }))
+
+        orderedLangs.forEach { lang ->
+            switchPreference {
+                preferenceScreen.addPreference(this)
+                title = LocaleHelper.getSourceDisplayName(lang, context)
+                isPersistent = false
+                isChecked = lang in activeLangsCodes
+
+                onChange { newValue ->
+                    val checked = newValue as Boolean
+                    val current = preferences.enabledLanguages().get()
+                    preferences.enabledLanguages().set(
+                        if (!checked) {
+                            current - lang
+                        } else {
+                            current + lang
+                        }
+                    )
+                    true
+                }
+            }
+        }
+    }
+
+    override fun setDivider(divider: Drawable?) {
+        super.setDivider(null)
+    }
+}