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

fix(YouTube): Sort settings alphabetically despite punctuation (#3097)

Browse source 
Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>
This commit is contained in:
LisoUseInAIKyrios 2023-10-08 05:25:27 +04:00 committed by GitHub
parent 6e77812382
commit 46e3c97d24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/kotlin/app/revanced/patches/shared/settings/preference/ComponentsExtensions.kt
View file

@ -40,4 +40,9 @@ internal fun <T> Element.addDefault(default: T) {
} }
) )
} }
}
internal fun CharSequence.removePunctuation(): String {
val punctuation = "\\p{P}+".toRegex()
return this.replace(punctuation, "")
} }

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

@ -4,6 +4,7 @@ import app.revanced.patches.shared.settings.preference.BasePreference
import app.revanced.patches.shared.settings.preference.impl.PreferenceCategory import app.revanced.patches.shared.settings.preference.impl.PreferenceCategory
import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen import app.revanced.patches.shared.settings.preference.impl.PreferenceScreen
import app.revanced.patches.shared.settings.preference.impl.StringResource import app.revanced.patches.shared.settings.preference.impl.StringResource
import app.revanced.patches.shared.settings.preference.removePunctuation
import java.io.Closeable import java.io.Closeable
abstract class AbstractPreferenceScreen( abstract class AbstractPreferenceScreen(
@ -35,8 +36,8 @@ abstract class AbstractPreferenceScreen(
return PreferenceScreen( return PreferenceScreen(
key, key,
StringResource("${key}_title", title), StringResource("${key}_title", title),
preferences.sortedBy { it.title.value.lowercase() } + preferences.sortedBy { it.title.value.removePunctuation().lowercase() } +
categories.sortedBy { it.title.lowercase() }.map { it.transform() }, categories.sortedBy { it.title.removePunctuation().lowercase() }.map { it.transform() },
summary?.let { summary -> summary?.let { summary ->
StringResource("${key}_summary", summary) StringResource("${key}_summary", summary)
} }
@ -63,7 +64,7 @@ abstract class AbstractPreferenceScreen(
return PreferenceCategory( return PreferenceCategory(
key, key,
StringResource("${key}_title", title), StringResource("${key}_title", title),
preferences.sortedBy { it.title.value.lowercase() } preferences.sortedBy { it.title.value.removePunctuation().lowercase() }
) )
} }

4
src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
View file

@ -53,14 +53,14 @@ object HideLayoutComponentsPatch : BytecodePatch(
), ),
SwitchPreference( SwitchPreference(
"revanced_hide_join_membership_button", "revanced_hide_join_membership_button",
StringResource("revanced_hide_join_membership_button_title", "Hide \"Join\" button"), StringResource("revanced_hide_join_membership_button_title", "Hide \\\'Join\\\' button"),
StringResource("revanced_hide_join_membership_button_summary_on", "Button is hidden"), StringResource("revanced_hide_join_membership_button_summary_on", "Button is hidden"),
StringResource("revanced_hide_join_membership_button_summary_off", "Button is shown") StringResource("revanced_hide_join_membership_button_summary_off", "Button is shown")
), ),
SwitchPreference( SwitchPreference(
"revanced_hide_notify_me_button", "revanced_hide_notify_me_button",
StringResource("revanced_hide_notify_me_button_title", "Hide \"Notify me\" button"), StringResource("revanced_hide_notify_me_button_title", "Hide \\\'Notify me\\\' button"),
StringResource("revanced_hide_notify_me_button_summary_on", "Button is hidden"), StringResource("revanced_hide_notify_me_button_summary_on", "Button is hidden"),
StringResource("revanced_hide_notify_me_button_summary_off", "Button is shown") StringResource("revanced_hide_notify_me_button_summary_off", "Button is shown")
), ),

2
src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/HideLoadMoreButtonPatch.kt
View file

@ -11,7 +11,7 @@ import app.revanced.patches.youtube.layout.hide.loadmorebutton.fingerprints.Hide
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
@Patch( @Patch(
name = "Hide \"Load more\" button", name = "Hide \'Load more\' button",
description = "Hides the button under videos that loads similar videos.", description = "Hides the button under videos that loads similar videos.",
dependencies = [HideLoadMoreButtonResourcePatch::class], dependencies = [HideLoadMoreButtonResourcePatch::class],
compatiblePackages = [ compatiblePackages = [

2
src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/HideLoadMoreButtonResourcePatch.kt
View file

@ -21,7 +21,7 @@ object HideLoadMoreButtonResourcePatch : ResourcePatch() {
SettingsPatch.PreferenceScreen.LAYOUT.addPreferences( SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
SwitchPreference( SwitchPreference(
"revanced_hide_load_more_button", "revanced_hide_load_more_button",
StringResource("revanced_hide_load_more_button_title", "Hide \"Load More\" button"), StringResource("revanced_hide_load_more_button_title", "Hide \\\'Load More\\\' button"),
StringResource("revanced_hide_load_more_button_summary_on", "Button is hidden"), StringResource("revanced_hide_load_more_button_summary_on", "Button is hidden"),
StringResource("revanced_hide_load_more_button_summary_off", "Button is shown") StringResource("revanced_hide_load_more_button_summary_off", "Button is shown")
) )