From 57883266b8752fd4c000f12ecb71edccb27a0ec4 Mon Sep 17 00:00:00 2001 From: Brandon Presley Date: Sat, 14 Oct 2023 10:46:22 +1300 Subject: [PATCH] Hide rest timers on Workouts when alarms are off Closes #172. --- WorkoutItem.tsx | 8 ++++++-- WorkoutList.tsx | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/WorkoutItem.tsx b/WorkoutItem.tsx index 02d3780..6760e30 100644 --- a/WorkoutItem.tsx +++ b/WorkoutItem.tsx @@ -13,19 +13,23 @@ export default function WorkoutItem({ setNames, names, images, + alarm, }: { item: GymSet; images: boolean; setNames: (value: string[]) => void; names: string[]; + alarm: boolean; }) { const navigation = useNavigation>(); const dark = useDark(); const description = useMemo(() => { const seconds = item.seconds?.toString().padStart(2, "0"); - return `${item.sets} x ${item.minutes || 0}:${seconds}`; - }, [item.sets, item.minutes, item.seconds]); + const time = ` x ${item.minutes || 0}:${seconds}`; + if (alarm) return item.sets.toString() + time; + return item.sets.toString(); + }, [item.sets, item.minutes, item.seconds, alarm]); const left = useCallback(() => { if (!images || !item.image) return null; diff --git a/WorkoutList.tsx b/WorkoutList.tsx index 8f4baa4..70979bc 100644 --- a/WorkoutList.tsx +++ b/WorkoutList.tsx @@ -57,13 +57,14 @@ export default function WorkoutList() { ({ item }: { item: GymSet }) => ( ), - [settings?.images, names] + [settings?.images, names, settings.alarm] ); const next = async () => {