chore(release): 2.175.0-dev.1 [skip ci]

# [2.175.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.174.1-dev.1...v2.175.0-dev.1) (2023-05-24)

### Features

* **youtube/general-ads:** merge `hide-get-premium` patch into `general-ads` patch ([8252488](82524885bb))

CHANGELOG.md

@@ -1,3 +1,17 @@
+# [2.175.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.174.1-dev.1...v2.175.0-dev.1) (2023-05-24)
+
+
+### Features
+
+* **youtube/general-ads:** merge `hide-get-premium` patch into `general-ads` patch ([5195dd8](https://github.com/revanced/revanced-patches/commit/5195dd8936d63c482dbcb2cd0e7e9aab3c75954e))
+
+## [2.174.1-dev.1](https://github.com/revanced/revanced-patches/compare/v2.174.0...v2.174.1-dev.1) (2023-05-24)
+
+
+### Bug Fixes
+
+* **youtube/remove-player-controls-background:** use correct patch name and description ([8732a84](https://github.com/revanced/revanced-patches/commit/8732a84422087fca7e9e1635a0b1d8d2cbf034f4))
+
 # [2.174.0](https://github.com/revanced/revanced-patches/compare/v2.173.0...v2.174.0) (2023-05-24)
 
 

README.md

@@ -35,7 +35,6 @@ The official ReVanced Patches.
 | `hide-endscreen-cards` | Hides the suggested video cards at the end of a video in fullscreen. | 18.19.35 |
 | `hide-filter-bar` | Hides the filter bar in video feeds. | 18.19.35 |
 | `hide-floating-microphone-button` | Hides the floating microphone button which appears in search. | 18.19.35 |
-| `hide-get-premium` | Hides advertisement for YouTube Premium under the video player. | 18.19.35 |
 | `hide-info-cards` | Hides info cards in videos. | 18.19.35 |
 | `hide-load-more-button` | Hides the button under videos that loads similar videos. | 18.19.35 |
 | `hide-player-buttons` | Adds the option to hide video player previous and next buttons. | 18.19.35 |
@@ -52,7 +51,7 @@ The official ReVanced Patches.
 | `open-links-externally` | Open links outside of the app directly in your browser. | 18.19.35 |
 | `premium-heading` | Shows premium branding on the home screen. | all |
 | `remember-video-quality` | Adds the ability to remember the video quality you chose in the video quality flyout. | 18.19.35 |
-| `remove-player-button-background` | Removes the background from the video player buttons. | 18.19.35 |
+| `remove-player-controls-background` | Removes the background from the video player controls. | 18.19.35 |
 | `return-youtube-dislike` | Shows the dislike count of videos using the Return YouTube Dislike API. | 18.19.35 |
 | `seekbar-tapping` | Enables tap-to-seek on the seekbar of the video player. | 18.19.35 |
 | `sponsorblock` | Integrates SponsorBlock which allows skipping video segments such as sponsored content. | 18.19.35 |

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.174.0
+version = 2.175.0-dev.1

src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/HideAdsPatch.kt

@@ -14,13 +14,21 @@ import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.misc.fix.verticalscroll.patch.VerticalScrollPatch
 import app.revanced.patches.youtube.ad.general.annotation.HideAdsCompatibility
 import app.revanced.patches.youtube.ad.general.resource.patch.HideAdsResourcePatch
+import app.revanced.patches.youtube.ad.getpremium.bytecode.patch.HideGetPremiumPatch
 import app.revanced.patches.youtube.misc.fix.backtoexitgesture.patch.FixBackToExitGesturePatch
 import org.jf.dexlib2.iface.instruction.formats.Instruction31i
 import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 
 
 @Patch
-@DependsOn([HideAdsResourcePatch::class, VerticalScrollPatch::class, FixBackToExitGesturePatch::class])
+@DependsOn(
+    [
+        HideGetPremiumPatch::class,
+        HideAdsResourcePatch::class,
+        VerticalScrollPatch::class,
+        FixBackToExitGesturePatch::class
+    ]
+)
 @Name("hide-ads")
 @Description("Removes general ads.")
 @HideAdsCompatibility

src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/annotations/HideGetPremiumCompatibility.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.hide.getpremium.annotations
+package app.revanced.patches.youtube.ad.getpremium.annotations
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/bytecode/fingerprints/GetPremiumViewFingerprint.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.hide.getpremium.bytecode.fingerprints
+package app.revanced.patches.youtube.ad.getpremium.bytecode.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.Opcode

src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/bytecode/patch/HideGetPremiumVideoAdvertisementPatch.kt

@@ -1,7 +1,6 @@
-package app.revanced.patches.youtube.layout.hide.getpremium.bytecode.patch
+package app.revanced.patches.youtube.ad.getpremium.bytecode.patch
 
 import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
@@ -11,33 +10,35 @@ import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
-import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
-import app.revanced.patches.youtube.layout.hide.getpremium.annotations.HideGetPremiumCompatibility
+import app.revanced.patches.youtube.ad.getpremium.annotations.HideGetPremiumCompatibility
-import app.revanced.patches.youtube.layout.hide.getpremium.bytecode.fingerprints.GetPremiumViewFingerprint
+import app.revanced.patches.youtube.ad.getpremium.bytecode.fingerprints.GetPremiumViewFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction
 
-@Patch
 @DependsOn([IntegrationsPatch::class, SettingsPatch::class])
 @Name("hide-get-premium")
-@Description("Hides advertisement for YouTube Premium under the video player.")
 @HideGetPremiumCompatibility
 @Version("0.0.1")
-class HideGetPremiumPatch : BytecodePatch(
+class HideGetPremiumPatch : BytecodePatch(listOf(GetPremiumViewFingerprint,)) {
-    listOf(
-        GetPremiumViewFingerprint,
-    )
-) {
     override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+        SettingsPatch.PreferenceScreen.ADS.addPreferences(
             SwitchPreference(
                 "revanced_hide_get_premium",
-                StringResource("revanced_hide_get_premium_title", "Hide YouTube Premium advertisement"),
+                StringResource(
-                StringResource("revanced_hide_get_premium_summary_on", "YouTube Premium advertisement are hidden"),
+                    "revanced_hide_get_premium_title",
-                StringResource("revanced_hide_get_premium_summary_off", "YouTube Premium advertisement are shown")
+                    "Hide YouTube Premium advertisement under video player"
+                ),
+                StringResource(
+                    "revanced_hide_get_premium_summary_on",
+                    "YouTube Premium advertisement are hidden"
+                ),
+                StringResource(
+                    "revanced_hide_get_premium_summary_off",
+                    "YouTube Premium advertisement are shown"
+                )
             )
         )
 

src/main/kotlin/app/revanced/patches/youtube/layout/player/background/annotations/PlayerControlsBackgroundCompatibility.kt

@@ -1,7 +1,7 @@
-package app.revanced.patches.youtube.layout.buttons.player.background.annotations
+package app.revanced.patches.youtube.layout.player.background.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
 @Compatibility([Package("com.google.android.youtube", arrayOf("18.16.37", "18.19.35"))])
 @Target(AnnotationTarget.CLASS)
-internal annotation class PlayerButtonBackgroundCompatibility
+internal annotation class PlayerControlsBackgroundCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/player/background/patch/PlayerControlsBackgroundPatch.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.buttons.player.background.patch
+package app.revanced.patches.youtube.layout.player.background.patch
 
 import app.revanced.extensions.doRecursively
 import app.revanced.patcher.annotation.Description
@@ -9,15 +9,15 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.buttons.player.background.annotations.PlayerButtonBackgroundCompatibility
+import app.revanced.patches.youtube.layout.player.background.annotations.PlayerControlsBackgroundCompatibility
 import org.w3c.dom.Element
 
 @Patch(false)
-@Name("remove-player-button-background")
+@Name("remove-player-controls-background")
-@Description("Removes the background from the video player buttons.")
+@Description("Removes the background from the video player controls.")
-@PlayerButtonBackgroundCompatibility
+@PlayerControlsBackgroundCompatibility
 @Version("0.0.1")
-class PlayerButtonBackgroundPatch : ResourcePatch {
+class PlayerControlsBackgroundPatch : ResourcePatch {
     override fun execute(context: ResourceContext): PatchResult {
         context.xmlEditor[RESOURCE_FILE_PATH].use { editor ->
             editor.file.doRecursively node@{ node ->