Commit e4fbfe3
Changed files (21)
lib
components
lib/components/measurement_list/measurement_list.dart
@@ -1,8 +1,6 @@
import 'package:blood_pressure_app/components/blood_pressure_builder.dart';
-import 'package:blood_pressure_app/components/consistent_future_builder.dart';
import 'package:blood_pressure_app/components/measurement_list/measurement_list_entry.dart';
import 'package:blood_pressure_app/model/blood_pressure.dart';
-import 'package:blood_pressure_app/model/settings_store.dart';
import 'package:blood_pressure_app/model/storage/intervall_store.dart';
import 'package:blood_pressure_app/model/storage/settings_store.dart';
import 'package:flutter/material.dart';
lib/components/measurement_list/measurement_list_entry.dart
@@ -1,5 +1,4 @@
import 'package:blood_pressure_app/model/blood_pressure.dart';
-import 'package:blood_pressure_app/model/settings_store.dart';
import 'package:blood_pressure_app/model/storage/settings_store.dart';
import 'package:blood_pressure_app/screens/add_measurement.dart';
import 'package:flutter/material.dart';
lib/components/display_interval_picker.dart
@@ -1,4 +1,3 @@
-import 'package:blood_pressure_app/model/settings_store.dart';
import 'package:blood_pressure_app/model/storage/intervall_store.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
lib/components/export_item_order.dart
@@ -3,9 +3,7 @@ import 'dart:async';
import 'package:badges/badges.dart' as badges;
import 'package:blood_pressure_app/components/consistent_future_builder.dart';
-import 'package:blood_pressure_app/model/export_import.dart';
import 'package:blood_pressure_app/model/export_options.dart';
-import 'package:blood_pressure_app/model/settings_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';
lib/components/input_dialoge.dart
@@ -1,8 +1,6 @@
-import 'package:blood_pressure_app/model/settings_store.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:provider/provider.dart';
// TODO: redo dialoges in flutter style
class InputDialoge extends StatefulWidget {
lib/components/legacy_measurement_list.dart
@@ -1,9 +1,7 @@
import 'dart:collection';
import 'package:blood_pressure_app/components/blood_pressure_builder.dart';
-import 'package:blood_pressure_app/components/consistent_future_builder.dart';
import 'package:blood_pressure_app/model/blood_pressure.dart';
-import 'package:blood_pressure_app/model/settings_store.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/add_measurement.dart';
@@ -174,7 +172,7 @@ class LegacyMeasurementsList extends StatelessWidget {
child: Text((data[index].pulse ?? '').toString())),
Expanded(
flex: _tableElementsSizes[4],
- child: Text(data[index].notes ?? '')),
+ child: Text(data[index].notes)),
Expanded(
flex: _sideFlex,
child: const SizedBox(),
lib/components/measurement_graph.dart
@@ -1,11 +1,9 @@
import 'dart:math';
import 'package:blood_pressure_app/components/blood_pressure_builder.dart';
-import 'package:blood_pressure_app/components/consistent_future_builder.dart';
import 'package:blood_pressure_app/components/display_interval_picker.dart';
import 'package:blood_pressure_app/model/blood_pressure.dart';
import 'package:blood_pressure_app/model/horizontal_graph_line.dart';
-import 'package:blood_pressure_app/model/settings_store.dart';
import 'package:blood_pressure_app/model/storage/intervall_store.dart';
import 'package:blood_pressure_app/model/storage/settings_store.dart';
import 'package:collection/collection.dart';
lib/model/export_import.dart
@@ -8,7 +8,6 @@ import 'package:blood_pressure_app/model/export_options.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/model/storage/intervall_store.dart';
import 'package:blood_pressure_app/model/storage/settings_store.dart';
import 'package:csv/csv.dart';
import 'package:file_picker/file_picker.dart';
lib/model/export_options.dart
@@ -2,12 +2,9 @@ import 'dart:collection';
import 'package:blood_pressure_app/main.dart';
import 'package:blood_pressure_app/model/blood_pressure.dart';
-import 'package:blood_pressure_app/model/export_import.dart';
-import 'package:blood_pressure_app/model/settings_store.dart';
import 'package:blood_pressure_app/model/storage/common_settings_intervaces.dart';
import 'package:blood_pressure_app/model/storage/db/config_dao.dart';
import 'package:blood_pressure_app/model/storage/export_settings_store.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';
import 'package:function_tree/function_tree.dart';
@@ -279,6 +276,6 @@ enum RowDataFieldType {
return gLocalizations.color;
default:
return "unknown";
- };
+ }
}
}
\ No newline at end of file
lib/screens/subsettings/enter_timeformat.dart
@@ -1,4 +1,3 @@
-import 'package:blood_pressure_app/model/settings_store.dart';
import 'package:blood_pressure_app/model/storage/settings_store.dart';
import 'package:blood_pressure_app/screens/subsettings/time_formats_explainer.dart';
import 'package:flutter/material.dart';
lib/screens/subsettings/export_column_data.dart
@@ -1,11 +1,8 @@
import 'package:blood_pressure_app/model/blood_pressure.dart';
import 'package:blood_pressure_app/model/export_options.dart';
-import 'package:blood_pressure_app/model/settings_store.dart';
-import 'package:blood_pressure_app/model/storage/settings_store.dart';
import 'package:blood_pressure_app/screens/subsettings/export_field_format_documentation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:provider/provider.dart';
class EditExportColumnPage extends StatefulWidget {
final String? initialInternalName;
lib/screens/subsettings/export_import_screen.dart
@@ -5,7 +5,6 @@ import 'package:blood_pressure_app/components/settings_widgets.dart';
import 'package:blood_pressure_app/model/blood_pressure.dart';
import 'package:blood_pressure_app/model/export_import.dart';
import 'package:blood_pressure_app/model/export_options.dart';
-import 'package:blood_pressure_app/model/settings_store.dart';
import 'package:blood_pressure_app/model/storage/common_settings_intervaces.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';
lib/screens/subsettings/graph_markings.dart
@@ -1,6 +1,5 @@
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/settings_store.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';
lib/screens/add_measurement.dart
@@ -2,7 +2,6 @@ import 'package:blood_pressure_app/components/date_time_picker.dart';
import 'package:blood_pressure_app/model/blood_pressure.dart';
import 'package:blood_pressure_app/model/export_import.dart';
import 'package:blood_pressure_app/model/export_options.dart';
-import 'package:blood_pressure_app/model/settings_store.dart';
import 'package:blood_pressure_app/model/storage/export_settings_store.dart';
import 'package:blood_pressure_app/model/storage/settings_store.dart';
import 'package:flutter/material.dart';
lib/screens/home.dart
@@ -1,6 +1,5 @@
import 'package:blood_pressure_app/components/legacy_measurement_list.dart';
import 'package:blood_pressure_app/components/measurement_graph.dart';
-import 'package:blood_pressure_app/model/settings_store.dart';
import 'package:blood_pressure_app/model/storage/settings_store.dart';
import 'package:blood_pressure_app/screens/add_measurement.dart';
import 'package:blood_pressure_app/screens/settings.dart';
lib/screens/statistics.dart
@@ -1,10 +1,7 @@
-import 'dart:collection';
import 'package:blood_pressure_app/components/blood_pressure_builder.dart';
import 'package:blood_pressure_app/components/display_interval_picker.dart';
-import 'package:blood_pressure_app/model/blood_pressure.dart';
import 'package:blood_pressure_app/model/blood_pressure_analyzer.dart';
-import 'package:blood_pressure_app/model/settings_store.dart';
import 'package:blood_pressure_app/model/storage/intervall_store.dart';
import 'package:blood_pressure_app/model/storage/settings_store.dart';
import 'package:fl_chart/fl_chart.dart';
@@ -12,7 +9,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:provider/provider.dart';
-import '../components/blood_pressure_builder.dart';
class StatisticsPage extends StatelessWidget {
const StatisticsPage({super.key});
test/model/config_db_test.dart
@@ -50,7 +50,7 @@ void main() {
test('should initialize', () async {
final rawDB = await ConfigDB.open(dbPath: inMemoryDatabasePath, isFullPath: true);
- final dao = ConfigDao(rawDB);
+ ConfigDao(rawDB);
});
test('should create classes when no data is present', () async {
final rawDB = await ConfigDB.open(dbPath: inMemoryDatabasePath, isFullPath: true);
test/model/json_serialization_test.dart
@@ -130,7 +130,7 @@ void main() {
final v1 = Settings.fromJson('{"pulColor": true}');
final v2 = Settings.fromJson('{"validateInputs": "red"}');
final v3 = Settings.fromJson('{"validateInputs": "month", "useLegacyList": 10.5}');
- final v4 = Settings.fromJson('{"sysWarn": 18.6, "diaWarn": 90.65}');
+ Settings.fromJson('{"sysWarn": 18.6, "diaWarn": 90.65}');
expect(v1.pulColor.value, Settings().pulColor.value);
expect(v2.validateInputs, Settings().validateInputs);
test/ui/add_measurement_test.dart
@@ -1,6 +1,5 @@
import 'package:blood_pressure_app/model/blood_pressure.dart';
import 'package:blood_pressure_app/model/ram_only_implementations.dart';
-import 'package:blood_pressure_app/model/settings_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';
test/ui/statistics_test.dart
@@ -1,6 +1,5 @@
import 'package:blood_pressure_app/model/blood_pressure.dart';
import 'package:blood_pressure_app/model/ram_only_implementations.dart';
-import 'package:blood_pressure_app/model/settings_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';