home page names

Author: acashmoney777

KonditionExpo/app/_layout.tsx

@@ -5,6 +5,7 @@ import { StatusBar } from 'expo-status-bar';
 import 'react-native-reanimated';
 
 import { useColorScheme } from '@/hooks/useColorScheme';
+import { UserProvider } from '@/contexts/UserContext';
 
 export default function RootLayout() {
   const colorScheme = useColorScheme();
@@ -13,18 +14,19 @@ export default function RootLayout() {
   });
 
   if (!loaded) {
-    // Async font loading only occurs in development.
     return null;
   }
 
   return (
-    <ThemeProvider value={colorScheme === 'dark' ? DarkTheme : DefaultTheme}>
-      <Stack>
-        <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
-        <Stack.Screen name="login" options={{ headerShown: false }} />
-        <Stack.Screen name="+not-found" />
-      </Stack>
-      <StatusBar style="auto" />
-    </ThemeProvider>
+    <UserProvider> {/* ✅ Wrap the entire app in your context provider */}
+      <ThemeProvider value={colorScheme === 'dark' ? DarkTheme : DefaultTheme}>
+        <Stack>
+          <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
+          <Stack.Screen name="login" options={{ headerShown: false }} />
+          <Stack.Screen name="+not-found" />
+        </Stack>
+        <StatusBar style="auto" />
+      </ThemeProvider>
+    </UserProvider>
   );
 }

KonditionExpo/app/home.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { useUser } from '@/contexts/UserContext';
 import { SafeAreaView, View, Text, StyleSheet, ScrollView, TouchableOpacity, Image, Dimensions } from 'react-native';
 import { LineChart, PieChart } from 'react-native-svg-charts';
 import { router } from 'expo-router';
@@ -8,6 +9,7 @@ const { width } = Dimensions.get('window');
 const HomeScreen = ({ navigation }) => {
   // TODO: Replace with real data
   const bmiValue = '20.1';
+  const { name } = useUser();
   const heartRateData = [60, 62, 65, 70, 75, 78, 80, 82, 79, 76];
   const waterIntake = '4L';
   const sleepHours = '8h 20m';
@@ -27,7 +29,7 @@ const HomeScreen = ({ navigation }) => {
         {/* Header */}
         <View style={styles.header}>
           <Text style={styles.welcomeText}>Welcome Back,</Text>
-          <Text style={styles.userName}>Andy Vo</Text>
+          <Text style={styles.userName}>{name}</Text>
           <TouchableOpacity style={styles.notificationBtn} onPress={() => navigation.navigate('Notifications')}>
             <Image source={require('../assets/images/bell.png')} style={styles.bellIcon} />
           </TouchableOpacity>

KonditionExpo/app/login.tsx

@@ -5,8 +5,10 @@ import { Button } from '../components/ui/Button';
 import { Input } from '../components/ui/Input';
 import { Checkbox } from '../components/ui/Checkbox';
 import { router } from 'expo-router';
+import { useUser } from '@/contexts/UserContext';
 
 export default function LoginScreen() {
+  const { setName: setUserName } = useUser();
   const [email, setEmail] = useState('');
   const [password, setPassword] = useState('');
   const [rememberMe, setRememberMe] = useState(false);
@@ -21,33 +23,28 @@ export default function LoginScreen() {
   const handleLogin = async () => {
     setErrors({});
 
-    // Simple validation
     const newErrors: { email?: string; password?: string } = {};
-    
-    if (!email) {
-      newErrors.email = 'Email is required';
-    } else if (!/\S+@\S+\.\S+/.test(email)) {
-      newErrors.email = 'Please enter a valid email';
-    }
-    
-    if (!password) {
-      newErrors.password = 'Password is required';
-    } else if (password.length < 6) {
-      newErrors.password = 'Password must be at least 6 characters';
-    }
-    
+  
+    if (!email) newErrors.email = 'Email is required';
+    else if (!/\S+@\S+\.\S+/.test(email)) newErrors.email = 'Please enter a valid email';
+  
+    if (!password) newErrors.password = 'Password is required';
+    else if (password.length < 6) newErrors.password = 'Password must be at least 6 characters';
+  
     if (Object.keys(newErrors).length > 0) {
       setErrors(newErrors);
       return;
     }
-    
+  
     setIsLoading(true);
-    
+  
     try {
       // Simulate API call
       await new Promise(resolve => setTimeout(resolve, 1500));
-      
-      // Navigate to main screen after successful login
+  
+      // Set the name (this mimics what signup does)
+      setUserName('Returning User'); // You can replace this with a real name from API later
+  
       router.replace('/home');
     } catch (error) {
       console.error('Login error:', error);
@@ -57,7 +54,6 @@ export default function LoginScreen() {
   };
 
   const handleForgotPassword = () => {
-    // For now, just go back to main screen since we don't have forgot password yet
     router.push('/(tabs)');
   };
 

KonditionExpo/app/notification.tsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import { View, Text, StyleSheet, TouchableOpacity, FlatList, Image } from 'react-native';
+/*
 import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
 
 const notifications = [
@@ -10,6 +11,7 @@ const notifications = [
   { id: '5', title: "Hey, it's time for lunch", time: '8 April', icon: require('./assets/lunch.png') },
   { id: '6', title: 'Ups, You have missed your Lowerbo..', time: '3 April', icon: require('./assets/workout.png') },
 ];
+*/
 
 export default function NotificationScreen({ navigation }) {
   const renderItem = ({ item }) => (

KonditionExpo/app/signup.tsx

@@ -3,22 +3,30 @@ import { View, Text, StyleSheet, ScrollView } from 'react-native';
 import { Input } from '@/components/ui/Input';
 import { Button } from '@/components/ui/Button';
 import { router } from 'expo-router';
+import { useUser } from '@/contexts/UserContext';
+
+
+
 
 export default function SignUpScreen() {
   const [email, setEmail] = useState('');
   const [name, setName] = useState('');
   const [password, setPassword] = useState('');
   const [confirmPassword, setConfirmPassword] = useState('');
+  const { setName: setUserName } = useUser();
 
   const handleCreateAccount = () => {
     if (password !== confirmPassword) {
       alert("Passwords don't match");
       return;
     }
-
+  
+    setUserName(name);
+  
     // TODO: Send signup data to API
     router.replace('/signup2');
   };
+  
 
   return (
     <ScrollView contentContainerStyle={styles.container}>