Merge pull request #6 from Piwigo/master

updating from source

Author: abrenoch

lib/views/ImageViewPage.dart

@@ -6,7 +6,7 @@ import 'package:piwigo_ng/api/API.dart';
 import 'package:piwigo_ng/api/ImageAPI.dart';
 import 'package:piwigo_ng/constants/SettingsConstants.dart';
 import 'package:piwigo_ng/views/components/snackbars.dart';
-import 'package:path/path.dart' as Path;
+import 'package:mime_type/mime_type.dart';
 
 import 'package:piwigo_ng/views/VideoPlayerViewPage.dart';
 import 'package:piwigo_ng/views/components/dialogs/dialogs.dart';
@@ -294,7 +294,8 @@ class _ImageViewPageState extends State<ImageViewPage> with SingleTickerProvider
             },
             itemBuilder: (context, index) {
               var image = _images[index];
-              if(Path.extension(image['element_url']) == '.mp4') {
+              String mimeType = mime(image['element_url']);
+              if(mimeType.startsWith('video')) {
                 return _displayVideo(image);
               }
               return _displayImage(image);

lib/views/UploadGalleryViewPage.dart

@@ -6,6 +6,7 @@ import 'package:image_picker/image_picker.dart';
 import 'package:piwigo_ng/constants/SettingsConstants.dart';
 import 'package:piwigo_ng/services/OrientationService.dart';
 import 'package:piwigo_ng/api/API.dart';
+import 'package:mime_type/mime_type.dart';
 
 import 'package:flutter/material.dart';
 
@@ -436,7 +437,7 @@ class _UploadGalleryViewPage extends State<UploadGalleryViewPage> {
   }
 
   Widget _buildHorizontalListItem(XFile image) {
-    String expansion = image.path.split('.').last;
+    String mimeType = mime(image.path);
     return Container(
       padding: EdgeInsets.symmetric(horizontal: 5),
       child: Stack(
@@ -456,7 +457,7 @@ class _UploadGalleryViewPage extends State<UploadGalleryViewPage> {
                   ),
                   child: ClipRRect(
                     borderRadius: BorderRadius.circular(7),
-                    child: expansion == 'mp4'
+                    child: mimeType.startsWith('video')
                         ? VideoItem(path: image.path)
                         : Image.file(File(image.path),
                       fit: BoxFit.cover,
@@ -506,7 +507,7 @@ class _UploadGalleryViewPage extends State<UploadGalleryViewPage> {
   }
 
   Widget _buildGridItem(XFile image) {
-    String expansion = image.path.split('.').last;
+    String mimeType = mime(image.path);
     return Container(
       child: Stack(
         children: [
@@ -518,7 +519,7 @@ class _UploadGalleryViewPage extends State<UploadGalleryViewPage> {
               semanticContainer: true,
               child: GridTile(
                 child: Container(
-                  child: expansion == 'mp4'
+                  child: mimeType.startsWith('video')
                       ? VideoItem(path: image.path)
                       : Image.file(File(image.path),
                     fit: BoxFit.cover,

pubspec.yaml

@@ -57,6 +57,7 @@ dependencies:
   cached_network_image: ^3.0.0
   better_player: ^0.0.79
   wakelock: ^0.5.6
+  mime_type: ^1.0.0
 
 dev_dependencies:
   flutter_test: