From 68d10d4779d3545177fcf48f0aec237a2359b8b1 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Sun, 12 Nov 2023 16:02:06 +0100 Subject: [PATCH] feat(YouTube): Add `Enable slide to seek` patch Implementation references taken from github.com/inotia00/revanced-patches/commit/0ede1987544aa0068f28665c6c029df23a30afe2 --- .../seekbar/EnableSlideToSeekPatch.kt | 82 +++++++++++++++++++ .../DoubleSpeedSeekNoticeFingerprint.kt | 11 +++ .../fingerprints/SlideToSeekFingerprint.kt | 11 +++ 3 files changed, 104 insertions(+) create mode 100644 src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt create mode 100644 src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/DoubleSpeedSeekNoticeFingerprint.kt create mode 100644 src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/SlideToSeekFingerprint.kt diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt new file mode 100644 index 00000000..a7fc4232 --- /dev/null +++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt @@ -0,0 +1,82 @@ +package app.revanced.patches.youtube.interaction.seekbar + +import app.revanced.extensions.exception +import app.revanced.patcher.data.BytecodeContext +import app.revanced.patcher.extensions.InstructionExtensions.addInstructions +import app.revanced.patcher.extensions.InstructionExtensions.getInstruction +import app.revanced.patcher.patch.BytecodePatch +import app.revanced.patcher.patch.annotation.CompatiblePackage +import app.revanced.patcher.patch.annotation.Patch +import app.revanced.patches.shared.settings.preference.impl.StringResource +import app.revanced.patches.shared.settings.preference.impl.SwitchPreference +import app.revanced.patches.youtube.interaction.seekbar.fingerprints.DoubleSpeedSeekNoticeFingerprint +import app.revanced.patches.youtube.interaction.seekbar.fingerprints.SlideToSeekFingerprint +import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch +import app.revanced.patches.youtube.misc.settings.SettingsPatch +import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction + +@Patch( + name = "Enable slide to seek", + description = "Enable slide to seek instead of playing at 2x speed.", + dependencies = [IntegrationsPatch::class, SettingsPatch::class], + compatiblePackages = [ + CompatiblePackage( + "com.google.android.youtube", + [ + "18.43.45", + ] + ) + ] +) +@Suppress("unused") +object EnableSlideToSeekPatch : BytecodePatch( + setOf( + SlideToSeekFingerprint, + DoubleSpeedSeekNoticeFingerprint + ) +) { + const val INTEGRATIONS_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/patches/SlideToSeekPatch;" + + override fun execute(context: BytecodeContext) { + SettingsPatch.PreferenceScreen.INTERACTIONS.addPreferences( + SwitchPreference( + "revanced_slide_to_seek", + StringResource( + "revanced_slide_to_seek_title", + "Enable slide to seek" + ), + StringResource( + "revanced_slide_to_seek_summary_on", + "Slide to seek is enabled" + ), + StringResource( + "revanced_slide_to_seek_summary_off", + "Slide to seek is not enabled" + ), + ) + ) + + arrayOf( + // Restore the behaviour to slide to seek. + SlideToSeekFingerprint, + // Disable the double speed seek notice. + DoubleSpeedSeekNoticeFingerprint + ).map { + it.result ?: throw it.exception + }.forEach { + val insertIndex = it.scanResult.patternScanResult!!.endIndex + 1 + + it.mutableMethod.apply { + val isEnabledRegister = getInstruction(insertIndex).registerA + + addInstructions( + insertIndex, + """ + invoke-static { }, $INTEGRATIONS_CLASS_DESCRIPTOR->isSlideToSeekDisabled()Z + move-result v$isEnabledRegister + """ + ) + } + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/DoubleSpeedSeekNoticeFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/DoubleSpeedSeekNoticeFingerprint.kt new file mode 100644 index 00000000..c02ca6b4 --- /dev/null +++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/DoubleSpeedSeekNoticeFingerprint.kt @@ -0,0 +1,11 @@ +package app.revanced.patches.youtube.interaction.seekbar.fingerprints + +import app.revanced.util.patch.LiteralValueFingerprint +import com.android.tools.smali.dexlib2.Opcode + +object DoubleSpeedSeekNoticeFingerprint : LiteralValueFingerprint( + returnType = "Z", + parameters = emptyList(), + opcodes = listOf(Opcode.MOVE_RESULT), + literalSupplier = { 45411330 } +) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/SlideToSeekFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/SlideToSeekFingerprint.kt new file mode 100644 index 00000000..76a97d08 --- /dev/null +++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/fingerprints/SlideToSeekFingerprint.kt @@ -0,0 +1,11 @@ +package app.revanced.patches.youtube.interaction.seekbar.fingerprints + +import app.revanced.util.patch.LiteralValueFingerprint +import com.android.tools.smali.dexlib2.Opcode + +object SlideToSeekFingerprint : LiteralValueFingerprint( + returnType = "Z", + parameters = emptyList(), + opcodes = listOf(Opcode.MOVE_RESULT), + literalSupplier = { 45411329 } +) \ No newline at end of file