From 1f9a327c2668053906184d1e6fca14f734b91b85 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Fri, 17 Jan 2025 23:14:05 +0000
Subject: [PATCH] attempt to fix broken scrub on android (not working)

---
 src/screens/Feeds/VibeScreen.tsx | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/screens/Feeds/VibeScreen.tsx b/src/screens/Feeds/VibeScreen.tsx
index 942dc92520..81abaef5b2 100644
--- a/src/screens/Feeds/VibeScreen.tsx
+++ b/src/screens/Feeds/VibeScreen.tsx
@@ -570,7 +570,11 @@ function Overlay({
           </Animated.View>
 
           {player && active ? (
-            <Scrubber player={player} seekingAnimationSV={seekingAnimationSV} />
+            <Scrubber
+              player={player}
+              seekingAnimationSV={seekingAnimationSV}
+              scrollGesture={scrollGesture}
+            />
           ) : (
             <ScrubberPlaceholder />
           )}
@@ -616,9 +620,11 @@ function ScrubberPlaceholder() {
 function Scrubber({
   player,
   seekingAnimationSV,
+  scrollGesture,
 }: {
   player: VideoPlayer
   seekingAnimationSV: SharedValue<number>
+  scrollGesture: NativeGesture
 }) {
   const {width: screenWidth} = useSafeAreaFrame()
   const insets = useSafeAreaInsets()
@@ -667,9 +673,15 @@ function Scrubber({
 
   const gesture = useMemo(() => {
     return Gesture.Pan()
+      .blocksExternalGesture(scrollGesture)
       .failOffsetY([-10, 10])
+      .onBegin(() => {
+        'worklet'
+        console.log('begin')
+      })
       .onStart(() => {
         'worklet'
+        console.log('start')
         seekProgressSV.set(currentTimeSV.get())
         isSeekingSV.set(true)
         seekingAnimationSV.set(withTiming(1, {duration: 500}))
@@ -695,6 +707,7 @@ function Scrubber({
         seekingAnimationSV.set(withTiming(0, {duration: 500}))
       })
   }, [
+    scrollGesture,
     seekingAnimationSV,
     seekBy,
     screenWidth,