ReVanced/revanced-patches-ex
1
0
Fork 0
mirror of https://github.com/inotia00/revanced-patches.git synced 2025-05-29 13:20:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

add hide-fullscreen-panels patch

Browse Source
This commit is contained in:
inotia00 2023-02-05 12:44:06 +09:00
parent c2cef20998
commit 503ede30d7
8 changed files with 201 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/fullscreenpanels/bytecode/fingerprints/FullscreenViewAdderFingerprint.kt Normal file
View File

@ -0,0 +1,16 @@
package app.revanced.patches.youtube.layout.fullscreen.fullscreenpanels.bytecode.fingerprints
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
import org.jf.dexlib2.Opcode
object FullscreenViewAdderFingerprint : MethodFingerprint(
parameters = listOf("L", "L"),
opcodes = listOf(
Opcode.IGET_BOOLEAN,
Opcode.IF_EQ,
Opcode.GOTO,
Opcode.CONST_4,
Opcode.INVOKE_VIRTUAL
),
customFingerprint = { it.definingClass.endsWith("FullscreenEngagementPanelOverlay;") }
)

60
src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/fullscreenpanels/bytecode/patch/FullscreenButtonContainerBytecodePatch.kt Normal file
View File

@ -0,0 +1,60 @@
package app.revanced.patches.youtube.layout.fullscreen.fullscreenpanels.bytecode.patch
import app.revanced.patcher.annotation.Name
import app.revanced.patcher.annotation.Version
import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patcher.patch.PatchResult
import app.revanced.patcher.patch.annotations.DependsOn
import app.revanced.shared.annotation.YouTubeCompatibility
import app.revanced.shared.extensions.findMutableMethodOf
import app.revanced.shared.extensions.injectHideCall
import app.revanced.shared.extensions.toResult
import app.revanced.shared.patches.mapping.ResourceMappingPatch
import org.jf.dexlib2.Opcode
import org.jf.dexlib2.iface.instruction.formats.Instruction21c
import org.jf.dexlib2.iface.instruction.formats.Instruction31i
@Name("hide-fullscreen-buttoncontainer-bytecode-patch")
@DependsOn([ResourceMappingPatch::class])
@YouTubeCompatibility
@Version("0.0.1")
class FullscreenButtonContainerBytecodePatch : BytecodePatch() {
private val resourceIds = arrayOf(
"quick_actions_element_container"
).map { name ->
ResourceMappingPatch.resourceMappings.single { it.name == name }.id
}
private var patchSuccessArray = Array(resourceIds.size) {false}
override fun execute(context: BytecodeContext): PatchResult {
context.classes.forEach { classDef ->
classDef.methods.forEach { method ->
with(method.implementation) {
this?.instructions?.forEachIndexed { index, instruction ->
when (instruction.opcode) {
Opcode.CONST -> {
when ((instruction as Instruction31i).wideLiteral) {
resourceIds[0] -> { // fullscreen panel
val insertIndex = index + 3
val invokeInstruction = instructions.elementAt(insertIndex)
if (invokeInstruction.opcode != Opcode.CHECK_CAST) return@forEachIndexed
val mutableMethod = context.proxy(classDef).mutableClass.findMutableMethodOf(method)
val viewRegister = (invokeInstruction as Instruction21c).registerA
mutableMethod.implementation!!.injectHideCall(insertIndex, viewRegister, "layout/FullscreenLayoutPatch", "hideFullscreenPanels")
patchSuccessArray[0] = true;
}
}
}
else -> return@forEachIndexed
}
}
}
}
}
return toResult(patchSuccessArray.indexOf(false))
}
}

66
src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/fullscreenpanels/bytecode/patch/HideFullscreenPanelsBytecodePatch.kt Normal file
View File

@ -0,0 +1,66 @@
package app.revanced.patches.youtube.layout.fullscreen.fullscreenpanels.bytecode.patch
import app.revanced.patcher.annotation.Name
import app.revanced.patcher.annotation.Version
import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.addInstructions
import app.revanced.patcher.extensions.instruction
import app.revanced.patcher.extensions.removeInstruction
import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patcher.patch.PatchResult
import app.revanced.patcher.patch.PatchResultSuccess
import app.revanced.patcher.util.smali.ExternalLabel
import app.revanced.patches.youtube.layout.fullscreen.fullscreenpanels.bytecode.fingerprints.FullscreenViewAdderFingerprint
import app.revanced.shared.annotation.YouTubeCompatibility
import app.revanced.shared.extensions.toErrorResult
import app.revanced.shared.fingerprints.LayoutConstructorFingerprint
import app.revanced.shared.util.integrations.Constants.FULLSCREEN_LAYOUT
import org.jf.dexlib2.Opcode
import org.jf.dexlib2.builder.instruction.BuilderInstruction35c
import org.jf.dexlib2.iface.instruction.formats.Instruction35c
@Name("hide-fullscreen-panels-bytecode-patch")
@YouTubeCompatibility
@Version("0.0.1")
class HideFullscreenPanelsBytecodePatch : BytecodePatch(
listOf(
FullscreenViewAdderFingerprint,
LayoutConstructorFingerprint
)
) {
override fun execute(context: BytecodeContext): PatchResult {
FullscreenViewAdderFingerprint.result?.let {
with (it.mutableMethod) {
val endIndex = it.scanResult.patternScanResult!!.endIndex
val register = (implementation!!.instructions[endIndex] as Instruction35c).registerD
for (i in 1..3) removeInstruction(endIndex - i)
addInstructions(
endIndex - 3, """
invoke-static {}, $FULLSCREEN_LAYOUT->hideFullscreenPanels()I
move-result v$register
"""
)
}
} ?: return FullscreenViewAdderFingerprint.toErrorResult()
LayoutConstructorFingerprint.result?.mutableMethod?.let { method ->
val invokeIndex = method.implementation!!.instructions.indexOfFirst {
it.opcode.ordinal == Opcode.INVOKE_VIRTUAL.ordinal &&
((it as? BuilderInstruction35c)?.reference.toString() ==
"Landroid/widget/FrameLayout;->addView(Landroid/view/View;)V")
}
method.addInstructions(
invokeIndex, """
invoke-static {}, $FULLSCREEN_LAYOUT->hideFullscreenPanel()Z
move-result v15
if-nez v15, :hidden
""", listOf(ExternalLabel("hidden", method.instruction(invokeIndex + 1)))
)
} ?: return LayoutConstructorFingerprint.toErrorResult()
return PatchResultSuccess()
}
}

51
src/main/kotlin/app/revanced/patches/youtube/layout/fullscreen/fullscreenpanels/resource/patch/HideFullscreenPanelsPatch.kt Normal file
View File

@ -0,0 +1,51 @@
package app.revanced.patches.youtube.layout.fullscreen.fullscreenpanels.resource.patch
import app.revanced.patcher.annotation.Description
import app.revanced.patcher.annotation.Name
import app.revanced.patcher.annotation.Version
import app.revanced.patcher.data.ResourceContext
import app.revanced.patcher.patch.annotations.DependsOn
import app.revanced.patcher.patch.annotations.Patch
import app.revanced.patcher.patch.PatchResult
import app.revanced.patcher.patch.PatchResultSuccess
import app.revanced.patcher.patch.ResourcePatch
import app.revanced.patches.youtube.layout.fullscreen.fullscreenpanels.bytecode.patch.HideFullscreenPanelsBytecodePatch
import app.revanced.patches.youtube.layout.fullscreen.fullscreenpanels.bytecode.patch.FullscreenButtonContainerBytecodePatch
import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
import app.revanced.shared.annotation.YouTubeCompatibility
import app.revanced.shared.util.resources.ResourceHelper
@Patch
@Name("hide-fullscreen-panels")
@Description("Hides video description and comments panel in fullscreen view.")
@DependsOn(
[
FullscreenButtonContainerBytecodePatch::class,
HideFullscreenPanelsBytecodePatch::class,
SettingsPatch::class
]
)
@YouTubeCompatibility
@Version("0.0.1")
class HideFullscreenPanelsPatch : ResourcePatch {
override fun execute(context: ResourceContext): PatchResult {
/*
add settings
*/
ResourceHelper.addSettings2(
context,
"PREFERENCE_CATEGORY: REVANCED_SETTINGS",
"PREFERENCE: LAYOUT_SETTINGS",
"PREFERENCE_HEADER: FULLSCREEN",
"SETTINGS: HIDE_FULLSCREEN_PANELS"
)
ResourceHelper.patchSuccess(
context,
"hide-fullscreen-panels"
)
return PatchResultSuccess()
}
}

2
src/main/kotlin/app/revanced/patches/youtube/layout/player/autoplaybutton/bytecode/patch/HideAutoplayButtonBytecodePatch.kt
View File

@ -9,9 +9,9 @@ import app.revanced.patcher.patch.PatchResult
import app.revanced.patcher.patch.PatchResultSuccess
import app.revanced.patcher.patch.annotations.DependsOn
import app.revanced.patcher.util.smali.ExternalLabel
import app.revanced.patches.youtube.layout.player.autoplaybutton.bytecode.fingerprints.LayoutConstructorFingerprint
import app.revanced.shared.annotation.YouTubeCompatibility
import app.revanced.shared.extensions.toErrorResult
import app.revanced.shared.fingerprints.LayoutConstructorFingerprint
import app.revanced.shared.patches.mapping.ResourceMappingPatch
import app.revanced.shared.util.integrations.Constants.PLAYER_LAYOUT
import org.jf.dexlib2.iface.instruction.Instruction

2
src/main/kotlin/app/revanced/patches/youtube/layout/player/autoplaybutton/bytecode/fingerprints/LayoutConstructorFingerprint.kt → src/main/kotlin/app/revanced/shared/fingerprints/LayoutConstructorFingerprint.kt
View File

@ -1,4 +1,4 @@
package app.revanced.patches.youtube.layout.player.autoplaybutton.bytecode.fingerprints
package app.revanced.shared.fingerprints
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

3
src/main/resources/youtube/settings/host/values/strings.xml
View File

@ -331,6 +331,9 @@ Is it ready to submit?"</string>
<string name="revanced_hide_filmstrip_overlay_summary_off">Film strip overlay are shown</string>
<string name="revanced_hide_filmstrip_overlay_summary_on">Film strip overlay are hidden</string>
<string name="revanced_hide_filmstrip_overlay_title">Hide film strip overlay</string>
<string name="revanced_hide_fullscreen_panels_summary_off">Fullscreen panels are shown</string>
<string name="revanced_hide_fullscreen_panels_summary_on">Fullscreen panels are hidden</string>
<string name="revanced_hide_fullscreen_panels_title">Hide fullscreen panels</string>
<string name="revanced_hide_info_cards_summary_off">Info cards are shown</string>
<string name="revanced_hide_info_cards_summary_on">Info cards are hidden</string>
<string name="revanced_hide_info_cards_title">Hide info cards</string>

3
src/main/resources/youtube/settings/xml/revanced_prefs.xml
View File

@ -185,6 +185,8 @@
<!-- PREFERENCE_HEADER: FULLSCREEN
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_layout_settings_fullscreen" />PREFERENCE_HEADER: FULLSCREEN -->
<!-- SETTINGS: HIDE_FULLSCREEN_PANELS
<SwitchPreference android:title="@string/revanced_hide_fullscreen_panels_title" android:key="revanced_hide_fullscreen_panels" android:defaultValue="true" android:summaryOn="@string/revanced_hide_fullscreen_panels_summary_on" android:summaryOff="@string/revanced_hide_fullscreen_panels_summary_off" />SETTINGS: HIDE_FULLSCREEN_PANELS -->
<!-- SETTINGS: HIDE_ENDSCREEN_OVERLAY
<SwitchPreference android:title="@string/revanced_hide_endscreen_overlay_title" android:key="revanced_hide_endscreen_overlay" android:defaultValue="false" android:summaryOn="@string/revanced_hide_endscreen_overlay_summary_on" android:summaryOff="@string/revanced_hide_endscreen_overlay_summary_off" />SETTINGS: HIDE_ENDSCREEN_OVERLAY -->
@ -386,6 +388,7 @@
<Preference android:title="hide-player-overlay-filter" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_layout_settings_fullscreen" />
<Preference android:title="hide-fullscreen-panels" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="hide-endscreen-overlay" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="hide-filmstrip-overlay" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="disable-haptic-feedback" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>