From 52a4488ce47da091ad9a4c68abb03101090a2333 Mon Sep 17 00:00:00 2001 From: Jan Boon Date: Tue, 31 Jul 2018 12:02:34 +0800 Subject: [PATCH 1/2] Fix package imports --- flutter_map/lib/flutter_map.dart | 14 +++++++------- flutter_map/lib/src/geo/crs/crs.dart | 4 ++-- flutter_map/lib/src/gestures/gestures.dart | 7 ++++--- flutter_map/lib/src/layer/marker_layer.dart | 4 ++-- flutter_map/lib/src/layer/polyline_layer.dart | 5 +++-- flutter_map/lib/src/layer/tile_layer.dart | 9 +++++---- flutter_map/lib/src/map/flutter_map_state.dart | 9 +++++---- flutter_map/lib/src/map/map.dart | 9 +++++---- 8 files changed, 33 insertions(+), 28 deletions(-) diff --git a/flutter_map/lib/flutter_map.dart b/flutter_map/lib/flutter_map.dart index c43c08c87..9b7ec2fe0 100644 --- a/flutter_map/lib/flutter_map.dart +++ b/flutter_map/lib/flutter_map.dart @@ -4,14 +4,14 @@ import 'dart:async'; import 'package:flutter/widgets.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_map/flutter_map.dart'; -import 'package:flutter_map/src/core/point.dart'; -import 'package:flutter_map/src/geo/crs/crs.dart'; -import 'package:flutter_map/src/map/flutter_map_state.dart'; -import 'package:flutter_map/src/map/map.dart'; -import 'package:flutter_map/src/plugins/plugin.dart'; import 'package:latlong/latlong.dart'; +import 'flutter_map.dart'; +import 'src/core/point.dart'; +import 'src/geo/crs/crs.dart'; +import 'src/map/flutter_map_state.dart'; +import 'src/map/map.dart'; +import 'src/plugins/plugin.dart'; export 'src/plugins/plugin.dart'; export 'src/layer/layer.dart'; export 'src/layer/tile_layer.dart'; @@ -19,7 +19,7 @@ export 'src/layer/marker_layer.dart'; export 'src/layer/polyline_layer.dart'; export 'src/geo/crs/crs.dart'; export 'src/geo/latlng_bounds.dart'; -export 'package:flutter_map/src/core/point.dart'; +export 'src/core/point.dart'; class FlutterMap extends StatefulWidget { /// A set of layers' options to used to create the layers on the map diff --git a/flutter_map/lib/src/geo/crs/crs.dart b/flutter_map/lib/src/geo/crs/crs.dart index 20f978aad..1b9176c9c 100644 --- a/flutter_map/lib/src/geo/crs/crs.dart +++ b/flutter_map/lib/src/geo/crs/crs.dart @@ -2,9 +2,9 @@ import 'dart:math' as math; import 'package:tuple/tuple.dart'; import 'package:latlong/latlong.dart'; -import 'package:flutter_map/src/core/bounds.dart'; -import 'package:flutter_map/src/core/point.dart'; +import '../../core/bounds.dart'; +import '../../core/point.dart'; abstract class Crs { String get code; diff --git a/flutter_map/lib/src/gestures/gestures.dart b/flutter_map/lib/src/gestures/gestures.dart index 1179af594..50bda636b 100644 --- a/flutter_map/lib/src/gestures/gestures.dart +++ b/flutter_map/lib/src/gestures/gestures.dart @@ -2,10 +2,11 @@ import 'dart:math' as math; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; -import 'package:flutter_map/src/core/point.dart'; -import 'package:flutter_map/src/map/map.dart'; import 'package:latlong/latlong.dart'; -import 'package:flutter_map/flutter_map.dart'; + +import '../core/point.dart'; +import '../map/map.dart'; +import '../../flutter_map.dart'; abstract class MapGestureMixin extends State with TickerProviderStateMixin { diff --git a/flutter_map/lib/src/layer/marker_layer.dart b/flutter_map/lib/src/layer/marker_layer.dart index 2d78600d1..771a3bc05 100644 --- a/flutter_map/lib/src/layer/marker_layer.dart +++ b/flutter_map/lib/src/layer/marker_layer.dart @@ -1,7 +1,7 @@ import 'package:flutter/widgets.dart'; -import 'package:flutter_map/src/map/map.dart'; +import '../map/map.dart'; import 'package:latlong/latlong.dart'; -import 'package:flutter_map/flutter_map.dart'; +import '../../flutter_map.dart'; class MarkerLayerOptions extends LayerOptions { final List markers; diff --git a/flutter_map/lib/src/layer/polyline_layer.dart b/flutter_map/lib/src/layer/polyline_layer.dart index d443b3d68..fd040b656 100644 --- a/flutter_map/lib/src/layer/polyline_layer.dart +++ b/flutter_map/lib/src/layer/polyline_layer.dart @@ -1,10 +1,11 @@ import 'dart:ui'; import 'package:flutter/widgets.dart'; -import 'package:flutter_map/flutter_map.dart'; -import 'package:flutter_map/src/map/map.dart'; import 'package:latlong/latlong.dart'; +import '../../flutter_map.dart'; +import '../map/map.dart'; + class PolylineLayerOptions extends LayerOptions { final List polylines; PolylineLayerOptions({this.polylines = const []}); diff --git a/flutter_map/lib/src/layer/tile_layer.dart b/flutter_map/lib/src/layer/tile_layer.dart index c17b78bda..c8ee6eaeb 100644 --- a/flutter_map/lib/src/layer/tile_layer.dart +++ b/flutter_map/lib/src/layer/tile_layer.dart @@ -4,13 +4,14 @@ import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:latlong/latlong.dart'; import 'package:transparent_image/transparent_image.dart'; -import 'package:flutter_map/src/core/bounds.dart'; -import 'package:flutter_map/src/core/point.dart'; -import 'package:flutter_map/src/map/map.dart'; -import 'package:flutter_map/src/core/util.dart' as util; import 'package:tuple/tuple.dart'; import 'layer.dart'; +import '../core/bounds.dart'; +import '../core/point.dart'; +import '../map/map.dart'; +import '../core/util.dart' as util; + class TileLayerOptions extends LayerOptions { final String urlTemplate; final double tileSize; diff --git a/flutter_map/lib/src/map/flutter_map_state.dart b/flutter_map/lib/src/map/flutter_map_state.dart index b00b34c9f..073c246ca 100644 --- a/flutter_map/lib/src/map/flutter_map_state.dart +++ b/flutter_map/lib/src/map/flutter_map_state.dart @@ -1,8 +1,9 @@ import 'package:flutter/widgets.dart'; -import 'package:flutter_map/flutter_map.dart'; -import 'package:flutter_map/src/core/point.dart'; -import 'package:flutter_map/src/gestures/gestures.dart'; -import 'package:flutter_map/src/map/map.dart'; + +import '../../flutter_map.dart'; +import '../core/point.dart'; +import '../gestures/gestures.dart'; +import '../map/map.dart'; class FlutterMapState extends MapGestureMixin { final MapControllerImpl mapController; diff --git a/flutter_map/lib/src/map/map.dart b/flutter_map/lib/src/map/map.dart index 3e1aac256..9ef74be17 100644 --- a/flutter_map/lib/src/map/map.dart +++ b/flutter_map/lib/src/map/map.dart @@ -1,11 +1,12 @@ import 'dart:async'; import 'dart:math' as math; -import 'package:flutter_map/src/core/center_zoom.dart'; import 'package:latlong/latlong.dart'; -import 'package:flutter_map/flutter_map.dart'; -import 'package:flutter_map/src/core/bounds.dart'; -import 'package:flutter_map/src/core/point.dart'; + +import '../core/center_zoom.dart'; +import '../../flutter_map.dart'; +import '../core/bounds.dart'; +import '../core/point.dart'; class MapControllerImpl implements MapController { Completer _readyCompleter = new Completer(); From 93372cc4d2f5432c3b06bbd1be92e82d4acb3935 Mon Sep 17 00:00:00 2001 From: Jan Boon Date: Tue, 7 Aug 2018 14:47:49 +0800 Subject: [PATCH 2/2] Fix package imports --- flutter_map/lib/src/plugins/plugin.dart | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/flutter_map/lib/src/plugins/plugin.dart b/flutter_map/lib/src/plugins/plugin.dart index 919be8512..74766305d 100644 --- a/flutter_map/lib/src/plugins/plugin.dart +++ b/flutter_map/lib/src/plugins/plugin.dart @@ -1,6 +1,7 @@ import 'package:flutter/widgets.dart'; -import 'package:flutter_map/src/layer/layer.dart'; -import 'package:flutter_map/src/map/map.dart'; + +import '../layer/layer.dart'; +import '../map/map.dart'; abstract class MapPlugin { bool supportsLayer(LayerOptions options);