From e2c790870b928cacff3d03a75bb9a88e4894f658 Mon Sep 17 00:00:00 2001 From: Brandon Presley Date: Tue, 4 Oct 2022 14:46:15 +1300 Subject: [PATCH] Hide rest settings in workouts when alarms are off Closes #83 --- EditWorkout.tsx | 36 ++++++++++++++++++++---------------- WorkoutItem.tsx | 12 ++++++++---- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/EditWorkout.tsx b/EditWorkout.tsx index 9273eb6..1ae4561 100644 --- a/EditWorkout.tsx +++ b/EditWorkout.tsx @@ -146,22 +146,26 @@ export default function EditWorkout() { keyboardType="numeric" onSubmitEditing={() => minutesRef.current?.focus()} /> - secondsRef.current?.focus()} - value={minutes} - onChangeText={setMinutes} - label="Rest minutes" - keyboardType="numeric" - /> - + {!!settings.alarm && ( + <> + secondsRef.current?.focus()} + value={minutes} + onChangeText={setMinutes} + label="Rest minutes" + keyboardType="numeric" + /> + + + )} {!!settings.images && uri && ( { + const minutes = item.minutes?.toString().padStart(2, '0'); + const seconds = item.seconds?.toString().padStart(2, '0'); + if (settings.alarm) return `${item.sets} sets ${minutes}:${seconds} rest`; + return `${item.sets} sets`; + }, [item, settings.alarm]); return ( <> navigation.navigate('EditWorkout', {value: item})} title={item.name} - description={`${item.sets} sets ${minutes}:${seconds} rest`} + description={description} onLongPress={longPress} left={() => !!settings.images &&