merge modal changes in 147l

A4/app.json

@@ -1,24 +1,27 @@
 {
   "expo": {
-    "name": "cs47-a3-starter-w23",
-    "slug": "cs47-a3-starter-w23",
+    "name": "FitCast",
+    "slug": "FitCast",
+    "sdkVersion": "49.0.21",
+    "description": "Forecasting your outfits",
     "version": "1.0.0",
     "orientation": "portrait",
-    "icon": "./assets/icon.png",
+    "icon": "./assets/Images/fitcast2.png",
     "userInterfaceStyle": "light",
     "splash": {
-      "image": "./assets/splash.png",
+      "image": "./assets/Images/fitcast2.png",
       "resizeMode": "contain",
       "backgroundColor": "#ffffff"
     },
     "scheme": "exp",
     "updates": {
-      "fallbackToCacheTimeout": 0
+      "fallbackToCacheTimeout": 0,
+      "url": "https://u.expo.dev/2c3a7fee-8c5c-4105-b727-79d024598c77"
     },
-
     "assetBundlePatterns": ["**/*"],
     "ios": {
-      "supportsTablet": true
+      "supportsTablet": true,
+      "bundleIdentifier": "com.ashc.FitCast"
     },
     "android": {
       "adaptiveIcon": {
@@ -29,6 +32,17 @@
     "web": {
       "favicon": "./assets/favicon.png"
     },
-    "plugins": ["expo-router"]
+    "plugins": ["expo-router"],
+    "extra": {
+      "router": {
+        "origin": false
+      },
+      "eas": {
+        "projectId": "2c3a7fee-8c5c-4105-b727-79d024598c77"
+      }
+    },
+    "runtimeVersion": {
+      "policy": "appVersion"
+    }
   }
 }

A4/app/_layout.js

@@ -90,7 +90,7 @@ export default function Layout() {
           drawerItemStyle: { height: 0 },
         }}
       />
-      <Drawer.Screen //DELETE LATER
+      <Drawer.Screen
         name="screens/timelineDetail3-Rainy"
         options={{
           drawerLabel: "Weather Timeline 3",
@@ -100,7 +100,7 @@ export default function Layout() {
           drawerItemStyle: { height: 0 },
         }}
       />
-      <Drawer.Screen //DELETE LATER
+      <Drawer.Screen
         name="screens/timelineDetail4-Night"
         options={{
           drawerLabel: "Weather Timeline 4",
@@ -110,6 +110,62 @@ export default function Layout() {
           drawerItemStyle: { height: 0 },
         }}
       />
+      <Drawer.Screen
+        name="components/backHeader"
+        options={{
+          headerShown: false,
+          drawerItemStyle: { height: 0 },
+        }}
+      />
+      <Drawer.Screen
+        name="components/exitHeader"
+        options={{
+          headerShown: false,
+          drawerItemStyle: { height: 0 },
+        }}
+      />
+      <Drawer.Screen
+        name="components/header"
+        options={{
+          headerShown: false,
+          drawerItemStyle: { height: 0 },
+        }}
+      />
+      <Drawer.Screen
+        name="components/locationClothingItem"
+        options={{
+          headerShown: false,
+          drawerItemStyle: { height: 0 },
+        }}
+      />
+      <Drawer.Screen
+        name="components/timelineDetailComp"
+        options={{
+          headerShown: false,
+          drawerItemStyle: { height: 0 },
+        }}
+      />
+      <Drawer.Screen
+        name="screens/modals/locationModal"
+        options={{
+          headerShown: false,
+          drawerItemStyle: { height: 0 },
+        }}
+      />
+      <Drawer.Screen
+        name="screens/modals/logModal"
+        options={{
+          headerShown: false,
+          drawerItemStyle: { height: 0 },
+        }}
+      />
+      <Drawer.Screen
+        name="screens/modals/smartModal"
+        options={{
+          headerShown: false,
+          drawerItemStyle: { height: 0 },
+        }}
+      />
     </Drawer>
   );
 }

A4/app/components/header.js

@@ -8,7 +8,7 @@ const Header = () => {
   const navigation = useNavigation();
 
   const navigateHome = () => {
-    navigation.navigate("index"); // Replace 'Home' with the actual route name of your home screen
+    navigation.navigate("index");
   };
 
   return (
@@ -31,9 +31,6 @@ export { Header };
 
 const headerStyles = StyleSheet.create({
   container: {
-    // position: "absolute",
-    //borderColor: "black",
-    //borderWidth: 1,
     top: 0,
     left: 0,
     width: "100%",
@@ -47,46 +44,3 @@ const headerStyles = StyleSheet.create({
     justifyContent: "space-between",
   },
 });
-// import { StyleSheet, View, Text, Dimensions } from "react-native";
-
-// import { Images, Themes } from "../../assets/Themes";
-// const windowDimensions = Dimensions.get("window");
-
-// export default function Header() {
-//   // const params = useLocalSearchParams();
-//   return (
-//     <View style={styles.topBar}>
-//       <View style={styles.topBarContainer}>
-//         <Image source={Images.spotify} style={styles.fitCastLogo} />
-//         <Text style={styles.fitCastText}>FitCast Header</Text>
-//       </View>
-//     </View>
-//   );
-// }
-
-// const styles = StyleSheet.create({
-//   topBar: {
-//     flexDirection: "row",
-//     height: 60,
-//     width: Dimensions.get("window").width,
-//     alignItems: "center",
-//     justifyContent: "center",
-//   },
-//   topBarContainer: {
-//     flexDirection: "row",
-
-//     alignItems: "center",
-//     justifyContent: "center",
-//   },
-//   fitCastLogo: {
-//     // flex: 2,
-//     resizeMode: "contain",
-//     height: 25,
-//     width: 25,
-//   },
-//   fitCastText: {
-//     fontSize: 25,
-//     fontWeight: "bold",
-//     paddingLeft: 10,
-//   },
-// });