mirror of
https://github.com/revanced/revanced-patches
synced 2024-11-11 03:39:30 +01:00
feat(YouTube): Add Custom player overlay opacity patch (#2721)
This gets rid of the `Hide player overlay` patch. Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>
This commit is contained in:
johnconner122
GitHub
parent
4f01690cac
commit
2622b008ab
@ -1,8 +1,8 @@
|
||||
package app.revanced.patches.youtube.layout.hide.player.overlay.annotations
|
||||
package app.revanced.patches.youtube.layout.player.overlay.annotations
|
||||
|
||||
import app.revanced.patcher.annotation.Compatibility
|
||||
import app.revanced.patcher.annotation.Package
|
||||
|
||||
@Compatibility([Package("com.google.android.youtube")])
|
||||
@Target(AnnotationTarget.CLASS)
|
||||
internal annotation class HidePlayerOverlayPatchCompatibility
|
||||
internal annotation class PlayerOverlayPatchCompatibility
|
||||
@ -1,9 +1,9 @@
|
||||
package app.revanced.patches.youtube.layout.hide.player.overlay.bytecode.fingerprints
|
||||
package app.revanced.patches.youtube.layout.player.overlay.bytecode.fingerprints
|
||||
|
||||
import app.revanced.extensions.containsConstantInstructionValue
|
||||
import app.revanced.patcher.extensions.or
|
||||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
||||
import app.revanced.patches.youtube.layout.hide.player.overlay.resource.patch.HidePlayerOverlayResourcePatch
|
||||
import app.revanced.patches.youtube.layout.player.overlay.resource.patch.CustomPlayerOverlayOpacityResourcePatch
|
||||
import com.android.tools.smali.dexlib2.AccessFlags
|
||||
import com.android.tools.smali.dexlib2.Opcode
|
||||
|
||||
@ -17,6 +17,6 @@ object CreatePlayerOverviewFingerprint : MethodFingerprint(
|
||||
Opcode.CHECK_CAST
|
||||
),
|
||||
customFingerprint = { methodDef, _ ->
|
||||
methodDef.containsConstantInstructionValue(HidePlayerOverlayResourcePatch.scrimOverlayId)
|
||||
methodDef.containsConstantInstructionValue(CustomPlayerOverlayOpacityResourcePatch.scrimOverlayId)
|
||||
}
|
||||
)
|
||||
@ -1,4 +1,4 @@
|
||||
package app.revanced.patches.youtube.layout.hide.player.overlay.bytecode.patch
|
||||
package app.revanced.patches.youtube.layout.player.overlay.bytecode.patch
|
||||
|
||||
import app.revanced.extensions.indexOfFirstConstantInstructionValue
|
||||
import app.revanced.extensions.exception
|
||||
@ -10,35 +10,36 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
|
||||
import app.revanced.patcher.patch.BytecodePatch
|
||||
import app.revanced.patcher.patch.annotations.DependsOn
|
||||
import app.revanced.patcher.patch.annotations.Patch
|
||||
import app.revanced.patches.youtube.layout.hide.player.overlay.annotations.HidePlayerOverlayPatchCompatibility
|
||||
import app.revanced.patches.youtube.layout.hide.player.overlay.bytecode.fingerprints.CreatePlayerOverviewFingerprint
|
||||
import app.revanced.patches.youtube.layout.hide.player.overlay.resource.patch.HidePlayerOverlayResourcePatch
|
||||
import app.revanced.patches.youtube.layout.player.overlay.annotations.PlayerOverlayPatchCompatibility
|
||||
import app.revanced.patches.youtube.layout.player.overlay.bytecode.fingerprints.CreatePlayerOverviewFingerprint
|
||||
import app.revanced.patches.youtube.layout.player.overlay.resource.patch.CustomPlayerOverlayOpacityResourcePatch
|
||||
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
|
||||
|
||||
@Patch
|
||||
@Name("Hide player overlay")
|
||||
@Description("Hides the dark background overlay from the player when player controls are visible.")
|
||||
@DependsOn([HidePlayerOverlayResourcePatch::class])
|
||||
@HidePlayerOverlayPatchCompatibility
|
||||
class HidePlayerOverlayPatch : BytecodePatch(listOf(CreatePlayerOverviewFingerprint)) {
|
||||
@Name("Custom player overlay opacity")
|
||||
@Description("Change the opacity of the player background, when player controls are visible.")
|
||||
@DependsOn([CustomPlayerOverlayOpacityResourcePatch::class])
|
||||
@PlayerOverlayPatchCompatibility
|
||||
class CustomPlayerOverlayOpacityPatch : BytecodePatch(listOf(CreatePlayerOverviewFingerprint)) {
|
||||
override fun execute(context: BytecodeContext) {
|
||||
CreatePlayerOverviewFingerprint.result?.let { result ->
|
||||
result.mutableMethod.apply {
|
||||
val viewRegisterIndex =
|
||||
indexOfFirstConstantInstructionValue(HidePlayerOverlayResourcePatch.scrimOverlayId) + 3
|
||||
val viewRegister = getInstruction<OneRegisterInstruction>(viewRegisterIndex).registerA
|
||||
indexOfFirstConstantInstructionValue(CustomPlayerOverlayOpacityResourcePatch.scrimOverlayId) + 3
|
||||
val viewRegister =
|
||||
getInstruction<OneRegisterInstruction>(viewRegisterIndex).registerA
|
||||
|
||||
val insertIndex = viewRegisterIndex + 1
|
||||
addInstruction(
|
||||
insertIndex,
|
||||
"invoke-static { v$viewRegister }, " +
|
||||
"$INTEGRATIONS_CLASS_DESCRIPTOR->hidePlayerOverlay(Landroid/widget/ImageView;)V"
|
||||
"$INTEGRATIONS_CLASS_DESCRIPTOR->changeOpacity(Landroid/widget/ImageView;)V"
|
||||
)
|
||||
}
|
||||
} ?: throw CreatePlayerOverviewFingerprint.exception
|
||||
}
|
||||
|
||||
private companion object {
|
||||
const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/HidePlayerOverlayPatch;"
|
||||
const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/CustomPlayerOverlayOpacityPatch;"
|
||||
}
|
||||
}
|
||||
@ -1,22 +1,29 @@
|
||||
package app.revanced.patches.youtube.layout.hide.player.overlay.resource.patch
|
||||
package app.revanced.patches.youtube.layout.player.overlay.resource.patch
|
||||
|
||||
import app.revanced.patcher.data.ResourceContext
|
||||
import app.revanced.patcher.patch.ResourcePatch
|
||||
import app.revanced.patcher.patch.annotations.DependsOn
|
||||
import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
|
||||
import app.revanced.patches.shared.settings.preference.impl.InputType
|
||||
import app.revanced.patches.shared.settings.preference.impl.StringResource
|
||||
import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
|
||||
import app.revanced.patches.shared.settings.preference.impl.TextPreference
|
||||
import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
|
||||
|
||||
@DependsOn([SettingsPatch::class, ResourceMappingPatch::class])
|
||||
class HidePlayerOverlayResourcePatch : ResourcePatch {
|
||||
class CustomPlayerOverlayOpacityResourcePatch : ResourcePatch {
|
||||
override fun execute(context: ResourceContext) {
|
||||
SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
|
||||
SwitchPreference(
|
||||
"revanced_hide_player_overlay",
|
||||
StringResource("revanced_hide_player_overlay_title", "Hide background overlay in player"),
|
||||
StringResource("revanced_hide_player_overlay_summary_on", "Background overlay is hidden"),
|
||||
StringResource("revanced_hide_player_overlay_summary_off", "Background overlay is shown")
|
||||
TextPreference(
|
||||
"revanced_player_overlay_opacity",
|
||||
StringResource(
|
||||
"revanced_player_overlay_opacity_title",
|
||||
"Player overlay opacity"
|
||||
),
|
||||
StringResource(
|
||||
"revanced_player_overlay_opacity_summary",
|
||||
"Opacity value between 0-100, where 0 is transparent"
|
||||
),
|
||||
InputType.NUMBER
|
||||
)
|
||||
)
|
||||
|
||||
@ -26,6 +33,6 @@ class HidePlayerOverlayResourcePatch : ResourcePatch {
|
||||
}
|
||||
|
||||
internal companion object {
|
||||
var scrimOverlayId: Long = -1
|
||||
var scrimOverlayId = -1L
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user