Merge branch 'dev' into revanced-extended

gradle.properties

@@ -4,5 +4,5 @@ org.gradle.parallel = true
 android.useAndroidX = true
 kotlin.code.style = official
 kotlin.jvm.target.validation.mode = IGNORE
-version = 5.1.2
+version = 5.1.3
 

patches/src/main/kotlin/app/revanced/patches/reddit/ad/AdsPatch.kt

@@ -87,9 +87,9 @@ val adsPatch = bytecodePatch(
     compatibleWith(COMPATIBLE_PACKAGE)
 
     dependsOn(
+        settingsPatch,
         bannerAdsPatch,
         commentAdsPatch,
-        settingsPatch
     )
 
     execute {

patches/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt

@@ -29,6 +29,7 @@ import app.revanced.util.removeStringsElements
 import app.revanced.util.valueOrThrow
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import org.w3c.dom.Element
+import java.nio.file.Files
 import java.util.jar.Manifest
 
 private const val EXTENSION_INITIALIZATION_CLASS_DESCRIPTOR =
@@ -182,6 +183,18 @@ val settingsPatch = resourcePatch(
             copyXmlNode("youtube/settings/host", "values/$xmlFile", "resources")
         }
 
+        val valuesV21Directory = get("res").resolve("values-v21")
+        if (!valuesV21Directory.isDirectory)
+            Files.createDirectories(valuesV21Directory.toPath())
+
+        copyResources(
+            "youtube/settings",
+            ResourceGroup(
+                "values-v21",
+                "strings.xml"
+            )
+        )
+
         arrayOf(
             ResourceGroup(
                 "drawable",

patches/src/main/resources/youtube/settings/values-v21/strings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Translation Exception -->
+    <string name="revanced_spoof_streaming_data_side_effects_android_creator">@string/revanced_spoof_streaming_data_side_effects_android</string>
+    <string name="revanced_spoof_streaming_data_side_effects_android_unplugged">@string/revanced_spoof_streaming_data_side_effects_android</string>
+    <string name="revanced_spoof_streaming_data_side_effects_android_vr">@string/revanced_spoof_streaming_data_side_effects_android</string>
+</resources>

patches/src/main/resources/youtube/translations/it-rIT/strings.xml

@@ -1788,6 +1788,7 @@ Tocca il pulsante Continua e consenti le modifiche di ottimizzazione."</string>
     <string name="revanced_spoof_streaming_data_android_only_title">Usa solo il client Android</string>
     <string name="revanced_spoof_streaming_data_android_only_summary_on">Il client Android è usato per recuperare i dati in streaming.</string>
     <string name="revanced_spoof_streaming_data_android_only_summary_off">I client Android e iOS sono usati per recuperare i dati in streaming.</string>
+    <string name="revanced_spoof_streaming_data_android_only_user_dialog_message">La disattivazione di questa impostazione potrebbe causare problemi di riproduzione.</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">Mostra nelle statistiche per nerd</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">Il client usato per recuperare i dati in streaming è visibile nelle statistiche per nerd.</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">Il client usato per recuperare i dati in streaming è nascosto nelle statistiche per nerd.</string>

patches/src/main/resources/youtube/translations/ja-rJP/strings.xml

@@ -1778,12 +1778,14 @@ GmsCore の電池の最適化を無効にしても、バッテリーの使用に
     <string name="revanced_spoof_streaming_data_type_entry_ios">iOS</string>
     <string name="revanced_spoof_streaming_data_type_entry_ios_music">iOS Music</string>
     <string name="revanced_spoof_streaming_data_type_entry_ios_unplugged">iOS TV</string>
+    <string name="revanced_spoof_streaming_data_type_entry_android_creator">Android Creator</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_unplugged">Android TV</string>
     <string name="revanced_spoof_streaming_data_type_entry_android_vr">Android VR</string>
     <string name="revanced_spoof_streaming_data_side_effects_title">ストリーミングデータを偽装することによる副作用</string>
     <string name="revanced_spoof_streaming_data_side_effects_ios">・まだ見つかっていません。</string>
     <string name="revanced_spoof_streaming_data_side_effects_ios_unplugged">・子供向け動画は再生できない可能性があります。
 ・映画や有料動画は再生できない可能性があります。</string>
+    <string name="revanced_spoof_streaming_data_android_only_title">Android クライアントのみを使用</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_title">統計情報に偽装したクライアントを表示</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_on">統計情報に偽装したストリーミングデータを表示します。</string>
     <string name="revanced_spoof_streaming_data_stats_for_nerds_summary_off">統計情報に偽装したストリーミングデータを表示します。</string>