Simplified edit feeds UI

src/screens/SavedFeeds.tsx

@@ -1,6 +1,12 @@
-import {useCallback, useState} from 'react'
+import {useCallback, useMemo, useState} from 'react'
 import {View} from 'react-native'
-import Animated, {LinearTransition} from 'react-native-reanimated'
+import {Gesture, GestureDetector} from 'react-native-gesture-handler'
+import Animated, {
+  runOnJS,
+  useAnimatedStyle,
+  useSharedValue,
+  withSpring,
+} from 'react-native-reanimated'
 import {type AppBskyActorDefs} from '@atproto/api'
 import {TID} from '@atproto/common-web'
 import {msg, Trans} from '@lingui/macro'
@@ -29,12 +35,9 @@ import {NoSavedFeedsOfAnyType} from '#/screens/Feeds/NoSavedFeedsOfAnyType'
 import {atoms as a, useBreakpoints, useTheme} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
-import {
-  ArrowBottom_Stroke2_Corner0_Rounded as ArrowDownIcon,
-  ArrowTop_Stroke2_Corner0_Rounded as ArrowUpIcon,
-} from '#/components/icons/Arrow'
 import {FilterTimeline_Stroke2_Corner0_Rounded as FilterTimeline} from '#/components/icons/FilterTimeline'
 import {FloppyDisk_Stroke2_Corner0_Rounded as SaveIcon} from '#/components/icons/FloppyDisk'
+import {Menu_Stroke2_Corner0_Rounded as DragHandleIcon} from '#/components/icons/Menu'
 import {Pin_Filled_Corner0_Rounded as PinIcon} from '#/components/icons/Pin'
 import {Trash_Stroke2_Corner0_Rounded as TrashIcon} from '#/components/icons/Trash'
 import * as Layout from '#/components/Layout'
@@ -78,6 +81,11 @@ function SavedFeedsInner({
   const noFollowingFeed =
     currentFeeds.every(f => f.type !== 'timeline') && !noSavedFeedsOfAnyType
 
+  const scrollGesture = Gesture.Native()
+  const draggedItemId = useSharedValue<string | null>(null)
+  const draggedFromIndex = useSharedValue(-1)
+  const draggedToIndex = useSharedValue(-1)
+
   useFocusEffect(
     useCallback(() => {
       setMinimalShellMode(false)
@@ -122,7 +130,7 @@ function SavedFeedsInner({
         </Button>
       </Layout.Header.Outer>
 
-      <Layout.Content>
+      <Layout.Content simultaneousHandlers={scrollGesture}>
         {noSavedFeedsOfAnyType && (
           <View style={[t.atoms.border_contrast_low, a.border_b]}>
             <NoSavedFeedsOfAnyType
@@ -157,7 +165,10 @@ function SavedFeedsInner({
                 isPinned
                 currentFeeds={currentFeeds}
                 setCurrentFeeds={setCurrentFeeds}
-                preferences={preferences}
+                scrollGesture={scrollGesture}
+                draggedItemId={draggedItemId}
+                draggedFromIndex={draggedFromIndex}
+                draggedToIndex={draggedToIndex}
               />
             ))
           )
@@ -199,7 +210,10 @@ function SavedFeedsInner({
                 isPinned={false}
                 currentFeeds={currentFeeds}
                 setCurrentFeeds={setCurrentFeeds}
-                preferences={preferences}
+                scrollGesture={scrollGesture}
+                draggedItemId={draggedItemId}
+                draggedFromIndex={draggedFromIndex}
+                draggedToIndex={draggedToIndex}
               />
             ))
           )
@@ -236,18 +250,198 @@ function ListItem({
   isPinned,
   currentFeeds,
   setCurrentFeeds,
+  scrollGesture,
+  draggedItemId,
+  draggedFromIndex,
+  draggedToIndex,
 }: {
   feed: AppBskyActorDefs.SavedFeed
   isPinned: boolean
   currentFeeds: AppBskyActorDefs.SavedFeed[]
   setCurrentFeeds: React.Dispatch<AppBskyActorDefs.SavedFeed[]>
-  preferences: UsePreferencesQueryResponse
+  scrollGesture?: any
+  draggedItemId?: any
+  draggedFromIndex?: any
+  draggedToIndex?: any
 }) {
   const {_} = useLingui()
   const t = useTheme()
   const playHaptic = useHaptics()
   const feedUri = feed.value
 
+  const [itemHeight, setItemHeight] = useState(0)
+  const translateY = useSharedValue(0)
+  const isDragging = useSharedValue(false)
+  const lastTentativeIndex = useSharedValue(-1)
+
+  const reorderFeeds = useCallback(
+    (fromIndex: number, toIndex: number) => {
+      const nextFeeds = currentFeeds.slice()
+      const [movedItem] = nextFeeds.splice(fromIndex, 1)
+      nextFeeds.splice(toIndex, 0, movedItem)
+      setCurrentFeeds(nextFeeds)
+    },
+    [currentFeeds, setCurrentFeeds],
+  )
+
+  const panGesture = useMemo(() => {
+    if (!isPinned || !scrollGesture || !draggedItemId) return Gesture.Native()
+
+    return Gesture.Pan()
+      .blocksExternalGesture(scrollGesture)
+      .activeOffsetY([-5, 5])
+      .failOffsetX([-20, 20])
+      .onStart(() => {
+        'worklet'
+        isDragging.set(true)
+        const pinnedFeeds = currentFeeds.filter(f => f.pinned)
+        const currentIndex = pinnedFeeds.findIndex(f => f.id === feed.id)
+        draggedItemId.set(feed.id)
+        draggedFromIndex.set(currentIndex)
+        draggedToIndex.set(currentIndex)
+        runOnJS(playHaptic)()
+      })
+      .onUpdate(evt => {
+        'worklet'
+        if (itemHeight === 0) return
+
+        const newTranslateY = evt.translationY
+        const positionOffset = Math.round(newTranslateY / itemHeight)
+        const currentIndex = currentFeeds
+          .filter(f => f.pinned)
+          .findIndex(f => f.id === feed.id)
+        const pinnedCount = currentFeeds.filter(f => f.pinned).length
+        const tentativeIndex = Math.max(
+          0,
+          Math.min(currentIndex + positionOffset, pinnedCount - 1),
+        )
+
+        if (tentativeIndex !== lastTentativeIndex.get()) {
+          runOnJS(playHaptic)()
+          lastTentativeIndex.set(tentativeIndex)
+          draggedToIndex.set(tentativeIndex)
+        }
+
+        translateY.set(newTranslateY)
+      })
+      .onEnd(evt => {
+        'worklet'
+        if (itemHeight === 0) {
+          translateY.set(withSpring(0))
+          isDragging.set(false)
+          draggedItemId.set(null)
+          draggedFromIndex.set(-1)
+          draggedToIndex.set(-1)
+          return
+        }
+
+        const positionOffset = Math.round(evt.translationY / itemHeight)
+        const pinnedFeeds = currentFeeds.filter(f => f.pinned)
+        const currentIndex = pinnedFeeds.findIndex(f => f.id === feed.id)
+        const newIndex = Math.max(
+          0,
+          Math.min(currentIndex + positionOffset, pinnedFeeds.length - 1),
+        )
+
+        translateY.set(
+          withSpring(0, {
+            mass: 1.25,
+            damping: 300,
+            stiffness: 800,
+          }),
+        )
+        isDragging.set(false)
+        lastTentativeIndex.set(-1)
+        draggedItemId.set(null)
+        draggedFromIndex.set(-1)
+        draggedToIndex.set(-1)
+
+        if (newIndex !== currentIndex && currentIndex !== -1) {
+          runOnJS(reorderFeeds)(currentIndex, newIndex)
+        }
+      })
+  }, [
+    isPinned,
+    scrollGesture,
+    draggedItemId,
+    draggedFromIndex,
+    draggedToIndex,
+    itemHeight,
+    currentFeeds,
+    feed.id,
+    playHaptic,
+    reorderFeeds,
+    isDragging,
+    lastTentativeIndex,
+    translateY,
+  ])
+
+  const animatedStyle = useAnimatedStyle(() => {
+    if (!draggedItemId || !isPinned) {
+      return {
+        transform: [{translateY: 0}],
+        opacity: 1,
+        zIndex: 0,
+      }
+    }
+
+    const isBeingDragged = draggedItemId.get() === feed.id
+
+    if (isBeingDragged) {
+      // This is the item being dragged
+      return {
+        transform: [
+          {translateY: translateY.get()},
+          {scale: isDragging.get() ? 1.02 : 1},
+        ],
+        opacity: isDragging.get() ? 0.8 : 1,
+        zIndex: isDragging.get() ? 10 : 0,
+      }
+    }
+
+    // This is a non-dragged item - calculate if it should shift
+    const pinnedFeeds = currentFeeds.filter(f => f.pinned)
+    const myIndex = pinnedFeeds.findIndex(f => f.id === feed.id)
+    const fromIndex = draggedFromIndex.get()
+    const toIndex = draggedToIndex.get()
+
+    if (myIndex === -1 || fromIndex === -1 || toIndex === -1) {
+      return {
+        transform: [{translateY: 0}],
+        opacity: 1,
+        zIndex: 0,
+      }
+    }
+
+    let offset = 0
+
+    if (fromIndex < toIndex) {
+      // Dragging downward
+      if (myIndex > fromIndex && myIndex <= toIndex) {
+        offset = -itemHeight // Shift up
+      }
+    } else if (fromIndex > toIndex) {
+      // Dragging upward
+      if (myIndex < fromIndex && myIndex >= toIndex) {
+        offset = itemHeight // Shift down
+      }
+    }
+
+    return {
+      transform: [
+        {
+          translateY: withSpring(offset, {
+            mass: 1.25,
+            damping: 300,
+            stiffness: 800,
+          }),
+        },
+      ],
+      opacity: 1,
+      zIndex: 0,
+    }
+  }, [draggedItemId, isPinned, feed.id, currentFeeds, itemHeight])
+
   const onTogglePinned = async () => {
     playHaptic()
     setCurrentFeeds(
@@ -257,123 +451,75 @@ function ListItem({
     )
   }
 
-  const onPressUp = async () => {
-    if (!isPinned) return
-
-    const nextFeeds = currentFeeds.slice()
-    const ids = currentFeeds.map(f => f.id)
-    const index = ids.indexOf(feed.id)
-    const nextIndex = index - 1
-
-    if (index === -1 || index === 0) return
-    ;[nextFeeds[index], nextFeeds[nextIndex]] = [
-      nextFeeds[nextIndex],
-      nextFeeds[index],
-    ]
-
-    setCurrentFeeds(nextFeeds)
-  }
-
-  const onPressDown = async () => {
-    if (!isPinned) return
-
-    const nextFeeds = currentFeeds.slice()
-    const ids = currentFeeds.map(f => f.id)
-    const index = ids.indexOf(feed.id)
-    const nextIndex = index + 1
-
-    if (index === -1 || index >= nextFeeds.filter(f => f.pinned).length - 1)
-      return
-    ;[nextFeeds[index], nextFeeds[nextIndex]] = [
-      nextFeeds[nextIndex],
-      nextFeeds[index],
-    ]
-
-    setCurrentFeeds(nextFeeds)
-  }
-
   const onPressRemove = async () => {
     playHaptic()
     setCurrentFeeds(currentFeeds.filter(f => f.id !== feed.id))
   }
 
   return (
-    <Animated.View
+    <GestureDetector gesture={panGesture}>
-      style={[a.flex_row, a.border_b, t.atoms.border_contrast_low]}
+      <Animated.View
-      layout={LinearTransition.duration(100)}>
+        style={[a.flex_row, animatedStyle]}
-      {feed.type === 'timeline' ? (
+        onLayout={e => {
-        <FollowingFeedCard />
+          if (itemHeight === 0) {
-      ) : (
+            setItemHeight(e.nativeEvent.layout.height)
-        <FeedSourceCard
+          }
-          key={feedUri}
+        }}>
-          feedUri={feedUri}
+        {/* Drag Handle - only for pinned feeds */}
-          style={[isPinned && a.pr_sm]}
+        {isPinned && (
-          showMinimalPlaceholder
+          <View style={[a.justify_center, a.pl_md]}>
-          hideTopBorder={true}
+            <View style={[a.p_xs]}>
-        />
+              <DragHandleIcon size="md" style={t.atoms.text_contrast_medium} />
-      )}
+            </View>
-      <View style={[a.pr_lg, a.flex_row, a.align_center, a.gap_sm]}>
+          </View>
-        {isPinned ? (
-          <>
-            <Button
-              testID={`feed-${feed.type}-moveUp`}
-              label={_(msg`Move feed up`)}
-              onPress={onPressUp}
-              size="small"
-              color="secondary"
-              shape="square">
-              <ButtonIcon icon={ArrowUpIcon} />
-            </Button>
-            <Button
-              testID={`feed-${feed.type}-moveDown`}
-              label={_(msg`Move feed down`)}
-              onPress={onPressDown}
-              size="small"
-              color="secondary"
-              shape="square">
-              <ButtonIcon icon={ArrowDownIcon} />
-            </Button>
-          </>
-        ) : (
-          <Button
-            testID={`feed-${feedUri}-toggleSave`}
-            label={_(msg`Remove from my feeds`)}
-            onPress={onPressRemove}
-            size="small"
-            color="secondary"
-            variant="ghost"
-            shape="square">
-            <ButtonIcon icon={TrashIcon} />
-          </Button>
         )}
-        <Button
+
-          testID={`feed-${feed.type}-togglePin`}
+        {/* Feed Card */}
-          label={isPinned ? _(msg`Unpin feed`) : _(msg`Pin feed`)}
+        {feed.type === 'timeline' ? (
-          onPress={onTogglePinned}
+          <FollowingFeedCard />
-          size="small"
+        ) : (
-          color={isPinned ? 'primary_subtle' : 'secondary'}
+          <FeedSourceCard
-          shape="square">
+            key={feedUri}
-          <ButtonIcon icon={PinIcon} />
+            feedUri={feedUri}
-        </Button>
+            style={[isPinned && a.pr_sm]}
-      </View>
+            showMinimalPlaceholder
-    </Animated.View>
+            hideTopBorder={true}
+          />
+        )}
+
+        {/* Action Buttons */}
+        <View style={[a.pr_lg, a.flex_row, a.align_center, a.gap_sm]}>
+          {!isPinned && (
+            <Button
+              testID={`feed-${feedUri}-toggleSave`}
+              label={_(msg`Remove from my feeds`)}
+              onPress={onPressRemove}
+              size="small"
+              color="secondary"
+              variant="ghost"
+              shape="square">
+              <ButtonIcon icon={TrashIcon} />
+            </Button>
+          )}
+          <Button
+            testID={`feed-${feed.type}-togglePin`}
+            label={isPinned ? _(msg`Unpin feed`) : _(msg`Pin feed`)}
+            onPress={onTogglePinned}
+            size="small"
+            color={isPinned ? 'primary_subtle' : 'secondary'}
+            shape="square">
+            <ButtonIcon icon={PinIcon} />
+          </Button>
+        </View>
+      </Animated.View>
+    </GestureDetector>
   )
 }
 
 function SectionHeaderText({children}: {children: React.ReactNode}) {
-  const t = useTheme()
   // eslint-disable-next-line bsky-internal/avoid-unwrapped-text
   return (
-    <View
+    <View style={[a.flex_row, a.flex_1, a.px_lg, a.pt_2xl, a.pb_xs]}>
-      style={[
-        a.flex_row,
-        a.flex_1,
-        a.px_lg,
-        a.pt_2xl,
-        a.pb_md,
-        a.border_b,
-        t.atoms.border_contrast_low,
-      ]}>
       <Text style={[a.text_xl, a.font_bold, a.leading_snug]}>{children}</Text>
     </View>
   )
@@ -382,7 +528,7 @@ function SectionHeaderText({children}: {children: React.ReactNode}) {
 function FollowingFeedCard() {
   const t = useTheme()
   return (
-    <View style={[a.flex_row, a.align_center, a.flex_1, a.p_lg]}>
+    <View style={[a.flex_row, a.align_center, a.flex_1, a.p_md]}>
       <View
         style={[
           a.align_center,

src/view/com/feeds/FeedSourceCard.tsx

@@ -193,7 +193,7 @@ export function FeedSourceCardLoaded({
         }}
         style={[
           a.flex_1,
-          a.p_lg,
+          a.p_md,
           a.gap_md,
           !hideTopBorder && !a.border_t,
           t.atoms.border_contrast_low,
@@ -207,7 +207,7 @@ export function FeedSourceCardLoaded({
       <View
         style={[
           a.flex_1,
-          a.p_lg,
+          a.p_md,
           a.gap_md,
           !hideTopBorder && !a.border_t,
           t.atoms.border_contrast_low,