mirror of
https://github.com/revanced/revanced-patches
synced 2024-09-03 21:15:26 +02:00
feat: hide-shorts-button
patch
This commit is contained in:
parent
1a49bbdbc4
commit
88352ee6ec
@ -6,6 +6,7 @@ import app.revanced.patches.ad.HomePromoPatch
|
|||||||
import app.revanced.patches.ad.VideoAdsPatch
|
import app.revanced.patches.ad.VideoAdsPatch
|
||||||
import app.revanced.patches.interaction.EnableSeekbarTappingPatch
|
import app.revanced.patches.interaction.EnableSeekbarTappingPatch
|
||||||
import app.revanced.patches.layout.CreateButtonRemoverPatch
|
import app.revanced.patches.layout.CreateButtonRemoverPatch
|
||||||
|
import app.revanced.patches.layout.ShortsButtonRemoverPatch
|
||||||
import app.revanced.patches.layout.HideReelsPatch
|
import app.revanced.patches.layout.HideReelsPatch
|
||||||
import app.revanced.patches.layout.MinimizedPlaybackPatch
|
import app.revanced.patches.layout.MinimizedPlaybackPatch
|
||||||
import app.revanced.patches.layout.OldQualityLayoutPatch
|
import app.revanced.patches.layout.OldQualityLayoutPatch
|
||||||
@ -27,6 +28,7 @@ object Index {
|
|||||||
::HomePromoPatch,
|
::HomePromoPatch,
|
||||||
::MinimizedPlaybackPatch,
|
::MinimizedPlaybackPatch,
|
||||||
::CreateButtonRemoverPatch,
|
::CreateButtonRemoverPatch,
|
||||||
|
::ShortsButtonRemoverPatch,
|
||||||
::HideReelsPatch,
|
::HideReelsPatch,
|
||||||
::OldQualityLayoutPatch,
|
::OldQualityLayoutPatch,
|
||||||
::EnableSeekbarTappingPatch
|
::EnableSeekbarTappingPatch
|
||||||
|
@ -0,0 +1,134 @@
|
|||||||
|
package app.revanced.patches.layout
|
||||||
|
|
||||||
|
import app.revanced.patcher.PatcherData
|
||||||
|
import app.revanced.patcher.extensions.or
|
||||||
|
import app.revanced.patcher.patch.*
|
||||||
|
import app.revanced.patcher.signature.MethodMetadata
|
||||||
|
import app.revanced.patcher.signature.MethodSignature
|
||||||
|
import app.revanced.patcher.signature.MethodSignatureMetadata
|
||||||
|
import app.revanced.patcher.signature.PatternScanMethod
|
||||||
|
import app.revanced.patcher.smali.toInstruction
|
||||||
|
import org.jf.dexlib2.AccessFlags
|
||||||
|
import org.jf.dexlib2.Opcode
|
||||||
|
import org.jf.dexlib2.iface.instruction.formats.Instruction35c
|
||||||
|
import org.jf.dexlib2.iface.instruction.formats.Instruction3rc
|
||||||
|
import org.jf.dexlib2.iface.instruction.formats.Instruction11x
|
||||||
|
import org.jf.dexlib2.builder.instruction.BuilderInstruction32x
|
||||||
|
|
||||||
|
private val compatiblePackages = listOf(
|
||||||
|
PackageMetadata(
|
||||||
|
"com.google.android.youtube",
|
||||||
|
listOf("17.14.35")
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
class ShortsButtonRemoverPatch : Patch(
|
||||||
|
PatchMetadata(
|
||||||
|
"shorts-button",
|
||||||
|
"Shorts button patch",
|
||||||
|
"Hide the shorts button.",
|
||||||
|
compatiblePackages,
|
||||||
|
"0.0.1"
|
||||||
|
),
|
||||||
|
listOf(
|
||||||
|
MethodSignature(
|
||||||
|
MethodSignatureMetadata(
|
||||||
|
"pivotbar-buttons-method-tabenum",
|
||||||
|
MethodMetadata(null, null), // unknown
|
||||||
|
PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
|
||||||
|
compatiblePackages,
|
||||||
|
"Signature for the pivotbar method that creates all button views.",
|
||||||
|
"0.0.1"
|
||||||
|
),
|
||||||
|
"V",
|
||||||
|
AccessFlags.PUBLIC or AccessFlags.FINAL,
|
||||||
|
listOf("Z"),
|
||||||
|
listOf(
|
||||||
|
Opcode.CHECK_CAST,
|
||||||
|
Opcode.IGET_OBJECT,
|
||||||
|
Opcode.IF_NEZ,
|
||||||
|
Opcode.SGET_OBJECT,
|
||||||
|
Opcode.IGET,
|
||||||
|
Opcode.INVOKE_STATIC,
|
||||||
|
Opcode.MOVE_RESULT_OBJECT,
|
||||||
|
Opcode.IF_NEZ,
|
||||||
|
Opcode.SGET_OBJECT,
|
||||||
|
Opcode.INVOKE_VIRTUAL,
|
||||||
|
Opcode.MOVE_RESULT,
|
||||||
|
Opcode.IGET_OBJECT,
|
||||||
|
Opcode.CHECK_CAST,
|
||||||
|
Opcode.IGET_OBJECT,
|
||||||
|
Opcode.IF_NEZ,
|
||||||
|
Opcode.SGET_OBJECT,
|
||||||
|
Opcode.IGET,
|
||||||
|
Opcode.INVOKE_STATIC, // SomeEnum.fromValue(tabOrdinal)
|
||||||
|
Opcode.MOVE_RESULT_OBJECT
|
||||||
|
)
|
||||||
|
),
|
||||||
|
MethodSignature(
|
||||||
|
MethodSignatureMetadata(
|
||||||
|
"pivotbar-buttons-method-view",
|
||||||
|
MethodMetadata(null, null), // unknown
|
||||||
|
PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
|
||||||
|
compatiblePackages,
|
||||||
|
"Signature for the pivotbar method that creates all button views.",
|
||||||
|
"0.0.1"
|
||||||
|
),
|
||||||
|
"V",
|
||||||
|
AccessFlags.PUBLIC or AccessFlags.FINAL,
|
||||||
|
listOf("Z"),
|
||||||
|
listOf(
|
||||||
|
Opcode.NEW_INSTANCE, // new StateListDrawable()
|
||||||
|
Opcode.INVOKE_DIRECT,
|
||||||
|
Opcode.NEW_ARRAY,
|
||||||
|
Opcode.CONST,
|
||||||
|
Opcode.CONST_16,
|
||||||
|
Opcode.APUT,
|
||||||
|
Opcode.INVOKE_VIRTUAL,
|
||||||
|
Opcode.MOVE_RESULT_OBJECT,
|
||||||
|
Opcode.INVOKE_STATIC,
|
||||||
|
Opcode.MOVE_RESULT_OBJECT,
|
||||||
|
Opcode.INVOKE_VIRTUAL,
|
||||||
|
Opcode.SGET_OBJECT,
|
||||||
|
Opcode.INVOKE_VIRTUAL,
|
||||||
|
Opcode.MOVE_RESULT_OBJECT,
|
||||||
|
Opcode.INVOKE_STATIC,
|
||||||
|
Opcode.MOVE_RESULT_OBJECT,
|
||||||
|
Opcode.INVOKE_VIRTUAL,
|
||||||
|
Opcode.MOVE_OBJECT,
|
||||||
|
Opcode.MOVE_OBJECT,
|
||||||
|
Opcode.MOVE,
|
||||||
|
Opcode.MOVE_OBJECT,
|
||||||
|
Opcode.INVOKE_VIRTUAL_RANGE, // pivotBar.getView(drawable, tabName, z, i, map, akebVar, optional)
|
||||||
|
Opcode.MOVE_RESULT_OBJECT,
|
||||||
|
)
|
||||||
|
),
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
override fun execute(patcherData: PatcherData): PatchResult {
|
||||||
|
val result1 = signatures.first().result!!
|
||||||
|
val implementation1 = result1.method.implementation!!
|
||||||
|
val moveEnumInstruction = implementation1.instructions[result1.scanData.endIndex]
|
||||||
|
val enumRegister = (moveEnumInstruction as Instruction11x).registerA
|
||||||
|
|
||||||
|
val result2 = signatures.last().result!!
|
||||||
|
val implementation2 = result2.method.implementation!!
|
||||||
|
val moveViewInstruction = implementation2.instructions[result2.scanData.endIndex]
|
||||||
|
val viewRegister = (moveViewInstruction as Instruction11x).registerA
|
||||||
|
|
||||||
|
// Save the tab enum in XGlobals to avoid smali/register workarounds
|
||||||
|
implementation1.addInstruction(
|
||||||
|
result1.scanData.endIndex + 1,
|
||||||
|
"sput-object v$enumRegister, Lfi/razerman/youtube/XGlobals;->lastPivotTab:Ljava/lang/Enum;".toInstruction()
|
||||||
|
)
|
||||||
|
|
||||||
|
// Hide the button view via proxy by passing it to the hideShortsButton method
|
||||||
|
// It only hides it if the last tab name is "TAB_SHORTS"
|
||||||
|
implementation2.addInstruction(
|
||||||
|
result2.scanData.endIndex + 2,
|
||||||
|
"invoke-static { v$viewRegister }, Lfi/razerman/youtube/XAdRemover;->hideShortsButton(Landroid/view/View;)V".toInstruction()
|
||||||
|
)
|
||||||
|
|
||||||
|
return PatchResultSuccess()
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user