diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/musicsearch/MusicSearchPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/songsearch/SongSearchPatch.kt similarity index 77% rename from src/main/kotlin/app/revanced/patches/youtube/general/musicsearch/MusicSearchPatch.kt rename to src/main/kotlin/app/revanced/patches/youtube/general/songsearch/SongSearchPatch.kt index 9c56c006c..5503599df 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/musicsearch/MusicSearchPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/songsearch/SongSearchPatch.kt @@ -1,18 +1,18 @@ -package app.revanced.patches.youtube.general.musicsearch +package app.revanced.patches.youtube.general.songsearch import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patcher.patch.annotation.Patch -import app.revanced.patches.youtube.general.musicsearch.fingerprints.VoiceSearchConfigFingerprint +import app.revanced.patches.youtube.general.songsearch.fingerprints.VoiceSearchConfigFingerprint import app.revanced.patches.youtube.utils.integrations.Constants.GENERAL import app.revanced.patches.youtube.utils.settings.SettingsPatch import app.revanced.util.exception @Patch( - name = "Enable music search", - description = "Enables music search in the voice search screen.", + name = "Enable song search", + description = "Enables song search in the voice search screen.", dependencies = [SettingsPatch::class], compatiblePackages = [ CompatiblePackage( @@ -40,7 +40,7 @@ import app.revanced.util.exception use = false ) @Suppress("unused") -object MusicSearchPatch : BytecodePatch( +object SongSearchPatch : BytecodePatch( setOf(VoiceSearchConfigFingerprint) ) { override fun execute(context: BytecodeContext) { @@ -49,10 +49,10 @@ object MusicSearchPatch : BytecodePatch( it.mutableMethod.apply { addInstructions( 0, """ - invoke-static { }, $GENERAL->enableMusicSearch()Z + invoke-static { }, $GENERAL->enableSongSearch()Z move-result v0 return v0 - """ + """ ) } } ?: throw VoiceSearchConfigFingerprint.exception @@ -63,10 +63,10 @@ object MusicSearchPatch : BytecodePatch( SettingsPatch.addPreference( arrayOf( "PREFERENCE: GENERAL_SETTINGS", - "SETTINGS: ENABLE_MUSIC_SEARCH" + "SETTINGS: ENABLE_SONG_SEARCH" ) ) - SettingsPatch.updatePatchStatus("Enable music search") + SettingsPatch.updatePatchStatus("Enable song search") } } diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/musicsearch/fingerprints/VoiceSearchConfigFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/general/songsearch/fingerprints/VoiceSearchConfigFingerprint.kt similarity index 72% rename from src/main/kotlin/app/revanced/patches/youtube/general/musicsearch/fingerprints/VoiceSearchConfigFingerprint.kt rename to src/main/kotlin/app/revanced/patches/youtube/general/songsearch/fingerprints/VoiceSearchConfigFingerprint.kt index 01eb151e8..aea7c4a8c 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/musicsearch/fingerprints/VoiceSearchConfigFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/songsearch/fingerprints/VoiceSearchConfigFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.youtube.general.musicsearch.fingerprints +package app.revanced.patches.youtube.general.songsearch.fingerprints import app.revanced.util.fingerprint.LiteralValueFingerprint diff --git a/src/main/resources/youtube/settings/host/values/strings.xml b/src/main/resources/youtube/settings/host/values/strings.xml index dc16a8355..28909b441 100644 --- a/src/main/resources/youtube/settings/host/values/strings.xml +++ b/src/main/resources/youtube/settings/host/values/strings.xml @@ -160,9 +160,6 @@ Note: Disabling the speed overlay restores the 'Slide to seek' behavior of the o Language switch is disabled. Language switch is enabled. Enable language switch - Music search is disabled. - Music search is enabled. - Enable music search New splash animation is disabled. New splash animation is enabled. Enable new splash animation @@ -188,6 +185,9 @@ Note: Disabling the speed overlay restores the 'Slide to seek' behavior of the o Seekbar tapping is disabled. Seekbar tapping is enabled. Enable seekbar tapping + Song search is disabled. + Song search is enabled. + Enable song search Even if the brightness is set to 0 by swiping, auto brightness is not activated. When brightness reaches 0 by swiping, auto brightness is activated. Enable auto-brightness by swiping diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml index e1b349540..391f8b464 100644 --- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml +++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml @@ -184,8 +184,8 @@ - + @@ -401,7 +401,7 @@ - +