From ef7fdd730a59cd00f93a0e37409000b579e92d2f Mon Sep 17 00:00:00 2001 From: Bhargav B L Date: Tue, 22 Jun 2021 10:39:43 +0530 Subject: [PATCH 01/49] null safety migra --- example/android/app/build.gradle | 2 +- example/lib/main.dart | 1 - example/pubspec.lock | 30 +++++++++++++++--------------- example/pubspec.yaml | 2 +- lib/src/map.dart | 8 ++++---- pubspec.lock | 26 +++++++++++++------------- pubspec.yaml | 12 ++++++------ 7 files changed, 40 insertions(+), 41 deletions(-) diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 56abd65b..10906082 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -39,7 +39,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.humazed.google_map_location_picker_example" - minSdkVersion 16 + minSdkVersion 20 targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/example/lib/main.dart b/example/lib/main.dart index 4b345412..1faff1a5 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -3,7 +3,6 @@ import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:google_map_location_picker/generated/l10n.dart' as location_picker; import 'package:google_map_location_picker/google_map_location_picker.dart'; -import 'package:google_map_location_picker_example/keys.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'generated/i18n.dart'; diff --git a/example/pubspec.lock b/example/pubspec.lock index b1713335..9cc379c6 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -7,14 +7,14 @@ packages: name: android_intent url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.2" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.5.0" + version: "2.6.1" boolean_selector: dependency: transitive description: @@ -56,7 +56,7 @@ packages: name: cupertino_icons url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.3" fake_async: dependency: transitive description: @@ -80,7 +80,7 @@ packages: name: flutter_plugin_android_lifecycle url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.2" flutter_test: dependency: "direct dev" description: flutter @@ -97,35 +97,35 @@ packages: name: geolocator url: "https://pub.dartlang.org" source: hosted - version: "6.2.1" + version: "7.1.0" geolocator_platform_interface: dependency: transitive description: name: geolocator_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.9" + version: "2.1.1" geolocator_web: dependency: transitive description: name: geolocator_web url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "2.0.3" google_map_location_picker: dependency: "direct dev" description: path: ".." relative: true source: path - version: "4.1.6" + version: "4.1.7" google_maps_flutter: dependency: transitive description: name: google_maps_flutter url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.6" google_maps_flutter_platform_interface: dependency: transitive description: @@ -139,7 +139,7 @@ packages: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.13.0" + version: "0.13.3" http_parser: dependency: transitive description: @@ -188,7 +188,7 @@ packages: name: package_info url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.2" path: dependency: transitive description: @@ -216,7 +216,7 @@ packages: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "2.0.0" provider: dependency: transitive description: @@ -235,7 +235,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" stack_trace: dependency: transitive description: @@ -277,7 +277,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.19" + version: "0.3.0" typed_data: dependency: transitive description: @@ -293,5 +293,5 @@ packages: source: hosted version: "2.1.0" sdks: - dart: ">=2.12.0-259.9.beta <3.0.0" + dart: ">=2.12.0 <3.0.0" flutter: ">=2.0.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 862594e4..996c53f7 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.0 + cupertino_icons: ^1.0.3 dev_dependencies: flutter_test: diff --git a/lib/src/map.dart b/lib/src/map.dart index eca20b2c..d0a0d454 100644 --- a/lib/src/map.dart +++ b/lib/src/map.dart @@ -95,7 +95,7 @@ class MapPickerState extends State { Position currentPosition; try { currentPosition = - await getCurrentPosition(desiredAccuracy: widget.desiredAccuracy); + await Geolocator.getCurrentPosition(desiredAccuracy: widget.desiredAccuracy); d("position = $currentPosition"); setState(() => _currentPosition = currentPosition); @@ -324,7 +324,7 @@ class MapPickerState extends State { var dialogOpen; Future _checkGeolocationPermission() async { - final geolocationStatus = await checkPermission(); + final geolocationStatus = await Geolocator.checkPermission(); d("geolocationStatus = $geolocationStatus"); if (geolocationStatus == LocationPermission.denied && dialogOpen == null) { @@ -399,7 +399,7 @@ class MapPickerState extends State { child: Text(S.of(context)?.ok ?? 'Ok'), onPressed: () { Navigator.of(context, rootNavigator: true).pop(); - openAppSettings(); + Geolocator.openAppSettings(); dialogOpen = null; }, ), @@ -412,7 +412,7 @@ class MapPickerState extends State { // TODO: 9/12/2020 this is no longer needed, remove in the next release Future _checkGps() async { - if (!(await isLocationServiceEnabled())) { + if (!(await Geolocator.isLocationServiceEnabled())) { if (Theme.of(context).platform == TargetPlatform.android) { showDialog( context: context, diff --git a/pubspec.lock b/pubspec.lock index ae3630e2..7dc533fa 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,14 +7,14 @@ packages: name: android_intent url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.2" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.5.0" + version: "2.6.1" boolean_selector: dependency: transitive description: @@ -73,7 +73,7 @@ packages: name: flutter_plugin_android_lifecycle url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.2" flutter_test: dependency: "direct dev" description: flutter @@ -90,28 +90,28 @@ packages: name: geolocator url: "https://pub.dartlang.org" source: hosted - version: "6.2.1" + version: "7.1.0" geolocator_platform_interface: dependency: transitive description: name: geolocator_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.9" + version: "2.1.1" geolocator_web: dependency: transitive description: name: geolocator_web url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "2.0.3" google_maps_flutter: dependency: "direct main" description: name: google_maps_flutter url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.6" google_maps_flutter_platform_interface: dependency: transitive description: @@ -125,7 +125,7 @@ packages: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.13.0" + version: "0.13.3" http_parser: dependency: transitive description: @@ -174,7 +174,7 @@ packages: name: package_info url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.2" path: dependency: transitive description: @@ -202,7 +202,7 @@ packages: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "2.0.0" provider: dependency: "direct main" description: @@ -221,7 +221,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" stack_trace: dependency: "direct main" description: @@ -263,7 +263,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.19" + version: "0.3.0" typed_data: dependency: transitive description: @@ -279,5 +279,5 @@ packages: source: hosted version: "2.1.0" sdks: - dart: ">=2.12.0-259.9.beta <3.0.0" + dart: ">=2.12.0 <3.0.0" flutter: ">=2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index e281a9a7..1fe65d8f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ homepage: https://github.com/humazed/google_map_location_picker # flutter pub pub publish --dry-run environment: - sdk: ">=2.2.2 <3.0.0" + sdk: ">=2.2.0 <3.0.0" flutter: ">=2.0.0" dependencies: @@ -16,13 +16,13 @@ dependencies: sdk: flutter intl: ^0.17.0 - google_maps_flutter: ^2.0.1 - geolocator: ^6.1.14 - android_intent: ^2.0.0 + google_maps_flutter: ^2.0.6 + geolocator: ^7.1.0 + android_intent: ^2.0.2 provider: ^5.0.0 - http: ^0.13.0 + http: ^0.13.3 stack_trace: ^1.10.0 - package_info: ^2.0.0 + package_info: ^2.0.2 dev_dependencies: flutter_test: From 72b0d06a5df0868325f2406df6e4e0bbb153e1ed Mon Sep 17 00:00:00 2001 From: Bhargav B L Date: Tue, 22 Jun 2021 10:40:01 +0530 Subject: [PATCH 02/49] null safety migra --- example/ios/Flutter/flutter_export_environment.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100755 example/ios/Flutter/flutter_export_environment.sh diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh new file mode 100755 index 00000000..d04202e9 --- /dev/null +++ b/example/ios/Flutter/flutter_export_environment.sh @@ -0,0 +1,14 @@ +#!/bin/sh +# This is a generated file; do not edit or check into version control. +export "FLUTTER_ROOT=/Users/blb/Development/flutter" +export "FLUTTER_APPLICATION_PATH=/Users/blb/Development/google_map_location_picker/example" +export "COCOAPODS_PARALLEL_CODE_SIGN=true" +export "FLUTTER_TARGET=lib/main.dart" +export "FLUTTER_BUILD_DIR=build" +export "SYMROOT=${SOURCE_ROOT}/../build/ios" +export "FLUTTER_BUILD_NAME=1.0.0" +export "FLUTTER_BUILD_NUMBER=1.0.0" +export "DART_OBFUSCATION=false" +export "TRACK_WIDGET_CREATION=false" +export "TREE_SHAKE_ICONS=false" +export "PACKAGE_CONFIG=.packages" From 3cb447c59aba1474b9435c1c8b83a277ba65170b Mon Sep 17 00:00:00 2001 From: Bhargav B L Date: Tue, 22 Jun 2021 11:04:46 +0530 Subject: [PATCH 03/49] null safety migration completed --- example/lib/main.dart | 2 +- lib/generated/intl/messages_all.dart | 4 +- lib/generated/intl/messages_ar.dart | 2 +- lib/generated/intl/messages_de.dart | 2 +- lib/generated/intl/messages_en.dart | 2 +- lib/generated/intl/messages_es.dart | 2 +- lib/generated/intl/messages_fr.dart | 2 +- lib/generated/intl/messages_it.dart | 2 +- lib/generated/intl/messages_pt.dart | 2 +- lib/generated/intl/messages_ru.dart | 2 +- lib/generated/intl/messages_sr.dart | 2 +- lib/generated/intl/messages_tr.dart | 2 +- lib/generated/l10n.dart | 4 +- lib/src/google_map_location_picker.dart | 110 +++++++++++------------ lib/src/map.dart | 86 +++++++++--------- lib/src/model/auto_comp_iete_item.dart | 8 +- lib/src/model/location_result.dart | 6 +- lib/src/model/nearby_place.dart | 6 +- lib/src/providers/location_provider.dart | 6 +- lib/src/rich_suggestion.dart | 10 +-- lib/src/search_input.dart | 12 +-- lib/src/utils/loading_builder.dart | 16 ++-- lib/src/utils/location_utils.dart | 6 +- pubspec.yaml | 2 +- 24 files changed, 149 insertions(+), 149 deletions(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index 1faff1a5..67c1c7bf 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -51,7 +51,7 @@ class _MyAppState extends State { onPressed: () async { LocationResult result = await showLocationPicker( context, - apiKey, + "", initialCenter: LatLng(31.1975844, 29.9598339), // automaticallyAnimateToCurrentLocation: true, // mapStylePath: 'assets/mapStyle.json', diff --git a/lib/generated/intl/messages_all.dart b/lib/generated/intl/messages_all.dart index f633e6ff..b22af192 100644 --- a/lib/generated/intl/messages_all.dart +++ b/lib/generated/intl/messages_all.dart @@ -40,7 +40,7 @@ Map _deferredLibraries = { 'tr': () => new Future.value(null), }; -MessageLookupByLibrary _findExact(String localeName) { +MessageLookupByLibrary? _findExact(String localeName) { switch (localeName) { case 'ar': return messages_ar.messages; @@ -91,7 +91,7 @@ bool _messagesExistFor(String locale) { } } -MessageLookupByLibrary _findGeneratedMessagesFor(String locale) { +MessageLookupByLibrary? _findGeneratedMessagesFor(String locale) { var actualLocale = Intl.verifiedLocale(locale, _messagesExistFor, onFailure: (_) => null); if (actualLocale == null) return null; diff --git a/lib/generated/intl/messages_ar.dart b/lib/generated/intl/messages_ar.dart index be032a5c..be4ccfb8 100644 --- a/lib/generated/intl/messages_ar.dart +++ b/lib/generated/intl/messages_ar.dart @@ -19,7 +19,7 @@ typedef String MessageIfAbsent(String messageStr, List args); class MessageLookup extends MessageLookupByLibrary { String get localeName => 'ar'; - final messages = _notInlinedMessages(_notInlinedMessages); + final Map messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { "access_to_location_denied" : MessageLookupByLibrary.simpleMessage("تم رفض إذن الوصل الي الموقع الجغرافي"), "access_to_location_permanently_denied" : MessageLookupByLibrary.simpleMessage("تم رفض إذن الوصل الي الموقع الجغرافي بشكل نهائي"), diff --git a/lib/generated/intl/messages_de.dart b/lib/generated/intl/messages_de.dart index 2b6ee3f8..b8df1d3f 100644 --- a/lib/generated/intl/messages_de.dart +++ b/lib/generated/intl/messages_de.dart @@ -19,7 +19,7 @@ typedef String MessageIfAbsent(String messageStr, List args); class MessageLookup extends MessageLookupByLibrary { String get localeName => 'de'; - final messages = _notInlinedMessages(_notInlinedMessages); + final Map messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { "access_to_location_denied" : MessageLookupByLibrary.simpleMessage("Zugriff auf Standort verweigert"), "access_to_location_permanently_denied" : MessageLookupByLibrary.simpleMessage("Zugriff auf Standort permanent verweigert"), diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index 5bd6290e..dba6fb53 100644 --- a/lib/generated/intl/messages_en.dart +++ b/lib/generated/intl/messages_en.dart @@ -19,7 +19,7 @@ typedef String MessageIfAbsent(String messageStr, List args); class MessageLookup extends MessageLookupByLibrary { String get localeName => 'en'; - final messages = _notInlinedMessages(_notInlinedMessages); + final Map messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { "access_to_location_denied" : MessageLookupByLibrary.simpleMessage("Access to location denied"), "access_to_location_permanently_denied" : MessageLookupByLibrary.simpleMessage("Access to location permanently denied"), diff --git a/lib/generated/intl/messages_es.dart b/lib/generated/intl/messages_es.dart index 0a301e0c..858ed892 100644 --- a/lib/generated/intl/messages_es.dart +++ b/lib/generated/intl/messages_es.dart @@ -19,7 +19,7 @@ typedef String MessageIfAbsent(String messageStr, List args); class MessageLookup extends MessageLookupByLibrary { String get localeName => 'es'; - final messages = _notInlinedMessages(_notInlinedMessages); + final Map messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { "access_to_location_denied" : MessageLookupByLibrary.simpleMessage("Acceso a la ubicación denegado"), "access_to_location_permanently_denied" : MessageLookupByLibrary.simpleMessage("Acceso a la ubicación denegado permanentemente"), diff --git a/lib/generated/intl/messages_fr.dart b/lib/generated/intl/messages_fr.dart index c3924468..fdd2d342 100644 --- a/lib/generated/intl/messages_fr.dart +++ b/lib/generated/intl/messages_fr.dart @@ -19,7 +19,7 @@ typedef String MessageIfAbsent(String messageStr, List args); class MessageLookup extends MessageLookupByLibrary { String get localeName => 'fr'; - final messages = _notInlinedMessages(_notInlinedMessages); + final Map messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { "access_to_location_denied" : MessageLookupByLibrary.simpleMessage("Accès à l\'emplacement refusé"), "access_to_location_permanently_denied" : MessageLookupByLibrary.simpleMessage("Accès à l\'emplacement refusé définitivement"), diff --git a/lib/generated/intl/messages_it.dart b/lib/generated/intl/messages_it.dart index 969dbf5a..f22c4622 100644 --- a/lib/generated/intl/messages_it.dart +++ b/lib/generated/intl/messages_it.dart @@ -19,7 +19,7 @@ typedef String MessageIfAbsent(String messageStr, List args); class MessageLookup extends MessageLookupByLibrary { String get localeName => 'it'; - final messages = _notInlinedMessages(_notInlinedMessages); + final Map messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { "access_to_location_denied" : MessageLookupByLibrary.simpleMessage("Accesso alla posizione rifiutato"), "access_to_location_permanently_denied" : MessageLookupByLibrary.simpleMessage("Accesso alla posizione rifiutato permanentemente"), diff --git a/lib/generated/intl/messages_pt.dart b/lib/generated/intl/messages_pt.dart index 869c0e3c..1b178bf0 100644 --- a/lib/generated/intl/messages_pt.dart +++ b/lib/generated/intl/messages_pt.dart @@ -19,7 +19,7 @@ typedef String MessageIfAbsent(String messageStr, List args); class MessageLookup extends MessageLookupByLibrary { String get localeName => 'pt'; - final messages = _notInlinedMessages(_notInlinedMessages); + final Map messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { "access_to_location_denied" : MessageLookupByLibrary.simpleMessage("Acesso ao local negado"), "access_to_location_permanently_denied" : MessageLookupByLibrary.simpleMessage("Acesso ao local negado permanentemente"), diff --git a/lib/generated/intl/messages_ru.dart b/lib/generated/intl/messages_ru.dart index ad0dd019..a4e5c343 100644 --- a/lib/generated/intl/messages_ru.dart +++ b/lib/generated/intl/messages_ru.dart @@ -19,7 +19,7 @@ typedef String MessageIfAbsent(String messageStr, List args); class MessageLookup extends MessageLookupByLibrary { String get localeName => 'ru'; - final messages = _notInlinedMessages(_notInlinedMessages); + final Map messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { "access_to_location_denied" : MessageLookupByLibrary.simpleMessage("Доступ к местоположению запрещен"), "access_to_location_permanently_denied" : MessageLookupByLibrary.simpleMessage("Доступ к местоположению запрещен навсегда"), diff --git a/lib/generated/intl/messages_sr.dart b/lib/generated/intl/messages_sr.dart index f7120d17..d2f40758 100644 --- a/lib/generated/intl/messages_sr.dart +++ b/lib/generated/intl/messages_sr.dart @@ -19,7 +19,7 @@ typedef String MessageIfAbsent(String messageStr, List args); class MessageLookup extends MessageLookupByLibrary { String get localeName => 'sr'; - final messages = _notInlinedMessages(_notInlinedMessages); + final Map messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { "access_to_location_denied" : MessageLookupByLibrary.simpleMessage("Onemogućen pristup lokaciji"), "allow_access_to_the_location_services" : MessageLookupByLibrary.simpleMessage("Omogućite pristup Vašoj lokaciji"), diff --git a/lib/generated/intl/messages_tr.dart b/lib/generated/intl/messages_tr.dart index 690a4d2a..87db67f6 100644 --- a/lib/generated/intl/messages_tr.dart +++ b/lib/generated/intl/messages_tr.dart @@ -19,7 +19,7 @@ typedef String MessageIfAbsent(String messageStr, List args); class MessageLookup extends MessageLookupByLibrary { String get localeName => 'tr'; - final messages = _notInlinedMessages(_notInlinedMessages); + final Map messages = _notInlinedMessages(_notInlinedMessages); static _notInlinedMessages(_) => { "access_to_location_denied" : MessageLookupByLibrary.simpleMessage("Konum erişimi reddedildi"), "access_to_location_permanently_denied" : MessageLookupByLibrary.simpleMessage("Konuma erişim kalıcı olarak reddedildi"), diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index 5591ce10..3558b672 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -15,7 +15,7 @@ import 'intl/messages_all.dart'; class S { S(); - static S current; + static late S current; static const AppLocalizationDelegate delegate = AppLocalizationDelegate(); @@ -31,7 +31,7 @@ class S { }); } - static S of(BuildContext context) { + static S? of(BuildContext context) { return Localizations.of(context, S); } diff --git a/lib/src/google_map_location_picker.dart b/lib/src/google_map_location_picker.dart index b06dfda0..30d1511d 100644 --- a/lib/src/google_map_location_picker.dart +++ b/lib/src/google_map_location_picker.dart @@ -22,7 +22,7 @@ import 'utils/location_utils.dart'; class LocationPicker extends StatefulWidget { LocationPicker( this.apiKey, { - Key key, + Key? key, this.initialCenter, this.initialZoom, this.requiredGPS, @@ -44,28 +44,28 @@ class LocationPicker extends StatefulWidget { final String apiKey; - final LatLng initialCenter; - final double initialZoom; - final List countries; + final LatLng? initialCenter; + final double? initialZoom; + final List? countries; - final bool requiredGPS; - final bool myLocationButtonEnabled; - final bool layersButtonEnabled; - final bool automaticallyAnimateToCurrentLocation; + final bool? requiredGPS; + final bool? myLocationButtonEnabled; + final bool? layersButtonEnabled; + final bool? automaticallyAnimateToCurrentLocation; - final String mapStylePath; + final String? mapStylePath; - final Color appBarColor; - final BoxDecoration searchBarBoxDecoration; - final String hintText; - final Widget resultCardConfirmIcon; - final Alignment resultCardAlignment; - final Decoration resultCardDecoration; - final EdgeInsets resultCardPadding; + final Color? appBarColor; + final BoxDecoration? searchBarBoxDecoration; + final String? hintText; + final Widget? resultCardConfirmIcon; + final Alignment? resultCardAlignment; + final Decoration? resultCardDecoration; + final EdgeInsets? resultCardPadding; - final String language; + final String? language; - final LocationAccuracy desiredAccuracy; + final LocationAccuracy? desiredAccuracy; @override LocationPickerState createState() => LocationPickerState(); @@ -73,12 +73,12 @@ class LocationPicker extends StatefulWidget { class LocationPickerState extends State { /// Result returned after user completes selection - LocationResult locationResult; + LocationResult? locationResult; /// Overlay to display autocomplete suggestions - OverlayEntry overlayEntry; + OverlayEntry? overlayEntry; - List nearbyPlaces = List(); + List nearbyPlaces = []; /// Session token required for autocomplete API call String sessionToken = Uuid().generateV4(); @@ -94,7 +94,7 @@ class LocationPickerState extends State { /// Hides the autocomplete overlay void clearOverlay() { if (overlayEntry != null) { - overlayEntry.remove(); + overlayEntry!.remove(); overlayEntry = null; } } @@ -112,14 +112,14 @@ class LocationPickerState extends State { if (place.length < 1) return; - final RenderBox renderBox = context.findRenderObject(); + final RenderBox renderBox = context.findRenderObject() as RenderBox; Size size = renderBox.size; - final RenderBox appBarBox = appBarKey.currentContext.findRenderObject(); + final RenderBox? appBarBox = appBarKey.currentContext!.findRenderObject() as RenderBox?; overlayEntry = OverlayEntry( builder: (context) => Positioned( - top: appBarBox.size.height, + top: appBarBox!.size.height, width: size.width, child: Material( elevation: 1, @@ -146,7 +146,7 @@ class LocationPickerState extends State { ), ); - Overlay.of(context).insert(overlayEntry); + Overlay.of(context)!.insert(overlayEntry!); autoCompleteSearch(place); } @@ -159,7 +159,7 @@ class LocationPickerState extends State { // Currently, you can use components to filter by up to 5 countries. from https://developers.google.com/places/web-service/autocomplete String regionParam = countries?.isNotEmpty == true - ? "&components=country:${countries.sublist(0, min(countries.length, 5)).join('|country:')}" + ? "&components=country:${countries!.sublist(0, min(countries.length, 5)).join('|country:')}" : ""; var endpoint = @@ -169,12 +169,12 @@ class LocationPickerState extends State { "language=${widget.language}"; if (locationResult != null) { - endpoint += "&location=${locationResult.latLng.latitude}," + - "${locationResult.latLng.longitude}"; + endpoint += "&location=${locationResult!.latLng!.latitude}," + + "${locationResult!.latLng!.longitude}"; } LocationUtils.getAppHeaders() - .then((headers) => http.get(Uri.parse(endpoint), headers: headers)) + .then((headers) => http.get(Uri.parse(endpoint), headers: headers as Map?)) .then((response) { if (response.statusCode == 200) { Map data = jsonDecode(response.body); @@ -214,7 +214,7 @@ class LocationPickerState extends State { /// To navigate to the selected place from the autocomplete list to the map, /// the lat,lng is required. This method fetches the lat,lng of the place and /// proceeds to moving the map to that location. - void decodeAndSelectPlace(String placeId) { + void decodeAndSelectPlace(String? placeId) { clearOverlay(); final endpoint = @@ -223,7 +223,7 @@ class LocationPickerState extends State { '&language=${widget.language}'; LocationUtils.getAppHeaders() - .then((headers) => http.get(Uri.parse(endpoint), headers: headers)) + .then((headers) => http.get(Uri.parse(endpoint), headers: headers as Map?)) .then((response) { if (response.statusCode == 200) { Map location = @@ -240,17 +240,17 @@ class LocationPickerState extends State { /// Display autocomplete suggestions with the overlay. void displayAutoCompleteSuggestions(List suggestions) { - final RenderBox renderBox = context.findRenderObject(); + final RenderBox renderBox = context.findRenderObject() as RenderBox; Size size = renderBox.size; - final RenderBox appBarBox = appBarKey.currentContext.findRenderObject(); + final RenderBox? appBarBox = appBarKey.currentContext!.findRenderObject() as RenderBox?; clearOverlay(); overlayEntry = OverlayEntry( builder: (context) => Positioned( width: size.width, - top: appBarBox.size.height, + top: appBarBox!.size.height, child: Material( elevation: 1, child: Column( @@ -260,7 +260,7 @@ class LocationPickerState extends State { ), ); - Overlay.of(context).insert(overlayEntry); + Overlay.of(context)!.insert(overlayEntry!); } /// Utility function to get clean readable name of a location. First checks @@ -292,7 +292,7 @@ class LocationPickerState extends State { "location=${latLng.latitude},${latLng.longitude}&radius=150" + "&language=${widget.language}"; - return http.get(Uri.parse(endpoint), headers: headers); + return http.get(Uri.parse(endpoint), headers: headers as Map?); }).then((response) { if (response.statusCode == 200) { nearbyPlaces.clear(); @@ -330,14 +330,14 @@ class LocationPickerState extends State { "&language=${widget.language}"; final response = await http.get(Uri.parse(endpoint), - headers: await LocationUtils.getAppHeaders()); + headers: await (LocationUtils.getAppHeaders() as FutureOr?>)); if (response.statusCode == 200) { Map responseJson = jsonDecode(response.body); - String road; + String? road; - String placeId = responseJson['results'][0]['place_id']; + String? placeId = responseJson['results'][0]['place_id']; if (responseJson['status'] == 'REQUEST_DENIED') { road = 'REQUEST DENIED = please see log for more details'; @@ -352,9 +352,9 @@ class LocationPickerState extends State { setState(() { locationResult = LocationResult(); - locationResult.address = road; - locationResult.latLng = latLng; - locationResult.placeId = placeId; + locationResult!.address = road; + locationResult!.latLng = latLng; + locationResult!.placeId = placeId; }); } } @@ -362,7 +362,7 @@ class LocationPickerState extends State { /// Moves the camera to the provided location and updates other UI features to /// match the location. void moveToLocation(LatLng latLng) { - mapKey.currentState.mapController.future.then((controller) { + mapKey.currentState!.mapController.future.then((controller) { controller.animateCamera( CameraUpdate.newCameraPosition( CameraPosition( @@ -442,24 +442,24 @@ class LocationPickerState extends State { /// set [automaticallyAnimateToCurrentLocation] to false. /// /// -Future showLocationPicker( +Future showLocationPicker( BuildContext context, String apiKey, { LatLng initialCenter = const LatLng(45.521563, -122.677433), double initialZoom = 16, bool requiredGPS = false, - List countries, + List? countries, bool myLocationButtonEnabled = false, bool layersButtonEnabled = false, bool automaticallyAnimateToCurrentLocation = true, - String mapStylePath, + String? mapStylePath, Color appBarColor = Colors.transparent, - BoxDecoration searchBarBoxDecoration, - String hintText, - Widget resultCardConfirmIcon, - AlignmentGeometry resultCardAlignment, - EdgeInsetsGeometry resultCardPadding, - Decoration resultCardDecoration, + BoxDecoration? searchBarBoxDecoration, + String? hintText, + Widget? resultCardConfirmIcon, + AlignmentGeometry? resultCardAlignment, + EdgeInsetsGeometry? resultCardPadding, + Decoration? resultCardDecoration, String language = 'en', LocationAccuracy desiredAccuracy = LocationAccuracy.best, }) async { @@ -481,8 +481,8 @@ Future showLocationPicker( hintText: hintText, searchBarBoxDecoration: searchBarBoxDecoration, resultCardConfirmIcon: resultCardConfirmIcon, - resultCardAlignment: resultCardAlignment, - resultCardPadding: resultCardPadding, + resultCardAlignment: resultCardAlignment as Alignment?, + resultCardPadding: resultCardPadding as EdgeInsets?, resultCardDecoration: resultCardDecoration, countries: countries, language: language, diff --git a/lib/src/map.dart b/lib/src/map.dart index d0a0d454..726a17d6 100644 --- a/lib/src/map.dart +++ b/lib/src/map.dart @@ -21,7 +21,7 @@ import 'utils/location_utils.dart'; class MapPicker extends StatefulWidget { const MapPicker( this.apiKey, { - Key key, + Key? key, this.initialCenter, this.initialZoom, this.requiredGPS, @@ -42,27 +42,27 @@ class MapPicker extends StatefulWidget { final String apiKey; - final LatLng initialCenter; - final double initialZoom; + final LatLng? initialCenter; + final double? initialZoom; - final bool requiredGPS; - final bool myLocationButtonEnabled; - final bool layersButtonEnabled; - final bool automaticallyAnimateToCurrentLocation; + final bool? requiredGPS; + final bool? myLocationButtonEnabled; + final bool? layersButtonEnabled; + final bool? automaticallyAnimateToCurrentLocation; - final String mapStylePath; + final String? mapStylePath; - final Color appBarColor; - final BoxDecoration searchBarBoxDecoration; - final String hintText; - final Widget resultCardConfirmIcon; - final Alignment resultCardAlignment; - final Decoration resultCardDecoration; - final EdgeInsets resultCardPadding; + final Color? appBarColor; + final BoxDecoration? searchBarBoxDecoration; + final String? hintText; + final Widget? resultCardConfirmIcon; + final Alignment? resultCardAlignment; + final Decoration? resultCardDecoration; + final EdgeInsets? resultCardPadding; - final String language; + final String? language; - final LocationAccuracy desiredAccuracy; + final LocationAccuracy? desiredAccuracy; @override MapPickerState createState() => MapPickerState(); @@ -73,15 +73,15 @@ class MapPickerState extends State { MapType _currentMapType = MapType.normal; - String _mapStyle; + String? _mapStyle; - LatLng _lastMapPosition; + LatLng? _lastMapPosition; - Position _currentPosition; + Position? _currentPosition; - String _address; + String? _address; - String _placeId; + String? _placeId; void _onToggleMapTypePressed() { final MapType nextType = @@ -92,10 +92,10 @@ class MapPickerState extends State { // this also checks for location permission. Future _initCurrentLocation() async { - Position currentPosition; + Position? currentPosition; try { currentPosition = - await Geolocator.getCurrentPosition(desiredAccuracy: widget.desiredAccuracy); + await Geolocator.getCurrentPosition(desiredAccuracy: widget.desiredAccuracy!); d("position = $currentPosition"); setState(() => _currentPosition = currentPosition); @@ -124,11 +124,11 @@ class MapPickerState extends State { @override void initState() { super.initState(); - if (widget.automaticallyAnimateToCurrentLocation && !widget.requiredGPS) + if (widget.automaticallyAnimateToCurrentLocation! && !widget.requiredGPS!) _initCurrentLocation(); if (widget.mapStylePath != null) { - rootBundle.loadString(widget.mapStylePath).then((string) { + rootBundle.loadString(widget.mapStylePath!).then((string) { _mapStyle = string; }); } @@ -136,7 +136,7 @@ class MapPickerState extends State { @override Widget build(BuildContext context) { - if (widget.requiredGPS) { + if (widget.requiredGPS!) { _checkGeolocationPermission(); if (_currentPosition == null) _initCurrentLocation(); } @@ -148,8 +148,8 @@ class MapPickerState extends State { body: Builder( builder: (context) { if (_currentPosition == null && - widget.automaticallyAnimateToCurrentLocation && - widget.requiredGPS) { + widget.automaticallyAnimateToCurrentLocation! && + widget.requiredGPS!) { return const Center(child: CircularProgressIndicator()); } @@ -166,8 +166,8 @@ class MapPickerState extends State { GoogleMap( myLocationButtonEnabled: false, initialCameraPosition: CameraPosition( - target: widget.initialCenter, - zoom: widget.initialZoom, + target: widget.initialCenter!, + zoom: widget.initialZoom!, ), onMapCreated: (GoogleMapController controller) { mapController.complete(controller); @@ -226,7 +226,7 @@ class MapPickerState extends State { children: [ Flexible( flex: 20, - child: FutureLoadingBuilder>( + child: FutureLoadingBuilder>( future: getAddress(locationProvider.lastIdleLocation), mutable: true, loadingIndicator: Row( @@ -270,14 +270,14 @@ class MapPickerState extends State { ); } - Future> getAddress(LatLng location) async { + Future> getAddress(LatLng? location) async { try { final endpoint = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=${location?.latitude},${location?.longitude}' '&key=${widget.apiKey}&language=${widget.language}'; final response = jsonDecode((await http.get(Uri.parse(endpoint), - headers: await LocationUtils.getAppHeaders())) + headers: await (LocationUtils.getAppHeaders() as FutureOr?>))) .body); return { @@ -447,16 +447,16 @@ class MapPickerState extends State { class _MapFabs extends StatelessWidget { const _MapFabs({ - Key key, - @required this.myLocationButtonEnabled, - @required this.layersButtonEnabled, - @required this.onToggleMapTypePressed, - @required this.onMyLocationPressed, + Key? key, + required this.myLocationButtonEnabled, + required this.layersButtonEnabled, + required this.onToggleMapTypePressed, + required this.onMyLocationPressed, }) : assert(onToggleMapTypePressed != null), super(key: key); - final bool myLocationButtonEnabled; - final bool layersButtonEnabled; + final bool? myLocationButtonEnabled; + final bool? layersButtonEnabled; final VoidCallback onToggleMapTypePressed; final VoidCallback onMyLocationPressed; @@ -468,7 +468,7 @@ class _MapFabs extends StatelessWidget { margin: const EdgeInsets.only(top: kToolbarHeight + 24, right: 8), child: Column( children: [ - if (layersButtonEnabled) + if (layersButtonEnabled!) FloatingActionButton( onPressed: onToggleMapTypePressed, materialTapTargetSize: MaterialTapTargetSize.padded, @@ -476,7 +476,7 @@ class _MapFabs extends StatelessWidget { child: const Icon(Icons.layers), heroTag: "layers", ), - if (myLocationButtonEnabled) + if (myLocationButtonEnabled!) FloatingActionButton( onPressed: onMyLocationPressed, materialTapTargetSize: MaterialTapTargetSize.padded, diff --git a/lib/src/model/auto_comp_iete_item.dart b/lib/src/model/auto_comp_iete_item.dart index 6d5d840f..7ce61b80 100644 --- a/lib/src/model/auto_comp_iete_item.dart +++ b/lib/src/model/auto_comp_iete_item.dart @@ -2,17 +2,17 @@ /// into this model. class AutoCompleteItem { /// The id of the place. This helps to fetch the lat,lng of the place. - String id; + String? id; /// The text (name of place) displayed in the autocomplete suggestions list. - String text; + String? text; /// Assistive index to begin highlight of matched part of the [text] with /// the original query - int offset; + int? offset; /// Length of matched part of the [text] - int length; + int? length; @override String toString() { diff --git a/lib/src/model/location_result.dart b/lib/src/model/location_result.dart index b8c3248f..b35f30e9 100644 --- a/lib/src/model/location_result.dart +++ b/lib/src/model/location_result.dart @@ -5,13 +5,13 @@ class LocationResult { /// The human readable name of the location. This is primarily the /// name of the road. But in cases where the place was selected from Nearby /// places list, we use the name provided on the list item. - String address; // or road + String? address; // or road /// Google Maps place ID - String placeId; + String? placeId; /// Latitude/Longitude of the selected location. - LatLng latLng; + LatLng? latLng; LocationResult({this.latLng, this.address, this.placeId}); diff --git a/lib/src/model/nearby_place.dart b/lib/src/model/nearby_place.dart index 6a18f216..11bfbf1e 100644 --- a/lib/src/model/nearby_place.dart +++ b/lib/src/model/nearby_place.dart @@ -4,14 +4,14 @@ import 'package:google_maps_flutter/google_maps_flutter.dart'; class NearbyPlace { /// The human-readable name of the location provided. This value is provided /// for [LocationResult.address] when the user selects this nearby place. - String name; + String? name; /// The icon identifying the kind of place provided. Eg. lodging, chapel, /// hospital, etc. - String icon; + String? icon; // Latitude/Longitude of the provided location. - LatLng latLng; + LatLng? latLng; @override String toString() { diff --git a/lib/src/providers/location_provider.dart b/lib/src/providers/location_provider.dart index df4b2aef..0ef16d33 100644 --- a/lib/src/providers/location_provider.dart +++ b/lib/src/providers/location_provider.dart @@ -6,11 +6,11 @@ class LocationProvider extends ChangeNotifier { static LocationProvider of(BuildContext context, {bool listen = true}) => Provider.of(context, listen: listen); - LatLng _lastIdleLocation; + LatLng? _lastIdleLocation; - LatLng get lastIdleLocation => _lastIdleLocation; + LatLng? get lastIdleLocation => _lastIdleLocation; - void setLastIdleLocation(LatLng lastIdleLocation) { + void setLastIdleLocation(LatLng? lastIdleLocation) { if (_lastIdleLocation != lastIdleLocation) { _lastIdleLocation = lastIdleLocation; notifyListeners(); diff --git a/lib/src/rich_suggestion.dart b/lib/src/rich_suggestion.dart index a7472641..bc4d33c0 100644 --- a/lib/src/rich_suggestion.dart +++ b/lib/src/rich_suggestion.dart @@ -33,7 +33,7 @@ class RichSuggestion extends StatelessWidget { final List result = []; String startText = - autoCompleteItem.text.substring(0, autoCompleteItem.offset); + autoCompleteItem.text!.substring(0, autoCompleteItem.offset); if (startText.isNotEmpty) { result.add( TextSpan( @@ -47,8 +47,8 @@ class RichSuggestion extends StatelessWidget { ); } - String boldText = autoCompleteItem.text.substring(autoCompleteItem.offset, - autoCompleteItem.offset + autoCompleteItem.length); + String boldText = autoCompleteItem.text!.substring(autoCompleteItem.offset!, + autoCompleteItem.offset! + autoCompleteItem.length!); result.add( TextSpan( @@ -63,8 +63,8 @@ class RichSuggestion extends StatelessWidget { String remainingText = this .autoCompleteItem - .text - .substring(autoCompleteItem.offset + autoCompleteItem.length); + .text! + .substring(autoCompleteItem.offset! + autoCompleteItem.length!); result.add( TextSpan( text: remainingText, diff --git a/lib/src/search_input.dart b/lib/src/search_input.dart index 9d7ba047..00041dea 100644 --- a/lib/src/search_input.dart +++ b/lib/src/search_input.dart @@ -7,16 +7,16 @@ import 'package:google_map_location_picker/generated/l10n.dart'; class SearchInput extends StatefulWidget { SearchInput( this.onSearchInput, { - Key key, + Key? key, this.searchInputKey, this.boxDecoration, this.hintText, }) : super(key: key); final ValueChanged onSearchInput; - final Key searchInputKey; - final BoxDecoration boxDecoration; - final String hintText; + final Key? searchInputKey; + final BoxDecoration? boxDecoration; + final String? hintText; @override State createState() => SearchInputState(); @@ -25,7 +25,7 @@ class SearchInput extends StatefulWidget { class SearchInputState extends State { TextEditingController editController = TextEditingController(); - Timer debouncer; + Timer? debouncer; bool hasSearchEntry = false; @@ -51,7 +51,7 @@ class SearchInputState extends State { } if (debouncer?.isActive ?? false) { - debouncer.cancel(); + debouncer!.cancel(); } debouncer = Timer(Duration(milliseconds: 500), () { diff --git a/lib/src/utils/loading_builder.dart b/lib/src/utils/loading_builder.dart index ec1d09ce..4ca7c5bb 100644 --- a/lib/src/utils/loading_builder.dart +++ b/lib/src/utils/loading_builder.dart @@ -10,10 +10,10 @@ typedef WidgetBuilder = Widget Function(BuildContext context, T snapshot); class FutureLoadingBuilder extends StatefulWidget { const FutureLoadingBuilder({ - Key key, - @required this.future, + Key? key, + required this.future, this.initialData, - @required this.builder, + required this.builder, this.mutable = false, this.loadingIndicator, }) : assert(builder != null), @@ -35,22 +35,22 @@ class FutureLoadingBuilder extends StatefulWidget { /// provided to the [builder] will become null, regardless of [initialData]. /// (The error itself will be available in [AsyncSnapshot.error], and /// [AsyncSnapshot.hasError] will be true.) - final T initialData; + final T? initialData; /// default is true /// /// set to false if the future will change. final bool mutable; - final Widget loadingIndicator; + final Widget? loadingIndicator; @override _FutureLoadingBuilderState createState() => _FutureLoadingBuilderState(); } -class _FutureLoadingBuilderState extends State> { - Future future; +class _FutureLoadingBuilderState extends State> { + Future? future; @override void initState() { @@ -60,7 +60,7 @@ class _FutureLoadingBuilderState extends State> { @override Widget build(BuildContext context) { - return FutureBuilder( + return FutureBuilder( future: widget.mutable ? widget.future : future, initialData: widget.initialData, builder: (BuildContext context, AsyncSnapshot snapshot) { diff --git a/lib/src/utils/location_utils.dart b/lib/src/utils/location_utils.dart index f5209277..68451f12 100644 --- a/lib/src/utils/location_utils.dart +++ b/lib/src/utils/location_utils.dart @@ -5,9 +5,9 @@ import 'package:flutter/services.dart'; class LocationUtils { static const _platform = const MethodChannel('google_map_location_picker'); - static Map _appHeaderCache = {}; + static Map _appHeaderCache = {}; - static Future> getAppHeaders() async { + static Future> getAppHeaders() async { if (_appHeaderCache.isEmpty) { PackageInfo packageInfo = await PackageInfo.fromPlatform(); @@ -16,7 +16,7 @@ class LocationUtils { "X-Ios-Bundle-Identifier": packageInfo.packageName, }; } else if (Platform.isAndroid) { - String sha1; + String? sha1; try { sha1 = await _platform.invokeMethod( 'getSigningCertSha1', packageInfo.packageName); diff --git a/pubspec.yaml b/pubspec.yaml index 1fe65d8f..0418cd56 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ homepage: https://github.com/humazed/google_map_location_picker # flutter pub pub publish --dry-run environment: - sdk: ">=2.2.0 <3.0.0" + sdk: '>=2.12.0 <3.0.0' flutter: ">=2.0.0" dependencies: From 2a4d1a67bfa1098a7d6a54e1740c88e3fe693792 Mon Sep 17 00:00:00 2001 From: Bhargav B L Date: Tue, 22 Jun 2021 12:31:23 +0530 Subject: [PATCH 04/49] Type casting errors due to null safety fixed --- .../android/app/src/main/AndroidManifest.xml | 8 ++--- .../app/src/main/res/values/styles.xml | 18 +++++++++++ example/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/lib/generated/i18n.dart | 32 +++++++++---------- example/lib/main.dart | 6 ++-- example/pubspec.lock | 11 +++++-- example/pubspec.yaml | 2 +- lib/src/map.dart | 12 ++++--- lib/src/utils/loading_builder.dart | 6 ++-- lib/src/utils/location_utils.dart | 6 ++-- pubspec.lock | 7 ++++ pubspec.yaml | 1 + 13 files changed, 74 insertions(+), 39 deletions(-) create mode 100644 example/android/app/src/main/res/values/styles.xml diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index a41588c0..7cafa901 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -38,11 +38,11 @@ - + + + + android:value="API_KEY" /> diff --git a/example/android/app/src/main/res/values/styles.xml b/example/android/app/src/main/res/values/styles.xml new file mode 100644 index 00000000..1f83a33f --- /dev/null +++ b/example/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/example/android/build.gradle b/example/android/build.gradle index 56ace55b..7c1a7619 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.6.3' + classpath 'com.android.tools.build:gradle:4.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 56228224..82d78d74 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/example/lib/generated/i18n.dart b/example/lib/generated/i18n.dart index b5e27a19..5636c73b 100644 --- a/example/lib/generated/i18n.dart +++ b/example/lib/generated/i18n.dart @@ -11,12 +11,12 @@ import 'package:flutter/material.dart'; class S implements WidgetsLocalizations { const S(); - static S current; + static S? current; static const GeneratedLocalizationsDelegate delegate = GeneratedLocalizationsDelegate(); - static S of(BuildContext context) => Localizations.of(context, S); + static S? of(BuildContext context) => Localizations.of(context, S); @override TextDirection get textDirection => TextDirection.ltr; @@ -33,7 +33,7 @@ class $en extends S { const $en(); } -class GeneratedLocalizationsDelegate extends LocalizationsDelegate { +class GeneratedLocalizationsDelegate extends LocalizationsDelegate { const GeneratedLocalizationsDelegate(); List get supportedLocales { @@ -44,8 +44,8 @@ class GeneratedLocalizationsDelegate extends LocalizationsDelegate { } LocaleListResolutionCallback listResolution( - {Locale fallback, bool withCountry = true}) { - return (List locales, Iterable supported) { + {Locale? fallback, bool withCountry = true}) { + return (List? locales, Iterable supported) { if (locales == null || locales.isEmpty) { return fallback ?? supported.first; } else { @@ -55,29 +55,29 @@ class GeneratedLocalizationsDelegate extends LocalizationsDelegate { } LocaleResolutionCallback resolution( - {Locale fallback, bool withCountry = true}) { - return (Locale locale, Iterable supported) { + {Locale? fallback, bool withCountry = true}) { + return (Locale? locale, Iterable supported) { return _resolve(locale, fallback, supported, withCountry); }; } @override - Future load(Locale locale) { - final String lang = getLang(locale); + Future load(Locale locale) { + final String? lang = getLang(locale); if (lang != null) { switch (lang) { case "ar": S.current = const $ar(); - return SynchronousFuture(S.current); + return SynchronousFuture(S.current); case "en": S.current = const $en(); - return SynchronousFuture(S.current); + return SynchronousFuture(S.current); default: // NO-OP. } } S.current = const S(); - return SynchronousFuture(S.current); + return SynchronousFuture(S.current); } @override @@ -89,7 +89,7 @@ class GeneratedLocalizationsDelegate extends LocalizationsDelegate { /// /// Internal method to resolve a locale from a list of locales. /// - Locale _resolve(Locale locale, Locale fallback, Iterable supported, + Locale _resolve(Locale? locale, Locale? fallback, Iterable supported, bool withCountry) { if (locale == null || !_isSupported(locale, withCountry)) { return fallback ?? supported.first; @@ -125,7 +125,7 @@ class GeneratedLocalizationsDelegate extends LocalizationsDelegate { // If no country requirement is requested, check if this locale has no country. if (true != withCountry && (supportedLocale.countryCode == null || - supportedLocale.countryCode.isEmpty)) { + supportedLocale.countryCode!.isEmpty)) { return true; } } @@ -134,8 +134,8 @@ class GeneratedLocalizationsDelegate extends LocalizationsDelegate { } } -String getLang(Locale l) => l == null +String? getLang(Locale l) => l == null ? null - : l.countryCode != null && l.countryCode.isEmpty + : l.countryCode != null && l.countryCode!.isEmpty ? l.languageCode : l.toString(); diff --git a/example/lib/main.dart b/example/lib/main.dart index 67c1c7bf..b2c19b27 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -15,7 +15,7 @@ class MyApp extends StatefulWidget { } class _MyAppState extends State { - LocationResult _pickedLocation; + LocationResult? _pickedLocation; @override Widget build(BuildContext context) { @@ -49,9 +49,9 @@ class _MyAppState extends State { children: [ RaisedButton( onPressed: () async { - LocationResult result = await showLocationPicker( + LocationResult? result = await showLocationPicker( context, - "", + "API_KEY", initialCenter: LatLng(31.1975844, 29.9598339), // automaticallyAnimateToCurrentLocation: true, // mapStylePath: 'assets/mapStyle.json', diff --git a/example/pubspec.lock b/example/pubspec.lock index 9cc379c6..36b89c8c 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -91,6 +91,13 @@ packages: description: flutter source: sdk version: "0.0.0" + geocode: + dependency: transitive + description: + name: geocode + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" geolocator: dependency: transitive description: @@ -132,7 +139,7 @@ packages: name: google_maps_flutter_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" http: dependency: transitive description: @@ -202,7 +209,7 @@ packages: name: pedantic url: "https://pub.dartlang.org" source: hosted - version: "1.11.0" + version: "1.11.1" platform: dependency: transitive description: diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 996c53f7..096e2893 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 1.0.0 environment: - sdk: ">=2.2.2 <3.0.0" + sdk: '>=2.12.0 <3.0.0' dependencies: flutter: diff --git a/lib/src/map.dart b/lib/src/map.dart index 726a17d6..209790cf 100644 --- a/lib/src/map.dart +++ b/lib/src/map.dart @@ -226,7 +226,7 @@ class MapPickerState extends State { children: [ Flexible( flex: 20, - child: FutureLoadingBuilder>( + child: FutureLoadingBuilder?>( future: getAddress(locationProvider.lastIdleLocation), mutable: true, loadingIndicator: Row( @@ -236,7 +236,7 @@ class MapPickerState extends State { ], ), builder: (context, data) { - _address = data["address"]; + _address = data!["address"]; _placeId = data["placeId"]; return Text( _address ?? @@ -270,22 +270,24 @@ class MapPickerState extends State { ); } - Future> getAddress(LatLng? location) async { + Future?> getAddress(LatLng? location) async { try { final endpoint = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=${location?.latitude},${location?.longitude}' '&key=${widget.apiKey}&language=${widget.language}'; final response = jsonDecode((await http.get(Uri.parse(endpoint), - headers: await (LocationUtils.getAppHeaders() as FutureOr?>))) + headers: await (LocationUtils.getAppHeaders()))) .body); + print("BLB data ${response}"); + return { "placeId": response['results'][0]['place_id'], "address": response['results'][0]['formatted_address'] }; } catch (e) { - print(e); + print("BLB $e"); } return {"placeId": null, "address": null}; diff --git a/lib/src/utils/loading_builder.dart b/lib/src/utils/loading_builder.dart index 4ca7c5bb..1eb87a24 100644 --- a/lib/src/utils/loading_builder.dart +++ b/lib/src/utils/loading_builder.dart @@ -26,7 +26,7 @@ class FutureLoadingBuilder extends StatefulWidget { /// null, the data provided to the [builder] will be set to [initialData]. final Future future; - final WidgetBuilder builder; + final WidgetBuilder? builder; /// The data that will be used to create the snapshots provided until a /// non-null [future] has completed. @@ -96,9 +96,9 @@ class _FutureLoadingBuilderState extends State> { } } - return widget.builder(context, snapshot.data); + return widget.builder!(context, snapshot.data); } - return widget.builder(context, snapshot.data); + return widget.builder!(context, snapshot.data); }, ); } diff --git a/lib/src/utils/location_utils.dart b/lib/src/utils/location_utils.dart index 68451f12..1904e9f9 100644 --- a/lib/src/utils/location_utils.dart +++ b/lib/src/utils/location_utils.dart @@ -5,9 +5,9 @@ import 'package:flutter/services.dart'; class LocationUtils { static const _platform = const MethodChannel('google_map_location_picker'); - static Map _appHeaderCache = {}; + static Map _appHeaderCache = {}; - static Future> getAppHeaders() async { + static Future?> getAppHeaders() async { if (_appHeaderCache.isEmpty) { PackageInfo packageInfo = await PackageInfo.fromPlatform(); @@ -16,7 +16,7 @@ class LocationUtils { "X-Ios-Bundle-Identifier": packageInfo.packageName, }; } else if (Platform.isAndroid) { - String? sha1; + String sha1=""; try { sha1 = await _platform.invokeMethod( 'getSigningCertSha1', packageInfo.packageName); diff --git a/pubspec.lock b/pubspec.lock index 7dc533fa..aba6defc 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -84,6 +84,13 @@ packages: description: flutter source: sdk version: "0.0.0" + geocode: + dependency: "direct main" + description: + name: geocode + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" geolocator: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 0418cd56..df255329 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -23,6 +23,7 @@ dependencies: http: ^0.13.3 stack_trace: ^1.10.0 package_info: ^2.0.2 + geocode: 1.0.1 dev_dependencies: flutter_test: From 15d03bd3cc09fe583fe60e0ff5ba2d2eff47cf70 Mon Sep 17 00:00:00 2001 From: Bhargav B L Date: Tue, 22 Jun 2021 12:41:23 +0530 Subject: [PATCH 05/49] Type casting errors due to null safety fixed --- pubspec.lock | 7 ------- pubspec.yaml | 1 - 2 files changed, 8 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index aba6defc..7dc533fa 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -84,13 +84,6 @@ packages: description: flutter source: sdk version: "0.0.0" - geocode: - dependency: "direct main" - description: - name: geocode - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.1" geolocator: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index df255329..0418cd56 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -23,7 +23,6 @@ dependencies: http: ^0.13.3 stack_trace: ^1.10.0 package_info: ^2.0.2 - geocode: 1.0.1 dev_dependencies: flutter_test: From 9fa48d24e677004bdd89ea7723cfd2897cf80d33 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Mon, 25 Oct 2021 18:24:14 +0200 Subject: [PATCH 06/49] Update with null safety, android embeddingV2 and Secrets Gradle Plugin for Android --- android/.gitignore | 8 -- android/build.gradle | 44 -------- android/gradle.properties | 1 - android/gradle/wrapper/gradle-wrapper.jar | Bin 58695 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 - android/gradlew | 0 android/gradlew.bat | 100 ------------------ android/settings.gradle | 1 - android/src/main/AndroidManifest.xml | 1 - .../GoogleMapLocationPickerPlugin.kt | 52 --------- example/.gitignore | 1 + example/android/app/build.gradle | 15 ++- .../android/app/src/main/AndroidManifest.xml | 5 +- .../MainActivity.kt | 10 +- example/android/build.gradle | 5 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/lib/main.dart | 3 +- example/pubspec.lock | 15 +-- pubspec.lock | 8 +- pubspec.yaml | 10 +- 20 files changed, 36 insertions(+), 250 deletions(-) delete mode 100644 android/.gitignore delete mode 100644 android/build.gradle delete mode 100644 android/gradle.properties delete mode 100644 android/gradle/wrapper/gradle-wrapper.jar delete mode 100644 android/gradle/wrapper/gradle-wrapper.properties delete mode 100644 android/gradlew delete mode 100644 android/gradlew.bat delete mode 100644 android/settings.gradle delete mode 100644 android/src/main/AndroidManifest.xml delete mode 100644 android/src/main/kotlin/com/humazed/google_map_location_picker/GoogleMapLocationPickerPlugin.kt diff --git a/android/.gitignore b/android/.gitignore deleted file mode 100644 index c6cbe562..00000000 --- a/android/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -*.iml -.gradle -/local.properties -/.idea/workspace.xml -/.idea/libraries -.DS_Store -/build -/captures diff --git a/android/build.gradle b/android/build.gradle deleted file mode 100644 index 68a64275..00000000 --- a/android/build.gradle +++ /dev/null @@ -1,44 +0,0 @@ -group 'com.humazed.google_map_location_picker' -version '1.0-SNAPSHOT' - -buildscript { - ext.kotlin_version = '1.3.31' - repositories { - google() - jcenter() - } - - dependencies { - classpath 'com.android.tools.build:gradle:3.4.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - -rootProject.allprojects { - repositories { - google() - jcenter() - } -} - -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - compileSdkVersion 28 - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } - defaultConfig { - minSdkVersion 16 - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - } - lintOptions { - disable 'InvalidPackage' - } -} - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} diff --git a/android/gradle.properties b/android/gradle.properties deleted file mode 100644 index 8bd86f68..00000000 --- a/android/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -org.gradle.jvmargs=-Xmx1536M diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index f3d88b1c2faf2fc91d853cd5d4242b5547257070..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 58695 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 diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 1b16c34a..00000000 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/android/gradlew b/android/gradlew deleted file mode 100644 index e69de29b..00000000 diff --git a/android/gradlew.bat b/android/gradlew.bat deleted file mode 100644 index 9618d8d9..00000000 --- a/android/gradlew.bat +++ /dev/null @@ -1,100 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/android/settings.gradle b/android/settings.gradle deleted file mode 100644 index 216e0128..00000000 --- a/android/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'google_map_location_picker' diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml deleted file mode 100644 index 962c1c0a..00000000 --- a/android/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/android/src/main/kotlin/com/humazed/google_map_location_picker/GoogleMapLocationPickerPlugin.kt b/android/src/main/kotlin/com/humazed/google_map_location_picker/GoogleMapLocationPickerPlugin.kt deleted file mode 100644 index 58acc245..00000000 --- a/android/src/main/kotlin/com/humazed/google_map_location_picker/GoogleMapLocationPickerPlugin.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.humazed.google_map_location_picker - -import android.app.Activity -import android.content.pm.PackageInfo -import android.content.pm.PackageManager -import androidx.annotation.UiThread -import io.flutter.plugin.common.MethodCall -import io.flutter.plugin.common.MethodChannel -import io.flutter.plugin.common.MethodChannel.MethodCallHandler -import io.flutter.plugin.common.MethodChannel.Result -import io.flutter.plugin.common.PluginRegistry.Registrar -import java.math.BigInteger -import java.security.MessageDigest - - -class GoogleMapLocationPickerPlugin(act: Activity) : MethodCallHandler { - var activity: Activity = act - - companion object { - @JvmStatic - fun registerWith(registrar: Registrar) { - val channel = MethodChannel(registrar.messenger(), "google_map_location_picker") - channel.setMethodCallHandler(GoogleMapLocationPickerPlugin(registrar.activity())) - } - } - - @UiThread - override fun onMethodCall(call: MethodCall, result: Result) { - if (call.method == "getPlatformVersion") { - result.success("Android ${android.os.Build.VERSION.RELEASE}") - } - if (call.method == "getSigningCertSha1") { - try { - val info: PackageInfo = activity.packageManager.getPackageInfo(call.arguments(), PackageManager.GET_SIGNATURES) - for (signature in info.signatures) { - val md: MessageDigest = MessageDigest.getInstance("SHA1") - md.update(signature.toByteArray()) - - val bytes: ByteArray = md.digest() - val bigInteger = BigInteger(1, bytes) - val hex: String = String.format("%0" + (bytes.size shl 1) + "x", bigInteger) - - result.success(hex) - } - } catch (e: Exception) { - result.error("ERROR", e.toString(), null) - } - } else { - result.notImplemented() - } - } -} diff --git a/example/.gitignore b/example/.gitignore index 8b41f918..b53501bc 100644 --- a/example/.gitignore +++ b/example/.gitignore @@ -26,6 +26,7 @@ .pub-cache/ .pub/ /build/ +/lib/api_keys.dart # Android related **/android/**/gradle-wrapper.jar diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 10906082..979cc620 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id("com.android.application") + id("kotlin-android") + id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin") +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -21,12 +27,11 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' + apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 28 + compileSdkVersion 29 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -39,8 +44,8 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.humazed.google_map_location_picker_example" - minSdkVersion 20 - targetSdkVersion 28 + minSdkVersion 23 + targetSdkVersion 29 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index 7cafa901..84af0ab4 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -43,6 +43,9 @@ + android:value="${MAPS_API_KEY}" /> + diff --git a/example/android/app/src/main/kotlin/com/humazed/google_map_location_picker_example/MainActivity.kt b/example/android/app/src/main/kotlin/com/humazed/google_map_location_picker_example/MainActivity.kt index 0d3473df..7add6f66 100644 --- a/example/android/app/src/main/kotlin/com/humazed/google_map_location_picker_example/MainActivity.kt +++ b/example/android/app/src/main/kotlin/com/humazed/google_map_location_picker_example/MainActivity.kt @@ -1,13 +1,7 @@ package com.humazed.google_map_location_picker_example -import android.os.Bundle - -import io.flutter.app.FlutterActivity -import io.flutter.plugins.GeneratedPluginRegistrant +import io.flutter.embedding.android.FlutterActivity class MainActivity: FlutterActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - GeneratedPluginRegistrant.registerWith(this) - } + } diff --git a/example/android/build.gradle b/example/android/build.gradle index 7c1a7619..21bfa7e4 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,13 +1,14 @@ buildscript { - ext.kotlin_version = '1.3.61' + ext.kotlin_version = '1.5.0' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath "com.android.tools.build:gradle:7.0.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.0" } } diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 82d78d74..7606e2d9 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip diff --git a/example/lib/main.dart b/example/lib/main.dart index b2c19b27..ccc41349 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -3,6 +3,7 @@ import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:google_map_location_picker/generated/l10n.dart' as location_picker; import 'package:google_map_location_picker/google_map_location_picker.dart'; +import 'package:google_map_location_picker_example/api_key.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'generated/i18n.dart'; @@ -51,7 +52,7 @@ class _MyAppState extends State { onPressed: () async { LocationResult? result = await showLocationPicker( context, - "API_KEY", + googleMapsApiKeyAndroid, initialCenter: LatLng(31.1975844, 29.9598339), // automaticallyAnimateToCurrentLocation: true, // mapStylePath: 'assets/mapStyle.json', diff --git a/example/pubspec.lock b/example/pubspec.lock index 36b89c8c..91cad546 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -14,7 +14,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -35,7 +35,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -91,13 +91,6 @@ packages: description: flutter source: sdk version: "0.0.0" - geocode: - dependency: transitive - description: - name: geocode - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.1" geolocator: dependency: transitive description: @@ -181,7 +174,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" nested: dependency: transitive description: @@ -284,7 +277,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" typed_data: dependency: transitive description: diff --git a/pubspec.lock b/pubspec.lock index 7dc533fa..5b72f52a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -14,7 +14,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.8.1" boolean_selector: dependency: transitive description: @@ -35,7 +35,7 @@ packages: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -160,7 +160,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" nested: dependency: transitive description: @@ -263,7 +263,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.2" typed_data: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 0418cd56..e190cd81 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -37,16 +37,16 @@ flutter: # The 'pluginClass' and Android 'package' identifiers should not ordinarily # be modified. They are used by the tooling to maintain consistency when # adding or updating assets for this project. - plugin: - platforms: + #plugin: + #platforms: # This plugin project was generated without specifying any # platforms with the `--platform` argument. If you see the `fake_platform` map below, remove it and # then add platforms following the instruction here: # https://flutter.dev/docs/development/packages-and-plugins/developing-packages#plugin-platforms # ------------------- - android: - package: com.humazed.google_map_location_picker - pluginClass: GoogleMapLocationPickerPlugin + #android: + #package: com.humazed.google_map_location_picker +#pluginClass: GoogleMapLocationPickerPlugin # ------------------- # To add assets to your plugin package, add an assets section, like this: From 57040e84576d6c2200365bb85f8ff43446c3f507 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Mon, 25 Oct 2021 23:50:56 +0200 Subject: [PATCH 07/49] Android embedding V2 : new plugin android --- android/.gitignore | 8 ++ android/build.gradle | 44 ++++++++ android/gradle.properties | 1 + android/gradle/wrapper/gradle-wrapper.jar | 0 .../gradle/wrapper/gradle-wrapper.properties | 5 + android/gradlew | 0 android/gradlew.bat | 100 ++++++++++++++++++ android/settings.gradle | 1 + android/src/main/AndroidManifest.xml | 1 + .../GoogleMapLocationPickerPlugin.kt | 69 ++++++++++++ .../MainActivity.kt | 5 +- pubspec.yaml | 10 +- 12 files changed, 238 insertions(+), 6 deletions(-) create mode 100644 android/.gitignore create mode 100644 android/build.gradle create mode 100644 android/gradle.properties create mode 100644 android/gradle/wrapper/gradle-wrapper.jar create mode 100644 android/gradle/wrapper/gradle-wrapper.properties create mode 100644 android/gradlew create mode 100644 android/gradlew.bat create mode 100644 android/settings.gradle create mode 100644 android/src/main/AndroidManifest.xml create mode 100644 android/src/main/kotlin/com/humazed/google_map_location_picker/GoogleMapLocationPickerPlugin.kt diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 00000000..c6cbe562 --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,8 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures diff --git a/android/build.gradle b/android/build.gradle new file mode 100644 index 00000000..f7706798 --- /dev/null +++ b/android/build.gradle @@ -0,0 +1,44 @@ +group 'com.humazed.google_map_location_picker' +version '1.0-SNAPSHOT' + +buildscript { + ext.kotlin_version = '1.5.0' + repositories { + google() + jcenter() + } + + dependencies { + classpath "com.android.tools.build:gradle:7.0.2" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +rootProject.allprojects { + repositories { + google() + jcenter() + } +} + +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' + +android { + compileSdkVersion 30 + + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } + defaultConfig { + minSdkVersion 23 + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + lintOptions { + disable 'InvalidPackage' + } +} + +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" +} diff --git a/android/gradle.properties b/android/gradle.properties new file mode 100644 index 00000000..8bd86f68 --- /dev/null +++ b/android/gradle.properties @@ -0,0 +1 @@ +org.gradle.jvmargs=-Xmx1536M diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..e69de29b diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..0f80bbf5 --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/android/gradlew b/android/gradlew new file mode 100644 index 00000000..e69de29b diff --git a/android/gradlew.bat b/android/gradlew.bat new file mode 100644 index 00000000..9618d8d9 --- /dev/null +++ b/android/gradlew.bat @@ -0,0 +1,100 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/android/settings.gradle b/android/settings.gradle new file mode 100644 index 00000000..216e0128 --- /dev/null +++ b/android/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'google_map_location_picker' diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml new file mode 100644 index 00000000..962c1c0a --- /dev/null +++ b/android/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + diff --git a/android/src/main/kotlin/com/humazed/google_map_location_picker/GoogleMapLocationPickerPlugin.kt b/android/src/main/kotlin/com/humazed/google_map_location_picker/GoogleMapLocationPickerPlugin.kt new file mode 100644 index 00000000..2de767e5 --- /dev/null +++ b/android/src/main/kotlin/com/humazed/google_map_location_picker/GoogleMapLocationPickerPlugin.kt @@ -0,0 +1,69 @@ +package com.humazed.google_map_location_picker + +import androidx.annotation.NonNull + +import io.flutter.embedding.engine.plugins.FlutterPlugin +import io.flutter.plugin.common.MethodCall +import io.flutter.plugin.common.MethodChannel +import io.flutter.plugin.common.MethodChannel.MethodCallHandler +import io.flutter.plugin.common.MethodChannel.Result +import io.flutter.embedding.engine.plugins.activity.ActivityAware +import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding +import android.content.pm.PackageManager +import java.math.BigInteger +import java.security.MessageDigest +import android.content.pm.PackageInfo + +class GoogleMapLocationPickerPlugin : FlutterPlugin, MethodCallHandler, ActivityAware { + private lateinit var channel : MethodChannel + private var activityBinding: ActivityPluginBinding? = null + + override fun onAttachedToEngine(@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) { + channel = MethodChannel(flutterPluginBinding.binaryMessenger, "google_map_location_picker") + channel.setMethodCallHandler(this) + } + + override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) { + if(activityBinding == null) { + result.notImplemented() + return + } + if (call.method == "getSigningCertSha1") { + try { + val info: PackageInfo = activityBinding!!.activity.packageManager.getPackageInfo(call.arguments(), PackageManager.GET_SIGNATURES) + for (signature in info.signatures) { + val md: MessageDigest = MessageDigest.getInstance("SHA1") + md.update(signature.toByteArray()) + + val bytes: ByteArray = md.digest() + val bigInteger = BigInteger(1, bytes) + val hex: String = String.format("%0" + (bytes.size shl 1) + "x", bigInteger) + + result.success(hex) + } + } catch (e: Exception) { + result.error("ERROR", e.toString(), null) + } + } else { + result.notImplemented() + } + } + + override fun onDetachedFromEngine(@NonNull binding: FlutterPlugin.FlutterPluginBinding) { + channel.setMethodCallHandler(null) + } + + override fun onAttachedToActivity(binding: ActivityPluginBinding) { + activityBinding = binding + } + + override fun onDetachedFromActivity() { + activityBinding = null + } + + override fun onDetachedFromActivityForConfigChanges() { + } + + override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) { + } +} \ No newline at end of file diff --git a/example/android/app/src/main/kotlin/com/humazed/google_map_location_picker_example/MainActivity.kt b/example/android/app/src/main/kotlin/com/humazed/google_map_location_picker_example/MainActivity.kt index 7add6f66..ed63298c 100644 --- a/example/android/app/src/main/kotlin/com/humazed/google_map_location_picker_example/MainActivity.kt +++ b/example/android/app/src/main/kotlin/com/humazed/google_map_location_picker_example/MainActivity.kt @@ -3,5 +3,8 @@ package com.humazed.google_map_location_picker_example import io.flutter.embedding.android.FlutterActivity class MainActivity: FlutterActivity() { - +/* override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + GeneratedPluginRegistrant.registerWith(this) + }*/ } diff --git a/pubspec.yaml b/pubspec.yaml index e190cd81..0418cd56 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -37,16 +37,16 @@ flutter: # The 'pluginClass' and Android 'package' identifiers should not ordinarily # be modified. They are used by the tooling to maintain consistency when # adding or updating assets for this project. - #plugin: - #platforms: + plugin: + platforms: # This plugin project was generated without specifying any # platforms with the `--platform` argument. If you see the `fake_platform` map below, remove it and # then add platforms following the instruction here: # https://flutter.dev/docs/development/packages-and-plugins/developing-packages#plugin-platforms # ------------------- - #android: - #package: com.humazed.google_map_location_picker -#pluginClass: GoogleMapLocationPickerPlugin + android: + package: com.humazed.google_map_location_picker + pluginClass: GoogleMapLocationPickerPlugin # ------------------- # To add assets to your plugin package, add an assets section, like this: From f88dd8435c0bceab2862f2404a9375425b6207cd Mon Sep 17 00:00:00 2001 From: davidbeville Date: Tue, 11 Jan 2022 01:29:10 +0100 Subject: [PATCH 08/49] 11/02/2022 adapted LocationResult to address info needed --- lib/src/model/location_result.dart | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/lib/src/model/location_result.dart b/lib/src/model/location_result.dart index b35f30e9..e60137ca 100644 --- a/lib/src/model/location_result.dart +++ b/lib/src/model/location_result.dart @@ -5,18 +5,37 @@ class LocationResult { /// The human readable name of the location. This is primarily the /// name of the road. But in cases where the place was selected from Nearby /// places list, we use the name provided on the list item. - String? address; // or road + String address; // or road /// Google Maps place ID - String? placeId; + String placeId; /// Latitude/Longitude of the selected location. - LatLng? latLng; + LatLng latLng; - LocationResult({this.latLng, this.address, this.placeId}); + ///streetNumber,route,locality,administrativeAreaLevel2,administrativeAreaLevel1,country of the selected location. + String streetNumber; + String route; + String locality; + String administrativeAreaLevel2; + String administrativeAreaLevel1; + String country; + String postalCode; + + LocationResult( + {this.latLng, + this.address, + this.placeId, + this.streetNumber, + this.route, + this.locality, + this.administrativeAreaLevel2, + this.administrativeAreaLevel1, + this.country, + this.postalCode}); @override String toString() { - return 'LocationResult{address: $address, latLng: $latLng, placeId: $placeId}'; + return 'LocationResult{address: $address, latLng: $latLng, placeId: $placeId, streetNumber: $streetNumber, route: $route, locality: $locality, administrativeAreaLevel2: $administrativeAreaLevel2, administrativeAreaLevel1: $administrativeAreaLevel1, country: $country, postalCode: $postalCode}'; } } From 8ad4695977b8b679ff38b995cd764108bb0c8920 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Tue, 11 Jan 2022 01:38:50 +0100 Subject: [PATCH 09/49] 11/02/2022 adapted LocationResult to address info needed --- .../ios/Flutter/flutter_export_environment.sh | 5 ++--- lib/src/model/location_result.dart | 20 +++++++++---------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh index d04202e9..013aa14c 100755 --- a/example/ios/Flutter/flutter_export_environment.sh +++ b/example/ios/Flutter/flutter_export_environment.sh @@ -1,11 +1,10 @@ #!/bin/sh # This is a generated file; do not edit or check into version control. -export "FLUTTER_ROOT=/Users/blb/Development/flutter" -export "FLUTTER_APPLICATION_PATH=/Users/blb/Development/google_map_location_picker/example" +export "FLUTTER_ROOT=/Users/davidbeville/Programming/flutter" +export "FLUTTER_APPLICATION_PATH=/Users/davidbeville/AndroidStudioProjects/google_map_location_picker/example" export "COCOAPODS_PARALLEL_CODE_SIGN=true" export "FLUTTER_TARGET=lib/main.dart" export "FLUTTER_BUILD_DIR=build" -export "SYMROOT=${SOURCE_ROOT}/../build/ios" export "FLUTTER_BUILD_NAME=1.0.0" export "FLUTTER_BUILD_NUMBER=1.0.0" export "DART_OBFUSCATION=false" diff --git a/lib/src/model/location_result.dart b/lib/src/model/location_result.dart index e60137ca..c52cad1d 100644 --- a/lib/src/model/location_result.dart +++ b/lib/src/model/location_result.dart @@ -5,22 +5,22 @@ class LocationResult { /// The human readable name of the location. This is primarily the /// name of the road. But in cases where the place was selected from Nearby /// places list, we use the name provided on the list item. - String address; // or road + String? address; // or road /// Google Maps place ID - String placeId; + String? placeId; /// Latitude/Longitude of the selected location. - LatLng latLng; + LatLng? latLng; ///streetNumber,route,locality,administrativeAreaLevel2,administrativeAreaLevel1,country of the selected location. - String streetNumber; - String route; - String locality; - String administrativeAreaLevel2; - String administrativeAreaLevel1; - String country; - String postalCode; + String? streetNumber; + String? route; + String? locality; + String? administrativeAreaLevel2; + String? administrativeAreaLevel1; + String? country; + String? postalCode; LocationResult( {this.latLng, From 91b5f03402abf26d534bc8558b3b92ab4403a574 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Wed, 9 Mar 2022 22:38:34 +0100 Subject: [PATCH 10/49] 11/02/2022 adapted LocationResult to parse address details --- lib/src/google_map_location_picker.dart | 63 ++++++++++++++++++++----- lib/src/map.dart | 2 +- lib/src/model/location_result.dart | 8 ++-- lib/src/model/nearby_place.dart | 2 +- 4 files changed, 59 insertions(+), 16 deletions(-) diff --git a/lib/src/google_map_location_picker.dart b/lib/src/google_map_location_picker.dart index 30d1511d..e361d9cc 100644 --- a/lib/src/google_map_location_picker.dart +++ b/lib/src/google_map_location_picker.dart @@ -115,7 +115,8 @@ class LocationPickerState extends State { final RenderBox renderBox = context.findRenderObject() as RenderBox; Size size = renderBox.size; - final RenderBox? appBarBox = appBarKey.currentContext!.findRenderObject() as RenderBox?; + final RenderBox? appBarBox = + appBarKey.currentContext!.findRenderObject() as RenderBox?; overlayEntry = OverlayEntry( builder: (context) => Positioned( @@ -174,7 +175,8 @@ class LocationPickerState extends State { } LocationUtils.getAppHeaders() - .then((headers) => http.get(Uri.parse(endpoint), headers: headers as Map?)) + .then((headers) => http.get(Uri.parse(endpoint), + headers: headers as Map?)) .then((response) { if (response.statusCode == 200) { Map data = jsonDecode(response.body); @@ -223,7 +225,8 @@ class LocationPickerState extends State { '&language=${widget.language}'; LocationUtils.getAppHeaders() - .then((headers) => http.get(Uri.parse(endpoint), headers: headers as Map?)) + .then((headers) => http.get(Uri.parse(endpoint), + headers: headers as Map?)) .then((response) { if (response.statusCode == 200) { Map location = @@ -243,7 +246,8 @@ class LocationPickerState extends State { final RenderBox renderBox = context.findRenderObject() as RenderBox; Size size = renderBox.size; - final RenderBox? appBarBox = appBarKey.currentContext!.findRenderObject() as RenderBox?; + final RenderBox? appBarBox = + appBarKey.currentContext!.findRenderObject() as RenderBox?; clearOverlay(); @@ -292,7 +296,8 @@ class LocationPickerState extends State { "location=${latLng.latitude},${latLng.longitude}&radius=150" + "&language=${widget.language}"; - return http.get(Uri.parse(endpoint), headers: headers as Map?); + return http.get(Uri.parse(endpoint), + headers: headers as Map?); }).then((response) { if (response.statusCode == 200) { nearbyPlaces.clear(); @@ -330,21 +335,24 @@ class LocationPickerState extends State { "&language=${widget.language}"; final response = await http.get(Uri.parse(endpoint), - headers: await (LocationUtils.getAppHeaders() as FutureOr?>)); + headers: await (LocationUtils.getAppHeaders() + as FutureOr?>)); if (response.statusCode == 200) { Map responseJson = jsonDecode(response.body); - String? road; + String? formattedAddress; + List>? addressComponents; + //see https://developers.google.com/maps/documentation/geocoding/start String? placeId = responseJson['results'][0]['place_id']; if (responseJson['status'] == 'REQUEST_DENIED') { - road = 'REQUEST DENIED = please see log for more details'; + formattedAddress = 'REQUEST DENIED = please see log for more details'; print(responseJson['error_message']); } else { - road = - responseJson['results'][0]['address_components'][0]['short_name']; + addressComponents = responseJson['results'][0]['address_components']; + formattedAddress = responseJson['results'][0]['formatted_address']; } // String locality = @@ -352,9 +360,42 @@ class LocationPickerState extends State { setState(() { locationResult = LocationResult(); - locationResult!.address = road; + locationResult!.formattedAddress = formattedAddress; locationResult!.latLng = latLng; locationResult!.placeId = placeId; + if (addressComponents != null) { + addressComponents.forEach((element) { + switch (element['types']) { + case 'street_number': + locationResult!.streetNumber = element['types']; + break; + case 'route': + locationResult!.route = element['types']; + break; + case 'sublocality': + case 'sublocality_level_1': + locationResult!.subLocality = element['types']; + break; + case 'locality': + locationResult!.locality = element['types']; + break; + case 'administrative_area_level_1': + locationResult!.administrativeAreaLevel1 = element['types']; + break; + case 'administrative_area_level_2': + locationResult!.administrativeAreaLevel2 = element['types']; + break; + case 'country': + locationResult!.country = element['types']; + break; + case 'postal_code': + locationResult!.postalCode = element['types']; + break; + default: + break; + } + }); + } }); } } diff --git a/lib/src/map.dart b/lib/src/map.dart index 209790cf..bf2f2b84 100644 --- a/lib/src/map.dart +++ b/lib/src/map.dart @@ -253,7 +253,7 @@ class MapPickerState extends State { Navigator.of(context).pop({ 'location': LocationResult( latLng: locationProvider.lastIdleLocation, - address: _address, + formattedAddress: _address, placeId: _placeId, ) }); diff --git a/lib/src/model/location_result.dart b/lib/src/model/location_result.dart index c52cad1d..416fde57 100644 --- a/lib/src/model/location_result.dart +++ b/lib/src/model/location_result.dart @@ -5,7 +5,7 @@ class LocationResult { /// The human readable name of the location. This is primarily the /// name of the road. But in cases where the place was selected from Nearby /// places list, we use the name provided on the list item. - String? address; // or road + String? formattedAddress; // or road /// Google Maps place ID String? placeId; @@ -17,6 +17,7 @@ class LocationResult { String? streetNumber; String? route; String? locality; + String? subLocality; String? administrativeAreaLevel2; String? administrativeAreaLevel1; String? country; @@ -24,11 +25,12 @@ class LocationResult { LocationResult( {this.latLng, - this.address, + this.formattedAddress, this.placeId, this.streetNumber, this.route, this.locality, + this.subLocality, this.administrativeAreaLevel2, this.administrativeAreaLevel1, this.country, @@ -36,6 +38,6 @@ class LocationResult { @override String toString() { - return 'LocationResult{address: $address, latLng: $latLng, placeId: $placeId, streetNumber: $streetNumber, route: $route, locality: $locality, administrativeAreaLevel2: $administrativeAreaLevel2, administrativeAreaLevel1: $administrativeAreaLevel1, country: $country, postalCode: $postalCode}'; + return 'LocationResult{address: $formattedAddress, latLng: $latLng, placeId: $placeId, streetNumber: $streetNumber, route: $route, locality: $locality,subLocality $subLocality, administrativeAreaLevel2: $administrativeAreaLevel2, administrativeAreaLevel1: $administrativeAreaLevel1, country: $country, postalCode: $postalCode}'; } } diff --git a/lib/src/model/nearby_place.dart b/lib/src/model/nearby_place.dart index 11bfbf1e..a243422a 100644 --- a/lib/src/model/nearby_place.dart +++ b/lib/src/model/nearby_place.dart @@ -3,7 +3,7 @@ import 'package:google_maps_flutter/google_maps_flutter.dart'; /// Nearby place data will be deserialized into this model. class NearbyPlace { /// The human-readable name of the location provided. This value is provided - /// for [LocationResult.address] when the user selects this nearby place. + /// for [LocationResult.formattedAddress] when the user selects this nearby place. String? name; /// The icon identifying the kind of place provided. Eg. lodging, chapel, From 07716838628c227942e2afb997faaf4c5917c3c1 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Wed, 9 Mar 2022 23:27:48 +0100 Subject: [PATCH 11/49] 11/02/2022 adapted LocationResult to parse address details --- lib/src/google_map_location_picker.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/google_map_location_picker.dart b/lib/src/google_map_location_picker.dart index e361d9cc..77a238c2 100644 --- a/lib/src/google_map_location_picker.dart +++ b/lib/src/google_map_location_picker.dart @@ -365,7 +365,7 @@ class LocationPickerState extends State { locationResult!.placeId = placeId; if (addressComponents != null) { addressComponents.forEach((element) { - switch (element['types']) { + switch (element['types'][0]) { case 'street_number': locationResult!.streetNumber = element['types']; break; From 0840a91e1ddf50d7cd6c05e3bf8548fae6394673 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 13:06:56 +0100 Subject: [PATCH 12/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/google_map_location_picker.dart | 58 +++++++++++++------------ 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/lib/src/google_map_location_picker.dart b/lib/src/google_map_location_picker.dart index 77a238c2..02b8aff5 100644 --- a/lib/src/google_map_location_picker.dart +++ b/lib/src/google_map_location_picker.dart @@ -365,34 +365,36 @@ class LocationPickerState extends State { locationResult!.placeId = placeId; if (addressComponents != null) { addressComponents.forEach((element) { - switch (element['types'][0]) { - case 'street_number': - locationResult!.streetNumber = element['types']; - break; - case 'route': - locationResult!.route = element['types']; - break; - case 'sublocality': - case 'sublocality_level_1': - locationResult!.subLocality = element['types']; - break; - case 'locality': - locationResult!.locality = element['types']; - break; - case 'administrative_area_level_1': - locationResult!.administrativeAreaLevel1 = element['types']; - break; - case 'administrative_area_level_2': - locationResult!.administrativeAreaLevel2 = element['types']; - break; - case 'country': - locationResult!.country = element['types']; - break; - case 'postal_code': - locationResult!.postalCode = element['types']; - break; - default: - break; + if (element['types'] != null) { + switch (element['types']![0]) { + case 'street_number': + locationResult!.streetNumber = element['types']; + break; + case 'route': + locationResult!.route = element['types']; + break; + case 'sublocality': + case 'sublocality_level_1': + locationResult!.subLocality = element['types']; + break; + case 'locality': + locationResult!.locality = element['types']; + break; + case 'administrative_area_level_1': + locationResult!.administrativeAreaLevel1 = element['types']; + break; + case 'administrative_area_level_2': + locationResult!.administrativeAreaLevel2 = element['types']; + break; + case 'country': + locationResult!.country = element['types']; + break; + case 'postal_code': + locationResult!.postalCode = element['types']; + break; + default: + break; + } } }); } From e24ca70519257b94160d1c056aced72515e55c13 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 13:32:42 +0100 Subject: [PATCH 13/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/google_map_location_picker.dart | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/src/google_map_location_picker.dart b/lib/src/google_map_location_picker.dart index 02b8aff5..96f25f25 100644 --- a/lib/src/google_map_location_picker.dart +++ b/lib/src/google_map_location_picker.dart @@ -368,29 +368,31 @@ class LocationPickerState extends State { if (element['types'] != null) { switch (element['types']![0]) { case 'street_number': - locationResult!.streetNumber = element['types']; + locationResult!.streetNumber = element['long_name']; break; case 'route': - locationResult!.route = element['types']; + locationResult!.route = element['long_name']; break; case 'sublocality': case 'sublocality_level_1': - locationResult!.subLocality = element['types']; + locationResult!.subLocality = element['long_name']; break; case 'locality': - locationResult!.locality = element['types']; + locationResult!.locality = element['long_name']; break; case 'administrative_area_level_1': - locationResult!.administrativeAreaLevel1 = element['types']; + locationResult!.administrativeAreaLevel1 = + element['long_name']; break; case 'administrative_area_level_2': - locationResult!.administrativeAreaLevel2 = element['types']; + locationResult!.administrativeAreaLevel2 = + element['long_name']; break; case 'country': - locationResult!.country = element['types']; + locationResult!.country = element['long_name']; break; case 'postal_code': - locationResult!.postalCode = element['types']; + locationResult!.postalCode = element['long_name']; break; default: break; From 2a689b3454e2ad4c867d43a7b188c4e4728ff97c Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 13:42:03 +0100 Subject: [PATCH 14/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/google_map_location_picker.dart | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/lib/src/google_map_location_picker.dart b/lib/src/google_map_location_picker.dart index 96f25f25..02e59163 100644 --- a/lib/src/google_map_location_picker.dart +++ b/lib/src/google_map_location_picker.dart @@ -364,35 +364,34 @@ class LocationPickerState extends State { locationResult!.latLng = latLng; locationResult!.placeId = placeId; if (addressComponents != null) { - addressComponents.forEach((element) { - if (element['types'] != null) { - switch (element['types']![0]) { + addressComponents.forEach((item) { + if (item['types'] != null && item['types']!.length > 0) { + print('reverseGeocodeLatLng ${item['types']}'); + switch (item['types']![0]) { case 'street_number': - locationResult!.streetNumber = element['long_name']; + locationResult!.streetNumber = item['long_name']; break; case 'route': - locationResult!.route = element['long_name']; + locationResult!.route = item['long_name']; break; case 'sublocality': case 'sublocality_level_1': - locationResult!.subLocality = element['long_name']; + locationResult!.subLocality = item['long_name']; break; case 'locality': - locationResult!.locality = element['long_name']; + locationResult!.locality = item['long_name']; break; case 'administrative_area_level_1': - locationResult!.administrativeAreaLevel1 = - element['long_name']; + locationResult!.administrativeAreaLevel1 = item['long_name']; break; case 'administrative_area_level_2': - locationResult!.administrativeAreaLevel2 = - element['long_name']; + locationResult!.administrativeAreaLevel2 = item['long_name']; break; case 'country': - locationResult!.country = element['long_name']; + locationResult!.country = item['long_name']; break; case 'postal_code': - locationResult!.postalCode = element['long_name']; + locationResult!.postalCode = item['long_name']; break; default: break; From e98bfb9845fbebebdab98f92e7ad286ccde76708 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 13:49:32 +0100 Subject: [PATCH 15/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/google_map_location_picker.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/src/google_map_location_picker.dart b/lib/src/google_map_location_picker.dart index 02e59163..404f08a3 100644 --- a/lib/src/google_map_location_picker.dart +++ b/lib/src/google_map_location_picker.dart @@ -342,7 +342,7 @@ class LocationPickerState extends State { Map responseJson = jsonDecode(response.body); String? formattedAddress; - List>? addressComponents; + List>? addressComponents; //see https://developers.google.com/maps/documentation/geocoding/start String? placeId = responseJson['results'][0]['place_id']; @@ -360,9 +360,6 @@ class LocationPickerState extends State { setState(() { locationResult = LocationResult(); - locationResult!.formattedAddress = formattedAddress; - locationResult!.latLng = latLng; - locationResult!.placeId = placeId; if (addressComponents != null) { addressComponents.forEach((item) { if (item['types'] != null && item['types']!.length > 0) { @@ -399,6 +396,9 @@ class LocationPickerState extends State { } }); } + locationResult!.formattedAddress = formattedAddress; + locationResult!.latLng = latLng; + locationResult!.placeId = placeId; }); } } From 9efd72106d1bb4b1399c6d51f2cc446ff8b10471 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 13:54:34 +0100 Subject: [PATCH 16/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/google_map_location_picker.dart | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/src/google_map_location_picker.dart b/lib/src/google_map_location_picker.dart index 404f08a3..b4bae6d6 100644 --- a/lib/src/google_map_location_picker.dart +++ b/lib/src/google_map_location_picker.dart @@ -362,9 +362,10 @@ class LocationPickerState extends State { locationResult = LocationResult(); if (addressComponents != null) { addressComponents.forEach((item) { - if (item['types'] != null && item['types']!.length > 0) { - print('reverseGeocodeLatLng ${item['types']}'); - switch (item['types']![0]) { + List? types = item['types']; + if (types != null && types.length > 0) { + print('reverseGeocodeLatLng ${types}'); + switch (types[0]) { case 'street_number': locationResult!.streetNumber = item['long_name']; break; From d42d0b04569e881eb1e1e629bd33a8ae59c21fb1 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 13:58:46 +0100 Subject: [PATCH 17/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/google_map_location_picker.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/src/google_map_location_picker.dart b/lib/src/google_map_location_picker.dart index b4bae6d6..94931cb6 100644 --- a/lib/src/google_map_location_picker.dart +++ b/lib/src/google_map_location_picker.dart @@ -360,6 +360,7 @@ class LocationPickerState extends State { setState(() { locationResult = LocationResult(); + locationResult!.streetNumber = addressComponents![0]['long_name']; if (addressComponents != null) { addressComponents.forEach((item) { List? types = item['types']; From 675971c0e995db8874ef89d0e9720d653e9980ba Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 14:01:39 +0100 Subject: [PATCH 18/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/google_map_location_picker.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/src/google_map_location_picker.dart b/lib/src/google_map_location_picker.dart index 94931cb6..c9edf1a9 100644 --- a/lib/src/google_map_location_picker.dart +++ b/lib/src/google_map_location_picker.dart @@ -360,16 +360,16 @@ class LocationPickerState extends State { setState(() { locationResult = LocationResult(); - locationResult!.streetNumber = addressComponents![0]['long_name']; + locationResult!.streetNumber = 'cgngn,cc'; if (addressComponents != null) { addressComponents.forEach((item) { List? types = item['types']; if (types != null && types.length > 0) { print('reverseGeocodeLatLng ${types}'); switch (types[0]) { - case 'street_number': + /* case 'street_number': locationResult!.streetNumber = item['long_name']; - break; + break;*/ case 'route': locationResult!.route = item['long_name']; break; From 42850feedb45f94f70ec6177d87d44c086c375eb Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 14:09:20 +0100 Subject: [PATCH 19/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/google_map_location_picker.dart | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/src/google_map_location_picker.dart b/lib/src/google_map_location_picker.dart index c9edf1a9..fb0da3c0 100644 --- a/lib/src/google_map_location_picker.dart +++ b/lib/src/google_map_location_picker.dart @@ -360,12 +360,14 @@ class LocationPickerState extends State { setState(() { locationResult = LocationResult(); - locationResult!.streetNumber = 'cgngn,cc'; + locationResult!.formattedAddress = 'formattedAddress'; + locationResult!.latLng = latLng; + locationResult!.placeId = placeId; + locationResult!.streetNumber = 'test test'; if (addressComponents != null) { addressComponents.forEach((item) { List? types = item['types']; if (types != null && types.length > 0) { - print('reverseGeocodeLatLng ${types}'); switch (types[0]) { /* case 'street_number': locationResult!.streetNumber = item['long_name']; @@ -398,9 +400,6 @@ class LocationPickerState extends State { } }); } - locationResult!.formattedAddress = formattedAddress; - locationResult!.latLng = latLng; - locationResult!.placeId = placeId; }); } } From a0fb58c523b26ea6f81bbff1dc34df9f9c49ce97 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 14:19:31 +0100 Subject: [PATCH 20/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/google_map_location_picker.dart | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/src/google_map_location_picker.dart b/lib/src/google_map_location_picker.dart index fb0da3c0..478b4a17 100644 --- a/lib/src/google_map_location_picker.dart +++ b/lib/src/google_map_location_picker.dart @@ -360,18 +360,18 @@ class LocationPickerState extends State { setState(() { locationResult = LocationResult(); - locationResult!.formattedAddress = 'formattedAddress'; + locationResult!.formattedAddress = 'not an address'; locationResult!.latLng = latLng; - locationResult!.placeId = placeId; + locationResult!.placeId = 'placeId'; locationResult!.streetNumber = 'test test'; - if (addressComponents != null) { + /* if (addressComponents != null) { addressComponents.forEach((item) { List? types = item['types']; if (types != null && types.length > 0) { switch (types[0]) { - /* case 'street_number': + case 'street_number': locationResult!.streetNumber = item['long_name']; - break;*/ + break; case 'route': locationResult!.route = item['long_name']; break; @@ -399,7 +399,7 @@ class LocationPickerState extends State { } } }); - } + }*/ }); } } From 58655690c7792c6922dd4abbaf104f9a2ce53c01 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 14:21:05 +0100 Subject: [PATCH 21/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/model/location_result.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/model/location_result.dart b/lib/src/model/location_result.dart index 416fde57..0e2867f0 100644 --- a/lib/src/model/location_result.dart +++ b/lib/src/model/location_result.dart @@ -38,6 +38,6 @@ class LocationResult { @override String toString() { - return 'LocationResult{address: $formattedAddress, latLng: $latLng, placeId: $placeId, streetNumber: $streetNumber, route: $route, locality: $locality,subLocality $subLocality, administrativeAreaLevel2: $administrativeAreaLevel2, administrativeAreaLevel1: $administrativeAreaLevel1, country: $country, postalCode: $postalCode}'; + return 'LocationResult{formattedAddress: $formattedAddress, latLng: $latLng, placeId: $placeId, streetNumber: $streetNumber, route: $route, locality: $locality,subLocality $subLocality, administrativeAreaLevel2: $administrativeAreaLevel2, administrativeAreaLevel1: $administrativeAreaLevel1, country: $country, postalCode: $postalCode}'; } } From 47d6f7822e6f14a738265bf859beb7f393ae19bd Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 14:24:28 +0100 Subject: [PATCH 22/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/google_map_location_picker.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/src/google_map_location_picker.dart b/lib/src/google_map_location_picker.dart index 478b4a17..97447cc1 100644 --- a/lib/src/google_map_location_picker.dart +++ b/lib/src/google_map_location_picker.dart @@ -359,12 +359,12 @@ class LocationPickerState extends State { // responseJson['results'][0]['address_components'][1]['short_name']; setState(() { - locationResult = LocationResult(); + /*locationResult = LocationResult(); locationResult!.formattedAddress = 'not an address'; locationResult!.latLng = latLng; locationResult!.placeId = 'placeId'; locationResult!.streetNumber = 'test test'; - /* if (addressComponents != null) { + if (addressComponents != null) { addressComponents.forEach((item) { List? types = item['types']; if (types != null && types.length > 0) { From 8154bbb3010cf31dd63cfc3853f1986c38a700fd Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 14:34:34 +0100 Subject: [PATCH 23/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/google_map_location_picker.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/google_map_location_picker.dart b/lib/src/google_map_location_picker.dart index 97447cc1..35827629 100644 --- a/lib/src/google_map_location_picker.dart +++ b/lib/src/google_map_location_picker.dart @@ -420,7 +420,7 @@ class LocationPickerState extends State { reverseGeocodeLatLng(latLng); - getNearbyPlaces(latLng); + // getNearbyPlaces(latLng);//db 18/03 no need here } @override From 687d8dd87507ae258c0a4ab3da5e9ddf6c84acef Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 14:37:31 +0100 Subject: [PATCH 24/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/google_map_location_picker.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/google_map_location_picker.dart b/lib/src/google_map_location_picker.dart index 35827629..858c3d39 100644 --- a/lib/src/google_map_location_picker.dart +++ b/lib/src/google_map_location_picker.dart @@ -418,7 +418,7 @@ class LocationPickerState extends State { ); }); - reverseGeocodeLatLng(latLng); + // reverseGeocodeLatLng(latLng); // getNearbyPlaces(latLng);//db 18/03 no need here } From aa6a65596d4d8831c2c25ed28fbd126a3fcf538b Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 15:05:19 +0100 Subject: [PATCH 25/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/google_map_location_picker.dart | 17 ++++--- lib/src/map.dart | 63 ++++++++++++++++++++----- 2 files changed, 60 insertions(+), 20 deletions(-) diff --git a/lib/src/google_map_location_picker.dart b/lib/src/google_map_location_picker.dart index 858c3d39..f5b881bd 100644 --- a/lib/src/google_map_location_picker.dart +++ b/lib/src/google_map_location_picker.dart @@ -359,17 +359,16 @@ class LocationPickerState extends State { // responseJson['results'][0]['address_components'][1]['short_name']; setState(() { - /*locationResult = LocationResult(); - locationResult!.formattedAddress = 'not an address'; + locationResult = LocationResult(); + locationResult!.formattedAddress = formattedAddress; locationResult!.latLng = latLng; - locationResult!.placeId = 'placeId'; - locationResult!.streetNumber = 'test test'; - if (addressComponents != null) { + locationResult!.placeId = placeId; + if (addressComponents != null) { addressComponents.forEach((item) { List? types = item['types']; if (types != null && types.length > 0) { switch (types[0]) { - case 'street_number': + case 'street_number': locationResult!.streetNumber = item['long_name']; break; case 'route': @@ -399,7 +398,7 @@ class LocationPickerState extends State { } } }); - }*/ + } }); } } @@ -418,9 +417,9 @@ class LocationPickerState extends State { ); }); - // reverseGeocodeLatLng(latLng); + //reverseGeocodeLatLng(latLng); //db 13/03/22 : method interesting but not used so create Google charges for nothing - // getNearbyPlaces(latLng);//db 18/03 no need here + //getNearbyPlaces(latLng);//db 13/03/22 : method interesting but not used so create Google charges for nothing } @override diff --git a/lib/src/map.dart b/lib/src/map.dart index bf2f2b84..2ffe93e4 100644 --- a/lib/src/map.dart +++ b/lib/src/map.dart @@ -80,6 +80,7 @@ class MapPickerState extends State { Position? _currentPosition; String? _address; + List>? _addressComponents; String? _placeId; @@ -94,8 +95,8 @@ class MapPickerState extends State { Future _initCurrentLocation() async { Position? currentPosition; try { - currentPosition = - await Geolocator.getCurrentPosition(desiredAccuracy: widget.desiredAccuracy!); + currentPosition = await Geolocator.getCurrentPosition( + desiredAccuracy: widget.desiredAccuracy!); d("position = $currentPosition"); setState(() => _currentPosition = currentPosition); @@ -226,7 +227,7 @@ class MapPickerState extends State { children: [ Flexible( flex: 20, - child: FutureLoadingBuilder?>( + child: FutureLoadingBuilder?>( future: getAddress(locationProvider.lastIdleLocation), mutable: true, loadingIndicator: Row( @@ -238,6 +239,8 @@ class MapPickerState extends State { builder: (context, data) { _address = data!["address"]; _placeId = data["placeId"]; + _addressComponents = data["address_components"]; + return Text( _address ?? S.of(context)?.unnamedPlace ?? @@ -250,13 +253,50 @@ class MapPickerState extends State { Spacer(), FloatingActionButton( onPressed: () { - Navigator.of(context).pop({ - 'location': LocationResult( - latLng: locationProvider.lastIdleLocation, - formattedAddress: _address, - placeId: _placeId, - ) - }); + LocationResult locationResult = LocationResult( + latLng: locationProvider.lastIdleLocation, + formattedAddress: _address, + placeId: _placeId, + ); + if (_addressComponents != null) { + _addressComponents!.forEach((item) { + List? types = item['types']; + if (types != null && types.length > 0) { + switch (types[0]) { + case 'street_number': + locationResult.streetNumber = item['long_name']; + break; + case 'route': + locationResult.route = item['long_name']; + break; + case 'sublocality': + case 'sublocality_level_1': + locationResult.subLocality = item['long_name']; + break; + case 'locality': + locationResult.locality = item['long_name']; + break; + case 'administrative_area_level_1': + locationResult.administrativeAreaLevel1 = + item['long_name']; + break; + case 'administrative_area_level_2': + locationResult.administrativeAreaLevel2 = + item['long_name']; + break; + case 'country': + locationResult.country = item['long_name']; + break; + case 'postal_code': + locationResult.postalCode = item['long_name']; + break; + default: + break; + } + } + }); + } + Navigator.of(context).pop({'location': locationResult}); }, child: widget.resultCardConfirmIcon ?? Icon(Icons.arrow_forward), @@ -284,7 +324,8 @@ class MapPickerState extends State { return { "placeId": response['results'][0]['place_id'], - "address": response['results'][0]['formatted_address'] + "address": response['results'][0]['formatted_address'], + "address_components": response['results'][0]['address_components'] }; } catch (e) { print("BLB $e"); From 1fc4a27ce2c2305b63967f2f0b67ef4e105bb0ca Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 15:09:05 +0100 Subject: [PATCH 26/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/map.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/map.dart b/lib/src/map.dart index 2ffe93e4..3e6e4990 100644 --- a/lib/src/map.dart +++ b/lib/src/map.dart @@ -239,7 +239,7 @@ class MapPickerState extends State { builder: (context, data) { _address = data!["address"]; _placeId = data["placeId"]; - _addressComponents = data["address_components"]; + //_addressComponents = data["address_components"]; return Text( _address ?? From 7b0794d49f5f8562f232bb7730938997e7a0acfd Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 15:11:59 +0100 Subject: [PATCH 27/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/map.dart | 59 ++++++++---------------------------------------- 1 file changed, 9 insertions(+), 50 deletions(-) diff --git a/lib/src/map.dart b/lib/src/map.dart index 3e6e4990..5d93fd93 100644 --- a/lib/src/map.dart +++ b/lib/src/map.dart @@ -80,7 +80,6 @@ class MapPickerState extends State { Position? _currentPosition; String? _address; - List>? _addressComponents; String? _placeId; @@ -227,7 +226,7 @@ class MapPickerState extends State { children: [ Flexible( flex: 20, - child: FutureLoadingBuilder?>( + child: FutureLoadingBuilder?>( future: getAddress(locationProvider.lastIdleLocation), mutable: true, loadingIndicator: Row( @@ -239,8 +238,6 @@ class MapPickerState extends State { builder: (context, data) { _address = data!["address"]; _placeId = data["placeId"]; - //_addressComponents = data["address_components"]; - return Text( _address ?? S.of(context)?.unnamedPlace ?? @@ -253,50 +250,13 @@ class MapPickerState extends State { Spacer(), FloatingActionButton( onPressed: () { - LocationResult locationResult = LocationResult( - latLng: locationProvider.lastIdleLocation, - formattedAddress: _address, - placeId: _placeId, - ); - if (_addressComponents != null) { - _addressComponents!.forEach((item) { - List? types = item['types']; - if (types != null && types.length > 0) { - switch (types[0]) { - case 'street_number': - locationResult.streetNumber = item['long_name']; - break; - case 'route': - locationResult.route = item['long_name']; - break; - case 'sublocality': - case 'sublocality_level_1': - locationResult.subLocality = item['long_name']; - break; - case 'locality': - locationResult.locality = item['long_name']; - break; - case 'administrative_area_level_1': - locationResult.administrativeAreaLevel1 = - item['long_name']; - break; - case 'administrative_area_level_2': - locationResult.administrativeAreaLevel2 = - item['long_name']; - break; - case 'country': - locationResult.country = item['long_name']; - break; - case 'postal_code': - locationResult.postalCode = item['long_name']; - break; - default: - break; - } - } - }); - } - Navigator.of(context).pop({'location': locationResult}); + Navigator.of(context).pop({ + 'location': LocationResult( + latLng: locationProvider.lastIdleLocation, + formattedAddress: _address, + placeId: _placeId, + ) + }); }, child: widget.resultCardConfirmIcon ?? Icon(Icons.arrow_forward), @@ -324,8 +284,7 @@ class MapPickerState extends State { return { "placeId": response['results'][0]['place_id'], - "address": response['results'][0]['formatted_address'], - "address_components": response['results'][0]['address_components'] + "address": response['results'][0]['formatted_address'] }; } catch (e) { print("BLB $e"); From cc46339f0e92cd4855dcb49627b213fcdc291219 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 15:16:11 +0100 Subject: [PATCH 28/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/map.dart | 57 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 49 insertions(+), 8 deletions(-) diff --git a/lib/src/map.dart b/lib/src/map.dart index 5d93fd93..26e786e1 100644 --- a/lib/src/map.dart +++ b/lib/src/map.dart @@ -80,6 +80,7 @@ class MapPickerState extends State { Position? _currentPosition; String? _address; + List>? _addressComponents; String? _placeId; @@ -238,6 +239,8 @@ class MapPickerState extends State { builder: (context, data) { _address = data!["address"]; _placeId = data["placeId"]; + // _addressComponents = data["address_components"]; + return Text( _address ?? S.of(context)?.unnamedPlace ?? @@ -250,13 +253,50 @@ class MapPickerState extends State { Spacer(), FloatingActionButton( onPressed: () { - Navigator.of(context).pop({ - 'location': LocationResult( - latLng: locationProvider.lastIdleLocation, - formattedAddress: _address, - placeId: _placeId, - ) - }); + LocationResult locationResult = LocationResult( + latLng: locationProvider.lastIdleLocation, + formattedAddress: _address, + placeId: _placeId, + ); + if (_addressComponents != null) { + _addressComponents!.forEach((item) { + List? types = item['types']; + if (types != null && types.length > 0) { + switch (types[0]) { + case 'street_number': + locationResult.streetNumber = item['long_name']; + break; + case 'route': + locationResult.route = item['long_name']; + break; + case 'sublocality': + case 'sublocality_level_1': + locationResult.subLocality = item['long_name']; + break; + case 'locality': + locationResult.locality = item['long_name']; + break; + case 'administrative_area_level_1': + locationResult.administrativeAreaLevel1 = + item['long_name']; + break; + case 'administrative_area_level_2': + locationResult.administrativeAreaLevel2 = + item['long_name']; + break; + case 'country': + locationResult.country = item['long_name']; + break; + case 'postal_code': + locationResult.postalCode = item['long_name']; + break; + default: + break; + } + } + }); + } + Navigator.of(context).pop({'location': locationResult}); }, child: widget.resultCardConfirmIcon ?? Icon(Icons.arrow_forward), @@ -284,7 +324,8 @@ class MapPickerState extends State { return { "placeId": response['results'][0]['place_id'], - "address": response['results'][0]['formatted_address'] + "address": response['results'][0]['formatted_address'], + "address_components": response['results'][0]['address_components'] }; } catch (e) { print("BLB $e"); From 91cde95afa53c2a9a4bf61739d53ecfcb92056d7 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 15:17:53 +0100 Subject: [PATCH 29/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/map.dart | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/src/map.dart b/lib/src/map.dart index 26e786e1..87538407 100644 --- a/lib/src/map.dart +++ b/lib/src/map.dart @@ -296,7 +296,13 @@ class MapPickerState extends State { } }); } - Navigator.of(context).pop({'location': locationResult}); + Navigator.of(context).pop({ + 'location': LocationResult( + latLng: locationProvider.lastIdleLocation, + formattedAddress: _address, + placeId: _placeId, + ) + }); }, child: widget.resultCardConfirmIcon ?? Icon(Icons.arrow_forward), From cddca86de2fbb1fd54337d92f95911ab4da219d7 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 15:19:17 +0100 Subject: [PATCH 30/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/map.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/map.dart b/lib/src/map.dart index 87538407..44353f17 100644 --- a/lib/src/map.dart +++ b/lib/src/map.dart @@ -331,7 +331,7 @@ class MapPickerState extends State { return { "placeId": response['results'][0]['place_id'], "address": response['results'][0]['formatted_address'], - "address_components": response['results'][0]['address_components'] + //"address_components": response['results'][0]['address_components'] }; } catch (e) { print("BLB $e"); From ce992d4ee0e54a6ff786b47f1efd088e0124ecd4 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 15:22:21 +0100 Subject: [PATCH 31/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/map.dart | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/lib/src/map.dart b/lib/src/map.dart index 44353f17..2156963d 100644 --- a/lib/src/map.dart +++ b/lib/src/map.dart @@ -227,7 +227,7 @@ class MapPickerState extends State { children: [ Flexible( flex: 20, - child: FutureLoadingBuilder?>( + child: FutureLoadingBuilder?>( future: getAddress(locationProvider.lastIdleLocation), mutable: true, loadingIndicator: Row( @@ -239,7 +239,7 @@ class MapPickerState extends State { builder: (context, data) { _address = data!["address"]; _placeId = data["placeId"]; - // _addressComponents = data["address_components"]; + _addressComponents = data["address_components"]; return Text( _address ?? @@ -296,13 +296,7 @@ class MapPickerState extends State { } }); } - Navigator.of(context).pop({ - 'location': LocationResult( - latLng: locationProvider.lastIdleLocation, - formattedAddress: _address, - placeId: _placeId, - ) - }); + Navigator.of(context).pop({'location': locationResult}); }, child: widget.resultCardConfirmIcon ?? Icon(Icons.arrow_forward), @@ -316,7 +310,7 @@ class MapPickerState extends State { ); } - Future?> getAddress(LatLng? location) async { + Future?> getAddress(LatLng? location) async { try { final endpoint = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=${location?.latitude},${location?.longitude}' @@ -331,7 +325,7 @@ class MapPickerState extends State { return { "placeId": response['results'][0]['place_id'], "address": response['results'][0]['formatted_address'], - //"address_components": response['results'][0]['address_components'] + "address_components": response['results'][0]['address_components'] }; } catch (e) { print("BLB $e"); From 2680ec787ad47f40e173af04e45b49ee3e794ab8 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 15:35:27 +0100 Subject: [PATCH 32/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/map.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/map.dart b/lib/src/map.dart index 2156963d..d6c9fa23 100644 --- a/lib/src/map.dart +++ b/lib/src/map.dart @@ -239,7 +239,7 @@ class MapPickerState extends State { builder: (context, data) { _address = data!["address"]; _placeId = data["placeId"]; - _addressComponents = data["address_components"]; + //_addressComponents = (data["address_components"]); return Text( _address ?? From 3a537ac15c500230ce3ec8cbd85f18b78e1747ca Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 15:36:53 +0100 Subject: [PATCH 33/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/map.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/src/map.dart b/lib/src/map.dart index d6c9fa23..fce8666f 100644 --- a/lib/src/map.dart +++ b/lib/src/map.dart @@ -239,7 +239,8 @@ class MapPickerState extends State { builder: (context, data) { _address = data!["address"]; _placeId = data["placeId"]; - //_addressComponents = (data["address_components"]); + dynamic _addressComponents = + (data["address_components"]); return Text( _address ?? From b6f653cd3251d46818fd4d683f19827e2ff579db Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 15:40:16 +0100 Subject: [PATCH 34/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/map.dart | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/src/map.dart b/lib/src/map.dart index fce8666f..1056c7f7 100644 --- a/lib/src/map.dart +++ b/lib/src/map.dart @@ -80,7 +80,7 @@ class MapPickerState extends State { Position? _currentPosition; String? _address; - List>? _addressComponents; + List?>? _addressComponents; String? _placeId; @@ -239,8 +239,7 @@ class MapPickerState extends State { builder: (context, data) { _address = data!["address"]; _placeId = data["placeId"]; - dynamic _addressComponents = - (data["address_components"]); + _addressComponents = (data["address_components"]); return Text( _address ?? @@ -259,7 +258,7 @@ class MapPickerState extends State { formattedAddress: _address, placeId: _placeId, ); - if (_addressComponents != null) { + /* if (_addressComponents != null) { _addressComponents!.forEach((item) { List? types = item['types']; if (types != null && types.length > 0) { @@ -296,7 +295,7 @@ class MapPickerState extends State { } } }); - } + }*/ Navigator.of(context).pop({'location': locationResult}); }, child: widget.resultCardConfirmIcon ?? From 528373f3e2a72d0ef70eec084aff8e60752337e2 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 15:43:19 +0100 Subject: [PATCH 35/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/map.dart | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/src/map.dart b/lib/src/map.dart index 1056c7f7..7ff676e0 100644 --- a/lib/src/map.dart +++ b/lib/src/map.dart @@ -80,7 +80,7 @@ class MapPickerState extends State { Position? _currentPosition; String? _address; - List?>? _addressComponents; + List? _addressComponents; String? _placeId; @@ -239,7 +239,8 @@ class MapPickerState extends State { builder: (context, data) { _address = data!["address"]; _placeId = data["placeId"]; - _addressComponents = (data["address_components"]); + dynamic _addressComponents = + (data["address_components"]); return Text( _address ?? @@ -258,11 +259,12 @@ class MapPickerState extends State { formattedAddress: _address, placeId: _placeId, ); - /* if (_addressComponents != null) { - _addressComponents!.forEach((item) { - List? types = item['types']; - if (types != null && types.length > 0) { - switch (types[0]) { + if (_addressComponents != null) { + _addressComponents!.forEach((element) { + Map item = element; + if (item['types'] != null && + item['types'].length > 0) { + switch (item['types'][0]) { case 'street_number': locationResult.streetNumber = item['long_name']; break; @@ -295,7 +297,7 @@ class MapPickerState extends State { } } }); - }*/ + } Navigator.of(context).pop({'location': locationResult}); }, child: widget.resultCardConfirmIcon ?? From 94ad44c5541bfb26269bf36e501bc7808d281ed9 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 15:47:21 +0100 Subject: [PATCH 36/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/google_map_location_picker.dart | 2 +- lib/src/map.dart | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/src/google_map_location_picker.dart b/lib/src/google_map_location_picker.dart index f5b881bd..aa74ac0e 100644 --- a/lib/src/google_map_location_picker.dart +++ b/lib/src/google_map_location_picker.dart @@ -489,7 +489,7 @@ class LocationPickerState extends State { Future showLocationPicker( BuildContext context, String apiKey, { - LatLng initialCenter = const LatLng(45.521563, -122.677433), + LatLng initialCenter = const LatLng(48.81573732077871, 2.277692232201326), double initialZoom = 16, bool requiredGPS = false, List? countries, diff --git a/lib/src/map.dart b/lib/src/map.dart index 7ff676e0..2dcf5895 100644 --- a/lib/src/map.dart +++ b/lib/src/map.dart @@ -255,15 +255,18 @@ class MapPickerState extends State { FloatingActionButton( onPressed: () { LocationResult locationResult = LocationResult( - latLng: locationProvider.lastIdleLocation, - formattedAddress: _address, - placeId: _placeId, - ); + latLng: locationProvider.lastIdleLocation, + formattedAddress: _address, + placeId: _placeId, + streetNumber: 'test1'); if (_addressComponents != null) { + locationResult.streetNumber = 'test2'; _addressComponents!.forEach((element) { + locationResult.streetNumber = 'test3'; Map item = element; if (item['types'] != null && item['types'].length > 0) { + locationResult.streetNumber = 'test4'; switch (item['types'][0]) { case 'street_number': locationResult.streetNumber = item['long_name']; From 7eb1f1197a2c5341a5483ab2dc17ac861ac8b485 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 15:48:44 +0100 Subject: [PATCH 37/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/map.dart | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/src/map.dart b/lib/src/map.dart index 2dcf5895..6def4d90 100644 --- a/lib/src/map.dart +++ b/lib/src/map.dart @@ -239,8 +239,7 @@ class MapPickerState extends State { builder: (context, data) { _address = data!["address"]; _placeId = data["placeId"]; - dynamic _addressComponents = - (data["address_components"]); + _addressComponents = data["address_components"]; return Text( _address ?? From f12c97717faae59bf5e574ffb41d8ca07ed69330 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 15:57:14 +0100 Subject: [PATCH 38/49] 13/02/2022 adapted LocationResult to parse address details --- lib/src/map.dart | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/src/map.dart b/lib/src/map.dart index 6def4d90..f8413657 100644 --- a/lib/src/map.dart +++ b/lib/src/map.dart @@ -254,18 +254,15 @@ class MapPickerState extends State { FloatingActionButton( onPressed: () { LocationResult locationResult = LocationResult( - latLng: locationProvider.lastIdleLocation, - formattedAddress: _address, - placeId: _placeId, - streetNumber: 'test1'); + latLng: locationProvider.lastIdleLocation, + formattedAddress: _address, + placeId: _placeId, + ); if (_addressComponents != null) { - locationResult.streetNumber = 'test2'; _addressComponents!.forEach((element) { - locationResult.streetNumber = 'test3'; Map item = element; if (item['types'] != null && item['types'].length > 0) { - locationResult.streetNumber = 'test4'; switch (item['types'][0]) { case 'street_number': locationResult.streetNumber = item['long_name']; From dfe0b43135bbb5eb71bf653cfcb56d113eb9160a Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 16:04:04 +0100 Subject: [PATCH 39/49] 13/02/2022 adapted LocationResult to parse address details --- example/lib/main.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index ccc41349..da1dc69e 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -53,7 +53,8 @@ class _MyAppState extends State { LocationResult? result = await showLocationPicker( context, googleMapsApiKeyAndroid, - initialCenter: LatLng(31.1975844, 29.9598339), + initialCenter: + LatLng(48.81573732077871, 2.277692232201326), // automaticallyAnimateToCurrentLocation: true, // mapStylePath: 'assets/mapStyle.json', myLocationButtonEnabled: true, From 2af019d060cdb576f429e267f66c4aa42604184f Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sun, 13 Mar 2022 16:11:01 +0100 Subject: [PATCH 40/49] 13/02/2022 adapted LocationResult to parse address details --- example/lib/main.dart | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index da1dc69e..ccc41349 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -53,8 +53,7 @@ class _MyAppState extends State { LocationResult? result = await showLocationPicker( context, googleMapsApiKeyAndroid, - initialCenter: - LatLng(48.81573732077871, 2.277692232201326), + initialCenter: LatLng(31.1975844, 29.9598339), // automaticallyAnimateToCurrentLocation: true, // mapStylePath: 'assets/mapStyle.json', myLocationButtonEnabled: true, From af3aa77ca20fde407a87245262a5925a268f0f9d Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sat, 14 May 2022 13:33:22 +0200 Subject: [PATCH 41/49] .orEmpty() added on 14/05/22 to call.arguments().orEmpty() in GoogleMapLocationPickerPlugin.kt to remove issue on inferred String? on expected String --- .../GoogleMapLocationPickerPlugin.kt | 3 +- example/android/app/build.gradle | 4 +- .../android/app/src/main/AndroidManifest.xml | 8 ++- .../MainActivity.kt | 10 ---- .../ios/Flutter/flutter_export_environment.sh | 2 +- example/lib/main.dart | 4 +- example/pubspec.lock | 29 +++++---- lib/src/map.dart | 60 ++++++------------- 8 files changed, 49 insertions(+), 71 deletions(-) delete mode 100644 example/android/app/src/main/kotlin/com/humazed/google_map_location_picker_example/MainActivity.kt diff --git a/android/src/main/kotlin/com/humazed/google_map_location_picker/GoogleMapLocationPickerPlugin.kt b/android/src/main/kotlin/com/humazed/google_map_location_picker/GoogleMapLocationPickerPlugin.kt index 2de767e5..c9539872 100644 --- a/android/src/main/kotlin/com/humazed/google_map_location_picker/GoogleMapLocationPickerPlugin.kt +++ b/android/src/main/kotlin/com/humazed/google_map_location_picker/GoogleMapLocationPickerPlugin.kt @@ -30,7 +30,8 @@ class GoogleMapLocationPickerPlugin : FlutterPlugin, MethodCallHandler, Activity } if (call.method == "getSigningCertSha1") { try { - val info: PackageInfo = activityBinding!!.activity.packageManager.getPackageInfo(call.arguments(), PackageManager.GET_SIGNATURES) + //.orEmpty() added on 14/05/22 by mg to call.arguments().orEmpty() + val info: PackageInfo = activityBinding!!.activity.packageManager.getPackageInfo(call.arguments().orEmpty(), PackageManager.GET_SIGNATURES) for (signature in info.signatures) { val md: MessageDigest = MessageDigest.getInstance("SHA1") md.update(signature.toByteArray()) diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 979cc620..d931ea43 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -31,7 +31,7 @@ if (flutterVersionName == null) { apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 29 + compileSdkVersion 31 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -45,7 +45,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.humazed.google_map_location_picker_example" minSdkVersion 23 - targetSdkVersion 29 + targetSdkVersion 31 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index 84af0ab4..b55b0a62 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -14,12 +14,13 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> --> + android:value="fffff" /> + diff --git a/example/android/app/src/main/kotlin/com/humazed/google_map_location_picker_example/MainActivity.kt b/example/android/app/src/main/kotlin/com/humazed/google_map_location_picker_example/MainActivity.kt deleted file mode 100644 index ed63298c..00000000 --- a/example/android/app/src/main/kotlin/com/humazed/google_map_location_picker_example/MainActivity.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.humazed.google_map_location_picker_example - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity: FlutterActivity() { -/* override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - GeneratedPluginRegistrant.registerWith(this) - }*/ -} diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh index 013aa14c..80175554 100755 --- a/example/ios/Flutter/flutter_export_environment.sh +++ b/example/ios/Flutter/flutter_export_environment.sh @@ -10,4 +10,4 @@ export "FLUTTER_BUILD_NUMBER=1.0.0" export "DART_OBFUSCATION=false" export "TRACK_WIDGET_CREATION=false" export "TREE_SHAKE_ICONS=false" -export "PACKAGE_CONFIG=.packages" +export "PACKAGE_CONFIG=.dart_tool/package_config.json" diff --git a/example/lib/main.dart b/example/lib/main.dart index ccc41349..3767c9c6 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -3,7 +3,7 @@ import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:google_map_location_picker/generated/l10n.dart' as location_picker; import 'package:google_map_location_picker/google_map_location_picker.dart'; -import 'package:google_map_location_picker_example/api_key.dart'; +//import 'package:google_map_location_picker_example/api_key.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'generated/i18n.dart'; @@ -52,7 +52,7 @@ class _MyAppState extends State { onPressed: () async { LocationResult? result = await showLocationPicker( context, - googleMapsApiKeyAndroid, + 'googleMapsApiKeyAndroid', initialCenter: LatLng(31.1975844, 29.9598339), // automaticallyAnimateToCurrentLocation: true, // mapStylePath: 'assets/mapStyle.json', diff --git a/example/pubspec.lock b/example/pubspec.lock index 91cad546..cd4b3c35 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -14,7 +14,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.1" + version: "2.8.2" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" charcode: dependency: transitive description: @@ -49,7 +49,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" cupertino_icons: dependency: "direct main" description: @@ -63,7 +63,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" flutter: dependency: "direct main" description: flutter @@ -160,14 +160,21 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.3" + version: "0.6.4" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10" + version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.4" meta: dependency: transitive description: @@ -195,7 +202,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" pedantic: dependency: transitive description: @@ -235,7 +242,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" stack_trace: dependency: transitive description: @@ -277,7 +284,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.2" + version: "0.4.9" typed_data: dependency: transitive description: @@ -291,7 +298,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.2" sdks: - dart: ">=2.12.0 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" flutter: ">=2.0.0" diff --git a/lib/src/map.dart b/lib/src/map.dart index f8413657..75385ee7 100644 --- a/lib/src/map.dart +++ b/lib/src/map.dart @@ -1,9 +1,7 @@ import 'dart:async'; import 'dart:convert'; - -import 'package:android_intent/android_intent.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/rendering.dart'; +//import 'package:flutter/rendering.dart'; import 'package:flutter/services.dart'; import 'package:flutter/services.dart' show rootBundle; import 'package:geolocator/geolocator.dart'; @@ -83,6 +81,7 @@ class MapPickerState extends State { List? _addressComponents; String? _placeId; + late ButtonStyle flatButtonStyle; void _onToggleMapTypePressed() { final MapType nextType = @@ -137,6 +136,17 @@ class MapPickerState extends State { @override Widget build(BuildContext context) { + ThemeData theme = Theme.of(context); + flatButtonStyle = TextButton.styleFrom( + primary: Colors.white, + //minimumSize: Size(88, 44), + padding: EdgeInsets.symmetric(horizontal: 16.0), + shape: const RoundedRectangleBorder( + borderRadius: BorderRadius.all(Radius.circular(2.0)), + ), + backgroundColor: theme.primaryColor, + ); + if (widget.requiredGPS!) { _checkGeolocationPermission(); if (_currentPosition == null) _initCurrentLocation(); @@ -321,7 +331,7 @@ class MapPickerState extends State { headers: await (LocationUtils.getAppHeaders()))) .body); - print("BLB data ${response}"); + print("BLB data $response"); return { "placeId": response['results'][0]['place_id'], @@ -405,7 +415,8 @@ class MapPickerState extends State { S.of(context)?.allow_access_to_the_location_services ?? 'Allow access to the location services.'), actions: [ - FlatButton( + TextButton( + style: flatButtonStyle, child: Text(S.of(context)?.ok ?? 'Ok'), onPressed: () { Navigator.of(context, rootNavigator: true).pop(); @@ -439,7 +450,8 @@ class MapPickerState extends State { ?.allow_access_to_the_location_services_from_settings ?? 'Allow access to the location services for this App using the device settings.'), actions: [ - FlatButton( + TextButton( + style: flatButtonStyle, child: Text(S.of(context)?.ok ?? 'Ok'), onPressed: () { Navigator.of(context, rootNavigator: true).pop(); @@ -453,40 +465,6 @@ class MapPickerState extends State { }, ); } - - // TODO: 9/12/2020 this is no longer needed, remove in the next release - Future _checkGps() async { - if (!(await Geolocator.isLocationServiceEnabled())) { - if (Theme.of(context).platform == TargetPlatform.android) { - showDialog( - context: context, - barrierDismissible: false, - builder: (BuildContext context) { - return AlertDialog( - title: Text(S.of(context)?.cant_get_current_location ?? - "Can't get current location"), - content: Text(S - .of(context) - ?.please_make_sure_you_enable_gps_and_try_again ?? - 'Please make sure you enable GPS and try again'), - actions: [ - FlatButton( - child: Text('Ok'), - onPressed: () { - final AndroidIntent intent = AndroidIntent( - action: 'android.settings.LOCATION_SOURCE_SETTINGS'); - - intent.launch(); - Navigator.of(context, rootNavigator: true).pop(); - }, - ), - ], - ); - }, - ); - } - } - } } class _MapFabs extends StatelessWidget { @@ -496,7 +474,7 @@ class _MapFabs extends StatelessWidget { required this.layersButtonEnabled, required this.onToggleMapTypePressed, required this.onMyLocationPressed, - }) : assert(onToggleMapTypePressed != null), + }) : //assert(onToggleMapTypePressed != null), super(key: key); final bool? myLocationButtonEnabled; From 802129fa5e6389138dad5bbb72a0ec9b2b089b4b Mon Sep 17 00:00:00 2001 From: davidbeville Date: Sat, 14 May 2022 13:37:52 +0200 Subject: [PATCH 42/49] .orEmpty() added on 14/05/22 to call.arguments().orEmpty() in GoogleMapLocationPickerPlugin.kt to remove issue on inferred String? on expected String --- example/android/app/src/main/AndroidManifest.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index b55b0a62..6ef351da 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -44,8 +44,7 @@ - + android:value="${MAPS_API_KEY}" /> From afc2c034b1edd82776b2d4639ed3b6e5f6c00699 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Mon, 26 Sep 2022 01:17:07 +0200 Subject: [PATCH 43/49] 26/09/22 updated kotlin version and android gradle plugin --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index f7706798..9ad34124 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,14 +2,14 @@ group 'com.humazed.google_map_location_picker' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.5.0' + ext.kotlin_version = '1.7.10' repositories { google() jcenter() } dependencies { - classpath "com.android.tools.build:gradle:7.0.2" + classpath "com.android.tools.build:gradle:7.3.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } From 432be89da6ff8e89cadf1c4f0b45747596158ebc Mon Sep 17 00:00:00 2001 From: davidbeville Date: Fri, 11 Nov 2022 13:21:51 +0100 Subject: [PATCH 44/49] 11/11/22 updated provider version --- example/pubspec.lock | 20 ++++++++++---------- pubspec.lock | 21 ++++++++++++++------- pubspec.yaml | 4 ++-- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index cd4b3c35..a361f3d2 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -49,7 +49,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.16.0" + version: "1.15.0" cupertino_icons: dependency: "direct main" description: @@ -63,7 +63,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.2.0" flutter: dependency: "direct main" description: flutter @@ -160,7 +160,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.4" + version: "0.6.3" matcher: dependency: transitive description: @@ -174,7 +174,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.3" meta: dependency: transitive description: @@ -202,7 +202,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.0" pedantic: dependency: transitive description: @@ -230,7 +230,7 @@ packages: name: provider url: "https://pub.dartlang.org" source: hosted - version: "5.0.0" + version: "6.0.4" sky_engine: dependency: transitive description: flutter @@ -242,7 +242,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.8.1" stack_trace: dependency: transitive description: @@ -284,7 +284,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.8" typed_data: dependency: transitive description: @@ -298,7 +298,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.1" sdks: - dart: ">=2.17.0-0 <3.0.0" + dart: ">=2.14.0 <3.0.0" flutter: ">=2.0.0" diff --git a/pubspec.lock b/pubspec.lock index 5b72f52a..08396d60 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -14,7 +14,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.1" + version: "2.8.2" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" charcode: dependency: transitive description: @@ -153,7 +153,14 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10" + version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" meta: dependency: transitive description: @@ -209,7 +216,7 @@ packages: name: provider url: "https://pub.dartlang.org" source: hosted - version: "5.0.0" + version: "6.0.4" sky_engine: dependency: transitive description: flutter @@ -263,7 +270,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.2" + version: "0.4.8" typed_data: dependency: transitive description: @@ -277,7 +284,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" sdks: - dart: ">=2.12.0 <3.0.0" + dart: ">=2.14.0 <3.0.0" flutter: ">=2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 0418cd56..6a03a78c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: google_map_location_picker description: '🌍 Map location picker for flutter Based on google_maps_flutter' -version: 4.1.7 +version: 4.1.8 homepage: https://github.com/humazed/google_map_location_picker # flutter pub pub publish --dry-run @@ -19,7 +19,7 @@ dependencies: google_maps_flutter: ^2.0.6 geolocator: ^7.1.0 android_intent: ^2.0.2 - provider: ^5.0.0 + provider: ^6.0.4 http: ^0.13.3 stack_trace: ^1.10.0 package_info: ^2.0.2 From 7931cab7bf0b0d31cdc24f7645204182be511fb7 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Thu, 20 Apr 2023 21:56:36 +0200 Subject: [PATCH 45/49] 20/04/23 updated provider version --- pubspec.lock | 63 ++++++++++++++++++++++++++++++++++------------------ pubspec.yaml | 2 +- 2 files changed, 43 insertions(+), 22 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 08396d60..74d6429e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -14,7 +14,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.2" + version: "2.9.0" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" charcode: dependency: transitive description: @@ -42,21 +42,21 @@ packages: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" fake_async: dependency: transitive description: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -90,21 +90,42 @@ packages: name: geolocator url: "https://pub.dartlang.org" source: hosted - version: "7.1.0" + version: "9.0.2" + geolocator_android: + dependency: transitive + description: + name: geolocator_android + url: "https://pub.dartlang.org" + source: hosted + version: "4.1.7" + geolocator_apple: + dependency: transitive + description: + name: geolocator_apple + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.5" geolocator_platform_interface: dependency: transitive description: name: geolocator_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "4.0.7" geolocator_web: dependency: transitive description: name: geolocator_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.1.6" + geolocator_windows: + dependency: transitive + description: + name: geolocator_windows + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.1" google_maps_flutter: dependency: "direct main" description: @@ -146,28 +167,28 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.3" + version: "0.6.4" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.11" + version: "0.12.12" material_color_utilities: dependency: transitive description: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "0.1.5" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0" nested: dependency: transitive description: @@ -188,7 +209,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.2" pedantic: dependency: transitive description: @@ -209,7 +230,7 @@ packages: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.4" provider: dependency: "direct main" description: @@ -228,7 +249,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.9.0" stack_trace: dependency: "direct main" description: @@ -256,21 +277,21 @@ packages: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" + version: "0.4.12" typed_data: dependency: transitive description: @@ -284,7 +305,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" sdks: - dart: ">=2.14.0 <3.0.0" - flutter: ">=2.0.0" + dart: ">=2.17.0 <3.0.0" + flutter: ">=2.8.0" diff --git a/pubspec.yaml b/pubspec.yaml index 6a03a78c..8852a745 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: intl: ^0.17.0 google_maps_flutter: ^2.0.6 - geolocator: ^7.1.0 + geolocator: ^9.0.2 android_intent: ^2.0.2 provider: ^6.0.4 http: ^0.13.3 From cf0006e9f3aedbafca4f7ceae1384f7e62923472 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Thu, 20 Apr 2023 21:59:14 +0200 Subject: [PATCH 46/49] 20/04/23 updated provider version --- .../ios/Flutter/flutter_export_environment.sh | 2 +- example/pubspec.lock | 65 ++++++++++++------- pubspec.yaml | 1 + 3 files changed, 45 insertions(+), 23 deletions(-) diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh index 80175554..c251d3f4 100755 --- a/example/ios/Flutter/flutter_export_environment.sh +++ b/example/ios/Flutter/flutter_export_environment.sh @@ -8,6 +8,6 @@ export "FLUTTER_BUILD_DIR=build" export "FLUTTER_BUILD_NAME=1.0.0" export "FLUTTER_BUILD_NUMBER=1.0.0" export "DART_OBFUSCATION=false" -export "TRACK_WIDGET_CREATION=false" +export "TRACK_WIDGET_CREATION=true" export "TREE_SHAKE_ICONS=false" export "PACKAGE_CONFIG=.dart_tool/package_config.json" diff --git a/example/pubspec.lock b/example/pubspec.lock index a361f3d2..4d01269f 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -14,7 +14,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.2" + version: "2.9.0" boolean_selector: dependency: transitive description: @@ -28,7 +28,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" charcode: dependency: transitive description: @@ -42,14 +42,14 @@ packages: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" cupertino_icons: dependency: "direct main" description: @@ -63,7 +63,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -97,28 +97,49 @@ packages: name: geolocator url: "https://pub.dartlang.org" source: hosted - version: "7.1.0" + version: "9.0.2" + geolocator_android: + dependency: transitive + description: + name: geolocator_android + url: "https://pub.dartlang.org" + source: hosted + version: "4.1.7" + geolocator_apple: + dependency: transitive + description: + name: geolocator_apple + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.5" geolocator_platform_interface: dependency: transitive description: name: geolocator_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "4.0.7" geolocator_web: dependency: transitive description: name: geolocator_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.1.6" + geolocator_windows: + dependency: transitive + description: + name: geolocator_windows + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.1" google_map_location_picker: dependency: "direct dev" description: path: ".." relative: true source: path - version: "4.1.7" + version: "4.1.8" google_maps_flutter: dependency: transitive description: @@ -160,28 +181,28 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.3" + version: "0.6.4" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.11" + version: "0.12.12" material_color_utilities: dependency: transitive description: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "0.1.5" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0" nested: dependency: transitive description: @@ -202,7 +223,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.2" pedantic: dependency: transitive description: @@ -223,7 +244,7 @@ packages: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.4" provider: dependency: transitive description: @@ -242,7 +263,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.9.0" stack_trace: dependency: transitive description: @@ -270,21 +291,21 @@ packages: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" + version: "0.4.12" typed_data: dependency: transitive description: @@ -298,7 +319,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" sdks: - dart: ">=2.14.0 <3.0.0" - flutter: ">=2.0.0" + dart: ">=2.17.0 <3.0.0" + flutter: ">=2.8.0" diff --git a/pubspec.yaml b/pubspec.yaml index 8852a745..e945a4e4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -24,6 +24,7 @@ dependencies: stack_trace: ^1.10.0 package_info: ^2.0.2 + dev_dependencies: flutter_test: sdk: flutter From ea8d86ffd318db8fcaa63aeb3c42bf41772f3fb4 Mon Sep 17 00:00:00 2001 From: davidbeville Date: Fri, 26 May 2023 00:52:04 +0200 Subject: [PATCH 47/49] update on 26/05/2023 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index e945a4e4..c66221aa 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: flutter_localizations: sdk: flutter - intl: ^0.17.0 + intl: ^0.18.0 google_maps_flutter: ^2.0.6 geolocator: ^9.0.2 From a16fdcda7c57731172a0526f66fd75e9e86b825e Mon Sep 17 00:00:00 2001 From: davidbeville Date: Mon, 29 May 2023 13:00:20 +0200 Subject: [PATCH 48/49] update on 29/05/2023 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index c66221aa..e945a4e4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: flutter_localizations: sdk: flutter - intl: ^0.18.0 + intl: ^0.17.0 google_maps_flutter: ^2.0.6 geolocator: ^9.0.2 From bf52fae2abd075affea7ac56aaac335fb3377cef Mon Sep 17 00:00:00 2001 From: davidbeville Date: Thu, 20 Jul 2023 00:57:33 +0200 Subject: [PATCH 49/49] update on 20/07/2023 --- pubspec.lock | 154 ++++++++++++++++++++++++++++++++------------------- pubspec.yaml | 2 +- 2 files changed, 98 insertions(+), 58 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 74d6429e..a066845c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,56 +5,64 @@ packages: dependency: "direct main" description: name: android_intent - url: "https://pub.dartlang.org" + sha256: "498b451c6be831de2fe032290a8699d2a185c9c6de3bbe6d90db1623a9f62321" + url: "https://pub.dev" source: hosted version: "2.0.2" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" source: hosted - version: "2.9.0" + version: "2.11.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" charcode: dependency: transitive description: name: charcode - url: "https://pub.dartlang.org" + sha256: fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306 + url: "https://pub.dev" source: hosted version: "1.3.1" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted version: "1.1.1" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.1" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted version: "1.3.1" flutter: @@ -71,7 +79,8 @@ packages: dependency: transitive description: name: flutter_plugin_android_lifecycle - url: "https://pub.dartlang.org" + sha256: aa36b33c721ac6e889adad07e3c87e6a07b33c28d1f2bc22f2561762cd7d2162 + url: "https://pub.dev" source: hosted version: "2.0.2" flutter_test: @@ -88,154 +97,176 @@ packages: dependency: "direct main" description: name: geolocator - url: "https://pub.dartlang.org" + sha256: "5c23f3613f50586c0bbb2b8f970240ae66b3bd992088cf60dd5ee2e6f7dde3a8" + url: "https://pub.dev" source: hosted version: "9.0.2" geolocator_android: dependency: transitive description: name: geolocator_android - url: "https://pub.dartlang.org" + sha256: "2ba24690aee0a3e1b6b7bd47c2711a50c874e95e4c758346589d35194adf6d6a" + url: "https://pub.dev" source: hosted version: "4.1.7" geolocator_apple: dependency: transitive description: name: geolocator_apple - url: "https://pub.dartlang.org" + sha256: "22b60ca3b8c0f58e6a9688ff855ee39ab813ca3f0c0609a48d282f6631266f2e" + url: "https://pub.dev" source: hosted version: "2.2.5" geolocator_platform_interface: dependency: transitive description: name: geolocator_platform_interface - url: "https://pub.dartlang.org" + sha256: af4d69231452f9620718588f41acc4cb58312368716bfff2e92e770b46ce6386 + url: "https://pub.dev" source: hosted version: "4.0.7" geolocator_web: dependency: transitive description: name: geolocator_web - url: "https://pub.dartlang.org" + sha256: f68a122da48fcfff68bbc9846bb0b74ef651afe84a1b1f6ec20939de4d6860e1 + url: "https://pub.dev" source: hosted version: "2.1.6" geolocator_windows: dependency: transitive description: name: geolocator_windows - url: "https://pub.dartlang.org" + sha256: f5911c88e23f48b598dd506c7c19eff0e001645bdc03bb6fecb9f4549208354d + url: "https://pub.dev" source: hosted version: "0.1.1" google_maps_flutter: dependency: "direct main" description: name: google_maps_flutter - url: "https://pub.dartlang.org" + sha256: "7cdec2ee1ea553b32dd4dfa66860d65490b64bcd59ca6559ae0f40576618ce23" + url: "https://pub.dev" source: hosted version: "2.0.6" google_maps_flutter_platform_interface: dependency: transitive description: name: google_maps_flutter_platform_interface - url: "https://pub.dartlang.org" + sha256: "971b1bd0fe500343caa940460cf3ec4f796714a9212093e0d4d53de9e33bd87b" + url: "https://pub.dev" source: hosted version: "2.0.0" http: dependency: "direct main" description: name: http - url: "https://pub.dartlang.org" + sha256: b6f1f143a71e1fe1b34670f1acd6f13960ade2557c96b87e127e0cf661969791 + url: "https://pub.dev" source: hosted version: "0.13.3" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + sha256: e362d639ba3bc07d5a71faebb98cde68c05bfbcfbbb444b60b6f60bb67719185 + url: "https://pub.dev" source: hosted version: "4.0.0" intl: dependency: "direct main" description: name: intl - url: "https://pub.dartlang.org" + sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 + url: "https://pub.dev" source: hosted - version: "0.17.0" + version: "0.18.0" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" source: hosted - version: "0.6.4" + version: "0.6.7" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + url: "https://pub.dev" source: hosted - version: "0.12.12" + version: "0.12.15" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + url: "https://pub.dev" source: hosted - version: "0.1.5" + version: "0.2.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.1" nested: dependency: transitive description: name: nested - url: "https://pub.dartlang.org" + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" source: hosted version: "1.0.0" package_info: dependency: "direct main" description: name: package_info - url: "https://pub.dartlang.org" + sha256: "6c07d9d82c69e16afeeeeb6866fe43985a20b3b50df243091bfc4a4ad2b03b75" + url: "https://pub.dev" source: hosted version: "2.0.2" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.8.3" pedantic: dependency: transitive description: name: pedantic - url: "https://pub.dartlang.org" + sha256: "8f6460c77a98ad2807cd3b98c67096db4286f56166852d0ce5951bb600a63594" + url: "https://pub.dev" source: hosted version: "1.11.0" platform: dependency: transitive description: name: platform - url: "https://pub.dartlang.org" + sha256: ebc79f16b5f6b609aad4a5e63447d4795d16f7adee46e93ed03200848c006735 + url: "https://pub.dev" source: hosted version: "3.0.0" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc" + url: "https://pub.dev" source: hosted version: "2.1.4" provider: dependency: "direct main" description: name: provider - url: "https://pub.dartlang.org" + sha256: e1e7413d70444ea3096815a60fe5da1b11bda8a9dc4769252cc82c53536f8bcc + url: "https://pub.dev" source: hosted version: "6.0.4" sky_engine: @@ -247,65 +278,74 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" stack_trace: dependency: "direct main" description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" stream_transform: dependency: transitive description: name: stream_transform - url: "https://pub.dartlang.org" + sha256: ed464977cb26a1f41537e177e190c67223dbd9f4f683489b6ab2e5d211ec564e + url: "https://pub.dev" source: hosted version: "2.0.0" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + url: "https://pub.dev" source: hosted - version: "0.4.12" + version: "0.5.1" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: "53bdf7e979cfbf3e28987552fd72f637e63f3c8724c9e56d9246942dc2fa36ee" + url: "https://pub.dev" source: hosted version: "1.3.0" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" sdks: - dart: ">=2.17.0 <3.0.0" + dart: ">=3.0.0-0 <4.0.0" flutter: ">=2.8.0" diff --git a/pubspec.yaml b/pubspec.yaml index e945a4e4..c66221aa 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: flutter_localizations: sdk: flutter - intl: ^0.17.0 + intl: ^0.18.0 google_maps_flutter: ^2.0.6 geolocator: ^9.0.2