feat: vitest 4

.github/workflows/build-mobile.yml

@@ -30,6 +30,18 @@ on:
         required: true
       IOS_CERTIFICATE_PASSWORD:
         required: true
+      IOS_PROVISIONING_PROFILE:
+        required: true
+      IOS_PROVISIONING_PROFILE_SHARE_EXTENSION:
+        required: true
+      IOS_PROVISIONING_PROFILE_WIDGET_EXTENSION:
+        required: true
+      IOS_DEVELOPMENT_PROVISIONING_PROFILE:
+        required: true
+      IOS_DEVELOPMENT_PROVISIONING_PROFILE_SHARE_EXTENSION:
+        required: true
+      IOS_DEVELOPMENT_PROVISIONING_PROFILE_WIDGET_EXTENSION:
+        required: true
       FASTLANE_TEAM_ID:
         required: true
   pull_request:
@@ -84,7 +96,7 @@ jobs:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{ inputs.ref || github.sha }}
           persist-credentials: false
@@ -103,7 +115,7 @@ jobs:
 
       - name: Restore Gradle Cache
         id: cache-gradle-restore
-        uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: |
             ~/.gradle/caches
@@ -153,14 +165,14 @@ jobs:
           fi
 
       - name: Publish Android Artifact
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: release-apk-signed
           path: mobile/build/app/outputs/flutter-apk/*.apk
 
       - name: Save Gradle Cache
         id: cache-gradle-save
-        uses: actions/cache/save@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         if: github.ref == 'refs/heads/main'
         with:
           path: |
@@ -182,7 +194,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
         with:
           ref: ${{ inputs.ref || github.sha }}
           persist-credentials: false
@@ -228,14 +240,35 @@ jobs:
           mkdir -p ~/.appstoreconnect/private_keys
           echo "$API_KEY_CONTENT" | base64 --decode > ~/.appstoreconnect/private_keys/AuthKey_${API_KEY_ID}.p8
 
-      - name: Import Certificate
+      - name: Import Certificate and Provisioning Profiles
         env:
           IOS_CERTIFICATE_P12: ${{ secrets.IOS_CERTIFICATE_P12 }}
+          IOS_CERTIFICATE_PASSWORD: ${{ secrets.IOS_CERTIFICATE_PASSWORD }}
+          IOS_PROVISIONING_PROFILE: ${{ secrets.IOS_PROVISIONING_PROFILE }}
+          IOS_PROVISIONING_PROFILE_SHARE_EXTENSION: ${{ secrets.IOS_PROVISIONING_PROFILE_SHARE_EXTENSION }}
+          IOS_PROVISIONING_PROFILE_WIDGET_EXTENSION: ${{ secrets.IOS_PROVISIONING_PROFILE_WIDGET_EXTENSION }}
+          IOS_DEVELOPMENT_PROVISIONING_PROFILE: ${{ secrets.IOS_DEVELOPMENT_PROVISIONING_PROFILE }}
+          IOS_DEVELOPMENT_PROVISIONING_PROFILE_SHARE_EXTENSION: ${{ secrets.IOS_DEVELOPMENT_PROVISIONING_PROFILE_SHARE_EXTENSION }}
+          IOS_DEVELOPMENT_PROVISIONING_PROFILE_WIDGET_EXTENSION: ${{ secrets.IOS_DEVELOPMENT_PROVISIONING_PROFILE_WIDGET_EXTENSION }}
+          ENVIRONMENT: ${{ inputs.environment || 'development' }}
         working-directory: ./mobile/ios
         run: |
           # Decode certificate
           echo "$IOS_CERTIFICATE_P12" | base64 --decode > certificate.p12
 
+          # Decode provisioning profiles based on environment
+          if [[ "$ENVIRONMENT" == "development" ]]; then
+            echo "$IOS_DEVELOPMENT_PROVISIONING_PROFILE" | base64 --decode > profile_dev.mobileprovision
+            echo "$IOS_DEVELOPMENT_PROVISIONING_PROFILE_SHARE_EXTENSION" | base64 --decode > profile_dev_share.mobileprovision
+            echo "$IOS_DEVELOPMENT_PROVISIONING_PROFILE_WIDGET_EXTENSION" | base64 --decode > profile_dev_widget.mobileprovision
+            ls -lh profile_dev*.mobileprovision
+          else
+            echo "$IOS_PROVISIONING_PROFILE" | base64 --decode > profile.mobileprovision
+            echo "$IOS_PROVISIONING_PROFILE_SHARE_EXTENSION" | base64 --decode > profile_share.mobileprovision
+            echo "$IOS_PROVISIONING_PROFILE_WIDGET_EXTENSION" | base64 --decode > profile_widget.mobileprovision
+            ls -lh profile*.mobileprovision
+          fi
+
       - name: Create keychain and import certificate
         env:
           KEYCHAIN_PASSWORD: ${{ secrets.IOS_CERTIFICATE_PASSWORD }}
@@ -286,7 +319,7 @@ jobs:
           security delete-keychain build.keychain || true
 
       - name: Upload IPA artifact
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: ios-release-ipa
           path: mobile/ios/Runner.ipa

.github/workflows/cache-cleanup.yml

@@ -25,7 +25,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Check out code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}

.github/workflows/cli.yml

@@ -35,7 +35,7 @@ jobs:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -78,7 +78,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}

.github/workflows/codeql-analysis.yml

@@ -50,7 +50,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}

.github/workflows/docs-build.yml

@@ -60,11 +60,10 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
-          fetch-depth: 0
 
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
@@ -86,7 +85,7 @@ jobs:
         run: pnpm build
 
       - name: Upload build output
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: docs-build-output
           path: docs/build/

.github/workflows/docs-deploy.yml

@@ -125,13 +125,13 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
 
       - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@b868e6e7c8cc212beec876330b4059e661ee44bb # use-mise-action-v1.1.1
+        uses: immich-app/devtools/actions/use-mise@cd24790a7f5f6439ac32cc94f5523cb2de8bfa8c # use-mise-action-v1.1.0
 
       - name: Load parameters
         id: parameters

.github/workflows/docs-destroy.yml

@@ -23,13 +23,13 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
 
       - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@b868e6e7c8cc212beec876330b4059e661ee44bb # use-mise-action-v1.1.1
+        uses: immich-app/devtools/actions/use-mise@cd24790a7f5f6439ac32cc94f5523cb2de8bfa8c # use-mise-action-v1.1.0
 
       - name: Destroy Docs Subdomain
         env:

.github/workflows/fix-format.yml

@@ -22,7 +22,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: 'Checkout'
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           ref: ${{ github.event.pull_request.head.ref }}
           token: ${{ steps.generate-token.outputs.token }}

.github/workflows/prepare-release.yml

@@ -56,7 +56,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           token: ${{ steps.generate-token.outputs.token }}
           persist-credentials: true
@@ -136,13 +136,13 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           token: ${{ steps.generate-token.outputs.token }}
           persist-credentials: false
 
       - name: Download APK
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           name: release-apk-signed
           github-token: ${{ steps.generate-token.outputs.token }}

.github/workflows/release-pr.yml

@@ -23,7 +23,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           token: ${{ steps.generate-token.outputs.token }}
           persist-credentials: true
@@ -159,7 +159,7 @@ jobs:
 
       - name: Create PR
         id: create-pr
-        uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v8.0.0
+        uses: peter-evans/create-pull-request@22a9089034f40e5a961c8808d113e2c98fb63676 # v7.0.11
         with:
           token: ${{ steps.generate-token.outputs.token }}
           commit-message: 'chore: release ${{ steps.bump-type.outputs.next }}'

.github/workflows/release.yml

@@ -58,7 +58,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           token: ${{ steps.generate-token.outputs.token }}
           persist-credentials: false
@@ -74,7 +74,7 @@ jobs:
           echo "version=$VERSION" >> $GITHUB_OUTPUT
 
       - name: Download APK
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           name: release-apk-signed
           github-token: ${{ steps.generate-token.outputs.token }}

.github/workflows/sdk.yml

@@ -22,7 +22,7 @@ jobs:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}

.github/workflows/static_analysis.yml

@@ -55,7 +55,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}

.github/workflows/test.yml

@@ -69,7 +69,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -114,7 +114,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -161,7 +161,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -203,7 +203,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -247,7 +247,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -285,7 +285,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -333,7 +333,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -379,7 +379,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           submodules: 'recursive'
@@ -418,7 +418,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           submodules: 'recursive'
@@ -473,7 +473,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           submodules: 'recursive'
@@ -505,7 +505,7 @@ jobs:
         run: npx playwright test
         if: ${{ !cancelled() }}
       - name: Archive test results
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         if: success() || failure()
         with:
           name: e2e-web-test-results-${{ matrix.runner }}
@@ -534,7 +534,7 @@ jobs:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -566,14 +566,17 @@ jobs:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
       - name: Install uv
         uses: astral-sh/setup-uv@681c641aba71e4a1c380be3ab5e12ad51f415867 # v7.1.6
+      - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
+        # TODO: add caching when supported (https://github.com/actions/setup-python/pull/818)
         with:
           python-version: 3.11
+          #cache: 'uv'
       - name: Install dependencies
         run: |
           uv sync --extra cpu
@@ -607,7 +610,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -636,7 +639,7 @@ jobs:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -658,7 +661,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
@@ -720,7 +723,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}

cli/package.json

@@ -21,7 +21,7 @@
     "@types/micromatch": "^4.0.9",
     "@types/mock-fs": "^4.13.1",
     "@types/node": "^24.10.4",
-    "@vitest/coverage-v8": "^3.0.0",
+    "@vitest/coverage-v8": "^4.0.0",
     "byte-size": "^9.0.0",
     "cli-progress": "^3.12.0",
     "commander": "^12.0.0",
@@ -37,7 +37,7 @@
     "typescript-eslint": "^8.28.0",
     "vite": "^7.0.0",
     "vite-tsconfig-paths": "^6.0.0",
-    "vitest": "^3.0.0",
+    "vitest": "^4.0.0",
     "vitest-fetch-mock": "^0.4.0",
     "yaml": "^2.3.1"
   },

cli/vite.config.ts

@@ -1,4 +1,4 @@
-import { defineConfig } from 'vite';
+import { defineConfig, UserConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
 
 export default defineConfig({
@@ -17,4 +17,7 @@ export default defineConfig({
     noExternal: /^(?!node:).*$/,
   },
   plugins: [tsconfigPaths()],
-});
+  test: {
+    globals: true,
+  },
+} as UserConfig);

cli/vitest.config.ts

@@ -1,7 +0,0 @@
-import { defineConfig } from 'vitest/config';
-
-export default defineConfig({
-  test: {
-    globals: true,
-  },
-});

docs/docs/features/sharing.md

@@ -33,7 +33,7 @@ You can create a public link to share a group of photos or videos, or an album,
 The public shared link is generated with a random URL, which acts as as a secret to avoid the link being guessed by unwanted parties, for instance.
 
 ```
-https://my.immich.app/share/JUckRMxlgpo7F9BpyqGk_cZEwDzaU_U5LU5_oNZp1ETIBa9dpQ0b5ghNm_22QVJfn3k
+https://immich.yourdomain.com/share/JUckRMxlgpo7F9BpyqGk_cZEwDzaU_U5LU5_oNZp1ETIBa9dpQ0b5ghNm_22QVJfn3k
 ```
 
 ### Creating a public share link

e2e-auth-server/Dockerfile

@@ -1,6 +0,0 @@
-FROM node:24.1.0-alpine3.20@sha256:8fe019e0d57dbdce5f5c27c0b63d2775cf34b00e3755a7dea969802d7e0c2b25
-RUN corepack enable
-ADD package.json *.ts ./
-RUN pnpm install
-EXPOSE 2286
-CMD ["pnpm", "run", "start"]

e2e-auth-server/package.json

@@ -1,15 +0,0 @@
-{
-  "name": "@immich/e2e-auth-server",
-  "version": "0.1.0",
-  "type": "module",
-  "main": "auth-server.ts",
-  "scripts": {
-    "start": "tsx startup.ts"
-  },
-  "devDependencies": {
-    "jose": "^5.6.3",
-    "@types/oidc-provider": "^9.0.0",
-    "oidc-provider": "^9.0.0",
-    "tsx": "^4.20.6"
-  }
-}

e2e-auth-server/startup.ts

@@ -1,8 +0,0 @@
-import setup from './auth-server'
-
-const teardown = await setup()
-process.on('exit', () => {
-  teardown()
-  console.log('[e2e-auth-server] stopped')
-  process.exit(0)
-})

e2e/docker-compose.yml

@@ -1,12 +1,6 @@
 name: immich-e2e
 
 services:
-  e2e-auth-server:
-    build:
-      context: ../e2e-auth-server
-    ports:
-      - 2286:2286
-
   immich-server:
     container_name: immich-e2e-server
     image: immich-server:latest
@@ -33,6 +27,8 @@ services:
       - IMMICH_IGNORE_MOUNT_CHECK_ERRORS=true
     volumes:
       - ./test-assets:/test-assets
+    extra_hosts:
+      - 'auth-server:host-gateway'
     depends_on:
       redis:
         condition: service_started

e2e/package.json

@@ -22,12 +22,12 @@
     "@eslint/js": "^9.8.0",
     "@faker-js/faker": "^10.1.0",
     "@immich/cli": "file:../cli",
-    "@immich/e2e-auth-server": "file:../e2e-auth-server",
     "@immich/sdk": "file:../open-api/typescript-sdk",
     "@playwright/test": "^1.44.1",
     "@socket.io/component-emitter": "^3.1.2",
     "@types/luxon": "^3.4.2",
     "@types/node": "^24.10.4",
+    "@types/oidc-provider": "^9.0.0",
     "@types/pg": "^8.15.1",
     "@types/pngjs": "^6.0.4",
     "@types/supertest": "^6.0.2",
@@ -38,7 +38,9 @@
     "eslint-plugin-unicorn": "^62.0.0",
     "exiftool-vendored": "^34.3.0",
     "globals": "^16.0.0",
+    "jose": "^5.6.3",
     "luxon": "^3.4.4",
+    "oidc-provider": "^9.0.0",
     "pg": "^8.11.3",
     "pngjs": "^7.0.0",
     "prettier": "^3.7.4",
@@ -49,7 +51,7 @@
     "typescript": "^5.3.3",
     "typescript-eslint": "^8.28.0",
     "utimes": "^5.2.1",
-    "vitest": "^3.0.0"
+    "vitest": "^4.0.0"
   },
   "volta": {
     "node": "24.12.0"

e2e/src/api/specs/oauth.e2e-spec.ts

@@ -1,4 +1,3 @@
-import { OAuthClient, OAuthUser } from '@immich/e2e-auth-server';
 import {
   LoginResponseDto,
   SystemConfigOAuthDto,
@@ -9,12 +8,13 @@ import {
 } from '@immich/sdk';
 import { createHash, randomBytes } from 'node:crypto';
 import { errorDto } from 'src/responses';
+import { OAuthClient, OAuthUser } from 'src/setup/auth-server';
 import { app, asBearerAuth, baseUrl, utils } from 'src/utils';
 import request from 'supertest';
 import { beforeAll, describe, expect, it } from 'vitest';
 
 const authServer = {
-  internal: 'http://e2e-auth-server:2286',
+  internal: 'http://auth-server:2286',
   external: 'http://127.0.0.1:2286',
 };
 

e2e/src/generators.ts

@@ -26,5 +26,6 @@ export const makeRandomImage = () => {
   if (!value) {
     throw new Error('Ran out of random asset data');
   }
+
   return value;
 };

e2e/src/generators/timeline/rest-response.ts

@@ -346,8 +346,6 @@ export function toAssetResponseDto(asset: MockTimelineAsset, owner?: UserRespons
     duplicateId: null,
     resized: true,
     checksum: asset.checksum,
-    width: exifInfo.exifImageWidth ?? 1,
-    height: exifInfo.exifImageHeight ?? 1,
   };
 }
 

e2e/src/mock-network/timeline-network.ts

@@ -1,4 +1,3 @@
-import { AssetResponseDto } from '@immich/sdk';
 import { BrowserContext, Page, Request, Route } from '@playwright/test';
 import { basename } from 'node:path';
 import {
@@ -64,33 +63,15 @@ export const setupTimelineMockApiRoutes = async (
   });
 
   await context.route('**/api/assets/*', async (route, request) => {
-    if (request.method() === 'GET') {
-      const url = new URL(request.url());
-      const pathname = url.pathname;
-      const assetId = basename(pathname);
-      let asset = getAsset(timelineRestData, assetId);
-      if (changes.assetDeletions.includes(asset!.id)) {
-        asset = {
-          ...asset,
-          isTrashed: true,
-        } as AssetResponseDto;
-      }
-      return route.fulfill({
-        status: 200,
-        contentType: 'application/json',
-        json: asset,
-      });
-    }
-    await route.fallback();
-  });
-
-  await context.route('**/api/assets', async (route, request) => {
-    if (request.method() === 'DELETE') {
-      return route.fulfill({
-        status: 204,
-      });
-    }
-    await route.fallback();
+    const url = new URL(request.url());
+    const pathname = url.pathname;
+    const assetId = basename(pathname);
+    const asset = getAsset(timelineRestData, assetId);
+    return route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      json: asset,
+    });
   });
 
   await context.route('**/api/assets/*/ocr', async (route) => {
@@ -136,28 +117,17 @@ export const setupTimelineMockApiRoutes = async (
   });
 
   await context.route('**/api/albums/**', async (route, request) => {
-    const albumsMatch = request.url().match(/\/api\/albums\/(?<albumId>[^/?]+)/);
-    if (albumsMatch) {
-      const album = getAlbum(timelineRestData, testContext.adminId, albumsMatch.groups?.albumId, changes);
-      return route.fulfill({
-        status: 200,
-        contentType: 'application/json',
-        json: album,
-      });
+    const pattern = /\/api\/albums\/(?<albumId>[^/?]+)/;
+    const match = request.url().match(pattern);
+    if (!match) {
+      return route.continue();
     }
-    return route.fallback();
-  });
-
-  await context.route('**/api/albums**', async (route, request) => {
-    const allAlbums = request.url().match(/\/api\/albums\?assetId=(?<assetId>[^&]+)/);
-    if (allAlbums) {
-      return route.fulfill({
-        status: 200,
-        contentType: 'application/json',
-        json: [],
-      });
-    }
-    return route.fallback();
+    const album = getAlbum(timelineRestData, testContext.adminId, match.groups?.albumId, changes);
+    return route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      json: album,
+    });
   });
 };
 

e2e/src/setup/auth-server.ts

@@ -125,7 +125,7 @@ const setup = async () => {
     ],
   });
 
-  const onStart = () => console.log(`[e2e-auth-server] http://${host}:${port}/.well-known/openid-configuration`);
+  const onStart = () => console.log(`[auth-server] http://${host}:${port}/.well-known/openid-configuration`);
   const app = oidc.listen(port, host, onStart);
   return () => app.close();
 };

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

@@ -1,156 +0,0 @@
-import { faker } from '@faker-js/faker';
-import { test } from '@playwright/test';
-import {
-  Changes,
-  createDefaultTimelineConfig,
-  generateTimelineData,
-  SeededRandom,
-  selectRandom,
-  TimelineAssetConfig,
-  TimelineData,
-} from 'src/generators/timeline';
-import { setupBaseMockApiRoutes } from 'src/mock-network/base-network';
-import { setupTimelineMockApiRoutes, TimelineTestContext } from 'src/mock-network/timeline-network';
-import { utils } from 'src/utils';
-import { assetViewerUtils, cancelAllPollers } from 'src/web/specs/timeline/utils';
-
-test.describe.configure({ mode: 'parallel' });
-test.describe('asset-viewer', () => {
-  const rng = new SeededRandom(529);
-  let adminUserId: string;
-  let timelineRestData: TimelineData;
-  const assets: TimelineAssetConfig[] = [];
-  const yearMonths: string[] = [];
-  const testContext = new TimelineTestContext();
-  const changes: Changes = {
-    albumAdditions: [],
-    assetDeletions: [],
-    assetArchivals: [],
-    assetFavorites: [],
-  };
-
-  test.beforeAll(async () => {
-    utils.initSdk();
-    adminUserId = faker.string.uuid();
-    testContext.adminId = adminUserId;
-    timelineRestData = generateTimelineData({ ...createDefaultTimelineConfig(), ownerId: adminUserId });
-    for (const timeBucket of timelineRestData.buckets.values()) {
-      assets.push(...timeBucket);
-    }
-    for (const yearMonth of timelineRestData.buckets.keys()) {
-      const [year, month] = yearMonth.split('-');
-      yearMonths.push(`${year}-${Number(month)}`);
-    }
-  });
-
-  test.beforeEach(async ({ context }) => {
-    await setupBaseMockApiRoutes(context, adminUserId);
-    await setupTimelineMockApiRoutes(context, timelineRestData, changes, testContext);
-  });
-
-  test.afterEach(() => {
-    cancelAllPollers();
-    testContext.slowBucket = false;
-    changes.albumAdditions = [];
-    changes.assetDeletions = [];
-    changes.assetArchivals = [];
-    changes.assetFavorites = [];
-  });
-
-  test.describe('/photos/:id', () => {
-    test('Delete photo advances to next', async ({ page }) => {
-      const asset = selectRandom(assets, rng);
-      await page.goto(`/photos/${asset.id}`);
-      await assetViewerUtils.waitForViewerLoad(page, asset);
-      await page.getByLabel('Delete').click();
-      const index = assets.indexOf(asset);
-      await assetViewerUtils.waitForViewerLoad(page, assets[index + 1]);
-    });
-    test('Delete photo advances to next (2x)', async ({ page }) => {
-      const asset = selectRandom(assets, rng);
-      await page.goto(`/photos/${asset.id}`);
-      await assetViewerUtils.waitForViewerLoad(page, asset);
-      await page.getByLabel('Delete').click();
-      const index = assets.indexOf(asset);
-      await assetViewerUtils.waitForViewerLoad(page, assets[index + 1]);
-      await page.getByLabel('Delete').click();
-      await assetViewerUtils.waitForViewerLoad(page, assets[index + 2]);
-    });
-    test('Delete last photo advances to prev', async ({ page }) => {
-      const asset = assets.at(-1)!;
-      await page.goto(`/photos/${asset.id}`);
-      await assetViewerUtils.waitForViewerLoad(page, asset);
-      await page.getByLabel('Delete').click();
-      const index = assets.indexOf(asset);
-      await assetViewerUtils.waitForViewerLoad(page, assets[index - 1]);
-    });
-    test('Delete last photo advances to prev (2x)', async ({ page }) => {
-      const asset = assets.at(-1)!;
-      await page.goto(`/photos/${asset.id}`);
-      await assetViewerUtils.waitForViewerLoad(page, asset);
-      await page.getByLabel('Delete').click();
-      const index = assets.indexOf(asset);
-      await assetViewerUtils.waitForViewerLoad(page, assets[index - 1]);
-      await page.getByLabel('Delete').click();
-      await assetViewerUtils.waitForViewerLoad(page, assets[index - 2]);
-    });
-  });
-  test.describe('/trash/photos/:id', () => {
-    test('Delete trashed photo advances to next', async ({ page }) => {
-      const asset = selectRandom(assets, rng);
-      const index = assets.indexOf(asset);
-      const deletedAssets = assets.slice(index - 10, index + 10).map((asset) => asset.id);
-      changes.assetDeletions.push(...deletedAssets);
-      await page.goto(`/trash/photos/${asset.id}`);
-      await assetViewerUtils.waitForViewerLoad(page, asset);
-      await page.getByLabel('Delete').click();
-      // confirm dialog
-      await page.getByRole('button').getByText('Delete').click();
-      await assetViewerUtils.waitForViewerLoad(page, assets[index + 1]);
-    });
-    test('Delete trashed photo advances to next 2x', async ({ page }) => {
-      const asset = selectRandom(assets, rng);
-      const index = assets.indexOf(asset);
-      const deletedAssets = assets.slice(index - 10, index + 10).map((asset) => asset.id);
-      changes.assetDeletions.push(...deletedAssets);
-      await page.goto(`/trash/photos/${asset.id}`);
-      await assetViewerUtils.waitForViewerLoad(page, asset);
-      await page.getByLabel('Delete').click();
-      // confirm dialog
-      await page.getByRole('button').getByText('Delete').click();
-      await assetViewerUtils.waitForViewerLoad(page, assets[index + 1]);
-      await page.getByLabel('Delete').click();
-      // confirm dialog
-      await page.getByRole('button').getByText('Delete').click();
-      await assetViewerUtils.waitForViewerLoad(page, assets[index + 2]);
-    });
-    test('Delete trashed photo advances to prev', async ({ page }) => {
-      const asset = selectRandom(assets, rng);
-      const index = assets.indexOf(asset);
-      const deletedAssets = assets.slice(index - 10, index + 10).map((asset) => asset.id);
-      changes.assetDeletions.push(...deletedAssets);
-      await page.goto(`/trash/photos/${assets[index + 9].id}`);
-      await assetViewerUtils.waitForViewerLoad(page, assets[index + 9]);
-      await page.getByLabel('Delete').click();
-      // confirm dialog
-      await page.getByRole('button').getByText('Delete').click();
-      await assetViewerUtils.waitForViewerLoad(page, assets[index + 8]);
-    });
-    test('Delete trashed photo advances to prev 2x', async ({ page }) => {
-      const asset = selectRandom(assets, rng);
-      const index = assets.indexOf(asset);
-      const deletedAssets = assets.slice(index - 10, index + 10).map((asset) => asset.id);
-      changes.assetDeletions.push(...deletedAssets);
-      await page.goto(`/trash/photos/${assets[index + 9].id}`);
-      await assetViewerUtils.waitForViewerLoad(page, assets[index + 9]);
-      await page.getByLabel('Delete').click();
-      // confirm dialog
-      await page.getByRole('button').getByText('Delete').click();
-      await assetViewerUtils.waitForViewerLoad(page, assets[index + 8]);
-      await page.getByLabel('Delete').click();
-      // confirm dialog
-      await page.getByRole('button').getByText('Delete').click();
-      await assetViewerUtils.waitForViewerLoad(page, assets[index + 7]);
-    });
-  });
-});

e2e/src/web/specs/timeline/timeline.parallel-e2e-spec.ts

@@ -463,7 +463,7 @@ test.describe('Timeline', () => {
         });
         changes.albumAdditions.push(...requestJson.ids);
       });
-      await page.getByText('Add assets').click();
+      await page.getByText('Done').click();
       await expect(put).resolves.toEqual({
         ids: [
           'c077ea7b-cfa1-45e4-8554-f86c00ee5658',

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

@@ -181,12 +181,8 @@ export const assetViewerUtils = {
   },
   async waitForViewerLoad(page: Page, asset: TimelineAssetConfig) {
     await page
-      .locator(
-        `img[draggable="false"][src="/api/assets/${asset.id}/thumbnail?size=preview&c=${asset.thumbhash}&edited=true"]`,
-      )
-      .or(
-        page.locator(`video[poster="/api/assets/${asset.id}/thumbnail?size=preview&c=${asset.thumbhash}&edited=true"]`),
-      )
+      .locator(`img[draggable="false"][src="/api/assets/${asset.id}/thumbnail?size=preview&c=${asset.thumbhash}"]`)
+      .or(page.locator(`video[poster="/api/assets/${asset.id}/thumbnail?size=preview&c=${asset.thumbhash}"]`))
       .waitFor();
   },
   async expectActiveAssetToBe(page: Page, assetId: string) {

e2e/src/web/specs/user-admin.e2e-spec.ts

@@ -56,7 +56,7 @@ test.describe('User Administration', () => {
     await expect(page.getByLabel('Admin User')).not.toBeChecked();
     await page.getByLabel('Admin User').click();
     await expect(page.getByLabel('Admin User')).toBeChecked();
-    await page.getByRole('button', { name: 'Save' }).click();
+    await page.getByRole('button', { name: 'Confirm' }).click();
 
     await expect
       .poll(async () => {
@@ -85,7 +85,7 @@ test.describe('User Administration', () => {
     await expect(page.getByLabel('Admin User')).toBeChecked();
     await page.getByLabel('Admin User').click();
     await expect(page.getByLabel('Admin User')).not.toBeChecked();
-    await page.getByRole('button', { name: 'Save' }).click();
+    await page.getByRole('button', { name: 'Confirm' }).click();
 
     await expect
       .poll(async () => {

e2e/vitest.config.ts

@@ -1,7 +1,7 @@
 import { defineConfig } from 'vitest/config';
 
 // skip `docker compose up` if `make e2e` was already run
-const globalSetup: string[] = [];
+const globalSetup: string[] = ['src/setup/auth-server.ts'];
 try {
   await fetch('http://127.0.0.1:2285/api/server-info/ping');
 } catch {
@@ -14,10 +14,7 @@ export default defineConfig({
     globalSetup,
     testTimeout: 15_000,
     pool: 'threads',
-    poolOptions: {
-      threads: {
-        singleThread: true,
-      },
-    },
+    maxWorkers: 1,
+    isolate: false,
   },
 });

i18n/en.json

@@ -18,7 +18,6 @@
   "add_a_title": "Add a title",
   "add_action": "Add action",
   "add_action_description": "Click to add an action to perform",
-  "add_assets": "Add assets",
   "add_birthday": "Add a birthday",
   "add_endpoint": "Add endpoint",
   "add_exclusion_pattern": "Add exclusion pattern",
@@ -479,7 +478,6 @@
   "album_summary": "Album summary",
   "album_updated": "Album updated",
   "album_updated_setting_description": "Receive an email notification when a shared album has new assets",
-  "album_upload_assets": "Upload assets from your computer and add to album",
   "album_user_left": "Left {album}",
   "album_user_removed": "Removed {user}",
   "album_viewer_appbar_delete_confirm": "Are you sure you want to delete this album from your account?",
@@ -736,18 +734,6 @@
   "checksum": "Checksum",
   "choose_matching_people_to_merge": "Choose matching people to merge",
   "city": "City",
-  "cleanup_confirm_description": "Immich found {count} assets (created before {date}) safely backed up to the server. Remove the local copies from this device?",
-  "cleanup_confirm_prompt_title": "Remove from this device?",
-  "cleanup_deleted_assets": "Moved {count} assets to device trash",
-  "cleanup_deleting": "Moving to trash...",
-  "cleanup_filter_description": "Choose which types of assets to remove in the cleanup",
-  "cleanup_found_assets": "Found {count} backed up assets",
-  "cleanup_icloud_shared_albums_excluded": "iCloud Shared Albums are excluded from the scan",
-  "cleanup_no_assets_found": "No backed up assets found matching your criteria",
-  "cleanup_preview_title": "Assets to remove ({count})",
-  "cleanup_step3_description": "Scan for photos and videos that have been backed up to the server with the selected cutoff date and filter options",
-  "cleanup_step4_summary": "{count} assets created before {date} are queued for removal from your device",
-  "cleanup_trash_hint": "To fully reclaim storage space, open the system gallery app and empty the trash",
   "clear": "Clear",
   "clear_all": "Clear all",
   "clear_all_recent_searches": "Clear all recent searches",
@@ -833,20 +819,13 @@
   "created_at": "Created",
   "creating_linked_albums": "Creating linked albums...",
   "crop": "Crop",
-  "crop_aspect_ratio_fixed": "Fixed",
-  "crop_aspect_ratio_free": "Free",
-  "crop_aspect_ratio_original": "Original",
   "curated_object_page_title": "Things",
   "current_device": "Current device",
   "current_pin_code": "Current PIN code",
   "current_server_address": "Current server address",
-  "custom_date": "Custom date",
   "custom_locale": "Custom Locale",
   "custom_locale_description": "Format dates and numbers based on the language and the region",
   "custom_url": "Custom URL",
-  "cutoff_date_description": "Remove photos and videos older than",
-  "cutoff_day": "{count, plural, one {day} other {days}}",
-  "cutoff_year": "{count, plural, one {year} other {years}}",
   "daily_title_text_date": "E, MMM dd",
   "daily_title_text_date_year": "E, MMM dd, yyyy",
   "dark": "Dark",
@@ -969,13 +948,9 @@
   "editor": "Editor",
   "editor_close_without_save_prompt": "The changes will not be saved",
   "editor_close_without_save_title": "Close editor?",
-  "editor_confirm_reset_all_changes": "Are you sure you want to reset all changes?",
-  "editor_flip_horizontal": "Flip horizontal",
-  "editor_flip_vertical": "Flip vertical",
-  "editor_orientation": "Orientation",
-  "editor_reset_all_changes": "Reset changes",
-  "editor_rotate_left": "Rotate 90° counterclockwise",
-  "editor_rotate_right": "Rotate 90° clockwise",
+  "editor_crop_tool_h2_aspect_ratios": "Aspect ratios",
+  "editor_crop_tool_h2_rotation": "Rotation",
+  "editor_mode": "Editor mode",
   "email": "Email",
   "email_notifications": "Email notifications",
   "empty_folder": "This folder is empty",
@@ -1173,7 +1148,6 @@
   "filetype": "Filetype",
   "filter": "Filter",
   "filter_description": "Conditions to filter the target assets",
-  "filter_options": "Filter options",
   "filter_people": "Filter people",
   "filter_places": "Filter places",
   "filters": "Filters",
@@ -1186,9 +1160,6 @@
   "folders_feature_description": "Browsing the folder view for the photos and videos on the file system",
   "forgot_pin_code_question": "Forgot your PIN?",
   "forward": "Forward",
-  "free_up_space": "Free Up Space",
-  "free_up_space_description": "Move backed-up photos and videos to your device's trash to free up space. Your copies on the server remain safe",
-  "free_up_space_settings_subtitle": "Free up device storage",
   "full_path": "Full path: {path}",
   "gcast_enabled": "Google Cast",
   "gcast_enabled_description": "This feature loads external resources from Google in order to work.",
@@ -1305,8 +1276,6 @@
   "json_error": "JSON error",
   "keep": "Keep",
   "keep_all": "Keep All",
-  "keep_favorites": "Keep favorites",
-  "keep_favorites_description": "Favorite assets will not be deleted from your device",
   "keep_this_delete_others": "Keep this, delete others",
   "kept_this_deleted_others": "Kept this asset and deleted {count, plural, one {# asset} other {# assets}}",
   "keyboard_shortcuts": "Keyboard shortcuts",
@@ -1466,8 +1435,6 @@
   "minimize": "Minimize",
   "minute": "Minute",
   "minutes": "Minutes",
-  "mirror_horizontal": "Horizontal",
-  "mirror_vertical": "Vertical",
   "missing": "Missing",
   "mobile_app": "Mobile App",
   "mobile_app_download_onboarding_note": "Download the companion mobile app using the following options",
@@ -1479,7 +1446,6 @@
   "move_down": "Move down",
   "move_off_locked_folder": "Move out of locked folder",
   "move_to": "Move to",
-  "move_to_device_trash": "Move to device trash",
   "move_to_lock_folder_action_prompt": "{count} added to the locked folder",
   "move_to_locked_folder": "Move to locked folder",
   "move_to_locked_folder_confirmation": "These photos and video will be removed from all albums, and only viewable from the locked folder",
@@ -1662,7 +1628,6 @@
   "photos_and_videos": "Photos & Videos",
   "photos_count": "{count, plural, one {{count, number} Photo} other {{count, number} Photos}}",
   "photos_from_previous_years": "Photos from previous years",
-  "photos_only": "Photos only",
   "pick_a_location": "Pick a location",
   "pick_custom_range": "Custom range",
   "pick_date_range": "Select a date range",
@@ -1843,11 +1808,9 @@
   "saved_settings": "Saved settings",
   "say_something": "Say something",
   "scaffold_body_error_occurred": "Error occurred",
-  "scan": "Scan",
   "scan_all_libraries": "Scan All Libraries",
   "scan_library": "Scan",
   "scan_settings": "Scan Settings",
-  "scanning": "Scanning",
   "scanning_for_album": "Scanning for album...",
   "search": "Search",
   "search_albums": "Search albums",
@@ -1919,7 +1882,6 @@
   "select_all_in": "Select all in {group}",
   "select_avatar_color": "Select avatar color",
   "select_count": "{count, plural, one {Select #} other {Select #}}",
-  "select_cutoff_date": "Select cutoff date",
   "select_face": "Select face",
   "select_featured_photo": "Select featured photo",
   "select_from_computer": "Select from computer",
@@ -2288,7 +2250,6 @@
   "video_hover_setting_description": "Play video thumbnail when mouse is hovering over item. Even when disabled, playback can be started by hovering over the play icon.",
   "videos": "Videos",
   "videos_count": "{count, plural, one {# Video} other {# Videos}}",
-  "videos_only": "Videos only",
   "view": "View",
   "view_album": "View Album",
   "view_all": "View All",

mobile/ios/.gitignore

@@ -33,5 +33,4 @@ Runner/GeneratedPluginRegistrant.*
 !default.perspectivev3
 
 fastlane/report.xml
-Gemfile.lock
-certs/
+Gemfile.lock

mobile/ios/fastlane/Fastfile

@@ -44,7 +44,7 @@ def get_version_from_pubspec
 end
   
   # Helper method to configure code signing for all targets
-  def configure_code_signing(bundle_id_suffix: "", profile_name_main:, profile_name_share:, profile_name_widget:)
+  def configure_code_signing(bundle_id_suffix: "")
     bundle_suffix = bundle_id_suffix.empty? ? "" : ".#{bundle_id_suffix}"
     
     # Runner (main app)
@@ -54,7 +54,7 @@ end
       team_id: ENV["FASTLANE_TEAM_ID"] || TEAM_ID,
       code_sign_identity: CODE_SIGN_IDENTITY,
       bundle_identifier: "#{BASE_BUNDLE_ID}#{bundle_suffix}",
-      profile_name: profile_name_main,
+      profile_name: "#{BASE_BUNDLE_ID}#{bundle_suffix} AppStore",
       targets: ["Runner"]
     )
     
@@ -65,7 +65,7 @@ end
       team_id: ENV["FASTLANE_TEAM_ID"] || TEAM_ID,
       code_sign_identity: CODE_SIGN_IDENTITY,
       bundle_identifier: "#{BASE_BUNDLE_ID}#{bundle_suffix}.ShareExtension",
-      profile_name: profile_name_share,
+      profile_name: "#{BASE_BUNDLE_ID}#{bundle_suffix}.ShareExtension AppStore",
       targets: ["ShareExtension"]
     )
     
@@ -76,7 +76,7 @@ end
       team_id: ENV["FASTLANE_TEAM_ID"] || TEAM_ID,
       code_sign_identity: CODE_SIGN_IDENTITY,
       bundle_identifier: "#{BASE_BUNDLE_ID}#{bundle_suffix}.Widget",
-      profile_name: profile_name_widget,
+      profile_name: "#{BASE_BUNDLE_ID}#{bundle_suffix}.Widget AppStore",
       targets: ["WidgetExtension"]
     )
   end
@@ -87,10 +87,7 @@ end
     bundle_id_suffix: "",
     configuration: "Release",
     distribute_external: true,
-    version_number: nil,
-    profile_name_main:,
-    profile_name_share:,
-    profile_name_widget:
+    version_number: nil
   )
     bundle_suffix = bundle_id_suffix.empty? ? "" : ".#{bundle_id_suffix}"
     app_identifier = "#{BASE_BUNDLE_ID}#{bundle_suffix}"
@@ -118,9 +115,9 @@ end
       xcargs: "-skipMacroValidation CODE_SIGN_IDENTITY='#{CODE_SIGN_IDENTITY}' CODE_SIGN_STYLE=Manual",
       export_options: {
         provisioningProfiles: {
-          "#{app_identifier}" => profile_name_main,
-          "#{app_identifier}.ShareExtension" => profile_name_share,
-          "#{app_identifier}.Widget" => profile_name_widget
+          "#{app_identifier}" => "#{app_identifier} AppStore",
+          "#{app_identifier}.ShareExtension" => "#{app_identifier}.ShareExtension AppStore",
+          "#{app_identifier}.Widget" => "#{app_identifier}.Widget AppStore"
         },
         signingStyle: "manual",
         signingCertificate: CODE_SIGN_IDENTITY
@@ -139,35 +136,20 @@ end
   lane :gha_testflight_dev do
     api_key = get_api_key
     
-    # Download and install provisioning profiles from App Store Connect
-    # Certificate is imported by GHA workflow into build.keychain
-    # Capture profile names after each sigh call
-    sigh(api_key: api_key, app_identifier: "#{BASE_BUNDLE_ID}.development", force: true)
-    main_profile_name = lane_context[SharedValues::SIGH_NAME]
+    # Install development provisioning profiles
+    install_provisioning_profile(path: "profile_dev.mobileprovision")
+    install_provisioning_profile(path: "profile_dev_share.mobileprovision")
+    install_provisioning_profile(path: "profile_dev_widget.mobileprovision")
     
-    sigh(api_key: api_key, app_identifier: "#{BASE_BUNDLE_ID}.development.ShareExtension", force: true)
-    share_profile_name = lane_context[SharedValues::SIGH_NAME]
-    
-    sigh(api_key: api_key, app_identifier: "#{BASE_BUNDLE_ID}.development.Widget", force: true)
-    widget_profile_name = lane_context[SharedValues::SIGH_NAME]
-    
-    # Configure code signing for dev bundle IDs using the downloaded profile names
-    configure_code_signing(
-      bundle_id_suffix: "development",
-      profile_name_main: main_profile_name,
-      profile_name_share: share_profile_name,
-      profile_name_widget: widget_profile_name
-    )
+    # Configure code signing for dev bundle IDs
+    configure_code_signing(bundle_id_suffix: "development")
     
     # Build and upload
     build_and_upload(
       api_key: api_key,
       bundle_id_suffix: "development",
       configuration: "Profile",
-      distribute_external: false,
-      profile_name_main: main_profile_name,
-      profile_name_share: share_profile_name,
-      profile_name_widget: widget_profile_name
+      distribute_external: false
     )
   end
 
@@ -175,33 +157,20 @@ end
   lane :gha_release_prod do
     api_key = get_api_key
     
-    # Download and install provisioning profiles from App Store Connect
-    # Certificate is imported by GHA workflow into build.keychain
-    sigh(api_key: api_key, app_identifier: BASE_BUNDLE_ID, force: true)
-    main_profile_name = lane_context[SharedValues::SIGH_NAME]
-    
-    sigh(api_key: api_key, app_identifier: "#{BASE_BUNDLE_ID}.ShareExtension", force: true)
-    share_profile_name = lane_context[SharedValues::SIGH_NAME]
-    
-    sigh(api_key: api_key, app_identifier: "#{BASE_BUNDLE_ID}.Widget", force: true)
-    widget_profile_name = lane_context[SharedValues::SIGH_NAME]
+    # Install provisioning profiles
+    install_provisioning_profile(path: "profile.mobileprovision")
+    install_provisioning_profile(path: "profile_share.mobileprovision")
+    install_provisioning_profile(path: "profile_widget.mobileprovision")
     
     
     # Configure code signing for production bundle IDs
-    configure_code_signing(
-      profile_name_main: main_profile_name,
-      profile_name_share: share_profile_name,
-      profile_name_widget: widget_profile_name
-    )
+    configure_code_signing
 
     # Build and upload with version number
     build_and_upload(
       api_key: api_key,
       version_number: get_version_from_pubspec,
       distribute_external: false,
-      profile_name_main: main_profile_name,
-      profile_name_share: share_profile_name,
-      profile_name_widget: widget_profile_name
     )
   end
 
@@ -246,26 +215,13 @@ end
     # Use the same build process as production, just skip the upload
     # This ensures PR builds validate the same way as production builds
     
-    api_key = get_api_key
-    
-    # Download and install provisioning profiles from App Store Connect
-    # Certificate is imported by GHA workflow into build.keychain
-    sigh(api_key: api_key, app_identifier: "#{BASE_BUNDLE_ID}.development", force: true)
-    main_profile_name = lane_context[SharedValues::SIGH_NAME]
-    
-    sigh(api_key: api_key, app_identifier: "#{BASE_BUNDLE_ID}.development.ShareExtension", force: true)
-    share_profile_name = lane_context[SharedValues::SIGH_NAME]
-    
-    sigh(api_key: api_key, app_identifier: "#{BASE_BUNDLE_ID}.development.Widget", force: true)
-    widget_profile_name = lane_context[SharedValues::SIGH_NAME]
+    # Install provisioning profiles (use development profiles for PR builds)
+    install_provisioning_profile(path: "profile_dev.mobileprovision")
+    install_provisioning_profile(path: "profile_dev_share.mobileprovision")
+    install_provisioning_profile(path: "profile_dev_widget.mobileprovision")
     
     # Configure code signing for dev bundle IDs
-    configure_code_signing(
-      bundle_id_suffix: "development",
-      profile_name_main: main_profile_name,
-      profile_name_share: share_profile_name,
-      profile_name_widget: widget_profile_name
-    )
+    configure_code_signing(bundle_id_suffix: "development")
     
     # Build the app (same as gha_testflight_dev but without upload)
     build_app(
@@ -277,9 +233,9 @@ end
       xcargs: "-skipMacroValidation CODE_SIGN_IDENTITY='#{CODE_SIGN_IDENTITY}' CODE_SIGN_STYLE=Manual",
       export_options: {
         provisioningProfiles: {
-          "#{BASE_BUNDLE_ID}.development" => main_profile_name,
-          "#{BASE_BUNDLE_ID}.development.ShareExtension" => share_profile_name,
-          "#{BASE_BUNDLE_ID}.development.Widget" => widget_profile_name
+          "#{BASE_BUNDLE_ID}.development" => "#{BASE_BUNDLE_ID}.development AppStore",
+          "#{BASE_BUNDLE_ID}.development.ShareExtension" => "#{BASE_BUNDLE_ID}.development.ShareExtension AppStore",
+          "#{BASE_BUNDLE_ID}.development.Widget" => "#{BASE_BUNDLE_ID}.development.Widget AppStore"
         },
         signingStyle: "manual",
         signingCertificate: CODE_SIGN_IDENTITY

mobile/lib/constants/enums.dart

@@ -7,7 +7,3 @@ enum AssetVisibilityEnum { timeline, hidden, archive, locked }
 enum SortUserBy { id }
 
 enum ActionSource { timeline, viewer }
-
-enum CleanupStep { selectDate, filterOptions, scan, delete }
-
-enum AssetFilterType { all, photosOnly, videosOnly }

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

@@ -4,6 +4,7 @@ import 'package:immich_mobile/domain/models/exif.model.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
+import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';
 
 typedef _AssetVideoDimension = ({double? width, double? height, bool isFlipped});
 
@@ -98,7 +99,9 @@ class AssetService {
       height = fetched?.height?.toDouble();
     }
 
-    return (width: width, height: height, isFlipped: false);
+    final exif = await getExif(asset);
+    final isFlipped = ExifDtoConverter.isOrientationFlipped(exif?.orientation);
+    return (width: width, height: height, isFlipped: isFlipped);
   }
 
   Future<List<(String, String)>> getPlaces(String userId) {

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

@@ -360,7 +360,6 @@ extension on Iterable<PlatformAlbum> {
         name: e.name,
         updatedAt: tryFromSecondsSinceEpoch(e.updatedAt, isUtc: true) ?? DateTime.timestamp(),
         assetCount: e.assetCount,
-        isIosSharedAlbum: e.isCloud,
       ),
     ).toList();
   }

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

@@ -79,9 +79,6 @@ class TimelineFactory {
   TimelineService fromAssets(List<BaseAsset> assets, TimelineOrigin type) =>
       TimelineService(_timelineRepository.fromAssets(assets, type));
 
-  TimelineService fromAssetsWithBuckets(List<BaseAsset> assets, TimelineOrigin type) =>
-      TimelineService(_timelineRepository.fromAssetsWithBuckets(assets, type));
-
   TimelineService map(String userId, LatLngBounds bounds) =>
       TimelineService(_timelineRepository.map(userId, bounds, groupBy));
 }

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

@@ -33,7 +33,6 @@ extension LocalAlbumEntityDataHelper on LocalAlbumEntityData {
       assetCount: assetCount,
       backupSelection: backupSelection,
       linkedRemoteAlbumId: linkedRemoteAlbumId,
-      isIosSharedAlbum: isIosSharedAlbum,
     );
   }
 }

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

@@ -1,7 +1,6 @@
 import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
 import 'package:immich_mobile/constants/constants.dart';
-import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.dart';
@@ -127,49 +126,4 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
     }
     return result;
   }
-
-  Future<List<LocalAsset>> getRemovalCandidates(
-    String userId,
-    DateTime cutoffDate, {
-    AssetFilterType filterType = AssetFilterType.all,
-    bool keepFavorites = true,
-  }) async {
-    final iosSharedAlbumAssets = _db.localAlbumAssetEntity.selectOnly()
-      ..addColumns([_db.localAlbumAssetEntity.assetId])
-      ..join([
-        innerJoin(
-          _db.localAlbumEntity,
-          _db.localAlbumAssetEntity.albumId.equalsExp(_db.localAlbumEntity.id),
-          useColumns: false,
-        ),
-      ])
-      ..where(_db.localAlbumEntity.isIosSharedAlbum.equals(true));
-
-    final query = _db.localAssetEntity.select().join([
-      innerJoin(_db.remoteAssetEntity, _db.localAssetEntity.checksum.equalsExp(_db.remoteAssetEntity.checksum)),
-    ]);
-
-    Expression<bool> whereClause =
-        _db.localAssetEntity.createdAt.isSmallerOrEqualValue(cutoffDate) &
-        _db.remoteAssetEntity.ownerId.equals(userId) &
-        _db.remoteAssetEntity.deletedAt.isNull();
-
-    // Exclude assets that are in iOS shared albums
-    whereClause = whereClause & _db.localAssetEntity.id.isNotInQuery(iosSharedAlbumAssets);
-
-    if (filterType == AssetFilterType.photosOnly) {
-      whereClause = whereClause & _db.localAssetEntity.type.equalsValue(AssetType.image);
-    } else if (filterType == AssetFilterType.videosOnly) {
-      whereClause = whereClause & _db.localAssetEntity.type.equalsValue(AssetType.video);
-    }
-
-    if (keepFavorites) {
-      whereClause = whereClause & _db.localAssetEntity.isFavorite.equals(false);
-    }
-
-    query.where(whereClause);
-
-    final rows = await query.get();
-    return rows.map((row) => row.readTable(_db.localAssetEntity).toDto()).toList();
-  }
 }

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

@@ -22,7 +22,6 @@ import 'package:immich_mobile/infrastructure/entities/stack.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';
 import 'package:logging/logging.dart';
 import 'package:openapi/api.dart' as api show AssetVisibility, AlbumUserRole, UserMetadataKey;
 import 'package:openapi/api.dart' hide AssetVisibility, AlbumUserRole, UserMetadataKey;
@@ -195,8 +194,6 @@ class SyncStreamRepository extends DriftDatabaseRepository {
             livePhotoVideoId: Value(asset.livePhotoVideoId),
             stackId: Value(asset.stackId),
             libraryId: Value(asset.libraryId),
-            width: Value(asset.width),
-            height: Value(asset.height),
           );
 
           batch.insert(
@@ -248,21 +245,10 @@ class SyncStreamRepository extends DriftDatabaseRepository {
 
       await _db.batch((batch) {
         for (final exif in data) {
-          int? width;
-          int? height;
-
-          if (ExifDtoConverter.isOrientationFlipped(exif.orientation)) {
-            width = exif.exifImageHeight;
-            height = exif.exifImageWidth;
-          } else {
-            width = exif.exifImageWidth;
-            height = exif.exifImageHeight;
-          }
-
           batch.update(
             _db.remoteAssetEntity,
-            RemoteAssetEntityCompanion(width: Value(width), height: Value(height)),
-            where: (row) => row.id.equals(exif.assetId) & row.width.isNull() & row.height.isNull(),
+            RemoteAssetEntityCompanion(width: Value(exif.exifImageWidth), height: Value(exif.exifImageHeight)),
+            where: (row) => row.id.equals(exif.assetId),
           );
         }
       });

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

@@ -253,24 +253,6 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     origin: origin,
   );
 
-  TimelineQuery fromAssetsWithBuckets(List<BaseAsset> assets, TimelineOrigin origin) {
-    // Sort assets by date descending and group by day
-    final sorted = List<BaseAsset>.from(assets)..sort((a, b) => b.createdAt.compareTo(a.createdAt));
-    final Map<DateTime, int> bucketCounts = {};
-    for (final asset in sorted) {
-      final date = DateTime(asset.createdAt.year, asset.createdAt.month, asset.createdAt.day);
-      bucketCounts[date] = (bucketCounts[date] ?? 0) + 1;
-    }
-
-    final buckets = bucketCounts.entries.map((e) => TimeBucket(date: e.key, assetCount: e.value)).toList();
-
-    return (
-      bucketSource: () => Stream.value(buckets),
-      assetSource: (offset, count) => Future.value(sorted.skip(offset).take(count).toList(growable: false)),
-      origin: origin,
-    );
-  }
-
   TimelineQuery remote(String ownerId, GroupAssetsBy groupBy) => _remoteQueryBuilder(
     filter: (row) =>
         row.deletedAt.isNull() & row.visibility.equalsValue(AssetVisibility.timeline) & row.ownerId.equals(ownerId),

mobile/lib/main.dart

@@ -42,7 +42,6 @@ import 'package:immich_mobile/utils/http_ssl_options.dart';
 import 'package:immich_mobile/utils/licenses.dart';
 import 'package:immich_mobile/utils/migration.dart';
 import 'package:immich_mobile/wm_executor.dart';
-import 'package:immich_ui/immich_ui.dart';
 import 'package:intl/date_symbol_data_local.dart';
 import 'package:logging/logging.dart';
 import 'package:timezone/data/latest.dart';
@@ -253,13 +252,6 @@ class ImmichAppState extends ConsumerState<ImmichApp> with WidgetsBindingObserve
         themeMode: ref.watch(immichThemeModeProvider),
         darkTheme: getThemeData(colorScheme: immichTheme.dark, locale: context.locale),
         theme: getThemeData(colorScheme: immichTheme.light, locale: context.locale),
-        builder: (context, child) => ImmichTranslationProvider(
-          translations: ImmichTranslations(
-            submit: "submit".t(context: context),
-            password: "password".t(context: context),
-          ),
-          child: ImmichThemeProvider(colorScheme: context.colorScheme, child: child!),
-        ),
         routerConfig: router.config(
           deepLinkBuilder: _deepLinkBuilder,
           navigatorObservers: () => [AppNavigationObserver(ref: ref)],

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

@@ -12,7 +12,6 @@ import 'package:immich_mobile/widgets/settings/asset_viewer_settings/asset_viewe
 import 'package:immich_mobile/widgets/settings/backup_settings/backup_settings.dart';
 import 'package:immich_mobile/widgets/settings/backup_settings/drift_backup_settings.dart';
 import 'package:immich_mobile/widgets/settings/beta_sync_settings/sync_status_and_actions.dart';
-import 'package:immich_mobile/widgets/settings/free_up_space_settings.dart';
 import 'package:immich_mobile/widgets/settings/language_settings.dart';
 import 'package:immich_mobile/widgets/settings/networking_settings/networking_settings.dart';
 import 'package:immich_mobile/widgets/settings/notification_setting.dart';
@@ -23,7 +22,6 @@ enum SettingSection {
   advanced('advanced', Icons.build_outlined, "advanced_settings_tile_subtitle"),
   assetViewer('asset_viewer_settings_title', Icons.image_outlined, "asset_viewer_settings_subtitle"),
   backup('backup', Icons.cloud_upload_outlined, "backup_settings_subtitle"),
-  freeUpSpace('free_up_space', Icons.cleaning_services_outlined, "free_up_space_settings_subtitle"),
   languages('language', Icons.language, "setting_languages_subtitle"),
   networking('networking_settings', Icons.wifi, "networking_subtitle"),
   notifications('notifications', Icons.notifications_none_rounded, "setting_notifications_subtitle"),
@@ -40,7 +38,6 @@ enum SettingSection {
     SettingSection.assetViewer => const AssetViewerSettings(),
     SettingSection.backup =>
       Store.tryGet(StoreKey.betaTimeline) ?? false ? const DriftBackupSettings() : const BackupSettings(),
-    SettingSection.freeUpSpace => const FreeUpSpaceSettings(),
     SettingSection.languages => const LanguageSettings(),
     SettingSection.networking => const NetworkingSettings(),
     SettingSection.notifications => const NotificationSetting(),

mobile/lib/pages/search/map/map.page.dart

@@ -370,7 +370,6 @@ class _MapWithMarker extends StatelessWidget {
                   ? PositionedAssetMarkerIcon(
                       point: value.point,
                       assetRemoteId: value.marker.assetRemoteId,
-                      assetThumbhash: '',
                       durationInMilliseconds: value.shouldAnimate ? 100 : 0,
                       onTap: onMarkerTapped,
                     )

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

@@ -1,42 +0,0 @@
-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/domain/models/timeline.model.dart';
-import 'package:immich_mobile/domain/services/timeline.service.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
-
-@RoutePage()
-class CleanupPreviewPage extends StatelessWidget {
-  final List<LocalAsset> assets;
-
-  const CleanupPreviewPage({super.key, required this.assets});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: Text('cleanup_preview_title'.t(context: context, args: {'count': assets.length.toString()})),
-        centerTitle: true,
-        elevation: 0,
-        scrolledUnderElevation: 0,
-        backgroundColor: context.colorScheme.surface,
-      ),
-      body: ProviderScope(
-        overrides: [
-          timelineServiceProvider.overrideWith((ref) {
-            final timelineService = ref
-                .watch(timelineFactoryProvider)
-                .fromAssetsWithBuckets(assets.cast<BaseAsset>(), TimelineOrigin.search);
-            ref.onDispose(timelineService.dispose);
-            return timelineService;
-          }),
-        ],
-        child: const Timeline(appBar: null, bottomSheet: null, groupBy: GroupAssetsBy.day, readOnly: true),
-      ),
-    );
-  }
-}

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

@@ -19,17 +19,6 @@ List<Widget> _showcaseBuilder(Function(ImmichVariant variant, ImmichColor color)
   return children;
 }
 
-class _ComponentTitle extends StatelessWidget {
-  final String title;
-
-  const _ComponentTitle(this.title);
-
-  @override
-  Widget build(BuildContext context) {
-    return Text(title, style: context.textTheme.titleLarge);
-  }
-}
-
 @RoutePage()
 class ImmichUIShowcasePage extends StatelessWidget {
   const ImmichUIShowcasePage({super.key});
@@ -46,51 +35,13 @@ class ImmichUIShowcasePage extends StatelessWidget {
             mainAxisAlignment: MainAxisAlignment.start,
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              const _ComponentTitle("IconButton"),
+              Text("IconButton", style: context.textTheme.titleLarge),
               ..._showcaseBuilder(
                 (variant, color) =>
-                    ImmichIconButton(icon: Icons.favorite, color: color, variant: variant, onPressed: () {}),
-              ),
-              const _ComponentTitle("CloseButton"),
-              ..._showcaseBuilder(
-                (variant, color) => ImmichCloseButton(color: color, variant: variant, onPressed: () {}),
-              ),
-              const _ComponentTitle("TextButton"),
-
-              ImmichTextButton(
-                labelText: "Text Button",
-                onPressed: () {},
-                variant: ImmichVariant.filled,
-                color: ImmichColor.primary,
-              ),
-              ImmichTextButton(
-                labelText: "Text Button",
-                onPressed: () {},
-                variant: ImmichVariant.filled,
-                color: ImmichColor.primary,
-                loading: true,
-              ),
-              ImmichTextButton(
-                labelText: "Text Button",
-                onPressed: () {},
-                variant: ImmichVariant.ghost,
-                color: ImmichColor.primary,
-              ),
-              ImmichTextButton(
-                labelText: "Text Button",
-                onPressed: () {},
-                variant: ImmichVariant.ghost,
-                color: ImmichColor.primary,
-                loading: true,
-              ),
-              const _ComponentTitle("Form"),
-              ImmichForm(
-                onSubmit: () {},
-                child: const Column(
-                  spacing: 10,
-                  children: [ImmichTextInput(label: "Title", hintText: "Enter a title")],
-                ),
+                    ImmichIconButton(icon: Icons.favorite, color: color, variant: variant, onTap: () {}),
               ),
+              Text("CloseButton", style: context.textTheme.titleLarge),
+              ..._showcaseBuilder((variant, color) => ImmichCloseButton(color: color, variant: variant, onTap: () {})),
             ],
           ),
         ),

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

@@ -37,7 +37,7 @@ class DriftCropImagePage extends HookWidget {
             icon: Icons.done_rounded,
             color: ImmichColor.primary,
             variant: ImmichVariant.ghost,
-            onPressed: () async {
+            onTap: () async {
               final croppedImage = await cropController.croppedImage();
               unawaited(context.pushRoute(DriftEditImageRoute(asset: asset, image: croppedImage, isEdited: true)));
             },
@@ -79,13 +79,13 @@ class DriftCropImagePage extends HookWidget {
                                   icon: Icons.rotate_left,
                                   variant: ImmichVariant.ghost,
                                   color: ImmichColor.secondary,
-                                  onPressed: () => cropController.rotateLeft(),
+                                  onTap: () => cropController.rotateLeft(),
                                 ),
                                 ImmichIconButton(
                                   icon: Icons.rotate_right,
                                   variant: ImmichVariant.ghost,
                                   color: ImmichColor.secondary,
-                                  onPressed: () => cropController.rotateRight(),
+                                  onTap: () => cropController.rotateRight(),
                                 ),
                               ],
                             ),

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

@@ -611,7 +611,6 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
       filterQuality: FilterQuality.high,
       maxScale: 1.0,
       basePosition: Alignment.center,
-      disableScaleGestures: true,
       child: SizedBox(
         width: ctx.width,
         height: ctx.height,

mobile/lib/presentation/widgets/asset_viewer/bottom_sheet/sheet_location_details.widget.dart

@@ -68,7 +68,7 @@ class _SheetLocationDetailsState extends ConsumerState<SheetLocationDetails> {
       return const SizedBox.shrink();
     }
 
-    final remoteAsset = asset as RemoteAsset;
+    final remoteId = asset is LocalAsset ? asset.remoteId : (asset as RemoteAsset).id;
     final locationName = _getLocationName(exifInfo);
     final coordinates = "${exifInfo?.latitude?.toStringAsFixed(4)}, ${exifInfo?.longitude?.toStringAsFixed(4)}";
 
@@ -92,12 +92,7 @@ class _SheetLocationDetailsState extends ConsumerState<SheetLocationDetails> {
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  ExifMap(
-                    exifInfo: exifInfo!,
-                    markerId: remoteAsset.id,
-                    markerAssetThumbhash: remoteAsset.thumbHash,
-                    onMapCreated: _onMapCreated,
-                  ),
+                  ExifMap(exifInfo: exifInfo!, markerId: remoteId, onMapCreated: _onMapCreated),
                   const SizedBox(height: 16),
                   if (locationName != null)
                     Padding(

mobile/lib/presentation/widgets/images/remote_image_provider.dart

@@ -10,7 +10,6 @@ import 'package:immich_mobile/presentation/widgets/images/one_frame_multi_image_
 import 'package:immich_mobile/providers/image/cache/remote_image_cache_manager.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
-import 'package:openapi/api.dart';
 
 class RemoteThumbProvider extends CancellableImageProvider<RemoteThumbProvider>
     with CancellableImageProviderMixin<RemoteThumbProvider> {
@@ -94,7 +93,7 @@ class RemoteFullImageProvider extends CancellableImageProvider<RemoteFullImagePr
 
     final headers = ApiService.getRequestHeaders();
     final request = this.request = RemoteImageRequest(
-      uri: getThumbnailUrlForRemoteId(key.assetId, type: AssetMediaSize.preview),
+      uri: getPreviewUrlForRemoteId(key.assetId),
       headers: headers,
       cacheManager: cacheManager,
     );

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

@@ -42,7 +42,6 @@ class Timeline extends StatelessWidget {
     this.withScrubber = true,
     this.snapToMonth = true,
     this.initialScrollOffset,
-    this.readOnly = false,
   });
 
   final Widget? topSliverWidget;
@@ -55,7 +54,6 @@ class Timeline extends StatelessWidget {
   final bool withScrubber;
   final bool snapToMonth;
   final double? initialScrollOffset;
-  final bool readOnly;
 
   @override
   Widget build(BuildContext context) {
@@ -75,7 +73,6 @@ class Timeline extends StatelessWidget {
                 groupBy: groupBy,
               ),
             ),
-            if (readOnly) readonlyModeProvider.overrideWith(() => _AlwaysReadOnlyNotifier()),
           ],
           child: _SliverTimeline(
             topSliverWidget: topSliverWidget,
@@ -92,17 +89,6 @@ class Timeline extends StatelessWidget {
   }
 }
 
-class _AlwaysReadOnlyNotifier extends ReadOnlyModeNotifier {
-  @override
-  bool build() => true;
-
-  @override
-  void setReadonlyMode(bool value) {}
-
-  @override
-  void toggleReadonlyMode() {}
-}
-
 class _SliverTimeline extends ConsumerStatefulWidget {
   const _SliverTimeline({
     this.topSliverWidget,

mobile/lib/providers/cleanup.provider.dart

@@ -1,106 +0,0 @@
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/services/cleanup.service.dart';
-
-class CleanupState {
-  final DateTime? selectedDate;
-  final List<LocalAsset> assetsToDelete;
-  final bool isScanning;
-  final bool isDeleting;
-  final AssetFilterType filterType;
-  final bool keepFavorites;
-
-  const CleanupState({
-    this.selectedDate,
-    this.assetsToDelete = const [],
-    this.isScanning = false,
-    this.isDeleting = false,
-    this.filterType = AssetFilterType.all,
-    this.keepFavorites = true,
-  });
-
-  CleanupState copyWith({
-    DateTime? selectedDate,
-    List<LocalAsset>? assetsToDelete,
-    bool? isScanning,
-    bool? isDeleting,
-    AssetFilterType? filterType,
-    bool? keepFavorites,
-  }) {
-    return CleanupState(
-      selectedDate: selectedDate ?? this.selectedDate,
-      assetsToDelete: assetsToDelete ?? this.assetsToDelete,
-      isScanning: isScanning ?? this.isScanning,
-      isDeleting: isDeleting ?? this.isDeleting,
-      filterType: filterType ?? this.filterType,
-      keepFavorites: keepFavorites ?? this.keepFavorites,
-    );
-  }
-}
-
-final cleanupProvider = StateNotifierProvider<CleanupNotifier, CleanupState>((ref) {
-  return CleanupNotifier(ref.watch(cleanupServiceProvider), ref.watch(currentUserProvider)?.id);
-});
-
-class CleanupNotifier extends StateNotifier<CleanupState> {
-  final CleanupService _cleanupService;
-  final String? _userId;
-
-  CleanupNotifier(this._cleanupService, this._userId) : super(const CleanupState());
-
-  void setSelectedDate(DateTime? date) {
-    state = state.copyWith(selectedDate: date, assetsToDelete: []);
-  }
-
-  void setFilterType(AssetFilterType filterType) {
-    state = state.copyWith(filterType: filterType, assetsToDelete: []);
-  }
-
-  void setKeepFavorites(bool keepFavorites) {
-    state = state.copyWith(keepFavorites: keepFavorites, assetsToDelete: []);
-  }
-
-  Future<void> scanAssets() async {
-    if (_userId == null || state.selectedDate == null) {
-      return;
-    }
-
-    state = state.copyWith(isScanning: true);
-    try {
-      final assets = await _cleanupService.getRemovalCandidates(
-        _userId,
-        state.selectedDate!,
-        filterType: state.filterType,
-        keepFavorites: state.keepFavorites,
-      );
-      state = state.copyWith(assetsToDelete: assets, isScanning: false);
-    } catch (e) {
-      state = state.copyWith(isScanning: false);
-      rethrow;
-    }
-  }
-
-  Future<int> deleteAssets() async {
-    if (state.assetsToDelete.isEmpty) {
-      return 0;
-    }
-
-    state = state.copyWith(isDeleting: true);
-    try {
-      final deletedCount = await _cleanupService.deleteLocalAssets(state.assetsToDelete.map((a) => a.id).toList());
-
-      state = state.copyWith(assetsToDelete: [], isDeleting: false);
-
-      return deletedCount;
-    } catch (e) {
-      state = state.copyWith(isDeleting: false);
-      rethrow;
-    }
-  }
-
-  void reset() {
-    state = const CleanupState();
-  }
-}

mobile/lib/routing/router.dart

@@ -88,7 +88,6 @@ import 'package:immich_mobile/presentation/pages/drift_album_options.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_archive.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_asset_selection_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_asset_troubleshoot.page.dart';
-import 'package:immich_mobile/presentation/pages/cleanup_preview.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_create_album.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_favorite.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_library.page.dart';
@@ -339,7 +338,6 @@ class AppRouter extends RootStackRouter {
     AutoRoute(page: AssetTroubleshootRoute.page, guards: [_authGuard, _duplicateGuard]),
     AutoRoute(page: DownloadInfoRoute.page, guards: [_authGuard, _duplicateGuard]),
     AutoRoute(page: ImmichUIShowcaseRoute.page, guards: [_authGuard, _duplicateGuard]),
-    AutoRoute(page: CleanupPreviewRoute.page, guards: [_authGuard, _duplicateGuard]),
     // required to handle all deeplinks in deep_link.service.dart
     // auto_route_library#1722
     RedirectRoute(path: '*', redirectTo: '/'),

mobile/lib/routing/router.gr.dart

@@ -611,43 +611,6 @@ class ChangePasswordRoute extends PageRouteInfo<void> {
   );
 }
 
-/// generated route for
-/// [CleanupPreviewPage]
-class CleanupPreviewRoute extends PageRouteInfo<CleanupPreviewRouteArgs> {
-  CleanupPreviewRoute({
-    Key? key,
-    required List<LocalAsset> assets,
-    List<PageRouteInfo>? children,
-  }) : super(
-         CleanupPreviewRoute.name,
-         args: CleanupPreviewRouteArgs(key: key, assets: assets),
-         initialChildren: children,
-       );
-
-  static const String name = 'CleanupPreviewRoute';
-
-  static PageInfo page = PageInfo(
-    name,
-    builder: (data) {
-      final args = data.argsAs<CleanupPreviewRouteArgs>();
-      return CleanupPreviewPage(key: args.key, assets: args.assets);
-    },
-  );
-}
-
-class CleanupPreviewRouteArgs {
-  const CleanupPreviewRouteArgs({this.key, required this.assets});
-
-  final Key? key;
-
-  final List<LocalAsset> assets;
-
-  @override
-  String toString() {
-    return 'CleanupPreviewRouteArgs{key: $key, assets: $assets}';
-  }
-}
-
 /// generated route for
 /// [CreateAlbumPage]
 class CreateAlbumRoute extends PageRouteInfo<CreateAlbumRouteArgs> {

mobile/lib/services/cleanup.service.dart

@@ -1,45 +0,0 @@
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
-import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:immich_mobile/repositories/asset_media.repository.dart';
-
-final cleanupServiceProvider = Provider<CleanupService>((ref) {
-  return CleanupService(ref.watch(localAssetRepository), ref.watch(assetMediaRepositoryProvider));
-});
-
-class CleanupService {
-  final DriftLocalAssetRepository _localAssetRepository;
-  final AssetMediaRepository _assetMediaRepository;
-
-  const CleanupService(this._localAssetRepository, this._assetMediaRepository);
-
-  Future<List<LocalAsset>> getRemovalCandidates(
-    String userId,
-    DateTime cutoffDate, {
-    AssetFilterType filterType = AssetFilterType.all,
-    bool keepFavorites = true,
-  }) {
-    return _localAssetRepository.getRemovalCandidates(
-      userId,
-      cutoffDate,
-      filterType: filterType,
-      keepFavorites: keepFavorites,
-    );
-  }
-
-  Future<int> deleteLocalAssets(List<String> localIds) async {
-    if (localIds.isEmpty) {
-      return 0;
-    }
-
-    final deletedIds = await _assetMediaRepository.deleteAll(localIds);
-    if (deletedIds.isNotEmpty) {
-      await _localAssetRepository.delete(deletedIds);
-      return deletedIds.length;
-    }
-
-    return 0;
-  }
-}

mobile/lib/utils/image_url_builder.dart

@@ -1,3 +1,4 @@
+import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
@@ -9,18 +10,14 @@ String getThumbnailUrl(final Asset asset, {AssetMediaSize type = AssetMediaSize.
 }
 
 String getThumbnailCacheKey(final Asset asset, {AssetMediaSize type = AssetMediaSize.thumbnail}) {
-  return getThumbnailCacheKeyForRemoteId(asset.remoteId!, asset.thumbhash!, type: type);
+  return getThumbnailCacheKeyForRemoteId(asset.remoteId!, type: type);
 }
 
-String getThumbnailCacheKeyForRemoteId(
-  final String id,
-  final String thumbhash, {
-  AssetMediaSize type = AssetMediaSize.thumbnail,
-}) {
+String getThumbnailCacheKeyForRemoteId(final String id, {AssetMediaSize type = AssetMediaSize.thumbnail}) {
   if (type == AssetMediaSize.thumbnail) {
-    return 'thumbnail-image-$id-$thumbhash';
+    return 'thumbnail-image-$id';
   } else {
-    return '${id}_${thumbhash}_previewStage';
+    return '${id}_previewStage';
   }
 }
 
@@ -35,25 +32,26 @@ String getAlbumThumbNailCacheKey(final Album album, {AssetMediaSize type = Asset
   if (album.thumbnail.value?.remoteId == null) {
     return '';
   }
-  return getThumbnailCacheKeyForRemoteId(
-    album.thumbnail.value!.remoteId!,
-    album.thumbnail.value!.thumbhash!,
-    type: type,
-  );
+  return getThumbnailCacheKeyForRemoteId(album.thumbnail.value!.remoteId!, type: type);
 }
 
-String getOriginalUrlForRemoteId(final String id, {bool edited = true}) {
-  return '${Store.get(StoreKey.serverEndpoint)}/assets/$id/original?edited=$edited';
+String getOriginalUrlForRemoteId(final String id) {
+  return '${Store.get(StoreKey.serverEndpoint)}/assets/$id/original';
 }
 
-String getThumbnailUrlForRemoteId(
-  final String id, {
-  AssetMediaSize type = AssetMediaSize.thumbnail,
-  bool edited = true,
-}) {
-  return '${Store.get(StoreKey.serverEndpoint)}/assets/$id/thumbnail?size=${type.value}&edited=$edited';
+String getImageCacheKey(final Asset asset) {
+  // Assets from response DTOs do not have an isar id, querying which would give us the default autoIncrement id
+  final isFromDto = asset.id == noDbId;
+  return '${isFromDto ? asset.remoteId : asset.id}_fullStage';
 }
 
+String getThumbnailUrlForRemoteId(final String id, {AssetMediaSize type = AssetMediaSize.thumbnail}) {
+  return '${Store.get(StoreKey.serverEndpoint)}/assets/$id/thumbnail?size=${type.value}';
+}
+
+String getPreviewUrlForRemoteId(final String id) =>
+    '${Store.get(StoreKey.serverEndpoint)}/assets/$id/thumbnail?size=${AssetMediaSize.preview}';
+
 String getPlaybackUrlForRemoteId(final String id) {
   return '${Store.get(StoreKey.serverEndpoint)}/assets/$id/video/playback?';
 }

mobile/lib/utils/migration.dart

@@ -31,7 +31,7 @@ import 'package:isar/isar.dart';
 // ignore: import_rule_photo_manager
 import 'package:photo_manager/photo_manager.dart';
 
-const int targetVersion = 20;
+const int targetVersion = 19;
 
 Future<void> migrateDatabaseIfNeeded(Isar db, Drift drift) async {
   final hasVersion = Store.tryGet(StoreKey.version) != null;
@@ -86,10 +86,6 @@ Future<void> migrateDatabaseIfNeeded(Isar db, Drift drift) async {
     }
   }
 
-  if (version < 20 && Store.isBetaTimelineEnabled) {
-    await _syncLocalAlbumIsIosSharedAlbum(drift);
-  }
-
   if (targetVersion >= 12) {
     await Store.put(StoreKey.version, targetVersion);
     return;
@@ -262,25 +258,6 @@ Future<bool> _populateLocalAssetTime(Drift db) async {
   }
 }
 
-Future<void> _syncLocalAlbumIsIosSharedAlbum(Drift db) async {
-  try {
-    final nativeApi = NativeSyncApi();
-    final albums = await nativeApi.getAlbums();
-    await db.batch((batch) {
-      for (final album in albums) {
-        batch.update(
-          db.localAlbumEntity,
-          LocalAlbumEntityCompanion(isIosSharedAlbum: Value(album.isCloud)),
-          where: (t) => t.id.equals(album.id),
-        );
-      }
-    });
-    dPrint(() => "[MIGRATION] Successfully updated isIosSharedAlbum for ${albums.length} albums");
-  } catch (error) {
-    dPrint(() => "[MIGRATION] Error while syncing local album isIosSharedAlbum: $error");
-  }
-}
-
 Future<void> migrateDeviceAssetToSqlite(Isar db, Drift drift) async {
   try {
     final isarDeviceAssets = await db.deviceAssetEntitys.where().findAll();

mobile/lib/widgets/asset_viewer/detail_panel/asset_location.dart

@@ -74,7 +74,7 @@ class AssetLocation extends HookConsumerWidget {
             ],
           ),
           asset.isRemote ? const SizedBox.shrink() : const SizedBox(height: 16),
-          ExifMap(exifInfo: exifInfo!, markerId: asset.remoteId, markerAssetThumbhash: asset.thumbhash),
+          ExifMap(exifInfo: exifInfo!, markerId: asset.remoteId),
           const SizedBox(height: 16),
           getLocationName(),
           Text(

mobile/lib/widgets/asset_viewer/detail_panel/exif_map.dart

@@ -10,20 +10,10 @@ import 'package:url_launcher/url_launcher.dart';
 
 class ExifMap extends StatelessWidget {
   final ExifInfo exifInfo;
-  // TODO: Pass in a BaseAsset instead of the ID and thumbhash when removing old timeline
-  // This is currently structured this way because of the old timeline implementation
-  // reusing this component
   final String? markerId;
-  final String? markerAssetThumbhash;
   final MapCreatedCallback? onMapCreated;
 
-  const ExifMap({
-    super.key,
-    required this.exifInfo,
-    this.markerAssetThumbhash,
-    this.markerId = 'marker',
-    this.onMapCreated,
-  });
+  const ExifMap({super.key, required this.exifInfo, this.markerId = 'marker', this.onMapCreated});
 
   @override
   Widget build(BuildContext context) {
@@ -71,7 +61,6 @@ class ExifMap extends StatelessWidget {
           width: constraints.maxWidth,
           zoom: 12.0,
           assetMarkerRemoteId: markerId,
-          assetThumbhash: markerAssetThumbhash,
           onTap: (tapPosition, latLong) async {
             Uri? uri = await createCoordinatesUri();
 

mobile/lib/widgets/backup/drift_album_info_list_tile.dart

@@ -4,7 +4,6 @@ import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
 import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
@@ -42,13 +41,6 @@ class DriftAlbumInfoListTile extends HookConsumerWidget {
       return Icon(Icons.circle, color: context.colorScheme.surfaceContainerHighest);
     }
 
-    Widget buildSubtitle() {
-      return Text(
-        album.isIosSharedAlbum ? '${album.assetCount} (iCloud Shared Album)' : album.assetCount.toString(),
-        style: context.textTheme.labelLarge?.copyWith(color: context.colorScheme.onSurfaceSecondary),
-      );
-    }
-
     return GestureDetector(
       onDoubleTap: () {
         ref.watch(hapticFeedbackProvider.notifier).selectionClick();
@@ -81,8 +73,8 @@ class DriftAlbumInfoListTile extends HookConsumerWidget {
           }
         },
         leading: buildIcon(),
-        title: Text(album.name, style: context.textTheme.titleSmall),
-        subtitle: buildSubtitle(),
+        title: Text(album.name, style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)),
+        subtitle: Text(album.assetCount.toString()),
         trailing: IconButton(
           onPressed: () {
             context.pushRoute(LocalTimelineRoute(album: album));

mobile/lib/widgets/forms/login/login_form.dart

@@ -14,7 +14,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup.provider.dart';
@@ -30,7 +29,12 @@ import 'package:immich_mobile/utils/version_compatibility.dart';
 import 'package:immich_mobile/widgets/common/immich_logo.dart';
 import 'package:immich_mobile/widgets/common/immich_title_text.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
-import 'package:immich_ui/immich_ui.dart';
+import 'package:immich_mobile/widgets/forms/login/email_input.dart';
+import 'package:immich_mobile/widgets/forms/login/loading_icon.dart';
+import 'package:immich_mobile/widgets/forms/login/login_button.dart';
+import 'package:immich_mobile/widgets/forms/login/o_auth_login_button.dart';
+import 'package:immich_mobile/widgets/forms/login/password_input.dart';
+import 'package:immich_mobile/widgets/forms/login/server_endpoint_input.dart';
 import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
 import 'package:package_info_plus/package_info_plus.dart';
@@ -41,33 +45,16 @@ class LoginForm extends HookConsumerWidget {
 
   final log = Logger('LoginForm');
 
-  String? _validateUrl(String? url) {
-    if (url == null || url.isEmpty) return null;
-
-    final parsedUrl = Uri.tryParse(url);
-    if (parsedUrl == null || !parsedUrl.isAbsolute || !parsedUrl.scheme.startsWith("http") || parsedUrl.host.isEmpty) {
-      return 'login_form_err_invalid_url'.tr();
-    }
-
-    return null;
-  }
-
-  String? _validateEmail(String? email) {
-    if (email == null || email == '') return null;
-    if (email.endsWith(' ')) return 'login_form_err_trailing_whitespace'.tr();
-    if (email.startsWith(' ')) return 'login_form_err_leading_whitespace'.tr();
-    if (email.contains(' ') || !email.contains('@')) {
-      return 'login_form_err_invalid_email'.tr();
-    }
-    return null;
-  }
-
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final emailController = useTextEditingController.fromValue(TextEditingValue.empty);
     final passwordController = useTextEditingController.fromValue(TextEditingValue.empty);
     final serverEndpointController = useTextEditingController.fromValue(TextEditingValue.empty);
+    final emailFocusNode = useFocusNode();
     final passwordFocusNode = useFocusNode();
+    final serverEndpointFocusNode = useFocusNode();
+    final isLoading = useState<bool>(false);
+    final isLoadingServer = useState<bool>(false);
     final isOauthEnable = useState<bool>(false);
     final isPasswordLoginEnable = useState<bool>(false);
     final oAuthButtonLabel = useState<String>('OAuth');
@@ -109,6 +96,7 @@ class LoginForm extends HookConsumerWidget {
       }
 
       try {
+        isLoadingServer.value = true;
         final endpoint = await ref.read(authProvider.notifier).validateServerUrl(serverUrl);
 
         // Fetch and load server config and features
@@ -132,6 +120,7 @@ class LoginForm extends HookConsumerWidget {
         );
         isOauthEnable.value = false;
         isPasswordLoginEnable.value = true;
+        isLoadingServer.value = false;
       } on HandshakeException {
         ImmichToast.show(
           context: context,
@@ -141,6 +130,7 @@ class LoginForm extends HookConsumerWidget {
         );
         isOauthEnable.value = false;
         isPasswordLoginEnable.value = true;
+        isLoadingServer.value = false;
       } catch (e) {
         ImmichToast.show(
           context: context,
@@ -150,7 +140,10 @@ class LoginForm extends HookConsumerWidget {
         );
         isOauthEnable.value = false;
         isPasswordLoginEnable.value = true;
+        isLoadingServer.value = false;
       }
+
+      isLoadingServer.value = false;
     }
 
     useEffect(() {
@@ -237,6 +230,8 @@ class LoginForm extends HookConsumerWidget {
     login() async {
       TextInput.finishAutofillContext();
 
+      isLoading.value = true;
+
       // Invalidate all api repository provider instance to take into account new access token
       invalidateAllApiRepositoryProviders(ref);
 
@@ -266,6 +261,8 @@ class LoginForm extends HookConsumerWidget {
           toastType: ToastType.error,
           gravity: ToastGravity.TOP,
         );
+      } finally {
+        isLoading.value = false;
       }
     }
 
@@ -309,6 +306,8 @@ class LoginForm extends HookConsumerWidget {
           codeChallenge,
         );
 
+        isLoading.value = true;
+
         // Invalidate all api repository provider instance to take into account new access token
         invalidateAllApiRepositoryProviders(ref);
       } catch (error, stack) {
@@ -320,6 +319,7 @@ class LoginForm extends HookConsumerWidget {
           toastType: ToastType.error,
           gravity: ToastGravity.TOP,
         );
+        isLoading.value = false;
         return;
       }
 
@@ -338,6 +338,7 @@ class LoginForm extends HookConsumerWidget {
               .saveAuthInfo(accessToken: loginResponseDto.accessToken);
 
           if (isSuccess) {
+            isLoading.value = false;
             final permission = ref.watch(galleryPermissionNotifier);
             final isBeta = Store.isBetaTimelineEnabled;
             if (!isBeta && (permission.isGranted || permission.isLimited)) {
@@ -363,7 +364,9 @@ class LoginForm extends HookConsumerWidget {
             toastType: ToastType.error,
             gravity: ToastGravity.TOP,
           );
-        } finally {}
+        } finally {
+          isLoading.value = false;
+        }
       } else {
         ImmichToast.show(
           context: context,
@@ -371,10 +374,66 @@ class LoginForm extends HookConsumerWidget {
           toastType: ToastType.info,
           gravity: ToastGravity.TOP,
         );
+        isLoading.value = false;
         return;
       }
     }
 
+    buildSelectServer() {
+      const buttonRadius = 25.0;
+      return Column(
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          ServerEndpointInput(
+            controller: serverEndpointController,
+            focusNode: serverEndpointFocusNode,
+            onSubmit: getServerAuthSettings,
+          ),
+          const SizedBox(height: 18),
+          Row(
+            children: [
+              Expanded(
+                child: ElevatedButton.icon(
+                  style: ElevatedButton.styleFrom(
+                    padding: const EdgeInsets.symmetric(vertical: 12),
+                    shape: const RoundedRectangleBorder(
+                      borderRadius: BorderRadius.only(
+                        topLeft: Radius.circular(buttonRadius),
+                        bottomLeft: Radius.circular(buttonRadius),
+                      ),
+                    ),
+                  ),
+                  onPressed: () => context.pushRoute(const SettingsRoute()),
+                  icon: const Icon(Icons.settings_rounded),
+                  label: const Text(""),
+                ),
+              ),
+              const SizedBox(width: 1),
+              Expanded(
+                flex: 3,
+                child: ElevatedButton.icon(
+                  style: ElevatedButton.styleFrom(
+                    padding: const EdgeInsets.symmetric(vertical: 12),
+                    shape: const RoundedRectangleBorder(
+                      borderRadius: BorderRadius.only(
+                        topRight: Radius.circular(buttonRadius),
+                        bottomRight: Radius.circular(buttonRadius),
+                      ),
+                    ),
+                  ),
+                  onPressed: isLoadingServer.value ? null : getServerAuthSettings,
+                  icon: const Icon(Icons.arrow_forward_rounded),
+                  label: const Text('next', style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold)).tr(),
+                ),
+              ),
+            ],
+          ),
+          const SizedBox(height: 18),
+          if (isLoadingServer.value) const LoadingIcon(),
+        ],
+      );
+    }
+
     buildVersionCompatWarning() {
       checkVersionMismatch();
 
@@ -396,102 +455,66 @@ class LoginForm extends HookConsumerWidget {
       );
     }
 
-    final serverSelectionOrLogin = serverEndpoint.value == null
-        ? Padding(
-            padding: const EdgeInsets.only(top: ImmichSpacing.md),
-            child: Column(
-              mainAxisSize: MainAxisSize.max,
-              children: [
-                ImmichForm(
-                  submitText: 'next'.t(context: context),
-                  submitIcon: Icons.arrow_forward_rounded,
-                  onSubmit: getServerAuthSettings,
-                  child: ImmichTextInput(
-                    controller: serverEndpointController,
-                    label: 'login_form_endpoint_url'.t(context: context),
-                    hintText: 'login_form_endpoint_hint'.t(context: context),
-                    validator: _validateUrl,
-                    keyboardAction: TextInputAction.next,
-                    keyboardType: TextInputType.url,
-                    autofillHints: const [AutofillHints.url],
-                    onSubmit: (ctx, _) => ImmichForm.of(ctx).submit(),
-                  ),
-                ),
-                ImmichTextButton(
-                  labelText: 'settings'.t(context: context),
-                  icon: Icons.settings,
-                  variant: ImmichVariant.ghost,
-                  onPressed: () => context.pushRoute(const SettingsRoute()),
-                ),
-              ],
+    buildLogin() {
+      return AutofillGroup(
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            buildVersionCompatWarning(),
+            Text(
+              sanitizeUrl(serverEndpointController.text),
+              style: context.textTheme.displaySmall,
+              textAlign: TextAlign.center,
             ),
-          )
-        : AutofillGroup(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.stretch,
-              mainAxisSize: MainAxisSize.max,
-              children: [
-                buildVersionCompatWarning(),
-                Padding(
-                  padding: const EdgeInsets.only(bottom: ImmichSpacing.md),
-                  child: Text(
-                    sanitizeUrl(serverEndpointController.text),
-                    style: context.textTheme.displaySmall,
-                    textAlign: TextAlign.center,
-                  ),
-                ),
-                if (isPasswordLoginEnable.value)
-                  ImmichForm(
-                    submitText: 'login'.t(context: context),
-                    submitIcon: Icons.login_rounded,
-                    onSubmit: login,
-                    child: Column(
-                      spacing: ImmichSpacing.md,
-                      children: [
-                        ImmichTextInput(
-                          controller: emailController,
-                          label: 'email'.t(context: context),
-                          hintText: 'login_form_email_hint'.t(context: context),
-                          validator: _validateEmail,
-                          keyboardAction: TextInputAction.next,
-                          keyboardType: TextInputType.emailAddress,
-                          autofillHints: const [AutofillHints.email],
-                          onSubmit: (_, _) => passwordFocusNode.requestFocus(),
-                        ),
-                        ImmichPasswordInput(
-                          controller: passwordController,
-                          focusNode: passwordFocusNode,
-                          label: 'password'.t(context: context),
-                          hintText: 'login_form_password_hint'.t(context: context),
-                          keyboardAction: TextInputAction.go,
-                          onSubmit: (ctx, _) => ImmichForm.of(ctx).submit(),
+            if (isPasswordLoginEnable.value) ...[
+              const SizedBox(height: 18),
+              EmailInput(
+                controller: emailController,
+                focusNode: emailFocusNode,
+                onSubmit: passwordFocusNode.requestFocus,
+              ),
+              const SizedBox(height: 8),
+              PasswordInput(controller: passwordController, focusNode: passwordFocusNode, onSubmit: login),
+            ],
+
+            // Note: This used to have an AnimatedSwitcher, but was removed
+            // because of https://github.com/flutter/flutter/issues/120874
+            isLoading.value
+                ? const LoadingIcon()
+                : Column(
+                    crossAxisAlignment: CrossAxisAlignment.stretch,
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      const SizedBox(height: 18),
+                      if (isPasswordLoginEnable.value) LoginButton(onPressed: login),
+                      if (isOauthEnable.value) ...[
+                        if (isPasswordLoginEnable.value)
+                          Padding(
+                            padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                            child: Divider(color: context.isDarkTheme ? Colors.white : Colors.black),
+                          ),
+                        OAuthLoginButton(
+                          serverEndpointController: serverEndpointController,
+                          buttonLabel: oAuthButtonLabel.value,
+                          isLoading: isLoading,
+                          onPressed: oAuthLogin,
                         ),
                       ],
-                    ),
+                    ],
                   ),
-                if (isOauthEnable.value)
-                  ImmichForm(
-                    submitText: oAuthButtonLabel.value,
-                    submitIcon: Icons.pin_outlined,
-                    onSubmit: oAuthLogin,
-                    child: isPasswordLoginEnable.value
-                        ? Padding(
-                            padding: const EdgeInsets.only(left: 18.0, right: 18.0, top: 12.0),
-                            child: Divider(color: context.isDarkTheme ? Colors.white : Colors.black, height: 5),
-                          )
-                        : const SizedBox.shrink(),
-                  ),
-                if (!isOauthEnable.value && !isPasswordLoginEnable.value)
-                  Center(child: const Text('login_disabled').tr()),
-                ImmichTextButton(
-                  labelText: 'back'.t(context: context),
-                  icon: Icons.arrow_back,
-                  variant: ImmichVariant.ghost,
-                  onPressed: () => serverEndpoint.value = null,
-                ),
-              ],
+            if (!isOauthEnable.value && !isPasswordLoginEnable.value) Center(child: const Text('login_disabled').tr()),
+            const SizedBox(height: 12),
+            TextButton.icon(
+              icon: const Icon(Icons.arrow_back),
+              onPressed: () => serverEndpoint.value = null,
+              label: const Text('back').tr(),
             ),
-          );
+          ],
+        ),
+      );
+    }
+
+    final serverSelectionOrLogin = serverEndpoint.value == null ? buildSelectServer() : buildLogin();
 
     return LayoutBuilder(
       builder: (context, constraints) {

mobile/lib/widgets/forms/login/o_auth_login_button.dart

@@ -0,0 +1,31 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+
+class OAuthLoginButton extends ConsumerWidget {
+  final TextEditingController serverEndpointController;
+  final ValueNotifier<bool> isLoading;
+  final String buttonLabel;
+  final Function() onPressed;
+
+  const OAuthLoginButton({
+    super.key,
+    required this.serverEndpointController,
+    required this.isLoading,
+    required this.buttonLabel,
+    required this.onPressed,
+  });
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return ElevatedButton.icon(
+      style: ElevatedButton.styleFrom(
+        backgroundColor: context.primaryColor.withAlpha(230),
+        padding: const EdgeInsets.symmetric(vertical: 12),
+      ),
+      onPressed: onPressed,
+      icon: const Icon(Icons.pin_rounded),
+      label: Text(buttonLabel, style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)),
+    );
+  }
+}

mobile/lib/widgets/forms/login/password_input.dart

@@ -0,0 +1,37 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+class PasswordInput extends HookConsumerWidget {
+  final TextEditingController controller;
+  final FocusNode? focusNode;
+  final Function()? onSubmit;
+
+  const PasswordInput({super.key, required this.controller, this.focusNode, this.onSubmit});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final isPasswordVisible = useState<bool>(false);
+
+    return TextFormField(
+      obscureText: !isPasswordVisible.value,
+      controller: controller,
+      decoration: InputDecoration(
+        labelText: 'password'.tr(),
+        border: const OutlineInputBorder(),
+        hintText: 'login_form_password_hint'.tr(),
+        hintStyle: const TextStyle(fontWeight: FontWeight.normal, fontSize: 14),
+        suffixIcon: IconButton(
+          onPressed: () => isPasswordVisible.value = !isPasswordVisible.value,
+          icon: Icon(isPasswordVisible.value ? Icons.visibility_off_sharp : Icons.visibility_sharp),
+        ),
+      ),
+      autofillHints: const [AutofillHints.password],
+      keyboardType: TextInputType.text,
+      onFieldSubmitted: (_) => onSubmit?.call(),
+      focusNode: focusNode,
+      textInputAction: TextInputAction.go,
+    );
+  }
+}

mobile/lib/widgets/forms/login/server_endpoint_input.dart

@@ -0,0 +1,46 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/utils/url_helper.dart';
+
+class ServerEndpointInput extends StatelessWidget {
+  final TextEditingController controller;
+  final FocusNode focusNode;
+  final Function()? onSubmit;
+
+  const ServerEndpointInput({super.key, required this.controller, required this.focusNode, this.onSubmit});
+
+  String? _validateInput(String? url) {
+    if (url == null || url.isEmpty) return null;
+
+    final parsedUrl = Uri.tryParse(sanitizeUrl(url));
+    if (parsedUrl == null || !parsedUrl.isAbsolute || !parsedUrl.scheme.startsWith("http") || parsedUrl.host.isEmpty) {
+      return 'login_form_err_invalid_url'.tr();
+    }
+
+    return null;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.only(top: 16.0),
+      child: TextFormField(
+        controller: controller,
+        decoration: InputDecoration(
+          labelText: 'login_form_endpoint_url'.tr(),
+          border: const OutlineInputBorder(),
+          hintText: 'login_form_endpoint_hint'.tr(),
+          errorMaxLines: 4,
+        ),
+        validator: _validateInput,
+        autovalidateMode: AutovalidateMode.always,
+        focusNode: focusNode,
+        autofillHints: const [AutofillHints.url],
+        keyboardType: TextInputType.url,
+        autocorrect: false,
+        onFieldSubmitted: (_) => onSubmit?.call(),
+        textInputAction: TextInputAction.go,
+      ),
+    );
+  }
+}

mobile/lib/widgets/map/map_thumbnail.dart

@@ -19,7 +19,6 @@ class MapThumbnail extends HookConsumerWidget {
   final Function(Point<double>, LatLng)? onTap;
   final LatLng centre;
   final String? assetMarkerRemoteId;
-  final String? assetThumbhash;
   final bool showMarkerPin;
   final double zoom;
   final double height;
@@ -36,7 +35,6 @@ class MapThumbnail extends HookConsumerWidget {
     this.onTap,
     this.zoom = 8,
     this.assetMarkerRemoteId,
-    this.assetThumbhash,
     this.showMarkerPin = false,
     this.themeMode,
     this.showAttribution = true,
@@ -111,13 +109,8 @@ class MapThumbnail extends HookConsumerWidget {
               ),
               ValueListenableBuilder(
                 valueListenable: position,
-                builder: (_, value, __) => value != null && assetMarkerRemoteId != null && assetThumbhash != null
-                    ? PositionedAssetMarkerIcon(
-                        size: height / 2,
-                        point: value,
-                        assetRemoteId: assetMarkerRemoteId!,
-                        assetThumbhash: assetThumbhash!,
-                      )
+                builder: (_, value, __) => value != null && assetMarkerRemoteId != null
+                    ? PositionedAssetMarkerIcon(size: height / 2, point: value, assetRemoteId: assetMarkerRemoteId!)
                     : const SizedBox.shrink(),
               ),
             ],

mobile/lib/widgets/map/positioned_asset_marker_icon.dart

@@ -10,7 +10,6 @@ import 'package:immich_mobile/utils/image_url_builder.dart';
 class PositionedAssetMarkerIcon extends StatelessWidget {
   final Point<num> point;
   final String assetRemoteId;
-  final String assetThumbhash;
   final double size;
   final int durationInMilliseconds;
 
@@ -19,7 +18,6 @@ class PositionedAssetMarkerIcon extends StatelessWidget {
   const PositionedAssetMarkerIcon({
     required this.point,
     required this.assetRemoteId,
-    required this.assetThumbhash,
     this.size = 100,
     this.durationInMilliseconds = 100,
     this.onTap,
@@ -37,7 +35,7 @@ class PositionedAssetMarkerIcon extends StatelessWidget {
         onTap: () => onTap?.call(),
         child: SizedBox.square(
           dimension: size,
-          child: _AssetMarkerIcon(id: assetRemoteId, thumbhash: assetThumbhash, key: Key(assetRemoteId)),
+          child: _AssetMarkerIcon(id: assetRemoteId, key: Key(assetRemoteId)),
         ),
       ),
     );
@@ -45,15 +43,14 @@ class PositionedAssetMarkerIcon extends StatelessWidget {
 }
 
 class _AssetMarkerIcon extends StatelessWidget {
-  const _AssetMarkerIcon({required this.id, required this.thumbhash, super.key});
+  const _AssetMarkerIcon({required this.id, super.key});
 
   final String id;
-  final String thumbhash;
 
   @override
   Widget build(BuildContext context) {
     final imageUrl = getThumbnailUrlForRemoteId(id);
-    final cacheKey = getThumbnailCacheKeyForRemoteId(id, thumbhash);
+    final cacheKey = getThumbnailCacheKeyForRemoteId(id);
     return LayoutBuilder(
       builder: (context, constraints) {
         return Stack(

mobile/lib/widgets/settings/free_up_space_settings.dart

@@ -1,702 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/platform_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/providers/cleanup.provider.dart';
-import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
-
-class FreeUpSpaceSettings extends ConsumerStatefulWidget {
-  const FreeUpSpaceSettings({super.key});
-
-  @override
-  ConsumerState<FreeUpSpaceSettings> createState() => _FreeUpSpaceSettingsState();
-}
-
-class _FreeUpSpaceSettingsState extends ConsumerState<FreeUpSpaceSettings> {
-  CleanupStep _currentStep = CleanupStep.selectDate;
-  bool _hasScanned = false;
-
-  void _resetState() {
-    ref.read(cleanupProvider.notifier).reset();
-    _hasScanned = false;
-  }
-
-  CleanupStep get _calculatedStep {
-    final state = ref.read(cleanupProvider);
-
-    if (state.assetsToDelete.isNotEmpty) {
-      return CleanupStep.delete;
-    }
-
-    if (state.selectedDate != null) {
-      return CleanupStep.filterOptions;
-    }
-
-    return CleanupStep.selectDate;
-  }
-
-  void _goToFiltersStep() {
-    ref.read(hapticFeedbackProvider.notifier).mediumImpact();
-    setState(() => _currentStep = CleanupStep.filterOptions);
-  }
-
-  void _goToScanStep() {
-    ref.read(hapticFeedbackProvider.notifier).mediumImpact();
-    setState(() => _currentStep = CleanupStep.scan);
-  }
-
-  void _setPresetDate(int daysAgo) {
-    ref.read(hapticFeedbackProvider.notifier).mediumImpact();
-    final date = DateTime.now().subtract(Duration(days: daysAgo));
-    ref.read(cleanupProvider.notifier).setSelectedDate(date);
-    setState(() => _hasScanned = false);
-  }
-
-  bool _isPresetSelected(int? daysAgo) {
-    final state = ref.read(cleanupProvider);
-    if (state.selectedDate == null) return false;
-
-    final expectedDate = daysAgo != null ? DateTime.now().subtract(Duration(days: daysAgo)) : DateTime(2000);
-
-    // Check if dates match (ignoring time component)
-    return state.selectedDate!.year == expectedDate.year &&
-        state.selectedDate!.month == expectedDate.month &&
-        state.selectedDate!.day == expectedDate.day;
-  }
-
-  Future<void> _selectDate() async {
-    final state = ref.read(cleanupProvider);
-    ref.read(hapticFeedbackProvider.notifier).mediumImpact();
-
-    final DateTime? picked = await showDatePicker(
-      context: context,
-      initialDate: state.selectedDate ?? DateTime.now(),
-      firstDate: DateTime(2000),
-      lastDate: DateTime.now(),
-    );
-
-    if (picked != null) {
-      ref.read(cleanupProvider.notifier).setSelectedDate(picked);
-    }
-  }
-
-  Future<void> _scanAssets() async {
-    ref.read(hapticFeedbackProvider.notifier).mediumImpact();
-
-    await ref.read(cleanupProvider.notifier).scanAssets();
-    final state = ref.read(cleanupProvider);
-
-    setState(() {
-      _hasScanned = true;
-      if (state.assetsToDelete.isNotEmpty) {
-        _currentStep = CleanupStep.delete;
-      }
-    });
-  }
-
-  Future<void> _deleteAssets() async {
-    final state = ref.read(cleanupProvider);
-
-    if (state.assetsToDelete.isEmpty || state.selectedDate == null) {
-      return;
-    }
-
-    ref.read(hapticFeedbackProvider.notifier).mediumImpact();
-    final confirmed = await showDialog<bool>(
-      context: context,
-      builder: (ctx) =>
-          _DeleteConfirmationDialog(assetCount: state.assetsToDelete.length, cutoffDate: state.selectedDate!),
-    );
-
-    if (confirmed != true) {
-      return;
-    }
-
-    final deletedCount = await ref.read(cleanupProvider.notifier).deleteAssets();
-
-    if (mounted && deletedCount > 0) {
-      ref.read(hapticFeedbackProvider.notifier).heavyImpact();
-
-      await showDialog<void>(
-        context: context,
-        builder: (ctx) => _DeleteSuccessDialog(deletedCount: deletedCount),
-      );
-    }
-
-    setState(() => _currentStep = CleanupStep.selectDate);
-  }
-
-  void _showAssetsPreview(List<LocalAsset> assets) {
-    ref.read(hapticFeedbackProvider.notifier).mediumImpact();
-    context.pushRoute(CleanupPreviewRoute(assets: assets));
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final state = ref.watch(cleanupProvider);
-    final hasDate = state.selectedDate != null;
-    final hasAssets = _hasScanned && state.assetsToDelete.isNotEmpty;
-
-    StepStyle styleForState(StepState stepState, {bool isDestructive = false}) {
-      switch (stepState) {
-        case StepState.complete:
-          return StepStyle(
-            color: context.colorScheme.primary,
-            indexStyle: TextStyle(color: context.colorScheme.onPrimary, fontWeight: FontWeight.w500),
-          );
-        case StepState.disabled:
-          return StepStyle(
-            color: context.colorScheme.onSurface.withValues(alpha: 0.38),
-            indexStyle: TextStyle(color: context.colorScheme.surface, fontWeight: FontWeight.w500),
-          );
-        case StepState.indexed:
-        case StepState.editing:
-        case StepState.error:
-          if (isDestructive) {
-            return StepStyle(
-              color: context.colorScheme.error,
-              indexStyle: TextStyle(color: context.colorScheme.onError, fontWeight: FontWeight.w500),
-            );
-          }
-          return StepStyle(
-            color: context.colorScheme.onSurface.withValues(alpha: 0.6),
-            indexStyle: TextStyle(color: context.colorScheme.surface, fontWeight: FontWeight.w500),
-          );
-      }
-    }
-
-    final step1State = hasDate ? StepState.complete : StepState.indexed;
-    final step2State = hasDate ? StepState.complete : StepState.disabled;
-    final step3State = hasAssets
-        ? StepState.complete
-        : hasDate
-        ? StepState.indexed
-        : StepState.disabled;
-    final step4State = hasAssets ? StepState.indexed : StepState.disabled;
-
-    String getFilterSubtitle() {
-      final parts = <String>[];
-      switch (state.filterType) {
-        case AssetFilterType.all:
-          parts.add('all'.t(context: context));
-        case AssetFilterType.photosOnly:
-          parts.add('photos_only'.t(context: context));
-        case AssetFilterType.videosOnly:
-          parts.add('videos_only'.t(context: context));
-      }
-      if (state.keepFavorites) {
-        parts.add('keep_favorites'.t(context: context));
-      }
-      return parts.join(' • ');
-    }
-
-    return PopScope(
-      onPopInvokedWithResult: (didPop, result) {
-        if (didPop) {
-          _resetState();
-        }
-      },
-      child: SingleChildScrollView(
-        child: Column(
-          children: [
-            Padding(
-              padding: const EdgeInsets.all(16.0),
-              child: Container(
-                padding: const EdgeInsets.all(16),
-                decoration: BoxDecoration(
-                  color: context.colorScheme.surfaceContainerLow,
-                  borderRadius: const BorderRadius.all(Radius.circular(12)),
-                  border: Border.all(color: context.primaryColor.withValues(alpha: 0.25)),
-                ),
-                child: Text(
-                  'free_up_space_description'.t(context: context),
-                  style: context.textTheme.labelLarge?.copyWith(fontSize: 15),
-                ),
-              ),
-            ),
-
-            Stepper(
-              physics: const NeverScrollableScrollPhysics(),
-              currentStep: _currentStep.index,
-              onStepTapped: (step) {
-                // Only allow going back or to completed steps
-                if (step <= _calculatedStep.index) {
-                  setState(() => _currentStep = CleanupStep.values[step]);
-                }
-              },
-              controlsBuilder: (_, __) => const SizedBox.shrink(),
-              steps: [
-                // Step 1: Select Cutoff Date
-                Step(
-                  stepStyle: styleForState(step1State),
-                  title: Text(
-                    'select_cutoff_date'.t(context: context),
-                    style: context.textTheme.titleMedium?.copyWith(
-                      fontWeight: FontWeight.w600,
-                      color: step1State == StepState.complete
-                          ? context.colorScheme.primary
-                          : context.colorScheme.onSurface,
-                    ),
-                  ),
-                  subtitle: hasDate
-                      ? Text(
-                          DateFormat.yMMMd().format(state.selectedDate!),
-                          style: context.textTheme.bodyMedium?.copyWith(
-                            color: context.colorScheme.primary,
-                            fontWeight: FontWeight.w500,
-                          ),
-                        )
-                      : null,
-                  content: Column(
-                    crossAxisAlignment: CrossAxisAlignment.stretch,
-                    children: [
-                      Text('cutoff_date_description'.t(context: context), style: context.textTheme.labelLarge),
-                      const SizedBox(height: 16),
-                      GridView.count(
-                        shrinkWrap: true,
-                        physics: const NeverScrollableScrollPhysics(),
-                        crossAxisCount: 3,
-                        mainAxisSpacing: 8,
-                        crossAxisSpacing: 8,
-                        childAspectRatio: 1.4,
-                        children: [
-                          _DatePresetCard(
-                            value: '30',
-                            unit: 'cutoff_day'.t(context: context, args: {'count': '30'}),
-                            onTap: () => _setPresetDate(30),
-                            isSelected: _isPresetSelected(30),
-                          ),
-                          _DatePresetCard(
-                            value: '60',
-                            unit: 'cutoff_day'.t(context: context, args: {'count': '60'}),
-
-                            onTap: () => _setPresetDate(60),
-                            isSelected: _isPresetSelected(60),
-                          ),
-                          _DatePresetCard(
-                            value: '90',
-                            unit: 'cutoff_day'.t(context: context, args: {'count': '90'}),
-
-                            onTap: () => _setPresetDate(90),
-                            isSelected: _isPresetSelected(90),
-                          ),
-                          _DatePresetCard(
-                            value: '1',
-                            unit: 'cutoff_year'.t(context: context, args: {'count': '1'}),
-                            onTap: () => _setPresetDate(365),
-                            isSelected: _isPresetSelected(365),
-                          ),
-                          _DatePresetCard(
-                            value: '2',
-                            unit: 'cutoff_year'.t(context: context, args: {'count': '2'}),
-                            onTap: () => _setPresetDate(730),
-                            isSelected: _isPresetSelected(730),
-                          ),
-                          _DatePresetCard(
-                            value: '3',
-                            unit: 'cutoff_year'.t(context: context, args: {'count': '3'}),
-                            onTap: () => _setPresetDate(1095),
-                            isSelected: _isPresetSelected(1095),
-                          ),
-                        ],
-                      ),
-                      const SizedBox(height: 16),
-                      OutlinedButton.icon(
-                        onPressed: _selectDate,
-                        icon: const Icon(Icons.calendar_today),
-                        label: Text('custom_date'.t(context: context)),
-                        style: OutlinedButton.styleFrom(minimumSize: const Size(double.infinity, 48)),
-                      ),
-                      const SizedBox(height: 16),
-                      ElevatedButton.icon(
-                        onPressed: hasDate ? () => _goToFiltersStep() : null,
-                        icon: const Icon(Icons.arrow_forward),
-                        label: Text('continue'.t(context: context)),
-                        style: ElevatedButton.styleFrom(minimumSize: const Size(double.infinity, 48)),
-                      ),
-                    ],
-                  ),
-                  isActive: true,
-                  state: step1State,
-                ),
-
-                // Step 2: Select Filter Options
-                Step(
-                  stepStyle: styleForState(step2State),
-                  title: Text(
-                    'filter_options'.t(context: context),
-                    style: context.textTheme.titleMedium?.copyWith(
-                      fontWeight: FontWeight.w600,
-                      color: step2State == StepState.complete
-                          ? context.colorScheme.primary
-                          : step2State == StepState.disabled
-                          ? context.colorScheme.onSurface.withValues(alpha: 0.38)
-                          : context.colorScheme.onSurface,
-                    ),
-                  ),
-                  subtitle: hasDate
-                      ? Text(
-                          getFilterSubtitle(),
-                          style: context.textTheme.bodyMedium?.copyWith(
-                            color: context.colorScheme.primary,
-                            fontWeight: FontWeight.w500,
-                          ),
-                        )
-                      : null,
-                  content: Column(
-                    crossAxisAlignment: CrossAxisAlignment.stretch,
-                    children: [
-                      Text('cleanup_filter_description'.t(context: context), style: context.textTheme.labelLarge),
-                      const SizedBox(height: 16),
-                      SegmentedButton<AssetFilterType>(
-                        segments: [
-                          ButtonSegment(
-                            value: AssetFilterType.all,
-                            label: Text('all'.t(context: context)),
-                            icon: const Icon(Icons.photo_library),
-                          ),
-                          ButtonSegment(
-                            value: AssetFilterType.photosOnly,
-                            label: Text('photos'.t(context: context)),
-                            icon: const Icon(Icons.photo),
-                          ),
-                          ButtonSegment(
-                            value: AssetFilterType.videosOnly,
-                            label: Text('videos'.t(context: context)),
-                            icon: const Icon(Icons.videocam),
-                          ),
-                        ],
-                        selected: {state.filterType},
-                        onSelectionChanged: (selection) {
-                          ref.read(cleanupProvider.notifier).setFilterType(selection.first);
-                          setState(() => _hasScanned = false);
-                        },
-                      ),
-                      const SizedBox(height: 16),
-                      SwitchListTile(
-                        contentPadding: EdgeInsets.zero,
-                        title: Text('keep_favorites'.t(context: context), style: context.textTheme.titleSmall),
-                        subtitle: Text(
-                          'keep_favorites_description'.t(context: context),
-                          style: context.textTheme.labelLarge,
-                        ),
-                        value: state.keepFavorites,
-                        onChanged: (value) {
-                          ref.read(cleanupProvider.notifier).setKeepFavorites(value);
-                          setState(() => _hasScanned = false);
-                        },
-                      ),
-                      const SizedBox(height: 16),
-                      ElevatedButton.icon(
-                        onPressed: _goToScanStep,
-                        icon: const Icon(Icons.arrow_forward),
-                        label: Text('continue'.t(context: context)),
-                        style: ElevatedButton.styleFrom(minimumSize: const Size(double.infinity, 48)),
-                      ),
-                    ],
-                  ),
-                  isActive: hasDate,
-                  state: step2State,
-                ),
-
-                // Step 3: Scan Assets
-                Step(
-                  stepStyle: styleForState(step3State),
-                  title: Text(
-                    'scan'.t(context: context),
-                    style: context.textTheme.titleMedium?.copyWith(
-                      fontWeight: FontWeight.w600,
-                      color: step3State == StepState.complete
-                          ? context.colorScheme.primary
-                          : step3State == StepState.disabled
-                          ? context.colorScheme.onSurface.withValues(alpha: 0.38)
-                          : context.colorScheme.onSurface,
-                    ),
-                  ),
-                  subtitle: _hasScanned
-                      ? Text(
-                          'cleanup_found_assets'.t(
-                            context: context,
-                            args: {'count': state.assetsToDelete.length.toString()},
-                          ),
-                          style: context.textTheme.bodyMedium?.copyWith(
-                            color: state.assetsToDelete.isNotEmpty
-                                ? context.colorScheme.primary
-                                : context.colorScheme.onSurface.withValues(alpha: 0.6),
-                            fontWeight: FontWeight.w500,
-                          ),
-                        )
-                      : null,
-                  content: Column(
-                    children: [
-                      Text(
-                        'cleanup_step3_description'.t(context: context),
-                        style: context.textTheme.labelLarge?.copyWith(fontSize: 15),
-                      ),
-                      if (CurrentPlatform.isIOS) ...[
-                        const SizedBox(height: 12),
-                        Container(
-                          padding: const EdgeInsets.all(12),
-                          decoration: BoxDecoration(
-                            color: context.colorScheme.primaryContainer.withValues(alpha: 0.3),
-                            borderRadius: const BorderRadius.all(Radius.circular(12)),
-                          ),
-                          child: Row(
-                            children: [
-                              Icon(Icons.info_outline, color: context.colorScheme.primary),
-                              const SizedBox(width: 12),
-                              Expanded(
-                                child: Text(
-                                  'cleanup_icloud_shared_albums_excluded'.t(context: context),
-                                  style: context.textTheme.labelLarge,
-                                ),
-                              ),
-                            ],
-                          ),
-                        ),
-                      ],
-                      const SizedBox(height: 16),
-                      state.isScanning
-                          ? SizedBox(
-                              width: 28,
-                              height: 28,
-                              child: CircularProgressIndicator(
-                                strokeWidth: 2,
-                                backgroundColor: context.colorScheme.primary.withAlpha(50),
-                              ),
-                            )
-                          : ElevatedButton.icon(
-                              onPressed: state.isScanning ? null : _scanAssets,
-                              icon: const Icon(Icons.search),
-                              label: Text(_hasScanned ? 'rescan'.t(context: context) : 'scan'.t(context: context)),
-                              style: ElevatedButton.styleFrom(minimumSize: const Size(double.infinity, 48)),
-                            ),
-                      if (_hasScanned && state.assetsToDelete.isEmpty) ...[
-                        const SizedBox(height: 16),
-                        Container(
-                          padding: const EdgeInsets.all(12),
-                          decoration: BoxDecoration(
-                            color: Colors.orange.withValues(alpha: 0.1),
-                            borderRadius: const BorderRadius.all(Radius.circular(8)),
-                          ),
-                          child: Row(
-                            children: [
-                              const Icon(Icons.info, color: Colors.orange),
-                              const SizedBox(width: 12),
-                              Expanded(
-                                child: Text(
-                                  'cleanup_no_assets_found'.t(context: context),
-                                  style: context.textTheme.bodyMedium,
-                                ),
-                              ),
-                            ],
-                          ),
-                        ),
-                      ],
-                    ],
-                  ),
-                  isActive: hasDate,
-                  state: step3State,
-                ),
-
-                // Step 4: Delete Assets
-                Step(
-                  stepStyle: styleForState(step4State, isDestructive: true),
-                  title: Text(
-                    'move_to_device_trash'.t(context: context),
-                    style: context.textTheme.titleMedium?.copyWith(
-                      fontWeight: FontWeight.w600,
-                      color: step4State == StepState.disabled
-                          ? context.colorScheme.onSurface.withValues(alpha: 0.38)
-                          : context.colorScheme.error,
-                    ),
-                  ),
-                  content: Column(
-                    crossAxisAlignment: CrossAxisAlignment.stretch,
-                    children: [
-                      Container(
-                        padding: const EdgeInsets.all(16),
-                        decoration: BoxDecoration(
-                          color: context.colorScheme.errorContainer.withValues(alpha: 0.3),
-                          borderRadius: const BorderRadius.all(Radius.circular(12)),
-                          border: Border.all(color: context.colorScheme.error.withValues(alpha: 0.3)),
-                        ),
-                        child: hasAssets
-                            ? Text(
-                                'cleanup_step4_summary'.t(
-                                  context: context,
-                                  args: {
-                                    'count': state.assetsToDelete.length.toString(),
-                                    'date': DateFormat.yMMMd().format(state.selectedDate!),
-                                  },
-                                ),
-                                style: context.textTheme.labelLarge?.copyWith(fontSize: 15),
-                              )
-                            : null,
-                      ),
-                      const SizedBox(height: 16),
-                      OutlinedButton.icon(
-                        onPressed: () => _showAssetsPreview(state.assetsToDelete),
-                        icon: const Icon(Icons.preview),
-                        label: Text('preview'.t(context: context)),
-                        style: OutlinedButton.styleFrom(minimumSize: const Size(double.infinity, 48)),
-                      ),
-                      const SizedBox(height: 12),
-                      ElevatedButton.icon(
-                        onPressed: state.isDeleting ? null : _deleteAssets,
-                        icon: state.isDeleting
-                            ? const SizedBox(
-                                width: 20,
-                                height: 20,
-                                child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white),
-                              )
-                            : const Icon(Icons.delete_forever),
-                        label: Text(
-                          state.isDeleting
-                              ? 'cleanup_deleting'.t(context: context)
-                              : 'move_to_device_trash'.t(context: context),
-                        ),
-                        style: ElevatedButton.styleFrom(
-                          backgroundColor: context.colorScheme.error,
-                          foregroundColor: context.colorScheme.onError,
-                          minimumSize: const Size(double.infinity, 56),
-                          textStyle: const TextStyle(fontSize: 16, fontWeight: FontWeight.w600),
-                        ),
-                      ),
-                    ],
-                  ),
-                  isActive: hasAssets,
-                  state: step4State,
-                ),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class _DeleteConfirmationDialog extends StatelessWidget {
-  final int assetCount;
-  final DateTime cutoffDate;
-
-  const _DeleteConfirmationDialog({required this.assetCount, required this.cutoffDate});
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: Text('cleanup_confirm_prompt_title'.t(context: context)),
-      content: Text(
-        'cleanup_confirm_description'.t(
-          context: context,
-          args: {'count': assetCount.toString(), 'date': DateFormat.yMMMd().format(cutoffDate)},
-        ),
-        style: context.textTheme.labelLarge?.copyWith(fontSize: 15),
-      ),
-      actions: [
-        TextButton(
-          onPressed: () => context.pop(false),
-          child: Text('cancel'.t(context: context)),
-        ),
-        ElevatedButton(
-          onPressed: () => context.pop(true),
-          style: ElevatedButton.styleFrom(
-            backgroundColor: context.colorScheme.error,
-            foregroundColor: context.colorScheme.onError,
-          ),
-          child: Text('confirm'.t(context: context)),
-        ),
-      ],
-    );
-  }
-}
-
-class _DeleteSuccessDialog extends StatelessWidget {
-  final int deletedCount;
-
-  const _DeleteSuccessDialog({required this.deletedCount});
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      icon: Icon(Icons.check_circle, color: context.colorScheme.primary, size: 48),
-      title: Text('success'.t(context: context)),
-      content: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Text(
-            'cleanup_deleted_assets'.t(context: context, args: {'count': deletedCount.toString()}),
-            style: context.textTheme.labelLarge?.copyWith(fontSize: 16),
-            textAlign: TextAlign.center,
-          ),
-          const SizedBox(height: 16),
-          Text(
-            'cleanup_trash_hint'.t(context: context),
-            style: context.textTheme.labelLarge?.copyWith(fontSize: 16, color: context.primaryColor),
-            textAlign: TextAlign.center,
-          ),
-        ],
-      ),
-      actions: [
-        ElevatedButton(
-          onPressed: () => context.pop(),
-          child: Text('done'.t(context: context)),
-        ),
-      ],
-    );
-  }
-}
-
-class _DatePresetCard extends StatelessWidget {
-  final String value;
-  final String unit;
-  final VoidCallback onTap;
-  final bool isSelected;
-
-  const _DatePresetCard({required this.value, required this.unit, required this.onTap, required this.isSelected});
-
-  @override
-  Widget build(BuildContext context) {
-    return Material(
-      color: isSelected ? context.colorScheme.primaryContainer.withAlpha(100) : context.colorScheme.surfaceContainer,
-      borderRadius: const BorderRadius.all(Radius.circular(12)),
-      child: InkWell(
-        onTap: onTap,
-        borderRadius: const BorderRadius.all(Radius.circular(12)),
-        child: Container(
-          decoration: BoxDecoration(
-            borderRadius: const BorderRadius.all(Radius.circular(12)),
-            border: Border.all(color: isSelected ? context.colorScheme.primary : Colors.transparent, width: 1),
-          ),
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Text(
-                value,
-                style: context.textTheme.headlineSmall?.copyWith(
-                  fontWeight: FontWeight.bold,
-                  color: isSelected ? context.colorScheme.primary : context.colorScheme.onSurface,
-                ),
-              ),
-              Text(
-                unit,
-                style: context.textTheme.bodySmall?.copyWith(
-                  color: isSelected
-                      ? context.colorScheme.primary
-                      : context.colorScheme.onSurface.withValues(alpha: 0.7),
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}

mobile/openapi/README.md

@@ -358,6 +358,7 @@ Class | Method | HTTP request | Description
  - [AssetMediaResponseDto](doc//AssetMediaResponseDto.md)
  - [AssetMediaSize](doc//AssetMediaSize.md)
  - [AssetMediaStatus](doc//AssetMediaStatus.md)
+ - [AssetMetadataKey](doc//AssetMetadataKey.md)
  - [AssetMetadataResponseDto](doc//AssetMetadataResponseDto.md)
  - [AssetMetadataUpsertDto](doc//AssetMetadataUpsertDto.md)
  - [AssetMetadataUpsertItemDto](doc//AssetMetadataUpsertItemDto.md)

mobile/openapi/lib/api.dart

@@ -109,6 +109,7 @@ part 'model/asset_jobs_dto.dart';
 part 'model/asset_media_response_dto.dart';
 part 'model/asset_media_size.dart';
 part 'model/asset_media_status.dart';
+part 'model/asset_metadata_key.dart';
 part 'model/asset_metadata_response_dto.dart';
 part 'model/asset_metadata_upsert_dto.dart';
 part 'model/asset_metadata_upsert_item_dto.dart';

mobile/openapi/lib/api/assets_api.dart

@@ -186,12 +186,12 @@ class AssetsApi {
   ///
   /// * [String] id (required):
   ///
-  /// * [String] key (required):
-  Future<Response> deleteAssetMetadataWithHttpInfo(String id, String key,) async {
+  /// * [AssetMetadataKey] key (required):
+  Future<Response> deleteAssetMetadataWithHttpInfo(String id, AssetMetadataKey key,) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/assets/{id}/metadata/{key}'
       .replaceAll('{id}', id)
-      .replaceAll('{key}', key);
+      .replaceAll('{key}', key.toString());
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -222,8 +222,8 @@ class AssetsApi {
   ///
   /// * [String] id (required):
   ///
-  /// * [String] key (required):
-  Future<void> deleteAssetMetadata(String id, String key,) async {
+  /// * [AssetMetadataKey] key (required):
+  Future<void> deleteAssetMetadata(String id, AssetMetadataKey key,) async {
     final response = await deleteAssetMetadataWithHttpInfo(id, key,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -552,12 +552,12 @@ class AssetsApi {
   ///
   /// * [String] id (required):
   ///
-  /// * [String] key (required):
-  Future<Response> getAssetMetadataByKeyWithHttpInfo(String id, String key,) async {
+  /// * [AssetMetadataKey] key (required):
+  Future<Response> getAssetMetadataByKeyWithHttpInfo(String id, AssetMetadataKey key,) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/assets/{id}/metadata/{key}'
       .replaceAll('{id}', id)
-      .replaceAll('{key}', key);
+      .replaceAll('{key}', key.toString());
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -588,8 +588,8 @@ class AssetsApi {
   ///
   /// * [String] id (required):
   ///
-  /// * [String] key (required):
-  Future<AssetMetadataResponseDto?> getAssetMetadataByKey(String id, String key,) async {
+  /// * [AssetMetadataKey] key (required):
+  Future<AssetMetadataResponseDto?> getAssetMetadataByKey(String id, AssetMetadataKey key,) async {
     final response = await getAssetMetadataByKeyWithHttpInfo(id, key,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -1246,6 +1246,8 @@ class AssetsApi {
   ///
   /// * [DateTime] fileModifiedAt (required):
   ///
+  /// * [List<AssetMetadataUpsertItemDto>] metadata (required):
+  ///
   /// * [String] key:
   ///
   /// * [String] slug:
@@ -1261,12 +1263,10 @@ class AssetsApi {
   ///
   /// * [String] livePhotoVideoId:
   ///
-  /// * [List<AssetMetadataUpsertItemDto>] metadata:
-  ///
   /// * [MultipartFile] sidecarData:
   ///
   /// * [AssetVisibility] visibility:
-  Future<Response> uploadAssetWithHttpInfo(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, { String? key, String? slug, String? xImmichChecksum, String? duration, String? filename, bool? isFavorite, String? livePhotoVideoId, List<AssetMetadataUpsertItemDto>? metadata, MultipartFile? sidecarData, AssetVisibility? visibility, }) async {
+  Future<Response> uploadAssetWithHttpInfo(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, List<AssetMetadataUpsertItemDto> metadata, { String? key, String? slug, String? xImmichChecksum, String? duration, String? filename, bool? isFavorite, String? livePhotoVideoId, MultipartFile? sidecarData, AssetVisibility? visibility, }) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/assets';
 
@@ -1373,6 +1373,8 @@ class AssetsApi {
   ///
   /// * [DateTime] fileModifiedAt (required):
   ///
+  /// * [List<AssetMetadataUpsertItemDto>] metadata (required):
+  ///
   /// * [String] key:
   ///
   /// * [String] slug:
@@ -1388,13 +1390,11 @@ class AssetsApi {
   ///
   /// * [String] livePhotoVideoId:
   ///
-  /// * [List<AssetMetadataUpsertItemDto>] metadata:
-  ///
   /// * [MultipartFile] sidecarData:
   ///
   /// * [AssetVisibility] visibility:
-  Future<AssetMediaResponseDto?> uploadAsset(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, { String? key, String? slug, String? xImmichChecksum, String? duration, String? filename, bool? isFavorite, String? livePhotoVideoId, List<AssetMetadataUpsertItemDto>? metadata, MultipartFile? sidecarData, AssetVisibility? visibility, }) async {
-    final response = await uploadAssetWithHttpInfo(assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt,  key: key, slug: slug, xImmichChecksum: xImmichChecksum, duration: duration, filename: filename, isFavorite: isFavorite, livePhotoVideoId: livePhotoVideoId, metadata: metadata, sidecarData: sidecarData, visibility: visibility, );
+  Future<AssetMediaResponseDto?> uploadAsset(MultipartFile assetData, String deviceAssetId, String deviceId, DateTime fileCreatedAt, DateTime fileModifiedAt, List<AssetMetadataUpsertItemDto> metadata, { String? key, String? slug, String? xImmichChecksum, String? duration, String? filename, bool? isFavorite, String? livePhotoVideoId, MultipartFile? sidecarData, AssetVisibility? visibility, }) async {
+    final response = await uploadAssetWithHttpInfo(assetData, deviceAssetId, deviceId, fileCreatedAt, fileModifiedAt, metadata,  key: key, slug: slug, xImmichChecksum: xImmichChecksum, duration: duration, filename: filename, isFavorite: isFavorite, livePhotoVideoId: livePhotoVideoId, sidecarData: sidecarData, visibility: visibility, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -1418,14 +1418,12 @@ class AssetsApi {
   ///
   /// * [String] id (required):
   ///
-  /// * [bool] edited:
-  ///
   /// * [String] key:
   ///
   /// * [AssetMediaSize] size:
   ///
   /// * [String] slug:
-  Future<Response> viewAssetWithHttpInfo(String id, { bool? edited, String? key, AssetMediaSize? size, String? slug, }) async {
+  Future<Response> viewAssetWithHttpInfo(String id, { String? key, AssetMediaSize? size, String? slug, }) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/assets/{id}/thumbnail'
       .replaceAll('{id}', id);
@@ -1437,9 +1435,6 @@ class AssetsApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (edited != null) {
-      queryParams.addAll(_queryParams('', 'edited', edited));
-    }
     if (key != null) {
       queryParams.addAll(_queryParams('', 'key', key));
     }
@@ -1472,15 +1467,13 @@ class AssetsApi {
   ///
   /// * [String] id (required):
   ///
-  /// * [bool] edited:
-  ///
   /// * [String] key:
   ///
   /// * [AssetMediaSize] size:
   ///
   /// * [String] slug:
-  Future<MultipartFile?> viewAsset(String id, { bool? edited, String? key, AssetMediaSize? size, String? slug, }) async {
-    final response = await viewAssetWithHttpInfo(id,  edited: edited, key: key, size: size, slug: slug, );
+  Future<MultipartFile?> viewAsset(String id, { String? key, AssetMediaSize? size, String? slug, }) async {
+    final response = await viewAssetWithHttpInfo(id,  key: key, size: size, slug: slug, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }

mobile/openapi/lib/api_client.dart

@@ -266,6 +266,8 @@ class ApiClient {
           return AssetMediaSizeTypeTransformer().decode(value);
         case 'AssetMediaStatus':
           return AssetMediaStatusTypeTransformer().decode(value);
+        case 'AssetMetadataKey':
+          return AssetMetadataKeyTypeTransformer().decode(value);
         case 'AssetMetadataResponseDto':
           return AssetMetadataResponseDto.fromJson(value);
         case 'AssetMetadataUpsertDto':

mobile/openapi/lib/api_helper.dart

@@ -67,6 +67,9 @@ String parameterToString(dynamic value) {
   if (value is AssetMediaStatus) {
     return AssetMediaStatusTypeTransformer().encode(value).toString();
   }
+  if (value is AssetMetadataKey) {
+    return AssetMetadataKeyTypeTransformer().encode(value).toString();
+  }
   if (value is AssetOrder) {
     return AssetOrderTypeTransformer().encode(value).toString();
   }

mobile/openapi/lib/model/asset_metadata_key.dart

@@ -0,0 +1,82 @@
+//
+// 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 AssetMetadataKey {
+  /// Instantiate a new enum with the provided [value].
+  const AssetMetadataKey._(this.value);
+
+  /// The underlying value of this enum member.
+  final String value;
+
+  @override
+  String toString() => value;
+
+  String toJson() => value;
+
+  static const mobileApp = AssetMetadataKey._(r'mobile-app');
+
+  /// List of all possible values in this [enum][AssetMetadataKey].
+  static const values = <AssetMetadataKey>[
+    mobileApp,
+  ];
+
+  static AssetMetadataKey? fromJson(dynamic value) => AssetMetadataKeyTypeTransformer().decode(value);
+
+  static List<AssetMetadataKey> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <AssetMetadataKey>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = AssetMetadataKey.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+}
+
+/// Transformation class that can [encode] an instance of [AssetMetadataKey] to String,
+/// and [decode] dynamic data back to [AssetMetadataKey].
+class AssetMetadataKeyTypeTransformer {
+  factory AssetMetadataKeyTypeTransformer() => _instance ??= const AssetMetadataKeyTypeTransformer._();
+
+  const AssetMetadataKeyTypeTransformer._();
+
+  String encode(AssetMetadataKey data) => data.value;
+
+  /// Decodes a [dynamic value][data] to a AssetMetadataKey.
+  ///
+  /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
+  /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
+  /// cannot be decoded successfully, then an [UnimplementedError] is thrown.
+  ///
+  /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
+  /// and users are still using an old app with the old code.
+  AssetMetadataKey? decode(dynamic data, {bool allowNull = true}) {
+    if (data != null) {
+      switch (data) {
+        case r'mobile-app': return AssetMetadataKey.mobileApp;
+        default:
+          if (!allowNull) {
+            throw ArgumentError('Unknown enum value to decode: $data');
+          }
+      }
+    }
+    return null;
+  }
+
+  /// Singleton [AssetMetadataKeyTypeTransformer] instance.
+  static AssetMetadataKeyTypeTransformer? _instance;
+}
+

mobile/openapi/lib/model/asset_metadata_response_dto.dart

@@ -18,7 +18,7 @@ class AssetMetadataResponseDto {
     required this.value,
   });
 
-  String key;
+  AssetMetadataKey key;
 
   DateTime updatedAt;
 
@@ -57,7 +57,7 @@ class AssetMetadataResponseDto {
       final json = value.cast<String, dynamic>();
 
       return AssetMetadataResponseDto(
-        key: mapValueOfType<String>(json, r'key')!,
+        key: AssetMetadataKey.fromJson(json[r'key'])!,
         updatedAt: mapDateTime(json, r'updatedAt', r'')!,
         value: mapValueOfType<Object>(json, r'value')!,
       );

mobile/openapi/lib/model/asset_metadata_upsert_item_dto.dart

@@ -17,7 +17,7 @@ class AssetMetadataUpsertItemDto {
     required this.value,
   });
 
-  String key;
+  AssetMetadataKey key;
 
   Object value;
 
@@ -51,7 +51,7 @@ class AssetMetadataUpsertItemDto {
       final json = value.cast<String, dynamic>();
 
       return AssetMetadataUpsertItemDto(
-        key: mapValueOfType<String>(json, r'key')!,
+        key: AssetMetadataKey.fromJson(json[r'key'])!,
         value: mapValueOfType<Object>(json, r'value')!,
       );
     }

mobile/openapi/lib/model/asset_response_dto.dart

@@ -23,7 +23,6 @@ class AssetResponseDto {
     required this.fileCreatedAt,
     required this.fileModifiedAt,
     required this.hasMetadata,
-    required this.height,
     required this.id,
     required this.isArchived,
     required this.isFavorite,
@@ -46,7 +45,6 @@ class AssetResponseDto {
     this.unassignedFaces = const [],
     required this.updatedAt,
     required this.visibility,
-    required this.width,
   });
 
   /// base64 encoded sha1 hash
@@ -79,8 +77,6 @@ class AssetResponseDto {
 
   bool hasMetadata;
 
-  num? height;
-
   String id;
 
   bool isArchived;
@@ -145,8 +141,6 @@ class AssetResponseDto {
 
   AssetVisibility visibility;
 
-  num? width;
-
   @override
   bool operator ==(Object other) => identical(this, other) || other is AssetResponseDto &&
     other.checksum == checksum &&
@@ -159,7 +153,6 @@ class AssetResponseDto {
     other.fileCreatedAt == fileCreatedAt &&
     other.fileModifiedAt == fileModifiedAt &&
     other.hasMetadata == hasMetadata &&
-    other.height == height &&
     other.id == id &&
     other.isArchived == isArchived &&
     other.isFavorite == isFavorite &&
@@ -181,8 +174,7 @@ class AssetResponseDto {
     other.type == type &&
     _deepEquality.equals(other.unassignedFaces, unassignedFaces) &&
     other.updatedAt == updatedAt &&
-    other.visibility == visibility &&
-    other.width == width;
+    other.visibility == visibility;
 
   @override
   int get hashCode =>
@@ -197,7 +189,6 @@ class AssetResponseDto {
     (fileCreatedAt.hashCode) +
     (fileModifiedAt.hashCode) +
     (hasMetadata.hashCode) +
-    (height == null ? 0 : height!.hashCode) +
     (id.hashCode) +
     (isArchived.hashCode) +
     (isFavorite.hashCode) +
@@ -219,11 +210,10 @@ class AssetResponseDto {
     (type.hashCode) +
     (unassignedFaces.hashCode) +
     (updatedAt.hashCode) +
-    (visibility.hashCode) +
-    (width == null ? 0 : width!.hashCode);
+    (visibility.hashCode);
 
   @override
-  String toString() => 'AssetResponseDto[checksum=$checksum, createdAt=$createdAt, deviceAssetId=$deviceAssetId, deviceId=$deviceId, duplicateId=$duplicateId, duration=$duration, exifInfo=$exifInfo, fileCreatedAt=$fileCreatedAt, fileModifiedAt=$fileModifiedAt, hasMetadata=$hasMetadata, height=$height, id=$id, isArchived=$isArchived, isFavorite=$isFavorite, isOffline=$isOffline, isTrashed=$isTrashed, libraryId=$libraryId, livePhotoVideoId=$livePhotoVideoId, localDateTime=$localDateTime, originalFileName=$originalFileName, originalMimeType=$originalMimeType, originalPath=$originalPath, owner=$owner, ownerId=$ownerId, people=$people, resized=$resized, stack=$stack, tags=$tags, thumbhash=$thumbhash, type=$type, unassignedFaces=$unassignedFaces, updatedAt=$updatedAt, visibility=$visibility, width=$width]';
+  String toString() => 'AssetResponseDto[checksum=$checksum, createdAt=$createdAt, deviceAssetId=$deviceAssetId, deviceId=$deviceId, duplicateId=$duplicateId, duration=$duration, exifInfo=$exifInfo, fileCreatedAt=$fileCreatedAt, fileModifiedAt=$fileModifiedAt, hasMetadata=$hasMetadata, id=$id, isArchived=$isArchived, isFavorite=$isFavorite, isOffline=$isOffline, isTrashed=$isTrashed, libraryId=$libraryId, livePhotoVideoId=$livePhotoVideoId, localDateTime=$localDateTime, originalFileName=$originalFileName, originalMimeType=$originalMimeType, originalPath=$originalPath, owner=$owner, ownerId=$ownerId, people=$people, resized=$resized, stack=$stack, tags=$tags, thumbhash=$thumbhash, type=$type, unassignedFaces=$unassignedFaces, updatedAt=$updatedAt, visibility=$visibility]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -245,11 +235,6 @@ class AssetResponseDto {
       json[r'fileCreatedAt'] = this.fileCreatedAt.toUtc().toIso8601String();
       json[r'fileModifiedAt'] = this.fileModifiedAt.toUtc().toIso8601String();
       json[r'hasMetadata'] = this.hasMetadata;
-    if (this.height != null) {
-      json[r'height'] = this.height;
-    } else {
-    //  json[r'height'] = null;
-    }
       json[r'id'] = this.id;
       json[r'isArchived'] = this.isArchived;
       json[r'isFavorite'] = this.isFavorite;
@@ -300,11 +285,6 @@ class AssetResponseDto {
       json[r'unassignedFaces'] = this.unassignedFaces;
       json[r'updatedAt'] = this.updatedAt.toUtc().toIso8601String();
       json[r'visibility'] = this.visibility;
-    if (this.width != null) {
-      json[r'width'] = this.width;
-    } else {
-    //  json[r'width'] = null;
-    }
     return json;
   }
 
@@ -327,9 +307,6 @@ class AssetResponseDto {
         fileCreatedAt: mapDateTime(json, r'fileCreatedAt', r'')!,
         fileModifiedAt: mapDateTime(json, r'fileModifiedAt', r'')!,
         hasMetadata: mapValueOfType<bool>(json, r'hasMetadata')!,
-        height: json[r'height'] == null
-            ? null
-            : num.parse('${json[r'height']}'),
         id: mapValueOfType<String>(json, r'id')!,
         isArchived: mapValueOfType<bool>(json, r'isArchived')!,
         isFavorite: mapValueOfType<bool>(json, r'isFavorite')!,
@@ -352,9 +329,6 @@ class AssetResponseDto {
         unassignedFaces: AssetFaceWithoutPersonResponseDto.listFromJson(json[r'unassignedFaces']),
         updatedAt: mapDateTime(json, r'updatedAt', r'')!,
         visibility: AssetVisibility.fromJson(json[r'visibility'])!,
-        width: json[r'width'] == null
-            ? null
-            : num.parse('${json[r'width']}'),
       );
     }
     return null;
@@ -410,7 +384,6 @@ class AssetResponseDto {
     'fileCreatedAt',
     'fileModifiedAt',
     'hasMetadata',
-    'height',
     'id',
     'isArchived',
     'isFavorite',
@@ -424,7 +397,6 @@ class AssetResponseDto {
     'type',
     'updatedAt',
     'visibility',
-    'width',
   };
 }
 

mobile/openapi/lib/model/sync_asset_metadata_delete_v1.dart

@@ -19,7 +19,7 @@ class SyncAssetMetadataDeleteV1 {
 
   String assetId;
 
-  String key;
+  AssetMetadataKey key;
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is SyncAssetMetadataDeleteV1 &&
@@ -52,7 +52,7 @@ class SyncAssetMetadataDeleteV1 {
 
       return SyncAssetMetadataDeleteV1(
         assetId: mapValueOfType<String>(json, r'assetId')!,
-        key: mapValueOfType<String>(json, r'key')!,
+        key: AssetMetadataKey.fromJson(json[r'key'])!,
       );
     }
     return null;

mobile/openapi/lib/model/sync_asset_metadata_v1.dart

@@ -20,7 +20,7 @@ class SyncAssetMetadataV1 {
 
   String assetId;
 
-  String key;
+  AssetMetadataKey key;
 
   Object value;
 
@@ -58,7 +58,7 @@ class SyncAssetMetadataV1 {
 
       return SyncAssetMetadataV1(
         assetId: mapValueOfType<String>(json, r'assetId')!,
-        key: mapValueOfType<String>(json, r'key')!,
+        key: AssetMetadataKey.fromJson(json[r'key'])!,
         value: mapValueOfType<Object>(json, r'value')!,
       );
     }

mobile/openapi/lib/model/sync_asset_v1.dart

@@ -18,7 +18,6 @@ class SyncAssetV1 {
     required this.duration,
     required this.fileCreatedAt,
     required this.fileModifiedAt,
-    required this.height,
     required this.id,
     required this.isFavorite,
     required this.libraryId,
@@ -30,7 +29,6 @@ class SyncAssetV1 {
     required this.thumbhash,
     required this.type,
     required this.visibility,
-    required this.width,
   });
 
   String checksum;
@@ -43,8 +41,6 @@ class SyncAssetV1 {
 
   DateTime? fileModifiedAt;
 
-  int? height;
-
   String id;
 
   bool isFavorite;
@@ -67,8 +63,6 @@ class SyncAssetV1 {
 
   AssetVisibility visibility;
 
-  int? width;
-
   @override
   bool operator ==(Object other) => identical(this, other) || other is SyncAssetV1 &&
     other.checksum == checksum &&
@@ -76,7 +70,6 @@ class SyncAssetV1 {
     other.duration == duration &&
     other.fileCreatedAt == fileCreatedAt &&
     other.fileModifiedAt == fileModifiedAt &&
-    other.height == height &&
     other.id == id &&
     other.isFavorite == isFavorite &&
     other.libraryId == libraryId &&
@@ -87,8 +80,7 @@ class SyncAssetV1 {
     other.stackId == stackId &&
     other.thumbhash == thumbhash &&
     other.type == type &&
-    other.visibility == visibility &&
-    other.width == width;
+    other.visibility == visibility;
 
   @override
   int get hashCode =>
@@ -98,7 +90,6 @@ class SyncAssetV1 {
     (duration == null ? 0 : duration!.hashCode) +
     (fileCreatedAt == null ? 0 : fileCreatedAt!.hashCode) +
     (fileModifiedAt == null ? 0 : fileModifiedAt!.hashCode) +
-    (height == null ? 0 : height!.hashCode) +
     (id.hashCode) +
     (isFavorite.hashCode) +
     (libraryId == null ? 0 : libraryId!.hashCode) +
@@ -109,11 +100,10 @@ class SyncAssetV1 {
     (stackId == null ? 0 : stackId!.hashCode) +
     (thumbhash == null ? 0 : thumbhash!.hashCode) +
     (type.hashCode) +
-    (visibility.hashCode) +
-    (width == null ? 0 : width!.hashCode);
+    (visibility.hashCode);
 
   @override
-  String toString() => 'SyncAssetV1[checksum=$checksum, deletedAt=$deletedAt, duration=$duration, fileCreatedAt=$fileCreatedAt, fileModifiedAt=$fileModifiedAt, height=$height, id=$id, isFavorite=$isFavorite, libraryId=$libraryId, livePhotoVideoId=$livePhotoVideoId, localDateTime=$localDateTime, originalFileName=$originalFileName, ownerId=$ownerId, stackId=$stackId, thumbhash=$thumbhash, type=$type, visibility=$visibility, width=$width]';
+  String toString() => 'SyncAssetV1[checksum=$checksum, deletedAt=$deletedAt, duration=$duration, fileCreatedAt=$fileCreatedAt, fileModifiedAt=$fileModifiedAt, id=$id, isFavorite=$isFavorite, libraryId=$libraryId, livePhotoVideoId=$livePhotoVideoId, localDateTime=$localDateTime, originalFileName=$originalFileName, ownerId=$ownerId, stackId=$stackId, thumbhash=$thumbhash, type=$type, visibility=$visibility]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -137,11 +127,6 @@ class SyncAssetV1 {
       json[r'fileModifiedAt'] = this.fileModifiedAt!.toUtc().toIso8601String();
     } else {
     //  json[r'fileModifiedAt'] = null;
-    }
-    if (this.height != null) {
-      json[r'height'] = this.height;
-    } else {
-    //  json[r'height'] = null;
     }
       json[r'id'] = this.id;
       json[r'isFavorite'] = this.isFavorite;
@@ -174,11 +159,6 @@ class SyncAssetV1 {
     }
       json[r'type'] = this.type;
       json[r'visibility'] = this.visibility;
-    if (this.width != null) {
-      json[r'width'] = this.width;
-    } else {
-    //  json[r'width'] = null;
-    }
     return json;
   }
 
@@ -196,7 +176,6 @@ class SyncAssetV1 {
         duration: mapValueOfType<String>(json, r'duration'),
         fileCreatedAt: mapDateTime(json, r'fileCreatedAt', r''),
         fileModifiedAt: mapDateTime(json, r'fileModifiedAt', r''),
-        height: mapValueOfType<int>(json, r'height'),
         id: mapValueOfType<String>(json, r'id')!,
         isFavorite: mapValueOfType<bool>(json, r'isFavorite')!,
         libraryId: mapValueOfType<String>(json, r'libraryId'),
@@ -208,7 +187,6 @@ class SyncAssetV1 {
         thumbhash: mapValueOfType<String>(json, r'thumbhash'),
         type: AssetTypeEnum.fromJson(json[r'type'])!,
         visibility: AssetVisibility.fromJson(json[r'visibility'])!,
-        width: mapValueOfType<int>(json, r'width'),
       );
     }
     return null;
@@ -261,7 +239,6 @@ class SyncAssetV1 {
     'duration',
     'fileCreatedAt',
     'fileModifiedAt',
-    'height',
     'id',
     'isFavorite',
     'libraryId',
@@ -273,7 +250,6 @@ class SyncAssetV1 {
     'thumbhash',
     'type',
     'visibility',
-    'width',
   };
 }
 

mobile/packages/ui/lib/immich_ui.dart

@@ -1,10 +1,3 @@
-export 'src/components/close_button.dart';
-export 'src/components/form.dart';
-export 'src/components/icon_button.dart';
-export 'src/components/password_input.dart';
-export 'src/components/text_button.dart';
-export 'src/components/text_input.dart';
-export 'src/constants.dart';
-export 'src/theme.dart';
-export 'src/translation.dart';
+export 'src/buttons/close_button.dart';
+export 'src/buttons/icon_button.dart';
 export 'src/types.dart';

mobile/packages/ui/lib/src/buttons/close_button.dart

@@ -1,16 +1,15 @@
 import 'package:flutter/material.dart';
+import 'package:immich_ui/src/buttons/icon_button.dart';
 import 'package:immich_ui/src/types.dart';
 
-import 'icon_button.dart';
-
 class ImmichCloseButton extends StatelessWidget {
-  final VoidCallback? onPressed;
+  final VoidCallback? onTap;
   final ImmichVariant variant;
   final ImmichColor color;
 
   const ImmichCloseButton({
     super.key,
-    this.onPressed,
+    this.onTap,
     this.color = ImmichColor.primary,
     this.variant = ImmichVariant.ghost,
   });
@@ -21,6 +20,6 @@ class ImmichCloseButton extends StatelessWidget {
         icon: Icons.close,
         color: color,
         variant: variant,
-        onPressed: onPressed ?? () => Navigator.of(context).pop(),
+        onTap: onTap ?? () => Navigator.of(context).pop(),
       );
 }

mobile/packages/ui/lib/src/buttons/icon_button.dart

@@ -3,48 +3,42 @@ import 'package:immich_ui/src/types.dart';
 
 class ImmichIconButton extends StatelessWidget {
   final IconData icon;
-  final VoidCallback onPressed;
+  final VoidCallback onTap;
   final ImmichVariant variant;
   final ImmichColor color;
-  final bool disabled;
 
   const ImmichIconButton({
     super.key,
     required this.icon,
-    required this.onPressed,
+    required this.onTap,
     this.color = ImmichColor.primary,
     this.variant = ImmichVariant.filled,
-    this.disabled = false,
   });
 
   @override
   Widget build(BuildContext context) {
-    final colorScheme = Theme.of(context).colorScheme;
-
     final background = switch (variant) {
       ImmichVariant.filled => switch (color) {
-          ImmichColor.primary => colorScheme.primary,
-          ImmichColor.secondary => colorScheme.secondary,
+          ImmichColor.primary => Theme.of(context).colorScheme.primary,
+          ImmichColor.secondary => Theme.of(context).colorScheme.secondary,
         },
       ImmichVariant.ghost => Colors.transparent,
     };
 
     final foreground = switch (variant) {
       ImmichVariant.filled => switch (color) {
-          ImmichColor.primary => colorScheme.onPrimary,
-          ImmichColor.secondary => colorScheme.onSecondary,
+          ImmichColor.primary => Theme.of(context).colorScheme.onPrimary,
+          ImmichColor.secondary => Theme.of(context).colorScheme.onSecondary,
         },
       ImmichVariant.ghost => switch (color) {
-          ImmichColor.primary => colorScheme.primary,
-          ImmichColor.secondary => colorScheme.secondary,
+          ImmichColor.primary => Theme.of(context).colorScheme.primary,
+          ImmichColor.secondary => Theme.of(context).colorScheme.secondary,
         },
     };
 
-    final effectiveOnPressed = disabled ? null : onPressed;
-
     return IconButton(
       icon: Icon(icon),
-      onPressed: effectiveOnPressed,
+      onPressed: onTap,
       style: IconButton.styleFrom(
         backgroundColor: background,
         foregroundColor: foreground,

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

@@ -1,98 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-import 'package:immich_ui/immich_ui.dart';
-import 'package:immich_ui/src/internal.dart';
-
-class ImmichForm extends StatefulWidget {
-  final String? submitText;
-  final IconData? submitIcon;
-  final FutureOr<void> Function()? onSubmit;
-  final Widget child;
-
-  const ImmichForm({
-    super.key,
-    this.submitText,
-    this.submitIcon,
-    required this.onSubmit,
-    required this.child,
-  });
-
-  @override
-  State<ImmichForm> createState() => ImmichFormState();
-
-  static ImmichFormState of(BuildContext context) {
-    final scope = context.dependOnInheritedWidgetOfExactType<_ImmichFormScope>();
-    if (scope == null) {
-      throw FlutterError(
-        'ImmichForm.of() called with a context that does not contain an ImmichForm.\n'
-        'No ImmichForm ancestor could be found starting from the context that was passed to '
-        'ImmichForm.of(). This usually happens when the context provided is '
-        'from a widget above the ImmichForm.\n'
-        'The context used was:\n'
-        '$context',
-      );
-    }
-    return scope._formState;
-  }
-}
-
-class ImmichFormState extends State<ImmichForm> {
-  final _formKey = GlobalKey<FormState>();
-  bool _isLoading = false;
-
-  FutureOr<void> submit() async {
-    final isValid = _formKey.currentState?.validate() ?? false;
-    if (!isValid) {
-      return;
-    }
-
-    setState(() {
-      _isLoading = true;
-    });
-
-    try {
-      await widget.onSubmit?.call();
-    } finally {
-      if (mounted) {
-        setState(() {
-          _isLoading = false;
-        });
-      }
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final submitText = widget.submitText ?? context.translations.submit;
-    return _ImmichFormScope(
-      formState: this,
-      child: Form(
-        key: _formKey,
-        child: Column(
-          spacing: ImmichSpacing.md,
-          children: [
-            widget.child,
-            ImmichTextButton(
-              labelText: submitText,
-              icon: widget.submitIcon,
-              variant: ImmichVariant.filled,
-              loading: _isLoading,
-              onPressed: submit,
-              disabled: widget.onSubmit == null,
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class _ImmichFormScope extends InheritedWidget {
-  const _ImmichFormScope({required super.child, required ImmichFormState formState}) : _formState = formState;
-
-  final ImmichFormState _formState;
-
-  @override
-  bool updateShouldNotify(_ImmichFormScope oldWidget) => oldWidget._formState != _formState;
-}

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

@@ -1,58 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_ui/src/components/text_input.dart';
-import 'package:immich_ui/src/internal.dart';
-
-class ImmichPasswordInput extends StatefulWidget {
-  final String? label;
-  final String? hintText;
-  final TextEditingController? controller;
-  final FocusNode? focusNode;
-  final String? Function(String?)? validator;
-  final void Function(BuildContext, String)? onSubmit;
-  final TextInputAction? keyboardAction;
-
-  const ImmichPasswordInput({
-    super.key,
-    this.controller,
-    this.focusNode,
-    this.label,
-    this.hintText,
-    this.validator,
-    this.onSubmit,
-    this.keyboardAction,
-  });
-
-  @override
-  State createState() => _ImmichPasswordInputState();
-}
-
-class _ImmichPasswordInputState extends State<ImmichPasswordInput> {
-  bool _visible = false;
-
-  void _toggleVisibility() {
-    setState(() {
-      _visible = !_visible;
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return ImmichTextInput(
-      key: widget.key,
-      label: widget.label ?? context.translations.password,
-      hintText: widget.hintText,
-      controller: widget.controller,
-      focusNode: widget.focusNode,
-      validator: widget.validator,
-      onSubmit: widget.onSubmit,
-      keyboardAction: widget.keyboardAction,
-      obscureText: !_visible,
-      suffixIcon: IconButton(
-        onPressed: _toggleVisibility,
-        icon: Icon(_visible ? Icons.visibility_off_rounded : Icons.visibility_rounded),
-      ),
-      autofillHints: [AutofillHints.password],
-      keyboardType: TextInputType.text,
-    );
-  }
-}

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

@@ -1,87 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-import 'package:immich_ui/src/constants.dart';
-import 'package:immich_ui/src/types.dart';
-
-class ImmichTextButton extends StatelessWidget {
-  final String labelText;
-  final IconData? icon;
-  final FutureOr<void> Function() onPressed;
-  final ImmichVariant variant;
-  final ImmichColor color;
-  final bool expanded;
-  final bool loading;
-  final bool disabled;
-
-  const ImmichTextButton({
-    super.key,
-    required this.labelText,
-    this.icon,
-    required this.onPressed,
-    this.variant = ImmichVariant.filled,
-    this.color = ImmichColor.primary,
-    this.expanded = true,
-    this.loading = false,
-    this.disabled = false,
-  });
-
-  Widget _buildButton(ImmichVariant variant) {
-    final Widget? effectiveIcon = loading
-        ? const SizedBox.square(
-            dimension: ImmichIconSize.md,
-            child: CircularProgressIndicator(strokeWidth: ImmichBorderWidth.lg),
-          )
-        : icon != null
-            ? Icon(icon, fontWeight: FontWeight.w600)
-            : null;
-    final hasIcon = effectiveIcon != null;
-
-    final label = Text(labelText, style: const TextStyle(fontSize: ImmichTextSize.body, fontWeight: FontWeight.bold));
-    final style = ElevatedButton.styleFrom(padding: const EdgeInsets.symmetric(vertical: ImmichSpacing.md));
-
-    final effectiveOnPressed = disabled || loading ? null : onPressed;
-
-    switch (variant) {
-      case ImmichVariant.filled:
-        if (hasIcon) {
-          return ElevatedButton.icon(
-            style: style,
-            onPressed: effectiveOnPressed,
-            icon: effectiveIcon,
-            label: label,
-          );
-        }
-
-        return ElevatedButton(
-          style: style,
-          onPressed: effectiveOnPressed,
-          child: label,
-        );
-      case ImmichVariant.ghost:
-        if (hasIcon) {
-          return TextButton.icon(
-            style: style,
-            onPressed: effectiveOnPressed,
-            icon: effectiveIcon,
-            label: label,
-          );
-        }
-
-        return TextButton(
-          style: style,
-          onPressed: effectiveOnPressed,
-          child: label,
-        );
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final button = _buildButton(variant);
-    if (expanded) {
-      return SizedBox(width: double.infinity, child: button);
-    }
-    return button;
-  }
-}

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

@@ -1,88 +0,0 @@
-import 'package:flutter/material.dart';
-
-class ImmichTextInput extends StatefulWidget {
-  final String label;
-  final String? hintText;
-  final TextEditingController? controller;
-  final FocusNode? focusNode;
-  final String? Function(String?)? validator;
-  final void Function(BuildContext, String)? onSubmit;
-  final TextInputType keyboardType;
-  final TextInputAction? keyboardAction;
-  final List<String>? autofillHints;
-  final Widget? suffixIcon;
-  final bool obscureText;
-
-  const ImmichTextInput({
-    super.key,
-    this.controller,
-    this.focusNode,
-    required this.label,
-    this.hintText,
-    this.validator,
-    this.onSubmit,
-    this.keyboardType = TextInputType.text,
-    this.keyboardAction,
-    this.autofillHints,
-    this.suffixIcon,
-    this.obscureText = false,
-  });
-
-  @override
-  State createState() => _ImmichTextInputState();
-}
-
-class _ImmichTextInputState extends State<ImmichTextInput> {
-  late final FocusNode _focusNode;
-  String? _error;
-
-  @override
-  void initState() {
-    super.initState();
-    _focusNode = widget.focusNode ?? FocusNode();
-  }
-
-  @override
-  void dispose() {
-    if (widget.focusNode == null) {
-      _focusNode.dispose();
-    }
-    super.dispose();
-  }
-
-  String? _validateInput(String? value) {
-    setState(() {
-      _error = widget.validator?.call(value);
-    });
-    return null;
-  }
-
-  bool get _hasError => _error != null && _error!.isNotEmpty;
-
-  @override
-  Widget build(BuildContext context) {
-    final themeData = Theme.of(context);
-
-    return TextFormField(
-      controller: widget.controller,
-      focusNode: _focusNode,
-      decoration: InputDecoration(
-        hintText: widget.hintText,
-        labelText: widget.label,
-        labelStyle: themeData.inputDecorationTheme.labelStyle?.copyWith(
-          color: _hasError ? themeData.colorScheme.error : null,
-        ),
-        errorText: _error,
-        suffixIcon: widget.suffixIcon,
-      ),
-      obscureText: widget.obscureText,
-      validator: _validateInput,
-      keyboardType: widget.keyboardType,
-      textInputAction: widget.keyboardAction,
-      autofillHints: widget.autofillHints,
-      onTap: () => setState(() => _error = null),
-      onTapOutside: (_) => _focusNode.unfocus(),
-      onFieldSubmitted: (value) => widget.onSubmit?.call(context, value),
-    );
-  }
-}

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

@@ -1,199 +0,0 @@
-/// Spacing constants for gaps between widgets
-abstract class ImmichSpacing {
-  const ImmichSpacing._();
-
-  /// Extra small spacing: 4.0
-  static const double xs = 4.0;
-
-  /// Small spacing: 8.0
-  static const double sm = 8.0;
-
-  /// Medium spacing (default): 12.0
-  static const double md = 12.0;
-
-  /// Large spacing: 16.0
-  static const double lg = 16.0;
-
-  /// Extra large spacing: 24.0
-  static const double xl = 24.0;
-
-  /// Extra extra large spacing: 32.0
-  static const double xxl = 32.0;
-
-  /// Extra extra extra large spacing: 48.0
-  static const double xxxl = 48.0;
-}
-
-/// Border radius constants for consistent rounded corners
-abstract class ImmichRadius {
-  const ImmichRadius._();
-
-  /// No radius: 0.0
-  static const double none = 0.0;
-
-  /// Extra small radius: 4.0
-  static const double xs = 4.0;
-
-  /// Small radius: 8.0
-  static const double sm = 8.0;
-
-  /// Medium radius (default): 12.0
-  static const double md = 12.0;
-
-  /// Large radius: 16.0
-  static const double lg = 16.0;
-
-  /// Extra large radius: 20.0
-  static const double xl = 20.0;
-
-  /// Extra extra large radius: 24.0
-  static const double xxl = 24.0;
-
-  /// Full circular radius: infinity
-  static const double full = double.infinity;
-}
-
-/// Icon size constants for consistent icon sizing
-abstract class ImmichIconSize {
-  const ImmichIconSize._();
-
-  /// Extra small icon: 16.0
-  static const double xs = 16.0;
-
-  /// Small icon: 20.0
-  static const double sm = 20.0;
-
-  /// Medium icon (default): 24.0
-  static const double md = 24.0;
-
-  /// Large icon: 32.0
-  static const double lg = 32.0;
-
-  /// Extra large icon: 40.0
-  static const double xl = 40.0;
-
-  /// Extra extra large icon: 48.0
-  static const double xxl = 48.0;
-}
-
-/// Animation duration constants for consistent timing
-abstract class ImmichDuration {
-  const ImmichDuration._();
-
-  /// Extra fast: 100ms
-  static const Duration extraFast = Duration(milliseconds: 100);
-
-  /// Fast: 150ms
-  static const Duration fast = Duration(milliseconds: 150);
-
-  /// Normal: 200ms
-  static const Duration normal = Duration(milliseconds: 200);
-
-  /// Moderate: 300ms
-  static const Duration moderate = Duration(milliseconds: 300);
-
-  /// Slow: 500ms
-  static const Duration slow = Duration(milliseconds: 500);
-
-  /// Extra slow: 700ms
-  static const Duration extraSlow = Duration(milliseconds: 700);
-}
-
-/// Elevation constants for consistent shadows and depth
-abstract class ImmichElevation {
-  const ImmichElevation._();
-
-  /// No elevation: 0.0
-  static const double none = 0.0;
-
-  /// Extra small elevation: 1.0
-  static const double xs = 1.0;
-
-  /// Small elevation: 2.0
-  static const double sm = 2.0;
-
-  /// Medium elevation: 4.0
-  static const double md = 4.0;
-
-  /// Large elevation: 8.0
-  static const double lg = 8.0;
-
-  /// Extra large elevation: 12.0
-  static const double xl = 12.0;
-
-  /// Extra extra large elevation: 16.0
-  static const double xxl = 16.0;
-}
-
-/// Border width constants (similar to Tailwind's border-* scale)
-abstract class ImmichBorderWidth {
-  const ImmichBorderWidth._();
-
-  /// No border: 0.0
-  static const double none = 0.0;
-
-  /// Hairline border: 0.5
-  static const double hairline = 0.5;
-
-  /// Default border: 1.0 (border)
-  static const double base = 1.0;
-
-  /// Medium border: 2.0 (border-2)
-  static const double md = 2.0;
-
-  /// Large border: 3.0 (border-4)
-  static const double lg = 3.0;
-
-  /// Extra large border: 4.0
-  static const double xl = 4.0;
-}
-
-/// Text size constants with semantic HTML-like naming
-/// These follow a type scale for harmonious text hierarchy
-abstract class ImmichTextSize {
-  const ImmichTextSize._();
-
-  /// Caption text: 10.0
-  /// Use for: Tiny labels, legal text, metadata, timestamps
-  static const double caption = 10.0;
-
-  /// Label text: 12.0
-  /// Use for: Form labels, secondary text, helper text
-  static const double label = 12.0;
-
-  /// Body text: 14.0 (default)
-  /// Use for: Main body text, paragraphs, default UI text
-  static const double body = 14.0;
-
-  /// Body emphasized: 16.0
-  /// Use for: Emphasized body text, button labels, tabs
-  static const double bodyLarge = 16.0;
-
-  /// Heading 6: 18.0 (smallest heading)
-  /// Use for: Subtitles, card titles, section headers
-  static const double h6 = 18.0;
-
-  /// Heading 5: 20.0
-  /// Use for: Small headings, prominent labels
-  static const double h5 = 20.0;
-
-  /// Heading 4: 24.0
-  /// Use for: Page titles, dialog titles
-  static const double h4 = 24.0;
-
-  /// Heading 3: 30.0
-  /// Use for: Section headings, large headings
-  static const double h3 = 30.0;
-
-  /// Heading 2: 36.0
-  /// Use for: Major section headings
-  static const double h2 = 36.0;
-
-  /// Heading 1: 48.0 (largest heading)
-  /// Use for: Page hero headings, main titles
-  static const double h1 = 48.0;
-
-  /// Display text: 60.0
-  /// Use for: Hero numbers, splash screens, extra large display
-  static const double display = 60.0;
-}

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

@@ -1,6 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_ui/src/translation.dart';
-
-extension TranslationHelper on BuildContext {
-  ImmichTranslations get translations => ImmichTranslationProvider.of(this);
-}

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

@@ -1,42 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_ui/src/constants.dart';
-
-class ImmichThemeProvider extends StatelessWidget {
-  final ColorScheme colorScheme;
-  final Widget child;
-
-  const ImmichThemeProvider({super.key, required this.colorScheme, required this.child});
-
-  @override
-  Widget build(BuildContext context) {
-    return Theme(
-      data: Theme.of(context).copyWith(
-        colorScheme: colorScheme,
-        brightness: colorScheme.brightness,
-        inputDecorationTheme: InputDecorationTheme(
-          floatingLabelBehavior: FloatingLabelBehavior.always,
-          focusedBorder: OutlineInputBorder(
-            borderSide: BorderSide(color: colorScheme.primary),
-            borderRadius: const BorderRadius.all(Radius.circular(ImmichRadius.md)),
-          ),
-          enabledBorder: OutlineInputBorder(
-            borderSide: BorderSide(color: colorScheme.primary),
-            borderRadius: const BorderRadius.all(Radius.circular(ImmichRadius.md)),
-          ),
-          errorBorder: OutlineInputBorder(
-            borderSide: BorderSide(color: colorScheme.error),
-            borderRadius: const BorderRadius.all(Radius.circular(ImmichRadius.md)),
-          ),
-          focusedErrorBorder: OutlineInputBorder(
-            borderSide: BorderSide(color: colorScheme.error),
-            borderRadius: const BorderRadius.all(Radius.circular(ImmichRadius.md)),
-          ),
-          labelStyle: TextStyle(color: colorScheme.primary, fontWeight: FontWeight.w600),
-          hintStyle: const TextStyle(fontSize: ImmichTextSize.body),
-          errorStyle: TextStyle(color: colorScheme.error, fontWeight: FontWeight.w600),
-        ),
-      ),
-      child: child,
-    );
-  }
-}

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

@@ -1,31 +0,0 @@
-import 'package:flutter/material.dart';
-
-class ImmichTranslations {
-  late String submit;
-  late String password;
-
-  ImmichTranslations({String? submit, String? password}) {
-    this.submit = submit ?? 'Submit';
-    this.password = password ?? 'Password';
-  }
-}
-
-class ImmichTranslationProvider extends InheritedWidget {
-  final ImmichTranslations? translations;
-
-  const ImmichTranslationProvider({
-    super.key,
-    this.translations,
-    required super.child,
-  });
-
-  static ImmichTranslations of(BuildContext context) {
-    final provider = context.dependOnInheritedWidgetOfExactType<ImmichTranslationProvider>();
-    return provider?.translations ?? ImmichTranslations();
-  }
-
-  @override
-  bool updateShouldNotify(covariant ImmichTranslationProvider oldWidget) {
-    return oldWidget.translations != translations;
-  }
-}

mobile/test/domain/repositories/sync_stream_repository_test.dart

@@ -1,185 +0,0 @@
-import 'package:drift/drift.dart' as drift;
-import 'package:drift/native.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/sync_stream.repository.dart';
-import 'package:openapi/api.dart';
-
-SyncUserV1 _createUser({String id = 'user-1'}) {
-  return SyncUserV1(
-    id: id,
-    name: 'Test User',
-    email: 'test@test.com',
-    deletedAt: null,
-    avatarColor: null,
-    hasProfileImage: false,
-    profileChangedAt: DateTime(2024, 1, 1),
-  );
-}
-
-SyncAssetV1 _createAsset({
-  required String id,
-  required String checksum,
-  required String fileName,
-  String ownerId = 'user-1',
-  int? width,
-  int? height,
-}) {
-  return SyncAssetV1(
-    id: id,
-    checksum: checksum,
-    originalFileName: fileName,
-    type: AssetTypeEnum.IMAGE,
-    ownerId: ownerId,
-    isFavorite: false,
-    fileCreatedAt: DateTime(2024, 1, 1),
-    fileModifiedAt: DateTime(2024, 1, 1),
-    localDateTime: DateTime(2024, 1, 1),
-    visibility: AssetVisibility.timeline,
-    width: width,
-    height: height,
-    deletedAt: null,
-    duration: null,
-    libraryId: null,
-    livePhotoVideoId: null,
-    stackId: null,
-    thumbhash: null,
-  );
-}
-
-SyncAssetExifV1 _createExif({
-  required String assetId,
-  required int width,
-  required int height,
-  required String orientation,
-}) {
-  return SyncAssetExifV1(
-    assetId: assetId,
-    exifImageWidth: width,
-    exifImageHeight: height,
-    orientation: orientation,
-    city: null,
-    country: null,
-    dateTimeOriginal: null,
-    description: null,
-    exposureTime: null,
-    fNumber: null,
-    fileSizeInByte: null,
-    focalLength: null,
-    fps: null,
-    iso: null,
-    latitude: null,
-    lensModel: null,
-    longitude: null,
-    make: null,
-    model: null,
-    modifyDate: null,
-    profileDescription: null,
-    projectionType: null,
-    rating: null,
-    state: null,
-    timeZone: null,
-  );
-}
-
-void main() {
-  late Drift db;
-  late SyncStreamRepository sut;
-
-  setUp(() async {
-    db = Drift(drift.DatabaseConnection(NativeDatabase.memory(), closeStreamsSynchronously: true));
-    sut = SyncStreamRepository(db);
-  });
-
-  tearDown(() async {
-    await db.close();
-  });
-
-  group('SyncStreamRepository - Dimension swapping based on orientation', () {
-    test('swaps dimensions for asset with rotated orientation', () async {
-      final flippedOrientations = ['5', '6', '7', '8', '90', '-90'];
-
-      for (final orientation in flippedOrientations) {
-        final assetId = 'asset-$orientation-degrees';
-
-        await sut.updateUsersV1([_createUser()]);
-
-        final asset = _createAsset(
-          id: assetId,
-          checksum: 'checksum-$orientation',
-          fileName: 'rotated_$orientation.jpg',
-        );
-        await sut.updateAssetsV1([asset]);
-
-        final exif = _createExif(
-          assetId: assetId,
-          width: 1920,
-          height: 1080,
-          orientation: orientation, // EXIF orientation value for 90 degrees CW
-        );
-        await sut.updateAssetsExifV1([exif]);
-
-        final query = db.remoteAssetEntity.select()..where((tbl) => tbl.id.equals(assetId));
-        final result = await query.getSingle();
-
-        expect(result.width, equals(1080));
-        expect(result.height, equals(1920));
-      }
-    });
-
-    test('does not swap dimensions for asset with normal orientation', () async {
-      final nonFlippedOrientations = ['1', '2', '3', '4'];
-      for (final orientation in nonFlippedOrientations) {
-        final assetId = 'asset-$orientation-degrees';
-
-        await sut.updateUsersV1([_createUser()]);
-
-        final asset = _createAsset(id: assetId, checksum: 'checksum-$orientation', fileName: 'normal_$orientation.jpg');
-        await sut.updateAssetsV1([asset]);
-
-        final exif = _createExif(
-          assetId: assetId,
-          width: 1920,
-          height: 1080,
-          orientation: orientation, // EXIF orientation value for normal
-        );
-        await sut.updateAssetsExifV1([exif]);
-
-        final query = db.remoteAssetEntity.select()..where((tbl) => tbl.id.equals(assetId));
-        final result = await query.getSingle();
-
-        expect(result.width, equals(1920));
-        expect(result.height, equals(1080));
-      }
-    });
-
-    test('does not update dimensions if asset already has width and height', () async {
-      const assetId = 'asset-with-dimensions';
-      const existingWidth = 1920;
-      const existingHeight = 1080;
-      const exifWidth = 3840;
-      const exifHeight = 2160;
-
-      await sut.updateUsersV1([_createUser()]);
-
-      final asset = _createAsset(
-        id: assetId,
-        checksum: 'checksum-with-dims',
-        fileName: 'with_dimensions.jpg',
-        width: existingWidth,
-        height: existingHeight,
-      );
-      await sut.updateAssetsV1([asset]);
-
-      final exif = _createExif(assetId: assetId, width: exifWidth, height: exifHeight, orientation: '6');
-      await sut.updateAssetsExifV1([exif]);
-
-      // Verify the asset still has original dimensions (not updated from EXIF)
-      final query = db.remoteAssetEntity.select()..where((tbl) => tbl.id.equals(assetId));
-      final result = await query.getSingle();
-
-      expect(result.width, equals(existingWidth), reason: 'Width should remain as originally set');
-      expect(result.height, equals(existingHeight), reason: 'Height should remain as originally set');
-    });
-  });
-}

mobile/test/domain/services/asset.service_test.dart

@@ -166,8 +166,8 @@ void main() {
       expect(result, 1080 / 1920);
     });
 
-    test('should not flip remote asset dimensions', () async {
-      final flippedOrientations = ['1', '2', '3', '4', '5', '6', '7', '8', '90', '-90'];
+    test('handles various flipped EXIF orientations correctly', () async {
+      final flippedOrientations = ['5', '6', '7', '8', '90', '-90'];
 
       for (final orientation in flippedOrientations) {
         final remoteAsset = TestUtils.createRemoteAsset(id: 'remote-$orientation', width: 1920, height: 1080);
@@ -178,7 +178,23 @@ void main() {
 
         final result = await sut.getAspectRatio(remoteAsset);
 
-        expect(result, 1920 / 1080, reason: 'Should not flipped remote asset dimensions for orientation $orientation');
+        expect(result, 1080 / 1920, reason: 'Orientation $orientation should flip dimensions');
+      }
+    });
+
+    test('handles various non-flipped EXIF orientations correctly', () async {
+      final nonFlippedOrientations = ['1', '2', '3', '4'];
+
+      for (final orientation in nonFlippedOrientations) {
+        final remoteAsset = TestUtils.createRemoteAsset(id: 'remote-$orientation', width: 1920, height: 1080);
+
+        final exif = ExifInfo(orientation: orientation);
+
+        when(() => mockRemoteAssetRepository.getExif('remote-$orientation')).thenAnswer((_) async => exif);
+
+        final result = await sut.getAspectRatio(remoteAsset);
+
+        expect(result, 1920 / 1080, reason: 'Orientation $orientation should NOT flip dimensions');
       }
     });
   });

mobile/test/fixtures/sync_stream.stub.dart

@@ -94,11 +94,25 @@ abstract final class SyncStreamStub {
     required String ack,
     DateTime? trashedAt,
   }) {
-    return _assetV1(id: id, checksum: checksum, deletedAt: trashedAt ?? DateTime(2025, 1, 1), ack: ack);
+    return _assetV1(
+      id: id,
+      checksum: checksum,
+      deletedAt: trashedAt ?? DateTime(2025, 1, 1),
+      ack: ack,
+    );
   }
 
-  static SyncEvent assetModified({required String id, required String checksum, required String ack}) {
-    return _assetV1(id: id, checksum: checksum, deletedAt: null, ack: ack);
+  static SyncEvent assetModified({
+    required String id,
+    required String checksum,
+    required String ack,
+  }) {
+    return _assetV1(
+      id: id,
+      checksum: checksum,
+      deletedAt: null,
+      ack: ack,
+    );
   }
 
   static SyncEvent _assetV1({
@@ -126,8 +140,6 @@ abstract final class SyncStreamStub {
         thumbhash: null,
         type: AssetTypeEnum.IMAGE,
         visibility: AssetVisibility.timeline,
-        width: null,
-        height: null,
       ),
       ack: ack,
     );

mobile/test/infrastructure/repositories/local_asset_repository_test.dart

@@ -1,438 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:drift/native.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/album/local_album.model.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/entities/user.entity.drift.dart';
-import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
-
-void main() {
-  late Drift db;
-  late DriftLocalAssetRepository repository;
-
-  setUp(() {
-    db = Drift(DatabaseConnection(NativeDatabase.memory(), closeStreamsSynchronously: true));
-    repository = DriftLocalAssetRepository(db);
-  });
-
-  tearDown(() async {
-    await db.close();
-  });
-
-  group('getRemovalCandidates', () {
-    final userId = 'user-123';
-    final otherUserId = 'user-456';
-    final now = DateTime(2024, 1, 15);
-    final cutoffDate = DateTime(2024, 1, 10);
-    final beforeCutoff = DateTime(2024, 1, 5);
-    final afterCutoff = DateTime(2024, 1, 12);
-
-    Future<void> insertUser(String id, String email) async {
-      await db.into(db.userEntity).insert(UserEntityCompanion.insert(id: id, email: email, name: email));
-    }
-
-    setUp(() async {
-      await insertUser(userId, 'user@test.com');
-      await insertUser(otherUserId, 'other@test.com');
-    });
-
-    Future<void> insertLocalAsset({
-      required String id,
-      required String checksum,
-      required DateTime createdAt,
-      required AssetType type,
-      required bool isFavorite,
-    }) async {
-      await db
-          .into(db.localAssetEntity)
-          .insert(
-            LocalAssetEntityCompanion.insert(
-              id: id,
-              name: 'asset_$id.jpg',
-              checksum: Value(checksum),
-              type: type,
-              createdAt: Value(createdAt),
-              updatedAt: Value(createdAt),
-              isFavorite: Value(isFavorite),
-            ),
-          );
-    }
-
-    Future<void> insertRemoteAsset({
-      required String id,
-      required String checksum,
-      required String ownerId,
-      DateTime? deletedAt,
-    }) async {
-      await db
-          .into(db.remoteAssetEntity)
-          .insert(
-            RemoteAssetEntityCompanion.insert(
-              id: id,
-              name: 'remote_$id.jpg',
-              checksum: checksum,
-              type: AssetType.image,
-              createdAt: Value(now),
-              updatedAt: Value(now),
-              ownerId: ownerId,
-              visibility: AssetVisibility.timeline,
-              deletedAt: Value(deletedAt),
-            ),
-          );
-    }
-
-    Future<void> insertLocalAlbum({required String id, required String name, required bool isIosSharedAlbum}) async {
-      await db
-          .into(db.localAlbumEntity)
-          .insert(
-            LocalAlbumEntityCompanion.insert(
-              id: id,
-              name: name,
-              updatedAt: Value(now),
-              backupSelection: BackupSelection.none,
-              isIosSharedAlbum: Value(isIosSharedAlbum),
-            ),
-          );
-    }
-
-    Future<void> insertLocalAlbumAsset({required String albumId, required String assetId}) async {
-      await db
-          .into(db.localAlbumAssetEntity)
-          .insert(LocalAlbumAssetEntityCompanion.insert(albumId: albumId, assetId: assetId));
-    }
-
-    test('returns only assets that match all criteria', () async {
-      // Asset 1: Should be included - backed up, before cutoff, correct owner, not deleted, not favorite
-      await insertLocalAsset(
-        id: 'local-1',
-        checksum: 'checksum-1',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-1', checksum: 'checksum-1', ownerId: userId);
-
-      // Asset 2: Should NOT be included - not backed up (no remote asset)
-      await insertLocalAsset(
-        id: 'local-2',
-        checksum: 'checksum-2',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-
-      // Asset 3: Should NOT be included - after cutoff date
-      await insertLocalAsset(
-        id: 'local-3',
-        checksum: 'checksum-3',
-        createdAt: afterCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-3', checksum: 'checksum-3', ownerId: userId);
-
-      // Asset 4: Should NOT be included - different owner
-      await insertLocalAsset(
-        id: 'local-4',
-        checksum: 'checksum-4',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-4', checksum: 'checksum-4', ownerId: otherUserId);
-
-      // Asset 5: Should NOT be included - remote asset is deleted
-      await insertLocalAsset(
-        id: 'local-5',
-        checksum: 'checksum-5',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-5', checksum: 'checksum-5', ownerId: userId, deletedAt: now);
-
-      // Asset 6: Should NOT be included - is favorite (when keepFavorites=true)
-      await insertLocalAsset(
-        id: 'local-6',
-        checksum: 'checksum-6',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: true,
-      );
-      await insertRemoteAsset(id: 'remote-6', checksum: 'checksum-6', ownerId: userId);
-
-      final candidates = await repository.getRemovalCandidates(userId, cutoffDate, keepFavorites: true);
-
-      expect(candidates.length, 1);
-      expect(candidates[0].id, 'local-1');
-    });
-
-    test('includes favorites when keepFavorites is false', () async {
-      await insertLocalAsset(
-        id: 'local-favorite',
-        checksum: 'checksum-fav',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: true,
-      );
-      await insertRemoteAsset(id: 'remote-favorite', checksum: 'checksum-fav', ownerId: userId);
-
-      final candidates = await repository.getRemovalCandidates(userId, cutoffDate, keepFavorites: false);
-
-      expect(candidates.length, 1);
-      expect(candidates[0].id, 'local-favorite');
-      expect(candidates[0].isFavorite, true);
-    });
-
-    test('filters by photos only', () async {
-      // Photo
-      await insertLocalAsset(
-        id: 'local-photo',
-        checksum: 'checksum-photo',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-photo', checksum: 'checksum-photo', ownerId: userId);
-
-      // Video
-      await insertLocalAsset(
-        id: 'local-video',
-        checksum: 'checksum-video',
-        createdAt: beforeCutoff,
-        type: AssetType.video,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-video', checksum: 'checksum-video', ownerId: userId);
-
-      final candidates = await repository.getRemovalCandidates(
-        userId,
-        cutoffDate,
-        filterType: AssetFilterType.photosOnly,
-      );
-
-      expect(candidates.length, 1);
-      expect(candidates[0].id, 'local-photo');
-      expect(candidates[0].type, AssetType.image);
-    });
-
-    test('filters by videos only', () async {
-      // Photo
-      await insertLocalAsset(
-        id: 'local-photo',
-        checksum: 'checksum-photo',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-photo', checksum: 'checksum-photo', ownerId: userId);
-
-      // Video
-      await insertLocalAsset(
-        id: 'local-video',
-        checksum: 'checksum-video',
-        createdAt: beforeCutoff,
-        type: AssetType.video,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-video', checksum: 'checksum-video', ownerId: userId);
-
-      final candidates = await repository.getRemovalCandidates(
-        userId,
-        cutoffDate,
-        filterType: AssetFilterType.videosOnly,
-      );
-
-      expect(candidates.length, 1);
-      expect(candidates[0].id, 'local-video');
-      expect(candidates[0].type, AssetType.video);
-    });
-
-    test('returns both photos and videos with filterType.all', () async {
-      // Photo
-      await insertLocalAsset(
-        id: 'local-photo',
-        checksum: 'checksum-photo',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-photo', checksum: 'checksum-photo', ownerId: userId);
-
-      // Video
-      await insertLocalAsset(
-        id: 'local-video',
-        checksum: 'checksum-video',
-        createdAt: beforeCutoff,
-        type: AssetType.video,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-video', checksum: 'checksum-video', ownerId: userId);
-
-      final candidates = await repository.getRemovalCandidates(userId, cutoffDate, filterType: AssetFilterType.all);
-
-      expect(candidates.length, 2);
-      final ids = candidates.map((a) => a.id).toSet();
-      expect(ids, containsAll(['local-photo', 'local-video']));
-    });
-
-    test('excludes assets in iOS shared albums', () async {
-      // Regular album
-      await insertLocalAlbum(id: 'album-regular', name: 'Regular Album', isIosSharedAlbum: false);
-
-      // iOS shared album
-      await insertLocalAlbum(id: 'album-shared', name: 'Shared Album', isIosSharedAlbum: true);
-
-      // Asset in regular album (should be included)
-      await insertLocalAsset(
-        id: 'local-regular',
-        checksum: 'checksum-regular',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-regular', checksum: 'checksum-regular', ownerId: userId);
-      await insertLocalAlbumAsset(albumId: 'album-regular', assetId: 'local-regular');
-
-      // Asset in iOS shared album (should be excluded)
-      await insertLocalAsset(
-        id: 'local-shared',
-        checksum: 'checksum-shared',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-shared', checksum: 'checksum-shared', ownerId: userId);
-      await insertLocalAlbumAsset(albumId: 'album-shared', assetId: 'local-shared');
-
-      final candidates = await repository.getRemovalCandidates(userId, cutoffDate);
-
-      expect(candidates.length, 1);
-      expect(candidates[0].id, 'local-regular');
-    });
-
-    test('includes assets at exact cutoff date', () async {
-      await insertLocalAsset(
-        id: 'local-exact',
-        checksum: 'checksum-exact',
-        createdAt: cutoffDate,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-exact', checksum: 'checksum-exact', ownerId: userId);
-
-      final candidates = await repository.getRemovalCandidates(userId, cutoffDate);
-
-      expect(candidates.length, 1);
-      expect(candidates[0].id, 'local-exact');
-    });
-
-    test('returns empty list when no assets match criteria', () async {
-      // Only assets after cutoff
-      await insertLocalAsset(
-        id: 'local-after',
-        checksum: 'checksum-after',
-        createdAt: afterCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-after', checksum: 'checksum-after', ownerId: userId);
-
-      final candidates = await repository.getRemovalCandidates(userId, cutoffDate);
-
-      expect(candidates, isEmpty);
-    });
-
-    test('handles multiple assets with same checksum', () async {
-      // Two local assets with same checksum (edge case, but should handle it)
-      await insertLocalAsset(
-        id: 'local-dup1',
-        checksum: 'checksum-dup',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertLocalAsset(
-        id: 'local-dup2',
-        checksum: 'checksum-dup',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-dup', checksum: 'checksum-dup', ownerId: userId);
-
-      final candidates = await repository.getRemovalCandidates(userId, cutoffDate);
-
-      expect(candidates.length, 2);
-      expect(candidates.map((a) => a.checksum).toSet(), equals({'checksum-dup'}));
-    });
-
-    test('includes assets not in any album', () async {
-      // Asset not in any album should be included
-      await insertLocalAsset(
-        id: 'local-no-album',
-        checksum: 'checksum-no-album',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-no-album', checksum: 'checksum-no-album', ownerId: userId);
-
-      final candidates = await repository.getRemovalCandidates(userId, cutoffDate);
-
-      expect(candidates.length, 1);
-      expect(candidates[0].id, 'local-no-album');
-    });
-
-    test('excludes asset that is in both regular and iOS shared album', () async {
-      // Regular album
-      await insertLocalAlbum(id: 'album-regular', name: 'Regular Album', isIosSharedAlbum: false);
-
-      // iOS shared album
-      await insertLocalAlbum(id: 'album-shared', name: 'Shared Album', isIosSharedAlbum: true);
-
-      // Asset in BOTH albums - should be excluded because it's in an iOS shared album
-      await insertLocalAsset(
-        id: 'local-both',
-        checksum: 'checksum-both',
-        createdAt: beforeCutoff,
-        type: AssetType.image,
-        isFavorite: false,
-      );
-      await insertRemoteAsset(id: 'remote-both', checksum: 'checksum-both', ownerId: userId);
-      await insertLocalAlbumAsset(albumId: 'album-regular', assetId: 'local-both');
-      await insertLocalAlbumAsset(albumId: 'album-shared', assetId: 'local-both');
-
-      final candidates = await repository.getRemovalCandidates(userId, cutoffDate);
-
-      expect(candidates, isEmpty);
-    });
-
-    test('excludes assets with null checksum (not backed up)', () async {
-      // Asset with null checksum cannot be matched to remote asset
-      await db
-          .into(db.localAssetEntity)
-          .insert(
-            LocalAssetEntityCompanion.insert(
-              id: 'local-null-checksum',
-              name: 'asset_null.jpg',
-              checksum: const Value.absent(), // null checksum
-              type: AssetType.image,
-              createdAt: Value(beforeCutoff),
-              updatedAt: Value(beforeCutoff),
-              isFavorite: const Value(false),
-            ),
-          );
-
-      final candidates = await repository.getRemovalCandidates(userId, cutoffDate);
-
-      expect(candidates, isEmpty);
-    });
-  });
-}

mobile/test/modules/utils/openapi_patching_test.dart

@@ -45,17 +45,5 @@ void main() {
       addDefault(value, keys, defaultValue);
       expect(value['alpha']['beta'], 'gamma');
     });
-
-    test('addDefault with null', () {
-      dynamic value = jsonDecode("""
-{
-  "download": {
-    "archiveSize": 4294967296,
-    "includeEmbeddedVideos": false
-  }
-}
-""");
-      expect(value['download']['unknownKey'], isNull);
-    });
   });
 }

open-api/immich-openapi-specs.json

@@ -3340,7 +3340,7 @@
             "required": true,
             "in": "path",
             "schema": {
-              "type": "string"
+              "$ref": "#/components/schemas/AssetMetadataKey"
             }
           }
         ],
@@ -3399,7 +3399,7 @@
             "required": true,
             "in": "path",
             "schema": {
-              "type": "string"
+              "$ref": "#/components/schemas/AssetMetadataKey"
             }
           }
         ],
@@ -3676,15 +3676,6 @@
         "description": "Retrieve the thumbnail image for the specified asset.",
         "operationId": "viewAsset",
         "parameters": [
-          {
-            "name": "edited",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "default": false,
-              "type": "boolean"
-            }
-          },
           {
             "name": "id",
             "required": true,
@@ -15508,7 +15499,8 @@
           "deviceAssetId",
           "deviceId",
           "fileCreatedAt",
-          "fileModifiedAt"
+          "fileModifiedAt",
+          "metadata"
         ],
         "type": "object"
       },
@@ -15583,10 +15575,20 @@
         ],
         "type": "string"
       },
+      "AssetMetadataKey": {
+        "enum": [
+          "mobile-app"
+        ],
+        "type": "string"
+      },
       "AssetMetadataResponseDto": {
         "properties": {
           "key": {
-            "type": "string"
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/AssetMetadataKey"
+              }
+            ]
           },
           "updatedAt": {
             "format": "date-time",
@@ -15620,7 +15622,11 @@
       "AssetMetadataUpsertItemDto": {
         "properties": {
           "key": {
-            "type": "string"
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/AssetMetadataKey"
+              }
+            ]
           },
           "value": {
             "type": "object"
@@ -15764,10 +15770,6 @@
           "hasMetadata": {
             "type": "boolean"
           },
-          "height": {
-            "nullable": true,
-            "type": "number"
-          },
           "id": {
             "type": "string"
           },
@@ -15888,10 +15890,6 @@
                 "$ref": "#/components/schemas/AssetVisibility"
               }
             ]
-          },
-          "width": {
-            "nullable": true,
-            "type": "number"
           }
         },
         "required": [
@@ -15903,7 +15901,6 @@
           "fileCreatedAt",
           "fileModifiedAt",
           "hasMetadata",
-          "height",
           "id",
           "isArchived",
           "isFavorite",
@@ -15916,8 +15913,7 @@
           "thumbhash",
           "type",
           "updatedAt",
-          "visibility",
-          "width"
+          "visibility"
         ],
         "type": "object"
       },
@@ -20655,7 +20651,11 @@
             "type": "string"
           },
           "key": {
-            "type": "string"
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/AssetMetadataKey"
+              }
+            ]
           }
         },
         "required": [
@@ -20670,7 +20670,11 @@
             "type": "string"
           },
           "key": {
-            "type": "string"
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/AssetMetadataKey"
+              }
+            ]
           },
           "value": {
             "type": "object"
@@ -20707,10 +20711,6 @@
             "nullable": true,
             "type": "string"
           },
-          "height": {
-            "nullable": true,
-            "type": "integer"
-          },
           "id": {
             "type": "string"
           },
@@ -20757,10 +20757,6 @@
                 "$ref": "#/components/schemas/AssetVisibility"
               }
             ]
-          },
-          "width": {
-            "nullable": true,
-            "type": "integer"
           }
         },
         "required": [
@@ -20769,7 +20765,6 @@
           "duration",
           "fileCreatedAt",
           "fileModifiedAt",
-          "height",
           "id",
           "isFavorite",
           "libraryId",
@@ -20780,8 +20775,7 @@
           "stackId",
           "thumbhash",
           "type",
-          "visibility",
-          "width"
+          "visibility"
         ],
         "type": "object"
       },

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

@@ -8,7 +8,7 @@ import * as Oazapfts from "@oazapfts/runtime";
 import * as QS from "@oazapfts/runtime/query";
 export const defaults: Oazapfts.Defaults<Oazapfts.CustomHeaders> = {
     headers: {},
-    baseUrl: "/api"
+    baseUrl: "/api",
 };
 const oazapfts = Oazapfts.runtime(defaults);
 export const servers = {
@@ -349,7 +349,6 @@ export type AssetResponseDto = {
     /** The UTC timestamp when the file was last modified on the filesystem. This reflects the last time the physical file was changed, which may be different from when the photo was originally taken. */
     fileModifiedAt: string;
     hasMetadata: boolean;
-    height: number | null;
     id: string;
     isArchived: boolean;
     isFavorite: boolean;
@@ -374,7 +373,6 @@ export type AssetResponseDto = {
     /** The UTC timestamp when the asset record was last updated in the database. This is automatically maintained by the database and reflects when any field in the asset was last modified. */
     updatedAt: string;
     visibility: AssetVisibility;
-    width: number | null;
 };
 export type ContributorCountResponseDto = {
     assetCount: number;
@@ -473,7 +471,7 @@ export type AssetBulkDeleteDto = {
     ids: string[];
 };
 export type AssetMetadataUpsertItemDto = {
-    key: string;
+    key: AssetMetadataKey;
     value: object;
 };
 export type AssetMediaCreateDto = {
@@ -486,7 +484,7 @@ export type AssetMediaCreateDto = {
     filename?: string;
     isFavorite?: boolean;
     livePhotoVideoId?: string;
-    metadata?: AssetMetadataUpsertItemDto[];
+    metadata: AssetMetadataUpsertItemDto[];
     sidecarData?: Blob;
     visibility?: AssetVisibility;
 };
@@ -556,7 +554,7 @@ export type UpdateAssetDto = {
     visibility?: AssetVisibility;
 };
 export type AssetMetadataResponseDto = {
-    key: string;
+    key: AssetMetadataKey;
     updatedAt: string;
     value: object;
 };
@@ -2566,7 +2564,7 @@ export function updateAssetMetadata({ id, assetMetadataUpsertDto }: {
  */
 export function deleteAssetMetadata({ id, key }: {
     id: string;
-    key: string;
+    key: AssetMetadataKey;
 }, opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchText(`/assets/${encodeURIComponent(id)}/metadata/${encodeURIComponent(key)}`, {
         ...opts,
@@ -2578,7 +2576,7 @@ export function deleteAssetMetadata({ id, key }: {
  */
 export function getAssetMetadataByKey({ id, key }: {
     id: string;
-    key: string;
+    key: AssetMetadataKey;
 }, opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
@@ -2642,8 +2640,7 @@ export function replaceAsset({ id, key, slug, assetMediaReplaceDto }: {
 /**
  * View asset thumbnail
  */
-export function viewAsset({ edited, id, key, size, slug }: {
-    edited?: boolean;
+export function viewAsset({ id, key, size, slug }: {
     id: string;
     key?: string;
     size?: AssetMediaSize;
@@ -2653,7 +2650,6 @@ export function viewAsset({ edited, id, key, size, slug }: {
         status: 200;
         data: Blob;
     }>(`/assets/${encodeURIComponent(id)}/thumbnail${QS.query(QS.explode({
-        edited,
         key,
         size,
         slug
@@ -5367,6 +5363,9 @@ export enum Permission {
     AdminSessionRead = "adminSession.read",
     AdminAuthUnlinkAll = "adminAuth.unlinkAll"
 }
+export enum AssetMetadataKey {
+    MobileApp = "mobile-app"
+}
 export enum AssetMediaStatus {
     Created = "created",
     Replaced = "replaced",