added video icon on thumbnail

Piwigo · Feb 13, 2023 · 75238a6 · 75238a6
1 parent 88e0a6a
commit 75238a6
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 14 deletions.
diff --git a/lib/components/cards/image_card.dart b/lib/components/cards/image_card.dart
@@ -72,11 +72,21 @@ class ImageCard extends StatelessWidget {
               mainAxisSize: MainAxisSize.min,
               crossAxisAlignment: CrossAxisAlignment.stretch,
               children: [
-                if (image.favorite)
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.start,
-                    crossAxisAlignment: CrossAxisAlignment.center,
-                    children: [
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.start,
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    if (image.isVideo)
+                      Padding(
+                        padding: const EdgeInsets.all(2.0),
+                        child: Icon(
+                          Icons.local_movies,
+                          color: Color(0xFFFFFFFF),
+                          size: 12,
+                          shadows: AppShadows.icon,
+                        ),
+                      ),
+                    if (image.favorite)
                       Padding(
                         padding: const EdgeInsets.all(2.0),
                         child: Icon(
@@ -86,8 +96,8 @@ class ImageCard extends StatelessWidget {
                           shadows: AppShadows.icon,
                         ),
                       ),
-                    ],
-                  ),
+                  ],
+                ),
                 if (Preferences.getShowThumbnailTitle)
                   Container(
                     padding: const EdgeInsets.all(2.0),

diff --git a/lib/models/image_model.dart b/lib/models/image_model.dart
@@ -1,3 +1,5 @@
+import 'package:mime_type/mime_type.dart';
+
 class ImageModel {
   int id;
   int width;
@@ -74,6 +76,11 @@ class ImageModel {
     }
   }
 
+  bool get isVideo {
+    String? mimeType = mime(file) ?? mime(elementUrl) ?? mime(derivatives.medium.url);
+    return mimeType != null && mimeType.startsWith('video');
+  }
+
   @override
   operator ==(other) => other is ImageModel && id == other.id;
 

diff --git a/lib/views/image/image_view_page.dart b/lib/views/image/image_view_page.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:mime_type/mime_type.dart';
 import 'package:photo_view/photo_view.dart';
 import 'package:photo_view/photo_view_gallery.dart';
 import 'package:piwigo_ng/api/api_error.dart';
@@ -340,10 +339,9 @@ class _ImageViewPageState extends State<ImageViewPage> {
           builder: (context, index) {
             final ImageModel image = _imageList[index];
 
-            /// Check mime type of file (multiple test to ensure it is not null)
-            String? mimeType = mime(image.file) ?? mime(image.elementUrl) ?? mime(image.derivatives.medium.url);
-            if (mimeType != null && mimeType.startsWith('video')) {
-              /// Returns video player
+            // Check mime type of file (multiple test to ensure it is not null)
+            if (image.isVideo) {
+              // Returns video player
               return PhotoViewGalleryPageOptions.customChild(
                 disableGestures: true,
                 child: VideoView(
@@ -356,7 +354,7 @@ class _ImageViewPageState extends State<ImageViewPage> {
               );
             }
 
-            /// Default behavior: Zoomable image
+            // Default behavior: Zoomable image
             return PhotoViewGalleryPageOptions(
               imageProvider: NetworkImage(
                 image.getDerivativeFromString(Preferences.getImageFullScreenSize)?.url ?? '',
@@ -365,7 +363,7 @@ class _ImageViewPageState extends State<ImageViewPage> {
               minScale: PhotoViewComputedScale.contained,
               errorBuilder: (context, o, s) {
                 debugPrint("$o");
-                return Center();
+                return SizedBox();
               },
             );
           },