diff --git a/app/lib/consts.dart b/app/lib/consts.dart index 6b2e7ac3142f2661e6a473e202cfa02734e1f305..ff51be4528a85120a5f2ee56be5d90e0dc7772c1 100644 --- a/app/lib/consts.dart +++ b/app/lib/consts.dart @@ -1,6 +1,6 @@ +import 'package:latlong2/latlong.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; -import 'package:latlong2/latlong.dart'; // API variables const String port = "8443"; diff --git a/app/lib/main.dart b/app/lib/main.dart index 5bce45213d8ec5a75387d38279491c1a69d78904..dcc739fa3047d7ac62f6daba321bb508201f96ad 100644 --- a/app/lib/main.dart +++ b/app/lib/main.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'pages/default_page.dart'; +import 'package:flutter/material.dart'; void main() { runApp(const MyApp()); diff --git a/app/lib/server_requests/fetch_markers.dart b/app/lib/server_requests/fetch_markers.dart index fb16d8ecae7a77590bc37f1cb070ed2bf4fa1a19..19a208dbf3b7fe604441224ddf4c4bb0f369b001 100644 --- a/app/lib/server_requests/fetch_markers.dart +++ b/app/lib/server_requests/fetch_markers.dart @@ -1,11 +1,11 @@ +import 'dart:io'; import 'dart:async'; import 'dart:convert'; -import 'dart:io'; -import '../../consts.dart'; -import '../data_classes.dart'; import 'package:path_provider/path_provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:flutter/material.dart'; + +import '../../consts.dart'; +import '../data_classes.dart'; class FetchResult { final List<Measurement> measurements; diff --git a/app/lib/server_requests/fetch_relation.dart b/app/lib/server_requests/fetch_relation.dart index 999a0611510203980a554a249a0feb7fda788143..ab77dcecc3d5eef79e60c7e7a1344328b084387b 100644 --- a/app/lib/server_requests/fetch_relation.dart +++ b/app/lib/server_requests/fetch_relation.dart @@ -1,6 +1,6 @@ +import 'dart:io'; import 'dart:async'; import 'dart:convert'; -import 'dart:io'; import 'dart:typed_data'; import 'package:path_provider/path_provider.dart'; diff --git a/app/lib/widgets/choropleth_map.dart b/app/lib/widgets/choropleth_map.dart index f611a1dcedf22d732f8c675834bbc60e64a1783c..1dd7b7178fedbdd757b5655aa4805cfc6d400a7a 100644 --- a/app/lib/widgets/choropleth_map.dart +++ b/app/lib/widgets/choropleth_map.dart @@ -1,9 +1,9 @@ +import 'dart:math'; import 'dart:typed_data'; -import '../data_classes.dart'; import 'package:flutter/material.dart'; import 'package:syncfusion_flutter_maps/maps.dart'; -import 'dart:math'; -import 'dart:convert'; + +import '../data_classes.dart'; /// A class containing thickness data for each subdivision of the map. class IceThicknessModel { diff --git a/app/lib/widgets/map_widget.dart b/app/lib/widgets/map_widget.dart index c509347d990fd6939940e42452eeba9c5050b1c8..80c74ecd2c419d34ed258ffa23d57f0156e3210b 100644 --- a/app/lib/widgets/map_widget.dart +++ b/app/lib/widgets/map_widget.dart @@ -1,15 +1,16 @@ -import 'package:flutter/material.dart'; -import '../data_classes.dart'; -import '../../consts.dart'; -import 'quick_view_chart.dart'; -import 'stat_charts.dart'; -import 'sat_layer.dart'; -import 'package:flutter_map/flutter_map.dart'; -import 'choropleth_map.dart'; import 'dart:typed_data'; +import 'package:flutter_map/flutter_map.dart'; +import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:shared_preferences/shared_preferences.dart'; +import 'sat_layer.dart'; +import 'stat_charts.dart'; +import '../../consts.dart'; +import 'choropleth_map.dart'; +import '../data_classes.dart'; +import 'quick_view_chart.dart'; + /// MapContainerWidget is the main widget that contains the map with all /// its layers, polygons and markers. class MapContainerWidget extends StatefulWidget { diff --git a/app/lib/widgets/osm_map.dart b/app/lib/widgets/osm_map.dart index d78cd8cb675cecc486e078ef0fbd1e7f4246d753..5690c5d2fb06de155817ee2d9f61b0af1343228a 100644 --- a/app/lib/widgets/osm_map.dart +++ b/app/lib/widgets/osm_map.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import '../data_classes.dart'; -import '../../consts.dart'; import 'package:flutter_map/flutter_map.dart'; -import 'package:latlong2/latlong.dart'; + +import '../../consts.dart'; +import '../data_classes.dart'; class OSMmap extends StatelessWidget { final List<Measurement> markerList; diff --git a/app/lib/widgets/sat_layer.dart b/app/lib/widgets/sat_layer.dart index 097440e9d9e856a39b7b59785f953979fcdd3342..0e3749ebf309e6af9b2334ab916fb13f2cdac0f0 100644 --- a/app/lib/widgets/sat_layer.dart +++ b/app/lib/widgets/sat_layer.dart @@ -1,7 +1,8 @@ +import 'package:latlong2/latlong.dart'; import 'package:flutter/material.dart'; -import '../data_classes.dart'; import 'package:flutter_map/flutter_map.dart'; -import 'package:latlong2/latlong.dart'; + +import '../data_classes.dart'; class SatLayer extends StatelessWidget { final List<Measurement> markerList;