From dee6d072fb3762ff718562e4de963c9159c5210c Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Sun, 20 Jul 2025 13:56:53 -0500
Subject: [PATCH] fix: memory jarring hero animation (#20030)

* fix: memory jarring hero animation

* remove other hero
---
 .../widgets/memory/memory_card.widget.dart    | 38 ++++++++-----------
 .../widgets/memory/memory_lane.widget.dart    | 15 +++-----
 2 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/mobile/lib/presentation/widgets/memory/memory_card.widget.dart b/mobile/lib/presentation/widgets/memory/memory_card.widget.dart
index a6262bd2e5..268bbc30c0 100644
--- a/mobile/lib/presentation/widgets/memory/memory_card.widget.dart
+++ b/mobile/lib/presentation/widgets/memory/memory_card.widget.dart
@@ -57,30 +57,24 @@ class DriftMemoryCard extends StatelessWidget {
               }
 
               if (asset.isImage) {
-                return Hero(
-                  tag: 'memory-${asset.id}',
-                  child: FullImage(
-                    asset,
-                    fit: fit,
-                    size: const Size(double.infinity, double.infinity),
-                  ),
+                return FullImage(
+                  asset,
+                  fit: fit,
+                  size: const Size(double.infinity, double.infinity),
                 );
               } else {
-                return Hero(
-                  tag: 'memory-${asset.id}',
-                  child: SizedBox(
-                    width: context.width,
-                    height: context.height,
-                    child: NativeVideoViewer(
-                      key: ValueKey(asset.id),
-                      asset: asset,
-                      showControls: false,
-                      playbackDelayFactor: 2,
-                      image: FullImage(
-                        asset,
-                        size: Size(context.width, context.height),
-                        fit: BoxFit.contain,
-                      ),
+                return SizedBox(
+                  width: context.width,
+                  height: context.height,
+                  child: NativeVideoViewer(
+                    key: ValueKey(asset.id),
+                    asset: asset,
+                    showControls: false,
+                    playbackDelayFactor: 2,
+                    image: FullImage(
+                      asset,
+                      size: Size(context.width, context.height),
+                      fit: BoxFit.contain,
                     ),
                   ),
                 );
diff --git a/mobile/lib/presentation/widgets/memory/memory_lane.widget.dart b/mobile/lib/presentation/widgets/memory/memory_lane.widget.dart
index aa21f36dd1..403d8de061 100644
--- a/mobile/lib/presentation/widgets/memory/memory_lane.widget.dart
+++ b/mobile/lib/presentation/widgets/memory/memory_lane.widget.dart
@@ -79,15 +79,12 @@ class DriftMemoryCard extends ConsumerWidget {
               Colors.black.withValues(alpha: 0.2),
               BlendMode.darken,
             ),
-            child: Hero(
-              tag: 'memory-${memory.assets[0].id}',
-              child: SizedBox(
-                width: 205,
-                height: 200,
-                child: Thumbnail(
-                  remoteId: memory.assets[0].id,
-                  fit: BoxFit.cover,
-                ),
+            child: SizedBox(
+              width: 205,
+              height: 200,
+              child: Thumbnail(
+                remoteId: memory.assets[0].id,
+                fit: BoxFit.cover,
               ),
             ),
           ),