From 33bb197557b6222d7db46e02c74fe8442833e295 Mon Sep 17 00:00:00 2001
From: davidpkj <davidpenkow1@gmail.com>
Date: Wed, 24 Aug 2022 15:38:58 +0200
Subject: Minor bug fixes and updates

---
 lib/util/file_handler.dart | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'lib/util/file_handler.dart')

diff --git a/lib/util/file_handler.dart b/lib/util/file_handler.dart
index 0344c60..db1d725 100644
--- a/lib/util/file_handler.dart
+++ b/lib/util/file_handler.dart
@@ -32,25 +32,23 @@ class FileHandler {
 
         await _file.writeAsString(jsonEncode(await encodeDataAsMap(ExportType.full, data)));
 
-        ToastBar.showToastBar(context, AppLocalizations.of(context)!.exportSuccess);
+        ToastBar.showToastBar(context, AppLocalizations.of(context)!.exportSuccess, actionLabel: "");
         Notifications.notify(AppLocalizations.of(context)!.exportSuccess, AppLocalizations.of(context)!.tapHint, _file.path);
       } catch (e) {
         print(e);
-        ToastBar.showToastBar(context, AppLocalizations.of(context)!.exportError);
+        ToastBar.showToastBar(context, AppLocalizations.of(context)!.exportError, actionLabel: "");
       }
     }
   }
 
   /// Deserializes the given `file` into the returned Map. Sends a confirmation Toast to the given `context` afterwards.
-  static Future<Map<String, String>> deserializeFile(BuildContext context, File file) async {
+  static Future deserializeFile(BuildContext context, File file) async {
     final dynamic _content = jsonDecode(await file.readAsString());
 
     SettingsData.decode(_content["settings"]);
     RecipeData.decode(_content["recipes"]);
 
-    ToastBar.showToastBar(context, AppLocalizations.of(context)!.importSuccess);
-
-    return _content;
+    ToastBar.showToastBar(context, AppLocalizations.of(context)!.importSuccess, actionLabel: "");
   }
 
   /// Parses a given possible deserializable `file` for useful information and returns a map of it.
@@ -76,14 +74,14 @@ class FileHandler {
   static Future<File?> pickDeserializableFile(BuildContext context) async {
     if (await Permission.storage.request().isGranted) {
       try {
-        FilePickerResult? result = await FilePicker.platform.pickFiles(type: FileType.custom, allowedExtensions: ["kulinar"]);
+        FilePickerResult? result = await FilePicker.platform.pickFiles(type: FileType.any); //, allowedExtensions: ["kulinar"]);
 
         if (result != null) {
           return File(result.files.single.path!);
         }
       } catch (e) {
         print(e);
-        ToastBar.showToastBar(context, AppLocalizations.of(context)!.importError);
+        ToastBar.showToastBar(context, AppLocalizations.of(context)!.importError, actionLabel: "");
       }
     }
 
@@ -97,7 +95,6 @@ class FileHandler {
     _map["version"] = cVersion;
     _map["type"] = type.toString();
     // TODO: IMPLEMENT: Base64 Images and image count on export
-    // map["imageCount"] = getImageCount;
     _map.addAll(data as Map<String, String>);
 
     return _map;
-- 
cgit v1.2.3