Adds ticks to the progress indicator

machine-learning/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "machine-learning"
-version = "1.94.1"
+version = "1.94.0"
 description = ""
 authors = ["Hau Tran <alex.tran1502@gmail.com>"]
 readme = "README.md"

mobile/android/fastlane/Fastfile

@@ -36,7 +36,7 @@ platform :android do
       build_type: 'Release',
       properties: {
         "android.injected.version.code" => 120,
-        "android.injected.version.name" => "1.94.1",
+        "android.injected.version.name" => "1.94.0",
       }
     )
     upload_to_play_store(skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, aab: '../build/app/outputs/bundle/release/app-release.aab')

mobile/android/fastlane/report.xml

@@ -5,17 +5,17 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000307">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000253">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="94.411929">
+      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="74.926686">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="29.826675">
+      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="28.933555">
         
       </testcase>
     

mobile/ios/Podfile.lock

@@ -180,4 +180,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 64c9b5291666c0ca3caabdfe9865c141ac40321d
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.11.3

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -379,7 +379,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 136;
+				CURRENT_PROJECT_VERSION = 134;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -515,7 +515,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 136;
+				CURRENT_PROJECT_VERSION = 134;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -543,7 +543,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 136;
+				CURRENT_PROJECT_VERSION = 134;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;

mobile/ios/Runner/Info.plist

@@ -55,11 +55,11 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.94.0</string>
+    <string>1.93.0</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>136</string>
+    <string>134</string>
     <key>FLTEnableImpeller</key>
     <true />
     <key>ITSAppUsesNonExemptEncryption</key>

mobile/ios/fastlane/Fastfile

@@ -19,7 +19,7 @@ platform :ios do
   desc "iOS Beta"
   lane :beta do
     increment_version_number(
-      version_number: "1.94.1"
+      version_number: "1.94.0"
     )
     increment_build_number(
       build_number: latest_testflight_build_number + 1,

mobile/ios/fastlane/report.xml

@@ -5,32 +5,32 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000255">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.00026">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="1.040605">
+      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.172341">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="5.393894">
+      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="6.491104">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.185907">
+      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.217405">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="4: build_app" time="147.537526">
+      <testcase classname="fastlane.lanes" name="4: build_app" time="138.23059">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="87.643366">
+      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="70.463048">
         
       </testcase>
     

mobile/lib/modules/memories/ui/memory_card.dart

@@ -12,18 +12,14 @@ import 'package:openapi/api.dart';
 class MemoryCard extends StatelessWidget {
   final Asset asset;
   final void Function() onTap;
-  final void Function() onClose;
   final String title;
-  final String? rightCornerText;
   final bool showTitle;
 
   const MemoryCard({
     required this.asset,
     required this.onTap,
-    required this.onClose,
     required this.title,
     required this.showTitle,
-    this.rightCornerText,
     super.key,
   });
 
@@ -65,34 +61,31 @@ class MemoryCard extends StatelessWidget {
           ),
           GestureDetector(
             onTap: onTap,
-            child: ImmichImage(
+            child: LayoutBuilder(
+              builder: (context, constraints) {
+                // Determine the fit using the aspect ratio
+                BoxFit fit = BoxFit.fitWidth;
+                if (asset.width != null && asset.height != null) {
+                  final aspectRatio = asset.height! / asset.width!;
+                  final phoneAspectRatio =
+                      constraints.maxWidth / constraints.maxHeight;
+                  // Look for a 25% difference in either direction
+                  if (phoneAspectRatio * .75 < aspectRatio &&
+                      phoneAspectRatio * 1.25 > aspectRatio) {
+                    // Cover to look nice if we have nearly the same aspect ratio
+                    fit = BoxFit.cover;
+                  }
+                }
+
+                return ImmichImage(
                   asset,
-              fit: BoxFit.fitWidth,
+                  fit: fit,
                   height: double.infinity,
                   width: double.infinity,
                   type: ThumbnailFormat.JPEG,
                   preferredLocalAssetSize: 2048,
-            ),
+                );
-          ),
+              },
-          Positioned(
-            top: 2.0,
-            left: 2.0,
-            child: IconButton(
-              onPressed: onClose,
-              icon: const Icon(Icons.close_rounded),
-              color: Colors.grey[400],
-            ),
-          ),
-          Positioned(
-            right: 18.0,
-            top: 18.0,
-            child: Text(
-              rightCornerText ?? "",
-              style: TextStyle(
-                color: Colors.grey[200],
-                fontSize: 12.0,
-                fontWeight: FontWeight.bold,
-              ),
             ),
           ),
           if (showTitle)

mobile/lib/modules/memories/ui/memory_epilogue.dart

@@ -16,7 +16,7 @@ class _MemoryEpilogueState extends State<MemoryEpilogue>
   late final _animationController = AnimationController(
     vsync: this,
     duration: const Duration(
-      seconds: 3,
+      seconds: 2,
     ),
   )..repeat(
       reverse: true,
@@ -29,7 +29,7 @@ class _MemoryEpilogueState extends State<MemoryEpilogue>
     super.initState();
     _animation = CurvedAnimation(
       parent: _animationController,
-      curve: Curves.easeInOut,
+      curve: Curves.easeIn,
     );
   }
 
@@ -41,11 +41,10 @@ class _MemoryEpilogueState extends State<MemoryEpilogue>
 
   @override
   Widget build(BuildContext context) {
-    return Column(
+    return SafeArea(
-      crossAxisAlignment: CrossAxisAlignment.center,
+      child: Stack(
-      mainAxisAlignment: MainAxisAlignment.center,
         children: [
-        Expanded(
+          Positioned.fill(
             child: Column(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
@@ -81,7 +80,13 @@ class _MemoryEpilogueState extends State<MemoryEpilogue>
               ],
             ),
           ),
-        Column(
+          Positioned(
+            bottom: 0,
+            left: 0,
+            right: 0,
+            child: Padding(
+              padding: const EdgeInsets.only(bottom: 16.0),
+              child: Column(
                 children: [
                   SizedBox(
                     height: 48,
@@ -89,7 +94,7 @@ class _MemoryEpilogueState extends State<MemoryEpilogue>
                       animation: _animation,
                       builder: (context, child) {
                         return Transform.translate(
-                    offset: Offset(0, 5 * _animationController.value),
+                          offset: Offset(0, 8 * _animationController.value),
                           child: child,
                         );
                       },
@@ -108,7 +113,10 @@ class _MemoryEpilogueState extends State<MemoryEpilogue>
                   ),
                 ],
               ),
+            ),
+          ),
         ],
+      ),
     );
   }
 }

mobile/lib/modules/memories/ui/memory_progress_indicator.dart

@@ -0,0 +1,48 @@
+import 'package:flutter/material.dart';
+
+class MemoryProgressIndicator extends StatelessWidget {
+  /// The number of ticks in the progress indicator
+  final int ticks;
+
+  /// The current value of the indicator
+  final double value;
+
+  const MemoryProgressIndicator(
+      {super.key, required this.ticks, required this.value});
+
+  @override
+  Widget build(BuildContext context) {
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final tickWidth = constraints.maxWidth / ticks;
+        return Stack(
+          children: [
+            LinearProgressIndicator(
+              value: value,
+            ),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+              children: List.generate(
+                ticks,
+                (i) => Container(
+                  width: tickWidth,
+                  height: 4,
+                  decoration: BoxDecoration(
+                    border: i == 0
+                        ? null
+                        : Border(
+                            left: BorderSide(
+                              color: Theme.of(context).scaffoldBackgroundColor,
+                              width: 1,
+                            ),
+                          ),
+                  ),
+                ),
+              ),
+            ),
+          ],
+        );
+      },
+    );
+  }
+}

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

@@ -7,6 +7,7 @@ import 'package:immich_mobile/modules/memories/models/memory.dart';
 import 'package:immich_mobile/modules/memories/ui/memory_bottom_info.dart';
 import 'package:immich_mobile/modules/memories/ui/memory_card.dart';
 import 'package:immich_mobile/modules/memories/ui/memory_epilogue.dart';
+import 'package:immich_mobile/modules/memories/ui/memory_progress_indicator.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/ui/immich_image.dart';
 import 'package:openapi/api.dart' as api;
@@ -24,15 +25,31 @@ class MemoryPage extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final memoryPageController = usePageController(initialPage: memoryIndex);
-    final memoryAssetPageController = usePageController();
     final currentMemory = useState(memories[memoryIndex]);
     final currentAssetPage = useState(0);
+    final currentMemoryIndex = useState(0);
     final assetProgress = useState(
       "${currentAssetPage.value + 1}|${currentMemory.value.assets.length}",
     );
     const bgColor = Colors.black;
 
+    /// The list of all of the asset page controllers
+    final memoryAssetPageControllers =
+        List.generate(memories.length, (i) => usePageController());
+
+    /// The main vertically scrolling page controller with each list of memories
+    final memoryPageController = usePageController(initialPage: memoryIndex);
+
+    // The Page Controller that scrolls horizontally with all of the assets
+    PageController currentMemoryAssetPageController =
+        memoryAssetPageControllers[currentMemoryIndex.value];
+
+    useEffect(() {
+      // Memories is an immersive activity
+      SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
+      return null;
+    });
+
     toNextMemory() {
       memoryPageController.nextPage(
         duration: const Duration(milliseconds: 500),
@@ -43,7 +60,7 @@ class MemoryPage extends HookConsumerWidget {
     toNextAsset(int currentAssetIndex) {
       if (currentAssetIndex + 1 < currentMemory.value.assets.length) {
         // Go to the next asset
-        memoryAssetPageController.nextPage(
+        currentMemoryAssetPageController.nextPage(
           curve: Curves.easeInOut,
           duration: const Duration(milliseconds: 500),
         );
@@ -154,7 +171,12 @@ class MemoryPage extends HookConsumerWidget {
       },
       child: Scaffold(
         backgroundColor: bgColor,
-        body: SafeArea(
+        body: PopScope(
+          onPopInvoked: (didPop) {
+            // Remove immersive mode and go back to normal mode
+            SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+          },
+          child: SafeArea(
             child: PageView.builder(
               physics: const BouncingScrollPhysics(
                 parent: AlwaysScrollableScrollPhysics(),
@@ -164,6 +186,7 @@ class MemoryPage extends HookConsumerWidget {
               onPageChanged: (pageNumber) {
                 HapticFeedback.mediumImpact();
                 if (pageNumber < memories.length) {
+                  currentMemoryIndex.value = pageNumber;
                   currentMemory.value = memories[pageNumber];
                 }
 
@@ -186,12 +209,36 @@ class MemoryPage extends HookConsumerWidget {
                 // Build horizontal page
                 return Column(
                   children: [
+                    Padding(
+                      padding: const EdgeInsets.only(
+                        left: 24.0,
+                        right: 24.0,
+                        top: 8.0,
+                        bottom: 2.0,
+                      ),
+                      child: AnimatedBuilder(
+                        animation: currentMemoryAssetPageController,
+                        builder: (context, child) {
+                          double value = 0.0;
+                          if (currentMemoryAssetPageController.hasClients) {
+                            // We can only access [page] if this has clients
+                            value = currentMemoryAssetPageController.page ?? 0;
+                          }
+                          return MemoryProgressIndicator(
+                            ticks: memories[mIndex].assets.length,
+                            value: (value + 1) / memories[mIndex].assets.length,
+                          );
+                        },
+                      ),
+                    ),
                     Expanded(
-                    child: PageView.builder(
+                      child: Stack(
+                        children: [
+                          PageView.builder(
                             physics: const BouncingScrollPhysics(
                               parent: AlwaysScrollableScrollPhysics(),
                             ),
-                      controller: memoryAssetPageController,
+                            controller: memoryAssetPageControllers[mIndex],
                             onPageChanged: onAssetChanged,
                             scrollDirection: Axis.horizontal,
                             itemCount: memories[mIndex].assets.length,
@@ -202,14 +249,37 @@ class MemoryPage extends HookConsumerWidget {
                                 child: MemoryCard(
                                   asset: asset,
                                   onTap: () => toNextAsset(index),
-                            onClose: () => context.popRoute(),
-                            rightCornerText: assetProgress.value,
                                   title: memories[mIndex].title,
                                   showTitle: index == 0,
                                 ),
                               );
                             },
                           ),
+                          Positioned(
+                            top: 8,
+                            left: 8,
+                            child: MaterialButton(
+                              minWidth: 0,
+                              onPressed: () {
+                                // auto_route doesn't invoke pop scope, so
+                                // turn off full screen mode here
+                                // https://github.com/Milad-Akarie/auto_route_library/issues/1799
+                                context.popRoute();
+                                SystemChrome.setEnabledSystemUIMode(
+                                  SystemUiMode.edgeToEdge,
+                                );
+                              },
+                              shape: const CircleBorder(),
+                              color: Colors.white.withOpacity(0.2),
+                              elevation: 0,
+                              child: const Icon(
+                                Icons.close_rounded,
+                                color: Colors.white,
+                              ),
+                            ),
+                          ),
+                        ],
+                      ),
                     ),
                     MemoryBottomInfo(memory: memories[mIndex]),
                   ],
@@ -218,6 +288,7 @@ class MemoryPage extends HookConsumerWidget {
             ),
           ),
         ),
+      ),
     );
   }
 }

mobile/openapi/README.md

@@ -3,7 +3,7 @@ Immich API
 
 This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
-- API version: 1.94.1
+- API version: 1.94.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen
 
 ## Requirements

mobile/pubspec.yaml

@@ -2,7 +2,7 @@ name: immich_mobile
 description: Immich - selfhosted backup media file on mobile phone
 
 publish_to: "none"
-version: 1.94.1+120
+version: 1.94.0+120
 isar_version: &isar_version 3.1.0+1
 
 environment:

open-api/immich-openapi-specs.json

@@ -6473,7 +6473,7 @@
   "info": {
     "title": "Immich",
     "description": "Immich API",
-    "version": "1.94.1",
+    "version": "1.94.0",
     "contact": {}
   },
   "tags": [],

open-api/typescript-sdk/client/api.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.94.1
+ * The version of the OpenAPI document: 1.94.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

open-api/typescript-sdk/client/base.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.94.1
+ * The version of the OpenAPI document: 1.94.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

open-api/typescript-sdk/client/common.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.94.1
+ * The version of the OpenAPI document: 1.94.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

open-api/typescript-sdk/client/configuration.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.94.1
+ * The version of the OpenAPI document: 1.94.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

open-api/typescript-sdk/client/index.ts

@@ -4,7 +4,7 @@
  * Immich
  * Immich API
  *
- * The version of the OpenAPI document: 1.94.1
+ * The version of the OpenAPI document: 1.94.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).

server/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "immich",
-  "version": "1.94.1",
+  "version": "1.94.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "immich",
-      "version": "1.94.1",
+      "version": "1.94.0",
       "license": "UNLICENSED",
       "dependencies": {
         "@babel/runtime": "^7.22.11",

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "immich",
-  "version": "1.94.1",
+  "version": "1.94.0",
   "description": "",
   "author": "",
   "private": true,

web/src/api/utils.ts

@@ -1,3 +1,4 @@
+import { goto } from '$app/navigation';
 import type { AxiosError, AxiosPromise } from 'axios';
 import {
   notificationController,
@@ -44,7 +45,7 @@ export const oauth = {
     try {
       const redirectUri = location.href.split('?')[0];
       const { data } = await api.oauthApi.startOAuth({ oAuthConfigDto: { redirectUri } });
-      window.location.href = data.url;
+      goto(data.url);
     } catch (error) {
       handleError(error, 'Unable to login with OAuth');
     }

web/src/routes/auth/login/+page.svelte

@@ -11,7 +11,7 @@
   export let data: PageData;
 
   afterNavigate(async ({ from }) => {
-    if (from?.url?.pathname === AppRoute.AUTH_CHANGE_PASSWORD) {
+    if (from?.url.pathname === AppRoute.AUTH_CHANGE_PASSWORD) {
       resetSavedUser();
       await api.authenticationApi.logout();
     }