Lea/revanced-patches-tasker
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

feat(YouTube - Settings): Sort preference screens below other types of preference

Browse source
This commit is contained in:
oSumAtrIX 2023-11-18 04:55:19 +01:00
parent 14ea9674c4
commit 9561db50a8
No known key found for this signature in database
GPG key ID: A9B3094ACDB604B4
1 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/main/kotlin/app/revanced/patches/shared/settings/util/AbstractPreferenceScreen.kt
View file

@ -32,21 +32,29 @@ abstract class AbstractPreferenceScreen(
preferences: MutableList<BasePreference> = mutableListOf(), preferences: MutableList<BasePreference> = mutableListOf(),
val categories: MutableList<Category> = mutableListOf() val categories: MutableList<Category> = mutableListOf()
) : BasePreferenceCollection(key, title, preferences) { ) : BasePreferenceCollection(key, title, preferences) {
override fun transform(): PreferenceScreen { override fun transform() = PreferenceScreen(
return PreferenceScreen( key,
key, StringResource(
StringResource("${key}_title", title), "${key}_title", title
preferences.sortedBy { it.title.value.removePunctuation().lowercase() } + ),
categories.sortedBy { it.title.removePunctuation().lowercase() }.map { it.transform() }, preferences.sortedWith(
summary?.let { summary -> compareBy(
StringResource("${key}_summary", summary) { it is PreferenceScreen },
} { it.title.value.removePunctuation().lowercase() }
) )
} ) + categories.sortedBy {
it.title.removePunctuation().lowercase()
}.map {
it.transform()
},
summary?.let { summary ->
StringResource("${key}_summary", summary)
}
)
private fun ensureScreenInserted() { private fun ensureScreenInserted() {
// Add to screens if not yet done // Add to screens if not yet done
if(!this@AbstractPreferenceScreen.root.contains(this)) if (!this@AbstractPreferenceScreen.root.contains(this))
this@AbstractPreferenceScreen.root.add(this) this@AbstractPreferenceScreen.root.add(this)
} }
@ -59,7 +67,7 @@ abstract class AbstractPreferenceScreen(
key: String, key: String,
title: String, title: String,
preferences: MutableList<BasePreference> = mutableListOf() preferences: MutableList<BasePreference> = mutableListOf()
): BasePreferenceCollection(key, title, preferences) { ) : BasePreferenceCollection(key, title, preferences) {
override fun transform(): PreferenceCategory { override fun transform(): PreferenceCategory {
return PreferenceCategory( return PreferenceCategory(
key, key,
@ -72,7 +80,7 @@ abstract class AbstractPreferenceScreen(
ensureScreenInserted() ensureScreenInserted()
// Add to categories if not yet done // Add to categories if not yet done
if(!this@Screen.categories.contains(this)) if (!this@Screen.categories.contains(this))
this@Screen.categories.add(this) this@Screen.categories.add(this)
this.preferences.addAll(preferences) this.preferences.addAll(preferences)