test: face-editor positioning, broken-asset responsiveness

* ScrollDatePicker defaults maximumDate to DateTime.now(). When no birthday exists, the picker starts at today (Feb 2026) with max also Feb 2026 — so only Jan–Feb are available for the current year.

Fix applied: Added maximumDate: DateTime(DateTime.now().year, 12, 31) at person_edit_birthday_modal.widget.dart:93, allowing all 12 months to be selected while still preventing future-year birthdays.

* fix(mobile): initialize birthday picker to past date to prevent future birthdays

When no birthday exists, initialize to 30 years ago instead of today.
This allows all 12 months to be selectable while keeping maximumDate
as DateTime.now() to prevent future birthday selection.

Fixes issue where only current months were available due to maxDate constraint.

---------

Co-authored-by: socksprox <info@shadowfly.net>

.devcontainer/devcontainer.json

@@ -2,6 +2,7 @@
   "name": "Immich - Backend, Frontend and ML",
   "service": "immich-server",
   "runServices": [
+    "immich-init",
     "immich-server",
     "redis",
     "database",
@@ -31,29 +32,8 @@
         "tasks": {
           "version": "2.0.0",
           "tasks": [
-            {
-              "label": "Fix Permissions, Install Dependencies",
-              "type": "shell",
-              "command": "[ -f /immich-devcontainer/container-start.sh ] && /immich-devcontainer/container-start.sh || exit 0",
-              "isBackground": true,
-              "presentation": {
-                "echo": true,
-                "reveal": "always",
-                "focus": false,
-                "panel": "dedicated",
-                "showReuseMessage": true,
-                "clear": false,
-                "group": "Devcontainer tasks",
-                "close": true
-              },
-              "runOptions": {
-                "runOn": "default"
-              },
-              "problemMatcher": []
-            },
             {
               "label": "Immich API Server (Nest)",
-              "dependsOn": ["Fix Permissions, Install Dependencies"],
               "type": "shell",
               "command": "[ -f /immich-devcontainer/container-start-backend.sh ] && /immich-devcontainer/container-start-backend.sh || exit 0",
               "isBackground": true,
@@ -74,7 +54,6 @@
             },
             {
               "label": "Immich Web Server (Vite)",
-              "dependsOn": ["Fix Permissions, Install Dependencies"],
               "type": "shell",
               "command": "[ -f /immich-devcontainer/container-start-frontend.sh ] && /immich-devcontainer/container-start-frontend.sh || exit 0",
               "isBackground": true,
@@ -130,8 +109,8 @@
     }
   },
   "overrideCommand": true,
-  "workspaceFolder": "/workspaces/immich",
-  "remoteUser": "node",
+  "workspaceFolder": "/usr/src/app",
+  "remoteUser": "root",
   "userEnvProbe": "loginInteractiveShell",
   "remoteEnv": {
     // The location where your uploaded files are stored

.devcontainer/mobile/container-compose-overrides.yml

@@ -1,23 +1,17 @@
 services:
+  immich-app-base:
+    image: busybox
   immich-server:
+    extends:
+      service: immich-app-base
+    profiles: !reset []
+    image: immich-server-dev:latest
     build:
       target: dev-container-mobile
     environment:
       - IMMICH_SERVER_URL=http://127.0.0.1:2283/
-    volumes: !override # bind mount host to /workspaces/immich
-      - ..:/workspaces/immich
+    volumes:
       - ${UPLOAD_LOCATION:-upload-devcontainer-volume}${UPLOAD_LOCATION:+/photos}:/data
-      - pnpm-store:/usr/src/app/.pnpm-store
-      - server-node_modules:/usr/src/app/server/node_modules
-      - web-node_modules:/usr/src/app/web/node_modules
-      - github-node_modules:/usr/src/app/.github/node_modules
-      - cli-node_modules:/usr/src/app/cli/node_modules
-      - docs-node_modules:/usr/src/app/docs/node_modules
-      - e2e-node_modules:/usr/src/app/e2e/node_modules
-      - sdk-node_modules:/usr/src/app/open-api/typescript-sdk/node_modules
-      - app-node_modules:/usr/src/app/node_modules
-      - sveltekit:/usr/src/app/web/.svelte-kit
-      - coverage:/usr/src/app/web/coverage
       - /etc/localtime:/etc/localtime:ro
   immich-web:
     env_file: !reset []

.devcontainer/mobile/devcontainer.json

@@ -2,6 +2,7 @@
   "name": "Immich - Mobile",
   "service": "immich-server",
   "runServices": [
+    "immich-init",
     "immich-server",
     "redis",
     "database",
@@ -35,7 +36,7 @@
   },
   "forwardPorts": [],
   "overrideCommand": true,
-  "workspaceFolder": "/workspaces/immich",
+  "workspaceFolder": "/usr/src/app",
   "remoteUser": "node",
   "userEnvProbe": "loginInteractiveShell",
   "remoteEnv": {

.devcontainer/server/container-common.sh

@@ -2,11 +2,6 @@
 export IMMICH_PORT="${DEV_SERVER_PORT:-2283}"
 export DEV_PORT="${DEV_PORT:-3000}"
 
-# search for immich directory inside workspace.
-# /workspaces/immich is the bind mount, but other directories can be mounted if runing
-# Devcontainer: Clone [repository|pull request] in container volumne
-WORKSPACES_DIR="/workspaces"
-IMMICH_DIR="$WORKSPACES_DIR/immich"
 IMMICH_DEVCONTAINER_LOG="$HOME/immich-devcontainer.log"
 
 log() {
@@ -30,52 +25,8 @@ run_cmd() {
     return "${PIPESTATUS[0]}"
 }
 
-# Find directories excluding /workspaces/immich
-mapfile -t other_dirs < <(find "$WORKSPACES_DIR" -mindepth 1 -maxdepth 1 -type d ! -path "$IMMICH_DIR" ! -name ".*")
-
-if [ ${#other_dirs[@]} -gt 1 ]; then
-    log "Error: More than one directory found in $WORKSPACES_DIR other than $IMMICH_DIR."
-    exit 1
-elif [ ${#other_dirs[@]} -eq 1 ]; then
-    export IMMICH_WORKSPACE="${other_dirs[0]}"
-else
-    export IMMICH_WORKSPACE="$IMMICH_DIR"
-fi
+export IMMICH_WORKSPACE="/usr/src/app"
 
 log "Found immich workspace in $IMMICH_WORKSPACE"
 log ""
 
-fix_permissions() {
-
-    log "Fixing permissions for ${IMMICH_WORKSPACE}"
-
-    # Change ownership for directories that exist
-    for dir in "${IMMICH_WORKSPACE}/.vscode" \
-        "${IMMICH_WORKSPACE}/server/upload" \
-        "${IMMICH_WORKSPACE}/.pnpm-store" \
-        "${IMMICH_WORKSPACE}/.github/node_modules" \
-        "${IMMICH_WORKSPACE}/cli/node_modules" \
-        "${IMMICH_WORKSPACE}/e2e/node_modules" \
-        "${IMMICH_WORKSPACE}/open-api/typescript-sdk/node_modules" \
-        "${IMMICH_WORKSPACE}/server/node_modules" \
-        "${IMMICH_WORKSPACE}/server/dist" \
-        "${IMMICH_WORKSPACE}/web/node_modules" \
-        "${IMMICH_WORKSPACE}/web/dist"; do
-        if [ -d "$dir" ]; then
-            run_cmd sudo chown node -R "$dir"
-        fi
-    done
-
-    log ""
-}
-
-install_dependencies() {
-
-    log "Installing dependencies"
-    (
-        cd "${IMMICH_WORKSPACE}" || exit 1
-        export CI=1 FROZEN=1 OFFLINE=1
-        run_cmd make setup-web-dev setup-server-dev
-    )
-    log ""
-}

.devcontainer/server/container-compose-overrides.yml

@@ -1,26 +1,21 @@
 services:
+  immich-app-base:
+    image: busybox
   immich-server:
+    extends:
+      service: immich-app-base
+    profiles: !reset []
+    image: immich-server-dev:latest
     build:
       target: dev-container-server
     env_file: !reset []
     hostname: immich-dev
     environment:
       - IMMICH_SERVER_URL=http://127.0.0.1:2283/
-    volumes: !override
-      - ..:/workspaces/immich
+    volumes:
       - ${UPLOAD_LOCATION:-upload-devcontainer-volume}${UPLOAD_LOCATION:+/photos}:/data
       - /etc/localtime:/etc/localtime:ro
-      - pnpm-store:/usr/src/app/.pnpm-store
-      - server-node_modules:/usr/src/app/server/node_modules
-      - web-node_modules:/usr/src/app/web/node_modules
-      - github-node_modules:/usr/src/app/.github/node_modules
-      - cli-node_modules:/usr/src/app/cli/node_modules
-      - docs-node_modules:/usr/src/app/docs/node_modules
-      - e2e-node_modules:/usr/src/app/e2e/node_modules
-      - sdk-node_modules:/usr/src/app/open-api/typescript-sdk/node_modules
-      - app-node_modules:/usr/src/app/node_modules
-      - sveltekit:/usr/src/app/web/.svelte-kit
-      - coverage:/usr/src/app/web/coverage
+      - pnpm_store_server:/buildcache/pnpm-store
       - ../plugins:/build/corePlugin
   immich-web:
     env_file: !reset []

.devcontainer/server/container-start.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-# shellcheck source=common.sh
-# shellcheck disable=SC1091
-source /immich-devcontainer/container-common.sh
-
-log "Setting up Immich dev container..."
-fix_permissions
-
-log "Setup complete, please wait while backend and frontend services automatically start"
-log
-log "If necessary, the services may be manually started using"
-log
-log "$ /immich-devcontainer/container-start-backend.sh"
-log "$ /immich-devcontainer/container-start-frontend.sh"
-log
-log "From different terminal windows, as these scripts automatically restart the server"
-log "on error, and will continuously run in a loop"

.github/workflows/check-openapi.yml

@@ -19,7 +19,7 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
 

.github/workflows/test.yml

@@ -511,7 +511,7 @@ jobs:
         run: pnpm install --frozen-lockfile
         if: ${{ !cancelled() }}
       - name: Install Playwright Browsers
-        run: npx playwright install chromium --only-shell
+        run: pnpm exec playwright install chromium --only-shell
         if: ${{ !cancelled() }}
       - name: Docker build
         run: docker compose up -d --build --renew-anon-volumes --force-recreate --remove-orphans --wait --wait-timeout 300

.pnpmfile.cjs

@@ -4,12 +4,18 @@ module.exports = {
       if (!pkg.name) {
         return pkg;
       }
+      // make exiftool-vendored.pl a regular dependency since Docker prod
+      // images build with --no-optional to reduce image size
       if (pkg.name === "exiftool-vendored") {
-        if (pkg.optionalDependencies["exiftool-vendored.pl"]) {
-          // make exiftool-vendored.pl a regular dependency
-          pkg.dependencies["exiftool-vendored.pl"] =
-            pkg.optionalDependencies["exiftool-vendored.pl"];
-          delete pkg.optionalDependencies["exiftool-vendored.pl"];
+        const binaryPackage =
+          process.platform === "win32"
+            ? "exiftool-vendored.exe"
+            : "exiftool-vendored.pl";
+
+        if (pkg.optionalDependencies[binaryPackage]) {
+          pkg.dependencies[binaryPackage] =
+            pkg.optionalDependencies[binaryPackage];
+          delete pkg.optionalDependencies[binaryPackage];
         }
       }
       return pkg;

Makefile

@@ -52,7 +52,7 @@ attach-server:
 	docker exec -it docker_immich-server_1 sh
 
 renovate:
-  LOG_LEVEL=debug npx renovate --platform=local --repository-cache=reset
+  LOG_LEVEL=debug pnpm exec renovate --platform=local --repository-cache=reset
 
 # Directories that need to be created for volumes or build output
 VOLUME_DIRS = \

cli/package.json

@@ -13,7 +13,7 @@
     "cli"
   ],
   "devDependencies": {
-    "@eslint/js": "^9.8.0",
+    "@eslint/js": "^10.0.0",
     "@immich/sdk": "workspace:*",
     "@types/byte-size": "^8.1.0",
     "@types/cli-progress": "^3.11.0",
@@ -25,11 +25,11 @@
     "byte-size": "^9.0.0",
     "cli-progress": "^3.12.0",
     "commander": "^12.0.0",
-    "eslint": "^9.14.0",
+    "eslint": "^10.0.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-unicorn": "^62.0.0",
-    "globals": "^16.0.0",
+    "eslint-plugin-unicorn": "^63.0.0",
+    "globals": "^17.0.0",
     "mock-fs": "^5.2.0",
     "prettier": "^3.7.4",
     "prettier-plugin-organize-imports": "^4.0.0",
@@ -45,8 +45,8 @@
     "build": "vite build",
     "build:dev": "vite build --sourcemap true",
     "lint": "eslint \"src/**/*.ts\" --max-warnings 0",
-    "lint:fix": "npm run lint -- --fix",
-    "prepack": "npm run build",
+    "lint:fix": "pnpm run lint --fix",
+    "prepack": "pnpm run build",
     "test": "vitest",
     "test:cov": "vitest --coverage",
     "format": "prettier --check .",

cli/src/commands/asset.spec.ts

@@ -7,7 +7,15 @@ import { describe, expect, it, MockedFunction, vi } from 'vitest';
 import { Action, checkBulkUpload, defaults, getSupportedMediaTypes, Reason } from '@immich/sdk';
 import createFetchMock from 'vitest-fetch-mock';
 
-import { checkForDuplicates, getAlbumName, startWatch, uploadFiles, UploadOptionsDto } from 'src/commands/asset';
+import {
+  checkForDuplicates,
+  deleteFiles,
+  findSidecar,
+  getAlbumName,
+  startWatch,
+  uploadFiles,
+  UploadOptionsDto,
+} from 'src/commands/asset';
 
 vi.mock('@immich/sdk');
 
@@ -309,3 +317,85 @@ describe('startWatch', () => {
     await fs.promises.rm(testFolder, { recursive: true, force: true });
   });
 });
+
+describe('findSidecar', () => {
+  let testDir: string;
+  let testFilePath: string;
+
+  beforeEach(() => {
+    testDir = fs.mkdtempSync(path.join(os.tmpdir(), 'test-sidecar-'));
+    testFilePath = path.join(testDir, 'test.jpg');
+    fs.writeFileSync(testFilePath, 'test');
+  });
+
+  afterEach(() => {
+    fs.rmSync(testDir, { recursive: true, force: true });
+  });
+
+  it('should find sidecar file with photo.xmp naming convention', () => {
+    const sidecarPath = path.join(testDir, 'test.xmp');
+    fs.writeFileSync(sidecarPath, 'xmp data');
+
+    const result = findSidecar(testFilePath);
+    expect(result).toBe(sidecarPath);
+  });
+
+  it('should find sidecar file with photo.ext.xmp naming convention', () => {
+    const sidecarPath = path.join(testDir, 'test.jpg.xmp');
+    fs.writeFileSync(sidecarPath, 'xmp data');
+
+    const result = findSidecar(testFilePath);
+    expect(result).toBe(sidecarPath);
+  });
+
+  it('should prefer photo.ext.xmp over photo.xmp when both exist', () => {
+    const sidecarPath1 = path.join(testDir, 'test.xmp');
+    const sidecarPath2 = path.join(testDir, 'test.jpg.xmp');
+    fs.writeFileSync(sidecarPath1, 'xmp data 1');
+    fs.writeFileSync(sidecarPath2, 'xmp data 2');
+
+    const result = findSidecar(testFilePath);
+    // Should return the first one found (photo.xmp) based on the order in the code
+    expect(result).toBe(sidecarPath1);
+  });
+
+  it('should return undefined when no sidecar file exists', () => {
+    const result = findSidecar(testFilePath);
+    expect(result).toBeUndefined();
+  });
+});
+
+describe('deleteFiles', () => {
+  let testDir: string;
+  let testFilePath: string;
+
+  beforeEach(() => {
+    testDir = fs.mkdtempSync(path.join(os.tmpdir(), 'test-delete-'));
+    testFilePath = path.join(testDir, 'test.jpg');
+    fs.writeFileSync(testFilePath, 'test');
+  });
+
+  afterEach(() => {
+    fs.rmSync(testDir, { recursive: true, force: true });
+  });
+
+  it('should delete asset and sidecar file when main file is deleted', async () => {
+    const sidecarPath = path.join(testDir, 'test.xmp');
+    fs.writeFileSync(sidecarPath, 'xmp data');
+
+    await deleteFiles([{ id: 'test-id', filepath: testFilePath }], [], { delete: true, concurrency: 1 });
+
+    expect(fs.existsSync(testFilePath)).toBe(false);
+    expect(fs.existsSync(sidecarPath)).toBe(false);
+  });
+
+  it('should not delete sidecar file when delete option is false', async () => {
+    const sidecarPath = path.join(testDir, 'test.xmp');
+    fs.writeFileSync(sidecarPath, 'xmp data');
+
+    await deleteFiles([{ id: 'test-id', filepath: testFilePath }], [], { delete: false, concurrency: 1 });
+
+    expect(fs.existsSync(testFilePath)).toBe(true);
+    expect(fs.existsSync(sidecarPath)).toBe(true);
+  });
+});

cli/src/commands/asset.ts

@@ -17,7 +17,7 @@ import { Matcher, watch as watchFs } from 'chokidar';
 import { MultiBar, Presets, SingleBar } from 'cli-progress';
 import { chunk } from 'lodash-es';
 import micromatch from 'micromatch';
-import { Stats, createReadStream } from 'node:fs';
+import { Stats, createReadStream, existsSync } from 'node:fs';
 import { stat, unlink } from 'node:fs/promises';
 import path, { basename } from 'node:path';
 import { Queue } from 'src/queue';
@@ -403,23 +403,6 @@ export const uploadFiles = async (
 const uploadFile = async (input: string, stats: Stats): Promise<AssetMediaResponseDto> => {
   const { baseUrl, headers } = defaults;
 
-  const assetPath = path.parse(input);
-  const noExtension = path.join(assetPath.dir, assetPath.name);
-
-  const sidecarsFiles = await Promise.all(
-    // XMP sidecars can come in two filename formats. For a photo named photo.ext, the filenames are photo.ext.xmp and photo.xmp
-    [`${noExtension}.xmp`, `${input}.xmp`].map(async (sidecarPath) => {
-      try {
-        const stats = await stat(sidecarPath);
-        return new UploadFile(sidecarPath, stats.size);
-      } catch {
-        return false;
-      }
-    }),
-  );
-
-  const sidecarData = sidecarsFiles.find((file): file is UploadFile => file !== false);
-
   const formData = new FormData();
   formData.append('deviceAssetId', `${basename(input)}-${stats.size}`.replaceAll(/\s+/g, ''));
   formData.append('deviceId', 'CLI');
@@ -429,8 +412,15 @@ const uploadFile = async (input: string, stats: Stats): Promise<AssetMediaRespon
   formData.append('isFavorite', 'false');
   formData.append('assetData', new UploadFile(input, stats.size));
 
-  if (sidecarData) {
-    formData.append('sidecarData', sidecarData);
+  const sidecarPath = findSidecar(input);
+  if (sidecarPath) {
+    try {
+      const stats = await stat(sidecarPath);
+      const sidecarData = new UploadFile(sidecarPath, stats.size);
+      formData.append('sidecarData', sidecarData);
+    } catch {
+      // noop
+    }
   }
 
   const response = await fetch(`${baseUrl}/assets`, {
@@ -446,7 +436,19 @@ const uploadFile = async (input: string, stats: Stats): Promise<AssetMediaRespon
   return response.json();
 };
 
-const deleteFiles = async (uploaded: Asset[], duplicates: Asset[], options: UploadOptionsDto): Promise<void> => {
+export const findSidecar = (filepath: string): string | undefined => {
+  const assetPath = path.parse(filepath);
+  const noExtension = path.join(assetPath.dir, assetPath.name);
+
+  // XMP sidecars can come in two filename formats. For a photo named photo.ext, the filenames are photo.ext.xmp and photo.xmp
+  for (const sidecarPath of [`${noExtension}.xmp`, `${filepath}.xmp`]) {
+    if (existsSync(sidecarPath)) {
+      return sidecarPath;
+    }
+  }
+};
+
+export const deleteFiles = async (uploaded: Asset[], duplicates: Asset[], options: UploadOptionsDto): Promise<void> => {
   let fileCount = 0;
   if (options.delete) {
     fileCount += uploaded.length;
@@ -474,7 +476,15 @@ const deleteFiles = async (uploaded: Asset[], duplicates: Asset[], options: Uplo
 
   const chunkDelete = async (files: Asset[]) => {
     for (const assetBatch of chunk(files, options.concurrency)) {
-      await Promise.all(assetBatch.map((input: Asset) => unlink(input.filepath)));
+      await Promise.all(
+        assetBatch.map(async (input: Asset) => {
+          await unlink(input.filepath);
+          const sidecarPath = findSidecar(input.filepath);
+          if (sidecarPath) {
+            await unlink(sidecarPath);
+          }
+        }),
+      );
       deletionProgress.update(assetBatch.length);
     }
   };

docs/docs/features/libraries.md

@@ -80,6 +80,10 @@ There is an automatic scan job that is scheduled to run once a day. Its schedule
 
 This job also cleans up any libraries stuck in deletion. It is possible to trigger the cleanup by clicking "Scan all libraries" in the library management page.
 
+### Deleting a Library
+
+When deleting an external library, all assets inside are immediately deleted along with the library. Note that while a library can take a long time to fully delete in the background, it is immediately removed from the library list. If the deletion process is interrupted (for example, due to server restart), it will be cleaned up in the next nightly cron job. The cleanup process can also be manually initiated by clicking the "Scan All Libraries" button in the library list.
+
 ## Usage
 
 Let's show a concrete example where we add an existing gallery to Immich. Here, we have the following folders we want to add:

docs/package.json

@@ -8,7 +8,7 @@
     "format:fix": "prettier --write .",
     "start": "docusaurus start --port 3005",
     "copy:openapi": "jq -c < ../open-api/immich-openapi-specs.json > ./static/openapi.json || exit 0",
-    "build": "npm run copy:openapi && docusaurus build",
+    "build": "pnpm run copy:openapi && docusaurus build",
     "swizzle": "docusaurus swizzle",
     "deploy": "docusaurus deploy",
     "clear": "docusaurus clear",

e2e/package.json

@@ -8,23 +8,23 @@
     "test": "vitest --run",
     "test:watch": "vitest",
     "test:maintenance": "vitest --run --config vitest.maintenance.config.ts",
-    "test:web": "npx playwright test --project=web",
-    "test:web:maintenance": "npx playwright test --project=maintenance",
-    "test:web:ui": "npx playwright test --project=ui",
-    "start:web": "npx playwright test --ui --project=web",
-    "start:web:maintenance": "npx playwright test --ui --project=maintenance",
-    "start:web:ui": "npx playwright test --ui --project=ui",
+    "test:web": "pnpm exec playwright test --project=web",
+    "test:web:maintenance": "pnpm exec playwright test --project=maintenance",
+    "test:web:ui": "pnpm exec playwright test --project=ui",
+    "start:web": "pnpm exec playwright test --ui --project=web",
+    "start:web:maintenance": "pnpm exec playwright test --ui --project=maintenance",
+    "start:web:ui": "pnpm exec playwright test --ui --project=ui",
     "format": "prettier --check .",
     "format:fix": "prettier --write .",
     "lint": "eslint \"src/**/*.ts\" --max-warnings 0",
-    "lint:fix": "npm run lint -- --fix",
+    "lint:fix": "pnpm run lint --fix",
     "check": "tsc --noEmit"
   },
   "keywords": [],
   "author": "",
   "license": "GNU Affero General Public License version 3",
   "devDependencies": {
-    "@eslint/js": "^9.8.0",
+    "@eslint/js": "^10.0.0",
     "@faker-js/faker": "^10.1.0",
     "@immich/cli": "workspace:*",
     "@immich/e2e-auth-server":  "workspace:*",
@@ -37,12 +37,12 @@
     "@types/pngjs": "^6.0.4",
     "@types/supertest": "^6.0.2",
     "dotenv": "^17.2.3",
-    "eslint": "^9.14.0",
+    "eslint": "^10.0.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-unicorn": "^62.0.0",
-    "exiftool-vendored": "^34.3.0",
-    "globals": "^16.0.0",
+    "eslint-plugin-unicorn": "^63.0.0",
+    "exiftool-vendored": "^35.0.0",
+    "globals": "^17.0.0",
     "luxon": "^3.4.4",
     "pg": "^8.11.3",
     "pngjs": "^7.0.0",

e2e/src/specs/server/api/asset.e2e-spec.ts

@@ -253,7 +253,8 @@ describe('/asset', () => {
 
         expect(status).toBe(200);
         expect(body.id).toEqual(facesAsset.id);
-        expect(body.people).toMatchObject(expectedFaces);
+        const sortedPeople = body.people.toSorted((a: any, b: any) => a.name.localeCompare(b.name));
+        expect(sortedPeople).toMatchObject(expectedFaces);
       });
     });
 

e2e/src/specs/web/asset-viewer/stack.e2e-spec.ts

@@ -1,66 +0,0 @@
-import { AssetMediaResponseDto, LoginResponseDto } from '@immich/sdk';
-import { expect, Page, test } from '@playwright/test';
-import { utils } from 'src/utils';
-
-async function ensureDetailPanelVisible(page: Page) {
-  await page.waitForSelector('#immich-asset-viewer');
-
-  const isVisible = await page.locator('#detail-panel').isVisible();
-  if (!isVisible) {
-    await page.keyboard.press('i');
-    await page.waitForSelector('#detail-panel');
-  }
-}
-
-test.describe('Asset Viewer stack', () => {
-  let admin: LoginResponseDto;
-  let assetOne: AssetMediaResponseDto;
-  let assetTwo: AssetMediaResponseDto;
-
-  test.beforeAll(async () => {
-    utils.initSdk();
-    await utils.resetDatabase();
-    admin = await utils.adminSetup();
-    await utils.updateMyPreferences(admin.accessToken, { tags: { enabled: true } });
-
-    assetOne = await utils.createAsset(admin.accessToken);
-    assetTwo = await utils.createAsset(admin.accessToken);
-    await utils.createStack(admin.accessToken, [assetOne.id, assetTwo.id]);
-
-    const tags = await utils.upsertTags(admin.accessToken, ['test/1', 'test/2']);
-    const tagOne = tags.find((tag) => tag.value === 'test/1')!;
-    const tagTwo = tags.find((tag) => tag.value === 'test/2')!;
-    await utils.tagAssets(admin.accessToken, tagOne.id, [assetOne.id]);
-    await utils.tagAssets(admin.accessToken, tagTwo.id, [assetTwo.id]);
-  });
-
-  test('stack slideshow is visible', async ({ page, context }) => {
-    await utils.setAuthCookies(context, admin.accessToken);
-    await page.goto(`/photos/${assetOne.id}`);
-
-    const stackAssets = page.locator('#stack-slideshow [data-asset]');
-    await expect(stackAssets.first()).toBeVisible();
-    await expect(stackAssets.nth(1)).toBeVisible();
-  });
-
-  test('tags of primary asset are visible', async ({ page, context }) => {
-    await utils.setAuthCookies(context, admin.accessToken);
-    await page.goto(`/photos/${assetOne.id}`);
-    await ensureDetailPanelVisible(page);
-
-    const tags = page.getByTestId('detail-panel-tags').getByRole('link');
-    await expect(tags.first()).toHaveText('test/1');
-  });
-
-  test('tags of second asset are visible', async ({ page, context }) => {
-    await utils.setAuthCookies(context, admin.accessToken);
-    await page.goto(`/photos/${assetOne.id}`);
-    await ensureDetailPanelVisible(page);
-
-    const stackAssets = page.locator('#stack-slideshow [data-asset]');
-    await stackAssets.nth(1).click();
-
-    const tags = page.getByTestId('detail-panel-tags').getByRole('link');
-    await expect(tags.first()).toHaveText('test/2');
-  });
-});

e2e/src/specs/web/shared-link.e2e-spec.ts

@@ -45,8 +45,7 @@ test.describe('Shared Links', () => {
     await page.goto(`/share/${sharedLink.key}`);
     await page.getByRole('heading', { name: 'Test Album' }).waitFor();
     await page.locator(`[data-asset-id="${asset.id}"]`).hover();
-    await page.waitForSelector('[data-group] svg');
-    await page.getByRole('checkbox').click();
+    await page.waitForSelector(`[data-asset-id="${asset.id}"] [role="checkbox"]`);
     await Promise.all([page.waitForEvent('download'), page.getByRole('button', { name: 'Download' }).click()]);
   });
 

e2e/src/ui/mock-network/face-editor-network.ts

@@ -0,0 +1,127 @@
+import { BrowserContext } from '@playwright/test';
+import { randomThumbnail } from 'src/ui/generators/timeline';
+
+// Minimal valid H.264 MP4 (8x8px, 1 frame) that browsers can decode to get videoWidth/videoHeight
+const MINIMAL_MP4_BASE64 =
+  'AAAAIGZ0eXBpc29tAAACAGlzb21pc28yYXZjMW1wNDEAAAAIZnJlZQAAAr9tZGF0AAACoAYF//+c' +
+  '3EXpvebZSLeWLNgg2SPu73gyNjQgLSBjb3JlIDEyNSAtIEguMjY0L01QRUctNCBBVkMgY29kZWMg' +
+  'LSBDb3B5bGVmdCAyMDAzLTIwMTIgLSBodHRwOi8vd3d3LnZpZGVvbGFuLm9yZy94MjY0Lmh0bWwg' +
+  'LSBvcHRpb25zOiBjYWJhYz0xIHJlZj0zIGRlYmxvY2s9MTowOjAgYW5hbHlzZT0weDM6MHgxMTMg' +
+  'bWU9aGV4IHN1Ym1lPTcgcHN5PTEgcHN5X3JkPTEuMDA6MC4wMCBtaXhlZF9yZWY9MSBtZV9yYW5n' +
+  'ZT0xNiBjaHJvbWFfbWU9MSB0cmVsbGlzPTEgOHg4ZGN0PTEgY3FtPTAgZGVhZHpvbmU9MjEsMTEg' +
+  'ZmFzdF9wc2tpcD0xIGNocm9tYV9xcF9vZmZzZXQ9LTIgdGhyZWFkcz02IGxvb2thaGVhZF90aHJl' +
+  'YWRzPTEgc2xpY2VkX3RocmVhZHM9MCBucj0wIGRlY2ltYXRlPTEgaW50ZXJsYWNlZD0wIGJsdXJh' +
+  'eV9jb21wYXQ9MCBjb25zdHJhaW5lZF9pbnRyYT0wIGJmcmFtZXM9MyBiX3B5cmFtaWQ9MiBiX2Fk' +
+  'YXB0PTEgYl9iaWFzPTAgZGlyZWN0PTEgd2VpZ2h0Yj0xIG9wZW5fZ29wPTAgd2VpZ2h0cD0yIGtl' +
+  'eWludD0yNTAga2V5aW50X21pbj0yNCBzY2VuZWN1dD00MCBpbnRyYV9yZWZyZXNoPTAgcmNfbG9v' +
+  'a2FoZWFkPTQwIHJjPWNyZiBtYnRyZWU9MSBjcmY9MjMuMCBxY29tcD0wLjYwIHFwbWluPTAgcXBt' +
+  'YXg9NjkgcXBzdGVwPTQgaXBfcmF0aW89MS40MCBhcT0xOjEuMDAAgAAAAA9liIQAV/0TAAYdeBTX' +
+  'zg8AAALvbW9vdgAAAGxtdmhkAAAAAAAAAAAAAAAAAAAD6AAAACoAAQAAAQAAAAAAAAAAAAAAAAEAAAAA' +
+  'AAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAA' +
+  'Ahl0cmFrAAAAXHRraGQAAAAPAAAAAAAAAAAAAAABAAAAAAAAACoAAAAAAAAAAAAAAAAAAAAAAAEAAAAA' +
+  'AAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAABAAAAAAAgAAAAIAAAAAAAkZWR0cwAAABxlbHN0AAAAAAAA' +
+  'AAEAAAAqAAAAAAABAAAAAAGRbWRpYQAAACBtZGhkAAAAAAAAAAAAAAAAAAAwAAAAAgBVxAAAAAAA' +
+  'LWhkbHIAAAAAAAAAAHZpZGUAAAAAAAAAAAAAAABWaWRlb0hhbmRsZXIAAAABPG1pbmYAAAAUdm1oZAAA' +
+  'AAEAAAAAAAAAAAAAACRkaW5mAAAAHGRyZWYAAAAAAAAAAQAAAAx1cmwgAAAAAQAAAPxzdGJsAAAAmHN0' +
+  'c2QAAAAAAAAAAQAAAIhhdmMxAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAgACABIAAAASAAAAAAAAAAB' +
+  'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGP//AAAAMmF2Y0MBZAAK/+EAGWdkAAqs' +
+  '2V+WXAWyAAADAAIAAAMAYB4kSywBAAZo6+PLIsAAAAAYc3R0cwAAAAAAAAABAAAAAQAAAgAAAAAcc3Rz' +
+  'YwAAAAAAAAABAAAAAQAAAAEAAAABAAAAFHN0c3oAAAAAAAACtwAAAAEAAAAUc3RjbwAAAAAAAAABAAAA' +
+  'MAAAAGJ1ZHRhAAAAWm1ldGEAAAAAAAAAIWhkbHIAAAAAAAAAAG1kaXJhcHBsAAAAAAAAAAAAAAAALWls' +
+  'c3QAAAAlqXRvbwAAAB1kYXRhAAAAAQAAAABMYXZmNTQuNjMuMTA0';
+
+export const MINIMAL_MP4_BUFFER = Buffer.from(MINIMAL_MP4_BASE64, 'base64');
+
+export type MockPerson = {
+  id: string;
+  name: string;
+  birthDate: string | null;
+  isHidden: boolean;
+  thumbnailPath: string;
+  updatedAt: string;
+};
+
+export const createMockPeople = (count: number): MockPerson[] => {
+  const names = [
+    'Alice Johnson',
+    'Bob Smith',
+    'Charlie Brown',
+    'Diana Prince',
+    'Eve Adams',
+    'Frank Castle',
+    'Grace Lee',
+    'Hank Pym',
+    'Iris West',
+    'Jack Ryan',
+  ];
+  return Array.from({ length: count }, (_, index) => ({
+    id: `person-${index}`,
+    name: names[index % names.length],
+    birthDate: null,
+    isHidden: false,
+    thumbnailPath: `/upload/thumbs/person-${index}.jpeg`,
+    updatedAt: '2025-01-01T00:00:00.000Z',
+  }));
+};
+
+export type FaceCreateCapture = {
+  requests: Array<{
+    assetId: string;
+    personId: string;
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+    imageWidth: number;
+    imageHeight: number;
+  }>;
+};
+
+export const setupFaceEditorMockApiRoutes = async (
+  context: BrowserContext,
+  mockPeople: MockPerson[],
+  faceCreateCapture: FaceCreateCapture,
+) => {
+  await context.route('**/api/people?*', async (route, request) => {
+    if (request.method() !== 'GET') {
+      return route.fallback();
+    }
+
+    return route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      json: {
+        hasNextPage: false,
+        hidden: 0,
+        people: mockPeople,
+        total: mockPeople.length,
+      },
+    });
+  });
+
+  await context.route('**/api/faces', async (route, request) => {
+    if (request.method() !== 'POST') {
+      return route.fallback();
+    }
+
+    const body = request.postDataJSON();
+    faceCreateCapture.requests.push(body);
+
+    return route.fulfill({
+      status: 201,
+      contentType: 'text/plain',
+      body: 'OK',
+    });
+  });
+
+  await context.route('**/api/people/*/thumbnail', async (route) => {
+    if (!route.request().serviceWorker()) {
+      return route.continue();
+    }
+    return route.fulfill({
+      status: 200,
+      headers: { 'content-type': 'image/jpeg' },
+      body: await randomThumbnail('person-thumb', 1),
+    });
+  });
+};

e2e/src/ui/specs/asset-viewer/face-editor.e2e-spec.ts

@@ -0,0 +1,285 @@
+import { expect, Page, test } from '@playwright/test';
+import { SeededRandom, selectRandom, TimelineAssetConfig } from 'src/ui/generators/timeline';
+import {
+  createMockPeople,
+  FaceCreateCapture,
+  MockPerson,
+  setupFaceEditorMockApiRoutes,
+} from 'src/ui/mock-network/face-editor-network';
+import { assetViewerUtils } from '../timeline/utils';
+import { setupAssetViewerFixture } from './utils';
+
+const waitForSelectorTransition = async (page: Page) => {
+  await page.waitForFunction(
+    () => {
+      const selector = document.querySelector('#face-selector') as HTMLElement | null;
+      if (!selector) {
+        return false;
+      }
+      return selector.getAnimations({ subtree: false }).every((animation) => animation.playState === 'finished');
+    },
+    undefined,
+    { timeout: 1000, polling: 50 },
+  );
+};
+
+const openFaceEditor = async (page: Page, asset: TimelineAssetConfig) => {
+  await page.goto(`/photos/${asset.id}`);
+  await assetViewerUtils.waitForViewerLoad(page, asset);
+  await page.keyboard.press('i');
+  await page.locator('#detail-panel').waitFor({ state: 'visible' });
+  await page.getByLabel('Tag people').click();
+  await page.locator('#face-selector').waitFor({ state: 'visible' });
+  await waitForSelectorTransition(page);
+};
+
+test.describe.configure({ mode: 'parallel' });
+test.describe('face-editor', () => {
+  const fixture = setupAssetViewerFixture(777);
+  const rng = new SeededRandom(777);
+  let mockPeople: MockPerson[];
+  let faceCreateCapture: FaceCreateCapture;
+
+  test.beforeAll(async () => {
+    mockPeople = createMockPeople(8);
+  });
+
+  test.beforeEach(async ({ context }) => {
+    faceCreateCapture = { requests: [] };
+    await setupFaceEditorMockApiRoutes(context, mockPeople, faceCreateCapture);
+  });
+
+  type ScreenRect = { top: number; left: number; width: number; height: number };
+
+  const getFaceBoxRect = async (page: Page): Promise<ScreenRect> => {
+    const dataEl = page.locator('#face-editor-data');
+    await expect(dataEl).toHaveAttribute('data-face-left', /^-?\d+/);
+    await expect(dataEl).toHaveAttribute('data-face-top', /^-?\d+/);
+    await expect(dataEl).toHaveAttribute('data-face-width', /^[1-9]/);
+    await expect(dataEl).toHaveAttribute('data-face-height', /^[1-9]/);
+    const canvasBox = await page.locator('#face-editor').boundingBox();
+    if (!canvasBox) {
+      throw new Error('Canvas element not found');
+    }
+    const left = Number(await dataEl.getAttribute('data-face-left'));
+    const top = Number(await dataEl.getAttribute('data-face-top'));
+    const width = Number(await dataEl.getAttribute('data-face-width'));
+    const height = Number(await dataEl.getAttribute('data-face-height'));
+    return {
+      top: canvasBox.y + top,
+      left: canvasBox.x + left,
+      width,
+      height,
+    };
+  };
+
+  const getSelectorRect = async (page: Page): Promise<ScreenRect> => {
+    const box = await page.locator('#face-selector').boundingBox();
+    if (!box) {
+      throw new Error('Face selector element not found');
+    }
+    return { top: box.y, left: box.x, width: box.width, height: box.height };
+  };
+
+  const computeOverlapArea = (a: ScreenRect, b: ScreenRect): number => {
+    const overlapX = Math.max(0, Math.min(a.left + a.width, b.left + b.width) - Math.max(a.left, b.left));
+    const overlapY = Math.max(0, Math.min(a.top + a.height, b.top + b.height) - Math.max(a.top, b.top));
+    return overlapX * overlapY;
+  };
+
+  const dragFaceBox = async (page: Page, deltaX: number, deltaY: number) => {
+    const faceBox = await getFaceBoxRect(page);
+    const centerX = faceBox.left + faceBox.width / 2;
+    const centerY = faceBox.top + faceBox.height / 2;
+    await page.mouse.move(centerX, centerY);
+    await page.mouse.down();
+    await page.mouse.move(centerX + deltaX, centerY + deltaY, { steps: 5 });
+    await page.mouse.up();
+    await page.waitForTimeout(300);
+  };
+
+  test('Face editor opens with person list', async ({ page }) => {
+    const asset = selectRandom(fixture.assets, rng);
+    await openFaceEditor(page, asset);
+
+    await expect(page.locator('#face-selector')).toBeVisible();
+    await expect(page.locator('#face-editor')).toBeVisible();
+
+    for (const person of mockPeople) {
+      await expect(page.locator('#face-selector').getByText(person.name)).toBeVisible();
+    }
+  });
+
+  test('Search filters people by name', async ({ page }) => {
+    const asset = selectRandom(fixture.assets, rng);
+    await openFaceEditor(page, asset);
+
+    const searchInput = page.locator('#face-selector input');
+    await searchInput.fill('Alice');
+
+    await expect(page.locator('#face-selector').getByText('Alice Johnson')).toBeVisible();
+    await expect(page.locator('#face-selector').getByText('Bob Smith')).toBeHidden();
+
+    await searchInput.clear();
+
+    for (const person of mockPeople) {
+      await expect(page.locator('#face-selector').getByText(person.name)).toBeVisible();
+    }
+  });
+
+  test('Search with no results shows empty message', async ({ page }) => {
+    const asset = selectRandom(fixture.assets, rng);
+    await openFaceEditor(page, asset);
+
+    const searchInput = page.locator('#face-selector input');
+    await searchInput.fill('Nonexistent Person XYZ');
+
+    for (const person of mockPeople) {
+      await expect(page.locator('#face-selector').getByText(person.name)).toBeHidden();
+    }
+  });
+
+  test('Selecting a person shows confirmation dialog', async ({ page }) => {
+    const asset = selectRandom(fixture.assets, rng);
+    await openFaceEditor(page, asset);
+
+    const personToTag = mockPeople[0];
+    await page.locator('#face-selector').getByText(personToTag.name).click();
+
+    await expect(page.getByRole('dialog')).toBeVisible();
+  });
+
+  test('Confirming tag calls createFace API and closes editor', async ({ page }) => {
+    const asset = selectRandom(fixture.assets, rng);
+    await openFaceEditor(page, asset);
+
+    const personToTag = mockPeople[0];
+    await page.locator('#face-selector').getByText(personToTag.name).click();
+
+    await expect(page.getByRole('dialog')).toBeVisible();
+    await page.getByRole('button', { name: /confirm/i }).click();
+
+    await expect(page.locator('#face-selector')).toBeHidden();
+    await expect(page.locator('#face-editor')).toBeHidden();
+
+    expect(faceCreateCapture.requests).toHaveLength(1);
+    expect(faceCreateCapture.requests[0].assetId).toBe(asset.id);
+    expect(faceCreateCapture.requests[0].personId).toBe(personToTag.id);
+  });
+
+  test('Cancel button closes face editor', async ({ page }) => {
+    const asset = selectRandom(fixture.assets, rng);
+    await openFaceEditor(page, asset);
+
+    await expect(page.locator('#face-selector')).toBeVisible();
+    await expect(page.locator('#face-editor')).toBeVisible();
+
+    await page.getByRole('button', { name: /cancel/i }).click();
+
+    await expect(page.locator('#face-selector')).toBeHidden();
+    await expect(page.locator('#face-editor')).toBeHidden();
+  });
+
+  test('Selector does not overlap face box on initial open', async ({ page }) => {
+    const asset = selectRandom(fixture.assets, rng);
+    await openFaceEditor(page, asset);
+
+    const faceBox = await getFaceBoxRect(page);
+    const selectorBox = await getSelectorRect(page);
+    const overlap = computeOverlapArea(faceBox, selectorBox);
+
+    expect(overlap).toBe(0);
+  });
+
+  test('Selector repositions without overlap after dragging face box down', async ({ page }) => {
+    const asset = selectRandom(fixture.assets, rng);
+    await openFaceEditor(page, asset);
+
+    await dragFaceBox(page, 0, 150);
+
+    const faceBox = await getFaceBoxRect(page);
+    const selectorBox = await getSelectorRect(page);
+    const overlap = computeOverlapArea(faceBox, selectorBox);
+
+    expect(overlap).toBe(0);
+  });
+
+  test('Selector repositions without overlap after dragging face box right', async ({ page }) => {
+    const asset = selectRandom(fixture.assets, rng);
+    await openFaceEditor(page, asset);
+
+    await dragFaceBox(page, 200, 0);
+
+    const faceBox = await getFaceBoxRect(page);
+    const selectorBox = await getSelectorRect(page);
+    const overlap = computeOverlapArea(faceBox, selectorBox);
+
+    expect(overlap).toBe(0);
+  });
+
+  test('Selector repositions without overlap after dragging face box to top-left corner', async ({ page }) => {
+    const asset = selectRandom(fixture.assets, rng);
+    await openFaceEditor(page, asset);
+
+    await dragFaceBox(page, -300, -300);
+
+    const faceBox = await getFaceBoxRect(page);
+    const selectorBox = await getSelectorRect(page);
+    const overlap = computeOverlapArea(faceBox, selectorBox);
+
+    expect(overlap).toBe(0);
+  });
+
+  test('Selector repositions without overlap after dragging face box to bottom-right', async ({ page }) => {
+    const asset = selectRandom(fixture.assets, rng);
+    await openFaceEditor(page, asset);
+
+    await dragFaceBox(page, 300, 300);
+
+    const faceBox = await getFaceBoxRect(page);
+    const selectorBox = await getSelectorRect(page);
+    const overlap = computeOverlapArea(faceBox, selectorBox);
+
+    expect(overlap).toBe(0);
+  });
+
+  test('Selector stays within viewport bounds', async ({ page }) => {
+    const asset = selectRandom(fixture.assets, rng);
+    await openFaceEditor(page, asset);
+
+    const viewportSize = page.viewportSize()!;
+    const selectorBox = await getSelectorRect(page);
+
+    expect(selectorBox.top).toBeGreaterThanOrEqual(0);
+    expect(selectorBox.left).toBeGreaterThanOrEqual(0);
+    expect(selectorBox.top + selectorBox.height).toBeLessThanOrEqual(viewportSize.height);
+    expect(selectorBox.left + selectorBox.width).toBeLessThanOrEqual(viewportSize.width);
+  });
+
+  test('Selector stays within viewport after dragging to edge', async ({ page }) => {
+    const asset = selectRandom(fixture.assets, rng);
+    await openFaceEditor(page, asset);
+
+    await dragFaceBox(page, -400, -400);
+
+    const viewportSize = page.viewportSize()!;
+    const selectorBox = await getSelectorRect(page);
+
+    expect(selectorBox.top).toBeGreaterThanOrEqual(0);
+    expect(selectorBox.left).toBeGreaterThanOrEqual(0);
+    expect(selectorBox.top + selectorBox.height).toBeLessThanOrEqual(viewportSize.height);
+    expect(selectorBox.left + selectorBox.width).toBeLessThanOrEqual(viewportSize.width);
+  });
+
+  test('Face box is draggable on the canvas', async ({ page }) => {
+    const asset = selectRandom(fixture.assets, rng);
+    await openFaceEditor(page, asset);
+
+    const beforeDrag = await getFaceBoxRect(page);
+    await dragFaceBox(page, 100, 50);
+    const afterDrag = await getFaceBoxRect(page);
+
+    expect(afterDrag.left).toBeGreaterThan(beforeDrag.left + 50);
+    expect(afterDrag.top).toBeGreaterThan(beforeDrag.top + 20);
+  });
+});

e2e/src/ui/specs/asset-viewer/stack.e2e-spec.ts

@@ -0,0 +1,84 @@
+import { faker } from '@faker-js/faker';
+import type { AssetResponseDto } from '@immich/sdk';
+import { expect, test } from '@playwright/test';
+import { toAssetResponseDto } from 'src/ui/generators/timeline';
+import {
+  createMockStack,
+  createMockStackAsset,
+  MockStack,
+  setupBrokenAssetMockApiRoutes,
+} from 'src/ui/mock-network/broken-asset-network';
+import { assetViewerUtils } from '../timeline/utils';
+import { enableTagsPreference, ensureDetailPanelVisible, setupAssetViewerFixture } from './utils';
+
+test.describe.configure({ mode: 'parallel' });
+test.describe('asset-viewer stack', () => {
+  const fixture = setupAssetViewerFixture(888);
+  let mockStack: MockStack;
+  let primaryAssetDto: AssetResponseDto;
+  let secondAssetDto: AssetResponseDto;
+
+  test.beforeAll(async () => {
+    primaryAssetDto = toAssetResponseDto(fixture.primaryAsset);
+    primaryAssetDto.tags = [
+      {
+        id: faker.string.uuid(),
+        name: '1',
+        value: 'test/1',
+        createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString(),
+      },
+    ];
+
+    secondAssetDto = createMockStackAsset(fixture.adminUserId);
+    secondAssetDto.tags = [
+      {
+        id: faker.string.uuid(),
+        name: '2',
+        value: 'test/2',
+        createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString(),
+      },
+    ];
+
+    mockStack = createMockStack(primaryAssetDto, [secondAssetDto], new Set());
+  });
+
+  test.beforeEach(async ({ context }) => {
+    await setupBrokenAssetMockApiRoutes(context, mockStack);
+  });
+
+  test('stack slideshow is visible', async ({ page }) => {
+    await page.goto(`/photos/${fixture.primaryAsset.id}`);
+    await assetViewerUtils.waitForViewerLoad(page, fixture.primaryAsset);
+
+    const stackSlideshow = page.locator('#stack-slideshow');
+    await expect(stackSlideshow).toBeVisible();
+
+    const stackAssets = stackSlideshow.locator('[data-asset]');
+    await expect(stackAssets).toHaveCount(mockStack.assets.length);
+  });
+
+  test('tags of primary asset are visible', async ({ context, page }) => {
+    await enableTagsPreference(context);
+
+    await page.goto(`/photos/${fixture.primaryAsset.id}`);
+    await ensureDetailPanelVisible(page);
+
+    const tags = page.getByTestId('detail-panel-tags').getByRole('link');
+    await expect(tags.first()).toHaveText('test/1');
+  });
+
+  test('tags of second asset are visible', async ({ context, page }) => {
+    await enableTagsPreference(context);
+
+    await page.goto(`/photos/${fixture.primaryAsset.id}`);
+    await ensureDetailPanelVisible(page);
+
+    const stackAssets = page.locator('#stack-slideshow [data-asset]');
+    await stackAssets.nth(1).click();
+
+    const tags = page.getByTestId('detail-panel-tags').getByRole('link');
+    await expect(tags.first()).toHaveText('test/2');
+  });
+});

e2e/src/ui/specs/timeline/timeline.e2e-spec.ts

@@ -438,7 +438,7 @@ test.describe('Timeline', () => {
       const asset = getAsset(timelineRestData, album.assetIds[0])!;
       await pageUtils.goToAsset(page, asset.fileCreatedAt);
       await thumbnailUtils.expectInViewport(page, asset.id);
-      await thumbnailUtils.expectSelectedReadonly(page, asset.id);
+      await thumbnailUtils.expectSelectedDisabled(page, asset.id);
     });
     test('Add photos to album', async ({ page }) => {
       const album = timelineRestData.album;
@@ -447,7 +447,7 @@ test.describe('Timeline', () => {
       const asset = getAsset(timelineRestData, album.assetIds[0])!;
       await pageUtils.goToAsset(page, asset.fileCreatedAt);
       await thumbnailUtils.expectInViewport(page, asset.id);
-      await thumbnailUtils.expectSelectedReadonly(page, asset.id);
+      await thumbnailUtils.expectSelectedDisabled(page, asset.id);
       await pageUtils.selectDay(page, 'Tue, Feb 27, 2024');
       const put = pageRoutePromise(page, `**/api/albums/${album.id}/assets`, async (route, request) => {
         const requestJson = request.postDataJSON();

e2e/src/ui/specs/timeline/utils.ts

@@ -65,7 +65,7 @@ export const thumbnailUtils = {
     return page.locator(`[data-thumbnail-focus-container][data-asset="${assetId}"] button`);
   },
   selectedAsset(page: Page) {
-    return page.locator('[data-thumbnail-focus-container]:has(button[aria-checked])');
+    return page.locator('[data-thumbnail-focus-container][data-selected]');
   },
   async clickAssetId(page: Page, assetId: string) {
     await thumbnailUtils.withAssetId(page, assetId).click();
@@ -102,12 +102,9 @@ export const thumbnailUtils = {
   async expectThumbnailIsNotArchive(page: Page, assetId: string) {
     await expect(thumbnailUtils.withAssetId(page, assetId).locator('[data-icon-archive]')).toHaveCount(0);
   },
-  async expectSelectedReadonly(page: Page, assetId: string) {
-    // todo - need a data attribute for selected
+  async expectSelectedDisabled(page: Page, assetId: string) {
     await expect(
-      page.locator(
-        `[data-thumbnail-focus-container][data-asset="${assetId}"] > .group.cursor-not-allowed > .rounded-xl`,
-      ),
+      page.locator(`[data-thumbnail-focus-container][data-asset="${assetId}"][data-selected][data-disabled]`),
     ).toBeVisible();
   },
   async expectTimelineHasOnScreenAssets(page: Page) {

i18n/en.json

@@ -1074,6 +1074,7 @@
     "failed_to_update_notification_status": "Failed to update notification status",
     "incorrect_email_or_password": "Incorrect email or password",
     "library_folder_already_exists": "This import path already exists.",
+    "page_not_found": "Page not found :/",
     "paths_validation_failed": "{paths, plural, one {# path} other {# paths}} failed validation",
     "profile_picture_transparent_pixels": "Profile pictures cannot have transparent pixels. Please zoom in and/or move the image.",
     "quota_higher_than_disk_size": "You set a quota higher than the disk size",
@@ -2026,6 +2027,9 @@
   "set_profile_picture": "Set profile picture",
   "set_slideshow_to_fullscreen": "Set Slideshow to fullscreen",
   "set_stack_primary_asset": "Set as primary asset",
+  "setting_image_navigation_enable_subtitle": "If enabled, you can navigate to the previous/next image by tapping the leftmost/rightmost quarter of the screen.",
+  "setting_image_navigation_enable_title": "Tap to Navigate",
+  "setting_image_navigation_title": "Image Navigation",
   "setting_image_viewer_help": "The detail viewer loads the small thumbnail first, then loads the medium-size preview (if enabled), finally loads the original (if enabled).",
   "setting_image_viewer_original_subtitle": "Enable to load the original full-resolution image (large!). Disable to reduce data usage (both network and on device cache).",
   "setting_image_viewer_original_title": "Load original image",
@@ -2304,6 +2308,7 @@
   "unstack_action_prompt": "{count} unstacked",
   "unstacked_assets_count": "Un-stacked {count, plural, one {# asset} other {# assets}}",
   "unsupported_field_type": "Unsupported field type",
+  "unsupported_file_type": "File {file} can't be uploaded because its file type {type} is not supported.",
   "untagged": "Untagged",
   "untitled_workflow": "Untitled workflow",
   "up_next": "Up next",

machine-learning/pyproject.toml

@@ -8,7 +8,6 @@ readme = "README.md"
 dependencies = [
     "aiocache>=0.12.1,<1.0",
     "fastapi>=0.95.2,<1.0",
-    "ftfy>=6.1.1",
     "gunicorn>=21.1.0",
     "huggingface-hub>=0.20.1,<1.0",
     "insightface>=0.7.3,<1.0",

machine-learning/uv.lock

@@ -654,18 +654,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/70/25/fab23259a52ece5670dcb8452e1af34b89e6135ecc17cd4b54b4b479eac6/fsspec-2023.12.2-py3-none-any.whl", hash = "sha256:d800d87f72189a745fa3d6b033b9dc4a34ad069f60ca60b943a63599f5501960", size = 168979, upload-time = "2023-12-11T21:19:52.446Z" },
 ]
 
-[[package]]
-name = "ftfy"
-version = "6.3.1"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "wcwidth" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/a5/d3/8650919bc3c7c6e90ee3fa7fd618bf373cbbe55dff043bd67353dbb20cd8/ftfy-6.3.1.tar.gz", hash = "sha256:9b3c3d90f84fb267fe64d375a07b7f8912d817cf86009ae134aa03e1819506ec", size = 308927, upload-time = "2024-10-26T00:50:35.149Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/ab/6e/81d47999aebc1b155f81eca4477a616a70f238a2549848c38983f3c22a82/ftfy-6.3.1-py3-none-any.whl", hash = "sha256:7c70eb532015cd2f9adb53f101fb6c7945988d023a085d127d1573dc49dd0083", size = 44821, upload-time = "2024-10-26T00:50:33.425Z" },
-]
-
 [[package]]
 name = "gevent"
 version = "24.10.3"
@@ -788,14 +776,14 @@ wheels = [
 
 [[package]]
 name = "gunicorn"
-version = "23.0.0"
+version = "25.1.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "packaging" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/34/72/9614c465dc206155d93eff0ca20d42e1e35afc533971379482de953521a4/gunicorn-23.0.0.tar.gz", hash = "sha256:f014447a0101dc57e294f6c18ca6b40227a4c90e9bdb586042628030cba004ec", size = 375031, upload-time = "2024-08-10T20:25:27.378Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/66/13/ef67f59f6a7896fdc2c1d62b5665c5219d6b0a9a1784938eb9a28e55e128/gunicorn-25.1.0.tar.gz", hash = "sha256:1426611d959fa77e7de89f8c0f32eed6aa03ee735f98c01efba3e281b1c47616", size = 594377, upload-time = "2026-02-13T11:09:58.989Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/cb/7d/6dac2a6e1eba33ee43f318edbed4ff29151a49b5d37f080aad1e6469bca4/gunicorn-23.0.0-py3-none-any.whl", hash = "sha256:ec400d38950de4dfd418cff8328b2c8faed0edb0d517d3394e457c317908ca4d", size = 85029, upload-time = "2024-08-10T20:25:24.996Z" },
+    { url = "https://files.pythonhosted.org/packages/da/73/4ad5b1f6a2e21cf1e85afdaad2b7b1a933985e2f5d679147a1953aaa192c/gunicorn-25.1.0-py3-none-any.whl", hash = "sha256:d0b1236ccf27f72cfe14bce7caadf467186f19e865094ca84221424e839b8b8b", size = 197067, upload-time = "2026-02-13T11:09:57.146Z" },
 ]
 
 [[package]]
@@ -939,7 +927,6 @@ source = { editable = "." }
 dependencies = [
     { name = "aiocache" },
     { name = "fastapi" },
-    { name = "ftfy" },
     { name = "gunicorn" },
     { name = "huggingface-hub" },
     { name = "insightface" },
@@ -1018,7 +1005,6 @@ types = [
 requires-dist = [
     { name = "aiocache", specifier = ">=0.12.1,<1.0" },
     { name = "fastapi", specifier = ">=0.95.2,<1.0" },
-    { name = "ftfy", specifier = ">=6.1.1" },
     { name = "gunicorn", specifier = ">=21.1.0" },
     { name = "huggingface-hub", specifier = ">=0.20.1,<1.0" },
     { name = "insightface", specifier = ">=0.7.3,<1.0" },

mise.toml

@@ -16,7 +16,7 @@ config_roots = [
 [tools]
 node = "24.13.1"
 flutter = "3.35.7"
-pnpm = "10.29.3"
+pnpm = "10.30.0"
 terragrunt = "0.98.0"
 opentofu = "1.11.4"
 java = "21.0.2"

mobile/android/app/src/main/kotlin/app/alextran/immich/images/LocalImagesImpl.kt

@@ -48,7 +48,6 @@ fun Bitmap.toNativeBuffer(): Map<String, Long>  {
   try {
     val buffer = NativeBuffer.wrap(pointer, size)
     copyPixelsToBuffer(buffer)
-    recycle()
     return mapOf(
       "pointer" to pointer,
       "width" to width.toLong(),
@@ -57,8 +56,9 @@ fun Bitmap.toNativeBuffer(): Map<String, Long>  {
     )
   } catch (e: Exception) {
     NativeBuffer.free(pointer)
-    recycle()
     throw e
+  } finally {
+    recycle()
   }
 }
 

mobile/lib/constants/enums.dart

@@ -18,3 +18,5 @@ enum ActionSource { timeline, viewer }
 enum CleanupStep { selectDate, scan, delete }
 
 enum AssetKeepType { none, photosOnly, videosOnly }
+
+enum AssetDateAggregation { start, end }

mobile/lib/domain/models/store.model.dart

@@ -73,6 +73,9 @@ enum StoreKey<T> {
   autoPlayVideo<bool>._(139),
   albumGridView<bool>._(140),
 
+  // Image viewer navigation settings
+  tapToNavigate<bool>._(141),
+
   // Experimental stuff
   photoManagerCustomFilter<bool>._(1000),
   betaPromptShown<bool>._(1001),

mobile/lib/domain/services/remote_album.service.dart

@@ -43,8 +43,8 @@ class RemoteAlbumService {
       AlbumSortMode.title => albums.sortedBy((album) => album.name),
       AlbumSortMode.lastModified => albums.sortedBy((album) => album.updatedAt),
       AlbumSortMode.assetCount => albums.sortedBy((album) => album.assetCount),
-      AlbumSortMode.mostRecent => await _sortByNewestAsset(albums),
-      AlbumSortMode.mostOldest => await _sortByOldestAsset(albums),
+      AlbumSortMode.mostRecent => await _sortByAssetDate(albums, aggregation: AssetDateAggregation.end),
+      AlbumSortMode.mostOldest => await _sortByAssetDate(albums, aggregation: AssetDateAggregation.start),
     };
     final effectiveOrder = isReverse ? sortMode.defaultOrder.reverse() : sortMode.defaultOrder;
 
@@ -172,46 +172,25 @@ class RemoteAlbumService {
     return _repository.getAlbumsContainingAsset(assetId);
   }
 
-  Future<List<RemoteAlbum>> _sortByNewestAsset(List<RemoteAlbum> albums) async {
-    // map album IDs to their newest asset dates
-    final Map<String, Future<DateTime?>> assetTimestampFutures = {};
-    for (final album in albums) {
-      assetTimestampFutures[album.id] = _repository.getNewestAssetTimestamp(album.id);
+  Future<List<RemoteAlbum>> _sortByAssetDate(
+    List<RemoteAlbum> albums, {
+    required AssetDateAggregation aggregation,
+  }) async {
+    if (albums.isEmpty) return [];
+
+    final albumIds = albums.map((e) => e.id).toList();
+    final sortedIds = await _repository.getSortedAlbumIds(albumIds, aggregation: aggregation);
+
+    final albumMap = Map<String, RemoteAlbum>.fromEntries(albums.map((a) => MapEntry(a.id, a)));
+
+    final sortedAlbums = sortedIds.map((id) => albumMap[id]).whereType<RemoteAlbum>().toList();
+
+    if (sortedAlbums.length < albums.length) {
+      final returnedIdSet = sortedIds.toSet();
+      final emptyAlbums = albums.where((a) => !returnedIdSet.contains(a.id));
+      sortedAlbums.addAll(emptyAlbums);
     }
 
-    // await all database queries
-    final entries = await Future.wait(
-      assetTimestampFutures.entries.map((entry) async => MapEntry(entry.key, await entry.value)),
-    );
-    final assetTimestamps = Map.fromEntries(entries);
-
-    final sorted = albums.sorted((a, b) {
-      final aDate = assetTimestamps[a.id] ?? DateTime.fromMillisecondsSinceEpoch(0);
-      final bDate = assetTimestamps[b.id] ?? DateTime.fromMillisecondsSinceEpoch(0);
-      return aDate.compareTo(bDate);
-    });
-
-    return sorted;
-  }
-
-  Future<List<RemoteAlbum>> _sortByOldestAsset(List<RemoteAlbum> albums) async {
-    // map album IDs to their oldest asset dates
-    final Map<String, Future<DateTime?>> assetTimestampFutures = {
-      for (final album in albums) album.id: _repository.getOldestAssetTimestamp(album.id),
-    };
-
-    // await all database queries
-    final entries = await Future.wait(
-      assetTimestampFutures.entries.map((entry) async => MapEntry(entry.key, await entry.value)),
-    );
-    final assetTimestamps = Map.fromEntries(entries);
-
-    final sorted = albums.sorted((a, b) {
-      final aDate = assetTimestamps[a.id] ?? DateTime.fromMillisecondsSinceEpoch(0);
-      final bDate = assetTimestamps[b.id] ?? DateTime.fromMillisecondsSinceEpoch(0);
-      return aDate.compareTo(bDate);
-    });
-
-    return sorted;
+    return sortedAlbums;
   }
 }

mobile/lib/domain/services/sync_stream.service.dart

@@ -68,12 +68,12 @@ class SyncStreamService {
       return false;
     }
 
-    final semVer = SemVer(major: serverVersion.major, minor: serverVersion.minor, patch: serverVersion.patch_);
+    final serverSemVer = SemVer(major: serverVersion.major, minor: serverVersion.minor, patch: serverVersion.patch_);
 
     final value = Store.get(StoreKey.syncMigrationStatus, "[]");
     final migrations = (jsonDecode(value) as List).cast<String>();
     int previousLength = migrations.length;
-    await _runPreSyncTasks(migrations, semVer);
+    await _runPreSyncTasks(migrations, serverSemVer);
 
     if (migrations.length != previousLength) {
       _logger.info("Updated pre-sync migration status: $migrations");
@@ -82,10 +82,14 @@ class SyncStreamService {
 
     // Start the sync stream and handle events
     bool shouldReset = false;
-    await _syncApiRepository.streamChanges(_handleEvents, onReset: () => shouldReset = true);
+    await _syncApiRepository.streamChanges(
+      _handleEvents,
+      serverVersion: serverSemVer,
+      onReset: () => shouldReset = true,
+    );
     if (shouldReset) {
       _logger.info("Resetting sync state as requested by server");
-      await _syncApiRepository.streamChanges(_handleEvents);
+      await _syncApiRepository.streamChanges(_handleEvents, serverVersion: serverSemVer);
     }
 
     previousLength = migrations.length;
@@ -282,6 +286,8 @@ class SyncStreamService {
         return _syncStreamRepository.deletePeopleV1(data.cast());
       case SyncEntityType.assetFaceV1:
         return _syncStreamRepository.updateAssetFacesV1(data.cast());
+      case SyncEntityType.assetFaceV2:
+        return _syncStreamRepository.updateAssetFacesV2(data.cast());
       case SyncEntityType.assetFaceDeleteV1:
         return _syncStreamRepository.deleteAssetFacesV1(data.cast());
       default:

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

@@ -28,6 +28,10 @@ class AssetFaceEntity extends Table with DriftDefaultsMixin {
 
   TextColumn get sourceType => text()();
 
+  BoolColumn get isVisible => boolean().withDefault(const Constant(true))();
+
+  DateTimeColumn get deletedAt => dateTime().nullable()();
+
   @override
   Set<Column> get primaryKey => {id};
 }

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

@@ -5,11 +5,12 @@ import 'package:immich_mobile/infrastructure/entities/asset_face.entity.drift.da
     as i1;
 import 'package:immich_mobile/infrastructure/entities/asset_face.entity.dart'
     as i2;
+import 'package:drift/src/runtime/query_builder/query_builder.dart' as i3;
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart'
-    as i3;
-import 'package:drift/internal/modular.dart' as i4;
+    as i4;
+import 'package:drift/internal/modular.dart' as i5;
 import 'package:immich_mobile/infrastructure/entities/person.entity.drift.dart'
-    as i5;
+    as i6;
 
 typedef $$AssetFaceEntityTableCreateCompanionBuilder =
     i1.AssetFaceEntityCompanion Function({
@@ -23,6 +24,8 @@ typedef $$AssetFaceEntityTableCreateCompanionBuilder =
       required int boundingBoxX2,
       required int boundingBoxY2,
       required String sourceType,
+      i0.Value<bool> isVisible,
+      i0.Value<DateTime?> deletedAt,
     });
 typedef $$AssetFaceEntityTableUpdateCompanionBuilder =
     i1.AssetFaceEntityCompanion Function({
@@ -36,6 +39,8 @@ typedef $$AssetFaceEntityTableUpdateCompanionBuilder =
       i0.Value<int> boundingBoxX2,
       i0.Value<int> boundingBoxY2,
       i0.Value<String> sourceType,
+      i0.Value<bool> isVisible,
+      i0.Value<DateTime?> deletedAt,
     });
 
 final class $$AssetFaceEntityTableReferences
@@ -51,29 +56,29 @@ final class $$AssetFaceEntityTableReferences
     super.$_typedResult,
   );
 
-  static i3.$RemoteAssetEntityTable _assetIdTable(i0.GeneratedDatabase db) =>
-      i4.ReadDatabaseContainer(db)
-          .resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity')
+  static i4.$RemoteAssetEntityTable _assetIdTable(i0.GeneratedDatabase db) =>
+      i5.ReadDatabaseContainer(db)
+          .resultSet<i4.$RemoteAssetEntityTable>('remote_asset_entity')
           .createAlias(
             i0.$_aliasNameGenerator(
-              i4.ReadDatabaseContainer(db)
+              i5.ReadDatabaseContainer(db)
                   .resultSet<i1.$AssetFaceEntityTable>('asset_face_entity')
                   .assetId,
-              i4.ReadDatabaseContainer(
+              i5.ReadDatabaseContainer(
                 db,
-              ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity').id,
+              ).resultSet<i4.$RemoteAssetEntityTable>('remote_asset_entity').id,
             ),
           );
 
-  i3.$$RemoteAssetEntityTableProcessedTableManager get assetId {
+  i4.$$RemoteAssetEntityTableProcessedTableManager get assetId {
     final $_column = $_itemColumn<String>('asset_id')!;
 
-    final manager = i3
+    final manager = i4
         .$$RemoteAssetEntityTableTableManager(
           $_db,
-          i4.ReadDatabaseContainer(
+          i5.ReadDatabaseContainer(
             $_db,
-          ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+          ).resultSet<i4.$RemoteAssetEntityTable>('remote_asset_entity'),
         )
         .filter((f) => f.id.sqlEquals($_column));
     final item = $_typedResult.readTableOrNull(_assetIdTable($_db));
@@ -83,29 +88,29 @@ final class $$AssetFaceEntityTableReferences
     );
   }
 
-  static i5.$PersonEntityTable _personIdTable(i0.GeneratedDatabase db) =>
-      i4.ReadDatabaseContainer(db)
-          .resultSet<i5.$PersonEntityTable>('person_entity')
+  static i6.$PersonEntityTable _personIdTable(i0.GeneratedDatabase db) =>
+      i5.ReadDatabaseContainer(db)
+          .resultSet<i6.$PersonEntityTable>('person_entity')
           .createAlias(
             i0.$_aliasNameGenerator(
-              i4.ReadDatabaseContainer(db)
+              i5.ReadDatabaseContainer(db)
                   .resultSet<i1.$AssetFaceEntityTable>('asset_face_entity')
                   .personId,
-              i4.ReadDatabaseContainer(
+              i5.ReadDatabaseContainer(
                 db,
-              ).resultSet<i5.$PersonEntityTable>('person_entity').id,
+              ).resultSet<i6.$PersonEntityTable>('person_entity').id,
             ),
           );
 
-  i5.$$PersonEntityTableProcessedTableManager? get personId {
+  i6.$$PersonEntityTableProcessedTableManager? get personId {
     final $_column = $_itemColumn<String>('person_id');
     if ($_column == null) return null;
-    final manager = i5
+    final manager = i6
         .$$PersonEntityTableTableManager(
           $_db,
-          i4.ReadDatabaseContainer(
+          i5.ReadDatabaseContainer(
             $_db,
-          ).resultSet<i5.$PersonEntityTable>('person_entity'),
+          ).resultSet<i6.$PersonEntityTable>('person_entity'),
         )
         .filter((f) => f.id.sqlEquals($_column));
     final item = $_typedResult.readTableOrNull(_personIdTable($_db));
@@ -165,24 +170,34 @@ class $$AssetFaceEntityTableFilterComposer
     builder: (column) => i0.ColumnFilters(column),
   );
 
-  i3.$$RemoteAssetEntityTableFilterComposer get assetId {
-    final i3.$$RemoteAssetEntityTableFilterComposer composer = $composerBuilder(
+  i0.ColumnFilters<bool> get isVisible => $composableBuilder(
+    column: $table.isVisible,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnFilters<DateTime> get deletedAt => $composableBuilder(
+    column: $table.deletedAt,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i4.$$RemoteAssetEntityTableFilterComposer get assetId {
+    final i4.$$RemoteAssetEntityTableFilterComposer composer = $composerBuilder(
       composer: this,
       getCurrentColumn: (t) => t.assetId,
-      referencedTable: i4.ReadDatabaseContainer(
+      referencedTable: i5.ReadDatabaseContainer(
         $db,
-      ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+      ).resultSet<i4.$RemoteAssetEntityTable>('remote_asset_entity'),
       getReferencedColumn: (t) => t.id,
       builder:
           (
             joinBuilder, {
             $addJoinBuilderToRootComposer,
             $removeJoinBuilderFromRootComposer,
-          }) => i3.$$RemoteAssetEntityTableFilterComposer(
+          }) => i4.$$RemoteAssetEntityTableFilterComposer(
             $db: $db,
-            $table: i4.ReadDatabaseContainer(
+            $table: i5.ReadDatabaseContainer(
               $db,
-            ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+            ).resultSet<i4.$RemoteAssetEntityTable>('remote_asset_entity'),
             $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
             joinBuilder: joinBuilder,
             $removeJoinBuilderFromRootComposer:
@@ -192,24 +207,24 @@ class $$AssetFaceEntityTableFilterComposer
     return composer;
   }
 
-  i5.$$PersonEntityTableFilterComposer get personId {
-    final i5.$$PersonEntityTableFilterComposer composer = $composerBuilder(
+  i6.$$PersonEntityTableFilterComposer get personId {
+    final i6.$$PersonEntityTableFilterComposer composer = $composerBuilder(
       composer: this,
       getCurrentColumn: (t) => t.personId,
-      referencedTable: i4.ReadDatabaseContainer(
+      referencedTable: i5.ReadDatabaseContainer(
         $db,
-      ).resultSet<i5.$PersonEntityTable>('person_entity'),
+      ).resultSet<i6.$PersonEntityTable>('person_entity'),
       getReferencedColumn: (t) => t.id,
       builder:
           (
             joinBuilder, {
             $addJoinBuilderToRootComposer,
             $removeJoinBuilderFromRootComposer,
-          }) => i5.$$PersonEntityTableFilterComposer(
+          }) => i6.$$PersonEntityTableFilterComposer(
             $db: $db,
-            $table: i4.ReadDatabaseContainer(
+            $table: i5.ReadDatabaseContainer(
               $db,
-            ).resultSet<i5.$PersonEntityTable>('person_entity'),
+            ).resultSet<i6.$PersonEntityTable>('person_entity'),
             $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
             joinBuilder: joinBuilder,
             $removeJoinBuilderFromRootComposer:
@@ -269,25 +284,35 @@ class $$AssetFaceEntityTableOrderingComposer
     builder: (column) => i0.ColumnOrderings(column),
   );
 
-  i3.$$RemoteAssetEntityTableOrderingComposer get assetId {
-    final i3.$$RemoteAssetEntityTableOrderingComposer composer =
+  i0.ColumnOrderings<bool> get isVisible => $composableBuilder(
+    column: $table.isVisible,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<DateTime> get deletedAt => $composableBuilder(
+    column: $table.deletedAt,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i4.$$RemoteAssetEntityTableOrderingComposer get assetId {
+    final i4.$$RemoteAssetEntityTableOrderingComposer composer =
         $composerBuilder(
           composer: this,
           getCurrentColumn: (t) => t.assetId,
-          referencedTable: i4.ReadDatabaseContainer(
+          referencedTable: i5.ReadDatabaseContainer(
             $db,
-          ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+          ).resultSet<i4.$RemoteAssetEntityTable>('remote_asset_entity'),
           getReferencedColumn: (t) => t.id,
           builder:
               (
                 joinBuilder, {
                 $addJoinBuilderToRootComposer,
                 $removeJoinBuilderFromRootComposer,
-              }) => i3.$$RemoteAssetEntityTableOrderingComposer(
+              }) => i4.$$RemoteAssetEntityTableOrderingComposer(
                 $db: $db,
-                $table: i4.ReadDatabaseContainer(
+                $table: i5.ReadDatabaseContainer(
                   $db,
-                ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+                ).resultSet<i4.$RemoteAssetEntityTable>('remote_asset_entity'),
                 $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
                 joinBuilder: joinBuilder,
                 $removeJoinBuilderFromRootComposer:
@@ -297,24 +322,24 @@ class $$AssetFaceEntityTableOrderingComposer
     return composer;
   }
 
-  i5.$$PersonEntityTableOrderingComposer get personId {
-    final i5.$$PersonEntityTableOrderingComposer composer = $composerBuilder(
+  i6.$$PersonEntityTableOrderingComposer get personId {
+    final i6.$$PersonEntityTableOrderingComposer composer = $composerBuilder(
       composer: this,
       getCurrentColumn: (t) => t.personId,
-      referencedTable: i4.ReadDatabaseContainer(
+      referencedTable: i5.ReadDatabaseContainer(
         $db,
-      ).resultSet<i5.$PersonEntityTable>('person_entity'),
+      ).resultSet<i6.$PersonEntityTable>('person_entity'),
       getReferencedColumn: (t) => t.id,
       builder:
           (
             joinBuilder, {
             $addJoinBuilderToRootComposer,
             $removeJoinBuilderFromRootComposer,
-          }) => i5.$$PersonEntityTableOrderingComposer(
+          }) => i6.$$PersonEntityTableOrderingComposer(
             $db: $db,
-            $table: i4.ReadDatabaseContainer(
+            $table: i5.ReadDatabaseContainer(
               $db,
-            ).resultSet<i5.$PersonEntityTable>('person_entity'),
+            ).resultSet<i6.$PersonEntityTable>('person_entity'),
             $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
             joinBuilder: joinBuilder,
             $removeJoinBuilderFromRootComposer:
@@ -372,25 +397,31 @@ class $$AssetFaceEntityTableAnnotationComposer
     builder: (column) => column,
   );
 
-  i3.$$RemoteAssetEntityTableAnnotationComposer get assetId {
-    final i3.$$RemoteAssetEntityTableAnnotationComposer composer =
+  i0.GeneratedColumn<bool> get isVisible =>
+      $composableBuilder(column: $table.isVisible, builder: (column) => column);
+
+  i0.GeneratedColumn<DateTime> get deletedAt =>
+      $composableBuilder(column: $table.deletedAt, builder: (column) => column);
+
+  i4.$$RemoteAssetEntityTableAnnotationComposer get assetId {
+    final i4.$$RemoteAssetEntityTableAnnotationComposer composer =
         $composerBuilder(
           composer: this,
           getCurrentColumn: (t) => t.assetId,
-          referencedTable: i4.ReadDatabaseContainer(
+          referencedTable: i5.ReadDatabaseContainer(
             $db,
-          ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+          ).resultSet<i4.$RemoteAssetEntityTable>('remote_asset_entity'),
           getReferencedColumn: (t) => t.id,
           builder:
               (
                 joinBuilder, {
                 $addJoinBuilderToRootComposer,
                 $removeJoinBuilderFromRootComposer,
-              }) => i3.$$RemoteAssetEntityTableAnnotationComposer(
+              }) => i4.$$RemoteAssetEntityTableAnnotationComposer(
                 $db: $db,
-                $table: i4.ReadDatabaseContainer(
+                $table: i5.ReadDatabaseContainer(
                   $db,
-                ).resultSet<i3.$RemoteAssetEntityTable>('remote_asset_entity'),
+                ).resultSet<i4.$RemoteAssetEntityTable>('remote_asset_entity'),
                 $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
                 joinBuilder: joinBuilder,
                 $removeJoinBuilderFromRootComposer:
@@ -400,24 +431,24 @@ class $$AssetFaceEntityTableAnnotationComposer
     return composer;
   }
 
-  i5.$$PersonEntityTableAnnotationComposer get personId {
-    final i5.$$PersonEntityTableAnnotationComposer composer = $composerBuilder(
+  i6.$$PersonEntityTableAnnotationComposer get personId {
+    final i6.$$PersonEntityTableAnnotationComposer composer = $composerBuilder(
       composer: this,
       getCurrentColumn: (t) => t.personId,
-      referencedTable: i4.ReadDatabaseContainer(
+      referencedTable: i5.ReadDatabaseContainer(
         $db,
-      ).resultSet<i5.$PersonEntityTable>('person_entity'),
+      ).resultSet<i6.$PersonEntityTable>('person_entity'),
       getReferencedColumn: (t) => t.id,
       builder:
           (
             joinBuilder, {
             $addJoinBuilderToRootComposer,
             $removeJoinBuilderFromRootComposer,
-          }) => i5.$$PersonEntityTableAnnotationComposer(
+          }) => i6.$$PersonEntityTableAnnotationComposer(
             $db: $db,
-            $table: i4.ReadDatabaseContainer(
+            $table: i5.ReadDatabaseContainer(
               $db,
-            ).resultSet<i5.$PersonEntityTable>('person_entity'),
+            ).resultSet<i6.$PersonEntityTable>('person_entity'),
             $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer,
             joinBuilder: joinBuilder,
             $removeJoinBuilderFromRootComposer:
@@ -468,6 +499,8 @@ class $$AssetFaceEntityTableTableManager
                 i0.Value<int> boundingBoxX2 = const i0.Value.absent(),
                 i0.Value<int> boundingBoxY2 = const i0.Value.absent(),
                 i0.Value<String> sourceType = const i0.Value.absent(),
+                i0.Value<bool> isVisible = const i0.Value.absent(),
+                i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
               }) => i1.AssetFaceEntityCompanion(
                 id: id,
                 assetId: assetId,
@@ -479,6 +512,8 @@ class $$AssetFaceEntityTableTableManager
                 boundingBoxX2: boundingBoxX2,
                 boundingBoxY2: boundingBoxY2,
                 sourceType: sourceType,
+                isVisible: isVisible,
+                deletedAt: deletedAt,
               ),
           createCompanionCallback:
               ({
@@ -492,6 +527,8 @@ class $$AssetFaceEntityTableTableManager
                 required int boundingBoxX2,
                 required int boundingBoxY2,
                 required String sourceType,
+                i0.Value<bool> isVisible = const i0.Value.absent(),
+                i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
               }) => i1.AssetFaceEntityCompanion.insert(
                 id: id,
                 assetId: assetId,
@@ -503,6 +540,8 @@ class $$AssetFaceEntityTableTableManager
                 boundingBoxX2: boundingBoxX2,
                 boundingBoxY2: boundingBoxY2,
                 sourceType: sourceType,
+                isVisible: isVisible,
+                deletedAt: deletedAt,
               ),
           withReferenceMapper: (p0) => p0
               .map(
@@ -709,6 +748,33 @@ class $AssetFaceEntityTable extends i2.AssetFaceEntity
     type: i0.DriftSqlType.string,
     requiredDuringInsert: true,
   );
+  static const i0.VerificationMeta _isVisibleMeta = const i0.VerificationMeta(
+    'isVisible',
+  );
+  @override
+  late final i0.GeneratedColumn<bool> isVisible = i0.GeneratedColumn<bool>(
+    'is_visible',
+    aliasedName,
+    false,
+    type: i0.DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+      'CHECK ("is_visible" IN (0, 1))',
+    ),
+    defaultValue: const i3.Constant(true),
+  );
+  static const i0.VerificationMeta _deletedAtMeta = const i0.VerificationMeta(
+    'deletedAt',
+  );
+  @override
+  late final i0.GeneratedColumn<DateTime> deletedAt =
+      i0.GeneratedColumn<DateTime>(
+        'deleted_at',
+        aliasedName,
+        true,
+        type: i0.DriftSqlType.dateTime,
+        requiredDuringInsert: false,
+      );
   @override
   List<i0.GeneratedColumn> get $columns => [
     id,
@@ -721,6 +787,8 @@ class $AssetFaceEntityTable extends i2.AssetFaceEntity
     boundingBoxX2,
     boundingBoxY2,
     sourceType,
+    isVisible,
+    deletedAt,
   ];
   @override
   String get aliasedName => _alias ?? actualTableName;
@@ -824,6 +892,18 @@ class $AssetFaceEntityTable extends i2.AssetFaceEntity
     } else if (isInserting) {
       context.missing(_sourceTypeMeta);
     }
+    if (data.containsKey('is_visible')) {
+      context.handle(
+        _isVisibleMeta,
+        isVisible.isAcceptableOrUnknown(data['is_visible']!, _isVisibleMeta),
+      );
+    }
+    if (data.containsKey('deleted_at')) {
+      context.handle(
+        _deletedAtMeta,
+        deletedAt.isAcceptableOrUnknown(data['deleted_at']!, _deletedAtMeta),
+      );
+    }
     return context;
   }
 
@@ -873,6 +953,14 @@ class $AssetFaceEntityTable extends i2.AssetFaceEntity
         i0.DriftSqlType.string,
         data['${effectivePrefix}source_type'],
       )!,
+      isVisible: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.bool,
+        data['${effectivePrefix}is_visible'],
+      )!,
+      deletedAt: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.dateTime,
+        data['${effectivePrefix}deleted_at'],
+      ),
     );
   }
 
@@ -899,6 +987,8 @@ class AssetFaceEntityData extends i0.DataClass
   final int boundingBoxX2;
   final int boundingBoxY2;
   final String sourceType;
+  final bool isVisible;
+  final DateTime? deletedAt;
   const AssetFaceEntityData({
     required this.id,
     required this.assetId,
@@ -910,6 +1000,8 @@ class AssetFaceEntityData extends i0.DataClass
     required this.boundingBoxX2,
     required this.boundingBoxY2,
     required this.sourceType,
+    required this.isVisible,
+    this.deletedAt,
   });
   @override
   Map<String, i0.Expression> toColumns(bool nullToAbsent) {
@@ -926,6 +1018,10 @@ class AssetFaceEntityData extends i0.DataClass
     map['bounding_box_x2'] = i0.Variable<int>(boundingBoxX2);
     map['bounding_box_y2'] = i0.Variable<int>(boundingBoxY2);
     map['source_type'] = i0.Variable<String>(sourceType);
+    map['is_visible'] = i0.Variable<bool>(isVisible);
+    if (!nullToAbsent || deletedAt != null) {
+      map['deleted_at'] = i0.Variable<DateTime>(deletedAt);
+    }
     return map;
   }
 
@@ -945,6 +1041,8 @@ class AssetFaceEntityData extends i0.DataClass
       boundingBoxX2: serializer.fromJson<int>(json['boundingBoxX2']),
       boundingBoxY2: serializer.fromJson<int>(json['boundingBoxY2']),
       sourceType: serializer.fromJson<String>(json['sourceType']),
+      isVisible: serializer.fromJson<bool>(json['isVisible']),
+      deletedAt: serializer.fromJson<DateTime?>(json['deletedAt']),
     );
   }
   @override
@@ -961,6 +1059,8 @@ class AssetFaceEntityData extends i0.DataClass
       'boundingBoxX2': serializer.toJson<int>(boundingBoxX2),
       'boundingBoxY2': serializer.toJson<int>(boundingBoxY2),
       'sourceType': serializer.toJson<String>(sourceType),
+      'isVisible': serializer.toJson<bool>(isVisible),
+      'deletedAt': serializer.toJson<DateTime?>(deletedAt),
     };
   }
 
@@ -975,6 +1075,8 @@ class AssetFaceEntityData extends i0.DataClass
     int? boundingBoxX2,
     int? boundingBoxY2,
     String? sourceType,
+    bool? isVisible,
+    i0.Value<DateTime?> deletedAt = const i0.Value.absent(),
   }) => i1.AssetFaceEntityData(
     id: id ?? this.id,
     assetId: assetId ?? this.assetId,
@@ -986,6 +1088,8 @@ class AssetFaceEntityData extends i0.DataClass
     boundingBoxX2: boundingBoxX2 ?? this.boundingBoxX2,
     boundingBoxY2: boundingBoxY2 ?? this.boundingBoxY2,
     sourceType: sourceType ?? this.sourceType,
+    isVisible: isVisible ?? this.isVisible,
+    deletedAt: deletedAt.present ? deletedAt.value : this.deletedAt,
   );
   AssetFaceEntityData copyWithCompanion(i1.AssetFaceEntityCompanion data) {
     return AssetFaceEntityData(
@@ -1013,6 +1117,8 @@ class AssetFaceEntityData extends i0.DataClass
       sourceType: data.sourceType.present
           ? data.sourceType.value
           : this.sourceType,
+      isVisible: data.isVisible.present ? data.isVisible.value : this.isVisible,
+      deletedAt: data.deletedAt.present ? data.deletedAt.value : this.deletedAt,
     );
   }
 
@@ -1028,7 +1134,9 @@ class AssetFaceEntityData extends i0.DataClass
           ..write('boundingBoxY1: $boundingBoxY1, ')
           ..write('boundingBoxX2: $boundingBoxX2, ')
           ..write('boundingBoxY2: $boundingBoxY2, ')
-          ..write('sourceType: $sourceType')
+          ..write('sourceType: $sourceType, ')
+          ..write('isVisible: $isVisible, ')
+          ..write('deletedAt: $deletedAt')
           ..write(')'))
         .toString();
   }
@@ -1045,6 +1153,8 @@ class AssetFaceEntityData extends i0.DataClass
     boundingBoxX2,
     boundingBoxY2,
     sourceType,
+    isVisible,
+    deletedAt,
   );
   @override
   bool operator ==(Object other) =>
@@ -1059,7 +1169,9 @@ class AssetFaceEntityData extends i0.DataClass
           other.boundingBoxY1 == this.boundingBoxY1 &&
           other.boundingBoxX2 == this.boundingBoxX2 &&
           other.boundingBoxY2 == this.boundingBoxY2 &&
-          other.sourceType == this.sourceType);
+          other.sourceType == this.sourceType &&
+          other.isVisible == this.isVisible &&
+          other.deletedAt == this.deletedAt);
 }
 
 class AssetFaceEntityCompanion
@@ -1074,6 +1186,8 @@ class AssetFaceEntityCompanion
   final i0.Value<int> boundingBoxX2;
   final i0.Value<int> boundingBoxY2;
   final i0.Value<String> sourceType;
+  final i0.Value<bool> isVisible;
+  final i0.Value<DateTime?> deletedAt;
   const AssetFaceEntityCompanion({
     this.id = const i0.Value.absent(),
     this.assetId = const i0.Value.absent(),
@@ -1085,6 +1199,8 @@ class AssetFaceEntityCompanion
     this.boundingBoxX2 = const i0.Value.absent(),
     this.boundingBoxY2 = const i0.Value.absent(),
     this.sourceType = const i0.Value.absent(),
+    this.isVisible = const i0.Value.absent(),
+    this.deletedAt = const i0.Value.absent(),
   });
   AssetFaceEntityCompanion.insert({
     required String id,
@@ -1097,6 +1213,8 @@ class AssetFaceEntityCompanion
     required int boundingBoxX2,
     required int boundingBoxY2,
     required String sourceType,
+    this.isVisible = const i0.Value.absent(),
+    this.deletedAt = const i0.Value.absent(),
   }) : id = i0.Value(id),
        assetId = i0.Value(assetId),
        imageWidth = i0.Value(imageWidth),
@@ -1117,6 +1235,8 @@ class AssetFaceEntityCompanion
     i0.Expression<int>? boundingBoxX2,
     i0.Expression<int>? boundingBoxY2,
     i0.Expression<String>? sourceType,
+    i0.Expression<bool>? isVisible,
+    i0.Expression<DateTime>? deletedAt,
   }) {
     return i0.RawValuesInsertable({
       if (id != null) 'id': id,
@@ -1129,6 +1249,8 @@ class AssetFaceEntityCompanion
       if (boundingBoxX2 != null) 'bounding_box_x2': boundingBoxX2,
       if (boundingBoxY2 != null) 'bounding_box_y2': boundingBoxY2,
       if (sourceType != null) 'source_type': sourceType,
+      if (isVisible != null) 'is_visible': isVisible,
+      if (deletedAt != null) 'deleted_at': deletedAt,
     });
   }
 
@@ -1143,6 +1265,8 @@ class AssetFaceEntityCompanion
     i0.Value<int>? boundingBoxX2,
     i0.Value<int>? boundingBoxY2,
     i0.Value<String>? sourceType,
+    i0.Value<bool>? isVisible,
+    i0.Value<DateTime?>? deletedAt,
   }) {
     return i1.AssetFaceEntityCompanion(
       id: id ?? this.id,
@@ -1155,6 +1279,8 @@ class AssetFaceEntityCompanion
       boundingBoxX2: boundingBoxX2 ?? this.boundingBoxX2,
       boundingBoxY2: boundingBoxY2 ?? this.boundingBoxY2,
       sourceType: sourceType ?? this.sourceType,
+      isVisible: isVisible ?? this.isVisible,
+      deletedAt: deletedAt ?? this.deletedAt,
     );
   }
 
@@ -1191,6 +1317,12 @@ class AssetFaceEntityCompanion
     if (sourceType.present) {
       map['source_type'] = i0.Variable<String>(sourceType.value);
     }
+    if (isVisible.present) {
+      map['is_visible'] = i0.Variable<bool>(isVisible.value);
+    }
+    if (deletedAt.present) {
+      map['deleted_at'] = i0.Variable<DateTime>(deletedAt.value);
+    }
     return map;
   }
 
@@ -1206,7 +1338,9 @@ class AssetFaceEntityCompanion
           ..write('boundingBoxY1: $boundingBoxY1, ')
           ..write('boundingBoxX2: $boundingBoxX2, ')
           ..write('boundingBoxY2: $boundingBoxY2, ')
-          ..write('sourceType: $sourceType')
+          ..write('sourceType: $sourceType, ')
+          ..write('isVisible: $isVisible, ')
+          ..write('deletedAt: $deletedAt')
           ..write(')'))
         .toString();
   }

mobile/lib/infrastructure/repositories/db.repository.dart

@@ -97,7 +97,7 @@ class Drift extends $Drift implements IDatabaseRepository {
   }
 
   @override
-  int get schemaVersion => 19;
+  int get schemaVersion => 20;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -226,6 +226,10 @@ class Drift extends $Drift implements IDatabaseRepository {
             await m.createIndex(v19.idxRemoteAssetLocalDateTimeMonth);
             await m.createIndex(v19.idxStackPrimaryAssetId);
           },
+          from19To20: (m, v20) async {
+            await m.addColumn(v20.assetFaceEntity, v20.assetFaceEntity.isVisible);
+            await m.addColumn(v20.assetFaceEntity, v20.assetFaceEntity.deletedAt);
+          },
         ),
       );
 

mobile/lib/infrastructure/repositories/db.repository.steps.dart

@@ -8360,6 +8360,550 @@ final class Schema19 extends i0.VersionedSchema {
   );
 }
 
+final class Schema20 extends i0.VersionedSchema {
+  Schema20({required super.database}) : super(version: 20);
+  @override
+  late final List<i1.DatabaseSchemaEntity> entities = [
+    userEntity,
+    remoteAssetEntity,
+    stackEntity,
+    localAssetEntity,
+    remoteAlbumEntity,
+    localAlbumEntity,
+    localAlbumAssetEntity,
+    idxLocalAlbumAssetAlbumAsset,
+    idxRemoteAlbumOwnerId,
+    idxLocalAssetChecksum,
+    idxLocalAssetCloudId,
+    idxStackPrimaryAssetId,
+    idxRemoteAssetOwnerChecksum,
+    uQRemoteAssetsOwnerChecksum,
+    uQRemoteAssetsOwnerLibraryChecksum,
+    idxRemoteAssetChecksum,
+    idxRemoteAssetStackId,
+    idxRemoteAssetLocalDateTimeDay,
+    idxRemoteAssetLocalDateTimeMonth,
+    authUserEntity,
+    userMetadataEntity,
+    partnerEntity,
+    remoteExifEntity,
+    remoteAlbumAssetEntity,
+    remoteAlbumUserEntity,
+    remoteAssetCloudIdEntity,
+    memoryEntity,
+    memoryAssetEntity,
+    personEntity,
+    assetFaceEntity,
+    storeEntity,
+    trashedLocalAssetEntity,
+    idxPartnerSharedWithId,
+    idxLatLng,
+    idxRemoteAlbumAssetAlbumAsset,
+    idxRemoteAssetCloudId,
+    idxPersonOwnerId,
+    idxAssetFacePersonId,
+    idxAssetFaceAssetId,
+    idxTrashedLocalAssetChecksum,
+    idxTrashedLocalAssetAlbum,
+  ];
+  late final Shape20 userEntity = Shape20(
+    source: i0.VersionedTable(
+      entityName: 'user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_3,
+        _column_84,
+        _column_85,
+        _column_91,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape28 remoteAssetEntity = Shape28(
+    source: i0.VersionedTable(
+      entityName: 'remote_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_1,
+        _column_8,
+        _column_9,
+        _column_5,
+        _column_10,
+        _column_11,
+        _column_12,
+        _column_0,
+        _column_13,
+        _column_14,
+        _column_15,
+        _column_16,
+        _column_17,
+        _column_18,
+        _column_19,
+        _column_20,
+        _column_21,
+        _column_86,
+        _column_101,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape3 stackEntity = Shape3(
+    source: i0.VersionedTable(
+      entityName: 'stack_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [_column_0, _column_9, _column_5, _column_15, _column_75],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape26 localAssetEntity = Shape26(
+    source: i0.VersionedTable(
+      entityName: 'local_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_1,
+        _column_8,
+        _column_9,
+        _column_5,
+        _column_10,
+        _column_11,
+        _column_12,
+        _column_0,
+        _column_22,
+        _column_14,
+        _column_23,
+        _column_98,
+        _column_96,
+        _column_46,
+        _column_47,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape9 remoteAlbumEntity = Shape9(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_56,
+        _column_9,
+        _column_5,
+        _column_15,
+        _column_57,
+        _column_58,
+        _column_59,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape19 localAlbumEntity = Shape19(
+    source: i0.VersionedTable(
+      entityName: 'local_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_5,
+        _column_31,
+        _column_32,
+        _column_90,
+        _column_33,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape22 localAlbumAssetEntity = Shape22(
+    source: i0.VersionedTable(
+      entityName: 'local_album_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
+      columns: [_column_34, _column_35, _column_33],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  final i1.Index idxLocalAlbumAssetAlbumAsset = i1.Index(
+    'idx_local_album_asset_album_asset',
+    'CREATE INDEX IF NOT EXISTS idx_local_album_asset_album_asset ON local_album_asset_entity (album_id, asset_id)',
+  );
+  final i1.Index idxRemoteAlbumOwnerId = i1.Index(
+    'idx_remote_album_owner_id',
+    'CREATE INDEX IF NOT EXISTS idx_remote_album_owner_id ON remote_album_entity (owner_id)',
+  );
+  final i1.Index idxLocalAssetChecksum = i1.Index(
+    'idx_local_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
+  );
+  final i1.Index idxLocalAssetCloudId = i1.Index(
+    'idx_local_asset_cloud_id',
+    'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)',
+  );
+  final i1.Index idxStackPrimaryAssetId = i1.Index(
+    'idx_stack_primary_asset_id',
+    'CREATE INDEX IF NOT EXISTS idx_stack_primary_asset_id ON stack_entity (primary_asset_id)',
+  );
+  final i1.Index idxRemoteAssetOwnerChecksum = i1.Index(
+    'idx_remote_asset_owner_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
+  );
+  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
+    'UQ_remote_assets_owner_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
+  );
+  final i1.Index uQRemoteAssetsOwnerLibraryChecksum = i1.Index(
+    'UQ_remote_assets_owner_library_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
+  );
+  final i1.Index idxRemoteAssetChecksum = i1.Index(
+    'idx_remote_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
+  );
+  final i1.Index idxRemoteAssetStackId = i1.Index(
+    'idx_remote_asset_stack_id',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_stack_id ON remote_asset_entity (stack_id)',
+  );
+  final i1.Index idxRemoteAssetLocalDateTimeDay = i1.Index(
+    'idx_remote_asset_local_date_time_day',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_local_date_time_day ON remote_asset_entity (STRFTIME(\'%Y-%m-%d\', local_date_time))',
+  );
+  final i1.Index idxRemoteAssetLocalDateTimeMonth = i1.Index(
+    'idx_remote_asset_local_date_time_month',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_local_date_time_month ON remote_asset_entity (STRFTIME(\'%Y-%m\', local_date_time))',
+  );
+  late final Shape21 authUserEntity = Shape21(
+    source: i0.VersionedTable(
+      entityName: 'auth_user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_3,
+        _column_2,
+        _column_84,
+        _column_85,
+        _column_92,
+        _column_93,
+        _column_7,
+        _column_94,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape4 userMetadataEntity = Shape4(
+    source: i0.VersionedTable(
+      entityName: 'user_metadata_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(user_id, "key")'],
+      columns: [_column_25, _column_26, _column_27],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape5 partnerEntity = Shape5(
+    source: i0.VersionedTable(
+      entityName: 'partner_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
+      columns: [_column_28, _column_29, _column_30],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape8 remoteExifEntity = Shape8(
+    source: i0.VersionedTable(
+      entityName: 'remote_exif_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id)'],
+      columns: [
+        _column_36,
+        _column_37,
+        _column_38,
+        _column_39,
+        _column_40,
+        _column_41,
+        _column_11,
+        _column_10,
+        _column_42,
+        _column_43,
+        _column_44,
+        _column_45,
+        _column_46,
+        _column_47,
+        _column_48,
+        _column_49,
+        _column_50,
+        _column_51,
+        _column_52,
+        _column_53,
+        _column_54,
+        _column_55,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape7 remoteAlbumAssetEntity = Shape7(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
+      columns: [_column_36, _column_60],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape10 remoteAlbumUserEntity = Shape10(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(album_id, user_id)'],
+      columns: [_column_60, _column_25, _column_61],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape27 remoteAssetCloudIdEntity = Shape27(
+    source: i0.VersionedTable(
+      entityName: 'remote_asset_cloud_id_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id)'],
+      columns: [
+        _column_36,
+        _column_99,
+        _column_100,
+        _column_96,
+        _column_46,
+        _column_47,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape11 memoryEntity = Shape11(
+    source: i0.VersionedTable(
+      entityName: 'memory_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_9,
+        _column_5,
+        _column_18,
+        _column_15,
+        _column_8,
+        _column_62,
+        _column_63,
+        _column_64,
+        _column_65,
+        _column_66,
+        _column_67,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape12 memoryAssetEntity = Shape12(
+    source: i0.VersionedTable(
+      entityName: 'memory_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, memory_id)'],
+      columns: [_column_36, _column_68],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape14 personEntity = Shape14(
+    source: i0.VersionedTable(
+      entityName: 'person_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_9,
+        _column_5,
+        _column_15,
+        _column_1,
+        _column_69,
+        _column_71,
+        _column_72,
+        _column_73,
+        _column_74,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape29 assetFaceEntity = Shape29(
+    source: i0.VersionedTable(
+      entityName: 'asset_face_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_36,
+        _column_76,
+        _column_77,
+        _column_78,
+        _column_79,
+        _column_80,
+        _column_81,
+        _column_82,
+        _column_83,
+        _column_102,
+        _column_18,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape18 storeEntity = Shape18(
+    source: i0.VersionedTable(
+      entityName: 'store_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [_column_87, _column_88, _column_89],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape25 trashedLocalAssetEntity = Shape25(
+    source: i0.VersionedTable(
+      entityName: 'trashed_local_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id, album_id)'],
+      columns: [
+        _column_1,
+        _column_8,
+        _column_9,
+        _column_5,
+        _column_10,
+        _column_11,
+        _column_12,
+        _column_0,
+        _column_95,
+        _column_22,
+        _column_14,
+        _column_23,
+        _column_97,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  final i1.Index idxPartnerSharedWithId = i1.Index(
+    'idx_partner_shared_with_id',
+    'CREATE INDEX IF NOT EXISTS idx_partner_shared_with_id ON partner_entity (shared_with_id)',
+  );
+  final i1.Index idxLatLng = i1.Index(
+    'idx_lat_lng',
+    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
+  );
+  final i1.Index idxRemoteAlbumAssetAlbumAsset = i1.Index(
+    'idx_remote_album_asset_album_asset',
+    'CREATE INDEX IF NOT EXISTS idx_remote_album_asset_album_asset ON remote_album_asset_entity (album_id, asset_id)',
+  );
+  final i1.Index idxRemoteAssetCloudId = i1.Index(
+    'idx_remote_asset_cloud_id',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_cloud_id ON remote_asset_cloud_id_entity (cloud_id)',
+  );
+  final i1.Index idxPersonOwnerId = i1.Index(
+    'idx_person_owner_id',
+    'CREATE INDEX IF NOT EXISTS idx_person_owner_id ON person_entity (owner_id)',
+  );
+  final i1.Index idxAssetFacePersonId = i1.Index(
+    'idx_asset_face_person_id',
+    'CREATE INDEX IF NOT EXISTS idx_asset_face_person_id ON asset_face_entity (person_id)',
+  );
+  final i1.Index idxAssetFaceAssetId = i1.Index(
+    'idx_asset_face_asset_id',
+    'CREATE INDEX IF NOT EXISTS idx_asset_face_asset_id ON asset_face_entity (asset_id)',
+  );
+  final i1.Index idxTrashedLocalAssetChecksum = i1.Index(
+    'idx_trashed_local_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)',
+  );
+  final i1.Index idxTrashedLocalAssetAlbum = i1.Index(
+    'idx_trashed_local_asset_album',
+    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)',
+  );
+}
+
+class Shape29 extends i0.VersionedTable {
+  Shape29({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get assetId =>
+      columnsByName['asset_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get personId =>
+      columnsByName['person_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get imageWidth =>
+      columnsByName['image_width']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get imageHeight =>
+      columnsByName['image_height']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get boundingBoxX1 =>
+      columnsByName['bounding_box_x1']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get boundingBoxY1 =>
+      columnsByName['bounding_box_y1']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get boundingBoxX2 =>
+      columnsByName['bounding_box_x2']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get boundingBoxY2 =>
+      columnsByName['bounding_box_y2']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get sourceType =>
+      columnsByName['source_type']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<bool> get isVisible =>
+      columnsByName['is_visible']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<DateTime> get deletedAt =>
+      columnsByName['deleted_at']! as i1.GeneratedColumn<DateTime>;
+}
+
+i1.GeneratedColumn<bool> _column_102(String aliasedName) =>
+    i1.GeneratedColumn<bool>(
+      'is_visible',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.bool,
+      defaultConstraints: i1.GeneratedColumn.constraintIsAlways(
+        'CHECK ("is_visible" IN (0, 1))',
+      ),
+      defaultValue: const CustomExpression('1'),
+    );
 i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
   required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -8379,6 +8923,7 @@ i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema17 schema) from16To17,
   required Future<void> Function(i1.Migrator m, Schema18 schema) from17To18,
   required Future<void> Function(i1.Migrator m, Schema19 schema) from18To19,
+  required Future<void> Function(i1.Migrator m, Schema20 schema) from19To20,
 }) {
   return (currentVersion, database) async {
     switch (currentVersion) {
@@ -8472,6 +9017,11 @@ i0.MigrationStepWithVersion migrationSteps({
         final migrator = i1.Migrator(database, schema);
         await from18To19(migrator, schema);
         return 19;
+      case 19:
+        final schema = Schema20(database: database);
+        final migrator = i1.Migrator(database, schema);
+        await from19To20(migrator, schema);
+        return 20;
       default:
         throw ArgumentError.value('Unknown migration from $currentVersion');
     }
@@ -8497,6 +9047,7 @@ i1.OnUpgrade stepByStep({
   required Future<void> Function(i1.Migrator m, Schema17 schema) from16To17,
   required Future<void> Function(i1.Migrator m, Schema18 schema) from17To18,
   required Future<void> Function(i1.Migrator m, Schema19 schema) from18To19,
+  required Future<void> Function(i1.Migrator m, Schema20 schema) from19To20,
 }) => i0.VersionedSchema.stepByStepHelper(
   step: migrationSteps(
     from1To2: from1To2,
@@ -8517,5 +9068,6 @@ i1.OnUpgrade stepByStep({
     from16To17: from16To17,
     from17To18: from17To18,
     from18To19: from18To19,
+    from19To20: from19To20,
   ),
 );

mobile/lib/infrastructure/repositories/local_asset.repository.dart

@@ -184,7 +184,8 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
     }
 
     if (keepFavorites) {
-      whereClause = whereClause & _db.localAssetEntity.isFavorite.equals(false);
+      whereClause =
+          whereClause & _db.localAssetEntity.isFavorite.equals(false) & _db.remoteAssetEntity.isFavorite.equals(false);
     }
 
     query.where(whereClause);

mobile/lib/infrastructure/repositories/people.repository.dart

@@ -16,9 +16,15 @@ class DriftPeopleRepository extends DriftDatabaseRepository {
   }
 
   Future<List<DriftPerson>> getAssetPeople(String assetId) async {
-    final query = _db.select(_db.assetFaceEntity).join([
-      innerJoin(_db.personEntity, _db.personEntity.id.equalsExp(_db.assetFaceEntity.personId)),
-    ])..where(_db.assetFaceEntity.assetId.equals(assetId) & _db.personEntity.isHidden.equals(false));
+    final query =
+        _db.select(_db.assetFaceEntity).join([
+          innerJoin(_db.personEntity, _db.personEntity.id.equalsExp(_db.assetFaceEntity.personId)),
+        ])..where(
+          _db.assetFaceEntity.assetId.equals(assetId) &
+              _db.assetFaceEntity.isVisible.equals(true) &
+              _db.assetFaceEntity.deletedAt.isNull() &
+              _db.personEntity.isHidden.equals(false),
+        );
 
     return query.map((row) {
       final person = row.readTable(_db.personEntity);
@@ -39,7 +45,9 @@ class DriftPeopleRepository extends DriftDatabaseRepository {
           ..where(
             people.isHidden.equals(false) &
                 assets.deletedAt.isNull() &
-                assets.visibility.equalsValue(AssetVisibility.timeline),
+                assets.visibility.equalsValue(AssetVisibility.timeline) &
+                faces.isVisible.equals(true) &
+                faces.deletedAt.isNull(),
           )
           ..groupBy([people.id], having: faces.id.count().isBiggerOrEqualValue(3) | people.name.equals('').not())
           ..orderBy([

mobile/lib/infrastructure/repositories/remote_album.repository.dart

@@ -1,6 +1,8 @@
 import 'dart:async';
+import 'dart:convert';
 
 import 'package:drift/drift.dart';
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
@@ -321,26 +323,32 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
     }).watchSingleOrNull();
   }
 
-  Future<DateTime?> getNewestAssetTimestamp(String albumId) {
-    final query = _db.remoteAlbumAssetEntity.selectOnly()
-      ..where(_db.remoteAlbumAssetEntity.albumId.equals(albumId))
-      ..addColumns([_db.remoteAssetEntity.localDateTime.max()])
-      ..join([
-        innerJoin(_db.remoteAssetEntity, _db.remoteAssetEntity.id.equalsExp(_db.remoteAlbumAssetEntity.assetId)),
-      ]);
+  Future<List<String>> getSortedAlbumIds(List<String> albumIds, {required AssetDateAggregation aggregation}) async {
+    if (albumIds.isEmpty) return [];
 
-    return query.map((row) => row.read(_db.remoteAssetEntity.localDateTime.max())).getSingleOrNull();
-  }
+    final jsonIds = jsonEncode(albumIds);
+    final sqlAgg = aggregation == AssetDateAggregation.start ? 'MIN' : 'MAX';
 
-  Future<DateTime?> getOldestAssetTimestamp(String albumId) {
-    final query = _db.remoteAlbumAssetEntity.selectOnly()
-      ..where(_db.remoteAlbumAssetEntity.albumId.equals(albumId))
-      ..addColumns([_db.remoteAssetEntity.localDateTime.min()])
-      ..join([
-        innerJoin(_db.remoteAssetEntity, _db.remoteAssetEntity.id.equalsExp(_db.remoteAlbumAssetEntity.assetId)),
-      ]);
+    final rows = await _db
+        .customSelect(
+          '''
+          SELECT
+            raae.album_id,
+            $sqlAgg(rae.local_date_time) AS asset_date
+          FROM json_each(?) ids
+          INNER JOIN remote_album_asset_entity raae
+            ON raae.album_id = ids.value
+          INNER JOIN remote_asset_entity rae
+            ON rae.id = raae.asset_id
+          GROUP BY raae.album_id
+          ORDER BY asset_date ASC
+          ''',
+          variables: [Variable<String>(jsonIds)],
+          readsFrom: {_db.remoteAlbumAssetEntity, _db.remoteAssetEntity},
+        )
+        .get();
 
-    return query.map((row) => row.read(_db.remoteAssetEntity.localDateTime.min())).getSingleOrNull();
+    return rows.map((row) => row.read<String>('album_id')).toList();
   }
 
   Future<int> getCount() {

mobile/lib/infrastructure/repositories/sync_api.repository.dart

@@ -7,6 +7,7 @@ import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/sync_event.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/services/api.service.dart';
+import 'package:immich_mobile/utils/semver.dart';
 import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
 
@@ -25,6 +26,7 @@ class SyncApiRepository {
 
   Future<void> streamChanges(
     Future<void> Function(List<SyncEvent>, Function() abort, Function() reset) onData, {
+    required SemVer serverVersion,
     Function()? onReset,
     int batchSize = kSyncEventBatchSize,
     http.Client? httpClient,
@@ -64,7 +66,8 @@ class SyncApiRepository {
           SyncRequestType.partnerStacksV1,
           SyncRequestType.userMetadataV1,
           SyncRequestType.peopleV1,
-          SyncRequestType.assetFacesV1,
+          if (serverVersion < const SemVer(major: 2, minor: 6, patch: 0)) SyncRequestType.assetFacesV1,
+          if (serverVersion >= const SemVer(major: 2, minor: 6, patch: 0)) SyncRequestType.assetFacesV2,
         ],
         reset: shouldReset,
       ).toJson(),
@@ -190,6 +193,7 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
   SyncEntityType.personV1: SyncPersonV1.fromJson,
   SyncEntityType.personDeleteV1: SyncPersonDeleteV1.fromJson,
   SyncEntityType.assetFaceV1: SyncAssetFaceV1.fromJson,
+  SyncEntityType.assetFaceV2: SyncAssetFaceV2.fromJson,
   SyncEntityType.assetFaceDeleteV1: SyncAssetFaceDeleteV1.fromJson,
   SyncEntityType.syncCompleteV1: _SyncEmptyDto.fromJson,
 };

mobile/lib/infrastructure/repositories/sync_stream.repository.dart

@@ -652,6 +652,37 @@ class SyncStreamRepository extends DriftDatabaseRepository {
     }
   }
 
+  Future<void> updateAssetFacesV2(Iterable<SyncAssetFaceV2> data) async {
+    try {
+      await _db.batch((batch) {
+        for (final assetFace in data) {
+          final companion = AssetFaceEntityCompanion(
+            assetId: Value(assetFace.assetId),
+            personId: Value(assetFace.personId),
+            imageWidth: Value(assetFace.imageWidth),
+            imageHeight: Value(assetFace.imageHeight),
+            boundingBoxX1: Value(assetFace.boundingBoxX1),
+            boundingBoxY1: Value(assetFace.boundingBoxY1),
+            boundingBoxX2: Value(assetFace.boundingBoxX2),
+            boundingBoxY2: Value(assetFace.boundingBoxY2),
+            sourceType: Value(assetFace.sourceType),
+            deletedAt: Value(assetFace.deletedAt),
+            isVisible: Value(assetFace.isVisible),
+          );
+
+          batch.insert(
+            _db.assetFaceEntity,
+            companion.copyWith(id: Value(assetFace.id)),
+            onConflict: DoUpdate((_) => companion),
+          );
+        }
+      });
+    } catch (error, stack) {
+      _logger.severe('Error: updateAssetFacesV2', error, stack);
+      rethrow;
+    }
+  }
+
   Future<void> deleteAssetFacesV1(Iterable<SyncAssetFaceDeleteV1> data) async {
     try {
       await _db.batch((batch) {

mobile/lib/infrastructure/repositories/timeline.repository.dart

@@ -323,6 +323,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
         row.deletedAt.isNull() & row.ownerId.equals(userId) & row.visibility.equalsValue(AssetVisibility.archive),
     groupBy: groupBy,
     origin: TimelineOrigin.archive,
+    joinLocal: true,
   );
 
   TimelineQuery locked(String userId, GroupAssetsBy groupBy) => _remoteQueryBuilder(
@@ -421,7 +422,9 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
           _db.remoteAssetEntity.deletedAt.isNull() &
               _db.remoteAssetEntity.ownerId.equals(userId) &
               _db.remoteAssetEntity.visibility.equalsValue(AssetVisibility.timeline) &
-              _db.assetFaceEntity.personId.equals(personId),
+              _db.assetFaceEntity.personId.equals(personId) &
+              _db.assetFaceEntity.isVisible.equals(true) &
+              _db.assetFaceEntity.deletedAt.isNull(),
         );
 
       return query.map((row) {
@@ -446,7 +449,9 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
         _db.remoteAssetEntity.deletedAt.isNull() &
             _db.remoteAssetEntity.ownerId.equals(userId) &
             _db.remoteAssetEntity.visibility.equalsValue(AssetVisibility.timeline) &
-            _db.assetFaceEntity.personId.equals(personId),
+            _db.assetFaceEntity.personId.equals(personId) &
+            _db.assetFaceEntity.isVisible.equals(true) &
+            _db.assetFaceEntity.deletedAt.isNull(),
       )
       ..groupBy([dateExp])
       ..orderBy([OrderingTerm.desc(dateExp)]);
@@ -476,7 +481,9 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
             _db.remoteAssetEntity.deletedAt.isNull() &
                 _db.remoteAssetEntity.ownerId.equals(userId) &
                 _db.remoteAssetEntity.visibility.equalsValue(AssetVisibility.timeline) &
-                _db.assetFaceEntity.personId.equals(personId),
+                _db.assetFaceEntity.personId.equals(personId) &
+                _db.assetFaceEntity.isVisible.equals(true) &
+                _db.assetFaceEntity.deletedAt.isNull(),
           )
           ..orderBy([OrderingTerm.desc(_db.remoteAssetEntity.createdAt)])
           ..limit(count, offset: offset);

mobile/lib/models/shared_link/shared_link.model.dart

@@ -14,6 +14,7 @@ class SharedLink {
   final String key;
   final bool showMetadata;
   final SharedLinkSource type;
+  final String? slug;
 
   const SharedLink({
     required this.id,
@@ -27,6 +28,7 @@ class SharedLink {
     required this.key,
     required this.showMetadata,
     required this.type,
+    required this.slug,
   });
 
   SharedLink copyWith({
@@ -41,6 +43,7 @@ class SharedLink {
     String? key,
     bool? showMetadata,
     SharedLinkSource? type,
+    String? slug,
   }) {
     return SharedLink(
       id: id ?? this.id,
@@ -54,6 +57,7 @@ class SharedLink {
       key: key ?? this.key,
       showMetadata: showMetadata ?? this.showMetadata,
       type: type ?? this.type,
+      slug: slug ?? this.slug,
     );
   }
 
@@ -66,6 +70,7 @@ class SharedLink {
       expiresAt = dto.expiresAt,
       key = dto.key,
       showMetadata = dto.showMetadata,
+      slug = dto.slug,
       type = dto.type == SharedLinkType.ALBUM ? SharedLinkSource.album : SharedLinkSource.individual,
       title = dto.type == SharedLinkType.ALBUM
           ? dto.album?.albumName.toUpperCase() ?? "UNKNOWN SHARE"
@@ -78,7 +83,7 @@ class SharedLink {
 
   @override
   String toString() =>
-      'SharedLink(id=$id, title=$title, thumbAssetId=$thumbAssetId, allowDownload=$allowDownload, allowUpload=$allowUpload, description=$description, password=$password, expiresAt=$expiresAt, key=$key, showMetadata=$showMetadata, type=$type)';
+      'SharedLink(id=$id, title=$title, thumbAssetId=$thumbAssetId, allowDownload=$allowDownload, allowUpload=$allowUpload, description=$description, password=$password, expiresAt=$expiresAt, key=$key, showMetadata=$showMetadata, type=$type, slug=$slug)';
 
   @override
   bool operator ==(Object other) =>
@@ -94,7 +99,8 @@ class SharedLink {
           other.expiresAt == expiresAt &&
           other.key == key &&
           other.showMetadata == showMetadata &&
-          other.type == type;
+          other.type == type &&
+          other.slug == slug;
 
   @override
   int get hashCode =>
@@ -108,5 +114,6 @@ class SharedLink {
       expiresAt.hashCode ^
       key.hashCode ^
       showMetadata.hashCode ^
-      type.hashCode;
+      type.hashCode ^
+      slug.hashCode;
 }

mobile/lib/pages/common/gallery_viewer.page.dart

@@ -221,8 +221,37 @@ class GalleryViewerPage extends HookConsumerWidget {
         onDragUpdate: (_, details, __) {
           handleSwipeUpDown(details);
         },
-        onTapDown: (_, __, ___) {
-          ref.read(showControlsProvider.notifier).toggle();
+        onTapDown: (ctx, tapDownDetails, _) {
+          final tapToNavigate = ref.read(appSettingsServiceProvider).getSetting<bool>(AppSettingsEnum.tapToNavigate);
+          if (!tapToNavigate) {
+            ref.read(showControlsProvider.notifier).toggle();
+            return;
+          }
+
+          double tapX = tapDownDetails.globalPosition.dx;
+          double screenWidth = ctx.width;
+
+          // We want to change images if the user taps in the leftmost or
+          // rightmost quarter of the screen
+          bool tappedLeftSide = tapX < screenWidth / 4;
+          bool tappedRightSide = tapX > screenWidth * (3 / 4);
+
+          int? currentPage = controller.page?.toInt();
+          int maxPage = renderList.totalAssets - 1;
+
+          if (tappedLeftSide && currentPage != null) {
+            // Nested if because we don't want to fallback to show/hide controls
+            if (currentPage != 0) {
+              controller.jumpToPage(currentPage - 1);
+            }
+          } else if (tappedRightSide && currentPage != null) {
+            // Nested if because we don't want to fallback to show/hide controls
+            if (currentPage != maxPage) {
+              controller.jumpToPage(currentPage + 1);
+            }
+          } else {
+            ref.read(showControlsProvider.notifier).toggle();
+          }
         },
         onLongPressStart: asset.isMotionPhoto
             ? (_, __, ___) {

mobile/lib/pages/common/splash_screen.page.dart

@@ -109,9 +109,43 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
     if (context.router.current.name == SplashScreenRoute.name) {
       final needBetaMigration = Store.get(StoreKey.needBetaMigration, false);
       if (needBetaMigration) {
+        bool migrate =
+            (await showDialog<bool>(
+              context: context,
+              builder: (ctx) => AlertDialog(
+                title: const Text("New Timeline Experience"),
+                content: const Text(
+                  "The old timeline has been deprecated and will be removed in an upcoming release. Would you like to switch to the new timeline now?",
+                ),
+                actions: [
+                  TextButton(onPressed: () => Navigator.of(ctx).pop(false), child: const Text("No")),
+                  ElevatedButton(onPressed: () => Navigator.of(ctx).pop(true), child: const Text("Yes")),
+                ],
+              ),
+            )) ??
+            false;
+        if (migrate != true) {
+          migrate =
+              (await showDialog<bool>(
+                context: context,
+                builder: (ctx) => AlertDialog(
+                  title: const Text("Are you sure?"),
+                  content: const Text(
+                    "If you choose to remain on the old timeline, you will be automatically migrated to the new timeline in an upcoming release. Would you like to switch now?",
+                  ),
+                  actions: [
+                    TextButton(onPressed: () => Navigator.of(ctx).pop(false), child: const Text("No")),
+                    ElevatedButton(onPressed: () => Navigator.of(ctx).pop(true), child: const Text("Yes")),
+                  ],
+                ),
+              )) ??
+              false;
+        }
         await Store.put(StoreKey.needBetaMigration, false);
-        unawaited(context.router.replaceAll([ChangeExperienceRoute(switchingToBeta: true)]));
-        return;
+        if (migrate) {
+          unawaited(context.router.replaceAll([ChangeExperienceRoute(switchingToBeta: true)]));
+          return;
+        }
       }
 
       unawaited(context.replaceRoute(Store.isBetaTimelineEnabled ? const TabShellRoute() : const TabControllerRoute()));

mobile/lib/pages/editing/edit.page.dart

@@ -1,6 +1,4 @@
-import 'dart:async';
 import 'dart:typed_data';
-import 'dart:ui';
 
 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -12,6 +10,7 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/album/album.provider.dart';
 import 'package:immich_mobile/repositories/file_media.repository.dart';
 import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/utils/image_converter.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 import 'package:path/path.dart' as p;
 
@@ -30,27 +29,10 @@ class EditImagePage extends ConsumerWidget {
   final bool isEdited;
 
   const EditImagePage({super.key, required this.asset, required this.image, required this.isEdited});
-  Future<Uint8List> _imageToUint8List(Image image) async {
-    final Completer<Uint8List> completer = Completer();
-    image.image
-        .resolve(const ImageConfiguration())
-        .addListener(
-          ImageStreamListener((ImageInfo info, bool _) {
-            info.image.toByteData(format: ImageByteFormat.png).then((byteData) {
-              if (byteData != null) {
-                completer.complete(byteData.buffer.asUint8List());
-              } else {
-                completer.completeError('Failed to convert image to bytes');
-              }
-            });
-          }, onError: (exception, stackTrace) => completer.completeError(exception)),
-        );
-    return completer.future;
-  }
 
   Future<void> _saveEditedImage(BuildContext context, Asset asset, Image image, WidgetRef ref) async {
     try {
-      final Uint8List imageData = await _imageToUint8List(image);
+      final Uint8List imageData = await imageToUint8List(image);
       await ref
           .read(fileMediaRepositoryProvider)
           .saveImage(imageData, title: "${p.withoutExtension(asset.fileName)}_edited.jpg");

mobile/lib/pages/library/shared_link/shared_link_edit.page.dart

@@ -29,6 +29,8 @@ class SharedLinkEditPage extends HookConsumerWidget {
     final descriptionController = useTextEditingController(text: existingLink?.description ?? "");
     final descriptionFocusNode = useFocusNode();
     final passwordController = useTextEditingController(text: existingLink?.password ?? "");
+    final slugController = useTextEditingController(text: existingLink?.slug ?? "");
+    final slugFocusNode = useFocusNode();
     final showMetadata = useState(existingLink?.showMetadata ?? true);
     final allowDownload = useState(existingLink?.allowDownload ?? true);
     final allowUpload = useState(existingLink?.allowUpload ?? false);
@@ -108,6 +110,26 @@ class SharedLinkEditPage extends HookConsumerWidget {
       );
     }
 
+    Widget buildSlugField() {
+      return TextField(
+        controller: slugController,
+        enabled: newShareLink.value.isEmpty,
+        focusNode: slugFocusNode,
+        textInputAction: TextInputAction.done,
+        autofocus: false,
+        decoration: InputDecoration(
+          labelText: 'custom_url'.tr(),
+          labelStyle: TextStyle(fontWeight: FontWeight.bold, color: colorScheme.primary),
+          floatingLabelBehavior: FloatingLabelBehavior.always,
+          border: const OutlineInputBorder(),
+          hintText: 'custom_url'.tr(),
+          hintStyle: const TextStyle(fontWeight: FontWeight.normal, fontSize: 14),
+          disabledBorder: OutlineInputBorder(borderSide: BorderSide(color: Colors.grey.withValues(alpha: 0.5))),
+        ),
+        onTapOutside: (_) => slugFocusNode.unfocus(),
+      );
+    }
+
     Widget buildShowMetaButton() {
       return SwitchListTile.adaptive(
         value: showMetadata.value,
@@ -261,6 +283,7 @@ class SharedLinkEditPage extends HookConsumerWidget {
             allowUpload: allowUpload.value,
             description: descriptionController.text.isEmpty ? null : descriptionController.text,
             password: passwordController.text.isEmpty ? null : passwordController.text,
+            slug: slugController.text.isEmpty ? null : slugController.text,
             expiresAt: expiryAfter.value == 0 ? null : calculateExpiry(),
           );
       ref.invalidate(sharedLinksStateProvider);
@@ -274,7 +297,10 @@ class SharedLinkEditPage extends HookConsumerWidget {
       }
 
       if (newLink != null && serverUrl != null) {
-        newShareLink.value = "${serverUrl}share/${newLink.key}";
+        final hasSlug = newLink.slug?.isNotEmpty == true;
+        final urlPath = hasSlug ? newLink.slug : newLink.key;
+        final basePath = hasSlug ? 's' : 'share';
+        newShareLink.value = "$serverUrl$basePath/$urlPath";
         copyLinkToClipboard();
       } else if (newLink == null) {
         ImmichToast.show(
@@ -292,6 +318,7 @@ class SharedLinkEditPage extends HookConsumerWidget {
       bool? meta;
       String? desc;
       String? password;
+      String? slug;
       DateTime? expiry;
       bool? changeExpiry;
 
@@ -315,6 +342,12 @@ class SharedLinkEditPage extends HookConsumerWidget {
         password = passwordController.text;
       }
 
+      if (slugController.text != (existingLink!.slug ?? "")) {
+        slug = slugController.text.isEmpty ? null : slugController.text;
+      } else {
+        slug = existingLink!.slug;
+      }
+
       if (editExpiry.value) {
         expiry = expiryAfter.value == 0 ? null : calculateExpiry();
         changeExpiry = true;
@@ -329,6 +362,7 @@ class SharedLinkEditPage extends HookConsumerWidget {
             allowUpload: upload,
             description: desc,
             password: password,
+            slug: slug,
             expiresAt: expiry,
             changeExpiry: changeExpiry,
           );
@@ -349,6 +383,7 @@ class SharedLinkEditPage extends HookConsumerWidget {
             Padding(padding: const EdgeInsets.all(padding), child: buildLinkTitle()),
             Padding(padding: const EdgeInsets.all(padding), child: buildDescriptionField()),
             Padding(padding: const EdgeInsets.all(padding), child: buildPasswordField()),
+            Padding(padding: const EdgeInsets.all(padding), child: buildSlugField()),
             Padding(
               padding: const EdgeInsets.only(left: padding, right: padding, bottom: padding),
               child: buildShowMetaButton(),

mobile/lib/presentation/pages/editing/drift_edit.page.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:ui';
 
 import 'package:auto_route/auto_route.dart';
 import 'package:cancellation_token_http/http.dart';
@@ -14,6 +13,7 @@ import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/repositories/file_media.repository.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/services/foreground_upload.service.dart';
+import 'package:immich_mobile/utils/image_converter.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart' as p;
@@ -33,23 +33,6 @@ class DriftEditImagePage extends ConsumerWidget {
   final bool isEdited;
 
   const DriftEditImagePage({super.key, required this.asset, required this.image, required this.isEdited});
-  Future<Uint8List> _imageToUint8List(Image image) async {
-    final Completer<Uint8List> completer = Completer();
-    image.image
-        .resolve(const ImageConfiguration())
-        .addListener(
-          ImageStreamListener((ImageInfo info, bool _) {
-            info.image.toByteData(format: ImageByteFormat.png).then((byteData) {
-              if (byteData != null) {
-                completer.complete(byteData.buffer.asUint8List());
-              } else {
-                completer.completeError('Failed to convert image to bytes');
-              }
-            });
-          }, onError: (exception, stackTrace) => completer.completeError(exception)),
-        );
-    return completer.future;
-  }
 
   void _exitEditing(BuildContext context) {
     // this assumes that the only way to get to this page is from the AssetViewerRoute
@@ -58,7 +41,7 @@ class DriftEditImagePage extends ConsumerWidget {
 
   Future<void> _saveEditedImage(BuildContext context, BaseAsset asset, Image image, WidgetRef ref) async {
     try {
-      final Uint8List imageData = await _imageToUint8List(image);
+      final Uint8List imageData = await imageToUint8List(image);
       LocalAsset? localAsset;
 
       try {

mobile/lib/presentation/pages/profile/profile_picture_crop.page.dart

@@ -0,0 +1,177 @@
+import 'dart:async';
+
+import 'package:auto_route/auto_route.dart';
+import 'package:crop_image/crop_image.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:image_picker/image_picker.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
+import 'package:immich_mobile/providers/auth.provider.dart';
+import 'package:immich_mobile/providers/backup/backup.provider.dart';
+import 'package:immich_mobile/providers/upload_profile_image.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/utils/image_converter.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
+import 'package:immich_ui/immich_ui.dart';
+
+@RoutePage()
+class ProfilePictureCropPage extends ConsumerStatefulWidget {
+  final BaseAsset asset;
+
+  const ProfilePictureCropPage({super.key, required this.asset});
+
+  @override
+  ConsumerState<ProfilePictureCropPage> createState() => _ProfilePictureCropPageState();
+}
+
+class _ProfilePictureCropPageState extends ConsumerState<ProfilePictureCropPage> {
+  late final CropController _cropController;
+  bool _isLoading = false;
+  bool _didInitCropController = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _cropController = CropController(defaultCrop: const Rect.fromLTRB(0, 0, 1, 1));
+
+    // Lock aspect ratio to 1:1 for circular/square crop
+    // CropController depends on CropImage initializing its bitmap size.
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted || _didInitCropController) {
+        return;
+      }
+      _didInitCropController = true;
+
+      _cropController.crop = const Rect.fromLTRB(0.1, 0.1, 0.9, 0.9);
+      _cropController.aspectRatio = 1.0;
+    });
+  }
+
+  @override
+  void dispose() {
+    _cropController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _handleDone() async {
+    if (_isLoading) return;
+
+    setState(() {
+      _isLoading = true;
+    });
+
+    try {
+      final croppedImage = await _cropController.croppedImage();
+      final pngBytes = await imageToUint8List(croppedImage);
+      final xFile = XFile.fromData(pngBytes, mimeType: 'image/png');
+      final success = await ref
+          .read(uploadProfileImageProvider.notifier)
+          .upload(xFile, fileName: 'profile-picture.png');
+
+      if (!context.mounted) return;
+
+      if (success) {
+        final profileImagePath = ref.read(uploadProfileImageProvider).profileImagePath;
+        ref.read(authProvider.notifier).updateUserProfileImagePath(profileImagePath);
+        final user = ref.read(currentUserProvider);
+        if (user != null) {
+          unawaited(ref.read(currentUserProvider.notifier).refresh());
+        }
+        unawaited(ref.read(backupProvider.notifier).updateDiskInfo());
+
+        ImmichToast.show(
+          context: context,
+          msg: 'profile_picture_set'.tr(),
+          gravity: ToastGravity.BOTTOM,
+          toastType: ToastType.success,
+        );
+
+        if (context.mounted) {
+          unawaited(context.maybePop());
+        }
+      } else {
+        ImmichToast.show(
+          context: context,
+          msg: 'errors.unable_to_set_profile_picture'.tr(),
+          toastType: ToastType.error,
+          gravity: ToastGravity.BOTTOM,
+        );
+      }
+    } catch (e) {
+      if (!context.mounted) return;
+
+      ImmichToast.show(
+        context: context,
+        msg: 'errors.unable_to_set_profile_picture'.tr(),
+        toastType: ToastType.error,
+        gravity: ToastGravity.BOTTOM,
+      );
+    } finally {
+      if (mounted) {
+        setState(() {
+          _isLoading = false;
+        });
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // Create Image widget from asset
+    final image = Image(image: getFullImageProvider(widget.asset));
+
+    return Scaffold(
+      appBar: AppBar(
+        backgroundColor: context.scaffoldBackgroundColor,
+        title: Text("set_profile_picture".tr()),
+        leading: _isLoading ? null : const ImmichCloseButton(),
+        actions: [
+          if (_isLoading)
+            const Padding(
+              padding: EdgeInsets.all(16.0),
+              child: SizedBox(width: 20, height: 20, child: CircularProgressIndicator(strokeWidth: 2)),
+            )
+          else
+            ImmichIconButton(
+              icon: Icons.done_rounded,
+              color: ImmichColor.primary,
+              variant: ImmichVariant.ghost,
+              onPressed: _handleDone,
+            ),
+        ],
+      ),
+      backgroundColor: context.scaffoldBackgroundColor,
+      body: SafeArea(
+        child: LayoutBuilder(
+          builder: (BuildContext context, BoxConstraints constraints) {
+            return Center(
+              child: ConstrainedBox(
+                constraints: BoxConstraints(maxHeight: context.height * 0.7, maxWidth: context.width * 0.9),
+                child: Container(
+                  decoration: BoxDecoration(
+                    borderRadius: const BorderRadius.all(Radius.circular(7)),
+                    boxShadow: [
+                      BoxShadow(
+                        color: Colors.black.withValues(alpha: 0.2),
+                        spreadRadius: 2,
+                        blurRadius: 10,
+                        offset: const Offset(0, 3),
+                      ),
+                    ],
+                  ),
+                  child: ClipRRect(
+                    child: CropImage(controller: _cropController, image: image, gridColor: Colors.white),
+                  ),
+                ),
+              ),
+            );
+          },
+        ),
+      ),
+    );
+  }
+}

mobile/lib/presentation/pages/search/drift_search.page.dart

@@ -150,10 +150,12 @@ class DriftSearchPage extends HookConsumerWidget {
       handleOnSelect(Set<PersonDto> value) {
         filter.value = filter.value.copyWith(people: value);
 
-        peopleCurrentFilterWidget.value = Text(
-          value.map((e) => e.name != '' ? e.name : 'no_name'.t(context: context)).join(', '),
-          style: context.textTheme.labelLarge,
-        );
+        final label = value.map((e) => e.name != '' ? e.name : 'no_name'.t(context: context)).join(', ');
+        if (label.isNotEmpty) {
+          peopleCurrentFilterWidget.value = Text(label, style: context.textTheme.labelLarge);
+        } else {
+          peopleCurrentFilterWidget.value = null;
+        }
       }
 
       handleClear() {
@@ -696,7 +698,7 @@ class DriftSearchPage extends HookConsumerWidget {
                       label: 'search_filter_location'.t(context: context),
                       currentFilter: locationCurrentFilterWidget.value,
                     ),
-                    if (userPreferences.value?.tagsEnabled ?? false)
+                    if (userPreferences.valueOrNull?.tagsEnabled ?? false)
                       SearchFilterChip(
                         icon: Icons.sell_outlined,
                         onTap: showTagPicker,
@@ -722,14 +724,13 @@ class DriftSearchPage extends HookConsumerWidget {
                       label: 'search_filter_media_type'.t(context: context),
                       currentFilter: mediaTypeCurrentFilterWidget.value,
                     ),
-                    if (userPreferences.value?.ratingsEnabled ?? false) ...[
+                    if (userPreferences.valueOrNull?.ratingsEnabled ?? false)
                       SearchFilterChip(
                         icon: Icons.star_outline_rounded,
                         onTap: showStarRatingPicker,
                         label: 'search_filter_star_rating'.t(context: context),
                         currentFilter: ratingCurrentFilterWidget.value,
                       ),
-                    ],
                     SearchFilterChip(
                       icon: Icons.display_settings_outlined,
                       onTap: showDisplayOptionPicker,

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

@@ -5,6 +5,7 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/asset_grid/trash_delete_dialog.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 /// This delete action has the following behavior:
@@ -22,6 +23,18 @@ class DeleteTrashActionButton extends ConsumerWidget {
       return;
     }
 
+    final selectCount = ref.watch(multiSelectProvider.select((s) => s.selectedAssets.length));
+
+    final confirmDelete =
+        await showDialog<bool>(
+          context: context,
+          builder: (context) => TrashDeleteDialog(count: selectCount),
+        ) ??
+        false;
+    if (!confirmDelete) {
+      return;
+    }
+
     final result = await ref.read(actionProvider.notifier).deleteRemoteAndLocal(source);
     ref.read(multiSelectProvider.notifier).reset();
 

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

@@ -0,0 +1,56 @@
+import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
+
+class SetAlbumCoverActionButton extends ConsumerWidget {
+  final String albumId;
+  final ActionSource source;
+  final bool iconOnly;
+  final bool menuItem;
+
+  const SetAlbumCoverActionButton({
+    super.key,
+    required this.albumId,
+    required this.source,
+    this.iconOnly = false,
+    this.menuItem = false,
+  });
+
+  void _onTap(BuildContext context, WidgetRef ref) async {
+    if (!context.mounted) {
+      return;
+    }
+
+    final result = await ref.read(actionProvider.notifier).setAlbumCover(source, albumId);
+    ref.read(multiSelectProvider.notifier).reset();
+
+    final successMessage = 'album_cover_updated'.t(context: context);
+
+    if (context.mounted) {
+      ImmichToast.show(
+        context: context,
+        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
+        gravity: ToastGravity.BOTTOM,
+        toastType: result.success ? ToastType.success : ToastType.error,
+      );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData: Icons.image_outlined,
+      label: 'set_as_album_cover'.t(context: context),
+      iconOnly: iconOnly,
+      menuItem: menuItem,
+      onPressed: () => _onTap(context, ref),
+      maxWidth: 100,
+    );
+  }
+}

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

@@ -0,0 +1,35 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/routing/router.dart';
+
+class SetProfilePictureActionButton extends ConsumerWidget {
+  final BaseAsset asset;
+  final bool iconOnly;
+  final bool menuItem;
+
+  const SetProfilePictureActionButton({super.key, required this.asset, this.iconOnly = false, this.menuItem = false});
+
+  void _onTap(BuildContext context) {
+    if (!context.mounted) {
+      return;
+    }
+
+    context.pushRoute(ProfilePictureCropRoute(asset: asset));
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData: Icons.account_circle_outlined,
+      label: "set_as_profile_picture".t(context: context),
+      iconOnly: iconOnly,
+      menuItem: menuItem,
+      onPressed: () => _onTap(context),
+      maxWidth: 100,
+    );
+  }
+}

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

@@ -16,8 +16,10 @@ import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.sta
 import 'package:immich_mobile/presentation/widgets/asset_viewer/video_viewer.widget.dart';
 import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/video_player_controls_provider.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
@@ -29,8 +31,9 @@ enum _DragIntent { none, scroll, dismiss }
 class AssetPage extends ConsumerStatefulWidget {
   final int index;
   final int heroOffset;
+  final void Function(int direction)? onTapNavigate;
 
-  const AssetPage({super.key, required this.index, required this.heroOffset});
+  const AssetPage({super.key, required this.index, required this.heroOffset, this.onTapNavigate});
 
   @override
   ConsumerState createState() => _AssetPageState();
@@ -50,14 +53,13 @@ class _AssetPageState extends ConsumerState<AssetPage> {
 
   final _scrollController = ScrollController();
   late final _proxyScrollController = ProxyScrollController(scrollController: _scrollController);
+  final ValueNotifier<PhotoViewScaleState> _videoScaleStateNotifier = ValueNotifier(PhotoViewScaleState.initial);
 
   double _snapOffset = 0.0;
-  double _lastScrollOffset = 0.0;
 
   DragStartDetails? _dragStart;
   _DragIntent _dragIntent = _DragIntent.none;
   Drag? _drag;
-  bool _shouldPopOnDrag = false;
 
   @override
   void initState() {
@@ -78,6 +80,7 @@ class _AssetPageState extends ConsumerState<AssetPage> {
     _proxyScrollController.dispose();
     _scaleBoundarySub?.cancel();
     _eventSubscription?.cancel();
+    _videoScaleStateNotifier.dispose();
     super.dispose();
   }
 
@@ -91,7 +94,6 @@ class _AssetPageState extends ConsumerState<AssetPage> {
 
   void _showDetails() {
     if (!_proxyScrollController.hasClients || _snapOffset <= 0) return;
-    _lastScrollOffset = _proxyScrollController.offset;
     _proxyScrollController.animateTo(_snapOffset, duration: Durations.medium2, curve: Curves.easeOutCubic);
   }
 
@@ -105,18 +107,15 @@ class _AssetPageState extends ConsumerState<AssetPage> {
 
   void _onScroll() {
     final offset = _proxyScrollController.offset;
-    if (offset > SnapScrollPhysics.minSnapDistance && offset > _lastScrollOffset) {
+    if (offset > SnapScrollPhysics.minSnapDistance) {
       _viewer.setShowingDetails(true);
     } else if (offset < SnapScrollPhysics.minSnapDistance - kTouchSlop) {
       _viewer.setShowingDetails(false);
     }
-    _lastScrollOffset = offset;
   }
 
   void _beginDrag(DragStartDetails details) {
     _dragStart = details;
-    _shouldPopOnDrag = false;
-    _lastScrollOffset = _proxyScrollController.hasClients ? _proxyScrollController.offset : 0.0;
 
     if (_viewController != null) {
       _initialPhotoViewState = _viewController!.value;
@@ -158,6 +157,7 @@ class _AssetPageState extends ConsumerState<AssetPage> {
   void _endDrag(DragEndDetails details) {
     if (_dragStart == null) return;
 
+    final start = _dragStart;
     _dragStart = null;
 
     final intent = _dragIntent;
@@ -173,7 +173,8 @@ class _AssetPageState extends ConsumerState<AssetPage> {
         _drag?.end(details);
         _drag = null;
       case _DragIntent.dismiss:
-        if (_shouldPopOnDrag) {
+        const popThreshold = 75.0;
+        if (details.localPosition.dy - start!.localPosition.dy > popThreshold) {
           context.maybePop();
           return;
         }
@@ -192,7 +193,6 @@ class _AssetPageState extends ConsumerState<AssetPage> {
     PhotoViewControllerBase controller,
     PhotoViewScaleStateController scaleStateController,
   ) {
-    _viewController = controller;
     if (!_showingDetails && _isZoomed) return;
     _beginDrag(details);
   }
@@ -206,12 +206,8 @@ class _AssetPageState extends ConsumerState<AssetPage> {
 
   void _handleDragDown(BuildContext context, Offset delta) {
     const dragRatio = 0.2;
-    const popThreshold = 75.0;
-
-    _shouldPopOnDrag = delta.dy > popThreshold;
 
     final distance = delta.dy.abs();
-
     final maxScaleDistance = context.height * 0.5;
     final scaleReduction = (distance / maxScaleDistance).clamp(0.0, dragRatio);
     final initialScale = _viewController?.initialScale ?? _initialPhotoViewState.scale;
@@ -224,17 +220,39 @@ class _AssetPageState extends ConsumerState<AssetPage> {
   }
 
   void _onTapUp(BuildContext context, TapUpDetails details, PhotoViewControllerValue controllerValue) {
-    if (!_showingDetails && _dragStart == null) _viewer.toggleControls();
+    if (_showingDetails || _dragStart != null) return;
+
+    final tapToNavigate = ref.read(appSettingsServiceProvider).getSetting<bool>(AppSettingsEnum.tapToNavigate);
+    if (!tapToNavigate) {
+      _viewer.toggleControls();
+      return;
+    }
+
+    final tapX = details.globalPosition.dx;
+    final screenWidth = context.width;
+
+    // Navigate if the user taps in the leftmost or rightmost quarter of the screen
+    final tappedLeftSide = tapX < screenWidth / 4;
+    final tappedRightSide = tapX > screenWidth * (3 / 4);
+
+    if (tappedLeftSide) {
+      widget.onTapNavigate?.call(-1);
+    } else if (tappedRightSide) {
+      widget.onTapNavigate?.call(1);
+    } else {
+      _viewer.toggleControls();
+    }
   }
 
   void _onLongPress(BuildContext context, LongPressStartDetails details, PhotoViewControllerValue controllerValue) =>
       ref.read(isPlayingMotionVideoProvider.notifier).playing = true;
 
   void _onScaleStateChanged(PhotoViewScaleState scaleState) {
-    _isZoomed = switch (scaleState) {
-      PhotoViewScaleState.zoomedIn || PhotoViewScaleState.covering => true,
-      _ => false,
-    };
+    _isZoomed =
+        scaleState == PhotoViewScaleState.zoomedIn ||
+        scaleState == PhotoViewScaleState.covering ||
+        _videoScaleStateNotifier.value == PhotoViewScaleState.zoomedIn ||
+        _videoScaleStateNotifier.value == PhotoViewScaleState.covering;
     _viewer.setZoomed(_isZoomed);
 
     if (scaleState != PhotoViewScaleState.initial) {
@@ -316,34 +334,33 @@ class _AssetPageState extends ConsumerState<AssetPage> {
     }
 
     return PhotoView.customChild(
+      key: ValueKey(displayAsset),
       onDragStart: _onDragStart,
       onDragUpdate: _onDragUpdate,
       onDragEnd: _onDragEnd,
       onDragCancel: _onDragCancel,
-      onTapUp: _onTapUp,
       heroAttributes: heroAttributes,
       filterQuality: FilterQuality.high,
-      maxScale: 1.0,
       basePosition: Alignment.center,
       disableScaleGestures: true,
-      scaleStateChangedCallback: _onScaleStateChanged,
+      minScale: PhotoViewComputedScale.contained,
+      initialScale: PhotoViewComputedScale.contained,
+      tightMode: true,
       onPageBuild: _onPageBuild,
       enablePanAlways: true,
       backgroundDecoration: backgroundDecoration,
-      child: SizedBox(
-        width: context.width,
-        height: context.height,
-        child: NativeVideoViewer(
+      child: NativeVideoViewer(
+        key: ValueKey(displayAsset),
+        asset: displayAsset,
+        scaleStateNotifier: _videoScaleStateNotifier,
+        disableScaleGestures: showingDetails,
+        image: Image(
           key: ValueKey(displayAsset.heroTag),
-          asset: displayAsset,
-          image: Image(
-            key: ValueKey(displayAsset),
-            image: getFullImageProvider(displayAsset, size: context.sizeData),
-            fit: BoxFit.contain,
-            height: context.height,
-            width: context.width,
-            alignment: Alignment.center,
-          ),
+          image: getFullImageProvider(displayAsset, size: context.sizeData),
+          height: context.height,
+          width: context.width,
+          fit: BoxFit.contain,
+          alignment: Alignment.center,
         ),
       ),
     );

mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart

@@ -96,6 +96,16 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
 
   bool _assetReloadRequested = false;
 
+  void _onTapNavigate(int direction) {
+    final page = _pageController.page?.toInt();
+    if (page == null) return;
+    final target = page + direction;
+    final maxPage = ref.read(timelineServiceProvider).totalAssets - 1;
+    if (target >= 0 && target <= maxPage) {
+      _pageController.jumpToPage(target);
+    }
+  }
+
   @override
   void initState() {
     super.initState();
@@ -270,7 +280,8 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
                     : const FastClampingScrollPhysics(),
                 itemCount: ref.read(timelineServiceProvider).totalAssets,
                 onPageChanged: (index) => _onAssetChanged(index),
-                itemBuilder: (context, index) => AssetPage(index: index, heroOffset: _heroOffset),
+                itemBuilder: (context, index) =>
+                    AssetPage(index: index, heroOffset: _heroOffset, onTapNavigate: _onTapNavigate),
               ),
             ),
             if (!CurrentPlatform.isIOS)

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

@@ -9,6 +9,7 @@ import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/setting.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
@@ -25,6 +26,7 @@ import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/utils/debounce.dart';
 import 'package:immich_mobile/utils/hooks/interval_hook.dart';
+import 'package:immich_mobile/widgets/photo_view/photo_view.dart';
 import 'package:logging/logging.dart';
 import 'package:native_video_player/native_video_player.dart';
 import 'package:wakelock_plus/wakelock_plus.dart';
@@ -52,6 +54,8 @@ class NativeVideoViewer extends HookConsumerWidget {
   final bool showControls;
   final int playbackDelayFactor;
   final Widget image;
+  final ValueNotifier<PhotoViewScaleState>? scaleStateNotifier;
+  final bool disableScaleGestures;
 
   const NativeVideoViewer({
     super.key,
@@ -59,6 +63,8 @@ class NativeVideoViewer extends HookConsumerWidget {
     required this.image,
     this.showControls = true,
     this.playbackDelayFactor = 1,
+    this.scaleStateNotifier,
+    this.disableScaleGestures = false,
   });
 
   @override
@@ -138,6 +144,7 @@ class NativeVideoViewer extends HookConsumerWidget {
 
     final videoSource = useMemoized<Future<VideoSource?>>(() => createSource());
     final aspectRatio = useState<double?>(null);
+
     useMemoized(() async {
       if (!context.mounted || aspectRatio.value != null) {
         return null;
@@ -313,6 +320,20 @@ class NativeVideoViewer extends HookConsumerWidget {
       Timer(const Duration(milliseconds: 200), checkIfBuffering);
     }
 
+    Size? videoContextSize(double? videoAspectRatio, BuildContext? context) {
+      Size? videoContextSize;
+      if (videoAspectRatio == null || context == null) {
+        return null;
+      }
+      final contextAspectRatio = context.width / context.height;
+      if (videoAspectRatio > contextAspectRatio) {
+        videoContextSize = Size(context.width, context.width / aspectRatio.value!);
+      } else {
+        videoContextSize = Size(context.height * aspectRatio.value!, context.height);
+      }
+      return videoContextSize;
+    }
+
     ref.listen(currentAssetNotifier, (_, value) {
       final playerController = controller.value;
       if (playerController != null && value != asset) {
@@ -393,26 +414,31 @@ class NativeVideoViewer extends HookConsumerWidget {
       }
     });
 
-    return Stack(
-      children: [
-        // This remains under the video to avoid flickering
-        // For motion videos, this is the image portion of the asset
-        Center(key: ValueKey(asset.heroTag), child: image),
-        if (aspectRatio.value != null && !isCasting)
-          Visibility.maintain(
-            key: ValueKey(asset),
-            visible: isVisible.value,
-            child: Center(
+    return SizedBox(
+      width: context.width,
+      height: context.height,
+      child: Stack(
+        children: [
+          // Hide thumbnail once video is visible to avoid it showing in background when zooming out on video.
+          if (!isVisible.value || controller.value == null) Center(key: ValueKey(asset.heroTag), child: image),
+          if (aspectRatio.value != null && !isCasting && isCurrent)
+            Visibility.maintain(
               key: ValueKey(asset),
-              child: AspectRatio(
+              visible: isVisible.value,
+              child: PhotoView.customChild(
                 key: ValueKey(asset),
-                aspectRatio: aspectRatio.value!,
-                child: isCurrent ? NativeVideoPlayerView(key: ValueKey(asset), onViewReady: initController) : null,
+                enableRotation: false,
+                disableScaleGestures: disableScaleGestures,
+                // Transparent to avoid a black flash when viewer becomes visible but video isn't loaded yet.
+                backgroundDecoration: const BoxDecoration(color: Colors.transparent),
+                scaleStateChangedCallback: (state) => scaleStateNotifier?.value = state,
+                childSize: videoContextSize(aspectRatio.value, context),
+                child: NativeVideoPlayerView(key: ValueKey(asset), onViewReady: initController),
               ),
             ),
-          ),
-        if (showControls) const Center(child: VideoViewerControls()),
-      ],
+          if (showControls) const Center(child: VideoViewerControls()),
+        ],
+      ),
     );
   }
 

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

@@ -81,27 +81,35 @@ class VideoViewerControls extends HookConsumerWidget {
       }
     }
 
+    void toggleControlsVisibility() {
+      if (showBuffering) {
+        return;
+      }
+      if (showControls) {
+        ref.read(assetViewerProvider.notifier).setControls(false);
+      } else {
+        showControlsAndStartHideTimer();
+      }
+    }
+
     return GestureDetector(
-      behavior: HitTestBehavior.opaque,
-      onTap: showControlsAndStartHideTimer,
-      child: AbsorbPointer(
-        absorbing: !showControls,
+      behavior: HitTestBehavior.translucent,
+      onTap: toggleControlsVisibility,
+      child: IgnorePointer(
+        ignoring: !showControls,
         child: Stack(
           children: [
             if (showBuffering)
               const Center(child: DelayedLoadingIndicator(fadeInDuration: Duration(milliseconds: 400)))
             else
-              GestureDetector(
-                onTap: () => ref.read(assetViewerProvider.notifier).setControls(false),
-                child: CenterPlayButton(
-                  backgroundColor: Colors.black54,
-                  iconColor: Colors.white,
-                  isFinished: state == VideoPlaybackState.completed,
-                  isPlaying:
-                      state == VideoPlaybackState.playing || (cast.isCasting && cast.castState == CastState.playing),
-                  show: assetIsVideo && showControls,
-                  onPressed: togglePlay,
-                ),
+              CenterPlayButton(
+                backgroundColor: Colors.black54,
+                iconColor: Colors.white,
+                isFinished: state == VideoPlaybackState.completed,
+                isPlaying:
+                    state == VideoPlaybackState.playing || (cast.isCasting && cast.castState == CastState.playing),
+                show: assetIsVideo && showControls,
+                onPressed: togglePlay,
               ),
           ],
         ),

mobile/lib/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart

@@ -13,6 +13,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_
 import 'package:immich_mobile/presentation/widgets/action_buttons/favorite_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/set_album_cover.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_button.widget.dart';
@@ -113,6 +114,8 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
         ],
         if (multiselect.hasMerged) const DeleteLocalActionButton(source: ActionSource.timeline),
         if (ownsAlbum) RemoveFromAlbumActionButton(source: ActionSource.timeline, albumId: widget.album.id),
+        if (ownsAlbum && multiselect.selectedAssets.length == 1)
+          SetAlbumCoverActionButton(source: ActionSource.timeline, albumId: widget.album.id),
       ],
       slivers: ownsAlbum
           ? [

mobile/lib/presentation/widgets/people/person_edit_birthday_modal.widget.dart

@@ -25,7 +25,7 @@ class _DriftPersonNameEditFormState extends ConsumerState<DriftPersonBirthdayEdi
   @override
   void initState() {
     super.initState();
-    _selectedDate = widget.person.birthDate ?? DateTime.now();
+    _selectedDate = widget.person.birthDate ?? DateTime(DateTime.now().year - 30, 1, 1);
   }
 
   void saveBirthday() async {
@@ -90,6 +90,7 @@ class _DriftPersonNameEditFormState extends ConsumerState<DriftPersonBirthdayEdi
             selectedDate: _selectedDate,
             locale: context.locale,
             minimumDate: DateTime(1800, 1, 1),
+            maximumDate: DateTime.now(),
             onDateTimeChanged: (DateTime value) {
               setState(() {
                 _selectedDate = value;

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

@@ -29,38 +29,7 @@ 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/selection_sliver_app_bar.dart';
 
-class _TimelineRestorationState extends ChangeNotifier {
-  int? _restoreAssetIndex;
-  bool _shouldRestoreAssetPosition = false;
-
-  int? get restoreAssetIndex => _restoreAssetIndex;
-  bool get shouldRestoreAssetPosition => _shouldRestoreAssetPosition;
-
-  void setRestoreAssetIndex(int? index) {
-    _restoreAssetIndex = index;
-    notifyListeners();
-  }
-
-  void setShouldRestoreAssetPosition(bool should) {
-    _shouldRestoreAssetPosition = should;
-    notifyListeners();
-  }
-
-  void clearRestoreAssetIndex() {
-    _restoreAssetIndex = null;
-    notifyListeners();
-  }
-}
-
-class _TimelineRestorationProvider extends InheritedNotifier<_TimelineRestorationState> {
-  const _TimelineRestorationProvider({required super.notifier, required super.child});
-
-  static _TimelineRestorationState of(BuildContext context) {
-    return context.dependOnInheritedWidgetOfExactType<_TimelineRestorationProvider>()!.notifier!;
-  }
-}
-
-class Timeline extends StatefulWidget {
+class Timeline extends StatelessWidget {
   const Timeline({
     super.key,
     this.topSliverWidget,
@@ -74,6 +43,7 @@ class Timeline extends StatefulWidget {
     this.snapToMonth = true,
     this.initialScrollOffset,
     this.readOnly = false,
+    this.persistentBottomBar = false,
   });
 
   final Widget? topSliverWidget;
@@ -87,26 +57,7 @@ class Timeline extends StatefulWidget {
   final bool snapToMonth;
   final double? initialScrollOffset;
   final bool readOnly;
-
-  @override
-  State<Timeline> createState() => _TimelineState();
-}
-
-class _TimelineState extends State<Timeline> {
-  double? _lastWidth;
-  late final _TimelineRestorationState _restorationState;
-
-  @override
-  void initState() {
-    super.initState();
-    _restorationState = _TimelineRestorationState();
-  }
-
-  @override
-  void dispose() {
-    _restorationState.dispose();
-    super.dispose();
-  }
+  final bool persistentBottomBar;
 
   @override
   Widget build(BuildContext context) {
@@ -114,41 +65,32 @@ class _TimelineState extends State<Timeline> {
       resizeToAvoidBottomInset: false,
       floatingActionButton: const DownloadStatusFloatingButton(),
       body: LayoutBuilder(
-        builder: (_, constraints) {
-          if (_lastWidth != null && _lastWidth != constraints.maxWidth) {
-            _restorationState.setShouldRestoreAssetPosition(true);
-          }
-          _lastWidth = constraints.maxWidth;
-          return _TimelineRestorationProvider(
-            notifier: _restorationState,
-            child: ProviderScope(
-              key: ValueKey(_lastWidth),
-              overrides: [
-                timelineArgsProvider.overrideWith(
-                  (ref) => TimelineArgs(
-                    maxWidth: constraints.maxWidth,
-                    maxHeight: constraints.maxHeight,
-                    columnCount: ref.watch(settingsProvider.select((s) => s.get(Setting.tilesPerRow))),
-                    showStorageIndicator: widget.showStorageIndicator,
-                    withStack: widget.withStack,
-                    groupBy: widget.groupBy,
-                  ),
-                ),
-                if (widget.readOnly) readonlyModeProvider.overrideWith(() => _AlwaysReadOnlyNotifier()),
-              ],
-              child: _SliverTimeline(
-                key: const ValueKey('_sliver_timeline'),
-                topSliverWidget: widget.topSliverWidget,
-                topSliverWidgetHeight: widget.topSliverWidgetHeight,
-                appBar: widget.appBar,
-                bottomSheet: widget.bottomSheet,
-                withScrubber: widget.withScrubber,
-                snapToMonth: widget.snapToMonth,
-                initialScrollOffset: widget.initialScrollOffset,
+        builder: (_, constraints) => ProviderScope(
+          overrides: [
+            timelineArgsProvider.overrideWith(
+              (ref) => TimelineArgs(
+                maxWidth: constraints.maxWidth,
+                maxHeight: constraints.maxHeight,
+                columnCount: ref.watch(settingsProvider.select((s) => s.get(Setting.tilesPerRow))),
+                showStorageIndicator: showStorageIndicator,
+                withStack: withStack,
+                groupBy: groupBy,
               ),
             ),
-          );
-        },
+            if (readOnly) readonlyModeProvider.overrideWith(() => _AlwaysReadOnlyNotifier()),
+          ],
+          child: _SliverTimeline(
+            topSliverWidget: topSliverWidget,
+            topSliverWidgetHeight: topSliverWidgetHeight,
+            appBar: appBar,
+            bottomSheet: bottomSheet,
+            withScrubber: withScrubber,
+            persistentBottomBar: persistentBottomBar,
+            snapToMonth: snapToMonth,
+            initialScrollOffset: initialScrollOffset,
+            maxWidth: constraints.maxWidth,
+          ),
+        ),
       ),
     );
   }
@@ -167,14 +109,15 @@ class _AlwaysReadOnlyNotifier extends ReadOnlyModeNotifier {
 
 class _SliverTimeline extends ConsumerStatefulWidget {
   const _SliverTimeline({
-    super.key,
     this.topSliverWidget,
     this.topSliverWidgetHeight,
     this.appBar,
     this.bottomSheet,
     this.withScrubber = true,
+    this.persistentBottomBar = false,
     this.snapToMonth = true,
     this.initialScrollOffset,
+    this.maxWidth,
   });
 
   final Widget? topSliverWidget;
@@ -182,8 +125,10 @@ class _SliverTimeline extends ConsumerStatefulWidget {
   final Widget? appBar;
   final Widget? bottomSheet;
   final bool withScrubber;
+  final bool persistentBottomBar;
   final bool snapToMonth;
   final double? initialScrollOffset;
+  final double? maxWidth;
 
   @override
   ConsumerState createState() => _SliverTimelineState();
@@ -202,6 +147,7 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
   int _perRow = 4;
   double _scaleFactor = 3.0;
   double _baseScaleFactor = 3.0;
+  int? _restoreAssetIndex;
 
   @override
   void initState() {
@@ -220,6 +166,20 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
     ref.listenManual(multiSelectProvider.select((s) => s.isEnabled), _onMultiSelectionToggled);
   }
 
+  @override
+  void didUpdateWidget(covariant _SliverTimeline oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (widget.maxWidth != oldWidget.maxWidth) {
+      final asyncSegments = ref.read(timelineSegmentProvider);
+      asyncSegments.whenData((segments) {
+        final index = _getCurrentAssetIndex(segments);
+        // Refresh to wait for new segments to be generated with the updated width before restoring the scroll position
+        final _ = ref.refresh(timelineArgsProvider);
+        _restoreAssetIndex = index;
+      });
+    }
+  }
+
   void _onEvent(Event event) {
     switch (event) {
       case ScrollToTopEvent():
@@ -237,21 +197,14 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
     }
   }
 
-  void _onMultiSelectionToggled(_, bool isEnabled) {
-    EventStream.shared.emit(MultiSelectToggleEvent(isEnabled));
-  }
-
   void _restoreAssetPosition(_) {
-    final restorationState = _TimelineRestorationProvider.of(context);
-    if (!restorationState.shouldRestoreAssetPosition || restorationState.restoreAssetIndex == null) return;
+    if (_restoreAssetIndex == null) return;
 
     final asyncSegments = ref.read(timelineSegmentProvider);
     asyncSegments.whenData((segments) {
-      final targetSegment = segments.lastWhereOrNull(
-        (segment) => segment.firstAssetIndex <= restorationState.restoreAssetIndex!,
-      );
+      final targetSegment = segments.lastWhereOrNull((segment) => segment.firstAssetIndex <= _restoreAssetIndex!);
       if (targetSegment != null) {
-        final assetIndexInSegment = restorationState.restoreAssetIndex! - targetSegment.firstAssetIndex;
+        final assetIndexInSegment = _restoreAssetIndex! - targetSegment.firstAssetIndex;
         final newColumnCount = ref.read(timelineArgsProvider).columnCount;
         final rowIndexInSegment = (assetIndexInSegment / newColumnCount).floor();
         final targetRowIndex = targetSegment.firstIndex + 1 + rowIndexInSegment;
@@ -263,7 +216,11 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
         });
       }
     });
-    restorationState.clearRestoreAssetIndex();
+    _restoreAssetIndex = null;
+  }
+
+  void _onMultiSelectionToggled(_, bool isEnabled) {
+    EventStream.shared.emit(MultiSelectToggleEvent(isEnabled));
   }
 
   int? _getCurrentAssetIndex(List<Segment> segments) {
@@ -404,6 +361,9 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
     final isSelectionMode = ref.watch(multiSelectProvider.select((s) => s.forceEnable));
     final isMultiSelectEnabled = ref.watch(multiSelectProvider.select((s) => s.isEnabled));
     final isReadonlyModeEnabled = ref.watch(readonlyModeProvider);
+    final isMultiSelectStatusVisible = !isSelectionMode && isMultiSelectEnabled;
+    final isBottomWidgetVisible =
+        widget.bottomSheet != null && (isMultiSelectStatusVisible || widget.persistentBottomBar);
 
     return PopScope(
       canPop: !isMultiSelectEnabled,
@@ -470,68 +430,56 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
 
           return PrimaryScrollController(
             controller: _scrollController,
-            child: NotificationListener<ScrollEndNotification>(
-              onNotification: (notification) {
-                final currentIndex = _getCurrentAssetIndex(segments);
-                if (currentIndex != null && mounted) {
-                  _TimelineRestorationProvider.of(context).setRestoreAssetIndex(currentIndex);
-                }
-                return false;
-              },
-              child: RawGestureDetector(
-                gestures: {
-                  CustomScaleGestureRecognizer: GestureRecognizerFactoryWithHandlers<CustomScaleGestureRecognizer>(
-                    () => CustomScaleGestureRecognizer(),
-                    (CustomScaleGestureRecognizer scale) {
-                      scale.onStart = (details) {
-                        _baseScaleFactor = _scaleFactor;
-                      };
+            child: RawGestureDetector(
+              gestures: {
+                CustomScaleGestureRecognizer: GestureRecognizerFactoryWithHandlers<CustomScaleGestureRecognizer>(
+                  () => CustomScaleGestureRecognizer(),
+                  (CustomScaleGestureRecognizer scale) {
+                    scale.onStart = (details) {
+                      _baseScaleFactor = _scaleFactor;
+                    };
 
-                      scale.onUpdate = (details) {
-                        final newScaleFactor = math.max(math.min(5.0, _baseScaleFactor * details.scale), 1.0);
-                        final newPerRow = 7 - newScaleFactor.toInt();
+                    scale.onUpdate = (details) {
+                      final newScaleFactor = math.max(math.min(5.0, _baseScaleFactor * details.scale), 1.0);
+                      final newPerRow = 7 - newScaleFactor.toInt();
+
+                      if (newPerRow != _perRow) {
                         final targetAssetIndex = _getCurrentAssetIndex(segments);
+                        setState(() {
+                          _scaleFactor = newScaleFactor;
+                          _perRow = newPerRow;
+                          _restoreAssetIndex = targetAssetIndex;
+                        });
 
-                        if (newPerRow != _perRow) {
-                          final restorationState = _TimelineRestorationProvider.of(context);
-                          setState(() {
-                            _scaleFactor = newScaleFactor;
-                            _perRow = newPerRow;
-                          });
-
-                          restorationState.setRestoreAssetIndex(targetAssetIndex);
-                          restorationState.setShouldRestoreAssetPosition(true);
-                          ref.read(settingsProvider.notifier).set(Setting.tilesPerRow, _perRow);
-                        }
-                      };
-                    },
-                  ),
-                },
-                child: TimelineDragRegion(
-                  onStart: !isReadonlyModeEnabled ? _setDragStartIndex : null,
-                  onAssetEnter: _handleDragAssetEnter,
-                  onEnd: !isReadonlyModeEnabled ? _stopDrag : null,
-                  onScroll: _dragScroll,
-                  onScrollStart: () {
-                    // Minimize the bottom sheet when drag selection starts
-                    ref.read(timelineStateProvider.notifier).setScrolling(true);
+                        ref.read(settingsProvider.notifier).set(Setting.tilesPerRow, _perRow);
+                      }
+                    };
                   },
-                  child: Stack(
-                    children: [
-                      timeline,
-                      if (!isSelectionMode && isMultiSelectEnabled) ...[
-                        Positioned(
-                          top: MediaQuery.paddingOf(context).top,
-                          left: 25,
-                          child: const SizedBox(
-                            height: kToolbarHeight,
-                            child: Center(child: _MultiSelectStatusButton()),
-                          ),
+                ),
+              },
+              child: TimelineDragRegion(
+                onStart: !isReadonlyModeEnabled ? _setDragStartIndex : null,
+                onAssetEnter: _handleDragAssetEnter,
+                onEnd: !isReadonlyModeEnabled ? _stopDrag : null,
+                onScroll: _dragScroll,
+                onScrollStart: () {
+                  // Minimize the bottom sheet when drag selection starts
+                  ref.read(timelineStateProvider.notifier).setScrolling(true);
+                },
+                child: Stack(
+                  children: [
+                    timeline,
+                    if (isBottomWidgetVisible)
+                      Positioned(
+                        top: MediaQuery.paddingOf(context).top,
+                        left: 25,
+                        child: const SizedBox(
+                          height: kToolbarHeight,
+                          child: Center(child: _MultiSelectStatusButton()),
                         ),
-                        if (widget.bottomSheet != null) widget.bottomSheet!,
-                      ],
-                    ],
-                  ),
+                      ),
+                    if (isBottomWidgetVisible) widget.bottomSheet!,
+                  ],
                 ),
               ),
             ),

mobile/lib/providers/infrastructure/action.provider.dart

@@ -343,6 +343,22 @@ class ActionNotifier extends Notifier<void> {
     }
   }
 
+  Future<ActionResult> setAlbumCover(ActionSource source, String albumId) async {
+    final assets = _getAssets(source);
+    final asset = assets.first;
+    if (asset is! RemoteAsset) {
+      return const ActionResult(count: 1, success: false, error: 'Asset must be remote');
+    }
+
+    try {
+      await _service.setAlbumCover(albumId, asset.id);
+      return const ActionResult(count: 1, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to set album cover', error, stack);
+      return ActionResult(count: 1, success: false, error: error.toString());
+    }
+  }
+
   Future<ActionResult> updateDescription(ActionSource source, String description) async {
     final ids = _getRemoteIdsForSource(source);
     if (ids.length != 1) {

mobile/lib/providers/upload_profile_image.provider.dart

@@ -61,10 +61,10 @@ class UploadProfileImageNotifier extends StateNotifier<UploadProfileImageState>
 
   final UserService _userService;
 
-  Future<bool> upload(XFile file) async {
+  Future<bool> upload(XFile file, {String? fileName}) async {
     state = state.copyWith(status: UploadProfileStatus.loading);
 
-    var profileImagePath = await _userService.createProfileImage(file.name, await file.readAsBytes());
+    var profileImagePath = await _userService.createProfileImage(fileName ?? file.name, await file.readAsBytes());
 
     if (profileImagePath != null) {
       dPrint(() => "Successfully upload profile image");

mobile/lib/routing/router.dart

@@ -106,6 +106,7 @@ import 'package:immich_mobile/presentation/pages/drift_trash.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_user_selection.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_video.page.dart';
 import 'package:immich_mobile/presentation/pages/editing/drift_crop.page.dart';
+import 'package:immich_mobile/presentation/pages/profile/profile_picture_crop.page.dart';
 import 'package:immich_mobile/presentation/pages/editing/drift_edit.page.dart';
 import 'package:immich_mobile/presentation/pages/editing/drift_filter.page.dart';
 import 'package:immich_mobile/presentation/pages/local_timeline.page.dart';
@@ -198,6 +199,7 @@ class AppRouter extends RootStackRouter {
     AutoRoute(page: EditImageRoute.page),
     AutoRoute(page: CropImageRoute.page),
     AutoRoute(page: FilterImageRoute.page),
+    AutoRoute(page: ProfilePictureCropRoute.page),
     CustomRoute(
       page: FavoritesRoute.page,
       guards: [_authGuard, _duplicateGuard],

mobile/lib/routing/router.gr.dart

@@ -2443,6 +2443,44 @@ class PlacesCollectionRouteArgs {
   }
 }
 
+/// generated route for
+/// [ProfilePictureCropPage]
+class ProfilePictureCropRoute
+    extends PageRouteInfo<ProfilePictureCropRouteArgs> {
+  ProfilePictureCropRoute({
+    Key? key,
+    required BaseAsset asset,
+    List<PageRouteInfo>? children,
+  }) : super(
+         ProfilePictureCropRoute.name,
+         args: ProfilePictureCropRouteArgs(key: key, asset: asset),
+         initialChildren: children,
+       );
+
+  static const String name = 'ProfilePictureCropRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<ProfilePictureCropRouteArgs>();
+      return ProfilePictureCropPage(key: args.key, asset: args.asset);
+    },
+  );
+}
+
+class ProfilePictureCropRouteArgs {
+  const ProfilePictureCropRouteArgs({this.key, required this.asset});
+
+  final Key? key;
+
+  final BaseAsset asset;
+
+  @override
+  String toString() {
+    return 'ProfilePictureCropRouteArgs{key: $key, asset: $asset}';
+  }
+}
+
 /// generated route for
 /// [RecentlyTakenPage]
 class RecentlyTakenRoute extends PageRouteInfo<void> {

mobile/lib/services/action.service.dart

@@ -240,6 +240,12 @@ class ActionService {
     return _downloadRepository.downloadAllAssets(assets);
   }
 
+  Future<bool> setAlbumCover(String albumId, String assetId) async {
+    final updatedAlbum = await _albumApiRepository.updateAlbum(albumId, thumbnailAssetId: assetId);
+    await _remoteAlbumRepository.update(updatedAlbum);
+    return true;
+  }
+
   Future<int> _deleteLocalAssets(List<String> localIds) async {
     final deletedIds = await _assetMediaRepository.deleteAll(localIds);
     if (deletedIds.isEmpty) {

mobile/lib/services/app_settings.service.dart

@@ -35,6 +35,7 @@ enum AppSettingsEnum<T> {
   loopVideo<bool>(StoreKey.loopVideo, "loopVideo", true),
   loadOriginalVideo<bool>(StoreKey.loadOriginalVideo, "loadOriginalVideo", false),
   autoPlayVideo<bool>(StoreKey.autoPlayVideo, "autoPlayVideo", true),
+  tapToNavigate<bool>(StoreKey.tapToNavigate, "tapToNavigate", false),
   mapThemeMode<int>(StoreKey.mapThemeMode, null, 0),
   mapShowFavoriteOnly<bool>(StoreKey.mapShowFavoriteOnly, null, false),
   mapIncludeArchived<bool>(StoreKey.mapIncludeArchived, null, false),

mobile/lib/services/shared_link.service.dart

@@ -37,6 +37,7 @@ class SharedLinkService {
     required bool allowUpload,
     String? description,
     String? password,
+    String? slug,
     String? albumId,
     List<String>? assetIds,
     DateTime? expiresAt,
@@ -54,6 +55,7 @@ class SharedLinkService {
           expiresAt: expiresAt,
           description: description,
           password: password,
+          slug: slug,
         );
       } else if (assetIds != null) {
         dto = SharedLinkCreateDto(
@@ -64,6 +66,7 @@ class SharedLinkService {
           expiresAt: expiresAt,
           description: description,
           password: password,
+          slug: slug,
           assetIds: assetIds,
         );
       }
@@ -88,6 +91,7 @@ class SharedLinkService {
     bool? changeExpiry = false,
     String? description,
     String? password,
+    String? slug,
     DateTime? expiresAt,
   }) async {
     try {
@@ -100,6 +104,7 @@ class SharedLinkService {
           expiresAt: expiresAt,
           description: description,
           password: password,
+          slug: slug,
           changeExpiryTime: changeExpiry,
         ),
       );

mobile/lib/utils/action_button.utils.dart

@@ -20,9 +20,11 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/like_activity_
 import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/set_album_cover.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/similar_photos_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/set_profile_picture_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unarchive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
@@ -42,6 +44,7 @@ class ActionButtonContext {
   final bool isCasting;
   final TimelineOrigin timelineOrigin;
   final ThemeData? originalTheme;
+  final int selectedCount;
 
   const ActionButtonContext({
     required this.asset,
@@ -56,6 +59,7 @@ class ActionButtonContext {
     this.isCasting = false,
     this.timelineOrigin = TimelineOrigin.main,
     this.originalTheme,
+    this.selectedCount = 1,
   });
 }
 
@@ -65,7 +69,9 @@ enum ActionButtonType {
   share,
   shareLink,
   cast,
+  setAlbumCover,
   similarPhotos,
+  setProfilePicture,
   viewInTimeline,
   download,
   upload,
@@ -134,6 +140,11 @@ enum ActionButtonType {
         context.isOwner && //
             !context.isInLockedView && //
             context.currentAlbum != null,
+      ActionButtonType.setAlbumCover =>
+        context.isOwner && //
+            !context.isInLockedView && //
+            context.currentAlbum != null && //
+            context.selectedCount == 1,
       ActionButtonType.unstack =>
         context.isOwner && //
             !context.isInLockedView && //
@@ -146,6 +157,10 @@ enum ActionButtonType {
       ActionButtonType.similarPhotos =>
         !context.isInLockedView && //
             context.asset is RemoteAsset,
+      ActionButtonType.setProfilePicture =>
+        !context.isInLockedView && //
+            context.asset is RemoteAsset && //
+            context.isOwner,
       ActionButtonType.openInfo => true,
       ActionButtonType.viewInTimeline =>
         context.timelineOrigin != TimelineOrigin.main &&
@@ -213,6 +228,12 @@ enum ActionButtonType {
         iconOnly: iconOnly,
         menuItem: menuItem,
       ),
+      ActionButtonType.setAlbumCover => SetAlbumCoverActionButton(
+        albumId: context.currentAlbum!.id,
+        source: context.source,
+        iconOnly: iconOnly,
+        menuItem: menuItem,
+      ),
       ActionButtonType.likeActivity => LikeActivityActionButton(iconOnly: iconOnly, menuItem: menuItem),
       ActionButtonType.unstack => UnStackActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
       ActionButtonType.similarPhotos => SimilarPhotosActionButton(
@@ -220,6 +241,11 @@ enum ActionButtonType {
         iconOnly: iconOnly,
         menuItem: menuItem,
       ),
+      ActionButtonType.setProfilePicture => SetProfilePictureActionButton(
+        asset: context.asset,
+        iconOnly: iconOnly,
+        menuItem: menuItem,
+      ),
       ActionButtonType.openInfo => BaseActionButton(
         label: 'info'.tr(),
         iconData: Icons.info_outline,
@@ -251,7 +277,7 @@ enum ActionButtonType {
   int get kebabMenuGroup => switch (this) {
     // 0: info
     ActionButtonType.openInfo => 0,
-    // 10: move,remove, and delete
+    // 10: move, remove, and delete
     ActionButtonType.trash => 10,
     ActionButtonType.deletePermanent => 10,
     ActionButtonType.removeFromLockFolder => 10,

mobile/lib/utils/image_converter.dart

@@ -0,0 +1,28 @@
+import 'dart:async';
+import 'dart:typed_data';
+import 'dart:ui';
+
+import 'package:flutter/material.dart';
+
+/// Converts a Flutter [Image] widget to a [Uint8List] in PNG format.
+///
+/// This function resolves the image stream and converts it to byte data.
+/// Returns a [Future] that completes with the image bytes or completes with an error
+/// if the conversion fails.
+Future<Uint8List> imageToUint8List(Image image) async {
+  final Completer<Uint8List> completer = Completer();
+  image.image
+      .resolve(const ImageConfiguration())
+      .addListener(
+        ImageStreamListener((ImageInfo info, bool _) {
+          info.image.toByteData(format: ImageByteFormat.png).then((byteData) {
+            if (byteData != null) {
+              completer.complete(byteData.buffer.asUint8List());
+            } else {
+              completer.completeError('Failed to convert image to bytes');
+            }
+          });
+        }, onError: (exception, stackTrace) => completer.completeError(exception)),
+      );
+  return completer.future;
+}

mobile/lib/utils/migration.dart

@@ -30,11 +30,10 @@ import 'package:immich_mobile/utils/datetime_helpers.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:immich_mobile/utils/diff.dart';
 import 'package:isar/isar.dart';
-
 // ignore: import_rule_photo_manager
 import 'package:photo_manager/photo_manager.dart';
 
-const int targetVersion = 21;
+const int targetVersion = 22;
 
 Future<void> migrateDatabaseIfNeeded(Isar db, Drift drift) async {
   final hasVersion = Store.tryGet(StoreKey.version) != null;
@@ -100,6 +99,10 @@ Future<void> migrateDatabaseIfNeeded(Isar db, Drift drift) async {
     }
   }
 
+  if (version < 22 && !Store.isBetaTimelineEnabled) {
+    await Store.put(StoreKey.needBetaMigration, true);
+  }
+
   if (targetVersion >= 12) {
     await Store.put(StoreKey.version, targetVersion);
     return;

mobile/lib/utils/option.dart

@@ -0,0 +1,58 @@
+sealed class Option<T> {
+  const Option();
+
+  const factory Option.some(T value) = Some<T>;
+
+  const factory Option.none() = None<T>;
+
+  factory Option.fromNullable(T? value) => value != null ? Some(value) : None<T>();
+
+  @pragma('vm:prefer-inline')
+  bool get isSome => this is Some<T>;
+
+  @pragma('vm:prefer-inline')
+  bool get isNone => this is None<T>;
+
+  @pragma('vm:prefer-inline')
+  T? get unwrapOrNull => switch (this) {
+    Some(:final value) => value,
+    None() => null,
+  };
+
+  U fold<U>(U Function(T value) onSome, U Function() onNone) => switch (this) {
+    Some(:final value) => onSome(value),
+    None() => onNone(),
+  };
+
+  @override
+  String toString() => switch (this) {
+    Some(:final value) => 'Some($value)',
+    None() => 'None',
+  };
+}
+
+final class Some<T> extends Option<T> {
+  final T value;
+
+  const Some(this.value);
+
+  @override
+  bool operator ==(Object other) => other is Some<T> && other.value == value;
+
+  @override
+  int get hashCode => value.hashCode;
+}
+
+final class None<T> extends Option<T> {
+  const None();
+
+  @override
+  bool operator ==(Object other) => other is None<T>;
+
+  @override
+  int get hashCode => 0;
+}
+
+extension ObjectOptionExtension<T> on T? {
+  Option<T> toOption() => Option.fromNullable(this);
+}

mobile/lib/widgets/asset_grid/trash_delete_dialog.dart

@@ -0,0 +1,47 @@
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/generated/translations.g.dart';
+import 'package:immich_ui/immich_ui.dart';
+
+class TrashDeleteDialog extends StatelessWidget {
+  const TrashDeleteDialog({super.key, required this.count});
+
+  final int count;
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(10))),
+      title: Text(context.t.permanently_delete),
+      content: ImmichFormattedText(context.t.permanently_delete_assets_prompt(count: count)),
+      actions: [
+        SizedBox(
+          width: double.infinity,
+          height: 48,
+          child: FilledButton(
+            onPressed: () => context.pop(false),
+            style: FilledButton.styleFrom(
+              backgroundColor: context.colorScheme.surfaceDim,
+              foregroundColor: context.primaryColor,
+            ),
+            child: Text(context.t.cancel, style: const TextStyle(fontWeight: FontWeight.bold)),
+          ),
+        ),
+        const SizedBox(height: 8),
+        SizedBox(
+          width: double.infinity,
+          height: 48,
+
+          child: FilledButton(
+            onPressed: () => context.pop(true),
+            style: FilledButton.styleFrom(
+              backgroundColor: context.colorScheme.errorContainer,
+              foregroundColor: context.colorScheme.onErrorContainer,
+            ),
+            child: Text(context.t.delete, style: const TextStyle(fontWeight: FontWeight.bold)),
+          ),
+        ),
+      ],
+    );
+  }
+}

mobile/lib/widgets/asset_viewer/center_play_button.dart

@@ -21,23 +21,20 @@ class CenterPlayButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return ColoredBox(
-      color: Colors.transparent,
-      child: Center(
-        child: UnconstrainedBox(
-          child: AnimatedOpacity(
-            opacity: show ? 1.0 : 0.0,
-            duration: const Duration(milliseconds: 100),
-            child: DecoratedBox(
-              decoration: BoxDecoration(color: backgroundColor, shape: BoxShape.circle),
-              child: IconButton(
-                iconSize: 32,
-                padding: const EdgeInsets.all(12.0),
-                icon: isFinished
-                    ? Icon(Icons.replay, color: iconColor)
-                    : AnimatedPlayPause(color: iconColor, playing: isPlaying),
-                onPressed: onPressed,
-              ),
+    return Center(
+      child: UnconstrainedBox(
+        child: AnimatedOpacity(
+          opacity: show ? 1.0 : 0.0,
+          duration: const Duration(milliseconds: 100),
+          child: DecoratedBox(
+            decoration: BoxDecoration(color: backgroundColor, shape: BoxShape.circle),
+            child: IconButton(
+              iconSize: 32,
+              padding: const EdgeInsets.all(12.0),
+              icon: isFinished
+                  ? Icon(Icons.replay, color: iconColor)
+                  : AnimatedPlayPause(color: iconColor, playing: isPlaying),
+              onPressed: onPressed,
             ),
           ),
         ),

mobile/lib/widgets/settings/advanced_settings.dart

@@ -135,7 +135,7 @@ class AdvancedSettings extends HookConsumerWidget {
           title: "advanced_settings_enable_alternate_media_filter_title".tr(),
           subtitle: "advanced_settings_enable_alternate_media_filter_subtitle".tr(),
         ),
-      const BetaTimelineListTile(),
+      if (!Store.isBetaTimelineEnabled) const BetaTimelineListTile(),
       if (Store.isBetaTimelineEnabled)
         SettingsSwitchListTile(
           valueNotifier: readonlyModeEnabled,

mobile/lib/widgets/settings/asset_viewer_settings/asset_viewer_settings.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/widgets/settings/asset_viewer_settings/image_viewer_quality_setting.dart';
+import 'package:immich_mobile/widgets/settings/asset_viewer_settings/image_viewer_tap_to_navigate_setting.dart';
 import 'package:immich_mobile/widgets/settings/settings_sub_page_scaffold.dart';
 import 'video_viewer_settings.dart';
 
@@ -8,7 +9,11 @@ class AssetViewerSettings extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final assetViewerSetting = [const ImageViewerQualitySetting(), const VideoViewerSettings()];
+    final assetViewerSetting = [
+      const ImageViewerQualitySetting(),
+      const ImageViewerTapToNavigateSetting(),
+      const VideoViewerSettings(),
+    ];
 
     return SettingsSubPageScaffold(settings: assetViewerSetting, showDivider: true);
   }

mobile/lib/widgets/settings/asset_viewer_settings/image_viewer_tap_to_navigate_setting.dart

@@ -0,0 +1,30 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
+import 'package:immich_mobile/widgets/settings/settings_sub_title.dart';
+import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
+import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
+
+class ImageViewerTapToNavigateSetting extends HookConsumerWidget {
+  const ImageViewerTapToNavigateSetting({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final tapToNavigate = useAppSettingsState(AppSettingsEnum.tapToNavigate);
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        SettingsSubTitle(title: "setting_image_navigation_title".tr()),
+        SettingsSwitchListTile(
+          valueNotifier: tapToNavigate,
+          title: "setting_image_navigation_enable_title".tr(),
+          subtitle: "setting_image_navigation_enable_subtitle".tr(),
+          onChanged: (_) => ref.invalidate(appSettingsServiceProvider),
+        ),
+      ],
+    );
+  }
+}

mobile/lib/widgets/shared_link/shared_link_item.dart

@@ -78,7 +78,10 @@ class SharedLinkItem extends ConsumerWidget {
         return;
       }
 
-      Clipboard.setData(ClipboardData(text: "${serverUrl}share/${sharedLink.key}")).then((_) {
+      final hasSlug = sharedLink.slug?.isNotEmpty == true;
+      final urlPath = hasSlug ? sharedLink.slug : sharedLink.key;
+      final basePath = hasSlug ? 's' : 'share';
+      Clipboard.setData(ClipboardData(text: "$serverUrl$basePath/$urlPath")).then((_) {
         context.scaffoldMessenger.showSnackBar(
           SnackBar(
             content: Text(

mobile/openapi/README.md

@@ -358,12 +358,11 @@ Class | Method | HTTP request | Description
  - [AssetDeltaSyncDto](doc//AssetDeltaSyncDto.md)
  - [AssetDeltaSyncResponseDto](doc//AssetDeltaSyncResponseDto.md)
  - [AssetEditAction](doc//AssetEditAction.md)
- - [AssetEditActionCrop](doc//AssetEditActionCrop.md)
- - [AssetEditActionListDto](doc//AssetEditActionListDto.md)
- - [AssetEditActionListDtoEditsInner](doc//AssetEditActionListDtoEditsInner.md)
- - [AssetEditActionMirror](doc//AssetEditActionMirror.md)
- - [AssetEditActionRotate](doc//AssetEditActionRotate.md)
- - [AssetEditsDto](doc//AssetEditsDto.md)
+ - [AssetEditActionItemDto](doc//AssetEditActionItemDto.md)
+ - [AssetEditActionItemDtoParameters](doc//AssetEditActionItemDtoParameters.md)
+ - [AssetEditActionItemResponseDto](doc//AssetEditActionItemResponseDto.md)
+ - [AssetEditsCreateDto](doc//AssetEditsCreateDto.md)
+ - [AssetEditsResponseDto](doc//AssetEditsResponseDto.md)
  - [AssetFaceCreateDto](doc//AssetFaceCreateDto.md)
  - [AssetFaceDeleteDto](doc//AssetFaceDeleteDto.md)
  - [AssetFaceResponseDto](doc//AssetFaceResponseDto.md)
@@ -580,6 +579,7 @@ Class | Method | HTTP request | Description
  - [SyncAssetExifV1](doc//SyncAssetExifV1.md)
  - [SyncAssetFaceDeleteV1](doc//SyncAssetFaceDeleteV1.md)
  - [SyncAssetFaceV1](doc//SyncAssetFaceV1.md)
+ - [SyncAssetFaceV2](doc//SyncAssetFaceV2.md)
  - [SyncAssetMetadataDeleteV1](doc//SyncAssetMetadataDeleteV1.md)
  - [SyncAssetMetadataV1](doc//SyncAssetMetadataV1.md)
  - [SyncAssetV1](doc//SyncAssetV1.md)

mobile/openapi/lib/api.dart

@@ -97,12 +97,11 @@ part 'model/asset_copy_dto.dart';
 part 'model/asset_delta_sync_dto.dart';
 part 'model/asset_delta_sync_response_dto.dart';
 part 'model/asset_edit_action.dart';
-part 'model/asset_edit_action_crop.dart';
-part 'model/asset_edit_action_list_dto.dart';
-part 'model/asset_edit_action_list_dto_edits_inner.dart';
-part 'model/asset_edit_action_mirror.dart';
-part 'model/asset_edit_action_rotate.dart';
-part 'model/asset_edits_dto.dart';
+part 'model/asset_edit_action_item_dto.dart';
+part 'model/asset_edit_action_item_dto_parameters.dart';
+part 'model/asset_edit_action_item_response_dto.dart';
+part 'model/asset_edits_create_dto.dart';
+part 'model/asset_edits_response_dto.dart';
 part 'model/asset_face_create_dto.dart';
 part 'model/asset_face_delete_dto.dart';
 part 'model/asset_face_response_dto.dart';
@@ -319,6 +318,7 @@ part 'model/sync_asset_delete_v1.dart';
 part 'model/sync_asset_exif_v1.dart';
 part 'model/sync_asset_face_delete_v1.dart';
 part 'model/sync_asset_face_v1.dart';
+part 'model/sync_asset_face_v2.dart';
 part 'model/sync_asset_metadata_delete_v1.dart';
 part 'model/sync_asset_metadata_v1.dart';
 part 'model/sync_asset_v1.dart';

mobile/openapi/lib/api/assets_api.dart

@@ -421,14 +421,14 @@ class AssetsApi {
   ///
   /// * [String] id (required):
   ///
-  /// * [AssetEditActionListDto] assetEditActionListDto (required):
-  Future<Response> editAssetWithHttpInfo(String id, AssetEditActionListDto assetEditActionListDto,) async {
+  /// * [AssetEditsCreateDto] assetEditsCreateDto (required):
+  Future<Response> editAssetWithHttpInfo(String id, AssetEditsCreateDto assetEditsCreateDto,) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/assets/{id}/edits'
       .replaceAll('{id}', id);
 
     // ignore: prefer_final_locals
-    Object? postBody = assetEditActionListDto;
+    Object? postBody = assetEditsCreateDto;
 
     final queryParams = <QueryParam>[];
     final headerParams = <String, String>{};
@@ -456,9 +456,9 @@ class AssetsApi {
   ///
   /// * [String] id (required):
   ///
-  /// * [AssetEditActionListDto] assetEditActionListDto (required):
-  Future<AssetEditsDto?> editAsset(String id, AssetEditActionListDto assetEditActionListDto,) async {
-    final response = await editAssetWithHttpInfo(id, assetEditActionListDto,);
+  /// * [AssetEditsCreateDto] assetEditsCreateDto (required):
+  Future<AssetEditsResponseDto?> editAsset(String id, AssetEditsCreateDto assetEditsCreateDto,) async {
+    final response = await editAssetWithHttpInfo(id, assetEditsCreateDto,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -466,7 +466,7 @@ class AssetsApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'AssetEditsDto',) as AssetEditsDto;
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'AssetEditsResponseDto',) as AssetEditsResponseDto;
     
     }
     return null;
@@ -576,7 +576,7 @@ class AssetsApi {
   /// Parameters:
   ///
   /// * [String] id (required):
-  Future<AssetEditsDto?> getAssetEdits(String id,) async {
+  Future<AssetEditsResponseDto?> getAssetEdits(String id,) async {
     final response = await getAssetEditsWithHttpInfo(id,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -585,7 +585,7 @@ class AssetsApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'AssetEditsDto',) as AssetEditsDto;
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'AssetEditsResponseDto',) as AssetEditsResponseDto;
     
     }
     return null;

mobile/openapi/lib/api_client.dart

@@ -240,18 +240,16 @@ class ApiClient {
           return AssetDeltaSyncResponseDto.fromJson(value);
         case 'AssetEditAction':
           return AssetEditActionTypeTransformer().decode(value);
-        case 'AssetEditActionCrop':
-          return AssetEditActionCrop.fromJson(value);
-        case 'AssetEditActionListDto':
-          return AssetEditActionListDto.fromJson(value);
-        case 'AssetEditActionListDtoEditsInner':
-          return AssetEditActionListDtoEditsInner.fromJson(value);
-        case 'AssetEditActionMirror':
-          return AssetEditActionMirror.fromJson(value);
-        case 'AssetEditActionRotate':
-          return AssetEditActionRotate.fromJson(value);
-        case 'AssetEditsDto':
-          return AssetEditsDto.fromJson(value);
+        case 'AssetEditActionItemDto':
+          return AssetEditActionItemDto.fromJson(value);
+        case 'AssetEditActionItemDtoParameters':
+          return AssetEditActionItemDtoParameters.fromJson(value);
+        case 'AssetEditActionItemResponseDto':
+          return AssetEditActionItemResponseDto.fromJson(value);
+        case 'AssetEditsCreateDto':
+          return AssetEditsCreateDto.fromJson(value);
+        case 'AssetEditsResponseDto':
+          return AssetEditsResponseDto.fromJson(value);
         case 'AssetFaceCreateDto':
           return AssetFaceCreateDto.fromJson(value);
         case 'AssetFaceDeleteDto':
@@ -684,6 +682,8 @@ class ApiClient {
           return SyncAssetFaceDeleteV1.fromJson(value);
         case 'SyncAssetFaceV1':
           return SyncAssetFaceV1.fromJson(value);
+        case 'SyncAssetFaceV2':
+          return SyncAssetFaceV2.fromJson(value);
         case 'SyncAssetMetadataDeleteV1':
           return SyncAssetMetadataDeleteV1.fromJson(value);
         case 'SyncAssetMetadataV1':

mobile/openapi/lib/model/asset_edit_action_crop.dart

@@ -1,108 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class AssetEditActionCrop {
-  /// Returns a new [AssetEditActionCrop] instance.
-  AssetEditActionCrop({
-    required this.action,
-    required this.parameters,
-  });
-
-  /// Type of edit action to perform
-  AssetEditAction action;
-
-  CropParameters parameters;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is AssetEditActionCrop &&
-    other.action == action &&
-    other.parameters == parameters;
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (action.hashCode) +
-    (parameters.hashCode);
-
-  @override
-  String toString() => 'AssetEditActionCrop[action=$action, parameters=$parameters]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-      json[r'action'] = this.action;
-      json[r'parameters'] = this.parameters;
-    return json;
-  }
-
-  /// Returns a new [AssetEditActionCrop] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static AssetEditActionCrop? fromJson(dynamic value) {
-    upgradeDto(value, "AssetEditActionCrop");
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return AssetEditActionCrop(
-        action: AssetEditAction.fromJson(json[r'action'])!,
-        parameters: CropParameters.fromJson(json[r'parameters'])!,
-      );
-    }
-    return null;
-  }
-
-  static List<AssetEditActionCrop> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <AssetEditActionCrop>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = AssetEditActionCrop.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, AssetEditActionCrop> mapFromJson(dynamic json) {
-    final map = <String, AssetEditActionCrop>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = AssetEditActionCrop.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of AssetEditActionCrop-objects as value to a dart map
-  static Map<String, List<AssetEditActionCrop>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<AssetEditActionCrop>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = AssetEditActionCrop.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'action',
-    'parameters',
-  };
-}
-

mobile/openapi/lib/model/asset_edit_action_item_dto.dart

@@ -10,9 +10,9 @@
 
 part of openapi.api;
 
-class AssetEditActionMirror {
-  /// Returns a new [AssetEditActionMirror] instance.
-  AssetEditActionMirror({
+class AssetEditActionItemDto {
+  /// Returns a new [AssetEditActionItemDto] instance.
+  AssetEditActionItemDto({
     required this.action,
     required this.parameters,
   });
@@ -20,10 +20,10 @@ class AssetEditActionMirror {
   /// Type of edit action to perform
   AssetEditAction action;
 
-  MirrorParameters parameters;
+  AssetEditActionItemDtoParameters parameters;
 
   @override
-  bool operator ==(Object other) => identical(this, other) || other is AssetEditActionMirror &&
+  bool operator ==(Object other) => identical(this, other) || other is AssetEditActionItemDto &&
     other.action == action &&
     other.parameters == parameters;
 
@@ -34,7 +34,7 @@ class AssetEditActionMirror {
     (parameters.hashCode);
 
   @override
-  String toString() => 'AssetEditActionMirror[action=$action, parameters=$parameters]';
+  String toString() => 'AssetEditActionItemDto[action=$action, parameters=$parameters]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -43,27 +43,27 @@ class AssetEditActionMirror {
     return json;
   }
 
-  /// Returns a new [AssetEditActionMirror] instance and imports its values from
+  /// Returns a new [AssetEditActionItemDto] instance and imports its values from
   /// [value] if it's a [Map], null otherwise.
   // ignore: prefer_constructors_over_static_methods
-  static AssetEditActionMirror? fromJson(dynamic value) {
-    upgradeDto(value, "AssetEditActionMirror");
+  static AssetEditActionItemDto? fromJson(dynamic value) {
+    upgradeDto(value, "AssetEditActionItemDto");
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
-      return AssetEditActionMirror(
+      return AssetEditActionItemDto(
         action: AssetEditAction.fromJson(json[r'action'])!,
-        parameters: MirrorParameters.fromJson(json[r'parameters'])!,
+        parameters: AssetEditActionItemDtoParameters.fromJson(json[r'parameters'])!,
       );
     }
     return null;
   }
 
-  static List<AssetEditActionMirror> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <AssetEditActionMirror>[];
+  static List<AssetEditActionItemDto> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <AssetEditActionItemDto>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
-        final value = AssetEditActionMirror.fromJson(row);
+        final value = AssetEditActionItemDto.fromJson(row);
         if (value != null) {
           result.add(value);
         }
@@ -72,12 +72,12 @@ class AssetEditActionMirror {
     return result.toList(growable: growable);
   }
 
-  static Map<String, AssetEditActionMirror> mapFromJson(dynamic json) {
-    final map = <String, AssetEditActionMirror>{};
+  static Map<String, AssetEditActionItemDto> mapFromJson(dynamic json) {
+    final map = <String, AssetEditActionItemDto>{};
     if (json is Map && json.isNotEmpty) {
       json = json.cast<String, dynamic>(); // ignore: parameter_assignments
       for (final entry in json.entries) {
-        final value = AssetEditActionMirror.fromJson(entry.value);
+        final value = AssetEditActionItemDto.fromJson(entry.value);
         if (value != null) {
           map[entry.key] = value;
         }
@@ -86,14 +86,14 @@ class AssetEditActionMirror {
     return map;
   }
 
-  // maps a json object with a list of AssetEditActionMirror-objects as value to a dart map
-  static Map<String, List<AssetEditActionMirror>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<AssetEditActionMirror>>{};
+  // maps a json object with a list of AssetEditActionItemDto-objects as value to a dart map
+  static Map<String, List<AssetEditActionItemDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<AssetEditActionItemDto>>{};
     if (json is Map && json.isNotEmpty) {
       // ignore: parameter_assignments
       json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        map[entry.key] = AssetEditActionMirror.listFromJson(entry.value, growable: growable,);
+        map[entry.key] = AssetEditActionItemDto.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;

mobile/openapi/lib/model/asset_edit_action_item_dto_parameters.dart

@@ -0,0 +1,153 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class AssetEditActionItemDtoParameters {
+  /// Returns a new [AssetEditActionItemDtoParameters] instance.
+  AssetEditActionItemDtoParameters({
+    required this.height,
+    required this.width,
+    required this.x,
+    required this.y,
+    required this.angle,
+    required this.axis,
+  });
+
+  /// Height of the crop
+  ///
+  /// Minimum value: 1
+  num height;
+
+  /// Width of the crop
+  ///
+  /// Minimum value: 1
+  num width;
+
+  /// Top-Left X coordinate of crop
+  ///
+  /// Minimum value: 0
+  num x;
+
+  /// Top-Left Y coordinate of crop
+  ///
+  /// Minimum value: 0
+  num y;
+
+  /// Rotation angle in degrees
+  num angle;
+
+  /// Axis to mirror along
+  MirrorAxis axis;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is AssetEditActionItemDtoParameters &&
+    other.height == height &&
+    other.width == width &&
+    other.x == x &&
+    other.y == y &&
+    other.angle == angle &&
+    other.axis == axis;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (height.hashCode) +
+    (width.hashCode) +
+    (x.hashCode) +
+    (y.hashCode) +
+    (angle.hashCode) +
+    (axis.hashCode);
+
+  @override
+  String toString() => 'AssetEditActionItemDtoParameters[height=$height, width=$width, x=$x, y=$y, angle=$angle, axis=$axis]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'height'] = this.height;
+      json[r'width'] = this.width;
+      json[r'x'] = this.x;
+      json[r'y'] = this.y;
+      json[r'angle'] = this.angle;
+      json[r'axis'] = this.axis;
+    return json;
+  }
+
+  /// Returns a new [AssetEditActionItemDtoParameters] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static AssetEditActionItemDtoParameters? fromJson(dynamic value) {
+    upgradeDto(value, "AssetEditActionItemDtoParameters");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return AssetEditActionItemDtoParameters(
+        height: num.parse('${json[r'height']}'),
+        width: num.parse('${json[r'width']}'),
+        x: num.parse('${json[r'x']}'),
+        y: num.parse('${json[r'y']}'),
+        angle: num.parse('${json[r'angle']}'),
+        axis: MirrorAxis.fromJson(json[r'axis'])!,
+      );
+    }
+    return null;
+  }
+
+  static List<AssetEditActionItemDtoParameters> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <AssetEditActionItemDtoParameters>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = AssetEditActionItemDtoParameters.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, AssetEditActionItemDtoParameters> mapFromJson(dynamic json) {
+    final map = <String, AssetEditActionItemDtoParameters>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = AssetEditActionItemDtoParameters.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of AssetEditActionItemDtoParameters-objects as value to a dart map
+  static Map<String, List<AssetEditActionItemDtoParameters>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<AssetEditActionItemDtoParameters>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = AssetEditActionItemDtoParameters.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'height',
+    'width',
+    'x',
+    'y',
+    'angle',
+    'axis',
+  };
+}
+

mobile/openapi/lib/model/asset_edit_action_item_response_dto.dart

@@ -10,60 +10,67 @@
 
 part of openapi.api;
 
-class AssetEditActionListDtoEditsInner {
-  /// Returns a new [AssetEditActionListDtoEditsInner] instance.
-  AssetEditActionListDtoEditsInner({
+class AssetEditActionItemResponseDto {
+  /// Returns a new [AssetEditActionItemResponseDto] instance.
+  AssetEditActionItemResponseDto({
     required this.action,
+    required this.id,
     required this.parameters,
   });
 
   /// Type of edit action to perform
   AssetEditAction action;
 
-  MirrorParameters parameters;
+  String id;
+
+  AssetEditActionItemDtoParameters parameters;
 
   @override
-  bool operator ==(Object other) => identical(this, other) || other is AssetEditActionListDtoEditsInner &&
+  bool operator ==(Object other) => identical(this, other) || other is AssetEditActionItemResponseDto &&
     other.action == action &&
+    other.id == id &&
     other.parameters == parameters;
 
   @override
   int get hashCode =>
     // ignore: unnecessary_parenthesis
     (action.hashCode) +
+    (id.hashCode) +
     (parameters.hashCode);
 
   @override
-  String toString() => 'AssetEditActionListDtoEditsInner[action=$action, parameters=$parameters]';
+  String toString() => 'AssetEditActionItemResponseDto[action=$action, id=$id, parameters=$parameters]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
       json[r'action'] = this.action;
+      json[r'id'] = this.id;
       json[r'parameters'] = this.parameters;
     return json;
   }
 
-  /// Returns a new [AssetEditActionListDtoEditsInner] instance and imports its values from
+  /// Returns a new [AssetEditActionItemResponseDto] instance and imports its values from
   /// [value] if it's a [Map], null otherwise.
   // ignore: prefer_constructors_over_static_methods
-  static AssetEditActionListDtoEditsInner? fromJson(dynamic value) {
-    upgradeDto(value, "AssetEditActionListDtoEditsInner");
+  static AssetEditActionItemResponseDto? fromJson(dynamic value) {
+    upgradeDto(value, "AssetEditActionItemResponseDto");
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
-      return AssetEditActionListDtoEditsInner(
+      return AssetEditActionItemResponseDto(
         action: AssetEditAction.fromJson(json[r'action'])!,
-        parameters: MirrorParameters.fromJson(json[r'parameters'])!,
+        id: mapValueOfType<String>(json, r'id')!,
+        parameters: AssetEditActionItemDtoParameters.fromJson(json[r'parameters'])!,
       );
     }
     return null;
   }
 
-  static List<AssetEditActionListDtoEditsInner> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <AssetEditActionListDtoEditsInner>[];
+  static List<AssetEditActionItemResponseDto> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <AssetEditActionItemResponseDto>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
-        final value = AssetEditActionListDtoEditsInner.fromJson(row);
+        final value = AssetEditActionItemResponseDto.fromJson(row);
         if (value != null) {
           result.add(value);
         }
@@ -72,12 +79,12 @@ class AssetEditActionListDtoEditsInner {
     return result.toList(growable: growable);
   }
 
-  static Map<String, AssetEditActionListDtoEditsInner> mapFromJson(dynamic json) {
-    final map = <String, AssetEditActionListDtoEditsInner>{};
+  static Map<String, AssetEditActionItemResponseDto> mapFromJson(dynamic json) {
+    final map = <String, AssetEditActionItemResponseDto>{};
     if (json is Map && json.isNotEmpty) {
       json = json.cast<String, dynamic>(); // ignore: parameter_assignments
       for (final entry in json.entries) {
-        final value = AssetEditActionListDtoEditsInner.fromJson(entry.value);
+        final value = AssetEditActionItemResponseDto.fromJson(entry.value);
         if (value != null) {
           map[entry.key] = value;
         }
@@ -86,14 +93,14 @@ class AssetEditActionListDtoEditsInner {
     return map;
   }
 
-  // maps a json object with a list of AssetEditActionListDtoEditsInner-objects as value to a dart map
-  static Map<String, List<AssetEditActionListDtoEditsInner>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<AssetEditActionListDtoEditsInner>>{};
+  // maps a json object with a list of AssetEditActionItemResponseDto-objects as value to a dart map
+  static Map<String, List<AssetEditActionItemResponseDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<AssetEditActionItemResponseDto>>{};
     if (json is Map && json.isNotEmpty) {
       // ignore: parameter_assignments
       json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        map[entry.key] = AssetEditActionListDtoEditsInner.listFromJson(entry.value, growable: growable,);
+        map[entry.key] = AssetEditActionItemResponseDto.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
@@ -102,6 +109,7 @@ class AssetEditActionListDtoEditsInner {
   /// The list of required keys that must be present in a JSON.
   static const requiredKeys = <String>{
     'action',
+    'id',
     'parameters',
   };
 }

mobile/openapi/lib/model/asset_edit_action_rotate.dart

@@ -1,108 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class AssetEditActionRotate {
-  /// Returns a new [AssetEditActionRotate] instance.
-  AssetEditActionRotate({
-    required this.action,
-    required this.parameters,
-  });
-
-  /// Type of edit action to perform
-  AssetEditAction action;
-
-  RotateParameters parameters;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is AssetEditActionRotate &&
-    other.action == action &&
-    other.parameters == parameters;
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (action.hashCode) +
-    (parameters.hashCode);
-
-  @override
-  String toString() => 'AssetEditActionRotate[action=$action, parameters=$parameters]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-      json[r'action'] = this.action;
-      json[r'parameters'] = this.parameters;
-    return json;
-  }
-
-  /// Returns a new [AssetEditActionRotate] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static AssetEditActionRotate? fromJson(dynamic value) {
-    upgradeDto(value, "AssetEditActionRotate");
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return AssetEditActionRotate(
-        action: AssetEditAction.fromJson(json[r'action'])!,
-        parameters: RotateParameters.fromJson(json[r'parameters'])!,
-      );
-    }
-    return null;
-  }
-
-  static List<AssetEditActionRotate> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <AssetEditActionRotate>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = AssetEditActionRotate.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, AssetEditActionRotate> mapFromJson(dynamic json) {
-    final map = <String, AssetEditActionRotate>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = AssetEditActionRotate.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of AssetEditActionRotate-objects as value to a dart map
-  static Map<String, List<AssetEditActionRotate>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<AssetEditActionRotate>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = AssetEditActionRotate.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'action',
-    'parameters',
-  };
-}
-

mobile/openapi/lib/model/asset_edits_create_dto.dart

@@ -10,17 +10,17 @@
 
 part of openapi.api;
 
-class AssetEditActionListDto {
-  /// Returns a new [AssetEditActionListDto] instance.
-  AssetEditActionListDto({
+class AssetEditsCreateDto {
+  /// Returns a new [AssetEditsCreateDto] instance.
+  AssetEditsCreateDto({
     this.edits = const [],
   });
 
   /// List of edit actions to apply (crop, rotate, or mirror)
-  List<AssetEditActionListDtoEditsInner> edits;
+  List<AssetEditActionItemDto> edits;
 
   @override
-  bool operator ==(Object other) => identical(this, other) || other is AssetEditActionListDto &&
+  bool operator ==(Object other) => identical(this, other) || other is AssetEditsCreateDto &&
     _deepEquality.equals(other.edits, edits);
 
   @override
@@ -29,7 +29,7 @@ class AssetEditActionListDto {
     (edits.hashCode);
 
   @override
-  String toString() => 'AssetEditActionListDto[edits=$edits]';
+  String toString() => 'AssetEditsCreateDto[edits=$edits]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -37,26 +37,26 @@ class AssetEditActionListDto {
     return json;
   }
 
-  /// Returns a new [AssetEditActionListDto] instance and imports its values from
+  /// Returns a new [AssetEditsCreateDto] instance and imports its values from
   /// [value] if it's a [Map], null otherwise.
   // ignore: prefer_constructors_over_static_methods
-  static AssetEditActionListDto? fromJson(dynamic value) {
-    upgradeDto(value, "AssetEditActionListDto");
+  static AssetEditsCreateDto? fromJson(dynamic value) {
+    upgradeDto(value, "AssetEditsCreateDto");
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
-      return AssetEditActionListDto(
-        edits: AssetEditActionListDtoEditsInner.listFromJson(json[r'edits']),
+      return AssetEditsCreateDto(
+        edits: AssetEditActionItemDto.listFromJson(json[r'edits']),
       );
     }
     return null;
   }
 
-  static List<AssetEditActionListDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <AssetEditActionListDto>[];
+  static List<AssetEditsCreateDto> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <AssetEditsCreateDto>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
-        final value = AssetEditActionListDto.fromJson(row);
+        final value = AssetEditsCreateDto.fromJson(row);
         if (value != null) {
           result.add(value);
         }
@@ -65,12 +65,12 @@ class AssetEditActionListDto {
     return result.toList(growable: growable);
   }
 
-  static Map<String, AssetEditActionListDto> mapFromJson(dynamic json) {
-    final map = <String, AssetEditActionListDto>{};
+  static Map<String, AssetEditsCreateDto> mapFromJson(dynamic json) {
+    final map = <String, AssetEditsCreateDto>{};
     if (json is Map && json.isNotEmpty) {
       json = json.cast<String, dynamic>(); // ignore: parameter_assignments
       for (final entry in json.entries) {
-        final value = AssetEditActionListDto.fromJson(entry.value);
+        final value = AssetEditsCreateDto.fromJson(entry.value);
         if (value != null) {
           map[entry.key] = value;
         }
@@ -79,14 +79,14 @@ class AssetEditActionListDto {
     return map;
   }
 
-  // maps a json object with a list of AssetEditActionListDto-objects as value to a dart map
-  static Map<String, List<AssetEditActionListDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<AssetEditActionListDto>>{};
+  // maps a json object with a list of AssetEditsCreateDto-objects as value to a dart map
+  static Map<String, List<AssetEditsCreateDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<AssetEditsCreateDto>>{};
     if (json is Map && json.isNotEmpty) {
       // ignore: parameter_assignments
       json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        map[entry.key] = AssetEditActionListDto.listFromJson(entry.value, growable: growable,);
+        map[entry.key] = AssetEditsCreateDto.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;

mobile/openapi/lib/model/asset_edits_response_dto.dart

@@ -10,21 +10,21 @@
 
 part of openapi.api;
 
-class AssetEditsDto {
-  /// Returns a new [AssetEditsDto] instance.
-  AssetEditsDto({
+class AssetEditsResponseDto {
+  /// Returns a new [AssetEditsResponseDto] instance.
+  AssetEditsResponseDto({
     required this.assetId,
     this.edits = const [],
   });
 
-  /// Asset ID to apply edits to
+  /// Asset ID these edits belong to
   String assetId;
 
-  /// List of edit actions to apply (crop, rotate, or mirror)
-  List<AssetEditActionListDtoEditsInner> edits;
+  /// List of edit actions applied to the asset
+  List<AssetEditActionItemResponseDto> edits;
 
   @override
-  bool operator ==(Object other) => identical(this, other) || other is AssetEditsDto &&
+  bool operator ==(Object other) => identical(this, other) || other is AssetEditsResponseDto &&
     other.assetId == assetId &&
     _deepEquality.equals(other.edits, edits);
 
@@ -35,7 +35,7 @@ class AssetEditsDto {
     (edits.hashCode);
 
   @override
-  String toString() => 'AssetEditsDto[assetId=$assetId, edits=$edits]';
+  String toString() => 'AssetEditsResponseDto[assetId=$assetId, edits=$edits]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -44,27 +44,27 @@ class AssetEditsDto {
     return json;
   }
 
-  /// Returns a new [AssetEditsDto] instance and imports its values from
+  /// Returns a new [AssetEditsResponseDto] instance and imports its values from
   /// [value] if it's a [Map], null otherwise.
   // ignore: prefer_constructors_over_static_methods
-  static AssetEditsDto? fromJson(dynamic value) {
-    upgradeDto(value, "AssetEditsDto");
+  static AssetEditsResponseDto? fromJson(dynamic value) {
+    upgradeDto(value, "AssetEditsResponseDto");
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
-      return AssetEditsDto(
+      return AssetEditsResponseDto(
         assetId: mapValueOfType<String>(json, r'assetId')!,
-        edits: AssetEditActionListDtoEditsInner.listFromJson(json[r'edits']),
+        edits: AssetEditActionItemResponseDto.listFromJson(json[r'edits']),
       );
     }
     return null;
   }
 
-  static List<AssetEditsDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <AssetEditsDto>[];
+  static List<AssetEditsResponseDto> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <AssetEditsResponseDto>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
-        final value = AssetEditsDto.fromJson(row);
+        final value = AssetEditsResponseDto.fromJson(row);
         if (value != null) {
           result.add(value);
         }
@@ -73,12 +73,12 @@ class AssetEditsDto {
     return result.toList(growable: growable);
   }
 
-  static Map<String, AssetEditsDto> mapFromJson(dynamic json) {
-    final map = <String, AssetEditsDto>{};
+  static Map<String, AssetEditsResponseDto> mapFromJson(dynamic json) {
+    final map = <String, AssetEditsResponseDto>{};
     if (json is Map && json.isNotEmpty) {
       json = json.cast<String, dynamic>(); // ignore: parameter_assignments
       for (final entry in json.entries) {
-        final value = AssetEditsDto.fromJson(entry.value);
+        final value = AssetEditsResponseDto.fromJson(entry.value);
         if (value != null) {
           map[entry.key] = value;
         }
@@ -87,14 +87,14 @@ class AssetEditsDto {
     return map;
   }
 
-  // maps a json object with a list of AssetEditsDto-objects as value to a dart map
-  static Map<String, List<AssetEditsDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<AssetEditsDto>>{};
+  // maps a json object with a list of AssetEditsResponseDto-objects as value to a dart map
+  static Map<String, List<AssetEditsResponseDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<AssetEditsResponseDto>>{};
     if (json is Map && json.isNotEmpty) {
       // ignore: parameter_assignments
       json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        map[entry.key] = AssetEditsDto.listFromJson(entry.value, growable: growable,);
+        map[entry.key] = AssetEditsResponseDto.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;

mobile/openapi/lib/model/asset_response_dto.dart

@@ -156,7 +156,7 @@ class AssetResponseDto {
 
   List<TagResponseDto> tags;
 
-  /// Thumbhash for thumbnail generation
+  /// Thumbhash for thumbnail generation (base64) also used as the c query param for thumbnail cache busting.
   String? thumbhash;
 
   /// Asset type

mobile/openapi/lib/model/memory_create_dto.dart

@@ -15,9 +15,11 @@ class MemoryCreateDto {
   MemoryCreateDto({
     this.assetIds = const [],
     required this.data,
+    this.hideAt,
     this.isSaved,
     required this.memoryAt,
     this.seenAt,
+    this.showAt,
     required this.type,
   });
 
@@ -26,6 +28,15 @@ class MemoryCreateDto {
 
   OnThisDayDto data;
 
+  /// Date when memory should be hidden
+  ///
+  /// Please note: This property should have been non-nullable! Since the specification file
+  /// does not include a default value (using the "default:" property), however, the generated
+  /// source code must fall back to having a nullable type.
+  /// Consider adding a "default:" property in the specification file to hide this note.
+  ///
+  DateTime? hideAt;
+
   /// Is memory saved
   ///
   /// Please note: This property should have been non-nullable! Since the specification file
@@ -47,6 +58,15 @@ class MemoryCreateDto {
   ///
   DateTime? seenAt;
 
+  /// Date when memory should be shown
+  ///
+  /// Please note: This property should have been non-nullable! Since the specification file
+  /// does not include a default value (using the "default:" property), however, the generated
+  /// source code must fall back to having a nullable type.
+  /// Consider adding a "default:" property in the specification file to hide this note.
+  ///
+  DateTime? showAt;
+
   /// Memory type
   MemoryType type;
 
@@ -54,9 +74,11 @@ class MemoryCreateDto {
   bool operator ==(Object other) => identical(this, other) || other is MemoryCreateDto &&
     _deepEquality.equals(other.assetIds, assetIds) &&
     other.data == data &&
+    other.hideAt == hideAt &&
     other.isSaved == isSaved &&
     other.memoryAt == memoryAt &&
     other.seenAt == seenAt &&
+    other.showAt == showAt &&
     other.type == type;
 
   @override
@@ -64,18 +86,25 @@ class MemoryCreateDto {
     // ignore: unnecessary_parenthesis
     (assetIds.hashCode) +
     (data.hashCode) +
+    (hideAt == null ? 0 : hideAt!.hashCode) +
     (isSaved == null ? 0 : isSaved!.hashCode) +
     (memoryAt.hashCode) +
     (seenAt == null ? 0 : seenAt!.hashCode) +
+    (showAt == null ? 0 : showAt!.hashCode) +
     (type.hashCode);
 
   @override
-  String toString() => 'MemoryCreateDto[assetIds=$assetIds, data=$data, isSaved=$isSaved, memoryAt=$memoryAt, seenAt=$seenAt, type=$type]';
+  String toString() => 'MemoryCreateDto[assetIds=$assetIds, data=$data, hideAt=$hideAt, isSaved=$isSaved, memoryAt=$memoryAt, seenAt=$seenAt, showAt=$showAt, type=$type]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
       json[r'assetIds'] = this.assetIds;
       json[r'data'] = this.data;
+    if (this.hideAt != null) {
+      json[r'hideAt'] = this.hideAt!.toUtc().toIso8601String();
+    } else {
+    //  json[r'hideAt'] = null;
+    }
     if (this.isSaved != null) {
       json[r'isSaved'] = this.isSaved;
     } else {
@@ -86,6 +115,11 @@ class MemoryCreateDto {
       json[r'seenAt'] = this.seenAt!.toUtc().toIso8601String();
     } else {
     //  json[r'seenAt'] = null;
+    }
+    if (this.showAt != null) {
+      json[r'showAt'] = this.showAt!.toUtc().toIso8601String();
+    } else {
+    //  json[r'showAt'] = null;
     }
       json[r'type'] = this.type;
     return json;
@@ -104,9 +138,11 @@ class MemoryCreateDto {
             ? (json[r'assetIds'] as Iterable).cast<String>().toList(growable: false)
             : const [],
         data: OnThisDayDto.fromJson(json[r'data'])!,
+        hideAt: mapDateTime(json, r'hideAt', r''),
         isSaved: mapValueOfType<bool>(json, r'isSaved'),
         memoryAt: mapDateTime(json, r'memoryAt', r'')!,
         seenAt: mapDateTime(json, r'seenAt', r''),
+        showAt: mapDateTime(json, r'showAt', r''),
         type: MemoryType.fromJson(json[r'type'])!,
       );
     }

mobile/openapi/lib/model/sync_asset_face_v2.dart

@@ -0,0 +1,201 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class SyncAssetFaceV2 {
+  /// Returns a new [SyncAssetFaceV2] instance.
+  SyncAssetFaceV2({
+    required this.assetId,
+    required this.boundingBoxX1,
+    required this.boundingBoxX2,
+    required this.boundingBoxY1,
+    required this.boundingBoxY2,
+    required this.deletedAt,
+    required this.id,
+    required this.imageHeight,
+    required this.imageWidth,
+    required this.isVisible,
+    required this.personId,
+    required this.sourceType,
+  });
+
+  /// Asset ID
+  String assetId;
+
+  int boundingBoxX1;
+
+  int boundingBoxX2;
+
+  int boundingBoxY1;
+
+  int boundingBoxY2;
+
+  /// Face deleted at
+  DateTime? deletedAt;
+
+  /// Asset face ID
+  String id;
+
+  int imageHeight;
+
+  int imageWidth;
+
+  /// Is the face visible in the asset
+  bool isVisible;
+
+  /// Person ID
+  String? personId;
+
+  /// Source type
+  String sourceType;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is SyncAssetFaceV2 &&
+    other.assetId == assetId &&
+    other.boundingBoxX1 == boundingBoxX1 &&
+    other.boundingBoxX2 == boundingBoxX2 &&
+    other.boundingBoxY1 == boundingBoxY1 &&
+    other.boundingBoxY2 == boundingBoxY2 &&
+    other.deletedAt == deletedAt &&
+    other.id == id &&
+    other.imageHeight == imageHeight &&
+    other.imageWidth == imageWidth &&
+    other.isVisible == isVisible &&
+    other.personId == personId &&
+    other.sourceType == sourceType;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (assetId.hashCode) +
+    (boundingBoxX1.hashCode) +
+    (boundingBoxX2.hashCode) +
+    (boundingBoxY1.hashCode) +
+    (boundingBoxY2.hashCode) +
+    (deletedAt == null ? 0 : deletedAt!.hashCode) +
+    (id.hashCode) +
+    (imageHeight.hashCode) +
+    (imageWidth.hashCode) +
+    (isVisible.hashCode) +
+    (personId == null ? 0 : personId!.hashCode) +
+    (sourceType.hashCode);
+
+  @override
+  String toString() => 'SyncAssetFaceV2[assetId=$assetId, boundingBoxX1=$boundingBoxX1, boundingBoxX2=$boundingBoxX2, boundingBoxY1=$boundingBoxY1, boundingBoxY2=$boundingBoxY2, deletedAt=$deletedAt, id=$id, imageHeight=$imageHeight, imageWidth=$imageWidth, isVisible=$isVisible, personId=$personId, sourceType=$sourceType]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'assetId'] = this.assetId;
+      json[r'boundingBoxX1'] = this.boundingBoxX1;
+      json[r'boundingBoxX2'] = this.boundingBoxX2;
+      json[r'boundingBoxY1'] = this.boundingBoxY1;
+      json[r'boundingBoxY2'] = this.boundingBoxY2;
+    if (this.deletedAt != null) {
+      json[r'deletedAt'] = this.deletedAt!.toUtc().toIso8601String();
+    } else {
+    //  json[r'deletedAt'] = null;
+    }
+      json[r'id'] = this.id;
+      json[r'imageHeight'] = this.imageHeight;
+      json[r'imageWidth'] = this.imageWidth;
+      json[r'isVisible'] = this.isVisible;
+    if (this.personId != null) {
+      json[r'personId'] = this.personId;
+    } else {
+    //  json[r'personId'] = null;
+    }
+      json[r'sourceType'] = this.sourceType;
+    return json;
+  }
+
+  /// Returns a new [SyncAssetFaceV2] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static SyncAssetFaceV2? fromJson(dynamic value) {
+    upgradeDto(value, "SyncAssetFaceV2");
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return SyncAssetFaceV2(
+        assetId: mapValueOfType<String>(json, r'assetId')!,
+        boundingBoxX1: mapValueOfType<int>(json, r'boundingBoxX1')!,
+        boundingBoxX2: mapValueOfType<int>(json, r'boundingBoxX2')!,
+        boundingBoxY1: mapValueOfType<int>(json, r'boundingBoxY1')!,
+        boundingBoxY2: mapValueOfType<int>(json, r'boundingBoxY2')!,
+        deletedAt: mapDateTime(json, r'deletedAt', r''),
+        id: mapValueOfType<String>(json, r'id')!,
+        imageHeight: mapValueOfType<int>(json, r'imageHeight')!,
+        imageWidth: mapValueOfType<int>(json, r'imageWidth')!,
+        isVisible: mapValueOfType<bool>(json, r'isVisible')!,
+        personId: mapValueOfType<String>(json, r'personId'),
+        sourceType: mapValueOfType<String>(json, r'sourceType')!,
+      );
+    }
+    return null;
+  }
+
+  static List<SyncAssetFaceV2> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <SyncAssetFaceV2>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = SyncAssetFaceV2.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, SyncAssetFaceV2> mapFromJson(dynamic json) {
+    final map = <String, SyncAssetFaceV2>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = SyncAssetFaceV2.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of SyncAssetFaceV2-objects as value to a dart map
+  static Map<String, List<SyncAssetFaceV2>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<SyncAssetFaceV2>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = SyncAssetFaceV2.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'assetId',
+    'boundingBoxX1',
+    'boundingBoxX2',
+    'boundingBoxY1',
+    'boundingBoxY2',
+    'deletedAt',
+    'id',
+    'imageHeight',
+    'imageWidth',
+    'isVisible',
+    'personId',
+    'sourceType',
+  };
+}
+

mobile/openapi/lib/model/sync_entity_type.dart

@@ -64,6 +64,7 @@ class SyncEntityType {
   static const personV1 = SyncEntityType._(r'PersonV1');
   static const personDeleteV1 = SyncEntityType._(r'PersonDeleteV1');
   static const assetFaceV1 = SyncEntityType._(r'AssetFaceV1');
+  static const assetFaceV2 = SyncEntityType._(r'AssetFaceV2');
   static const assetFaceDeleteV1 = SyncEntityType._(r'AssetFaceDeleteV1');
   static const userMetadataV1 = SyncEntityType._(r'UserMetadataV1');
   static const userMetadataDeleteV1 = SyncEntityType._(r'UserMetadataDeleteV1');
@@ -114,6 +115,7 @@ class SyncEntityType {
     personV1,
     personDeleteV1,
     assetFaceV1,
+    assetFaceV2,
     assetFaceDeleteV1,
     userMetadataV1,
     userMetadataDeleteV1,
@@ -199,6 +201,7 @@ class SyncEntityTypeTypeTransformer {
         case r'PersonV1': return SyncEntityType.personV1;
         case r'PersonDeleteV1': return SyncEntityType.personDeleteV1;
         case r'AssetFaceV1': return SyncEntityType.assetFaceV1;
+        case r'AssetFaceV2': return SyncEntityType.assetFaceV2;
         case r'AssetFaceDeleteV1': return SyncEntityType.assetFaceDeleteV1;
         case r'UserMetadataV1': return SyncEntityType.userMetadataV1;
         case r'UserMetadataDeleteV1': return SyncEntityType.userMetadataDeleteV1;

mobile/openapi/lib/model/sync_request_type.dart

@@ -42,6 +42,7 @@ class SyncRequestType {
   static const usersV1 = SyncRequestType._(r'UsersV1');
   static const peopleV1 = SyncRequestType._(r'PeopleV1');
   static const assetFacesV1 = SyncRequestType._(r'AssetFacesV1');
+  static const assetFacesV2 = SyncRequestType._(r'AssetFacesV2');
   static const userMetadataV1 = SyncRequestType._(r'UserMetadataV1');
 
   /// List of all possible values in this [enum][SyncRequestType].
@@ -65,6 +66,7 @@ class SyncRequestType {
     usersV1,
     peopleV1,
     assetFacesV1,
+    assetFacesV2,
     userMetadataV1,
   ];
 
@@ -123,6 +125,7 @@ class SyncRequestTypeTypeTransformer {
         case r'UsersV1': return SyncRequestType.usersV1;
         case r'PeopleV1': return SyncRequestType.peopleV1;
         case r'AssetFacesV1': return SyncRequestType.assetFacesV1;
+        case r'AssetFacesV2': return SyncRequestType.assetFacesV2;
         case r'UserMetadataV1': return SyncRequestType.userMetadataV1;
         default:
           if (!allowNull) {

mobile/packages/ui/lib/immich_ui.dart

@@ -1,6 +1,6 @@
 export 'src/components/close_button.dart';
 export 'src/components/form.dart';
-export 'src/components/html_text.dart';
+export 'src/components/formatted_text.dart';
 export 'src/components/icon_button.dart';
 export 'src/components/password_input.dart';
 export 'src/components/text_button.dart';

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

@@ -0,0 +1,141 @@
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+
+class FormattedSpan {
+  final TextStyle? style;
+  final VoidCallback? onTap;
+
+  const FormattedSpan({this.style, this.onTap});
+}
+
+/// A widget that renders text with optional HTML-style formatting.
+///
+/// Supports the following tags:
+/// - `<b>` for bold text
+/// - `<link>` or any tag ending with `-link` for tappable links
+///
+/// Tags must not be nested. Each tag is matched independently left-to-right.
+///
+/// By default, `<b>` renders as [FontWeight.bold] and link tags render with an
+/// underline and no tap handler. Provide [spanBuilder] to attach tap callbacks
+/// or override styles per tag.
+///
+/// Bold-only example (no [spanBuilder] needed):
+/// ```dart
+/// ImmichFormattedText('Delete <b>{count}</b> items?')
+/// ```
+///
+/// Link example:
+/// ```dart
+/// ImmichFormattedText(
+///   'Refer to <docs-link>docs</docs-link> and <other-link>other</other-link>',
+///   spanBuilder: (tag) => FormattedSpan(
+///     onTap: switch (tag) {
+///       'docs-link'  => () => launchUrl(docsUrl),
+///       'other-link' => () => launchUrl(otherUrl),
+///       _            => null,
+///     },
+///   ),
+/// )
+/// ```
+class ImmichFormattedText extends StatefulWidget {
+  final String text;
+  final TextStyle? style;
+  final TextAlign? textAlign;
+  final TextOverflow? overflow;
+  final int? maxLines;
+  final bool? softWrap;
+  final FormattedSpan Function(String tag)? spanBuilder;
+
+  const ImmichFormattedText(
+    this.text, {
+    this.spanBuilder,
+    super.key,
+    this.style,
+    this.textAlign,
+    this.overflow,
+    this.maxLines,
+    this.softWrap,
+  });
+
+  @override
+  State<ImmichFormattedText> createState() => _ImmichFormattedTextState();
+}
+
+class _ImmichFormattedTextState extends State<ImmichFormattedText> {
+  final _recognizers = <GestureRecognizer>[];
+
+  // Matches <b>, <link>, or any *-link tag and its content.
+  static final _tagPattern = RegExp(r'<(b|link|[\w]+-link)>(.*?)</\1>', caseSensitive: false, dotAll: true);
+
+  @override
+  void dispose() {
+    _disposeRecognizers();
+    super.dispose();
+  }
+
+  void _disposeRecognizers() {
+    for (final recognizer in _recognizers) {
+      recognizer.dispose();
+    }
+    _recognizers.clear();
+  }
+
+  List<InlineSpan> _buildSpans() {
+    _disposeRecognizers();
+
+    final spans = <InlineSpan>[];
+    int cursor = 0;
+
+    for (final match in _tagPattern.allMatches(widget.text)) {
+      if (match.start > cursor) {
+        spans.add(TextSpan(text: widget.text.substring(cursor, match.start)));
+      }
+
+      final tag = match.group(1)!.toLowerCase();
+      final content = match.group(2)!;
+      final formattedSpan = (widget.spanBuilder ?? _defaultSpanBuilder)(tag);
+      final style = formattedSpan.style ?? _defaultTextStyle(tag);
+
+      GestureRecognizer? recognizer;
+      if (formattedSpan.onTap != null) {
+        recognizer = TapGestureRecognizer()..onTap = formattedSpan.onTap;
+        _recognizers.add(recognizer);
+      }
+      spans.add(TextSpan(text: content, style: style, recognizer: recognizer));
+
+      cursor = match.end;
+    }
+
+    if (cursor < widget.text.length) {
+      spans.add(TextSpan(text: widget.text.substring(cursor)));
+    }
+
+    return spans;
+  }
+
+  FormattedSpan _defaultSpanBuilder(String tag) => switch (tag) {
+        'b' => const FormattedSpan(style: TextStyle(fontWeight: FontWeight.bold)),
+        'link' => const FormattedSpan(style: TextStyle(decoration: TextDecoration.underline)),
+        _ when tag.endsWith('-link') => const FormattedSpan(style: TextStyle(decoration: TextDecoration.underline)),
+        _ => const FormattedSpan(),
+      };
+
+  TextStyle? _defaultTextStyle(String tag) => switch (tag) {
+        'b' => const TextStyle(fontWeight: FontWeight.bold),
+        'link' => const TextStyle(decoration: TextDecoration.underline),
+        _ when tag.endsWith('-link') => const TextStyle(decoration: TextDecoration.underline),
+        _ => null,
+      };
+
+  @override
+  Widget build(BuildContext context) {
+    return Text.rich(
+      TextSpan(style: widget.style, children: _buildSpans()),
+      textAlign: widget.textAlign,
+      overflow: widget.overflow,
+      maxLines: widget.maxLines,
+      softWrap: widget.softWrap,
+    );
+  }
+}

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

@@ -1,189 +0,0 @@
-import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
-import 'package:html/dom.dart' as dom;
-import 'package:html/parser.dart' as html_parser;
-
-enum _HtmlTagType {
-  bold,
-  link,
-  unsupported,
-}
-
-class _HtmlTag {
-  final _HtmlTagType type;
-  final String tagName;
-
-  const _HtmlTag._({required this.type, required this.tagName});
-
-  static const unsupported = _HtmlTag._(type: _HtmlTagType.unsupported, tagName: 'unsupported');
-
-  static _HtmlTag? fromString(dom.Node node) {
-    final tagName = (node is dom.Element) ? node.localName : null;
-    if (tagName == null) {
-      return null;
-    }
-
-    final tag = tagName.toLowerCase();
-    return switch (tag) {
-      'b' || 'strong' => _HtmlTag._(type: _HtmlTagType.bold, tagName: tag),
-      // Convert <a> back to 'link' for handler lookup
-      'a' => const _HtmlTag._(type: _HtmlTagType.link, tagName: 'link'),
-      _ when tag.endsWith('-link') => _HtmlTag._(type: _HtmlTagType.link, tagName: tag),
-      _ => _HtmlTag.unsupported,
-    };
-  }
-}
-
-/// A widget that renders text with optional HTML-style formatting.
-///
-/// Supports the following tags:
-/// - `<b>` or `<strong>` for bold text
-/// - `<link>` or any tag ending with `-link` for tappable links
-///
-/// Example:
-/// ```dart
-/// ImmichHtmlText(
-///   'Refer to <link>docs</link> and <other-link>other</other-link>',
-///   linkHandlers: {
-///     'link': () => launchUrl(docsUrl),
-///     'other-link': () => launchUrl(otherUrl),
-///   },
-/// )
-/// ```
-class ImmichHtmlText extends StatefulWidget {
-  final String text;
-  final TextStyle? style;
-  final TextAlign? textAlign;
-  final TextOverflow? overflow;
-  final int? maxLines;
-  final bool? softWrap;
-  final Map<String, VoidCallback>? linkHandlers;
-  final TextStyle? linkStyle;
-
-  const ImmichHtmlText(
-    this.text, {
-    super.key,
-    this.style,
-    this.textAlign,
-    this.overflow,
-    this.maxLines,
-    this.softWrap,
-    this.linkHandlers,
-    this.linkStyle,
-  });
-
-  @override
-  State<ImmichHtmlText> createState() => _ImmichHtmlTextState();
-}
-
-class _ImmichHtmlTextState extends State<ImmichHtmlText> {
-  final _recognizers = <GestureRecognizer>[];
-  dom.DocumentFragment _document = dom.DocumentFragment();
-
-  @override
-  void initState() {
-    super.initState();
-    _document = html_parser.parseFragment(_preprocessHtml(widget.text));
-  }
-
-  @override
-  void didUpdateWidget(covariant ImmichHtmlText oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (oldWidget.text != widget.text) {
-      _document = html_parser.parseFragment(_preprocessHtml(widget.text));
-    }
-  }
-
-  /// `<link>` tags are preprocessed to `<a>` tags because `<link>` is a
-  /// void element in HTML5 and cannot have children. The linkHandlers still use
-  /// 'link' as the key.
-  String _preprocessHtml(String html) {
-    return html
-        .replaceAllMapped(
-          RegExp(r'<(link)>(.*?)</\1>', caseSensitive: false),
-          (match) => '<a>${match.group(2)}</a>',
-        )
-        .replaceAllMapped(
-          RegExp(r'<(link)\s*/>', caseSensitive: false),
-          (match) => '<a></a>',
-        );
-  }
-
-  @override
-  void dispose() {
-    _disposeRecognizers();
-    super.dispose();
-  }
-
-  void _disposeRecognizers() {
-    for (final recognizer in _recognizers) {
-      recognizer.dispose();
-    }
-    _recognizers.clear();
-  }
-
-  List<InlineSpan> _buildSpans() {
-    _disposeRecognizers();
-
-    return _document.nodes.expand((node) => _buildNode(node, null, null)).toList();
-  }
-
-  Iterable<InlineSpan> _buildNode(
-    dom.Node node,
-    TextStyle? style,
-    _HtmlTag? parentTag,
-  ) sync* {
-    if (node is dom.Text) {
-      if (node.text.isEmpty) {
-        return;
-      }
-
-      GestureRecognizer? recognizer;
-      if (parentTag?.type == _HtmlTagType.link) {
-        final handler = widget.linkHandlers?[parentTag?.tagName];
-        if (handler != null) {
-          recognizer = TapGestureRecognizer()..onTap = handler;
-          _recognizers.add(recognizer);
-        }
-      }
-
-      yield TextSpan(text: node.text, style: style, recognizer: recognizer);
-    } else if (node is dom.Element) {
-      final htmlTag = _HtmlTag.fromString(node);
-      final tagStyle = _styleForTag(htmlTag);
-      final mergedStyle = style?.merge(tagStyle) ?? tagStyle;
-      final newParentTag = htmlTag?.type == _HtmlTagType.link ? htmlTag : parentTag;
-
-      for (final child in node.nodes) {
-        yield* _buildNode(child, mergedStyle, newParentTag);
-      }
-    }
-  }
-
-  TextStyle? _styleForTag(_HtmlTag? tag) {
-    if (tag == null) {
-      return null;
-    }
-
-    return switch (tag.type) {
-      _HtmlTagType.bold => const TextStyle(fontWeight: FontWeight.bold),
-      _HtmlTagType.link => widget.linkStyle ??
-          TextStyle(
-            color: Theme.of(context).colorScheme.primary,
-            decoration: TextDecoration.underline,
-          ),
-      _HtmlTagType.unsupported => null,
-    };
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Text.rich(
-      TextSpan(style: widget.style, children: _buildSpans()),
-      textAlign: widget.textAlign,
-      overflow: widget.overflow,
-      maxLines: widget.maxLines,
-      softWrap: widget.softWrap,
-    );
-  }
-}

mobile/packages/ui/pubspec.lock

@@ -41,14 +41,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.19.1"
-  csslib:
-    dependency: transitive
-    description:
-      name: csslib
-      sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.2"
   fake_async:
     dependency: transitive
     description:
@@ -67,14 +59,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  html:
-    dependency: "direct main"
-    description:
-      name: html
-      sha256: "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.15.6"
   leak_tracker:
     dependency: transitive
     description:

mobile/packages/ui/pubspec.yaml

@@ -7,7 +7,6 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  html: ^0.15.6
 
 dev_dependencies:
   flutter_test: