diff --git a/app/_layout.tsx b/app/_layout.tsx index 97c1dc3..845f03c 100644 --- a/app/_layout.tsx +++ b/app/_layout.tsx @@ -6,7 +6,7 @@ import 'react-native-reanimated'; import { useColorScheme } from 'react-native'; import { PaperProvider, Provider } from "react-native-paper"; import { UserProvider, useUser } from "@/context/UserContext"; -import themes from '@/app/themes' +import themes from '@/assets/themes' import log from "@/util/log" // Prevent the splash screen from auto-hiding before asset loading is complete. diff --git a/app/index.tsx b/app/index.tsx index 5a18aec..44ad80f 100644 --- a/app/index.tsx +++ b/app/index.tsx @@ -1,11 +1,12 @@ import React from 'react'; import {View, Text } from "react-native"; import { useTheme } from "react-native-paper"; -import ProfileScreen from "@/app/ProfileScreen"; -import StatusPage from "@/app/StatusPage"; -import Nav from "@/app/Nav"; +import ProfileScreen from "@/components/ProfileScreen"; +import StatusPage from "@/components/StatusPage"; +import Nav from "@/components/Nav"; +import BottomNav from "@/components/BottomNav" import { useUser } from "@/context/UserContext"; -import styles from "@/app/styles"; +import styles from "@/assets/styles"; import log from "@/util/log" const Index = () => { @@ -62,6 +63,7 @@ const Index = () => { setChanged={setUserDataChanged} onClose={() => setProfileActive(false)} /> + ); }; diff --git a/app/styles.ts b/assets/styles.ts similarity index 100% rename from app/styles.ts rename to assets/styles.ts diff --git a/app/themes.ts b/assets/themes.ts similarity index 100% rename from app/themes.ts rename to assets/themes.ts diff --git a/components/BottomNav.tsx b/components/BottomNav.tsx new file mode 100644 index 0000000..65a535b --- /dev/null +++ b/components/BottomNav.tsx @@ -0,0 +1,19 @@ +import {Appbar, Portal, Button, Dialog, Menu, Text, useTheme} from "react-native-paper"; +import {Image, useColorScheme, View} from "react-native"; +import styles from "@/assets/styles"; + +const BottomNav = () => { + const theme = useTheme(); + return ( + + + + Daisy Knight Dog Park + (change) + + + + ) +} + +export default BottomNav; diff --git a/app/Nav.tsx b/components/Nav.tsx similarity index 98% rename from app/Nav.tsx rename to components/Nav.tsx index 361f1cf..2c3d326 100644 --- a/app/Nav.tsx +++ b/components/Nav.tsx @@ -1,7 +1,7 @@ import {Appbar, Portal, Button, Dialog, Menu, Text, useTheme} from "react-native-paper"; import {Image, useColorScheme, View} from "react-native"; import React, {useState} from "react"; -import styles from "@/app/styles"; +import styles from "@/assets/styles"; const Nav = ({ toggleProfile }: { toggleProfile: () => void; }) => { const theme = useTheme(); diff --git a/app/ProfileScreen.tsx b/components/ProfileScreen.tsx similarity index 99% rename from app/ProfileScreen.tsx rename to components/ProfileScreen.tsx index ea6023a..78fbeda 100644 --- a/app/ProfileScreen.tsx +++ b/components/ProfileScreen.tsx @@ -4,8 +4,8 @@ import { Button, TextInput, Dialog, Portal, Avatar, useTheme, Text } from "react import { Asset } from 'expo-asset'; import * as FileSystem from 'expo-file-system'; import * as ImagePicker from "expo-image-picker"; -import themes from '@/app/themes'; -import styles from "@/app/styles"; +import themes from '@/assets/themes'; +import styles from "@/assets/styles"; import log from "@/util/log" import featureFlags from '@/util/featureFlags'; diff --git a/app/StatusPage.tsx b/components/StatusPage.tsx similarity index 99% rename from app/StatusPage.tsx rename to components/StatusPage.tsx index 2b77f66..b8f3d52 100644 --- a/app/StatusPage.tsx +++ b/components/StatusPage.tsx @@ -3,8 +3,8 @@ import useWebSocket from "react-use-websocket"; import axios from "axios"; import {Animated, Easing, ImageBackground, useColorScheme, View} from "react-native"; import { Avatar, List, Button, useTheme, } from "react-native-paper"; -import themes from "@/app/themes"; -import styles from "@/app/styles"; +import themes from "@/assets/themes"; +import styles from "@/assets/styles"; import log from "@/util/log" export const API_URL = process.env.EXPO_PUBLIC_API_URL;