1.7.1

lib/widgets/TestResultScreens/Add/capture_image.dart

@@ -2,11 +2,13 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:camera/camera.dart';
-import 'package:cssd/providers/test_results.dart';
+import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:provider/provider.dart';
 
+import '../../../providers/test_results.dart';
+
 class CaptureImage extends StatefulWidget {
   @override
   _CaptureImageState createState() {
@@ -201,7 +203,7 @@ class _CaptureImageState extends State<CaptureImage>
   //     }
   //   }
 
-    // return Row(children: toggles);
+  // return Row(children: toggles);
   // }
 
   String timestamp() => DateTime.now().millisecondsSinceEpoch.toString();
@@ -247,8 +249,13 @@ class _CaptureImageState extends State<CaptureImage>
           imagePath = filePath;
           var profileProviderObject =
               Provider.of<TestResultsProvider>(context, listen: false);
-          List<File> files = profileProviderObject.catchImages;
-          files.add(File(imagePath));
+          List<PlatformFile> files = profileProviderObject.catchImages;
+          print(imagePath);
+          files.add(PlatformFile(
+              name: 'test',
+              size: 0,
+              path: imagePath,
+              bytes: File(imagePath).readAsBytesSync()));
           profileProviderObject.setCatchImages(files);
           profileProviderObject.setImages();
           print(imagePath);

lib/widgets/TestResultScreens/Add/form_creator.dart

@@ -1,7 +1,4 @@
-import 'dart:io';
-
-import 'package:barcode_scan/barcode_scan.dart';
-import 'package:cssd/config/routes.dart';
+import 'package:barcode_scan2/barcode_scan2.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
@@ -12,6 +9,7 @@ import 'package:meta/meta.dart';
 import 'package:multiselect_formfield/multiselect_formfield.dart';
 import 'package:provider/provider.dart';
 
+import '../../../config/routes.dart';
 import '../../../providers/test_results.dart';
 
 class FormCreator extends StatefulWidget {
@@ -528,7 +526,7 @@ class _FormCreatorState extends State<FormCreator> {
   Future captureImage(BuildContext context) async {
     var profileProviderObject =
         Provider.of<TestResultsProvider>(context, listen: false);
-    List<File> files = profileProviderObject.catchImages;
+    List<PlatformFile> files = profileProviderObject.catchImages;
     try {
       files.add(
         await ImagePickerGC.pickImage(
@@ -552,12 +550,17 @@ class _FormCreatorState extends State<FormCreator> {
   Future<void> loadAssets(BuildContext context) async {
     var profileProviderObject =
         Provider.of<TestResultsProvider>(context, listen: false);
-    List<File> files = profileProviderObject.catchImages;
+    List<PlatformFile> files = profileProviderObject.catchImages;
     try {
-      files += await FilePicker.getMultiFile(
+      var datas = await FilePicker.platform.pickFiles(
         type: FileType.custom,
         allowedExtensions: ['jpg', 'png', 'bmp', 'jpeg', 'pdf', 'docx', 'doc'],
+        withData: true,
+        withReadStream: true,
       );
+      files += datas.files;
+      // files +=
+
       // print(files);
     } catch (_) {}
 
@@ -632,8 +635,9 @@ class ImageBox extends StatelessWidget {
                                   builder: (_) => Container(
                                     color: Colors.white,
                                     child: Center(
-                                      child: Image.file(
-                                        _testProvider.catchImages[index],
+                                      child: Image.memory(
+                                        _testProvider.catchImages[index].bytes,
+                                        fit: BoxFit.contain,
                                       ),
                                     ),
                                   ),
@@ -653,12 +657,12 @@ class ImageBox extends StatelessWidget {
                                 height: 60,
                                 fit: BoxFit.fill,
                               )
-                            : Image.file(
-                                _testProvider.catchImages[index],
+                            : Image.memory(
+                                _testProvider.catchImages[index].bytes,
                                 // asset: _images[index],
                                 width: 60,
                                 height: 60,
-                                fit: BoxFit.fill,
+                                fit: BoxFit.contain,
                               ),
                   ),
                 ),

lib/widgets/TestResultScreens/Add/save_button.dart

@@ -1,6 +1,7 @@
-import 'package:cssd/config/routes.dart';
 import 'package:flutter/material.dart';
 
+import '../../../config/routes.dart';
+
 class TestResultAddSaveButton extends StatelessWidget {
   const TestResultAddSaveButton({
     Key key,