diff --git a/app/index.tsx b/app/index.tsx index 1abda23..8ef59ff 100644 --- a/app/index.tsx +++ b/app/index.tsx @@ -63,7 +63,9 @@ const Index = () => { setChanged={setUserDataChanged} onClose={() => setProfileActive(false)} /> - setProfileActive(true)}/> + ); }; diff --git a/components/BottomNav.tsx b/components/BottomNav.tsx index 825d791..ef34704 100644 --- a/components/BottomNav.tsx +++ b/components/BottomNav.tsx @@ -1,24 +1,44 @@ -import {Appbar, Button, Text, useTheme} from "react-native-paper"; -import {View} from "react-native"; +import {Appbar, Portal, Button, Dialog, Text, useTheme } from "react-native-paper"; +import { View } from "react-native"; import styles from "@/assets/styles"; -import React from "react"; +import React, {useState} from "react"; +import Location from "@/components/Location"; -const BottomNav = ({ toggleLocation }: { toggleLocation: () => void; }) => { + +interface BNProps { + isProfileActive: boolean; +} +const BottomNav: React.FC = ({ isProfileActive }) => { const theme = useTheme(); + const [menuVisible, setMenuVisible] = useState(false); + return ( - - - - Daisy Knight Dog Park - - - + + + + + Daisy Knight Dog Park + + + + + setMenuVisible(false)} style={{ backgroundColor: theme.colors.primaryContainer, maxHeight: 400 }}> + Location + + + + + + + ) } diff --git a/components/Broken.tsx b/components/Broken.tsx index ed4f419..f31fc98 100644 --- a/components/Broken.tsx +++ b/components/Broken.tsx @@ -1,4 +1,4 @@ -import {Dialog, useTheme} from "react-native-paper"; +import {Dialog, Title, useTheme} from "react-native-paper"; import { Image } from "react-native"; import React from "react"; @@ -7,12 +7,12 @@ const theme = useTheme(); const Broken = () => { return ( - The Internet is a Series of Tubes + The Internet is a Series of Tubes - And these aren't connected. {"\n"} (We're still working on this part.) + And these aren't connected. {"\n"} (We're still working on this part.) ); }; diff --git a/components/Location.tsx b/components/Location.tsx index f1570a1..0ecac90 100644 --- a/components/Location.tsx +++ b/components/Location.tsx @@ -1,22 +1,9 @@ -import { Dialog, Portal } from "react-native-paper"; -import React, {useEffect} from "react"; +import React from "react"; import Broken from "@/components/Broken"; -interface LocationProps { - visible: boolean; -} -const Location: React.FC = ({ visible }) => { - useEffect(() => { - if (visible) { - - } - }, [visible]); +const Location = () => { return ( - - - - - + ) } diff --git a/components/TopNav.tsx b/components/TopNav.tsx index 6ea72a5..bd468e9 100644 --- a/components/TopNav.tsx +++ b/components/TopNav.tsx @@ -59,7 +59,7 @@ const TopNav = ({ toggleProfile }: { toggleProfile: () => void; }) => { setBugVisible(false)} style={{ backgroundColor: theme.colors.primaryContainer }}> - Privacy Policy + Report A Bug