fixed api requests

android/gradle.properties

@@ -54,3 +54,5 @@ EX_DEV_CLIENT_NETWORK_INSPECTOR=true
 
 # Use legacy packaging to compress native libraries in the resulting APK.
 expo.useLegacyPackaging=false
+
+VisionCamera_enableCodeScanner=true

ios/app/Info.plist

@@ -49,7 +49,9 @@
       <true/>
     </dict>
     <key>NSCameraUsageDescription</key>
-    <string>Allow $(PRODUCT_NAME) to access your camera</string>
+    <string>$(PRODUCT_NAME) needs access to your Camera.</string>
+    <key>NSMotionUsageDescription</key>
+    <string>Allow $(PRODUCT_NAME) to access your device motion</string>
     <key>UILaunchStoryboardName</key>
     <string>SplashScreen</string>
     <key>UIRequiredDeviceCapabilities</key>

package.json

@@ -22,6 +22,7 @@
     "react-countup": "^6.5.3",
     "react-native": "0.74.2",
     "react-native-compass-heading": "^1.5.0",
+    "react-native-config": "^1.5.2",
     "react-native-permissions": "^4.1.5",
     "react-native-progress": "^5.0.1",
     "react-native-safe-area-context": "4.10.1",

src/screens/AtividadeScreen.js

@@ -26,6 +26,7 @@ export default function AtividadeScreen({ route, navigation }) {
   const [data, setData] = useState([]);
   const [isLoading, setLoading] = useState(true);
   const [degree, setDegree] = useState(0);
+  const TRAIL_API_BASE_URL = __DEV__ ? 'http://172.26.196.22:5000' : 'https://ALGUMACOISA.COM';
 
   const item = route.params.item;
 
@@ -36,8 +37,10 @@ export default function AtividadeScreen({ route, navigation }) {
 
   const getTrees = async () => {
     try {
-      const response = await fetch('http://192.168.0.12:5000/trails/' + item.id + '/trees');
+      setLoading(true);
+      const response = await fetch(TRAIL_API_BASE_URL + '/trails/' + item.id + '/trees');
       const trees = await response.json();
+      console.log(trees);
       setData(trees);
     } catch (error) {
       console.error(error);
@@ -54,7 +57,8 @@ export default function AtividadeScreen({ route, navigation }) {
     if (route.params?.sucess) {
       if (route.params.sucess) {
         setArvore(n => n + 1);
-        setDistancia(n => n + data[arvore].distance);
+        const distance = data[arvore + 1] != null && data[arvore + 1].distance != null? data[arvore + 1].distance : 0;
+        setDistancia(n => n + distance);
       }
       route.params.sucess = false;
     }
@@ -82,7 +86,7 @@ export default function AtividadeScreen({ route, navigation }) {
   return (
     <View style={{ flex: 1, flexDirection: 'column' }}>
       <View style={{ flex: 5, backgroundColor: 'whitesmoke' }}>
-        <ZoomableImage source={require('../assets/mapa.jpg')} />
+        <ZoomableImage source={{uri: item.map_img.replace('localhost', '172.26.196.22')}} />
       </View>
       <View style={{
         flex: 2.5,

src/screens/FinalScreen.js

@@ -22,7 +22,7 @@ export default function FinalScreen({ route, navigation }) {
       <View style={{ flex: 5, backgroundColor: 'yellow' }}>
         <Image style={{ height: '100%', width: 'undefined', resizeMode: 'cover' }}
           // style={styles.roundImage}
-          source={require('../assets/flamboyant-laranja-esalq.jpg')}
+          source={{uri: item.thumb_img.replace('localhost', '172.26.196.22')}}
         />
       </View>
 

src/screens/IniciarScreen.js

@@ -17,7 +17,7 @@ export default function IniciarScreen({ route, navigation }) {
           showsHorizontalScrollIndicator={false}>
           <Image style={{ height: '100%', width: 'undefined', aspectRatio: 1, resizeMode: 'cover' }}
             // style={styles.roundImage}
-            source={require('../assets/mapa.jpg')}
+            source={{uri: item.thumb_img.replace('localhost', '172.26.196.22')}}
           />
         </ScrollView>
       </View>

src/screens/TrilhasScreen.js

@@ -14,7 +14,7 @@ function TrilhaCard({ item, navigation }) {
         <View style={styles.cardHeader}>
           <Image
             style={styles.roundImage}
-            source={require('../assets/flamboyant-laranja-esalq.jpg')}
+            source={{uri: item.thumb_img.replace('localhost', '172.26.196.22')}}
           />
           <View style={styles.subCard}>
             <Text style={styles.cardTitle}>
@@ -41,10 +41,13 @@ function TrilhaCard({ item, navigation }) {
 export default function TrilhasScreen({ navigation }) {
   const [isLoading, setLoading] = useState(true);
   const [data, setData] = useState([]);
+  const TRAIL_API_BASE_URL = __DEV__ ? 'http://172.26.196.22:5000' : 'google.com';
+
 
   const getMovies = async () => {
     try {
-      const response = await fetch('http://192.168.0.12:5000/trails/');
+      console.log(TRAIL_API_BASE_URL);
+      const response = await fetch(TRAIL_API_BASE_URL + '/trails/');
       const json = await response.json();
       console.log(json);
       setData(json);

src/styles/styles.js

@@ -45,7 +45,8 @@ export const styles = StyleSheet.create({
       width: '25%', 
       height: 'undefined', 
       aspectRatio: 1, 
-      borderRadius: 4
+      borderRadius: 4,
+      resizeMode: 'contain'
     },
     card : {
       flex: 1,