Skip to content

Fix imports within library #84

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

Closed
kaetemi wants to merge 2 commits into from
Closed

Fix imports within library #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52a4488
Fix package imports
kaetemi Jul 31, 2018
93372cc
Fix package imports
kaetemi Aug 7, 2018
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
14 changes: 7 additions & 7 deletions flutter_map/lib/flutter_map.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ 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';
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
Expand Down
4 changes: 2 additions & 2 deletions flutter_map/lib/src/geo/crs/crs.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 4 additions & 3 deletions flutter_map/lib/src/gestures/gestures.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<FlutterMap>
with TickerProviderStateMixin {
Expand Down
4 changes: 2 additions & 2 deletions flutter_map/lib/src/layer/marker_layer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<Marker> markers;
Expand Down
5 changes: 3 additions & 2 deletions flutter_map/lib/src/layer/polyline_layer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<Polyline> polylines;
PolylineLayerOptions({this.polylines = const []});
Expand Down
9 changes: 5 additions & 4 deletions flutter_map/lib/src/layer/tile_layer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 5 additions & 4 deletions flutter_map/lib/src/map/flutter_map_state.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
9 changes: 5 additions & 4 deletions flutter_map/lib/src/map/map.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<Null> _readyCompleter = new Completer<Null>();
Expand Down
5 changes: 3 additions & 2 deletions flutter_map/lib/src/plugins/plugin.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
Expand Down