Commit f01b257

derdilla <derdilla06@gmail.com>
2023-06-10 14:09:37
extract labels form model
1 parent cd05776
Changed files (3)
lib/l10n/app_en.arb
@@ -1,5 +1,6 @@
 {
   "title": "Blood Pressure App",
+
   "error": "Error: {msg}",
   "@error": {
     "placeholders": {
@@ -28,8 +29,11 @@
       }
     }
   },
+  "errNoFileOpened": "no file opened",
+
   "btnCancel": "CANCEL",
   "btnSave": "SAVE",
+
   "sysLong": "systolic",
   "sysShort": "sys",
   "diaLong": "diastolic",
@@ -37,6 +41,7 @@
   "pulLong": "pulse",
   "pulShort": "pul",
   "addNote": "note (optional)",
+
   "layout": "layout",
   "allowManualTimeInput": "allow manual time input",
   "enterTimeFormatScreen": "time format",
@@ -64,6 +69,15 @@
   "useExportCompatability": "compatability export",
   "useExportCompatabilityDesc": "sets export mime type to text",
   "export": "export",
+  "exportSuccess": "Exported to: {path}",
+  "@exportSuccess": {
+    "placeholders": {
+      "path": {
+        "type": "String"
+      }
+    }
+  },
+  "shared": "shared",
   "import": "import",
   "sourceCode": "source code",
   "licenses": "3rd party licenses"
lib/model/blood_pressure.dart
@@ -171,7 +171,7 @@ class BloodPressureModel extends ChangeNotifier {
 
     // notify user about location
     if (Platform.isLinux || Platform.isWindows || Platform.isMacOS) {
-      callback(true, 'Exported to: $path');
+      callback(true, path);
     } else if (Platform.isAndroid || Platform.isIOS) {
       var mimeType = MimeType.csv;
       if (exportAsText) {
@@ -187,7 +187,7 @@ class BloodPressureModel extends ChangeNotifier {
     } else {}
   }
 
-  Future<void> import(void Function(bool, String?) callback) async {
+  Future<void> import(void Function(bool) callback) async {
     var result = await FilePicker.platform.pickFiles(
       allowMultiple: false,
       withData: true,
@@ -204,13 +204,10 @@ class BloodPressureModel extends ChangeNotifier {
               (line[1] as int), (line[2] as int), (line[3] as int), line[4].toString());
           add(record);
         }
-        return callback(true, null);
-      } else {
-        return callback(false, 'empty file');
+        return callback(true);
       }
-    } else {
-      return callback(false, 'no file opened');
     }
+    return callback(false);
   }
 
   void close() {
lib/screens/settings.dart
@@ -267,7 +267,7 @@ class SettingsPage extends StatelessWidget {
                   leading: const Icon(Icons.file_upload),
                   onPressed: (context) {
                     try {
-                      Provider.of<BloodPressureModel>(context, listen: false).import((res, String? err) {
+                      Provider.of<BloodPressureModel>(context, listen: false).import((res) {
                         if (res) {
                           ScaffoldMessenger.of(context).showSnackBar(SnackBar(
                               content:
@@ -275,7 +275,7 @@ class SettingsPage extends StatelessWidget {
                         } else {
                           ScaffoldMessenger.of(context).showSnackBar(SnackBar(
                               content: Text(AppLocalizations.of(context)!
-                                  .error(err ?? AppLocalizations.of(context)!.errUnknown))));
+                                  .error(AppLocalizations.of(context)!.errNoFileOpened))));
                         }
                       });
                     } on Exception catch (e) {