mirror of
https://github.com/revanced/revanced-patches
synced 2024-12-04 21:22:54 +01:00
fix(hide-create-button): increase patching compatibility across versions
Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>
This commit is contained in:
oSumAtrIX
parent
e3b32800ff
commit
99800ac558
@ -1,79 +0,0 @@
|
|||||||
package app.revanced.patches.youtube.layout.createbutton.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.addInstruction
|
|
||||||
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.patcher.patch.impl.BytecodePatch
|
|
||||||
import app.revanced.patches.youtube.layout.createbutton.annotations.CreateButtonCompatibility
|
|
||||||
import app.revanced.patches.youtube.layout.createbutton.fingerprints.CreateButtonFingerprint
|
|
||||||
import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
|
|
||||||
import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
|
|
||||||
import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
|
|
||||||
import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
|
|
||||||
import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
|
|
||||||
import org.jf.dexlib2.Opcode
|
|
||||||
import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
|
|
||||||
import org.jf.dexlib2.iface.instruction.ReferenceInstruction
|
|
||||||
import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
|
|
||||||
import org.jf.dexlib2.iface.reference.MethodReference
|
|
||||||
|
|
||||||
@Patch
|
|
||||||
@DependsOn([IntegrationsPatch::class, ResourceIdMappingProviderResourcePatch::class, SettingsPatch::class])
|
|
||||||
@Name("disable-create-button")
|
|
||||||
@Description("Hides the create button in the navigation bar.")
|
|
||||||
@CreateButtonCompatibility
|
|
||||||
@Version("0.0.1")
|
|
||||||
class CreateButtonRemoverPatch : BytecodePatch(
|
|
||||||
listOf(
|
|
||||||
CreateButtonFingerprint
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
override fun execute(data: BytecodeData): PatchResult {
|
|
||||||
SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
|
|
||||||
SwitchPreference(
|
|
||||||
"revanced_create_button_enabled",
|
|
||||||
StringResource("revanced_create_button_enabled_title", "Show create button"),
|
|
||||||
false,
|
|
||||||
StringResource("revanced_create_button_summary_on", "Create button is shown"),
|
|
||||||
StringResource("revanced_create_button_summary_off", "Create button is hidden")
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
val result = CreateButtonFingerprint.result!!
|
|
||||||
|
|
||||||
// Get the required register which holds the view object we need to pass to the method hideCreateButton
|
|
||||||
val implementation = result.mutableMethod.implementation!!
|
|
||||||
|
|
||||||
val imageOnlyLayout =
|
|
||||||
ResourceIdMappingProviderResourcePatch.resourceMappings.single { it.type == "layout" && it.name == "image_only_tab" }
|
|
||||||
|
|
||||||
val imageOnlyLayoutConstIndex =
|
|
||||||
implementation.instructions.indexOfFirst { (it as? WideLiteralInstruction)?.wideLiteral == imageOnlyLayout.id }
|
|
||||||
|
|
||||||
val (instructionIndex, instruction) = implementation.instructions.drop(imageOnlyLayoutConstIndex).withIndex()
|
|
||||||
.first {
|
|
||||||
(((it.value as? ReferenceInstruction)?.reference) as? MethodReference)?.definingClass?.contains("PivotBar")
|
|
||||||
?: false
|
|
||||||
}
|
|
||||||
|
|
||||||
if (instruction.opcode != Opcode.INVOKE_VIRTUAL) return PatchResultError("Could not find the correct instruction")
|
|
||||||
|
|
||||||
val moveResultIndex = imageOnlyLayoutConstIndex + instructionIndex + 1
|
|
||||||
val moveResultInstruction = implementation.instructions[moveResultIndex] as OneRegisterInstruction
|
|
||||||
|
|
||||||
// Hide the button view via proxy by passing it to the hideCreateButton method
|
|
||||||
result.mutableMethod.addInstruction(
|
|
||||||
moveResultIndex + 1,
|
|
||||||
"invoke-static { v${moveResultInstruction.registerA} }, Lapp/revanced/integrations/patches/HideCreateButtonPatch;->hideCreateButton(Landroid/view/View;)V"
|
|
||||||
)
|
|
||||||
|
|
||||||
return PatchResultSuccess()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Version
|
|||||||
import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
|
import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
|
||||||
import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
|
import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
|
||||||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
||||||
import app.revanced.patches.youtube.layout.shorts.button.annotations.ShortsButtonCompatibility
|
import app.revanced.patches.youtube.layout.pivotbar.shortsbutton.annotations.ShortsButtonCompatibility
|
||||||
import org.jf.dexlib2.Opcode
|
import org.jf.dexlib2.Opcode
|
||||||
|
|
||||||
@Name("fullscreen-view-adder-fingerprint")
|
@Name("fullscreen-view-adder-fingerprint")
|
||||||
|
|||||||
@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Version
|
|||||||
import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
|
import app.revanced.patcher.fingerprint.method.annotation.DirectPatternScanMethod
|
||||||
import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
|
import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
|
||||||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
||||||
import app.revanced.patches.youtube.layout.shorts.button.annotations.ShortsButtonCompatibility
|
import app.revanced.patches.youtube.layout.pivotbar.shortsbutton.annotations.ShortsButtonCompatibility
|
||||||
import org.jf.dexlib2.Opcode
|
import org.jf.dexlib2.Opcode
|
||||||
|
|
||||||
@Name("fullscreen-view-adder-parent-fingerprint")
|
@Name("fullscreen-view-adder-parent-fingerprint")
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
package app.revanced.patches.youtube.layout.createbutton.annotations
|
package app.revanced.patches.youtube.layout.pivotbar.createbutton.annotations
|
||||||
|
|
||||||
import app.revanced.patcher.annotation.Compatibility
|
import app.revanced.patcher.annotation.Compatibility
|
||||||
import app.revanced.patcher.annotation.Package
|
import app.revanced.patcher.annotation.Package
|
||||||
@ -0,0 +1,24 @@
|
|||||||
|
package app.revanced.patches.youtube.layout.pivotbar.createbutton.fingerprints
|
||||||
|
|
||||||
|
import app.revanced.patcher.annotation.Name
|
||||||
|
import app.revanced.patcher.annotation.Version
|
||||||
|
import app.revanced.patcher.fingerprint.method.annotation.MatchingMethod
|
||||||
|
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
||||||
|
import app.revanced.patches.youtube.layout.pivotbar.createbutton.annotations.CreateButtonCompatibility
|
||||||
|
import org.jf.dexlib2.Opcode
|
||||||
|
|
||||||
|
@Name("pivot-bar-create-button-view-fingerprint")
|
||||||
|
@MatchingMethod(
|
||||||
|
"Lknw", "z"
|
||||||
|
)
|
||||||
|
@CreateButtonCompatibility
|
||||||
|
@Version("0.0.1")
|
||||||
|
object PivotBarCreateButtonViewFingerprint : MethodFingerprint(
|
||||||
|
opcodes = listOf(
|
||||||
|
Opcode.INVOKE_DIRECT_RANGE, // unique instruction anchor
|
||||||
|
Opcode.CONST_4,
|
||||||
|
Opcode.INVOKE_VIRTUAL,
|
||||||
|
Opcode.MOVE_RESULT_OBJECT,
|
||||||
|
Opcode.INVOKE_STATIC
|
||||||
|
)
|
||||||
|
)
|
||||||
@ -0,0 +1,72 @@
|
|||||||
|
package app.revanced.patches.youtube.layout.pivotbar.createbutton.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.MethodFingerprintExtensions.name
|
||||||
|
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
|
||||||
|
import app.revanced.patcher.patch.annotations.DependsOn
|
||||||
|
import app.revanced.patcher.patch.annotations.Patch
|
||||||
|
import app.revanced.patcher.patch.impl.BytecodePatch
|
||||||
|
import app.revanced.patches.youtube.layout.pivotbar.InjectionUtils.REGISTER_TEMPLATE_REPLACEMENT
|
||||||
|
import app.revanced.patches.youtube.layout.pivotbar.InjectionUtils.injectHook
|
||||||
|
import app.revanced.patches.youtube.layout.pivotbar.createbutton.annotations.CreateButtonCompatibility
|
||||||
|
import app.revanced.patches.youtube.layout.pivotbar.createbutton.fingerprints.PivotBarCreateButtonViewFingerprint
|
||||||
|
import app.revanced.patches.youtube.layout.pivotbar.fingerprints.PivotBarFingerprint
|
||||||
|
import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
|
||||||
|
import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
|
||||||
|
import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
|
||||||
|
import app.revanced.patches.youtube.misc.settings.framework.components.impl.StringResource
|
||||||
|
import app.revanced.patches.youtube.misc.settings.framework.components.impl.SwitchPreference
|
||||||
|
|
||||||
|
@Patch
|
||||||
|
@DependsOn([IntegrationsPatch::class, ResourceIdMappingProviderResourcePatch::class, SettingsPatch::class])
|
||||||
|
@Name("hide-create-button")
|
||||||
|
@Description("Hides the create button in the navigation bar.")
|
||||||
|
@CreateButtonCompatibility
|
||||||
|
@Version("0.0.1")
|
||||||
|
class CreateButtonRemoverPatch : BytecodePatch(
|
||||||
|
listOf(
|
||||||
|
PivotBarFingerprint
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
override fun execute(data: BytecodeData): PatchResult {
|
||||||
|
SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
|
||||||
|
SwitchPreference(
|
||||||
|
"revanced_create_button_enabled",
|
||||||
|
StringResource("revanced_create_button_enabled_title", "Show create button"),
|
||||||
|
false,
|
||||||
|
StringResource("revanced_create_button_summary_on", "Create button is shown"),
|
||||||
|
StringResource("revanced_create_button_summary_off", "Create button is hidden")
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Resolve fingerprints
|
||||||
|
*/
|
||||||
|
|
||||||
|
val pivotBarResult = PivotBarFingerprint.result ?: return PatchResultError("PivotBarFingerprint failed")
|
||||||
|
|
||||||
|
if (!PivotBarCreateButtonViewFingerprint.resolve(data, pivotBarResult.method, pivotBarResult.classDef))
|
||||||
|
return PatchResultError("${PivotBarCreateButtonViewFingerprint.name} failed")
|
||||||
|
|
||||||
|
val createButtonResult = PivotBarCreateButtonViewFingerprint.result!!
|
||||||
|
val insertIndex = createButtonResult.patternScanResult!!.endIndex
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Inject hooks
|
||||||
|
*/
|
||||||
|
|
||||||
|
val integrationsClass = "Lapp/revanced/integrations/patches/HideCreateButtonPatch;"
|
||||||
|
val hook =
|
||||||
|
"invoke-static { v$REGISTER_TEMPLATE_REPLACEMENT }, $integrationsClass->hideCreateButton(Landroid/view/View;)V"
|
||||||
|
|
||||||
|
createButtonResult.mutableMethod.injectHook(hook, insertIndex)
|
||||||
|
|
||||||
|
return PatchResultSuccess()
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user