From 6aac335c401fb6760290c98cb068892e90d02952 Mon Sep 17 00:00:00 2001 From: inotia00 <108592928+inotia00@users.noreply.github.com> Date: Thu, 19 Oct 2023 11:23:44 +0900 Subject: [PATCH] feat(YouTube/Disable haptic feedback): `Disable seek haptic feedback` now also disables `seek undo haptic feedback` --- .../youtube/player/hapticfeedback/HapticFeedBackPatch.kt | 3 +++ .../fingerprints/SeekUndoHapticsFingerprint.kt | 8 ++++++++ .../youtube/shorts/shortscomponent/ShortsToolBarPatch.kt | 6 ++++-- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/fingerprints/SeekUndoHapticsFingerprint.kt diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/HapticFeedBackPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/HapticFeedBackPatch.kt index dc7caef95..d0656e571 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/HapticFeedBackPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/HapticFeedBackPatch.kt @@ -13,6 +13,7 @@ import app.revanced.patcher.util.smali.ExternalLabel import app.revanced.patches.youtube.player.hapticfeedback.fingerprints.MarkerHapticsFingerprint import app.revanced.patches.youtube.player.hapticfeedback.fingerprints.ScrubbingHapticsFingerprint import app.revanced.patches.youtube.player.hapticfeedback.fingerprints.SeekHapticsFingerprint +import app.revanced.patches.youtube.player.hapticfeedback.fingerprints.SeekUndoHapticsFingerprint import app.revanced.patches.youtube.player.hapticfeedback.fingerprints.ZoomHapticsFingerprint import app.revanced.patches.youtube.utils.settings.SettingsPatch import app.revanced.util.integrations.Constants.PLAYER @@ -50,6 +51,7 @@ object HapticFeedBackPatch : BytecodePatch( setOf( MarkerHapticsFingerprint, SeekHapticsFingerprint, + SeekUndoHapticsFingerprint, ScrubbingHapticsFingerprint, ZoomHapticsFingerprint ) @@ -58,6 +60,7 @@ object HapticFeedBackPatch : BytecodePatch( arrayOf( SeekHapticsFingerprint to "disableSeekVibrate", + SeekUndoHapticsFingerprint to "disableSeekVibrate", ScrubbingHapticsFingerprint to "disableScrubbingVibrate", MarkerHapticsFingerprint to "disableChapterVibrate", ZoomHapticsFingerprint to "disableZoomVibrate" diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/fingerprints/SeekUndoHapticsFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/fingerprints/SeekUndoHapticsFingerprint.kt new file mode 100644 index 000000000..4fd07e57e --- /dev/null +++ b/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/fingerprints/SeekUndoHapticsFingerprint.kt @@ -0,0 +1,8 @@ +package app.revanced.patches.youtube.player.hapticfeedback.fingerprints + +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint + +object SeekUndoHapticsFingerprint : MethodFingerprint( + returnType = "V", + strings = listOf("Failed to execute seek undo haptics vibrate.") +) diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/ShortsToolBarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/ShortsToolBarPatch.kt index a0cb8c19f..576868768 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/ShortsToolBarPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/ShortsToolBarPatch.kt @@ -27,11 +27,13 @@ object ShortsToolBarPatch : BytecodePatch( targetMethod.apply { addInstructionsWithLabels( - 0, """ + 0, + """ invoke-static {}, $SHORTS->hideShortsToolBarBanner()Z move-result v0 if-nez v0, :hide - """, ExternalLabel("hide", getInstruction(implementation!!.instructions.size - 1)) + """, + ExternalLabel("hide", getInstruction(implementation!!.instructions.size - 1)) ) } } ?: throw ToolBarBannerFingerprint.exception