Adds photo thumbnail to videos (#2880)

* Motion photos use placeholder image for more seamless loading

* Fixes merge conflicts

mobile/lib/modules/asset_viewer/views/gallery_viewer.dart

@@ -367,6 +367,26 @@ class GalleryViewerPage extends HookConsumerWidget {
       );
     }
 
+    ImageProvider imageProvider(Asset asset) {
+      if (asset.isLocal) {
+        return localImageProvider(asset);
+      } else {
+        if (isLoadOriginal.value) {
+          return originalImageProvider(asset);
+        } else if (isLoadPreview.value) {
+          return remoteThumbnailImageProvider(
+            asset,
+            api.ThumbnailFormat.JPEG,
+          );
+        } else {
+          return remoteThumbnailImageProvider(
+            asset,
+            api.ThumbnailFormat.WEBP,
+          );
+        }
+      }
+    }
+
     return Scaffold(
       backgroundColor: Colors.black,
       body: WillPopScope(
@@ -460,26 +480,9 @@ class GalleryViewerPage extends HookConsumerWidget {
                   : null,
               builder: (context, index) {
                 final asset = loadAsset(index);
+                final ImageProvider provider = imageProvider(asset);
+
                 if (asset.isImage && !isPlayingMotionVideo.value) {
-                  // Show photo
-                  final ImageProvider provider;
-                  if (asset.isLocal) {
-                    provider = localImageProvider(asset);
-                  } else {
-                    if (isLoadOriginal.value) {
-                      provider = originalImageProvider(asset);
-                    } else if (isLoadPreview.value) {
-                      provider = remoteThumbnailImageProvider(
-                        asset,
-                        api.ThumbnailFormat.JPEG,
-                      );
-                    } else {
-                      provider = remoteThumbnailImageProvider(
-                        asset,
-                        api.ThumbnailFormat.WEBP,
-                      );
-                    }
-                  }
                   return PhotoViewGalleryPageOptions(
                     onDragStart: (_, details, __) =>
                         localPosition = details.localPosition,
@@ -512,18 +515,23 @@ class GalleryViewerPage extends HookConsumerWidget {
                     maxScale: 1.0,
                     minScale: 1.0,
                     basePosition: Alignment.bottomCenter,
-                    child: SafeArea(
+                    child: VideoViewerPage(
-                      child: VideoViewerPage(
+                      onPlaying: () => isPlayingVideo.value = true,
-                        onPlaying: () => isPlayingVideo.value = true,
+                      onPaused: () => isPlayingVideo.value = false,
-                        onPaused: () => isPlayingVideo.value = false,
+                      asset: asset,
-                        asset: asset,
+                      isMotionVideo: isPlayingMotionVideo.value,
-                        isMotionVideo: isPlayingMotionVideo.value,
+                      placeholder: Image(
-                        onVideoEnded: () {
+                        image: provider,
-                          if (isPlayingMotionVideo.value) {
+                        fit: BoxFit.fitWidth,
-                            isPlayingMotionVideo.value = false;
+                        height: MediaQuery.of(context).size.height,
-                          }
+                        width: MediaQuery.of(context).size.width,
-                        },
+                        alignment: Alignment.center,
                       ),
+                      onVideoEnded: () {
+                        if (isPlayingMotionVideo.value) {
+                          isPlayingMotionVideo.value = false;
+                        }
+                      },
                     ),
                   );
                 }

mobile/lib/modules/asset_viewer/views/video_viewer_page.dart

@@ -15,6 +15,7 @@ import 'package:video_player/video_player.dart';
 class VideoViewerPage extends HookConsumerWidget {
   final Asset asset;
   final bool isMotionVideo;
+  final Widget? placeholder;
   final VoidCallback onVideoEnded;
   final VoidCallback? onPlaying;
   final VoidCallback? onPaused;
@@ -26,6 +27,7 @@ class VideoViewerPage extends HookConsumerWidget {
     required this.onVideoEnded,
     this.onPlaying,
     this.onPaused,
+    this.placeholder,
   }) : super(key: key);
 
   @override
@@ -66,6 +68,7 @@ class VideoViewerPage extends HookConsumerWidget {
           onVideoEnded: onVideoEnded,
           onPaused: onPaused,
           onPlaying: onPlaying,
+          placeholder: placeholder,
         ),
         if (downloadAssetStatus == DownloadAssetStatus.loading)
           const Center(
@@ -95,6 +98,10 @@ class VideoPlayer extends StatefulWidget {
   final Function()? onPlaying;
   final Function()? onPaused;
 
+  /// The placeholder to show while the video is loading
+  /// usually, a thumbnail of the video
+  final Widget? placeholder;
+
   const VideoPlayer({
     Key? key,
     this.url,
@@ -104,6 +111,7 @@ class VideoPlayer extends StatefulWidget {
     required this.isMotionVideo,
     this.onPlaying,
     this.onPaused,
+    this.placeholder,
   }) : super(key: key);
 
   @override
@@ -186,12 +194,18 @@ class _VideoPlayerState extends State<VideoPlayer> {
         ),
       );
     } else {
-      return const Center(
+      return SizedBox(
-        child: SizedBox(
+        height: MediaQuery.of(context).size.height,
-          width: 75,
+        width: MediaQuery.of(context).size.width,
-          height: 75,
+        child: Center(
-          child: CircularProgressIndicator.adaptive(
+          child: Stack(
-            strokeWidth: 2,
+            children: [
+              if (widget.placeholder != null)
+                widget.placeholder!,
+              const Center(
+                child: ImmichLoadingIndicator(),
+              ),
+            ],
           ),
         ),
       );