Merge branch 'uifix'

apps/mobile/src/app/(auth)/onboarding.tsx

@@ -13,12 +13,17 @@ import { useUser, useAuth } from "@clerk/clerk-expo";
 import { useRouter } from "expo-router";
 import { fitnessProfileApi } from "@/api/fitnessProfile";
 import { gymsApi, type Gym } from "@/api/gyms";
+import { useTheme } from "../../contexts/ThemeContext";
+import { Input } from "../../components/Input";
+import { MinimalButton } from "../../components/MinimalButton";
+import { MinimalCard } from "../../components/MinimalCard";
 import log from "../../utils/logger";
 
 export default function OnboardingScreen() {
   const { user } = useUser();
   const { getToken } = useAuth();
   const router = useRouter();
+  const { colors, typography } = useTheme();
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [gyms, setGyms] = useState<Gym[]>([]);
   const [gymsLoading, setGymsLoading] = useState<boolean>(false);
@@ -134,24 +139,53 @@ export default function OnboardingScreen() {
   const progress = calculateProgress();
 
   return (
-    <ScrollView style={styles.container}>
+    <ScrollView
-      <Text style={styles.title}>Set Up Your Fitness Profile</Text>
+      style={[styles.container, { backgroundColor: colors.background }]}
-      <Text style={styles.subtitle}>
+    >
+      <Text
+        style={[typography.h2, { color: colors.textPrimary }, styles.title]}
+      >
+        Set Up Your Fitness Profile
+      </Text>
+      <Text
+        style={[
+          typography.body,
+          { color: colors.textSecondary },
+          styles.subtitle,
+        ]}
+      >
         Help us personalize your fitness journey
       </Text>
 
       {/* Progress indicator */}
       <View style={styles.progressContainer}>
-        <View style={styles.progressBarBackground}>
+        <View
-          <View style={[styles.progressBarFill, { width: `${progress}%` }]} />
+          style={[
+            styles.progressBarBackground,
+            { backgroundColor: colors.borderLight },
+          ]}
+        >
+          <View
+            style={[
+              styles.progressBarFill,
+              { width: `${progress}%`, backgroundColor: colors.primary },
+            ]}
+          />
         </View>
-        <Text style={styles.progressText}>{progress}% Complete</Text>
+        <Text
+          style={[
+            typography.caption,
+            { color: colors.textTertiary },
+            styles.progressText,
+          ]}
+        >
+          {progress}% Complete
+        </Text>
       </View>
 
       <View style={styles.form}>
-        <Text style={styles.label}>Height (cm)</Text>
+        <Input
-        <TextInput
+          label="Height (cm)"
-          style={styles.input}
           value={fitnessProfile.height}
           onChangeText={(value) =>
             setFitnessProfile({ ...fitnessProfile, height: value })
@@ -160,9 +194,8 @@ export default function OnboardingScreen() {
           placeholder="Enter height in cm"
         />
 
-        <Text style={styles.label}>Weight (kg)</Text>
+        <Input
-        <TextInput
+          label="Weight (kg)"
-          style={styles.input}
           value={fitnessProfile.weight}
           onChangeText={(value) =>
             setFitnessProfile({ ...fitnessProfile, weight: value })
@@ -171,9 +204,8 @@ export default function OnboardingScreen() {
           placeholder="Enter weight in kg"
         />
 
-        <Text style={styles.label}>Age</Text>
+        <Input
-        <TextInput
+          label="Age"
-          style={styles.input}
           value={fitnessProfile.age}
           onChangeText={(value) =>
             setFitnessProfile({ ...fitnessProfile, age: value })
@@ -182,9 +214,9 @@ export default function OnboardingScreen() {
           placeholder="Enter your age"
         />
 
-        <Text style={styles.label}>Fitness Goals</Text>
+        <Input
-        <TextInput
+          label="Fitness Goals"
-          style={[styles.input, styles.textArea]}
+          style={styles.textArea}
           value={fitnessProfile.goals}
           onChangeText={(value) =>
             setFitnessProfile({ ...fitnessProfile, goals: value })
@@ -194,33 +226,48 @@ export default function OnboardingScreen() {
           placeholder="What are your fitness goals?"
         />
 
-        <Text style={styles.label}>Fitness Level</Text>
+        <Text
+          style={[typography.h4, { color: colors.textPrimary }, styles.label]}
+        >
+          Fitness Level
+        </Text>
         <View style={styles.buttonGroup}>
           {["beginner", "intermediate", "advanced"].map((level) => (
             <TouchableOpacity
               key={level}
               style={[
-                styles.levelButton,
+                styles.segmentButton,
-                fitnessProfile.fitnessLevel === level && styles.selectedButton,
+                {
+                  backgroundColor:
+                    fitnessProfile.fitnessLevel === level
+                      ? colors.primary
+                      : colors.surface,
+                  borderColor: colors.border,
+                },
               ]}
               onPress={() => handleLevelSelect(level)}
             >
               <Text
                 style={[
-                  styles.levelButtonText,
+                  typography.caption,
-                  fitnessProfile.fitnessLevel === level &&
+                  {
-                    styles.selectedButtonText,
+                    color:
+                      fitnessProfile.fitnessLevel === level
+                        ? colors.white
+                        : colors.textSecondary,
+                    textTransform: "capitalize",
+                  },
                 ]}
               >
-                {level.charAt(0).toUpperCase() + level.slice(1)}
+                {level}
               </Text>
             </TouchableOpacity>
           ))}
         </View>
 
-        <Text style={styles.label}>Medical Conditions</Text>
+        <Input
-        <TextInput
+          label="Medical Conditions"
-          style={[styles.input, styles.textArea]}
+          style={styles.textArea}
           value={fitnessProfile.medicalConditions}
           onChangeText={(value) =>
             setFitnessProfile({ ...fitnessProfile, medicalConditions: value })
@@ -230,9 +277,9 @@ export default function OnboardingScreen() {
           placeholder="Any medical conditions we should know about?"
         />
 
-        <Text style={styles.label}>Dietary Restrictions</Text>
+        <Input
-        <TextInput
+          label="Dietary Restrictions"
-          style={[styles.input, styles.textArea]}
+          style={styles.textArea}
           value={fitnessProfile.dietaryRestrictions}
           onChangeText={(value) =>
             setFitnessProfile({
@@ -245,34 +292,47 @@ export default function OnboardingScreen() {
           placeholder="Any dietary restrictions?"
         />
 
-        <Text style={styles.label}>Preferred Workout Time</Text>
+        <Text
+          style={[typography.h4, { color: colors.textPrimary }, styles.label]}
+        >
+          Preferred Workout Time
+        </Text>
         <View style={styles.buttonGroup}>
           {["morning", "afternoon", "evening"].map((time) => (
             <TouchableOpacity
               key={time}
               style={[
-                styles.timeButton,
+                styles.segmentButton,
-                fitnessProfile.preferredWorkoutTime === time &&
+                {
-                  styles.selectedButton,
+                  backgroundColor:
+                    fitnessProfile.preferredWorkoutTime === time
+                      ? colors.primary
+                      : colors.surface,
+                  borderColor: colors.border,
+                },
               ]}
               onPress={() => handleTimeSelect(time)}
             >
               <Text
                 style={[
-                  styles.timeButtonText,
+                  typography.caption,
-                  fitnessProfile.preferredWorkoutTime === time &&
+                  {
-                    styles.selectedButtonText,
+                    color:
+                      fitnessProfile.preferredWorkoutTime === time
+                        ? colors.white
+                        : colors.textSecondary,
+                    textTransform: "capitalize",
+                  },
                 ]}
               >
-                {time.charAt(0).toUpperCase() + time.slice(1)}
+                {time}
               </Text>
             </TouchableOpacity>
           ))}
         </View>
 
-        <Text style={styles.label}>Workouts per Week</Text>
+        <Input
-        <TextInput
+          label="Workouts per Week"
-          style={styles.input}
           value={fitnessProfile.workoutFrequency}
           onChangeText={(value) =>
             setFitnessProfile({ ...fitnessProfile, workoutFrequency: value })
@@ -281,7 +341,11 @@ export default function OnboardingScreen() {
           placeholder="Number of workouts per week"
         />
 
-        <Text style={styles.label}>Select a Gym</Text>
+        <Text
+          style={[typography.h4, { color: colors.textPrimary }, styles.label]}
+        >
+          Select a Gym
+        </Text>
         {gymsLoading ? (
           <ActivityIndicator />
         ) : (
@@ -293,15 +357,24 @@ export default function OnboardingScreen() {
             <View style={{ flexDirection: "row" }}>
               <TouchableOpacity
                 style={[
-                  styles.levelButton,
+                  styles.segmentButton,
-                  selectedGymId === null && styles.selectedButton,
+                  {
+                    backgroundColor:
+                      selectedGymId === null ? colors.primary : colors.surface,
+                    borderColor: colors.border,
+                  },
                 ]}
                 onPress={() => setSelectedGymId(null)}
               >
                 <Text
                   style={[
-                    styles.levelButtonText,
+                    typography.caption,
-                    selectedGymId === null && styles.selectedButtonText,
+                    {
+                      color:
+                        selectedGymId === null
+                          ? colors.white
+                          : colors.textSecondary,
+                    },
                   ]}
                 >
                   Proceed without gym
@@ -311,15 +384,26 @@ export default function OnboardingScreen() {
                 <TouchableOpacity
                   key={gym.id}
                   style={[
-                    styles.levelButton,
+                    styles.segmentButton,
-                    selectedGymId === gym.id && styles.selectedButton,
+                    {
+                      backgroundColor:
+                        selectedGymId === gym.id
+                          ? colors.primary
+                          : colors.surface,
+                      borderColor: colors.border,
+                    },
                   ]}
                   onPress={() => setSelectedGymId(gym.id)}
                 >
                   <Text
                     style={[
-                      styles.levelButtonText,
+                      typography.caption,
-                      selectedGymId === gym.id && styles.selectedButtonText,
+                      {
+                        color:
+                          selectedGymId === gym.id
+                            ? colors.white
+                            : colors.textSecondary,
+                      },
                     ]}
                   >
                     {gym.name}
@@ -330,17 +414,14 @@ export default function OnboardingScreen() {
           </ScrollView>
         )}
 
-        <TouchableOpacity
+        <MinimalButton
-          style={styles.submitButton}
+          title="Complete Setup"
           onPress={handleSubmit}
+          loading={isSubmitting}
           disabled={isSubmitting}
-        >
+          fullWidth
-          {isSubmitting ? (
+          size="lg"
-            <ActivityIndicator color="white" />
+        />
-          ) : (
-            <Text style={styles.submitButtonText}>Complete Setup</Text>
-          )}
-        </TouchableOpacity>
       </View>
     </ScrollView>
   );
@@ -349,18 +430,13 @@ export default function OnboardingScreen() {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    backgroundColor: "#f5f5f5",
   },
   title: {
-    fontSize: 24,
-    fontWeight: "bold",
     textAlign: "center",
     marginTop: 40,
     marginBottom: 8,
   },
   subtitle: {
-    fontSize: 16,
-    color: "#666",
     textAlign: "center",
     marginBottom: 32,
   },
@@ -368,91 +444,39 @@ const styles = StyleSheet.create({
     padding: 20,
   },
   label: {
-    fontSize: 14,
+    marginBottom: 8,
-    fontWeight: "600",
-    color: "#374151",
-    marginBottom: 4,
-  },
-  input: {
-    borderWidth: 1,
-    borderColor: "#ddd",
-    borderRadius: 8,
-    padding: 12,
-    marginBottom: 16,
-    backgroundColor: "white",
   },
   textArea: {
-    height: 80,
+    minHeight: 80,
     textAlignVertical: "top",
+    marginBottom: 16,
   },
   buttonGroup: {
     flexDirection: "row",
-    justifyContent: "space-between",
+    flexWrap: "wrap",
+    gap: 8,
     marginBottom: 16,
   },
-  levelButton: {
+  segmentButton: {
-    flex: 1,
+    minWidth: 100,
-    backgroundColor: "#f3f4f6",
     padding: 10,
-    borderRadius: 8,
+    borderRadius: 10,
-    marginHorizontal: 4,
+    borderWidth: 1,
     alignItems: "center",
   },
-  timeButton: {
-    flex: 1,
-    backgroundColor: "#f3f4f6",
-    padding: 10,
-    borderRadius: 8,
-    marginHorizontal: 4,
-    alignItems: "center",
-  },
-  selectedButton: {
-    backgroundColor: "#3b82f6",
-  },
-  levelButtonText: {
-    color: "#374151",
-    fontSize: 14,
-    fontWeight: "500",
-  },
-  timeButtonText: {
-    color: "#374151",
-    fontSize: 14,
-    fontWeight: "500",
-  },
-  selectedButtonText: {
-    color: "white",
-  },
-  submitButton: {
-    backgroundColor: "#3b82f6",
-    padding: 16,
-    borderRadius: 8,
-    alignItems: "center",
-    marginTop: 24,
-  },
-  submitButtonText: {
-    color: "white",
-    fontSize: 16,
-    fontWeight: "600",
-  },
   progressContainer: {
     paddingHorizontal: 20,
     marginBottom: 16,
   },
   progressBarBackground: {
     height: 8,
-    backgroundColor: "#e5e7eb",
     borderRadius: 4,
     overflow: "hidden",
     marginBottom: 8,
   },
   progressBarFill: {
     height: "100%",
-    backgroundColor: "#3b82f6",
     borderRadius: 4,
   },
-  progressText: {
+  progressText: { textAlign: "center" },
-    fontSize: 12,
-    color: "#6b7280",
-    textAlign: "center",
-  },
 });

apps/mobile/src/app/(auth)/sign-in.tsx

@@ -4,7 +4,6 @@ import { useRouter } from "expo-router";
 import {
   View,
   Text,
-  TextInput,
   TouchableOpacity,
   StyleSheet,
   ActivityIndicator,
@@ -13,6 +12,9 @@ import {
   ScrollView,
 } from "react-native";
 import { OAuthButtons } from "../../components/auth/OAuthButtons";
+import { Input } from "../../components/Input";
+import { MinimalButton } from "../../components/MinimalButton";
+import { useTheme } from "../../contexts/ThemeContext";
 import { getErrorMessage, getClerkErrorCode } from "../../utils/error-helpers";
 import log from "../../utils/logger";
 
@@ -25,6 +27,7 @@ export default function SignInScreen() {
   const [password, setPassword] = useState("");
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState("");
+  const { colors, typography } = useTheme();
 
   // Redirect if already signed in
   useEffect(() => {
@@ -77,8 +80,15 @@ export default function SignInScreen() {
   if (isSignedIn) {
     return (
       <View style={[styles.container, styles.centerContent]}>
-        <ActivityIndicator size="large" color="#2563eb" />
+        <ActivityIndicator size="large" color={colors.primary} />
-        <Text style={styles.loadingText}>Redirecting...</Text>
+        <Text
+          style={[
+            typography.body,
+            { color: colors.textSecondary, marginTop: 12 },
+          ]}
+        >
+          Redirecting...
+        </Text>
       </View>
     );
   }
@@ -86,19 +96,33 @@ export default function SignInScreen() {
   return (
     <KeyboardAvoidingView
       behavior={Platform.OS === "ios" ? "padding" : "height"}
-      style={styles.container}
+      style={[styles.container, { backgroundColor: colors.background }]}
     >
       <ScrollView
         contentContainerStyle={styles.scrollContent}
         keyboardShouldPersistTaps="handled"
       >
         <View style={styles.content}>
-          <Text style={styles.title}>Welcome Back</Text>
+          <Text
-          <Text style={styles.subtitle}>Sign in to continue to FitAI</Text>
+            style={[typography.h1, { color: colors.textPrimary }, styles.title]}
+          >
+            Welcome Back
+          </Text>
+          <Text
+            style={[
+              typography.body,
+              { color: colors.textSecondary },
+              styles.subtitle,
+            ]}
+          >
+            Sign in to continue to FitAI
+          </Text>
 
           {error ? (
             <View style={styles.errorContainer}>
-              <Text style={styles.errorText}>{error}</Text>
+              <Text style={[typography.caption, { color: colors.danger }]}>
+                {error}
+              </Text>
             </View>
           ) : null}
 
@@ -112,13 +136,11 @@ export default function SignInScreen() {
 
           <View style={styles.form}>
             <View style={styles.inputContainer}>
-              <Text style={styles.label}>Email</Text>
+              <Input
-              <TextInput
+                label="Email"
-                style={styles.input}
                 autoCapitalize="none"
                 value={emailAddress}
                 placeholder="Enter your email"
-                placeholderTextColor="#999"
                 onChangeText={setEmailAddress}
                 keyboardType="email-address"
                 autoComplete="email"
@@ -127,12 +149,10 @@ export default function SignInScreen() {
             </View>
 
             <View style={styles.inputContainer}>
-              <Text style={styles.label}>Password</Text>
+              <Input
-              <TextInput
+                label="Password"
-                style={styles.input}
                 value={password}
                 placeholder="Enter your password"
-                placeholderTextColor="#999"
                 secureTextEntry={true}
                 onChangeText={setPassword}
                 autoComplete="password"
@@ -140,26 +160,29 @@ export default function SignInScreen() {
               />
             </View>
 
-            <TouchableOpacity
+            <MinimalButton
-              style={[styles.button, loading && styles.buttonDisabled]}
+              title="Sign In"
               onPress={onSignInPress}
+              loading={loading}
               disabled={loading || !emailAddress || !password}
-            >
+              fullWidth
-              {loading ? (
+              size="lg"
-                <ActivityIndicator color="#fff" />
+            />
-              ) : (
-                <Text style={styles.buttonText}>Sign In</Text>
-              )}
-            </TouchableOpacity>
           </View>
 
           <View style={styles.footer}>
-            <Text style={styles.footerText}>Don't have an account? </Text>
+            <Text style={[typography.caption, { color: colors.textSecondary }]}>
+              Don't have an account?{" "}
+            </Text>
             <TouchableOpacity
               onPress={() => router.push("/(auth)/sign-up")}
               disabled={loading}
             >
-              <Text style={styles.linkText}>Sign Up</Text>
+              <Text
+                style={[typography.bodyEmphasis, { color: colors.primary }]}
+              >
+                Sign Up
+              </Text>
             </TouchableOpacity>
           </View>
         </View>
@@ -171,17 +194,11 @@ export default function SignInScreen() {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    backgroundColor: "#f5f5f5",
   },
   centerContent: {
     justifyContent: "center",
     alignItems: "center",
   },
-  loadingText: {
-    marginTop: 12,
-    fontSize: 16,
-    color: "#666",
-  },
   scrollContent: {
     flexGrow: 1,
     justifyContent: "center",
@@ -193,27 +210,18 @@ const styles = StyleSheet.create({
     paddingVertical: 40,
   },
   title: {
-    fontSize: 32,
-    fontWeight: "bold",
-    color: "#1a1a1a",
     marginBottom: 8,
   },
   subtitle: {
-    fontSize: 16,
-    color: "#666",
     marginBottom: 32,
   },
   errorContainer: {
-    backgroundColor: "#fee",
+    backgroundColor: "rgba(255, 59, 59, 0.08)",
     padding: 12,
-    borderRadius: 8,
+    borderRadius: 12,
     marginBottom: 16,
     borderLeftWidth: 4,
-    borderLeftColor: "#f44",
+    borderLeftColor: "#FF3B3B",
-  },
-  errorText: {
-    color: "#c00",
-    fontSize: 14,
   },
   form: {
     marginBottom: 24,
@@ -221,51 +229,11 @@ const styles = StyleSheet.create({
   inputContainer: {
     marginBottom: 20,
   },
-  label: {
-    fontSize: 14,
-    fontWeight: "600",
-    color: "#333",
-    marginBottom: 8,
-  },
-  input: {
-    backgroundColor: "#fff",
-    borderWidth: 1,
-    borderColor: "#ddd",
-    borderRadius: 8,
-    paddingHorizontal: 16,
-    paddingVertical: 12,
-    fontSize: 16,
-    color: "#1a1a1a",
-  },
-  button: {
-    backgroundColor: "#2563eb",
-    paddingVertical: 16,
-    borderRadius: 8,
-    alignItems: "center",
-    marginTop: 8,
-  },
-  buttonDisabled: {
-    backgroundColor: "#93c5fd",
-  },
-  buttonText: {
-    color: "#fff",
-    fontSize: 16,
-    fontWeight: "600",
-  },
   footer: {
     flexDirection: "row",
     justifyContent: "center",
     alignItems: "center",
   },
-  footerText: {
-    fontSize: 14,
-    color: "#666",
-  },
-  linkText: {
-    fontSize: 14,
-    color: "#2563eb",
-    fontWeight: "600",
-  },
   dividerContainer: {
     flexDirection: "row",
     alignItems: "center",
@@ -274,11 +242,11 @@ const styles = StyleSheet.create({
   dividerLine: {
     flex: 1,
     height: 1,
-    backgroundColor: "#ddd",
+    backgroundColor: "#E5E5EA",
   },
   dividerText: {
     marginHorizontal: 10,
-    color: "#666",
+    color: "#8E8E93",
     fontSize: 14,
   },
 });

apps/mobile/src/app/(auth)/sign-up.tsx

@@ -4,7 +4,6 @@ import { useRouter } from "expo-router";
 import {
   View,
   Text,
-  TextInput,
   TouchableOpacity,
   StyleSheet,
   ActivityIndicator,
@@ -13,6 +12,9 @@ import {
   ScrollView,
 } from "react-native";
 import { OAuthButtons } from "../../components/auth/OAuthButtons";
+import { Input } from "../../components/Input";
+import { MinimalButton } from "../../components/MinimalButton";
+import { useTheme } from "../../contexts/ThemeContext";
 import { getErrorMessage, getClerkErrorCode } from "../../utils/error-helpers";
 import log from "../../utils/logger";
 
@@ -29,6 +31,7 @@ export default function SignUpScreen() {
   const [code, setCode] = useState("");
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState("");
+  const { colors, typography } = useTheme();
 
   // Redirect if already signed in
   useEffect(() => {
@@ -101,8 +104,15 @@ export default function SignUpScreen() {
   if (isSignedIn) {
     return (
       <View style={[styles.container, styles.centerContent]}>
-        <ActivityIndicator size="large" color="#2563eb" />
+        <ActivityIndicator size="large" color={colors.primary} />
-        <Text style={styles.loadingText}>Redirecting...</Text>
+        <Text
+          style={[
+            typography.body,
+            { color: colors.textSecondary, marginTop: 12 },
+          ]}
+        >
+          Redirecting...
+        </Text>
       </View>
     );
   }
@@ -118,42 +128,53 @@ export default function SignUpScreen() {
           keyboardShouldPersistTaps="handled"
         >
           <View style={styles.content}>
-            <Text style={styles.title}>Verify Email</Text>
+            <Text
-            <Text style={styles.subtitle}>
+              style={[
+                typography.h1,
+                { color: colors.textPrimary },
+                styles.title,
+              ]}
+            >
+              Verify Email
+            </Text>
+            <Text
+              style={[
+                typography.body,
+                { color: colors.textSecondary },
+                styles.subtitle,
+              ]}
+            >
               Enter the verification code sent to {emailAddress}
             </Text>
 
             {error ? (
               <View style={styles.errorContainer}>
-                <Text style={styles.errorText}>{error}</Text>
+                <Text style={[typography.caption, { color: colors.danger }]}>
+                  {error}
+                </Text>
               </View>
             ) : null}
 
             <View style={styles.form}>
               <View style={styles.inputContainer}>
-                <Text style={styles.label}>Verification Code</Text>
+                <Input
-                <TextInput
+                  label="Verification Code"
-                  style={styles.input}
                   value={code}
                   placeholder="Enter verification code"
-                  placeholderTextColor="#999"
                   onChangeText={setCode}
                   keyboardType="number-pad"
                   editable={!loading}
                 />
               </View>
 
-              <TouchableOpacity
+              <MinimalButton
-                style={[styles.button, loading && styles.buttonDisabled]}
+                title="Verify Email"
                 onPress={onVerifyPress}
+                loading={loading}
                 disabled={loading || !code}
-              >
+                fullWidth
-                {loading ? (
+                size="lg"
-                  <ActivityIndicator color="#fff" />
+              />
-                ) : (
-                  <Text style={styles.buttonText}>Verify Email</Text>
-                )}
-              </TouchableOpacity>
             </View>
           </View>
         </ScrollView>
@@ -164,19 +185,33 @@ export default function SignUpScreen() {
   return (
     <KeyboardAvoidingView
       behavior={Platform.OS === "ios" ? "padding" : "height"}
-      style={styles.container}
+      style={[styles.container, { backgroundColor: colors.background }]}
     >
       <ScrollView
         contentContainerStyle={styles.scrollContent}
         keyboardShouldPersistTaps="handled"
       >
         <View style={styles.content}>
-          <Text style={styles.title}>Create Account</Text>
+          <Text
-          <Text style={styles.subtitle}>Sign up to get started with FitAI</Text>
+            style={[typography.h1, { color: colors.textPrimary }, styles.title]}
+          >
+            Create Account
+          </Text>
+          <Text
+            style={[
+              typography.body,
+              { color: colors.textSecondary },
+              styles.subtitle,
+            ]}
+          >
+            Sign up to get started with FitAI
+          </Text>
 
           {error ? (
             <View style={styles.errorContainer}>
-              <Text style={styles.errorText}>{error}</Text>
+              <Text style={[typography.caption, { color: colors.danger }]}>
+                {error}
+              </Text>
             </View>
           ) : null}
 
@@ -190,12 +225,10 @@ export default function SignUpScreen() {
 
           <View style={styles.form}>
             <View style={styles.inputContainer}>
-              <Text style={styles.label}>First Name</Text>
+              <Input
-              <TextInput
+                label="First Name"
-                style={styles.input}
                 value={firstName}
                 placeholder="Enter your first name"
-                placeholderTextColor="#999"
                 onChangeText={setFirstName}
                 autoComplete="given-name"
                 editable={!loading}
@@ -203,12 +236,10 @@ export default function SignUpScreen() {
             </View>
 
             <View style={styles.inputContainer}>
-              <Text style={styles.label}>Last Name</Text>
+              <Input
-              <TextInput
+                label="Last Name"
-                style={styles.input}
                 value={lastName}
                 placeholder="Enter your last name"
-                placeholderTextColor="#999"
                 onChangeText={setLastName}
                 autoComplete="family-name"
                 editable={!loading}
@@ -216,13 +247,11 @@ export default function SignUpScreen() {
             </View>
 
             <View style={styles.inputContainer}>
-              <Text style={styles.label}>Email</Text>
+              <Input
-              <TextInput
+                label="Email"
-                style={styles.input}
                 autoCapitalize="none"
                 value={emailAddress}
                 placeholder="Enter your email"
-                placeholderTextColor="#999"
                 onChangeText={setEmailAddress}
                 keyboardType="email-address"
                 autoComplete="email"
@@ -231,42 +260,51 @@ export default function SignUpScreen() {
             </View>
 
             <View style={styles.inputContainer}>
-              <Text style={styles.label}>Password</Text>
+              <Input
-              <TextInput
+                label="Password"
-                style={styles.input}
                 value={password}
                 placeholder="Create a password"
-                placeholderTextColor="#999"
                 secureTextEntry={true}
                 onChangeText={setPassword}
                 autoComplete="password-new"
                 editable={!loading}
               />
-              <Text style={styles.hint}>Must be at least 8 characters</Text>
+              <Text
+                style={[
+                  typography.caption,
+                  { color: colors.textTertiary },
+                  styles.hint,
+                ]}
+              >
+                Must be at least 8 characters
+              </Text>
             </View>
 
-            <TouchableOpacity
+            <MinimalButton
-              style={[styles.button, loading && styles.buttonDisabled]}
+              title="Sign Up"
               onPress={onSignUpPress}
+              loading={loading}
               disabled={
                 loading || !emailAddress || !password || !firstName || !lastName
               }
-            >
+              fullWidth
-              {loading ? (
+              size="lg"
-                <ActivityIndicator color="#fff" />
+            />
-              ) : (
-                <Text style={styles.buttonText}>Sign Up</Text>
-              )}
-            </TouchableOpacity>
           </View>
 
           <View style={styles.footer}>
-            <Text style={styles.footerText}>Already have an account? </Text>
+            <Text style={[typography.caption, { color: colors.textSecondary }]}>
+              Already have an account?{" "}
+            </Text>
             <TouchableOpacity
               onPress={() => router.push("/(auth)/sign-in")}
               disabled={loading}
             >
-              <Text style={styles.linkText}>Sign In</Text>
+              <Text
+                style={[typography.bodyEmphasis, { color: colors.primary }]}
+              >
+                Sign In
+              </Text>
             </TouchableOpacity>
           </View>
         </View>
@@ -278,17 +316,11 @@ export default function SignUpScreen() {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    backgroundColor: "#f5f5f5",
   },
   centerContent: {
     justifyContent: "center",
     alignItems: "center",
   },
-  loadingText: {
-    marginTop: 12,
-    fontSize: 16,
-    color: "#666",
-  },
   scrollContent: {
     flexGrow: 1,
     justifyContent: "center",
@@ -300,27 +332,18 @@ const styles = StyleSheet.create({
     paddingVertical: 40,
   },
   title: {
-    fontSize: 32,
-    fontWeight: "bold",
-    color: "#1a1a1a",
     marginBottom: 8,
   },
   subtitle: {
-    fontSize: 16,
-    color: "#666",
     marginBottom: 32,
   },
   errorContainer: {
-    backgroundColor: "#fee",
+    backgroundColor: "rgba(255, 59, 59, 0.08)",
     padding: 12,
-    borderRadius: 8,
+    borderRadius: 12,
     marginBottom: 16,
     borderLeftWidth: 4,
-    borderLeftColor: "#f44",
+    borderLeftColor: "#FF3B3B",
-  },
-  errorText: {
-    color: "#c00",
-    fontSize: 14,
   },
   form: {
     marginBottom: 24,
@@ -328,56 +351,14 @@ const styles = StyleSheet.create({
   inputContainer: {
     marginBottom: 20,
   },
-  label: {
-    fontSize: 14,
-    fontWeight: "600",
-    color: "#333",
-    marginBottom: 8,
-  },
-  input: {
-    backgroundColor: "#fff",
-    borderWidth: 1,
-    borderColor: "#ddd",
-    borderRadius: 8,
-    paddingHorizontal: 16,
-    paddingVertical: 12,
-    fontSize: 16,
-    color: "#1a1a1a",
-  },
   hint: {
-    fontSize: 12,
-    color: "#999",
     marginTop: 4,
   },
-  button: {
-    backgroundColor: "#2563eb",
-    paddingVertical: 16,
-    borderRadius: 8,
-    alignItems: "center",
-    marginTop: 8,
-  },
-  buttonDisabled: {
-    backgroundColor: "#93c5fd",
-  },
-  buttonText: {
-    color: "#fff",
-    fontSize: 16,
-    fontWeight: "600",
-  },
   footer: {
     flexDirection: "row",
     justifyContent: "center",
     alignItems: "center",
   },
-  footerText: {
-    fontSize: 14,
-    color: "#666",
-  },
-  linkText: {
-    fontSize: 14,
-    color: "#2563eb",
-    fontWeight: "600",
-  },
   dividerContainer: {
     flexDirection: "row",
     alignItems: "center",
@@ -386,11 +367,11 @@ const styles = StyleSheet.create({
   dividerLine: {
     flex: 1,
     height: 1,
-    backgroundColor: "#ddd",
+    backgroundColor: "#E5E5EA",
   },
   dividerText: {
     marginHorizontal: 10,
-    color: "#666",
+    color: "#8E8E93",
     fontSize: 14,
   },
 });

apps/mobile/src/app/(tabs)/_layout.tsx

@@ -80,7 +80,7 @@ export default function TabLayout() {
       <Tabs.Screen
         name="recommendations"
         options={{
-          title: "AI",
+          title: "Plans",
         }}
       />
       <Tabs.Screen

apps/mobile/src/app/personal-details.tsx

@@ -1,162 +1,147 @@
-import React, { useState } from 'react';
+import React, { useState } from "react";
 import {
   View,
   Text,
   StyleSheet,
   ScrollView,
   TouchableOpacity,
-    TextInput,
   Alert,
-    Platform,
+  ActivityIndicator,
-} from 'react-native';
+} from "react-native";
-import { useRouter, Stack } from 'expo-router';
+import { Stack, useRouter } from "expo-router";
-import { useUser } from '@clerk/clerk-expo';
+import { Ionicons } from "@expo/vector-icons";
-import { Ionicons } from '@expo/vector-icons';
+import { useUser } from "@clerk/clerk-expo";
-import { LinearGradient } from 'expo-linear-gradient';
+import { useTheme } from "../contexts/ThemeContext";
-import { theme } from '../styles/theme';
+import { MinimalCard } from "../components/MinimalCard";
+import { Input } from "../components/Input";
+import { MinimalButton } from "../components/MinimalButton";
 
 export default function PersonalDetailsScreen() {
   const router = useRouter();
   const { user } = useUser();
+  const { colors, typography } = useTheme();
   const [loading, setLoading] = useState(false);
 
-    // Initialize with current user data
   const [formData, setFormData] = useState({
-        firstName: user?.firstName || '',
+    firstName: user?.firstName || "",
-        lastName: user?.lastName || '',
+    lastName: user?.lastName || "",
-        email: user?.primaryEmailAddress?.emailAddress || '',
+    email: user?.primaryEmailAddress?.emailAddress || "",
-        phone: user?.primaryPhoneNumber?.phoneNumber || '',
+    phone: user?.primaryPhoneNumber?.phoneNumber || "",
   });
 
+  const updateField = (field: "firstName" | "lastName", value: string) => {
+    setFormData((prev) => ({ ...prev, [field]: value }));
+  };
+
   const handleSave = async () => {
     setLoading(true);
     try {
-            // Update user profile via Clerk
       await user?.update({
         firstName: formData.firstName,
         lastName: formData.lastName,
       });
 
-            Alert.alert('Success', 'Personal details updated successfully', [
+      Alert.alert("Success", "Personal details updated successfully", [
-                { text: 'OK', onPress: () => router.back() },
+        { text: "OK", onPress: () => router.back() },
       ]);
-        } catch (error) {
+    } catch {
-            console.error('Error updating personal details:', error);
+      Alert.alert(
-            Alert.alert('Error', 'Failed to update personal details. Please try again.');
+        "Error",
+        "Failed to update personal details. Please try again.",
+      );
     } finally {
       setLoading(false);
     }
   };
 
-    const updateField = (field: string, value: string) => {
-        setFormData(prev => ({ ...prev, [field]: value }));
-    };
-
   return (
     <>
       <Stack.Screen options={{ headerShown: false }} />
-            <View style={styles.container}>
+      <View style={[styles.container, { backgroundColor: colors.background }]}>
-                {/* Header */}
+        <View
-                <LinearGradient
+          style={[styles.header, { borderBottomColor: colors.borderLight }]}
-                    colors={theme.gradients.primary}
-                    style={styles.header}
         >
           <TouchableOpacity
-                        style={styles.backButton}
+            style={[
+              styles.backButton,
+              { backgroundColor: colors.surfaceElevated },
+            ]}
             onPress={() => router.back()}
+            activeOpacity={0.8}
           >
-                        <Ionicons name="arrow-back" size={24} color="#fff" />
+            <Ionicons name="arrow-back" size={20} color={colors.textPrimary} />
           </TouchableOpacity>
-                    <Text style={styles.headerTitle}>Personal Details</Text>
+          <Text style={[typography.h3, { color: colors.textPrimary }]}>
-                    <View style={{ width: 40 }} />
+            Personal Details
-                </LinearGradient>
+          </Text>
+          <View style={styles.backButtonPlaceholder} />
+        </View>
 
         <ScrollView
           style={styles.content}
           contentContainerStyle={styles.scrollContent}
           showsVerticalScrollIndicator={false}
         >
-                    {/* First Name */}
+          <MinimalCard variant="elevated" style={styles.card}>
-                    <View style={styles.field}>
+            <Input
-                        <Text style={styles.label}>First Name *</Text>
+              label="First Name"
-                        <View style={styles.inputContainer}>
-                            <Ionicons name="person-outline" size={20} color={theme.colors.gray400} style={styles.inputIcon} />
-                            <TextInput
-                                style={styles.input}
               value={formData.firstName}
-                                onChangeText={(value) => updateField('firstName', value)}
+              onChangeText={(value) => updateField("firstName", value)}
               placeholder="Enter first name"
-                                placeholderTextColor={theme.colors.gray400}
             />
-                        </View>
-                    </View>
 
-                    {/* Last Name */}
+            <Input
-                    <View style={styles.field}>
+              label="Last Name"
-                        <Text style={styles.label}>Last Name *</Text>
-                        <View style={styles.inputContainer}>
-                            <Ionicons name="person-outline" size={20} color={theme.colors.gray400} style={styles.inputIcon} />
-                            <TextInput
-                                style={styles.input}
               value={formData.lastName}
-                                onChangeText={(value) => updateField('lastName', value)}
+              onChangeText={(value) => updateField("lastName", value)}
               placeholder="Enter last name"
-                                placeholderTextColor={theme.colors.gray400}
             />
-                        </View>
-                    </View>
 
-                    {/* Email (Read-only) */}
+            <View style={styles.readOnlyField}>
-                    <View style={styles.field}>
+              <Text style={[typography.h4, { color: colors.textPrimary }]}>
-                        <Text style={styles.label}>Email</Text>
+                Email
-                        <View style={[styles.inputContainer, styles.disabledInput]}>
+              </Text>
-                            <Ionicons name="mail-outline" size={20} color={theme.colors.gray400} style={styles.inputIcon} />
+              <Text style={[typography.body, { color: colors.textSecondary }]}>
-                            <TextInput
+                {formData.email || "Not set"}
-                                style={[styles.input, styles.disabledText]}
+              </Text>
-                                value={formData.email}
+              <Text
-                                editable={false}
+                style={[typography.caption, { color: colors.textTertiary }]}
-                                placeholderTextColor={theme.colors.gray400}
+              >
-                            />
+                Read-only in app settings
-                            <Ionicons name="lock-closed-outline" size={16} color={theme.colors.gray400} />
-                        </View>
-                        <Text style={styles.helperText}>Email cannot be changed here</Text>
-                    </View>
-
-                    {/* Phone (Read-only for now) */}
-                    <View style={styles.field}>
-                        <Text style={styles.label}>Phone Number</Text>
-                        <View style={[styles.inputContainer, styles.disabledInput]}>
-                            <Ionicons name="call-outline" size={20} color={theme.colors.gray400} style={styles.inputIcon} />
-                            <TextInput
-                                style={[styles.input, styles.disabledText]}
-                                value={formData.phone || 'Not set'}
-                                editable={false}
-                                placeholderTextColor={theme.colors.gray400}
-                            />
-                            <Ionicons name="lock-closed-outline" size={16} color={theme.colors.gray400} />
-                        </View>
-                        <Text style={styles.helperText}>Phone number cannot be changed here</Text>
-                    </View>
-                </ScrollView>
-
-                {/* Save Button */}
-                <View style={styles.footer}>
-                    <TouchableOpacity
-                        style={[styles.saveButton, loading && styles.saveButtonDisabled]}
-                        onPress={handleSave}
-                        disabled={loading}
-                    >
-                        <LinearGradient
-                            colors={theme.gradients.primary}
-                            style={styles.saveButtonGradient}
-                        >
-                            <Ionicons name="checkmark-circle" size={20} color="#fff" />
-                            <Text style={styles.saveButtonText}>
-                                {loading ? 'Saving...' : 'Save Changes'}
               </Text>
-                        </LinearGradient>
-                    </TouchableOpacity>
             </View>
+
+            <View style={styles.readOnlyField}>
+              <Text style={[typography.h4, { color: colors.textPrimary }]}>
+                Phone Number
+              </Text>
+              <Text style={[typography.body, { color: colors.textSecondary }]}>
+                {formData.phone || "Not set"}
+              </Text>
+              <Text
+                style={[typography.caption, { color: colors.textTertiary }]}
+              >
+                Read-only in app settings
+              </Text>
+            </View>
+          </MinimalCard>
+
+          <MinimalButton
+            title="Save Changes"
+            onPress={handleSave}
+            loading={loading}
+            disabled={loading}
+            fullWidth
+            size="lg"
+            style={{ marginTop: 16 }}
+          />
+
+          {loading ? (
+            <View style={styles.loadingRow}>
+              <ActivityIndicator size="small" color={colors.primary} />
+            </View>
+          ) : null}
+        </ScrollView>
       </View>
     </>
   );
@@ -165,105 +150,44 @@ export default function PersonalDetailsScreen() {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-        backgroundColor: theme.colors.background,
   },
   header: {
-        flexDirection: 'row',
+    paddingTop: 56,
-        alignItems: 'center',
+    paddingBottom: 12,
-        justifyContent: 'space-between',
-        paddingTop: Platform.OS === 'ios' ? 60 : 40,
-        paddingBottom: 20,
     paddingHorizontal: 20,
+    borderBottomWidth: 1,
+    flexDirection: "row",
+    alignItems: "center",
+    justifyContent: "space-between",
   },
   backButton: {
-        width: 40,
+    width: 36,
-        height: 40,
+    height: 36,
-        borderRadius: 20,
+    borderRadius: 10,
-        backgroundColor: 'rgba(255, 255, 255, 0.2)',
+    alignItems: "center",
-        justifyContent: 'center',
+    justifyContent: "center",
-        alignItems: 'center',
   },
-    headerTitle: {
+  backButtonPlaceholder: {
-        fontSize: theme.typography.fontSize['2xl'],
+    width: 36,
-        fontWeight: theme.typography.fontWeight.bold,
+    height: 36,
-        color: '#fff',
   },
   content: {
     flex: 1,
   },
   scrollContent: {
     padding: 20,
-        paddingBottom: 100,
+    paddingBottom: 80,
   },
-    field: {
+  card: {
-        marginBottom: 24,
+    borderRadius: 16,
   },
-    label: {
+  readOnlyField: {
-        fontSize: theme.typography.fontSize.sm,
+    marginTop: 8,
-        fontWeight: theme.typography.fontWeight.semibold,
+    marginBottom: 12,
-        color: theme.colors.gray700,
+    gap: 4,
-        marginBottom: 8,
   },
-    inputContainer: {
+  loadingRow: {
-        flexDirection: 'row',
+    marginTop: 16,
-        alignItems: 'center',
+    alignItems: "center",
-        backgroundColor: '#fff',
-        borderRadius: theme.borderRadius.lg,
-        borderWidth: 1,
-        borderColor: theme.colors.gray200,
-        paddingHorizontal: 16,
-        ...theme.shadows.subtle,
-    },
-    inputIcon: {
-        marginRight: 12,
-    },
-    input: {
-        flex: 1,
-        paddingVertical: 16,
-        fontSize: theme.typography.fontSize.base,
-        color: theme.colors.gray900,
-    },
-    disabledInput: {
-        backgroundColor: theme.colors.gray50,
-    },
-    disabledText: {
-        color: theme.colors.gray500,
-    },
-    helperText: {
-        fontSize: theme.typography.fontSize.xs,
-        color: theme.colors.gray500,
-        marginTop: 6,
-        marginLeft: 4,
-    },
-    footer: {
-        position: 'absolute',
-        bottom: 0,
-        left: 0,
-        right: 0,
-        padding: 20,
-        paddingBottom: Platform.OS === 'ios' ? 40 : 20,
-        backgroundColor: '#fff',
-        borderTopWidth: 1,
-        borderTopColor: theme.colors.gray100,
-        ...theme.shadows.medium,
-    },
-    saveButton: {
-        borderRadius: theme.borderRadius.lg,
-        overflow: 'hidden',
-    },
-    saveButtonGradient: {
-        flexDirection: 'row',
-        alignItems: 'center',
-        justifyContent: 'center',
-        paddingVertical: 16,
-        gap: 8,
-    },
-    saveButtonDisabled: {
-        opacity: 0.6,
-    },
-    saveButtonText: {
-        fontSize: theme.typography.fontSize.base,
-        fontWeight: theme.typography.fontWeight.bold,
-        color: '#fff',
   },
 });

apps/mobile/src/components/Input.tsx

@@ -1,5 +1,12 @@
 import React from "react";
-import { View, Text, TextInput, StyleSheet, TextInputProps } from "react-native";
+import {
+  View,
+  Text,
+  TextInput,
+  StyleSheet,
+  TextInputProps,
+} from "react-native";
+import { useTheme } from "../contexts/ThemeContext";
 
 interface InputProps extends TextInputProps {
   label: string;
@@ -7,15 +14,39 @@ interface InputProps extends TextInputProps {
 }
 
 export function Input({ label, error, style, ...props }: InputProps) {
+  const { colors, typography } = useTheme();
+
   return (
     <View style={styles.container}>
-      <Text style={styles.label}>{label}</Text>
+      <Text
+        style={[typography.h4, { color: colors.textPrimary }, styles.label]}
+      >
+        {label}
+      </Text>
       <TextInput
-        style={[styles.input, error && styles.inputError, style]}
+        style={[
-        placeholderTextColor="#9ca3af"
+          styles.input,
+          {
+            backgroundColor: colors.surface,
+            borderColor: error ? colors.danger : colors.border,
+            color: colors.textPrimary,
+          },
+          style,
+        ]}
+        placeholderTextColor={colors.textTertiary}
         {...props}
       />
-      {error && <Text style={styles.errorText}>{error}</Text>}
+      {error && (
+        <Text
+          style={[
+            typography.caption,
+            styles.errorText,
+            { color: colors.danger },
+          ]}
+        >
+          {error}
+        </Text>
+      )}
     </View>
   );
 }
@@ -25,27 +56,16 @@ const styles = StyleSheet.create({
     marginBottom: 16,
   },
   label: {
-    fontSize: 14,
-    fontWeight: "600",
-    color: "#374151",
     marginBottom: 8,
   },
   input: {
-    backgroundColor: "white",
     borderWidth: 1,
-    borderColor: "#e5e7eb",
+    borderRadius: 12,
-    borderRadius: 8,
     paddingHorizontal: 16,
-    paddingVertical: 12,
+    paddingVertical: 14,
     fontSize: 16,
-    color: "#1f2937",
-  },
-  inputError: {
-    borderColor: "#ef4444",
   },
   errorText: {
-    fontSize: 12,
-    color: "#ef4444",
     marginTop: 4,
   },
 });

apps/mobile/src/components/Picker.tsx

@@ -1,6 +1,7 @@
 import React from "react";
 import { View, Text, StyleSheet } from "react-native";
 import { Picker as RNPicker } from "@react-native-picker/picker";
+import { useTheme } from "../contexts/ThemeContext";
 
 interface PickerProps {
   label: string;
@@ -10,23 +11,57 @@ interface PickerProps {
   error?: string;
 }
 
-export function Picker({ label, value, onValueChange, items, error }: PickerProps) {
+export function Picker({
+  label,
+  value,
+  onValueChange,
+  items,
+  error,
+}: PickerProps) {
+  const { colors, typography } = useTheme();
+
   return (
     <View style={styles.container}>
-      <Text style={styles.label}>{label}</Text>
+      <Text
-      <View style={[styles.pickerWrapper, error && styles.pickerError]}>
+        style={[typography.h4, { color: colors.textPrimary }, styles.label]}
+      >
+        {label}
+      </Text>
+      <View
+        style={[
+          styles.pickerWrapper,
+          {
+            backgroundColor: colors.surface,
+            borderColor: error ? colors.danger : colors.border,
+          },
+        ]}
+      >
         <RNPicker
           selectedValue={value}
           onValueChange={onValueChange}
-          style={styles.picker}
+          style={[styles.picker, { color: colors.textPrimary }]}
         >
           <RNPicker.Item label="Select..." value="" />
           {items.map((item) => (
-            <RNPicker.Item key={item.value} label={item.label} value={item.value} />
+            <RNPicker.Item
+              key={item.value}
+              label={item.label}
+              value={item.value}
+            />
           ))}
         </RNPicker>
       </View>
-      {error && <Text style={styles.errorText}>{error}</Text>}
+      {error && (
+        <Text
+          style={[
+            typography.caption,
+            styles.errorText,
+            { color: colors.danger },
+          ]}
+        >
+          {error}
+        </Text>
+      )}
     </View>
   );
 }
@@ -36,27 +71,17 @@ const styles = StyleSheet.create({
     marginBottom: 16,
   },
   label: {
-    fontSize: 14,
-    fontWeight: "600",
-    color: "#374151",
     marginBottom: 8,
   },
   pickerWrapper: {
-    backgroundColor: "white",
     borderWidth: 1,
-    borderColor: "#e5e7eb",
+    borderRadius: 12,
-    borderRadius: 8,
     overflow: "hidden",
   },
-  pickerError: {
-    borderColor: "#ef4444",
-  },
   picker: {
     height: 50,
   },
   errorText: {
-    fontSize: 12,
-    color: "#ef4444",
     marginTop: 4,
   },
 });