Starter/samples
1
0
Fork 0
mirror of https://github.com/flutter/samples.git synced 2025-11-08 13:58:47 +00:00
Code Issues Releases Wiki Activity

Samples maintenance (#435)

Browse Source
This commit is contained in:
Brett Morgan
2020-05-13 09:18:26 +10:00
committed by GitHub
parent 941ebebfad
commit baa1f976b2
94 changed files with 492 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
place_tracker/lib/place_map.dart
View File

@@ -22,13 +22,16 @@ class PlaceMap extends StatefulWidget {
}
class PlaceMapState extends State<PlaceMap> {
static BitmapDescriptor _getPlaceMarkerIcon(PlaceCategory category) {
static Future<BitmapDescriptor> _getPlaceMarkerIcon(
BuildContext context, PlaceCategory category) async {
switch (category) {
case PlaceCategory.favorite:
return BitmapDescriptor.fromAsset('assets/heart.png');
return BitmapDescriptor.fromAssetImage(
createLocalImageConfiguration(context), 'assets/heart.png');
break;
case PlaceCategory.visited:
return BitmapDescriptor.fromAsset('assets/visited.png');
return BitmapDescriptor.fromAssetImage(
createLocalImageConfiguration(context), 'assets/visited.png');
break;
case PlaceCategory.wantToGo:
default:
@@ -47,7 +50,7 @@ class PlaceMapState extends State<PlaceMap> {
LatLng _lastMapPosition;
Map<Marker, Place> _markedPlaces = Map<Marker, Place>();
final Map<Marker, Place> _markedPlaces = <Marker, Place>{};
final Set<Marker> _markers = {};
@@ -61,10 +64,12 @@ class PlaceMapState extends State<PlaceMap> {
// Draw initial place markers on creation so that we have something
// interesting to look at.
var markers = <Marker>{};
for (var place in AppState.of(context).places) {
markers.add(await _createPlaceMarker(context, place));
}
setState(() {
for (Place place in AppState.of(context).places) {
_markers.add(_createPlaceMarker(place));
}
_markers.addAll(markers);
});
// Zoom to fit the initially selected category.
@@ -76,7 +81,7 @@ class PlaceMapState extends State<PlaceMap> {
);
}
Marker _createPlaceMarker(Place place) {
Future<Marker> _createPlaceMarker(BuildContext context, Place place) async {
final marker = Marker(
markerId: MarkerId(place.latLng.toString()),
position: place.latLng,
@@ -85,7 +90,7 @@ class PlaceMapState extends State<PlaceMap> {
snippet: '${place.starRating} Star Rating',
onTap: () => _pushPlaceDetailsScreen(place),
),
icon: _getPlaceMarkerIcon(place.category),
icon: await _getPlaceMarkerIcon(context, place.category),
visible: place.category == AppState.of(context).selectedCategory,
);
_markedPlaces[marker] = place;
@@ -126,7 +131,7 @@ class PlaceMapState extends State<PlaceMap> {
}
void _updateExistingPlaceMarker({@required Place place}) {
Marker marker = _markedPlaces.keys
var marker = _markedPlaces.keys
.singleWhere((value) => _markedPlaces[value].id == place.id);
setState(() {
@@ -160,7 +165,7 @@ class PlaceMapState extends State<PlaceMap> {
Future<void> _showPlacesForSelectedCategory(PlaceCategory category) async {
setState(() {
for (Marker marker in List.of(_markedPlaces.keys)) {
for (var marker in List.of(_markedPlaces.keys)) {
final place = _markedPlaces[marker];
final updatedMarker = marker.copyWith(
visibleParam: place.category == category,
@@ -181,15 +186,15 @@ class PlaceMapState extends State<PlaceMap> {
}
Future<void> _zoomToFitPlaces(List<Place> places) async {
GoogleMapController controller = await mapController.future;
var controller = await mapController.future;
// Default min/max values to latitude and longitude of center.
double minLat = widget.center.latitude;
double maxLat = widget.center.latitude;
double minLong = widget.center.longitude;
double maxLong = widget.center.longitude;
var minLat = widget.center.latitude;
var maxLat = widget.center.latitude;
var minLong = widget.center.longitude;
var maxLong = widget.center.longitude;
for (Place place in places) {
for (var place in places) {
minLat = min(minLat, place.latitude);
maxLat = max(maxLat, place.latitude);
minLong = min(minLong, place.longitude);
@@ -224,16 +229,19 @@ class PlaceMapState extends State<PlaceMap> {
Future<void> _confirmAddPlace(BuildContext context) async {
if (_pendingMarker != null) {
// Create a new Place and map it to the marker we just added.
final Place newPlace = Place(
id: Uuid().v1() as String,
final newPlace = Place(
id: Uuid().v1(),
latLng: _pendingMarker.position,
name: _pendingMarker.infoWindow.title,
category: AppState.of(context).selectedCategory,
);
var placeMarker = await _getPlaceMarkerIcon(
context, AppState.of(context).selectedCategory);
setState(() {
final updatedMarker = _pendingMarker.copyWith(
iconParam: _getPlaceMarkerIcon(AppState.of(context).selectedCategory),
iconParam: placeMarker,
infoWindowParam: InfoWindow(
title: 'New Place',
snippet: null,
@@ -267,7 +275,7 @@ class PlaceMapState extends State<PlaceMap> {
);
// Add the new place to the places stored in appState.
final List<Place> newPlaces = List.from(AppState.of(context).places)
final newPlaces = List<Place>.from(AppState.of(context).places)
..add(newPlace);
// Manually update our map configuration here since our map is already
@@ -292,7 +300,7 @@ class PlaceMapState extends State<PlaceMap> {
}
void _onToggleMapTypePressed() {
final MapType nextType =
final nextType =
MapType.values[(_currentMapType.index + 1) % MapType.values.length];
setState(() {
@@ -302,8 +310,7 @@ class PlaceMapState extends State<PlaceMap> {
Future<void> _maybeUpdateMapConfiguration() async {
_configuration ??= MapConfiguration.of(AppState.of(context));
final MapConfiguration newConfiguration =
MapConfiguration.of(AppState.of(context));
final newConfiguration = MapConfiguration.of(AppState.of(context));
// Since we manually update [_configuration] when place or selectedCategory
// changes come from the [place_map], we should only enter this if statement