From e7fc23213fb5a3fdc8fff68b345aaf4d9fc9150d Mon Sep 17 00:00:00 2001
From: Twanda Mudonhi <161071449+Tawanda21@users.noreply.github.com>
Date: Wed, 7 May 2025 17:07:44 +0200
Subject: [PATCH 01/13] Updated LoginScreen and Auth and AppNavigator

---
 App.js                     |   6 +-
 components/Auth.js         |  41 +------
 navigation/AppNavigator.js |  23 ++--
 screens/LoginScreen.js     | 225 ++++++++++++++++++++++---------------
 4 files changed, 149 insertions(+), 146 deletions(-)

diff --git a/App.js b/App.js
index 7e2af9c..f1f9277 100644
--- a/App.js
+++ b/App.js
@@ -1,15 +1,13 @@
 import React from 'react';
 import { StatusBar, SafeAreaView } from 'react-native';
 import AppNavigator from './navigation/AppNavigator';
-import Auth from './components/Auth';
+
 
 export default function App() {
   return (
     <>
       <StatusBar barStyle="dark-content" />
-      <SafeAreaView>
-        <Auth />
-      </SafeAreaView>
+      
       <AppNavigator />
     </>
   );
diff --git a/components/Auth.js b/components/Auth.js
index aa5a353..1de3ea5 100644
--- a/components/Auth.js
+++ b/components/Auth.js
@@ -1,43 +1,10 @@
-import React, { useState } from 'react';
-import { Alert, StyleSheet, View } from 'react-native';
-import { supabase } from '../lib/supabase'; // Adjust the import path as necessary
-import { Button, Input } from '@rneui/themed';
-
-export default function Auth() {
-  const [email, setEmail] = useState('');
-  const [password, setPassword] = useState('');
-
-  const signInWithEmail = async () => {
-    const { error } = await supabase.auth.signInWithPassword({ email, password });
-    if (error) Alert.alert(error.message);
-  };
-
-  const signUpWithEmail = async () => {
-    const { error } = await supabase.auth.signUp({ email, password });
-    if (error) Alert.alert(error.message);
-  };
+import React from 'react';
+import { View, StyleSheet } from 'react-native';
 
+export default function Auth({ navigation }) {
   return (
     <View style={styles.container}>
-      <Input
-        label="Email"
-        leftIcon={{ type: 'font-awesome', name: 'envelope' }}
-        onChangeText={setEmail}
-        value={email}
-        placeholder="email@address.com"
-        autoCapitalize="none"
-      />
-      <Input
-        label="Password"
-        leftIcon={{ type: 'font-awesome', name: 'lock' }}
-        onChangeText={setPassword}
-        value={password}
-        secureTextEntry
-        placeholder="Password"
-        autoCapitalize="none"
-      />
-      <Button title="Sign In" onPress={signInWithEmail} />
-      <Button title="Sign Up" onPress={signUpWithEmail} />
+      
     </View>
   );
 }
diff --git a/navigation/AppNavigator.js b/navigation/AppNavigator.js
index 84c194a..f0adc79 100644
--- a/navigation/AppNavigator.js
+++ b/navigation/AppNavigator.js
@@ -28,7 +28,7 @@ const MainTabNavigator = () => {
   return (
     <Tab.Navigator
       screenOptions={({ route }) => ({
-        headerShown: false,
+        headerShown: false, // Ensure no header is shown
         tabBarIcon: ({ focused, color, size }) => {
           let iconName;
 
@@ -50,16 +50,13 @@ const MainTabNavigator = () => {
         },
         tabBarActiveTintColor: '#acd4fd',
         tabBarInactiveTintColor: '#fff',
-        headerShown: false,
         tabBarShowLabel: true,
-
         tabBarStyle: {
           position: 'absolute',
           height: 60,
           paddingBottom: 9,
           paddingTop: 8,
           backgroundColor: 'black',
-          
           left: '15%',
           right: '15%',
           bottom: 20,
@@ -72,7 +69,7 @@ const MainTabNavigator = () => {
           margin: 20,
         },
         tabBarHideOnKeyboard: false,
-        animationEnabled: false
+        animationEnabled: false,
       })}
     >
       <Tab.Screen name="Home" component={HomeScreen} />
@@ -88,12 +85,12 @@ const MainTabNavigator = () => {
 // Auth stack navigator
 const AuthStack = () => {
   return (
-    <Stack.Navigator 
-      screenOptions={{ 
-        headerShown: false,
+    <Stack.Navigator
+      screenOptions={{
+        headerShown: false, // Ensure no header is shown
         cardStyleInterpolator: CardStyleInterpolators.forHorizontalIOS,
         presentation: 'card',
-        animation: 'slide_from_right'
+        animation: 'slide_from_right',
       }}
     >
       <Stack.Screen name="Splash" component={SplashScreen} />
@@ -122,12 +119,12 @@ const RootNavigator = () => {
   }
 
   return (
-    <Stack.Navigator 
-      screenOptions={{ 
-        headerShown: false,
+    <Stack.Navigator
+      screenOptions={{
+        headerShown: false, // Ensure no header is shown
         cardStyleInterpolator: CardStyleInterpolators.forHorizontalIOS,
         presentation: 'card',
-        animation: 'slide_from_right'
+        animation: 'slide_from_right',
       }}
     >
       {isAuthenticated ? (
diff --git a/screens/LoginScreen.js b/screens/LoginScreen.js
index d5b7ca5..b897043 100644
--- a/screens/LoginScreen.js
+++ b/screens/LoginScreen.js
@@ -1,11 +1,21 @@
-import React, { useEffect, useRef } from 'react';
-import { Image, Animated } from 'react-native';
-import { View, Text, TextInput, StyleSheet, TouchableOpacity } from 'react-native';import { useNavigation } from '@react-navigation/native';
+import React, { useState, useEffect, useRef } from 'react';
+import { Alert, Animated, Image, StyleSheet, Text, TextInput, TouchableOpacity, View } from 'react-native';
+import { supabase } from '../lib/supabase'; // Adjust the import path as necessary
+import { useNavigation } from '@react-navigation/native';
 
 const LoginScreen = () => {
   const navigation = useNavigation();
   const fadeAnim = useRef(new Animated.Value(0)).current;
 
+  const [email, setEmail] = useState('');
+  const [password, setPassword] = useState('');
+
+  const signInWithEmail = async () => {
+    const { error } = await supabase.auth.signInWithPassword({ email, password });
+    if (error) Alert.alert(error.message);
+    else navigation.reset({ index: 0, routes: [{ name: 'MainTabNavigator' }] });
+  };
+
   useEffect(() => {
     const fadeIn = Animated.timing(fadeAnim, {
       toValue: 1,
@@ -18,42 +28,68 @@ const LoginScreen = () => {
       useNativeDriver: true,
     });
 
-    Animated.loop(
-      Animated.sequence([fadeIn, fadeOut])
-    ).start();
+    Animated.loop(Animated.sequence([fadeIn, fadeOut])).start();
   }, []);
 
   return (
     <View style={styles.container}>
       <View style={styles.header}>
         <Text style={styles.logoText}>LoetoLink</Text>
+        <Image
+          source={require('../assets/logo.jpg')}
+          style={styles.splashImage}
+        />
       </View>
-      <Image
-              source={require('../assets/logo.jpg')}
-              style={[styles.splashImage, { width: 100, height: 100, resizeMode: 'contain' }]}
-            />
       <Text style={styles.title}>Welcome!</Text>
-      <TouchableOpacity style={styles.appleButton}>
-      <Image
-          source={require('../assets/apple-logo.png')}
-          style={styles.appleIcon}
-        />
-        <Text style={styles.appleButtonText}>Sign up with Apple</Text>
+      <TextInput
+        style={styles.input}
+        placeholder="Email"
+        value={email}
+        onChangeText={setEmail}
+        autoCapitalize="none"
+        keyboardType="email-address"
+      />
+      <TextInput
+        style={styles.input}
+        placeholder="Password"
+        value={password}
+        onChangeText={setPassword}
+        secureTextEntry
+        autoCapitalize="none"
+      />
+      <TouchableOpacity style={styles.button} onPress={signInWithEmail}>
+        <Text style={styles.buttonText}>Sign In</Text>
       </TouchableOpacity>
-      <TouchableOpacity style={styles.googleButton}>
-      <Image
-          source={require('../assets/google-logo.png')}
-          style={styles.googleIcon}
-        />
-        <Text style={styles.googleButtonText}>Sign up with Google</Text>
-      </TouchableOpacity>
-      <TouchableOpacity style={styles.secondaryButton} onPress={() => navigation.navigate('Login')}>
-        <Text style={styles.buttonText}>I already have an account</Text>
+
+      <TouchableOpacity style={styles.newButton} onPress={() => {}}>
+        <Text style={styles.buttonText}>I'm New</Text>
       </TouchableOpacity>
-      <View style={{ height: 25 }} />
 
+      <View style={styles.buttonContainer}>
+        <TouchableOpacity style={styles.appleButton}>
+          <Image
+            source={require('../assets/apple-logo.png')}
+            style={styles.appleIcon}
+          />
+
+        </TouchableOpacity>
+        <TouchableOpacity style={styles.googleButton}>
+          <Image
+            source={require('../assets/google-logo.png')}
+            style={[styles.googleIcon, { width: 20, height: 20 }]}
+          />
+        </TouchableOpacity>
+      </View>
+      
       <TouchableOpacity
-        style={styles.guestButton} onPress={() => navigation.reset({ index: 0, routes: [{ name: 'MainTabNavigator', params: { screen: 'Map' } }], })}>
+        style={styles.guestButton}
+        onPress={() =>
+          navigation.reset({
+            index: 0,
+            routes: [{ name: 'MainTabNavigator', params: { screen: 'Map' } }],
+          })
+        }
+      >
         <Text style={styles.guestButtonText}>Continue as Guest</Text>
         <Animated.Image
           source={require('../assets/arrow-right.png')}
@@ -62,8 +98,14 @@ const LoginScreen = () => {
       </TouchableOpacity>
       <Text style={styles.footerText}>
         By continuing you confirm that you agree to our{' '}
-        <Text style={styles.link} onPress={() => {}}>Terms of Service</Text>, {' '}
-        <Text style={styles.link} onPress={() => {}}>Bus/Combi Policy</Text> and good behavior in the bus/combi.
+        <Text style={styles.link} onPress={() => {}}>
+          Terms of Service
+        </Text>
+        ,{' '}
+        <Text style={styles.link} onPress={() => {}}>
+          Bus/Combi Policy
+        </Text>{' '}
+        and good behavior in the bus/combi.
       </Text>
     </View>
   );
@@ -79,35 +121,34 @@ const styles = StyleSheet.create({
   },
   header: {
     position: 'absolute',
-    top: 60,
+    top: 20,
     left: 20,
-    alignSelf: 'flex-start',
+    flexDirection: 'row',
+    alignItems: 'center',
   },
   logoText: {
     fontSize: 24,
     fontWeight: 'bold',
+    marginRight: 10,
+  },
+  splashImage: {
+    width: 40,
+    height: 40,
+    resizeMode: 'contain',
   },
   title: {
     fontSize: 24,
     fontWeight: 'bold',
-    marginBottom: 40,
+    marginBottom: 20,
   },
-  subtitle: {
-    fontSize: 16,
-    marginBottom: 40,
-  },
-  highlight: {
-    fontWeight: 'bold',
-  },
-  button: {
-    backgroundColor: '#000',
-    padding: 10,
-    borderRadius: 25,
+  input: {
     width: '100%',
-    alignItems: 'center',
-    justifyContent: 'center',
-    marginTop: 10,
-    marginBottom: 25,
+    padding: 15,
+    borderWidth: 1,
+    borderColor: '#ccc',
+    borderRadius: 25,
+    marginBottom: 15,
+    backgroundColor: '#fff',
     shadowColor: '#000',
     shadowOffset: {
       width: 0,
@@ -117,14 +158,15 @@ const styles = StyleSheet.create({
     shadowRadius: 3.84,
     elevation: 5,
   },
-  appleButton: {
+  button: {
     backgroundColor: '#000',
     padding: 10,
     borderRadius: 25,
     width: '100%',
     alignItems: 'center',
     justifyContent: 'center',
-    marginBottom: 25,
+    marginTop: 10,
+    marginBottom: 10,
     shadowColor: '#000',
     shadowOffset: {
       width: 0,
@@ -134,8 +176,8 @@ const styles = StyleSheet.create({
     shadowRadius: 3.84,
     elevation: 5,
   },
-  googleButton: {
-    backgroundColor: '#fff',
+  newButton: {
+    backgroundColor: '#808080',
     padding: 10,
     borderRadius: 25,
     width: '100%',
@@ -151,15 +193,26 @@ const styles = StyleSheet.create({
     shadowRadius: 3.84,
     elevation: 5,
   },
-  guestButton: {
-    backgroundColor: '#f0f0f0',
+  buttonText: {
+    color: '#fff',
+    textAlign: 'center',
+    fontSize: 16,
+  },
+  buttonContainer: {
+    flexDirection: 'row',
+    justifyContent: 'center',
+    alignItems: 'center',
+    width: '100%',
+    marginBottom: 25,
+  },
+  appleButton: {
+    backgroundColor: '#000',
     padding: 10,
     borderRadius: 25,
-    width: '100%',
-    flexDirection: 'row',
+    width: '25%',
     alignItems: 'center',
     justifyContent: 'center',
-    marginBottom: 25,
+    marginRight: 10,
     shadowColor: '#000',
     shadowOffset: {
       width: 0,
@@ -169,33 +222,16 @@ const styles = StyleSheet.create({
     shadowRadius: 3.84,
     elevation: 5,
   },
-  buttonText: {
-    color: '#fff',
-    textAlign: 'center',
-    fontSize: 16,
-  },
-  guestButtonText: {
-    color: '#666',
-    textAlign: 'center',
-    fontSize: 16,
-    marginRight: 10,
-  },
-  appleButtonText: {
-    color: '#fff',
-    textAlign: 'center',
-    fontSize: 16,
-  },
-  googleButtonText: {
-    color: '#000',
-    textAlign: 'center',
-    fontSize: 16,
-  },
-  secondaryButton: {
-    backgroundColor: '#204ECF',
+  googleButton: {
+    backgroundColor: '#fff',
     padding: 10,
     borderRadius: 25,
-    width: '100%',
+    width: '25%',
+    alignItems: 'center',
+    justifyContent: 'center',
+    
     shadowColor: '#000',
+
     shadowOffset: {
       width: 0,
       height: 2,
@@ -204,19 +240,24 @@ const styles = StyleSheet.create({
     shadowRadius: 3.84,
     elevation: 5,
   },
-  appleIcon: {
-    width: 20,
-    height: 20,
-    marginRight: 171,
-    marginBottom: -21,
-    tintColor: '#fff',
+  guestButton: {
+    backgroundColor: '#f0f0f0',
+    padding: 10,
+    borderRadius: 25,
+    width: '100%',
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'center',
+    marginBottom: 25,
   },
-  googleIcon: {
-    width: 20,
-    height: 20,
-    marginRight: 171,
-    marginBottom: -21,
+
+  guestButtonText: {
+    color: '#666',
+    textAlign: 'center',
+    fontSize: 16,
+    marginRight: 10,
   },
+
   arrowIcon: {
     width: 20,
     height: 20,
@@ -232,7 +273,7 @@ const styles = StyleSheet.create({
   link: {
     textDecorationLine: 'underline',
     color: 'blue',
-  }
+  },
 });
 
 export default LoginScreen;
\ No newline at end of file

From 8dd214988f992cfb34dcf9a68fe3af3edca25fd8 Mon Sep 17 00:00:00 2001
From: ModiseKgosi <cse23-102@thuto.bac.ac.bw>
Date: Wed, 7 May 2025 17:45:52 +0200
Subject: [PATCH 02/13] new go maps api key

---
 app.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.json b/app.json
index e186769..8010403 100644
--- a/app.json
+++ b/app.json
@@ -21,7 +21,7 @@
     "android": {
       "config": {
         "googleMaps": {
-          "apiKey": "AlzaSya0Ll6laKMO06oO9lBmTdqQ6P_4Qo1_fEJ"
+          "apiKey": "AlzaSykD0-TOgCvku5D5nyYC67DmWk2aaon-COn"
         }
       },
       "adaptiveIcon": {

From 9f83acd07314b018da08c9a075f7353328705bf4 Mon Sep 17 00:00:00 2001
From: ModiseKgosi <cse23-102@thuto.bac.ac.bw>
Date: Wed, 7 May 2025 20:15:29 +0200
Subject: [PATCH 03/13] hoe this doesnt fuck everything up

---
 navigation/AppNavigator.js |   1 +
 screens/HomeScreen.js      |  86 +++++++++++++++++++++-----
 screens/MapViewScreen.js   | 123 +++++++++++++++++++++++++------------
 3 files changed, 154 insertions(+), 56 deletions(-)

diff --git a/navigation/AppNavigator.js b/navigation/AppNavigator.js
index f0adc79..7f6c7fe 100644
--- a/navigation/AppNavigator.js
+++ b/navigation/AppNavigator.js
@@ -133,6 +133,7 @@ const RootNavigator = () => {
         <>
           <Stack.Screen name="Login" component={LoginScreen} />
           <Stack.Screen name="MainTabNavigator" component={MainTabNavigator} />
+          <Stack.Screen name="Map" component={MapViewScreen} />
         </>
       )}
     </Stack.Navigator>
diff --git a/screens/HomeScreen.js b/screens/HomeScreen.js
index 88a7a43..f53de94 100644
--- a/screens/HomeScreen.js
+++ b/screens/HomeScreen.js
@@ -1,30 +1,84 @@
-import React from 'react';
-import { View, Text, StyleSheet, Dimensions } from 'react-native';
+import React, { useState } from 'react';
+import { View, TextInput, Button, StyleSheet, Alert } from 'react-native';
+import { useNavigation } from '@react-navigation/native';
+import { supabase } from '../lib/supabase'; // Ensure this path is correct
+
+const HomeScreen = () => {
+  const [from, setFrom] = useState('');
+  const [to, setTo] = useState('');
+  const navigation = useNavigation();
+
+  const handleSearch = async () => {
+    if (!from || !to) {
+      Alert.alert('Error', 'Please enter both "From" and "To" stops.');
+      return;
+    }
+
+    try {
+      // Fetch stops from Supabase
+      const { data: stops, error: stopsError } = await supabase.from('stops').select('*');
+      if (stopsError) throw stopsError;
+
+      // Find the "from" and "to" stops
+      const fromStop = stops.find((stop) => stop.name.toLowerCase() === from.toLowerCase());
+      const toStop = stops.find((stop) => stop.name.toLowerCase() === to.toLowerCase());
+
+      if (!fromStop || !toStop) {
+        Alert.alert('Error', 'One or both stops not found.');
+        return;
+      }
+
+      // Ensure the stops are on the same route and in the correct order
+      if (fromStop.route_id !== toStop.route_id) {
+        Alert.alert('Error', 'The selected stops are not on the same route.');
+        return;
+      }
+      if (fromStop.stop_order >= toStop.stop_order) {
+        Alert.alert('Error', '"From" stop must come before "To" stop in the route.');
+        return;
+      }
+
+      // Navigate to MapViewScreen with route details
+      navigation.navigate('Map', {
+        origin: { latitude: fromStop.latitude, longitude: fromStop.longitude },
+        destination: { latitude: toStop.latitude, longitude: toStop.longitude },
+      });
+    } catch (error) {
+      Alert.alert('Error', 'An error occurred while fetching the route.');
+      console.error(error);
+    }
+  };
 
-const HomeScreen = (navigation) => {
   return (
     <View style={styles.container}>
+      <TextInput
+        style={styles.input}
+        placeholder="From..."
+        value={from}
+        onChangeText={setFrom}
+      />
+      <TextInput
+        style={styles.input}
+        placeholder="To..."
+        value={to}
+        onChangeText={setTo}
+      />
+      <Button title="Find Route" onPress={handleSearch} />
     </View>
   );
 };
 
 const styles = StyleSheet.create({
-  safeArea: {
-    flex: 1,
-    backgroundColor: '#dce2ef',
-  },
-
   container: {
     flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
-    backgroundColor: '#dce2ef',
-    width: Dimensions.get('window').width,
-    height: Dimensions.get('window').height,
+    padding: 20,
   },
-  text: {
-    fontSize: 24,
-    fontWeight: 'bold',
+  input: {
+    borderWidth: 1,
+    borderColor: '#ccc',
+    borderRadius: 5,
+    padding: 10,
+    marginBottom: 10,
   },
 });
 
diff --git a/screens/MapViewScreen.js b/screens/MapViewScreen.js
index f0c3a30..130e661 100644
--- a/screens/MapViewScreen.js
+++ b/screens/MapViewScreen.js
@@ -1,55 +1,92 @@
-import React from 'react';
-import { View, StyleSheet, Dimensions } from 'react-native';
-import MapView, { Marker } from 'react-native-maps';
+import React, { useState, useEffect } from 'react';
+import { View, StyleSheet, Dimensions, Text } from 'react-native';
+import MapView, { Marker, Polyline } from 'react-native-maps';
 
-const taxiRanks = [
-  {
-    id: 'broadhurst',
-    name: 'Broadhurst Taxi Rank',
-    latitude: -24.6251926,
-    longitude: 25.9368589,
-  },
-  {
-    id: 'gamecity',
-    name: 'Game City Taxi Rank',
-    latitude: -24.6869378,
-    longitude: 25.8770554,
-  },
-  {
-    id: 'mainmall',
-    name: 'Main Mall Taxi Rank',
-    latitude: -24.6586851,
-    longitude: 25.9021672,
-  },
-];
+const MapViewScreen = ({ route }) => {
+  const { origin, destination } = route.params || {}; // Fallback to undefined if params are missing
+
+  if (!origin || !destination) {
+    return (
+      <View style={styles.container}>
+        <Text style={styles.errorText}>Route details are missing. Please try again.</Text>
+      </View>
+    );
+  }
+
+  const [routeCoordinates, setRouteCoordinates] = useState([]);
+
+  useEffect(() => {
+    const fetchRoute = async () => {
+      try {
+        const directionsUrl = `https://maps.gomaps.pro/maps/api/directions/json?origin=${origin.latitude},${origin.longitude}&destination=${destination.latitude},${destination.longitude}&key=AlzaSykD0-TOgCvku5D5nyYC67DmWk2aaon-COn`;
+        const response = await fetch(directionsUrl);
+        const directionsData = await response.json();
+
+        if (directionsData.status === 'OK') {
+          const points = decodePolyline(directionsData.routes[0].overview_polyline.points);
+          setRouteCoordinates(points);
+        } else {
+          console.error('Failed to fetch directions:', directionsData.status);
+        }
+      } catch (error) {
+        console.error('Error fetching route:', error);
+      }
+    };
+
+    fetchRoute();
+  }, [origin, destination]);
+
+  const decodePolyline = (encoded) => {
+    let points = [];
+    let index = 0, len = encoded.length;
+    let lat = 0, lng = 0;
+
+    while (index < len) {
+      let b, shift = 0, result = 0;
+      do {
+        b = encoded.charCodeAt(index++) - 63;
+        result |= (b & 0x1f) << shift;
+        shift += 5;
+      } while (b >= 0x20);
+      const dlat = (result & 1) ? ~(result >> 1) : (result >> 1);
+      lat += dlat;
+
+      shift = 0;
+      result = 0;
+      do {
+        b = encoded.charCodeAt(index++) - 63;
+        result |= (b & 0x1f) << shift;
+        shift += 5;
+      } while (b >= 0x20);
+      const dlng = (result & 1) ? ~(result >> 1) : (result >> 1);
+      lng += dlng;
+
+      points.push({ latitude: lat / 1e5, longitude: lng / 1e5 });
+    }
+
+    return points;
+  };
 
-const MapViewScreen = () => {
   return (
     <View style={styles.container}>
       <MapView
         style={styles.map}
         initialRegion={{
-          latitude: -24.6586,
-          longitude: 25.9086,
+          latitude: origin.latitude,
+          longitude: origin.longitude,
           latitudeDelta: 0.05,
           longitudeDelta: 0.05,
         }}
       >
-        {/* Central Marker */}
-        <Marker
-          coordinate={{ latitude: -24.6586, longitude: 25.9086 }}
-          title="Gaborone Center"
-          description="Start here"
-        />
-
-        {/* Taxi Rank Markers */}
-        {taxiRanks.map((rank) => (
-          <Marker
-            key={rank.id}
-            coordinate={{ latitude: rank.latitude, longitude: rank.longitude }}
-            title={rank.name}
+        <Marker coordinate={origin} title="Origin" />
+        <Marker coordinate={destination} title="Destination" />
+        {routeCoordinates.length > 0 && (
+          <Polyline
+            coordinates={routeCoordinates}
+            strokeColor="#0000FF"
+            strokeWidth={3}
           />
-        ))}
+        )}
       </MapView>
     </View>
   );
@@ -58,11 +95,17 @@ const MapViewScreen = () => {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
   },
   map: {
     width: Dimensions.get('window').width,
     height: Dimensions.get('window').height,
   },
+  errorText: {
+    fontSize: 16,
+    color: 'red',
+  },
 });
 
 export default MapViewScreen;
\ No newline at end of file

From 89592603bd7c09e3305de32c38d7c3ce12a87464 Mon Sep 17 00:00:00 2001
From: Twanda Mudonhi <161071449+Tawanda21@users.noreply.github.com>
Date: Thu, 8 May 2025 15:07:49 +0200
Subject: [PATCH 04/13] meh

---
 app.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.json b/app.json
index 8010403..88481e7 100644
--- a/app.json
+++ b/app.json
@@ -21,7 +21,7 @@
     "android": {
       "config": {
         "googleMaps": {
-          "apiKey": "AlzaSykD0-TOgCvku5D5nyYC67DmWk2aaon-COn"
+          "apiKey": "AlzaSykD0-TOgCvku5D5nyYC67DmWk2aaon-COna"
         }
       },
       "adaptiveIcon": {

From e72ad5d396104d39f66c89f03c89f87f03f2344e Mon Sep 17 00:00:00 2001
From: Twanda Mudonhi <161071449+Tawanda21@users.noreply.github.com>
Date: Thu, 8 May 2025 16:10:03 +0200
Subject: [PATCH 05/13] Logout button, bus stop search bar, and map view

---
 screens/BusStopScreen.js       | 89 +++++++++++++++++++++++++++++++---
 screens/HomeScreen.js          | 40 +++++++++++++--
 screens/MapViewScreen.js       | 51 +++++++++----------
 screens/ProfileScreen.js       | 26 ++++++++--
 screens/SplashScreen.js        |  3 +-
 screens/TransportInfoScreen.js |  4 +-
 6 files changed, 168 insertions(+), 45 deletions(-)

diff --git a/screens/BusStopScreen.js b/screens/BusStopScreen.js
index ba9de66..aeed62f 100644
--- a/screens/BusStopScreen.js
+++ b/screens/BusStopScreen.js
@@ -1,12 +1,53 @@
-import React from 'react';
-import { View, Text, StyleSheet } from 'react-native';
+import React, { useState } from 'react';
+import { View, Text, StyleSheet, TextInput, FlatList, TouchableOpacity } from 'react-native';
 import Button from '../components/Button';
 
 const BusStopScreen = ({ navigation }) => {
+  const [searchQuery, setSearchQuery] = useState('');
+  const [filteredStops, setFilteredStops] = useState([]);
+  
+  // Example bus stops data - replace with your actual data
+  const busStops = [
+    { id: '1', name: 'Gamecity bus stop' },
+    { id: '2', name: 'Apex bus stop' },
+    { id: '3', name: 'BAC bus stop' },
+    // Add more bus stops as needed
+  ];
+
+  const handleSearch = (text) => {
+    setSearchQuery(text);
+    const filtered = busStops.filter(stop =>
+      stop.name.toLowerCase().includes(text.toLowerCase())
+    );
+    setFilteredStops(filtered);
+  };
+
   return (
     <View style={styles.container}>
-      <Text style={styles.text}>Bus Stop Screen</Text>
-      <Button title="Show Route" onPress={() => navigation.navigate('MapView')} color="#364fa1" style={styles.button} />
+      <View style={styles.searchContainer}>
+        <TextInput
+          style={styles.searchBar}
+          placeholder="Search bus stops..."
+          value={searchQuery}
+          onChangeText={handleSearch}
+        />
+        {searchQuery.length > 0 && (
+          <FlatList
+            style={styles.dropdown}
+            data={filteredStops}
+            keyExtractor={(item) => item.id}
+            renderItem={({ item }) => (
+              <View style={styles.dropdownItemContainer}>
+                <Text style={styles.dropdownItem}>{item.name}</Text>
+                <TouchableOpacity style={styles.routeButton}>
+                  <Text style={styles.routeButtonText}>Show Route</Text>
+                </TouchableOpacity>
+              </View>
+            )}
+          />
+        )}
+      </View>
+
     </View>
   );
 };
@@ -14,14 +55,50 @@ const BusStopScreen = ({ navigation }) => {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
+
     backgroundColor: '#dce2ef',
     padding: 20,
   },
+  searchContainer: {
+    width: '100%',
+    marginBottom: 20,
+  },
+  searchBar: {
+    backgroundColor: 'white',
+    padding: 10,
+    borderRadius: 10,
+    marginBottom: 5,
+  },
+  dropdown: {
+    backgroundColor: 'white',
+    maxHeight: 200,
+    borderRadius: 10,
+  },
+  dropdownItemContainer: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    padding: 15,
+    borderBottomWidth: 1,
+    borderBottomColor: '#eee',
+  },
+  dropdownItem: {
+    flex: 1,
+  },
+  routeButton: {
+    backgroundColor: '#22303f',
+    padding: 8,
+    borderRadius: 5,
+    marginLeft: 10,
+  },
+  routeButtonText: {
+    color: 'white',
+    fontSize: 12,
+  },
   text: {
     fontSize: 24,
     fontWeight: 'bold',
+    textAlign: 'center',
   },
   button: {
     borderRadius: 50,
diff --git a/screens/HomeScreen.js b/screens/HomeScreen.js
index f53de94..7efc792 100644
--- a/screens/HomeScreen.js
+++ b/screens/HomeScreen.js
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { View, TextInput, Button, StyleSheet, Alert } from 'react-native';
+import { View, TextInput, Button, StyleSheet, Alert, TouchableOpacity, Text } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import { supabase } from '../lib/supabase'; // Ensure this path is correct
 
@@ -63,7 +63,9 @@ const HomeScreen = () => {
         value={to}
         onChangeText={setTo}
       />
-      <Button title="Find Route" onPress={handleSearch} />
+      <TouchableOpacity style={styles.button} onPress={handleSearch}>
+        <Text style={styles.buttonText}>Find Route</Text>
+      </TouchableOpacity>
     </View>
   );
 };
@@ -76,9 +78,37 @@ const styles = StyleSheet.create({
   input: {
     borderWidth: 1,
     borderColor: '#ccc',
-    borderRadius: 5,
-    padding: 10,
-    marginBottom: 10,
+    borderRadius: 15,
+    padding: 15,
+    marginBottom: 15,
+    backgroundColor: 'white',
+    shadowColor: '#000',
+    shadowOffset: {
+      width: 0,
+      height: 2,
+    },
+    shadowOpacity: 0.25,
+    shadowRadius: 3.84,
+    elevation: 5,
+  },
+  button: {
+    backgroundColor: '#018abe',
+    padding: 15,
+    borderRadius: 15,
+    alignItems: 'center',
+    shadowColor: '#000',
+    shadowOffset: {
+      width: 0,
+      height: 2,
+    },
+    shadowOpacity: 0.25,
+    shadowRadius: 3.84,
+    elevation: 5,
+  },
+  buttonText: {
+    color: 'white',
+    fontSize: 16,
+    fontWeight: 'bold',
   },
 });
 
diff --git a/screens/MapViewScreen.js b/screens/MapViewScreen.js
index 130e661..7dcda3b 100644
--- a/screens/MapViewScreen.js
+++ b/screens/MapViewScreen.js
@@ -5,35 +5,29 @@ import MapView, { Marker, Polyline } from 'react-native-maps';
 const MapViewScreen = ({ route }) => {
   const { origin, destination } = route.params || {}; // Fallback to undefined if params are missing
 
-  if (!origin || !destination) {
-    return (
-      <View style={styles.container}>
-        <Text style={styles.errorText}>Route details are missing. Please try again.</Text>
-      </View>
-    );
-  }
-
   const [routeCoordinates, setRouteCoordinates] = useState([]);
 
   useEffect(() => {
-    const fetchRoute = async () => {
-      try {
-        const directionsUrl = `https://maps.gomaps.pro/maps/api/directions/json?origin=${origin.latitude},${origin.longitude}&destination=${destination.latitude},${destination.longitude}&key=AlzaSykD0-TOgCvku5D5nyYC67DmWk2aaon-COn`;
-        const response = await fetch(directionsUrl);
-        const directionsData = await response.json();
+    if (origin && destination) {
+      const fetchRoute = async () => {
+        try {
+          const directionsUrl = `https://maps.gomaps.pro/maps/api/directions/json?origin=${origin.latitude},${origin.longitude}&destination=${destination.latitude},${destination.longitude}&key=AlzaSykD0-TOgCvku5D5nyYC67DmWk2aaon-COn`;
+          const response = await fetch(directionsUrl);
+          const directionsData = await response.json();
 
-        if (directionsData.status === 'OK') {
-          const points = decodePolyline(directionsData.routes[0].overview_polyline.points);
-          setRouteCoordinates(points);
-        } else {
-          console.error('Failed to fetch directions:', directionsData.status);
+          if (directionsData.status === 'OK') {
+            const points = decodePolyline(directionsData.routes[0].overview_polyline.points);
+            setRouteCoordinates(points);
+          } else {
+            console.error('Failed to fetch directions:', directionsData.status);
+          }
+        } catch (error) {
+          console.error('Error fetching route:', error);
         }
-      } catch (error) {
-        console.error('Error fetching route:', error);
-      }
-    };
+      };
 
-    fetchRoute();
+      fetchRoute();
+    }
   }, [origin, destination]);
 
   const decodePolyline = (encoded) => {
@@ -72,14 +66,17 @@ const MapViewScreen = ({ route }) => {
       <MapView
         style={styles.map}
         initialRegion={{
-          latitude: origin.latitude,
-          longitude: origin.longitude,
+          latitude: origin?.latitude || -24.6586, // Default latitude if origin is missing
+          longitude: origin?.longitude || 25.9086, // Default longitude if origin is missing
           latitudeDelta: 0.05,
           longitudeDelta: 0.05,
         }}
       >
-        <Marker coordinate={origin} title="Origin" />
-        <Marker coordinate={destination} title="Destination" />
+        {/* Render markers if origin and destination are provided */}
+        {origin && <Marker coordinate={origin} title="Origin" />}
+        {destination && <Marker coordinate={destination} title="Destination" />}
+
+        {/* Render the route if coordinates are available */}
         {routeCoordinates.length > 0 && (
           <Polyline
             coordinates={routeCoordinates}
diff --git a/screens/ProfileScreen.js b/screens/ProfileScreen.js
index 4cde952..ff3ca4e 100644
--- a/screens/ProfileScreen.js
+++ b/screens/ProfileScreen.js
@@ -1,8 +1,26 @@
 import React from 'react';
-import { View, Text, StyleSheet, TouchableOpacity, Image } from 'react-native';
+import { View, Text, StyleSheet, TouchableOpacity, Alert } from 'react-native';
 
 const ProfileScreen = ({ navigation }) => {
-  const Profile = []
+  const handleLogout = () => {
+    Alert.alert(
+      "Logout",
+      "Are you sure you want to logout?",
+      [
+        {
+          text: "Cancel",
+          onPress: () => console.log("Logout canceled"),
+          style: "cancel",
+        },
+        {
+          text: "Logout",
+          onPress: () => navigation.replace('Login'), // Replace with your login screen name
+        },
+      ],
+      { cancelable: true }
+    );
+  };
+
   return (
     <View style={styles.container}>
       <Text style={styles.text}>Profile Screen</Text>
@@ -19,8 +37,8 @@ const ProfileScreen = ({ navigation }) => {
         <Text style={styles.buttonText}>Change Language</Text>
       </TouchableOpacity>
       
-      <TouchableOpacity style={[styles.button, { backgroundColor: '#dce2ef' }]} onPress={() => {}}>
-        <Text style={[styles.buttonText, { color: 'black' }]}>Logout</Text>
+      <TouchableOpacity style={[styles.button, { backgroundColor: '#660F24' }]} onPress={handleLogout}>
+        <Text style={[styles.buttonText, { color: 'white' }]}>Logout</Text>
       </TouchableOpacity>
       
     </View>
diff --git a/screens/SplashScreen.js b/screens/SplashScreen.js
index e72cfad..31454b7 100644
--- a/screens/SplashScreen.js
+++ b/screens/SplashScreen.js
@@ -19,8 +19,9 @@ const SplashScreen = () => {
         source={require('../assets/animations/FinalSplashScreen.json')} // Path to your JSON file
         autoPlay
         loop
-        speed={15} //the speed
+        speed={5} //the speed
         style={styles.lottieAnimation}
+        resizeMode="cover"
       />
     </View>
   );
diff --git a/screens/TransportInfoScreen.js b/screens/TransportInfoScreen.js
index 2521eb5..c82768f 100644
--- a/screens/TransportInfoScreen.js
+++ b/screens/TransportInfoScreen.js
@@ -25,7 +25,7 @@ const TransportInfoScreen = ({ navigation }) => {
       case 'Delayed':
         return '#364c84';
       case 'Very late':
-        return '#001F3F';
+        return 'black';
       default:
         return 'gray';
     }
@@ -69,7 +69,7 @@ const TransportInfoScreen = ({ navigation }) => {
 
   return (
     <View style={styles.container}>
-      <Text style={styles.text}>Your Route Information</Text>
+      <Text style={styles.text}></Text>
       <FlatList
         data={transports}
         keyExtractor={(item) => item.id}

From 109ea49353412935e72d1b366c8ae889f9a6da87 Mon Sep 17 00:00:00 2001
From: ModiseKgosi <cse23-102@thuto.bac.ac.bw>
Date: Thu, 8 May 2025 17:21:37 +0200
Subject: [PATCH 06/13] no changes made, just tryna see if it will pull if i
 commit a comment

---
 screens/HomeScreen.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/screens/HomeScreen.js b/screens/HomeScreen.js
index 7efc792..a73f33d 100644
--- a/screens/HomeScreen.js
+++ b/screens/HomeScreen.js
@@ -16,6 +16,7 @@ const HomeScreen = () => {
 
     try {
       // Fetch stops from Supabase
+      //just tryna see if  it will pull if i make a commit
       const { data: stops, error: stopsError } = await supabase.from('stops').select('*');
       if (stopsError) throw stopsError;
 

From 22f0abb97ef840120b713f3f1d7f84e3392f9282 Mon Sep 17 00:00:00 2001
From: ModiseKgosi <cse23-102@thuto.bac.ac.bw>
Date: Thu, 8 May 2025 19:01:04 +0200
Subject: [PATCH 07/13] Predictive searching

---
 screens/HomeScreen.js | 177 ++++++++++++++++++++++++++++++------------
 1 file changed, 128 insertions(+), 49 deletions(-)

diff --git a/screens/HomeScreen.js b/screens/HomeScreen.js
index a73f33d..0831cb0 100644
--- a/screens/HomeScreen.js
+++ b/screens/HomeScreen.js
@@ -1,52 +1,102 @@
-import React, { useState } from 'react';
-import { View, TextInput, Button, StyleSheet, Alert, TouchableOpacity, Text } from 'react-native';
+import React, { useState, useEffect } from 'react';
+import { View, TextInput, FlatList, TouchableOpacity, Text, StyleSheet, Alert } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
-import { supabase } from '../lib/supabase'; // Ensure this path is correct
+import { supabase } from '../lib/supabase';
+import * as Location from 'expo-location';
+import haversine from 'haversine-distance';
 
 const HomeScreen = () => {
   const [from, setFrom] = useState('');
   const [to, setTo] = useState('');
+  const [stops, setStops] = useState([]);
+  const [filteredStops, setFilteredStops] = useState([]);
   const navigation = useNavigation();
 
+  useEffect(() => {
+    const fetchStops = async () => {
+      const { data, error } = await supabase.from('stops').select('*');
+      if (error) {
+        Alert.alert('Error', 'Failed to fetch stops.');
+        return;
+      }
+      setStops(data);
+    };
+    fetchStops();
+  }, []);
+
+  const handleInputChange = (text, type) => {
+    const filtered = stops.filter((stop) =>
+      stop.name.toLowerCase().includes(text.toLowerCase())
+    );
+    setFilteredStops(filtered);
+
+    if (type === 'from') setFrom(text);
+    else setTo(text);
+  };
+
+  const handleSelectStop = (stop, type) => {
+    if (type === 'from') setFrom(stop.name);
+    else setTo(stop.name);
+    setFilteredStops([]);
+  };
+
   const handleSearch = async () => {
     if (!from || !to) {
       Alert.alert('Error', 'Please enter both "From" and "To" stops.');
       return;
     }
 
-    try {
-      // Fetch stops from Supabase
-      //just tryna see if  it will pull if i make a commit
-      const { data: stops, error: stopsError } = await supabase.from('stops').select('*');
-      if (stopsError) throw stopsError;
+    const fromStop = stops.find((stop) => stop.name.toLowerCase() === from.toLowerCase());
+    const toStop = stops.find((stop) => stop.name.toLowerCase() === to.toLowerCase());
 
-      // Find the "from" and "to" stops
-      const fromStop = stops.find((stop) => stop.name.toLowerCase() === from.toLowerCase());
-      const toStop = stops.find((stop) => stop.name.toLowerCase() === to.toLowerCase());
+    if (!fromStop || !toStop) {
+      Alert.alert('Error', 'One or both stops not found.');
+      return;
+    }
 
-      if (!fromStop || !toStop) {
-        Alert.alert('Error', 'One or both stops not found.');
-        return;
-      }
+    if (fromStop.route_id !== toStop.route_id) {
+      Alert.alert('Error', 'The selected stops are not on the same route.');
+      return;
+    }
 
-      // Ensure the stops are on the same route and in the correct order
-      if (fromStop.route_id !== toStop.route_id) {
-        Alert.alert('Error', 'The selected stops are not on the same route.');
-        return;
-      }
-      if (fromStop.stop_order >= toStop.stop_order) {
-        Alert.alert('Error', '"From" stop must come before "To" stop in the route.');
-        return;
+    if (fromStop.stop_order >= toStop.stop_order) {
+      Alert.alert('Error', '"From" stop must come before "To" stop in the route.');
+      return;
+    }
+
+    navigation.navigate('Map', {
+      origin: { latitude: fromStop.latitude, longitude: fromStop.longitude },
+      destination: { latitude: toStop.latitude, longitude: toStop.longitude },
+    });
+  };
+
+  const handleUseMyLocation = async () => {
+    const { status } = await Location.requestForegroundPermissionsAsync();
+    if (status !== 'granted') {
+      Alert.alert('Permission Denied', 'Location permission is required to use this feature.');
+      return;
+    }
+
+    const location = await Location.getCurrentPositionAsync({});
+    const { latitude, longitude } = location.coords;
+
+    let nearestStop = null;
+    let minDistance = Infinity;
+
+    stops.forEach((stop) => {
+      const distance = haversine(
+        { latitude, longitude },
+        { latitude: stop.latitude, longitude: stop.longitude }
+      );
+      if (distance < minDistance) {
+        minDistance = distance;
+        nearestStop = stop;
       }
+    });
 
-      // Navigate to MapViewScreen with route details
-      navigation.navigate('Map', {
-        origin: { latitude: fromStop.latitude, longitude: fromStop.longitude },
-        destination: { latitude: toStop.latitude, longitude: toStop.longitude },
-      });
-    } catch (error) {
-      Alert.alert('Error', 'An error occurred while fetching the route.');
-      console.error(error);
+    if (nearestStop) {
+      setFrom(nearestStop.name);
+      Alert.alert('Nearest Stop', `Nearest stop is ${nearestStop.name}`);
     }
   };
 
@@ -56,14 +106,47 @@ const HomeScreen = () => {
         style={styles.input}
         placeholder="From..."
         value={from}
-        onChangeText={setFrom}
+        onChangeText={(text) => handleInputChange(text, 'from')}
       />
+      {filteredStops.length > 0 && (
+        <FlatList
+          style={styles.dropdown}
+          data={filteredStops}
+          keyExtractor={(item) => item.id.toString()}
+          renderItem={({ item }) => (
+            <TouchableOpacity
+              style={styles.dropdownItem}
+              onPress={() => handleSelectStop(item, 'from')}
+            >
+              <Text>{item.name}</Text>
+            </TouchableOpacity>
+          )}
+        />
+      )}
       <TextInput
         style={styles.input}
         placeholder="To..."
         value={to}
-        onChangeText={setTo}
+        onChangeText={(text) => handleInputChange(text, 'to')}
       />
+      {filteredStops.length > 0 && (
+        <FlatList
+          style={styles.dropdown}
+          data={filteredStops}
+          keyExtractor={(item) => item.id.toString()}
+          renderItem={({ item }) => (
+            <TouchableOpacity
+              style={styles.dropdownItem}
+              onPress={() => handleSelectStop(item, 'to')}
+            >
+              <Text>{item.name}</Text>
+            </TouchableOpacity>
+          )}
+        />
+      )}
+      <TouchableOpacity style={styles.button} onPress={handleUseMyLocation}>
+        <Text style={styles.buttonText}>Use My Location</Text>
+      </TouchableOpacity>
       <TouchableOpacity style={styles.button} onPress={handleSearch}>
         <Text style={styles.buttonText}>Find Route</Text>
       </TouchableOpacity>
@@ -83,28 +166,24 @@ const styles = StyleSheet.create({
     padding: 15,
     marginBottom: 15,
     backgroundColor: 'white',
-    shadowColor: '#000',
-    shadowOffset: {
-      width: 0,
-      height: 2,
-    },
-    shadowOpacity: 0.25,
-    shadowRadius: 3.84,
-    elevation: 5,
+  },
+  dropdown: {
+    maxHeight: 150,
+    backgroundColor: 'white',
+    borderRadius: 10,
+    marginBottom: 10,
+  },
+  dropdownItem: {
+    padding: 10,
+    borderBottomWidth: 1,
+    borderBottomColor: '#ccc',
   },
   button: {
     backgroundColor: '#018abe',
     padding: 15,
     borderRadius: 15,
     alignItems: 'center',
-    shadowColor: '#000',
-    shadowOffset: {
-      width: 0,
-      height: 2,
-    },
-    shadowOpacity: 0.25,
-    shadowRadius: 3.84,
-    elevation: 5,
+    marginBottom: 10,
   },
   buttonText: {
     color: 'white',

From d5b1da4d937dd284129f7b4f20476952aec2cf16 Mon Sep 17 00:00:00 2001
From: ModiseKgosi <cse23-102@thuto.bac.ac.bw>
Date: Thu, 8 May 2025 20:51:06 +0200
Subject: [PATCH 08/13] user authencation functionality

---
 screens/LoginScreen.js | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/screens/LoginScreen.js b/screens/LoginScreen.js
index b897043..e39df72 100644
--- a/screens/LoginScreen.js
+++ b/screens/LoginScreen.js
@@ -10,10 +10,25 @@ const LoginScreen = () => {
   const [email, setEmail] = useState('');
   const [password, setPassword] = useState('');
 
+  // Function to handle user login
   const signInWithEmail = async () => {
     const { error } = await supabase.auth.signInWithPassword({ email, password });
-    if (error) Alert.alert(error.message);
-    else navigation.reset({ index: 0, routes: [{ name: 'MainTabNavigator' }] });
+    if (error) {
+      Alert.alert('Login Failed', error.message);
+    } else {
+      Alert.alert('Login Successful', 'Welcome back!');
+      navigation.reset({ index: 0, routes: [{ name: 'MainTabNavigator' }] }); // Navigate to the main app
+    }
+  };
+
+  // Function to handle user registration
+  const signUpWithEmail = async () => {
+    const { data, error } = await supabase.auth.signUp({ email, password });
+    if (error) {
+      Alert.alert('Registration Failed', error.message);
+    } else {
+      Alert.alert('Registration Successful', 'Please check your email for verification.');
+    }
   };
 
   useEffect(() => {
@@ -60,8 +75,7 @@ const LoginScreen = () => {
       <TouchableOpacity style={styles.button} onPress={signInWithEmail}>
         <Text style={styles.buttonText}>Sign In</Text>
       </TouchableOpacity>
-
-      <TouchableOpacity style={styles.newButton} onPress={() => {}}>
+      <TouchableOpacity style={styles.newButton} onPress={signUpWithEmail}>
         <Text style={styles.buttonText}>I'm New</Text>
       </TouchableOpacity>
 
@@ -71,7 +85,6 @@ const LoginScreen = () => {
             source={require('../assets/apple-logo.png')}
             style={styles.appleIcon}
           />
-
         </TouchableOpacity>
         <TouchableOpacity style={styles.googleButton}>
           <Image
@@ -80,7 +93,7 @@ const LoginScreen = () => {
           />
         </TouchableOpacity>
       </View>
-      
+
       <TouchableOpacity
         style={styles.guestButton}
         onPress={() =>
@@ -92,7 +105,7 @@ const LoginScreen = () => {
       >
         <Text style={styles.guestButtonText}>Continue as Guest</Text>
         <Animated.Image
-          source={require('../assets/arrow-right.png')}
+          source={require('../assets/arrow-right.png')} // Ensure this path is correct
           style={[styles.arrowIcon, { opacity: fadeAnim }]}
         />
       </TouchableOpacity>
@@ -229,9 +242,7 @@ const styles = StyleSheet.create({
     width: '25%',
     alignItems: 'center',
     justifyContent: 'center',
-    
     shadowColor: '#000',
-
     shadowOffset: {
       width: 0,
       height: 2,
@@ -250,14 +261,11 @@ const styles = StyleSheet.create({
     justifyContent: 'center',
     marginBottom: 25,
   },
-
   guestButtonText: {
     color: '#666',
     textAlign: 'center',
     fontSize: 16,
-    marginRight: 10,
   },
-
   arrowIcon: {
     width: 20,
     height: 20,

From 3a6d9d14d054661864dfea70ced4f49aa23ef86e Mon Sep 17 00:00:00 2001
From: ModiseKgosi <cse23-102@thuto.bac.ac.bw>
Date: Thu, 8 May 2025 22:09:28 +0200
Subject: [PATCH 09/13] just some dependencies

---
 package-lock.json | 93 +++++++++++++++++++++++++++++++++++++++++++++++
 package.json      |  5 +++
 2 files changed, 98 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index c52d009..6c5b265 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,7 +17,12 @@
         "@rneui/themed": "^4.0.0-rc.8",
         "@supabase/supabase-js": "^2.49.4",
         "expo": "~52.0.46",
+        "expo-apple-authentication": "~7.1.3",
+        "expo-auth-session": "~6.0.3",
+        "expo-location": "~18.0.10",
         "expo-status-bar": "~2.0.1",
+        "expo-web-browser": "~14.0.2",
+        "haversine-distance": "^1.2.3",
         "lottie-react-native": "^7.1.0",
         "react": "18.3.1",
         "react-native": "0.76.9",
@@ -7359,6 +7364,25 @@
         }
       }
     },
+    "node_modules/expo-apple-authentication": {
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/expo-apple-authentication/-/expo-apple-authentication-7.1.3.tgz",
+      "integrity": "sha512-TRaF513oDGjGx3hRiAwkMiSnKLN8BIR9Se5Gi3ttz2UUgP9y+tNHV6Ji6/oztJo9ON7zerHg2mn5Y+3B8c2vTQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*",
+        "react-native": "*"
+      }
+    },
+    "node_modules/expo-application": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/expo-application/-/expo-application-6.0.2.tgz",
+      "integrity": "sha512-qcj6kGq3mc7x5yIb5KxESurFTJCoEKwNEL34RdPEvTB/xhl7SeVZlu05sZBqxB1V4Ryzq/LsCb7NHNfBbb3L7A==",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*"
+      }
+    },
     "node_modules/expo-asset": {
       "version": "11.0.5",
       "resolved": "https://registry.npmjs.org/expo-asset/-/expo-asset-11.0.5.tgz",
@@ -7376,6 +7400,24 @@
         "react-native": "*"
       }
     },
+    "node_modules/expo-auth-session": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/expo-auth-session/-/expo-auth-session-6.0.3.tgz",
+      "integrity": "sha512-s7LmmMPiiY1NXrlcXkc4+09Hlfw9X1CpaQOCDkwfQEodG1uCYGQi/WImTnDzw5YDkWI79uC8F1mB8EIerilkDA==",
+      "license": "MIT",
+      "dependencies": {
+        "expo-application": "~6.0.2",
+        "expo-constants": "~17.0.5",
+        "expo-crypto": "~14.0.2",
+        "expo-linking": "~7.0.5",
+        "expo-web-browser": "~14.0.2",
+        "invariant": "^2.2.4"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
+      }
+    },
     "node_modules/expo-constants": {
       "version": "17.0.8",
       "resolved": "https://registry.npmjs.org/expo-constants/-/expo-constants-17.0.8.tgz",
@@ -7390,6 +7432,18 @@
         "react-native": "*"
       }
     },
+    "node_modules/expo-crypto": {
+      "version": "14.0.2",
+      "resolved": "https://registry.npmjs.org/expo-crypto/-/expo-crypto-14.0.2.tgz",
+      "integrity": "sha512-WRc9PBpJraJN29VD5Ef7nCecxJmZNyRKcGkNiDQC1nhY5agppzwhqh7zEzNFarE/GqDgSiaDHS8yd5EgFhP9AQ==",
+      "license": "MIT",
+      "dependencies": {
+        "base64-js": "^1.3.0"
+      },
+      "peerDependencies": {
+        "expo": "*"
+      }
+    },
     "node_modules/expo-file-system": {
       "version": "18.0.12",
       "resolved": "https://registry.npmjs.org/expo-file-system/-/expo-file-system-18.0.12.tgz",
@@ -7426,6 +7480,29 @@
         "react": "*"
       }
     },
+    "node_modules/expo-linking": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/expo-linking/-/expo-linking-7.0.5.tgz",
+      "integrity": "sha512-3KptlJtcYDPWohk0MfJU75MJFh2ybavbtcSd84zEPfw9s1q3hjimw3sXnH03ZxP54kiEWldvKmmnGcVffBDB1g==",
+      "license": "MIT",
+      "dependencies": {
+        "expo-constants": "~17.0.5",
+        "invariant": "^2.2.4"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
+      }
+    },
+    "node_modules/expo-location": {
+      "version": "18.0.10",
+      "resolved": "https://registry.npmjs.org/expo-location/-/expo-location-18.0.10.tgz",
+      "integrity": "sha512-R0Iioz0UZ9Ts8TACPngh8uDFbajJhVa5/igLqWB8Pq/gp8UHuwj7PC8XbZV7avsFoShYjaxrOhf4U7IONeKLgg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*"
+      }
+    },
     "node_modules/expo-modules-autolinking": {
       "version": "2.0.8",
       "resolved": "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-2.0.8.tgz",
@@ -7500,6 +7577,16 @@
         "react-native": "*"
       }
     },
+    "node_modules/expo-web-browser": {
+      "version": "14.0.2",
+      "resolved": "https://registry.npmjs.org/expo-web-browser/-/expo-web-browser-14.0.2.tgz",
+      "integrity": "sha512-Hncv2yojhTpHbP6SGWARBFdl7P6wBHc1O8IKaNsH0a/IEakq887o1eRhLxZ5IwztPQyRDhpqHdgJ+BjWolOnwA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*",
+        "react-native": "*"
+      }
+    },
     "node_modules/exponential-backoff": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz",
@@ -8052,6 +8139,12 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/haversine-distance": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/haversine-distance/-/haversine-distance-1.2.3.tgz",
+      "integrity": "sha512-cRKtuukt+/fVprlLueX30mytMNtiQ4tff93FDW9yrBx3BYrq6gujiw1+hEaaxssKlOZTm8R3BPtMbNM+n0+bqQ==",
+      "license": "MIT"
+    },
     "node_modules/hermes-estree": {
       "version": "0.23.1",
       "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.23.1.tgz",
diff --git a/package.json b/package.json
index 56a002c..b105459 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,12 @@
     "@rneui/themed": "^4.0.0-rc.8",
     "@supabase/supabase-js": "^2.49.4",
     "expo": "~52.0.46",
+    "expo-apple-authentication": "~7.1.3",
+    "expo-auth-session": "~6.0.3",
+    "expo-location": "~18.0.10",
     "expo-status-bar": "~2.0.1",
+    "expo-web-browser": "~14.0.2",
+    "haversine-distance": "^1.2.3",
     "lottie-react-native": "^7.1.0",
     "react": "18.3.1",
     "react-native": "0.76.9",

From d3225abf2193b13f3daa3b43b3419b1402531cd5 Mon Sep 17 00:00:00 2001
From: ModiseKgosi <cse23-102@thuto.bac.ac.bw>
Date: Thu, 8 May 2025 23:52:52 +0200
Subject: [PATCH 10/13] google sign in functionality added

---
 screens/LoginScreen.js | 68 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 66 insertions(+), 2 deletions(-)

diff --git a/screens/LoginScreen.js b/screens/LoginScreen.js
index e39df72..9fcd1d8 100644
--- a/screens/LoginScreen.js
+++ b/screens/LoginScreen.js
@@ -2,6 +2,10 @@ import React, { useState, useEffect, useRef } from 'react';
 import { Alert, Animated, Image, StyleSheet, Text, TextInput, TouchableOpacity, View } from 'react-native';
 import { supabase } from '../lib/supabase'; // Adjust the import path as necessary
 import { useNavigation } from '@react-navigation/native';
+import * as WebBrowser from 'expo-web-browser';
+import * as AuthSession from 'expo-auth-session';
+import * as AppleAuthentication from 'expo-apple-authentication';
+import { Platform } from 'react-native';
 
 const LoginScreen = () => {
   const navigation = useNavigation();
@@ -31,6 +35,66 @@ const LoginScreen = () => {
     }
   };
 
+  // Google Sign-In function
+  const signInWithGoogle = async () => {
+    const redirectUrl = AuthSession.makeRedirectUri({ useProxy: false });
+    const { data, error } = await supabase.auth.signInWithOAuth({
+      provider: 'google',
+      options: { redirectTo: redirectUrl }
+    });
+
+    if (error) {
+      Alert.alert('Google Sign-In failed', error.message);
+      return;
+    }
+    if (data?.url) {
+      const result = await WebBrowser.openAuthSessionAsync(data.url, redirectUrl);
+      // After OAuth, Supabase will handle the session.
+      // check if user is logged in and navigate:
+      const { data: userData } = await supabase.auth.getUser();
+      if (userData?.user) {
+        navigation.reset({ index: 0, routes: [{ name: 'MainTabNavigator' }] });
+      }
+    }
+  };
+
+  // Apple Sign-In function (iOS only)
+  const signInWithApple = async () => {
+    if (Platform.OS !== 'ios') {
+      Alert.alert('Apple Sign-In is only available on iOS.');
+      return;
+    }
+    const redirectUrl = AuthSession.makeRedirectUri({ useProxy: false });
+    const { data, error } = await supabase.auth.signInWithOAuth({
+      provider: 'apple',
+      options: { redirectTo: redirectUrl }
+    });
+
+    if (error) {
+      Alert.alert('Apple Sign-In failed', error.message);
+      return;
+    }
+    if (data?.url) {
+      const result = await WebBrowser.openAuthSessionAsync(data.url, redirectUrl);
+      const { data: userData } = await supabase.auth.getUser();
+      if (userData?.user) {
+        navigation.reset({ index: 0, routes: [{ name: 'MainTabNavigator' }] });
+      }
+    }
+  };
+
+  // Listen for auth state changes (handles OAuth redirect)
+  /*useEffect(() => {
+    const { data: authListener } = supabase.auth.onAuthStateChange((event, session) => {
+      if (session && session.user) {
+        navigation.reset({ index: 0, routes: [{ name: 'MainTabNavigator' }] });
+      }
+    });
+    return () => {
+      authListener.subscription.unsubscribe();
+    };
+  }, []); */
+
   useEffect(() => {
     const fadeIn = Animated.timing(fadeAnim, {
       toValue: 1,
@@ -80,13 +144,13 @@ const LoginScreen = () => {
       </TouchableOpacity>
 
       <View style={styles.buttonContainer}>
-        <TouchableOpacity style={styles.appleButton}>
+        <TouchableOpacity style={styles.appleButton} onPress={signInWithApple}>
           <Image
             source={require('../assets/apple-logo.png')}
             style={styles.appleIcon}
           />
         </TouchableOpacity>
-        <TouchableOpacity style={styles.googleButton}>
+        <TouchableOpacity style={styles.googleButton} onPress={signInWithGoogle}>
           <Image
             source={require('../assets/google-logo.png')}
             style={[styles.googleIcon, { width: 20, height: 20 }]}

From 7b75aaadfa92a077ad5d34404441d39859c58e30 Mon Sep 17 00:00:00 2001
From: ModiseKgosi <cse23-102@thuto.bac.ac.bw>
Date: Fri, 9 May 2025 00:58:02 +0200
Subject: [PATCH 11/13] just more features

---
 assets/avatar.jpg        | Bin 0 -> 27288 bytes
 components/UserHeader.js |  82 +++++++++++++++++++++++++++++++++++++++
 screens/HomeScreen.js    |   2 +
 screens/ProfileScreen.js |   2 +
 4 files changed, 86 insertions(+)
 create mode 100644 assets/avatar.jpg
 create mode 100644 components/UserHeader.js

diff --git a/assets/avatar.jpg b/assets/avatar.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ec5f7e8e2c1f27cfd3b49178d4605b5dbaf8a603
GIT binary patch
literal 27288
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

literal 0
HcmV?d00001

diff --git a/components/UserHeader.js b/components/UserHeader.js
new file mode 100644
index 0000000..d18f1d2
--- /dev/null
+++ b/components/UserHeader.js
@@ -0,0 +1,82 @@
+import React, { useEffect, useState } from 'react';
+import { View, Text, Image, StyleSheet, TouchableOpacity } from 'react-native';
+import { supabase } from '../lib/supabase';
+import { Ionicons } from '@expo/vector-icons';
+
+const fallbackAvatar = require('../assets/avatar.jpg');
+
+const UserHeader = () => {
+  const [user, setUser] = useState(null);
+
+  useEffect(() => {
+    const fetchUser = async () => {
+      const { data } = await supabase.auth.getUser();
+      if (data?.user) {
+        const { user } = data;
+        const displayName =
+          user.user_metadata?.full_name ||
+          user.user_metadata?.name ||
+          user.email;
+        const avatar =
+          user.user_metadata?.avatar_url ||
+          user.user_metadata?.picture ||
+          null;
+        setUser({
+          name: displayName,
+          avatar,
+        });
+      }
+    };
+    fetchUser();
+  }, []);
+
+  return (
+    <View style={styles.header}>
+      <Image
+        source={user?.avatar ? { uri: user.avatar } : fallbackAvatar}
+        style={styles.avatar}
+      />
+      <Text style={styles.greeting}>
+        Hey, <Text style={styles.name}>{user?.name || 'User'}</Text>
+      </Text>
+      <TouchableOpacity>
+        <Ionicons name="notifications-outline" size={28} color="#333" />
+      </TouchableOpacity>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  header: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    backgroundColor: '#fff',
+    margin: 10,
+    marginTop: 40,
+    padding: 16,
+    borderRadius: 16,
+    shadowColor: '#000',
+    shadowOpacity: 0.05,
+    shadowRadius: 8,
+    elevation: 2,
+    justifyContent: 'space-between',
+  },
+  avatar: {
+    width: 40,
+    height: 40,
+    borderRadius: 12,
+    marginRight: 16,
+  },
+  greeting: {
+    flex: 1,
+    fontSize: 18,
+    fontWeight: '500',
+    color: '#333',
+    textAlign: 'center',
+  },
+  name: {
+    fontWeight: 'bold',
+  },
+});
+
+export default UserHeader;
\ No newline at end of file
diff --git a/screens/HomeScreen.js b/screens/HomeScreen.js
index 0831cb0..81648e9 100644
--- a/screens/HomeScreen.js
+++ b/screens/HomeScreen.js
@@ -4,6 +4,7 @@ import { useNavigation } from '@react-navigation/native';
 import { supabase } from '../lib/supabase';
 import * as Location from 'expo-location';
 import haversine from 'haversine-distance';
+import UserHeader from '../components/UserHeader';
 
 const HomeScreen = () => {
   const [from, setFrom] = useState('');
@@ -102,6 +103,7 @@ const HomeScreen = () => {
 
   return (
     <View style={styles.container}>
+      <UserHeader />
       <TextInput
         style={styles.input}
         placeholder="From..."
diff --git a/screens/ProfileScreen.js b/screens/ProfileScreen.js
index ff3ca4e..473bae2 100644
--- a/screens/ProfileScreen.js
+++ b/screens/ProfileScreen.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import { View, Text, StyleSheet, TouchableOpacity, Alert } from 'react-native';
+import UserHeader from '../components/UserHeader';
 
 const ProfileScreen = ({ navigation }) => {
   const handleLogout = () => {
@@ -23,6 +24,7 @@ const ProfileScreen = ({ navigation }) => {
 
   return (
     <View style={styles.container}>
+      <UserHeader />
       <Text style={styles.text}>Profile Screen</Text>
       
       <TouchableOpacity style={[styles.button, { backgroundColor: '#001F3F'}]} onPress={() => {}}>

From 0c641abaca9245caddcf988a1c02cd26f14367e8 Mon Sep 17 00:00:00 2001
From: ModiseKgosi <cse23-102@thuto.bac.ac.bw>
Date: Fri, 9 May 2025 10:28:53 +0200
Subject: [PATCH 12/13] sign up

---
 screens/LoginScreen.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/screens/LoginScreen.js b/screens/LoginScreen.js
index 9fcd1d8..6b33e07 100644
--- a/screens/LoginScreen.js
+++ b/screens/LoginScreen.js
@@ -140,7 +140,7 @@ const LoginScreen = () => {
         <Text style={styles.buttonText}>Sign In</Text>
       </TouchableOpacity>
       <TouchableOpacity style={styles.newButton} onPress={signUpWithEmail}>
-        <Text style={styles.buttonText}>I'm New</Text>
+        <Text style={styles.buttonText}>Sign Up</Text>
       </TouchableOpacity>
 
       <View style={styles.buttonContainer}>

From 005482a95b74447fff0a261da953c2327af3b2b5 Mon Sep 17 00:00:00 2001
From: Twanda Mudonhi <161071449+Tawanda21@users.noreply.github.com>
Date: Tue, 13 May 2025 14:33:31 +0200
Subject: [PATCH 13/13] MostUsedScreen and ProfileScreen updated

---
 components/UserHeader.js   |  29 +++--
 navigation/AppNavigator.js |   9 +-
 screens/MostUsedScreen.js  | 218 ++++++++++++++++++++++++++++++++
 screens/ProfileScreen.js   | 251 ++++++++++++++++++++++++++++++++-----
 4 files changed, 461 insertions(+), 46 deletions(-)
 create mode 100644 screens/MostUsedScreen.js

diff --git a/components/UserHeader.js b/components/UserHeader.js
index d18f1d2..ad4ecbd 100644
--- a/components/UserHeader.js
+++ b/components/UserHeader.js
@@ -1,11 +1,10 @@
 import React, { useEffect, useState } from 'react';
-import { View, Text, Image, StyleSheet, TouchableOpacity } from 'react-native';
+import { View, Text, Image, StyleSheet } from 'react-native';
 import { supabase } from '../lib/supabase';
-import { Ionicons } from '@expo/vector-icons';
 
 const fallbackAvatar = require('../assets/avatar.jpg');
 
-const UserHeader = () => {
+const UserHeader = ({ minimal = false }) => {
   const [user, setUser] = useState(null);
 
   useEffect(() => {
@@ -30,6 +29,16 @@ const UserHeader = () => {
     fetchUser();
   }, []);
 
+  if (minimal) {
+    // Render only the profile picture
+    return (
+      <Image
+        source={user?.avatar ? { uri: user.avatar } : fallbackAvatar}
+        style={styles.avatarLarge}
+      />
+    );
+  }
+
   return (
     <View style={styles.header}>
       <Image
@@ -39,9 +48,6 @@ const UserHeader = () => {
       <Text style={styles.greeting}>
         Hey, <Text style={styles.name}>{user?.name || 'User'}</Text>
       </Text>
-      <TouchableOpacity>
-        <Ionicons name="notifications-outline" size={28} color="#333" />
-      </TouchableOpacity>
     </View>
   );
 };
@@ -53,8 +59,8 @@ const styles = StyleSheet.create({
     backgroundColor: '#fff',
     margin: 10,
     marginTop: 40,
-    padding: 16,
-    borderRadius: 16,
+    padding: 10,
+    borderRadius: 50,
     shadowColor: '#000',
     shadowOpacity: 0.05,
     shadowRadius: 8,
@@ -64,9 +70,14 @@ const styles = StyleSheet.create({
   avatar: {
     width: 40,
     height: 40,
-    borderRadius: 12,
+    borderRadius: 50,
     marginRight: 16,
   },
+  avatarLarge: {
+    width: 120,
+    height: 120,
+    borderRadius: 60,
+  },
   greeting: {
     flex: 1,
     fontSize: 18,
diff --git a/navigation/AppNavigator.js b/navigation/AppNavigator.js
index 7f6c7fe..198afb6 100644
--- a/navigation/AppNavigator.js
+++ b/navigation/AppNavigator.js
@@ -6,6 +6,7 @@ import { Ionicons } from '@expo/vector-icons';
 import { Animated } from 'react-native';
 import { CardStyleInterpolators } from '@react-navigation/stack';
 
+
 // Auth Screens
 import SplashScreen from '../screens/SplashScreen';
 import LoginScreen from '../screens/LoginScreen';
@@ -15,7 +16,7 @@ import HomeScreen from '../screens/HomeScreen';
 import MapViewScreen from '../screens/MapViewScreen';
 import BusStopScreen from '../screens/BusStopScreen';
 import TransportInfoScreen from '../screens/TransportInfoScreen';
-import FavoritesScreen from '../screens/FavoritesScreen';
+import MostUsedScreen from '../screens/MostUsedScreen';
 import ProfileScreen from '../screens/ProfileScreen';
 
 const Tab = createBottomTabNavigator();
@@ -40,8 +41,8 @@ const MainTabNavigator = () => {
             iconName = focused ? 'bus' : 'bus-outline';
           } else if (route.name === 'Transport') {
             iconName = focused ? 'information-circle' : 'information-circle-outline';
-          } else if (route.name === 'Favorites') {
-            iconName = focused ? 'heart' : 'heart-outline';
+          } else if (route.name === 'Most Used') {
+            iconName = focused ? 'star' : 'star-outline';
           } else if (route.name === 'Profile') {
             iconName = focused ? 'person' : 'person-outline';
           }
@@ -76,7 +77,7 @@ const MainTabNavigator = () => {
       <Tab.Screen name="Map" component={MapViewScreen} />
       <Tab.Screen name="Bus Stops" component={BusStopScreen} />
       <Tab.Screen name="Transport" component={TransportInfoScreen} />
-      <Tab.Screen name="Favorites" component={FavoritesScreen} />
+      <Tab.Screen name="Most Used" component={MostUsedScreen} />
       <Tab.Screen name="Profile" component={ProfileScreen} />
     </Tab.Navigator>
   );
diff --git a/screens/MostUsedScreen.js b/screens/MostUsedScreen.js
new file mode 100644
index 0000000..4b631ac
--- /dev/null
+++ b/screens/MostUsedScreen.js
@@ -0,0 +1,218 @@
+import React, { useState, useEffect } from 'react';
+import { View, Text, StyleSheet, FlatList, TouchableOpacity, Animated, Dimensions, TouchableWithoutFeedback } from 'react-native';
+import MapView, { Marker } from 'react-native-maps';
+import { useNavigation } from '@react-navigation/native';
+
+const MostUsedScreen = () => {
+  const navigation = useNavigation();
+  const [expandedId, setExpandedId] = useState(null);
+  const [animations, setAnimations] = useState({});
+
+const mostUsed = [
+  { 
+    id: '1', 
+    name: 'Route 1 & 2',
+    description: 'Popular commuter route through downtown',
+    coordinates: {
+      latitude: -24.6581, // Gaborone latitude
+      longitude: 25.9122, // Gaborone longitude
+    }
+  },
+  { 
+    id: '2', 
+    name: 'Route 3 & 4',
+    description: 'Express route to shopping district',
+    coordinates: {
+      latitude: -24.6581, // Gaborone latitude
+      longitude: 25.9122, // Gaborone longitude
+    }
+  },
+];
+
+  useEffect(() => {
+    const initialAnimations = {};
+    mostUsed.forEach(item => {
+      initialAnimations[item.id] = new Animated.Value(0);
+    });
+    setAnimations(initialAnimations);
+  }, []);
+
+  const toggleExpand = (id) => {
+    if (!animations[id]) return;
+    
+    setExpandedId(expandedId === id ? null : id);
+    Animated.timing(animations[id], {
+      toValue: expandedId === id ? 0 : 1,
+      duration: 300,
+      useNativeDriver: false,
+    }).start();
+  };
+
+  const handleBackgroundPress = () => {
+    if (expandedId && animations[expandedId]) {
+      Animated.timing(animations[expandedId], {
+        toValue: 0,
+        duration: 300,
+        useNativeDriver: false,
+      }).start(() => setExpandedId(null));
+    }
+  };
+
+    const renderItem = ({ item }) => {
+    const isExpanded = expandedId === item.id;
+    const animation = animations[item.id];
+  
+    if (!animation) return null;
+  
+    return (
+      <TouchableOpacity
+        onPress={(e) => {
+          e.stopPropagation();
+          toggleExpand(item.id);
+        }}
+      >
+        <View style={styles.card}>
+          <Text style={styles.cardText}>{item.name}</Text>
+          <Animated.View
+            style={[
+              styles.expandedContent,
+              {
+                opacity: animation,
+                maxHeight: animation.interpolate({
+                  inputRange: [0, 1],
+                  outputRange: [0, 500],
+                }),
+                transform: [
+                  {
+                    translateY: animation.interpolate({
+                      inputRange: [0, 1],
+                      outputRange: [-20, 0],
+                    }),
+                  },
+                ],
+              },
+            ]}
+          >
+            <Text style={styles.description}>{item.description}</Text>
+            <MapView
+              style={styles.miniMap}
+              initialRegion={{
+                latitude: item.coordinates.latitude,
+                longitude: item.coordinates.longitude,
+                latitudeDelta: 0.0922,
+                longitudeDelta: 0.0421,
+              }}
+            >
+              <Marker coordinate={item.coordinates} />
+            </MapView>
+            <TouchableOpacity
+              style={styles.viewMapButton}
+              onPress={(e) => {
+                e.stopPropagation();
+                navigation.navigate('Map', { routeId: item.id });
+              }}
+            >
+              <Text style={styles.viewMapButtonText}>View in Map</Text>
+            </TouchableOpacity>
+          </Animated.View>
+        </View>
+      </TouchableOpacity>
+    );
+  };
+
+  return (
+    <TouchableWithoutFeedback onPress={handleBackgroundPress}>
+      <View style={styles.container}>
+        <Text style={styles.text}>Most Used Screen</Text>
+        <FlatList
+          data={mostUsed}
+          keyExtractor={(item) => item.id}
+          key={'single-column'}
+          numColumns={1}
+          renderItem={renderItem}
+          contentContainerStyle={styles.listContent}
+          style={styles.list}
+        />
+      </View>
+    </TouchableWithoutFeedback>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: '#dce2ef',
+    padding: 20,
+  },
+  text: {
+    fontSize: 24,
+    fontWeight: 'bold',
+    marginBottom: 20,
+  },
+  list: {
+    width: '100%',
+  },
+  card: {
+    alignContent: 'center',
+    alignItems: 'center',
+    justifyContent: 'center',
+    width: '98%',
+    margin: 10,
+    padding: 25,
+    backgroundColor: 'white',
+    borderRadius: 30,
+    shadowColor: '#000',
+    shadowOffset: {
+      width: 0,
+      height: 2,
+    },
+    shadowOpacity: 0.25,
+    shadowRadius: 3.84,
+    elevation: 5,
+    alignSelf: 'center',
+    overflow: 'hidden',
+  },
+  cardText: {
+    fontSize: 22,
+    fontWeight: '500',
+  },
+  listContent: {
+    justifyContent: 'center',
+    alignItems: 'center',
+    padding: 10,
+    width: '100%',
+  },
+  expandedContent: {
+    width: '100%',
+    marginTop: 20,
+    alignItems: 'center',
+    overflow: 'hidden',
+  },
+  description: {
+    fontSize: 18,
+    marginBottom: 15,
+    textAlign: 'center',
+  },
+  miniMap: {
+    width: '100%',
+    height: 200,
+    borderRadius: 15,
+    marginBottom: 15,
+  },
+  viewMapButton: {
+    backgroundColor: '#4a90e2',
+    padding: 10,
+    borderRadius: 15,
+    width: '50%',
+    alignItems: 'center',
+  },
+  viewMapButtonText: {
+    color: 'white',
+    fontSize: 16,
+    fontWeight: '500',
+  },
+});
+
+export default MostUsedScreen;
\ No newline at end of file
diff --git a/screens/ProfileScreen.js b/screens/ProfileScreen.js
index 473bae2..a4a3996 100644
--- a/screens/ProfileScreen.js
+++ b/screens/ProfileScreen.js
@@ -1,20 +1,48 @@
-import React from 'react';
-import { View, Text, StyleSheet, TouchableOpacity, Alert } from 'react-native';
+import React, { useState, useRef } from 'react';
+import { View, Text, StyleSheet, TouchableOpacity, Alert, Modal, Animated, TouchableWithoutFeedback, TextInput } from 'react-native';
 import UserHeader from '../components/UserHeader';
+import { MaterialIcons } from '@expo/vector-icons';
+import { supabase } from '../lib/supabase'; 
 
 const ProfileScreen = ({ navigation }) => {
+  const [showDropdown, setShowDropdown] = useState(false);
+  const [isEditingUsername, setIsEditingUsername] = useState(false);
+  const [username, setUsername] = useState('CurrentUsername'); // Replace with actual username from user data
+  const dropdownHeight = useRef(new Animated.Value(0)).current;
+  const dropdownOpacity = useRef(new Animated.Value(0)).current;
+
+  const toggleDropdown = () => {
+    const toValue = showDropdown ? 0 : 200;
+    const opacityValue = showDropdown ? 0 : 1;
+    setShowDropdown(!showDropdown);
+
+    Animated.parallel([
+      Animated.spring(dropdownHeight, {
+        toValue,
+        useNativeDriver: false,
+        friction: 8,
+        tension: 40,
+      }),
+      Animated.timing(dropdownOpacity, {
+        toValue: opacityValue,
+        duration: 300,
+        useNativeDriver: false,
+      }),
+    ]).start();
+  };
+
   const handleLogout = () => {
     Alert.alert(
-      "Logout",
-      "Are you sure you want to logout?",
+      'Logout',
+      'Are you sure you want to logout?',
       [
         {
-          text: "Cancel",
-          onPress: () => console.log("Logout canceled"),
-          style: "cancel",
+          text: 'Cancel',
+          onPress: () => console.log('Logout canceled'),
+          style: 'cancel',
         },
         {
-          text: "Logout",
+          text: 'Logout',
           onPress: () => navigation.replace('Login'), // Replace with your login screen name
         },
       ],
@@ -22,30 +50,120 @@ const ProfileScreen = ({ navigation }) => {
     );
   };
 
+  const handleOptionSelect = (option) => {
+    toggleDropdown();
+    switch (option) {
+      case 'new':
+        // Add logic for new profile picture
+        break;
+      case 'username':
+        setIsEditingUsername(true); // Enable editing mode
+        break;
+      case 'email':
+        // Add logic for changing email
+        break;
+      case 'password':
+        // Add logic for changing password
+        break;
+    }
+  };
+
+    const handleSaveUsername = async () => {
+    try {
+      console.log('Attempting to update username:', username); // Debug log
+  
+      // Update the display name in the authentication table
+      const { data, error } = await supabase.auth.updateUser({
+        data: { display_name: username }, // Update the display name field
+      });
+  
+      if (error) {
+        console.error('Error updating username:', error.message);
+        Alert.alert('Error', 'Failed to update username. Please try again.');
+        return;
+      }
+  
+      console.log('Username updated successfully:', data);
+      Alert.alert('Success', 'Username updated successfully!');
+      setIsEditingUsername(false); // Exit editing mode
+  
+      // Fetch user data to verify the update
+      const { data: userData, error: fetchError } = await supabase.auth.getUser();
+      if (fetchError) {
+        console.error('Error fetching user data:', fetchError.message);
+      } else {
+        console.log('Updated user data:', userData);
+      }
+    } catch (err) {
+      console.error('Unexpected error:', err);
+      Alert.alert('Error', 'An unexpected error occurred. Please try again.');
+    }
+  };
+
   return (
-    <View style={styles.container}>
-      <UserHeader />
-      <Text style={styles.text}>Profile Screen</Text>
-      
-      <TouchableOpacity style={[styles.button, { backgroundColor: '#001F3F'}]} onPress={() => {}}>
-        <Text style={styles.buttonText}>Edit Information</Text>
-      </TouchableOpacity>
-      
-      <TouchableOpacity style={[styles.button, { backgroundColor: '#364c84' }]} onPress={() => {}}>
-        <Text style={styles.buttonText}>Change Theme</Text>
-      </TouchableOpacity>
-      
-      <TouchableOpacity style={[styles.button, { backgroundColor: '#95b1ee' }]} onPress={() => {}}>
-        <Text style={styles.buttonText}>Change Language</Text>
-      </TouchableOpacity>
-      
-      <TouchableOpacity style={[styles.button, { backgroundColor: '#660F24' }]} onPress={handleLogout}>
-        <Text style={[styles.buttonText, { color: 'white' }]}>Logout</Text>
-      </TouchableOpacity>
-      
-    </View>
+    <TouchableWithoutFeedback onPress={() => showDropdown && toggleDropdown()}>
+      <View style={styles.container}>
+        <View style={styles.profilePictureContainer}>
+          <UserHeader minimal />
+          <TouchableOpacity style={styles.editIconContainer} onPress={toggleDropdown}>
+            <MaterialIcons name="edit" size={24} color="white" />
+          </TouchableOpacity>
+        </View>
+
+        <Animated.View style={[styles.contentContainer]}>
+          <TouchableWithoutFeedback>
+            <Animated.View
+              style={[
+                styles.dropdown,
+                {
+                  height: dropdownHeight,
+                  opacity: dropdownOpacity,
+                  display: showDropdown ? 'flex' : 'none',
+                },
+              ]}
+            >
+              <TouchableOpacity style={styles.dropdownItem} onPress={() => handleOptionSelect('new')}>
+                <Text style={styles.dropdownText}>New Profile Picture</Text>
+              </TouchableOpacity>
+              <TouchableOpacity style={styles.dropdownItem} onPress={() => handleOptionSelect('username')}>
+                <Text style={styles.dropdownText}>Edit Username</Text>
+              </TouchableOpacity>
+              <TouchableOpacity style={styles.dropdownItem} onPress={() => handleOptionSelect('email')}>
+                <Text style={styles.dropdownText}>Change Email</Text>
+              </TouchableOpacity>
+              <TouchableOpacity style={styles.dropdownItem} onPress={() => handleOptionSelect('password')}>
+                <Text style={styles.dropdownText}>Change Password</Text>
+              </TouchableOpacity>
+            </Animated.View>
+          </TouchableWithoutFeedback>
+
+          {isEditingUsername && (
+            <View style={styles.editUsernameContainer}>
+              <TextInput
+                style={styles.editableTextInput}
+                value={username}
+                onChangeText={setUsername}
+                onBlur={handleSaveUsername} // Save when input loses focus
+                autoFocus
+              />
+              <TouchableOpacity onPress={handleSaveUsername} style={styles.saveButton}>
+                <Text style={styles.saveButtonText}>Save</Text>
+              </TouchableOpacity>
+            </View>
+          )}
+
+          <TouchableOpacity style={[styles.button, { backgroundColor: '#364c84' }]} onPress={() => {}}>
+            <Text style={styles.buttonText}>Change Theme</Text>
+          </TouchableOpacity>
+
+          <TouchableOpacity style={[styles.button, { backgroundColor: '#660F24' }]} onPress={handleLogout}>
+            <Text style={[styles.buttonText, { color: 'white' }]}>Logout</Text>
+          </TouchableOpacity>
+        </Animated.View>
+      </View>
+    </TouchableWithoutFeedback>
   );
-}
+};
 
 const styles = StyleSheet.create({
   container: {
@@ -55,10 +173,77 @@ const styles = StyleSheet.create({
     backgroundColor: '#dce2ef',
     padding: 20,
   },
-  text: {
-    fontSize: 24,
-    fontWeight: 'bold',
+  contentContainer: {
+    width: '100%',
+    alignItems: 'center',
+  },
+  profilePictureContainer: {
+    width: 120,
+    height: 120,
+    borderRadius: 60,
+    overflow: 'hidden',
     marginBottom: 30,
+    alignItems: 'center',
+    justifyContent: 'center',
+    backgroundColor: '#fff',
+    position: 'relative',
+  },
+  editIconContainer: {
+    position: 'absolute',
+    top: 0,
+    left: 0,
+    right: 0,
+    bottom: 0,
+    backgroundColor: 'rgba(77, 77, 77, 0.17)',
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  dropdown: {
+    width: '100%',
+    backgroundColor: 'white',
+    borderRadius: 25,
+    padding: 5,
+    marginBottom: 10,
+    shadowColor: '#000',
+    shadowOffset: {
+      width: 0,
+      height: 2,
+    },
+    shadowOpacity: 0.25,
+    shadowRadius: 3.84,
+    elevation: 5,
+    overflow: 'hidden',
+  },
+  dropdownItem: {
+    padding: 10,
+    borderBottomWidth: 1,
+    borderBottomColor: '#eee',
+  },
+  dropdownText: {
+    fontSize: 16,
+    color: '#333',
+  },
+  editUsernameContainer: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    marginVertical: 10,
+  },
+  editableTextInput: {
+    flex: 1,
+    borderBottomWidth: 1,
+    borderBottomColor: '#ccc',
+    fontSize: 16,
+    color: '#333',
+    marginRight: 10,
+  },
+  saveButton: {
+    backgroundColor: '#364c84',
+    padding: 10,
+    borderRadius: 5,
+  },
+  saveButtonText: {
+    color: 'white',
+    fontSize: 14,
   },
   button: {
     padding: 15,