Migrate from heic_to_jpg to heif_converter

image_gallery_saver 0.2.0 -> heif_converter 1.0.1

heic_to_jpg as not received an update since 2022 (repo archived) migrated to heif_converter and added support for .heif files.

Author: Renarde-dev

lib/services/auto_upload_manager.dart

@@ -7,7 +7,7 @@ import 'package:dio/dio.dart';
 import 'package:dio_cookie_manager/dio_cookie_manager.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:heic_to_jpg/heic_to_jpg.dart';
+import 'package:heif_converter/heif_converter.dart';
 import 'package:piwigo_ng/models/album_model.dart';
 import 'package:piwigo_ng/models/status_model.dart';
 import 'package:piwigo_ng/network/api_client.dart';
@@ -91,13 +91,11 @@ class AutoUploadManager {
     // Remove folders and links
     List<File> files = dirFiles.where((file) => file is File).map<File>((e) => e as File).toList();
 
-    // Convert .heic files to .jpg
+    // Convert heic/heif files to .jpg
     for (File file in files) {
-      if (file.path.endsWith('.heic')) {
-        debugPrint("${file.path} is Heic ! Converting to jpg... ");
-        String? jpgPath = await HeicToJpg.convert(
-          file.path,
-        );
+      if (file.path.endsWith('.heic') || file.path.endsWith('.heif')) {
+        debugPrint("${file.path} is Heic/Heif ! Converting to jpg... ");
+        String? jpgPath = await HeifConverter.convert(file.path, format: 'jpg');
         if (jpgPath != null) {
           files.remove(file);
           files.add(File(jpgPath));

lib/utils/image_actions.dart

@@ -3,7 +3,7 @@ import 'dart:io';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_image_compress/flutter_image_compress.dart';
-import 'package:heic_to_jpg/heic_to_jpg.dart';
+import 'package:heif_converter/heif_converter.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:piwigo_ng/components/dialogs/confirm_dialog.dart';
@@ -51,7 +51,11 @@ Future<File> compressImage(File file,
     );
 
     debugPrint("Upload Compress $result");
-    return result ?? file;
+    if (result != null) {
+      return File(result.path);
+    } else {
+      return file;
+    }
   } catch (e) {
     debugPrint(e.toString());
   }
@@ -82,12 +86,10 @@ Future<List<XFile>?> onPickFiles() async {
     List<XFile> uploadFiles = [];
     for (PlatformFile file in result.files) {
       String? filePath = file.path;
-      if (file.extension == 'heic' && filePath != null) {
-        debugPrint("$filePath is Heic !");
+      if ((file.extension == 'heic' || file.extension == 'heif') && filePath != null) {
+        debugPrint("$filePath is Heic/Heif !");
         File oldFile = File(file.path!);
-        filePath = await HeicToJpg.convert(
-          file.path!,
-        );
+        filePath = await HeifConverter.convert(file.path!, format: 'jpg');
         oldFile.delete();
       }
       if (filePath != null) {
@@ -116,8 +118,8 @@ Future<List<XFile>?> onPickImages() async {
       if (Preferences.getAvailableFileTypes
           .contains(file.name.split('.').last)) {
         files.add(file);
-      } else if (file.name.endsWith('.heic')) {
-        String? jpgPath = await HeicToJpg.convert(file.path);
+      } else if (file.name.endsWith('.heic') || file.name.endsWith('.heif')) {
+        String? jpgPath = await HeifConverter.convert(file.path, format: 'jpg');
         if (jpgPath != null) {
           files.add(XFile(jpgPath));
         }
@@ -146,7 +148,7 @@ Future<XFile?> onTakePhoto(BuildContext context) async {
           requestFullMetadata: !Preferences.getRemoveMetadata,
         );
         if (image != null) {
-          String? jpgPath = await HeicToJpg.convert(image.path);
+          String? jpgPath = await HeifConverter.convert(image.path, format: 'jpg');
           if (jpgPath != null) {
             image = XFile(jpgPath);
           }

pubspec.yaml

@@ -62,7 +62,7 @@ dependencies:
   permission_handler: ^10.2.0 # Check and asks for permissions
   share_plus: ^10.1.4 # Share files
   flutter_cache_manager: ^3.3.0 # Handles network image cache
-  heic_to_jpg: ^0.2.0 # Convert heic files to jpg
+  heif_converter: ^1.0.1 # Convert heic files to jpg
   provider: ^6.0.3 # Notifiers for theme and language changes
 
   # Translations