Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update source/extension filter controller titles

Browse Source 
(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
This commit is contained in:
arkon 2020-06-06 10:17:18 -04:00 committed by Jobobby04
parent c635826c1f
commit 5e194d63af
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionFilterController.kt
View File

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

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

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

6
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSourcesController.kt → app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt
View File

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