From 636b1fa9bf516a816487d176467114b7be1d483e Mon Sep 17 00:00:00 2001 From: Vadim Date: Thu, 11 May 2023 14:53:04 +0200 Subject: [PATCH] --code=always_use_package_imports --- lib/application.dart | 25 +++++++++---------- lib/data/shared_prefs_service.dart | 9 +++---- lib/firebase.dart | 2 +- lib/main_dev.dart | 3 +-- lib/main_prod.dart | 5 ++-- lib/screens/metering/bloc_metering.dart | 7 +++--- .../bloc_communication_metering.dart | 4 +-- .../provider_bottom_controls.dart | 2 +- .../widget_bottom_controls.dart | 3 +-- .../bloc_container_camera.dart | 10 ++++---- .../widget_camera_controls.dart | 4 +-- .../provider_container_camera.dart | 5 ++-- .../widget_container_camera.dart | 13 +++++----- .../bloc_container_light_sensor.dart | 8 +++--- .../provider_container_light_sensor.dart | 5 ++-- .../widget_list_exposure_pairs.dart | 4 +-- .../widget_top_bar_metering.dart | 3 +-- .../widget_picker_dialog_animated.dart | 4 +-- .../widget_container_readings.dart | 5 ++-- lib/screens/metering/flow_metering.dart | 7 +++--- lib/screens/metering/screen_metering.dart | 13 +++++----- .../about/widget_settings_section_about.dart | 9 +++---- .../caffeine/provider_list_tile_caffeine.dart | 4 +-- .../caffeine/widget_list_tile_caffeine.dart | 2 +- .../haptics/provider_list_tile_haptics.dart | 4 +-- .../haptics/widget_list_tile_haptics.dart | 2 +- .../widget_settings_section_general.dart | 7 +++--- .../bloc_dialog_calibration.dart | 4 +-- .../provider_dialog_calibration.dart | 4 +-- .../widget_dialog_calibration.dart | 7 +++--- .../widget_list_tile_calibration.dart | 3 +-- .../widget_list_tiles_equipments.dart | 2 +- .../widget_container_equipment_profile.dart | 3 +-- .../screen_equipment_profile.dart | 5 ++-- .../widget_list_tile_equipment_profiles.dart | 3 +-- .../widget_list_tile_fractional_stops.dart | 2 +- ...dget_list_tile_metering_screen_layout.dart | 2 +- .../widget_settings_section_metering.dart | 9 +++---- .../widget_dialog_picker_primary_color.dart | 4 +-- .../widget_list_tile_primary_color.dart | 2 +- .../theme/widget_settings_section_theme.dart | 6 ++--- lib/screens/settings/screen_settings.dart | 9 +++---- 42 files changed, 106 insertions(+), 128 deletions(-) diff --git a/lib/application.dart b/lib/application.dart index 87cb444..3f5a11f 100644 --- a/lib/application.dart +++ b/lib/application.dart @@ -5,24 +5,23 @@ import 'package:flutter/services.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:lightmeter/data/caffeine_service.dart'; import 'package:lightmeter/data/haptics_service.dart'; +import 'package:lightmeter/data/light_sensor_service.dart'; import 'package:lightmeter/data/models/supported_locale.dart'; +import 'package:lightmeter/data/permissions_service.dart'; +import 'package:lightmeter/data/shared_prefs_service.dart'; +import 'package:lightmeter/environment.dart'; +import 'package:lightmeter/generated/l10n.dart'; +import 'package:lightmeter/providers/equipment_profile_provider.dart'; +import 'package:lightmeter/providers/ev_source_type_provider.dart'; +import 'package:lightmeter/providers/metering_screen_layout_provider.dart'; +import 'package:lightmeter/providers/stop_type_provider.dart'; import 'package:lightmeter/providers/supported_locale_provider.dart'; +import 'package:lightmeter/providers/theme_provider.dart'; +import 'package:lightmeter/screens/metering/flow_metering.dart'; +import 'package:lightmeter/screens/settings/flow_settings.dart'; import 'package:provider/provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'data/light_sensor_service.dart'; -import 'data/permissions_service.dart'; -import 'data/shared_prefs_service.dart'; -import 'environment.dart'; -import 'generated/l10n.dart'; -import 'providers/equipment_profile_provider.dart'; -import 'providers/ev_source_type_provider.dart'; -import 'providers/metering_screen_layout_provider.dart'; -import 'providers/theme_provider.dart'; -import 'screens/metering/flow_metering.dart'; -import 'screens/settings/flow_settings.dart'; -import 'providers/stop_type_provider.dart'; - class Application extends StatelessWidget { final Environment env; diff --git a/lib/data/shared_prefs_service.dart b/lib/data/shared_prefs_service.dart index 7109bc3..0dd9972 100644 --- a/lib/data/shared_prefs_service.dart +++ b/lib/data/shared_prefs_service.dart @@ -1,15 +1,14 @@ import 'dart:convert'; import 'package:flutter/material.dart'; +import 'package:lightmeter/data/models/ev_source_type.dart'; +import 'package:lightmeter/data/models/film.dart'; +import 'package:lightmeter/data/models/metering_screen_layout_config.dart'; import 'package:lightmeter/data/models/supported_locale.dart'; +import 'package:lightmeter/data/models/theme_type.dart'; import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'models/ev_source_type.dart'; -import 'models/film.dart'; -import 'models/metering_screen_layout_config.dart'; -import 'models/theme_type.dart'; - class UserPreferencesService { static const _isoKey = "iso"; static const _ndFilterKey = "ndFilter"; diff --git a/lib/firebase.dart b/lib/firebase.dart index ca2407a..f75ae90 100644 --- a/lib/firebase.dart +++ b/lib/firebase.dart @@ -2,7 +2,7 @@ import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_crashlytics/firebase_crashlytics.dart'; import 'package:flutter/foundation.dart'; -import 'firebase_options.dart'; +import 'package:lightmeter/firebase_options.dart'; Future initializeFirebase() async { await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform); diff --git a/lib/main_dev.dart b/lib/main_dev.dart index e74e87b..fd6ed56 100644 --- a/lib/main_dev.dart +++ b/lib/main_dev.dart @@ -1,8 +1,7 @@ import 'package:flutter/material.dart'; +import 'package:lightmeter/application.dart'; import 'package:lightmeter/environment.dart'; -import 'application.dart'; - Future main() async { WidgetsFlutterBinding.ensureInitialized(); runApp(const Application(Environment.dev())); diff --git a/lib/main_prod.dart b/lib/main_prod.dart index 627f016..bf02374 100644 --- a/lib/main_prod.dart +++ b/lib/main_prod.dart @@ -1,8 +1,7 @@ import 'package:flutter/material.dart'; +import 'package:lightmeter/application.dart'; import 'package:lightmeter/environment.dart'; - -import 'application.dart'; -import 'firebase.dart'; +import 'package:lightmeter/firebase.dart'; Future main() async { WidgetsFlutterBinding.ensureInitialized(); diff --git a/lib/screens/metering/bloc_metering.dart b/lib/screens/metering/bloc_metering.dart index 95448e5..b5901c3 100644 --- a/lib/screens/metering/bloc_metering.dart +++ b/lib/screens/metering/bloc_metering.dart @@ -6,16 +6,15 @@ import 'package:lightmeter/data/models/exposure_pair.dart'; import 'package:lightmeter/data/models/film.dart'; import 'package:lightmeter/data/shared_prefs_service.dart'; import 'package:lightmeter/interactors/metering_interactor.dart'; +import 'package:lightmeter/screens/metering/communication/bloc_communication_metering.dart'; import 'package:lightmeter/screens/metering/communication/event_communication_metering.dart' as communication_events; import 'package:lightmeter/screens/metering/communication/state_communication_metering.dart' as communication_states; +import 'package:lightmeter/screens/metering/event_metering.dart'; +import 'package:lightmeter/screens/metering/state_metering.dart'; import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart'; -import 'communication/bloc_communication_metering.dart'; -import 'event_metering.dart'; -import 'state_metering.dart'; - class MeteringBloc extends Bloc { final MeteringCommunicationBloc _communicationBloc; final UserPreferencesService _userPreferencesService; diff --git a/lib/screens/metering/communication/bloc_communication_metering.dart b/lib/screens/metering/communication/bloc_communication_metering.dart index 5e84cdd..1c54dc3 100644 --- a/lib/screens/metering/communication/bloc_communication_metering.dart +++ b/lib/screens/metering/communication/bloc_communication_metering.dart @@ -1,7 +1,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; -import 'event_communication_metering.dart'; -import 'state_communication_metering.dart'; +import 'package:lightmeter/screens/metering/communication/event_communication_metering.dart'; +import 'package:lightmeter/screens/metering/communication/state_communication_metering.dart'; class MeteringCommunicationBloc extends Bloc { diff --git a/lib/screens/metering/components/bottom_controls/provider_bottom_controls.dart b/lib/screens/metering/components/bottom_controls/provider_bottom_controls.dart index a697227..dd4a9be 100644 --- a/lib/screens/metering/components/bottom_controls/provider_bottom_controls.dart +++ b/lib/screens/metering/components/bottom_controls/provider_bottom_controls.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:lightmeter/res/dimens.dart'; -import 'widget_bottom_controls.dart'; +import 'package:lightmeter/screens/metering/components/bottom_controls/widget_bottom_controls.dart'; class MeteringBottomControlsProvider extends StatelessWidget { final double? ev; diff --git a/lib/screens/metering/components/bottom_controls/widget_bottom_controls.dart b/lib/screens/metering/components/bottom_controls/widget_bottom_controls.dart index 5565b69..9bb4c53 100644 --- a/lib/screens/metering/components/bottom_controls/widget_bottom_controls.dart +++ b/lib/screens/metering/components/bottom_controls/widget_bottom_controls.dart @@ -1,10 +1,9 @@ import 'package:flutter/material.dart'; import 'package:lightmeter/data/models/ev_source_type.dart'; import 'package:lightmeter/res/dimens.dart'; +import 'package:lightmeter/screens/metering/components/bottom_controls/components/measure_button/widget_button_measure.dart'; import 'package:provider/provider.dart'; -import 'components/measure_button/widget_button_measure.dart'; - class MeteringBottomControls extends StatelessWidget { final double? ev; final bool isMetering; diff --git a/lib/screens/metering/components/camera_container/bloc_container_camera.dart b/lib/screens/metering/components/camera_container/bloc_container_camera.dart index 67bb623..1dee549 100644 --- a/lib/screens/metering/components/camera_container/bloc_container_camera.dart +++ b/lib/screens/metering/components/camera_container/bloc_container_camera.dart @@ -2,23 +2,23 @@ import 'dart:async'; import 'dart:io'; import 'dart:math'; import 'dart:typed_data'; + import 'package:camera/camera.dart'; import 'package:exif/exif.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lightmeter/interactors/metering_interactor.dart'; -import 'package:lightmeter/screens/metering/components/camera_container/models/camera_error_type.dart'; -import 'package:lightmeter/screens/metering/components/shared/ev_source_base/bloc_base_ev_source.dart'; import 'package:lightmeter/screens/metering/communication/bloc_communication_metering.dart'; import 'package:lightmeter/screens/metering/communication/event_communication_metering.dart' as communication_event; import 'package:lightmeter/screens/metering/communication/state_communication_metering.dart' as communication_states; +import 'package:lightmeter/screens/metering/components/camera_container/event_container_camera.dart'; +import 'package:lightmeter/screens/metering/components/camera_container/models/camera_error_type.dart'; +import 'package:lightmeter/screens/metering/components/camera_container/state_container_camera.dart'; +import 'package:lightmeter/screens/metering/components/shared/ev_source_base/bloc_base_ev_source.dart'; import 'package:lightmeter/utils/log_2.dart'; -import 'event_container_camera.dart'; -import 'state_container_camera.dart'; - class CameraContainerBloc extends EvSourceBlocBase { final MeteringInteractor _meteringInteractor; late final _WidgetsBindingObserver _observer; diff --git a/lib/screens/metering/components/camera_container/components/camera_controls/widget_camera_controls.dart b/lib/screens/metering/components/camera_container/components/camera_controls/widget_camera_controls.dart index 57be1d6..493bbef 100644 --- a/lib/screens/metering/components/camera_container/components/camera_controls/widget_camera_controls.dart +++ b/lib/screens/metering/components/camera_container/components/camera_controls/widget_camera_controls.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:lightmeter/res/dimens.dart'; -import 'components/exposure_offset_slider/widget_slider_exposure_offset.dart'; -import 'components/zoom_slider/widget_slider_zoom.dart'; +import 'package:lightmeter/screens/metering/components/camera_container/components/camera_controls/components/exposure_offset_slider/widget_slider_exposure_offset.dart'; +import 'package:lightmeter/screens/metering/components/camera_container/components/camera_controls/components/zoom_slider/widget_slider_zoom.dart'; class CameraControls extends StatelessWidget { final RangeValues exposureOffsetRange; diff --git a/lib/screens/metering/components/camera_container/provider_container_camera.dart b/lib/screens/metering/components/camera_container/provider_container_camera.dart index c2643f2..c334ecd 100644 --- a/lib/screens/metering/components/camera_container/provider_container_camera.dart +++ b/lib/screens/metering/components/camera_container/provider_container_camera.dart @@ -4,11 +4,10 @@ import 'package:lightmeter/data/models/exposure_pair.dart'; import 'package:lightmeter/data/models/film.dart'; import 'package:lightmeter/interactors/metering_interactor.dart'; import 'package:lightmeter/screens/metering/communication/bloc_communication_metering.dart'; +import 'package:lightmeter/screens/metering/components/camera_container/bloc_container_camera.dart'; +import 'package:lightmeter/screens/metering/components/camera_container/widget_container_camera.dart'; import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart'; -import 'bloc_container_camera.dart'; -import 'widget_container_camera.dart'; - class CameraContainerProvider extends StatelessWidget { final ExposurePair? fastest; final ExposurePair? slowest; diff --git a/lib/screens/metering/components/camera_container/widget_container_camera.dart b/lib/screens/metering/components/camera_container/widget_container_camera.dart index 0362b5f..46f4278 100644 --- a/lib/screens/metering/components/camera_container/widget_container_camera.dart +++ b/lib/screens/metering/components/camera_container/widget_container_camera.dart @@ -7,20 +7,19 @@ import 'package:lightmeter/features.dart'; import 'package:lightmeter/platform_config.dart'; import 'package:lightmeter/providers/metering_screen_layout_provider.dart'; import 'package:lightmeter/res/dimens.dart'; +import 'package:lightmeter/screens/metering/components/camera_container/bloc_container_camera.dart'; +import 'package:lightmeter/screens/metering/components/camera_container/components/camera_controls/widget_camera_controls.dart'; +import 'package:lightmeter/screens/metering/components/camera_container/components/camera_controls_placeholder/widget_placeholder_camera_controls.dart'; import 'package:lightmeter/screens/metering/components/camera_container/components/camera_view/widget_camera_view.dart'; +import 'package:lightmeter/screens/metering/components/camera_container/components/camera_view_placeholder/widget_placeholder_camera_view.dart'; +import 'package:lightmeter/screens/metering/components/camera_container/event_container_camera.dart'; import 'package:lightmeter/screens/metering/components/camera_container/models/camera_error_type.dart'; +import 'package:lightmeter/screens/metering/components/camera_container/state_container_camera.dart'; import 'package:lightmeter/screens/metering/components/shared/exposure_pairs_list/widget_list_exposure_pairs.dart'; import 'package:lightmeter/screens/metering/components/shared/metering_top_bar/widget_top_bar_metering.dart'; import 'package:lightmeter/screens/metering/components/shared/readings_container/widget_container_readings.dart'; import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart'; -import 'bloc_container_camera.dart'; -import 'components/camera_controls/widget_camera_controls.dart'; -import 'components/camera_controls_placeholder/widget_placeholder_camera_controls.dart'; -import 'components/camera_view_placeholder/widget_placeholder_camera_view.dart'; -import 'event_container_camera.dart'; -import 'state_container_camera.dart'; - class CameraContainer extends StatelessWidget { final ExposurePair? fastest; final ExposurePair? slowest; diff --git a/lib/screens/metering/components/light_sensor_container/bloc_container_light_sensor.dart b/lib/screens/metering/components/light_sensor_container/bloc_container_light_sensor.dart index ff2bb9d..45719ec 100644 --- a/lib/screens/metering/components/light_sensor_container/bloc_container_light_sensor.dart +++ b/lib/screens/metering/components/light_sensor_container/bloc_container_light_sensor.dart @@ -1,16 +1,16 @@ import 'dart:async'; + import 'package:lightmeter/interactors/metering_interactor.dart'; -import 'package:lightmeter/screens/metering/components/shared/ev_source_base/bloc_base_ev_source.dart'; import 'package:lightmeter/screens/metering/communication/bloc_communication_metering.dart'; import 'package:lightmeter/screens/metering/communication/event_communication_metering.dart' as communication_event; import 'package:lightmeter/screens/metering/communication/state_communication_metering.dart' as communication_states; +import 'package:lightmeter/screens/metering/components/light_sensor_container/event_container_light_sensor.dart'; +import 'package:lightmeter/screens/metering/components/light_sensor_container/state_container_light_sensor.dart'; +import 'package:lightmeter/screens/metering/components/shared/ev_source_base/bloc_base_ev_source.dart'; import 'package:lightmeter/utils/log_2.dart'; -import 'event_container_light_sensor.dart'; -import 'state_container_light_sensor.dart'; - class LightSensorContainerBloc extends EvSourceBlocBase { final MeteringInteractor _meteringInteractor; diff --git a/lib/screens/metering/components/light_sensor_container/provider_container_light_sensor.dart b/lib/screens/metering/components/light_sensor_container/provider_container_light_sensor.dart index 71bf5e6..ab2b626 100644 --- a/lib/screens/metering/components/light_sensor_container/provider_container_light_sensor.dart +++ b/lib/screens/metering/components/light_sensor_container/provider_container_light_sensor.dart @@ -4,11 +4,10 @@ import 'package:lightmeter/data/models/exposure_pair.dart'; import 'package:lightmeter/data/models/film.dart'; import 'package:lightmeter/interactors/metering_interactor.dart'; import 'package:lightmeter/screens/metering/communication/bloc_communication_metering.dart'; +import 'package:lightmeter/screens/metering/components/light_sensor_container/bloc_container_light_sensor.dart'; +import 'package:lightmeter/screens/metering/components/light_sensor_container/widget_container_light_sensor.dart'; import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart'; -import 'bloc_container_light_sensor.dart'; -import 'widget_container_light_sensor.dart'; - class LightSensorContainerProvider extends StatelessWidget { final ExposurePair? fastest; final ExposurePair? slowest; diff --git a/lib/screens/metering/components/shared/exposure_pairs_list/widget_list_exposure_pairs.dart b/lib/screens/metering/components/shared/exposure_pairs_list/widget_list_exposure_pairs.dart index 11c0f9e..f2496b2 100644 --- a/lib/screens/metering/components/shared/exposure_pairs_list/widget_list_exposure_pairs.dart +++ b/lib/screens/metering/components/shared/exposure_pairs_list/widget_list_exposure_pairs.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:lightmeter/data/models/exposure_pair.dart'; import 'package:lightmeter/res/dimens.dart'; -import 'components/empty_exposure_pairs_list/widget_list_exposure_pairs_empty.dart'; -import 'components/exposure_pairs_list_item/widget_item_list_exposure_pairs.dart'; +import 'package:lightmeter/screens/metering/components/shared/exposure_pairs_list/components/empty_exposure_pairs_list/widget_list_exposure_pairs_empty.dart'; +import 'package:lightmeter/screens/metering/components/shared/exposure_pairs_list/components/exposure_pairs_list_item/widget_item_list_exposure_pairs.dart'; class ExposurePairsList extends StatelessWidget { final List exposurePairs; diff --git a/lib/screens/metering/components/shared/metering_top_bar/widget_top_bar_metering.dart b/lib/screens/metering/components/shared/metering_top_bar/widget_top_bar_metering.dart index f9b195a..0682e7e 100644 --- a/lib/screens/metering/components/shared/metering_top_bar/widget_top_bar_metering.dart +++ b/lib/screens/metering/components/shared/metering_top_bar/widget_top_bar_metering.dart @@ -1,9 +1,8 @@ import 'package:flutter/material.dart'; import 'package:lightmeter/res/dimens.dart'; +import 'package:lightmeter/screens/metering/components/shared/metering_top_bar/shape_top_bar_metering.dart'; import 'package:lightmeter/screens/metering/components/shared/readings_container/widget_container_readings.dart'; -import 'shape_top_bar_metering.dart'; - class MeteringTopBar extends StatelessWidget { final ReadingsContainer readingsContainer; final double appendixHeight; diff --git a/lib/screens/metering/components/shared/readings_container/components/animated_dialog_picker/widget_picker_dialog_animated.dart b/lib/screens/metering/components/shared/readings_container/components/animated_dialog_picker/widget_picker_dialog_animated.dart index 0c3cd48..55923c8 100644 --- a/lib/screens/metering/components/shared/readings_container/components/animated_dialog_picker/widget_picker_dialog_animated.dart +++ b/lib/screens/metering/components/shared/readings_container/components/animated_dialog_picker/widget_picker_dialog_animated.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'components/animated_dialog/widget_dialog_animated.dart'; -import 'components/dialog_picker/widget_picker_dialog.dart'; +import 'package:lightmeter/screens/metering/components/shared/readings_container/components/animated_dialog_picker/components/animated_dialog/widget_dialog_animated.dart'; +import 'package:lightmeter/screens/metering/components/shared/readings_container/components/animated_dialog_picker/components/dialog_picker/widget_picker_dialog.dart'; class AnimatedDialogPicker extends StatelessWidget { final _key = GlobalKey(); diff --git a/lib/screens/metering/components/shared/readings_container/widget_container_readings.dart b/lib/screens/metering/components/shared/readings_container/widget_container_readings.dart index 313b408..0e517f7 100644 --- a/lib/screens/metering/components/shared/readings_container/widget_container_readings.dart +++ b/lib/screens/metering/components/shared/readings_container/widget_container_readings.dart @@ -7,11 +7,10 @@ import 'package:lightmeter/generated/l10n.dart'; import 'package:lightmeter/providers/equipment_profile_provider.dart'; import 'package:lightmeter/providers/metering_screen_layout_provider.dart'; import 'package:lightmeter/res/dimens.dart'; +import 'package:lightmeter/screens/metering/components/shared/readings_container/components/animated_dialog_picker/widget_picker_dialog_animated.dart'; +import 'package:lightmeter/screens/metering/components/shared/readings_container/components/reading_value_container/widget_container_reading_value.dart'; import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart'; -import 'components/animated_dialog_picker/widget_picker_dialog_animated.dart'; -import 'components/reading_value_container/widget_container_reading_value.dart'; - /// Contains a column of fastest & slowest exposure pairs + a row of ISO and ND pickers class ReadingsContainer extends StatelessWidget { final ExposurePair? fastest; diff --git a/lib/screens/metering/flow_metering.dart b/lib/screens/metering/flow_metering.dart index c376c7d..88b38ad 100644 --- a/lib/screens/metering/flow_metering.dart +++ b/lib/screens/metering/flow_metering.dart @@ -7,13 +7,12 @@ import 'package:lightmeter/data/permissions_service.dart'; import 'package:lightmeter/data/shared_prefs_service.dart'; import 'package:lightmeter/interactors/metering_interactor.dart'; import 'package:lightmeter/providers/equipment_profile_provider.dart'; +import 'package:lightmeter/screens/metering/bloc_metering.dart'; +import 'package:lightmeter/screens/metering/communication/bloc_communication_metering.dart'; +import 'package:lightmeter/screens/metering/screen_metering.dart'; import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart'; import 'package:provider/provider.dart'; -import 'bloc_metering.dart'; -import 'communication/bloc_communication_metering.dart'; -import 'screen_metering.dart'; - class MeteringFlow extends StatefulWidget { const MeteringFlow({super.key}); diff --git a/lib/screens/metering/screen_metering.dart b/lib/screens/metering/screen_metering.dart index cf27875..b1a2d9c 100644 --- a/lib/screens/metering/screen_metering.dart +++ b/lib/screens/metering/screen_metering.dart @@ -8,15 +8,14 @@ import 'package:lightmeter/environment.dart'; import 'package:lightmeter/providers/equipment_profile_provider.dart'; import 'package:lightmeter/providers/ev_source_type_provider.dart'; import 'package:lightmeter/providers/metering_screen_layout_provider.dart'; +import 'package:lightmeter/screens/metering/bloc_metering.dart'; +import 'package:lightmeter/screens/metering/components/bottom_controls/provider_bottom_controls.dart'; +import 'package:lightmeter/screens/metering/components/camera_container/provider_container_camera.dart'; +import 'package:lightmeter/screens/metering/components/light_sensor_container/provider_container_light_sensor.dart'; +import 'package:lightmeter/screens/metering/event_metering.dart'; +import 'package:lightmeter/screens/metering/state_metering.dart'; import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart'; -import 'components/bottom_controls/provider_bottom_controls.dart'; -import 'components/camera_container/provider_container_camera.dart'; -import 'components/light_sensor_container/provider_container_light_sensor.dart'; -import 'bloc_metering.dart'; -import 'event_metering.dart'; -import 'state_metering.dart'; - class MeteringScreen extends StatefulWidget { const MeteringScreen({super.key}); diff --git a/lib/screens/settings/components/about/widget_settings_section_about.dart b/lib/screens/settings/components/about/widget_settings_section_about.dart index 89e3cf2..d911ae8 100644 --- a/lib/screens/settings/components/about/widget_settings_section_about.dart +++ b/lib/screens/settings/components/about/widget_settings_section_about.dart @@ -1,12 +1,11 @@ import 'package:flutter/material.dart'; import 'package:lightmeter/generated/l10n.dart'; +import 'package:lightmeter/screens/settings/components/about/components/report_issue/widget_list_tile_report_issue.dart'; +import 'package:lightmeter/screens/settings/components/about/components/source_code/widget_list_tile_source_code.dart'; +import 'package:lightmeter/screens/settings/components/about/components/version/widget_list_tile_version.dart'; +import 'package:lightmeter/screens/settings/components/about/components/write_email/widget_list_tile_write_email.dart'; import 'package:lightmeter/screens/settings/components/shared/settings_section/widget_settings_section.dart'; -import 'components/report_issue/widget_list_tile_report_issue.dart'; -import 'components/source_code/widget_list_tile_source_code.dart'; -import 'components/version/widget_list_tile_version.dart'; -import 'components/write_email/widget_list_tile_write_email.dart'; - class AboutSettingsSection extends StatelessWidget { const AboutSettingsSection({super.key}); diff --git a/lib/screens/settings/components/general/components/caffeine/provider_list_tile_caffeine.dart b/lib/screens/settings/components/general/components/caffeine/provider_list_tile_caffeine.dart index 479b1e7..269fa20 100644 --- a/lib/screens/settings/components/general/components/caffeine/provider_list_tile_caffeine.dart +++ b/lib/screens/settings/components/general/components/caffeine/provider_list_tile_caffeine.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lightmeter/interactors/settings_interactor.dart'; -import 'bloc_list_tile_caffeine.dart'; -import 'widget_list_tile_caffeine.dart'; +import 'package:lightmeter/screens/settings/components/general/components/caffeine/bloc_list_tile_caffeine.dart'; +import 'package:lightmeter/screens/settings/components/general/components/caffeine/widget_list_tile_caffeine.dart'; class CaffeineListTileProvider extends StatelessWidget { const CaffeineListTileProvider({super.key}); diff --git a/lib/screens/settings/components/general/components/caffeine/widget_list_tile_caffeine.dart b/lib/screens/settings/components/general/components/caffeine/widget_list_tile_caffeine.dart index dfd7bbe..7de7450 100644 --- a/lib/screens/settings/components/general/components/caffeine/widget_list_tile_caffeine.dart +++ b/lib/screens/settings/components/general/components/caffeine/widget_list_tile_caffeine.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lightmeter/generated/l10n.dart'; -import 'bloc_list_tile_caffeine.dart'; +import 'package:lightmeter/screens/settings/components/general/components/caffeine/bloc_list_tile_caffeine.dart'; class CaffeineListTile extends StatelessWidget { const CaffeineListTile({super.key}); diff --git a/lib/screens/settings/components/general/components/haptics/provider_list_tile_haptics.dart b/lib/screens/settings/components/general/components/haptics/provider_list_tile_haptics.dart index 97531c8..894172e 100644 --- a/lib/screens/settings/components/general/components/haptics/provider_list_tile_haptics.dart +++ b/lib/screens/settings/components/general/components/haptics/provider_list_tile_haptics.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lightmeter/interactors/settings_interactor.dart'; -import 'bloc_list_tile_haptics.dart'; -import 'widget_list_tile_haptics.dart'; +import 'package:lightmeter/screens/settings/components/general/components/haptics/bloc_list_tile_haptics.dart'; +import 'package:lightmeter/screens/settings/components/general/components/haptics/widget_list_tile_haptics.dart'; class HapticsListTileProvider extends StatelessWidget { const HapticsListTileProvider({super.key}); diff --git a/lib/screens/settings/components/general/components/haptics/widget_list_tile_haptics.dart b/lib/screens/settings/components/general/components/haptics/widget_list_tile_haptics.dart index 673fa2c..a33b1ce 100644 --- a/lib/screens/settings/components/general/components/haptics/widget_list_tile_haptics.dart +++ b/lib/screens/settings/components/general/components/haptics/widget_list_tile_haptics.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lightmeter/generated/l10n.dart'; -import 'bloc_list_tile_haptics.dart'; +import 'package:lightmeter/screens/settings/components/general/components/haptics/bloc_list_tile_haptics.dart'; class HapticsListTile extends StatelessWidget { const HapticsListTile({super.key}); diff --git a/lib/screens/settings/components/general/widget_settings_section_general.dart b/lib/screens/settings/components/general/widget_settings_section_general.dart index 7a2d836..b873d3f 100644 --- a/lib/screens/settings/components/general/widget_settings_section_general.dart +++ b/lib/screens/settings/components/general/widget_settings_section_general.dart @@ -1,11 +1,10 @@ import 'package:flutter/material.dart'; import 'package:lightmeter/generated/l10n.dart'; +import 'package:lightmeter/screens/settings/components/general/components/caffeine/provider_list_tile_caffeine.dart'; +import 'package:lightmeter/screens/settings/components/general/components/haptics/provider_list_tile_haptics.dart'; +import 'package:lightmeter/screens/settings/components/general/components/language/widget_list_tile_language.dart'; import 'package:lightmeter/screens/settings/components/shared/settings_section/widget_settings_section.dart'; -import 'components/caffeine/provider_list_tile_caffeine.dart'; -import 'components/haptics/provider_list_tile_haptics.dart'; -import 'components/language/widget_list_tile_language.dart'; - class GeneralSettingsSection extends StatelessWidget { const GeneralSettingsSection({super.key}); diff --git a/lib/screens/settings/components/metering/components/calibration/components/calibration_dialog/bloc_dialog_calibration.dart b/lib/screens/settings/components/metering/components/calibration/components/calibration_dialog/bloc_dialog_calibration.dart index 854ac7f..6003396 100644 --- a/lib/screens/settings/components/metering/components/calibration/components/calibration_dialog/bloc_dialog_calibration.dart +++ b/lib/screens/settings/components/metering/components/calibration/components/calibration_dialog/bloc_dialog_calibration.dart @@ -1,8 +1,8 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lightmeter/interactors/settings_interactor.dart'; -import 'event_dialog_calibration.dart'; -import 'state_dialog_calibration.dart'; +import 'package:lightmeter/screens/settings/components/metering/components/calibration/components/calibration_dialog/event_dialog_calibration.dart'; +import 'package:lightmeter/screens/settings/components/metering/components/calibration/components/calibration_dialog/state_dialog_calibration.dart'; class CalibrationDialogBloc extends Bloc { final SettingsInteractor _settingsInteractor; diff --git a/lib/screens/settings/components/metering/components/calibration/components/calibration_dialog/provider_dialog_calibration.dart b/lib/screens/settings/components/metering/components/calibration/components/calibration_dialog/provider_dialog_calibration.dart index 1161265..a968dfe 100644 --- a/lib/screens/settings/components/metering/components/calibration/components/calibration_dialog/provider_dialog_calibration.dart +++ b/lib/screens/settings/components/metering/components/calibration/components/calibration_dialog/provider_dialog_calibration.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lightmeter/interactors/settings_interactor.dart'; -import 'bloc_dialog_calibration.dart'; -import 'widget_dialog_calibration.dart'; +import 'package:lightmeter/screens/settings/components/metering/components/calibration/components/calibration_dialog/bloc_dialog_calibration.dart'; +import 'package:lightmeter/screens/settings/components/metering/components/calibration/components/calibration_dialog/widget_dialog_calibration.dart'; class CalibrationDialogProvider extends StatelessWidget { const CalibrationDialogProvider({super.key}); diff --git a/lib/screens/settings/components/metering/components/calibration/components/calibration_dialog/widget_dialog_calibration.dart b/lib/screens/settings/components/metering/components/calibration/components/calibration_dialog/widget_dialog_calibration.dart index fc26df3..7a4b5fa 100644 --- a/lib/screens/settings/components/metering/components/calibration/components/calibration_dialog/widget_dialog_calibration.dart +++ b/lib/screens/settings/components/metering/components/calibration/components/calibration_dialog/widget_dialog_calibration.dart @@ -3,13 +3,12 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:lightmeter/environment.dart'; import 'package:lightmeter/generated/l10n.dart'; import 'package:lightmeter/res/dimens.dart'; +import 'package:lightmeter/screens/settings/components/metering/components/calibration/components/calibration_dialog/bloc_dialog_calibration.dart'; +import 'package:lightmeter/screens/settings/components/metering/components/calibration/components/calibration_dialog/event_dialog_calibration.dart'; +import 'package:lightmeter/screens/settings/components/metering/components/calibration/components/calibration_dialog/state_dialog_calibration.dart'; import 'package:lightmeter/screens/shared/centered_slider/widget_slider_centered.dart'; import 'package:lightmeter/utils/to_string_signed.dart'; -import 'bloc_dialog_calibration.dart'; -import 'event_dialog_calibration.dart'; -import 'state_dialog_calibration.dart'; - class CalibrationDialog extends StatelessWidget { const CalibrationDialog({super.key}); diff --git a/lib/screens/settings/components/metering/components/calibration/widget_list_tile_calibration.dart b/lib/screens/settings/components/metering/components/calibration/widget_list_tile_calibration.dart index 43de482..7781371 100644 --- a/lib/screens/settings/components/metering/components/calibration/widget_list_tile_calibration.dart +++ b/lib/screens/settings/components/metering/components/calibration/widget_list_tile_calibration.dart @@ -1,10 +1,9 @@ import 'package:flutter/material.dart'; import 'package:lightmeter/generated/l10n.dart'; import 'package:lightmeter/interactors/settings_interactor.dart'; +import 'package:lightmeter/screens/settings/components/metering/components/calibration/components/calibration_dialog/provider_dialog_calibration.dart'; import 'package:provider/provider.dart'; -import 'components/calibration_dialog/provider_dialog_calibration.dart'; - class CalibrationListTile extends StatelessWidget { const CalibrationListTile({super.key}); diff --git a/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/components/equipment_list_tiles/widget_list_tiles_equipments.dart b/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/components/equipment_list_tiles/widget_list_tiles_equipments.dart index 52a2960..695e4e3 100644 --- a/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/components/equipment_list_tiles/widget_list_tiles_equipments.dart +++ b/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/components/equipment_list_tiles/widget_list_tiles_equipments.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:lightmeter/generated/l10n.dart'; +import 'package:lightmeter/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/components/equipment_list_tiles/components/dialog_filter/widget_dialog_filter.dart'; import 'package:lightmeter/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/components/equipment_list_tiles/components/dialog_range_picker/widget_dialog_picker_range.dart'; import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart'; -import 'package:lightmeter/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/components/equipment_list_tiles/components/dialog_filter/widget_dialog_filter.dart'; class EquipmentListTiles extends StatelessWidget { final List selectedApertureValues; diff --git a/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/widget_container_equipment_profile.dart b/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/widget_container_equipment_profile.dart index 5e546d5..7223551 100644 --- a/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/widget_container_equipment_profile.dart +++ b/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/widget_container_equipment_profile.dart @@ -3,11 +3,10 @@ import 'dart:math'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:lightmeter/res/dimens.dart'; +import 'package:lightmeter/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/components/equipment_list_tiles/widget_list_tiles_equipments.dart'; import 'package:lightmeter/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_name_dialog/widget_dialog_equipment_profile_name.dart'; import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart'; -import 'components/equipment_list_tiles/widget_list_tiles_equipments.dart'; - class EquipmentProfileContainer extends StatefulWidget { final EquipmentProfileData data; final ValueChanged onUpdate; diff --git a/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart b/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart index af15f4a..04a9be1 100644 --- a/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart +++ b/lib/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart @@ -2,12 +2,11 @@ import 'package:flutter/material.dart'; import 'package:lightmeter/generated/l10n.dart'; import 'package:lightmeter/providers/equipment_profile_provider.dart'; import 'package:lightmeter/res/dimens.dart'; +import 'package:lightmeter/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_container/widget_container_equipment_profile.dart'; +import 'package:lightmeter/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/components/equipment_profile_name_dialog/widget_dialog_equipment_profile_name.dart'; import 'package:lightmeter/screens/shared/sliver_screen/screen_sliver.dart'; import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart'; -import 'components/equipment_profile_container/widget_container_equipment_profile.dart'; -import 'components/equipment_profile_name_dialog/widget_dialog_equipment_profile_name.dart'; - class EquipmentProfilesScreen extends StatefulWidget { const EquipmentProfilesScreen({super.key}); diff --git a/lib/screens/settings/components/metering/components/equipment_profiles/widget_list_tile_equipment_profiles.dart b/lib/screens/settings/components/metering/components/equipment_profiles/widget_list_tile_equipment_profiles.dart index c8fa3a8..ab4167a 100644 --- a/lib/screens/settings/components/metering/components/equipment_profiles/widget_list_tile_equipment_profiles.dart +++ b/lib/screens/settings/components/metering/components/equipment_profiles/widget_list_tile_equipment_profiles.dart @@ -1,9 +1,8 @@ import 'package:flutter/material.dart'; import 'package:lightmeter/generated/l10n.dart'; +import 'package:lightmeter/screens/settings/components/metering/components/equipment_profiles/components/equipment_profile_screen/screen_equipment_profile.dart'; import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart'; -import 'components/equipment_profile_screen/screen_equipment_profile.dart'; - class EquipmentProfilesListTile extends StatelessWidget { const EquipmentProfilesListTile({super.key}); diff --git a/lib/screens/settings/components/metering/components/fractional_stops/widget_list_tile_fractional_stops.dart b/lib/screens/settings/components/metering/components/fractional_stops/widget_list_tile_fractional_stops.dart index c882d8c..a21ec94 100644 --- a/lib/screens/settings/components/metering/components/fractional_stops/widget_list_tile_fractional_stops.dart +++ b/lib/screens/settings/components/metering/components/fractional_stops/widget_list_tile_fractional_stops.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:lightmeter/generated/l10n.dart'; -import 'package:lightmeter/screens/settings/components/shared/dialog_picker.dart/widget_dialog_picker.dart'; import 'package:lightmeter/providers/stop_type_provider.dart'; +import 'package:lightmeter/screens/settings/components/shared/dialog_picker.dart/widget_dialog_picker.dart'; import 'package:m3_lightmeter_resources/m3_lightmeter_resources.dart'; import 'package:provider/provider.dart'; diff --git a/lib/screens/settings/components/metering/components/metering_screen_layout/widget_list_tile_metering_screen_layout.dart b/lib/screens/settings/components/metering/components/metering_screen_layout/widget_list_tile_metering_screen_layout.dart index 9823366..a540926 100644 --- a/lib/screens/settings/components/metering/components/metering_screen_layout/widget_list_tile_metering_screen_layout.dart +++ b/lib/screens/settings/components/metering/components/metering_screen_layout/widget_list_tile_metering_screen_layout.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:lightmeter/generated/l10n.dart'; -import 'components/meterins_screen_layout_features_dialog/widget_dialog_metering_screen_layout_features.dart'; +import 'package:lightmeter/screens/settings/components/metering/components/metering_screen_layout/components/meterins_screen_layout_features_dialog/widget_dialog_metering_screen_layout_features.dart'; class MeteringScreenLayoutListTile extends StatelessWidget { const MeteringScreenLayoutListTile({super.key}); diff --git a/lib/screens/settings/components/metering/widget_settings_section_metering.dart b/lib/screens/settings/components/metering/widget_settings_section_metering.dart index 495c57f..a033cbd 100644 --- a/lib/screens/settings/components/metering/widget_settings_section_metering.dart +++ b/lib/screens/settings/components/metering/widget_settings_section_metering.dart @@ -1,13 +1,12 @@ import 'package:flutter/material.dart'; import 'package:lightmeter/features.dart'; import 'package:lightmeter/generated/l10n.dart'; +import 'package:lightmeter/screens/settings/components/metering/components/calibration/widget_list_tile_calibration.dart'; +import 'package:lightmeter/screens/settings/components/metering/components/equipment_profiles/widget_list_tile_equipment_profiles.dart'; +import 'package:lightmeter/screens/settings/components/metering/components/fractional_stops/widget_list_tile_fractional_stops.dart'; +import 'package:lightmeter/screens/settings/components/metering/components/metering_screen_layout/widget_list_tile_metering_screen_layout.dart'; import 'package:lightmeter/screens/settings/components/shared/settings_section/widget_settings_section.dart'; -import 'components/calibration/widget_list_tile_calibration.dart'; -import 'components/metering_screen_layout/widget_list_tile_metering_screen_layout.dart'; -import 'components/equipment_profiles/widget_list_tile_equipment_profiles.dart'; -import 'components/fractional_stops/widget_list_tile_fractional_stops.dart'; - class MeteringSettingsSection extends StatelessWidget { const MeteringSettingsSection({super.key}); diff --git a/lib/screens/settings/components/theme/components/primary_color/components/primary_color_picker_dialog/widget_dialog_picker_primary_color.dart b/lib/screens/settings/components/theme/components/primary_color/components/primary_color_picker_dialog/widget_dialog_picker_primary_color.dart index 9a4dd07..58d357e 100644 --- a/lib/screens/settings/components/theme/components/primary_color/components/primary_color_picker_dialog/widget_dialog_picker_primary_color.dart +++ b/lib/screens/settings/components/theme/components/primary_color/components/primary_color_picker_dialog/widget_dialog_picker_primary_color.dart @@ -57,9 +57,9 @@ class _PrimaryColorDialogPickerState extends State { ), ), ), - Row( + const Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: const [ + children: [ _Cutout(), RotatedBox( quarterTurns: 2, diff --git a/lib/screens/settings/components/theme/components/primary_color/widget_list_tile_primary_color.dart b/lib/screens/settings/components/theme/components/primary_color/widget_list_tile_primary_color.dart index 760e567..6b6c0d0 100644 --- a/lib/screens/settings/components/theme/components/primary_color/widget_list_tile_primary_color.dart +++ b/lib/screens/settings/components/theme/components/primary_color/widget_list_tile_primary_color.dart @@ -5,7 +5,7 @@ import 'package:lightmeter/generated/l10n.dart'; import 'package:lightmeter/providers/theme_provider.dart'; import 'package:lightmeter/res/dimens.dart'; -import 'components/primary_color_picker_dialog/widget_dialog_picker_primary_color.dart'; +import 'package:lightmeter/screens/settings/components/theme/components/primary_color/components/primary_color_picker_dialog/widget_dialog_picker_primary_color.dart'; class PrimaryColorListTile extends StatelessWidget { const PrimaryColorListTile({super.key}); diff --git a/lib/screens/settings/components/theme/widget_settings_section_theme.dart b/lib/screens/settings/components/theme/widget_settings_section_theme.dart index 7df9365..8a9bbfa 100644 --- a/lib/screens/settings/components/theme/widget_settings_section_theme.dart +++ b/lib/screens/settings/components/theme/widget_settings_section_theme.dart @@ -4,9 +4,9 @@ import 'package:lightmeter/data/models/dynamic_colors_state.dart'; import 'package:lightmeter/generated/l10n.dart'; import 'package:lightmeter/screens/settings/components/shared/settings_section/widget_settings_section.dart'; -import 'components/dynamic_color/widget_list_tile_dynamic_color.dart'; -import 'components/primary_color/widget_list_tile_primary_color.dart'; -import 'components/theme_type/widget_list_tile_theme_type.dart'; +import 'package:lightmeter/screens/settings/components/theme/components/dynamic_color/widget_list_tile_dynamic_color.dart'; +import 'package:lightmeter/screens/settings/components/theme/components/primary_color/widget_list_tile_primary_color.dart'; +import 'package:lightmeter/screens/settings/components/theme/components/theme_type/widget_list_tile_theme_type.dart'; class ThemeSettingsSection extends StatelessWidget { const ThemeSettingsSection({super.key}); diff --git a/lib/screens/settings/screen_settings.dart b/lib/screens/settings/screen_settings.dart index 262803e..2adf906 100644 --- a/lib/screens/settings/screen_settings.dart +++ b/lib/screens/settings/screen_settings.dart @@ -1,12 +1,11 @@ import 'package:flutter/material.dart'; import 'package:lightmeter/generated/l10n.dart'; +import 'package:lightmeter/screens/settings/components/about/widget_settings_section_about.dart'; +import 'package:lightmeter/screens/settings/components/general/widget_settings_section_general.dart'; +import 'package:lightmeter/screens/settings/components/metering/widget_settings_section_metering.dart'; +import 'package:lightmeter/screens/settings/components/theme/widget_settings_section_theme.dart'; import 'package:lightmeter/screens/shared/sliver_screen/screen_sliver.dart'; -import 'components/about/widget_settings_section_about.dart'; -import 'components/general/widget_settings_section_general.dart'; -import 'components/metering/widget_settings_section_metering.dart'; -import 'components/theme/widget_settings_section_theme.dart'; - class SettingsScreen extends StatelessWidget { const SettingsScreen({super.key});