diff --git a/mobile/app/(tabs)/_layout.tsx b/mobile/app/(tabs)/_layout.tsx index acbdee433ea88ce8f214506973b40f3ed4a7370f..8a503eb8ab3183d346708fc8f5939cead5aa84a7 100644 --- a/mobile/app/(tabs)/_layout.tsx +++ b/mobile/app/(tabs)/_layout.tsx @@ -24,7 +24,6 @@ export default function Layout() { color: LIGTHT_THEME.color.white, }, headerTitleAlign: "center", - }} > - - + ); } \ No newline at end of file diff --git a/mobile/app/_layout.tsx b/mobile/app/_layout.tsx index 2ef26b5ef9f38060284b6e8d0a76838285af679b..aaff8dba5e6c2b6451ed525b4ee0440fd6e1b145 100644 --- a/mobile/app/_layout.tsx +++ b/mobile/app/_layout.tsx @@ -4,13 +4,16 @@ import { LIGTHT_THEME } from "../src/constants/theme"; import { AuthContextProvider, useAuth } from "../src/contexts/auth_context"; import { ActivityIndicator } from "react-native"; import { GestureHandlerRootView } from "react-native-gesture-handler"; +import { AudioContextProvider } from "../src/contexts/audio_context"; export default function Root() { return ( - + + + @@ -23,10 +26,16 @@ const MainLayout = () => { if (isLoading) { return ; } - + return ( - - + + { /> { headerShown: false, }} /> + + ); }; diff --git a/mobile/app/login.tsx b/mobile/app/login.tsx index d574b54332899c8146da2303ea23f71130ec3579..f1e466a180bfb91bf97956a2b0ae592dabf0b751 100644 --- a/mobile/app/login.tsx +++ b/mobile/app/login.tsx @@ -1,4 +1,4 @@ -import { LoginPage } from "../src/screens/login/login_page"; +import { LoginPage } from "../src/auth/pages/login_page"; const LoginScreen = () => { return ( diff --git a/mobile/app/scan.tsx b/mobile/app/scan.tsx index 7f00020bb6385157fe51d9f21efca1ab05c23bdd..16a0619e430afbc119bb5e75cdd782ad28e60524 100644 --- a/mobile/app/scan.tsx +++ b/mobile/app/scan.tsx @@ -1,113 +1,7 @@ -import { View, Text, Button, StyleSheet, Animated } from "react-native"; -import { useQRScanner } from "../src/hooks/useQRScanner"; -import { CameraView } from "expo-camera/next"; -import { BarCodeScanningResult } from "expo-camera"; -import { useEffect, useRef } from "react"; +import ScanPage from "../src/screens/scan/scan_page"; export default function ScanScreen() { - const { hasPermission, getPermission, scanning, onQRScanned, qrData } = - useQRScanner(); - - const qrAnimation = useRef(new Animated.Value(0)).current; - - const startAnimation = () => { - Animated.loop( - Animated.sequence([ - Animated.timing(qrAnimation, { - toValue: 1, - duration: 1000, - useNativeDriver: true, - }), - Animated.timing(qrAnimation, { - toValue: 0, - duration: 1000, - useNativeDriver: true, - }), - ]) - ).start(); - }; - - useEffect(() => { - return () => { - qrAnimation.stopAnimation(); - }; - }, []); - - if (!hasPermission) { - return ( - - No permission -