Skip to content

[google_maps_flutter] fixes #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amuramoto merged 9 commits into from
Apr 27, 2023
Merged

[google_maps_flutter] fixes #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
65a5cb5
[google_maps_flutter_web] refactor _applyMapId function away
jokerttu Apr 27, 2023
12ec15b
[google_maps_flutter] use local variable to avoid force unwraps
jokerttu Apr 27, 2023
a863155
[google_maps_flutter] Force iOS platform version to 12 for example ap…
jokerttu Apr 27, 2023
2cd61ab
[google_maps_flutter] Show hint for android only if not latest renderer
jokerttu Apr 27, 2023
4aee29a
[google_maps_flutter_android] Fix test in interpretGoogleMapOptions
jokerttu Apr 27, 2023
b907770
[google_maps_flutter] move setMapId away from GoogleMapOptionsSink
jokerttu Apr 27, 2023
6c8323d
[google_maps_ios] extract nested lookup variable
jokerttu Apr 27, 2023
90c1ae4
Fix format
jokerttu Apr 27, 2023
d149139
[google_maps_flutter] add package identifier to AndroidManifest.xml
jokerttu Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[google_maps_flutter] use local variable to avoid force unwraps
  • Loading branch information
@jokerttu
jokerttu committed Apr 27, 2023
commit 12ec15bc3547ec240c287759af27a14d9c53bf6e
10 changes: 6 additions & 4 deletions packages/google_maps_flutter/google_maps_flutter/example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,9 @@ Future<AndroidMapRenderer?> initializeMapRenderer() async {
return _initializedRendererCompleter!.future;
}

_initializedRendererCompleter = Completer<AndroidMapRenderer?>();
final Completer<AndroidMapRenderer?> completer =
Completer<AndroidMapRenderer?>();
_initializedRendererCompleter = completer;

WidgetsFlutterBinding.ensureInitialized();

Expand All @@ -103,10 +105,10 @@ Future<AndroidMapRenderer?> initializeMapRenderer() async {
if (mapsImplementation is GoogleMapsFlutterAndroid) {
mapsImplementation.initializeWithRenderer(AndroidMapRenderer.latest).then(
(AndroidMapRenderer initializedRenderer) =>
_initializedRendererCompleter!.complete(initializedRenderer));
completer.complete(initializedRenderer));
} else {
_initializedRendererCompleter!.complete(null);
completer.complete(null);
}

return _initializedRendererCompleter!.future;
return completer.future;
}
8 changes: 5 additions & 3 deletions packages/google_maps_flutter/google_maps_flutter_android/example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,17 @@ Future<AndroidMapRenderer?> initializeMapRenderer() async {
return _initializedRendererCompleter!.future;
}

_initializedRendererCompleter = Completer<AndroidMapRenderer?>();
final Completer<AndroidMapRenderer?> completer =
Completer<AndroidMapRenderer?>();
_initializedRendererCompleter = completer;

WidgetsFlutterBinding.ensureInitialized();

final GoogleMapsFlutterPlatform platform = GoogleMapsFlutterPlatform.instance;
(platform as GoogleMapsFlutterAndroid)
.initializeWithRenderer(AndroidMapRenderer.latest)
.then((AndroidMapRenderer initializedRenderer) =>
_initializedRendererCompleter!.complete(initializedRenderer));
completer.complete(initializedRenderer));

return _initializedRendererCompleter!.future;
return completer.future;
}