From 795d935413dca38e2d06e578e91f5665b8f82c21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoni=20Nu=C3=B1ez?= Date: Fri, 17 Jul 2026 16:11:10 +0000 Subject: [PATCH] Remove Google Maps vs OSM --- apps/frontend-mobile/app.json | 8 +--- apps/frontend-mobile/app/(tabs)/map.tsx | 3 +- apps/frontend-mobile/app/(tabs)/search.tsx | 49 +++++++++++----------- apps/frontend-mobile/app/medicine/[id].tsx | 3 +- apps/frontend-mobile/app/pharmacy/[id].tsx | 3 +- 5 files changed, 29 insertions(+), 37 deletions(-) diff --git a/apps/frontend-mobile/app.json b/apps/frontend-mobile/app.json index 55b0a94..8fe6891 100644 --- a/apps/frontend-mobile/app.json +++ b/apps/frontend-mobile/app.json @@ -24,13 +24,7 @@ "foregroundImage": "./assets/adaptive-icon.png", "backgroundColor": "#007AFF" }, - "package": "com.farmafinder.app", - "googleServicesFile": "./google-services.json", - "config": { - "googleMaps": { - "apiKey": "" - } - } + "package": "com.farmafinder.app" }, "plugins": [ "expo-router", diff --git a/apps/frontend-mobile/app/(tabs)/map.tsx b/apps/frontend-mobile/app/(tabs)/map.tsx index aebd46e..acb25e2 100644 --- a/apps/frontend-mobile/app/(tabs)/map.tsx +++ b/apps/frontend-mobile/app/(tabs)/map.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from 'react'; import { View, StyleSheet, Text } from 'react-native'; -import MapView, { Marker, UrlTile, PROVIDER_DEFAULT } from 'react-native-maps'; +import MapView, { Marker, UrlTile } from 'react-native-maps'; import { useRouter } from 'expo-router'; import { getPharmacies } from '../../services/pharmacies'; import { LoadingSpinner } from '../../components/LoadingSpinner'; @@ -54,7 +54,6 @@ export default function MapScreen() { item.nregistro} renderItem={({ item }) => } - ListHeaderComponent={ - <> - {products.length > 0 && ( - - {t('search.parapharmacy')} - {products.map((product) => ( - router.push(`/product/${product.source}/${product.id || product._id}`)} - activeOpacity={0.7} - > - - - - {t('search.parapharmacy')} - + ListEmptyComponent={ + products.length === 0 ? null : undefined + } + ListFooterComponent={ + products.length > 0 ? ( + + {t('search.parapharmacy')} + {products.map((product) => ( + router.push(`/product/${product.source}/${product.id || product._id}`)} + activeOpacity={0.7} + > + + + + {t('search.parapharmacy')} - {product.name} - {product.brand} • {product.price}€ - - ))} - - )} - + {product.name} + {product.brand} • {product.price}€ + + + ))} + + ) : null } contentContainerStyle={[styles.list, isTablet && styles.listTablet]} showsVerticalScrollIndicator={false} diff --git a/apps/frontend-mobile/app/medicine/[id].tsx b/apps/frontend-mobile/app/medicine/[id].tsx index 69532e6..20f053a 100644 --- a/apps/frontend-mobile/app/medicine/[id].tsx +++ b/apps/frontend-mobile/app/medicine/[id].tsx @@ -3,7 +3,7 @@ import { View, Text, ScrollView, StyleSheet, TouchableOpacity, Linking } from 'r import { useLocalSearchParams, useRouter } from 'expo-router'; import { Ionicons } from '@expo/vector-icons'; import * as Location from 'expo-location'; -import MapView, { Marker, UrlTile, PROVIDER_DEFAULT } from 'react-native-maps'; +import MapView, { Marker, UrlTile } from 'react-native-maps'; import { getMedicine, getMedicinePharmacies } from '../../services/medicines'; import { subscribeToMedicine, unsubscribeFromMedicine } from '../../services/notifications'; import { useAuth } from '../../hooks/useAuth'; @@ -209,7 +209,6 @@ export default function MedicineDetailScreen() {