Lea/revanced-patches-tasker
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix(YouTube - Enable tablet layout): Respect the original device layout

Browse source
This commit is contained in:
oSumAtrIX 2023-11-23 00:59:32 +01:00
parent da81a19d74
commit b2c5babf3f
No known key found for this signature in database
GPG key ID: A9B3094ACDB604B4
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/main/kotlin/app/revanced/patches/youtube/layout/tablet/EnableTabletLayoutPatch.kt
View file

@ -2,8 +2,11 @@ package app.revanced.patches.youtube.layout.tablet
import app.revanced.extensions.exception import app.revanced.extensions.exception
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
import app.revanced.patcher.extensions.InstructionExtensions.getInstructions
import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patcher.patch.annotation.CompatiblePackage
import app.revanced.patcher.patch.annotation.Patch import app.revanced.patcher.patch.annotation.Patch
@ -13,6 +16,8 @@ import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
import app.revanced.patches.youtube.layout.tablet.fingerprints.GetFormFactorFingerprint import app.revanced.patches.youtube.layout.tablet.fingerprints.GetFormFactorFingerprint
import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
import app.revanced.patches.youtube.misc.settings.SettingsPatch import app.revanced.patches.youtube.misc.settings.SettingsPatch
import com.android.tools.smali.dexlib2.Opcode
import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction10x
@Patch( @Patch(
name = "Enable tablet layout", name = "Enable tablet layout",
@ -37,18 +42,28 @@ object EnableTabletLayoutPatch : BytecodePatch(
GetFormFactorFingerprint.result?.let { GetFormFactorFingerprint.result?.let {
it.mutableMethod.apply { it.mutableMethod.apply {
val returnLargeFormFactorIndex = it.scanResult.patternScanResult!!.endIndex - 4 val returnCurrentFormFactorIndex = getInstructions().lastIndex - 2
val returnIsLargeFormFactorLabel = getInstruction(returnCurrentFormFactorIndex - 2)
val returnFormFactorIndex = getInstruction(returnCurrentFormFactorIndex)
val insertIndex = returnCurrentFormFactorIndex + 1
// Replace the labeled instruction with a nop and add the preserved instructions back
replaceInstruction(returnCurrentFormFactorIndex, BuilderInstruction10x(Opcode.NOP))
addInstruction(insertIndex, returnFormFactorIndex)
// Because the labeled instruction is now a nop, we can add our own instructions right after it
addInstructionsWithLabels( addInstructionsWithLabels(
0, insertIndex,
""" """
invoke-static {}, Lapp/revanced/integrations/patches/EnableTabletLayoutPatch;->enableTabletLayout()Z invoke-static { }, Lapp/revanced/integrations/patches/EnableTabletLayoutPatch;->enableTabletLayout()Z
move-result v0 move-result v0 # Free register
if-nez v0, :is_large_form_factor if-nez v0, :is_large_form_factor
""", """,
ExternalLabel( ExternalLabel(
"is_large_form_factor", "is_large_form_factor",
getInstruction(returnLargeFormFactorIndex) returnIsLargeFormFactorLabel
) )
) )
} }