From e3a2251898c330ffb9b52eb671db1c6cbfda2b05 Mon Sep 17 00:00:00 2001 From: Maarten Date: Thu, 8 Aug 2024 13:38:42 +0200 Subject: [PATCH] Set map coordinates of session as center --- app/(onboarding)/start.tsx | 4 ++-- app/(tabs)/map.tsx | 22 ++++++++++++++++++++-- app/(tabs)/settings.tsx | 6 +----- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/app/(onboarding)/start.tsx b/app/(onboarding)/start.tsx index 98fd606..a5756b9 100644 --- a/app/(onboarding)/start.tsx +++ b/app/(onboarding)/start.tsx @@ -1,7 +1,7 @@ import { Stack } from 'expo-router'; import { StyleSheet, TextInput, TouchableOpacity } from 'react-native'; import { router } from 'expo-router'; -import DeviceInfo from 'react-native-device-info'; +// import DeviceInfo from 'react-native-device-info'; import { ThemedText } from '@/components/ThemedText'; import { ThemedView } from '@/components/ThemedView'; @@ -27,7 +27,7 @@ export default function OnboardStartScreen() { } // Get device name info - const deviceName = DeviceInfo.getModel(); + const deviceName = ''; // DeviceInfo.getModel(); Request .post( 'sessions/create', { diff --git a/app/(tabs)/map.tsx b/app/(tabs)/map.tsx index 1b5adc8..aaba273 100644 --- a/app/(tabs)/map.tsx +++ b/app/(tabs)/map.tsx @@ -10,14 +10,32 @@ import { Colors } from '@/constants/Colors'; import { useColorScheme } from '@/hooks/useColorScheme'; import List from '@/components/List'; import { Request } from '@/services/request'; - +import { useToken } from '@/context/AppProvider'; +import { useIsFocused } from '@react-navigation/core'; export default function MapScreen() { const colorScheme = useColorScheme() ?? 'light'; + const { token, isLoading } = useToken(); + const isFocused = useIsFocused(); const [ types, setTypes ] = useState( [] ); + const [ coordinates, setCoordinates ] = useState( [] ); const [ markers, setMarkers ] = useState( [] ); + // Load session + useEffect( () => { + if (token) { + Request.post( 'sessions/get', { token: token } ).then( (response) => { + console.log('session', response); + if (response.success) { + const { session } = response; + + setCoordinates([session.coordinates.longitude, session.coordinates.latitude]); + } + } ) + } + }, [isFocused]); + // Load markers and types useEffect( () => { Mapbox.setTelemetryEnabled( false ); @@ -91,7 +109,7 @@ export default function MapScreen() { attributionEnabled={false} > diff --git a/app/(tabs)/settings.tsx b/app/(tabs)/settings.tsx index 7ab7bdf..f1c0d04 100644 --- a/app/(tabs)/settings.tsx +++ b/app/(tabs)/settings.tsx @@ -19,7 +19,6 @@ import { useToken } from '@/context/AppProvider'; import { Message } from '@/services/message'; import { Request } from '@/services/request'; import CustomModal from '@/components/EditModal'; -import { err } from 'react-native-svg'; export default function SettingsScreen() { const colorScheme = useColorScheme() ?? 'light'; @@ -89,10 +88,7 @@ export default function SettingsScreen() { } else { Message.error( response.message ); } - } ) - .catch( (error) => { - console.log( 'error', error ); - } ) + } ); }; const logout = () => {