Picker loading dialog

Author: ReightI

lib/app.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:image_picker/image_picker.dart';
@@ -63,9 +64,14 @@ class App extends StatelessWidget {
           darkTheme: darkTheme,
           theme: lightTheme,
           builder: (context, child) {
+            EasyLoading.instance
+              ..loadingStyle = EasyLoadingStyle.custom
+              ..backgroundColor = Theme.of(context).scaffoldBackgroundColor
+              ..indicatorColor = Theme.of(context).textTheme.bodyMedium?.color
+              ..textColor = Theme.of(context).textTheme.bodyMedium?.color;
             return ScrollConfiguration(
               behavior: OverscrollBehavior(),
-              child: child!,
+              child: EasyLoading.init().call(context, child),
             );
           },
           onGenerateRoute: generateRoute,

lib/services/auto_upload_manager.dart

@@ -99,11 +99,10 @@ class AutoUploadManager {
     // Convert .heic files to .jpg
     for (File file in files) {
       if (file.path.endsWith('.heic')) {
-        debugPrint("${file.path} is Heic !");
+        debugPrint("${file.path} is Heic ! Converting to jpg... ");
         String? jpgPath = await HeicToJpg.convert(
           file.path,
         );
-        debugPrint("From ${file.path}...\nto $jpgPath");
         if (jpgPath != null) {
           files.remove(file);
           files.add(File(jpgPath));

lib/views/album/album_view_page.dart

@@ -1,9 +1,9 @@
 import 'dart:math';
 
 import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:image_picker/image_picker.dart';
-import 'package:piwigo_ng/components/loading_overlay.dart';
 import 'package:piwigo_ng/components/popup_list_item.dart';
 import 'package:piwigo_ng/components/scroll_widgets/album_grid_view.dart';
 import 'package:piwigo_ng/components/scroll_widgets/image_grid_view.dart';
@@ -167,11 +167,15 @@ class _AlbumViewPageState extends State<AlbumViewPage>
       });
 
   Future<void> _onPickImages() async {
-    OverlayEntry overlayEntry =
-        OverlayEntry(builder: (context) => LoadingOverlay());
-    Overlay.of(context).insert(overlayEntry);
+    EasyLoading.show(
+      status: appStrings.loadingHUD_label,
+      indicator: CircularProgressIndicator(),
+      maskType: EasyLoadingMaskType.black,
+      dismissOnTap: true,
+    );
     List<XFile>? images = await onPickImages();
-    overlayEntry.remove();
+    if (!EasyLoading.isShow) return;
+    EasyLoading.dismiss();
     if (images == null || images.isEmpty) return;
     Navigator.of(context).pushNamed(UploadViewPage.routeName, arguments: {
       'images': images,

lib/views/upload/upload_view_page.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:mime_type/mime_type.dart';
 import 'package:piwigo_ng/components/buttons/animated_piwigo_button.dart';
@@ -84,6 +85,7 @@ class _UploadGalleryViewPage extends State<UploadViewPage>
       _imageList.map((e) => File(e.path)).toList(),
       returnExistFiles: true,
     );
+    if (!mounted) return;
     setState(() {
       _imageExistList = files.map((e) => e.path).toList();
     });
@@ -125,7 +127,16 @@ class _UploadGalleryViewPage extends State<UploadViewPage>
   }
 
   Future<void> _addFiles() async {
+    EasyLoading.show(
+      status: appStrings.loadingHUD_label,
+      indicator: CircularProgressIndicator(),
+      maskType: EasyLoadingMaskType.black,
+      dismissOnTap: true,
+    );
+    if (!EasyLoading.isShow) return;
+    EasyLoading.dismiss();
     List<XFile>? images = await onPickImages();
+    if (!mounted) return;
     if (images != null && images.isNotEmpty) {
       setState(() {
         _imageList.addAll(images);
@@ -136,6 +147,7 @@ class _UploadGalleryViewPage extends State<UploadViewPage>
 
   Future<void> _takePhoto() async {
     XFile? image = await onTakePhoto(context);
+    if (!mounted) return;
     if (image == null) return;
     setState(() {
       _imageList.add(image);
@@ -442,14 +454,13 @@ class _UploadGalleryViewPage extends State<UploadViewPage>
                     double? cacheHeight = constraints.maxHeight.isInfinite
                         ? constraints.maxHeight
                         : null;
-                    return Image.memory(
-                      file.readAsBytesSync(),
+                    return Image.file(
+                      file,
                       fit: BoxFit.cover,
                       cacheWidth: cacheWidth?.floor(),
                       cacheHeight: cacheHeight?.floor(),
                       width: cacheWidth,
                       height: cacheHeight,
-                      gaplessPlayback: true,
                       filterQuality: FilterQuality.low,
                       errorBuilder: (context, object, stacktrace) => Center(
                         child: Icon(Icons.image_not_supported),

pubspec.yaml

@@ -33,6 +33,7 @@ dependencies:
   pull_to_refresh: ^2.0.0 # Top and bottom refresh gestures
   photo_view: ^0.14.0 # Zoom on fullscreen photos
   extended_text: ^11.0.0 # Text overflow on left side
+  flutter_easyloading: ^3.0.5 # Show loading dialog
 
   # Storage
   package_info_plus: ^3.1.2 # Get project info (version)