chore(deps): update dependency java to v21.0.11+10.0.lts

Co-authored-by: priyanshuANDcoad <priyanshu23154050@akgec.ac.in>
Co-authored-by: Daniel Dietzler <mail@ddietzler.dev>

docs/docs/install/synology.md

@@ -7,7 +7,7 @@ sidebar_position: 85
 :::note
 This is a community contribution and not officially supported by the Immich team, but included here for convenience.
 
-Community support can be found in the dedicated channel on the [Discord Server](https://discord.immich.app/).
+Community support should be directed to Synology-specific support platforms.
 :::
 
 Immich can easily be installed on a Synology NAS using Container Manager within DSM. If you have not installed Container Manager already, you can install it in the Packages Center. Refer to the [Container Manager docs](https://kb.synology.com/en-us/DSM/help/ContainerManager/docker_desc?version=7) for more information on using Container Manager.

docs/docs/install/unraid.md

@@ -121,7 +121,7 @@ alt="Go to Docker Tab and visit the address listed next to immich-web"
         width="90%"
         alt="Go to Docker Tab and visit the address listed next to immich-web"
     />
-    
+
 </details>
 
 :::tip

docs/mise.lock

@@ -1,7 +1,7 @@
 # @generated - this file is auto-generated by `mise lock` https://mise.en.dev/dev-tools/mise-lock.html
 
 [[tools.wrangler]]
-version = "4.100.0"
+version = "4.110.0"
 backend = "npm:wrangler"
 
 [tools.wrangler.options]

docs/mise.toml

@@ -28,4 +28,4 @@ run = "prettier --write ."
 run = "wrangler pages deploy build --project-name=${PROJECT_NAME} --branch=${BRANCH_NAME}"
 
 [tools]
-wrangler = "4.100.0"
+wrangler = "4.110.0"

e2e/package.json

@@ -32,7 +32,7 @@
     "@playwright/test": "^1.44.1",
     "@socket.io/component-emitter": "^3.1.2",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^24.13.2",
+    "@types/node": "^24.13.3",
     "@types/pg": "^8.15.1",
     "@types/pngjs": "^6.0.4",
     "@types/supertest": "^7.0.0",

mise.lock

@@ -184,33 +184,6 @@ checksum = "sha256:b5e1d2a1ad3c03229ddc89823848f4a1c11f9c6402a51fa26f0aaa5f1d7a2
 url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-x86_64-windows.tar.gz"
 url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288925833"
 
-[[tools.java]]
-version = "21.0.2"
-backend = "core:java"
-
-[tools.java.options]
-shorthand_vendor = "openjdk"
-
-[tools.java."platforms.linux-arm64"]
-checksum = "sha256:08db1392a48d4eb5ea5315cf8f18b89dbaf36cda663ba882cf03c704c9257ec2"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_linux-aarch64_bin.tar.gz"
-
-[tools.java."platforms.linux-x64"]
-checksum = "sha256:a2def047a73941e01a73739f92755f86b895811afb1f91243db214cff5bdac3f"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_linux-x64_bin.tar.gz"
-
-[tools.java."platforms.macos-arm64"]
-checksum = "sha256:b3d588e16ec1e0ef9805d8a696591bd518a5cea62567da8f53b5ce32d11d22e4"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_macos-aarch64_bin.tar.gz"
-
-[tools.java."platforms.macos-x64"]
-checksum = "sha256:8fd09e15dc406387a0aba70bf5d99692874e999bf9cd9208b452b5d76ac922d3"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_macos-x64_bin.tar.gz"
-
-[tools.java."platforms.windows-x64"]
-checksum = "sha256:b6c17e747ae78cdd6de4d7532b3164b277daee97c007d3eaa2b39cca99882664"
-url = "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_windows-x64_bin.zip"
-
 [[tools.node]]
 version = "24.15.0"
 backend = "core:node"
@@ -287,43 +260,43 @@ url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.
 url_api = "https://api.github.com/repos/opentofu/opentofu/releases/assets/391536406"
 
 [[tools.pnpm]]
-version = "11.6.0"
+version = "11.11.0"
 backend = "aqua:pnpm/pnpm"
 
 [tools.pnpm."platforms.linux-arm64"]
-checksum = "sha256:2fec653ff6dadab340d1c3d2214688a7451cc471f39710839440b293ca7c53b0"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.6.0/pnpm-linux-arm64.tar.gz"
-url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/445120174"
+checksum = "sha256:4871093439f036b3082df6102255ac119f3b6f4f50c51c5711fc7c358b8b22d7"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.11.0/pnpm-linux-arm64.tar.gz"
+url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/471734816"
 provenance = "github-attestations"
 
 [tools.pnpm."platforms.linux-arm64-musl"]
-checksum = "sha256:56a78c08cf22adf29e7dacb6f7f100139731693863d20fb94a7883463a62169e"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.6.0/pnpm-linux-arm64-musl.tar.gz"
-url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/445120177"
+checksum = "sha256:f97316cee0deb3ae3fd64e8a09e1c8c88a76da33373a2b465bd6a4c3e85e0690"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.11.0/pnpm-linux-arm64-musl.tar.gz"
+url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/471734819"
 provenance = "github-attestations"
 
 [tools.pnpm."platforms.linux-x64"]
-checksum = "sha256:74d64c1646385fb21691f32f0ab6aca1a9f5c829ba54d3cda3a24838a228e68c"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.6.0/pnpm-linux-x64.tar.gz"
-url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/445120176"
+checksum = "sha256:df4699e897012ab14df2cc6eaa942910e830eb7fcaa420a2a1421a9461fd9108"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.11.0/pnpm-linux-x64.tar.gz"
+url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/471734818"
 provenance = "github-attestations"
 
 [tools.pnpm."platforms.linux-x64-musl"]
-checksum = "sha256:7a0c463a09d912fba6b7d9eca0a946bc228ea50f3015a05c09a29e7e85a932d7"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.6.0/pnpm-linux-x64-musl.tar.gz"
-url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/445120175"
+checksum = "sha256:aad186f8a8ae72d827d5efe63e99e801456715fb7f2798949405fa33f20260db"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.11.0/pnpm-linux-x64-musl.tar.gz"
+url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/471734821"
 provenance = "github-attestations"
 
 [tools.pnpm."platforms.macos-arm64"]
-checksum = "sha256:87c901635a14481fb30566a3749041134ffd4317bc6fe866c345b69fdf9b6b85"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.6.0/pnpm-darwin-arm64.tar.gz"
-url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/445120180"
+checksum = "sha256:ad46ad16c2376c2b78354ac488c1b166e076aa59bfcbcfd567d55957d755a690"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.11.0/pnpm-darwin-arm64.tar.gz"
+url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/471734814"
 provenance = "github-attestations"
 
 [tools.pnpm."platforms.windows-x64"]
-checksum = "sha256:91c753435542b04859c689304fae0dd64eba6b40937cfa426a48485b712e4e9c"
-url = "https://github.com/pnpm/pnpm/releases/download/v11.6.0/pnpm-win32-x64.zip"
-url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/445120173"
+checksum = "sha256:13ad8a9b139c4c829fea33462cf04d061d72f0926b2b76a92ac03c9a36e405f9"
+url = "https://github.com/pnpm/pnpm/releases/download/v11.11.0/pnpm-win32-x64.zip"
+url_api = "https://api.github.com/repos/pnpm/pnpm/releases/assets/471734820"
 provenance = "github-attestations"
 
 [[tools.terragrunt]]

mise.toml

@@ -16,14 +16,14 @@ config_roots = [
 
 [tools]
 node = "24.15.0"
-pnpm = "11.6.0"
+pnpm = "11.11.0"
 terragrunt = "1.0.3"
 opentofu = "1.11.6"
 "npm:oazapfts" = "7.5.0"
 "github:extism/cli" = "1.6.3"
 "github:webassembly/binaryen" = "version_124"
 "github:extism/js-pdk" = "1.6.0"
-java = "21.0.2"
+java = "21.0.11+10.0.LTS"
 
 [tools."github:jellyfin/jellyfin-ffmpeg"]
 version = "7.1.3-6"

mobile/android/app/build.gradle

@@ -89,13 +89,6 @@ flutter {
 }
 
 dependencies {
-  constraints {
-    implementation("androidx.glance:glance-appwidget") {
-      version { strictly libs.versions.glance.get() }
-      because 'home_widget requests 1.+ which can resolve to pre-releases incompatible with our compileSdk/AGP'
-    }
-  }
-
   implementation libs.okhttp
   implementation libs.cronet.embedded
   implementation libs.media3.datasource.okhttp

mobile/ios/Podfile.lock

@@ -12,12 +12,8 @@ PODS:
     - Flutter
   - fluttertoast (0.0.2):
     - Flutter
-  - home_widget (0.0.1):
-    - Flutter
   - native_video_player (1.0.0):
     - Flutter
-  - permission_handler_apple (9.3.0):
-    - Flutter
   - share_handler_ios (0.0.14):
     - Flutter
     - share_handler_ios/share_handler_ios_models (= 0.0.14)
@@ -34,9 +30,7 @@ DEPENDENCIES:
   - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
   - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
-  - home_widget (from `.symlinks/plugins/home_widget/ios`)
   - native_video_player (from `.symlinks/plugins/native_video_player/ios`)
-  - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - share_handler_ios (from `.symlinks/plugins/share_handler_ios/ios`)
   - share_handler_ios_models (from `.symlinks/plugins/share_handler_ios/ios/Models`)
 
@@ -53,12 +47,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_secure_storage/ios"
   fluttertoast:
     :path: ".symlinks/plugins/fluttertoast/ios"
-  home_widget:
-    :path: ".symlinks/plugins/home_widget/ios"
   native_video_player:
     :path: ".symlinks/plugins/native_video_player/ios"
-  permission_handler_apple:
-    :path: ".symlinks/plugins/permission_handler_apple/ios"
   share_handler_ios:
     :path: ".symlinks/plugins/share_handler_ios/ios"
   share_handler_ios_models:
@@ -71,12 +61,10 @@ SPEC CHECKSUMS:
   flutter_local_notifications: ad39620c743ea4c15127860f4b5641649a988100
   flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
   fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1
-  home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64f
   native_video_player: b65c58951ede2f93d103a25366bdebca95081265
-  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
   share_handler_ios: e2244e990f826b2c8eaa291ac3831569438ba0fb
   share_handler_ios_models: fc638c9b4330dc7f082586c92aee9dfa0b87b871
 
-PODFILE CHECKSUM: 938abbae4114b9c2140c550a2a0d8f7c674f5dfe
+PODFILE CHECKSUM: 3c43a700a4bffb4120bf696cad263aefd4bb3c8c
 
 COCOAPODS: 1.16.2

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -154,11 +154,15 @@
 /* Begin PBXFileSystemSynchronizedRootGroup section */
 		B231F52D2E93A44A00BC45D1 /* Core */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+			);
 			path = Core;
 			sourceTree = "<group>";
 		};
 		B2CF7F8C2DDE4EBB00744BF6 /* Sync */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+			);
 			path = Sync;
 			sourceTree = "<group>";
 		};
@@ -180,6 +184,8 @@
 		};
 		FEE084F22EC172080045228E /* Schemas */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+			);
 			path = Schemas;
 			sourceTree = "<group>";
 		};
@@ -372,7 +378,6 @@
 				FAC6F89A2D287C890078CB2F /* Embed Foundation Extensions */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				513DA7292DED6106813332F4 /* [CP] Embed Pods Frameworks */,
-				2FA39DEC809D6D7C4A01EFCB /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -466,7 +471,7 @@
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
 			packageReferences = (
-				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
 				FEE084F62EC172460045228E /* XCRemoteSwiftPackageReference "sqlite-data" */,
 				FEE084F92EC1725A0045228E /* XCRemoteSwiftPackageReference "swift-http-structured-headers" */,
 			);
@@ -513,27 +518,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		2FA39DEC809D6D7C4A01EFCB /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -558,14 +542,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -1266,7 +1246,7 @@
 /* End XCConfigurationList section */
 
 /* Begin XCLocalSwiftPackageReference section */
-		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
+		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
 			isa = XCLocalSwiftPackageReference;
 			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
 		};

mobile/lib/domain/models/asset/remote_asset.model.dart

@@ -70,6 +70,10 @@ class RemoteAsset extends BaseAsset {
 
   bool get isTrashed => deletedAt != null;
 
+  bool get isStacked => stackId != null;
+
+  bool get isArchived => visibility == .archive;
+
   @override
   String toString() {
     return '''Asset {

mobile/lib/infrastructure/entities/asset_edit.entity.drift.dart

@@ -44,16 +44,7 @@ final class $$AssetEditEntityTableReferences
   static i5.$RemoteAssetEntityTable _assetIdTable(i0.GeneratedDatabase db) =>
       i6.ReadDatabaseContainer(db)
           .resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity')
-          .createAlias(
-            i0.$_aliasNameGenerator(
-              i6.ReadDatabaseContainer(db)
-                  .resultSet<i1.$AssetEditEntityTable>('asset_edit_entity')
-                  .assetId,
-              i6.ReadDatabaseContainer(
-                db,
-              ).resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity').id,
-            ),
-          );
+          .createAlias('asset_edit_entity__asset_id__remote_asset_entity__id');
 
   i5.$$RemoteAssetEntityTableProcessedTableManager get assetId {
     final $_column = $_itemColumn<String>('asset_id')!;

mobile/lib/infrastructure/entities/asset_face.entity.drift.dart

@@ -59,16 +59,7 @@ final class $$AssetFaceEntityTableReferences
   static i4.$RemoteAssetEntityTable _assetIdTable(i0.GeneratedDatabase db) =>
       i5.ReadDatabaseContainer(db)
           .resultSet<i4.$RemoteAssetEntityTable>('remote_asset_entity')
-          .createAlias(
-            i0.$_aliasNameGenerator(
-              i5.ReadDatabaseContainer(db)
-                  .resultSet<i1.$AssetFaceEntityTable>('asset_face_entity')
-                  .assetId,
-              i5.ReadDatabaseContainer(
-                db,
-              ).resultSet<i4.$RemoteAssetEntityTable>('remote_asset_entity').id,
-            ),
-          );
+          .createAlias('asset_face_entity__asset_id__remote_asset_entity__id');
 
   i4.$$RemoteAssetEntityTableProcessedTableManager get assetId {
     final $_column = $_itemColumn<String>('asset_id')!;
@@ -91,16 +82,7 @@ final class $$AssetFaceEntityTableReferences
   static i6.$PersonEntityTable _personIdTable(i0.GeneratedDatabase db) =>
       i5.ReadDatabaseContainer(db)
           .resultSet<i6.$PersonEntityTable>('person_entity')
-          .createAlias(
-            i0.$_aliasNameGenerator(
-              i5.ReadDatabaseContainer(db)
-                  .resultSet<i1.$AssetFaceEntityTable>('asset_face_entity')
-                  .personId,
-              i5.ReadDatabaseContainer(
-                db,
-              ).resultSet<i6.$PersonEntityTable>('person_entity').id,
-            ),
-          );
+          .createAlias('asset_face_entity__person_id__person_entity__id');
 
   i6.$$PersonEntityTableProcessedTableManager? get personId {
     final $_column = $_itemColumn<String>('person_id');

mobile/lib/infrastructure/entities/asset_ocr.entity.drift.dart

@@ -61,16 +61,7 @@ final class $$AssetOcrEntityTableReferences
   static i4.$RemoteAssetEntityTable _assetIdTable(i0.GeneratedDatabase db) =>
       i5.ReadDatabaseContainer(db)
           .resultSet<i4.$RemoteAssetEntityTable>('remote_asset_entity')
-          .createAlias(
-            i0.$_aliasNameGenerator(
-              i5.ReadDatabaseContainer(
-                db,
-              ).resultSet<i1.$AssetOcrEntityTable>('asset_ocr_entity').assetId,
-              i5.ReadDatabaseContainer(
-                db,
-              ).resultSet<i4.$RemoteAssetEntityTable>('remote_asset_entity').id,
-            ),
-          );
+          .createAlias('asset_ocr_entity__asset_id__remote_asset_entity__id');
 
   i4.$$RemoteAssetEntityTableProcessedTableManager get assetId {
     final $_column = $_itemColumn<String>('asset_id')!;

mobile/lib/infrastructure/entities/exif.entity.drift.dart

@@ -75,16 +75,7 @@ final class $$RemoteExifEntityTableReferences
   static i3.$RemoteAssetEntityTable _assetIdTable(i0.GeneratedDatabase db) =>
       i4.ReadDatabaseContainer(db)
           .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity')
-          .createAlias(
-            i0.$_aliasNameGenerator(
-              i4.ReadDatabaseContainer(db)
-                  .resultSet<i1.$RemoteExifEntityTable>('remote_exif_entity')
-                  .assetId,
-              i4.ReadDatabaseContainer(
-                db,
-              ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity').id,
-            ),
-          );
+          .createAlias('remote_exif_entity__asset_id__remote_asset_entity__id');
 
   i3.$$RemoteAssetEntityTableProcessedTableManager get assetId {
     final $_column = $_itemColumn<String>('asset_id')!;

mobile/lib/infrastructure/entities/local_album.entity.drift.dart

@@ -50,14 +50,7 @@ final class $$LocalAlbumEntityTableReferences
   ) => i6.ReadDatabaseContainer(db)
       .resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity')
       .createAlias(
-        i0.$_aliasNameGenerator(
-          i6.ReadDatabaseContainer(db)
-              .resultSet<i1.$LocalAlbumEntityTable>('local_album_entity')
-              .linkedRemoteAlbumId,
-          i6.ReadDatabaseContainer(
-            db,
-          ).resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity').id,
-        ),
+        'local_album_entity__linked_remote_album_id__remote_album_entity__id',
       );
 
   i5.$$RemoteAlbumEntityTableProcessedTableManager? get linkedRemoteAlbumId {

mobile/lib/infrastructure/entities/local_album_asset.entity.drift.dart

@@ -41,16 +41,7 @@ final class $$LocalAlbumAssetEntityTableReferences
       i4.ReadDatabaseContainer(db)
           .resultSet<i3.$LocalAssetEntityTable>('local_asset_entity')
           .createAlias(
-            i0.$_aliasNameGenerator(
-              i4.ReadDatabaseContainer(db)
-                  .resultSet<i1.$LocalAlbumAssetEntityTable>(
-                    'local_album_asset_entity',
-                  )
-                  .assetId,
-              i4.ReadDatabaseContainer(
-                db,
-              ).resultSet<i3.$LocalAssetEntityTable>('local_asset_entity').id,
-            ),
+            'local_album_asset_entity__asset_id__local_asset_entity__id',
           );
 
   i3.$$LocalAssetEntityTableProcessedTableManager get assetId {
@@ -75,16 +66,7 @@ final class $$LocalAlbumAssetEntityTableReferences
       i4.ReadDatabaseContainer(db)
           .resultSet<i5.$LocalAlbumEntityTable>('local_album_entity')
           .createAlias(
-            i0.$_aliasNameGenerator(
-              i4.ReadDatabaseContainer(db)
-                  .resultSet<i1.$LocalAlbumAssetEntityTable>(
-                    'local_album_asset_entity',
-                  )
-                  .albumId,
-              i4.ReadDatabaseContainer(
-                db,
-              ).resultSet<i5.$LocalAlbumEntityTable>('local_album_entity').id,
-            ),
+            'local_album_asset_entity__album_id__local_album_entity__id',
           );
 
   i5.$$LocalAlbumEntityTableProcessedTableManager get albumId {

mobile/lib/infrastructure/entities/memory.entity.drift.dart

@@ -53,16 +53,7 @@ final class $$MemoryEntityTableReferences
   static i5.$UserEntityTable _ownerIdTable(i0.GeneratedDatabase db) =>
       i6.ReadDatabaseContainer(db)
           .resultSet<i5.$UserEntityTable>('user_entity')
-          .createAlias(
-            i0.$_aliasNameGenerator(
-              i6.ReadDatabaseContainer(
-                db,
-              ).resultSet<i1.$MemoryEntityTable>('memory_entity').ownerId,
-              i6.ReadDatabaseContainer(
-                db,
-              ).resultSet<i5.$UserEntityTable>('user_entity').id,
-            ),
-          );
+          .createAlias('memory_entity__owner_id__user_entity__id');
 
   i5.$$UserEntityTableProcessedTableManager get ownerId {
     final $_column = $_itemColumn<String>('owner_id')!;

mobile/lib/infrastructure/entities/memory_asset.entity.drift.dart

@@ -39,14 +39,7 @@ final class $$MemoryAssetEntityTableReferences
       i4.ReadDatabaseContainer(db)
           .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity')
           .createAlias(
-            i0.$_aliasNameGenerator(
-              i4.ReadDatabaseContainer(db)
-                  .resultSet<i1.$MemoryAssetEntityTable>('memory_asset_entity')
-                  .assetId,
-              i4.ReadDatabaseContainer(
-                db,
-              ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity').id,
-            ),
+            'memory_asset_entity__asset_id__remote_asset_entity__id',
           );
 
   i3.$$RemoteAssetEntityTableProcessedTableManager get assetId {
@@ -70,16 +63,7 @@ final class $$MemoryAssetEntityTableReferences
   static i5.$MemoryEntityTable _memoryIdTable(i0.GeneratedDatabase db) =>
       i4.ReadDatabaseContainer(db)
           .resultSet<i5.$MemoryEntityTable>('memory_entity')
-          .createAlias(
-            i0.$_aliasNameGenerator(
-              i4.ReadDatabaseContainer(db)
-                  .resultSet<i1.$MemoryAssetEntityTable>('memory_asset_entity')
-                  .memoryId,
-              i4.ReadDatabaseContainer(
-                db,
-              ).resultSet<i5.$MemoryEntityTable>('memory_entity').id,
-            ),
-          );
+          .createAlias('memory_asset_entity__memory_id__memory_entity__id');
 
   i5.$$MemoryEntityTableProcessedTableManager get memoryId {
     final $_column = $_itemColumn<String>('memory_id')!;

mobile/lib/infrastructure/entities/partner.entity.drift.dart

@@ -39,16 +39,7 @@ final class $$PartnerEntityTableReferences
   static i4.$UserEntityTable _sharedByIdTable(i0.GeneratedDatabase db) =>
       i5.ReadDatabaseContainer(db)
           .resultSet<i4.$UserEntityTable>('user_entity')
-          .createAlias(
-            i0.$_aliasNameGenerator(
-              i5.ReadDatabaseContainer(
-                db,
-              ).resultSet<i1.$PartnerEntityTable>('partner_entity').sharedById,
-              i5.ReadDatabaseContainer(
-                db,
-              ).resultSet<i4.$UserEntityTable>('user_entity').id,
-            ),
-          );
+          .createAlias('partner_entity__shared_by_id__user_entity__id');
 
   i4.$$UserEntityTableProcessedTableManager get sharedById {
     final $_column = $_itemColumn<String>('shared_by_id')!;
@@ -71,16 +62,7 @@ final class $$PartnerEntityTableReferences
   static i4.$UserEntityTable _sharedWithIdTable(i0.GeneratedDatabase db) =>
       i5.ReadDatabaseContainer(db)
           .resultSet<i4.$UserEntityTable>('user_entity')
-          .createAlias(
-            i0.$_aliasNameGenerator(
-              i5.ReadDatabaseContainer(db)
-                  .resultSet<i1.$PartnerEntityTable>('partner_entity')
-                  .sharedWithId,
-              i5.ReadDatabaseContainer(
-                db,
-              ).resultSet<i4.$UserEntityTable>('user_entity').id,
-            ),
-          );
+          .createAlias('partner_entity__shared_with_id__user_entity__id');
 
   i4.$$UserEntityTableProcessedTableManager get sharedWithId {
     final $_column = $_itemColumn<String>('shared_with_id')!;

mobile/lib/infrastructure/entities/person.entity.drift.dart

@@ -48,16 +48,7 @@ final class $$PersonEntityTableReferences
   static i4.$UserEntityTable _ownerIdTable(i0.GeneratedDatabase db) =>
       i5.ReadDatabaseContainer(db)
           .resultSet<i4.$UserEntityTable>('user_entity')
-          .createAlias(
-            i0.$_aliasNameGenerator(
-              i5.ReadDatabaseContainer(
-                db,
-              ).resultSet<i1.$PersonEntityTable>('person_entity').ownerId,
-              i5.ReadDatabaseContainer(
-                db,
-              ).resultSet<i4.$UserEntityTable>('user_entity').id,
-            ),
-          );
+          .createAlias('person_entity__owner_id__user_entity__id');
 
   i4.$$UserEntityTableProcessedTableManager get ownerId {
     final $_column = $_itemColumn<String>('owner_id')!;

mobile/lib/infrastructure/entities/remote_album.entity.drift.dart

@@ -52,14 +52,7 @@ final class $$RemoteAlbumEntityTableReferences
   ) => i6.ReadDatabaseContainer(db)
       .resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity')
       .createAlias(
-        i0.$_aliasNameGenerator(
-          i6.ReadDatabaseContainer(db)
-              .resultSet<i1.$RemoteAlbumEntityTable>('remote_album_entity')
-              .thumbnailAssetId,
-          i6.ReadDatabaseContainer(
-            db,
-          ).resultSet<i5.$RemoteAssetEntityTable>('remote_asset_entity').id,
-        ),
+        'remote_album_entity__thumbnail_asset_id__remote_asset_entity__id',
       );
 
   i5.$$RemoteAssetEntityTableProcessedTableManager? get thumbnailAssetId {

mobile/lib/infrastructure/entities/remote_album_asset.entity.drift.dart

@@ -39,16 +39,7 @@ final class $$RemoteAlbumAssetEntityTableReferences
       i4.ReadDatabaseContainer(db)
           .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity')
           .createAlias(
-            i0.$_aliasNameGenerator(
-              i4.ReadDatabaseContainer(db)
-                  .resultSet<i1.$RemoteAlbumAssetEntityTable>(
-                    'remote_album_asset_entity',
-                  )
-                  .assetId,
-              i4.ReadDatabaseContainer(
-                db,
-              ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity').id,
-            ),
+            'remote_album_asset_entity__asset_id__remote_asset_entity__id',
           );
 
   i3.$$RemoteAssetEntityTableProcessedTableManager get assetId {
@@ -73,16 +64,7 @@ final class $$RemoteAlbumAssetEntityTableReferences
       i4.ReadDatabaseContainer(db)
           .resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity')
           .createAlias(
-            i0.$_aliasNameGenerator(
-              i4.ReadDatabaseContainer(db)
-                  .resultSet<i1.$RemoteAlbumAssetEntityTable>(
-                    'remote_album_asset_entity',
-                  )
-                  .albumId,
-              i4.ReadDatabaseContainer(
-                db,
-              ).resultSet<i5.$RemoteAlbumEntityTable>('remote_album_entity').id,
-            ),
+            'remote_album_asset_entity__album_id__remote_album_entity__id',
           );
 
   i5.$$RemoteAlbumEntityTableProcessedTableManager get albumId {

mobile/lib/infrastructure/entities/remote_album_user.entity.drift.dart

@@ -42,16 +42,7 @@ final class $$RemoteAlbumUserEntityTableReferences
       i5.ReadDatabaseContainer(db)
           .resultSet<i4.$RemoteAlbumEntityTable>('remote_album_entity')
           .createAlias(
-            i0.$_aliasNameGenerator(
-              i5.ReadDatabaseContainer(db)
-                  .resultSet<i1.$RemoteAlbumUserEntityTable>(
-                    'remote_album_user_entity',
-                  )
-                  .albumId,
-              i5.ReadDatabaseContainer(
-                db,
-              ).resultSet<i4.$RemoteAlbumEntityTable>('remote_album_entity').id,
-            ),
+            'remote_album_user_entity__album_id__remote_album_entity__id',
           );
 
   i4.$$RemoteAlbumEntityTableProcessedTableManager get albumId {
@@ -75,18 +66,7 @@ final class $$RemoteAlbumUserEntityTableReferences
   static i6.$UserEntityTable _userIdTable(i0.GeneratedDatabase db) =>
       i5.ReadDatabaseContainer(db)
           .resultSet<i6.$UserEntityTable>('user_entity')
-          .createAlias(
-            i0.$_aliasNameGenerator(
-              i5.ReadDatabaseContainer(db)
-                  .resultSet<i1.$RemoteAlbumUserEntityTable>(
-                    'remote_album_user_entity',
-                  )
-                  .userId,
-              i5.ReadDatabaseContainer(
-                db,
-              ).resultSet<i6.$UserEntityTable>('user_entity').id,
-            ),
-          );
+          .createAlias('remote_album_user_entity__user_id__user_entity__id');
 
   i6.$$UserEntityTableProcessedTableManager get userId {
     final $_column = $_itemColumn<String>('user_id')!;

mobile/lib/infrastructure/entities/remote_asset.entity.drift.dart

@@ -74,16 +74,7 @@ final class $$RemoteAssetEntityTableReferences
   static i5.$UserEntityTable _ownerIdTable(i0.GeneratedDatabase db) =>
       i6.ReadDatabaseContainer(db)
           .resultSet<i5.$UserEntityTable>('user_entity')
-          .createAlias(
-            i0.$_aliasNameGenerator(
-              i6.ReadDatabaseContainer(db)
-                  .resultSet<i1.$RemoteAssetEntityTable>('remote_asset_entity')
-                  .ownerId,
-              i6.ReadDatabaseContainer(
-                db,
-              ).resultSet<i5.$UserEntityTable>('user_entity').id,
-            ),
-          );
+          .createAlias('remote_asset_entity__owner_id__user_entity__id');
 
   i5.$$UserEntityTableProcessedTableManager get ownerId {
     final $_column = $_itemColumn<String>('owner_id')!;

mobile/lib/infrastructure/entities/remote_asset_cloud_id.entity.drift.dart

@@ -45,16 +45,7 @@ final class $$RemoteAssetCloudIdEntityTableReferences
       i4.ReadDatabaseContainer(db)
           .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity')
           .createAlias(
-            i0.$_aliasNameGenerator(
-              i4.ReadDatabaseContainer(db)
-                  .resultSet<i1.$RemoteAssetCloudIdEntityTable>(
-                    'remote_asset_cloud_id_entity',
-                  )
-                  .assetId,
-              i4.ReadDatabaseContainer(
-                db,
-              ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity').id,
-            ),
+            'remote_asset_cloud_id_entity__asset_id__remote_asset_entity__id',
           );
 
   i3.$$RemoteAssetEntityTableProcessedTableManager get assetId {

mobile/lib/infrastructure/entities/stack.entity.drift.dart

@@ -38,16 +38,7 @@ final class $$StackEntityTableReferences
   static i4.$UserEntityTable _ownerIdTable(i0.GeneratedDatabase db) =>
       i5.ReadDatabaseContainer(db)
           .resultSet<i4.$UserEntityTable>('user_entity')
-          .createAlias(
-            i0.$_aliasNameGenerator(
-              i5.ReadDatabaseContainer(
-                db,
-              ).resultSet<i1.$StackEntityTable>('stack_entity').ownerId,
-              i5.ReadDatabaseContainer(
-                db,
-              ).resultSet<i4.$UserEntityTable>('user_entity').id,
-            ),
-          );
+          .createAlias('stack_entity__owner_id__user_entity__id');
 
   i4.$$UserEntityTableProcessedTableManager get ownerId {
     final $_column = $_itemColumn<String>('owner_id')!;

mobile/lib/infrastructure/entities/user_metadata.entity.drift.dart

@@ -40,18 +40,7 @@ final class $$UserMetadataEntityTableReferences
   static i5.$UserEntityTable _userIdTable(i0.GeneratedDatabase db) =>
       i6.ReadDatabaseContainer(db)
           .resultSet<i5.$UserEntityTable>('user_entity')
-          .createAlias(
-            i0.$_aliasNameGenerator(
-              i6.ReadDatabaseContainer(db)
-                  .resultSet<i1.$UserMetadataEntityTable>(
-                    'user_metadata_entity',
-                  )
-                  .userId,
-              i6.ReadDatabaseContainer(
-                db,
-              ).resultSet<i5.$UserEntityTable>('user_entity').id,
-            ),
-          );
+          .createAlias('user_metadata_entity__user_id__user_entity__id');
 
   i5.$$UserEntityTableProcessedTableManager get userId {
     final $_column = $_itemColumn<String>('user_id')!;

mobile/lib/presentation/actions/favorite.action.dart

@@ -3,25 +3,23 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/utils/asset_filter.dart';
 import 'package:immich_ui/immich_ui.dart';
 
 class FavoriteAction extends AssetAction<RemoteAsset> {
-  final bool shouldFavorite;
+  final bool favorite;
 
-  FavoriteAction({required super.assets}) : shouldFavorite = assets.any((asset) => !asset.isFavorite);
+  FavoriteAction({required super.assets}) : favorite = assets.any((asset) => !asset.isFavorite);
 
   @override
-  IconData get icon => shouldFavorite ? Icons.favorite_border_rounded : Icons.favorite_rounded;
+  IconData get icon => favorite ? Icons.favorite_border_rounded : Icons.favorite_rounded;
 
   @override
-  String label(ActionScope scope) => shouldFavorite ? scope.context.t.favorite : scope.context.t.unfavorite;
+  String label(ActionScope scope) => favorite ? scope.context.t.favorite : scope.context.t.unfavorite;
 
   @override
-  Iterable<RemoteAsset> filter(ActionScope scope) => assets
-      .where(
-        (asset) => asset is RemoteAsset && asset.ownerId == scope.authUser.id && asset.isFavorite == !shouldFavorite,
-      )
-      .cast<RemoteAsset>();
+  Iterable<RemoteAsset> filter(ActionScope scope) =>
+      AssetFilter(assets).owned(scope.authUser.id).favorite(isFavorite: !favorite);
 
   @override
   bool isVisible(ActionScope scope) => filter(scope).isNotEmpty;
@@ -31,8 +29,8 @@ class FavoriteAction extends AssetAction<RemoteAsset> {
     final ActionScope(:ref) = scope;
     final assets = filter(scope).map((asset) => asset.id).toList(growable: false);
 
-    await ref.read(assetServiceProvider).updateFavorite(assets, shouldFavorite);
-    final message = shouldFavorite
+    await ref.read(assetServiceProvider).updateFavorite(assets, favorite);
+    final message = favorite
         ? StaticTranslations.instance.favorite_action_prompt(count: assets.length)
         : StaticTranslations.instance.unfavorite_action_prompt(count: assets.length);
     snackbar.success(message);

mobile/lib/presentation/pages/dev/main_timeline.page.dart

@@ -1,17 +1,49 @@
 import 'package:auto_route/auto_route.dart';
-import 'package:flutter/widgets.dart';
+import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/presentation/widgets/memory/memory_lane.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
-import 'package:immich_mobile/widgets/common/page_chrome/tab_page.dart';
-import 'package:immich_mobile/widgets/common/page_chrome/types.dart';
+import 'package:immich_mobile/presentation/widgets/feature_message/feature_message_dialog.widget.dart';
+import 'package:immich_mobile/providers/feature_message.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/memory.provider.dart';
 
 @RoutePage()
-class MainTimelinePage extends TabPage {
+class MainTimelinePage extends ConsumerStatefulWidget {
   const MainTimelinePage({super.key});
 
   @override
-  Widget scopeBuilder(BuildContext context, Widget child) => timelineChromeScope(context, child);
+  ConsumerState<MainTimelinePage> createState() => _MainTimelinePageState();
+}
+
+class _MainTimelinePageState extends ConsumerState<MainTimelinePage> {
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      if (!mounted) {
+        return;
+      }
+      final service = ref.read(featureMessageServiceProvider);
+      if (!service.shouldShow()) {
+        return;
+      }
+
+      await service.markSeen();
+      if (!mounted) {
+        return;
+      }
+
+      await showFeatureMessageDialog(context);
+    });
+  }
 
   @override
-  ProviderListenable<PageChromeContent> get content => timelineChromeProvider;
+  Widget build(BuildContext context) {
+    final hasMemories = ref.watch(driftMemoryFutureProvider.select((state) => state.value?.isNotEmpty ?? false));
+    return Timeline(
+      topSliverWidget: const SliverToBoxAdapter(child: DriftMemoryLane()),
+      topSliverWidgetHeight: hasMemories ? 200 : 0,
+      showStorageIndicator: true,
+    );
+  }
 }

mobile/lib/presentation/pages/drift_album.page.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -5,70 +7,64 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/widgets/common/page_chrome/tab_page.dart';
-import 'package:immich_mobile/widgets/common/page_chrome/types.dart';
-import 'package:immich_mobile/widgets/common/primary_app_bar.dart';
+import 'package:immich_mobile/widgets/common/immich_sliver_app_bar.dart';
 
 @RoutePage()
-class DriftAlbumsPage extends TabPage {
+class DriftAlbumsPage extends ConsumerStatefulWidget {
   const DriftAlbumsPage({super.key});
 
   @override
-  ProviderListenable<PageChromeContent> get content => Provider<PageChromeContent>((ref) {
+  ConsumerState<DriftAlbumsPage> createState() => _DriftAlbumsPageState();
+}
+
+class _DriftAlbumsPageState extends ConsumerState<DriftAlbumsPage> {
+  final ScrollController _scrollController = ScrollController();
+
+  Future<void> onRefresh() async {
+    await ref.read(remoteAlbumProvider.notifier).refresh();
+  }
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
     final albumCount = ref.watch(remoteAlbumProvider.select((state) => state.albums.length));
     final showScrollbar = albumCount > 20;
 
-    return PageChromeContent(
+    final scrollView = CustomScrollView(
+      controller: _scrollController,
       physics: const AlwaysScrollableScrollPhysics(),
-      appBar: const PrimaryAppBar(
-        snap: false,
-        floating: false,
-        pinned: true,
-        showUploadButton: false,
-        actions: [_CreateAlbumAction()],
-      ),
-      viewportBuilder: (scrollView) => _AlbumRefreshWrapper(showScrollbar: showScrollbar, scrollView: scrollView),
-      slivers: [const _AlbumSelectorSliver()],
+      slivers: [
+        ImmichSliverAppBar(
+          snap: false,
+          floating: false,
+          pinned: true,
+          actions: [
+            IconButton(
+              onPressed: () => context.pushRoute(const DriftCreateAlbumRoute()),
+              icon: const Icon(Icons.add_rounded),
+            ),
+          ],
+          showUploadButton: false,
+        ),
+        AlbumSelector(
+          onAlbumSelected: (album) {
+            context.router.push(RemoteAlbumRoute(album: album));
+          },
+        ),
+      ],
     );
-  });
-}
 
-class _CreateAlbumAction extends StatelessWidget {
-  const _CreateAlbumAction();
-
-  @override
-  Widget build(BuildContext context) {
-    return IconButton(
-      onPressed: () => context.pushRoute(const DriftCreateAlbumRoute()),
-      icon: const Icon(Icons.add_rounded),
-    );
-  }
-}
-
-class _AlbumSelectorSliver extends StatelessWidget {
-  const _AlbumSelectorSliver();
-
-  @override
-  Widget build(BuildContext context) {
-    return AlbumSelector(onAlbumSelected: (album) => context.router.push(RemoteAlbumRoute(album: album)));
-  }
-}
-
-class _AlbumRefreshWrapper extends ConsumerWidget {
-  final bool showScrollbar;
-  final CustomScrollView scrollView;
-
-  const _AlbumRefreshWrapper({required this.showScrollbar, required this.scrollView});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final controller = PrimaryScrollController.of(context);
     return RefreshIndicator(
-      onRefresh: () => ref.read(remoteAlbumProvider.notifier).refresh(),
+      onRefresh: onRefresh,
       edgeOffset: 100,
       child: showScrollbar
           ? RawScrollbar(
-              controller: controller,
+              controller: _scrollController,
               interactive: true,
               thickness: 8,
               radius: const Radius.circular(4),

mobile/lib/presentation/pages/drift_library.page.dart

@@ -16,23 +16,27 @@ import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
-import 'package:immich_mobile/widgets/common/page_chrome/tab_page.dart';
-import 'package:immich_mobile/widgets/common/page_chrome/types.dart';
-import 'package:immich_mobile/widgets/common/primary_app_bar.dart';
+import 'package:immich_mobile/widgets/common/immich_sliver_app_bar.dart';
 import 'package:immich_mobile/widgets/map/map_thumbnail.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 
 @RoutePage()
-class DriftLibraryPage extends TabPage {
+class DriftLibraryPage extends ConsumerWidget {
   const DriftLibraryPage({super.key});
 
   @override
-  ProviderListenable<PageChromeContent> get content => Provider<PageChromeContent>((ref) {
-    return const PageChromeContent(
-      appBar: PrimaryAppBar(snap: false, floating: false, pinned: true, showUploadButton: false),
-      slivers: [_ActionButtonGrid(), _CollectionCards(), _QuickAccessButtonList()],
+  Widget build(BuildContext context, WidgetRef ref) {
+    return const Scaffold(
+      body: CustomScrollView(
+        slivers: [
+          ImmichSliverAppBar(snap: false, floating: false, pinned: true, showUploadButton: false),
+          _ActionButtonGrid(),
+          _CollectionCards(),
+          _QuickAccessButtonList(),
+        ],
+      ),
     );
-  });
+  }
 }
 
 class _ActionButtonGrid extends ConsumerWidget {

mobile/lib/presentation/widgets/action_buttons/share_action_button.widget.dart

@@ -7,7 +7,6 @@ import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/settings_key.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
@@ -129,12 +128,6 @@ class ShareActionButton extends ConsumerWidget {
       return;
     }
 
-    await ref.read(settingsProvider).write(SettingsKey.shareFileType, fileType);
-
-    if (!context.mounted) {
-      return;
-    }
-
     await _share(context, ref, fileType);
   }
 

mobile/lib/presentation/widgets/album/album_selector.widget.dart

@@ -745,10 +745,15 @@ class AddToAlbumHeader extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     Future<void> onCreateAlbum() async {
+      final albumName = await showDialog<String?>(context: context, builder: (context) => const NewAlbumNameModal());
+      if (albumName == null) {
+        return;
+      }
+
       final selectedAssets = ref.read(multiSelectProvider).selectedAssets;
       final newAlbum = await ref
           .read(remoteAlbumProvider.notifier)
-          .createAlbumWithAssets(title: "Untitled Album", assets: selectedAssets);
+          .createAlbumWithAssets(title: albumName, assets: selectedAssets);
 
       if (newAlbum == null) {
         ImmichToast.show(context: context, toastType: ToastType.error, msg: 'errors.failed_to_create_album'.tr());

mobile/lib/presentation/widgets/asset_viewer/viewer_top_app_bar.widget.dart

@@ -63,7 +63,7 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
 
       ActionIconButtonWidget(action: FavoriteAction(assets: assetForAction)),
 
-      ViewerKebabMenu(originalTheme: originalTheme),
+      ImmichColorOverride(color: null, child: ViewerKebabMenu(originalTheme: originalTheme)),
     ];
 
     final lockedViewActions = <Widget>[ViewerKebabMenu(originalTheme: originalTheme)];

mobile/lib/presentation/widgets/timeline/timeline.widget.dart

@@ -7,7 +7,6 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/events.model.dart';
@@ -17,23 +16,17 @@ import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_status_floating_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart';
-import 'package:immich_mobile/presentation/widgets/feature_message/feature_message_dialog.widget.dart';
-import 'package:immich_mobile/presentation/widgets/memory/memory_lane.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/scrubber.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline_drag_region.dart';
-import 'package:immich_mobile/presentation/widgets/timeline/timeline_scroll.provider.dart';
-import 'package:immich_mobile/providers/feature_message.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/memory.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_sliver_app_bar.dart';
 import 'package:immich_mobile/widgets/common/mesmerizing_sliver_app_bar.dart';
-import 'package:immich_mobile/widgets/common/page_chrome/types.dart';
-import 'package:immich_mobile/widgets/common/primary_app_bar.dart';
 import 'package:immich_mobile/widgets/common/selection_sliver_app_bar.dart';
 
 class Timeline extends ConsumerWidget {
@@ -44,7 +37,7 @@ class Timeline extends ConsumerWidget {
     this.bottomSliverWidget,
     this.showStorageIndicator = false,
     this.withStack = false,
-    this.appBar = const PrimaryAppBar(floating: true, pinned: false, snap: false),
+    this.appBar = const ImmichSliverAppBar(floating: true, pinned: false, snap: false),
     this.bottomSheet = const GeneralBottomSheet(minChildSize: 0.23),
     this.groupBy,
     this.withScrubber = true,
@@ -755,225 +748,3 @@ class CustomScaleGestureRecognizer extends ScaleGestureRecognizer {
     acceptGesture(pointer);
   }
 }
-
-// ---------------------------------------------------------------------------
-// PageChrome (Photos) path
-//
-// The shared `PageChrome` owns the Scaffold + scroll view + app bar. The
-// timeline contributes a [PageChromeContent] via [timelineChromeProvider],
-// read inside [timelineChromeScope] (which overrides `timelineArgsProvider`
-// from the real layout constraints). The controller/observer/scroll logic
-// lives in [timelineScrollProvider] so the chrome can read the controller
-// before it builds the scroll view (same frame).
-// ---------------------------------------------------------------------------
-
-/// Wraps the chrome body in the timeline's `ProviderScope`, overriding
-/// `timelineArgsProvider` from the actual scroll-view constraints via a
-/// `LayoutBuilder` (built during layout, so the value is real, not a guess).
-Widget timelineChromeScope(BuildContext context, Widget child) {
-  return LayoutBuilder(
-    builder: (context, constraints) {
-      return Consumer(
-        builder: (context, ref, _) {
-          final columnCount = ref.watch(appConfigProvider.select((config) => config.timeline.tilesPerRow));
-          return ProviderScope(
-            overrides: [
-              timelineArgsProvider.overrideWithValue(
-                TimelineArgs(
-                  maxWidth: constraints.maxWidth,
-                  maxHeight: constraints.maxHeight,
-                  columnCount: columnCount,
-                  showStorageIndicator: true,
-                ),
-              ),
-            ],
-            child: _TimelineChromePopScope(child: child),
-          );
-        },
-      );
-    },
-  );
-}
-
-/// Pops out of multiselect (instead of the route) while a selection is active.
-class _TimelineChromePopScope extends ConsumerWidget {
-  final Widget child;
-
-  const _TimelineChromePopScope({required this.child});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final isMultiSelectEnabled = ref.watch(multiSelectProvider.select((s) => s.isEnabled));
-    return PopScope(
-      canPop: !isMultiSelectEnabled,
-      onPopInvokedWithResult: (didPop, _) {
-        if (!didPop && isMultiSelectEnabled) {
-          ref.read(multiSelectProvider.notifier).reset();
-        }
-      },
-      child: child,
-    );
-  }
-}
-
-final timelineChromeProvider = Provider<PageChromeContent>((ref) {
-  final scroll = ref.watch(timelineScrollProvider.notifier);
-  final physics = ref.watch(timelineScrollProvider.select((s) => s.physics));
-  final maxHeight = ref.watch(timelineArgsProvider.select((args) => args.maxHeight));
-  final isSelectionMode = ref.watch(multiSelectProvider.select((s) => s.forceEnable));
-
-  return PageChromeContent(
-    controller: scroll.controller,
-    physics: physics,
-    scrollCacheExtent: ScrollCacheExtent.pixels(maxHeight * 2),
-    appBar: isSelectionMode
-        ? const SelectionSliverAppBar()
-        : const PrimaryAppBar(floating: true, pinned: false, snap: false),
-    slivers: const [_TimelineChromeContent()],
-    viewportBuilder: (scrollView) => _TimelineChromeViewport(scrollView: scrollView),
-    floatingActionButton: const DownloadStatusFloatingButton(),
-    overlays: const [_TimelineChromeOverlays()],
-  );
-}, dependencies: [timelineServiceProvider, timelineArgsProvider, timelineScrollProvider, multiSelectProvider]);
-
-/// The timeline's content slivers (memory lane, the segmented grid, bottom
-/// padding). Mounted by the chrome inside its scroll view, so the ambient
-/// `PrimaryScrollController` is the chrome's controller.
-class _TimelineChromeContent extends ConsumerWidget {
-  const _TimelineChromeContent();
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    // A reload event forces the grid to rebuild.
-    ref.listen(timelineSegmentProvider, (_, __) {});
-
-    final asyncSegments = ref.watch(timelineSegmentProvider);
-    final isMultiSelectEnabled = ref.watch(multiSelectProvider.select((s) => s.isEnabled));
-    final hasMemories = ref.watch(driftMemoryFutureProvider.select((state) => state.value?.isNotEmpty ?? false));
-
-    return asyncSegments.when(
-      loading: () => const SliverToBoxAdapter(child: SizedBox.shrink()),
-      error: (_, __) => const SliverToBoxAdapter(child: SizedBox.shrink()),
-      data: (segments) {
-        final childCount = (segments.lastOrNull?.lastIndex ?? -1) + 1;
-        const bottomSheetOpenModifier = 120.0;
-        final contentBottomPadding = context.padding.bottom + (isMultiSelectEnabled ? bottomSheetOpenModifier : 0);
-
-        return SliverMainAxisGroup(
-          slivers: [
-            if (hasMemories) const SliverToBoxAdapter(child: DriftMemoryLane()),
-            _SliverSegmentedList(
-              segments: segments,
-              delegate: SliverChildBuilderDelegate((ctx, index) {
-                if (index >= childCount) {
-                  return null;
-                }
-                final segment = segments.findByIndex(index);
-                return segment?.builder(ctx, index) ?? const SizedBox.shrink();
-              }, childCount: childCount, addAutomaticKeepAlives: false, addRepaintBoundaries: false),
-            ),
-            SliverPadding(padding: EdgeInsets.only(bottom: contentBottomPadding)),
-          ],
-        );
-      },
-    );
-  }
-}
-
-/// Wraps the shared scroll view in the pinch-to-scale gesture, drag selection
-/// region and the scrubber.
-class _TimelineChromeViewport extends ConsumerWidget {
-  final CustomScrollView scrollView;
-
-  const _TimelineChromeViewport({required this.scrollView});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final scroll = ref.read(timelineScrollProvider.notifier);
-    final isReadonlyModeEnabled = ref.watch(readonlyModeProvider);
-    final maxHeight = ref.watch(timelineArgsProvider.select((args) => args.maxHeight));
-    final isMultiSelectEnabled = ref.watch(multiSelectProvider.select((s) => s.isEnabled));
-    final hasMemories = ref.watch(driftMemoryFutureProvider.select((state) => state.value?.isNotEmpty ?? false));
-    final segments = ref.watch(timelineSegmentProvider).valueOrNull ?? const [];
-
-    final topPadding = context.padding.top + kToolbarHeight + 10;
-    const bottomSheetOpenModifier = 120.0;
-    final contentBottomPadding = context.padding.bottom + (isMultiSelectEnabled ? bottomSheetOpenModifier : 0);
-    final scrubberBottomPadding = contentBottomPadding + kScrubberThumbHeight;
-
-    final timeline = Scrubber(
-      layoutSegments: segments,
-      timelineHeight: maxHeight,
-      topPadding: topPadding,
-      bottomPadding: scrubberBottomPadding,
-      monthSegmentSnappingOffset: hasMemories ? 200 : 0,
-      hasAppBar: true,
-      child: scrollView,
-    );
-
-    return RawGestureDetector(
-      gestures: {
-        CustomScaleGestureRecognizer: GestureRecognizerFactoryWithHandlers<CustomScaleGestureRecognizer>(
-          () => CustomScaleGestureRecognizer(),
-          (CustomScaleGestureRecognizer recognizer) {
-            recognizer.onStart = (_) => scroll.onScaleStart();
-            recognizer.onUpdate = (details) => scroll.onScaleUpdate(details.scale, segments);
-          },
-        ),
-      },
-      child: TimelineDragRegion(
-        onStart: !isReadonlyModeEnabled ? scroll.setDragStartIndex : null,
-        onAssetEnter: scroll.handleDragAssetEnter,
-        onEnd: !isReadonlyModeEnabled ? scroll.stopDrag : null,
-        onScroll: scroll.dragScroll,
-        onScrollStart: scroll.onScrollStart,
-        child: timeline,
-      ),
-    );
-  }
-}
-
-/// The multiselect status button + bottom sheet stacked on top of the timeline.
-class _TimelineChromeOverlays extends HookConsumerWidget {
-  const _TimelineChromeOverlays();
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    // Show the "what's new" feature message once, when the timeline mounts.
-    useEffect(() {
-      WidgetsBinding.instance.addPostFrameCallback((_) async {
-        if (!context.mounted) {
-          return;
-        }
-        final service = ref.read(featureMessageServiceProvider);
-        if (!service.shouldShow()) {
-          return;
-        }
-        await service.markSeen();
-        if (!context.mounted) {
-          return;
-        }
-        await showFeatureMessageDialog(context);
-      });
-      return null;
-    }, const []);
-
-    final isSelectionMode = ref.watch(multiSelectProvider.select((s) => s.forceEnable));
-    final isMultiSelectEnabled = ref.watch(multiSelectProvider.select((s) => s.isEnabled));
-    final isVisible = !isSelectionMode && isMultiSelectEnabled;
-    if (!isVisible) {
-      return const SizedBox.shrink();
-    }
-    return Stack(
-      clipBehavior: Clip.none,
-      children: [
-        Positioned(
-          top: MediaQuery.paddingOf(context).top,
-          left: 25,
-          child: const SizedBox(height: kToolbarHeight, child: Center(child: _MultiSelectStatusButton())),
-        ),
-        const GeneralBottomSheet(minChildSize: 0.23),
-      ],
-    );
-  }
-}

mobile/lib/presentation/widgets/timeline/timeline_scroll.provider.dart

@@ -1,282 +0,0 @@
-import 'dart:async';
-import 'dart:collection';
-import 'dart:math' as math;
-
-import 'package:collection/collection.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/events.model.dart';
-import 'package:immich_mobile/domain/models/settings_key.dart';
-import 'package:immich_mobile/domain/models/timeline.model.dart';
-import 'package:immich_mobile/domain/utils/event_stream.dart';
-import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
-import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart';
-import 'package:immich_mobile/presentation/widgets/timeline/timeline_drag_region.dart';
-import 'package:immich_mobile/providers/infrastructure/settings.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
-import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
-
-/// Transient interaction state of the chrome timeline that drives rebuilds of
-/// the content slivers + viewport (scale/drag/physics).
-class TimelineScrollState {
-  final int perRow;
-  final double scaleFactor;
-  final bool dragging;
-  final ScrollPhysics? physics;
-
-  const TimelineScrollState({this.perRow = 4, this.scaleFactor = 3.0, this.dragging = false, this.physics});
-
-  TimelineScrollState copyWith({int? perRow, double? scaleFactor, bool? dragging, ScrollPhysics? physics}) {
-    return TimelineScrollState(
-      perRow: perRow ?? this.perRow,
-      scaleFactor: scaleFactor ?? this.scaleFactor,
-      dragging: dragging ?? this.dragging,
-      // physics is nullable-by-design; pass explicitly to clear.
-      physics: physics,
-    );
-  }
-}
-
-/// Owns the chrome timeline's [ScrollController] and everything bound to it:
-/// the iOS status-bar-tap observer, the scroll event subscription, position
-/// restore, pinch-to-scale and drag-selection logic.
-///
-/// This lives in a provider (not a widget [State]) so the shared `PageChrome`
-/// can read the controller *before* it builds the scroll view, keeping the
-/// timeline's chrome same-frame. Scoped under the timeline's `ProviderScope`
-/// (via [timelineServiceProvider]/[timelineArgsProvider]) so each timeline gets
-/// its own instance.
-class TimelineScrollController extends Notifier<TimelineScrollState> with WidgetsBindingObserver {
-  late final ScrollController controller;
-  StreamSubscription? _eventSubscription;
-
-  // Drag selection
-  TimelineAssetIndex? _dragAnchorIndex;
-  final Set<BaseAsset> _draggedAssets = HashSet();
-
-  double _baseScaleFactor = 3.0;
-  int? _restoreAssetIndex;
-
-  @override
-  TimelineScrollState build() {
-    WidgetsBinding.instance.addObserver(this);
-    controller = ScrollController(onAttach: _restoreAssetPosition);
-    _eventSubscription = EventStream.shared.listen(_onEvent);
-
-    final perRow = ref.read(appConfigProvider.select((config) => config.timeline.tilesPerRow));
-    _baseScaleFactor = 7.0 - perRow;
-
-    ref.listen(multiSelectProvider.select((s) => s.isEnabled), _onMultiSelectionToggled);
-
-    // Remember scroll position across width changes (orientation / rail toggle)
-    // so it can be restored after the segments regenerate.
-    ref.listen(timelineArgsProvider.select((a) => a.maxWidth), (previous, next) {
-      if (previous != null && previous != next) {
-        final segments = ref.read(timelineSegmentProvider).valueOrNull;
-        if (segments != null && controller.hasClients) {
-          _restoreAssetIndex = _getCurrentAssetIndex(segments);
-        }
-      }
-    });
-
-    ref.onDispose(() {
-      WidgetsBinding.instance.removeObserver(this);
-      controller.dispose();
-      _eventSubscription?.cancel();
-    });
-
-    return TimelineScrollState(perRow: perRow, scaleFactor: _baseScaleFactor);
-  }
-
-  // Capture iOS status bar tap
-  @override
-  void handleStatusBarTap() => scrollToTop();
-
-  void _onEvent(Event event) {
-    switch (event) {
-      case ScrollToTopEvent():
-        scrollToTop();
-      case ScrollToDateEvent scrollToDateEvent:
-        scrollToDate(scrollToDateEvent.date);
-      default:
-        break;
-    }
-  }
-
-  void _restoreAssetPosition(_) {
-    if (_restoreAssetIndex == null) {
-      return;
-    }
-
-    final asyncSegments = ref.read(timelineSegmentProvider);
-    asyncSegments.whenData((segments) {
-      final targetSegment = segments.lastWhereOrNull((segment) => segment.firstAssetIndex <= _restoreAssetIndex!);
-      if (targetSegment != null) {
-        final assetIndexInSegment = _restoreAssetIndex! - targetSegment.firstAssetIndex;
-        final newColumnCount = ref.read(timelineArgsProvider).columnCount;
-        final rowIndexInSegment = (assetIndexInSegment / newColumnCount).floor();
-        final targetRowIndex = targetSegment.firstIndex + 1 + rowIndexInSegment;
-        final targetOffset = targetSegment.indexToLayoutOffset(targetRowIndex);
-        WidgetsBinding.instance.addPostFrameCallback((_) {
-          if (controller.hasClients) {
-            controller.jumpTo(targetOffset.clamp(0.0, controller.position.maxScrollExtent));
-          }
-        });
-      }
-    });
-    _restoreAssetIndex = null;
-  }
-
-  void _onMultiSelectionToggled(_, bool isEnabled) {
-    EventStream.shared.emit(MultiSelectToggleEvent(isEnabled));
-  }
-
-  int? getCurrentAssetIndex(List<Segment> segments) => _getCurrentAssetIndex(segments);
-
-  int? _getCurrentAssetIndex(List<Segment> segments) {
-    final currentOffset = controller.offset.clamp(0.0, controller.position.maxScrollExtent);
-    final segment = segments.findByOffset(currentOffset) ?? segments.lastOrNull;
-    int? targetAssetIndex;
-    if (segment != null) {
-      final rowIndex = segment.getMinChildIndexForScrollOffset(currentOffset);
-      if (rowIndex > segment.firstIndex) {
-        final rowIndexInSegment = rowIndex - (segment.firstIndex + 1);
-        final assetsPerRow = ref.read(timelineArgsProvider).columnCount;
-        final assetIndexInSegment = rowIndexInSegment * assetsPerRow;
-        targetAssetIndex = segment.firstAssetIndex + assetIndexInSegment;
-      } else {
-        targetAssetIndex = segment.firstAssetIndex;
-      }
-    }
-    return targetAssetIndex;
-  }
-
-  void scrollToTop() {
-    if (!controller.hasClients) {
-      return;
-    }
-
-    final timelineState = ref.read(timelineStateProvider.notifier);
-    timelineState.setScrubbing(true);
-    controller
-        .animateTo(0, duration: const Duration(milliseconds: 250), curve: Curves.easeInOut)
-        .whenComplete(() => timelineState.setScrubbing(false));
-  }
-
-  void scrollToDate(DateTime date) {
-    final timelineState = ref.read(timelineStateProvider.notifier);
-    final asyncSegments = ref.read(timelineSegmentProvider);
-    asyncSegments.whenData((segments) {
-      final targetSegment = segments.firstWhereOrNull((segment) {
-        if (segment.bucket is TimeBucket) {
-          final segmentDate = (segment.bucket as TimeBucket).date;
-          return segmentDate.year == date.year && segmentDate.month == date.month && segmentDate.day == date.day;
-        }
-        return false;
-      });
-
-      final fallbackSegment =
-          targetSegment ??
-          segments.firstWhereOrNull((segment) {
-            if (segment.bucket is TimeBucket) {
-              final segmentDate = (segment.bucket as TimeBucket).date;
-              return segmentDate.year == date.year && segmentDate.month == date.month;
-            }
-            return false;
-          });
-
-      if (fallbackSegment != null) {
-        final targetOffset = fallbackSegment.startOffset - 50;
-        timelineState.setScrubbing(true);
-        controller
-            .animateTo(
-              targetOffset.clamp(0.0, controller.position.maxScrollExtent),
-              duration: const Duration(milliseconds: 500),
-              curve: Curves.easeInOut,
-            )
-            .whenComplete(() => timelineState.setScrubbing(false));
-      } else {
-        timelineState.setScrubbing(false);
-      }
-    });
-  }
-
-  // Pinch to scale
-  void onScaleStart() {
-    _baseScaleFactor = state.scaleFactor;
-  }
-
-  void onScaleUpdate(double scale, List<Segment> segments) {
-    final newScaleFactor = math.max(math.min(5.0, _baseScaleFactor * scale), 1.0);
-    final newPerRow = 7 - newScaleFactor.toInt();
-    if (newPerRow != state.perRow) {
-      _restoreAssetIndex = _getCurrentAssetIndex(segments);
-      state = state.copyWith(scaleFactor: newScaleFactor, perRow: newPerRow, physics: state.physics);
-      ref.read(settingsProvider).write(SettingsKey.timelineTilesPerRow, newPerRow);
-    }
-  }
-
-  // Drag selection
-  void setDragStartIndex(TimelineAssetIndex index) {
-    _dragAnchorIndex = index;
-    state = state.copyWith(dragging: true, physics: const ClampingScrollPhysics());
-  }
-
-  void stopDrag() {
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      // Reset physics post frame to prevent a sudden change on iOS.
-      state = state.copyWith(dragging: state.dragging, physics: null);
-    });
-    _draggedAssets.clear();
-    state = state.copyWith(dragging: false, physics: state.physics);
-    final timelineState = ref.read(timelineStateProvider.notifier);
-    Future.delayed(const Duration(milliseconds: 300), () {
-      timelineState.setScrolling(false);
-    });
-  }
-
-  void dragScroll(ScrollDirection direction) {
-    controller.animateTo(
-      controller.offset + (direction == ScrollDirection.forward ? 175 : -175),
-      duration: const Duration(milliseconds: 125),
-      curve: Curves.easeOut,
-    );
-  }
-
-  void onScrollStart() {
-    ref.read(timelineStateProvider.notifier).setScrolling(true);
-  }
-
-  void handleDragAssetEnter(TimelineAssetIndex index) {
-    if (_dragAnchorIndex == null || !state.dragging) {
-      return;
-    }
-
-    final timelineService = ref.read(timelineServiceProvider);
-    final dragAnchorIndex = _dragAnchorIndex!;
-
-    final startIndex = math.min(dragAnchorIndex.assetIndex, index.assetIndex);
-    final endIndex = math.max(dragAnchorIndex.assetIndex, index.assetIndex);
-    final count = endIndex - startIndex + 1;
-
-    if (timelineService.hasRange(startIndex, count)) {
-      final selectedAssets = timelineService.getAssets(startIndex, count);
-      final multiSelectNotifier = ref.read(multiSelectProvider.notifier);
-      for (final asset in _draggedAssets) {
-        multiSelectNotifier.deselectAsset(asset);
-      }
-      _draggedAssets.clear();
-      for (final asset in selectedAssets) {
-        multiSelectNotifier.selectAsset(asset);
-        _draggedAssets.add(asset);
-      }
-    }
-  }
-}
-
-final timelineScrollProvider = NotifierProvider<TimelineScrollController, TimelineScrollState>(
-  TimelineScrollController.new,
-  dependencies: [timelineServiceProvider, timelineArgsProvider, multiSelectProvider, timelineSegmentProvider],
-);

mobile/lib/utils/asset_filter.dart

@@ -0,0 +1,22 @@
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+
+extension type const AssetFilter<T extends BaseAsset>(Iterable<T> assets) implements Iterable<T> {
+  AssetFilter<T> where(bool Function(T asset) test) => AssetFilter(assets.where(test));
+  AssetFilter<T> whereNot(bool Function(T asset) test) => AssetFilter(assets.where((asset) => !test(asset)));
+
+  AssetFilter<T> type(AssetType type) => where((asset) => asset.type == type);
+  AssetFilter<T> favorite({bool isFavorite = true}) => where((asset) => asset.isFavorite == isFavorite);
+
+  AssetFilter<RemoteAsset> remote() => AssetFilter(assets.whereType<RemoteAsset>());
+  AssetFilter<RemoteAsset> owned(String ownerId) => remote().where((asset) => asset.ownerId == ownerId);
+  AssetFilter<RemoteAsset> visibility(AssetVisibility visibility) =>
+      remote().where((asset) => asset.visibility == visibility);
+  AssetFilter<RemoteAsset> notVisibility(AssetVisibility visibility) =>
+      remote().where((asset) => asset.visibility != visibility);
+  AssetFilter<RemoteAsset> archived({bool isArchived = true}) =>
+      remote().where((asset) => asset.isArchived == isArchived);
+  AssetFilter<RemoteAsset> stacked({bool isStacked = true}) => remote().where((asset) => asset.isStacked == isStacked);
+
+  AssetFilter<LocalAsset> local() => AssetFilter(assets.whereType<LocalAsset>());
+  AssetFilter<LocalAsset> backedUp() => local().where((asset) => asset.remoteAssetId != null);
+}

mobile/lib/widgets/common/immich_sliver_app_bar.dart

@@ -20,23 +20,17 @@ import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/asset_viewer/cast_dialog.dart';
 import 'package:immich_mobile/widgets/common/app_bar_dialog/app_bar_dialog.dart';
 import 'package:immich_mobile/widgets/common/user_circle_avatar.dart';
-import 'package:immich_ui/immich_ui.dart';
 
-/// The app's standard app bar. Composes Immich-specific indicators (sync,
-/// backup, profile, cast) and the multiselect dim behaviour onto the generic
-/// [ImmichSliverAppBar] primitive from the ui package.
-class PrimaryAppBar extends ConsumerWidget {
+class ImmichSliverAppBar extends ConsumerWidget {
   final List<Widget>? actions;
   final bool showUploadButton;
   final bool floating;
   final bool pinned;
   final bool snap;
   final Widget? title;
-  final Widget? leading;
-  final bool automaticallyImplyLeading;
   final double? expandedHeight;
 
-  const PrimaryAppBar({
+  const ImmichSliverAppBar({
     super.key,
     this.actions,
     this.showUploadButton = true,
@@ -44,8 +38,6 @@ class PrimaryAppBar extends ConsumerWidget {
     this.pinned = false,
     this.snap = true,
     this.title,
-    this.leading,
-    this.automaticallyImplyLeading = false,
     this.expandedHeight,
   });
 
@@ -55,27 +47,38 @@ class PrimaryAppBar extends ConsumerWidget {
     final isReadonlyModeEnabled = ref.watch(readonlyModeProvider);
     final isMultiSelectEnabled = ref.watch(multiSelectProvider.select((s) => s.isEnabled));
 
-    return ImmichSliverAppBar(
-      floating: floating,
-      pinned: pinned,
-      snap: snap,
-      expandedHeight: expandedHeight,
-      dimmed: isMultiSelectEnabled,
-      automaticallyImplyLeading: automaticallyImplyLeading,
-      leading: leading,
-      title: title ?? const _ImmichLogoWithText(),
-      actions: [
-        const _SyncStatusIndicator(),
-        if (isCasting && !isReadonlyModeEnabled)
-          IconButton(
-            onPressed: () => showDialog(context: context, builder: (context) => const CastDialog()),
-            icon: Icon(isCasting ? Icons.cast_connected_rounded : Icons.cast_rounded),
-          ),
-        if (actions != null) ...actions!,
-        if (showUploadButton && !isReadonlyModeEnabled) const _BackupIndicator(),
-        const _ProfileIndicator(),
-        const SizedBox(width: 8),
-      ],
+    return SliverIgnorePointer(
+      ignoring: isMultiSelectEnabled,
+      sliver: SliverAnimatedOpacity(
+        duration: Durations.medium1,
+        opacity: isMultiSelectEnabled ? 0 : 1,
+        sliver: SliverAppBar(
+          backgroundColor: context.colorScheme.surface,
+          surfaceTintColor: context.colorScheme.surfaceTint,
+          elevation: 0,
+          scrolledUnderElevation: 1.0,
+          floating: floating,
+          pinned: pinned,
+          snap: snap,
+          expandedHeight: expandedHeight,
+          shape: const RoundedRectangleBorder(borderRadius: BorderRadius.vertical(bottom: Radius.circular(5))),
+          automaticallyImplyLeading: false,
+          centerTitle: false,
+          title: title ?? const _ImmichLogoWithText(),
+          actions: [
+            const _SyncStatusIndicator(),
+            if (isCasting && !isReadonlyModeEnabled)
+              IconButton(
+                onPressed: () => showDialog(context: context, builder: (context) => const CastDialog()),
+                icon: Icon(isCasting ? Icons.cast_connected_rounded : Icons.cast_rounded),
+              ),
+            if (actions != null) ...actions!,
+            if (showUploadButton && !isReadonlyModeEnabled) const _BackupIndicator(),
+            const _ProfileIndicator(),
+            const SizedBox(width: 8),
+          ],
+        ),
+      ),
     );
   }
 }

mobile/lib/widgets/common/page_chrome/page_chrome.dart

@@ -1,64 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/widgets/common/page_chrome/types.dart';
-
-/// The shared page chrome. Authored once; tabs never instantiate it directly
-/// (they extend `TabPage`, whose `build` renders this beneath the tab's scope).
-///
-/// Owns the [Scaffold], the single [CustomScrollView] and its
-/// [PrimaryScrollController]. Reads the active tab's [PageChromeContent] from
-/// [content] (available in the same frame, since this is a descendant of the
-/// tab's scope) and renders its app bar + content slivers.
-class PageChrome extends ConsumerStatefulWidget {
-  final ProviderListenable<PageChromeContent> content;
-
-  const PageChrome({super.key, required this.content});
-
-  @override
-  ConsumerState<PageChrome> createState() => _PageChromeState();
-}
-
-class _PageChromeState extends ConsumerState<PageChrome> {
-  ScrollController? _ownController;
-
-  @override
-  void dispose() {
-    _ownController?.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final content = ref.watch(widget.content);
-
-    // The tab's controller, or a chrome-owned default created lazily.
-    final controller = content.controller ?? (_ownController ??= ScrollController());
-
-    final scrollView = CustomScrollView(
-      controller: controller,
-      physics: content.physics,
-      scrollCacheExtent: content.scrollCacheExtent,
-      slivers: [content.appBar, ...content.slivers],
-    );
-
-    Widget body = content.viewportBuilder != null ? content.viewportBuilder!(scrollView) : scrollView;
-
-    if (content.overlays.isNotEmpty) {
-      body = Stack(clipBehavior: Clip.none, children: [body, ...content.overlays]);
-    }
-
-    body = Scaffold(
-      // Removes the built-in Scaffold `handleStatusBarTap`, avoiding duplicate
-      // events when a tab (e.g. the timeline) provides its own.
-      primary: false,
-      resizeToAvoidBottomInset: false,
-      floatingActionButton: content.floatingActionButton,
-      body: body,
-    );
-
-    // The chrome owns the single scroll view; mark its controller primary so
-    // the scrubber's `PrimaryScrollController.of` and iOS status-bar-tap both
-    // resolve it. Wrapping the Scaffold preserves status-bar-tap resolution.
-    return PrimaryScrollController(controller: controller, child: body);
-  }
-}

mobile/lib/widgets/common/page_chrome/tab_page.dart

@@ -1,30 +0,0 @@
-import 'package:flutter/widgets.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/widgets/common/page_chrome/page_chrome.dart';
-import 'package:immich_mobile/widgets/common/page_chrome/types.dart';
-
-/// The base type for a page rendered as a primary tab.
-///
-/// Extending [TabPage] is the *only* place that knows the page is a tab: a
-/// subclass declares its chrome [content] provider and, if needed, the
-/// [scopeBuilder] the provider must be read within. The [PageChrome] is
-/// rendered automatically beneath that scope, so it reads the tab's content
-/// provider as a descendant (same frame). Nothing beneath the chrome has any
-/// knowledge of tabs.
-abstract class TabPage extends ConsumerWidget {
-  const TabPage({super.key});
-
-  /// The provider that yields this tab's chrome content (app bar + slivers +
-  /// controller + decorators). Read beneath [scopeBuilder].
-  ProviderListenable<PageChromeContent> get content;
-
-  /// Produces the scope the [content] provider must be read within (e.g. the
-  /// timeline's `LayoutBuilder` + `timelineArgsProvider` override). Defaults to
-  /// the identity scope.
-  Widget scopeBuilder(BuildContext context, Widget child) => child;
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return scopeBuilder(context, PageChrome(content: content));
-  }
-}

mobile/lib/widgets/common/page_chrome/types.dart

@@ -1,51 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
-
-/// Everything a tab contributes to the single shared `PageChrome`.
-///
-/// Published per-tab via a `Provider<PageChromeContent>`; the chrome reads the
-/// active tab's value (within that tab's scope) and renders it. Data flows
-/// downward, so the chrome renders with the active tab's content in the same
-/// frame.
-class PageChromeContent {
-  /// The app bar sliver placed first in the shared scroll view. The tab decides
-  /// which bar it wants (e.g. a primary bar, or a selection bar during
-  /// multiselect).
-  final Widget appBar;
-
-  /// The tab's content slivers, rendered after [appBar].
-  final List<Widget> slivers;
-
-  /// Scroll controller for the shared scroll view. Provided by the tab when it
-  /// needs custom behaviour (e.g. the timeline's position restore). When `null`,
-  /// the chrome creates and owns a default controller.
-  final ScrollController? controller;
-
-  /// Optionally decorates the shared scroll view, e.g. wrapping it in the
-  /// timeline's `Scrubber`. Receives the built scroll view and returns the
-  /// widget to place in the body.
-  final Widget Function(CustomScrollView scrollView)? viewportBuilder;
-
-  final Widget? floatingActionButton;
-
-  /// Widgets stacked on top of the scroll view (e.g. bottom sheet, multiselect
-  /// status button).
-  final List<Widget> overlays;
-
-  final ScrollPhysics? physics;
-
-  /// Forwarded to the shared [CustomScrollView] (e.g. the timeline's larger
-  /// cache extent).
-  final ScrollCacheExtent? scrollCacheExtent;
-
-  const PageChromeContent({
-    required this.appBar,
-    this.slivers = const [],
-    this.controller,
-    this.viewportBuilder,
-    this.floatingActionButton,
-    this.overlays = const [],
-    this.physics,
-    this.scrollCacheExtent,
-  });
-}

mobile/openapi/.openapi-generator/VERSION

@@ -1 +1 @@
-7.22.0
+7.23.0

mobile/openapi/README.md

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

mobile/openapi/lib/api_client.dart

@@ -97,9 +97,9 @@ class ApiClient {
       if (nullableHeaderParams != null) {
         request.headers.addAll(nullableHeaderParams);
       }
-      if (msgBody is String) {
+      if (msgBody is String && msgBody.isNotEmpty) {
         request.body = msgBody;
-      } else if (msgBody is List<int>) {
+      } else if (msgBody is List<int> && msgBody.isNotEmpty) {
         request.bodyBytes = msgBody;
       } else if (msgBody is Map<String, String>) {
         request.bodyFields = msgBody;

mobile/openapi/lib/model/time_bucket_asset_response_dto.dart

@@ -35,16 +35,16 @@ class TimeBucketAssetResponseDto {
   });
 
   /// Array of city names extracted from EXIF GPS data
-  Optional<List<String>?> city;
+  Optional<List<String?>?> city;
 
   /// Array of country names extracted from EXIF GPS data
-  Optional<List<String>?> country;
+  Optional<List<String?>?> country;
 
   /// Array of UTC timestamps when each asset was originally uploaded to Immich
   List<String> createdAt;
 
   /// Array of video/gif durations in milliseconds (null for static images)
-  List<int> duration;
+  List<int?> duration;
 
   /// Array of file creation timestamps in UTC
   List<String> fileCreatedAt;
@@ -62,22 +62,22 @@ class TimeBucketAssetResponseDto {
   List<bool> isTrashed;
 
   /// Array of latitude coordinates extracted from EXIF GPS data
-  Optional<List<num>?> latitude;
+  Optional<List<num?>?> latitude;
 
   /// Array of live photo video asset IDs (null for non-live photos)
-  List<String> livePhotoVideoId;
+  List<String?> livePhotoVideoId;
 
   /// Array of UTC offset hours at the time each photo was taken. Positive values are east of UTC, negative values are west of UTC. Values may be fractional (e.g., 5.5 for +05:30, -9.75 for -09:45). Applying this offset to 'fileCreatedAt' will give you the time the photo was taken from the photographer's perspective.
   List<num> localOffsetHours;
 
   /// Array of longitude coordinates extracted from EXIF GPS data
-  Optional<List<num>?> longitude;
+  Optional<List<num?>?> longitude;
 
   /// Array of owner IDs for each asset
   List<String> ownerId;
 
   /// Array of projection types for 360° content (e.g., \"EQUIRECTANGULAR\", \"CUBEFACE\", \"CYLINDRICAL\")
-  List<String> projectionType;
+  List<String?> projectionType;
 
   /// Array of aspect ratios (width/height) for each asset
   List<num> ratio;
@@ -86,7 +86,7 @@ class TimeBucketAssetResponseDto {
   Optional<List<List<String>?>?> stack;
 
   /// Array of BlurHash strings for generating asset previews (base64 encoded)
-  List<String> thumbhash;
+  List<String?> thumbhash;
 
   /// Array of visibility statuses for each asset (e.g., ARCHIVE, TIMELINE, HIDDEN, LOCKED)
   List<AssetVisibility> visibility;

mobile/packages/ui/lib/immich_ui.dart

@@ -1,5 +1,4 @@
 export 'src/color_override.dart';
-export 'src/components/app_bar/app_bar.dart';
 export 'src/components/close_button.dart';
 export 'src/components/column_button.dart';
 export 'src/components/form.dart';

mobile/packages/ui/lib/src/color_override.dart

@@ -3,7 +3,7 @@ import 'package:flutter/widgets.dart';
 class ImmichColorOverride extends InheritedWidget {
   const ImmichColorOverride({super.key, required this.color, required super.child});
 
-  final Color color;
+  final Color? color;
 
   static Color? maybeOf(BuildContext context) =>
       context.dependOnInheritedWidgetOfExactType<ImmichColorOverride>()?.color;

mobile/packages/ui/lib/src/components/app_bar/app_bar.dart

@@ -1,62 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_ui/src/constants.dart';
-
-/// A generic, domain-free sliver app bar primitive.
-///
-/// It only handles layout, theming and the optional dim animation. Callers are
-/// responsible for supplying the [title], [leading] and [actions] widgets.
-class ImmichSliverAppBar extends StatelessWidget {
-  final Widget? title;
-  final Widget? leading;
-  final bool automaticallyImplyLeading;
-  final List<Widget> actions;
-  final bool floating;
-  final bool pinned;
-  final bool snap;
-  final double? expandedHeight;
-
-  /// When `true`, the bar fades out and stops receiving pointer events.
-  final bool dimmed;
-
-  const ImmichSliverAppBar({
-    super.key,
-    this.title,
-    this.leading,
-    this.automaticallyImplyLeading = false,
-    this.actions = const [],
-    this.floating = true,
-    this.pinned = false,
-    this.snap = true,
-    this.expandedHeight,
-    this.dimmed = false,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final colorScheme = Theme.of(context).colorScheme;
-
-    return SliverIgnorePointer(
-      ignoring: dimmed,
-      sliver: SliverAnimatedOpacity(
-        duration: ImmichDuration.moderate,
-        opacity: dimmed ? 0 : 1,
-        sliver: SliverAppBar(
-          backgroundColor: colorScheme.surface,
-          surfaceTintColor: colorScheme.surfaceTint,
-          elevation: ImmichElevation.none,
-          scrolledUnderElevation: ImmichElevation.xs,
-          floating: floating,
-          pinned: pinned,
-          snap: snap,
-          expandedHeight: expandedHeight,
-          shape: const RoundedRectangleBorder(borderRadius: BorderRadius.vertical(bottom: Radius.circular(5))),
-          automaticallyImplyLeading: automaticallyImplyLeading,
-          leading: leading,
-          centerTitle: false,
-          title: title,
-          actions: actions,
-        ),
-      ),
-    );
-  }
-}

mobile/pubspec.lock

@@ -366,18 +366,18 @@ packages:
     dependency: "direct main"
     description:
       name: drift
-      sha256: "8033500116b24398fba0cca0369cc31678cd627c01e41753a61186911cea743e"
+      sha256: "6cc0b623c0e83f7080524d8396e9301b1d78b9c66a4fdceeb0f798211303254c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.33.0"
+    version: "2.34.0"
   drift_dev:
     dependency: "direct dev"
     description:
       name: drift_dev
-      sha256: b3dd5b75e30522a91da8abda9f5bb17230cb038097f6d15fa75d42bb563428aa
+      sha256: "9cfff1576b49725da0d32c040651a41ae195e8c4af8d8da301593e41d7abc2f7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.33.0"
+    version: "2.34.0"
   drift_sqlite_async:
     dependency: "direct main"
     description:
@@ -772,10 +772,10 @@ packages:
     dependency: "direct main"
     description:
       name: home_widget
-      sha256: "908d033514a981f829fd98213909e11a428104327be3b422718aa643ac9d084a"
+      sha256: fece84c7464099873c3ace38394ad7053509a4b0e36e57a1105a6aa31f47f23c
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.1"
+    version: "0.9.3"
   hooks:
     dependency: transitive
     description:

mobile/pubspec.yaml

@@ -19,7 +19,7 @@ dependencies:
   crypto: ^3.0.7
   device_info_plus: ^12.4.0
   diacritic: ^0.1.6
-  drift: ^2.32.1
+  drift: ^2.34.0
   drift_sqlite_async: 0.3.1
   dynamic_color: ^1.8.1
   easy_localization: ^3.0.8
@@ -35,7 +35,7 @@ dependencies:
   flutter_web_auth_2: ^5.0.2
   fluttertoast: ^8.2.14
   geolocator: ^14.0.2
-  home_widget: ^0.8.1
+  home_widget: ^0.9.3
   hooks_riverpod: ^2.6.1
   http: ^1.6.0
   image_picker: ^1.2.1
@@ -96,7 +96,7 @@ dev_dependencies:
   auto_route_generator: ^10.5.0
   build_runner: ^2.13.1
   # Drift generator
-  drift_dev: ^2.32.1
+  drift_dev: ^2.34.0
   fake_async: ^1.3.3
   file: ^7.0.1 # for MemoryFileSystem
   flutter_launcher_icons: ^0.14.4

mobile/test/unit/factories/remote_asset_factory.dart

@@ -5,7 +5,14 @@ import '../../utils.dart';
 class RemoteAssetFactory {
   const RemoteAssetFactory();
 
-  static RemoteAsset create({String? id, String? name, String? ownerId, bool isFavorite = false}) {
+  static RemoteAsset create({
+    String? id,
+    String? name,
+    String? ownerId,
+    bool isFavorite = false,
+    AssetVisibility visibility = AssetVisibility.timeline,
+    String? stackId,
+  }) {
     id = TestUtils.uuid(id);
 
     return RemoteAsset(
@@ -17,6 +24,8 @@ class RemoteAssetFactory {
       createdAt: TestUtils.yesterday(),
       updatedAt: TestUtils.now(),
       isFavorite: isFavorite,
+      visibility: visibility,
+      stackId: stackId,
       isEdited: false,
     );
   }

mobile/test/unit/presentation/action_buttons/share_action_button_test.dart

@@ -0,0 +1,117 @@
+import 'dart:async';
+
+import 'package:drift/drift.dart';
+import 'package:drift/native.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/settings_key.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
+import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+
+import '../../factories/remote_asset_factory.dart';
+import '../presentation_context.dart';
+
+class _RecordingActionNotifier extends ActionNotifier {
+  final List<ShareAssetType> sharedFileTypes = [];
+
+  @override
+  void build() {}
+
+  @override
+  Future<ActionResult> shareAssets(
+    ActionSource source,
+    BuildContext context, {
+    ShareAssetType fileType = ShareAssetType.original,
+    Completer<void>? cancelCompleter,
+    void Function(double progress)? onAssetDownloadProgress,
+  }) async {
+    sharedFileTypes.add(fileType);
+    return const ActionResult(count: 1, success: true);
+  }
+}
+
+class _FakeAssetViewerNotifier extends AssetViewerStateNotifier {
+  final BaseAsset asset;
+
+  _FakeAssetViewerNotifier(this.asset);
+
+  @override
+  AssetViewerState build() => AssetViewerState(currentAsset: asset);
+}
+
+void main() {
+  late PresentationContext context;
+  late _RecordingActionNotifier actionNotifier;
+
+  setUpAll(() async {
+    final db = Drift(DatabaseConnection(NativeDatabase.memory(), closeStreamsSynchronously: true));
+    await SettingsRepository.ensureInitialized(db);
+  });
+
+  setUp(() async {
+    context = await PresentationContext.create();
+    actionNotifier = _RecordingActionNotifier();
+    await SettingsRepository.instance.clear([SettingsKey.shareFileType]);
+  });
+
+  tearDown(() {
+    context.dispose();
+  });
+
+  Future<void> pumpShareButton(WidgetTester tester) async {
+    final asset = RemoteAssetFactory.create(ownerId: context.currentUser.id);
+    await tester.pumpTestWidget(
+      context,
+      const ShareActionButton(source: ActionSource.viewer),
+      overrides: [
+        actionProvider.overrideWith(() => actionNotifier),
+        assetViewerProvider.overrideWith(() => _FakeAssetViewerNotifier(asset)),
+      ],
+    );
+  }
+
+  Future<void> longPressAndPickPreview(WidgetTester tester) async {
+    await tester.longPress(find.byType(BaseActionButton));
+    await tester.pumpAndSettle();
+    await tester.tap(find.byIcon(Icons.photo_size_select_large_rounded));
+    await tester.pumpAndSettle();
+  }
+
+  group('ShareActionButton', () {
+    testWidgets('single press shares with the configured default quality', (tester) async {
+      await pumpShareButton(tester);
+
+      await tester.tap(find.byType(BaseActionButton));
+      await tester.pumpAndSettle();
+
+      expect(actionNotifier.sharedFileTypes, [ShareAssetType.original]);
+    });
+
+    testWidgets('long press shares with the quality picked in the dialog', (tester) async {
+      await pumpShareButton(tester);
+
+      await longPressAndPickPreview(tester);
+
+      expect(actionNotifier.sharedFileTypes, [ShareAssetType.preview]);
+    });
+
+    testWidgets('quality picked on long press is a one-time choice and does not change the default', (tester) async {
+      await pumpShareButton(tester);
+
+      await longPressAndPickPreview(tester);
+      expect(actionNotifier.sharedFileTypes, [ShareAssetType.preview]);
+
+      await tester.tap(find.byType(BaseActionButton));
+      await tester.pumpAndSettle();
+
+      expect(actionNotifier.sharedFileTypes, [ShareAssetType.preview, ShareAssetType.original]);
+      expect(SettingsRepository.instance.appConfig.share.fileType, ShareAssetType.original);
+    });
+  });
+}

mobile/test/unit/utils/asset_filter_test.dart

@@ -0,0 +1,200 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/utils/asset_filter.dart';
+
+import '../factories/local_asset_factory.dart';
+import '../factories/remote_asset_factory.dart';
+
+void main() {
+  group('AssetFilter', () {
+    group('type promotion', () {
+      test('a bare filter retains every BaseAsset', () {
+        final remoteAsset = RemoteAssetFactory.create();
+        final localAsset = LocalAssetFactory.create();
+
+        final AssetFilter<BaseAsset> filter = AssetFilter(<BaseAsset>[remoteAsset, localAsset]);
+
+        expect(filter.toList(), [remoteAsset, localAsset]);
+      });
+
+      test('remote keeps only remote assets', () {
+        final remoteAsset = RemoteAssetFactory.create();
+        final localAsset = LocalAssetFactory.create();
+
+        final AssetFilter<RemoteAsset> remoteOnly = AssetFilter(<BaseAsset>[remoteAsset, localAsset]).remote();
+
+        expect(remoteOnly.toList(), [remoteAsset]);
+      });
+
+      test('local keeps only local assets', () {
+        final remoteAsset = RemoteAssetFactory.create();
+        final localAsset = LocalAssetFactory.create();
+
+        final AssetFilter<LocalAsset> localOnly = AssetFilter(<BaseAsset>[remoteAsset, localAsset]).local();
+
+        expect(localOnly.toList(), [localAsset]);
+      });
+
+      test('owned promotes to RemoteAsset and drops local assets', () {
+        final remoteAsset = RemoteAssetFactory.create();
+        final localAsset = LocalAssetFactory.create();
+
+        final AssetFilter<RemoteAsset> remoteOnly = AssetFilter(<BaseAsset>[
+          remoteAsset,
+          localAsset,
+        ]).owned(remoteAsset.ownerId);
+
+        expect(remoteOnly.toList(), [remoteAsset]);
+      });
+
+      test('backedUp promotes to LocalAsset and drops remote assets', () {
+        final syncedPhoto = LocalAssetFactory.create().copyWith(remoteId: 'remote');
+        final offlinePhoto = LocalAssetFactory.create();
+        final remotePhoto = RemoteAssetFactory.create();
+
+        final AssetFilter<LocalAsset> syncedPhotos = AssetFilter(<BaseAsset>[
+          syncedPhoto,
+          offlinePhoto,
+          remotePhoto,
+        ]).backedUp();
+
+        expect(syncedPhotos.toList(), [syncedPhoto]);
+      });
+    });
+
+    group('named filters', () {
+      test('owned keeps only assets of the given owner', () {
+        final asset1 = RemoteAssetFactory.create();
+        final asset2 = RemoteAssetFactory.create();
+
+        final alexPhotos = AssetFilter([asset1, asset2]).owned(asset1.ownerId);
+
+        expect(alexPhotos.toList(), [asset1]);
+      });
+
+      test('favorites keeps only favorite assets', () {
+        final asset1 = RemoteAssetFactory.create(isFavorite: true);
+        final asset2 = RemoteAssetFactory.create(ownerId: asset1.ownerId);
+
+        final favorites = AssetFilter([asset1, asset2]).favorite();
+
+        expect(favorites.toList(), [asset1]);
+      });
+
+      test('type keeps only assets of the given type', () {
+        final image = RemoteAssetFactory.create();
+        final video = RemoteAssetFactory.create(ownerId: image.ownerId).copyWith(type: .video);
+
+        final videos = AssetFilter([image, video]).type(.video);
+
+        expect(videos.toList(), [video]);
+      });
+
+      test('visibility keeps only assets with the given visibility', () {
+        final locked = RemoteAssetFactory.create(visibility: AssetVisibility.locked);
+        final onTimeline = RemoteAssetFactory.create(ownerId: locked.ownerId);
+
+        final lockedPhotos = AssetFilter([locked, onTimeline]).visibility(.locked);
+
+        expect(lockedPhotos.toList(), [locked]);
+      });
+
+      test('archived keeps only archived assets', () {
+        final archived = RemoteAssetFactory.create(visibility: AssetVisibility.archive);
+        final onTimeline = RemoteAssetFactory.create(ownerId: archived.ownerId);
+
+        final archivedPhotos = AssetFilter([archived, onTimeline]).archived();
+
+        expect(archivedPhotos.toList(), [archived]);
+      });
+
+      test('stacked keeps only assets belonging to a stack', () {
+        final stacked = RemoteAssetFactory.create(stackId: 'stack');
+        final loose = RemoteAssetFactory.create(ownerId: stacked.ownerId);
+
+        final stackedPhotos = AssetFilter([stacked, loose]).stacked();
+
+        expect(stackedPhotos.toList(), [stacked]);
+      });
+    });
+
+    group('inversion', () {
+      test('notArchived keeps every non-archived visibility', () {
+        final archived = RemoteAssetFactory.create(visibility: AssetVisibility.archive);
+        final onTimeline = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.timeline);
+        final hidden = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.hidden);
+        final locked = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.locked);
+
+        final visiblePhotos = AssetFilter([archived, onTimeline, hidden, locked]).archived(isArchived: false);
+
+        expect(visiblePhotos.toSet(), {onTimeline, hidden, locked});
+      });
+
+      test('notVisibility keeps every asset not at the target visibility', () {
+        final archived = RemoteAssetFactory.create(visibility: AssetVisibility.archive);
+        final onTimeline = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.timeline);
+        final locked = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.locked);
+
+        final toArchive = AssetFilter([archived, onTimeline, locked]).notVisibility(.archive);
+
+        expect(toArchive.toSet(), {onTimeline, locked});
+      });
+
+      test('notStacked keeps only assets without a stack', () {
+        final stacked = RemoteAssetFactory.create(stackId: 'stack');
+        final loose = RemoteAssetFactory.create(ownerId: stacked.ownerId);
+
+        final loosePhotos = AssetFilter([stacked, loose]).stacked(isStacked: false);
+
+        expect(loosePhotos.toList(), [loose]);
+      });
+
+      test('whereNot inverts an arbitrary predicate', () {
+        final favorite = RemoteAssetFactory.create(isFavorite: true);
+        final regular = RemoteAssetFactory.create(ownerId: favorite.ownerId);
+
+        final nonFavorites = AssetFilter([favorite, regular]).whereNot((asset) => asset.isFavorite);
+
+        expect(nonFavorites.toList(), [regular]);
+      });
+
+      test('notFavorites keeps only non-favorite assets', () {
+        final favorite = RemoteAssetFactory.create(isFavorite: true);
+        final regular = RemoteAssetFactory.create(ownerId: favorite.ownerId);
+
+        final nonFavorites = AssetFilter([favorite, regular]).favorite(isFavorite: false);
+
+        expect(nonFavorites.toList(), [regular]);
+      });
+    });
+
+    group('chaining', () {
+      test('combines predicates across owner, visibility and stack', () {
+        final asset = RemoteAssetFactory.create();
+        final wrongOwner = RemoteAssetFactory.create();
+        final archived = RemoteAssetFactory.create(ownerId: asset.ownerId, visibility: AssetVisibility.archive);
+        final stacked = RemoteAssetFactory.create(ownerId: asset.ownerId, stackId: 'stack-1');
+        final localPhoto = LocalAssetFactory.create();
+
+        final result = AssetFilter(<BaseAsset>[
+          asset,
+          wrongOwner,
+          archived,
+          stacked,
+          localPhoto,
+        ]).owned(asset.ownerId).archived(isArchived: false).stacked(isStacked: false);
+
+        expect(result.toList(), [asset]);
+      });
+
+      test('a base filter after a promotion retains the promoted type', () {
+        final favorite = RemoteAssetFactory.create(isFavorite: true);
+        final regular = RemoteAssetFactory.create(ownerId: favorite.ownerId);
+
+        final AssetFilter<RemoteAsset> result = AssetFilter([favorite, regular]).owned(favorite.ownerId).favorite();
+
+        expect(result.toList(), [favorite]);
+      });
+    });
+  });
+}

open-api/bin/generate-dart-sdk.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-OPENAPI_GENERATOR_VERSION=v7.22.0
+OPENAPI_GENERATOR_VERSION=v7.23.0
 
 set -euo pipefail
 
@@ -23,7 +23,6 @@ patch --no-backup-if-mismatch -u ../mobile/openapi/lib/api_client.dart <./patch/
 patch --no-backup-if-mismatch -u ../mobile/openapi/lib/api.dart <./patch/api.dart.patch
 patch --no-backup-if-mismatch -u ../mobile/openapi/pubspec.yaml <./patch/pubspec_immich_mobile.yaml.patch
 patch --no-backup-if-mismatch -u ../mobile/openapi/lib/model/asset_edit_action_item_dto.dart <./patch/asset_edit_action_item_dto.dart.patch
-patch --no-backup-if-mismatch -u ../mobile/openapi/lib/model/time_bucket_asset_response_dto.dart <./patch/time_bucket_asset_response_dto.dart.patch
 # Don't include analysis_options.yaml for the generated openapi files
 # so that language servers can properly exclude the mobile/openapi directory
 rm ../mobile/openapi/analysis_options.yaml

open-api/openapitools.json

@@ -2,6 +2,6 @@
   "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
   "spaces": 2,
   "generator-cli": {
-    "version": "7.22.0"
+    "version": "7.23.0"
   }
 }

open-api/patch/api_client.dart.patch

@@ -1,96 +1,30 @@
 @@ -13,7 +13,7 @@
  class ApiClient {
    ApiClient({this.basePath = '/api', this.authentication,});
- 
+
 -  final String basePath;
 +  String basePath;
    final Authentication? authentication;
- 
+
    var _client = Client();
-@@ -44,8 +44,9 @@
-     Object? body,
-     Map<String, String> headerParams,
-     Map<String, String> formParams,
--    String? contentType,
--  ) async {
-+    String? contentType, {
-+    Future<void>? abortTrigger,
-+  }) async {
-     await authentication?.applyToParams(queryParams, headerParams);
- 
-     headerParams.addAll(_defaultHeaderMap);
-@@ -63,7 +64,7 @@
-         body is MultipartFile && (contentType == null ||
-         !contentType.toLowerCase().startsWith('multipart/form-data'))
-       ) {
--        final request = StreamedRequest(method, uri);
-+        final request = AbortableStreamedRequest(method, uri, abortTrigger: abortTrigger);
-         request.headers.addAll(headerParams);
-         request.contentLength = body.length;
-         body.finalize().listen(
-@@ -78,7 +79,7 @@
-       }
- 
-       if (body is MultipartRequest) {
--        final request = MultipartRequest(method, uri);
-+        final request = AbortableMultipartRequest(method, uri, abortTrigger: abortTrigger);
-         request.fields.addAll(body.fields);
-         request.files.addAll(body.files);
-         request.headers.addAll(body.headers);
-@@ -92,14 +93,19 @@
-         : await serializeAsync(body);
-       final nullableHeaderParams = headerParams.isEmpty ? null : headerParams;
- 
--      switch(method) {
--        case 'POST': return await _client.post(uri, headers: nullableHeaderParams, body: msgBody,);
--        case 'PUT': return await _client.put(uri, headers: nullableHeaderParams, body: msgBody,);
--        case 'DELETE': return await _client.delete(uri, headers: nullableHeaderParams, body: msgBody,);
--        case 'PATCH': return await _client.patch(uri, headers: nullableHeaderParams, body: msgBody,);
--        case 'HEAD': return await _client.head(uri, headers: nullableHeaderParams,);
--        case 'GET': return await _client.get(uri, headers: nullableHeaderParams,);
-+      final request = AbortableRequest(method, uri, abortTrigger: abortTrigger);
-+      if (nullableHeaderParams != null) {
-+        request.headers.addAll(nullableHeaderParams);
-       }
-+      if (msgBody is String) {
-+        request.body = msgBody;
-+      } else if (msgBody is List<int>) {
-+        request.bodyBytes = msgBody;
-+      } else if (msgBody is Map<String, String>) {
-+        request.bodyFields = msgBody;
-+      }
-+      final response = await _client.send(request);
-+      return Response.fromStream(response);
-     } on SocketException catch (error, trace) {
-       throw ApiException.withInner(
-         HttpStatus.badRequest,
-@@ -136,26 +146,21 @@
-         trace,
-       );
-     }
--
--    throw ApiException(
--      HttpStatus.badRequest,
--      'Invalid HTTP operation: $method $path',
--    );
+@@ -143,19 +143,19 @@
+     );
    }
- 
+
 -  Future<dynamic> deserializeAsync(String value, String targetType, {bool growable = false,}) async =>
 +  Future<dynamic> deserializeAsync(String value, String targetType, {bool growable = false,}) =>
      // ignore: deprecated_member_use_from_same_package
      deserialize(value, targetType, growable: growable);
- 
+
    @Deprecated('Scheduled for removal in OpenAPI Generator 6.x. Use deserializeAsync() instead.')
 -  dynamic deserialize(String value, String targetType, {bool growable = false,}) {
 +  Future<dynamic> deserialize(String value, String targetType, {bool growable = false,}) async {
      // Remove all spaces. Necessary for regular expressions as well.
      targetType = targetType.replaceAll(' ', ''); // ignore: parameter_assignments
- 
+
      // If the expected target type is String, nothing to do...
      return targetType == 'String'
        ? value
 -      : fromJson(json.decode(value), targetType, growable: growable);
 +      : fromJson(await compute((String j) => json.decode(j), value), targetType, growable: growable);
    }
- 
-   // ignore: deprecated_member_use_from_same_package

open-api/patch/time_bucket_asset_response_dto.dart.patch

@@ -1,9 +0,0 @@
-@@ -83,7 +83,7 @@
-   List<num> ratio;
- 
-   /// Array of stack information as [stackId, assetCount] tuples (null for non-stacked assets)
--  Optional<List<List<String>>?> stack;
-+  Optional<List<List<String>?>?> stack;
- 
-   /// Array of BlurHash strings for generating asset previews (base64 encoded)
-   List<String> thumbhash;

open-api/templates/mobile/api.mustache.patch

@@ -1,11 +1,8 @@
 --- api.mustache
 +++ api.mustache.modified
-@@ -49,9 +49,9 @@
-   ///
-     {{/-last}}
+@@ -51,7 +51,7 @@
    {{/allParams}}
--  Future<Response> {{{nickname}}}WithHttpInfo({{#allParams}}{{#required}}{{{dataType}}} {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{ {{#allParams}}{{^required}}{{{dataType}}}? {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}} }{{/hasOptionalParams}}) async {
-+  Future<Response> {{{nickname}}}WithHttpInfo({{#allParams}}{{#required}}{{{dataType}}} {{{paramName}}}, {{/required}}{{/allParams}}{ {{#allParams}}{{^required}}{{{dataType}}}? {{{paramName}}}, {{/required}}{{/allParams}}Future<void>? abortTrigger, }) async {
+   Future<Response> {{{nickname}}}WithHttpInfo({{#allParams}}{{#required}}{{{dataType}}} {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{ {{#allParams}}{{^required}}{{{dataType}}}? {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}} }{{/hasOptionalParams}}) async {
      // ignore: prefer_const_declarations
 -    final path = r'{{{path}}}'{{#pathParams}}
 +    final apiPath = r'{{{path}}}'{{#pathParams}}
@@ -21,7 +18,7 @@
      {{#formParams}}
      {{^isFile}}
      if ({{{paramName}}} != null) {
-@@ -121,13 +121,14 @@
+@@ -121,7 +121,7 @@
      {{/isMultipart}}
  
      return apiClient.invokeAPI(
@@ -30,21 +27,3 @@
        '{{{httpMethod}}}',
        queryParams,
        postBody,
-       headerParams,
-       formParams,
-       contentTypes.isEmpty ? null : contentTypes.first,
-+      abortTrigger: abortTrigger,
-     );
-   }
- 
-@@ -161,8 +162,8 @@
-   ///
-     {{/-last}}
-   {{/allParams}}
--  Future<{{#returnType}}{{{.}}}?{{/returnType}}{{^returnType}}void{{/returnType}}> {{{nickname}}}({{#allParams}}{{#required}}{{{dataType}}} {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}}{{#hasOptionalParams}}{ {{#allParams}}{{^required}}{{{dataType}}}? {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}} }{{/hasOptionalParams}}) async {
--    final response = await {{{nickname}}}WithHttpInfo({{#allParams}}{{#required}}{{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}}{{#hasOptionalParams}} {{#allParams}}{{^required}}{{{paramName}}}: {{{paramName}}},{{^-last}} {{/-last}}{{/required}}{{/allParams}} {{/hasOptionalParams}});
-+  Future<{{#returnType}}{{{.}}}?{{/returnType}}{{^returnType}}void{{/returnType}}> {{{nickname}}}({{#allParams}}{{#required}}{{{dataType}}} {{{paramName}}}, {{/required}}{{/allParams}}{ {{#allParams}}{{^required}}{{{dataType}}}? {{{paramName}}}, {{/required}}{{/allParams}}Future<void>? abortTrigger, }) async {
-+    final response = await {{{nickname}}}WithHttpInfo({{#allParams}}{{#required}}{{{paramName}}}, {{/required}}{{/allParams}}{{#allParams}}{{^required}}{{{paramName}}}: {{{paramName}}}, {{/required}}{{/allParams}}abortTrigger: abortTrigger,);
-     if (response.statusCode >= HttpStatus.badRequest) {
-       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-     }

open-api/templates/mobile/serialization/native/native_class.mustache.patch

@@ -26,155 +26,3 @@
        return {{{classname}}}(
    {{#vars}}
      {{#isDateTime}}
-@@ -195,48 +181,98 @@
-         {{#complexType}}
-           {{#isArray}}
-             {{#items.isArray}}
-+              {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(json[r'{{{baseName}}}'] is List
-+          ? (json[r'{{{baseName}}}'] as List).map((e) =>
-+              {{#items.complexType}}
-+              e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.complexType}}>[]{{/items.isNullable}} : {{items.complexType}}.listFromJson(e){{#uniqueItems}}.toSet(){{/uniqueItems}}
-+              {{/items.complexType}}
-+              {{^items.complexType}}
-+              e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}>[]{{/items.isNullable}} : (e as List).map((value) => value as {{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}).toList(growable: false)
-+              {{/items.complexType}}
-+            ).toList()
-+          :  {{#isNullable}}null{{/isNullable}}{{^isNullable}}const []{{/isNullable}}) : const Optional.absent(),
-+              {{/vendorExtensions.x-is-optional}}
-+              {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: json[r'{{{baseName}}}'] is List
-           ? (json[r'{{{baseName}}}'] as List).map((e) =>
-               {{#items.complexType}}
--              {{items.complexType}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}}
-+              e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.complexType}}>[]{{/items.isNullable}} : {{items.complexType}}.listFromJson(e){{#uniqueItems}}.toSet(){{/uniqueItems}}
-               {{/items.complexType}}
-               {{^items.complexType}}
--              e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const  <{{items.items.dataType}}>[]{{/items.isNullable}} : (e as List).cast<{{items.items.dataType}}>()
-+              e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}>[]{{/items.isNullable}} : (e as List).map((value) => value as {{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}).toList(growable: false)
-               {{/items.complexType}}
-             ).toList()
-           :  {{#isNullable}}null{{/isNullable}}{{^isNullable}}const []{{/isNullable}},
-+              {{/vendorExtensions.x-is-optional}}
-             {{/items.isArray}}
-             {{^items.isArray}}
-+              {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present({{{complexType}}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}}) : const Optional.absent(),
-+              {{/vendorExtensions.x-is-optional}}
-+              {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: {{{complexType}}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}},
-+              {{/vendorExtensions.x-is-optional}}
-             {{/items.isArray}}
-           {{/isArray}}
-           {{^isArray}}
-             {{#isMap}}
-               {{#items.isArray}}
-+                {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(json[r'{{{baseName}}}'] == null ? null
-+                  {{#items.complexType}}
-+            : {{items.complexType}}.mapListFromJson(json[r'{{{baseName}}}'])) : const Optional.absent(),
-+                  {{/items.complexType}}
-+                  {{^items.complexType}}
-+            : (json[r'{{{baseName}}}'] as Map<String, dynamic>).map((k, v) => MapEntry(k, v == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}>[]{{/items.isNullable}} : (v as List).map((value) => value as {{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}).toList(growable: false)))) : const Optional.absent(),
-+                  {{/items.complexType}}
-+                {{/vendorExtensions.x-is-optional}}
-+                {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: json[r'{{{baseName}}}'] == null
-           ? {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}
--                {{#items.complexType}}
-+                  {{#items.complexType}}
-             : {{items.complexType}}.mapListFromJson(json[r'{{{baseName}}}']),
--                {{/items.complexType}}
--                {{^items.complexType}}
--            : (json[r'{{{baseName}}}'] as Map<String, dynamic>).map((k, v) => MapEntry(k, v == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}>[]{{/items.isNullable}} : (v as List).cast<{{items.items.dataType}}>())),
--                {{/items.complexType}}
-+                  {{/items.complexType}}
-+                  {{^items.complexType}}
-+            : (json[r'{{{baseName}}}'] as Map<String, dynamic>).map((k, v) => MapEntry(k, v == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}>[]{{/items.isNullable}} : (v as List).map((value) => value as {{items.items.dataType}}{{#items.items.isNullable}}?{{/items.items.isNullable}}).toList(growable: false))),
-+                  {{/items.complexType}}
-+                {{/vendorExtensions.x-is-optional}}
-               {{/items.isArray}}
-               {{^items.isArray}}
-                 {{#items.isMap}}
-                   {{#items.complexType}}
-+                    {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present({{items.complexType}}.mapFromJson(json[r'{{{baseName}}}'])) : const Optional.absent(),
-+                    {{/vendorExtensions.x-is-optional}}
-+                    {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: {{items.complexType}}.mapFromJson(json[r'{{{baseName}}}']),
-+                    {{/vendorExtensions.x-is-optional}}
-                   {{/items.complexType}}
-                   {{^items.complexType}}
-+                    {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(mapCastOfType<String, dynamic>(json, r'{{{baseName}}}')) : const Optional.absent(),
-+                    {{/vendorExtensions.x-is-optional}}
-+                    {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: mapCastOfType<String, dynamic>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
-+                    {{/vendorExtensions.x-is-optional}}
-                   {{/items.complexType}}
-                 {{/items.isMap}}
-                 {{^items.isMap}}
-                   {{#items.complexType}}
-+                    {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present({{{items.complexType}}}.mapFromJson(json[r'{{{baseName}}}'])) : const Optional.absent(),
-+                    {{/vendorExtensions.x-is-optional}}
-+                    {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: {{{items.complexType}}}.mapFromJson(json[r'{{{baseName}}}']),
-+                    {{/vendorExtensions.x-is-optional}}
-                   {{/items.complexType}}
-                   {{^items.complexType}}
-+                    {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(mapCastOfType<String, {{items.dataType}}>(json, r'{{{baseName}}}')) : const Optional.absent(),
-+                    {{/vendorExtensions.x-is-optional}}
-+                    {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: mapCastOfType<String, {{items.dataType}}>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
-+                    {{/vendorExtensions.x-is-optional}}
-                   {{/items.complexType}}
-                 {{/items.isMap}}
-               {{/items.isArray}}
-@@ -259,23 +295,45 @@
-         {{^complexType}}
-           {{#isArray}}
-             {{#isEnum}}
-+              {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present({{{items.datatypeWithEnum}}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}}) : const Optional.absent(),
-+              {{/vendorExtensions.x-is-optional}}
-+              {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: {{{items.datatypeWithEnum}}}.listFromJson(json[r'{{{baseName}}}']){{#uniqueItems}}.toSet(){{/uniqueItems}},
-+              {{/vendorExtensions.x-is-optional}}
-             {{/isEnum}}
-             {{^isEnum}}
-+              {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(json[r'{{{baseName}}}'] is Iterable
-+            ? (json[r'{{{baseName}}}'] as Iterable).cast<{{{items.datatype}}}>().{{#uniqueItems}}toSet(){{/uniqueItems}}{{^uniqueItems}}toList(growable: false){{/uniqueItems}}
-+            : {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}) : const Optional.absent(),
-+              {{/vendorExtensions.x-is-optional}}
-+              {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: json[r'{{{baseName}}}'] is Iterable
-             ? (json[r'{{{baseName}}}'] as Iterable).cast<{{{items.datatype}}}>().{{#uniqueItems}}toSet(){{/uniqueItems}}{{^uniqueItems}}toList(growable: false){{/uniqueItems}}
-             : {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}},
-+              {{/vendorExtensions.x-is-optional}}
-             {{/isEnum}}
-           {{/isArray}}
-           {{^isArray}}
-             {{#isMap}}
-+              {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(mapCastOfType<String, {{{items.datatype}}}>(json, r'{{{baseName}}}')) : const Optional.absent(),
-+              {{/vendorExtensions.x-is-optional}}
-+              {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: mapCastOfType<String, {{{items.datatype}}}>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
-+              {{/vendorExtensions.x-is-optional}}
-             {{/isMap}}
-             {{^isMap}}
-               {{#isNumber}}
-+                {{#vendorExtensions.x-is-optional}}
-+        {{{name}}}: json.containsKey(r'{{{baseName}}}') ? Optional.present(json[r'{{{baseName}}}'] == null ? null : num.parse('${json[r'{{{baseName}}}']}')) : const Optional.absent(),
-+                {{/vendorExtensions.x-is-optional}}
-+                {{^vendorExtensions.x-is-optional}}
-         {{{name}}}: {{#isNullable}}json[r'{{{baseName}}}'] == null
-             ? {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}
-             : {{/isNullable}}{{{datatypeWithEnum}}}.parse('${json[r'{{{baseName}}}']}'),
-+                {{/vendorExtensions.x-is-optional}}
-               {{/isNumber}}
-               {{^isNumber}}
-                 {{#vendorExtensions.x-original-is-integer}}

package.json

@@ -8,7 +8,7 @@
     "format": "prettier --cache --check i18n/",
     "format:fix": "prettier --cache --write --list-different i18n"
   },
-  "packageManager": "pnpm@11.6.0",
+  "packageManager": "pnpm@11.11.0",
   "engines": {
     "pnpm": ">=10.0.0"
   },

packages/cli/package.json

@@ -25,7 +25,7 @@
     "@types/lodash-es": "^4.17.12",
     "@types/micromatch": "^4.0.9",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "^24.13.2",
+    "@types/node": "^24.13.3",
     "@vitest/coverage-v8": "^4.0.0",
     "byte-size": "^9.0.0",
     "cli-progress": "^3.12.0",

packages/e2e-auth-server/package.json

@@ -13,5 +13,5 @@
     "oidc-provider": "^9.0.0",
     "tsx": "^4.20.6"
   },
-  "packageManager": "pnpm@11.6.0"
+  "packageManager": "pnpm@11.11.0"
 }

packages/plugin-core/manifest.json

@@ -103,6 +103,12 @@
             "default": false,
             "title": "Case sensitive",
             "description": "Whether matching should be case-sensitive"
+          },
+          "usePath": {
+            "type": "boolean",
+            "default": false,
+            "title": "Use path",
+            "description": "Match the full path on the server instead of the original filename"
           }
         },
         "required": ["pattern"]

packages/plugin-core/src/index.ts

@@ -54,11 +54,11 @@ const methods = wrapper<Manifest>({
   },
 
   assetFileFilter: ({ data, config }) => {
-    const { pattern, matchType = 'contains', caseSensitive = false } = config;
+    const { pattern, matchType = 'contains', caseSensitive = false, usePath = false } = config;
 
     const { asset } = data;
 
-    const fileName = asset.originalFileName || '';
+    const fileName = usePath ? asset.originalPath : asset.originalFileName;
     const searchName = caseSensitive ? fileName : fileName.toLowerCase();
     const searchPattern = caseSensitive ? pattern : pattern.toLowerCase();
 

packages/plugin-sdk/package.json

@@ -27,11 +27,11 @@
   "keywords": [],
   "author": "",
   "license": "GNU Affero General Public License version 3",
-  "packageManager": "pnpm@11.6.0",
+  "packageManager": "pnpm@11.11.0",
   "devDependencies": {
     "@extism/js-pdk": "^1.1.1",
     "@immich/sdk": "workspace:*",
-    "@types/node": "^24.13.2",
+    "@types/node": "^24.13.3",
     "esbuild": "^0.28.0",
     "tsc-alias": "^1.8.16",
     "typescript": "^6.0.0"

packages/scripts/package.json

@@ -27,10 +27,10 @@
     "semver": "^7.8.1"
   },
   "devDependencies": {
-    "@types/node": "^24.13.2",
+    "@types/node": "^24.13.3",
     "@types/semver": "^7.7.1",
     "vite": "^8.0.16",
     "vitest": "^4.1.8"
   },
-  "packageManager": "pnpm@11.6.0"
+  "packageManager": "pnpm@11.11.0"
 }

packages/sdk/package.json

@@ -24,7 +24,7 @@
     "@oazapfts/runtime": "^1.0.2"
   },
   "devDependencies": {
-    "@types/node": "^24.13.2",
+    "@types/node": "^24.13.3",
     "typescript": "^6.0.0"
   }
 }

pnpm-workspace.yaml

@@ -66,4 +66,4 @@ injectWorkspacePackages: true
 shamefullyHoist: false
 verifyDepsBeforeRun: install
 minimumReleaseAgeExclude:
-  - '@immich/ui@0.81.1'
+  - '@immich/ui@0.83.0'

server/package.json

@@ -49,14 +49,14 @@
     "@nestjs/websockets": "^11.0.4",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/context-async-hooks": "^2.0.0",
-    "@opentelemetry/exporter-prometheus": "^0.219.0",
-    "@opentelemetry/instrumentation-http": "^0.219.0",
-    "@opentelemetry/instrumentation-ioredis": "^0.67.0",
-    "@opentelemetry/instrumentation-nestjs-core": "^0.65.0",
-    "@opentelemetry/instrumentation-pg": "^0.71.0",
+    "@opentelemetry/exporter-prometheus": "^0.220.0",
+    "@opentelemetry/instrumentation-http": "^0.220.0",
+    "@opentelemetry/instrumentation-ioredis": "^0.68.0",
+    "@opentelemetry/instrumentation-nestjs-core": "^0.66.0",
+    "@opentelemetry/instrumentation-pg": "^0.72.0",
     "@opentelemetry/resources": "^2.0.1",
     "@opentelemetry/sdk-metrics": "^2.0.1",
-    "@opentelemetry/sdk-node": "^0.219.0",
+    "@opentelemetry/sdk-node": "^0.220.0",
     "@opentelemetry/semantic-conventions": "^1.34.0",
     "@react-email/components": "^1.0.0",
     "@react-email/render": "^2.0.0",
@@ -138,7 +138,7 @@
     "@types/luxon": "^3.6.2",
     "@types/mock-fs": "^4.13.1",
     "@types/multer": "^2.0.0",
-    "@types/node": "^24.13.2",
+    "@types/node": "^24.13.3",
     "@types/nodemailer": "^8.0.0",
     "@types/picomatch": "^4.0.0",
     "@types/pngjs": "^6.0.5",

server/src/decorators.ts

@@ -190,11 +190,11 @@ type CustomExtensions = {
 };
 
 enum ApiState {
-  'Stable' = 'Stable',
-  'Alpha' = 'Alpha',
-  'Beta' = 'Beta',
-  'Internal' = 'Internal',
-  'Deprecated' = 'Deprecated',
+  Stable = 'Stable',
+  Alpha = 'Alpha',
+  Beta = 'Beta',
+  Internal = 'Internal',
+  Deprecated = 'Deprecated',
 }
 export class HistoryBuilder {
   private hasDeprecated = false;

server/src/queries/workflow.repository.sql

@@ -25,6 +25,8 @@ select
           inner join "plugin" on "plugin"."id" = "plugin_method"."pluginId"
         where
           "workflow"."id" = "workflow_step"."workflowId"
+        order by
+          "workflow_step"."order" asc
       ) as agg
   ) as "steps"
 from
@@ -57,6 +59,8 @@ select
           inner join "plugin" on "plugin"."id" = "plugin_method"."pluginId"
         where
           "workflow"."id" = "workflow_step"."workflowId"
+        order by
+          "workflow_step"."order" asc
       ) as agg
   ) as "steps"
 from

server/src/repositories/integrity.repository.ts

@@ -154,8 +154,7 @@ export class IntegrityRepository {
       .select(['allPaths.path as path', 'allPaths.assetId', 'allPaths.fileAssetId', 'integrity_report.id as reportId'])
       .stream() as AsyncIterableIterator<
       { path: string; reportId: string | null } & (
-        | { assetId: string; fileAssetId: null }
-        | { assetId: null; fileAssetId: string }
+        { assetId: string; fileAssetId: null } | { assetId: null; fileAssetId: string }
       )
     >;
   }

server/src/repositories/workflow.repository.ts

@@ -39,7 +39,8 @@ export class WorkflowRepository {
               'plugin_method.name as methodName',
               'workflow_step.config',
               'workflow_step.enabled',
-            ]),
+            ])
+            .orderBy('workflow_step.order', 'asc'),
         ).as('steps'),
       ]);
   }

server/src/types.ts

@@ -336,8 +336,7 @@ export interface IIntegrityUntrackedFilesJob {
 
 export interface IIntegrityMissingFilesJob {
   items: ({ path: string; reportId: string | null } & (
-    | { assetId: string; fileAssetId: null }
-    | { assetId: null; fileAssetId: string }
+    { assetId: string; fileAssetId: null } | { assetId: null; fileAssetId: string }
   ))[];
 }
 
@@ -553,8 +552,7 @@ export interface MemoryData {
 export type VersionCheckMetadata = { checkedAt: string; releaseVersion: string };
 export type SystemFlags = { mountChecks: Record<StorageFolder, boolean> };
 export type MaintenanceModeState =
-  | { isMaintenanceMode: true; secret: string; action?: SetMaintenanceModeDto }
-  | { isMaintenanceMode: false };
+  { isMaintenanceMode: true; secret: string; action?: SetMaintenanceModeDto } | { isMaintenanceMode: false };
 export type MemoriesState = {
   /** memories have already been created through this date */
   lastOnThisDayDate: string;

web/package.json

@@ -27,7 +27,7 @@
     "@formatjs/icu-messageformat-parser": "^3.0.0",
     "@immich/justified-layout-wasm": "^0.4.3",
     "@immich/sdk": "workspace:*",
-    "@immich/ui": "^0.81.1",
+    "@immich/ui": "^0.83.0",
     "@mapbox/mapbox-gl-rtl-text": "0.4.0",
     "@mdi/js": "^7.4.47",
     "@noble/hashes": "^2.2.0",
@@ -76,9 +76,9 @@
     "@koddsson/eslint-plugin-tscompat": "^0.2.0",
     "@socket.io/component-emitter": "^3.1.0",
     "@sveltejs/adapter-static": "^3.0.8",
-    "@sveltejs/enhanced-img": "^0.10.4",
+    "@sveltejs/enhanced-img": "^0.11.0",
     "@sveltejs/kit": "^2.56.1",
-    "@sveltejs/vite-plugin-svelte": "7.1.2",
+    "@sveltejs/vite-plugin-svelte": "7.2.0",
     "@tailwindcss/vite": "^4.2.4",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/svelte": "^5.2.8",
@@ -105,7 +105,7 @@
     "prettier-plugin-sort-json": "^4.1.1",
     "prettier-plugin-svelte": "^4.0.0",
     "rollup-plugin-visualizer": "^7.0.0",
-    "svelte": "5.56.3",
+    "svelte": "5.56.4",
     "svelte-check": "^4.4.6",
     "svelte-eslint-parser": "^1.3.3",
     "tailwindcss": "^4.2.4",

web/src/lib/components/asset-viewer/AssetViewer.svelte

@@ -14,6 +14,7 @@
   import { authManager } from '$lib/managers/auth-manager.svelte';
   import { editManager, EditToolType } from '$lib/managers/edit/edit-manager.svelte';
   import { eventManager } from '$lib/managers/event-manager.svelte';
+  import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
   import { getAssetActions } from '$lib/services/asset.service';
   import { faceManager } from '$lib/stores/face.svelte';
   import { ocrManager } from '$lib/stores/ocr.svelte';
@@ -23,6 +24,7 @@
   import type { OnUndoDelete } from '$lib/utils/actions';
   import { navigateToAsset } from '$lib/utils/asset-utils';
   import { handleError } from '$lib/utils/handle-error';
+  import { navigate } from '$lib/utils/navigation';
   import { InvocationTracker } from '$lib/utils/invocationTracker';
   import { SlideshowHistory } from '$lib/utils/slideshow-history';
   import { toTimelineAsset } from '$lib/utils/timeline-util';
@@ -149,6 +151,15 @@
     }
   };
 
+  const onAssetsUndoArchive = async (assets: TimelineAsset[]) => {
+    if (assets.length === 0) {
+      return;
+    }
+    const restoredAsset = assets[0];
+    await assetViewerManager.setAssetId(restoredAsset.id);
+    await navigate({ targetRoute: 'current', assetId: restoredAsset.id });
+  };
+
   onMount(() => {
     syncAssetViewerOpenClass(true);
     const slideshowStateUnsubscribe = slideshowState.subscribe((value) => {
@@ -475,7 +486,7 @@
 </script>
 
 <CommandPaletteDefaultProvider name={$t('assets')} actions={[Tag, TagPeople]} />
-<OnEvents {onAssetUpdate} />
+<OnEvents {onAssetUpdate} {onAssetsUndoArchive} />
 
 <svelte:document
   bind:fullscreenElement

web/src/lib/components/shared-components/context-menu/ContextMenu.svelte

@@ -64,7 +64,7 @@
 <div
   bind:this={menuScrollView}
   class={[
-    'fixed z-1 w-max max-w-75 min-w-50 immich-scrollbar rounded-lg bg-slate-100 shadow-lg duration-250 ease-in-out',
+    'fixed z-70 w-max max-w-75 min-w-50 immich-scrollbar rounded-lg bg-slate-100 shadow-lg duration-250 ease-in-out',
     position.needScrollBar ? 'overflow-auto' : 'overflow-hidden',
   ]}
   style:left="{position.left}px"

web/src/lib/components/shared-components/map/Map.svelte

@@ -309,12 +309,12 @@
     untrack(() => map?.jumpTo({ center, zoom }));
   });
 
-  const onAssetsDelete = async () => {
+  const onAssetsChanged = async () => {
     mapMarkers = await loadMapMarkers();
   };
 </script>
 
-<OnEvents {onAssetsDelete} />
+<OnEvents onAssetsDelete={onAssetsChanged} onAssetsArchive={onAssetsChanged} onAssetsUnarchive={onAssetsChanged} />
 
 <!--  We handle style loading ourselves so we set style blank here -->
 <MapLibre

web/src/lib/managers/edit/transform-manager.svelte.ts

@@ -8,17 +8,7 @@ import { normalizeTransformEdits } from '$lib/utils/editor';
 import { handleError } from '$lib/utils/handle-error';
 
 export type CropAspectRatio =
-  | '1:1'
-  | '16:9'
-  | '4:3'
-  | '3:2'
-  | '7:5'
-  | '9:16'
-  | '3:4'
-  | '2:3'
-  | '5:7'
-  | 'free'
-  | 'reset';
+  '1:1' | '16:9' | '4:3' | '3:2' | '7:5' | '9:16' | '3:4' | '2:3' | '5:7' | 'free' | 'reset';
 
 type Region = {
   x: number;

web/src/lib/managers/event-manager.svelte.ts

@@ -16,6 +16,7 @@ import type {
   UserAdminResponseDto,
   WorkflowResponseDto,
 } from '@immich/sdk';
+import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
 import { BaseEventManager } from '$lib/utils/base-event-manager.svelte';
 import type { TreeNode } from '$lib/utils/tree-utils';
 
@@ -35,6 +36,8 @@ export type Events = {
 
   AssetUpdate: [AssetResponseDto];
   AssetsArchive: [string[]];
+  AssetsUnarchive: [TimelineAsset[]];
+  AssetsUndoArchive: [TimelineAsset[]];
   AssetsDelete: [string[]];
   AssetEditsApplied: [string];
   AssetsTag: [string[]];

web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts

@@ -1,4 +1,4 @@
-import { AssetOrder, getAssetInfo, getTimeBuckets, AssetOrderBy, type AssetResponseDto } from '@immich/sdk';
+import { AssetOrder, AssetOrderBy, getAssetInfo, getTimeBuckets, type AssetResponseDto } from '@immich/sdk';
 import { clamp, isEqual } from 'lodash-es';
 import { SvelteDate, SvelteSet } from 'svelte/reactivity';
 import { VirtualScrollManager } from '$lib/managers/VirtualScrollManager/VirtualScrollManager.svelte';
@@ -114,7 +114,15 @@ export class TimelineManager extends VirtualScrollManager {
 
     this.#unsubscribes.push(
       eventManager.on({
-        AssetUpdate: (asset: AssetResponseDto) => this.#updateAssets([toTimelineAsset(asset)]),
+        AssetUpdate: (asset: AssetResponseDto) => {
+          const timelineAsset = toTimelineAsset(asset);
+          if (this.#options.albumId || this.#options.personId) {
+            this.#updateAssets([timelineAsset]);
+          } else {
+            this.upsertAssets([timelineAsset]);
+          }
+        },
+        AssetsUnarchive: (assets) => this.upsertAssets(assets),
       }),
     );
   }

web/src/lib/utils/asset-utils.ts

@@ -24,6 +24,7 @@ import { get } from 'svelte/store';
 import type { AssetMultiSelectManager } from '$lib/managers/asset-multi-select-manager.svelte';
 import { authManager } from '$lib/managers/auth-manager.svelte';
 import { downloadManager } from '$lib/managers/download-manager.svelte';
+import { eventManager } from '$lib/managers/event-manager.svelte';
 import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
 import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
 import { downloadBlob, downloadRequest, withError } from '$lib/utils';
@@ -31,6 +32,7 @@ import { getByteUnitString } from '$lib/utils/byte-units';
 import { getFormatter } from '$lib/utils/i18n';
 import { navigate } from '$lib/utils/navigation';
 import { asQueryString } from '$lib/utils/shared-links';
+import { toTimelineAsset } from '$lib/utils/timeline-util';
 import { handleError } from './handle-error';
 
 export const tagAssets = async ({
@@ -400,7 +402,12 @@ export const toggleArchive = async (asset: AssetResponseDto) => {
     });
 
     asset.isArchived = data.isArchived;
-    toastManager.primary(asset.isArchived ? $t(`added_to_archive`) : $t(`removed_from_archive`));
+    if (asset.isArchived) {
+      const timelineAsset = toTimelineAsset(asset);
+      showUndoArchiveToast($t('added_to_archive'), [timelineAsset]);
+    } else {
+      toastManager.primary($t('removed_from_archive'));
+    }
   } catch (error) {
     handleError(error, $t('errors.unable_to_add_remove_archive', { values: { archived: asset.isArchived } }));
   }
@@ -408,7 +415,45 @@ export const toggleArchive = async (asset: AssetResponseDto) => {
   return asset;
 };
 
-export const archiveAssets = async (assets: { id: string }[], visibility: AssetVisibility) => {
+const showUndoArchiveToast = (description: string, assets: TimelineAsset[]) => {
+  const $t = get(t);
+  toastManager.primary({
+    description,
+    button: (close) => ({
+      label: $t('undo'),
+      onclick: () => {
+        close();
+        void undoArchiveAssets(assets);
+      },
+    }),
+  });
+};
+
+const undoArchiveAssets = async (assets: TimelineAsset[]) => {
+  const $t = get(t);
+  try {
+    const ids = assets.map((a) => a.id);
+    if (ids.length > 0) {
+      await updateAssets({
+        assetBulkUpdateDto: {
+          ids,
+          visibility: AssetVisibility.Timeline,
+        },
+      });
+    }
+
+    for (const asset of assets) {
+      asset.visibility = AssetVisibility.Timeline;
+    }
+    eventManager.emit('AssetsUnarchive', assets);
+    eventManager.emit('AssetsUndoArchive', assets);
+    toastManager.success($t('unarchived_count', { values: { count: assets.length } }));
+  } catch (error) {
+    handleError(error, $t('errors.unable_to_archive_unarchive', { values: { archived: false } }));
+  }
+};
+
+export const archiveAssets = async (assets: TimelineAsset[], visibility: AssetVisibility) => {
   const ids = assets.map(({ id }) => id);
   const $t = get(t);
 
@@ -419,11 +464,11 @@ export const archiveAssets = async (assets: { id: string }[], visibility: AssetV
       });
     }
 
-    toastManager.primary(
-      visibility === AssetVisibility.Archive
-        ? $t('archived_count', { values: { count: ids.length } })
-        : $t('unarchived_count', { values: { count: ids.length } }),
-    );
+    if (visibility === AssetVisibility.Archive) {
+      showUndoArchiveToast($t('archived_count', { values: { count: ids.length } }), assets);
+    } else {
+      toastManager.primary($t('unarchived_count', { values: { count: ids.length } }));
+    }
   } catch (error) {
     handleError(
       error,

web/src/lib/utils/byte-units.ts

@@ -1,11 +1,11 @@
 export const enum ByteUnit {
-  'B' = 'B',
-  'KiB' = 'KiB',
-  'MiB' = 'MiB',
-  'GiB' = 'GiB',
-  'TiB' = 'TiB',
-  'PiB' = 'PiB',
-  'EiB' = 'EiB',
+  B = 'B',
+  KiB = 'KiB',
+  MiB = 'MiB',
+  GiB = 'GiB',
+  TiB = 'TiB',
+  PiB = 'PiB',
+  EiB = 'EiB',
 }
 
 const byteUnits = [ByteUnit.B, ByteUnit.KiB, ByteUnit.MiB, ByteUnit.GiB, ByteUnit.TiB, ByteUnit.PiB, ByteUnit.EiB];

web/src/lib/utils/sw-messaging.ts

@@ -1,7 +1,6 @@
 import { ServiceWorkerMessenger } from './sw-messenger';
 
 const hasServiceWorker = globalThis.isSecureContext && 'serviceWorker' in navigator;
-// eslint-disable-next-line compat/compat
 const messenger = hasServiceWorker ? new ServiceWorkerMessenger(navigator.serviceWorker) : undefined;
 
 export function cancelImageUrl(url: string | undefined | null) {

web/src/lib/utils/timeline-util.ts

@@ -165,7 +165,10 @@ export const toTimelineAsset = (unknownAsset: AssetResponseDto | TimelineAsset):
   const people = assetResponse.people?.map((person) => person.name) || [];
 
   const localDateTime = fromISODateTimeUTCToObject(assetResponse.localDateTime);
-  const fileCreatedAt = fromISODateTimeToObject(assetResponse.fileCreatedAt, assetResponse.exifInfo?.timeZone ?? 'UTC');
+  // Keep this consistent with the bucket loader (getTimes), which stores fileCreatedAt as UTC
+  // components. The timeline sorts assets within a day by fileCreatedAt, so a mismatched
+  // representation here would place re-inserted assets (e.g. undo archive) in the wrong spot.
+  const fileCreatedAt = fromISODateTimeUTCToObject(assetResponse.fileCreatedAt);
   const createdAt = fromISODateTimeUTCToObject(assetResponse.createdAt);
 
   return {

web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte

@@ -329,6 +329,7 @@
   onPersonAssetDelete={handlePersonAssetDelete}
   onAssetsDelete={updateAssetCount}
   onAssetsArchive={updateAssetCount}
+  onAssetsUnarchive={updateAssetCount}
 />
 
 <main

web/src/routes/admin/system-settings/SettingTextarea.svelte

@@ -63,6 +63,5 @@
     {required}
     {value}
     oninput={handleInput}
-    {disabled}
-  ></textarea>
+    {disabled}></textarea>
 </div>