Commit f57f1ac

derdilla <82763757+NobodyForNothing@users.noreply.github.com>
2024-07-01 16:17:58
update import directives
Signed-off-by: derdilla <82763757+NobodyForNothing@users.noreply.github.com>
main
1 parent 31f96bb
Changed files (72)
app
integration_test
add_measurement_test.dart
navigation_test.dart
lib
components
tree_selection_dialoge.dart
data_util
blood_pressure_builder.dart
entry_context.dart
repository_builder.dart
features
bluetooth
logic
characteristics
ble_date_time.dart
ble_measurement_status.dart
ble_read_cubit.dart
bluetooth_cubit.dart
device_scan_cubit.dart
mock
fake_device.dart
fake_flutter_blue_plus.dart
fake_service.dart
mock_ble_read_cubit.dart
ui
closed_bluetooth_input.dart
device_selection.dart
measurement_failure.dart
measurement_success.dart
bluetooth_input.dart
export_import
active_field_customization.dart
add_export_column_dialoge.dart
export_button_bar.dart
export_column_management_screen.dart
export_field_format_documentation_screen.dart
import_preview_dialoge.dart
input
add_measurement_dialoge.dart
measurement_list
measurement_list.dart
measurement_list_entry.dart
settings
tiles
input_list_tile.dart
number_input_list_tile.dart
settings_widgets.dart
add_medication_dialoge.dart
delete_data_screen.dart
enter_timeformat_dialoge.dart
export_import_screen.dart
foreign_db_import_screen.dart
graph_markings_screen.dart
medicine_manager_screen.dart
version_screen.dart
statistics
blood_pressure_distribution.dart
measurement_graph.dart
screens
home_screen.dart
settings_screen.dart
statistics_screen.dart
app.dart
test
bluetooth
characteristics
ble_measurement_data_test.dart
ble_read_cubit_test.dart
bluetooth_cubit_test.dart
device_scan_cubit_test.dart
ui
components
bluetooth_input
closed_input_test.dart
device_selection_test.dart
input_card_test.dart
measurement_failure_test.dart
measurement_success_test.dart
measurement_list
measurement_list_entry_test.dart
measurement_list_test.dart
settings
color_picker_list_tile_test.dart
dropdown_list_tile_test.dart
input_list_tile_test.dart
number_input_list_tile_test.dart
slider_list_tile_test.dart
titled_column_test.dart
statistics
blood_pressure_distribution_test.dart
value_distribution_test.dart
add_export_column_dialoge_test.dart
add_measurement_dialoge_test.dart
bluetooth_input_test.dart
confirm_deletion_dialoge_test.dart
enter_timeformat_dialoge_test.dart
import_preview_dialoge_test.dart
input_dialoge_test.dart
app/integration_test/add_measurement_test.dart
@@ -1,7 +1,7 @@
 import 'package:blood_pressure_app/app.dart';
-import 'package:blood_pressure_app/components/dialoges/add_measurement_dialoge.dart';
-import 'package:blood_pressure_app/components/measurement_list/measurement_list_entry.dart';
-import 'package:blood_pressure_app/components/settings/color_picker_list_tile.dart';
+import 'package:blood_pressure_app/features/input/add_measurement_dialoge.dart';
+import 'package:blood_pressure_app/features/measurement_list/measurement_list_entry.dart';
+import 'package:blood_pressure_app/features/settings/tiles/color_picker_list_tile.dart';
 import 'package:blood_pressure_app/screens/home_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
app/integration_test/navigation_test.dart
@@ -1,17 +1,17 @@
 
 import 'package:blood_pressure_app/app.dart';
-import 'package:blood_pressure_app/components/dialoges/add_export_column_dialoge.dart';
-import 'package:blood_pressure_app/components/dialoges/add_medication_dialoge.dart';
-import 'package:blood_pressure_app/components/dialoges/enter_timeformat_dialoge.dart';
+import 'package:blood_pressure_app/features/export_import/add_export_column_dialoge.dart';
+import 'package:blood_pressure_app/features/export_import/export_column_management_screen.dart';
+import 'package:blood_pressure_app/features/settings/add_medication_dialoge.dart';
+import 'package:blood_pressure_app/features/settings/delete_data_screen.dart';
+import 'package:blood_pressure_app/features/settings/enter_timeformat_dialoge.dart';
+import 'package:blood_pressure_app/features/settings/export_import_screen.dart';
+import 'package:blood_pressure_app/features/settings/graph_markings_screen.dart';
+import 'package:blood_pressure_app/features/settings/medicine_manager_screen.dart';
+import 'package:blood_pressure_app/features/settings/warn_about_screen.dart';
 import 'package:blood_pressure_app/screens/home_screen.dart';
 import 'package:blood_pressure_app/screens/settings_screen.dart';
 import 'package:blood_pressure_app/screens/statistics_screen.dart';
-import 'package:blood_pressure_app/screens/subsettings/delete_data_screen.dart';
-import 'package:blood_pressure_app/screens/subsettings/export_import/export_column_management_screen.dart';
-import 'package:blood_pressure_app/screens/subsettings/export_import/export_import_screen.dart';
-import 'package:blood_pressure_app/screens/subsettings/graph_markings_screen.dart';
-import 'package:blood_pressure_app/screens/subsettings/medicine_manager_screen.dart';
-import 'package:blood_pressure_app/screens/subsettings/warn_about_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';
app/lib/components/tree_selection_dialoge.dart
@@ -1,7 +1,6 @@
-
 import 'dart:math';
 
-import 'package:blood_pressure_app/components/dialoges/fullscreen_dialoge.dart';
+import 'package:blood_pressure_app/components/fullscreen_dialoge.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
app/lib/data_util/blood_pressure_builder.dart
@@ -1,6 +1,6 @@
 import 'dart:collection';
 
-import 'package:blood_pressure_app/components/repository_builder.dart';
+import 'package:blood_pressure_app/data_util/repository_builder.dart';
 import 'package:blood_pressure_app/model/storage/intervall_store.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
app/lib/data_util/entry_context.dart
@@ -1,8 +1,8 @@
-import 'package:blood_pressure_app/components/dialoges/add_measurement_dialoge.dart';
-import 'package:blood_pressure_app/components/dialoges/confirm_deletion_dialoge.dart';
+import 'package:blood_pressure_app/components/confirm_deletion_dialoge.dart';
+import 'package:blood_pressure_app/features/export_import/export_button_bar.dart';
+import 'package:blood_pressure_app/features/input/add_measurement_dialoge.dart';
 import 'package:blood_pressure_app/logging.dart';
 import 'package:blood_pressure_app/model/storage/storage.dart';
-import 'package:blood_pressure_app/screens/subsettings/export_import/export_button_bar.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart' hide ProviderNotFoundException;
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
app/lib/data_util/repository_builder.dart
@@ -1,4 +1,4 @@
-import 'package:blood_pressure_app/components/consistent_future_builder.dart';
+import 'package:blood_pressure_app/data_util/consistent_future_builder.dart';
 import 'package:blood_pressure_app/model/storage/intervall_store.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
app/lib/features/bluetooth/logic/characteristics/ble_date_time.dart
@@ -1,4 +1,4 @@
-import 'package:blood_pressure_app/bluetooth/characteristics/decoding_util.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/characteristics/decoding_util.dart';
 
 extension BleDateTimeParser on DateTime {
   static DateTime? parseBle(List<int> bytes, int offset) {
app/lib/features/bluetooth/logic/characteristics/ble_measurement_status.dart
@@ -1,4 +1,4 @@
-import 'package:blood_pressure_app/bluetooth/characteristics/decoding_util.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/characteristics/decoding_util.dart';
 
 class BleMeasurementStatus {
   BleMeasurementStatus({
app/lib/features/bluetooth/logic/ble_read_cubit.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:blood_pressure_app/bluetooth/characteristics/ble_measurement_data.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/characteristics/ble_measurement_data.dart';
 import 'package:blood_pressure_app/logging.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
app/lib/features/bluetooth/logic/bluetooth_cubit.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:blood_pressure_app/bluetooth/logic/flutter_blue_plus_mockable.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/flutter_blue_plus_mockable.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
app/lib/features/bluetooth/logic/device_scan_cubit.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
-import 'package:blood_pressure_app/bluetooth/logic/bluetooth_cubit.dart';
-import 'package:blood_pressure_app/bluetooth/logic/flutter_blue_plus_mockable.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/bluetooth_cubit.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/flutter_blue_plus_mockable.dart';
 import 'package:blood_pressure_app/logging.dart';
 import 'package:blood_pressure_app/model/storage/settings_store.dart';
 import 'package:collection/collection.dart';
app/lib/features/bluetooth/mock/fake_device.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:blood_pressure_app/bluetooth/mock/fake_service.dart';
+import 'package:blood_pressure_app/features/bluetooth/mock/fake_service.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
app/lib/features/bluetooth/mock/fake_flutter_blue_plus.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:blood_pressure_app/bluetooth/logic/flutter_blue_plus_mockable.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/flutter_blue_plus_mockable.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
app/lib/features/bluetooth/mock/fake_service.dart
@@ -1,4 +1,4 @@
-import 'package:blood_pressure_app/bluetooth/mock/fake_characteristic.dart';
+import 'package:blood_pressure_app/features/bluetooth/mock/fake_characteristic.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 
 class FakeBleBPService implements BluetoothService {
app/lib/features/bluetooth/mock/mock_ble_read_cubit.dart
@@ -1,6 +1,6 @@
-import 'package:blood_pressure_app/bluetooth/characteristics/ble_measurement_data.dart';
-import 'package:blood_pressure_app/bluetooth/characteristics/ble_measurement_status.dart';
-import 'package:blood_pressure_app/bluetooth/logic/ble_read_cubit.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/ble_read_cubit.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/characteristics/ble_measurement_data.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/characteristics/ble_measurement_status.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
app/lib/features/bluetooth/ui/closed_bluetooth_input.dart
@@ -1,5 +1,5 @@
 import 'package:app_settings/app_settings.dart';
-import 'package:blood_pressure_app/bluetooth/logic/bluetooth_cubit.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/bluetooth_cubit.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
app/lib/features/bluetooth/ui/device_selection.dart
@@ -1,4 +1,4 @@
-import 'package:blood_pressure_app/components/bluetooth_input/input_card.dart';
+import 'package:blood_pressure_app/features/bluetooth/ui/input_card.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
app/lib/features/bluetooth/ui/measurement_failure.dart
@@ -1,4 +1,4 @@
-import 'package:blood_pressure_app/components/bluetooth_input/input_card.dart';
+import 'package:blood_pressure_app/features/bluetooth/ui/input_card.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
app/lib/features/bluetooth/ui/measurement_success.dart
@@ -1,5 +1,5 @@
-import 'package:blood_pressure_app/bluetooth/characteristics/ble_measurement_data.dart';
-import 'package:blood_pressure_app/components/bluetooth_input/input_card.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/characteristics/ble_measurement_data.dart';
+import 'package:blood_pressure_app/features/bluetooth/ui/input_card.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
app/lib/features/bluetooth/bluetooth_input.dart
@@ -1,15 +1,15 @@
 import 'dart:async';
 
-import 'package:blood_pressure_app/bluetooth/characteristics/ble_measurement_data.dart';
-import 'package:blood_pressure_app/bluetooth/device_scan_cubit.dart';
-import 'package:blood_pressure_app/bluetooth/logic/ble_read_cubit.dart';
-import 'package:blood_pressure_app/bluetooth/logic/bluetooth_cubit.dart';
-import 'package:blood_pressure_app/bluetooth/logic/flutter_blue_plus_mockable.dart';
-import 'package:blood_pressure_app/bluetooth/ui/closed_bluetooth_input.dart';
-import 'package:blood_pressure_app/bluetooth/ui/input_card.dart';
-import 'package:blood_pressure_app/bluetooth/ui/measurement_failure.dart';
-import 'package:blood_pressure_app/bluetooth/ui/measurement_success.dart';
-import 'package:blood_pressure_app/components/bluetooth_input/device_selection.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/ble_read_cubit.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/bluetooth_cubit.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/characteristics/ble_measurement_data.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/device_scan_cubit.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/flutter_blue_plus_mockable.dart';
+import 'package:blood_pressure_app/features/bluetooth/ui/closed_bluetooth_input.dart';
+import 'package:blood_pressure_app/features/bluetooth/ui/device_selection.dart';
+import 'package:blood_pressure_app/features/bluetooth/ui/input_card.dart';
+import 'package:blood_pressure_app/features/bluetooth/ui/measurement_failure.dart';
+import 'package:blood_pressure_app/features/bluetooth/ui/measurement_success.dart';
 import 'package:blood_pressure_app/logging.dart';
 import 'package:blood_pressure_app/model/storage/storage.dart';
 import 'package:flutter/material.dart';
app/lib/features/export_import/active_field_customization.dart
@@ -1,4 +1,5 @@
-import 'package:blood_pressure_app/components/settings/dropdown_list_tile.dart';
+import 'package:blood_pressure_app/features/export_import/export_column_management_screen.dart';
+import 'package:blood_pressure_app/features/settings/tiles/dropdown_list_tile.dart';
 import 'package:blood_pressure_app/model/export_import/column.dart';
 import 'package:blood_pressure_app/model/export_import/export_configuration.dart';
 import 'package:blood_pressure_app/model/storage/common_settings_interfaces.dart';
@@ -6,7 +7,6 @@ import 'package:blood_pressure_app/model/storage/export_columns_store.dart';
 import 'package:blood_pressure_app/model/storage/export_csv_settings_store.dart';
 import 'package:blood_pressure_app/model/storage/export_pdf_settings_store.dart';
 import 'package:blood_pressure_app/model/storage/export_settings_store.dart';
-import 'package:blood_pressure_app/screens/subsettings/export_import/export_column_management_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:provider/provider.dart';
app/lib/features/settings/add_export_column_dialoge.dart → app/lib/features/export_import/add_export_column_dialoge.dart
@@ -1,9 +1,9 @@
-import 'package:blood_pressure_app/components/dialoges/fullscreen_dialoge.dart';
-import 'package:blood_pressure_app/components/measurement_list/measurement_list_entry.dart';
+import 'package:blood_pressure_app/components/fullscreen_dialoge.dart';
+import 'package:blood_pressure_app/features/export_import/export_field_format_documentation_screen.dart';
+import 'package:blood_pressure_app/features/measurement_list/measurement_list_entry.dart';
 import 'package:blood_pressure_app/model/export_import/column.dart';
 import 'package:blood_pressure_app/model/export_import/record_formatter.dart';
 import 'package:blood_pressure_app/model/storage/settings_store.dart';
-import 'package:blood_pressure_app/screens/subsettings/export_import/export_field_format_documentation_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:health_data_store/health_data_store.dart';
app/lib/features/export_import/export_button_bar.dart
@@ -4,7 +4,7 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:blood_pressure_app/components/dialoges/import_preview_dialoge.dart';
+import 'package:blood_pressure_app/features/export_import/import_preview_dialoge.dart';
 import 'package:blood_pressure_app/model/blood_pressure/model.dart';
 import 'package:blood_pressure_app/model/blood_pressure/record.dart';
 import 'package:blood_pressure_app/model/export_import/csv_converter.dart';
app/lib/features/export_import/export_column_management_screen.dart
@@ -1,4 +1,4 @@
-import 'package:blood_pressure_app/components/dialoges/add_export_column_dialoge.dart';
+import 'package:blood_pressure_app/features/export_import/add_export_column_dialoge.dart';
 import 'package:blood_pressure_app/model/export_import/column.dart';
 import 'package:blood_pressure_app/model/storage/export_columns_store.dart';
 import 'package:flutter/material.dart';
app/lib/features/export_import/export_field_format_documentation_screen.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:blood_pressure_app/screens/subsettings/time_formats_reference_screen.dart';
+import 'package:blood_pressure_app/features/settings/time_formats_reference_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:url_launcher/url_launcher.dart';
app/lib/features/export_import/import_preview_dialoge.dart
@@ -2,7 +2,7 @@
 import 'dart:math';
 
 import 'package:blood_pressure_app/components/custom_banner.dart';
-import 'package:blood_pressure_app/components/dialoges/fullscreen_dialoge.dart';
+import 'package:blood_pressure_app/components/fullscreen_dialoge.dart';
 import 'package:blood_pressure_app/model/export_import/column.dart';
 import 'package:blood_pressure_app/model/export_import/csv_record_parsing_actor.dart';
 import 'package:blood_pressure_app/model/storage/export_columns_store.dart';
app/lib/features/input/add_measurement_dialoge.dart
@@ -1,9 +1,9 @@
 import 'dart:async';
 
-import 'package:blood_pressure_app/components/bluetooth_input.dart';
-import 'package:blood_pressure_app/components/dialoges/fullscreen_dialoge.dart';
-import 'package:blood_pressure_app/components/forms/date_time_form.dart';
-import 'package:blood_pressure_app/components/settings/color_picker_list_tile.dart';
+import 'package:blood_pressure_app/components/fullscreen_dialoge.dart';
+import 'package:blood_pressure_app/features/bluetooth/bluetooth_input.dart';
+import 'package:blood_pressure_app/features/input/forms/date_time_form.dart';
+import 'package:blood_pressure_app/features/settings/tiles/color_picker_list_tile.dart';
 import 'package:blood_pressure_app/model/blood_pressure/pressure_unit.dart';
 import 'package:blood_pressure_app/model/storage/storage.dart';
 import 'package:flutter/material.dart';
app/lib/features/measurement_list/measurement_list.dart
@@ -1,5 +1,5 @@
-import 'package:blood_pressure_app/components/measurement_list/measurement_list_entry.dart';
-import 'package:blood_pressure_app/model/entry_context.dart';
+import 'package:blood_pressure_app/data_util/entry_context.dart';
+import 'package:blood_pressure_app/features/measurement_list/measurement_list_entry.dart';
 import 'package:blood_pressure_app/model/storage/settings_store.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
app/lib/features/measurement_list/measurement_list_entry.dart
@@ -1,7 +1,7 @@
-import 'package:blood_pressure_app/components/dialoges/confirm_deletion_dialoge.dart';
+import 'package:blood_pressure_app/components/confirm_deletion_dialoge.dart';
 import 'package:blood_pressure_app/components/nullable_text.dart';
 import 'package:blood_pressure_app/components/pressure_text.dart';
-import 'package:blood_pressure_app/model/entry_context.dart';
+import 'package:blood_pressure_app/data_util/entry_context.dart';
 import 'package:blood_pressure_app/model/storage/storage.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
app/lib/features/settings/tiles/input_list_tile.dart
@@ -1,4 +1,4 @@
-import 'package:blood_pressure_app/components/dialoges/input_dialoge.dart';
+import 'package:blood_pressure_app/components/input_dialoge.dart';
 import 'package:flutter/material.dart';
 
 /// A list tile for exposing editable strings.
app/lib/features/settings/tiles/number_input_list_tile.dart
@@ -1,4 +1,4 @@
-import 'package:blood_pressure_app/components/dialoges/input_dialoge.dart';
+import 'package:blood_pressure_app/components/input_dialoge.dart';
 import 'package:flutter/material.dart';
 
 /// Widget for editing numbers in a list tile.
app/lib/features/settings/tiles/settings_widgets.dart
@@ -1,28 +0,0 @@
-/// Widgets related to organizing input fields in list like structures.
-///
-/// While any list or column can host the list tile widgets that are part of this library, [TitledColumn] can be used to
-/// further structure settings lists.
-///
-/// List tiles from flutter and this library currently used by the app are:
-/// - [ListTile]
-/// - [SwitchListTile]
-/// - [ColorSelectionListTile]
-/// - [DropDownListTile]
-/// - [SliderListTile]
-/// - [InputListTile]
-/// - [NumberInputListTile]
-///
-/// List tiles that find no use in the app:
-/// - [CheckboxListTile]
-/// - [RadioListTile]
-library settings_widgets;
-
-import 'package:blood_pressure_app/components/settings/settings_widgets.dart';
-import 'package:flutter/material.dart';
-
-export 'color_picker_list_tile.dart';
-export 'dropdown_list_tile.dart';
-export 'input_list_tile.dart';
-export 'number_input_list_tile.dart';
-export 'slider_list_tile.dart';
-export 'titled_column.dart';
app/lib/features/settings/add_medication_dialoge.dart
@@ -1,5 +1,5 @@
-import 'package:blood_pressure_app/components/dialoges/fullscreen_dialoge.dart';
-import 'package:blood_pressure_app/components/settings/color_picker_list_tile.dart';
+import 'package:blood_pressure_app/components/fullscreen_dialoge.dart';
+import 'package:blood_pressure_app/features/settings/tiles/color_picker_list_tile.dart';
 import 'package:blood_pressure_app/model/storage/settings_store.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
app/lib/features/settings/delete_data_screen.dart
@@ -1,4 +1,4 @@
-import 'package:blood_pressure_app/components/dialoges/confirm_deletion_dialoge.dart';
+import 'package:blood_pressure_app/components/confirm_deletion_dialoge.dart';
 import 'package:blood_pressure_app/model/storage/export_columns_store.dart';
 import 'package:blood_pressure_app/model/storage/storage.dart';
 import 'package:flutter/material.dart';
app/lib/features/settings/enter_timeformat_dialoge.dart
@@ -1,5 +1,5 @@
-import 'package:blood_pressure_app/components/dialoges/fullscreen_dialoge.dart';
-import 'package:blood_pressure_app/screens/subsettings/export_import/export_field_format_documentation_screen.dart';
+import 'package:blood_pressure_app/components/fullscreen_dialoge.dart';
+import 'package:blood_pressure_app/features/export_import/export_field_format_documentation_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
app/lib/features/settings/export_import_screen.dart
@@ -1,12 +1,13 @@
-
 import 'package:blood_pressure_app/components/disabled.dart';
-import 'package:blood_pressure_app/components/export_warn_banner.dart';
-import 'package:blood_pressure_app/components/settings/settings_widgets.dart';
+import 'package:blood_pressure_app/data_util/display_interval_picker.dart';
+import 'package:blood_pressure_app/features/export_import/active_field_customization.dart';
+import 'package:blood_pressure_app/features/export_import/export_button_bar.dart';
+import 'package:blood_pressure_app/features/export_import/export_warn_banner.dart';
+import 'package:blood_pressure_app/features/settings/tiles/dropdown_list_tile.dart';
+import 'package:blood_pressure_app/features/settings/tiles/input_list_tile.dart';
+import 'package:blood_pressure_app/features/settings/tiles/number_input_list_tile.dart';
 import 'package:blood_pressure_app/model/storage/export_columns_store.dart';
 import 'package:blood_pressure_app/model/storage/storage.dart';
-import 'package:blood_pressure_app/screens/elements/display_interval_picker.dart';
-import 'package:blood_pressure_app/screens/subsettings/export_import/active_field_customization.dart';
-import 'package:blood_pressure_app/screens/subsettings/export_import/export_button_bar.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:jsaver/jSaver.dart';
app/lib/features/settings/foreign_db_import_screen.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 
-import 'package:blood_pressure_app/components/consistent_future_builder.dart';
-import 'package:blood_pressure_app/components/dialoges/tree_selection_dialoge.dart';
+import 'package:blood_pressure_app/components/tree_selection_dialoge.dart';
+import 'package:blood_pressure_app/data_util/consistent_future_builder.dart';
 import 'package:blood_pressure_app/model/blood_pressure/needle_pin.dart';
 import 'package:blood_pressure_app/model/export_import/import_field_type.dart';
 import 'package:blood_pressure_app/model/storage/convert_util.dart';
app/lib/features/settings/graph_markings_screen.dart
@@ -1,5 +1,5 @@
 import 'package:blood_pressure_app/components/color_picker.dart';
-import 'package:blood_pressure_app/components/dialoges/input_dialoge.dart';
+import 'package:blood_pressure_app/components/input_dialoge.dart';
 import 'package:blood_pressure_app/model/horizontal_graph_line.dart';
 import 'package:blood_pressure_app/model/storage/settings_store.dart';
 import 'package:flutter/material.dart';
app/lib/features/settings/medicine_manager_screen.dart
@@ -1,6 +1,6 @@
-import 'package:blood_pressure_app/components/consistent_future_builder.dart';
-import 'package:blood_pressure_app/components/dialoges/add_medication_dialoge.dart';
-import 'package:blood_pressure_app/components/dialoges/confirm_deletion_dialoge.dart';
+import 'package:blood_pressure_app/components/confirm_deletion_dialoge.dart';
+import 'package:blood_pressure_app/data_util/consistent_future_builder.dart';
+import 'package:blood_pressure_app/features/settings/add_medication_dialoge.dart';
 import 'package:blood_pressure_app/model/storage/settings_store.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
app/lib/features/settings/version_screen.dart
@@ -1,4 +1,4 @@
-import 'package:blood_pressure_app/components/consistent_future_builder.dart';
+import 'package:blood_pressure_app/data_util/consistent_future_builder.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
app/lib/features/statistics/blood_pressure_distribution.dart
@@ -1,4 +1,4 @@
-import 'package:blood_pressure_app/components/statistics/value_distribution.dart';
+import 'package:blood_pressure_app/features/statistics/value_distribution.dart';
 import 'package:blood_pressure_app/model/storage/settings_store.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
app/lib/features/statistics/measurement_graph.dart
@@ -1,11 +1,11 @@
 import 'dart:math';
 
-import 'package:blood_pressure_app/components/repository_builder.dart';
 import 'package:blood_pressure_app/data_util/blood_pressure_builder.dart';
+import 'package:blood_pressure_app/data_util/display_interval_picker.dart';
+import 'package:blood_pressure_app/data_util/repository_builder.dart';
 import 'package:blood_pressure_app/model/horizontal_graph_line.dart';
 import 'package:blood_pressure_app/model/storage/intervall_store.dart';
 import 'package:blood_pressure_app/model/storage/settings_store.dart';
-import 'package:blood_pressure_app/screens/elements/display_interval_picker.dart';
 import 'package:collection/collection.dart';
 import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
app/lib/screens/home_screen.dart
@@ -1,11 +1,11 @@
-import 'package:blood_pressure_app/components/measurement_list/measurement_list.dart';
-import 'package:blood_pressure_app/components/repository_builder.dart';
-import 'package:blood_pressure_app/model/entry_context.dart';
+import 'package:blood_pressure_app/data_util/blood_pressure_builder.dart';
+import 'package:blood_pressure_app/data_util/entry_context.dart';
+import 'package:blood_pressure_app/data_util/repository_builder.dart';
+import 'package:blood_pressure_app/features/measurement_list/legacy_measurement_list.dart';
+import 'package:blood_pressure_app/features/measurement_list/measurement_list.dart';
+import 'package:blood_pressure_app/features/statistics/measurement_graph.dart';
 import 'package:blood_pressure_app/model/storage/intervall_store.dart';
 import 'package:blood_pressure_app/model/storage/settings_store.dart';
-import 'package:blood_pressure_app/screens/elements/blood_pressure_builder.dart';
-import 'package:blood_pressure_app/screens/elements/legacy_measurement_list.dart';
-import 'package:blood_pressure_app/screens/elements/measurement_graph.dart';
 import 'package:blood_pressure_app/screens/settings_screen.dart';
 import 'package:blood_pressure_app/screens/statistics_screen.dart';
 import 'package:flutter/material.dart';
app/lib/screens/settings_screen.dart
@@ -1,22 +1,26 @@
 import 'dart:io';
 
-import 'package:blood_pressure_app/components/consistent_future_builder.dart';
 import 'package:blood_pressure_app/components/custom_banner.dart';
-import 'package:blood_pressure_app/components/dialoges/enter_timeformat_dialoge.dart';
-import 'package:blood_pressure_app/components/dialoges/input_dialoge.dart';
-import 'package:blood_pressure_app/components/settings/settings_widgets.dart';
+import 'package:blood_pressure_app/components/input_dialoge.dart';
+import 'package:blood_pressure_app/data_util/consistent_future_builder.dart';
+import 'package:blood_pressure_app/features/settings/delete_data_screen.dart';
+import 'package:blood_pressure_app/features/settings/enter_timeformat_dialoge.dart';
+import 'package:blood_pressure_app/features/settings/export_import_screen.dart';
+import 'package:blood_pressure_app/features/settings/foreign_db_import_screen.dart';
+import 'package:blood_pressure_app/features/settings/graph_markings_screen.dart';
+import 'package:blood_pressure_app/features/settings/medicine_manager_screen.dart';
+import 'package:blood_pressure_app/features/settings/tiles/color_picker_list_tile.dart';
+import 'package:blood_pressure_app/features/settings/tiles/dropdown_list_tile.dart';
+import 'package:blood_pressure_app/features/settings/tiles/number_input_list_tile.dart';
+import 'package:blood_pressure_app/features/settings/tiles/slider_list_tile.dart';
+import 'package:blood_pressure_app/features/settings/tiles/titled_column.dart';
+import 'package:blood_pressure_app/features/settings/version_screen.dart';
+import 'package:blood_pressure_app/features/settings/warn_about_screen.dart';
 import 'package:blood_pressure_app/model/blood_pressure/pressure_unit.dart';
 import 'package:blood_pressure_app/model/blood_pressure/warn_values.dart';
 import 'package:blood_pressure_app/model/iso_lang_names.dart';
 import 'package:blood_pressure_app/model/storage/storage.dart';
 import 'package:blood_pressure_app/platform_integration/platform_client.dart';
-import 'package:blood_pressure_app/screens/subsettings/delete_data_screen.dart';
-import 'package:blood_pressure_app/screens/subsettings/export_import/export_import_screen.dart';
-import 'package:blood_pressure_app/screens/subsettings/foreign_db_import_screen.dart';
-import 'package:blood_pressure_app/screens/subsettings/graph_markings_screen.dart';
-import 'package:blood_pressure_app/screens/subsettings/medicine_manager_screen.dart';
-import 'package:blood_pressure_app/screens/subsettings/version_screen.dart';
-import 'package:blood_pressure_app/screens/subsettings/warn_about_screen.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
app/lib/screens/statistics_screen.dart
@@ -1,9 +1,9 @@
-import 'package:blood_pressure_app/components/statistics/blood_pressure_distribution.dart';
+import 'package:blood_pressure_app/data_util/blood_pressure_builder.dart';
+import 'package:blood_pressure_app/data_util/display_interval_picker.dart';
+import 'package:blood_pressure_app/features/statistics/blood_pressure_distribution.dart';
 import 'package:blood_pressure_app/model/blood_pressure_analyzer.dart';
 import 'package:blood_pressure_app/model/storage/intervall_store.dart';
 import 'package:blood_pressure_app/model/storage/settings_store.dart';
-import 'package:blood_pressure_app/screens/elements/blood_pressure_builder.dart';
-import 'package:blood_pressure_app/screens/elements/display_interval_picker.dart';
 import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
app/lib/app.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:blood_pressure_app/components/consistent_future_builder.dart';
+import 'package:blood_pressure_app/data_util/consistent_future_builder.dart';
 import 'package:blood_pressure_app/model/blood_pressure/update_legacy_entries.dart';
 import 'package:blood_pressure_app/model/export_import/export_configuration.dart';
 import 'package:blood_pressure_app/model/storage/db/config_db.dart';
app/test/bluetooth/characteristics/ble_measurement_data_test.dart
@@ -1,4 +1,4 @@
-import 'package:blood_pressure_app/bluetooth/characteristics/ble_measurement_data.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/characteristics/ble_measurement_data.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
app/test/bluetooth/ble_read_cubit_test.dart
@@ -1,4 +1,4 @@
-/*import 'package:blood_pressure_app/bluetooth/ble_read_cubit.dart';
+/*import 'package:blood_pressure_app/features/bluetooth/ble_read_cubit.dart';
 import 'package:blood_pressure_app/logging.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:flutter_test/flutter_test.dart';
app/test/bluetooth/bluetooth_cubit_test.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
-import 'package:blood_pressure_app/bluetooth/bluetooth_cubit.dart';
-import 'package:blood_pressure_app/bluetooth/flutter_blue_plus_mockable.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/bluetooth_cubit.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/flutter_blue_plus_mockable.dart';
 import 'package:blood_pressure_app/logging.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
app/test/bluetooth/device_scan_cubit_test.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
-import 'package:blood_pressure_app/bluetooth/device_scan_cubit.dart';
-import 'package:blood_pressure_app/bluetooth/flutter_blue_plus_mockable.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/device_scan_cubit.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/flutter_blue_plus_mockable.dart';
 import 'package:blood_pressure_app/logging.dart';
 import 'package:blood_pressure_app/model/storage/settings_store.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
app/test/ui/components/bluetooth_input/closed_input_test.dart
@@ -2,8 +2,8 @@
 import 'dart:async';
 
 import 'package:bloc_test/bloc_test.dart';
-import 'package:blood_pressure_app/bluetooth/bluetooth_cubit.dart';
-import 'package:blood_pressure_app/components/bluetooth_input/closed_bluetooth_input.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/bluetooth_cubit.dart';
+import 'package:blood_pressure_app/features/bluetooth/ui/closed_bluetooth_input.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';
app/test/ui/components/bluetooth_input/device_selection_test.dart
@@ -1,6 +1,6 @@
 import 'dart:ui';
 
-import 'package:blood_pressure_app/components/bluetooth_input/device_selection.dart';
+import 'package:blood_pressure_app/features/bluetooth/ui/device_selection.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';
app/test/ui/components/bluetooth_input/input_card_test.dart
@@ -1,4 +1,4 @@
-import 'package:blood_pressure_app/components/bluetooth_input/input_card.dart';
+import 'package:blood_pressure_app/features/bluetooth/ui/input_card.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
app/test/ui/components/bluetooth_input/measurement_failure_test.dart
@@ -1,5 +1,5 @@
 
-import 'package:blood_pressure_app/components/bluetooth_input/measurement_failure.dart';
+import 'package:blood_pressure_app/features/bluetooth/ui/measurement_failure.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';
app/test/ui/components/bluetooth_input/measurement_success_test.dart
@@ -1,7 +1,7 @@
 
-import 'package:blood_pressure_app/bluetooth/characteristics/ble_measurement_data.dart';
-import 'package:blood_pressure_app/bluetooth/characteristics/ble_measurement_status.dart';
-import 'package:blood_pressure_app/components/bluetooth_input/measurement_success.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/characteristics/ble_measurement_data.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/characteristics/ble_measurement_status.dart';
+import 'package:blood_pressure_app/features/bluetooth/ui/measurement_success.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';
app/test/ui/components/measurement_list/measurement_list_entry_test.dart
@@ -1,4 +1,4 @@
-import 'package:blood_pressure_app/components/measurement_list/measurement_list_entry.dart';
+import 'package:blood_pressure_app/features/measurement_list/measurement_list_entry.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:health_data_store/health_data_store.dart';
app/test/ui/components/measurement_list/measurement_list_test.dart
@@ -1,5 +1,5 @@
-import 'package:blood_pressure_app/components/measurement_list/measurement_list.dart';
-import 'package:blood_pressure_app/components/measurement_list/measurement_list_entry.dart';
+import 'package:blood_pressure_app/features/measurement_list/measurement_list.dart';
+import 'package:blood_pressure_app/features/measurement_list/measurement_list_entry.dart';
 import 'package:blood_pressure_app/model/storage/settings_store.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
app/test/ui/components/settings/color_picker_list_tile_test.dart
@@ -1,5 +1,5 @@
 import 'package:blood_pressure_app/components/color_picker.dart';
-import 'package:blood_pressure_app/components/settings/color_picker_list_tile.dart';
+import 'package:blood_pressure_app/features/settings/tiles/color_picker_list_tile.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
app/test/ui/components/settings/dropdown_list_tile_test.dart
@@ -1,4 +1,4 @@
-import 'package:blood_pressure_app/components/settings/dropdown_list_tile.dart';
+import 'package:blood_pressure_app/features/settings/tiles/dropdown_list_tile.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
app/test/ui/components/settings/input_list_tile_test.dart
@@ -1,5 +1,5 @@
-import 'package:blood_pressure_app/components/dialoges/input_dialoge.dart';
-import 'package:blood_pressure_app/components/settings/input_list_tile.dart';
+import 'package:blood_pressure_app/components/input_dialoge.dart';
+import 'package:blood_pressure_app/features/settings/tiles/input_list_tile.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
app/test/ui/components/settings/number_input_list_tile_test.dart
@@ -1,5 +1,5 @@
-import 'package:blood_pressure_app/components/dialoges/input_dialoge.dart';
-import 'package:blood_pressure_app/components/settings/number_input_list_tile.dart';
+import 'package:blood_pressure_app/components/input_dialoge.dart';
+import 'package:blood_pressure_app/features/settings/tiles/number_input_list_tile.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
app/test/ui/components/settings/slider_list_tile_test.dart
@@ -1,4 +1,4 @@
-import 'package:blood_pressure_app/components/settings/slider_list_tile.dart';
+import 'package:blood_pressure_app/features/settings/tiles/slider_list_tile.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
app/test/ui/components/settings/titled_column_test.dart
@@ -1,4 +1,4 @@
-import 'package:blood_pressure_app/components/settings/settings_widgets.dart';
+import 'package:blood_pressure_app/features/settings/tiles/titled_column.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
app/test/ui/components/statistics/blood_pressure_distribution_test.dart
@@ -1,5 +1,5 @@
-import 'package:blood_pressure_app/components/statistics/blood_pressure_distribution.dart';
-import 'package:blood_pressure_app/components/statistics/value_distribution.dart';
+import 'package:blood_pressure_app/features/statistics/blood_pressure_distribution.dart';
+import 'package:blood_pressure_app/features/statistics/value_distribution.dart';
 import 'package:blood_pressure_app/model/storage/settings_store.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
app/test/ui/components/statistics/value_distribution_test.dart
@@ -1,5 +1,5 @@
 
-import 'package:blood_pressure_app/components/statistics/value_distribution.dart';
+import 'package:blood_pressure_app/features/statistics/value_distribution.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
app/test/ui/components/add_export_column_dialoge_test.dart
@@ -1,7 +1,7 @@
-import 'package:blood_pressure_app/components/dialoges/add_export_column_dialoge.dart';
-import 'package:blood_pressure_app/components/measurement_list/measurement_list_entry.dart';
+import 'package:blood_pressure_app/features/export_import/add_export_column_dialoge.dart';
+import 'package:blood_pressure_app/features/export_import/export_field_format_documentation_screen.dart';
+import 'package:blood_pressure_app/features/measurement_list/measurement_list_entry.dart';
 import 'package:blood_pressure_app/model/export_import/column.dart';
-import 'package:blood_pressure_app/screens/subsettings/export_import/export_field_format_documentation_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';
app/test/ui/components/add_measurement_dialoge_test.dart
@@ -1,6 +1,6 @@
-import 'package:blood_pressure_app/components/bluetooth_input.dart';
-import 'package:blood_pressure_app/components/dialoges/add_measurement_dialoge.dart';
-import 'package:blood_pressure_app/components/settings/color_picker_list_tile.dart';
+import 'package:blood_pressure_app/features/bluetooth/bluetooth_input.dart';
+import 'package:blood_pressure_app/features/input/add_measurement_dialoge.dart';
+import 'package:blood_pressure_app/features/settings/tiles/color_picker_list_tile.dart';
 import 'package:blood_pressure_app/model/storage/settings_store.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
app/test/ui/components/bluetooth_input_test.dart
@@ -1,11 +1,11 @@
 import 'package:bloc_test/bloc_test.dart';
-import 'package:blood_pressure_app/bluetooth/ble_read_cubit.dart';
-import 'package:blood_pressure_app/bluetooth/bluetooth_cubit.dart';
-import 'package:blood_pressure_app/bluetooth/characteristics/ble_measurement_data.dart';
-import 'package:blood_pressure_app/bluetooth/device_scan_cubit.dart';
-import 'package:blood_pressure_app/components/bluetooth_input.dart';
-import 'package:blood_pressure_app/components/bluetooth_input/closed_bluetooth_input.dart';
-import 'package:blood_pressure_app/components/bluetooth_input/measurement_success.dart';
+import 'package:blood_pressure_app/features/bluetooth/bluetooth_input.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/ble_read_cubit.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/bluetooth_cubit.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/characteristics/ble_measurement_data.dart';
+import 'package:blood_pressure_app/features/bluetooth/logic/device_scan_cubit.dart';
+import 'package:blood_pressure_app/features/bluetooth/ui/closed_bluetooth_input.dart';
+import 'package:blood_pressure_app/features/bluetooth/ui/measurement_success.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart' hide BluetoothState;
 import 'package:flutter_test/flutter_test.dart';
app/test/ui/components/confirm_deletion_dialoge_test.dart
@@ -1,4 +1,4 @@
-import 'package:blood_pressure_app/components/dialoges/confirm_deletion_dialoge.dart';
+import 'package:blood_pressure_app/components/confirm_deletion_dialoge.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';
app/test/ui/components/enter_timeformat_dialoge_test.dart
@@ -1,4 +1,4 @@
-import 'package:blood_pressure_app/components/dialoges/enter_timeformat_dialoge.dart';
+import 'package:blood_pressure_app/features/settings/enter_timeformat_dialoge.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
app/test/ui/components/import_preview_dialoge_test.dart
@@ -1,5 +1,5 @@
 import 'package:blood_pressure_app/components/custom_banner.dart';
-import 'package:blood_pressure_app/components/dialoges/import_preview_dialoge.dart';
+import 'package:blood_pressure_app/features/export_import/import_preview_dialoge.dart';
 import 'package:blood_pressure_app/model/export_import/csv_converter.dart';
 import 'package:blood_pressure_app/model/export_import/csv_record_parsing_actor.dart';
 import 'package:blood_pressure_app/model/storage/export_columns_store.dart';
app/test/ui/components/input_dialoge_test.dart
@@ -1,4 +1,4 @@
-import 'package:blood_pressure_app/components/dialoges/input_dialoge.dart';
+import 'package:blood_pressure_app/components/input_dialoge.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_test/flutter_test.dart';