changed settings dir structure

lib/main.dart

@@ -1,4 +1,4 @@
-import 'package:aves/model/settings.dart';
+import 'package:aves/model/settings/settings.dart';
 import 'package:aves/widgets/common/data_providers/settings_provider.dart';
 import 'package:aves/widgets/common/icons.dart';
 import 'package:aves/widgets/home_page.dart';

lib/model/settings/coordinate_format.dart

@@ -0,0 +1,28 @@
+import 'package:aves/utils/geo_utils.dart';
+import 'package:tuple/tuple.dart';
+
+enum CoordinateFormat { dms, decimal }
+
+extension ExtraCoordinateFormat on CoordinateFormat {
+  String get name {
+    switch (this) {
+      case CoordinateFormat.dms:
+        return 'DMS';
+      case CoordinateFormat.decimal:
+        return 'Decimal degrees';
+      default:
+        return toString();
+    }
+  }
+
+  String format(Tuple2<double, double> latLng) {
+    switch (this) {
+      case CoordinateFormat.dms:
+        return toDMS(latLng).join(', ');
+      case CoordinateFormat.decimal:
+        return [latLng.item1, latLng.item2].map((n) => n.toStringAsFixed(6)).join(', ');
+      default:
+        return toString();
+    }
+  }
+}

lib/model/settings/home_page.dart

@@ -0,0 +1,28 @@
+import 'package:aves/widgets/album/collection_page.dart';
+import 'package:aves/widgets/filter_grids/albums_page.dart';
+
+enum HomePageSetting { collection, albums }
+
+extension ExtraHomePageSetting on HomePageSetting {
+  String get name {
+    switch (this) {
+      case HomePageSetting.collection:
+        return 'Collection';
+      case HomePageSetting.albums:
+        return 'Albums';
+      default:
+        return toString();
+    }
+  }
+
+  String get routeName {
+    switch (this) {
+      case HomePageSetting.collection:
+        return CollectionPage.routeName;
+      case HomePageSetting.albums:
+        return AlbumListPage.routeName;
+      default:
+        return toString();
+    }
+  }
+}

lib/model/settings/settings.dart

@@ -1,11 +1,11 @@
-import 'package:aves/utils/geo_utils.dart';
+import 'package:aves/model/settings/coordinate_format.dart';
+import 'package:aves/model/settings/home_page.dart';
 import 'package:aves/widgets/fullscreen/info/location_section.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:tuple/tuple.dart';
 
-import 'source/enums.dart';
+import '../source/enums.dart';
 
 final Settings settings = Settings._private();
 
@@ -148,44 +148,3 @@ class Settings extends ChangeNotifier {
     }
   }
 }
-
-enum HomePageSetting { collection, albums }
-
-extension ExtraHomePageSetting on HomePageSetting {
-  String get name {
-    switch (this) {
-      case HomePageSetting.collection:
-        return 'Collection';
-      case HomePageSetting.albums:
-        return 'Albums';
-      default:
-        return toString();
-    }
-  }
-}
-
-enum CoordinateFormat { dms, decimal }
-
-extension ExtraCoordinateFormat on CoordinateFormat {
-  String get name {
-    switch (this) {
-      case CoordinateFormat.dms:
-        return 'DMS';
-      case CoordinateFormat.decimal:
-        return 'Decimal degrees';
-      default:
-        return toString();
-    }
-  }
-
-  String format(Tuple2<double, double> latLng) {
-    switch (this) {
-      case CoordinateFormat.dms:
-        return toDMS(latLng).join(', ');
-      case CoordinateFormat.decimal:
-        return [latLng.item1, latLng.item2].map((n) => n.toStringAsFixed(6)).join(', ');
-      default:
-        return toString();
-    }
-  }
-}

lib/model/source/collection_lens.dart

@@ -4,7 +4,7 @@ import 'dart:collection';
 import 'package:aves/model/filters/album.dart';
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/image_entry.dart';
-import 'package:aves/model/settings.dart';
+import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/model/source/tag.dart';
 import 'package:aves/utils/android_file_utils.dart';

lib/widgets/album/app_bar.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:aves/main.dart';
-import 'package:aves/model/settings.dart';
+import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/model/source/enums.dart';
 import 'package:aves/utils/durations.dart';

lib/widgets/album/grid/tile_extent_manager.dart

@@ -1,6 +1,6 @@
 import 'dart:math';
 
-import 'package:aves/model/settings.dart';
+import 'package:aves/model/settings/settings.dart';
 import 'package:flutter/widgets.dart';
 
 class TileExtentManager {

lib/widgets/album/thumbnail/vector.dart

@@ -1,5 +1,5 @@
 import 'package:aves/model/image_entry.dart';
-import 'package:aves/model/settings.dart';
+import 'package:aves/model/settings/settings.dart';
 import 'package:aves/widgets/common/image_providers/uri_picture_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';

lib/widgets/common/data_providers/media_store_collection_provider.dart

@@ -3,7 +3,7 @@ import 'dart:math';
 import 'package:aves/model/favourite_repo.dart';
 import 'package:aves/model/image_entry.dart';
 import 'package:aves/model/metadata_db.dart';
-import 'package:aves/model/settings.dart';
+import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/services/image_file_service.dart';
 import 'package:flutter/material.dart';

lib/widgets/common/data_providers/settings_provider.dart

@@ -1,4 +1,4 @@
-import 'package:aves/model/settings.dart';
+import 'package:aves/model/settings/settings.dart';
 import 'package:flutter/widgets.dart';
 import 'package:provider/provider.dart';
 

lib/widgets/common/double_back_pop.dart

@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:aves/model/settings.dart';
+import 'package:aves/model/settings/settings.dart';
 import 'package:aves/utils/durations.dart';
 import 'package:aves/widgets/common/action_delegates/feedback.dart';
 import 'package:flutter/foundation.dart';

lib/widgets/debug_page.dart

@@ -4,7 +4,7 @@ import 'package:aves/model/favourite_repo.dart';
 import 'package:aves/model/image_entry.dart';
 import 'package:aves/model/image_metadata.dart';
 import 'package:aves/model/metadata_db.dart';
-import 'package:aves/model/settings.dart';
+import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/services/android_app_service.dart';
 import 'package:aves/services/image_file_service.dart';

lib/widgets/drawer/collection_tile.dart

@@ -1,5 +1,5 @@
 import 'package:aves/model/filters/filters.dart';
-import 'package:aves/model/settings.dart';
+import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/widgets/album/collection_page.dart';

lib/widgets/filter_grids/albums_page.dart

@@ -1,6 +1,6 @@
 import 'package:aves/model/filters/album.dart';
 import 'package:aves/model/image_entry.dart';
-import 'package:aves/model/settings.dart';
+import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/album.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/model/source/enums.dart';

lib/widgets/filter_grids/filter_grid_page.dart

@@ -2,7 +2,7 @@ import 'dart:ui';
 
 import 'package:aves/model/filters/filters.dart';
 import 'package:aves/model/image_entry.dart';
-import 'package:aves/model/settings.dart';
+import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/model/source/collection_source.dart';
 import 'package:aves/utils/durations.dart';

lib/widgets/fullscreen/image_view.dart

@@ -1,5 +1,5 @@
 import 'package:aves/model/image_entry.dart';
-import 'package:aves/model/settings.dart';
+import 'package:aves/model/settings/settings.dart';
 import 'package:aves/widgets/album/empty.dart';
 import 'package:aves/widgets/common/icons.dart';
 import 'package:aves/widgets/common/image_providers/thumbnail_provider.dart';

lib/widgets/fullscreen/info/location_section.dart

@@ -1,6 +1,7 @@
 import 'package:aves/model/filters/location.dart';
 import 'package:aves/model/image_entry.dart';
-import 'package:aves/model/settings.dart';
+import 'package:aves/model/settings/coordinate_format.dart';
+import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/widgets/common/aves_filter_chip.dart';
 import 'package:aves/widgets/common/icons.dart';

lib/widgets/fullscreen/info/maps/common.dart

@@ -1,4 +1,4 @@
-import 'package:aves/model/settings.dart';
+import 'package:aves/model/settings/settings.dart';
 import 'package:aves/services/android_app_service.dart';
 import 'package:aves/widgets/common/aves_selection_dialog.dart';
 import 'package:aves/widgets/common/borders.dart';

lib/widgets/fullscreen/info/maps/google_map.dart

@@ -1,4 +1,4 @@
-import 'package:aves/model/settings.dart';
+import 'package:aves/model/settings/settings.dart';
 import 'package:aves/widgets/fullscreen/info/location_section.dart';
 import 'package:aves/widgets/fullscreen/info/maps/common.dart';
 import 'package:flutter/material.dart';

lib/widgets/fullscreen/info/maps/leaflet_map.dart

@@ -1,4 +1,4 @@
-import 'package:aves/model/settings.dart';
+import 'package:aves/model/settings/settings.dart';
 import 'package:aves/widgets/fullscreen/info/maps/common.dart';
 import 'package:aves/widgets/fullscreen/info/maps/scale_layer.dart';
 import 'package:flutter/material.dart';

lib/widgets/fullscreen/overlay/bottom.dart

@@ -3,7 +3,8 @@ import 'dart:ui';
 
 import 'package:aves/model/image_entry.dart';
 import 'package:aves/model/image_metadata.dart';
-import 'package:aves/model/settings.dart';
+import 'package:aves/model/settings/coordinate_format.dart';
+import 'package:aves/model/settings/settings.dart';
 import 'package:aves/services/metadata_service.dart';
 import 'package:aves/utils/constants.dart';
 import 'package:aves/widgets/common/fx/blurred.dart';

lib/widgets/home_page.dart

@@ -1,6 +1,7 @@
 import 'package:aves/main.dart';
 import 'package:aves/model/image_entry.dart';
-import 'package:aves/model/settings.dart';
+import 'package:aves/model/settings/home_page.dart';
+import 'package:aves/model/settings/settings.dart';
 import 'package:aves/model/source/collection_lens.dart';
 import 'package:aves/services/image_file_service.dart';
 import 'package:aves/services/viewer_service.dart';

lib/widgets/settings/settings_page.dart

@@ -1,4 +1,6 @@
-import 'package:aves/model/settings.dart';
+import 'package:aves/model/settings/coordinate_format.dart';
+import 'package:aves/model/settings/home_page.dart';
+import 'package:aves/model/settings/settings.dart';
 import 'package:aves/widgets/common/aves_selection_dialog.dart';
 import 'package:aves/widgets/common/data_providers/media_query_data_provider.dart';
 import 'package:aves/widgets/common/highlight_title.dart';

lib/widgets/settings/svg_background.dart

@@ -1,4 +1,4 @@
-import 'package:aves/model/settings.dart';
+import 'package:aves/model/settings/settings.dart';
 import 'package:aves/widgets/common/borders.dart';
 import 'package:flutter/material.dart';
 

lib/widgets/welcome_page.dart

@@ -1,4 +1,4 @@
-import 'package:aves/model/settings.dart';
+import 'package:aves/model/settings/settings.dart';
 import 'package:aves/utils/durations.dart';
 import 'package:aves/widgets/common/aves_logo.dart';
 import 'package:aves/widgets/common/labeled_checkbox.dart';