feat: enhance exercise tracking, privacy settings, and bulk publishing features

app/(app)/(tabs)/(plans)/index.tsx

@@ -19,6 +19,7 @@ import { t } from "@lingui/core/macro";
 import { useAppTheme } from "@/theme";
 import type { AppThemeColors } from "@/theme/types";
 import { usePublishedPlanIdsQuery } from "@/hooks/usePublishedPlanIdsQuery";
+import { usePublishedWorkoutIdsQuery } from "@/hooks/usePublishedWorkoutIdsQuery";
 import { useSocialStore } from "@/store/socialStore";
 
 export default function PlansScreen() {
@@ -38,6 +39,7 @@ export default function PlansScreen() {
     error: standaloneError,
   } = useStandaloneWorkoutsQuery();
   const { data: publishedPlanIds } = usePublishedPlanIdsQuery();
+  const { data: publishedWorkoutIds } = usePublishedWorkoutIdsQuery();
   const { privacySettings } = useSocialStore();
 
   useEffect(() => {
@@ -159,6 +161,10 @@ export default function PlansScreen() {
                 workout={item}
                 onPress={() => handleViewWorkout(item)}
                 countUnilateralDouble={countUnilateralDouble}
+                isPublished={
+                  !!privacySettings?.shareStandaloneWorkouts &&
+                  !!publishedWorkoutIds?.includes(String(item.id))
+                }
               />
             ))
           ) : (

app/(app)/(tabs)/(plans)/overview.tsx

@@ -39,7 +39,6 @@ import { useDeloadWeekMutation } from "@/hooks/useDeloadWeekMutation";
 import { useProgressionSettingsQuery } from "@/hooks/useProgressionSettingsQuery";
 import { getCurrentISOWeek } from "@/utils/isoWeek";
 import { AuthContext } from "@/context/AuthProvider";
-import { useSocialStore } from "@/store/socialStore";
 import { usePlanPublishQuery } from "@/hooks/usePlanPublishQuery";
 import { usePlanPublishMutation } from "@/hooks/usePlanPublishMutation";
 
@@ -105,8 +104,7 @@ export default function PlanOverviewScreen() {
   const deloadMutation = useDeloadWeekMutation(Number(planId));
 
   const user = useContext(AuthContext);
-  const { privacySettings } = useSocialStore();
-  const showShareToggle = !!user && !!privacySettings?.sharePlans;
+  const showShareToggle = !!user && !plan?.app_plan_id;
   const { data: isPublished = false, isLoading: isPublishLoading } =
     usePlanPublishQuery(showShareToggle ? Number(planId) : null);
   const publishMutation = usePlanPublishMutation(Number(planId));

app/(app)/(tabs)/(plans)/standalone-workout.tsx

@@ -32,7 +32,6 @@ import { t } from "@lingui/core/macro";
 import { useAppTheme, radii } from "@/theme";
 import type { AppThemeColors } from "@/theme/types";
 import { AuthContext } from "@/context/AuthProvider";
-import { useSocialStore } from "@/store/socialStore";
 import { useWorkoutPublishQuery } from "@/hooks/useWorkoutPublishQuery";
 import { useWorkoutPublishMutation } from "@/hooks/useWorkoutPublishMutation";
 
@@ -53,8 +52,7 @@ export default function StandaloneWorkoutScreen() {
   const distanceUnit = settings?.distanceUnit || "m";
 
   const user = useContext(AuthContext);
-  const { privacySettings } = useSocialStore();
-  const showShareToggle = !!user && !!privacySettings?.shareStandaloneWorkouts;
+  const showShareToggle = !!user;
   const { data: isPublished = false, isLoading: isPublishLoading } =
     useWorkoutPublishQuery(showShareToggle ? workoutId : null);
   const publishMutation = useWorkoutPublishMutation(workoutId);

app/(app)/(tabs)/(stats)/exercises.tsx

@@ -92,26 +92,24 @@ export default function ExercisesScreen() {
         (exerciseId) => !selectedExercises.includes(exerciseId),
       );
 
-      // Insert new exercises into the tracked_exercises table
-      for (const exerciseId of newExercises) {
-        await db.runAsync(
-          `
-          INSERT INTO tracked_exercises (exercise_id)
-          VALUES (?)
-        `,
-          [exerciseId],
-        );
-      }
+      await db.withExclusiveTransactionAsync(async (txn) => {
+        // Insert new exercises into the tracked_exercises table
+        for (const exerciseId of newExercises) {
+          await txn.runAsync(
+            `INSERT INTO tracked_exercises (exercise_id, sort_order)
+             VALUES (?, (SELECT COALESCE(MAX(sort_order), 0) + 1 FROM tracked_exercises))`,
+            [exerciseId],
+          );
+        }
 
-      // Delete unselected exercises from the tracked_exercises table
-      for (const exerciseId of removedExercises) {
-        await db.runAsync(
-          `
-          DELETE FROM tracked_exercises WHERE exercise_id = ?
-        `,
-          [exerciseId],
-        );
-      }
+        // Delete unselected exercises from the tracked_exercises table
+        for (const exerciseId of removedExercises) {
+          await txn.runAsync(
+            `DELETE FROM tracked_exercises WHERE exercise_id = ?`,
+            [exerciseId],
+          );
+        }
+      });
 
       queryclient.invalidateQueries({ queryKey: ["trackedExercises"] });
       router.back();

app/(app)/(tabs)/(stats)/index.tsx

@@ -30,11 +30,13 @@ import { WorkoutCalendarModal } from "@/components/stats/WorkoutCalendarModal";
 import { InsightsStrip } from "@/components/stats/InsightsStrip";
 import { StatsTile } from "@/components/stats/StatsTile";
 import { ExerciseCompactCard } from "@/components/stats/ExerciseCompactCard";
-import { useRouter } from "expo-router";
+import { useRouter, useFocusEffect } from "expo-router";
 import { useSettingsQuery } from "@/hooks/useSettingsQuery";
 import { useBodyMeasurementSessionsQuery } from "@/hooks/useBodyMeasurementSessionsQuery";
 import { useTrackedExercisesQuery } from "@/hooks/useTrackedExercisesQuery";
+import { useReorderTrackedExercisesMutation } from "@/hooks/useReorderTrackedExercisesMutation";
 import { useStatsInsights } from "@/hooks/useStatsInsights";
+import Sortable from "react-native-sortables";
 import { WorkoutBarChart } from "@/components/charts/WorkoutBarChart";
 import { VolumeBarChart } from "@/components/charts/VolumeBarChart";
 import BodyPartChart from "@/components/charts/BodyPartChart";
@@ -114,6 +116,8 @@ export default function StatsScreen() {
   );
   const [historyVisible, setHistoryVisible] = useState(false);
   const [selectedDate, setSelectedDate] = useState<string | null>(null);
+  const [isReorderMode, setIsReorderMode] = useState(false);
+  const reorderMutation = useReorderTrackedExercisesMutation();
 
   useEffect(() => {
     if (settings?.timeRange) setSelectedTimeRange(settings.timeRange);
@@ -317,6 +321,23 @@ export default function StatsScreen() {
     });
   }, [router, trackedExercises]);
 
+  const handleReorderDragEnd = useCallback(
+    ({ fromIndex, toIndex }: { fromIndex: number; toIndex: number }) => {
+      if (fromIndex === toIndex) return;
+      const reordered = [...(trackedExercises ?? [])];
+      const [moved] = reordered.splice(fromIndex, 1);
+      reordered.splice(toIndex, 0, moved);
+      reorderMutation.mutate(reordered.map((e) => e.exercise_id));
+    },
+    [trackedExercises, reorderMutation],
+  );
+
+  useFocusEffect(
+    useCallback(() => {
+      return () => setIsReorderMode(false);
+    }, []),
+  );
+
   const isLoading =
     isLoadingWorkouts ||
     isLoadingExercises ||
@@ -514,31 +535,67 @@ export default function StatsScreen() {
             <ThemedText style={styles.sectionTitle}>
               <Trans>Tracked Exercises</Trans>
             </ThemedText>
-            <Button
-              mode="text"
-              compact
-              labelStyle={{ color: colors.accent, fontSize: 13 }}
-              onPress={handleManageExercisesPress}
-            >
-              {trackedExercises && trackedExercises.length > 0 ? (
-                <Trans>Manage</Trans>
-              ) : (
-                <Trans>+ Add</Trans>
+            <View style={styles.exerciseHeaderButtons}>
+              {!isReorderMode && (
+                <Button
+                  mode="text"
+                  compact
+                  labelStyle={{ color: colors.accent, fontSize: 13 }}
+                  onPress={handleManageExercisesPress}
+                >
+                  {trackedExercises && trackedExercises.length > 0 ? (
+                    <Trans>Manage</Trans>
+                  ) : (
+                    <Trans>+ Add</Trans>
+                  )}
+                </Button>
               )}
-            </Button>
+              {trackedExercises && trackedExercises.length > 1 && (
+                <Button
+                  mode="text"
+                  compact
+                  labelStyle={{
+                    color: isReorderMode ? colors.accent : colors.contentSecondary,
+                    fontSize: 13,
+                  }}
+                  onPress={() => setIsReorderMode((v) => !v)}
+                >
+                  {isReorderMode ? <Trans>Done</Trans> : <Trans>Reorder</Trans>}
+                </Button>
+              )}
+            </View>
           </View>
           {trackedExercises && trackedExercises.length > 0 ? (
-            trackedExercises.map((exercise) => (
-              <ExerciseCompactCard
-                key={exercise.exercise_id}
-                exercise={exercise}
-                weightUnit={weightUnit}
-                distanceUnit={distanceUnit}
-                onPress={() =>
-                  handleExercisePress(exercise.exercise_id, exercise.name)
-                }
+            isReorderMode ? (
+              <Sortable.Grid
+                columns={1}
+                data={trackedExercises}
+                keyExtractor={(item) => item.exercise_id.toString()}
+                renderItem={({ item }) => (
+                  <ExerciseCompactCard
+                    exercise={item}
+                    weightUnit={weightUnit}
+                    distanceUnit={distanceUnit}
+                    isReorderMode
+                    onPress={() => {}}
+                  />
+                )}
+                onDragEnd={handleReorderDragEnd}
+                showDropIndicator
               />
-            ))
+            ) : (
+              trackedExercises.map((exercise) => (
+                <ExerciseCompactCard
+                  key={exercise.exercise_id}
+                  exercise={exercise}
+                  weightUnit={weightUnit}
+                  distanceUnit={distanceUnit}
+                  onPress={() =>
+                    handleExercisePress(exercise.exercise_id, exercise.name)
+                  }
+                />
+              ))
+            )
           ) : (
             <ThemedText style={{ color: colors.contentSecondary }}>
               <Trans>No exercises tracked yet. Tap + Add to start.</Trans>
@@ -651,6 +708,10 @@ function createStyles(colors: AppThemeColors) {
       flexWrap: "wrap",
       gap: 8,
     },
+    exerciseHeaderButtons: {
+      flexDirection: "row",
+      alignItems: "center",
+    },
     measurementTile: {
       padding: 12,
       borderRadius: radii.md,

app/(app)/(tabs)/_layout.tsx

@@ -5,13 +5,15 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { AppMenu } from "@/components/AppMenu";
 import { TabBarIcon } from "@/components/navigation/TabBarIcon";
 import { useMenuStore } from "@/store/menuStore";
+import { useSocialStore } from "@/store/socialStore";
 import { t } from "@lingui/core/macro";
 import { useAppTheme } from "@/theme";
 
 export default function TabLayout() {
   const { colors } = useAppTheme();
   const insets = useSafeAreaInsets();
   const openMenu = useMenuStore((s) => s.openMenu);
+  const { pendingRequests } = useSocialStore();
 
   return (
     <>
@@ -90,6 +92,8 @@ export default function TabLayout() {
           }}
           options={{
             title: t`More`,
+            tabBarBadge:
+              pendingRequests.length > 0 ? pendingRequests.length : undefined,
             tabBarIcon: ({ color, focused }) => (
               <TabBarIcon
                 name={