Commit 1988e4e

derdilla <82763757+NobodyForNothing@users.noreply.github.com>
2024-03-15 16:38:39
clean up
Signed-off-by: derdilla <82763757+NobodyForNothing@users.noreply.github.com>
1 parent e507622
Changed files (4)
lib
components
screens
subsettings
test
lib/components/dialoges/import_preview_dialoge.dart
@@ -54,8 +54,6 @@ class _ImportPreviewDialogeState extends State<ImportPreviewDialoge> {
     SchedulerBinding.instance.addPostFrameCallback((_) => _updateBanner());
   }
 
-  // FIXME: multiple columns update type
-
   void _updateBanner() {
     if (_showingError) {
       _showingError = false;
@@ -152,7 +150,7 @@ class _ImportPreviewDialogeState extends State<ImportPreviewDialoge> {
                       alignment: AlignmentDirectional.center,
                       child: TextButton(
                         onPressed: () => setState(() {_limitRows = false;}),
-                        child: const Text('…')
+                        child: const Text('…'),
                       ),
                     ),
                 ],
@@ -184,8 +182,6 @@ class _ImportPreviewDialogeState extends State<ImportPreviewDialoge> {
       );
     }
 
-    // TODO: time formatting, more fitting localizations
-
     var text = parsed!.$2.toString();
     if (text.isEmpty) text = '-';
     return Tooltip(
lib/screens/subsettings/export_import/export_button_bar.dart
@@ -74,7 +74,6 @@ class ExportButtonBar extends StatelessWidget {
                       Provider.of<CsvExportSettings>(context, listen: false),
                       Provider.of<ExportColumnsManager>(context, listen: false),
                     );
-                    // TODO: verify that works
                     final importedRecords = await showImportPreview(
                       context,
                       CsvRecordParsingActor(
@@ -82,33 +81,8 @@ class ExportButtonBar extends StatelessWidget {
                         utf8.decode(binaryContent),
                       ),
                       Provider.of<ExportColumnsManager>(context, listen: false),
-                      true, // TODO use settings
+                      Provider.of<Settings>(context, listen: false).bottomAppBars,
                     );
-
-                    /*final result = converter.parse(utf8.decode(binaryContent));
-                    final importedRecords = result.getOr((error) {
-                      switch (error) {
-                        case RecordParsingErrorEmptyFile():
-                          _showError(messenger, localizations.errParseEmptyCsvFile);
-                          break;
-                        case RecordParsingErrorTimeNotRestoreable():
-                          _showError(messenger, localizations.errParseTimeNotRestoreable);
-                          break;
-                        case RecordParsingErrorUnknownColumn():
-                          _showError(messenger, localizations.errParseUnknownColumn(error.title));
-                          break;
-                        case RecordParsingErrorExpectedMoreFields():
-                          _showError(messenger, localizations.errParseLineTooShort(error.lineNumber));
-                          break;
-                        case RecordParsingErrorUnparsableField():
-                          _showError(messenger, localizations.errParseFailedDecodingField(
-                              error.lineNumber, error.fieldContents,),);
-                          break;
-                      }
-                      return null;
-                    });
-                    if (result.hasError()) return;
-                     */
                     if (importedRecords == null || !context.mounted) return;
                     final model = Provider.of<BloodPressureModel>(context, listen: false);
                     await model.addAll(importedRecords, null);
@@ -136,6 +110,7 @@ class ExportButtonBar extends StatelessWidget {
       messenger.showSnackBar(SnackBar(content: Text(text)));
 }
 
+/// Perform a full export according to the configuration in [context].
 void performExport(BuildContext context, [AppLocalizations? localizations]) async {
   localizations ??= AppLocalizations.of(context);
   final exportSettings = Provider.of<ExportSettings>(context, listen: false);
@@ -199,4 +174,4 @@ Future<void> _exportData(BuildContext context, Uint8List data, String fullFileNa
     file.writeAsBytesSync(data);
     await _exportFile(context, file.path, fullFileName, mimeType);
   }
-}
\ No newline at end of file
+}
lib/main.dart
@@ -9,6 +9,7 @@ import 'package:blood_pressure_app/model/storage/db/config_db.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/model/storage/update_legacy_settings.dart';
+import 'package:blood_pressure_app/screens/home_screen.dart';
 import 'package:blood_pressure_app/screens/loading_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -18,12 +19,6 @@ import 'package:path/path.dart';
 import 'package:provider/provider.dart';
 import 'package:sqflite/sqflite.dart';
 
-import 'components/dialoges/import_preview_dialoge.dart';
-import 'model/export_import/csv_converter.dart';
-import 'model/export_import/csv_record_parsing_actor.dart';
-import 'model/storage/export_columns_store.dart';
-import 'model/storage/export_csv_settings_store.dart';
-
 late final ConfigDB _database;
 late final BloodPressureModel _bloodPressureModel;
 
@@ -129,19 +124,8 @@ class AppRoot extends StatelessWidget {
       localizationsDelegates: AppLocalizations.localizationsDelegates,
       supportedLocales: AppLocalizations.supportedLocales,
       locale: settings.language,
-      home: ImportPreviewDialoge(
-        bottomAppBar: false,
-        initialActor: CsvRecordParsingActor(
-          CsvConverter(
-            CsvExportSettings(),
-            ExportColumnsManager(),
-          ),
-          'systolic,diastolic,pulse,notes,needlePin\n123,45,67,note1,'
-              '"{""color"":4285132974}"\n114,71,56,,null',
-        ),
-        columnsManager: ExportColumnsManager(),
-      ),
-    )
+      home: const AppHome(),
+    ),
   );
 
   ThemeData _buildTheme(ColorScheme colorScheme) {
test/ui/components/import_preview_dialoge_test.dart
@@ -103,4 +103,5 @@ void main() {
     expect(find.text('line2'), findsOneWidget);
     expect(find.text('line3'), findsOneWidget);
   });
+  // TODO: test imported data
 }