From 8988e584ae5f304db84e1da12b4e794f5d39f086 Mon Sep 17 00:00:00 2001
From: Brandon Presley <brandon@presley.nz>
Date: Thu, 9 Nov 2023 18:52:50 +1300
Subject: [PATCH] Rename workout -> exercise

A workout would typically refer to a list of
exercises.
---
 AppDrawer.tsx                         | 12 ++---
 AppStack.tsx                          | 12 ++---
 EditWorkout.tsx => EditExercise.tsx   | 20 ++++-----
 EditWorkouts.tsx => EditExercises.tsx | 17 +++----
 EditPlan.tsx                          | 52 +++++++++++-----------
 WorkoutItem.tsx => ExerciseItem.tsx   |  8 ++--
 WorkoutList.tsx => ExerciseList.tsx   | 64 +++++++++++++--------------
 ExercisesPage.tsx                     | 34 ++++++++++++++
 PlanItem.tsx                          | 10 ++---
 PlanList.tsx                          |  6 +--
 SettingsPage.tsx                      |  6 +--
 StartPlan.tsx                         | 28 ++++++------
 WorkoutsPage.tsx                      | 34 --------------
 data-source.ts                        |  2 +
 drawer-param-list.ts                  |  2 +-
 migrations/1699508495726-exercises.ts | 10 +++++
 plan.ts                               |  2 +-
 17 files changed, 166 insertions(+), 153 deletions(-)
 rename EditWorkout.tsx => EditExercise.tsx (92%)
 rename EditWorkouts.tsx => EditExercises.tsx (92%)
 rename WorkoutItem.tsx => ExerciseItem.tsx (88%)
 rename WorkoutList.tsx => ExerciseList.tsx (71%)
 create mode 100644 ExercisesPage.tsx
 delete mode 100644 WorkoutsPage.tsx
 create mode 100644 migrations/1699508495726-exercises.ts

diff --git a/AppDrawer.tsx b/AppDrawer.tsx
index 399dc3a..610e3f6 100644
--- a/AppDrawer.tsx
+++ b/AppDrawer.tsx
@@ -7,7 +7,7 @@ import SetList from "./SetList";
 import SettingsPage from "./SettingsPage";
 import TimerPage from "./TimerPage";
 import WeightList from "./WeightList";
-import WorkoutList from "./WorkoutList";
+import ExerciseList from "./ExerciseList";
 import { DrawerParams } from "./drawer-param-list";
 import useDark from "./use-dark";
 
@@ -29,6 +29,11 @@ export default function AppDrawer() {
         component={SetList}
         options={{ drawerIcon: () => <IconButton icon="home-outline" /> }}
       />
+      <Drawer.Screen
+        name="Exercises"
+        component={ExerciseList}
+        options={{ drawerIcon: () => <IconButton icon="dumbbell" /> }}
+      />
       <Drawer.Screen
         name="Plans"
         component={PlanList}
@@ -41,11 +46,6 @@ export default function AppDrawer() {
           drawerIcon: () => <IconButton icon="chart-bell-curve-cumulative" />,
         }}
       />
-      <Drawer.Screen
-        name="Workouts"
-        component={WorkoutList}
-        options={{ drawerIcon: () => <IconButton icon="dumbbell" /> }}
-      />
       <Drawer.Screen
         name="Timer"
         component={TimerPage}
diff --git a/AppStack.tsx b/AppStack.tsx
index 4343d34..924e0df 100644
--- a/AppStack.tsx
+++ b/AppStack.tsx
@@ -4,8 +4,8 @@ import EditPlan from "./EditPlan";
 import EditSet from "./EditSet";
 import EditSets from "./EditSets";
 import EditWeight from "./EditWeight";
-import EditWorkout from "./EditWorkout";
-import EditWorkouts from "./EditWorkouts";
+import EditExercise from "./EditExercise";
+import EditExercises from "./EditExercises";
 import StartPlan from "./StartPlan";
 import ViewGraph from "./ViewGraph";
 import ViewWeightGraph from "./ViewWeightGraph";
@@ -36,10 +36,10 @@ export type StackParams = {
     weight: Weight;
   };
   ViewWeightGraph: {};
-  EditWorkout: {
+  EditExercise: {
     gymSet: GymSet;
   };
-  EditWorkouts: {
+  EditExercises: {
     names: string[];
   };
   ViewSetList: {
@@ -62,8 +62,8 @@ export default function AppStack() {
       <Stack.Screen name="ViewGraph" component={ViewGraph} />
       <Stack.Screen name="EditWeight" component={EditWeight} />
       <Stack.Screen name="ViewWeightGraph" component={ViewWeightGraph} />
-      <Stack.Screen name="EditWorkout" component={EditWorkout} />
-      <Stack.Screen name="EditWorkouts" component={EditWorkouts} />
+      <Stack.Screen name="EditExercise" component={EditExercise} />
+      <Stack.Screen name="EditExercises" component={EditExercises} />
       <Stack.Screen name="ViewSetList" component={ViewSetList} />
     </Stack.Navigator>
   );
diff --git a/EditWorkout.tsx b/EditExercise.tsx
similarity index 92%
rename from EditWorkout.tsx
rename to EditExercise.tsx
index 9f94a72..7e8da18 100644
--- a/EditWorkout.tsx
+++ b/EditExercise.tsx
@@ -22,8 +22,8 @@ import { toast } from "./toast";
 import { DrawerParams } from "./drawer-param-list";
 import { StackParams } from "./AppStack";
 
-export default function EditWorkout() {
-  const { params } = useRoute<RouteProp<StackParams, "EditWorkout">>();
+export default function EditExercise() {
+  const { params } = useRoute<RouteProp<StackParams, "EditExercise">>();
   const [removeImage, setRemoveImage] = useState(false);
   const [showRemove, setShowRemove] = useState(false);
   const [name, setName] = useState(params.gymSet.name);
@@ -50,7 +50,7 @@ export default function EditWorkout() {
   );
 
   const update = async () => {
-    const newWorkout = {
+    const newExercise = {
       name: name || params.gymSet.name,
       sets: Number(sets),
       minutes: +minutes,
@@ -58,14 +58,14 @@ export default function EditWorkout() {
       steps,
       image: removeImage ? "" : uri,
     } as GymSet;
-    await setRepo.update({ name: params.gymSet.name }, newWorkout);
+    await setRepo.update({ name: params.gymSet.name }, newExercise);
     await planRepo.query(
       `UPDATE plans 
-       SET workouts = REPLACE(workouts, $1, $2) 
-       WHERE workouts LIKE $3`,
+       SET exercises = REPLACE(exercises, $1, $2) 
+       WHERE exercises LIKE $3`,
       [params.gymSet.name, name, `%${params.gymSet.name}%`]
     );
-    navigate("Workouts", { update: newWorkout });
+    navigate("Exercises", { update: newExercise });
   };
 
   const add = async () => {
@@ -82,7 +82,7 @@ export default function EditWorkout() {
       created: now,
     });
     emitter.emit(GYM_SET_CREATED);
-    navigate("Workouts", { reset: new Date().getTime() });
+    navigate("Exercises", { reset: new Date().getTime() });
   };
 
   const save = async () => {
@@ -112,7 +112,7 @@ export default function EditWorkout() {
   return (
     <>
       <StackHeader
-        title={params.gymSet.name ? "Edit workout" : "Add workout"}
+        title={params.gymSet.name ? "Edit exercise" : "Add exercise"}
       />
       <View style={{ padding: PADDING, flex: 1 }}>
         <ScrollView style={{ flex: 1 }}>
@@ -143,7 +143,7 @@ export default function EditWorkout() {
               if (fixed.length !== newSets.length)
                 toast("Sets must be a number");
             }}
-            label="Sets per workout"
+            label="Sets per exercise"
             keyboardType="numeric"
             onSubmitEditing={() => minutesRef.current?.focus()}
           />
diff --git a/EditWorkouts.tsx b/EditExercises.tsx
similarity index 92%
rename from EditWorkouts.tsx
rename to EditExercises.tsx
index 2e85d0f..c4412c2 100644
--- a/EditWorkouts.tsx
+++ b/EditExercises.tsx
@@ -20,10 +20,11 @@ import { GYM_SET_CREATED } from "./gym-set";
 import Settings from "./settings";
 import StackHeader from "./StackHeader";
 import { toast } from "./toast";
-import { WorkoutsPageParams } from "./WorkoutsPage";
+import { ExercisesPageParams } from "./ExercisesPage";
 
-export default function EditWorkouts() {
-  const { params } = useRoute<RouteProp<WorkoutsPageParams, "EditWorkouts">>();
+export default function EditExercises() {
+  const { params } =
+    useRoute<RouteProp<ExercisesPageParams, "EditExercises">>();
   const [removeImage, setRemoveImage] = useState(false);
   const [showRemove, setShowRemove] = useState(false);
   const [name, setName] = useState("");
@@ -37,7 +38,7 @@ export default function EditWorkouts() {
   const [oldSeconds, setOldSeconds] = useState("");
   const [sets, setSets] = useState("");
   const [oldSets, setOldSets] = useState("");
-  const navigation = useNavigation<NavigationProp<WorkoutsPageParams>>();
+  const navigation = useNavigation<NavigationProp<ExercisesPageParams>>();
   const setsRef = useRef<TextInput>(null);
   const stepsRef = useRef<TextInput>(null);
   const minutesRef = useRef<TextInput>(null);
@@ -82,12 +83,12 @@ export default function EditWorkouts() {
         .createQueryBuilder()
         .update()
         .set({
-          workouts: () => `REPLACE(workouts, '${oldName}', '${name}')`,
+          exercises: () => `REPLACE(exercises, '${oldName}', '${name}')`,
         })
-        .where("workouts LIKE :name", { name: `%${oldName}%` })
+        .where("exercises LIKE :name", { name: `%${oldName}%` })
         .execute();
     }
-    navigation.navigate("WorkoutList", { clearNames: true });
+    navigation.navigate("ExerciseList", { clearNames: true });
   };
 
   const changeImage = useCallback(async () => {
@@ -111,7 +112,7 @@ export default function EditWorkouts() {
 
   return (
     <>
-      <StackHeader title={`Edit ${params.names.length} workouts`} />
+      <StackHeader title={`Edit ${params.names.length} exercises`} />
       <View style={{ padding: PADDING, flex: 1 }}>
         <ScrollView style={{ flex: 1 }}>
           <AppInput
diff --git a/EditPlan.tsx b/EditPlan.tsx
index 27d7aa3..01e4c0f 100644
--- a/EditPlan.tsx
+++ b/EditPlan.tsx
@@ -32,8 +32,8 @@ export default function EditPlan() {
   const [days, setDays] = useState<string[]>(
     plan.days ? plan.days.split(",") : []
   );
-  const [workouts, setWorkouts] = useState<string[]>(
-    plan.workouts ? plan.workouts.split(",") : []
+  const [exercises, setExercises] = useState<string[]>(
+    plan.exercises ? plan.exercises.split(",") : []
   );
   const [names, setNames] = useState<string[]>([]);
   const { navigate: drawerNavigate } =
@@ -56,27 +56,27 @@ export default function EditPlan() {
   }, []);
 
   const save = useCallback(async () => {
-    console.log(`${EditPlan.name}.save`, { days, workouts, plan });
-    if (!days || !workouts) return;
-    const newWorkouts = workouts.filter((workout) => workout).join(",");
+    console.log(`${EditPlan.name}.save`, { days, exercises, plan });
+    if (!days || !exercises) return;
+    const newExercises = exercises.filter((exercise) => exercise).join(",");
     const newDays = days.filter((day) => day).join(",");
     await planRepo.save({
       title: title,
       days: newDays,
-      workouts: newWorkouts,
+      exercises: newExercises,
       id: plan.id,
     });
-  }, [title, days, workouts, plan]);
+  }, [title, days, exercises, plan]);
 
-  const toggleWorkout = useCallback(
+  const toggleExercise = useCallback(
     (on: boolean, name: string) => {
       if (on) {
-        setWorkouts([...workouts, name]);
+        setExercises([...exercises, name]);
       } else {
-        setWorkouts(workouts.filter((workout) => workout !== name));
+        setExercises(exercises.filter((exercise) => exercise !== name));
       }
     },
-    [setWorkouts, workouts]
+    [setExercises, exercises]
   );
 
   const toggleDay = useCallback(
@@ -99,32 +99,32 @@ export default function EditPlan() {
     />
   );
 
-  const renderWorkout = ({
+  const renderExercise = ({
     item,
     drag,
   }: ReorderableListRenderItemInfo<string>) => (
     <Pressable
       onLongPress={drag}
-      onPress={() => toggleWorkout(!workouts.includes(item), item)}
+      onPress={() => toggleExercise(!exercises.includes(item), item)}
       style={{ flexDirection: "row", alignItems: "center" }}
     >
       <PaperSwitch
-        value={workouts.includes(item)}
+        value={exercises.includes(item)}
         style={{ marginRight: MARGIN }}
-        onValueChange={(value) => toggleWorkout(value, item)}
+        onValueChange={(value) => toggleExercise(value, item)}
       />
       <Text>{item}</Text>
     </Pressable>
   );
 
-  const reorderWorkout = (from: number, to: number) => {
+  const reorderExercise = (from: number, to: number) => {
     const newNames = [...names];
     const copy = newNames[from];
     newNames[from] = newNames[to];
     newNames[to] = copy;
-    const newWorkouts = newNames.filter((name) => workouts.includes(name));
-    console.log({ newWorkouts });
-    setWorkouts(newWorkouts);
+    const newExercises = newNames.filter((name) => exercises.includes(name));
+    console.log({ newExercises });
+    setExercises(newExercises);
   };
 
   return (
@@ -140,10 +140,10 @@ export default function EditPlan() {
                 where: { id: plan.id },
               });
               let first = await setRepo.findOne({
-                where: { name: workouts[0] },
+                where: { name: exercises[0] },
                 order: { created: "desc" },
               });
-              if (!first) first = { ...defaultSet, name: workouts[0] };
+              if (!first) first = { ...defaultSet, name: exercises[0] };
               delete first.id;
               stackNavigate("StartPlan", { plan: newPlan, first });
             }}
@@ -161,18 +161,18 @@ export default function EditPlan() {
         <Text style={styles.title}>Days</Text>
         {DAYS.map((day) => renderDay(day))}
 
-        <Text style={[styles.title, { marginTop: MARGIN }]}>Workouts</Text>
+        <Text style={[styles.title, { marginTop: MARGIN }]}>Exercises</Text>
         {names.length === 0 ? (
           <View>
-            <Text>No workouts found.</Text>
+            <Text>No exercises found.</Text>
           </View>
         ) : (
           <ReorderableList
             data={names}
             onReorder={({ fromIndex, toIndex }) =>
-              reorderWorkout(fromIndex, toIndex)
+              reorderExercise(fromIndex, toIndex)
             }
-            renderItem={renderWorkout}
+            renderItem={renderExercise}
             keyExtractor={(item) => item}
             dragScale={1.025}
             style={{
@@ -183,7 +183,7 @@ export default function EditPlan() {
         )}
 
         <Button
-          disabled={workouts.length === 0 && days.length === 0}
+          disabled={exercises.length === 0 && days.length === 0}
           style={styles.button}
           mode="outlined"
           icon="content-save"
diff --git a/WorkoutItem.tsx b/ExerciseItem.tsx
similarity index 88%
rename from WorkoutItem.tsx
rename to ExerciseItem.tsx
index 6760e30..438ff02 100644
--- a/WorkoutItem.tsx
+++ b/ExerciseItem.tsx
@@ -6,9 +6,9 @@ import { DARK_RIPPLE } from "./constants";
 import { LIGHT_RIPPLE } from "./constants";
 import GymSet from "./gym-set";
 import useDark from "./use-dark";
-import { WorkoutsPageParams } from "./WorkoutsPage";
+import { ExercisesPageParams } from "./ExercisesPage";
 
-export default function WorkoutItem({
+export default function ExerciseItem({
   item,
   setNames,
   names,
@@ -21,7 +21,7 @@ export default function WorkoutItem({
   names: string[];
   alarm: boolean;
 }) {
-  const navigation = useNavigation<NavigationProp<WorkoutsPageParams>>();
+  const navigation = useNavigation<NavigationProp<ExercisesPageParams>>();
   const dark = useDark();
 
   const description = useMemo(() => {
@@ -52,7 +52,7 @@ export default function WorkoutItem({
   const press = () => {
     console.log({ names });
     if (names.length === 0)
-      return navigation.navigate("EditWorkout", { gymSet: item });
+      return navigation.navigate("EditExercise", { gymSet: item });
     const removing = names.find((name) => name === item.name);
     if (removing) setNames(names.filter((name) => name !== item.name));
     else setNames([...names, item.name]);
diff --git a/WorkoutList.tsx b/ExerciseList.tsx
similarity index 71%
rename from WorkoutList.tsx
rename to ExerciseList.tsx
index 78e2d78..08bb01d 100644
--- a/WorkoutList.tsx
+++ b/ExerciseList.tsx
@@ -17,12 +17,12 @@ import ListMenu from "./ListMenu";
 import Page from "./Page";
 import SetList from "./SetList";
 import Settings, { SETTINGS } from "./settings";
-import WorkoutItem from "./WorkoutItem";
+import ExerciseItem from "./ExerciseItem";
 import { DrawerParams } from "./drawer-param-list";
 import { StackParams } from "./AppStack";
 
-export default function WorkoutList() {
-  const [workouts, setWorkouts] = useState<GymSet[]>();
+export default function ExerciseList() {
+  const [exercises, setExercises] = useState<GymSet[]>();
   const [offset, setOffset] = useState(0);
   const [term, setTerm] = useState("");
   const [end, setEnd] = useState(false);
@@ -30,20 +30,20 @@ export default function WorkoutList() {
   const [names, setNames] = useState<string[]>([]);
   const [refreshing, setRefreshing] = useState(false);
   const navigation = useNavigation<NavigationProp<StackParams>>();
-  const { params } = useRoute<RouteProp<DrawerParams, "Workouts">>();
+  const { params } = useRoute<RouteProp<DrawerParams, "Exercises">>();
 
-  const update = (newWorkout: GymSet) => {
-    console.log(`${WorkoutList.name}.update:`, newWorkout);
-    if (!workouts) return;
-    const newWorkouts = workouts.map((workout) =>
-      workout.name === newWorkout.name ? newWorkout : workout
+  const update = (newExercise: GymSet) => {
+    console.log(`${ExerciseList.name}.update:`, newExercise);
+    if (!exercises) return;
+    const newExercises = exercises.map((exercise) =>
+      exercise.name === newExercise.name ? newExercise : exercise
     );
-    setWorkouts(newWorkouts);
+    setExercises(newExercises);
   };
 
   const reset = async (value: string) => {
-    console.log(`${WorkoutList.name}.reset`, value);
-    const newWorkouts = await setRepo
+    console.log(`${ExerciseList.name}.reset`, value);
+    const newExercises = await setRepo
       .createQueryBuilder()
       .select()
       .where("name LIKE :name", { name: `%${value.trim()}%` })
@@ -52,9 +52,9 @@ export default function WorkoutList() {
       .limit(LIMIT)
       .getMany();
     setOffset(0);
-    console.log(`${WorkoutList.name}.reset`, { length: newWorkouts.length });
-    setEnd(newWorkouts.length < LIMIT);
-    setWorkouts(newWorkouts);
+    console.log(`${ExerciseList.name}.reset`, { length: newExercises.length });
+    setEnd(newExercises.length < LIMIT);
+    setExercises(newExercises);
   };
 
   useEffect(() => {
@@ -66,7 +66,7 @@ export default function WorkoutList() {
   }, []);
 
   useEffect(() => {
-    console.log(`${WorkoutList.name}.useEffect`, params);
+    console.log(`${ExerciseList.name}.useEffect`, params);
     if (!params) reset("");
     if (params?.search) search(params.search);
     else if (params?.update) update(params.update);
@@ -77,7 +77,7 @@ export default function WorkoutList() {
 
   const renderItem = useCallback(
     ({ item }: { item: GymSet }) => (
-      <WorkoutItem
+      <ExerciseItem
         images={settings?.images}
         alarm={settings?.alarm}
         item={item}
@@ -98,7 +98,7 @@ export default function WorkoutList() {
     });
     if (end) return;
     const newOffset = offset + LIMIT;
-    const newWorkouts = await setRepo
+    const newExercises = await setRepo
       .createQueryBuilder()
       .select()
       .where("name LIKE :name", { name: `%${term.trim()}%` })
@@ -107,15 +107,15 @@ export default function WorkoutList() {
       .limit(LIMIT)
       .offset(newOffset)
       .getMany();
-    if (newWorkouts.length === 0) return setEnd(true);
-    if (!workouts) return;
-    setWorkouts([...workouts, ...newWorkouts]);
-    if (newWorkouts.length < LIMIT) return setEnd(true);
+    if (newExercises.length === 0) return setEnd(true);
+    if (!exercises) return;
+    setExercises([...exercises, ...newExercises]);
+    if (newExercises.length < LIMIT) return setEnd(true);
     setOffset(newOffset);
   };
 
   const onAdd = useCallback(async () => {
-    navigation.navigate("EditWorkout", {
+    navigation.navigate("EditExercise", {
       gymSet: new GymSet(),
     });
   }, [navigation]);
@@ -137,19 +137,19 @@ export default function WorkoutList() {
   };
 
   const select = () => {
-    if (!workouts) return;
-    if (names.length === workouts.length) return setNames([]);
-    setNames(workouts.map((workout) => workout.name));
+    if (!exercises) return;
+    if (names.length === exercises.length) return setNames([]);
+    setNames(exercises.map((exercise) => exercise.name));
   };
 
   const edit = () => {
-    navigation.navigate("EditWorkouts", { names });
+    navigation.navigate("EditExercises", { names });
   };
 
   return (
     <>
       <DrawerHeader
-        name={names.length > 0 ? `${names.length} selected` : "Workouts"}
+        name={names.length > 0 ? `${names.length} selected` : "Exercises"}
       >
         <ListMenu
           onClear={clear}
@@ -160,14 +160,14 @@ export default function WorkoutList() {
         />
       </DrawerHeader>
       <Page onAdd={onAdd} term={term} search={search}>
-        {workouts?.length === 0 ? (
+        {exercises?.length === 0 ? (
           <List.Item
-            title="No workouts yet."
-            description="A workout is something you do at the gym. E.g. Deadlifts"
+            title="No exercises yet."
+            description="An exercise is something you do at the gym. E.g. Deadlifts"
           />
         ) : (
           <FlatList
-            data={workouts}
+            data={exercises}
             style={{ flex: 1 }}
             renderItem={renderItem}
             keyExtractor={(w) => w.name}
diff --git a/ExercisesPage.tsx b/ExercisesPage.tsx
new file mode 100644
index 0000000..ba20658
--- /dev/null
+++ b/ExercisesPage.tsx
@@ -0,0 +1,34 @@
+import { createStackNavigator } from "@react-navigation/stack";
+import EditExercise from "./EditExercise";
+import EditExercises from "./EditExercises";
+import GymSet from "./gym-set";
+import ExerciseList from "./ExerciseList";
+
+export type ExercisesPageParams = {
+  ExerciseList: {
+    clearNames?: boolean;
+    search?: string;
+    update?: GymSet;
+    reset?: number;
+  };
+  EditExercise: {
+    gymSet: GymSet;
+  };
+  EditExercises: {
+    names: string[];
+  };
+};
+
+const Stack = createStackNavigator<ExercisesPageParams>();
+
+export default function ExercisesPage() {
+  return (
+    <Stack.Navigator
+      screenOptions={{ headerShown: false, animationEnabled: false }}
+    >
+      <Stack.Screen name="ExerciseList" component={ExerciseList} />
+      <Stack.Screen name="EditExercise" component={EditExercise} />
+      <Stack.Screen name="EditExercises" component={EditExercises} />
+    </Stack.Navigator>
+  );
+}
diff --git a/PlanItem.tsx b/PlanItem.tsx
index b951702..e9a32e5 100644
--- a/PlanItem.tsx
+++ b/PlanItem.tsx
@@ -36,12 +36,12 @@ export default function PlanItem({
   );
 
   const start = useCallback(async () => {
-    const workout = item.workouts.split(",")[0];
+    const exercise = item.exercises.split(",")[0];
     let first = await setRepo.findOne({
-      where: { name: workout },
+      where: { name: exercise },
       order: { created: "desc" },
     });
-    if (!first) first = { ...defaultSet, name: workout };
+    if (!first) first = { ...defaultSet, name: exercise };
     delete first.id;
     if (ids.length === 0) {
       return navigation.navigate("StartPlan", { plan: item, first });
@@ -85,8 +85,8 @@ export default function PlanItem({
   );
 
   const description = useMemo(
-    () => (item.title ? currentDays : item.workouts.replace(/,/g, ", ")),
-    [item.title, currentDays, item.workouts]
+    () => (item.title ? currentDays : item.exercises.replace(/,/g, ", ")),
+    [item.title, currentDays, item.exercises]
   );
 
   const backgroundColor = useMemo(() => {
diff --git a/PlanList.tsx b/PlanList.tsx
index 44ddda8..3cd1426 100644
--- a/PlanList.tsx
+++ b/PlanList.tsx
@@ -28,7 +28,7 @@ export default function PlanList() {
         where: [
           { title: Like(`%${value.trim()}%`) },
           { days: Like(`%${value.trim()}%`) },
-          { workouts: Like(`%${value.trim()}%`) },
+          { exercises: Like(`%${value.trim()}%`) },
         ],
       })
       .then(setPlans);
@@ -57,7 +57,7 @@ export default function PlanList() {
 
   const onAdd = () =>
     navigation.navigate("EditPlan", {
-      plan: { title: "", days: "", workouts: "" },
+      plan: { title: "", days: "", exercises: "" },
     });
 
   const edit = useCallback(async () => {
@@ -107,7 +107,7 @@ export default function PlanList() {
         {plans?.length === 0 ? (
           <List.Item
             title="No plans yet"
-            description="A plan is a list of workouts for certain days."
+            description="A plan is a list of exercises for certain days."
           />
         ) : (
           <FlatList
diff --git a/SettingsPage.tsx b/SettingsPage.tsx
index aeee2cb..e71000b 100644
--- a/SettingsPage.tsx
+++ b/SettingsPage.tsx
@@ -2,7 +2,7 @@ import { NavigationProp, useNavigation } from "@react-navigation/native";
 import { format } from "date-fns";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { useForm } from "react-hook-form";
-import { NativeModules, ScrollView, View } from "react-native";
+import { NativeModules, ScrollView } from "react-native";
 import DocumentPicker from "react-native-document-picker";
 import { Dirs, FileSystem } from "react-native-file-access";
 import { Button } from "react-native-paper";
@@ -145,8 +145,8 @@ export default function SettingsPage() {
           else toast("Hid unit option for sets.");
           return;
         case "steps":
-          if (value) toast("Show steps for a workout.");
-          else toast("Hid steps for workouts.");
+          if (value) toast("Show steps for exercises.");
+          else toast("Hid steps for exercises.");
           return;
         case "showDate":
           if (value) toast("Show date for sets.");
diff --git a/StartPlan.tsx b/StartPlan.tsx
index f6c9f5d..3a3dedb 100644
--- a/StartPlan.tsx
+++ b/StartPlan.tsx
@@ -34,7 +34,7 @@ export default function StartPlan() {
   const weightRef = useRef<TextInput>(null);
   const repsRef = useRef<TextInput>(null);
   const unitRef = useRef<TextInput>(null);
-  const workouts = useMemo(() => params.plan.workouts.split(","), [params]);
+  const exercises = useMemo(() => params.plan.exercises.split(","), [params]);
   const navigation = useNavigation<NavigationProp<StackParams>>();
 
   const [selection, setSelection] = useState({
@@ -43,33 +43,33 @@ export default function StartPlan() {
   });
 
   const refresh = useCallback(async () => {
-    const questions = workouts
-      .map((workout, index) => `('${workout}',${index})`)
+    const questions = exercises
+      .map((exercise, index) => `('${exercise}',${index})`)
       .join(",");
     const select = `
-      SELECT workouts.name, COUNT(sets.id) as total, sets.sets
-      FROM (select 0 as name, 0 as sequence union values ${questions}) as workouts 
-      LEFT JOIN sets ON sets.name = workouts.name 
+      SELECT exercises.name, COUNT(sets.id) as total, sets.sets
+      FROM (select 0 as name, 0 as sequence union values ${questions}) as exercises 
+      LEFT JOIN sets ON sets.name = exercises.name 
         AND sets.created LIKE STRFTIME('%Y-%m-%d%%', 'now', 'localtime')
         AND NOT sets.hidden
-      GROUP BY workouts.name
-      ORDER BY workouts.sequence
+      GROUP BY exercises.name
+      ORDER BY exercises.sequence
       LIMIT -1
       OFFSET 1
     `;
     const newCounts = await AppDataSource.manager.query(select);
     console.log(`${StartPlan.name}.focus:`, { newCounts });
     setCounts(newCounts);
-  }, [workouts]);
+  }, [exercises]);
 
   const select = useCallback(
     async (index: number, newCounts?: CountMany[]) => {
       setSelected(index);
       if (!counts && !newCounts) return;
-      const workout = counts ? counts[index] : newCounts[index];
-      console.log(`${StartPlan.name}.next:`, { workout });
+      const exercise = counts ? counts[index] : newCounts[index];
+      console.log(`${StartPlan.name}.next:`, { exercise });
       const last = await setRepo.findOne({
-        where: { name: workout.name },
+        where: { name: exercise.name },
         order: { created: "desc" },
       });
       console.log({ last });
@@ -92,8 +92,8 @@ export default function StartPlan() {
 
   const handleSubmit = async () => {
     const now = await getNow();
-    const workout = counts[selected];
-    const best = await getBestSet(workout.name);
+    const exercise = counts[selected];
+    const best = await getBestSet(exercise.name);
     delete best.id;
     const newSet: GymSet = {
       ...best,
diff --git a/WorkoutsPage.tsx b/WorkoutsPage.tsx
deleted file mode 100644
index 58133b6..0000000
--- a/WorkoutsPage.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { createStackNavigator } from "@react-navigation/stack";
-import EditWorkout from "./EditWorkout";
-import EditWorkouts from "./EditWorkouts";
-import GymSet from "./gym-set";
-import WorkoutList from "./WorkoutList";
-
-export type WorkoutsPageParams = {
-  WorkoutList: {
-    clearNames?: boolean;
-    search?: string;
-    update?: GymSet;
-    reset?: number;
-  };
-  EditWorkout: {
-    gymSet: GymSet;
-  };
-  EditWorkouts: {
-    names: string[];
-  };
-};
-
-const Stack = createStackNavigator<WorkoutsPageParams>();
-
-export default function WorkoutsPage() {
-  return (
-    <Stack.Navigator
-      screenOptions={{ headerShown: false, animationEnabled: false }}
-    >
-      <Stack.Screen name="WorkoutList" component={WorkoutList} />
-      <Stack.Screen name="EditWorkout" component={EditWorkout} />
-      <Stack.Screen name="EditWorkouts" component={EditWorkouts} />
-    </Stack.Navigator>
-  );
-}
diff --git a/data-source.ts b/data-source.ts
index 81bc576..8d5735e 100644
--- a/data-source.ts
+++ b/data-source.ts
@@ -30,6 +30,7 @@ import { weight1697766633971 } from "./migrations/1697766633971-weight";
 import { Plan } from "./plan";
 import Settings from "./settings";
 import Weight from "./weight";
+import { exercises1699508495726 } from "./migrations/1699508495726-exercises";
 
 export const AppDataSource = new DataSource({
   type: "react-native",
@@ -66,5 +67,6 @@ export const AppDataSource = new DataSource({
     addBackup1678334268359,
     planTitle1692654882408,
     weight1697766633971,
+    exercises1699508495726,
   ],
 });
diff --git a/drawer-param-list.ts b/drawer-param-list.ts
index e91cbbb..d676637 100644
--- a/drawer-param-list.ts
+++ b/drawer-param-list.ts
@@ -5,7 +5,7 @@ export type DrawerParams = {
   Settings: {};
   Graphs: {};
   Plans: {};
-  Workouts: {
+  Exercises: {
     clearNames?: boolean;
     search?: string;
     update?: GymSet;
diff --git a/migrations/1699508495726-exercises.ts b/migrations/1699508495726-exercises.ts
new file mode 100644
index 0000000..e14be6a
--- /dev/null
+++ b/migrations/1699508495726-exercises.ts
@@ -0,0 +1,10 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class exercises1699508495726 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE plans ADD COLUMN exercises TEXT`);
+    await queryRunner.query(`UPDATE plans SET exercises = workouts`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {}
+}
diff --git a/plan.ts b/plan.ts
index 6107581..ae7cb1c 100644
--- a/plan.ts
+++ b/plan.ts
@@ -12,5 +12,5 @@ export class Plan {
   days: string;
 
   @Column("text")
-  workouts: string;
+  exercises: string;
 }