From 4997bde26c851d20c4040290ed72a103483ddbbd Mon Sep 17 00:00:00 2001
From: inotia00 <108592928+inotia00@users.noreply.github.com>
Date: Fri, 20 Oct 2023 09:34:38 +0900
Subject: [PATCH] fix(YouTube/Disable haptic feedback): separate the `Disable
 seek undo haptic feedback` setting from the `Disable seek haptic feedback`
 setting

---
 .../player/hapticfeedback/HapticFeedBackPatch.kt      |  2 +-
 .../youtube/settings/host/values/strings.xml          | 11 +++--------
 .../resources/youtube/settings/xml/revanced_prefs.xml |  9 +++++----
 3 files changed, 9 insertions(+), 13 deletions(-)

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 d0656e571..7fbe00fe9 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
@@ -60,7 +60,7 @@ object HapticFeedBackPatch : BytecodePatch(
 
         arrayOf(
             SeekHapticsFingerprint to "disableSeekVibrate",
-            SeekUndoHapticsFingerprint to "disableSeekVibrate",
+            SeekUndoHapticsFingerprint to "disableSeekUndoVibrate",
             ScrubbingHapticsFingerprint to "disableScrubbingVibrate",
             MarkerHapticsFingerprint to "disableChapterVibrate",
             ZoomHapticsFingerprint to "disableZoomVibrate"
diff --git a/src/main/resources/youtube/settings/host/values/strings.xml b/src/main/resources/youtube/settings/host/values/strings.xml
index 37b00c628..fd52dae1e 100644
--- a/src/main/resources/youtube/settings/host/values/strings.xml
+++ b/src/main/resources/youtube/settings/host/values/strings.xml
@@ -64,17 +64,12 @@
     <string name="revanced_disable_default_playback_speed_live_summary_off">Default playback speed is enabled in live stream</string>
     <string name="revanced_disable_default_playback_speed_live_summary_on">Default playback speed is disabled in live stream</string>
     <string name="revanced_disable_default_playback_speed_live_title">Disable playback speed in live stream</string>
-    <string name="revanced_disable_haptic_feedback_chapters_summary_off">Chapters haptic feedback is enabled</string>
-    <string name="revanced_disable_haptic_feedback_chapters_summary_on">Chapters haptic feedback is disabled</string>
+    <string name="revanced_disable_haptic_feedback_summary_off">Haptic feedback is enabled</string>
+    <string name="revanced_disable_haptic_feedback_summary_on">Haptic feedback is disabled</string>
     <string name="revanced_disable_haptic_feedback_chapters_title">Disable chapters haptic feedback</string>
-    <string name="revanced_disable_haptic_feedback_scrubbing_summary_off">Scrubbing haptic feedback is enabled</string>
-    <string name="revanced_disable_haptic_feedback_scrubbing_summary_on">Scrubbing haptic feedback is disabled</string>
     <string name="revanced_disable_haptic_feedback_scrubbing_title">Disable scrubbing haptic feedback</string>
-    <string name="revanced_disable_haptic_feedback_seek_summary_off">Seek haptic feedback is enabled</string>
-    <string name="revanced_disable_haptic_feedback_seek_summary_on">Seek haptic feedback is disabled</string>
     <string name="revanced_disable_haptic_feedback_seek_title">Disable seek haptic feedback</string>
-    <string name="revanced_disable_haptic_feedback_zoom_summary_off">Zoom haptic feedback is enabled</string>
-    <string name="revanced_disable_haptic_feedback_zoom_summary_on">Zoom haptic feedback is disabled</string>
+    <string name="revanced_disable_haptic_feedback_seek_undo_title">Disable seek undo haptic feedback</string>
     <string name="revanced_disable_haptic_feedback_zoom_title">Disable zoom haptic feedback</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_off">Auto HDR brightness is enabled</string>
     <string name="revanced_disable_hdr_auto_brightness_summary_on">Auto HDR brightness is disabled</string>
diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
index d2d8a1b7c..de04a1a39 100644
--- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml
+++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
@@ -549,10 +549,11 @@
 
         <!-- SETTINGS: DISABLE_HAPTIC_FEEDBACK
         <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_haptic_feedback_title" />
-        <SwitchPreference android:title="@string/revanced_disable_haptic_feedback_chapters_title" android:key="revanced_disable_haptic_feedback_chapters" android:defaultValue="false" android:summaryOn="@string/revanced_disable_haptic_feedback_chapters_summary_on" android:summaryOff="@string/revanced_disable_haptic_feedback_chapters_summary_off" />
-        <SwitchPreference android:title="@string/revanced_disable_haptic_feedback_scrubbing_title" android:key="revanced_disable_haptic_feedback_scrubbing" android:defaultValue="false" android:summaryOn="@string/revanced_disable_haptic_feedback_scrubbing_summary_on" android:summaryOff="@string/revanced_disable_haptic_feedback_scrubbing_summary_off" />
-        <SwitchPreference android:title="@string/revanced_disable_haptic_feedback_seek_title" android:key="revanced_disable_haptic_feedback_seek" android:defaultValue="false" android:summaryOn="@string/revanced_disable_haptic_feedback_seek_summary_on" android:summaryOff="@string/revanced_disable_haptic_feedback_seek_summary_off" />
-        <SwitchPreference android:title="@string/revanced_disable_haptic_feedback_zoom_title" android:key="revanced_disable_haptic_feedback_zoom" android:defaultValue="false" android:summaryOn="@string/revanced_disable_haptic_feedback_zoom_summary_on" android:summaryOff="@string/revanced_disable_haptic_feedback_zoom_summary_off" />SETTINGS: DISABLE_HAPTIC_FEEDBACK -->
+        <SwitchPreference android:title="@string/revanced_disable_haptic_feedback_chapters_title" android:key="revanced_disable_haptic_feedback_chapters" android:defaultValue="false" android:summaryOn="@string/revanced_disable_haptic_feedback_summary_on" android:summaryOff="@string/revanced_disable_haptic_feedback_summary_off" />
+        <SwitchPreference android:title="@string/revanced_disable_haptic_feedback_scrubbing_title" android:key="revanced_disable_haptic_feedback_scrubbing" android:defaultValue="false" android:summaryOn="@string/revanced_disable_haptic_feedback_summary_on" android:summaryOff="@string/revanced_disable_haptic_feedback_summary_off" />
+        <SwitchPreference android:title="@string/revanced_disable_haptic_feedback_seek_title" android:key="revanced_disable_haptic_feedback_seek" android:defaultValue="false" android:summaryOn="@string/revanced_disable_haptic_feedback_summary_on" android:summaryOff="@string/revanced_disable_haptic_feedback_summary_off" />
+        <SwitchPreference android:title="@string/revanced_disable_haptic_feedback_seek_undo_title" android:key="revanced_disable_haptic_feedback_seek_undo" android:defaultValue="false" android:summaryOn="@string/revanced_disable_haptic_feedback_summary_on" android:summaryOff="@string/revanced_disable_haptic_feedback_summary_off" />
+        <SwitchPreference android:title="@string/revanced_disable_haptic_feedback_zoom_title" android:key="revanced_disable_haptic_feedback_zoom" android:defaultValue="false" android:summaryOn="@string/revanced_disable_haptic_feedback_summary_on" android:summaryOff="@string/revanced_disable_haptic_feedback_summary_off" />SETTINGS: DISABLE_HAPTIC_FEEDBACK -->
 
     <!-- PREFERENCE: PLAYER_SETTINGS
     </PreferenceScreen>PREFERENCE: PLAYER_SETTINGS -->