From 9967fd9268bfd3e7a9a754bfcf2737e1da0faf88 Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Tue, 19 Mar 2024 11:27:47 +0100
Subject: [PATCH] refactor: sort imports
---
app/lib/consts.dart | 2 +-
app/lib/main.dart | 2 +-
app/lib/server_requests/fetch_markers.dart | 8 ++++----
app/lib/server_requests/fetch_relation.dart | 2 +-
app/lib/widgets/choropleth_map.dart | 6 +++---
app/lib/widgets/map_widget.dart | 17 +++++++++--------
app/lib/widgets/osm_map.dart | 6 +++---
app/lib/widgets/sat_layer.dart | 5 +++--
8 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/app/lib/consts.dart b/app/lib/consts.dart
index 6b2e7ac3..ff51be45 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 5bce4521..dcc739fa 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 fb16d8ec..19a208db 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 999a0611..ab77dcec 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 f611a1dc..1dd7b717 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 c509347d..80c74ecd 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 d78cd8cb..5690c5d2 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 097440e9..0e3749eb 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;
--
GitLab