chore(release): 2.20.3 [skip ci]

## [2.20.3](https://github.com/revanced/revanced-patches/compare/v2.20.2...v2.20.3) (2022-07-20)

### Bug Fixes

* disable-fullscreen-panels patch not working ([#213](https://github.com/revanced/revanced-patches/issues/213)) ([513276e](513276e950))

CHANGELOG.md

@@ -1,3 +1,38 @@
+## [2.20.3](https://github.com/revanced/revanced-patches/compare/v2.20.2...v2.20.3) (2022-07-20)
+
+
+### Bug Fixes
+
+* disable-fullscreen-panels patch not working ([#213](https://github.com/revanced/revanced-patches/issues/213)) ([5372105](https://github.com/revanced/revanced-patches/commit/5372105e72607f289b779e4c2a3c13f3458842ce))
+
+## [2.20.2](https://github.com/revanced/revanced-patches/compare/v2.20.1...v2.20.2) (2022-07-20)
+
+
+### Bug Fixes
+
+* autoplay not working. ([586eed5](https://github.com/revanced/revanced-patches/commit/586eed515fc7ff8e3b1b150b0d34610b39480bb5))
+
+## [2.20.1](https://github.com/revanced/revanced-patches/compare/v2.20.0...v2.20.1) (2022-07-20)
+
+
+### Bug Fixes
+
+* autoplay still enabled when using patch ([4f96129](https://github.com/revanced/revanced-patches/commit/4f961298f6cb6417ee3f3d6f8ac7ce96594ed03b))
+
+# [2.20.0](https://github.com/revanced/revanced-patches/compare/v2.19.0...v2.20.0) (2022-07-18)
+
+
+### Features
+
+* `minimize-playback-music` patch ([#200](https://github.com/revanced/revanced-patches/issues/200)) ([d4fd18b](https://github.com/revanced/revanced-patches/commit/d4fd18bc74c92e17cdfb21b627b2f6a8919ff2dc))
+
+# [2.19.0](https://github.com/revanced/revanced-patches/compare/v2.18.3...v2.19.0) (2022-07-18)
+
+
+### Features
+
+* `compact-header` patch ([83753ba](https://github.com/revanced/revanced-patches/commit/83753bacf8f56ad16f8abafc02034f1595c12532))
+
 ## [2.18.3](https://github.com/revanced/revanced-patches/compare/v2.18.2...v2.18.3) (2022-07-18)
 
 

README.md

@@ -6,8 +6,10 @@
 
 | 💊 Patch | 📜 Description | 🎯 Target Package | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|:-----------------:|
+| `minimized-playback-music` | Enables minimized playback on Kids music. | `com.google.android.apps.youtube.music` | 5.14.53 |
 | `tasteBuilder-remover` | Removes the "Tell us which artists you like" card from the home screen. | `com.google.android.apps.youtube.music` | 5.14.53 |
 | `hide-get-premium` | Removes all "Get Premium" evidences from the avatar menu. | `com.google.android.apps.youtube.music` | 5.14.53 |
+| `compact-header` | Hides the music category bar at the top of the homepage. | `com.google.android.apps.youtube.music` | 5.14.53 |
 | `upgrade-button-remover` | Removes the upgrade tab from the pivot bar. | `com.google.android.apps.youtube.music` | 5.14.53 |
 | `background-play` | Enables playing music in the background. | `com.google.android.apps.youtube.music` | 5.14.53 |
 | `music-video-ads` | Removes ads in the music player. | `com.google.android.apps.youtube.music` | 5.14.53 |

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.18.3
+version = 2.20.3

src/main/kotlin/app/revanced/patches/music/layout/compactheader/annotations/CompactHeaderCompatibility.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.music.layout.compactheader.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class CompactHeaderCompatibility

src/main/kotlin/app/revanced/patches/music/layout/compactheader/fingerprints/CompactHeaderConstructorFingerprint.kt

@@ -0,0 +1,33 @@
+package app.revanced.patches.music.layout.compactheader.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.music.layout.compactheader.annotations.CompactHeaderCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("compact-header-constructor-fingerprint")
+@MatchingMethod(
+    "Llcz;", "<init>"
+)
+@CompactHeaderCompatibility
+@Version("0.0.1")
+object CompactHeaderConstructorFingerprint : MethodFingerprint(
+    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf("L", "L", "L", "L", "L"), listOf(
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.CONST,
+        Opcode.CONST_4,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CHECK_CAST
+    )
+)

src/main/kotlin/app/revanced/patches/music/layout/compactheader/patch/CompactHeaderPatch.kt

@@ -0,0 +1,41 @@
+package app.revanced.patches.music.layout.compactheader.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patches.music.layout.compactheader.annotations.CompactHeaderCompatibility
+import app.revanced.patches.music.layout.compactheader.fingerprints.CompactHeaderConstructorFingerprint
+import org.jf.dexlib2.builder.instruction.BuilderInstruction11x
+
+@Patch(false)
+@Name("compact-header")
+@Description("Hides the music category bar at the top of the homepage.")
+@CompactHeaderCompatibility
+@Version("0.0.1")
+class CompactHeaderPatch : BytecodePatch(
+    listOf(
+        CompactHeaderConstructorFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        val result = CompactHeaderConstructorFingerprint.result!!
+        val method = result.mutableMethod
+
+        val insertIndex = result.patternScanResult!!.endIndex
+        val register = (method.implementation!!.instructions[insertIndex - 1] as BuilderInstruction11x).registerA
+        method.addInstructions(
+            insertIndex, """
+                const/16 v0, 0x8
+                invoke-virtual {v${register}, v0}, Landroid/view/View;->setVisibility(I)V
+            """
+        )
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/annotations/MinimizedPlaybackCompatibility.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.music.layout.minimizedplayback.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.apps.youtube.music", arrayOf("5.14.53")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class MinimizedPlaybackCompatibility

src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/fingerprints/MinimizedPlaybackManagerFingerprint.kt

@@ -0,0 +1,36 @@
+package app.revanced.patches.music.layout.minimizedplayback.fingerprints
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
+import app.revanced.patches.music.layout.minimizedplayback.annotations.MinimizedPlaybackCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("minimized-playback-manager-fingerprint")
+@MatchingMethod(
+    "Llxw;", "c"
+)
+@MinimizedPlaybackCompatibility
+@Version("0.0.1")
+object MinimizedPlaybackManagerFingerprint : MethodFingerprint(
+    "V",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    listOf("I", "L", "Z"),
+    listOf(
+        Opcode.IGET,
+        Opcode.IF_NE,
+        Opcode.IGET_OBJECT,
+        Opcode.IF_NE,
+        Opcode.IGET_BOOLEAN,
+        Opcode.IF_EQ,
+        Opcode.GOTO,
+        Opcode.RETURN_VOID,
+        Opcode.SGET_OBJECT,
+        Opcode.CONST_4,
+        Opcode.IF_NE,
+        Opcode.IPUT_BOOLEAN,
+    )
+)

src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/patch/MinimizedPlaybackPatch.kt

@@ -0,0 +1,38 @@
+package app.revanced.patches.music.layout.minimizedplayback.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.impl.BytecodeData
+import app.revanced.patcher.data.impl.toMethodWalker
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.impl.BytecodePatch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.music.layout.minimizedplayback.annotations.MinimizedPlaybackCompatibility
+import app.revanced.patches.music.layout.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.reference.MethodReference
+
+@Patch
+@Name("minimized-playback-music")
+@Description("Enables minimized playback on Kids music.")
+@MinimizedPlaybackCompatibility
+@Version("0.0.1")
+class MinimizedPlaybackPatch : BytecodePatch(
+    listOf(
+        MinimizedPlaybackManagerFingerprint
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        MinimizedPlaybackManagerFingerprint.result!!.mutableMethod.addInstructions(
+            0, """
+                return-void
+                """
+        )
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/patch/HideAutoplayButton.kt

@@ -6,7 +6,6 @@ import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.removeInstruction
-import app.revanced.patcher.extensions.replaceInstructions
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.Dependencies
@@ -53,11 +52,15 @@ class HideAutoplayButton : BytecodePatch(
         val autonavInformerMethod = AutonavInformerFingerprint.result!!.mutableMethod
 
         //force disable autoplay since it's hard to do without the button
-        autonavInformerMethod.replaceInstructions(
+        autonavInformerMethod.addInstructions(
             0, """
-            invoke-static {}, Lapp/revanced/integrations/patches/HideAutoplayButtonPatch;->isButtonHidden()Z
-            move-result v0            
+            invoke-static {}, Lapp/revanced/integrations/patches/HideAutoplayButtonPatch;->isButtonShown()Z
+            move-result v0
+            if-nez v0, :hidden
+            const/4 v0, 0x0
             return v0
+            :hidden
+            nop
         """
         )
 

src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/fingerprints/FullscreenViewAdderFingerprint.kt

@@ -2,7 +2,7 @@ package app.revanced.patches.youtube.layout.fullscreenpanels.fingerprints
 
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod
+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.shorts.button.annotations.ShortsButtonCompatibility
@@ -12,21 +12,14 @@ import org.jf.dexlib2.Opcode
 @MatchingMethod(
     "LFullscreenEngagementPanelOverlay;", "e"
 )
-@FuzzyPatternScanMethod(2)
+@DirectPatternScanMethod
 @ShortsButtonCompatibility
 @Version("0.0.1")
 object FullscreenViewAdderFingerprint : MethodFingerprint(
     null,
     null,
-    listOf("L", "L"),
-    listOf(
-        Opcode.GOTO,
-        Opcode.IGET_BOOLEAN,
-        Opcode.IF_EQ,
-        Opcode.GOTO,
-        Opcode.CONST_4,
-        Opcode.INVOKE_VIRTUAL,
-    ),
     null,
-    { it.definingClass.endsWith("FullscreenEngagementPanelOverlay;") }
+    listOf(
+        Opcode.IGET_BOOLEAN
+    )
 )

src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/fingerprints/FullscreenViewAdderParentFingerprint.kt

@@ -0,0 +1,32 @@
+package app.revanced.patches.youtube.layout.fullscreenpanels.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.shorts.button.annotations.ShortsButtonCompatibility
+import org.jf.dexlib2.Opcode
+
+@Name("fullscreen-view-adder-parent-fingerprint")
+@MatchingMethod(
+    "LFullscreenEngagementPanelOverlay;", "e"
+)
+@DirectPatternScanMethod
+@ShortsButtonCompatibility
+@Version("0.0.1")
+object FullscreenViewAdderParentFingerprint : MethodFingerprint(
+    null,
+    null,
+    listOf("L", "L"),
+    listOf(
+        Opcode.GOTO,
+        Opcode.IGET_BOOLEAN,
+        Opcode.IF_EQ,
+        Opcode.GOTO,
+        Opcode.CONST_4,
+        Opcode.INVOKE_VIRTUAL,
+    ),
+    null,
+    { it.definingClass.endsWith("FullscreenEngagementPanelOverlay;") }
+)

src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/patch/FullscreenPanelsRemoverPatch.kt

@@ -5,6 +5,8 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.impl.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.removeInstruction
+import app.revanced.patcher.fingerprint.method.utils.MethodFingerprintUtils.resolve
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
@@ -13,9 +15,8 @@ import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.impl.BytecodePatch
 import app.revanced.patches.youtube.layout.fullscreenpanels.annotations.FullscreenPanelsCompatibility
 import app.revanced.patches.youtube.layout.fullscreenpanels.fingerprints.FullscreenViewAdderFingerprint
+import app.revanced.patches.youtube.layout.fullscreenpanels.fingerprints.FullscreenViewAdderParentFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.MethodReference
 
 @Patch
 @Name("disable-fullscreen-panels")
@@ -25,23 +26,23 @@ import org.jf.dexlib2.iface.reference.MethodReference
 @Version("0.0.1")
 class FullscreenPanelsRemoverPatch : BytecodePatch(
     listOf(
-        FullscreenViewAdderFingerprint
+        FullscreenViewAdderParentFingerprint
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val result = FullscreenViewAdderFingerprint.result
+        val parentResult = FullscreenViewAdderParentFingerprint.result!!
+        FullscreenViewAdderFingerprint.resolve(data, parentResult.method, parentResult.classDef)
+        val result = FullscreenViewAdderParentFingerprint.result
             ?: return PatchResultError("Fingerprint not resolved!")
 
         val method = result.mutableMethod
-        val implementation = method.implementation
-            ?: return PatchResultError("Implementation not found!")
 
-        val visibilityCallIndex = implementation.instructions.withIndex()
-            .first { ((it.value as? ReferenceInstruction)?.reference as? MethodReference)?.name == ("setVisibility") }.index
+        val ifIndex = result.patternScanResult!!.startIndex + 2
 
+        method.removeInstruction(ifIndex)
         method.addInstructions(
-            visibilityCallIndex - 1, """
-            invoke-static { }, Lapp/revanced/integrations/patches/FullscreenPanelsRemoverPatch;->getFullsceenPanelsVisibility()I
+            ifIndex, """
+            invoke-static {}, Lapp/revanced/integrations/patches/FullscreenPanelsRemoverPatch;->getFullscreenPanelsVisibility()I
             move-result p1
         """
         )

src/main/resources/sponsorblock/values/strings.xml

@@ -108,41 +108,6 @@
     <string name="sb_settings">SponsorBlock settings</string>
     <string name="sb_summary">Uses the sponsor.ajay.app API</string>
 
-    <string name="microg_notification_settings">Notification settings</string>
-    <string name="microg_notification_settings_summary">"1. Google device registration and Cloud Messaging need to be enabled for notifications.
-2. ReVanced needs to be shown as registered under Cloud Messaging.
-3. Current State in Cloud Messaging must be Connected."</string>
-    <string name="microg_settings">MicroG settings</string>
-    <string name="revanced_settings">ReVanced settings</string>
-
-    <string name="revanced_seekbar_tapping">Seekbar Tapping</string>
-    <string name="revanced_seekbar_tapping_off">Seekbar Tapping (video progress bar) is disabled</string>
-    <string name="revanced_seekbar_tapping_on">Seekbar Tapping (video progress bar) is enabled</string>
-    <string name="pref_subtitles_scale_normal">Normal</string>
-
-    <string name="litho_shorts_shelf">Shorts Shelf</string>
-    <string name="litho_shorts_shelf_off">Shorts Shelf removal is turned off</string>
-    <string name="litho_shorts_shelf_on">Shorts Shelf removal is turned on</string>
-
-    <string name="revanced_create_button_summary_off">Create Button has default visibility</string>
-    <string name="revanced_create_button_summary_on">Create Button is forcefully disabled</string>
-    <string name="revanced_create_button_title">Create Button</string>
-
-    <string name="litho_community_guidelines">Community Guidelines</string>
-    <string name="litho_community_guidelines_off">Community Guidelines removal is turned off</string>
-    <string name="litho_community_guidelines_on">Community Guidelines removal is turned on</string>
-
-    <string name="revanced_copy_video_url_summary_off">Copy Link Button is hidden from the player overlay</string>
-    <string name="revanced_copy_video_url_summary_on">Copy Link Button is shown in the player overlay</string>
-    <string name="revanced_copy_video_url_timestamp_summary_off">Copy Link Button With Timestamp is hidden from the player overlay</string>
-    <string name="revanced_copy_video_url_timestamp_summary_on">Copy Link Button With Timestamp is shown in the player overlay</string>
-    <string name="revanced_copy_video_url_timestamp_title">Copy Link Button With Timestamp</string>
-    <string name="revanced_copy_video_url_title">Copy Link Button</string>
-
-    <string name="revanced_old_style_quality_settings_title">Quality Settings style</string>
-    <string name="revanced_old_style_quality_settings_summary_off">Using default style video quality settings</string>
-    <string name="revanced_old_style_quality_settings_summary_on">Using old style video quality settings</string>
-
     <string name="general_time_without_sb">Show time without segments</string>
     <string name="general_time_without_sb_sum">This time appears in brackets next to the current time. This shows the total video duration minus any segments.</string>
     <string name="general_whitelisting">Channel whitelisting</string>