diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 02eb80d9..e13174af 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -94,21 +94,13 @@ io.flutter.embedded_views_preview + LSApplicationQueriesSchemes + + comgooglemaps + baidumap + iosamap + -LSApplicationQueriesSchemes - - comgooglemaps - baidumap - iosamap - waze - yandexmaps - yandexnavi - citymapper - mapswithme - osmandmaps - dgis - qqmap - here-location - + diff --git a/lib/pages/pharmacies/screens/product-details/availability_info.dart b/lib/pages/pharmacies/screens/product-details/availability_info.dart index 08c6d5de..5cacf64d 100644 --- a/lib/pages/pharmacies/screens/product-details/availability_info.dart +++ b/lib/pages/pharmacies/screens/product-details/availability_info.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; import 'package:maps_launcher/maps_launcher.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:map_launcher/map_launcher.dart'; +import 'dart:io' show Platform; class AvailabilityInfo extends StatelessWidget { final ProductDetailViewModel previousModel; @@ -55,13 +56,18 @@ class AvailabilityInfo extends StatelessWidget { icon: Icon(Icons.location_on), color: Colors.red, onPressed: () { - MapLauncher.showMarker( + if (Platform.isIOS) { MapLauncher.showMarker( + mapType: MapType.apple, + coords: Coords(double.parse(previousModel.productLocationService[index].latitude), + double.parse(previousModel.productLocationService[index].longitude)), + title: previousModel.productLocationService[index].locationDescription,); + } else { MapLauncher.showMarker( mapType: MapType.google, coords: Coords(double.parse(previousModel.productLocationService[index].latitude), double.parse(previousModel.productLocationService[index].longitude)), title: previousModel.productLocationService[index].locationDescription, -// description: location.locationName, - ); + // description: location.locationName, + ); } // MapsLauncher.launchCoordinates(double.parse(previousModel.productLocationService[index].latitude), double.parse(previousModel.productLocationService[index].longitude), previousModel.productLocationService[index].locationDescription); }, ), diff --git a/lib/widgets/hospital_location.dart b/lib/widgets/hospital_location.dart index e9395906..edd7f473 100644 --- a/lib/widgets/hospital_location.dart +++ b/lib/widgets/hospital_location.dart @@ -77,14 +77,19 @@ class HospitalLocation extends StatelessWidget { Column( children: [ contactButton(Icons.location_on, TranslationBase.of(context).locationa, () { - // MapsLauncher.launchCoordinates(double.parse(location.latitude), double.parse(location.longitude), location.locationName); - MapLauncher.showMarker( - mapType: MapType.google, + // MapsLauncher.launchCoordinates(double.parse(location.latitude), double.parse(location.longitude), location.locationName); + if (Platform.isIOS) { MapLauncher.showMarker( +// mapType: MapType.google, + mapType: MapType.apple, coords: Coords(double.parse(location.latitude), double.parse(location.longitude)), - title: location.locationName, -// description: location.locationName, - ); - }), + title: location.locationName,); + } else { MapLauncher.showMarker( + mapType: MapType.google, + coords: Coords(double.parse(location.latitude), double.parse(location.longitude)), + title: location.locationName, + // description: location.locationName, + ); }} + ), SizedBox(height: 10), contactButton(Icons.call, TranslationBase.of(context).callNow, () { launch("tel://" + location.phoneNumber); @@ -118,5 +123,4 @@ class HospitalLocation extends StatelessWidget { } - }