feat: integrate theme and i18n across all screens

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Millian Lamiaux
2026-02-21 00:05:14 +01:00
parent f17125e231
commit f80798069b
17 changed files with 3127 additions and 2402 deletions

View File

@@ -2,39 +2,50 @@
* TabataFit Tab Layout
* Native iOS tabs with liquid glass effect
* 5 tabs: Home, Workouts, Activity, Browse, Profile
* Redirects to onboarding if not completed
*/
import { Redirect } from 'expo-router'
import { NativeTabs, Icon, Label } from 'expo-router/unstable-native-tabs'
import { useTranslation } from 'react-i18next'
import { BRAND } from '@/src/shared/constants/colors'
import { useUserStore } from '@/src/shared/stores'
export default function TabLayout() {
const { t } = useTranslation('screens')
const onboardingCompleted = useUserStore((s) => s.profile.onboardingCompleted)
if (!onboardingCompleted) {
return <Redirect href="/onboarding" />
}
return (
<NativeTabs
tintColor={BRAND.PRIMARY}
>
<NativeTabs.Trigger name="index">
<Icon sf={{ default: 'house', selected: 'house.fill' }} />
<Label>Home</Label>
<Label>{t('tabs.home')}</Label>
</NativeTabs.Trigger>
<NativeTabs.Trigger name="workouts">
<Icon sf={{ default: 'flame', selected: 'flame.fill' }} />
<Label>Workouts</Label>
<Label>{t('tabs.workouts')}</Label>
</NativeTabs.Trigger>
<NativeTabs.Trigger name="activity">
<Icon sf={{ default: 'chart.bar', selected: 'chart.bar.fill' }} />
<Label>Activity</Label>
<Label>{t('tabs.activity')}</Label>
</NativeTabs.Trigger>
<NativeTabs.Trigger name="browse">
<Icon sf={{ default: 'square.grid.2x2', selected: 'square.grid.2x2.fill' }} />
<Label>Browse</Label>
<Label>{t('tabs.browse')}</Label>
</NativeTabs.Trigger>
<NativeTabs.Trigger name="profile">
<Icon sf={{ default: 'person', selected: 'person.fill' }} />
<Label>Profile</Label>
<Label>{t('tabs.profile')}</Label>
</NativeTabs.Trigger>
</NativeTabs>
)

View File

@@ -1,62 +1,181 @@
/**
* TabataFit Activity Screen
* React Native + SwiftUI Islands — wired to shared data
* Premium stats dashboard — streak, rings, weekly chart, history
*/
import { View, StyleSheet, ScrollView, Dimensions, Text as RNText } from 'react-native'
import { View, StyleSheet, ScrollView, Dimensions } from 'react-native'
import { useSafeAreaInsets } from 'react-native-safe-area-context'
import { LinearGradient } from 'expo-linear-gradient'
import { BlurView } from 'expo-blur'
import Ionicons from '@expo/vector-icons/Ionicons'
import {
Host,
Gauge,
Text,
HStack,
VStack,
Chart,
List,
} from '@expo/ui/swift-ui'
import { useMemo } from 'react'
import { useTranslation } from 'react-i18next'
import { useActivityStore, getWeeklyActivity } from '@/src/shared/stores'
import { getWorkoutById } from '@/src/shared/data'
import { ACHIEVEMENTS } from '@/src/shared/data'
import { StyledText } from '@/src/shared/components/StyledText'
import {
BRAND,
DARK,
TEXT as TEXT_COLORS,
GLASS,
GRADIENTS,
} from '@/src/shared/constants/colors'
import { useThemeColors, BRAND, PHASE, GRADIENTS } from '@/src/shared/theme'
import type { ThemeColors } from '@/src/shared/theme/types'
import { SPACING, LAYOUT } from '@/src/shared/constants/spacing'
import { RADIUS } from '@/src/shared/constants/borderRadius'
const { width: SCREEN_WIDTH } = Dimensions.get('window')
const FONTS = {
LARGE_TITLE: 34,
TITLE_2: 22,
SUBHEADLINE: 15,
CAPTION_1: 12,
// ═══════════════════════════════════════════════════════════════════════════
// STAT RING — Custom circular progress (pure RN, no SwiftUI)
// ═══════════════════════════════════════════════════════════════════════════
function StatRing({
value,
max,
color,
size = 64,
}: {
value: number
max: number
color: string
size?: number
}) {
const colors = useThemeColors()
const strokeWidth = 5
const radius = (size - strokeWidth) / 2
const circumference = 2 * Math.PI * radius
const progress = Math.min(value / max, 1)
const strokeDashoffset = circumference * (1 - progress)
// We'll use a View-based ring since SVG isn't available
// Use border trick for a circular progress indicator
return (
<View style={{ width: size, height: size, alignItems: 'center', justifyContent: 'center' }}>
{/* Track */}
<View
style={{
position: 'absolute',
width: size,
height: size,
borderRadius: size / 2,
borderWidth: strokeWidth,
borderColor: colors.bg.overlay2,
}}
/>
{/* Fill — simplified: show a colored ring proportional to progress */}
<View
style={{
position: 'absolute',
width: size,
height: size,
borderRadius: size / 2,
borderWidth: strokeWidth,
borderColor: color,
borderTopColor: progress > 0.25 ? color : 'transparent',
borderRightColor: progress > 0.5 ? color : 'transparent',
borderBottomColor: progress > 0.75 ? color : 'transparent',
borderLeftColor: progress > 0 ? color : 'transparent',
transform: [{ rotate: '-90deg' }],
opacity: progress > 0 ? 1 : 0.3,
}}
/>
</View>
)
}
// ═══════════════════════════════════════════════════════════════════════════
// STAT CARD
// ═══════════════════════════════════════════════════════════════════════════
function StatCard({
label,
value,
max,
color,
icon,
}: {
label: string
value: number
max: number
color: string
icon: keyof typeof Ionicons.glyphMap
}) {
const colors = useThemeColors()
const styles = useMemo(() => createStyles(colors), [colors])
return (
<View style={styles.statCard}>
<BlurView intensity={colors.glass.blurLight} tint={colors.glass.blurTint} style={StyleSheet.absoluteFill} />
<View style={styles.statCardInner}>
<StatRing value={value} max={max} color={color} size={52} />
<View style={{ flex: 1, marginLeft: SPACING[3] }}>
<StyledText size={24} weight="bold" color={colors.text.primary}>
{String(value)}
</StyledText>
<StyledText size={12} color={colors.text.tertiary}>
{label}
</StyledText>
</View>
<Ionicons name={icon} size={18} color={color} />
</View>
</View>
)
}
// ═══════════════════════════════════════════════════════════════════════════
// WEEKLY BAR
// ═══════════════════════════════════════════════════════════════════════════
function WeeklyBar({
day,
completed,
isToday,
}: {
day: string
completed: boolean
isToday: boolean
}) {
const colors = useThemeColors()
const styles = useMemo(() => createStyles(colors), [colors])
return (
<View style={styles.weekBarColumn}>
<View style={[styles.weekBar, completed && styles.weekBarFilled]}>
{completed && (
<LinearGradient
colors={[BRAND.PRIMARY, BRAND.PRIMARY_LIGHT]}
style={[StyleSheet.absoluteFill, { borderRadius: 4 }]}
/>
)}
</View>
<StyledText
size={11}
weight={isToday ? 'bold' : 'regular'}
color={isToday ? colors.text.primary : colors.text.hint}
>
{day}
</StyledText>
</View>
)
}
// ═══════════════════════════════════════════════════════════════════════════
// MAIN SCREEN
// ═══════════════════════════════════════════════════════════════════════════
const DAY_KEYS = ['days.sun', 'days.mon', 'days.tue', 'days.wed', 'days.thu', 'days.fri', 'days.sat'] as const
export default function ActivityScreen() {
const { t } = useTranslation()
const insets = useSafeAreaInsets()
const colors = useThemeColors()
const styles = useMemo(() => createStyles(colors), [colors])
const streak = useActivityStore((s) => s.streak)
const history = useActivityStore((s) => s.history)
const totalWorkouts = history.length
const totalMinutes = useMemo(() => history.reduce((sum, r) => sum + r.durationMinutes, 0), [history])
const totalCalories = useMemo(() => history.reduce((sum, r) => sum + r.calories, 0), [history])
const recentWorkouts = useMemo(() => history.slice(0, 3), [history])
const recentWorkouts = useMemo(() => history.slice(0, 5), [history])
const weeklyActivity = useMemo(() => getWeeklyActivity(history), [history])
const today = new Date().getDay() // 0=Sun
// Check achievements
const unlockedAchievements = ACHIEVEMENTS.filter(a => {
switch (a.type) {
@@ -67,18 +186,17 @@ export default function ActivityScreen() {
default: return false
}
})
const displayAchievements = ACHIEVEMENTS.slice(0, 5).map(a => ({
const displayAchievements = ACHIEVEMENTS.slice(0, 4).map(a => ({
...a,
unlocked: unlockedAchievements.some(u => u.id === a.id),
}))
// Format recent workout dates
const formatDate = (timestamp: number) => {
const now = Date.now()
const diff = now - timestamp
if (diff < 86400000) return 'Today'
if (diff < 172800000) return 'Yesterday'
return Math.floor(diff / 86400000) + ' days ago'
if (diff < 86400000) return t('screens:activity.today')
if (diff < 172800000) return t('screens:activity.yesterday')
return t('screens:activity.daysAgo', { count: Math.floor(diff / 86400000) })
}
return (
@@ -89,7 +207,14 @@ export default function ActivityScreen() {
showsVerticalScrollIndicator={false}
>
{/* Header */}
<StyledText size={FONTS.LARGE_TITLE} weight="bold" color={TEXT_COLORS.PRIMARY}>Activity</StyledText>
<StyledText
size={34}
weight="bold"
color={colors.text.primary}
style={{ marginBottom: SPACING[6] }}
>
{t('screens:activity.title')}
</StyledText>
{/* Streak Banner */}
<View style={styles.streakBanner}>
@@ -99,119 +224,154 @@ export default function ActivityScreen() {
end={{ x: 1, y: 1 }}
style={StyleSheet.absoluteFill}
/>
<View style={styles.streakContent}>
<Ionicons name="flame" size={32} color={TEXT_COLORS.PRIMARY} />
<View style={styles.streakText}>
<StyledText size={FONTS.TITLE_2} weight="bold" color={TEXT_COLORS.PRIMARY}>
{(streak.current || 0) + ' Day Streak'}
<View style={styles.streakRow}>
<View style={styles.streakIconWrap}>
<Ionicons name="flame" size={28} color="#FFFFFF" />
</View>
<View style={{ flex: 1 }}>
<StyledText size={28} weight="bold" color="#FFFFFF">
{String(streak.current || 0)}
</StyledText>
<StyledText size={FONTS.SUBHEADLINE} color={TEXT_COLORS.SECONDARY}>
{streak.current > 0 ? 'Keep it going!' : 'Start your streak today!'}
<StyledText size={13} color="rgba(255,255,255,0.8)">
{t('screens:activity.dayStreak')}
</StyledText>
</View>
<View style={styles.streakMeta}>
<StyledText size={11} color="rgba(255,255,255,0.6)">
{t('screens:activity.longest')}
</StyledText>
<StyledText size={20} weight="bold" color="#FFFFFF">
{String(streak.longest)}
</StyledText>
</View>
</View>
</View>
{/* SwiftUI Island: Stats Gauges */}
<Host matchContents useViewportSizeMeasurement colorScheme="dark" style={styles.statsIsland}>
<HStack spacing={12}>
<VStack spacing={4}>
<Gauge
type="circularCapacity"
current={{ value: Math.min(totalWorkouts / 100, 1), label: String(totalWorkouts) }}
color={BRAND.PRIMARY}
/>
<Text size={11} color={TEXT_COLORS.TERTIARY}>Workouts</Text>
</VStack>
<VStack spacing={4}>
<Gauge
type="circularCapacity"
current={{ value: Math.min(totalMinutes / 300, 1), label: String(totalMinutes) }}
color="#5AC8FA"
/>
<Text size={11} color={TEXT_COLORS.TERTIARY}>Minutes</Text>
</VStack>
<VStack spacing={4}>
<Gauge
type="circularCapacity"
current={{ value: Math.min(totalCalories / 5000, 1), label: String(totalCalories) }}
color="#FFD60A"
/>
<Text size={11} color={TEXT_COLORS.TERTIARY}>Calories</Text>
</VStack>
<VStack spacing={4}>
<Gauge
type="circularCapacity"
current={{ value: Math.min(streak.longest / 30, 1), label: String(streak.longest) }}
color="#30D158"
/>
<Text size={11} color={TEXT_COLORS.TERTIARY}>Best Streak</Text>
</VStack>
</HStack>
</Host>
{/* SwiftUI Island: This Week Chart */}
<View style={styles.section}>
<StyledText size={FONTS.TITLE_2} weight="semibold" color={TEXT_COLORS.PRIMARY}>This Week</StyledText>
<Host matchContents useViewportSizeMeasurement colorScheme="dark" style={styles.chartIsland}>
<Chart
type="bar"
data={weeklyActivity.map(d => ({
x: d.date,
y: d.completed ? 1 : 0,
color: d.completed ? BRAND.PRIMARY : '#333333',
}))}
barStyle={{ cornerRadius: 4 }}
style={{ height: 160 }}
/>
</Host>
{/* Stats Grid — 2x2 */}
<View style={styles.statsGrid}>
<StatCard
label={t('screens:activity.workouts')}
value={totalWorkouts}
max={100}
color={BRAND.PRIMARY}
icon="barbell-outline"
/>
<StatCard
label={t('screens:activity.minutes')}
value={totalMinutes}
max={300}
color={PHASE.REST}
icon="time-outline"
/>
<StatCard
label={t('screens:activity.calories')}
value={totalCalories}
max={5000}
color={BRAND.SECONDARY}
icon="flash-outline"
/>
<StatCard
label={t('screens:activity.bestStreak')}
value={streak.longest}
max={30}
color={BRAND.SUCCESS}
icon="trending-up-outline"
/>
</View>
{/* SwiftUI Island: Recent Workouts */}
{/* This Week */}
<View style={styles.section}>
<StyledText size={20} weight="semibold" color={colors.text.primary} style={{ marginBottom: SPACING[4] }}>
{t('screens:activity.thisWeek')}
</StyledText>
<View style={styles.weekCard}>
<BlurView intensity={colors.glass.blurLight} tint={colors.glass.blurTint} style={StyleSheet.absoluteFill} />
<View style={styles.weekBarsRow}>
{weeklyActivity.map((d, i) => (
<WeeklyBar
key={i}
day={t(DAY_KEYS[i])}
completed={d.completed}
isToday={i === today}
/>
))}
</View>
<View style={styles.weekSummary}>
<StyledText size={13} color={colors.text.tertiary}>
{t('screens:activity.ofDays', { completed: weeklyActivity.filter(d => d.completed).length })}
</StyledText>
</View>
</View>
</View>
{/* Recent Workouts */}
{recentWorkouts.length > 0 && (
<View style={styles.section}>
<StyledText size={FONTS.TITLE_2} weight="semibold" color={TEXT_COLORS.PRIMARY}>Recent</StyledText>
<Host useViewportSizeMeasurement colorScheme="dark" style={{ height: 44 * recentWorkouts.length + 55 }}>
<List listStyle="insetGrouped" scrollEnabled={false}>
{recentWorkouts.map((result) => {
const workout = getWorkoutById(result.workoutId)
return (
<HStack key={result.id} spacing={12}>
<Text color={BRAND.PRIMARY} weight="bold">{workout?.title ?? 'Workout'}</Text>
<Text size={13} color={TEXT_COLORS.TERTIARY}>{formatDate(result.completedAt)}</Text>
<Text size={13} color={TEXT_COLORS.PRIMARY}>{result.durationMinutes + ' min'}</Text>
<Text size={13} color={BRAND.PRIMARY}>{result.calories + ' cal'}</Text>
</HStack>
)
})}
</List>
</Host>
<StyledText size={20} weight="semibold" color={colors.text.primary} style={{ marginBottom: SPACING[4] }}>
{t('screens:activity.recent')}
</StyledText>
<View style={styles.recentCard}>
<BlurView intensity={colors.glass.blurLight} tint={colors.glass.blurTint} style={StyleSheet.absoluteFill} />
{recentWorkouts.map((result, idx) => {
const workout = getWorkoutById(result.workoutId)
const workoutTitle = workout ? t(`content:workouts.${workout.id}`, { defaultValue: workout.title }) : t('screens:activity.workouts')
return (
<View key={result.id}>
<View style={styles.recentRow}>
<View style={styles.recentDot}>
<View style={[styles.dot, { backgroundColor: BRAND.PRIMARY }]} />
</View>
<View style={{ flex: 1 }}>
<StyledText size={15} weight="semibold" color={colors.text.primary}>
{workoutTitle}
</StyledText>
<StyledText size={12} color={colors.text.tertiary}>
{formatDate(result.completedAt) + ' \u00B7 ' + t('units.minUnit', { count: result.durationMinutes })}
</StyledText>
</View>
<StyledText size={14} weight="semibold" color={BRAND.PRIMARY}>
{t('units.calUnit', { count: result.calories })}
</StyledText>
</View>
{idx < recentWorkouts.length - 1 && <View style={styles.recentDivider} />}
</View>
)
})}
</View>
</View>
)}
{/* Achievements */}
<View style={styles.section}>
<StyledText size={FONTS.TITLE_2} weight="semibold" color={TEXT_COLORS.PRIMARY}>Achievements</StyledText>
<View style={styles.achievementsGrid}>
{displayAchievements.map((achievement) => (
<View
key={achievement.id}
style={[styles.achievementBadge, !achievement.unlocked && styles.achievementLocked]}
>
<BlurView intensity={GLASS.BLUR_LIGHT} tint="dark" style={StyleSheet.absoluteFill} />
<View style={[styles.achievementIcon, !achievement.unlocked && styles.achievementIconLocked]}>
<StyledText size={20} weight="semibold" color={colors.text.primary} style={{ marginBottom: SPACING[4] }}>
{t('screens:activity.achievements')}
</StyledText>
<View style={styles.achievementsRow}>
{displayAchievements.map((a) => (
<View key={a.id} style={styles.achievementCard}>
<BlurView intensity={colors.glass.blurLight} tint={colors.glass.blurTint} style={StyleSheet.absoluteFill} />
<View
style={[
styles.achievementIcon,
a.unlocked
? { backgroundColor: 'rgba(255, 107, 53, 0.15)' }
: { backgroundColor: 'rgba(255, 255, 255, 0.04)' },
]}
>
<Ionicons
name={achievement.unlocked ? 'trophy' : 'lock-closed'}
size={24}
color={achievement.unlocked ? BRAND.PRIMARY : TEXT_COLORS.TERTIARY}
name={a.unlocked ? 'trophy' : 'lock-closed'}
size={22}
color={a.unlocked ? BRAND.PRIMARY : colors.text.hint}
/>
</View>
<StyledText
size={FONTS.CAPTION_1}
weight={achievement.unlocked ? 'semibold' : 'regular'}
color={TEXT_COLORS.PRIMARY}
size={11}
weight="semibold"
color={a.unlocked ? colors.text.primary : colors.text.hint}
numberOfLines={1}
style={{ marginTop: SPACING[2], textAlign: 'center' }}
>
{achievement.title}
{t(`content:achievements.${a.id}.title`, { defaultValue: a.title })}
</StyledText>
</View>
))}
@@ -226,81 +386,168 @@ export default function ActivityScreen() {
// STYLES
// ═══════════════════════════════════════════════════════════════════════════
const styles = StyleSheet.create({
container: {
flex: 1,
backgroundColor: DARK.BASE,
},
scrollView: {
flex: 1,
},
scrollContent: {
paddingHorizontal: LAYOUT.SCREEN_PADDING,
},
const CARD_HALF = (SCREEN_WIDTH - LAYOUT.SCREEN_PADDING * 2 - SPACING[3]) / 2
// Streak Banner
streakBanner: {
height: 80,
borderRadius: RADIUS.GLASS_CARD,
overflow: 'hidden',
marginBottom: SPACING[6],
marginTop: SPACING[4],
},
streakContent: {
flex: 1,
flexDirection: 'row',
alignItems: 'center',
paddingHorizontal: SPACING[5],
gap: SPACING[4],
},
streakText: {
flex: 1,
},
function createStyles(colors: ThemeColors) {
return StyleSheet.create({
container: {
flex: 1,
backgroundColor: colors.bg.base,
},
scrollView: {
flex: 1,
},
scrollContent: {
paddingHorizontal: LAYOUT.SCREEN_PADDING,
},
// Stats Island
statsIsland: {
marginBottom: SPACING[8],
},
// Streak
streakBanner: {
borderRadius: RADIUS.GLASS_CARD,
overflow: 'hidden',
marginBottom: SPACING[5],
...colors.shadow.md,
},
streakRow: {
flexDirection: 'row',
alignItems: 'center',
paddingHorizontal: SPACING[5],
paddingVertical: SPACING[5],
gap: SPACING[4],
},
streakIconWrap: {
width: 48,
height: 48,
borderRadius: 24,
backgroundColor: 'rgba(255,255,255,0.15)',
alignItems: 'center',
justifyContent: 'center',
},
streakMeta: {
alignItems: 'center',
backgroundColor: 'rgba(255,255,255,0.1)',
paddingHorizontal: SPACING[4],
paddingVertical: SPACING[2],
borderRadius: RADIUS.MD,
},
// Chart Island
chartIsland: {
marginTop: SPACING[2],
},
// Stats 2x2
statsGrid: {
flexDirection: 'row',
flexWrap: 'wrap',
gap: SPACING[3],
marginBottom: SPACING[6],
},
statCard: {
width: CARD_HALF,
borderRadius: RADIUS.LG,
overflow: 'hidden',
borderWidth: 1,
borderColor: colors.bg.overlay2,
},
statCardInner: {
flexDirection: 'row',
alignItems: 'center',
padding: SPACING[4],
},
// Section
section: {
marginBottom: SPACING[6],
},
// Section
section: {
marginBottom: SPACING[6],
},
// Achievements
achievementsGrid: {
flexDirection: 'row',
flexWrap: 'wrap',
gap: SPACING[3],
},
achievementBadge: {
width: (SCREEN_WIDTH - LAYOUT.SCREEN_PADDING * 2 - SPACING[3] * 2) / 3,
aspectRatio: 1,
borderRadius: RADIUS.LG,
alignItems: 'center',
justifyContent: 'center',
borderWidth: 1,
borderColor: 'rgba(255, 255, 255, 0.1)',
overflow: 'hidden',
},
achievementLocked: {
opacity: 0.5,
},
achievementIcon: {
width: 48,
height: 48,
borderRadius: 24,
backgroundColor: 'rgba(255, 107, 53, 0.15)',
alignItems: 'center',
justifyContent: 'center',
marginBottom: SPACING[2],
},
achievementIconLocked: {
backgroundColor: 'rgba(255, 255, 255, 0.05)',
},
})
// Weekly
weekCard: {
borderRadius: RADIUS.LG,
overflow: 'hidden',
borderWidth: 1,
borderColor: colors.bg.overlay2,
paddingTop: SPACING[5],
paddingBottom: SPACING[4],
},
weekBarsRow: {
flexDirection: 'row',
justifyContent: 'space-around',
alignItems: 'flex-end',
paddingHorizontal: SPACING[4],
height: 100,
},
weekBarColumn: {
alignItems: 'center',
flex: 1,
gap: SPACING[2],
},
weekBar: {
width: 24,
height: 60,
borderRadius: 4,
backgroundColor: colors.border.glassLight,
overflow: 'hidden',
},
weekBarFilled: {
backgroundColor: BRAND.PRIMARY,
},
weekSummary: {
alignItems: 'center',
marginTop: SPACING[3],
paddingTop: SPACING[3],
borderTopWidth: StyleSheet.hairlineWidth,
borderTopColor: colors.bg.overlay2,
marginHorizontal: SPACING[4],
},
// Recent
recentCard: {
borderRadius: RADIUS.LG,
overflow: 'hidden',
borderWidth: 1,
borderColor: colors.bg.overlay2,
paddingVertical: SPACING[2],
},
recentRow: {
flexDirection: 'row',
alignItems: 'center',
paddingHorizontal: SPACING[4],
paddingVertical: SPACING[3],
},
recentDot: {
width: 24,
alignItems: 'center',
marginRight: SPACING[3],
},
dot: {
width: 8,
height: 8,
borderRadius: 4,
},
recentDivider: {
height: StyleSheet.hairlineWidth,
backgroundColor: colors.border.glassLight,
marginLeft: SPACING[4] + 24 + SPACING[3],
},
// Achievements
achievementsRow: {
flexDirection: 'row',
gap: SPACING[3],
},
achievementCard: {
flex: 1,
aspectRatio: 0.9,
borderRadius: RADIUS.LG,
alignItems: 'center',
justifyContent: 'center',
borderWidth: 1,
borderColor: colors.bg.overlay2,
overflow: 'hidden',
paddingHorizontal: SPACING[1],
},
achievementIcon: {
width: 44,
height: 44,
borderRadius: 22,
alignItems: 'center',
justifyContent: 'center',
},
})
}

View File

@@ -10,6 +10,8 @@ import { LinearGradient } from 'expo-linear-gradient'
import { BlurView } from 'expo-blur'
import Ionicons from '@expo/vector-icons/Ionicons'
import { useMemo } from 'react'
import { useTranslation } from 'react-i18next'
import { useHaptics } from '@/src/shared/hooks'
import {
COLLECTIONS,
@@ -17,17 +19,12 @@ import {
getFeaturedCollection,
COLLECTION_COLORS,
WORKOUTS,
getTrainerById,
} from '@/src/shared/data'
import { useTranslatedCollections, useTranslatedPrograms, useTranslatedWorkouts } from '@/src/shared/data/useTranslatedData'
import { StyledText } from '@/src/shared/components/StyledText'
import {
BRAND,
DARK,
TEXT,
GLASS,
SHADOW,
} from '@/src/shared/constants/colors'
import { useThemeColors, BRAND } from '@/src/shared/theme'
import type { ThemeColors } from '@/src/shared/theme/types'
import { SPACING, LAYOUT } from '@/src/shared/constants/spacing'
import { RADIUS } from '@/src/shared/constants/borderRadius'
@@ -61,11 +58,17 @@ const NEW_RELEASES = WORKOUTS.slice(-4)
// ═══════════════════════════════════════════════════════════════════════════
export default function BrowseScreen() {
const { t } = useTranslation()
const insets = useSafeAreaInsets()
const router = useRouter()
const haptics = useHaptics()
const colors = useThemeColors()
const styles = useMemo(() => createStyles(colors), [colors])
const featuredCollection = getFeaturedCollection()
const translatedCollections = useTranslatedCollections(COLLECTIONS)
const translatedPrograms = useTranslatedPrograms(PROGRAMS)
const translatedNewReleases = useTranslatedWorkouts(NEW_RELEASES)
const handleWorkoutPress = (id: string) => {
haptics.buttonTap()
@@ -85,7 +88,7 @@ export default function BrowseScreen() {
showsVerticalScrollIndicator={false}
>
{/* Header */}
<StyledText size={FONTS.LARGE_TITLE} weight="bold" color={TEXT.PRIMARY}>Browse</StyledText>
<StyledText size={FONTS.LARGE_TITLE} weight="bold" color={colors.text.primary}>{t('screens:browse.title')}</StyledText>
{/* Featured Collection */}
{featuredCollection && (
@@ -98,18 +101,18 @@ export default function BrowseScreen() {
/>
<View style={styles.featuredBadge}>
<Ionicons name="star" size={12} color={TEXT.PRIMARY} />
<RNText style={styles.featuredBadgeText}>FEATURED</RNText>
<Ionicons name="star" size={12} color="#FFFFFF" />
<RNText style={styles.featuredBadgeText}>{t('screens:browse.featured')}</RNText>
</View>
<View style={styles.featuredInfo}>
<StyledText size={FONTS.TITLE} weight="bold" color={TEXT.PRIMARY}>{featuredCollection.title}</StyledText>
<StyledText size={FONTS.HEADLINE} color={TEXT.SECONDARY}>{featuredCollection.description}</StyledText>
<StyledText size={FONTS.TITLE} weight="bold" color="#FFFFFF">{t(`content:collections.${featuredCollection.id}.title`, { defaultValue: featuredCollection.title })}</StyledText>
<StyledText size={FONTS.HEADLINE} color="rgba(255,255,255,0.8)">{t(`content:collections.${featuredCollection.id}.description`, { defaultValue: featuredCollection.description })}</StyledText>
<View style={styles.featuredStats}>
<View style={styles.featuredStat}>
<Ionicons name="fitness" size={14} color={TEXT.PRIMARY} />
<StyledText size={FONTS.CAPTION_1} color={TEXT.PRIMARY}>{featuredCollection.workoutIds.length + ' workouts'}</StyledText>
<Ionicons name="fitness" size={14} color="#FFFFFF" />
<StyledText size={FONTS.CAPTION_1} color="#FFFFFF">{t('plurals.workout', { count: featuredCollection.workoutIds.length })}</StyledText>
</View>
</View>
</View>
@@ -118,9 +121,9 @@ export default function BrowseScreen() {
{/* Collections Grid */}
<View style={styles.section}>
<StyledText size={FONTS.TITLE_2} weight="semibold" color={TEXT.PRIMARY}>Collections</StyledText>
<StyledText size={FONTS.TITLE_2} weight="semibold" color={colors.text.primary}>{t('screens:browse.collections')}</StyledText>
<View style={styles.collectionsGrid}>
{COLLECTIONS.map((collection) => {
{translatedCollections.map((collection) => {
const color = COLLECTION_COLORS[collection.id] ?? BRAND.PRIMARY
return (
<Pressable
@@ -128,15 +131,15 @@ export default function BrowseScreen() {
style={styles.collectionCard}
onPress={() => handleCollectionPress(collection.id)}
>
<BlurView intensity={GLASS.BLUR_LIGHT} tint="dark" style={StyleSheet.absoluteFill} />
<BlurView intensity={colors.glass.blurLight} tint={colors.glass.blurTint} style={StyleSheet.absoluteFill} />
<View style={[styles.collectionIconBg, { backgroundColor: `${color}20` }]}>
<RNText style={styles.collectionEmoji}>{collection.icon}</RNText>
</View>
<StyledText size={FONTS.SUBHEADLINE} weight="semibold" color={TEXT.PRIMARY} numberOfLines={1}>
<StyledText size={FONTS.SUBHEADLINE} weight="semibold" color={colors.text.primary} numberOfLines={1}>
{collection.title}
</StyledText>
<StyledText size={FONTS.CAPTION_1} color={color}>
{collection.workoutIds.length + ' workouts'}
{t('plurals.workout', { count: collection.workoutIds.length })}
</StyledText>
</Pressable>
)
@@ -147,34 +150,34 @@ export default function BrowseScreen() {
{/* Programs */}
<View style={styles.section}>
<View style={styles.sectionHeader}>
<StyledText size={FONTS.TITLE_2} weight="semibold" color={TEXT.PRIMARY}>Programs</StyledText>
<TextButton>See All</TextButton>
<StyledText size={FONTS.TITLE_2} weight="semibold" color={colors.text.primary}>{t('screens:browse.programs')}</StyledText>
<TextButton>{t('seeAll')}</TextButton>
</View>
<ScrollView
horizontal
showsHorizontalScrollIndicator={false}
contentContainerStyle={styles.programsScroll}
>
{PROGRAMS.map((program) => (
{translatedPrograms.map((program) => (
<View key={program.id} style={styles.programCard}>
<BlurView intensity={GLASS.BLUR_MEDIUM} tint="dark" style={StyleSheet.absoluteFill} />
<BlurView intensity={colors.glass.blurMedium} tint={colors.glass.blurTint} style={StyleSheet.absoluteFill} />
<View style={styles.programHeader}>
<View style={styles.programLevelBadge}>
<StyledText size={FONTS.CAPTION_2} weight="semibold" color={TEXT.PRIMARY}>{program.level}</StyledText>
<StyledText size={FONTS.CAPTION_2} weight="semibold" color={colors.text.primary}>{t(`levels.${program.level.toLowerCase()}`)}</StyledText>
</View>
</View>
<StyledText size={FONTS.HEADLINE} weight="semibold" color={TEXT.PRIMARY}>{program.title}</StyledText>
<StyledText size={FONTS.HEADLINE} weight="semibold" color={colors.text.primary}>{program.title}</StyledText>
<View style={styles.programMeta}>
<View style={styles.programMetaItem}>
<Ionicons name="calendar" size={14} color={TEXT.TERTIARY} />
<StyledText size={FONTS.CAPTION_1} color={TEXT.TERTIARY}>{program.weeks + ' weeks'}</StyledText>
<Ionicons name="calendar" size={14} color={colors.text.tertiary} />
<StyledText size={FONTS.CAPTION_1} color={colors.text.tertiary}>{t('screens:browse.weeksCount', { count: program.weeks })}</StyledText>
</View>
<View style={styles.programMetaItem}>
<Ionicons name="repeat" size={14} color={TEXT.TERTIARY} />
<StyledText size={FONTS.CAPTION_1} color={TEXT.TERTIARY}>{program.workoutsPerWeek + 'x /week'}</StyledText>
<Ionicons name="repeat" size={14} color={colors.text.tertiary} />
<StyledText size={FONTS.CAPTION_1} color={colors.text.tertiary}>{t('screens:browse.timesPerWeek', { count: program.workoutsPerWeek })}</StyledText>
</View>
</View>
</View>
@@ -185,29 +188,26 @@ export default function BrowseScreen() {
{/* New Releases */}
<View style={styles.section}>
<View style={styles.sectionHeader}>
<StyledText size={FONTS.TITLE_2} weight="semibold" color={TEXT.PRIMARY}>New Releases</StyledText>
<StyledText size={FONTS.TITLE_2} weight="semibold" color={colors.text.primary}>{t('screens:browse.newReleases')}</StyledText>
</View>
{NEW_RELEASES.map((workout) => {
const trainer = getTrainerById(workout.trainerId)
return (
<Pressable
key={workout.id}
style={styles.releaseRow}
onPress={() => handleWorkoutPress(workout.id)}
>
<View style={[styles.releaseAvatar, { backgroundColor: trainer?.color ?? BRAND.PRIMARY }]}>
<RNText style={styles.releaseInitial}>{trainer?.name[0] ?? 'T'}</RNText>
</View>
<View style={styles.releaseInfo}>
<StyledText size={FONTS.HEADLINE} weight="semibold" color={TEXT.PRIMARY}>{workout.title}</StyledText>
<StyledText size={FONTS.CAPTION_1} color={TEXT.TERTIARY}>
{(trainer?.name ?? '') + ' \u00B7 ' + workout.duration + ' min \u00B7 ' + workout.level}
</StyledText>
</View>
<Ionicons name="play-circle" size={32} color={BRAND.PRIMARY} />
</Pressable>
)
})}
{translatedNewReleases.map((workout) => (
<Pressable
key={workout.id}
style={styles.releaseRow}
onPress={() => handleWorkoutPress(workout.id)}
>
<View style={[styles.releaseAvatar, { backgroundColor: BRAND.PRIMARY }]}>
<Ionicons name="flame" size={20} color="#FFFFFF" />
</View>
<View style={styles.releaseInfo}>
<StyledText size={FONTS.HEADLINE} weight="semibold" color={colors.text.primary}>{workout.title}</StyledText>
<StyledText size={FONTS.CAPTION_1} color={colors.text.tertiary}>
{t('durationLevel', { duration: workout.duration, level: t(`levels.${workout.level.toLowerCase()}`) })}
</StyledText>
</View>
<Ionicons name="play-circle" size={32} color={BRAND.PRIMARY} />
</Pressable>
))}
</View>
</ScrollView>
</View>
@@ -220,160 +220,162 @@ export default function BrowseScreen() {
const COLLECTION_CARD_WIDTH = (SCREEN_WIDTH - LAYOUT.SCREEN_PADDING * 2 - SPACING[3]) / 2
const styles = StyleSheet.create({
container: {
flex: 1,
backgroundColor: DARK.BASE,
},
scrollView: {
flex: 1,
},
scrollContent: {
paddingHorizontal: LAYOUT.SCREEN_PADDING,
},
function createStyles(colors: ThemeColors) {
return StyleSheet.create({
container: {
flex: 1,
backgroundColor: colors.bg.base,
},
scrollView: {
flex: 1,
},
scrollContent: {
paddingHorizontal: LAYOUT.SCREEN_PADDING,
},
// Featured Collection
featuredCard: {
height: 200,
borderRadius: RADIUS.GLASS_CARD,
overflow: 'hidden',
marginBottom: SPACING[8],
marginTop: SPACING[4],
...SHADOW.lg,
},
featuredBadge: {
flexDirection: 'row',
alignItems: 'center',
backgroundColor: 'rgba(0, 0, 0, 0.3)',
paddingHorizontal: SPACING[2],
paddingVertical: SPACING[1],
borderRadius: RADIUS.SM,
alignSelf: 'flex-start',
margin: SPACING[4],
gap: SPACING[1],
},
featuredBadgeText: {
fontSize: 11,
fontWeight: 'bold',
color: TEXT.PRIMARY,
},
featuredInfo: {
position: 'absolute',
bottom: SPACING[5],
left: SPACING[5],
right: SPACING[5],
},
featuredStats: {
flexDirection: 'row',
gap: SPACING[4],
marginTop: SPACING[3],
},
featuredStat: {
flexDirection: 'row',
alignItems: 'center',
gap: SPACING[1],
},
// Featured Collection
featuredCard: {
height: 200,
borderRadius: RADIUS.GLASS_CARD,
overflow: 'hidden',
marginBottom: SPACING[8],
marginTop: SPACING[4],
...colors.shadow.lg,
},
featuredBadge: {
flexDirection: 'row',
alignItems: 'center',
backgroundColor: 'rgba(0, 0, 0, 0.3)',
paddingHorizontal: SPACING[2],
paddingVertical: SPACING[1],
borderRadius: RADIUS.SM,
alignSelf: 'flex-start',
margin: SPACING[4],
gap: SPACING[1],
},
featuredBadgeText: {
fontSize: 11,
fontWeight: 'bold',
color: '#FFFFFF',
},
featuredInfo: {
position: 'absolute',
bottom: SPACING[5],
left: SPACING[5],
right: SPACING[5],
},
featuredStats: {
flexDirection: 'row',
gap: SPACING[4],
marginTop: SPACING[3],
},
featuredStat: {
flexDirection: 'row',
alignItems: 'center',
gap: SPACING[1],
},
// Section
section: {
marginBottom: SPACING[6],
},
sectionHeader: {
flexDirection: 'row',
justifyContent: 'space-between',
alignItems: 'center',
marginBottom: SPACING[4],
},
// Section
section: {
marginBottom: SPACING[6],
},
sectionHeader: {
flexDirection: 'row',
justifyContent: 'space-between',
alignItems: 'center',
marginBottom: SPACING[4],
},
// Collections Grid
collectionsGrid: {
flexDirection: 'row',
flexWrap: 'wrap',
gap: SPACING[3],
marginTop: SPACING[3],
},
collectionCard: {
width: COLLECTION_CARD_WIDTH,
paddingVertical: SPACING[4],
paddingHorizontal: SPACING[3],
borderRadius: RADIUS.LG,
overflow: 'hidden',
borderWidth: 1,
borderColor: 'rgba(255, 255, 255, 0.1)',
gap: SPACING[1],
},
collectionIconBg: {
width: 44,
height: 44,
borderRadius: 12,
alignItems: 'center',
justifyContent: 'center',
marginBottom: SPACING[2],
},
collectionEmoji: {
fontSize: 22,
},
// Collections Grid
collectionsGrid: {
flexDirection: 'row',
flexWrap: 'wrap',
gap: SPACING[3],
marginTop: SPACING[3],
},
collectionCard: {
width: COLLECTION_CARD_WIDTH,
paddingVertical: SPACING[4],
paddingHorizontal: SPACING[3],
borderRadius: RADIUS.LG,
overflow: 'hidden',
borderWidth: 1,
borderColor: colors.border.glass,
gap: SPACING[1],
},
collectionIconBg: {
width: 44,
height: 44,
borderRadius: 12,
alignItems: 'center',
justifyContent: 'center',
marginBottom: SPACING[2],
},
collectionEmoji: {
fontSize: 22,
},
// Programs
programsScroll: {
gap: SPACING[3],
},
programCard: {
width: 200,
height: 140,
borderRadius: RADIUS.LG,
overflow: 'hidden',
padding: SPACING[4],
borderWidth: 1,
borderColor: 'rgba(255, 255, 255, 0.1)',
},
programHeader: {
flexDirection: 'row',
justifyContent: 'flex-end',
marginBottom: SPACING[2],
},
programLevelBadge: {
backgroundColor: 'rgba(255, 107, 53, 0.2)',
paddingHorizontal: SPACING[2],
paddingVertical: SPACING[1],
borderRadius: RADIUS.SM,
},
programMeta: {
flexDirection: 'row',
gap: SPACING[3],
marginTop: SPACING[3],
},
programMetaItem: {
flexDirection: 'row',
alignItems: 'center',
gap: SPACING[1],
},
// Programs
programsScroll: {
gap: SPACING[3],
},
programCard: {
width: 200,
height: 140,
borderRadius: RADIUS.LG,
overflow: 'hidden',
padding: SPACING[4],
borderWidth: 1,
borderColor: colors.border.glass,
},
programHeader: {
flexDirection: 'row',
justifyContent: 'flex-end',
marginBottom: SPACING[2],
},
programLevelBadge: {
backgroundColor: 'rgba(255, 107, 53, 0.2)',
paddingHorizontal: SPACING[2],
paddingVertical: SPACING[1],
borderRadius: RADIUS.SM,
},
programMeta: {
flexDirection: 'row',
gap: SPACING[3],
marginTop: SPACING[3],
},
programMetaItem: {
flexDirection: 'row',
alignItems: 'center',
gap: SPACING[1],
},
// New Releases
releaseRow: {
flexDirection: 'row',
alignItems: 'center',
paddingVertical: SPACING[3],
paddingHorizontal: SPACING[4],
backgroundColor: DARK.SURFACE,
borderRadius: RADIUS.LG,
marginBottom: SPACING[2],
gap: SPACING[3],
},
releaseAvatar: {
width: 44,
height: 44,
borderRadius: 22,
alignItems: 'center',
justifyContent: 'center',
},
releaseInitial: {
fontSize: 18,
fontWeight: '700',
color: TEXT.PRIMARY,
},
releaseInfo: {
flex: 1,
gap: 2,
},
})
// New Releases
releaseRow: {
flexDirection: 'row',
alignItems: 'center',
paddingVertical: SPACING[3],
paddingHorizontal: SPACING[4],
backgroundColor: colors.bg.surface,
borderRadius: RADIUS.LG,
marginBottom: SPACING[2],
gap: SPACING[3],
},
releaseAvatar: {
width: 44,
height: 44,
borderRadius: 22,
alignItems: 'center',
justifyContent: 'center',
},
releaseInitial: {
fontSize: 18,
fontWeight: '700',
color: '#FFFFFF',
},
releaseInfo: {
flex: 1,
gap: 2,
},
})
}

View File

@@ -11,25 +11,20 @@ import { BlurView } from 'expo-blur'
import Ionicons from '@expo/vector-icons/Ionicons'
import { useMemo } from 'react'
import { useTranslation } from 'react-i18next'
import { useHaptics } from '@/src/shared/hooks'
import { useUserStore, useActivityStore } from '@/src/shared/stores'
import {
getFeaturedWorkouts,
getPopularWorkouts,
getTrainerById,
COLLECTIONS,
WORKOUTS,
} from '@/src/shared/data'
import { useTranslatedWorkouts, useTranslatedCollections } from '@/src/shared/data/useTranslatedData'
import { StyledText } from '@/src/shared/components/StyledText'
import {
BRAND,
DARK,
TEXT,
GLASS,
SHADOW,
GRADIENTS,
} from '@/src/shared/constants/colors'
import { useThemeColors, BRAND, GRADIENTS } from '@/src/shared/theme'
import type { ThemeColors } from '@/src/shared/theme/types'
import { SPACING, LAYOUT } from '@/src/shared/constants/spacing'
import { RADIUS } from '@/src/shared/constants/borderRadius'
@@ -51,23 +46,20 @@ const FONTS = {
// HELPERS
// ═══════════════════════════════════════════════════════════════════════════
function getGreeting() {
const hour = new Date().getHours()
if (hour < 12) return 'Good morning'
if (hour < 18) return 'Good afternoon'
return 'Good evening'
}
function PrimaryButton({ children, onPress }: { children: string; onPress?: () => void }) {
const colors = useThemeColors()
const styles = useMemo(() => createStyles(colors), [colors])
return (
<Pressable style={styles.primaryButton} onPress={onPress}>
<Ionicons name="play" size={16} color={TEXT.PRIMARY} style={styles.buttonIcon} />
<Ionicons name="play" size={16} color="#FFFFFF" style={styles.buttonIcon} />
<RNText style={styles.primaryButtonText}>{children}</RNText>
</Pressable>
)
}
function PlainButton({ children, onPress }: { children: string; onPress?: () => void }) {
const colors = useThemeColors()
const styles = useMemo(() => createStyles(colors), [colors])
return (
<Pressable onPress={onPress}>
<RNText style={styles.plainButtonText}>{children}</RNText>
@@ -80,16 +72,29 @@ function PlainButton({ children, onPress }: { children: string; onPress?: () =>
// ═══════════════════════════════════════════════════════════════════════════
export default function HomeScreen() {
const { t } = useTranslation()
const insets = useSafeAreaInsets()
const router = useRouter()
const haptics = useHaptics()
const colors = useThemeColors()
const styles = useMemo(() => createStyles(colors), [colors])
const userName = useUserStore((s) => s.profile.name)
const history = useActivityStore((s) => s.history)
const recentWorkouts = useMemo(() => history.slice(0, 3), [history])
const featured = getFeaturedWorkouts()[0] ?? WORKOUTS[0]
const featuredTrainer = getTrainerById(featured.trainerId)
const popular = getPopularWorkouts(4)
const translatedPopular = useTranslatedWorkouts(popular)
const translatedCollections = useTranslatedCollections(COLLECTIONS)
const greeting = (() => {
const hour = new Date().getHours()
if (hour < 12) return t('greetings.morning')
if (hour < 18) return t('greetings.afternoon')
return t('greetings.evening')
})()
const featuredTitle = t(`content:workouts.${featured.id}`, { defaultValue: featured.title })
const handleWorkoutPress = (id: string) => {
haptics.buttonTap()
@@ -105,11 +110,21 @@ export default function HomeScreen() {
>
{/* Header */}
<View style={styles.header}>
<StyledText size={FONTS.LARGE_TITLE} weight="semibold" color={TEXT.PRIMARY}>
{getGreeting() + ', ' + userName}
</StyledText>
<View style={{ flex: 1, marginRight: SPACING[3] }}>
<StyledText size={FONTS.SUBHEADLINE} color={colors.text.tertiary}>
{greeting}
</StyledText>
<StyledText
size={FONTS.LARGE_TITLE}
weight="bold"
color={colors.text.primary}
numberOfLines={1}
>
{userName}
</StyledText>
</View>
<Pressable style={styles.profileButton}>
<Ionicons name="person-circle-outline" size={32} color={TEXT.PRIMARY} />
<Ionicons name="person-circle-outline" size={32} color={colors.text.primary} />
</Pressable>
</View>
@@ -136,21 +151,21 @@ export default function HomeScreen() {
/>
<View style={styles.featuredBadge}>
<RNText style={styles.featuredBadgeText}>🔥 FEATURED</RNText>
<RNText style={styles.featuredBadgeText}>{'🔥 ' + t('screens:home.featured')}</RNText>
</View>
<View style={styles.featuredContent}>
<StyledText size={FONTS.TITLE} weight="bold" color={TEXT.PRIMARY}>
{featured.title}
<StyledText size={FONTS.TITLE} weight="bold" color="#FFFFFF">
{featuredTitle}
</StyledText>
<StyledText size={FONTS.SUBHEADLINE} color={TEXT.SECONDARY}>
{featured.duration + ' min • ' + featured.level + ' • ' + (featuredTrainer?.name ?? '')}
<StyledText size={FONTS.SUBHEADLINE} color="rgba(255,255,255,0.8)">
{t('workoutMeta', { duration: featured.duration, level: t(`levels.${featured.level.toLowerCase()}`), calories: featured.calories })}
</StyledText>
<View style={styles.featuredButtons}>
<PrimaryButton onPress={() => handleWorkoutPress(featured.id)}>START</PrimaryButton>
<PrimaryButton onPress={() => handleWorkoutPress(featured.id)}>{t('start')}</PrimaryButton>
<Pressable style={styles.saveButton}>
<Ionicons name="heart-outline" size={24} color={TEXT.PRIMARY} />
<Ionicons name="heart-outline" size={24} color="#FFFFFF" />
</Pressable>
</View>
</View>
@@ -160,8 +175,8 @@ export default function HomeScreen() {
{recentWorkouts.length > 0 && (
<View style={styles.section}>
<View style={styles.sectionHeader}>
<StyledText size={FONTS.TITLE_2} weight="semibold" color={TEXT.PRIMARY}>Recent</StyledText>
<PlainButton>See All</PlainButton>
<StyledText size={FONTS.TITLE_2} weight="semibold" color={colors.text.primary}>{t('screens:home.recent')}</StyledText>
<PlainButton>{t('seeAll')}</PlainButton>
</View>
<ScrollView
horizontal
@@ -171,7 +186,7 @@ export default function HomeScreen() {
{recentWorkouts.map((result) => {
const workout = WORKOUTS.find(w => w.id === result.workoutId)
if (!workout) return null
const trainer = getTrainerById(workout.trainerId)
const workoutTitle = t(`content:workouts.${workout.id}`, { defaultValue: workout.title })
return (
<Pressable
key={result.id}
@@ -180,16 +195,14 @@ export default function HomeScreen() {
>
<View style={styles.continueThumb}>
<LinearGradient
colors={[trainer?.color ?? BRAND.PRIMARY, BRAND.PRIMARY_LIGHT]}
colors={[BRAND.PRIMARY, BRAND.PRIMARY_LIGHT]}
style={StyleSheet.absoluteFill}
/>
<StyledText size={FONTS.LARGE_TITLE} weight="bold" color={TEXT.PRIMARY}>
{trainer?.name[0] ?? 'T'}
</StyledText>
<Ionicons name="flame" size={32} color="#FFFFFF" />
</View>
<StyledText size={FONTS.SUBHEADLINE} weight="semibold" color={TEXT.PRIMARY}>{workout.title}</StyledText>
<StyledText size={FONTS.CAPTION_2} color={TEXT.TERTIARY}>
{result.calories + ' cal • ' + result.durationMinutes + ' min'}
<StyledText size={FONTS.SUBHEADLINE} weight="semibold" color={colors.text.primary}>{workoutTitle}</StyledText>
<StyledText size={FONTS.CAPTION_2} color={colors.text.tertiary}>
{t('calMin', { calories: result.calories, duration: result.durationMinutes })}
</StyledText>
</Pressable>
)
@@ -200,13 +213,13 @@ export default function HomeScreen() {
{/* Popular This Week */}
<View style={styles.section}>
<StyledText size={FONTS.TITLE_2} weight="semibold" color={TEXT.PRIMARY}>Popular This Week</StyledText>
<StyledText size={FONTS.TITLE_2} weight="semibold" color={colors.text.primary}>{t('screens:home.popularThisWeek')}</StyledText>
<ScrollView
horizontal
showsHorizontalScrollIndicator={false}
contentContainerStyle={styles.horizontalScroll}
>
{popular.map((item) => (
{translatedPopular.map((item) => (
<Pressable
key={item.id}
style={styles.popularCard}
@@ -215,8 +228,8 @@ export default function HomeScreen() {
<View style={styles.popularThumb}>
<Ionicons name="flame" size={24} color={BRAND.PRIMARY} />
</View>
<StyledText size={FONTS.SUBHEADLINE} weight="medium" color={TEXT.PRIMARY}>{item.title}</StyledText>
<StyledText size={FONTS.CAPTION_2} color={TEXT.TERTIARY}>{item.duration + ' min'}</StyledText>
<StyledText size={FONTS.SUBHEADLINE} weight="medium" color={colors.text.primary}>{item.title}</StyledText>
<StyledText size={FONTS.CAPTION_2} color={colors.text.tertiary}>{t('units.minUnit', { count: item.duration })}</StyledText>
</Pressable>
))}
</ScrollView>
@@ -224,19 +237,19 @@ export default function HomeScreen() {
{/* Collections */}
<View style={styles.section}>
<StyledText size={FONTS.TITLE_2} weight="semibold" color={TEXT.PRIMARY}>Collections</StyledText>
{COLLECTIONS.map((item) => (
<StyledText size={FONTS.TITLE_2} weight="semibold" color={colors.text.primary}>{t('screens:home.collections')}</StyledText>
{translatedCollections.map((item) => (
<Pressable key={item.id} style={styles.collectionCard} onPress={() => { haptics.buttonTap(); router.push(`/collection/${item.id}`) }}>
<BlurView intensity={GLASS.BLUR_MEDIUM} tint="dark" style={StyleSheet.absoluteFill} />
<BlurView intensity={colors.glass.blurMedium} tint={colors.glass.blurTint} style={StyleSheet.absoluteFill} />
<View style={styles.collectionContent}>
<RNText style={styles.collectionIcon}>{item.icon}</RNText>
<View style={styles.collectionText}>
<StyledText size={FONTS.HEADLINE} weight="semibold" color={TEXT.PRIMARY}>{item.title}</StyledText>
<StyledText size={FONTS.CAPTION_1} color={TEXT.TERTIARY}>
{item.workoutIds.length + ' workouts • ' + item.description}
<StyledText size={FONTS.HEADLINE} weight="semibold" color={colors.text.primary}>{item.title}</StyledText>
<StyledText size={FONTS.CAPTION_1} color={colors.text.tertiary}>
{t('plurals.workout', { count: item.workoutIds.length }) + ' \u00B7 ' + item.description}
</StyledText>
</View>
<Ionicons name="chevron-forward" size={20} color={TEXT.TERTIARY} />
<Ionicons name="chevron-forward" size={20} color={colors.text.tertiary} />
</View>
</Pressable>
))}
@@ -250,167 +263,169 @@ export default function HomeScreen() {
// STYLES
// ═══════════════════════════════════════════════════════════════════════════
const styles = StyleSheet.create({
container: {
flex: 1,
backgroundColor: DARK.BASE,
},
scrollView: {
flex: 1,
},
scrollContent: {
paddingHorizontal: LAYOUT.SCREEN_PADDING,
},
function createStyles(colors: ThemeColors) {
return StyleSheet.create({
container: {
flex: 1,
backgroundColor: colors.bg.base,
},
scrollView: {
flex: 1,
},
scrollContent: {
paddingHorizontal: LAYOUT.SCREEN_PADDING,
},
// Header
header: {
flexDirection: 'row',
justifyContent: 'space-between',
alignItems: 'center',
marginBottom: SPACING[6],
},
profileButton: {
width: 40,
height: 40,
alignItems: 'center',
justifyContent: 'center',
},
// Header
header: {
flexDirection: 'row',
justifyContent: 'space-between',
alignItems: 'center',
marginBottom: SPACING[6],
},
profileButton: {
width: 40,
height: 40,
alignItems: 'center',
justifyContent: 'center',
},
// Buttons
primaryButton: {
flexDirection: 'row',
alignItems: 'center',
backgroundColor: BRAND.PRIMARY,
paddingHorizontal: SPACING[4],
paddingVertical: SPACING[3],
borderRadius: RADIUS.SM,
},
buttonIcon: {
marginRight: SPACING[2],
},
primaryButtonText: {
fontSize: 14,
fontWeight: '600',
color: TEXT.PRIMARY,
},
plainButtonText: {
fontSize: FONTS.BODY,
color: BRAND.PRIMARY,
},
// Buttons
primaryButton: {
flexDirection: 'row',
alignItems: 'center',
backgroundColor: BRAND.PRIMARY,
paddingHorizontal: SPACING[4],
paddingVertical: SPACING[3],
borderRadius: RADIUS.SM,
},
buttonIcon: {
marginRight: SPACING[2],
},
primaryButtonText: {
fontSize: 14,
fontWeight: '600',
color: '#FFFFFF',
},
plainButtonText: {
fontSize: FONTS.BODY,
color: BRAND.PRIMARY,
},
// Featured
featuredCard: {
width: CARD_WIDTH,
height: 220,
borderRadius: RADIUS.GLASS_CARD,
overflow: 'hidden',
marginBottom: SPACING[8],
...SHADOW.lg,
},
featuredBadge: {
position: 'absolute',
top: SPACING[4],
left: SPACING[4],
backgroundColor: 'rgba(255, 255, 255, 0.15)',
paddingHorizontal: SPACING[3],
paddingVertical: SPACING[1],
borderRadius: RADIUS.SM,
borderWidth: 1,
borderColor: 'rgba(255, 255, 255, 0.2)',
},
featuredBadgeText: {
fontSize: 11,
fontWeight: 'bold',
color: TEXT.PRIMARY,
},
featuredContent: {
position: 'absolute',
bottom: 0,
left: 0,
right: 0,
padding: SPACING[5],
},
featuredButtons: {
flexDirection: 'row',
alignItems: 'center',
gap: SPACING[3],
marginTop: SPACING[4],
},
saveButton: {
width: 44,
height: 44,
alignItems: 'center',
justifyContent: 'center',
backgroundColor: 'rgba(255, 255, 255, 0.1)',
borderRadius: 22,
borderWidth: 1,
borderColor: 'rgba(255, 255, 255, 0.15)',
},
// Featured
featuredCard: {
width: CARD_WIDTH,
height: 220,
borderRadius: RADIUS.GLASS_CARD,
overflow: 'hidden',
marginBottom: SPACING[8],
...colors.shadow.lg,
},
featuredBadge: {
position: 'absolute',
top: SPACING[4],
left: SPACING[4],
backgroundColor: 'rgba(255, 255, 255, 0.15)',
paddingHorizontal: SPACING[3],
paddingVertical: SPACING[1],
borderRadius: RADIUS.SM,
borderWidth: 1,
borderColor: 'rgba(255, 255, 255, 0.2)',
},
featuredBadgeText: {
fontSize: 11,
fontWeight: 'bold',
color: '#FFFFFF',
},
featuredContent: {
position: 'absolute',
bottom: 0,
left: 0,
right: 0,
padding: SPACING[5],
},
featuredButtons: {
flexDirection: 'row',
alignItems: 'center',
gap: SPACING[3],
marginTop: SPACING[4],
},
saveButton: {
width: 44,
height: 44,
alignItems: 'center',
justifyContent: 'center',
backgroundColor: 'rgba(255, 255, 255, 0.1)',
borderRadius: 22,
borderWidth: 1,
borderColor: 'rgba(255, 255, 255, 0.15)',
},
// Sections
section: {
marginBottom: SPACING[8],
},
sectionHeader: {
flexDirection: 'row',
justifyContent: 'space-between',
alignItems: 'center',
marginBottom: SPACING[4],
},
horizontalScroll: {
gap: SPACING[3],
},
// Sections
section: {
marginBottom: SPACING[8],
},
sectionHeader: {
flexDirection: 'row',
justifyContent: 'space-between',
alignItems: 'center',
marginBottom: SPACING[4],
},
horizontalScroll: {
gap: SPACING[3],
},
// Continue Card
continueCard: {
width: 140,
},
continueThumb: {
width: 140,
height: 200,
borderRadius: RADIUS.LG,
overflow: 'hidden',
alignItems: 'center',
justifyContent: 'center',
marginBottom: SPACING[2],
},
// Continue Card
continueCard: {
width: 140,
},
continueThumb: {
width: 140,
height: 200,
borderRadius: RADIUS.LG,
overflow: 'hidden',
alignItems: 'center',
justifyContent: 'center',
marginBottom: SPACING[2],
},
// Popular Card
popularCard: {
width: 120,
},
popularThumb: {
width: 120,
height: 120,
borderRadius: RADIUS.LG,
alignItems: 'center',
justifyContent: 'center',
marginBottom: SPACING[2],
borderWidth: 1,
borderColor: 'rgba(255, 255, 255, 0.1)',
backgroundColor: 'rgba(255, 255, 255, 0.05)',
},
// Popular Card
popularCard: {
width: 120,
},
popularThumb: {
width: 120,
height: 120,
borderRadius: RADIUS.LG,
alignItems: 'center',
justifyContent: 'center',
marginBottom: SPACING[2],
borderWidth: 1,
borderColor: colors.border.glass,
backgroundColor: colors.bg.overlay1,
},
// Collection Card
collectionCard: {
height: 80,
borderRadius: RADIUS.LG,
overflow: 'hidden',
marginBottom: SPACING[3],
borderWidth: 1,
borderColor: 'rgba(255, 255, 255, 0.1)',
},
collectionContent: {
flex: 1,
flexDirection: 'row',
alignItems: 'center',
paddingHorizontal: SPACING[5],
},
collectionIcon: {
fontSize: 28,
marginRight: SPACING[4],
},
collectionText: {
flex: 1,
},
})
// Collection Card
collectionCard: {
height: 80,
borderRadius: RADIUS.LG,
overflow: 'hidden',
marginBottom: SPACING[3],
borderWidth: 1,
borderColor: colors.border.glass,
},
collectionContent: {
flex: 1,
flexDirection: 'row',
alignItems: 'center',
paddingHorizontal: SPACING[5],
},
collectionIcon: {
fontSize: 28,
marginRight: SPACING[4],
},
collectionText: {
flex: 1,
},
})
}

View File

@@ -15,19 +15,18 @@ import {
Switch,
Text,
LabeledContent,
DateTimePicker,
Button,
} from '@expo/ui/swift-ui'
import { useMemo } from 'react'
import { useTranslation } from 'react-i18next'
import { useUserStore } from '@/src/shared/stores'
import { requestNotificationPermissions, usePurchases } from '@/src/shared/hooks'
import { StyledText } from '@/src/shared/components/StyledText'
import {
BRAND,
DARK,
TEXT,
GLASS,
SHADOW,
GRADIENTS,
} from '@/src/shared/constants/colors'
import { useThemeColors, BRAND, GRADIENTS } from '@/src/shared/theme'
import type { ThemeColors } from '@/src/shared/theme/types'
import { SPACING, LAYOUT } from '@/src/shared/constants/spacing'
import { RADIUS } from '@/src/shared/constants/borderRadius'
@@ -44,14 +43,44 @@ const FONTS = {
// ═══════════════════════════════════════════════════════════════════════════
export default function ProfileScreen() {
const { t } = useTranslation('screens')
const insets = useSafeAreaInsets()
const colors = useThemeColors()
const styles = useMemo(() => createStyles(colors), [colors])
const profile = useUserStore((s) => s.profile)
const settings = useUserStore((s) => s.settings)
const updateSettings = useUserStore((s) => s.updateSettings)
const { restorePurchases } = usePurchases()
const isPremium = profile.subscription !== 'free'
const planLabel = isPremium ? 'TabataFit+' : 'Free'
const handleRestore = async () => {
await restorePurchases()
}
const handleReminderToggle = async (enabled: boolean) => {
if (enabled) {
const granted = await requestNotificationPermissions()
if (!granted) return
}
updateSettings({ reminders: enabled })
}
const handleTimeChange = (date: Date) => {
const hh = String(date.getHours()).padStart(2, '0')
const mm = String(date.getMinutes()).padStart(2, '0')
updateSettings({ reminderTime: `${hh}:${mm}` })
}
// Build initial date string for the picker (today at reminderTime)
const today = new Date()
const [rh, rm] = settings.reminderTime.split(':').map(Number)
const pickerDate = new Date(today.getFullYear(), today.getMonth(), today.getDate(), rh, rm)
const pickerInitial = pickerDate.toISOString()
const settingsHeight = settings.reminders ? 430 : 385
return (
<View style={[styles.container, { paddingTop: insets.top }]}>
<ScrollView
@@ -60,32 +89,32 @@ export default function ProfileScreen() {
showsVerticalScrollIndicator={false}
>
{/* Header */}
<StyledText size={FONTS.LARGE_TITLE} weight="bold" color={TEXT.PRIMARY}>
Profile
<StyledText size={FONTS.LARGE_TITLE} weight="bold" color={colors.text.primary}>
{t('profile.title')}
</StyledText>
{/* Profile Card */}
<View style={styles.profileCard}>
<BlurView intensity={GLASS.BLUR_MEDIUM} tint="dark" style={StyleSheet.absoluteFill} />
<BlurView intensity={colors.glass.blurMedium} tint={colors.glass.blurTint} style={StyleSheet.absoluteFill} />
<View style={styles.avatarContainer}>
<LinearGradient
colors={GRADIENTS.CTA}
style={StyleSheet.absoluteFill}
/>
<StyledText size={FONTS.LARGE_TITLE} weight="bold" color={TEXT.PRIMARY}>
<StyledText size={FONTS.LARGE_TITLE} weight="bold" color="#FFFFFF">
{profile.name[0]}
</StyledText>
</View>
<StyledText size={FONTS.TITLE_2} weight="semibold" color={TEXT.PRIMARY}>
<StyledText size={FONTS.TITLE_2} weight="semibold" color={colors.text.primary}>
{profile.name}
</StyledText>
<StyledText size={FONTS.SUBHEADLINE} color={TEXT.TERTIARY}>
<StyledText size={FONTS.SUBHEADLINE} color={colors.text.tertiary}>
{profile.email}
</StyledText>
{isPremium && (
<View style={styles.premiumBadge}>
<Ionicons name="star" size={12} color={BRAND.PRIMARY} />
<StyledText size={FONTS.CAPTION_1} weight="semibold" color={TEXT.PRIMARY}>
<StyledText size={FONTS.CAPTION_1} weight="semibold" color={colors.text.primary}>
{planLabel}
</StyledText>
</View>
@@ -102,59 +131,82 @@ export default function ProfileScreen() {
style={StyleSheet.absoluteFill}
/>
<View style={styles.subscriptionContent}>
<Ionicons name="ribbon" size={24} color={TEXT.PRIMARY} />
<Ionicons name="ribbon" size={24} color="#FFFFFF" />
<View style={styles.subscriptionInfo}>
<StyledText size={FONTS.HEADLINE} weight="bold" color={TEXT.PRIMARY}>
<StyledText size={FONTS.HEADLINE} weight="bold" color="#FFFFFF">
{planLabel}
</StyledText>
<StyledText size={FONTS.CAPTION_1} color={TEXT.SECONDARY}>
{'Member since ' + profile.joinDate}
<StyledText size={FONTS.CAPTION_1} color="rgba(255,255,255,0.8)">
{t('profile.memberSince', { date: profile.joinDate })}
</StyledText>
</View>
</View>
</View>
)}
{/* SwiftUI Island: Settings */}
<Host useViewportSizeMeasurement colorScheme="dark" style={{ height: 385 }}>
{/* SwiftUI Island: Subscription Section */}
<Host useViewportSizeMeasurement colorScheme={colors.colorScheme} style={{ height: 60, marginTop: -20 }}>
<List listStyle="insetGrouped" scrollEnabled={false}>
<Section title="WORKOUT">
<Section title={t('profile.sectionSubscription')}>
<Button
variant="borderless"
onPress={handleRestore}
color={colors.text.primary}
>
{t('profile.restorePurchases')}
</Button>
</Section>
</List>
</Host>
{/* SwiftUI Island: Settings */}
<Host useViewportSizeMeasurement colorScheme={colors.colorScheme} style={{ height: settingsHeight }}>
<List listStyle="insetGrouped" scrollEnabled={false}>
<Section title={t('profile.sectionWorkout')}>
<Switch
label="Haptic Feedback"
label={t('profile.hapticFeedback')}
value={settings.haptics}
onValueChange={(v) => updateSettings({ haptics: v })}
color={BRAND.PRIMARY}
/>
<Switch
label="Sound Effects"
label={t('profile.soundEffects')}
value={settings.soundEffects}
onValueChange={(v) => updateSettings({ soundEffects: v })}
color={BRAND.PRIMARY}
/>
<Switch
label="Voice Coaching"
label={t('profile.voiceCoaching')}
value={settings.voiceCoaching}
onValueChange={(v) => updateSettings({ voiceCoaching: v })}
color={BRAND.PRIMARY}
/>
</Section>
<Section title="NOTIFICATIONS">
<Section title={t('profile.sectionNotifications')}>
<Switch
label="Daily Reminders"
label={t('profile.dailyReminders')}
value={settings.reminders}
onValueChange={(v) => updateSettings({ reminders: v })}
onValueChange={handleReminderToggle}
color={BRAND.PRIMARY}
/>
<LabeledContent label="Reminder Time">
<Text color={TEXT.TERTIARY}>{settings.reminderTime.replace(':00', ':00 AM')}</Text>
</LabeledContent>
{settings.reminders && (
<LabeledContent label={t('profile.reminderTime')}>
<DateTimePicker
displayedComponents="hourAndMinute"
variant="compact"
initialDate={pickerInitial}
onDateSelected={handleTimeChange}
color={BRAND.PRIMARY}
/>
</LabeledContent>
)}
</Section>
</List>
</Host>
{/* Version */}
<StyledText size={FONTS.CAPTION_1} color={TEXT.TERTIARY} style={styles.versionText}>
TabataFit v1.0.0
<StyledText size={FONTS.CAPTION_1} color={colors.text.tertiary} style={styles.versionText}>
{t('profile.version')}
</StyledText>
</ScrollView>
</View>
@@ -165,72 +217,74 @@ export default function ProfileScreen() {
// STYLES
// ═══════════════════════════════════════════════════════════════════════════
const styles = StyleSheet.create({
container: {
flex: 1,
backgroundColor: DARK.BASE,
},
scrollView: {
flex: 1,
},
scrollContent: {
paddingHorizontal: LAYOUT.SCREEN_PADDING,
},
function createStyles(colors: ThemeColors) {
return StyleSheet.create({
container: {
flex: 1,
backgroundColor: colors.bg.base,
},
scrollView: {
flex: 1,
},
scrollContent: {
paddingHorizontal: LAYOUT.SCREEN_PADDING,
},
// Profile Card
profileCard: {
borderRadius: RADIUS.GLASS_CARD,
overflow: 'hidden',
marginBottom: SPACING[6],
marginTop: SPACING[4],
alignItems: 'center',
paddingVertical: SPACING[6],
borderWidth: 1,
borderColor: 'rgba(255, 255, 255, 0.1)',
...SHADOW.md,
},
avatarContainer: {
width: 80,
height: 80,
borderRadius: 40,
alignItems: 'center',
justifyContent: 'center',
marginBottom: SPACING[3],
overflow: 'hidden',
},
premiumBadge: {
flexDirection: 'row',
alignItems: 'center',
backgroundColor: 'rgba(255, 107, 53, 0.15)',
paddingHorizontal: SPACING[3],
paddingVertical: SPACING[1],
borderRadius: RADIUS.FULL,
marginTop: SPACING[3],
gap: SPACING[1],
},
// Profile Card
profileCard: {
borderRadius: RADIUS.GLASS_CARD,
overflow: 'hidden',
marginBottom: SPACING[6],
marginTop: SPACING[4],
alignItems: 'center',
paddingVertical: SPACING[6],
borderWidth: 1,
borderColor: colors.border.glass,
...colors.shadow.md,
},
avatarContainer: {
width: 80,
height: 80,
borderRadius: 40,
alignItems: 'center',
justifyContent: 'center',
marginBottom: SPACING[3],
overflow: 'hidden',
},
premiumBadge: {
flexDirection: 'row',
alignItems: 'center',
backgroundColor: 'rgba(255, 107, 53, 0.15)',
paddingHorizontal: SPACING[3],
paddingVertical: SPACING[1],
borderRadius: RADIUS.FULL,
marginTop: SPACING[3],
gap: SPACING[1],
},
// Subscription Card
subscriptionCard: {
height: 80,
borderRadius: RADIUS.LG,
overflow: 'hidden',
marginBottom: SPACING[6],
...SHADOW.BRAND_GLOW,
},
subscriptionContent: {
flex: 1,
flexDirection: 'row',
alignItems: 'center',
paddingHorizontal: SPACING[4],
gap: SPACING[3],
},
subscriptionInfo: {
flex: 1,
},
// Subscription Card
subscriptionCard: {
height: 80,
borderRadius: RADIUS.LG,
overflow: 'hidden',
marginBottom: SPACING[6],
...colors.shadow.BRAND_GLOW,
},
subscriptionContent: {
flex: 1,
flexDirection: 'row',
alignItems: 'center',
paddingHorizontal: SPACING[4],
gap: SPACING[3],
},
subscriptionInfo: {
flex: 1,
},
// Version Text
versionText: {
textAlign: 'center',
marginTop: SPACING[6],
},
})
// Version Text
versionText: {
textAlign: 'center',
marginTop: SPACING[6],
},
})
}

View File

@@ -1,40 +1,134 @@
/**
* TabataFit Workouts Screen
* React Native + SwiftUI Islands — wired to shared data
* Premium workout browser — scrollable category pills, trainers, workout grid
*/
import { useState } from 'react'
import { View, StyleSheet, ScrollView, Pressable, Dimensions, Text as RNText } from 'react-native'
import { useState, useRef, useMemo } from 'react'
import { View, StyleSheet, ScrollView, Pressable, Dimensions, Animated } from 'react-native'
import { useRouter } from 'expo-router'
import { useSafeAreaInsets } from 'react-native-safe-area-context'
import { LinearGradient } from 'expo-linear-gradient'
import { BlurView } from 'expo-blur'
import Ionicons from '@expo/vector-icons/Ionicons'
import { Host, Picker } from '@expo/ui/swift-ui'
import { useTranslation } from 'react-i18next'
import { useHaptics } from '@/src/shared/hooks'
import { WORKOUTS, TRAINERS, CATEGORIES, getTrainerById } from '@/src/shared/data'
import { WORKOUTS } from '@/src/shared/data'
import { useTranslatedCategories, useTranslatedWorkouts } from '@/src/shared/data/useTranslatedData'
import { StyledText } from '@/src/shared/components/StyledText'
import {
BRAND,
DARK,
TEXT,
GLASS,
SHADOW,
} from '@/src/shared/constants/colors'
import { useThemeColors, BRAND, GRADIENTS } from '@/src/shared/theme'
import type { ThemeColors } from '@/src/shared/theme/types'
import { SPACING, LAYOUT } from '@/src/shared/constants/spacing'
import { RADIUS } from '@/src/shared/constants/borderRadius'
const { width: SCREEN_WIDTH } = Dimensions.get('window')
const CARD_WIDTH = (SCREEN_WIDTH - LAYOUT.SCREEN_PADDING * 2 - SPACING[3]) / 2
const FONTS = {
LARGE_TITLE: 34,
TITLE_2: 22,
HEADLINE: 17,
SUBHEADLINE: 15,
CAPTION_1: 12,
CAPTION_2: 11,
// ═══════════════════════════════════════════════════════════════════════════
// CATEGORY PILL
// ═══════════════════════════════════════════════════════════════════════════
function CategoryPill({
label,
selected,
onPress,
}: {
label: string
selected: boolean
onPress: () => void
}) {
const colors = useThemeColors()
const styles = useMemo(() => createStyles(colors), [colors])
return (
<Pressable
style={[styles.pill, selected && styles.pillSelected]}
onPress={onPress}
>
{selected && (
<LinearGradient
colors={GRADIENTS.CTA}
style={[StyleSheet.absoluteFill, { borderRadius: 20 }]}
/>
)}
<StyledText
size={14}
weight={selected ? 'semibold' : 'regular'}
color={selected ? '#FFFFFF' : colors.text.tertiary}
>
{label}
</StyledText>
</Pressable>
)
}
// ═══════════════════════════════════════════════════════════════════════════
// WORKOUT CARD
// ═══════════════════════════════════════════════════════════════════════════
function WorkoutCard({
title,
duration,
level,
levelLabel,
onPress,
}: {
title: string
duration: number
level: string
levelLabel: string
onPress: () => void
}) {
const colors = useThemeColors()
const styles = useMemo(() => createStyles(colors), [colors])
return (
<Pressable style={styles.workoutCard} onPress={onPress}>
<BlurView intensity={colors.glass.blurMedium} tint={colors.glass.blurTint} style={StyleSheet.absoluteFill} />
{/* Subtle gradient accent at top */}
<LinearGradient
colors={[levelColor(level, colors) + '30', 'transparent']}
style={styles.cardGradient}
/>
{/* Duration badge */}
<View style={styles.durationBadge}>
<Ionicons name="time-outline" size={10} color={colors.text.secondary} />
<StyledText size={11} weight="semibold" color={colors.text.secondary} style={{ marginLeft: 3 }}>
{duration + ' min'}
</StyledText>
</View>
{/* Play button */}
<View style={styles.playArea}>
<View style={styles.playCircle}>
<Ionicons name="play" size={18} color={colors.text.primary} />
</View>
</View>
{/* Info */}
<View style={styles.workoutInfo}>
<StyledText size={14} weight="semibold" color={colors.text.primary} numberOfLines={2}>
{title}
</StyledText>
<View style={styles.levelRow}>
<View style={[styles.levelDot, { backgroundColor: levelColor(level, colors) }]} />
<StyledText size={11} color={colors.text.tertiary}>
{levelLabel}
</StyledText>
</View>
</View>
</Pressable>
)
}
function levelColor(level: string, colors: ThemeColors): string {
switch (level.toLowerCase()) {
case 'beginner': return BRAND.SUCCESS
case 'intermediate': return BRAND.SECONDARY
case 'advanced': return BRAND.DANGER
default: return colors.text.tertiary
}
}
// ═══════════════════════════════════════════════════════════════════════════
@@ -42,22 +136,28 @@ const FONTS = {
// ═══════════════════════════════════════════════════════════════════════════
export default function WorkoutsScreen() {
const { t } = useTranslation()
const insets = useSafeAreaInsets()
const router = useRouter()
const haptics = useHaptics()
const [selectedCategoryIndex, setSelectedCategoryIndex] = useState(0)
const selectedCategory = CATEGORIES[selectedCategoryIndex].id
const colors = useThemeColors()
const styles = useMemo(() => createStyles(colors), [colors])
const [selectedCategory, setSelectedCategory] = useState('all')
const categories = useTranslatedCategories()
const filteredWorkouts = selectedCategory === 'all'
? WORKOUTS
: WORKOUTS.filter(w => w.category === selectedCategory)
const translatedFiltered = useTranslatedWorkouts(filteredWorkouts)
const handleWorkoutPress = (id: string) => {
haptics.buttonTap()
router.push(`/workout/${id}`)
}
const selectedLabel = categories.find(c => c.id === selectedCategory)?.label ?? t('screens:workouts.allWorkouts')
return (
<View style={[styles.container, { paddingTop: insets.top }]}>
<ScrollView
@@ -67,89 +167,57 @@ export default function WorkoutsScreen() {
>
{/* Header */}
<View style={styles.header}>
<StyledText size={FONTS.LARGE_TITLE} weight="bold" color={TEXT.PRIMARY}>Workouts</StyledText>
<StyledText size={FONTS.SUBHEADLINE} color={TEXT.TERTIARY}>{WORKOUTS.length + ' workouts available'}</StyledText>
<StyledText size={34} weight="bold" color={colors.text.primary}>
{t('screens:workouts.title')}
</StyledText>
<StyledText size={15} color={colors.text.tertiary}>
{t('screens:workouts.available', { count: WORKOUTS.length })}
</StyledText>
</View>
{/* SwiftUI Island: Category Picker */}
<Host matchContents useViewportSizeMeasurement colorScheme="dark" style={styles.pickerIsland}>
<Picker
variant="segmented"
options={CATEGORIES.map(c => c.label)}
selectedIndex={selectedCategoryIndex}
onOptionSelected={(e) => {
haptics.selection()
setSelectedCategoryIndex(e.nativeEvent.index)
}}
color={BRAND.PRIMARY}
/>
</Host>
{/* Trainers */}
<View style={styles.section}>
<StyledText size={FONTS.TITLE_2} weight="semibold" color={TEXT.PRIMARY}>Trainers</StyledText>
<ScrollView
horizontal
showsHorizontalScrollIndicator={false}
contentContainerStyle={styles.trainersScroll}
>
{TRAINERS.map((trainer) => (
<Pressable key={trainer.id} style={styles.trainerCard}>
<BlurView intensity={GLASS.BLUR_MEDIUM} tint="dark" style={StyleSheet.absoluteFill} />
<View style={[styles.trainerAvatar, { backgroundColor: trainer.color }]}>
<StyledText size={FONTS.TITLE_2} weight="bold" color={TEXT.PRIMARY}>{trainer.name[0]}</StyledText>
</View>
<StyledText size={FONTS.SUBHEADLINE} weight="semibold" color={TEXT.PRIMARY}>{trainer.name}</StyledText>
<StyledText size={FONTS.CAPTION_2} color={TEXT.TERTIARY}>{trainer.specialty}</StyledText>
</Pressable>
))}
</ScrollView>
</View>
{/* Category Pills — horizontal scroll, no truncation */}
<ScrollView
horizontal
showsHorizontalScrollIndicator={false}
contentContainerStyle={styles.pillsRow}
style={styles.pillsScroll}
>
{categories.map((cat) => (
<CategoryPill
key={cat.id}
label={cat.label}
selected={selectedCategory === cat.id}
onPress={() => {
haptics.selection()
setSelectedCategory(cat.id)
}}
/>
))}
</ScrollView>
{/* Workouts Grid */}
<View style={styles.section}>
<View style={styles.sectionHeader}>
<StyledText size={FONTS.TITLE_2} weight="semibold" color={TEXT.PRIMARY}>
{selectedCategory === 'all' ? 'All Workouts' : (CATEGORIES.find(c => c.id === selectedCategory)?.label ?? 'All Workouts')}
<StyledText size={20} weight="semibold" color={colors.text.primary}>
{selectedCategory === 'all' ? t('screens:workouts.allWorkouts') : selectedLabel}
</StyledText>
{selectedCategory !== 'all' && (
<Pressable onPress={() => { haptics.buttonTap(); router.push(`/workout/category/${selectedCategory}`) }}>
<StyledText size={FONTS.SUBHEADLINE} color={BRAND.PRIMARY} weight="medium">See All</StyledText>
<StyledText size={14} color={BRAND.PRIMARY} weight="medium">{t('seeAll')}</StyledText>
</Pressable>
)}
</View>
<View style={styles.workoutsGrid}>
{filteredWorkouts.map((workout) => {
const trainer = getTrainerById(workout.trainerId)
return (
<Pressable
key={workout.id}
style={styles.workoutCard}
onPress={() => handleWorkoutPress(workout.id)}
>
<BlurView intensity={GLASS.BLUR_MEDIUM} tint="dark" style={StyleSheet.absoluteFill} />
<View style={styles.durationBadge}>
<StyledText size={FONTS.CAPTION_2} weight="semibold" color={TEXT.PRIMARY}>{workout.duration + ' min'}</StyledText>
</View>
<View style={[styles.workoutTrainerBadge, { backgroundColor: trainer?.color }]}>
<StyledText size={FONTS.CAPTION_1} weight="bold" color={TEXT.PRIMARY}>{trainer?.name[0] ?? 'T'}</StyledText>
</View>
<View style={styles.playOverlay}>
<View style={styles.playCircle}>
<Ionicons name="play" size={20} color={TEXT.PRIMARY} />
</View>
</View>
<View style={styles.workoutInfo}>
<StyledText size={FONTS.SUBHEADLINE} weight="semibold" color={TEXT.PRIMARY}>{workout.title}</StyledText>
<StyledText size={FONTS.CAPTION_1} color={BRAND.PRIMARY}>{workout.level}</StyledText>
</View>
</Pressable>
)
})}
{translatedFiltered.map((workout) => (
<WorkoutCard
key={workout.id}
title={workout.title}
duration={workout.duration}
level={workout.level}
levelLabel={t(`levels.${workout.level.toLowerCase()}`)}
onPress={() => handleWorkoutPress(workout.id)}
/>
))}
</View>
</View>
</ScrollView>
@@ -161,119 +229,126 @@ export default function WorkoutsScreen() {
// STYLES
// ═══════════════════════════════════════════════════════════════════════════
const styles = StyleSheet.create({
container: {
flex: 1,
backgroundColor: DARK.BASE,
},
scrollView: {
flex: 1,
},
scrollContent: {
paddingHorizontal: LAYOUT.SCREEN_PADDING,
},
function createStyles(colors: ThemeColors) {
return StyleSheet.create({
container: {
flex: 1,
backgroundColor: colors.bg.base,
},
scrollView: {
flex: 1,
},
scrollContent: {
paddingHorizontal: LAYOUT.SCREEN_PADDING,
},
// Header
header: {
marginBottom: SPACING[6],
},
// Header
header: {
marginBottom: SPACING[4],
},
// Picker Island
pickerIsland: {
marginBottom: SPACING[6],
},
// Pills
pillsScroll: {
marginHorizontal: -LAYOUT.SCREEN_PADDING,
marginBottom: SPACING[6],
},
pillsRow: {
paddingHorizontal: LAYOUT.SCREEN_PADDING,
gap: SPACING[2],
},
pill: {
paddingHorizontal: SPACING[4],
paddingVertical: SPACING[2],
borderRadius: 20,
backgroundColor: colors.bg.surface,
borderWidth: 1,
borderColor: colors.border.glassLight,
},
pillSelected: {
borderColor: BRAND.PRIMARY,
backgroundColor: 'transparent',
},
// Section
section: {
marginBottom: SPACING[8],
},
sectionHeader: {
flexDirection: 'row',
justifyContent: 'space-between',
alignItems: 'center',
marginBottom: SPACING[2],
},
// Section
section: {
marginBottom: SPACING[6],
},
sectionHeader: {
flexDirection: 'row',
justifyContent: 'space-between',
alignItems: 'center',
marginBottom: SPACING[4],
},
// Trainers
trainersScroll: {
gap: SPACING[3],
},
trainerCard: {
width: 100,
alignItems: 'center',
paddingVertical: SPACING[4],
borderRadius: RADIUS.LG,
borderWidth: 1,
borderColor: 'rgba(255, 255, 255, 0.1)',
overflow: 'hidden',
},
trainerAvatar: {
width: 48,
height: 48,
borderRadius: 24,
alignItems: 'center',
justifyContent: 'center',
marginBottom: SPACING[2],
},
// Workouts Grid
workoutsGrid: {
flexDirection: 'row',
flexWrap: 'wrap',
gap: SPACING[3],
},
workoutCard: {
width: CARD_WIDTH,
height: 180,
borderRadius: RADIUS.GLASS_CARD,
overflow: 'hidden',
...SHADOW.md,
borderWidth: 1,
borderColor: 'rgba(255, 255, 255, 0.1)',
},
durationBadge: {
position: 'absolute',
top: SPACING[2],
right: SPACING[2],
backgroundColor: 'rgba(0, 0, 0, 0.5)',
paddingHorizontal: SPACING[2],
paddingVertical: SPACING[1],
borderRadius: RADIUS.SM,
},
workoutTrainerBadge: {
position: 'absolute',
top: SPACING[2],
left: SPACING[2],
width: 28,
height: 28,
borderRadius: 14,
alignItems: 'center',
justifyContent: 'center',
},
playOverlay: {
position: 'absolute',
top: 0,
left: 0,
right: 0,
bottom: 60,
alignItems: 'center',
justifyContent: 'center',
},
playCircle: {
width: 44,
height: 44,
borderRadius: 22,
backgroundColor: 'rgba(255, 255, 255, 0.2)',
alignItems: 'center',
justifyContent: 'center',
borderWidth: 1,
borderColor: 'rgba(255, 255, 255, 0.3)',
},
workoutInfo: {
position: 'absolute',
bottom: 0,
left: 0,
right: 0,
padding: SPACING[3],
},
})
// Workouts Grid
workoutsGrid: {
flexDirection: 'row',
flexWrap: 'wrap',
gap: SPACING[3],
},
workoutCard: {
width: CARD_WIDTH,
height: 190,
borderRadius: RADIUS.GLASS_CARD,
overflow: 'hidden',
borderWidth: 1,
borderColor: colors.bg.overlay2,
},
cardGradient: {
position: 'absolute',
top: 0,
left: 0,
right: 0,
height: 80,
},
durationBadge: {
position: 'absolute',
top: SPACING[3],
right: SPACING[3],
flexDirection: 'row',
alignItems: 'center',
backgroundColor: 'rgba(0, 0, 0, 0.5)',
paddingHorizontal: SPACING[2],
paddingVertical: 3,
borderRadius: RADIUS.SM,
},
playArea: {
position: 'absolute',
top: 0,
left: 0,
right: 0,
bottom: 64,
alignItems: 'center',
justifyContent: 'center',
},
playCircle: {
width: 40,
height: 40,
borderRadius: 20,
backgroundColor: colors.border.glassStrong,
alignItems: 'center',
justifyContent: 'center',
borderWidth: 1,
borderColor: 'rgba(255, 255, 255, 0.25)',
},
workoutInfo: {
position: 'absolute',
bottom: 0,
left: 0,
right: 0,
padding: SPACING[3],
paddingTop: SPACING[2],
},
levelRow: {
flexDirection: 'row',
alignItems: 'center',
marginTop: 3,
gap: 5,
},
levelDot: {
width: 6,
height: 6,
borderRadius: 3,
},
})
}