Commit 6542f81

derdilla <82763757+NobodyForNothing@users.noreply.github.com>
2023-11-10 13:23:31
apply dart fix
Signed-off-by: derdilla <82763757+NobodyForNothing@users.noreply.github.com>
1 parent f3684e9
lib/components/settings/color_picker_list_tile.dart
@@ -11,7 +11,8 @@ class ColorSelectionListTile extends StatelessWidget {
         required this.title,
         required this.onMainColorChanged,
         required this.initialColor,
-        this.subtitle});
+        this.subtitle,
+        this.shape});
 
   /// The primary label of the list tile.
   final Widget title;
@@ -25,12 +26,16 @@ class ColorSelectionListTile extends StatelessWidget {
   /// Initial color displayed in the preview.
   final Color initialColor;
 
+  /// Defines the tile's [InkWell.customBorder] and [Ink.decoration] shape.
+  final ShapeBorder? shape;
+
   @override
   Widget build(BuildContext context) {
     return ListTile(
       title: title,
       subtitle: subtitle,
-      leading: CircleAvatar(
+      shape: shape,
+      leading: (initialColor == Colors.transparent) ? null : CircleAvatar(
         backgroundColor: initialColor,
         radius: 12,
       ),
lib/model/storage/export_csv_settings_store.dart
@@ -69,14 +69,18 @@ class CsvExportSettings extends ChangeNotifier implements CustomFieldsSettings {
   }
 
   bool _exportCustomFields = false;
+  @override
   bool get exportCustomFields => _exportCustomFields;
+  @override
   set exportCustomFields(bool value) {
     _exportCustomFields = value;
     notifyListeners();
   }
 
   List<String> _customFields = ExportFields.defaultCsv;
+  @override
   List<String> get customFields => _customFields;
+  @override
   set customFields(List<String> value) {
     _customFields = value;
     notifyListeners();
lib/model/storage/export_pdf_settings_store.dart
@@ -113,14 +113,18 @@ class PdfExportSettings extends ChangeNotifier implements CustomFieldsSettings {
   }
 
   bool _exportCustomFields = false;
+  @override
   bool get exportCustomFields => _exportCustomFields;
+  @override
   set exportCustomFields(bool value) {
     _exportCustomFields = value;
     notifyListeners();
   }
 
   List<String> _customFields = ExportFields.defaultPdf;
+  @override
   List<String> get customFields => _customFields;
+  @override
   set customFields(List<String> value) {
     _customFields = value;
     notifyListeners();
lib/screens/subsettings/delete_data.dart
@@ -27,9 +27,9 @@ class _DeleteDataScreenState extends State<DeleteDataScreen> {
     final localizations = AppLocalizations.of(context)!;
     return Scaffold(
       appBar: AppBar(
-        title: Text('Delete data'),
+        title: const Text('Delete data'),
         leading: IconButton(
-          icon: Icon(Icons.arrow_back),
+          icon: const Icon(Icons.arrow_back),
           onPressed: () {
             if (_deletedData) {
               Restart.restartApp();
lib/screens/subsettings/graph_markings.dart
@@ -66,7 +66,7 @@ class GraphMarkingsScreen extends StatelessWidget {
                 ),
                 title: Text(lines[i-1].height.toString()),
                 trailing: IconButton(
-                  icon: Icon(Icons.delete),
+                  icon: const Icon(Icons.delete),
                   onPressed: () {
                     lines.removeAt(i-1);
                     settings.horizontalGraphLines = lines;
lib/screens/home.dart
@@ -1,3 +1,4 @@
+import 'package:blood_pressure_app/components/dialoges/add_measurement.dart';
 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/storage/settings_store.dart';
@@ -76,11 +77,13 @@ class AppHome extends StatelessWidget {
                       heroTag: "floatingActionAdd",
                       tooltip: localizations.addMeasurement,
                       autofocus: true,
-                      onPressed: () {
-                        Navigator.push(
+                      onPressed: () async {
+                        await showDialog(context: context, builder: (context) => AddMeasurementDialoge(settings: settings));
+                        // TODO: move to function in file and save measurements
+                        /*Navigator.push(
                           context,
                           _buildTransition(const AddMeasurementPage(), settings.animationSpeed),
-                        );
+                        );*/
                       },
                       child: const Icon(Icons.add,),
                     ),
test/ui/components/measurement_list_entry_test.dart
@@ -16,7 +16,7 @@ void main() {
       await widgetTester.pumpWidget(_materialApp(MeasurementListRow(
           record: BloodPressureRecord(DateTime.fromMillisecondsSinceEpoch(31279811), null, null, null, 'null test'))));
       await widgetTester.pumpWidget(_materialApp(MeasurementListRow(
-          record: BloodPressureRecord(DateTime(2023), 124, 85, 63, 'color', needlePin: MeasurementNeedlePin(Colors.cyan)))));
+          record: BloodPressureRecord(DateTime(2023), 124, 85, 63, 'color', needlePin: const MeasurementNeedlePin(Colors.cyan)))));
 
     });
     testWidgets('should expand correctly', (widgetTester) async {