feat: downloads patch (#215)

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/resource/patch/ReturnYouTubeDislikeResourcePatch.kt

@@ -13,7 +13,7 @@ import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatc
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.Preference
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
-import app.revanced.util.resources.ResourceUtils.iterateXmlNodeChildren
+import app.revanced.util.resources.ResourceUtils.Settings.mergeStrings
 
 @DependsOn([FixLocaleConfigErrorPatch::class, SettingsPatch::class])
 @Name("return-youtube-dislike-resource-patch")
@@ -35,12 +35,7 @@ class ReturnYouTubeDislikeResourcePatch : ResourcePatch() {
             )
         )
         // merge strings
-        data.iterateXmlNodeChildren("returnyoutubedislike/host/values/strings.xml", "resources") {
-            // TODO: figure out why this is needed
-            if (!it.hasAttributes()) return@iterateXmlNodeChildren
-            val attributes = it.attributes
-            SettingsPatch.addString(attributes.getNamedItem("name")!!.nodeValue!!, it.textContent!!)
-        }
+        data.mergeStrings("returnyoutubedislike/host/values/strings.xml")
 
         return PatchResultSuccess()
     }

src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/ShowPlayerControlsFingerprint.kt

@@ -1,19 +0,0 @@
-package app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility
-
-@Name("show-player-controls-fingerprint")
-@MatchingMethod(
-    "LYouTubeControlsOverlay;", "ac"
-)
-@DirectPatternScanMethod
-@SponsorBlockCompatibility
-@Version("0.0.1")
-object ShowPlayerControlsFingerprint : MethodFingerprint(
-    "V", null, listOf("Z","Z"), null,  null
-)

src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt

@@ -23,6 +23,7 @@ import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.*
 import app.revanced.patches.youtube.layout.sponsorblock.resource.patch.SponsorBlockResourcePatch
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
+import app.revanced.patches.youtube.misc.playercontrols.bytecode.patch.PlayerControlsBytecodePatch
 import app.revanced.patches.youtube.misc.videoid.patch.VideoIdPatch
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
@@ -38,7 +39,7 @@ import org.jf.dexlib2.util.MethodUtil
 
 @Patch
 @DependsOn(
-    dependencies = [IntegrationsPatch::class, ResourceIdMappingProviderResourcePatch::class, SponsorBlockResourcePatch::class, VideoIdPatch::class]
+    dependencies = [PlayerControlsBytecodePatch::class, IntegrationsPatch::class, ResourceIdMappingProviderResourcePatch::class, SponsorBlockResourcePatch::class, VideoIdPatch::class]
 )
 @Name("sponsorblock")
 @Description("Integrate SponsorBlock.")
@@ -171,8 +172,7 @@ class SponsorBlockBytecodePatch : BytecodePatch(
         /*
         Voting & Shield button
          */
-        ShowPlayerControlsFingerprint.resolve(data, data.classes.find { it.type.endsWith("YouTubeControlsOverlay;") }!!)
-        val controlsMethodResult = ShowPlayerControlsFingerprint.result!!
+        val controlsMethodResult = PlayerControlsBytecodePatch.showPlayerControlsFingerprintResult
 
         val controlsLayoutStubResourceId =
             ResourceIdMappingProviderResourcePatch.resourceMappings.single { it.type == "id" && it.name == "controls_layout_stub" }.id
@@ -217,12 +217,8 @@ class SponsorBlockBytecodePatch : BytecodePatch(
         }
 
         // change visibility of the buttons
-        controlsMethodResult.mutableMethod.addInstructions(
-            0, """
-                invoke-static {p1}, Lapp/revanced/integrations/sponsorblock/ShieldButton;->changeVisibility(Z)V
-                invoke-static {p1}, Lapp/revanced/integrations/sponsorblock/VotingButton;->changeVisibility(Z)V
-            """.trimIndent()
-        )
+        PlayerControlsBytecodePatch.injectVisibilityCheckCall("Lapp/revanced/integrations/sponsorblock/ShieldButton;->changeVisibility(Z)V")
+        PlayerControlsBytecodePatch.injectVisibilityCheckCall("Lapp/revanced/integrations/sponsorblock/VotingButton;->changeVisibility(Z)V")
 
         // set SegmentHelperLayout.context to the player layout instance
         val instanceRegister = 0

src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/resource/patch/SponsorBlockResourcePatch.kt

@@ -13,9 +13,9 @@ import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.Preference
 import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
 import app.revanced.util.resources.ResourceUtils
+import app.revanced.util.resources.ResourceUtils.Settings.mergeStrings
 import app.revanced.util.resources.ResourceUtils.copyResources
 import app.revanced.util.resources.ResourceUtils.copyXmlNode
-import app.revanced.util.resources.ResourceUtils.iterateXmlNodeChildren
 
 @Name("sponsorblock-resource-patch")
 @SponsorBlockCompatibility
@@ -40,20 +40,7 @@ class SponsorBlockResourcePatch : ResourcePatch() {
         /*
          merge SponsorBlock strings to main strings
          */
-        data.iterateXmlNodeChildren("sponsorblock/host/values/strings.xml", "resources") {
-            // TODO: figure out why this is needed
-            if (!it.hasAttributes()) return@iterateXmlNodeChildren
-
-            val attributes = it.attributes
-            val key = attributes.getNamedItem("name")!!.nodeValue!!
-            val value = it.textContent!!
-
-            // all strings of SponsorBlock which have this attribute have the attribute value false,
-            // hence a null check suffices
-            val formatted = attributes.getNamedItem("formatted") == null
-
-            SettingsPatch.addString(key, value, formatted)
-        }
+        data.mergeStrings("sponsorblock/host/values/strings.xml")
 
         /*
          merge SponsorBlock drawables to main drawables