Sync v5.30.0 ReVanced/revanced-patches@f060fd5

* **YouTube - SponsorBlock:** Add "Undo automatic skip toast"
* **YouTube - Hide ads:** Hide new type of product ad in video description
* **Spotify - Unlock Premium:** Fix hiding context menu ads on newest versions

Author: chsbuffer

app/build.gradle.kts

@@ -15,7 +15,7 @@ android {
         applicationId = "io.github.chsbuffer.revancedxposed"
         versionCode = 19
         versionName = "1.0.$versionCode"
-        val patchVersion = "5.28.0"
+        val patchVersion = "5.30.0"
         buildConfigField("String", "PATCH_VERSION", "\"$patchVersion\"")
     }
     flavorDimensions += "abi"
@@ -91,33 +91,53 @@ abstract class GenerateStringsTask @Inject constructor(
     @get:OutputDirectory
     abstract val outputDirectory: DirectoryProperty
 
-    @TaskAction
-    fun action() {
-        val inputDir = inputDirectory.get().asFile
-
-        inputDir.listFiles()?.forEach {
-            val name = it.name
-            val inputFile = File(it, "strings.xml")
-            val genResDir = File(outputDirectory.get().asFile, name).apply { mkdirs() }
-            val outputFile = File(genResDir, "strings.xml")
-
-            val inputXml = XmlSlurper().parse(inputFile)
-
-            outputFile.writer().use { writer ->
-                MarkupBuilder(writer).run {
-                    doubleQuotes = true
+    private fun unwrapPatch(input: File, output: File) {
+        val inputXml = XmlSlurper().parse(input)
+        output.writer().use { writer ->
+            MarkupBuilder(writer).run {
+                fun writeNode(node: Any?) {
+                    if (node !is NodeChild) return
+                    val attributes = node.attributes()
                     withGroovyBuilder {
-                        "resources" {
-                            inputXml.children().children().children().forEach {
-                                val node = it as NodeChild
-                                "string"("name" to node.getProperty("@name")) { mkp.yield(it.text()) }
+                        if (node.children().any()) {
+                            node.name()(attributes) {
+                                node.children().forEach {
+                                    writeNode(it)
+                                }
                             }
+                        } else {
+                            node.name()(attributes) { mkp.yield(node.text()) }
+                        }
+                    }
+                }
+
+                doubleQuotes = true
+                withGroovyBuilder {
+                    "resources" {
+                        // resources.app.patch.*
+                        inputXml.children().children().children().forEach {
+                            writeNode(it)
                         }
                     }
                 }
             }
         }
     }
+
+    @TaskAction
+    fun action() {
+        val inputDir = inputDirectory.get().asFile
+        val outputDir = outputDirectory.get().asFile
+
+        inputDir.listFiles()?.forEach { variant ->
+            val inputFile = File(variant, "strings.xml")
+            val genResDir = File(outputDir, variant.name).apply { mkdirs() }
+            val outputFile = File(genResDir, "strings.xml")
+            unwrapPatch(inputFile, outputFile)
+        }
+
+        unwrapPatch(File(inputDir, "values/arrays.xml"), File(outputDir, "values/arrays.xml"))
+    }
 }
 
 androidComponents {

app/src/main/addresources/values-af-rZA/strings.xml

@@ -55,8 +55,9 @@ Second \"item\" text"</string>
   <!-- Translations of this should not be longer than the original English text, otherwise the text can be clipped and not entirely shown. -->
   </patch>
   <patch id="ad.general.hideAdsResourcePatch">
-  <!-- 'Visit store' should be translated with the same localized wording that YouTube displays. -->
   <!-- Translations of this should not be longer than the original English text, otherwise the text can be clipped and not entirely shown. -->
+  <!-- 'View products' should be translated with the same localized wording that YouTube displays. -->
+  <!-- 'Visit store' should be translated with the same localized wording that YouTube displays. -->
   </patch>
   <patch id="ad.getpremium.hideGetPremiumPatch">
   </patch>
@@ -79,6 +80,7 @@ Second \"item\" text"</string>
   </patch>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
+  <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                  This button usually appears only on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->

app/src/main/addresources/values-am-rET/strings.xml

@@ -55,8 +55,9 @@ Second \"item\" text"</string>
   <!-- Translations of this should not be longer than the original English text, otherwise the text can be clipped and not entirely shown. -->
   </patch>
   <patch id="ad.general.hideAdsResourcePatch">
-  <!-- 'Visit store' should be translated with the same localized wording that YouTube displays. -->
   <!-- Translations of this should not be longer than the original English text, otherwise the text can be clipped and not entirely shown. -->
+  <!-- 'View products' should be translated with the same localized wording that YouTube displays. -->
+  <!-- 'Visit store' should be translated with the same localized wording that YouTube displays. -->
   </patch>
   <patch id="ad.getpremium.hideGetPremiumPatch">
   </patch>
@@ -79,6 +80,7 @@ Second \"item\" text"</string>
   </patch>
   <patch id="layout.buttons.action.hideButtonsPatch">
   <!-- 'Share' should be translated with the same localized wording that YouTube displays. -->
+  <!-- 'Stop ads' should be translated with the same localized wording that YouTube displays. -->
   <!-- 'Report' should be translated with the same localized wording that YouTube displays.
                  This button usually appears only on live streams. -->
   <!-- 'Remix' should be translated with the same localized wording that YouTube displays. -->