chore(release): 3.2.0-dev.7 [skip ci]

# [3.2.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v3.2.0-dev.6...v3.2.0-dev.7) (2023-12-24) ### Features * **YouTube - Hide ads:** Hide fullscreen ads ([b12a14c](b12a14c4d0)) * **YouTube - Hide layout components:** Hide search result recommendations ([4408209](44082095ba))
feat(YouTube - Hide ads): Hide fullscreen ads
2025-12-25 02:14:09 +01:00 · 2023-12-24 17:40:36 +00:00 · 2023-12-24 18:38:34 +01:00 · 2023-12-24 18:07:01 +01:00 · 2023-12-24 12:41:57 +00:00 · 2023-12-24 13:39:59 +01:00
7 changed files with 64 additions and 19 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,25 @@
+# [3.2.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v3.2.0-dev.6...v3.2.0-dev.7) (2023-12-24)
+
+
+### Features
+
+* **YouTube - Hide ads:** Hide fullscreen ads ([bdc9a12](https://github.com/ReVanced/revanced-patches/commit/bdc9a129eff3a5051b8b37665b3243a8b61cbbac))
+* **YouTube - Hide layout components:** Hide search result recommendations ([55cc7f1](https://github.com/ReVanced/revanced-patches/commit/55cc7f1c7722f56af6d33ea2bd09a1b99d635209))
+
+# [3.2.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v3.2.0-dev.5...v3.2.0-dev.6) (2023-12-24)
+
+
+### Bug Fixes
+
+* **Spoof SIM country:** Validate patch option value correctly ([8105463](https://github.com/ReVanced/revanced-patches/commit/81054637915a5399d15f546b2290b5d939e15732))
+
+# [3.2.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v3.2.0-dev.4...v3.2.0-dev.5) (2023-12-23)
+
+
+### Bug Fixes
+
+* **YouTube - Alternative thumbnails:** Clarify DeArrow support is for thumbnails ([#2531](https://github.com/ReVanced/revanced-patches/issues/2531)) ([828abb0](https://github.com/ReVanced/revanced-patches/commit/828abb0558926cd6557c79abcf1a04bfe2c719e6))
+
 # [3.2.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v3.2.0-dev.3...v3.2.0-dev.4) (2023-12-21)


--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 3.2.0-dev.4
+version = 3.2.0-dev.7
--- a/patches.json
+++ b/patches.json
--- a/src/main/kotlin/app/revanced/patches/all/telephony/sim/spoof/SpoofSimCountryPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/all/telephony/sim/spoof/SpoofSimCountryPatch.kt
@@ -3,7 +3,6 @@ package app.revanced.patches.all.telephony.sim.spoof
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patcher.patch.options.PatchOption
 import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.all.misc.transformation.AbstractTransformInstructionsPatch
@@ -25,26 +24,29 @@ import java.util.*
 )
@Suppress("unused")
 object SpoofSimCountryPatch : AbstractTransformInstructionsPatch<Pair<Int, String>>() {
-    private val isoValidator: PatchOption<String>.(String?) -> Boolean =
-        { it: String? -> it?.uppercase() in Locale.getISOCountries() || it == null }
+    private val countries = Locale.getISOCountries().associateBy { Locale("", it).displayCountry }

-    private val networkCountryIso by stringPatchOption(
+    private val networkCountryIso by isoCountryPatchOption(
        "networkCountryIso",
-        null,
-        null,
        "Network ISO Country Code",
-        "ISO-3166-1 alpha-2 country code equivalent of the MCC (Mobile Country Code) " +
-                "of the current registered operator or the cell nearby.",
-        validator = isoValidator
    )

-    private val simCountryIso by stringPatchOption(
+    private val simCountryIso by isoCountryPatchOption(
        "simCountryIso",
-        null,
-        null,
        "Sim ISO Country Code",
+    )
+
+    private fun isoCountryPatchOption(
+        key: String,
+        title: String,
+    ) = stringPatchOption(
+        key,
+        null,
+        countries,
+        title,
        "ISO-3166-1 alpha-2 country code equivalent for the SIM provider's country code.",
-        validator = isoValidator
+        false,
+        validator = { it: String? -> it == null || it.uppercase() in countries.values }
    )

    override fun filterMap(
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsResourcePatch.kt
@@ -31,6 +31,12 @@ object HideAdsResourcePatch : ResourcePatch() {
                StringResource("revanced_hide_general_ads_summary_on", "General ads are hidden"),
                StringResource("revanced_hide_general_ads_summary_off", "General ads are shown")
            ),
+            SwitchPreference(
+                "revanced_hide_fullscreen_ads",
+                StringResource("revanced_hide_fullscreen_ads_title", "Hide fullscreen ads"),
+                StringResource("revanced_hide_fullscreen_ads_summary_on", "Fullscreen ads are hidden"),
+                StringResource("revanced_hide_fullscreen_ads_summary_off", "Fullscreen ads are shown")
+            ),
            SwitchPreference(
                "revanced_hide_buttoned_ads",
                StringResource("revanced_hide_buttoned_ads_title", "Hide buttoned ad"),
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
@@ -1,6 +1,5 @@
 package app.revanced.patches.youtube.layout.hide.general

-import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
@@ -18,6 +17,7 @@ import app.revanced.patches.youtube.layout.hide.general.fingerprints.ShowWaterma
 import app.revanced.patches.youtube.misc.litho.filter.LithoFilterPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch.PreferenceScreen
+import app.revanced.util.exception
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
@@ -93,6 +93,21 @@ object HideLayoutComponentsPatch : BytecodePatch(
                StringResource("revanced_hide_timed_reactions_summary_on", "Timed reactions are hidden"),
                StringResource("revanced_hide_timed_reactions_summary_off", "Timed reactions are shown")
            ),
+            SwitchPreference(
+                "revanced_hide_search_result_recommendations",
+                StringResource(
+                    "revanced_hide_search_result_recommendations_title",
+                    "Hide search result recommendations (e.g People also watched)"
+                ),
+                StringResource(
+                    "revanced_hide_search_result_recommendations_summary_on",
+                    "Recommendations are hidden"
+                ),
+                StringResource(
+                    "revanced_hide_search_result_recommendations_summary_off",
+                    "Recommendations are shown"
+                )
+            ),
            SwitchPreference(
                "revanced_hide_search_result_shelf_header",
                StringResource(
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt
@@ -119,9 +119,9 @@ object AlternativeThumbnailsPatch : BytecodePatch(
                    ),
                    SwitchPreference(
                        "revanced_alt_thumbnail_dearrow",
-                        StringResource("revanced_alt_thumbnail_dearrow_title", "Enable DeArrow"),
-                        StringResource("revanced_alt_thumbnail_dearrow_summary_on", "Using DeArrow"),
-                        StringResource("revanced_alt_thumbnail_dearrow_summary_off", "Not using DeArrow")
+                        StringResource("revanced_alt_thumbnail_dearrow_title", "Enable DeArrow thumbnails"),
+                        StringResource("revanced_alt_thumbnail_dearrow_summary_on", "Using DeArrow thumbnails"),
+                        StringResource("revanced_alt_thumbnail_dearrow_summary_off", "Not using DeArrow thumbnails")
                    ),
                    SwitchPreference(
                        "revanced_alt_thumbnail_dearrow_connection_toast",
Author	SHA1	Message	Date
semantic-release-bot	e2b2b7424b	chore(release): 3.2.0-dev.7 [skip ci] # [3.2.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v3.2.0-dev.6...v3.2.0-dev.7) (2023-12-24) ### Features * YouTube - Hide ads: Hide fullscreen ads ([`b12a14c`](`b12a14c4d0`)) * YouTube - Hide layout components: Hide search result recommendations ([`4408209`](`44082095ba`))	2023-12-24 17:40:36 +00:00
oSumAtrIX	b12a14c4d0	feat(YouTube - Hide ads): Hide fullscreen ads	2023-12-24 18:38:34 +01:00
oSumAtrIX	44082095ba	feat(YouTube - Hide layout components): Hide search result recommendations	2023-12-24 18:07:01 +01:00
semantic-release-bot	987e4e7e91	chore(release): 3.2.0-dev.6 [skip ci] # [3.2.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v3.2.0-dev.5...v3.2.0-dev.6) (2023-12-24) ### Bug Fixes * Spoof SIM country: Validate patch option value correctly ([`4fd77b1`](`4fd77b130a`))	2023-12-24 12:41:57 +00:00
oSumAtrIX	4fd77b130a	fix(Spoof SIM country): Validate patch option value correctly	2023-12-24 13:39:59 +01:00
semantic-release-bot	47aa56a06e	chore(release): 3.2.0-dev.5 [skip ci] # [3.2.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v3.2.0-dev.4...v3.2.0-dev.5) (2023-12-23) ### Bug Fixes * YouTube - Alternative thumbnails: Clarify DeArrow support is for thumbnails ([#2531](https://github.com/ReVanced/revanced-patches/issues/2531)) ([`47f2de4`](`47f2de4bc8`))	2023-12-23 07:49:58 +00:00
Ajay Ramachandran	47f2de4bc8	fix(YouTube - Alternative thumbnails): Clarify DeArrow support is for thumbnails (#2531 )	2023-12-23 11:48:06 +04:00
oSumAtrIX	36b929c3b3	refactor(Spoof SIM country): Use existing function to register patch option	2023-12-22 03:30:27 +01:00
oSumAtrIX	7109d8e088	refactor(Spoof SIM country): Reduce code duplication	2023-12-22 03:20:55 +01:00