feat(youtube/hide-create-button): bump compatibility to v17.45.36

ReVanced · Nov 28, 2022 · 1ca09ff · 1ca09ff
1 parent 18ce2cb
commit 1ca09ff
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 34 deletions.
diff --git a/...ced/patches/youtube/layout/pivotbar/createbutton/annotations/CreateButtonCompatibility.kt b/...ced/patches/youtube/layout/pivotbar/createbutton/annotations/CreateButtonCompatibility.kt
diff --git a/...p/revanced/patches/youtube/layout/pivotbar/createbutton/patch/CreateButtonRemoverPatch.kt b/...p/revanced/patches/youtube/layout/pivotbar/createbutton/patch/CreateButtonRemoverPatch.kt
@@ -4,36 +4,36 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.MethodFingerprintExtensions.name
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchResult
-import app.revanced.patcher.patch.PatchResultError
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.pivotbar.createbutton.annotations.CreateButtonCompatibility
+import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
+import app.revanced.patches.shared.settings.preference.impl.StringResource
+import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+import app.revanced.patches.youtube.layout.pivotbar.annotations.PivotBarCompatibility
 import app.revanced.patches.youtube.layout.pivotbar.createbutton.fingerprints.PivotBarCreateButtonViewFingerprint
-import app.revanced.patches.youtube.layout.pivotbar.fingerprints.PivotBarFingerprint
+import app.revanced.patches.youtube.layout.pivotbar.fingerprints.InitializeButtonsFingerprint
+import app.revanced.patches.youtube.layout.pivotbar.resource.patch.ResolvePivotBarFingerprintsPatch
 import app.revanced.patches.youtube.layout.pivotbar.utils.InjectionUtils.REGISTER_TEMPLATE_REPLACEMENT
 import app.revanced.patches.youtube.layout.pivotbar.utils.InjectionUtils.injectHook
+import app.revanced.patches.youtube.layout.pivotbar.utils.InjectionUtils.toErrorResult
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.shared.settings.preference.impl.StringResource
-import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 
 @Patch
-@DependsOn([IntegrationsPatch::class, ResourceMappingPatch::class, SettingsPatch::class])
+@DependsOn([IntegrationsPatch::class, ResourceMappingPatch::class, SettingsPatch::class, ResolvePivotBarFingerprintsPatch::class])
 @Name("hide-create-button")
 @Description("Hides the create button in the navigation bar.")
-@CreateButtonCompatibility
+@PivotBarCompatibility
 @Version("0.0.1")
-class CreateButtonRemoverPatch : BytecodePatch(
-    listOf(
-        PivotBarFingerprint
-    )
-) {
+class CreateButtonRemoverPatch : BytecodePatch() {
+    private companion object {
+        const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/HideCreateButtonPatch;"
+    }
+
     override fun execute(context: BytecodeContext): PatchResult {
         SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
             SwitchPreference(
@@ -49,10 +49,10 @@ class CreateButtonRemoverPatch : BytecodePatch(
          * Resolve fingerprints
          */
 
-        val pivotBarResult = PivotBarFingerprint.result ?: return PatchResultError("PivotBarFingerprint failed")
-
-        if (!PivotBarCreateButtonViewFingerprint.resolve(context, pivotBarResult.mutableMethod, pivotBarResult.mutableClass))
-            return PatchResultError("${PivotBarCreateButtonViewFingerprint.name} failed")
+        InitializeButtonsFingerprint.result!!.let {
+            if (!PivotBarCreateButtonViewFingerprint.resolve(context, it.mutableMethod, it.mutableClass))
+                return PivotBarCreateButtonViewFingerprint.toErrorResult()
+        }
 
         val createButtonResult = PivotBarCreateButtonViewFingerprint.result!!
         val insertIndex = createButtonResult.scanResult.patternScanResult!!.endIndex
@@ -61,9 +61,8 @@ class CreateButtonRemoverPatch : BytecodePatch(
          * Inject hooks
          */
 
-        val integrationsClass = "Lapp/revanced/integrations/patches/HideCreateButtonPatch;"
-        val hook =
-            "invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, $integrationsClass->hideCreateButton(Landroid/view/View;)V"
+        val hook = "invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, " +
+                "$INTEGRATIONS_CLASS_DESCRIPTOR->hideCreateButton(Landroid/view/View;)V"
 
         createButtonResult.mutableMethod.injectHook(hook, insertIndex)