From e4e3b415e422dff22d29da9c90d172c9060ace81 Mon Sep 17 00:00:00 2001 From: Almuhannad Date: Mon, 5 Oct 2020 17:01:08 +0300 Subject: [PATCH 01/20] fix research when keyboard closed , add marker color , fix animate to current location --- .../ios/Flutter/flutter_export_environment.sh | 15 +++++++++++++ example/lib/main.dart | 13 ++++++----- lib/src/google_map_location_picker.dart | 15 +++++++++++-- lib/src/map.dart | 22 ++++++++++++++----- lib/src/search_input.dart | 1 + 5 files changed, 52 insertions(+), 14 deletions(-) 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..8ce6ae8d --- /dev/null +++ b/example/ios/Flutter/flutter_export_environment.sh @@ -0,0 +1,15 @@ +#!/bin/sh +# This is a generated file; do not edit or check into version control. +export "FLUTTER_ROOT=/Users/henno/development/flutter" +export "FLUTTER_APPLICATION_PATH=/Users/henno/Desktop/edit_packages/google_location_picker_v4/google_map_location_picker/example" +export "FLUTTER_TARGET=lib/main.dart" +export "FLUTTER_BUILD_DIR=build" +export "SYMROOT=${SOURCE_ROOT}/../build/ios" +export "OTHER_LDFLAGS=$(inherited) -framework Flutter" +export "FLUTTER_FRAMEWORK_DIR=/Users/henno/development/flutter/bin/cache/artifacts/engine/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" diff --git a/example/lib/main.dart b/example/lib/main.dart index 7f940754..30b8796d 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'; @@ -51,17 +50,19 @@ class _MyAppState extends State { RaisedButton( onPressed: () async { LocationResult result = await showLocationPicker( - context, apiKey, - initialCenter: LatLng(31.1975844, 29.9598339), -// automaticallyAnimateToCurrentLocation: true, + context, + api_key, + initialCenter: null, + automaticallyAnimateToCurrentLocation: true, // mapStylePath: 'assets/mapStyle.json', myLocationButtonEnabled: true, // requiredGPS: true, layersButtonEnabled: true, - // countries: ['AE', 'NG'] + //markerColor: Colors.green, + // countries: ['SA'], // resultCardAlignment: Alignment.bottomCenter, - desiredAccuracy: LocationAccuracy.best, + desiredAccuracy: LocationAccuracy.low, ); print("result = $result"); setState(() => _pickedLocation = result); diff --git a/lib/src/google_map_location_picker.dart b/lib/src/google_map_location_picker.dart index 7084f393..b3d646c9 100644 --- a/lib/src/google_map_location_picker.dart +++ b/lib/src/google_map_location_picker.dart @@ -40,6 +40,7 @@ class LocationPicker extends StatefulWidget { this.countries, this.language, this.desiredAccuracy, + this.markerColor, }); final String apiKey; @@ -54,7 +55,7 @@ class LocationPicker extends StatefulWidget { final bool automaticallyAnimateToCurrentLocation; final String mapStylePath; - + final Color markerColor; final Color appBarColor; final BoxDecoration searchBarBoxDecoration; final String hintText; @@ -90,6 +91,7 @@ class LocationPickerState extends State { var searchInputKey = GlobalKey(); bool hasSearchTerm = false; + bool showSugesstion = true; /// Hides the autocomplete overlay void clearOverlay() { @@ -200,6 +202,8 @@ class LocationPickerState extends State { suggestions.add(RichSuggestion(aci, () { decodeAndSelectPlace(aci.id); + FocusScope.of(context).unfocus(); + showSugesstion = false; })); } } @@ -352,6 +356,7 @@ class LocationPickerState extends State { locationResult.address = road; locationResult.latLng = latLng; locationResult.placeId = placeId; + showSugesstion = true; }); } } @@ -396,7 +401,10 @@ class LocationPickerState extends State { backgroundColor: widget.appBarColor, key: appBarKey, title: SearchInput( - (input) => searchPlace(input), + (input) { + print("input : $input"); + if (showSugesstion) searchPlace(input.trim()); + }, key: searchInputKey, boxDecoration: widget.searchBarBoxDecoration, hintText: widget.hintText, @@ -422,6 +430,7 @@ class LocationPickerState extends State { key: mapKey, language: widget.language, desiredAccuracy: widget.desiredAccuracy, + markerColor: widget.markerColor, ), ); }), @@ -459,6 +468,7 @@ Future showLocationPicker( Decoration resultCardDecoration, String language = 'en', LocationAccuracy desiredAccuracy = LocationAccuracy.best, + Color markerColor, }) async { final results = await Navigator.of(context).push( MaterialPageRoute( @@ -484,6 +494,7 @@ Future showLocationPicker( countries: countries, language: language, desiredAccuracy: desiredAccuracy, + markerColor: markerColor, ); }, ), diff --git a/lib/src/map.dart b/lib/src/map.dart index 9235bf73..12d94bbc 100644 --- a/lib/src/map.dart +++ b/lib/src/map.dart @@ -38,6 +38,7 @@ class MapPicker extends StatefulWidget { this.resultCardPadding, this.language, this.desiredAccuracy, + this.markerColor, }) : super(key: key); final String apiKey; @@ -59,7 +60,7 @@ class MapPicker extends StatefulWidget { final Alignment resultCardAlignment; final Decoration resultCardDecoration; final EdgeInsets resultCardPadding; - + final Color markerColor; final String language; final LocationAccuracy desiredAccuracy; @@ -153,7 +154,9 @@ class MapPickerState extends State { return const Center(child: CircularProgressIndicator()); } - return buildMap(); + return _currentPosition == null + ? const Center(child: CircularProgressIndicator()) + : buildMap(); }, ), ); @@ -166,7 +169,8 @@ class MapPickerState extends State { GoogleMap( myLocationButtonEnabled: false, initialCameraPosition: CameraPosition( - target: widget.initialCenter, + target: widget.initialCenter ?? + LatLng(_currentPosition.latitude, _currentPosition.longitude), zoom: widget.initialZoom, ), onMapCreated: (GoogleMapController controller) { @@ -176,7 +180,8 @@ class MapPickerState extends State { controller.setMapStyle(_mapStyle); } - _lastMapPosition = widget.initialCenter; + _lastMapPosition = + LatLng(_currentPosition.latitude, _currentPosition.longitude); LocationProvider.of(context, listen: false) .setLastIdleLocation(_lastMapPosition); }, @@ -292,12 +297,17 @@ class MapPickerState extends State { } Widget pin() { + print("markerColor : ${widget.markerColor}"); return IgnorePointer( child: Center( child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - Icon(Icons.place, size: 56), + Icon( + Icons.place, + size: 56, + color: widget.markerColor ?? Colors.black, + ), Container( decoration: ShapeDecoration( shadows: [ @@ -465,7 +475,7 @@ class _MapFabs extends StatelessWidget { Widget build(BuildContext context) { return Container( alignment: Alignment.topRight, - margin: const EdgeInsets.only(top: kToolbarHeight + 24, right: 8), + margin: const EdgeInsets.only(top: kToolbarHeight + 50, right: 8), child: Column( children: [ if (layersButtonEnabled) diff --git a/lib/src/search_input.dart b/lib/src/search_input.dart index 9d7ba047..2f3c7a32 100644 --- a/lib/src/search_input.dart +++ b/lib/src/search_input.dart @@ -77,6 +77,7 @@ class SearchInputState extends State { Expanded( child: TextField( controller: editController, + textInputAction: TextInputAction.next, decoration: InputDecoration( hintText: widget.hintText ?? S.of(context)?.search_place ?? From b598aadcfe4677b94c238473331b08e03375b35f Mon Sep 17 00:00:00 2001 From: Almuhannad Date: Wed, 28 Oct 2020 11:45:10 +0300 Subject: [PATCH 02/20] add automaticallyImplyLeading boolean to appbar --- example/lib/main.dart | 3 +- lib/src/google_map_location_picker.dart | 48 +++++++++++++------------ lib/src/map.dart | 3 ++ 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index 30b8796d..7b5e1e2d 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -53,13 +53,14 @@ class _MyAppState extends State { context, api_key, initialCenter: null, + automaticallyImplyLeading: true, // by default true automaticallyAnimateToCurrentLocation: true, // mapStylePath: 'assets/mapStyle.json', myLocationButtonEnabled: true, // requiredGPS: true, layersButtonEnabled: true, //markerColor: Colors.green, - // countries: ['SA'], + // countries: ['SA'], // resultCardAlignment: Alignment.bottomCenter, desiredAccuracy: LocationAccuracy.low, diff --git a/lib/src/google_map_location_picker.dart b/lib/src/google_map_location_picker.dart index b3d646c9..85d26e23 100644 --- a/lib/src/google_map_location_picker.dart +++ b/lib/src/google_map_location_picker.dart @@ -20,28 +20,27 @@ import 'model/nearby_place.dart'; import 'utils/location_utils.dart'; class LocationPicker extends StatefulWidget { - LocationPicker( - this.apiKey, { - Key key, - this.initialCenter, - this.initialZoom, - this.requiredGPS, - this.myLocationButtonEnabled, - this.layersButtonEnabled, - this.automaticallyAnimateToCurrentLocation, - this.mapStylePath, - this.appBarColor, - this.searchBarBoxDecoration, - this.hintText, - this.resultCardConfirmIcon, - this.resultCardAlignment, - this.resultCardDecoration, - this.resultCardPadding, - this.countries, - this.language, - this.desiredAccuracy, - this.markerColor, - }); + LocationPicker(this.apiKey, + {Key key, + this.initialCenter, + this.initialZoom, + this.requiredGPS, + this.myLocationButtonEnabled, + this.layersButtonEnabled, + this.automaticallyAnimateToCurrentLocation, + this.mapStylePath, + this.appBarColor, + this.searchBarBoxDecoration, + this.hintText, + this.resultCardConfirmIcon, + this.resultCardAlignment, + this.resultCardDecoration, + this.resultCardPadding, + this.countries, + this.language, + this.desiredAccuracy, + this.markerColor, + this.automaticallyImplyLeading}); final String apiKey; @@ -53,7 +52,7 @@ class LocationPicker extends StatefulWidget { final bool myLocationButtonEnabled; final bool layersButtonEnabled; final bool automaticallyAnimateToCurrentLocation; - + final bool automaticallyImplyLeading; final String mapStylePath; final Color markerColor; final Color appBarColor; @@ -421,6 +420,7 @@ class LocationPickerState extends State { widget.automaticallyAnimateToCurrentLocation, mapStylePath: widget.mapStylePath, appBarColor: widget.appBarColor, + automaticallyImplyLeading: widget.automaticallyImplyLeading, searchBarBoxDecoration: widget.searchBarBoxDecoration, hintText: widget.hintText, resultCardConfirmIcon: widget.resultCardConfirmIcon, @@ -458,6 +458,7 @@ Future showLocationPicker( bool myLocationButtonEnabled = false, bool layersButtonEnabled = false, bool automaticallyAnimateToCurrentLocation = true, + bool automaticallyImplyLeading = true, String mapStylePath, Color appBarColor = Colors.transparent, BoxDecoration searchBarBoxDecoration, @@ -485,6 +486,7 @@ Future showLocationPicker( automaticallyAnimateToCurrentLocation, mapStylePath: mapStylePath, appBarColor: appBarColor, + automaticallyImplyLeading: automaticallyImplyLeading, hintText: hintText, searchBarBoxDecoration: searchBarBoxDecoration, resultCardConfirmIcon: resultCardConfirmIcon, diff --git a/lib/src/map.dart b/lib/src/map.dart index 12d94bbc..1ce9dbd4 100644 --- a/lib/src/map.dart +++ b/lib/src/map.dart @@ -39,6 +39,7 @@ class MapPicker extends StatefulWidget { this.language, this.desiredAccuracy, this.markerColor, + this.automaticallyImplyLeading }) : super(key: key); final String apiKey; @@ -50,8 +51,10 @@ class MapPicker extends StatefulWidget { final bool myLocationButtonEnabled; final bool layersButtonEnabled; final bool automaticallyAnimateToCurrentLocation; + final bool automaticallyImplyLeading; final String mapStylePath; + final Color appBarColor; final BoxDecoration searchBarBoxDecoration; From a71f8606f9d7147ba93f5186e09343caea6c384a Mon Sep 17 00:00:00 2001 From: Almuhannad Date: Wed, 28 Oct 2020 11:45:46 +0300 Subject: [PATCH 03/20] add automaticallyImplyLeading boolean to appbar --- 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 85d26e23..b99553ae 100644 --- a/lib/src/google_map_location_picker.dart +++ b/lib/src/google_map_location_picker.dart @@ -398,6 +398,7 @@ class LocationPickerState extends State { iconTheme: Theme.of(context).iconTheme, elevation: 0, backgroundColor: widget.appBarColor, + automaticallyImplyLeading: widget.automaticallyImplyLeading, key: appBarKey, title: SearchInput( (input) { From 0b2f8b21e06f09df817127440237c7945018b0de Mon Sep 17 00:00:00 2001 From: Almuhannad Date: Wed, 28 Oct 2020 12:48:19 +0300 Subject: [PATCH 04/20] add WillPopScope --- lib/src/google_map_location_picker.dart | 79 +++++++++++++------------ 1 file changed, 41 insertions(+), 38 deletions(-) diff --git a/lib/src/google_map_location_picker.dart b/lib/src/google_map_location_picker.dart index b99553ae..72bedd38 100644 --- a/lib/src/google_map_location_picker.dart +++ b/lib/src/google_map_location_picker.dart @@ -392,47 +392,50 @@ class LocationPickerState extends State { ChangeNotifierProvider(create: (_) => LocationProvider()), ], child: Builder(builder: (context) { - return Scaffold( - extendBodyBehindAppBar: true, - appBar: AppBar( - iconTheme: Theme.of(context).iconTheme, - elevation: 0, - backgroundColor: widget.appBarColor, - automaticallyImplyLeading: widget.automaticallyImplyLeading, - key: appBarKey, - title: SearchInput( - (input) { - print("input : $input"); - if (showSugesstion) searchPlace(input.trim()); - }, - key: searchInputKey, - boxDecoration: widget.searchBarBoxDecoration, + return WillPopScope( + onWillPop: () async => widget.automaticallyImplyLeading, + child: Scaffold( + extendBodyBehindAppBar: true, + appBar: AppBar( + iconTheme: Theme.of(context).iconTheme, + elevation: 0, + backgroundColor: widget.appBarColor, + automaticallyImplyLeading: widget.automaticallyImplyLeading, + key: appBarKey, + title: SearchInput( + (input) { + print("input : $input"); + if (showSugesstion) searchPlace(input.trim()); + }, + key: searchInputKey, + boxDecoration: widget.searchBarBoxDecoration, + hintText: widget.hintText, + ), + ), + body: MapPicker( + widget.apiKey, + initialCenter: widget.initialCenter, + initialZoom: widget.initialZoom, + requiredGPS: widget.requiredGPS, + myLocationButtonEnabled: widget.myLocationButtonEnabled, + layersButtonEnabled: widget.layersButtonEnabled, + automaticallyAnimateToCurrentLocation: + widget.automaticallyAnimateToCurrentLocation, + mapStylePath: widget.mapStylePath, + appBarColor: widget.appBarColor, + automaticallyImplyLeading: widget.automaticallyImplyLeading, + searchBarBoxDecoration: widget.searchBarBoxDecoration, hintText: widget.hintText, + resultCardConfirmIcon: widget.resultCardConfirmIcon, + resultCardAlignment: widget.resultCardAlignment, + resultCardDecoration: widget.resultCardDecoration, + resultCardPadding: widget.resultCardPadding, + key: mapKey, + language: widget.language, + desiredAccuracy: widget.desiredAccuracy, + markerColor: widget.markerColor, ), ), - body: MapPicker( - widget.apiKey, - initialCenter: widget.initialCenter, - initialZoom: widget.initialZoom, - requiredGPS: widget.requiredGPS, - myLocationButtonEnabled: widget.myLocationButtonEnabled, - layersButtonEnabled: widget.layersButtonEnabled, - automaticallyAnimateToCurrentLocation: - widget.automaticallyAnimateToCurrentLocation, - mapStylePath: widget.mapStylePath, - appBarColor: widget.appBarColor, - automaticallyImplyLeading: widget.automaticallyImplyLeading, - searchBarBoxDecoration: widget.searchBarBoxDecoration, - hintText: widget.hintText, - resultCardConfirmIcon: widget.resultCardConfirmIcon, - resultCardAlignment: widget.resultCardAlignment, - resultCardDecoration: widget.resultCardDecoration, - resultCardPadding: widget.resultCardPadding, - key: mapKey, - language: widget.language, - desiredAccuracy: widget.desiredAccuracy, - markerColor: widget.markerColor, - ), ); }), ); From 9b0203be7e76d99f73223a73ebaad348f86bdb26 Mon Sep 17 00:00:00 2001 From: Almuhannad Date: Wed, 10 Feb 2021 17:48:23 +0300 Subject: [PATCH 05/20] add color to progress dialog --- 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 72bedd38..ef76231b 100644 --- a/lib/src/google_map_location_picker.dart +++ b/lib/src/google_map_location_picker.dart @@ -131,7 +131,7 @@ class LocationPickerState extends State { SizedBox( height: 24, width: 24, - child: CircularProgressIndicator(strokeWidth: 3), + child: CircularProgressIndicator(strokeWidth: 3,backgroundColor:widget.markerColor??Colors.blue), ), SizedBox(width: 24), Expanded( From 1f3926fcb0771833df0ff9fd6918b8ae4960432f Mon Sep 17 00:00:00 2001 From: Almuhannad Date: Wed, 10 Feb 2021 17:55:08 +0300 Subject: [PATCH 06/20] add color to progress bar --- lib/src/map.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/src/map.dart b/lib/src/map.dart index 1ce9dbd4..008c8b42 100644 --- a/lib/src/map.dart +++ b/lib/src/map.dart @@ -154,11 +154,11 @@ class MapPickerState extends State { if (_currentPosition == null && widget.automaticallyAnimateToCurrentLocation && widget.requiredGPS) { - return const Center(child: CircularProgressIndicator()); + return const Center(child: CircularProgressIndicator(strokeWidth: 3,backgroundColor:widget.markerColor??Colors.blue),); } return _currentPosition == null - ? const Center(child: CircularProgressIndicator()) + ? const Center(child: CircularProgressIndicator(strokeWidth: 3,backgroundColor:widget.markerColor??Colors.blue),) : buildMap(); }, ), @@ -240,7 +240,7 @@ class MapPickerState extends State { loadingIndicator: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - CircularProgressIndicator(), + CircularProgressIndicator(strokeWidth: 3,backgroundColor:widget.markerColor??Colors.blue), ], ), builder: (context, data) { From e27d907869d6256a5625c191b4331100f13549be Mon Sep 17 00:00:00 2001 From: Almuhannad Date: Wed, 10 Feb 2021 17:56:40 +0300 Subject: [PATCH 07/20] fix progress color --- lib/src/map.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/src/map.dart b/lib/src/map.dart index 008c8b42..4eac68a4 100644 --- a/lib/src/map.dart +++ b/lib/src/map.dart @@ -154,11 +154,11 @@ class MapPickerState extends State { if (_currentPosition == null && widget.automaticallyAnimateToCurrentLocation && widget.requiredGPS) { - return const Center(child: CircularProgressIndicator(strokeWidth: 3,backgroundColor:widget.markerColor??Colors.blue),); + return Center(child: CircularProgressIndicator(strokeWidth: 3,backgroundColor:widget.markerColor??Colors.blue),); } return _currentPosition == null - ? const Center(child: CircularProgressIndicator(strokeWidth: 3,backgroundColor:widget.markerColor??Colors.blue),) + ? Center(child: CircularProgressIndicator(strokeWidth: 3,backgroundColor:widget.markerColor??Colors.blue),) : buildMap(); }, ), From 09e3d3509f0ee2da46d8cd714cf989a3a5063486 Mon Sep 17 00:00:00 2001 From: Almuhanand Ghaleb Date: Mon, 24 May 2021 13:21:57 +0300 Subject: [PATCH 08/20] Update pubspec.yaml update intl package --- pubspec.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index c62fb1f0..4df7a1d6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: flutter_localizations: sdk: flutter - intl: '>=0.16.0 <=0.16.1' + intl: '0.17.0' intl_translation: '>=0.17.9 <=0.17.10' google_maps_flutter: ^1.0.2 @@ -81,4 +81,4 @@ flutter: # For details regarding fonts in packages, see # https://flutter.dev/custom-fonts/#from-packages flutter_intl: - enabled: true \ No newline at end of file + enabled: true From 61b741655ab9602b3df1092f490630f9a9f4590e Mon Sep 17 00:00:00 2001 From: Almuhanand Ghaleb Date: Mon, 24 May 2021 13:25:23 +0300 Subject: [PATCH 09/20] Update pubspec.yaml update intl_translation --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 4df7a1d6..40321399 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: flutter_localizations: sdk: flutter intl: '0.17.0' - intl_translation: '>=0.17.9 <=0.17.10' + intl_translation: '0.17.10+1' google_maps_flutter: ^1.0.2 geolocator: ^6.0.0+4 From 4c75533e58e50a22ff9b0ea5d320396aa42b7db1 Mon Sep 17 00:00:00 2001 From: Almuhanand Ghaleb Date: Mon, 24 May 2021 13:27:58 +0300 Subject: [PATCH 10/20] Update pubspec.yaml downgrade intl --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 40321399..6c8bcc06 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: flutter_localizations: sdk: flutter - intl: '0.17.0' + intl: '0.16.1' intl_translation: '0.17.10+1' google_maps_flutter: ^1.0.2 From c4a258a97da09035edb4b293bed9be4b9490cb6e Mon Sep 17 00:00:00 2001 From: Almuhanand Ghaleb Date: Mon, 24 May 2021 13:31:25 +0300 Subject: [PATCH 11/20] Update pubspec.yaml update packages --- pubspec.yaml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 6c8bcc06..935a81f1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,16 +14,15 @@ dependencies: flutter_localizations: sdk: flutter - intl: '0.16.1' - intl_translation: '0.17.10+1' + intl: ^0.17.0 - google_maps_flutter: ^1.0.2 - geolocator: ^6.0.0+4 - android_intent: ^0.3.7+4 - provider: ^4.3.2+2 - http: ^0.12.2 - stack_trace: ^1.9.5 - package_info: '>=0.4.0+14 <2.0.0' + google_maps_flutter: ^2.0.1 + geolocator: ^6.1.14 + android_intent: ^2.0.0 + provider: ^5.0.0 + http: ^0.13.0 + stack_trace: ^1.10.0 + package_info: ^2.0.0 dev_dependencies: flutter_test: From ef29b848d5f57d55aead8c53c064b2d25121d03b Mon Sep 17 00:00:00 2001 From: Almuhanand Ghaleb Date: Mon, 24 May 2021 14:13:17 +0300 Subject: [PATCH 12/20] Update pubspec.yaml update geolocator --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 935a81f1..235de97a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: intl: ^0.17.0 google_maps_flutter: ^2.0.1 - geolocator: ^6.1.14 + geolocator: ^7.0.3 android_intent: ^2.0.0 provider: ^5.0.0 http: ^0.13.0 From 9f18535a07fd2c380fec4dc0965c98210615b0c7 Mon Sep 17 00:00:00 2001 From: Almuhanand Ghaleb Date: Wed, 26 May 2021 10:00:18 +0300 Subject: [PATCH 13/20] Update pubspec.yaml --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 235de97a..46c2c37a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,7 +19,7 @@ dependencies: google_maps_flutter: ^2.0.1 geolocator: ^7.0.3 android_intent: ^2.0.0 - provider: ^5.0.0 + provider: ^4.0.1 http: ^0.13.0 stack_trace: ^1.10.0 package_info: ^2.0.0 From e5728aba0dfece237e3b8e31d8217c020dffef38 Mon Sep 17 00:00:00 2001 From: Almuhanand Ghaleb Date: Wed, 26 May 2021 10:01:09 +0300 Subject: [PATCH 14/20] Update pubspec.yaml --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 46c2c37a..a509c6aa 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: sdk: flutter intl: ^0.17.0 - google_maps_flutter: ^2.0.1 + google_maps_flutter: ^1.0.2 geolocator: ^7.0.3 android_intent: ^2.0.0 provider: ^4.0.1 From 4070863618a156612229b6b4f7902b2ad2a41a27 Mon Sep 17 00:00:00 2001 From: Almuhanand Ghaleb Date: Wed, 26 May 2021 10:01:32 +0300 Subject: [PATCH 15/20] Update pubspec.yaml --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index a509c6aa..ccd1feca 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: intl: ^0.17.0 google_maps_flutter: ^1.0.2 - geolocator: ^7.0.3 + geolocator: ^6.0.0+4 android_intent: ^2.0.0 provider: ^4.0.1 http: ^0.13.0 From 73fd935523b3ec25dda2db81e7a6d27f6a201b96 Mon Sep 17 00:00:00 2001 From: Almuhanand Ghaleb Date: Wed, 26 May 2021 10:01:59 +0300 Subject: [PATCH 16/20] Update pubspec.yaml --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index ccd1feca..4306a410 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -20,7 +20,7 @@ dependencies: geolocator: ^6.0.0+4 android_intent: ^2.0.0 provider: ^4.0.1 - http: ^0.13.0 + http: ^0.12.2 stack_trace: ^1.10.0 package_info: ^2.0.0 From 93c19090c239ec2bd9b7990d8ede761d56c7e446 Mon Sep 17 00:00:00 2001 From: Almuhanand Ghaleb Date: Wed, 26 May 2021 10:30:36 +0300 Subject: [PATCH 17/20] Update pubspec.yaml --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 4306a410..4ed98205 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,7 +19,7 @@ dependencies: google_maps_flutter: ^1.0.2 geolocator: ^6.0.0+4 android_intent: ^2.0.0 - provider: ^4.0.1 + provider: ^5.0.0 http: ^0.12.2 stack_trace: ^1.10.0 package_info: ^2.0.0 From 88e36b750ece4afa5b0d882c8ba9dd09d033f349 Mon Sep 17 00:00:00 2001 From: Almuhanand Ghaleb Date: Wed, 26 May 2021 10:30:52 +0300 Subject: [PATCH 18/20] Update pubspec.yaml --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 4ed98205..e20b6e3a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -20,7 +20,7 @@ dependencies: geolocator: ^6.0.0+4 android_intent: ^2.0.0 provider: ^5.0.0 - http: ^0.12.2 + http: ^0.13.0 stack_trace: ^1.10.0 package_info: ^2.0.0 From dbcd5c5ce2586a6edfb20c64245a78e3615d3e93 Mon Sep 17 00:00:00 2001 From: Almuhanand Ghaleb Date: Wed, 26 May 2021 10:31:43 +0300 Subject: [PATCH 19/20] Update pubspec.yaml --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index e20b6e3a..ab384aeb 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: sdk: flutter intl: ^0.17.0 - google_maps_flutter: ^1.0.2 + google_maps_flutter: ^2.0.6 geolocator: ^6.0.0+4 android_intent: ^2.0.0 provider: ^5.0.0 From 3633a5f4f13e6de8bd5e2bd1317363cda7eaab4c Mon Sep 17 00:00:00 2001 From: Almuhanand Ghaleb Date: Wed, 26 May 2021 10:32:04 +0300 Subject: [PATCH 20/20] Update pubspec.yaml --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index ab384aeb..e5c107e1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: intl: ^0.17.0 google_maps_flutter: ^2.0.6 - geolocator: ^6.0.0+4 + geolocator: ^7.0.3 android_intent: ^2.0.0 provider: ^5.0.0 http: ^0.13.0