Merge branch 'dev' into tablet

app/(auth)/_layout.tsx

@@ -6,8 +6,8 @@ import {
   DrawerItem,
   DrawerItemList,
 } from "@react-navigation/drawer";
-import { Button, View, Text, ButtonSize, Constants } from "react-native-ui-lib";
-import { StyleSheet } from "react-native";
+import { Button, View, Text, ButtonSize } from "react-native-ui-lib";
+import { Dimensions, ImageBackground, StyleSheet } from "react-native";
 import Feather from "@expo/vector-icons/Feather";
 import DrawerButton from "@/components/shared/DrawerButton";
 import {
@@ -24,9 +24,21 @@ import NavBrainDumpIcon from "@/assets/svgs/NavBrainDumpIcon";
 import NavCalendarIcon from "@/assets/svgs/NavCalendarIcon";
 import NavSettingsIcon from "@/assets/svgs/NavSettingsIcon";
 import ViewSwitch from "@/components/pages/(tablet_pages)/ViewSwitch";
+import { useAtom, useSetAtom } from "jotai";
+import {
+  isFamilyViewAtom,
+  settingsPageIndex,
+  toDosPageIndex,
+  userSettingsView,
+} from "@/components/pages/calendar/atoms";
+import FeedbackNavIcon from "@/assets/svgs/FeedbackNavIcon";
 
 export default function TabLayout() {
   const { mutateAsync: signOut } = useSignOut();
+  const setIsFamilyView = useSetAtom(isFamilyViewAtom);
+  const setPageIndex = useSetAtom(settingsPageIndex);
+  const setUserView = useSetAtom(userSettingsView);
+  const setToDosIndex = useSetAtom(toDosPageIndex);
 
   return (
     <Drawer
@@ -45,12 +57,20 @@ export default function TabLayout() {
           backgroundColor: "#f9f8f7",
           height: "100%",
         },
-        drawerIcon: () => <MenuIcon />,
       }}
       drawerContent={(props) => {
         return (
-          <DrawerContentScrollView {...props} style={{ height: "100%" }}>
-            <View centerH centerV margin-30>
+          <DrawerContentScrollView {...props} style={{}}>
+            <View centerV marginH-30 marginT-20 marginB-20 row>
+              <ImageBackground
+                source={require("../../assets/images/splash.png")}
+                style={{
+                  backgroundColor: "transparent",
+                  height: 51.43,
+                  aspectRatio: 1,
+                  marginRight: 8,
+                }}
+              />
               <Text style={styles.title}>Welcome to Cally</Text>
             </View>
             <View
@@ -64,16 +84,41 @@ export default function TabLayout() {
                   title={"Calendar"}
                   color="rgb(7, 184, 199)"
                   bgColor={"rgb(231, 248, 250)"}
-                  pressFunc={() => props.navigation.navigate("calendar")}
+                  pressFunc={() => {
+                    props.navigation.navigate("calendar");
+                    setPageIndex(0);
+                    setToDosIndex(0);
+                    setUserView(true);
+                    setIsFamilyView(false);
+                  }}
                   icon={<NavCalendarIcon />}
                 />
                 <DrawerButton
                   color="#50be0c"
                   title={"Groceries"}
                   bgColor={"#eef9e7"}
-                  pressFunc={() => props.navigation.navigate("grocery")}
+                  pressFunc={() => {
+                    props.navigation.navigate("grocery");
+                    setPageIndex(0);
+                    setToDosIndex(0);
+                    setUserView(true);
+                    setIsFamilyView(false);
+                  }}
                   icon={<NavGroceryIcon />}
                 />
+                <DrawerButton
+                  color="#ea156d"
+                  title={"Feedback"}
+                  bgColor={"#fdedf4"}
+                  pressFunc={() => {
+                    props.navigation.navigate("feedback");
+                    setPageIndex(0);
+                    setToDosIndex(0);
+                    setUserView(true);
+                    setIsFamilyView(false);
+                  }}
+                  icon={<FeedbackNavIcon />}
+                />
               </View>
               <View style={{ flex: 1 }}>
                 {/*<DrawerButton
@@ -93,21 +138,39 @@ export default function TabLayout() {
                   color="#8005eb"
                   title={"To Do's"}
                   bgColor={"#f3e6fd"}
-                  pressFunc={() => props.navigation.navigate("todos")}
+                  pressFunc={() => {
+                    props.navigation.navigate("todos");
+                    setPageIndex(0);
+                    setToDosIndex(0);
+                    setUserView(true);
+                    setIsFamilyView(false);
+                  }}
                   icon={<NavToDosIcon />}
                 />
                 <DrawerButton
                   color="#e0ca03"
                   title={"Brain Dump"}
                   bgColor={"#fffacb"}
-                  pressFunc={() => props.navigation.navigate("brain_dump")}
+                  pressFunc={() => {
+                    props.navigation.navigate("brain_dump");
+                    setPageIndex(0);
+                    setToDosIndex(0);
+                    setUserView(true);
+                    setIsFamilyView(false);
+                  }}
                   icon={<NavBrainDumpIcon />}
                 />
                 {/*<DrawerItem label="Logout" onPress={() => signOut()} />*/}
               </View>
             </View>
             <Button
-              onPress={() => props.navigation.navigate("settings")}
+              onPress={() => {
+                props.navigation.navigate("settings");
+                setPageIndex(0);
+                setToDosIndex(0);
+                setUserView(true);
+                setIsFamilyView(false);
+              }}
               label={"Manage Settings"}
               labelStyle={styles.label}
               iconSource={() => (
@@ -135,9 +198,9 @@ export default function TabLayout() {
             <Button
               size={ButtonSize.large}
               marginH-30
+              marginT-12
               paddingV-15
               style={{
-                marginTop: "42%",
                 backgroundColor: "transparent",
                 borderWidth: 1.3,
                 borderColor: "#fd1775",
@@ -198,9 +261,13 @@ export default function TabLayout() {
         name="todos"
         options={{
           drawerLabel: "To-Do",
-          title: "To-Do's",
+          title: "To-Dos",
         }}
       />
+      <Drawer.Screen
+        name="feedback"
+        options={{ drawerLabel: "Feedback", title: "Feedback" }}
+      />
     </Drawer>
   );
 }

app/(auth)/feedback/_layout.tsx

@@ -0,0 +1,5 @@
+import {Stack} from "expo-router";
+
+export default function StackLayout () {
+    return <Stack screenOptions={{headerShown: false}}/>
+}

app/(auth)/feedback/index.tsx

@@ -0,0 +1,13 @@
+import FeedbackPage from "@/components/pages/feedback/FeedbackPage";
+import { FeedbackProvider } from "@/contexts/FeedbackContext";
+import { View } from "react-native-ui-lib";
+
+export default function Screen() {
+  return (
+    <FeedbackProvider>
+      <View>
+          <FeedbackPage />
+      </View>
+    </FeedbackProvider>
+  );
+}