Skip to content

Phase 5: Workout Execution Screen + Rest Timer #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Phase 5: Workout Execution Screen + Rest Timer #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bac920
Initial plan
Copilot Feb 28, 2026
8f98a2d
feat: Phase 5 — Workout Execution + Rest Timer
Copilot Feb 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/(app)/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export default function TodayScreen() {
</Text>
</View>
<TouchableOpacity
onPress={() => router.push(`/(app)/workout/${todayWorkout.workout_id}`)}
onPress={() => router.push(`/(app)/workout/${selectedDate}`)}
style={styles.startButton}
>
<Text style={styles.startIcon}>▶</Text>
Expand Down
57 changes: 56 additions & 1 deletion app/(app)/planner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,12 @@ export default function PlannerScreen() {
duration={structured?.duration}
/>

{selectedWorkout.is_locked ? (
{selectedWorkout.is_completed ? (
<View style={styles.completedRow}>
<Text style={styles.completedIcon}>✅</Text>
<Text style={styles.completedText}>Completed</Text>
</View>
) : selectedWorkout.is_locked ? (
<View style={styles.lockedRow}>
<Text style={styles.lockIconLarge}>🔒</Text>
<Text style={styles.lockedText}>Locked</Text>
Expand All @@ -277,6 +282,16 @@ export default function PlannerScreen() {
</View>
) : (
<>
{(selectedPlannerDate <= today) && (
<TouchableOpacity
onPress={() => router.push(`/(app)/workout/${selectedPlannerDate}`)}
style={[styles.ctaStart, actionLoading && styles.disabled]}
disabled={actionLoading}
>
<Text style={styles.ctaStartIcon}>▶</Text>
<Text style={styles.ctaStartText}>Start Workout</Text>
</TouchableOpacity>
)}
<TouchableOpacity
onPress={() => handleLockDay(true)}
style={[styles.ctaPrimary, actionLoading && styles.disabled]}
Expand Down Expand Up @@ -427,5 +442,45 @@ const styles = StyleSheet.create({
disabled: {
opacity: 0.4,
},
completedRow: {
flexDirection: 'row',
alignItems: 'center',
backgroundColor: '#FFFFFF',
borderRadius: 14,
paddingHorizontal: 16,
paddingVertical: 14,
gap: 10,
shadowColor: '#000',
shadowOpacity: 0.05,
shadowRadius: 6,
shadowOffset: { width: 0, height: 2 },
elevation: 1,
},
completedIcon: {
fontSize: 20,
},
completedText: {
fontSize: 15,
fontWeight: '700',
color: '#34C759',
},
ctaStart: {
backgroundColor: '#1A1A1A',
borderRadius: 14,
height: 52,
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'center',
gap: 10,
},
ctaStartIcon: {
color: '#E8470A',
fontSize: 16,
},
ctaStartText: {
color: '#FFFFFF',
fontSize: 16,
fontWeight: '700',
},
});

Loading