resolve merge conflicts

This commit is contained in:
Joey Boerwinkel 2022-04-13 11:45:39 +02:00
commit d0027e3a7a
5 changed files with 15 additions and 5 deletions

View file

@ -1,6 +1,5 @@
import 'dart:async'; import 'dart:async';
import 'dart:math'; import 'dart:math';
import 'dart:ui';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart' show rootBundle; import 'package:flutter/services.dart' show rootBundle;

View file

@ -184,6 +184,13 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.12.11" 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: meta:
dependency: transitive dependency: transitive
description: description:
@ -272,7 +279,7 @@ packages:
name: test_api name: test_api
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.4.3" version: "0.4.8"
typed_data: typed_data:
dependency: transitive dependency: transitive
description: description:

View file

@ -7,9 +7,9 @@ import 'dart:math';
import 'dart:typed_data'; import 'dart:typed_data';
import 'dart:ui' as ui; import 'dart:ui' as ui;
import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter_polyline_points/flutter_polyline_points.dart'; import 'package:flutter_polyline_points/flutter_polyline_points.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;

View file

@ -38,7 +38,8 @@ class DirectionsRepository {
debugPrint(e.message); debugPrint(e.message);
} }
throw GoogleMapsException( throw GoogleMapsException(
'Unable to retrieve directions from Google Maps API',); 'Unable to retrieve directions from Google Maps API',
);
} }
} }

View file

@ -114,6 +114,9 @@ class _GoogleTrackTraceMapState extends State<GoogleTrackTraceMap> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return GoogleMap( return GoogleMap(
gestureRecognizers: {
Factory<EagerGestureRecognizer>(() => EagerGestureRecognizer())
},
initialCameraPosition: calculateCameraPosition( initialCameraPosition: calculateCameraPosition(
controller.start.position, controller.start.position,
controller.end.position, controller.end.position,