WIP

.github/package.json

@@ -4,6 +4,6 @@
     "format:fix": "prettier --write ."
   },
   "devDependencies": {
-    "prettier": "^3.7.4"
+    "prettier": "^3.5.3"
   }
 }

.github/workflows/build-mobile.yml

@@ -108,7 +108,7 @@ jobs:
         working-directory: ./mobile
         run: printf "%s" $KEY_JKS | base64 -d > android/key.jks
 
-      - uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
+      - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: 'zulu'
           java-version: '17'
@@ -222,7 +222,6 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.3'
-          bundler-cache: true
           working-directory: ./mobile/ios
 
       - name: Install CocoaPods dependencies
@@ -230,6 +229,13 @@ jobs:
         run: |
           pod install
 
+      - name: Install Fastlane
+        working-directory: ./mobile/ios
+        run: |
+          gem install bundler
+          bundle config set --local path 'vendor/bundle'
+          bundle install
+
       - name: Create API Key
         env:
           API_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ID }}

.github/workflows/cli.yml

@@ -44,7 +44,7 @@ jobs:
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version-file: './cli/.nvmrc'
           registry-url: 'https://registry.npmjs.org'

.github/workflows/codeql-analysis.yml

@@ -57,7 +57,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
+        uses: github/codeql-action/init@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -70,7 +70,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
+        uses: github/codeql-action/autobuild@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -83,6 +83,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
+        uses: github/codeql-action/analyze@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
         with:
           category: '/language:${{matrix.language}}'

.github/workflows/docs-build.yml

@@ -69,7 +69,7 @@ jobs:
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version-file: './docs/.nvmrc'
           cache: 'pnpm'

.github/workflows/fix-format.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
+        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -32,7 +32,7 @@ jobs:
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version-file: './server/.nvmrc'
           cache: 'pnpm'

.github/workflows/merge-translations.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Generate a token
         id: generate_token
         if: ${{ inputs.skip != true }}
-        uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
+        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}

.github/workflows/prepare-release.yml

@@ -49,7 +49,7 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
+        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -68,7 +68,7 @@ jobs:
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version-file: './server/.nvmrc'
           cache: 'pnpm'
@@ -126,7 +126,7 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
+        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -144,7 +144,7 @@ jobs:
           github-token: ${{ steps.generate-token.outputs.token }}
 
       - name: Create draft release
-        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
+        uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe # v2.4.2
         with:
           draft: true
           tag_name: ${{ env.IMMICH_VERSION }}

.github/workflows/release-pr.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
+        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -36,7 +36,7 @@ jobs:
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version-file: './server/.nvmrc'
           cache: 'pnpm'
@@ -159,7 +159,7 @@ jobs:
 
       - name: Create PR
         id: create-pr
-        uses: peter-evans/create-pull-request@22a9089034f40e5a961c8808d113e2c98fb63676 # v7.0.11
+        uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412 # v7.0.9
         with:
           token: ${{ steps.generate-token.outputs.token }}
           commit-message: 'chore: release ${{ steps.bump-type.outputs.next }}'

.github/workflows/release.yml

@@ -52,7 +52,7 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
+        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
         with:
           app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
@@ -80,7 +80,7 @@ jobs:
           github-token: ${{ steps.generate-token.outputs.token }}
 
       - name: Create draft release
-        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
+        uses: softprops/action-gh-release@5be0e66d93ac7ed76da52eca8bb058f665c3a5fe # v2.4.2
         with:
           tag_name: ${{ steps.version.outputs.result }}
           token: ${{ steps.generate-token.outputs.token }}

.github/workflows/sdk.yml

@@ -31,7 +31,7 @@ jobs:
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
 
       # Setup .npmrc file to publish to npm
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version-file: './open-api/typescript-sdk/.nvmrc'
           registry-url: 'https://registry.npmjs.org'

.github/workflows/test.yml

@@ -77,7 +77,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version-file: './server/.nvmrc'
           cache: 'pnpm'
@@ -121,7 +121,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version-file: './cli/.nvmrc'
           cache: 'pnpm'
@@ -168,7 +168,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version-file: './cli/.nvmrc'
           cache: 'pnpm'
@@ -210,7 +210,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version-file: './web/.nvmrc'
           cache: 'pnpm'
@@ -254,7 +254,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version-file: './web/.nvmrc'
           cache: 'pnpm'
@@ -292,7 +292,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version-file: './web/.nvmrc'
           cache: 'pnpm'
@@ -340,7 +340,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version-file: './e2e/.nvmrc'
           cache: 'pnpm'
@@ -387,7 +387,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version-file: './server/.nvmrc'
           cache: 'pnpm'
@@ -426,7 +426,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version-file: './e2e/.nvmrc'
           cache: 'pnpm'
@@ -481,7 +481,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version-file: './e2e/.nvmrc'
           cache: 'pnpm'
@@ -617,7 +617,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version-file: './.github/.nvmrc'
           cache: 'pnpm'
@@ -668,7 +668,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version-file: './server/.nvmrc'
           cache: 'pnpm'
@@ -730,7 +730,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Setup Node
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version-file: './server/.nvmrc'
           cache: 'pnpm'

cli/package.json

@@ -20,7 +20,7 @@
     "@types/lodash-es": "^4.17.12",
     "@types/micromatch": "^4.0.9",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "^24.10.3",
+    "@types/node": "^24.10.1",
     "@vitest/coverage-v8": "^3.0.0",
     "byte-size": "^9.0.0",
     "cli-progress": "^3.12.0",
@@ -31,7 +31,7 @@
     "eslint-plugin-unicorn": "^62.0.0",
     "globals": "^16.0.0",
     "mock-fs": "^5.2.0",
-    "prettier": "^3.7.4",
+    "prettier": "^3.2.5",
     "prettier-plugin-organize-imports": "^4.0.0",
     "typescript": "^5.3.3",
     "typescript-eslint": "^8.28.0",

docker/docker-compose.dev.yml

@@ -58,6 +58,10 @@ services:
       IMMICH_THIRD_PARTY_BUG_FEATURE_URL: https://github.com/immich-app/immich/issues
       IMMICH_THIRD_PARTY_DOCUMENTATION_URL: https://docs.immich.app
       IMMICH_THIRD_PARTY_SUPPORT_URL: https://docs.immich.app/community-guides
+    ulimits:
+      nofile:
+        soft: 1048576
+        hard: 1048576
     ports:
       - 9230:9230
       - 9231:9231
@@ -96,6 +100,10 @@ services:
       - app-node_modules:/usr/src/app/node_modules
       - sveltekit:/usr/src/app/web/.svelte-kit
       - coverage:/usr/src/app/web/coverage
+    ulimits:
+      nofile:
+        soft: 1048576
+        hard: 1048576
     restart: unless-stopped
     depends_on:
       immich-server:
@@ -127,7 +135,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: docker.io/valkey/valkey:9@sha256:fb8d272e529ea567b9bf1302245796f21a2672b8368ca3fcb938ac334e613c8f
+    image: docker.io/valkey/valkey:9@sha256:4503e204c900a00ad393bec83c8c7c4c76b0529cd629e23b34b52011aefd1d27
     healthcheck:
       test: redis-cli ping || exit 1
 

docker/docker-compose.prod.yml

@@ -56,7 +56,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: docker.io/valkey/valkey:9@sha256:fb8d272e529ea567b9bf1302245796f21a2672b8368ca3fcb938ac334e613c8f
+    image: docker.io/valkey/valkey:9@sha256:4503e204c900a00ad393bec83c8c7c4c76b0529cd629e23b34b52011aefd1d27
     healthcheck:
       test: redis-cli ping || exit 1
     restart: always
@@ -83,7 +83,7 @@ services:
     container_name: immich_prometheus
     ports:
       - 9090:9090
-    image: prom/prometheus@sha256:d936808bdea528155c0154a922cd42fd75716b8bb7ba302641350f9f3eaeba09
+    image: prom/prometheus@sha256:49214755b6153f90a597adcbff0252cc61069f8ab69ce8411285cd4a560e8038
     volumes:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml
       - prometheus-data:/prometheus

docker/docker-compose.yml

@@ -49,7 +49,7 @@ services:
 
   redis:
     container_name: immich_redis
-    image: docker.io/valkey/valkey:9@sha256:fb8d272e529ea567b9bf1302245796f21a2672b8368ca3fcb938ac334e613c8f
+    image: docker.io/valkey/valkey:9@sha256:4503e204c900a00ad393bec83c8c7c4c76b0529cd629e23b34b52011aefd1d27
     healthcheck:
       test: redis-cli ping || exit 1
     restart: always

docs/docs/administration/reverse-proxy.md

@@ -24,9 +24,6 @@ server {
     # disable buffering uploads to prevent OOM on reverse proxy server and make uploads twice as fast (no pause)
     proxy_request_buffering off;
 
-    # increase body buffer to avoid limiting upload speed
-    client_body_buffer_size 1024k;
-
     # Set headers
     proxy_set_header Host              $host;
     proxy_set_header X-Real-IP         $remote_addr;
@@ -35,6 +32,8 @@ server {
 
     # enable websockets: http://nginx.org/en/docs/http/websocket.html
     proxy_http_version 1.1;
+    proxy_set_header   Upgrade    $http_upgrade;
+    proxy_set_header   Connection "upgrade";
     proxy_redirect     off;
 
     # set timeout
@@ -44,8 +43,6 @@ server {
 
     location / {
         proxy_pass http://<backend_url>:2283;
-        proxy_set_header   Upgrade    $http_upgrade;
-        proxy_set_header   Connection "upgrade";
     }
 
     # useful when using Let's Encrypt http-01 challenge

docs/docs/administration/server-commands.md

@@ -52,7 +52,7 @@ Password login has been enabled.
 Disable Maintenance Mode
 
 ```
-immich-admin disable-maintenance-mode
+immich-admin disable-maintenace-mode
 Maintenance mode has been disabled.
 ```
 

docs/package.json

@@ -38,7 +38,7 @@
     "@docusaurus/module-type-aliases": "~3.9.0",
     "@docusaurus/tsconfig": "^3.7.0",
     "@docusaurus/types": "^3.7.0",
-    "prettier": "^3.7.4",
+    "prettier": "^3.2.4",
     "typescript": "^5.1.6"
   },
   "browserslist": {

e2e/package.json

@@ -26,7 +26,7 @@
     "@playwright/test": "^1.44.1",
     "@socket.io/component-emitter": "^3.1.2",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^24.10.3",
+    "@types/node": "^24.10.1",
     "@types/oidc-provider": "^9.0.0",
     "@types/pg": "^8.15.1",
     "@types/pngjs": "^6.0.4",
@@ -36,14 +36,14 @@
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-unicorn": "^62.0.0",
-    "exiftool-vendored": "^34.0.0",
+    "exiftool-vendored": "^33.0.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",
+    "prettier": "^3.2.5",
     "prettier-plugin-organize-imports": "^4.0.0",
     "sharp": "^0.34.5",
     "socket.io-client": "^4.7.4",

i18n/en.json

@@ -10,7 +10,6 @@
   "active_count": "Active: {count}",
   "activity": "Activity",
   "activity_changed": "Activity is {enabled, select, true {enabled} other {disabled}}",
-  "activity_count": "{count, plural, =0 {Activity} =1 {1 activity} other {{count} activities}}",
   "add": "Add",
   "add_a_description": "Add a description",
   "add_a_location": "Add a location",
@@ -273,7 +272,7 @@
     "oauth_timeout_description": "Timeout for requests in milliseconds",
     "ocr_job_description": "Use machine learning to recognize text in images",
     "password_enable_description": "Login with email and password",
-    "password_settings": "Password Login",
+    "password_settings": "Password login",
     "password_settings_description": "Manage password login settings",
     "paths_validated_successfully": "All paths validated successfully",
     "person_cleanup_job": "Person cleanup",
@@ -653,7 +652,6 @@
   "backup_options_page_title": "Backup options",
   "backup_setting_subtitle": "Manage background and foreground upload settings",
   "backup_settings_subtitle": "Manage upload settings",
-  "backup_upload_details_page_more_details": "Tap for more details",
   "backward": "Backward",
   "biometric_auth_enabled": "Biometric authentication enabled",
   "biometric_locked_out": "You are locked out of biometric authentication",
@@ -720,7 +718,6 @@
   "check_corrupt_asset_backup_button": "Perform check",
   "check_corrupt_asset_backup_description": "Run this check only over Wi-Fi and once all assets have been backed-up. The procedure might take a few minutes.",
   "check_logs": "Check Logs",
-  "checksum": "Checksum",
   "choose_matching_people_to_merge": "Choose matching people to merge",
   "city": "City",
   "clear": "Clear",
@@ -1169,7 +1166,6 @@
   "header_settings_header_name_input": "Header name",
   "header_settings_header_value_input": "Header value",
   "headers_settings_tile_title": "Custom proxy headers",
-  "height": "Height",
   "hi_user": "Hi {name} ({email})",
   "hide_all_people": "Hide all people",
   "hide_gallery": "Hide gallery",
@@ -1292,7 +1288,6 @@
   "local": "Local",
   "local_asset_cast_failed": "Unable to cast an asset that is not uploaded to the server",
   "local_assets": "Local Assets",
-  "local_id": "Local ID",
   "local_media_summary": "Local Media Summary",
   "local_network": "Local network",
   "local_network_sheet_info": "The app will connect to the server through this URL when using the specified Wi-Fi network",
@@ -2223,7 +2218,6 @@
   "week": "Week",
   "welcome": "Welcome",
   "welcome_to_immich": "Welcome to Immich",
-  "width": "Width",
   "wifi_name": "Wi-Fi Name",
   "workflow": "Workflow",
   "wrong_pin_code": "Wrong PIN code",

i18n/ja.json

@@ -9,7 +9,6 @@
   "active": "アクティブ",
   "activity": "アクティビティ",
   "activity_changed": "アクティビティは{enabled, select, true {有効} other {無効}}になりました",
-  "activity_count": "{count, plural, =0 {コメント} other {コメント\n{count}件}}",
   "add": "追加",
   "add_a_description": "説明を追加",
   "add_a_location": "場所を追加",

mobile/ios/Runner/Info.plist

@@ -137,7 +137,8 @@
 	<key>NSFaceIDUsageDescription</key>
 	<string>We need to use FaceID to allow access to your locked folder</string>
 	<key>NSLocalNetworkUsageDescription</key>
-	<string>We need local network permission to connect to the local server using IP address and allow the casting feature to work</string>
+	<string>We need local network permission to connect to the local server using IP address and
+      allow the casting feature to work</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
 	<string>We require this permission to access the local WiFi name for background upload mechanism</string>
 	<key>NSLocationUsageDescription</key>

mobile/lib/constants/enums.dart

@@ -7,5 +7,3 @@ enum AssetVisibilityEnum { timeline, hidden, archive, locked }
 enum SortUserBy { id }
 
 enum ActionSource { timeline, viewer }
-
-enum ButtonPosition { bottomBar, kebabMenu, other }

mobile/lib/models/activities/activity.model.dart

@@ -62,9 +62,6 @@ class Activity {
 
 class ActivityStats {
   final int comments;
-  final int likes;
 
-  const ActivityStats({required this.comments, required this.likes});
+  const ActivityStats({required this.comments});
-
-  int get total => comments + likes;
 }

mobile/lib/pages/backup/drift_upload_detail.page.dart

@@ -98,7 +98,7 @@ class DriftUploadDetailPage extends ConsumerWidget {
                             ),
                           ),
                         Text(
-                          "backup_upload_details_page_more_details".t(context: context),
+                          'Tap for more details',
                           style: context.textTheme.bodySmall?.copyWith(
                             color: context.colorScheme.onSurface.withValues(alpha: 0.6),
                           ),
@@ -239,20 +239,14 @@ class FileDetailDialog extends ConsumerWidget {
                   const SizedBox(height: 24),
                   if (asset != null) ...[
                     _buildInfoSection(context, [
-                      _buildInfoRow(context, "filename".t(context: context), path.basename(uploadStatus.filename)),
+                      _buildInfoRow(context, "Filename", path.basename(uploadStatus.filename)),
-                      _buildInfoRow(context, "local_id".t(context: context), asset.id),
+                      _buildInfoRow(context, "Local ID", asset.id),
-                      _buildInfoRow(
+                      _buildInfoRow(context, "File Size", formatHumanReadableBytes(uploadStatus.fileSize, 2)),
-                        context,
+                      if (asset.width != null) _buildInfoRow(context, "Width", "${asset.width}px"),
-                        "file_size".t(context: context),
+                      if (asset.height != null) _buildInfoRow(context, "Height", "${asset.height}px"),
-                        formatHumanReadableBytes(uploadStatus.fileSize, 2),
+                      _buildInfoRow(context, "Created At", asset.createdAt.toString()),
-                      ),
+                      _buildInfoRow(context, "Updated At", asset.updatedAt.toString()),
-                      if (asset.width != null) _buildInfoRow(context, "width".t(context: context), "${asset.width}px"),
+                      if (asset.checksum != null) _buildInfoRow(context, "Checksum", asset.checksum!),
-                      if (asset.height != null)
-                        _buildInfoRow(context, "height".t(context: context), "${asset.height}px"),
-                      _buildInfoRow(context, "created_at".t(context: context), asset.createdAt.toString()),
-                      _buildInfoRow(context, "updated_at".t(context: context), asset.updatedAt.toString()),
-                      if (asset.checksum != null)
-                        _buildInfoRow(context, "checksum".t(context: context), asset.checksum!),
                     ]),
                   ],
                 ],

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

@@ -0,0 +1,173 @@
+import 'dart:async';
+
+import 'package:auto_route/auto_route.dart';
+import 'package:drift/drift.dart' hide Column;
+import 'package:easy_localization/easy_localization.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/providers/background_sync.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:logging/logging.dart';
+
+final _features = [
+  _Feature(
+    name: 'Main Timeline',
+    icon: Icons.timeline_rounded,
+    onTap: (ctx, _) => ctx.pushRoute(const TabShellRoute()),
+  ),
+  _Feature(
+    name: 'Selection Mode Timeline',
+    icon: Icons.developer_mode_rounded,
+    onTap: (ctx, ref) async {
+      final user = ref.watch(currentUserProvider);
+      if (user == null) {
+        return Future.value();
+      }
+
+      final assets = await ref.read(remoteAssetRepositoryProvider).getSome(user.id);
+
+      final selectedAssets = await ctx.pushRoute<Set<BaseAsset>>(
+        DriftAssetSelectionTimelineRoute(lockedSelectionAssets: assets.toSet()),
+      );
+
+      Logger("FeaturesInDevelopment").fine("Selected ${selectedAssets?.length ?? 0} assets");
+
+      return Future.value();
+    },
+  ),
+  _Feature(name: '', icon: Icons.vertical_align_center_sharp, onTap: (_, __) => Future.value()),
+  _Feature(
+    name: 'Sync Local',
+    icon: Icons.photo_album_rounded,
+    onTap: (_, ref) => ref.read(backgroundSyncProvider).syncLocal(),
+  ),
+  _Feature(
+    name: 'Sync Local Full (1)',
+    icon: Icons.photo_library_rounded,
+    onTap: (_, ref) => ref.read(backgroundSyncProvider).syncLocal(full: true),
+  ),
+  _Feature(
+    name: 'Hash Local Assets (2)',
+    icon: Icons.numbers_outlined,
+    onTap: (_, ref) => ref.read(backgroundSyncProvider).hashAssets(),
+  ),
+  _Feature(
+    name: 'Sync Remote (3)',
+    icon: Icons.refresh_rounded,
+    onTap: (_, ref) => ref.read(backgroundSyncProvider).syncRemote(),
+  ),
+  _Feature(
+    name: 'WAL Checkpoint',
+    icon: Icons.save_rounded,
+    onTap: (_, ref) => ref.read(driftProvider).customStatement("pragma wal_checkpoint(truncate)"),
+  ),
+  _Feature(name: '', icon: Icons.vertical_align_center_sharp, onTap: (_, __) => Future.value()),
+  _Feature(
+    name: 'Clear Delta Checkpoint',
+    icon: Icons.delete_rounded,
+    onTap: (_, ref) => ref.read(nativeSyncApiProvider).clearSyncCheckpoint(),
+  ),
+  _Feature(
+    name: 'Clear Local Data',
+    style: const TextStyle(color: Colors.orange, fontWeight: FontWeight.bold),
+    icon: Icons.delete_forever_rounded,
+    onTap: (_, ref) async {
+      final db = ref.read(driftProvider);
+      await db.localAssetEntity.deleteAll();
+      await db.localAlbumEntity.deleteAll();
+      await db.localAlbumAssetEntity.deleteAll();
+    },
+  ),
+  _Feature(
+    name: 'Clear Remote Data',
+    style: const TextStyle(color: Colors.orange, fontWeight: FontWeight.bold),
+    icon: Icons.delete_sweep_rounded,
+    onTap: (_, ref) async {
+      final db = ref.read(driftProvider);
+      await db.remoteAssetEntity.deleteAll();
+      await db.remoteExifEntity.deleteAll();
+      await db.remoteAlbumEntity.deleteAll();
+      await db.remoteAlbumUserEntity.deleteAll();
+      await db.remoteAlbumAssetEntity.deleteAll();
+      await db.memoryEntity.deleteAll();
+      await db.memoryAssetEntity.deleteAll();
+      await db.stackEntity.deleteAll();
+      await db.personEntity.deleteAll();
+      await db.assetFaceEntity.deleteAll();
+    },
+  ),
+  _Feature(
+    name: 'Local Media Summary',
+    style: const TextStyle(color: Colors.indigo, fontWeight: FontWeight.bold),
+    icon: Icons.table_chart_rounded,
+    onTap: (ctx, _) => ctx.pushRoute(const LocalMediaSummaryRoute()),
+  ),
+  _Feature(
+    name: 'Remote Media Summary',
+    style: const TextStyle(color: Colors.indigo, fontWeight: FontWeight.bold),
+    icon: Icons.summarize_rounded,
+    onTap: (ctx, _) => ctx.pushRoute(const RemoteMediaSummaryRoute()),
+  ),
+  _Feature(
+    name: 'Reset Sqlite',
+    icon: Icons.table_view_rounded,
+    style: const TextStyle(color: Colors.red, fontWeight: FontWeight.bold),
+    onTap: (_, ref) async {
+      final drift = ref.read(driftProvider);
+      // ignore: invalid_use_of_protected_member, invalid_use_of_visible_for_testing_member
+      final migrator = drift.createMigrator();
+      for (final entity in drift.allSchemaEntities) {
+        await migrator.drop(entity);
+        await migrator.create(entity);
+      }
+    },
+  ),
+];
+
+@RoutePage()
+class FeatInDevPage extends StatelessWidget {
+  const FeatInDevPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: Text('features_in_development'.tr()), centerTitle: true),
+      body: Column(
+        children: [
+          Flexible(
+            flex: 1,
+            child: ListView.builder(
+              itemBuilder: (_, index) {
+                final feat = _features[index];
+                return Consumer(
+                  builder: (ctx, ref, _) => ListTile(
+                    title: Text(feat.name, style: feat.style),
+                    trailing: Icon(feat.icon),
+                    visualDensity: VisualDensity.compact,
+                    onTap: () => unawaited(feat.onTap(ctx, ref)),
+                  ),
+                );
+              },
+              itemCount: _features.length,
+            ),
+          ),
+          const Divider(height: 0),
+        ],
+      ),
+    );
+  }
+}
+
+class _Feature {
+  const _Feature({required this.name, required this.icon, required this.onTap, this.style});
+
+  final String name;
+  final IconData icon;
+  final TextStyle? style;
+  final Future<void> Function(BuildContext, WidgetRef _) onTap;
+}

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

@@ -1,51 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_ui/immich_ui.dart';
-
-List<Widget> _showcaseBuilder(Function(ImmichVariant variant, ImmichColor color) builder) {
-  final children = <Widget>[];
-
-  final items = [
-    (variant: ImmichVariant.filled, title: "Filled Variant"),
-    (variant: ImmichVariant.ghost, title: "Ghost Variant"),
-  ];
-
-  for (final (:variant, :title) in items) {
-    children.add(Text(title));
-    children.add(Row(spacing: 10, children: [for (var color in ImmichColor.values) builder(variant, color)]));
-  }
-
-  return children;
-}
-
-@RoutePage()
-class ImmichUIShowcasePage extends StatelessWidget {
-  const ImmichUIShowcasePage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(title: const Text('Immich UI Showcase')),
-      body: Padding(
-        padding: const EdgeInsets.all(20),
-        child: SingleChildScrollView(
-          child: Column(
-            spacing: 10,
-            mainAxisAlignment: MainAxisAlignment.start,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Text("IconButton", style: context.textTheme.titleLarge),
-              ..._showcaseBuilder(
-                (variant, color) =>
-                    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/drift_activities.page.dart

@@ -37,7 +37,7 @@ class DriftActivitiesPage extends HookConsumerWidget {
       child: Scaffold(
         appBar: AppBar(
           title: Text(album.name),
-          actions: [const LikeActivityActionButton(iconOnly: true)],
+          actions: [const LikeActivityActionButton(menuItem: true)],
           actionsPadding: const EdgeInsets.only(right: 8),
         ),
         body: activities.widgetWhen(

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

@@ -27,19 +27,8 @@ class _DriftCreateAlbumPageState extends ConsumerState<DriftCreateAlbumPage> {
   bool isAlbumTitleTextFieldFocus = false;
   Set<BaseAsset> selectedAssets = {};
 
-  @override
-  void initState() {
-    super.initState();
-    albumTitleController.addListener(_onTitleChanged);
-  }
-
-  void _onTitleChanged() {
-    setState(() {});
-  }
-
   @override
   void dispose() {
-    albumTitleController.removeListener(_onTitleChanged);
     albumTitleController.dispose();
     albumDescriptionController.dispose();
     albumTitleTextFieldFocusNode.dispose();

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

@@ -9,7 +9,6 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/hooks/crop_controller_hook.dart';
-import 'package:immich_ui/immich_ui.dart';
 
 /// A widget for cropping an image.
 /// This widget uses [HookWidget] to manage its lifecycle and state. It allows
@@ -31,13 +30,11 @@ class DriftCropImagePage extends HookWidget {
       appBar: AppBar(
         backgroundColor: context.scaffoldBackgroundColor,
         title: Text("crop".tr()),
-        leading: const ImmichCloseButton(),
+        leading: CloseButton(color: context.primaryColor),
         actions: [
-          ImmichIconButton(
+          IconButton(
-            icon: Icons.done_rounded,
+            icon: Icon(Icons.done_rounded, color: context.primaryColor, size: 24),
-            color: ImmichColor.primary,
+            onPressed: () async {
-            variant: ImmichVariant.ghost,
-            onTap: () async {
               final croppedImage = await cropController.croppedImage();
               unawaited(context.pushRoute(DriftEditImageRoute(asset: asset, image: croppedImage, isEdited: true)));
             },
@@ -75,17 +72,17 @@ class DriftCropImagePage extends HookWidget {
                             child: Row(
                               mainAxisAlignment: MainAxisAlignment.spaceBetween,
                               children: [
-                                ImmichIconButton(
+                                IconButton(
-                                  icon: Icons.rotate_left,
+                                  icon: Icon(Icons.rotate_left, color: context.themeData.iconTheme.color),
-                                  variant: ImmichVariant.ghost,
+                                  onPressed: () {
-                                  color: ImmichColor.secondary,
+                                    cropController.rotateLeft();
-                                  onTap: () => cropController.rotateLeft(),
+                                  },
                                 ),
-                                ImmichIconButton(
+                                IconButton(
-                                  icon: Icons.rotate_right,
+                                  icon: Icon(Icons.rotate_right, color: context.themeData.iconTheme.color),
-                                  variant: ImmichVariant.ghost,
+                                  onPressed: () {
-                                  color: ImmichColor.secondary,
+                                    cropController.rotateRight();
-                                  onTap: () => cropController.rotateRight(),
+                                  },
                                 ),
                               ],
                             ),

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

@@ -21,36 +21,12 @@ import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_shee
 
 enum AddToMenuItem { album, archive, unarchive, lockedFolder }
 
-class AddActionButton extends ConsumerStatefulWidget {
+class AddActionButton extends ConsumerWidget {
-  const AddActionButton({super.key, this.originalTheme});
+  const AddActionButton({super.key});
 
-  final ThemeData? originalTheme;
+  Future<void> _showAddOptions(BuildContext context, WidgetRef ref) async {
-
-  @override
-  ConsumerState<AddActionButton> createState() => _AddActionButtonState();
-}
-
-class _AddActionButtonState extends ConsumerState<AddActionButton> {
-  void _handleMenuSelection(AddToMenuItem selected) {
-    switch (selected) {
-      case AddToMenuItem.album:
-        _openAlbumSelector();
-        break;
-      case AddToMenuItem.archive:
-        performArchiveAction(context, ref, source: ActionSource.viewer);
-        break;
-      case AddToMenuItem.unarchive:
-        performUnArchiveAction(context, ref, source: ActionSource.viewer);
-        break;
-      case AddToMenuItem.lockedFolder:
-        performMoveToLockFolderAction(context, ref, source: ActionSource.viewer);
-        break;
-    }
-  }
-
-  List<Widget> _buildMenuChildren() {
     final asset = ref.read(currentAssetNotifier);
-    if (asset == null) return [];
+    if (asset == null) return;
 
     final user = ref.read(currentUserProvider);
     final isOwner = asset is RemoteAsset && asset.ownerId == user?.id;
@@ -59,50 +35,84 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
     final hasRemote = asset is RemoteAsset;
     final showArchive = isOwner && !isInLockedView && hasRemote && !isArchived;
     final showUnarchive = isOwner && !isInLockedView && hasRemote && isArchived;
+    final menuItemHeight = 30.0;
 
-    return [
+    final List<PopupMenuEntry<AddToMenuItem>> items = [
-      Padding(
+      PopupMenuItem(
-        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+        enabled: false,
-        child: Text("add_to_bottom_bar".tr(), style: context.textTheme.labelMedium),
+        textStyle: context.textTheme.labelMedium,
+        height: 40,
+        child: Text("add_to_bottom_bar".tr()),
       ),
-      BaseActionButton(
+      PopupMenuItem(
-        iconData: Icons.photo_album_outlined,
+        height: menuItemHeight,
-        label: "album".tr(),
+        value: AddToMenuItem.album,
-        menuItem: true,
+        child: ListTile(leading: const Icon(Icons.photo_album_outlined), title: Text("album".tr())),
-        onPressed: () => _handleMenuSelection(AddToMenuItem.album),
       ),
-
+      const PopupMenuDivider(),
+      PopupMenuItem(enabled: false, textStyle: context.textTheme.labelMedium, height: 40, child: Text("move_to".tr())),
       if (isOwner) ...[
-        const Divider(),
-        Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-          child: Text("move_to".tr(), style: context.textTheme.labelMedium),
-        ),
         if (showArchive)
-          BaseActionButton(
+          PopupMenuItem(
-            iconData: Icons.archive_outlined,
+            height: menuItemHeight,
-            label: "archive".tr(),
+            value: AddToMenuItem.archive,
-            menuItem: true,
+            child: ListTile(leading: const Icon(Icons.archive_outlined), title: Text("archive".tr())),
-            onPressed: () => _handleMenuSelection(AddToMenuItem.archive),
           ),
         if (showUnarchive)
-          BaseActionButton(
+          PopupMenuItem(
-            iconData: Icons.unarchive_outlined,
+            height: menuItemHeight,
-            label: "unarchive".tr(),
+            value: AddToMenuItem.unarchive,
-            menuItem: true,
+            child: ListTile(leading: const Icon(Icons.unarchive_outlined), title: Text("unarchive".tr())),
-            onPressed: () => _handleMenuSelection(AddToMenuItem.unarchive),
           ),
-        BaseActionButton(
+        PopupMenuItem(
-          iconData: Icons.lock_outline,
+          height: menuItemHeight,
-          label: "locked_folder".tr(),
+          value: AddToMenuItem.lockedFolder,
-          menuItem: true,
+          child: ListTile(leading: const Icon(Icons.lock_outline), title: Text("locked_folder".tr())),
-          onPressed: () => _handleMenuSelection(AddToMenuItem.lockedFolder),
         ),
       ],
     ];
+
+    final AddToMenuItem? selected = await showMenu<AddToMenuItem>(
+      context: context,
+      color: context.themeData.scaffoldBackgroundColor,
+      position: _menuPosition(context),
+      items: items,
+      popUpAnimationStyle: AnimationStyle.noAnimation,
+    );
+
+    if (selected == null) {
+      return;
+    }
+
+    switch (selected) {
+      case AddToMenuItem.album:
+        _openAlbumSelector(context, ref);
+        break;
+      case AddToMenuItem.archive:
+        await performArchiveAction(context, ref, source: ActionSource.viewer);
+        break;
+      case AddToMenuItem.unarchive:
+        await performUnArchiveAction(context, ref, source: ActionSource.viewer);
+        break;
+      case AddToMenuItem.lockedFolder:
+        await performMoveToLockFolderAction(context, ref, source: ActionSource.viewer);
+        break;
+    }
   }
 
-  void _openAlbumSelector() {
+  RelativeRect _menuPosition(BuildContext context) {
+    final renderObject = context.findRenderObject();
+    if (renderObject is! RenderBox) {
+      return RelativeRect.fill;
+    }
+
+    final size = renderObject.size;
+    final position = renderObject.localToGlobal(Offset.zero);
+
+    return RelativeRect.fromLTRB(position.dx, position.dy - size.height - 200, position.dx + size.width, position.dy);
+  }
+
+  void _openAlbumSelector(BuildContext context, WidgetRef ref) {
     final currentAsset = ref.read(currentAssetNotifier);
     if (currentAsset == null) {
       ImmichToast.show(context: context, msg: "Cannot load asset information.", toastType: ToastType.error);
@@ -110,8 +120,7 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
     }
 
     final List<Widget> slivers = [
-      const CreateAlbumButton(),
+      AlbumSelector(onAlbumSelected: (album) => _addCurrentAssetToAlbum(context, ref, album)),
-      AlbumSelector(onAlbumSelected: (album) => _addCurrentAssetToAlbum(album)),
     ];
 
     showModalBottomSheet(
@@ -132,7 +141,7 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
     );
   }
 
-  Future<void> _addCurrentAssetToAlbum(RemoteAlbum album) async {
+  Future<void> _addCurrentAssetToAlbum(BuildContext context, WidgetRef ref, RemoteAlbum album) async {
     final latest = ref.read(currentAssetNotifier);
 
     if (latest == null) {
@@ -156,9 +165,6 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
         context: context,
         msg: 'add_to_album_bottom_sheet_added'.tr(namedArgs: {'album': album.name}),
       );
-
-      // Invalidate using the asset's remote ID to refresh the "Appears in" list
-      ref.invalidate(albumsContainingAssetProvider(latest.remoteId!));
     }
 
     if (!context.mounted) {
@@ -168,38 +174,17 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
   }
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
     final asset = ref.watch(currentAssetNotifier);
     if (asset == null) {
       return const SizedBox.shrink();
     }
-
+    return Builder(
-    final themeData = widget.originalTheme ?? context.themeData;
+      builder: (buttonContext) {
-
-    return MenuAnchor(
-      consumeOutsideTap: true,
-      style: MenuStyle(
-        backgroundColor: WidgetStatePropertyAll(themeData.scaffoldBackgroundColor),
-        surfaceTintColor: const WidgetStatePropertyAll(Colors.grey),
-        elevation: const WidgetStatePropertyAll(4),
-        shape: const WidgetStatePropertyAll(
-          RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(12))),
-        ),
-        padding: const WidgetStatePropertyAll(EdgeInsets.symmetric(vertical: 6)),
-      ),
-      menuChildren: widget.originalTheme != null
-          ? [
-              Theme(
-                data: widget.originalTheme!,
-                child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: _buildMenuChildren()),
-              ),
-            ]
-          : _buildMenuChildren(),
-      builder: (context, controller, child) {
         return BaseActionButton(
           iconData: Icons.add,
           label: "add_to_bottom_bar".tr(),
-          onPressed: () => controller.isOpen ? controller.close() : controller.open(),
+          onPressed: () => _showAddOptions(buttonContext, ref),
         );
       },
     );

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

@@ -9,10 +9,8 @@ import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 
 class AdvancedInfoActionButton extends ConsumerWidget {
   final ActionSource source;
-  final bool iconOnly;
-  final bool menuItem;
 
-  const AdvancedInfoActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+  const AdvancedInfoActionButton({super.key, required this.source});
 
   void _onTap(BuildContext context, WidgetRef ref) async {
     if (!context.mounted) {
@@ -28,8 +26,6 @@ class AdvancedInfoActionButton extends ConsumerWidget {
       maxWidth: 115.0,
       iconData: Icons.help_outline_rounded,
       label: "troubleshoot".t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
       onPressed: () => _onTap(context, ref),
     );
   }

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

@@ -35,10 +35,8 @@ Future<void> performArchiveAction(BuildContext context, WidgetRef ref, {required
 
 class ArchiveActionButton extends ConsumerWidget {
   final ActionSource source;
-  final bool iconOnly;
-  final bool menuItem;
 
-  const ArchiveActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+  const ArchiveActionButton({super.key, required this.source});
 
   Future<void> _onTap(BuildContext context, WidgetRef ref) async {
     await performArchiveAction(context, ref, source: source);
@@ -49,8 +47,6 @@ class ArchiveActionButton extends ConsumerWidget {
     return BaseActionButton(
       iconData: Icons.archive_outlined,
       label: "to_archive".t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
       onPressed: () => _onTap(context, ref),
     );
   }

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

@@ -1,8 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 
-class BaseActionButton extends ConsumerWidget {
+class BaseActionButton extends StatelessWidget {
   const BaseActionButton({
     super.key,
     required this.label,
@@ -12,7 +11,6 @@ class BaseActionButton extends ConsumerWidget {
     this.onLongPressed,
     this.maxWidth = 90.0,
     this.minWidth,
-    this.iconOnly = false,
     this.menuItem = false,
   });
 
@@ -21,42 +19,25 @@ class BaseActionButton extends ConsumerWidget {
   final Color? iconColor;
   final double maxWidth;
   final double? minWidth;
-
-  /// When true, renders only an IconButton without text label
-  final bool iconOnly;
-
-  /// When true, renders as a MenuItemButton for use in MenuAnchor menus
   final bool menuItem;
   final void Function()? onPressed;
   final void Function()? onLongPressed;
 
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  Widget build(BuildContext context) {
     final miniWidth = minWidth ?? (context.isMobile ? context.width / 4.5 : 75.0);
     final iconTheme = IconTheme.of(context);
     final iconSize = iconTheme.size ?? 24.0;
     final iconColor = this.iconColor ?? iconTheme.color ?? context.themeData.iconTheme.color;
     final textColor = context.themeData.textTheme.labelLarge?.color;
 
-    if (iconOnly) {
+    if (menuItem) {
       return IconButton(
         onPressed: onPressed,
         icon: Icon(iconData, size: iconSize, color: iconColor),
       );
     }
 
-    if (menuItem) {
-      final theme = context.themeData;
-      final effectiveIconColor = iconColor ?? theme.iconTheme.color ?? theme.colorScheme.onSurfaceVariant;
-
-      return MenuItemButton(
-        style: MenuItemButton.styleFrom(alignment: Alignment.centerLeft, padding: const EdgeInsets.all(16)),
-        leadingIcon: Icon(iconData, color: effectiveIconColor),
-        onPressed: onPressed,
-        child: Text(label, style: theme.textTheme.labelLarge?.copyWith(fontSize: 16)),
-      );
-    }
-
     return ConstrainedBox(
       constraints: BoxConstraints(maxWidth: maxWidth),
       child: MaterialButton(

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

@@ -7,9 +7,8 @@ import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/widgets/asset_viewer/cast_dialog.dart';
 
 class CastActionButton extends ConsumerWidget {
-  const CastActionButton({super.key, this.iconOnly = false, this.menuItem = false});
+  const CastActionButton({super.key, this.menuItem = true});
 
-  final bool iconOnly;
   final bool menuItem;
 
   @override
@@ -23,7 +22,6 @@ class CastActionButton extends ConsumerWidget {
       onPressed: () {
         showDialog(context: context, builder: (context) => const CastDialog());
       },
-      iconOnly: iconOnly,
       menuItem: menuItem,
     );
   }

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

@@ -18,15 +18,7 @@ import 'package:immich_mobile/widgets/common/immich_toast.dart';
 class DeleteActionButton extends ConsumerWidget {
   final ActionSource source;
   final bool showConfirmation;
-  final bool iconOnly;
+  const DeleteActionButton({super.key, required this.source, this.showConfirmation = false});
-  final bool menuItem;
-  const DeleteActionButton({
-    super.key,
-    required this.source,
-    this.showConfirmation = false,
-    this.iconOnly = false,
-    this.menuItem = false,
-  });
 
   void _onTap(BuildContext context, WidgetRef ref) async {
     if (!context.mounted) {
@@ -82,8 +74,6 @@ class DeleteActionButton extends ConsumerWidget {
       maxWidth: 110.0,
       iconData: Icons.delete_sweep_outlined,
       label: "delete".t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
       onPressed: () => _onTap(context, ref),
     );
   }

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

@@ -14,10 +14,8 @@ import 'package:immich_mobile/widgets/common/immich_toast.dart';
 /// - Prompt to delete the asset locally
 class DeleteLocalActionButton extends ConsumerWidget {
   final ActionSource source;
-  final bool iconOnly;
-  final bool menuItem;
 
-  const DeleteLocalActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+  const DeleteLocalActionButton({super.key, required this.source});
 
   void _onTap(BuildContext context, WidgetRef ref) async {
     if (!context.mounted) {
@@ -57,8 +55,6 @@ class DeleteLocalActionButton extends ConsumerWidget {
       maxWidth: 95.0,
       iconData: Icons.no_cell_outlined,
       label: "control_bottom_app_bar_delete_from_local".t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
       onPressed: () => _onTap(context, ref),
     );
   }

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

@@ -15,10 +15,8 @@ import 'package:immich_mobile/widgets/common/immich_toast.dart';
 /// - Prompt to delete the asset locally
 class DeletePermanentActionButton extends ConsumerWidget {
   final ActionSource source;
-  final bool iconOnly;
-  final bool menuItem;
 
-  const DeletePermanentActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+  const DeletePermanentActionButton({super.key, required this.source});
 
   void _onTap(BuildContext context, WidgetRef ref) async {
     if (!context.mounted) {
@@ -53,8 +51,6 @@ class DeletePermanentActionButton extends ConsumerWidget {
       maxWidth: 110.0,
       iconData: Icons.delete_forever,
       label: "delete_permanently".t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
       onPressed: () => _onTap(context, ref),
     );
   }

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

@@ -10,9 +10,8 @@ import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 
 class DownloadActionButton extends ConsumerWidget {
   final ActionSource source;
-  final bool iconOnly;
   final bool menuItem;
-  const DownloadActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+  const DownloadActionButton({super.key, required this.source, this.menuItem = false});
 
   void _onTap(BuildContext context, WidgetRef ref, BackgroundSyncManager backgroundSyncManager) async {
     if (!context.mounted) {
@@ -39,7 +38,6 @@ class DownloadActionButton extends ConsumerWidget {
       iconData: Icons.download,
       maxWidth: 95,
       label: "download".t(context: context),
-      iconOnly: iconOnly,
       menuItem: menuItem,
       onPressed: () => _onTap(context, ref, backgroundManager),
     );

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

@@ -8,10 +8,7 @@ import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asse
 import 'package:immich_mobile/routing/router.dart';
 
 class EditImageActionButton extends ConsumerWidget {
-  final bool iconOnly;
+  const EditImageActionButton({super.key});
-  final bool menuItem;
-
-  const EditImageActionButton({super.key, this.iconOnly = false, this.menuItem = false});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -30,8 +27,6 @@ class EditImageActionButton extends ConsumerWidget {
       iconData: Icons.tune,
       label: "edit".t(context: context),
       onPressed: onPress,
-      iconOnly: iconOnly,
-      menuItem: menuItem,
     );
   }
 }

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

@@ -10,10 +10,9 @@ import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class FavoriteActionButton extends ConsumerWidget {
   final ActionSource source;
-  final bool iconOnly;
   final bool menuItem;
 
-  const FavoriteActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+  const FavoriteActionButton({super.key, required this.source, this.menuItem = false});
 
   void _onTap(BuildContext context, WidgetRef ref) async {
     if (!context.mounted) {
@@ -45,7 +44,6 @@ class FavoriteActionButton extends ConsumerWidget {
     return BaseActionButton(
       iconData: Icons.favorite_border_rounded,
       label: "favorite".t(context: context),
-      iconOnly: iconOnly,
       menuItem: menuItem,
       onPressed: () => _onTap(context, ref),
     );

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

@@ -12,9 +12,8 @@ import 'package:immich_mobile/providers/infrastructure/current_album.provider.da
 import 'package:immich_mobile/providers/user.provider.dart';
 
 class LikeActivityActionButton extends ConsumerWidget {
-  const LikeActivityActionButton({super.key, this.iconOnly = false, this.menuItem = false});
+  const LikeActivityActionButton({super.key, this.menuItem = false});
 
-  final bool iconOnly;
   final bool menuItem;
 
   @override
@@ -47,19 +46,17 @@ class LikeActivityActionButton extends ConsumerWidget {
 
         return BaseActionButton(
           maxWidth: 60,
-          iconData: liked != null ? Icons.thumb_up : Icons.thumb_up_off_alt,
+          iconData: liked != null ? Icons.favorite : Icons.favorite_border,
           label: "like".t(context: context),
           onPressed: () => onTap(liked),
-          iconOnly: iconOnly,
           menuItem: menuItem,
         );
       },
 
       // default to empty heart during loading
       loading: () => BaseActionButton(
-        iconData: Icons.thumb_up_off_alt,
+        iconData: Icons.favorite_border,
         label: "like".t(context: context),
-        iconOnly: iconOnly,
         menuItem: menuItem,
       ),
       error: (error, stack) => Text('error_saving_image'.tr(args: [error.toString()])),

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

@@ -5,9 +5,8 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_bu
 import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';
 
 class MotionPhotoActionButton extends ConsumerWidget {
-  const MotionPhotoActionButton({super.key, this.iconOnly = false, this.menuItem = false});
+  const MotionPhotoActionButton({super.key, this.menuItem = true});
 
-  final bool iconOnly;
   final bool menuItem;
 
   @override
@@ -18,7 +17,6 @@ class MotionPhotoActionButton extends ConsumerWidget {
       iconData: isPlaying ? Icons.motion_photos_pause_outlined : Icons.play_circle_outline_rounded,
       label: "play_motion_photo".t(context: context),
       onPressed: ref.read(isPlayingMotionVideoProvider.notifier).toggle,
-      iconOnly: iconOnly,
       menuItem: menuItem,
     );
   }

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

@@ -38,10 +38,8 @@ Future<void> performMoveToLockFolderAction(BuildContext context, WidgetRef ref,
 
 class MoveToLockFolderActionButton extends ConsumerWidget {
   final ActionSource source;
-  final bool iconOnly;
-  final bool menuItem;
 
-  const MoveToLockFolderActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+  const MoveToLockFolderActionButton({super.key, required this.source});
 
   Future<void> _onTap(BuildContext context, WidgetRef ref) async {
     await performMoveToLockFolderAction(context, ref, source: source);
@@ -53,8 +51,6 @@ class MoveToLockFolderActionButton extends ConsumerWidget {
       maxWidth: 115.0,
       iconData: Icons.lock_outline_rounded,
       label: "move_to_locked_folder".t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
       onPressed: () => _onTap(context, ref),
     );
   }

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

@@ -1,32 +0,0 @@
-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/events.model.dart';
-import 'package:immich_mobile/domain/utils/event_stream.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
-import 'package:immich_mobile/providers/activity_statistics.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
-
-class OpenActivityActionButton extends ConsumerWidget {
-  const OpenActivityActionButton({super.key, this.iconOnly = false, this.menuItem = false});
-
-  final bool iconOnly;
-  final bool menuItem;
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final album = ref.watch(currentRemoteAlbumProvider);
-    final asset = ref.watch(currentAssetNotifier) as RemoteAsset?;
-    final count = album != null && album.id.isNotEmpty ? ref.watch(activityStatisticsProvider(album.id, asset?.id)) : 0;
-
-    return BaseActionButton(
-      iconData: Icons.chat_outlined,
-      label: "activity_count".t(args: {"count": count}),
-      onPressed: () => EventStream.shared.emit(const ViewerOpenBottomSheetEvent(activitiesMode: true)),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
-    );
-  }
-}

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

@@ -2,8 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/events.model.dart';
-import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
@@ -13,16 +11,8 @@ import 'package:immich_mobile/widgets/common/immich_toast.dart';
 class RemoveFromAlbumActionButton extends ConsumerWidget {
   final String albumId;
   final ActionSource source;
-  final bool iconOnly;
-  final bool menuItem;
 
-  const RemoveFromAlbumActionButton({
+  const RemoveFromAlbumActionButton({super.key, required this.albumId, required this.source});
-    super.key,
-    required this.albumId,
-    required this.source,
-    this.iconOnly = false,
-    this.menuItem = false,
-  });
 
   void _onTap(BuildContext context, WidgetRef ref) async {
     if (!context.mounted) {
@@ -32,10 +22,6 @@ class RemoveFromAlbumActionButton extends ConsumerWidget {
     final result = await ref.read(actionProvider.notifier).removeFromAlbum(source, albumId);
     ref.read(multiSelectProvider.notifier).reset();
 
-    if (source == ActionSource.viewer) {
-      EventStream.shared.emit(const ViewerReloadAssetEvent());
-    }
-
     final successMessage = 'remove_from_album_action_prompt'.t(
       context: context,
       args: {'count': result.count.toString()},
@@ -56,8 +42,6 @@ class RemoveFromAlbumActionButton extends ConsumerWidget {
     return BaseActionButton(
       iconData: Icons.remove_circle_outline,
       label: "remove_from_album".t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
       onPressed: () => _onTap(context, ref),
       maxWidth: 100,
     );

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

@@ -10,15 +10,8 @@ import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class RemoveFromLockFolderActionButton extends ConsumerWidget {
   final ActionSource source;
-  final bool iconOnly;
-  final bool menuItem;
 
-  const RemoveFromLockFolderActionButton({
+  const RemoveFromLockFolderActionButton({super.key, required this.source});
-    super.key,
-    required this.source,
-    this.iconOnly = false,
-    this.menuItem = false,
-  });
 
   void _onTap(BuildContext context, WidgetRef ref) async {
     if (!context.mounted) {
@@ -49,8 +42,6 @@ class RemoveFromLockFolderActionButton extends ConsumerWidget {
       maxWidth: 100.0,
       iconData: Icons.lock_open_rounded,
       label: "remove_from_locked_folder".t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
       onPressed: () => _onTap(context, ref),
     );
   }

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

@@ -31,10 +31,8 @@ class _SharePreparingDialog extends StatelessWidget {
 
 class ShareActionButton extends ConsumerWidget {
   final ActionSource source;
-  final bool iconOnly;
-  final bool menuItem;
 
-  const ShareActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+  const ShareActionButton({super.key, required this.source});
 
   void _onTap(BuildContext context, WidgetRef ref) async {
     if (!context.mounted) {
@@ -76,8 +74,6 @@ class ShareActionButton extends ConsumerWidget {
     return BaseActionButton(
       iconData: Platform.isAndroid ? Icons.share_rounded : Icons.ios_share_rounded,
       label: 'share'.t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
       onPressed: () => _onTap(context, ref),
     );
   }

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

@@ -7,10 +7,8 @@ import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 
 class ShareLinkActionButton extends ConsumerWidget {
   final ActionSource source;
-  final bool iconOnly;
-  final bool menuItem;
 
-  const ShareLinkActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+  const ShareLinkActionButton({super.key, required this.source});
 
   _onTap(BuildContext context, WidgetRef ref) async {
     if (!context.mounted) {
@@ -25,8 +23,6 @@ class ShareLinkActionButton extends ConsumerWidget {
     return BaseActionButton(
       iconData: Icons.link_rounded,
       label: "share_link".t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
       onPressed: () => _onTap(context, ref),
     );
   }

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

@@ -13,10 +13,8 @@ import 'package:immich_mobile/routing/router.dart';
 
 class SimilarPhotosActionButton extends ConsumerWidget {
   final String assetId;
-  final bool iconOnly;
-  final bool menuItem;
 
-  const SimilarPhotosActionButton({super.key, required this.assetId, this.iconOnly = false, this.menuItem = false});
+  const SimilarPhotosActionButton({super.key, required this.assetId});
 
   void _onTap(BuildContext context, WidgetRef ref) async {
     if (!context.mounted) {
@@ -46,8 +44,6 @@ class SimilarPhotosActionButton extends ConsumerWidget {
     return BaseActionButton(
       iconData: Icons.compare,
       label: "view_similar_photos".t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
       onPressed: () => _onTap(context, ref),
       maxWidth: 100,
     );

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

@@ -15,10 +15,8 @@ import 'package:immich_mobile/widgets/common/immich_toast.dart';
 /// which will be permanently deleted after the number of days configure by the admin
 class TrashActionButton extends ConsumerWidget {
   final ActionSource source;
-  final bool iconOnly;
-  final bool menuItem;
 
-  const TrashActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+  const TrashActionButton({super.key, required this.source});
 
   void _onTap(BuildContext context, WidgetRef ref) async {
     if (!context.mounted) {
@@ -50,8 +48,6 @@ class TrashActionButton extends ConsumerWidget {
       maxWidth: 85.0,
       iconData: Icons.delete_outline_rounded,
       label: "control_bottom_app_bar_trash_from_immich".t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
       onPressed: () => _onTap(context, ref),
     );
   }

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

@@ -37,10 +37,8 @@ Future<void> performUnArchiveAction(BuildContext context, WidgetRef ref, {requir
 
 class UnArchiveActionButton extends ConsumerWidget {
   final ActionSource source;
-  final bool iconOnly;
-  final bool menuItem;
 
-  const UnArchiveActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+  const UnArchiveActionButton({super.key, required this.source});
 
   Future<void> _onTap(BuildContext context, WidgetRef ref) async {
     await performUnArchiveAction(context, ref, source: source);
@@ -51,8 +49,6 @@ class UnArchiveActionButton extends ConsumerWidget {
     return BaseActionButton(
       iconData: Icons.unarchive_outlined,
       label: "unarchive".t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
       onPressed: () => _onTap(context, ref),
     );
   }

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

@@ -10,10 +10,9 @@ import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class UnFavoriteActionButton extends ConsumerWidget {
   final ActionSource source;
-  final bool iconOnly;
   final bool menuItem;
 
-  const UnFavoriteActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+  const UnFavoriteActionButton({super.key, required this.source, this.menuItem = false});
 
   void _onTap(BuildContext context, WidgetRef ref) async {
     if (!context.mounted) {
@@ -46,7 +45,6 @@ class UnFavoriteActionButton extends ConsumerWidget {
       iconData: Icons.favorite_rounded,
       label: "unfavorite".t(context: context),
       onPressed: () => _onTap(context, ref),
-      iconOnly: iconOnly,
       menuItem: menuItem,
     );
   }

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

@@ -10,10 +10,8 @@ import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class UnStackActionButton extends ConsumerWidget {
   final ActionSource source;
-  final bool iconOnly;
-  final bool menuItem;
 
-  const UnStackActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+  const UnStackActionButton({super.key, required this.source});
 
   void _onTap(BuildContext context, WidgetRef ref) async {
     if (!context.mounted) {
@@ -40,8 +38,6 @@ class UnStackActionButton extends ConsumerWidget {
     return BaseActionButton(
       iconData: Icons.layers_clear_outlined,
       label: "unstack".t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
       onPressed: () => _onTap(context, ref),
     );
   }

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

@@ -10,10 +10,8 @@ import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 class UploadActionButton extends ConsumerWidget {
   final ActionSource source;
-  final bool iconOnly;
-  final bool menuItem;
 
-  const UploadActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
+  const UploadActionButton({super.key, required this.source});
 
   void _onTap(BuildContext context, WidgetRef ref) async {
     if (!context.mounted) {
@@ -41,8 +39,6 @@ class UploadActionButton extends ConsumerWidget {
     return BaseActionButton(
       iconData: Icons.backup_outlined,
       label: "upload".t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
       onPressed: () => _onTap(context, ref),
     );
   }

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

@@ -12,10 +12,8 @@ import 'package:immich_mobile/extensions/theme_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_tile.dart';
-import 'package:immich_mobile/presentation/widgets/album/new_album_name_modal.widget.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
@@ -768,68 +766,3 @@ class AddToAlbumHeader extends ConsumerWidget {
     );
   }
 }
-
-class CreateAlbumButton extends ConsumerWidget {
-  const CreateAlbumButton({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    Future<void> onCreateAlbum() async {
-      var albumName = await showDialog<String?>(context: context, builder: (context) => const NewAlbumNameModal());
-      if (albumName == null) {
-        return;
-      }
-
-      final asset = ref.read(currentAssetNotifier);
-
-      if (asset == null) {
-        ImmichToast.show(context: context, msg: "Cannot load asset information.", toastType: ToastType.error);
-        return;
-      }
-
-      final album = await ref
-          .read(remoteAlbumProvider.notifier)
-          .createAlbum(title: albumName, assetIds: [asset.remoteId!]);
-
-      if (album == null) {
-        ImmichToast.show(context: context, toastType: ToastType.error, msg: 'errors.failed_to_create_album'.tr());
-        return;
-      }
-
-      ImmichToast.show(
-        context: context,
-        msg: 'add_to_album_bottom_sheet_added'.tr(namedArgs: {'album': album.name}),
-      );
-
-      // Invalidate using the asset's remote ID to refresh the "Appears in" list
-      ref.invalidate(albumsContainingAssetProvider(asset.remoteId!));
-
-      context.pop();
-    }
-
-    return SliverPadding(
-      padding: const EdgeInsets.symmetric(horizontal: 16),
-      sliver: SliverToBoxAdapter(
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            Text("add_to_album", style: context.textTheme.titleSmall).tr(),
-            TextButton.icon(
-              style: TextButton.styleFrom(
-                padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
-                minimumSize: const Size(0, 0),
-                tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-              ),
-              onPressed: onCreateAlbum,
-              icon: Icon(Icons.add, color: context.primaryColor),
-              label: Text(
-                "common_create_new_album",
-                style: TextStyle(color: context.primaryColor, fontWeight: FontWeight.bold, fontSize: 14),
-              ).tr(),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

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

@@ -1,53 +0,0 @@
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-
-class NewAlbumNameModal extends StatefulWidget {
-  const NewAlbumNameModal({super.key});
-
-  @override
-  State<NewAlbumNameModal> createState() => _NewAlbumNameModalState();
-}
-
-class _NewAlbumNameModalState extends State<NewAlbumNameModal> {
-  TextEditingController nameController = TextEditingController();
-
-  @override
-  void dispose() {
-    nameController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      title: const Text("album_name", style: TextStyle(fontWeight: FontWeight.bold)).tr(),
-      content: SingleChildScrollView(
-        child: TextFormField(
-          controller: nameController,
-          textCapitalization: TextCapitalization.words,
-          autofocus: true,
-          decoration: InputDecoration(hintText: 'name'.tr(), border: const OutlineInputBorder()),
-        ),
-      ),
-      actions: [
-        TextButton(
-          onPressed: () => context.pop(null),
-          child: Text(
-            "cancel",
-            style: TextStyle(color: Colors.red[300], fontWeight: FontWeight.bold),
-          ).tr(),
-        ),
-        TextButton(
-          onPressed: () {
-            context.pop(nameController.text.trim());
-          },
-          child: Text(
-            "create_album",
-            style: TextStyle(color: context.primaryColor, fontWeight: FontWeight.bold),
-          ).tr(),
-        ),
-      ],
-    );
-  }
-}

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

@@ -79,7 +79,7 @@ class ActivitiesBottomSheet extends HookConsumerWidget {
       expand: false,
       shouldCloseOnMinExtent: false,
       resizeOnScroll: false,
-      backgroundColor: context.isDarkTheme ? context.colorScheme.surface : Colors.white,
+      backgroundColor: context.isDarkTheme ? Colors.black : Colors.white,
     );
   }
 }

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

@@ -97,7 +97,7 @@ class AssetViewer extends ConsumerStatefulWidget {
 }
 
 const double _kBottomSheetMinimumExtent = 0.4;
-const double _kBottomSheetSnapExtent = 0.67;
+const double _kBottomSheetSnapExtent = 0.7;
 
 class _AssetViewerState extends ConsumerState<AssetViewer> {
   static final _dummyListener = ImageStreamListener((image, _) => image.dispose());
@@ -399,14 +399,10 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     final isDraggingDown = currentExtent < previousExtent;
     previousExtent = currentExtent;
     // Closes the bottom sheet if the user is dragging down
-    if (isDraggingDown && delta.extent < 0.67) {
+    if (isDraggingDown && delta.extent < 0.55) {
       if (dragInProgress) {
         blockGestures = true;
       }
-      // Jump to a lower position before starting close animation to prevent glitch
-      if (bottomSheetController.isAttached) {
-        bottomSheetController.jumpTo(0.67);
-      }
       sheetCloseController?.close();
     }
 
@@ -484,7 +480,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     previousExtent = _kBottomSheetMinimumExtent;
     sheetCloseController = showBottomSheet(
       context: ctx,
-      sheetAnimationStyle: const AnimationStyle(duration: Durations.medium2, reverseDuration: Durations.medium2),
+      sheetAnimationStyle: const AnimationStyle(duration: Durations.short4, reverseDuration: Durations.short2),
       constraints: const BoxConstraints(maxWidth: double.infinity),
       shape: const RoundedRectangleBorder(borderRadius: BorderRadius.vertical(top: Radius.circular(20.0))),
       backgroundColor: ctx.colorScheme.surfaceContainerLowest,
@@ -692,20 +688,16 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
               backgroundDecoration: BoxDecoration(color: backgroundColor),
               enablePanAlways: true,
             ),
-            if (!showingBottomSheet)
-              const Positioned(
-                bottom: 0,
-                left: 0,
-                right: 0,
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  mainAxisAlignment: MainAxisAlignment.end,
-                  crossAxisAlignment: CrossAxisAlignment.stretch,
-                  children: [AssetStackRow(), ViewerBottomBar()],
-                ),
-              ),
           ],
         ),
+        bottomNavigationBar: showingBottomSheet
+            ? const SizedBox.shrink()
+            : const Column(
+                mainAxisSize: MainAxisSize.min,
+                mainAxisAlignment: MainAxisAlignment.end,
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: [AssetStackRow(), ViewerBottomBar()],
+              ),
       ),
     );
   }

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

@@ -2,18 +2,18 @@ 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/domain/models/setting.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/edit_image_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/add_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/routes.provider.dart';
-import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/utils/action_button.utils.dart';
 import 'package:immich_mobile/widgets/asset_viewer/video_controls.dart';
 
 class ViewerBottomBar extends ConsumerWidget {
@@ -33,34 +33,23 @@ class ViewerBottomBar extends ConsumerWidget {
     int opacity = ref.watch(assetViewerProvider.select((state) => state.backgroundOpacity));
     final showControls = ref.watch(assetViewerProvider.select((s) => s.showingControls));
     final isInLockedView = ref.watch(inLockedViewProvider);
-    final album = ref.watch(currentRemoteAlbumProvider);
-    final isArchived = asset is RemoteAsset && asset.visibility == AssetVisibility.archive;
-    final advancedTroubleshooting = ref.watch(settingsProvider.notifier).get(Setting.advancedTroubleshooting);
-    final timelineOrigin = ref.read(timelineServiceProvider).origin;
-    final isTrashEnable = ref.watch(serverInfoProvider.select((state) => state.serverFeatures.trash));
 
     if (!showControls) {
       opacity = 0;
     }
 
-    final originalTheme = context.themeData;
+    final actions = <Widget>[
+      const ShareActionButton(source: ActionSource.viewer),
+      if (asset.isLocalOnly) const UploadActionButton(source: ActionSource.viewer),
+      if (asset.type == AssetType.image) const EditImageActionButton(),
+      if (asset.hasRemote) const AddActionButton(),
 
-    final buttonContext = ActionButtonContext(
+      if (isOwner) ...[
-      asset: asset,
+        asset.isLocalOnly
-      isOwner: isOwner,
+            ? const DeleteLocalActionButton(source: ActionSource.viewer)
-      isArchived: isArchived,
+            : const DeleteActionButton(source: ActionSource.viewer, showConfirmation: true),
-      isTrashEnabled: isTrashEnable,
+      ],
-      isStacked: asset is RemoteAsset && asset.stackId != null,
+    ];
-      isInLockedView: isInLockedView,
-      currentAlbum: album,
-      advancedTroubleshooting: advancedTroubleshooting,
-      source: ActionSource.viewer,
-      timelineOrigin: timelineOrigin,
-      originalTheme: originalTheme,
-      buttonPosition: ButtonPosition.bottomBar,
-    );
-
-    final actions = ActionButtonBuilder.buildViewerBottomBar(buttonContext, context, ref);
 
     return IgnorePointer(
       ignoring: opacity < 255,
@@ -85,12 +74,8 @@ class ViewerBottomBar extends ConsumerWidget {
                       mainAxisAlignment: MainAxisAlignment.end,
                       children: [
                         if (asset.isVideo) const VideoControls(),
-                        if (!isReadonlyModeEnabled)
+                        if (!isInLockedView && !isReadonlyModeEnabled)
-                          Row(
+                          Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: actions),
-                            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: actions.map((action) => Expanded(child: action)).toList(),
-                          ),
                       ],
                     ),
                   ),

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

@@ -8,6 +8,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
+import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/duration_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
@@ -20,9 +21,14 @@ import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_shee
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
+import 'package:immich_mobile/providers/routes.provider.dart';
+import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/utils/action_button.utils.dart';
 import 'package:immich_mobile/utils/bytes_units.dart';
 import 'package:immich_mobile/utils/timezone.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
@@ -42,8 +48,29 @@ class AssetDetailBottomSheet extends ConsumerWidget {
       return const SizedBox.shrink();
     }
 
+    final isTrashEnable = ref.watch(serverInfoProvider.select((state) => state.serverFeatures.trash));
+    final isOwner = asset is RemoteAsset && asset.ownerId == ref.watch(currentUserProvider)?.id;
+    final isInLockedView = ref.watch(inLockedViewProvider);
+    final currentAlbum = ref.watch(currentRemoteAlbumProvider);
+    final isArchived = asset is RemoteAsset && asset.visibility == AssetVisibility.archive;
+    final advancedTroubleshooting = ref.watch(settingsProvider.notifier).get(Setting.advancedTroubleshooting);
+
+    final buttonContext = ActionButtonContext(
+      asset: asset,
+      isOwner: isOwner,
+      isArchived: isArchived,
+      isTrashEnabled: isTrashEnable,
+      isInLockedView: isInLockedView,
+      isStacked: asset is RemoteAsset && asset.stackId != null,
+      currentAlbum: currentAlbum,
+      advancedTroubleshooting: advancedTroubleshooting,
+      source: ActionSource.viewer,
+    );
+
+    final actions = ActionButtonBuilder.build(buttonContext);
+
     return BaseBottomSheet(
-      actions: [],
+      actions: actions,
       slivers: const [_AssetDetailBottomSheet()],
       controller: controller,
       initialChildSize: initialChildSize,
@@ -52,7 +79,7 @@ class AssetDetailBottomSheet extends ConsumerWidget {
       expand: false,
       shouldCloseOnMinExtent: false,
       resizeOnScroll: false,
-      backgroundColor: context.isDarkTheme ? context.colorScheme.surface : Colors.white,
+      backgroundColor: context.isDarkTheme ? Colors.black : Colors.white,
     );
   }
 }
@@ -299,7 +326,7 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
         // Appears in (Albums)
         Padding(padding: const EdgeInsets.only(top: 16.0), child: _buildAppearsInList(ref, context)),
         // padding at the bottom to avoid cut-off
-        const SizedBox(height: 30),
+        const SizedBox(height: 100),
       ],
     );
   }

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

@@ -3,18 +3,26 @@ 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/domain/models/events.model.dart';
+import 'package:immich_mobile/domain/services/timeline.service.dart';
+import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/cast_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/favorite_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/motion_photo_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
-import 'package:immich_mobile/presentation/widgets/asset_viewer/viewer_kebab_menu.widget.dart';
 import 'package:immich_mobile/providers/activity.provider.dart';
+import 'package:immich_mobile/providers/cast.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/routes.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
 
 class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
   const ViewerTopAppBar({super.key});
@@ -33,6 +41,15 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
     final isInLockedView = ref.watch(inLockedViewProvider);
     final isReadonlyModeEnabled = ref.watch(readonlyModeProvider);
 
+    final timelineOrigin = ref.read(timelineServiceProvider).origin;
+    final showViewInTimelineButton =
+        timelineOrigin != TimelineOrigin.main &&
+        timelineOrigin != TimelineOrigin.deepLink &&
+        timelineOrigin != TimelineOrigin.trash &&
+        timelineOrigin != TimelineOrigin.archive &&
+        timelineOrigin != TimelineOrigin.localAlbum &&
+        isOwner;
+
     final isShowingSheet = ref.watch(assetViewerProvider.select((state) => state.showingBottomSheet));
     int opacity = ref.watch(assetViewerProvider.select((state) => state.backgroundOpacity));
     final showControls = ref.watch(assetViewerProvider.select((s) => s.showingControls));
@@ -45,20 +62,40 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
       opacity = 0;
     }
 
-    final originalTheme = context.themeData;
+    final isCasting = ref.watch(castProvider.select((c) => c.isCasting));
 
     final actions = <Widget>[
-      if (asset.isMotionPhoto) const MotionPhotoActionButton(iconOnly: true),
+      if (asset.isRemoteOnly) const DownloadActionButton(source: ActionSource.viewer, menuItem: true),
-
+      if (isCasting || (asset.hasRemote)) const CastActionButton(menuItem: true),
+      if (album != null && album.isActivityEnabled && album.isShared)
+        IconButton(
+          icon: const Icon(Icons.chat_outlined),
+          onPressed: () {
+            EventStream.shared.emit(const ViewerOpenBottomSheetEvent(activitiesMode: true));
+          },
+        ),
+      if (showViewInTimelineButton)
+        IconButton(
+          onPressed: () async {
+            await context.maybePop();
+            await context.navigateTo(const TabShellRoute(children: [MainTimelineRoute()]));
+            EventStream.shared.emit(ScrollToDateEvent(asset.createdAt));
+          },
+          icon: const Icon(Icons.image_search),
+          tooltip: 'view_in_timeline'.t(context: context),
+        ),
       if (asset.hasRemote && isOwner && !asset.isFavorite)
-        const FavoriteActionButton(source: ActionSource.viewer, iconOnly: true),
+        const FavoriteActionButton(source: ActionSource.viewer, menuItem: true),
       if (asset.hasRemote && isOwner && asset.isFavorite)
-        const UnFavoriteActionButton(source: ActionSource.viewer, iconOnly: true),
+        const UnFavoriteActionButton(source: ActionSource.viewer, menuItem: true),
-
+      if (asset.isMotionPhoto) const MotionPhotoActionButton(menuItem: true),
-      ViewerKebabMenu(originalTheme: originalTheme),
+      const _KebabMenu(),
     ];
 
-    final lockedViewActions = <Widget>[ViewerKebabMenu(originalTheme: originalTheme)];
+    final lockedViewActions = <Widget>[
+      if (isCasting || (asset.hasRemote)) const CastActionButton(menuItem: true),
+      const _KebabMenu(),
+    ];
 
     return IgnorePointer(
       ignoring: opacity < 255,
@@ -85,6 +122,20 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
   Size get preferredSize => const Size.fromHeight(60.0);
 }
 
+class _KebabMenu extends ConsumerWidget {
+  const _KebabMenu();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return IconButton(
+      onPressed: () {
+        EventStream.shared.emit(const ViewerOpenBottomSheetEvent());
+      },
+      icon: const Icon(Icons.more_vert_rounded),
+    );
+  }
+}
+
 class _AppBarBackButton extends ConsumerWidget {
   const _AppBarBackButton();
 

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

@@ -9,7 +9,6 @@ import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/services/setting.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
-import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/video_viewer_controls.widget.dart';
@@ -105,12 +104,7 @@ class NativeVideoViewer extends HookConsumerWidget {
             throw Exception('No file found for the video');
           }
 
-          // Pass a file:// URI so Android's Uri.parse doesn't
+          final source = await VideoSource.init(path: file.path, type: VideoSourceType.file);
-          // interpret characters like '#' as fragment identifiers.
-          final source = await VideoSource.init(
-            path: CurrentPlatform.isAndroid ? file.uri.toString() : file.path,
-            type: VideoSourceType.file,
-          );
           return source;
         }
 

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

@@ -1,85 +0,0 @@
-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/domain/models/setting.model.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/providers/cast.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
-import 'package:immich_mobile/providers/routes.provider.dart';
-import 'package:immich_mobile/providers/server_info.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/utils/action_button.utils.dart';
-
-class ViewerKebabMenu extends ConsumerWidget {
-  const ViewerKebabMenu({super.key, this.originalTheme});
-
-  final ThemeData? originalTheme;
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final asset = ref.watch(currentAssetNotifier);
-    if (asset == null) {
-      return const SizedBox.shrink();
-    }
-
-    final user = ref.watch(currentUserProvider);
-    final isOwner = asset is RemoteAsset && asset.ownerId == user?.id;
-    final isCasting = ref.watch(castProvider.select((c) => c.isCasting));
-    final timelineOrigin = ref.read(timelineServiceProvider).origin;
-    final isTrashEnable = ref.watch(serverInfoProvider.select((state) => state.serverFeatures.trash));
-    final isInLockedView = ref.watch(inLockedViewProvider);
-    final currentAlbum = ref.watch(currentRemoteAlbumProvider);
-    final isArchived = asset is RemoteAsset && asset.visibility == AssetVisibility.archive;
-    final advancedTroubleshooting = ref.watch(settingsProvider.notifier).get(Setting.advancedTroubleshooting);
-
-    final actionContext = ActionButtonContext(
-      asset: asset,
-      isOwner: isOwner,
-      isArchived: isArchived,
-      isTrashEnabled: isTrashEnable,
-      isStacked: asset is RemoteAsset && asset.stackId != null,
-      isInLockedView: isInLockedView,
-      currentAlbum: currentAlbum,
-      advancedTroubleshooting: advancedTroubleshooting,
-      source: ActionSource.viewer,
-      isCasting: isCasting,
-      timelineOrigin: timelineOrigin,
-      originalTheme: originalTheme,
-    );
-
-    final menuChildren = ActionButtonBuilder.buildViewerKebabMenu(actionContext, context, ref);
-
-    return MenuAnchor(
-      consumeOutsideTap: true,
-      style: MenuStyle(
-        backgroundColor: WidgetStatePropertyAll(context.themeData.scaffoldBackgroundColor),
-        surfaceTintColor: const WidgetStatePropertyAll(Colors.grey),
-        elevation: const WidgetStatePropertyAll(4),
-        shape: const WidgetStatePropertyAll(
-          RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(12))),
-        ),
-        padding: const WidgetStatePropertyAll(EdgeInsets.symmetric(vertical: 6)),
-      ),
-      menuChildren: [
-        ConstrainedBox(
-          constraints: const BoxConstraints(minWidth: 150),
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            crossAxisAlignment: CrossAxisAlignment.stretch,
-            children: menuChildren,
-          ),
-        ),
-      ],
-      builder: (context, controller, child) {
-        return IconButton(
-          icon: const Icon(Icons.more_vert_rounded),
-          onPressed: () => controller.isOpen ? controller.close() : controller.open(),
-        );
-      },
-    );
-  }
-}

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

@@ -14,6 +14,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_b
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unarchive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
@@ -46,7 +47,10 @@ class ArchiveBottomSheet extends ConsumerWidget {
           if (multiselect.selectedAssets.length > 1) const StackActionButton(source: ActionSource.timeline),
           if (multiselect.hasStacked) const UnStackActionButton(source: ActionSource.timeline),
         ],
-        if (multiselect.hasMerged) const DeleteLocalActionButton(source: ActionSource.timeline),
+        if (multiselect.hasLocal) ...[
+          const DeleteLocalActionButton(source: ActionSource.timeline),
+          const UploadActionButton(source: ActionSource.timeline),
+        ],
       ],
     );
   }

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

@@ -81,7 +81,7 @@ class _BaseDraggableScrollableSheetState extends ConsumerState<BaseBottomSheet>
                 child: CustomScrollView(
                   controller: scrollController,
                   slivers: [
-                    const SliverToBoxAdapter(child: _DragHandle()),
+                    const SliverPersistentHeader(delegate: _DragHandleDelegate(), pinned: true),
                     if (widget.actions.isNotEmpty)
                       SliverToBoxAdapter(
                         child: Column(
@@ -108,13 +108,31 @@ class _BaseDraggableScrollableSheetState extends ConsumerState<BaseBottomSheet>
   }
 }
 
+class _DragHandleDelegate extends SliverPersistentHeaderDelegate {
+  const _DragHandleDelegate();
+
+  @override
+  Widget build(BuildContext context, double shrinkOffset, bool overlapsContent) {
+    return const _DragHandle();
+  }
+
+  @override
+  bool shouldRebuild(_DragHandleDelegate oldDelegate) => false;
+
+  @override
+  double get minExtent => 50.0;
+
+  @override
+  double get maxExtent => 50.0;
+}
+
 class _DragHandle extends StatelessWidget {
   const _DragHandle();
 
   @override
   Widget build(BuildContext context) {
     return SizedBox(
-      height: 38,
+      height: 50,
       child: Center(
         child: SizedBox(
           width: 32,

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

@@ -17,6 +17,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_b
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unfavorite_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
@@ -85,7 +86,10 @@ class FavoriteBottomSheet extends ConsumerWidget {
           if (multiselect.selectedAssets.length > 1) const StackActionButton(source: ActionSource.timeline),
           if (multiselect.hasStacked) const UnStackActionButton(source: ActionSource.timeline),
         ],
-        if (multiselect.hasMerged) const DeleteLocalActionButton(source: ActionSource.timeline),
+        if (multiselect.hasLocal) ...[
+          const DeleteLocalActionButton(source: ActionSource.timeline),
+          const UploadActionButton(source: ActionSource.timeline),
+        ],
       ],
       slivers: multiselect.hasRemote
           ? [const AddToAlbumHeader(), AlbumSelector(onAlbumSelected: addAssetsToAlbum)]

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

@@ -18,6 +18,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_act
 import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
@@ -111,7 +112,10 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
             if (multiselect.hasStacked) const UnStackActionButton(source: ActionSource.timeline),
           ],
         ],
-        if (multiselect.hasMerged) const DeleteLocalActionButton(source: ActionSource.timeline),
+        if (multiselect.hasLocal) ...[
+          const DeleteLocalActionButton(source: ActionSource.timeline),
+          const UploadActionButton(source: ActionSource.timeline),
+        ],
         if (ownsAlbum) RemoveFromAlbumActionButton(source: ActionSource.timeline, albumId: widget.album.id),
       ],
       slivers: ownsAlbum

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

@@ -324,11 +324,7 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
           final topPadding = context.padding.top + (widget.appBar == null ? 0 : kToolbarHeight) + 10;
 
           const scrubberBottomPadding = 100.0;
-          const bottomSheetOpenModifier = 120.0;
+          final bottomPadding = context.padding.bottom + (widget.appBar == null ? 0 : scrubberBottomPadding);
-          final bottomPadding =
-              context.padding.bottom +
-              (widget.appBar == null ? 0 : scrubberBottomPadding) +
-              (isMultiSelectEnabled ? bottomSheetOpenModifier : 0);
 
           final grid = CustomScrollView(
             primary: true,
@@ -351,7 +347,7 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
                   addRepaintBoundaries: false,
                 ),
               ),
-              SliverPadding(padding: EdgeInsets.only(bottom: bottomPadding)),
+              const SliverPadding(padding: EdgeInsets.only(bottom: scrubberBottomPadding)),
             ],
           );
 

mobile/lib/providers/activity.provider.dart

@@ -26,10 +26,11 @@ class AlbumActivity extends _$AlbumActivity {
         ref.read(albumActivityProvider(albumId).notifier)._removeFromState(id);
       }
 
-      // Update statistics for both comments and likes
+      if (removedActivity.type == ActivityType.comment) {
-      ref.watch(activityStatisticsProvider(albumId, assetId).notifier).removeActivity();
+        ref.watch(activityStatisticsProvider(albumId, assetId).notifier).removeActivity();
-      if (assetId != null) {
+        if (assetId != null) {
-        ref.watch(activityStatisticsProvider(albumId).notifier).removeActivity();
+          ref.watch(activityStatisticsProvider(albumId).notifier).removeActivity();
+        }
       }
     }
   }
@@ -41,11 +42,6 @@ class AlbumActivity extends _$AlbumActivity {
       if (assetId != null) {
         ref.read(albumActivityProvider(albumId).notifier)._addToState(activity.requireValue);
       }
-      // Update statistics when adding a like
-      ref.watch(activityStatisticsProvider(albumId, assetId).notifier).addActivity();
-      if (assetId != null) {
-        ref.watch(activityStatisticsProvider(albumId).notifier).addActivity();
-      }
     }
   }
 

mobile/lib/providers/activity.provider.g.dart

@@ -6,7 +6,7 @@ part of 'activity.provider.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$albumActivityHash() => r'fe472b87b56ce4e3802833799bf707779ccc02e3';
+String _$albumActivityHash() => r'154e8ae98da3efc142369eae46d4005468fd67da';
 
 /// Copied from Dart SDK
 class _SystemHash {

mobile/lib/providers/activity_statistics.provider.dart

@@ -4,12 +4,12 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 part 'activity_statistics.provider.g.dart';
 
 // ignore: unintended_html_in_doc_comment
-/// Maintains the current number of activities (comments + likes) by <shared-album, asset>
+/// Maintains the current number of comments by <shared-album, asset>
 @riverpod
 class ActivityStatistics extends _$ActivityStatistics {
   @override
   int build(String albumId, [String? assetId]) {
-    ref.watch(activityServiceProvider).getStatistics(albumId, assetId: assetId).then((stats) => state = stats.total);
+    ref.watch(activityServiceProvider).getStatistics(albumId, assetId: assetId).then((stats) => state = stats.comments);
     return 0;
   }
 

mobile/lib/providers/activity_statistics.provider.g.dart

@@ -7,7 +7,7 @@ part of 'activity_statistics.provider.dart';
 // **************************************************************************
 
 String _$activityStatisticsHash() =>
-    r'ae0123a6ce129988e21f7327273af4d9acbae0f6';
+    r'1f43f0bcb11c754ca3cb586a13570db25023b9a8';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -37,22 +37,22 @@ abstract class _$ActivityStatistics extends BuildlessAutoDisposeNotifier<int> {
   int build(String albumId, [String? assetId]);
 }
 
-/// Maintains the current number of activities (comments + likes) by <shared-album, asset>
+/// Maintains the current number of comments by <shared-album, asset>
 ///
 /// Copied from [ActivityStatistics].
 @ProviderFor(ActivityStatistics)
 const activityStatisticsProvider = ActivityStatisticsFamily();
 
-/// Maintains the current number of activities (comments + likes) by <shared-album, asset>
+/// Maintains the current number of comments by <shared-album, asset>
 ///
 /// Copied from [ActivityStatistics].
 class ActivityStatisticsFamily extends Family<int> {
-  /// Maintains the current number of activities (comments + likes) by <shared-album, asset>
+  /// Maintains the current number of comments by <shared-album, asset>
   ///
   /// Copied from [ActivityStatistics].
   const ActivityStatisticsFamily();
 
-  /// Maintains the current number of activities (comments + likes) by <shared-album, asset>
+  /// Maintains the current number of comments by <shared-album, asset>
   ///
   /// Copied from [ActivityStatistics].
   ActivityStatisticsProvider call(String albumId, [String? assetId]) {
@@ -81,12 +81,12 @@ class ActivityStatisticsFamily extends Family<int> {
   String? get name => r'activityStatisticsProvider';
 }
 
-/// Maintains the current number of activities (comments + likes) by <shared-album, asset>
+/// Maintains the current number of comments by <shared-album, asset>
 ///
 /// Copied from [ActivityStatistics].
 class ActivityStatisticsProvider
     extends AutoDisposeNotifierProviderImpl<ActivityStatistics, int> {
-  /// Maintains the current number of activities (comments + likes) by <shared-album, asset>
+  /// Maintains the current number of comments by <shared-album, asset>
   ///
   /// Copied from [ActivityStatistics].
   ActivityStatisticsProvider(String albumId, [String? assetId])

mobile/lib/repositories/activity_api.repository.dart

@@ -36,7 +36,7 @@ class ActivityApiRepository extends ApiRepository {
 
   Future<ActivityStats> getStats(String albumId, {String? assetId}) async {
     final response = await checkNull(_api.getActivityStatistics(albumId, assetId: assetId));
-    return ActivityStats(comments: response.comments, likes: response.likes);
+    return ActivityStats(comments: response.comments);
   }
 
   static Activity _toActivity(ActivityResponseDto dto) => Activity(

mobile/lib/repositories/person_api.repository.dart

@@ -17,10 +17,8 @@ class PersonApiRepository extends ApiRepository {
   }
 
   Future<PersonDto> update(String id, {String? name, DateTime? birthday}) async {
-    final birthdayUtc = birthday == null ? null : DateTime.utc(birthday.year, birthday.month, birthday.day);
+    final dto = await checkNull(_api.updatePerson(id, PersonUpdateDto(name: name, birthDate: birthday)));
-    final dto = PersonUpdateDto(name: name, birthDate: birthdayUtc);
+    return _toPerson(dto);
-    final response = await checkNull(_api.updatePerson(id, dto));
-    return _toPerson(response);
   }
 
   static PersonDto _toPerson(PersonResponseDto dto) => PersonDto(

mobile/lib/routing/router.dart

@@ -78,9 +78,9 @@ import 'package:immich_mobile/pages/search/recently_taken.page.dart';
 import 'package:immich_mobile/pages/search/search.page.dart';
 import 'package:immich_mobile/pages/settings/sync_status.page.dart';
 import 'package:immich_mobile/pages/share_intent/share_intent.page.dart';
+import 'package:immich_mobile/presentation/pages/dev/feat_in_development.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/main_timeline.page.dart';
 import 'package:immich_mobile/presentation/pages/dev/media_stat.page.dart';
-import 'package:immich_mobile/presentation/pages/dev/ui_showcase.page.dart';
 import 'package:immich_mobile/presentation/pages/download_info.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_activities.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_album.page.dart';
@@ -167,7 +167,7 @@ class AppRouter extends RootStackRouter {
     AutoRoute(page: LoginRoute.page, guards: [_duplicateGuard]),
     AutoRoute(page: ChangePasswordRoute.page),
     AutoRoute(page: SearchRoute.page, guards: [_authGuard, _duplicateGuard], maintainState: false),
-    AutoRoute(
+    CustomRoute(
       page: TabControllerRoute.page,
       guards: [_authGuard, _duplicateGuard],
       children: [
@@ -176,8 +176,9 @@ class AppRouter extends RootStackRouter {
         AutoRoute(page: LibraryRoute.page, guards: [_authGuard, _duplicateGuard]),
         AutoRoute(page: AlbumsRoute.page, guards: [_authGuard, _duplicateGuard]),
       ],
+      transitionsBuilder: TransitionsBuilders.fadeIn,
     ),
-    AutoRoute(
+    CustomRoute(
       page: TabShellRoute.page,
       guards: [_authGuard, _duplicateGuard],
       children: [
@@ -186,6 +187,7 @@ class AppRouter extends RootStackRouter {
         AutoRoute(page: DriftLibraryRoute.page, guards: [_authGuard, _duplicateGuard]),
         AutoRoute(page: DriftAlbumsRoute.page, guards: [_authGuard, _duplicateGuard]),
       ],
+      transitionsBuilder: TransitionsBuilders.fadeIn,
     ),
     CustomRoute(
       page: GalleryViewerRoute.page,
@@ -286,6 +288,7 @@ class AppRouter extends RootStackRouter {
     AutoRoute(page: ShareIntentRoute.page, guards: [_authGuard, _duplicateGuard]),
     AutoRoute(page: LockedRoute.page, guards: [_authGuard, _lockedGuard, _duplicateGuard]),
     AutoRoute(page: PinAuthRoute.page, guards: [_authGuard, _duplicateGuard]),
+    AutoRoute(page: FeatInDevRoute.page, guards: [_authGuard, _duplicateGuard]),
     AutoRoute(page: LocalMediaSummaryRoute.page, guards: [_authGuard, _duplicateGuard]),
     AutoRoute(page: RemoteMediaSummaryRoute.page, guards: [_authGuard, _duplicateGuard]),
     AutoRoute(page: DriftBackupRoute.page, guards: [_authGuard, _duplicateGuard]),
@@ -337,7 +340,6 @@ class AppRouter extends RootStackRouter {
     AutoRoute(page: DriftBackupAssetDetailRoute.page, guards: [_authGuard, _duplicateGuard]),
     AutoRoute(page: AssetTroubleshootRoute.page, guards: [_authGuard, _duplicateGuard]),
     AutoRoute(page: DownloadInfoRoute.page, guards: [_authGuard, _duplicateGuard]),
-    AutoRoute(page: ImmichUIShowcaseRoute.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

@@ -1648,6 +1648,22 @@ class FavoritesRoute extends PageRouteInfo<void> {
   );
 }
 
+/// generated route for
+/// [FeatInDevPage]
+class FeatInDevRoute extends PageRouteInfo<void> {
+  const FeatInDevRoute({List<PageRouteInfo>? children})
+    : super(FeatInDevRoute.name, initialChildren: children);
+
+  static const String name = 'FeatInDevRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const FeatInDevPage();
+    },
+  );
+}
+
 /// generated route for
 /// [FilterImagePage]
 class FilterImageRoute extends PageRouteInfo<FilterImageRouteArgs> {
@@ -1815,22 +1831,6 @@ class HeaderSettingsRoute extends PageRouteInfo<void> {
   );
 }
 
-/// generated route for
-/// [ImmichUIShowcasePage]
-class ImmichUIShowcaseRoute extends PageRouteInfo<void> {
-  const ImmichUIShowcaseRoute({List<PageRouteInfo>? children})
-    : super(ImmichUIShowcaseRoute.name, initialChildren: children);
-
-  static const String name = 'ImmichUIShowcaseRoute';
-
-  static PageInfo page = PageInfo(
-    name,
-    builder: (data) {
-      return const ImmichUIShowcasePage();
-    },
-  );
-}
-
 /// generated route for
 /// [LibraryPage]
 class LibraryRoute extends PageRouteInfo<void> {

mobile/lib/services/activity.service.dart

@@ -32,7 +32,7 @@ class ActivityService with ErrorLoggerMixin {
   Future<ActivityStats> getStatistics(String albumId, {String? assetId}) async {
     return logError(
       () => _activityApiRepository.getStats(albumId, assetId: assetId),
-      defaultValue: const ActivityStats(comments: 0, likes: 0),
+      defaultValue: const ActivityStats(comments: 0),
       errorMessage: "Failed to statistics for album $albumId",
     );
   }

mobile/lib/services/app_settings.service.dart

@@ -27,7 +27,7 @@ enum AppSettingsEnum<T> {
   thumbnailCacheSize<int>(StoreKey.thumbnailCacheSize, "thumbnailCacheSize", 10000),
   imageCacheSize<int>(StoreKey.imageCacheSize, "imageCacheSize", 350),
   albumThumbnailCacheSize<int>(StoreKey.albumThumbnailCacheSize, "albumThumbnailCacheSize", 200),
-  selectedAlbumSortOrder<int>(StoreKey.selectedAlbumSortOrder, "selectedAlbumSortOrder", 2),
+  selectedAlbumSortOrder<int>(StoreKey.selectedAlbumSortOrder, "selectedAlbumSortOrder", 0),
   advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, null, false),
   manageLocalMediaAndroid<bool>(StoreKey.manageLocalMediaAndroid, null, false),
   logLevel<int>(StoreKey.logLevel, null, 5), // Level.INFO = 5
@@ -42,7 +42,7 @@ enum AppSettingsEnum<T> {
   mapRelativeDate<int>(StoreKey.mapRelativeDate, null, 0),
   allowSelfSignedSSLCert<bool>(StoreKey.selfSignedCert, null, false),
   ignoreIcloudAssets<bool>(StoreKey.ignoreIcloudAssets, null, false),
-  selectedAlbumSortReverse<bool>(StoreKey.selectedAlbumSortReverse, null, true),
+  selectedAlbumSortReverse<bool>(StoreKey.selectedAlbumSortReverse, null, false),
   enableHapticFeedback<bool>(StoreKey.enableHapticFeedback, null, true),
   syncAlbums<bool>(StoreKey.syncAlbums, null, false),
   autoEndpointSwitching<bool>(StoreKey.autoEndpointSwitching, null, false),

mobile/lib/utils/action_button.utils.dart

@@ -1,23 +1,14 @@
-import 'package:auto_route/auto_route.dart';
+import 'package:flutter/widgets.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/album/album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/domain/models/events.model.dart';
-import 'package:immich_mobile/domain/services/timeline.service.dart';
-import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/advanced_info_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/cast_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/like_activity_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/open_activity_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart';
@@ -28,9 +19,6 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_b
 import 'package:immich_mobile/presentation/widgets/action_buttons/unarchive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/edit_image_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/add_action_button.widget.dart';
-import 'package:immich_mobile/routing/router.dart';
 
 class ActionButtonContext {
   final BaseAsset asset;
@@ -42,10 +30,6 @@ class ActionButtonContext {
   final RemoteAlbum? currentAlbum;
   final bool advancedTroubleshooting;
   final ActionSource source;
-  final bool isCasting;
-  final TimelineOrigin timelineOrigin;
-  final ThemeData? originalTheme;
-  final ButtonPosition buttonPosition;
 
   const ActionButtonContext({
     required this.asset,
@@ -57,55 +41,27 @@ class ActionButtonContext {
     required this.currentAlbum,
     required this.advancedTroubleshooting,
     required this.source,
-    this.isCasting = false,
-    this.timelineOrigin = TimelineOrigin.main,
-    this.originalTheme,
-    this.buttonPosition = ButtonPosition.other,
   });
-
-  ActionButtonContext withButtonPosition(ButtonPosition position) {
-    return ActionButtonContext(
-      asset: asset,
-      isOwner: isOwner,
-      isArchived: isArchived,
-      isTrashEnabled: isTrashEnabled,
-      isStacked: isStacked,
-      isInLockedView: isInLockedView,
-      currentAlbum: currentAlbum,
-      advancedTroubleshooting: advancedTroubleshooting,
-      source: source,
-      isCasting: isCasting,
-      timelineOrigin: timelineOrigin,
-      originalTheme: originalTheme,
-      buttonPosition: position,
-    );
-  }
 }
 
 enum ActionButtonType {
-  openInfo,
+  advancedInfo,
-  openActivity,
-  likeActivity,
   share,
-  editImage,
   shareLink,
-  cast,
   similarPhotos,
-  viewInTimeline,
-  download,
-  upload,
-  unstack,
   archive,
   unarchive,
-  moveToLockFolder,
+  download,
-  removeFromLockFolder,
-  removeFromAlbum,
   trash,
-  deleteLocal,
   deletePermanent,
   delete,
-  addTo,
+  moveToLockFolder,
-  advancedInfo;
+  removeFromLockFolder,
+  deleteLocal,
+  upload,
+  removeFromAlbum,
+  unstack,
+  likeActivity;
 
   bool shouldShow(ActionButtonContext context) {
     return switch (this) {
@@ -172,218 +128,39 @@ enum ActionButtonType {
       ActionButtonType.similarPhotos =>
         !context.isInLockedView && //
             context.asset is RemoteAsset,
-      ActionButtonType.openInfo => true,
-      ActionButtonType.viewInTimeline =>
-        context.timelineOrigin != TimelineOrigin.main &&
-            context.timelineOrigin != TimelineOrigin.deepLink &&
-            context.timelineOrigin != TimelineOrigin.trash &&
-            context.timelineOrigin != TimelineOrigin.lockedFolder &&
-            context.timelineOrigin != TimelineOrigin.archive &&
-            context.timelineOrigin != TimelineOrigin.localAlbum &&
-            context.isOwner,
-      ActionButtonType.cast => context.isCasting || context.asset.hasRemote,
-      ActionButtonType.editImage =>
-        !context.isInLockedView && //
-            context.asset.type == AssetType.image &&
-            !(context.buttonPosition == ButtonPosition.bottomBar && context.currentAlbum?.isShared == true),
-      ActionButtonType.addTo =>
-        !context.isInLockedView && //
-            context.asset.hasRemote,
-      ActionButtonType.openActivity =>
-        !context.isInLockedView &&
-            context.currentAlbum != null &&
-            context.currentAlbum!.isActivityEnabled &&
-            context.currentAlbum!.isShared,
     };
   }
 
-  Widget buildButton(
+  Widget buildButton(ActionButtonContext context) {
-    ActionButtonContext context, [
-    BuildContext? buildContext,
-    bool iconOnly = false,
-    bool menuItem = false,
-  ]) {
     return switch (this) {
-      ActionButtonType.advancedInfo => AdvancedInfoActionButton(
+      ActionButtonType.advancedInfo => AdvancedInfoActionButton(source: context.source),
-        source: context.source,
+      ActionButtonType.share => ShareActionButton(source: context.source),
-        iconOnly: iconOnly,
+      ActionButtonType.shareLink => ShareLinkActionButton(source: context.source),
-        menuItem: menuItem,
+      ActionButtonType.archive => ArchiveActionButton(source: context.source),
-      ),
+      ActionButtonType.unarchive => UnArchiveActionButton(source: context.source),
-      ActionButtonType.share => ShareActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
+      ActionButtonType.download => DownloadActionButton(source: context.source),
-      ActionButtonType.shareLink => ShareLinkActionButton(
+      ActionButtonType.trash => TrashActionButton(source: context.source),
-        source: context.source,
+      ActionButtonType.deletePermanent => DeletePermanentActionButton(source: context.source),
-        iconOnly: iconOnly,
+      ActionButtonType.delete => DeleteActionButton(source: context.source),
-        menuItem: menuItem,
+      ActionButtonType.moveToLockFolder => MoveToLockFolderActionButton(source: context.source),
-      ),
+      ActionButtonType.removeFromLockFolder => RemoveFromLockFolderActionButton(source: context.source),
-      ActionButtonType.archive => ArchiveActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
+      ActionButtonType.deleteLocal => DeleteLocalActionButton(source: context.source),
-      ActionButtonType.unarchive => UnArchiveActionButton(
+      ActionButtonType.upload => UploadActionButton(source: context.source),
-        source: context.source,
-        iconOnly: iconOnly,
-        menuItem: menuItem,
-      ),
-      ActionButtonType.download => DownloadActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
-      ActionButtonType.trash => TrashActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
-      ActionButtonType.deletePermanent => DeletePermanentActionButton(
-        source: context.source,
-        iconOnly: iconOnly,
-        menuItem: menuItem,
-      ),
-      ActionButtonType.delete => DeleteActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
-      ActionButtonType.moveToLockFolder => MoveToLockFolderActionButton(
-        source: context.source,
-        iconOnly: iconOnly,
-        menuItem: menuItem,
-      ),
-      ActionButtonType.removeFromLockFolder => RemoveFromLockFolderActionButton(
-        source: context.source,
-        iconOnly: iconOnly,
-        menuItem: menuItem,
-      ),
-      ActionButtonType.deleteLocal => DeleteLocalActionButton(
-        source: context.source,
-        iconOnly: iconOnly,
-        menuItem: menuItem,
-      ),
-      ActionButtonType.upload => UploadActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
       ActionButtonType.removeFromAlbum => RemoveFromAlbumActionButton(
         albumId: context.currentAlbum!.id,
         source: context.source,
-        iconOnly: iconOnly,
-        menuItem: menuItem,
       ),
-      ActionButtonType.likeActivity => LikeActivityActionButton(iconOnly: iconOnly, menuItem: menuItem),
+      ActionButtonType.likeActivity => const LikeActivityActionButton(),
-      ActionButtonType.unstack => UnStackActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
+      ActionButtonType.unstack => UnStackActionButton(source: context.source),
-      ActionButtonType.similarPhotos => SimilarPhotosActionButton(
+      ActionButtonType.similarPhotos => SimilarPhotosActionButton(assetId: (context.asset as RemoteAsset).id),
-        assetId: (context.asset as RemoteAsset).id,
-        iconOnly: iconOnly,
-        menuItem: menuItem,
-      ),
-      ActionButtonType.openInfo => BaseActionButton(
-        label: 'info'.tr(),
-        iconData: Icons.info_outline,
-        iconColor: context.originalTheme?.iconTheme.color,
-        menuItem: true,
-        onPressed: () => EventStream.shared.emit(const ViewerOpenBottomSheetEvent()),
-      ),
-      ActionButtonType.viewInTimeline => BaseActionButton(
-        label: 'view_in_timeline'.tr(),
-        iconData: Icons.image_search,
-        iconColor: context.originalTheme?.iconTheme.color,
-        iconOnly: iconOnly,
-        menuItem: menuItem,
-        onPressed: buildContext == null
-            ? null
-            : () async {
-                await buildContext.maybePop();
-                await buildContext.navigateTo(const TabShellRoute(children: [MainTimelineRoute()]));
-                EventStream.shared.emit(ScrollToDateEvent(context.asset.createdAt));
-              },
-      ),
-      ActionButtonType.cast => CastActionButton(iconOnly: iconOnly, menuItem: menuItem),
-      ActionButtonType.editImage => EditImageActionButton(iconOnly: iconOnly, menuItem: menuItem),
-      ActionButtonType.addTo => AddActionButton(originalTheme: context.originalTheme),
-      ActionButtonType.openActivity => OpenActivityActionButton(iconOnly: iconOnly, menuItem: menuItem),
     };
   }
-
-  /// Defines which group each button belongs to for kebab menu.
-  /// Buttons in the same group will be displayed together,
-  /// with dividers separating different groups.
-  int get kebabMenuGroup => switch (this) {
-    // 0: info
-    ActionButtonType.openInfo => 0,
-    // 10: move,remove, and delete
-    ActionButtonType.trash => 10,
-    ActionButtonType.deletePermanent => 10,
-    ActionButtonType.removeFromLockFolder => 10,
-    ActionButtonType.removeFromAlbum => 10,
-    ActionButtonType.unstack => 10,
-    ActionButtonType.archive => 10,
-    ActionButtonType.unarchive => 10,
-    ActionButtonType.moveToLockFolder => 10,
-    ActionButtonType.deleteLocal => 10,
-    ActionButtonType.delete => 10,
-    // 90: advancedInfo
-    ActionButtonType.advancedInfo => 90,
-    // 1: others
-    _ => 1,
-  };
 }
 
 class ActionButtonBuilder {
   static const List<ActionButtonType> _actionTypes = ActionButtonType.values;
-  static const List<ActionButtonType> defaultViewerKebabMenuOrder = _actionTypes;
-  static const List<ActionButtonType> _defaultViewerBottomBarOrder = [
-    ActionButtonType.share,
-    ActionButtonType.upload,
-    ActionButtonType.editImage,
-    ActionButtonType.addTo,
-    ActionButtonType.openActivity,
-    ActionButtonType.likeActivity,
-    ActionButtonType.deleteLocal,
-    ActionButtonType.delete,
-    ActionButtonType.removeFromLockFolder,
-    ActionButtonType.deletePermanent,
-  ];
 
   static List<Widget> build(ActionButtonContext context) {
     return _actionTypes.where((type) => type.shouldShow(context)).map((type) => type.buildButton(context)).toList();
   }
-
-  static List<ActionButtonType> getViewerKebabMenuTypes(ActionButtonContext context) {
-    final visibleBottomBarButtons = getViewerBottomBarTypes(context);
-    final excludedTypes = <ActionButtonType>{...visibleBottomBarButtons, ActionButtonType.addTo};
-
-    if (visibleBottomBarButtons.contains(ActionButtonType.addTo)) {
-      excludedTypes.addAll([ActionButtonType.moveToLockFolder, ActionButtonType.archive, ActionButtonType.unarchive]);
-    }
-
-    return defaultViewerKebabMenuOrder
-        .where((type) => !excludedTypes.contains(type) && type.shouldShow(context))
-        .toList();
-  }
-
-  static List<ActionButtonType> getViewerBottomBarTypes(ActionButtonContext context) {
-    final bottomBarContext = context.withButtonPosition(ButtonPosition.bottomBar);
-    return _defaultViewerBottomBarOrder.where((type) => type.shouldShow(bottomBarContext)).take(4).toList();
-  }
-
-  static List<Widget> buildViewerKebabMenu(ActionButtonContext context, BuildContext buildContext, WidgetRef ref) {
-    final visibleButtons = getViewerKebabMenuTypes(context);
-    return visibleButtons.toKebabMenuWidgets(context, buildContext, ref);
-  }
-
-  static List<Widget> buildViewerBottomBar(ActionButtonContext context, BuildContext buildContext, WidgetRef ref) {
-    final visibleButtons = getViewerBottomBarTypes(context);
-    return visibleButtons.toBottomBarWidgets(context, buildContext, ref);
-  }
-}
-
-extension ActionButtonTypeListExtension on List<ActionButtonType> {
-  List<Widget> toKebabMenuWidgets(ActionButtonContext context, BuildContext buildContext, WidgetRef ref) {
-    if (isEmpty) {
-      return [];
-    }
-
-    final List<Widget> result = [];
-    int? lastGroup;
-
-    for (final type in this) {
-      if (lastGroup != null && type.kebabMenuGroup != lastGroup) {
-        result.add(const Divider(height: 1));
-      }
-      final widget = type.buildButton(context, buildContext, false, true);
-      result.add(widget is ConsumerWidget ? widget.build(buildContext, ref) : widget);
-      lastGroup = type.kebabMenuGroup;
-    }
-
-    return result;
-  }
-
-  List<Widget> toBottomBarWidgets(ActionButtonContext context, BuildContext buildContext, WidgetRef ref) {
-    return map((type) {
-      final widget = type.buildButton(context, buildContext, false, false);
-      return widget is ConsumerWidget ? widget.build(buildContext, ref) : widget;
-    }).toList();
-  }
 }

mobile/lib/widgets/activities/activity_text_field.dart

@@ -2,7 +2,6 @@ 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';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/activity.provider.dart';
 import 'package:immich_mobile/providers/album/current_album.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/current_asset.provider.dart';
@@ -69,11 +68,11 @@ class ActivityTextField extends HookConsumerWidget {
           suffixIcon: Padding(
             padding: const EdgeInsets.only(right: 10),
             child: IconButton(
-              icon: Icon(liked ? Icons.thumb_up : Icons.thumb_up_off_alt),
+              icon: Icon(liked ? Icons.favorite_rounded : Icons.favorite_border_rounded),
               onPressed: liked ? removeLike : addLike,
             ),
           ),
-          suffixIconColor: liked ? context.primaryColor : null,
+          suffixIconColor: liked ? Colors.red[700] : null,
           hintText: !isEnabled ? 'shared_album_activities_input_disable'.tr() : 'say_something'.tr(),
           hintStyle: TextStyle(fontWeight: FontWeight.normal, fontSize: 14, color: Colors.grey[600]),
         ),

mobile/lib/widgets/activities/activity_tile.dart

@@ -37,7 +37,7 @@ class ActivityTile extends HookConsumerWidget {
           ? Container(
               width: isBottomSheet ? 30 : 44,
               alignment: Alignment.center,
-              child: Icon(Icons.thumb_up, color: context.primaryColor),
+              child: Icon(Icons.favorite_rounded, color: Colors.red[700]),
             )
           : isBottomSheet
           ? UserCircleAvatar(user: activity.user, size: 30, radius: 15)

mobile/lib/widgets/activities/comment_bubble.dart

@@ -67,8 +67,8 @@ class CommentBubble extends ConsumerWidget {
                 bottom: 6,
                 child: Container(
                   padding: const EdgeInsets.all(4),
-                  decoration: BoxDecoration(color: context.colorScheme.surfaceContainer, shape: BoxShape.circle),
+                  decoration: BoxDecoration(color: Colors.white.withValues(alpha: 0.7), shape: BoxShape.circle),
-                  child: Icon(Icons.thumb_up, color: context.primaryColor, size: 18),
+                  child: Icon(Icons.favorite, color: Colors.red[600], size: 18),
                 ),
               ),
           ],
@@ -81,8 +81,8 @@ class CommentBubble extends ConsumerWidget {
     if (isLike && !showThumbnail) {
       likes = Container(
         padding: const EdgeInsets.all(8),
-        decoration: BoxDecoration(color: context.colorScheme.surfaceContainer, shape: BoxShape.circle),
+        decoration: BoxDecoration(color: Colors.white.withValues(alpha: 0.7), shape: BoxShape.circle),
-        child: Icon(Icons.thumb_up, color: context.primaryColor, size: 18),
+        child: Icon(Icons.favorite, color: Colors.red[600], size: 18),
       );
     }
 

mobile/lib/widgets/common/app_bar_dialog/server_update_notification.dart

@@ -53,18 +53,16 @@ class ServerUpdateNotification extends HookConsumerWidget {
         child: Row(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
-            Expanded(
+            Text(
-              child: Text(
+              serverInfoState.versionStatus.message,
-                serverInfoState.versionStatus.message,
+              textAlign: TextAlign.start,
-                textAlign: TextAlign.start,
+              maxLines: 3,
-                maxLines: 3,
+              overflow: TextOverflow.ellipsis,
-                overflow: TextOverflow.ellipsis,
+              style: context.textTheme.labelLarge,
-                style: context.textTheme.labelLarge,
-              ),
             ),
             if (serverInfoState.versionStatus == VersionStatus.serverOutOfDate ||
                 serverInfoState.versionStatus == VersionStatus.clientOutOfDate) ...[
-              const SizedBox(width: 8),
+              const Spacer(),
               TextButton(
                 onPressed: openUpdateLink,
                 style: TextButton.styleFrom(

mobile/lib/widgets/common/immich_app_bar.dart

@@ -155,8 +155,8 @@ class ImmichAppBar extends ConsumerWidget implements PreferredSizeWidget {
           ...actions!.map((action) => Padding(padding: const EdgeInsets.only(right: 16), child: action)),
         if (kDebugMode || kProfileMode)
           IconButton(
-            icon: const Icon(Icons.palette_rounded),
+            icon: const Icon(Icons.science_rounded),
-            onPressed: () => context.pushRoute(const ImmichUIShowcaseRoute()),
+            onPressed: () => context.pushRoute(const FeatInDevRoute()),
           ),
         if (isCasting)
           Padding(

mobile/lib/widgets/common/immich_sliver_app_bar.dart

@@ -74,8 +74,8 @@ class ImmichSliverAppBar extends ConsumerWidget {
             ...actions!.map((action) => Padding(padding: const EdgeInsets.only(right: 16), child: action)),
           if ((kDebugMode || kProfileMode) && !isReadonlyModeEnabled)
             IconButton(
-              icon: const Icon(Icons.palette_rounded),
+              icon: const Icon(Icons.science_rounded),
-              onPressed: () => context.pushRoute(const ImmichUIShowcaseRoute()),
+              onPressed: () => context.pushRoute(const FeatInDevRoute()),
             ),
           if (showUploadButton && !isReadonlyModeEnabled)
             const Padding(padding: EdgeInsets.only(right: 20), child: _BackupIndicator()),

mobile/lib/widgets/settings/beta_sync_settings/entity_count_tile.dart

@@ -2,27 +2,26 @@ import 'package:flutter/material.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
 
-class EntityCountTile extends StatelessWidget {
+class EntitiyCountTile extends StatelessWidget {
   final int count;
   final String label;
   final IconData icon;
 
-  const EntityCountTile({super.key, required this.count, required this.label, required this.icon});
+  const EntitiyCountTile({super.key, required this.count, required this.label, required this.icon});
 
   String zeroPadding(int number, int targetWidth) {
     final numStr = number.toString();
     return numStr.length < targetWidth ? "0" * (targetWidth - numStr.length) : "";
   }
 
+  int calculateMaxDigits(double availableWidth) {
+    const double charWidth = 11.0;
+    return (availableWidth / charWidth).floor().clamp(1, 8);
+  }
+
   @override
   Widget build(BuildContext context) {
-    final screenWidth = MediaQuery.of(context).size.width;
-    final availableWidth = (screenWidth - 32 - 8) / 2;
-    const double charWidth = 11.0;
-    final maxDigits = ((availableWidth - 32) / charWidth).floor().clamp(1, 8);
-
     return Container(
-      height: double.infinity,
       padding: const EdgeInsets.all(16),
       decoration: BoxDecoration(
         color: context.colorScheme.surfaceContainerLow,
@@ -30,6 +29,7 @@ class EntityCountTile extends StatelessWidget {
         border: Border.all(width: 0.5, color: context.colorScheme.outline.withAlpha(25)),
       ),
       child: Column(
+        mainAxisSize: MainAxisSize.min,
         crossAxisAlignment: CrossAxisAlignment.center,
         children: [
           // Icon and Label
@@ -38,30 +38,33 @@ class EntityCountTile extends StatelessWidget {
             children: [
               Icon(icon, color: context.primaryColor),
               const SizedBox(width: 8),
-              Flexible(
+              Text(
-                child: Text(
+                label,
-                  label,
+                style: TextStyle(color: context.primaryColor, fontWeight: FontWeight.bold, fontSize: 16),
-                  style: TextStyle(color: context.primaryColor, fontWeight: FontWeight.bold, fontSize: 16),
-                ),
               ),
             ],
           ),
+          const SizedBox(height: 12),
           // Number
-          const Spacer(),
+          LayoutBuilder(
-          RichText(
+            builder: (context, constraints) {
-            text: TextSpan(
+              final maxDigits = calculateMaxDigits(constraints.maxWidth);
-              style: const TextStyle(fontSize: 18, fontFamily: 'OverpassMono', fontWeight: FontWeight.w600),
+              return RichText(
-              children: [
+                text: TextSpan(
-                TextSpan(
+                  style: const TextStyle(fontSize: 18, fontFamily: 'OverpassMono', fontWeight: FontWeight.w600),
-                  text: zeroPadding(count, maxDigits),
+                  children: [
-                  style: TextStyle(color: context.colorScheme.onSurfaceSecondary.withAlpha(75)),
+                    TextSpan(
+                      text: zeroPadding(count, maxDigits),
+                      style: TextStyle(color: context.colorScheme.onSurfaceSecondary.withAlpha(75)),
+                    ),
+                    TextSpan(
+                      text: count.toString(),
+                      style: TextStyle(color: context.primaryColor),
+                    ),
+                  ],
                 ),
-                TextSpan(
+              );
-                  text: count.toString(),
+            },
-                  style: TextStyle(color: context.primaryColor),
-                ),
-              ],
-            ),
           ),
         ],
       ),

mobile/lib/widgets/settings/beta_sync_settings/sync_status_and_actions.dart

@@ -282,87 +282,76 @@ class _SyncStatsCounts extends ConsumerWidget {
             _SectionHeaderText(text: "assets".t(context: context)),
             Padding(
               padding: const EdgeInsets.fromLTRB(16, 8, 16, 16),
-              // 1. Wrap in IntrinsicHeight
+              child: Flex(
-              child: IntrinsicHeight(
+                direction: Axis.horizontal,
-                child: Flex(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  direction: Axis.horizontal,
+                spacing: 8.0,
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
-                  // 2. Stretch children vertically to fill the IntrinsicHeight
+                  Expanded(
-                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                    child: EntitiyCountTile(
-                  spacing: 8.0,
+                      label: "local".t(context: context),
-                  children: [
+                      count: localAssetCount,
-                    Expanded(
+                      icon: Icons.smartphone,
-                      child: EntityCountTile(
-                        label: "local".t(context: context),
-                        count: localAssetCount,
-                        icon: Icons.smartphone,
-                      ),
                     ),
-                    Expanded(
+                  ),
-                      child: EntityCountTile(
+                  Expanded(
-                        label: "remote".t(context: context),
+                    child: EntitiyCountTile(
-                        count: remoteAssetCount,
+                      label: "remote".t(context: context),
-                        icon: Icons.cloud,
+                      count: remoteAssetCount,
-                      ),
+                      icon: Icons.cloud,
                     ),
-                  ],
+                  ),
-                ),
+                ],
               ),
             ),
             _SectionHeaderText(text: "albums".t(context: context)),
             Padding(
               padding: const EdgeInsets.fromLTRB(16, 8, 16, 16),
-              child: IntrinsicHeight(
+              child: Flex(
-                child: Flex(
+                direction: Axis.horizontal,
-                  direction: Axis.horizontal,
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                spacing: 8.0,
-                  crossAxisAlignment: CrossAxisAlignment.stretch, // Added
+                children: [
-                  spacing: 8.0,
+                  Expanded(
-                  children: [
+                    child: EntitiyCountTile(
-                    Expanded(
+                      label: "local".t(context: context),
-                      child: EntityCountTile(
+                      count: localAlbumCount,
-                        label: "local".t(context: context),
+                      icon: Icons.smartphone,
-                        count: localAlbumCount,
-                        icon: Icons.smartphone,
-                      ),
                     ),
-                    Expanded(
+                  ),
-                      child: EntityCountTile(
+                  Expanded(
-                        label: "remote".t(context: context),
+                    child: EntitiyCountTile(
-                        count: remoteAlbumCount,
+                      label: "remote".t(context: context),
-                        icon: Icons.cloud,
+                      count: remoteAlbumCount,
-                      ),
+                      icon: Icons.cloud,
                     ),
-                  ],
+                  ),
-                ),
+                ],
               ),
             ),
             _SectionHeaderText(text: "other".t(context: context)),
             Padding(
               padding: const EdgeInsets.fromLTRB(16, 8, 16, 16),
-              child: IntrinsicHeight(
+              child: Flex(
-                child: Flex(
+                direction: Axis.horizontal,
-                  direction: Axis.horizontal,
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                spacing: 8.0,
-                  crossAxisAlignment: CrossAxisAlignment.stretch, // Added
+                children: [
-                  spacing: 8.0,
+                  Expanded(
-                  children: [
+                    child: EntitiyCountTile(
-                    Expanded(
+                      label: "memories".t(context: context),
-                      child: EntityCountTile(
+                      count: memoryCount,
-                        label: "memories".t(context: context),
+                      icon: Icons.calendar_today,
-                        count: memoryCount,
-                        icon: Icons.calendar_today,
-                      ),
                     ),
-                    Expanded(
+                  ),
-                      child: EntityCountTile(
+                  Expanded(
-                        label: "hashed_assets".t(context: context),
+                    child: EntitiyCountTile(
-                        count: localHashedCount,
+                      label: "hashed_assets".t(context: context),
-                        icon: Icons.tag,
+                      count: localHashedCount,
-                      ),
+                      icon: Icons.tag,
                     ),
-                  ],
+                  ),
-                ),
+                ],
               ),
             ),
             // To be removed once the experimental feature is stable
@@ -375,29 +364,26 @@ class _SyncStatsCounts extends ConsumerWidget {
                   return counts.when(
                     data: (c) => Padding(
                       padding: const EdgeInsets.fromLTRB(16, 8, 16, 16),
-                      child: IntrinsicHeight(
+                      child: Flex(
-                        child: Flex(
+                        direction: Axis.horizontal,
-                          direction: Axis.horizontal,
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        spacing: 8.0,
-                          crossAxisAlignment: CrossAxisAlignment.stretch, // Added
+                        children: [
-                          spacing: 8.0,
+                          Expanded(
-                          children: [
+                            child: EntitiyCountTile(
-                            Expanded(
+                              label: "local".t(context: context),
-                              child: EntityCountTile(
+                              count: c.total,
-                                label: "local".t(context: context),
+                              icon: Icons.delete_outline,
-                                count: c.total,
-                                icon: Icons.delete_outline,
-                              ),
                             ),
-                            Expanded(
+                          ),
-                              child: EntityCountTile(
+                          Expanded(
-                                label: "hashed_assets".t(context: context),
+                            child: EntitiyCountTile(
-                                count: c.hashed,
+                              label: "hashed_assets".t(context: context),
-                                icon: Icons.tag,
+                              count: c.hashed,
-                              ),
+                              icon: Icons.tag,
                             ),
-                          ],
+                          ),
-                        ),
+                        ],
                       ),
                     ),
                     loading: () => const CircularProgressIndicator(),

mobile/packages/ui/lib/immich_ui.dart

@@ -1,3 +0,0 @@
-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,25 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_ui/src/buttons/icon_button.dart';
-import 'package:immich_ui/src/types.dart';
-
-class ImmichCloseButton extends StatelessWidget {
-  final VoidCallback? onTap;
-  final ImmichVariant variant;
-  final ImmichColor color;
-
-  const ImmichCloseButton({
-    super.key,
-    this.onTap,
-    this.color = ImmichColor.primary,
-    this.variant = ImmichVariant.ghost,
-  });
-
-  @override
-  Widget build(BuildContext context) => ImmichIconButton(
-        key: key,
-        icon: Icons.close,
-        color: color,
-        variant: variant,
-        onTap: onTap ?? () => Navigator.of(context).pop(),
-      );
-}

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

@@ -1,48 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_ui/src/types.dart';
-
-class ImmichIconButton extends StatelessWidget {
-  final IconData icon;
-  final VoidCallback onTap;
-  final ImmichVariant variant;
-  final ImmichColor color;
-
-  const ImmichIconButton({
-    super.key,
-    required this.icon,
-    required this.onTap,
-    this.color = ImmichColor.primary,
-    this.variant = ImmichVariant.filled,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final background = switch (variant) {
-      ImmichVariant.filled => switch (color) {
-          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 => Theme.of(context).colorScheme.onPrimary,
-          ImmichColor.secondary => Theme.of(context).colorScheme.onSecondary,
-        },
-      ImmichVariant.ghost => switch (color) {
-          ImmichColor.primary => Theme.of(context).colorScheme.primary,
-          ImmichColor.secondary => Theme.of(context).colorScheme.secondary,
-        },
-    };
-
-    return IconButton(
-      icon: Icon(icon),
-      onPressed: onTap,
-      style: IconButton.styleFrom(
-        backgroundColor: background,
-        foregroundColor: foreground,
-      ),
-    );
-  }
-}

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

@@ -1,9 +0,0 @@
-enum ImmichVariant {
-  filled,
-  ghost,
-}
-
-enum ImmichColor {
-  primary,
-  secondary,
-}

mobile/packages/ui/pubspec.lock

@@ -1,55 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.19.1"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.16.0"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
-sdks:
-  dart: ">=3.8.0-0 <4.0.0"

mobile/packages/ui/pubspec.yaml

@@ -1,12 +0,0 @@
-name: immich_ui
-publish_to: none
-
-environment:
-  sdk: '>=3.0.0 <4.0.0'
-
-dependencies:
-  flutter:
-    sdk: flutter
-
-flutter:
-  uses-material-design: true

mobile/pubspec.lock

@@ -1015,13 +1015,6 @@ packages:
       relative: true
     source: path
     version: "0.0.0"
-  immich_ui:
-    dependency: "direct main"
-    description:
-      path: "packages/ui"
-      relative: true
-    source: path
-    version: "0.0.0"
   integration_test:
     dependency: "direct dev"
     description: flutter

mobile/pubspec.yaml

@@ -43,8 +43,6 @@ dependencies:
   hooks_riverpod: ^2.6.1
   http: ^1.5.0
   image_picker: ^1.2.0
-  immich_ui:
-    path: './packages/ui'
   intl: ^0.20.2
   isar:
     git:

mobile/test/modules/activity/activity_provider_test.dart

@@ -108,9 +108,9 @@ void main() {
       expect(activities, hasLength(5));
       expect(activities, contains(like));
 
-      // Verify activity count is bumped for new likes
+      // Never bump activity count for new likes
-      verify(() => activityStatisticsMock.addActivity()).called(1);
+      verifyNever(() => activityStatisticsMock.addActivity());
-      verify(() => albumActivityStatisticsMock.addActivity()).called(1);
+      verifyNever(() => albumActivityStatisticsMock.addActivity());
 
       final albumActivities = container.read(albumProvider).requireValue;
       expect(albumActivities, hasLength(5));
@@ -155,9 +155,8 @@ void main() {
       expect(activities, hasLength(3));
       expect(activities, isNot(anyElement(predicate((Activity a) => a.id == '3'))));
 
-      // Verify activity count is decreased for removed likes
+      verifyNever(() => activityStatisticsMock.removeActivity());
-      verify(() => activityStatisticsMock.removeActivity()).called(1);
+      verifyNever(() => albumActivityStatisticsMock.removeActivity());
-      verify(() => albumActivityStatisticsMock.removeActivity()).called(1);
     });
 
     test('Remove Like failed', () async {
@@ -205,9 +204,8 @@ void main() {
       expect(albumActivities, isNot(anyElement(predicate((Activity a) => a.id == '3'))));
 
       verify(() => activityMock.removeActivity('3'));
-      // Verify activity count is decreased when removing from asset-scoped provider
+      verifyNever(() => activityStatisticsMock.removeActivity());
-      verify(() => activityStatisticsMock.removeActivity()).called(1);
+      verifyNever(() => albumActivityStatisticsMock.removeActivity());
-      verify(() => albumActivityStatisticsMock.removeActivity()).called(1);
     });
   });
 

mobile/test/modules/activity/activity_statistics_provider_test.dart

@@ -22,7 +22,7 @@ void main() {
   test('Returns the proper count family', () async {
     when(
       () => activityMock.getStatistics('test-album', assetId: 'test-asset'),
-    ).thenAnswer((_) async => const ActivityStats(comments: 5, likes: 0));
+    ).thenAnswer((_) async => const ActivityStats(comments: 5));
 
     // Read here to make the getStatistics call
     container.read(activityStatisticsProvider('test-album', 'test-asset'));
@@ -38,9 +38,7 @@ void main() {
   });
 
   test('Adds activity', () async {
-    when(
+    when(() => activityMock.getStatistics('test-album')).thenAnswer((_) async => const ActivityStats(comments: 10));
-      () => activityMock.getStatistics('test-album'),
-    ).thenAnswer((_) async => const ActivityStats(comments: 10, likes: 0));
 
     final provider = activityStatisticsProvider('test-album');
     container.listen(provider, listener.call, fireImmediately: true);
@@ -57,7 +55,7 @@ void main() {
   test('Removes activity', () async {
     when(
       () => activityMock.getStatistics('new-album', assetId: 'test-asset'),
-    ).thenAnswer((_) async => const ActivityStats(comments: 10, likes: 0));
+    ).thenAnswer((_) async => const ActivityStats(comments: 10));
 
     final provider = activityStatisticsProvider('new-album', 'test-asset');
     container.listen(provider, listener.call, fireImmediately: true);

mobile/test/modules/activity/activity_text_field_test.dart

@@ -77,15 +77,15 @@ void main() {
       overrides: overrides,
     );
 
-    expect(find.widgetWithIcon(IconButton, Icons.thumb_up), findsOneWidget);
+    expect(find.widgetWithIcon(IconButton, Icons.favorite_rounded), findsOneWidget);
-    expect(find.widgetWithIcon(IconButton, Icons.thumb_up_off_alt), findsNothing);
+    expect(find.widgetWithIcon(IconButton, Icons.favorite_border_rounded), findsNothing);
   });
 
   testWidgets('Bordered icon if likedId == null', (tester) async {
     await tester.pumpConsumerWidget(ActivityTextField(onSubmit: (_) {}), overrides: overrides);
 
-    expect(find.widgetWithIcon(IconButton, Icons.thumb_up_off_alt), findsOneWidget);
+    expect(find.widgetWithIcon(IconButton, Icons.favorite_border_rounded), findsOneWidget);
-    expect(find.widgetWithIcon(IconButton, Icons.thumb_up), findsNothing);
+    expect(find.widgetWithIcon(IconButton, Icons.favorite_rounded), findsNothing);
   });
 
   testWidgets('Adds new like', (tester) async {