reorg

apps4av · Aug 16, 2024 · 7d9d12d · 7d9d12d
1 parent 368c0ec
commit 7d9d12d
Show file tree

Hide file tree

Showing 18 changed files with 41 additions and 41 deletions.
diff --git a/lib/data/main_database_helper.dart b/lib/data/main_database_helper.dart
@@ -7,8 +7,8 @@ import 'package:latlong2/latlong.dart';
 import 'package:path/path.dart';
 import 'package:sqflite/sqflite.dart';
 
-import '../destination.dart';
-import '../saa.dart';
+import 'package:avaremp/destination/destination.dart';
+import 'package:avaremp/saa.dart';
 import 'cifp.dart';
 
 class MainDatabaseHelper {

diff --git a/lib/data/realm_helper.dart b/lib/data/realm_helper.dart
@@ -15,18 +15,18 @@ import 'package:avaremp/data/weather_winds.dart';
 import 'package:avaremp/wnb.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:realm/realm.dart';
-import '../aircraft.dart';
-import '../checklist.dart';
-import '../destination.dart';
-import '../plan/plan_route.dart';
-import '../storage.dart';
-import '../weather/airep.dart';
-import '../weather/airsigmet.dart';
-import '../weather/metar.dart';
-import '../weather/notam.dart';
-import '../weather/taf.dart';
-import '../weather/tfr.dart';
-import '../weather/winds_aloft.dart';
+import 'package:avaremp/aircraft.dart';
+import 'package:avaremp/checklist.dart';
+import 'package:avaremp/destination/destination.dart';
+import 'package:avaremp/plan/plan_route.dart';
+import 'package:avaremp/storage.dart';
+import 'package:avaremp/weather/airep.dart';
+import 'package:avaremp/weather/airsigmet.dart';
+import 'package:avaremp/weather/metar.dart';
+import 'package:avaremp/weather/notam.dart';
+import 'package:avaremp/weather/taf.dart';
+import 'package:avaremp/weather/tfr.dart';
+import 'package:avaremp/weather/winds_aloft.dart';
 
 class RealmHelper {
 

diff --git a/lib/airport.dart → lib/destination/airport.dart b/lib/airport.dart → lib/destination/airport.dart
@@ -1,13 +1,13 @@
 import 'dart:math';
 
-import 'package:avaremp/destination.dart';
+import 'destination.dart';
 import 'package:avaremp/geo_calculations.dart';
 import 'package:avaremp/storage.dart';
 import 'package:avaremp/weather/metar.dart';
 import 'package:flutter/material.dart';
 import 'package:latlong2/latlong.dart';
 
-import 'constants.dart';
+import '../constants.dart';
 
 class Airport {
 

diff --git a/lib/airway.dart → lib/destination/airway.dart b/lib/airway.dart → lib/destination/airway.dart
@@ -1,9 +1,9 @@
-import 'package:avaremp/destination.dart';
+import 'destination.dart';
 import 'package:avaremp/geo_calculations.dart';
 import 'package:avaremp/plan/waypoint.dart';
 import 'package:latlong2/latlong.dart';
 
-import 'data/main_database_helper.dart';
+import '../data/main_database_helper.dart';
 
 
 // airway calculations

diff --git a/lib/destination.dart → lib/destination/destination.dart b/lib/destination.dart → lib/destination/destination.dart
@@ -5,7 +5,7 @@ import 'package:latlong2/latlong.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 
 import 'destination_calculations.dart';
-import 'data/main_database_helper.dart';
+import 'package:avaremp/data/main_database_helper.dart';
 
 class Destination {
 

diff --git a/lib/destination_calculations.dart → ...destination/destination_calculations.dart b/lib/destination_calculations.dart → ...destination/destination_calculations.dart
@@ -1,9 +1,9 @@
 import 'dart:math';
 
-import 'package:avaremp/destination.dart';
+import 'package:avaremp/destination/destination.dart';
 import 'package:latlong2/latlong.dart';
 
-import 'geo_calculations.dart';
+import '../geo_calculations.dart';
 
 class DestinationCalculations {
 

diff --git a/lib/nav.dart → lib/destination/nav.dart b/lib/nav.dart → lib/destination/nav.dart
@@ -1,5 +1,5 @@
 import 'package:auto_size_text/auto_size_text.dart';
-import 'package:avaremp/destination.dart';
+import 'package:avaremp/destination/destination.dart';
 import 'package:flutter/material.dart';
 
 class Nav {

diff --git a/lib/find_screen.dart b/lib/find_screen.dart
@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:latlong2/latlong.dart';
 import 'chart.dart';
 import 'constants.dart';
-import 'destination.dart';
+import 'package:avaremp/destination/destination.dart';
 import 'gps.dart';
 import 'data/main_database_helper.dart';
 import 'main_screen.dart';

diff --git a/lib/instrument_list.dart b/lib/instrument_list.dart
@@ -1,6 +1,6 @@
 import 'dart:math';
 
-import 'package:avaremp/destination_calculations.dart';
+import 'package:avaremp/destination/destination_calculations.dart';
 import 'package:avaremp/geo_calculations.dart';
 import 'package:avaremp/pfd_painter.dart';
 import 'package:avaremp/plan/plan_route.dart';
@@ -13,7 +13,7 @@ import 'package:intl/intl.dart';
 import 'package:latlong2/latlong.dart';
 
 import 'constants.dart';
-import 'destination.dart';
+import 'package:avaremp/destination/destination.dart';
 import 'gps.dart';
 
 

diff --git a/lib/longpress_widget.dart b/lib/longpress_widget.dart
@@ -17,11 +17,11 @@ import 'package:flutter/material.dart';
 import 'package:latlong2/latlong.dart';
 import 'package:toastification/toastification.dart';
 
-import 'airport.dart';
+import 'destination/airport.dart';
 import 'constants.dart';
-import 'destination.dart';
+import 'package:avaremp/destination/destination.dart';
 import 'weather/metar.dart';
-import 'nav.dart';
+import 'package:avaremp/destination/nav.dart';
 
 class LongPressWidget extends StatefulWidget {
   final Destination destination;

diff --git a/lib/map_screen.dart b/lib/map_screen.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:io';
 import 'dart:math';
 import 'package:auto_size_text/auto_size_text.dart';
-import 'package:avaremp/airport.dart';
+import 'package:avaremp/destination/airport.dart';
 import 'package:avaremp/documents_screen.dart';
 import 'package:avaremp/gdl90/nexrad_cache.dart';
 import 'package:avaremp/geo_calculations.dart';
@@ -29,7 +29,7 @@ import 'package:material_design_icons_flutter/material_design_icons_flutter.dart
 import 'package:path/path.dart';
 import 'chart.dart';
 import 'constants.dart';
-import 'destination.dart';
+import 'package:avaremp/destination/destination.dart';
 import 'download_screen.dart';
 import 'gps.dart';
 import 'longpress_widget.dart';

diff --git a/lib/plan/plan_file_widget.dart b/lib/plan/plan_file_widget.dart
@@ -9,7 +9,7 @@ import 'package:flutter/material.dart';
 
 import 'package:avaremp/aircraft.dart';
 import 'package:avaremp/constants.dart';
-import 'package:avaremp/destination.dart';
+import 'package:avaremp/destination/destination.dart';
 
 class PlanFileWidget extends StatefulWidget {
   const PlanFileWidget({super.key});

diff --git a/lib/plan/plan_item_widget.dart b/lib/plan/plan_item_widget.dart
@@ -1,9 +1,9 @@
 import 'plan_line_widget.dart';
 import 'package:avaremp/plan/waypoint.dart';
 import 'package:flutter/material.dart';
-import 'package:avaremp/airway.dart';
+import 'package:avaremp/destination/airway.dart';
 import 'package:avaremp/constants.dart';
-import 'package:avaremp/destination.dart';
+import 'package:avaremp/destination/destination.dart';
 
 class PlanItemWidget extends StatefulWidget {
   final Waypoint waypoint;

diff --git a/lib/plan/plan_line_widget.dart b/lib/plan/plan_line_widget.dart
@@ -1,8 +1,8 @@
-import 'package:avaremp/destination_calculations.dart';
+import 'package:avaremp/destination/destination_calculations.dart';
 import 'package:flutter/material.dart';
 
 import 'package:avaremp/constants.dart';
-import 'package:avaremp/destination.dart';
+import 'package:avaremp/destination/destination.dart';
 
 class PlanLineWidget extends StatefulWidget {
 

diff --git a/lib/plan/plan_route.dart b/lib/plan/plan_route.dart
@@ -1,7 +1,7 @@
 
 import 'dart:convert';
 
-import 'package:avaremp/airway.dart';
+import 'package:avaremp/destination/airway.dart';
 import 'package:avaremp/data/main_database_helper.dart';
 import 'package:avaremp/faa_dates.dart';
 import 'package:avaremp/geo_calculations.dart';
@@ -16,8 +16,8 @@ import 'package:latlong2/latlong.dart';
 import 'dart:math';
 import 'package:http/http.dart' as http;
 
-import 'package:avaremp/destination.dart';
-import 'package:avaremp/destination_calculations.dart';
+import 'package:avaremp/destination/destination.dart';
+import 'package:avaremp/destination/destination_calculations.dart';
 import 'package:avaremp/gps.dart';
 
 class PlanRoute {

diff --git a/lib/plan/waypoint.dart b/lib/plan/waypoint.dart
@@ -1,5 +1,5 @@
 
-import '../destination.dart';
+import 'package:avaremp/destination/destination.dart';
 
 class Waypoint {
 

diff --git a/lib/plate_screen.dart b/lib/plate_screen.dart
@@ -1,7 +1,7 @@
 import 'dart:math';
 import 'dart:ui' as ui;
 
-import 'package:avaremp/destination.dart';
+import 'package:avaremp/destination/destination.dart';
 import 'package:avaremp/geo_calculations.dart';
 import 'package:avaremp/path_utils.dart';
 import 'package:avaremp/storage.dart';

diff --git a/lib/storage.dart b/lib/storage.dart
@@ -48,7 +48,7 @@ import 'package:wakelock_plus/wakelock_plus.dart';
 import 'app_settings.dart';
 import 'data/db_general.dart';
 import 'data/realm_helper.dart';
-import 'destination.dart';
+import 'package:avaremp/destination/destination.dart';
 import 'download_manager.dart';
 import 'flight_timer.dart';
 import 'gdl90/message.dart';