fix(mobile): AssetCount reset and Elliptical progress in Memories (#3355)

* fix: Constraint CircularProgressIndicator in Memories

* fix(mobile): Asset count reset when scroll cancelled midway in Memories

mobile/lib/modules/memories/views/memory_page.dart

@@ -22,6 +22,7 @@ class MemoryPage extends HookConsumerWidget {
     final memoryPageController = usePageController(initialPage: memoryIndex);
     final memoryAssetPageController = usePageController();
     final currentMemory = useState(memories[memoryIndex]);
+    final previousMemoryIndex = useState(memoryIndex);
     final currentAssetPage = useState(0);
     final assetProgress = useState(
       "${currentAssetPage.value + 1}|${currentMemory.value.assets.length}",
@@ -48,21 +49,13 @@ class MemoryPage extends HookConsumerWidget {
           "${currentAssetPage.value + 1}|${currentMemory.value.assets.length}";
     }
 
-    onMemoryChanged(int otherIndex) {
-      HapticFeedback.mediumImpact();
-      currentMemory.value = memories[otherIndex];
-      currentAssetPage.value = 0;
-      updateProgressText();
-    }
-
     onAssetChanged(int otherIndex) {
       HapticFeedback.selectionClick();
-
       currentAssetPage.value = otherIndex;
       updateProgressText();
     }
 
-    buildBottomInfo() {
+    buildBottomInfo(Memory memory) {
       return Padding(
         padding: const EdgeInsets.all(16.0),
         child: Row(
@@ -71,7 +64,7 @@ class MemoryPage extends HookConsumerWidget {
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 Text(
-                  currentMemory.value.title,
+                  memory.title,
                   style: TextStyle(
                     color: Colors.grey[400],
                     fontSize: 11.0,
@@ -80,7 +73,7 @@ class MemoryPage extends HookConsumerWidget {
                 ),
                 Text(
                   DateFormat.yMMMMd().format(
-                    currentMemory.value.assets[0].fileCreatedAt,
+                    memory.assets[0].fileCreatedAt,
                   ),
                   style: const TextStyle(
                     color: Colors.white,
@@ -95,13 +88,34 @@ class MemoryPage extends HookConsumerWidget {
       );
     }
 
-    return Scaffold(
+    /* Notification listener is used instead of OnPageChanged callback since OnPageChanged is called
+     * when the page in the **center** of the viewer changes. We want to reset currentAssetPage only when the final
+     * page during the end of scroll is different than the current page
+     */
+    return NotificationListener<ScrollNotification>(
+      onNotification: (ScrollNotification notification) {
+        if (notification.depth == 0) {
+          var currentPageNumber = memoryPageController.page!.toInt();
+          currentMemory.value = memories[currentPageNumber];
+          if (notification is ScrollStartNotification) {
+            assetProgress.value = "";
+          } else if (notification is ScrollEndNotification) {
+            HapticFeedback.mediumImpact();
+            if (currentPageNumber != previousMemoryIndex.value) {
+              currentAssetPage.value = 0;
+              previousMemoryIndex.value = currentPageNumber;
+            }
+            updateProgressText();
+          }
+        }
+        return false;
+      },
+      child: Scaffold(
         backgroundColor: bgColor,
         body: SafeArea(
           child: PageView.builder(
             scrollDirection: Axis.vertical,
             controller: memoryPageController,
-          onPageChanged: onMemoryChanged,
             itemCount: memories.length,
             itemBuilder: (context, mIndex) {
               // Build horizontal page
@@ -129,12 +143,13 @@ class MemoryPage extends HookConsumerWidget {
                       },
                     ),
                   ),
-                buildBottomInfo(),
+                  buildBottomInfo(memories[mIndex]),
                 ],
               );
             },
           ),
         ),
+      ),
     );
   }
 }

mobile/lib/shared/ui/immich_image.dart

@@ -108,10 +108,13 @@ class ImmichImage extends StatelessWidget {
           );
         }
         return Transform.scale(
-          scale: 0.2,
+          scale: 2,
+          child: Center(
             child: CircularProgressIndicator.adaptive(
+              strokeWidth: 1,
               value: downloadProgress.progress,
             ),
+          ),
         );
       },
       errorWidget: (context, url, error) {