refactor: use widget previews for ui showcase

.github/workflows/build-mobile.yml

@@ -288,6 +288,7 @@ jobs:
           APP_STORE_CONNECT_API_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ID }}
           APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}
           ENVIRONMENT: ${{ inputs.environment || 'development' }}
+          BUNDLE_ID_SUFFIX: ${{ inputs.environment == 'production' && '' || 'development' }}
           GITHUB_REF: ${{ github.ref }}
           FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 120
           FASTLANE_XCODEBUILD_SETTINGS_RETRIES: 6

.github/workflows/static_analysis.yml

@@ -72,10 +72,6 @@ jobs:
         run: flutter pub get
         working-directory: ./mobile/packages/ui
 
-      - name: Install dependencies for UI Showcase
-        run: flutter pub get
-        working-directory: ./mobile/packages/ui/showcase
-
       - name: Generate translation files
         run: mise //mobile:codegen:translation
 

docs/docs/developer/setup.md

@@ -108,6 +108,24 @@ make translation
 
 The mobile app asks you what backend to connect to. You can utilize the demo backend (https://demo.immich.app/) if you don't need to change server code or upload photos. Alternatively, you can run the server yourself per the instructions above.
 
+#### UI components and widget previews
+
+Shared design-system widgets (buttons, inputs, forms) live in the
+[`immich_ui` package](https://github.com/immich-app/immich/tree/main/mobile/packages/ui/)
+under `mobile/packages/ui/`. Components are defined in `lib/src/components/`
+and have matching previews in `lib/src/previews/`.
+
+To inspect a component in isolation with a light/dark toggle and hot reload,
+launch [Flutter's Widget Previewer](https://docs.flutter.dev/tools/widget-previewer):
+
+```bash
+cd mobile/packages/ui
+flutter widget-preview start
+```
+
+In VS Code or Android Studio with the Flutter plugin, the previewer
+auto-starts when you open the **Flutter Widget Preview** tab in the sidebar.
+
 ## IDE setup
 
 ### Lint / format extensions

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

@@ -536,7 +536,7 @@ test.describe('Timeline', () => {
         force: false,
         ids: [assetToTrash.id],
       });
-      await page.keyboard.press('Escape');
+      await page.locator('#asset-selection-app-bar').getByLabel('Close').click();
       await page.getByText('Trash', { exact: true }).click();
       await timelineUtils.waitForTimelineLoad(page);
       await thumbnailUtils.expectInViewport(page, assetToTrash.id);
@@ -676,7 +676,7 @@ test.describe('Timeline', () => {
         ids: [assetToArchive.id],
       });
       await thumbnailUtils.expectThumbnailIsArchive(page, assetToArchive.id);
-      await page.keyboard.press('Escape');
+      await page.locator('#asset-selection-app-bar').getByLabel('Close').click();
       await page.getByRole('link').getByText('Archive').click();
       await timelineUtils.waitForTimelineLoad(page);
       await thumbnailUtils.expectInViewport(page, assetToArchive.id);
@@ -823,7 +823,7 @@ test.describe('Timeline', () => {
       });
       // ensure thumbnail still exists and has favorite icon
       await thumbnailUtils.expectThumbnailIsFavorite(page, assetToFavorite.id);
-      await page.keyboard.press('Escape');
+      await page.locator('#asset-selection-app-bar').getByLabel('Close').click();
       await page.getByRole('link').getByText('Favorites').click();
       await timelineUtils.waitForTimelineLoad(page);
       await pageUtils.goToAsset(page, assetToFavorite.fileCreatedAt);

mise.lock

@@ -1,9 +1,31 @@
 # @generated - this file is auto-generated by `mise lock` https://mise.en.dev/dev-tools/mise-lock.html
 
 [[tools."aqua:flutter/flutter"]]
-version = "3.41.9"
+version = "3.44.0"
 backend = "aqua:flutter/flutter"
 
+[tools."aqua:flutter/flutter"."platforms.linux-arm64"]
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.0-stable.tar.xz"
+
+[tools."aqua:flutter/flutter"."platforms.linux-arm64-musl"]
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.0-stable.tar.xz"
+
+[tools."aqua:flutter/flutter"."platforms.linux-x64"]
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.0-stable.tar.xz"
+
+[tools."aqua:flutter/flutter"."platforms.linux-x64-musl"]
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.0-stable.tar.xz"
+
+[tools."aqua:flutter/flutter"."platforms.macos-arm64"]
+checksum = "blake3:fb03aa5d9790205c948922ec3f0751c16e4575b09d6ae9dd4fbeb664a69f0e00"
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_arm64_3.44.0-stable.zip"
+
+[tools."aqua:flutter/flutter"."platforms.macos-x64"]
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/macos/flutter_macos_3.44.0-stable.zip"
+
+[tools."aqua:flutter/flutter"."platforms.windows-x64"]
+url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/windows/flutter_windows_3.44.0-stable.zip"
+
 [[tools.flutter]]
 version = "3.41.9-stable"
 backend = "asdf:flutter"
@@ -16,36 +38,43 @@ backend = "github:CQLabs/homebrew-dcm"
 checksum = "sha256:253da2512b149913dfe345bf9a62a79acb2d730f66e71162ba4a92dfc4224b82"
 url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-linux-arm-release.zip"
 url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543838"
+github_attestations = "unavailable"
 
 [tools."github:CQLabs/homebrew-dcm"."platforms.linux-arm64-musl"]
 checksum = "sha256:253da2512b149913dfe345bf9a62a79acb2d730f66e71162ba4a92dfc4224b82"
 url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-linux-arm-release.zip"
 url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543838"
+github_attestations = "unavailable"
 
 [tools."github:CQLabs/homebrew-dcm"."platforms.linux-x64"]
 checksum = "sha256:477e086d4099c12f21e5ccd83b005d5fb945dd4cac4fd127fd9a08d7649af1cf"
 url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-linux-x64-release.zip"
 url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543797"
+github_attestations = "unavailable"
 
 [tools."github:CQLabs/homebrew-dcm"."platforms.linux-x64-musl"]
 checksum = "sha256:477e086d4099c12f21e5ccd83b005d5fb945dd4cac4fd127fd9a08d7649af1cf"
 url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-linux-x64-release.zip"
 url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543797"
+github_attestations = "unavailable"
 
 [tools."github:CQLabs/homebrew-dcm"."platforms.macos-arm64"]
 checksum = "sha256:30bede64367d09067093cc57af6ec9496d7717898138ded5cb98a16ac8dd9d93"
 url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-macos-arm-release.zip"
 url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543757"
+github_attestations = "unavailable"
 
 [tools."github:CQLabs/homebrew-dcm"."platforms.macos-x64"]
 checksum = "sha256:e56cb99872be7445a4de1d37e5438ca70e3bcd83be7a2b9b385e3538881f8068"
 url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-macos-x64-release.zip"
 url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543727"
+github_attestations = "unavailable"
 
 [tools."github:CQLabs/homebrew-dcm"."platforms.windows-x64"]
 checksum = "sha256:f133470daa3fb0427f039b424392af7e917d7e7db6b556aa2a968ab0e31587da"
 url = "https://github.com/CQLabs/homebrew-dcm/releases/download/1.37.0/dcm-windows-release.zip"
 url_api = "https://api.github.com/repos/CQLabs/homebrew-dcm/releases/assets/404543660"
+github_attestations = "unavailable"
 
 [[tools."github:extism/cli"]]
 version = "1.6.3"
@@ -55,36 +84,43 @@ backend = "github:extism/cli"
 checksum = "sha256:d92f830c9be39637569feacb04e9750c28848df6d9a219db94152a9b4eb9452b"
 url = "https://github.com/extism/cli/releases/download/v1.6.3/extism-v1.6.3-linux-arm64.tar.gz"
 url_api = "https://api.github.com/repos/extism/cli/releases/assets/275694030"
+github_attestations = "unavailable"
 
 [tools."github:extism/cli"."platforms.linux-arm64-musl"]
 checksum = "sha256:d92f830c9be39637569feacb04e9750c28848df6d9a219db94152a9b4eb9452b"
 url = "https://github.com/extism/cli/releases/download/v1.6.3/extism-v1.6.3-linux-arm64.tar.gz"
 url_api = "https://api.github.com/repos/extism/cli/releases/assets/275694030"
+github_attestations = "unavailable"
 
 [tools."github:extism/cli"."platforms.linux-x64"]
 checksum = "sha256:34e7ae9bfded6e2c32dee83f70a4e50d34f9d3e80d1762b09625fe82e214d02d"
 url = "https://github.com/extism/cli/releases/download/v1.6.3/extism-v1.6.3-linux-amd64.tar.gz"
 url_api = "https://api.github.com/repos/extism/cli/releases/assets/275694025"
+github_attestations = "unavailable"
 
 [tools."github:extism/cli"."platforms.linux-x64-musl"]
 checksum = "sha256:34e7ae9bfded6e2c32dee83f70a4e50d34f9d3e80d1762b09625fe82e214d02d"
 url = "https://github.com/extism/cli/releases/download/v1.6.3/extism-v1.6.3-linux-amd64.tar.gz"
 url_api = "https://api.github.com/repos/extism/cli/releases/assets/275694025"
+github_attestations = "unavailable"
 
 [tools."github:extism/cli"."platforms.macos-arm64"]
 checksum = "sha256:b4ddbc575b5ac000115247f781723f9b9f284ed87b29c600539d72161b5b29fc"
 url = "https://github.com/extism/cli/releases/download/v1.6.3/extism-v1.6.3-darwin-arm64.tar.gz"
 url_api = "https://api.github.com/repos/extism/cli/releases/assets/275694029"
+github_attestations = "unavailable"
 
 [tools."github:extism/cli"."platforms.macos-x64"]
 checksum = "sha256:9a2f71b6e6009685a622cc3084e52d2a1a8e23c98d29ffa72e666e9dc699855f"
 url = "https://github.com/extism/cli/releases/download/v1.6.3/extism-v1.6.3-darwin-amd64.tar.gz"
 url_api = "https://api.github.com/repos/extism/cli/releases/assets/275694026"
+github_attestations = "unavailable"
 
 [tools."github:extism/cli"."platforms.windows-x64"]
 checksum = "sha256:47e4ed2782445b2b08a4d1ac127211588f8b4d1fc25fd6481d4cb65151b5213c"
 url = "https://github.com/extism/cli/releases/download/v1.6.3/extism-v1.6.3-windows-amd64.zip"
 url_api = "https://api.github.com/repos/extism/cli/releases/assets/275694035"
+github_attestations = "unavailable"
 
 [[tools."github:extism/js-pdk"]]
 version = "1.6.0"
@@ -94,36 +130,43 @@ backend = "github:extism/js-pdk"
 checksum = "sha256:15a186250e68d6bff4ec839fff275d45a90e383a69209dcc1239eb9e3aee6e1b"
 url = "https://github.com/extism/js-pdk/releases/download/v1.6.0/extism-js-aarch64-linux-v1.6.0.gz"
 url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353223214"
+github_attestations = "unavailable"
 
 [tools."github:extism/js-pdk"."platforms.linux-arm64-musl"]
 checksum = "sha256:15a186250e68d6bff4ec839fff275d45a90e383a69209dcc1239eb9e3aee6e1b"
 url = "https://github.com/extism/js-pdk/releases/download/v1.6.0/extism-js-aarch64-linux-v1.6.0.gz"
 url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353223214"
+github_attestations = "unavailable"
 
 [tools."github:extism/js-pdk"."platforms.linux-x64"]
 checksum = "sha256:4ded271ccf465031ccd0dc35e7a140e134d7f30721671cc4a8e1ff805d4aad68"
 url = "https://github.com/extism/js-pdk/releases/download/v1.6.0/extism-js-x86_64-linux-v1.6.0.gz"
 url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353223119"
+github_attestations = "unavailable"
 
 [tools."github:extism/js-pdk"."platforms.linux-x64-musl"]
 checksum = "sha256:4ded271ccf465031ccd0dc35e7a140e134d7f30721671cc4a8e1ff805d4aad68"
 url = "https://github.com/extism/js-pdk/releases/download/v1.6.0/extism-js-x86_64-linux-v1.6.0.gz"
 url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353223119"
+github_attestations = "unavailable"
 
 [tools."github:extism/js-pdk"."platforms.macos-arm64"]
 checksum = "sha256:548e25bda3971a07c32d78a249135cf8cb7b3eede101e878e06e53e01ac2e0ce"
 url = "https://github.com/extism/js-pdk/releases/download/v1.6.0/extism-js-aarch64-macos-v1.6.0.gz"
 url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353223215"
+github_attestations = "unavailable"
 
 [tools."github:extism/js-pdk"."platforms.macos-x64"]
 checksum = "sha256:d85a875c2a071f0c29fe572764c52c3a499f157ab7f9efac8939a4364390e29b"
 url = "https://github.com/extism/js-pdk/releases/download/v1.6.0/extism-js-x86_64-macos-v1.6.0.gz"
 url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353223239"
+github_attestations = "unavailable"
 
 [tools."github:extism/js-pdk"."platforms.windows-x64"]
 checksum = "sha256:97b7b746141e4777e1ca2b76febdeb16dc9d314ff6a4257df05a476b67228acc"
 url = "https://github.com/extism/js-pdk/releases/download/v1.6.0/extism-js-x86_64-windows-v1.6.0.gz"
 url_api = "https://api.github.com/repos/extism/js-pdk/releases/assets/353224133"
+github_attestations = "unavailable"
 
 [[tools."github:jellyfin/jellyfin-ffmpeg"]]
 version = "7.1.3-6"
@@ -133,36 +176,43 @@ backend = "github:jellyfin/jellyfin-ffmpeg"
 checksum = "sha256:bea03c670e8cc5bfe9edc0c5d624d4735421610cef5e808db93e7d8596952886"
 url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linuxarm64-gpl.tar.xz"
 url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048876"
+github_attestations = "unavailable"
 
 [tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-arm64-musl"]
 checksum = "sha256:bea03c670e8cc5bfe9edc0c5d624d4735421610cef5e808db93e7d8596952886"
 url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linuxarm64-gpl.tar.xz"
 url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048876"
+github_attestations = "unavailable"
 
 [tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-x64"]
 checksum = "sha256:39e99a7927468a6abec5f65d00f55010e8ff2ae3c2605294f179c94f6ae21af2"
 url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linux64-gpl.tar.xz"
 url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048879"
+github_attestations = "unavailable"
 
 [tools."github:jellyfin/jellyfin-ffmpeg"."platforms.linux-x64-musl"]
 checksum = "sha256:39e99a7927468a6abec5f65d00f55010e8ff2ae3c2605294f179c94f6ae21af2"
 url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_linux64-gpl.tar.xz"
 url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409048879"
+github_attestations = "unavailable"
 
 [tools."github:jellyfin/jellyfin-ffmpeg"."platforms.macos-arm64"]
 checksum = "sha256:e024d5e78d5414e75f0181036cd21373fafb9270c72894dfd7dbda2572439820"
 url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_macarm64-gpl.tar.xz"
 url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/408995838"
+github_attestations = "unavailable"
 
 [tools."github:jellyfin/jellyfin-ffmpeg"."platforms.macos-x64"]
 checksum = "sha256:066ede9774aaae97a18098aaeea8b7e0d286653eb8618f640476e99c59a536c2"
 url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_mac64-gpl.tar.xz"
 url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/408995889"
+github_attestations = "unavailable"
 
 [tools."github:jellyfin/jellyfin-ffmpeg"."platforms.windows-x64"]
 checksum = "sha256:7b7168149689610296f3a187c717056ce0786cc125a31caf28056737e9ba1cc1"
 url = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v7.1.3-6/jellyfin-ffmpeg_7.1.3-6_portable_win64-clang-gpl.zip"
 url_api = "https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/assets/409036094"
+github_attestations = "unavailable"
 
 [[tools."github:webassembly/binaryen"]]
 version = "version_124"
@@ -172,36 +222,43 @@ backend = "github:webassembly/binaryen"
 checksum = "sha256:6291bd9a57d8e046f3bc099a4db386c147433a87f71c783a901c5b1792e38de3"
 url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-aarch64-linux.tar.gz"
 url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288927659"
+github_attestations = "unavailable"
 
 [tools."github:webassembly/binaryen"."platforms.linux-arm64-musl"]
 checksum = "sha256:6291bd9a57d8e046f3bc099a4db386c147433a87f71c783a901c5b1792e38de3"
 url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-aarch64-linux.tar.gz"
 url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288927659"
+github_attestations = "unavailable"
 
 [tools."github:webassembly/binaryen"."platforms.linux-x64"]
 checksum = "sha256:0290c3779fedf592b8da0ded3032ff55c41a2b7bfa2d6bf7b7bac6f0e6e28963"
 url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-x86_64-linux.tar.gz"
 url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288926769"
+github_attestations = "unavailable"
 
 [tools."github:webassembly/binaryen"."platforms.linux-x64-musl"]
 checksum = "sha256:0290c3779fedf592b8da0ded3032ff55c41a2b7bfa2d6bf7b7bac6f0e6e28963"
 url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-x86_64-linux.tar.gz"
 url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288926769"
+github_attestations = "unavailable"
 
 [tools."github:webassembly/binaryen"."platforms.macos-arm64"]
 checksum = "sha256:86a2c960ff62c6d2ea6009d1f89745c22c70100d394a095eab45eb941bdaa24c"
 url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-arm64-macos.tar.gz"
 url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288926134"
+github_attestations = "unavailable"
 
 [tools."github:webassembly/binaryen"."platforms.macos-x64"]
 checksum = "sha256:b389bb0731758d86c3cb266d01d28a12725c23bd3cabc3df34faa162af0887e9"
 url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-x86_64-macos.tar.gz"
 url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288926135"
+github_attestations = "unavailable"
 
 [tools."github:webassembly/binaryen"."platforms.windows-x64"]
 checksum = "sha256:b5e1d2a1ad3c03229ddc89823848f4a1c11f9c6402a51fa26f0aaa5f1d7a2203"
 url = "https://github.com/WebAssembly/binaryen/releases/download/version_124/binaryen-version_124-x86_64-windows.tar.gz"
 url_api = "https://api.github.com/repos/WebAssembly/binaryen/releases/assets/288925833"
+github_attestations = "unavailable"
 
 [[tools.java]]
 version = "21.0.2"
@@ -296,9 +353,37 @@ checksum = "sha256:27323f70c875b8251bfd7e61a4cffc3ebff4e56ed1e611b955016f0c70773
 url = "https://github.com/opentofu/opentofu/releases/download/v1.11.6/tofu_1.11.6_windows_amd64.tar.gz"
 
 [[tools.pnpm]]
-version = "10.33.4"
+version = "10.33.1"
 backend = "aqua:pnpm/pnpm"
 
+[tools.pnpm."platforms.linux-arm64"]
+checksum = "sha256:ed8aa7901cf325f4cf5019405bdd6bf988426e4b23d08fe9b12ea4df7046f23e"
+url = "https://github.com/pnpm/pnpm/releases/download/v10.33.1/pnpm-linux-arm64"
+
+[tools.pnpm."platforms.linux-arm64-musl"]
+checksum = "sha256:ed8aa7901cf325f4cf5019405bdd6bf988426e4b23d08fe9b12ea4df7046f23e"
+url = "https://github.com/pnpm/pnpm/releases/download/v10.33.1/pnpm-linux-arm64"
+
+[tools.pnpm."platforms.linux-x64"]
+checksum = "sha256:fba950842532edd365e949b74643b64e6311089a45532dbe1e8f909a247fe3e9"
+url = "https://github.com/pnpm/pnpm/releases/download/v10.33.1/pnpm-linux-x64"
+
+[tools.pnpm."platforms.linux-x64-musl"]
+checksum = "sha256:fba950842532edd365e949b74643b64e6311089a45532dbe1e8f909a247fe3e9"
+url = "https://github.com/pnpm/pnpm/releases/download/v10.33.1/pnpm-linux-x64"
+
+[tools.pnpm."platforms.macos-arm64"]
+checksum = "sha256:909ced0038b00881d4d620ba2018c5d9691de373deea8e3c84b722b44324e47c"
+url = "https://github.com/pnpm/pnpm/releases/download/v10.33.1/pnpm-macos-arm64"
+
+[tools.pnpm."platforms.macos-x64"]
+checksum = "sha256:afdad60b83f4f482f4c95cc79325f29aef776d0922a324f023a312f40e0cc7d3"
+url = "https://github.com/pnpm/pnpm/releases/download/v10.33.1/pnpm-macos-x64"
+
+[tools.pnpm."platforms.windows-x64"]
+checksum = "sha256:67b23fd8c6800566b1cc04c446b170ff6e7977250084e4d8df9bfdbd8e6f4d02"
+url = "https://github.com/pnpm/pnpm/releases/download/v10.33.1/pnpm-win-x64.exe"
+
 [[tools.terragrunt]]
 version = "1.0.3"
 backend = "aqua:gruntwork-io/terragrunt"

mise.toml

@@ -16,7 +16,7 @@ config_roots = [
 
 [tools]
 node = "24.15.0"
-"aqua:flutter/flutter" = "3.41.9"
+"aqua:flutter/flutter" = "3.44.0"
 pnpm = "10.33.4"
 terragrunt = "1.0.3"
 opentofu = "1.11.6"

mobile/.vscode/settings.json

@@ -1,5 +1,4 @@
 {
-  "dart.flutterSdkPath": ".fvm/versions/3.41.9",
   "dart.lineLength": 120,
   "[dart]": {
     "editor.rulers": [

mobile/android/app/src/main/kotlin/app/alextran/immich/MainActivity.kt

@@ -17,8 +17,6 @@ import app.alextran.immich.images.LocalImageApi
 import app.alextran.immich.images.LocalImagesImpl
 import app.alextran.immich.images.RemoteImageApi
 import app.alextran.immich.images.RemoteImagesImpl
-import app.alextran.immich.permission.PermissionApi
-import app.alextran.immich.permission.PermissionApiImpl
 import app.alextran.immich.sync.NativeSyncApi
 import app.alextran.immich.sync.NativeSyncApiImpl26
 import app.alextran.immich.sync.NativeSyncApiImpl30
@@ -46,9 +44,7 @@ class MainActivity : FlutterFragmentActivity() {
         } else {
           NativeSyncApiImpl30(ctx)
         }
-      val permissionApiImpl = PermissionApiImpl(ctx)
       NativeSyncApi.setUp(messenger, nativeSyncApiImpl)
-      PermissionApi.setUp(messenger, permissionApiImpl)
       LocalImageApi.setUp(messenger, LocalImagesImpl(ctx))
       RemoteImageApi.setUp(messenger, RemoteImagesImpl(ctx))
 
@@ -57,7 +53,6 @@ class MainActivity : FlutterFragmentActivity() {
 
       flutterEngine.plugins.add(backgroundEngineLockImpl)
       flutterEngine.plugins.add(nativeSyncApiImpl)
-      flutterEngine.plugins.add(permissionApiImpl)
     }
 
     fun cancelPlugins(flutterEngine: FlutterEngine) {
@@ -65,8 +60,6 @@ class MainActivity : FlutterFragmentActivity() {
         flutterEngine.plugins.get(NativeSyncApiImpl26::class.java) as ImmichPlugin?
           ?: flutterEngine.plugins.get(NativeSyncApiImpl30::class.java) as ImmichPlugin?
       nativeApi?.detachFromEngine()
-      val permissionApi = flutterEngine.plugins.get(PermissionApiImpl::class.java) as ImmichPlugin?
-      permissionApi?.detachFromEngine()
     }
   }
 }

mobile/android/app/src/main/kotlin/app/alextran/immich/core/Network.g.kt

@@ -315,7 +315,6 @@ interface NetworkApi {
   fun hasCertificate(): Boolean
   fun getClientPointer(): Long
   fun setRequestHeaders(headers: Map<String, String>, serverUrls: List<String>, token: String?)
-  fun getAppGroupId(): String
 
   companion object {
     /** The codec used by NetworkApi. */
@@ -431,21 +430,6 @@ interface NetworkApi {
           channel.setMessageHandler(null)
         }
       }
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NetworkApi.getAppGroupId$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { _, reply ->
-            val wrapped: List<Any?> = try {
-              listOf(api.getAppGroupId())
-            } catch (exception: Throwable) {
-              NetworkPigeonUtils.wrapError(exception)
-            }
-            reply.reply(wrapped)
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
     }
   }
 }

mobile/android/app/src/main/kotlin/app/alextran/immich/core/NetworkApiPlugin.kt

@@ -13,7 +13,7 @@ class NetworkApiPlugin : FlutterPlugin, ActivityAware {
   private var networkApi: NetworkApiImpl? = null
 
   override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) {
-    networkApi = NetworkApiImpl(binding.applicationContext)
+    networkApi = NetworkApiImpl()
     NetworkApi.setUp(binding.binaryMessenger, networkApi)
   }
 
@@ -39,11 +39,9 @@ class NetworkApiPlugin : FlutterPlugin, ActivityAware {
   }
 }
 
-private class NetworkApiImpl(private val context: Context) : NetworkApi {
+private class NetworkApiImpl : NetworkApi {
   var activity: Activity? = null
 
-  override fun getAppGroupId(): String = context.packageName
-
   override fun addCertificate(clientData: ClientCertData, callback: (Result<Unit>) -> Unit) {
     try {
       HttpClientManager.setKeyEntry(clientData.data, clientData.password.toCharArray())

mobile/android/app/src/main/kotlin/app/alextran/immich/permission/ManageMediaPermissionDelegate.kt

@@ -1,96 +0,0 @@
-package app.alextran.immich.permission
-
-import android.content.Context
-import android.content.Intent
-import android.os.Build
-import android.provider.MediaStore
-import android.provider.Settings
-import androidx.core.net.toUri
-import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
-import io.flutter.plugin.common.PluginRegistry
-
-class ManageMediaPermissionDelegate(
-  context: Context,
-  private val requestCode: Int = 1003,
-) : PluginRegistry.ActivityResultListener {
-  private val ctx = context.applicationContext
-  private var activityBinding: ActivityPluginBinding? = null
-  private var pendingResult: ((Result<Boolean>) -> Unit)? = null
-
-  fun hasManageMediaPermission(): Boolean {
-    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-      MediaStore.canManageMedia(ctx)
-    } else {
-      false
-    }
-  }
-
-  fun requestManageMediaPermission(callback: (Result<Boolean>) -> Unit) {
-    if (hasManageMediaPermission()) {
-      callback(Result.success(true))
-      return
-    }
-
-    openManageMediaPermissionSettings(callback)
-  }
-
-  fun manageMediaPermission(callback: (Result<Boolean>) -> Unit) {
-    openManageMediaPermissionSettings(callback)
-  }
-
-  private fun openManageMediaPermissionSettings(callback: (Result<Boolean>) -> Unit) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
-      callback(Result.success(false))
-      return
-    }
-
-    val activity = activityBinding?.activity
-    if (activity == null) {
-      callback(Result.failure(FlutterError("NO_ACTIVITY", "Activity not available", null)))
-      return
-    }
-
-    pendingResult = callback
-    val intent = Intent(Settings.ACTION_REQUEST_MANAGE_MEDIA).apply {
-      data = "package:${activity.packageName}".toUri()
-    }
-    try {
-      activity.startActivityForResult(intent, requestCode)
-    } catch (e: Exception) {
-      pendingResult = null
-      callback(
-        Result.failure(
-          FlutterError("ACTIVITY_LAUNCH_FAILED", "Failed to launch MANAGE_MEDIA settings", e.toString())
-        )
-      )
-    }
-  }
-
-  fun onAttachedToActivity(binding: ActivityPluginBinding) {
-    activityBinding = binding
-    binding.addActivityResultListener(this)
-  }
-
-  fun onDetachedFromActivity() {
-    failPending("ACTIVITY_DETACHED", "Activity detached before MANAGE_MEDIA result")
-    activityBinding?.removeActivityResultListener(this)
-    activityBinding = null
-  }
-
-  override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
-    if (requestCode == this.requestCode) {
-      val callback = pendingResult
-      pendingResult = null
-      callback?.invoke(Result.success(hasManageMediaPermission()))
-      return true
-    }
-
-    return false
-  }
-
-  private fun failPending(code: String, message: String) {
-    val callback = pendingResult ?: return
-    pendingResult = null
-    callback(Result.failure(FlutterError(code, message, null)))
-  }
-}

mobile/android/app/src/main/kotlin/app/alextran/immich/permission/PermissionApi.g.kt

@@ -1,128 +0,0 @@
-// Autogenerated from Pigeon (v26.3.4), do not edit directly.
-// See also: https://pub.dev/packages/pigeon
-@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
-
-package app.alextran.immich.permission
-
-import android.util.Log
-import io.flutter.plugin.common.BasicMessageChannel
-import io.flutter.plugin.common.BinaryMessenger
-import io.flutter.plugin.common.EventChannel
-import io.flutter.plugin.common.MessageCodec
-import io.flutter.plugin.common.StandardMethodCodec
-import io.flutter.plugin.common.StandardMessageCodec
-import java.io.ByteArrayOutputStream
-import java.nio.ByteBuffer
-private object PermissionApiPigeonUtils {
-
-  fun wrapResult(result: Any?): List<Any?> {
-    return listOf(result)
-  }
-
-  fun wrapError(exception: Throwable): List<Any?> {
-    return if (exception is FlutterError) {
-      listOf(
-        exception.code,
-        exception.message,
-        exception.details
-      )
-    } else {
-      listOf(
-        exception.javaClass.simpleName,
-        exception.toString(),
-        "Cause: " + exception.cause + ", Stacktrace: " + Log.getStackTraceString(exception)
-      )
-    }
-  }
-}
-
-/**
- * Error class for passing custom error details to Flutter via a thrown PlatformException.
- * @property code The error code.
- * @property message The error message.
- * @property details The error details. Must be a datatype supported by the api codec.
- */
-class FlutterError (
-  val code: String,
-  override val message: String? = null,
-  val details: Any? = null
-) : RuntimeException()
-private open class PermissionApiPigeonCodec : StandardMessageCodec() {
-  override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
-    return     super.readValueOfType(type, buffer)
-  }
-  override fun writeValue(stream: ByteArrayOutputStream, value: Any?)   {
-    super.writeValue(stream, value)
-  }
-}
-
-
-/** Generated interface from Pigeon that represents a handler of messages from Flutter. */
-interface PermissionApi {
-  fun hasManageMediaPermission(): Boolean
-  fun requestManageMediaPermission(callback: (Result<Boolean>) -> Unit)
-  fun manageMediaPermission(callback: (Result<Boolean>) -> Unit)
-
-  companion object {
-    /** The codec used by PermissionApi. */
-    val codec: MessageCodec<Any?> by lazy {
-      PermissionApiPigeonCodec()
-    }
-    /** Sets up an instance of `PermissionApi` to handle messages through the `binaryMessenger`. */
-    @JvmOverloads
-    fun setUp(binaryMessenger: BinaryMessenger, api: PermissionApi?, messageChannelSuffix: String = "") {
-      val separatedMessageChannelSuffix = if (messageChannelSuffix.isNotEmpty()) ".$messageChannelSuffix" else ""
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.PermissionApi.hasManageMediaPermission$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { _, reply ->
-            val wrapped: List<Any?> = try {
-              listOf(api.hasManageMediaPermission())
-            } catch (exception: Throwable) {
-              PermissionApiPigeonUtils.wrapError(exception)
-            }
-            reply.reply(wrapped)
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.PermissionApi.requestManageMediaPermission$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { _, reply ->
-            api.requestManageMediaPermission{ result: Result<Boolean> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(PermissionApiPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(PermissionApiPigeonUtils.wrapResult(data))
-              }
-            }
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.PermissionApi.manageMediaPermission$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { _, reply ->
-            api.manageMediaPermission{ result: Result<Boolean> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(PermissionApiPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(PermissionApiPigeonUtils.wrapResult(data))
-              }
-            }
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
-    }
-  }
-}

mobile/android/app/src/main/kotlin/app/alextran/immich/permission/PermissionApiImpl.kt

@@ -1,37 +0,0 @@
-package app.alextran.immich.permission
-
-import android.content.Context
-import app.alextran.immich.core.ImmichPlugin
-import io.flutter.embedding.engine.plugins.activity.ActivityAware
-import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
-
-class PermissionApiImpl(context: Context) : ImmichPlugin(), PermissionApi, ActivityAware {
-  private val manageMediaPermissionDelegate = ManageMediaPermissionDelegate(context)
-
-  override fun hasManageMediaPermission(): Boolean =
-    manageMediaPermissionDelegate.hasManageMediaPermission()
-
-  override fun requestManageMediaPermission(callback: (Result<Boolean>) -> Unit) {
-    manageMediaPermissionDelegate.requestManageMediaPermission { completeWhenActive(callback, it) }
-  }
-
-  override fun manageMediaPermission(callback: (Result<Boolean>) -> Unit) {
-    manageMediaPermissionDelegate.manageMediaPermission { completeWhenActive(callback, it) }
-  }
-
-  override fun onAttachedToActivity(binding: ActivityPluginBinding) {
-    manageMediaPermissionDelegate.onAttachedToActivity(binding)
-  }
-
-  override fun onDetachedFromActivityForConfigChanges() {
-    manageMediaPermissionDelegate.onDetachedFromActivity()
-  }
-
-  override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
-    manageMediaPermissionDelegate.onAttachedToActivity(binding)
-  }
-
-  override fun onDetachedFromActivity() {
-    manageMediaPermissionDelegate.onDetachedFromActivity()
-  }
-}

mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MediaTrashDelegate.kt

@@ -1,133 +0,0 @@
-package app.alextran.immich.sync
-
-import android.app.Activity
-import android.content.ContentResolver
-import android.content.ContentUris
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
-import android.os.Bundle
-import android.provider.MediaStore
-import androidx.annotation.RequiresApi
-import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
-import io.flutter.plugin.common.PluginRegistry
-
-class MediaTrashDelegate(
-  context: Context,
-  private val trashRequestCode: Int = 1002,
-) : PluginRegistry.ActivityResultListener {
-  private val ctx = context.applicationContext
-  private var activityBinding: ActivityPluginBinding? = null
-  private var pendingResult: ((Result<Boolean>) -> Unit)? = null
-
-  private fun hasManageMediaPermission(): Boolean {
-    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-      MediaStore.canManageMedia(ctx)
-    } else {
-      false
-    }
-  }
-
-  fun restoreFromTrashById(mediaId: String, type: Long, callback: (Result<Boolean>) -> Unit) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R || !hasManageMediaPermission()) {
-      callback(Result.failure(FlutterError("PERMISSION_DENIED", "Media permission required", null)))
-      return
-    }
-
-    val id = mediaId.toLongOrNull()
-    if (id == null) {
-      callback(Result.failure(FlutterError("INVALID_ID", "The file id is not a valid number: $mediaId", null)))
-      return
-    }
-
-    if (!isInTrash(id)) {
-      callback(Result.failure(FlutterError("TRASH_NOT_FOUND", "Item with id=$id not found in trash", null)))
-      return
-    }
-
-    restoreUri(ContentUris.withAppendedId(contentUriForType(type.toInt()), id), callback)
-  }
-
-  @RequiresApi(Build.VERSION_CODES.R)
-  private fun restoreUri(
-    contentUri: Uri,
-    callback: (Result<Boolean>) -> Unit,
-  ) {
-    val activity = activityBinding?.activity
-    if (activity == null) {
-      callback(Result.failure(FlutterError("NO_ACTIVITY", "Activity not available", null)))
-      return
-    }
-
-    try {
-      val pendingIntent = MediaStore.createTrashRequest(ctx.contentResolver, listOf(contentUri), false)
-      pendingResult = callback
-      activity.startIntentSenderForResult(
-        pendingIntent.intentSender,
-        trashRequestCode,
-        null,
-        0,
-        0,
-        0,
-      )
-    } catch (e: Exception) {
-      pendingResult = null
-      callback(
-        Result.failure(
-          FlutterError("TRASH_ERROR", "Error creating or starting trash request", e.toString())
-        )
-      )
-    }
-  }
-
-  @RequiresApi(Build.VERSION_CODES.R)
-  private fun isInTrash(id: Long): Boolean {
-    val filesUri = MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL)
-    val args = Bundle().apply {
-      putString(ContentResolver.QUERY_ARG_SQL_SELECTION, "${MediaStore.Files.FileColumns._ID}=?")
-      putStringArray(ContentResolver.QUERY_ARG_SQL_SELECTION_ARGS, arrayOf(id.toString()))
-      putInt(MediaStore.QUERY_ARG_MATCH_TRASHED, MediaStore.MATCH_ONLY)
-      putInt(ContentResolver.QUERY_ARG_LIMIT, 1)
-    }
-    return ctx.contentResolver.query(filesUri, arrayOf(MediaStore.Files.FileColumns._ID), args, null)
-      ?.use { it.moveToFirst() } == true
-  }
-
-  private fun contentUriForType(type: Int): Uri =
-    when (type) {
-      // Same order as AssetType from Dart.
-      1 -> MediaStore.Images.Media.EXTERNAL_CONTENT_URI
-      2 -> MediaStore.Video.Media.EXTERNAL_CONTENT_URI
-      3 -> MediaStore.Audio.Media.EXTERNAL_CONTENT_URI
-      else -> MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL)
-    }
-
-  fun onAttachedToActivity(binding: ActivityPluginBinding) {
-    activityBinding = binding
-    binding.addActivityResultListener(this)
-  }
-
-  fun onDetachedFromActivity() {
-    failPending("ACTIVITY_DETACHED", "Activity detached before trash result")
-    activityBinding?.removeActivityResultListener(this)
-    activityBinding = null
-  }
-
-  override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?): Boolean {
-    if (requestCode == trashRequestCode) {
-      val callback = pendingResult
-      pendingResult = null
-      callback?.invoke(Result.success(resultCode == Activity.RESULT_OK))
-      return true
-    }
-
-    return false
-  }
-
-  private fun failPending(code: String, message: String) {
-    val callback = pendingResult ?: return
-    pendingResult = null
-    callback(Result.failure(FlutterError(code, message, null)))
-  }
-}

mobile/android/app/src/main/kotlin/app/alextran/immich/sync/Messages.g.kt

@@ -553,7 +553,6 @@ interface NativeSyncApi {
   fun hashAssets(assetIds: List<String>, allowNetworkAccess: Boolean, callback: (Result<List<HashResult>>) -> Unit)
   fun cancelHashing()
   fun getTrashedAssets(): Map<String, List<PlatformAsset>>
-  fun restoreFromTrashById(mediaId: String, type: Long, callback: (Result<Boolean>) -> Unit)
   fun getCloudIdForAssetIds(assetIds: List<String>): List<CloudIdResult>
 
   companion object {
@@ -748,27 +747,6 @@ interface NativeSyncApi {
           channel.setMessageHandler(null)
         }
       }
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.restoreFromTrashById$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { message, reply ->
-            val args = message as List<Any?>
-            val mediaIdArg = args[0] as String
-            val typeArg = args[1] as Long
-            api.restoreFromTrashById(mediaIdArg, typeArg) { result: Result<Boolean> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(MessagesPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(MessagesPigeonUtils.wrapResult(data))
-              }
-            }
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
       run {
         val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds$separatedMessageChannelSuffix", codec, taskQueue)
         if (api != null) {

mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt

@@ -17,8 +17,6 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.load.ImageHeaderParser
 import com.bumptech.glide.load.ImageHeaderParserUtils
 import com.bumptech.glide.load.resource.bitmap.DefaultImageHeaderParser
-import io.flutter.embedding.engine.plugins.activity.ActivityAware
-import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -41,11 +39,10 @@ sealed class AssetResult {
 private const val TAG = "NativeSyncApiImplBase"
 
 @SuppressLint("InlinedApi")
-open class NativeSyncApiImplBase(context: Context) : ImmichPlugin(), ActivityAware {
+open class NativeSyncApiImplBase(context: Context) : ImmichPlugin() {
   private val ctx: Context = context.applicationContext
 
   private var hashTask: Job? = null
-  private val mediaTrashDelegate = MediaTrashDelegate(ctx)
 
   companion object {
     private const val MAX_CONCURRENT_HASH_OPERATIONS = 16
@@ -451,26 +448,6 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin(), ActivityAwa
     hashTask = null
   }
 
-  fun restoreFromTrashById(mediaId: String, type: Long, callback: (Result<Boolean>) -> Unit) {
-    mediaTrashDelegate.restoreFromTrashById(mediaId, type) { completeWhenActive(callback, it) }
-  }
-
-  override fun onAttachedToActivity(binding: ActivityPluginBinding) {
-    mediaTrashDelegate.onAttachedToActivity(binding)
-  }
-
-  override fun onDetachedFromActivityForConfigChanges() {
-    mediaTrashDelegate.onDetachedFromActivity()
-  }
-
-  override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
-    mediaTrashDelegate.onAttachedToActivity(binding)
-  }
-
-  override fun onDetachedFromActivity() {
-    mediaTrashDelegate.onDetachedFromActivity()
-  }
-
   // This method is only implemented on iOS; on Android, we do not have a concept of cloud IDs
   @Suppress("unused", "UNUSED_PARAMETER")
   fun getCloudIdForAssetIds(assetIds: List<String>): List<CloudIdResult> {

mobile/android/gradle.properties

@@ -5,3 +5,7 @@ android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 org.gradle.caching=true
 org.gradle.parallel=true
+# This builtInKotlin flag was added automatically by Flutter migrator
+android.builtInKotlin=false
+# This newDsl flag was added automatically by Flutter migrator
+android.newDsl=false

mobile/ios/Podfile.lock

@@ -1,58 +1,23 @@
 PODS:
-  - background_downloader (0.0.1):
-    - Flutter
   - bonsoir_darwin (0.0.1):
     - Flutter
     - FlutterMacOS
-  - connectivity_plus (0.0.1):
-    - Flutter
   - cupertino_http (0.0.1):
     - Flutter
     - FlutterMacOS
-  - device_info_plus (0.0.1):
-    - Flutter
   - Flutter (1.0.0)
   - flutter_local_notifications (0.0.1):
     - Flutter
-  - flutter_native_splash (2.4.3):
-    - Flutter
   - flutter_secure_storage (6.0.0):
     - Flutter
-  - flutter_udid (0.0.1):
-    - Flutter
-    - KeychainAccess
-  - flutter_web_auth_2 (5.0.0):
-    - Flutter
   - fluttertoast (0.0.2):
     - Flutter
-  - geolocator_apple (1.2.0):
-    - Flutter
-    - FlutterMacOS
   - home_widget (0.0.1):
     - Flutter
-  - image_picker_ios (0.0.1):
-    - Flutter
-  - integration_test (0.0.1):
-    - Flutter
-  - KeychainAccess (4.2.2)
-  - local_auth_darwin (0.0.1):
-    - Flutter
-    - FlutterMacOS
-  - MapLibre (6.14.0)
-  - maplibre_gl (0.0.1):
-    - Flutter
-    - MapLibre (= 6.14.0)
   - native_video_player (1.0.0):
     - Flutter
-  - network_info_plus (0.0.1):
-    - Flutter
-  - package_info_plus (0.4.5):
-    - Flutter
   - permission_handler_apple (9.3.0):
     - Flutter
-  - photo_manager (3.9.0):
-    - Flutter
-    - FlutterMacOS
   - share_handler_ios (0.0.14):
     - Flutter
     - share_handler_ios/share_handler_ios_models (= 0.0.14)
@@ -61,144 +26,56 @@ PODS:
     - Flutter
     - share_handler_ios_models
   - share_handler_ios_models (0.0.9)
-  - share_plus (0.0.1):
-    - Flutter
-  - shared_preferences_foundation (0.0.1):
-    - Flutter
-    - FlutterMacOS
-  - url_launcher_ios (0.0.1):
-    - Flutter
-  - wakelock_plus (0.0.1):
-    - Flutter
 
 DEPENDENCIES:
-  - background_downloader (from `.symlinks/plugins/background_downloader/ios`)
   - bonsoir_darwin (from `.symlinks/plugins/bonsoir_darwin/darwin`)
-  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - cupertino_http (from `.symlinks/plugins/cupertino_http/darwin`)
-  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - Flutter (from `Flutter`)
   - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
-  - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
-  - flutter_udid (from `.symlinks/plugins/flutter_udid/ios`)
-  - flutter_web_auth_2 (from `.symlinks/plugins/flutter_web_auth_2/ios`)
   - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
-  - geolocator_apple (from `.symlinks/plugins/geolocator_apple/darwin`)
   - home_widget (from `.symlinks/plugins/home_widget/ios`)
-  - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
-  - integration_test (from `.symlinks/plugins/integration_test/ios`)
-  - local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
-  - maplibre_gl (from `.symlinks/plugins/maplibre_gl/ios`)
   - native_video_player (from `.symlinks/plugins/native_video_player/ios`)
-  - network_info_plus (from `.symlinks/plugins/network_info_plus/ios`)
-  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
-  - photo_manager (from `.symlinks/plugins/photo_manager/darwin`)
   - share_handler_ios (from `.symlinks/plugins/share_handler_ios/ios`)
   - share_handler_ios_models (from `.symlinks/plugins/share_handler_ios/ios/Models`)
-  - share_plus (from `.symlinks/plugins/share_plus/ios`)
-  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
-  - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
-
-SPEC REPOS:
-  trunk:
-    - KeychainAccess
-    - MapLibre
 
 EXTERNAL SOURCES:
-  background_downloader:
-    :path: ".symlinks/plugins/background_downloader/ios"
   bonsoir_darwin:
     :path: ".symlinks/plugins/bonsoir_darwin/darwin"
-  connectivity_plus:
-    :path: ".symlinks/plugins/connectivity_plus/ios"
   cupertino_http:
     :path: ".symlinks/plugins/cupertino_http/darwin"
-  device_info_plus:
-    :path: ".symlinks/plugins/device_info_plus/ios"
   Flutter:
     :path: Flutter
   flutter_local_notifications:
     :path: ".symlinks/plugins/flutter_local_notifications/ios"
-  flutter_native_splash:
-    :path: ".symlinks/plugins/flutter_native_splash/ios"
   flutter_secure_storage:
     :path: ".symlinks/plugins/flutter_secure_storage/ios"
-  flutter_udid:
-    :path: ".symlinks/plugins/flutter_udid/ios"
-  flutter_web_auth_2:
-    :path: ".symlinks/plugins/flutter_web_auth_2/ios"
   fluttertoast:
     :path: ".symlinks/plugins/fluttertoast/ios"
-  geolocator_apple:
-    :path: ".symlinks/plugins/geolocator_apple/darwin"
   home_widget:
     :path: ".symlinks/plugins/home_widget/ios"
-  image_picker_ios:
-    :path: ".symlinks/plugins/image_picker_ios/ios"
-  integration_test:
-    :path: ".symlinks/plugins/integration_test/ios"
-  local_auth_darwin:
-    :path: ".symlinks/plugins/local_auth_darwin/darwin"
-  maplibre_gl:
-    :path: ".symlinks/plugins/maplibre_gl/ios"
   native_video_player:
     :path: ".symlinks/plugins/native_video_player/ios"
-  network_info_plus:
-    :path: ".symlinks/plugins/network_info_plus/ios"
-  package_info_plus:
-    :path: ".symlinks/plugins/package_info_plus/ios"
   permission_handler_apple:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
-  photo_manager:
-    :path: ".symlinks/plugins/photo_manager/darwin"
   share_handler_ios:
     :path: ".symlinks/plugins/share_handler_ios/ios"
   share_handler_ios_models:
     :path: ".symlinks/plugins/share_handler_ios/ios/Models"
-  share_plus:
-    :path: ".symlinks/plugins/share_plus/ios"
-  shared_preferences_foundation:
-    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
-  url_launcher_ios:
-    :path: ".symlinks/plugins/url_launcher_ios/ios"
-  wakelock_plus:
-    :path: ".symlinks/plugins/wakelock_plus/ios"
 
 SPEC CHECKSUMS:
-  background_downloader: 50e91d979067b82081aba359d7d916b3ba5fadad
   bonsoir_darwin: 29c7ccf356646118844721f36e1de4b61f6cbd0e
-  connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
   cupertino_http: 94ac07f5ff090b8effa6c5e2c47871d48ab7c86c
-  device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
   flutter_local_notifications: ad39620c743ea4c15127860f4b5641649a988100
-  flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
   flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
-  flutter_udid: 92a5d31fe0526b7b6002a2318df702e12e7eb300
-  flutter_web_auth_2: 646fc9df97a01c59e5eea99b237da2c6360f8439
   fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1
-  geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e
   home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64f
-  image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326
-  integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
-  KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
-  local_auth_darwin: c3ee6cce0a8d56be34c8ccb66ba31f7f180aaebb
-  MapLibre: 69e572367f4ef6287e18246cfafc39c80cdcabcd
-  maplibre_gl: 3c924e44725147b03dda33430ad216005b40555f
   native_video_player: b65c58951ede2f93d103a25366bdebca95081265
-  network_info_plus: cf61925ab5205dce05a4f0895989afdb6aade5fc
-  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
   permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
-  photo_manager: 25fd77df14f4f0ba5ef99e2c61814dde77e2bceb
   share_handler_ios: e2244e990f826b2c8eaa291ac3831569438ba0fb
   share_handler_ios_models: fc638c9b4330dc7f082586c92aee9dfa0b87b871
-  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
-  shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
-  url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
-  wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556
 
 PODFILE CHECKSUM: 938abbae4114b9c2140c550a2a0d8f7c674f5dfe
 

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -19,8 +19,6 @@
 		B21E34AC2E5B09190031FDB9 /* BackgroundWorker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B21E34AB2E5B09100031FDB9 /* BackgroundWorker.swift */; };
 		B25D377A2E72CA15008B6CA7 /* Connectivity.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = B25D37782E72CA15008B6CA7 /* Connectivity.g.swift */; };
 		B25D377C2E72CA26008B6CA7 /* ConnectivityApiImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = B25D377B2E72CA20008B6CA7 /* ConnectivityApiImpl.swift */; };
-		B2EE00022E72CA15008B6CA7 /* PermissionApi.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2EE00012E72CA15008B6CA7 /* PermissionApi.g.swift */; };
-		B2EE00042E72CA15008B6CA7 /* PermissionApiImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2EE00032E72CA15008B6CA7 /* PermissionApiImpl.swift */; };
 		B2BE315F2E5E5229006EEF88 /* BackgroundWorker.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2BE315E2E5E5229006EEF88 /* BackgroundWorker.g.swift */; };
 		D218389C4A4C4693F141F7D1 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 886774DBDDE6B35BF2B4F2CD /* Pods_Runner.framework */; };
 		F02538E92DFBCBDD008C3FA3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
@@ -39,6 +37,7 @@
 		FEE084F82EC172460045228E /* SQLiteData in Frameworks */ = {isa = PBXBuildFile; productRef = FEE084F72EC172460045228E /* SQLiteData */; };
 		FEE084FB2EC1725A0045228E /* RawStructuredFieldValues in Frameworks */ = {isa = PBXBuildFile; productRef = FEE084FA2EC1725A0045228E /* RawStructuredFieldValues */; };
 		FEE084FD2EC1725A0045228E /* StructuredFieldValues in Frameworks */ = {isa = PBXBuildFile; productRef = FEE084FC2EC1725A0045228E /* StructuredFieldValues */; };
+		78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -107,8 +106,6 @@
 		B21E34AB2E5B09100031FDB9 /* BackgroundWorker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundWorker.swift; sourceTree = "<group>"; };
 		B25D37782E72CA15008B6CA7 /* Connectivity.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Connectivity.g.swift; sourceTree = "<group>"; };
 		B25D377B2E72CA20008B6CA7 /* ConnectivityApiImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectivityApiImpl.swift; sourceTree = "<group>"; };
-		B2EE00012E72CA15008B6CA7 /* PermissionApi.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionApi.g.swift; sourceTree = "<group>"; };
-		B2EE00032E72CA15008B6CA7 /* PermissionApiImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionApiImpl.swift; sourceTree = "<group>"; };
 		B2BE315E2E5E5229006EEF88 /* BackgroundWorker.g.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundWorker.g.swift; sourceTree = "<group>"; };
 		E0E99CDC17B3EB7FA8BA2332 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		F0B57D382DF764BD00DC5BCC /* WidgetExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = WidgetExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -129,6 +126,7 @@
 		FE5499F72F1198DE006016CB /* RemoteImagesImpl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoteImagesImpl.swift; sourceTree = "<group>"; };
 		FE5FE4AD2F30FBC000A71243 /* ImageProcessing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageProcessing.swift; sourceTree = "<group>"; };
 		FEAFA8722E4D42F4001E47FE /* Thumbhash.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Thumbhash.swift; sourceTree = "<group>"; };
+		78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
@@ -193,6 +191,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
 				FEE084F82EC172460045228E /* SQLiteData in Frameworks */,
 				FEE084FB2EC1725A0045228E /* RawStructuredFieldValues in Frameworks */,
 				FEE084FD2EC1725A0045228E /* StructuredFieldValues in Frameworks */,
@@ -247,6 +246,7 @@
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
+				78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -287,7 +287,6 @@
 				B25D37792E72CA15008B6CA7 /* Connectivity */,
 				B21E34A62E5AF9760031FDB9 /* Background */,
 				B2CF7F8C2DDE4EBB00744BF6 /* Sync */,
-				B2EE00052E72CA15008B6CA7 /* Permission */,
 				FA9973382CF6DF4B000EF859 /* Runner.entitlements */,
 				FAC7416727DB9F5500C668D8 /* RunnerProfile.entitlements */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
@@ -322,15 +321,6 @@
 			path = Connectivity;
 			sourceTree = "<group>";
 		};
-		B2EE00052E72CA15008B6CA7 /* Permission */ = {
-			isa = PBXGroup;
-			children = (
-				B2EE00032E72CA15008B6CA7 /* PermissionApiImpl.swift */,
-				B2EE00012E72CA15008B6CA7 /* PermissionApi.g.swift */,
-			);
-			path = Permission;
-			sourceTree = "<group>";
-		};
 		FAC6F8B62D287F120078CB2F /* ShareExtension */ = {
 			isa = PBXGroup;
 			children = (
@@ -360,6 +350,9 @@
 
 /* Begin PBXNativeTarget section */
 		97C146ED1CF9000F007C117D /* Runner */ = {
+			packageProductDependencies = (
+				78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
+			);
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
@@ -463,6 +456,7 @@
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
 			packageReferences = (
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
 				FEE084F62EC172460045228E /* XCRemoteSwiftPackageReference "sqlite-data" */,
 				FEE084F92EC1725A0045228E /* XCRemoteSwiftPackageReference "swift-http-structured-headers" */,
 			);
@@ -633,8 +627,6 @@
 				FE5499F42F1197D8006016CB /* RemoteImages.g.swift in Sources */,
 				FE5FE4AE2F30FBC000A71243 /* ImageProcessing.swift in Sources */,
 				B25D377A2E72CA15008B6CA7 /* Connectivity.g.swift in Sources */,
-				B2EE00022E72CA15008B6CA7 /* PermissionApi.g.swift in Sources */,
-				B2EE00042E72CA15008B6CA7 /* PermissionApiImpl.swift in Sources */,
 				FE5499F82F1198E2006016CB /* RemoteImagesImpl.swift in Sources */,
 				FEAFA8732E4D42F4001E47FE /* Thumbhash.swift in Sources */,
 				B25D377C2E72CA26008B6CA7 /* ConnectivityApiImpl.swift in Sources */,
@@ -734,7 +726,6 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CUSTOM_GROUP_ID = group.app.immich.share.profile;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -767,6 +758,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 240;
+				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2W7AC6T8T5;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -817,7 +809,6 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CUSTOM_GROUP_ID = group.app.immich.share.debug;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -877,7 +868,6 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -912,6 +902,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 240;
+				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2W7AC6T8T5;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -941,6 +932,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 240;
+				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2W7AC6T8T5;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -1096,6 +1088,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 240;
+				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2W7AC6T8T5;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -1139,6 +1132,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 240;
+				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2W7AC6T8T5;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -1179,6 +1173,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 240;
+				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2W7AC6T8T5;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -1285,7 +1280,17 @@
 			package = FEE084F92EC1725A0045228E /* XCRemoteSwiftPackageReference "swift-http-structured-headers" */;
 			productName = StructuredFieldValues;
 		};
+		78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = FlutterGeneratedPluginSwiftPackage;
+		};
 /* End XCSwiftPackageProductDependency section */
+/* Begin XCLocalSwiftPackageReference section */
+		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
+		};
+/* End XCLocalSwiftPackageReference section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
 }

mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,4 @@
 {
-  "originHash" : "9be33bfaa68721646604aefff3cabbdaf9a193da192aae024c265065671f6c49",
   "pins" : [
     {
       "identity" : "combine-schedulers",
@@ -19,6 +18,24 @@
         "version" : "7.8.0"
       }
     },
+    {
+      "identity" : "keychainaccess",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/kishikawakatsumi/KeychainAccess",
+      "state" : {
+        "revision" : "84e546727d66f1adc5439debad16270d0fdd04e7",
+        "version" : "4.2.2"
+      }
+    },
+    {
+      "identity" : "maplibre-gl-native-distribution",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/maplibre/maplibre-gl-native-distribution.git",
+      "state" : {
+        "revision" : "60d9bb85c94ce6e7fc4406cd32529fd12bdb7809",
+        "version" : "6.14.0"
+      }
+    },
     {
       "identity" : "sqlite-data",
       "kind" : "remoteSourceControl",
@@ -146,5 +163,5 @@
       }
     }
   ],
-  "version" : 3
+  "version" : 2
 }

mobile/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -5,6 +5,24 @@
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <PreActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Prepare Flutter Framework Script"
+               scriptText = "/bin/sh &quot;$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh&quot; prepare&#10;">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+                     BuildableName = "Immich.app"
+                     BlueprintName = "Runner"
+                     ReferencedContainer = "container:Runner.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"

mobile/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,4 @@
 {
-  "originHash" : "9be33bfaa68721646604aefff3cabbdaf9a193da192aae024c265065671f6c49",
   "pins" : [
     {
       "identity" : "combine-schedulers",
@@ -19,6 +18,24 @@
         "version" : "7.9.0"
       }
     },
+    {
+      "identity" : "keychainaccess",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/kishikawakatsumi/KeychainAccess",
+      "state" : {
+        "revision" : "84e546727d66f1adc5439debad16270d0fdd04e7",
+        "version" : "4.2.2"
+      }
+    },
+    {
+      "identity" : "maplibre-gl-native-distribution",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/maplibre/maplibre-gl-native-distribution.git",
+      "state" : {
+        "revision" : "60d9bb85c94ce6e7fc4406cd32529fd12bdb7809",
+        "version" : "6.14.0"
+      }
+    },
     {
       "identity" : "sqlite-data",
       "kind" : "remoteSourceControl",
@@ -146,5 +163,5 @@
       }
     }
   ],
-  "version" : 3
+  "version" : 2
 }

mobile/ios/Runner/AppDelegate.swift

@@ -26,7 +26,6 @@ import native_video_player
 
   public static func registerPlugins(with registry: FlutterPluginRegistry, messenger: FlutterBinaryMessenger) {
     NativeSyncApiImpl.register(with: registry.registrar(forPlugin: NativeSyncApiImpl.name)!)
-    PermissionApiSetup.setUp(binaryMessenger: messenger, api: PermissionApiImpl())
     LocalImageApiSetup.setUp(binaryMessenger: messenger, api: LocalImageApiImpl())
     RemoteImageApiSetup.setUp(binaryMessenger: messenger, api: RemoteImageApiImpl())
     BackgroundWorkerFgHostApiSetup.setUp(binaryMessenger: messenger, api: BackgroundWorkerApiImpl())

mobile/ios/Runner/Core/Network.g.swift

@@ -288,7 +288,6 @@ protocol NetworkApi {
   func hasCertificate() throws -> Bool
   func getClientPointer() throws -> Int64
   func setRequestHeaders(headers: [String: String], serverUrls: [String], token: String?) throws
-  func getAppGroupId() throws -> String
 }
 
 /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
@@ -389,18 +388,5 @@ class NetworkApiSetup {
     } else {
       setRequestHeadersChannel.setMessageHandler(nil)
     }
-    let getAppGroupIdChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NetworkApi.getAppGroupId\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      getAppGroupIdChannel.setMessageHandler { _, reply in
-        do {
-          let result = try api.getAppGroupId()
-          reply(wrapResult(result))
-        } catch {
-          reply(wrapError(error))
-        }
-      }
-    } else {
-      getAppGroupIdChannel.setMessageHandler(nil)
-    }
   }
 }

mobile/ios/Runner/Core/NetworkApiImpl.swift

@@ -61,10 +61,6 @@ class NetworkApiImpl: NetworkApi {
     return Int64(Int(bitPattern: pointer))
   }
   
-  func getAppGroupId() throws -> String {
-    return Bundle.main.object(forInfoDictionaryKey: "AppGroupId") as! String
-  }
-
   func setRequestHeaders(headers: [String : String], serverUrls: [String], token: String?) throws {
     URLSessionManager.setServerUrls(serverUrls)
 

mobile/ios/Runner/Core/URLSessionManager.swift

@@ -4,7 +4,7 @@ import native_video_player
 let CLIENT_CERT_LABEL = "app.alextran.immich.client_identity"
 let HEADERS_KEY = "immich.request_headers"
 let SERVER_URLS_KEY = "immich.server_urls"
-let APP_GROUP = Bundle.main.object(forInfoDictionaryKey: "AppGroupId") as! String
+let APP_GROUP = "group.app.immich.share"
 let COOKIE_EXPIRY_DAYS: TimeInterval = 400
 
 enum AuthCookie: CaseIterable {

mobile/ios/Runner/Permission/PermissionApi.g.swift

@@ -1,106 +0,0 @@
-// Autogenerated from Pigeon (v26.3.4), do not edit directly.
-// See also: https://pub.dev/packages/pigeon
-
-import Foundation
-
-#if os(iOS)
-  import Flutter
-#elseif os(macOS)
-  import FlutterMacOS
-#else
-  #error("Unsupported platform.")
-#endif
-
-private func wrapResult(_ result: Any?) -> [Any?] {
-  return [result]
-}
-
-private func wrapError(_ error: Any) -> [Any?] {
-  if let pigeonError = error as? PigeonError {
-    return [
-      pigeonError.code,
-      pigeonError.message,
-      pigeonError.details,
-    ]
-  }
-  if let flutterError = error as? FlutterError {
-    return [
-      flutterError.code,
-      flutterError.message,
-      flutterError.details,
-    ]
-  }
-  return [
-    "\(error)",
-    "\(Swift.type(of: error))",
-    "Stacktrace: \(Thread.callStackSymbols)",
-  ]
-}
-
-private func isNullish(_ value: Any?) -> Bool {
-  return value is NSNull || value == nil
-}
-
-private func nilOrValue<T>(_ value: Any?) -> T? {
-  if value is NSNull { return nil }
-  return value as! T?
-}
-
-/// Generated protocol from Pigeon that represents a handler of messages from Flutter.
-protocol PermissionApi {
-  func hasManageMediaPermission() throws -> Bool
-  func requestManageMediaPermission(completion: @escaping (Result<Bool, Error>) -> Void)
-  func manageMediaPermission(completion: @escaping (Result<Bool, Error>) -> Void)
-}
-
-/// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
-class PermissionApiSetup {
-  static var codec: FlutterStandardMessageCodec { FlutterStandardMessageCodec.sharedInstance() }
-  /// Sets up an instance of `PermissionApi` to handle messages through the `binaryMessenger`.
-  static func setUp(binaryMessenger: FlutterBinaryMessenger, api: PermissionApi?, messageChannelSuffix: String = "") {
-    let channelSuffix = messageChannelSuffix.count > 0 ? ".\(messageChannelSuffix)" : ""
-    let hasManageMediaPermissionChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.PermissionApi.hasManageMediaPermission\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      hasManageMediaPermissionChannel.setMessageHandler { _, reply in
-        do {
-          let result = try api.hasManageMediaPermission()
-          reply(wrapResult(result))
-        } catch {
-          reply(wrapError(error))
-        }
-      }
-    } else {
-      hasManageMediaPermissionChannel.setMessageHandler(nil)
-    }
-    let requestManageMediaPermissionChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.PermissionApi.requestManageMediaPermission\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      requestManageMediaPermissionChannel.setMessageHandler { _, reply in
-        api.requestManageMediaPermission { result in
-          switch result {
-          case .success(let res):
-            reply(wrapResult(res))
-          case .failure(let error):
-            reply(wrapError(error))
-          }
-        }
-      }
-    } else {
-      requestManageMediaPermissionChannel.setMessageHandler(nil)
-    }
-    let manageMediaPermissionChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.PermissionApi.manageMediaPermission\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      manageMediaPermissionChannel.setMessageHandler { _, reply in
-        api.manageMediaPermission { result in
-          switch result {
-          case .success(let res):
-            reply(wrapResult(res))
-          case .failure(let error):
-            reply(wrapError(error))
-          }
-        }
-      }
-    } else {
-      manageMediaPermissionChannel.setMessageHandler(nil)
-    }
-  }
-}

mobile/ios/Runner/Permission/PermissionApiImpl.swift

@@ -1,15 +0,0 @@
-import Foundation
-
-class PermissionApiImpl: PermissionApi {
-  func hasManageMediaPermission() throws -> Bool {
-    return false
-  }
-
-  func requestManageMediaPermission(completion: @escaping (Result<Bool, Error>) -> Void) {
-    completion(.success(false))
-  }
-
-  func manageMediaPermission(completion: @escaping (Result<Bool, Error>) -> Void) {
-    completion(.success(false))
-  }
-}

mobile/ios/Runner/Runner.entitlements

@@ -10,7 +10,7 @@
 	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>$(CUSTOM_GROUP_ID)</string>
+		<string>group.app.immich.share</string>
 	</array>
 </dict>
 </plist>

mobile/ios/Runner/RunnerProfile.entitlements

@@ -12,7 +12,7 @@
 	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>$(CUSTOM_GROUP_ID)</string>
+		<string>group.app.immich.share</string>
 	</array>
 </dict>
 </plist>

mobile/ios/Runner/Sync/Messages.g.swift

@@ -537,7 +537,6 @@ protocol NativeSyncApi {
   func hashAssets(assetIds: [String], allowNetworkAccess: Bool, completion: @escaping (Result<[HashResult], Error>) -> Void)
   func cancelHashing() throws
   func getTrashedAssets() throws -> [String: [PlatformAsset]]
-  func restoreFromTrashById(mediaId: String, type: Int64, completion: @escaping (Result<Bool, Error>) -> Void)
   func getCloudIdForAssetIds(assetIds: [String]) throws -> [CloudIdResult]
 }
 
@@ -722,24 +721,6 @@ class NativeSyncApiSetup {
     } else {
       getTrashedAssetsChannel.setMessageHandler(nil)
     }
-    let restoreFromTrashByIdChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.restoreFromTrashById\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      restoreFromTrashByIdChannel.setMessageHandler { message, reply in
-        let args = message as! [Any?]
-        let mediaIdArg = args[0] as! String
-        let typeArg = args[1] as! Int64
-        api.restoreFromTrashById(mediaId: mediaIdArg, type: typeArg) { result in
-          switch result {
-          case .success(let res):
-            reply(wrapResult(res))
-          case .failure(let error):
-            reply(wrapError(error))
-          }
-        }
-      }
-    } else {
-      restoreFromTrashByIdChannel.setMessageHandler(nil)
-    }
     let getCloudIdForAssetIdsChannel = taskQueue == nil
       ? FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
       : FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec, taskQueue: taskQueue)

mobile/ios/Runner/Sync/MessagesImpl.swift

@@ -382,10 +382,6 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
   func getTrashedAssets() throws -> [String: [PlatformAsset]] {
     throw PigeonError(code: "UNSUPPORTED_OS", message: "This feature not supported on iOS.", details: nil)
   }
-
-  func restoreFromTrashById(mediaId: String, type: Int64, completion: @escaping (Result<Bool, Error>) -> Void) {
-    completion(.success(false))
-  }
   
   private func getAssetsFromAlbum(in album: PHAssetCollection, options: PHFetchOptions) -> PHFetchResult<PHAsset> {
     // Ensure to actually getting all assets for the Recents album

mobile/ios/ShareExtension/ShareExtension.entitlements

@@ -4,7 +4,7 @@
   <dict>
     <key>com.apple.security.application-groups</key>
     <array>
-      <string>$(CUSTOM_GROUP_ID)</string>
+      <string>group.app.immich.share</string>
     </array>
   </dict>
 </plist>

mobile/ios/WidgetExtension/ImmichAPI.swift

@@ -2,7 +2,7 @@ import Foundation
 import SwiftUI
 import WidgetKit
 
-let IMMICH_SHARE_GROUP = Bundle.main.object(forInfoDictionaryKey: "AppGroupId") as! String
+let IMMICH_SHARE_GROUP = "group.app.immich.share"
 
 enum WidgetError: Error, Codable {
   case noLogin

mobile/ios/WidgetExtension/Info.plist

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>AppGroupId</key>
-	<string>$(CUSTOM_GROUP_ID)</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

mobile/ios/WidgetExtension/WidgetExtension.entitlements

@@ -4,7 +4,7 @@
   <dict>
     <key>com.apple.security.application-groups</key>
     <array>
-      <string>$(CUSTOM_GROUP_ID)</string>
+      <string>group.app.immich.share</string>
     </array>
   </dict>
 </plist>

mobile/ios/fastlane/Fastfile

@@ -21,7 +21,6 @@ platform :ios do
   CODE_SIGN_IDENTITY = "Apple Distribution: FUTO Holdings, Inc. (#{TEAM_ID})"
   BASE_BUNDLE_ID = "app.alextran.immich"
   DEV_BUNDLE_ID  = "tech.futo.immich.testflight"
-  DEV_GROUP_ID   = "group.app.immich.share.testflight"
 
   # Helper method to get App Store Connect API key
   def get_api_key
@@ -34,13 +33,6 @@ platform :ios do
     )
   end
   
-  # Helper method to assemble xcargs with optional CUSTOM_GROUP_ID override
-  def build_xcargs(group_id: nil)
-    args = "-skipMacroValidation CODE_SIGN_IDENTITY='#{CODE_SIGN_IDENTITY}' CODE_SIGN_STYLE=Manual"
-    args += " CUSTOM_GROUP_ID='#{group_id}'" if group_id
-    args
-  end
-
   # Helper method to get version from pubspec.yaml
 def get_version_from_pubspec
   require 'yaml'
@@ -97,8 +89,7 @@ end
     version_number: nil,
     profile_name_main:,
     profile_name_share:,
-    profile_name_widget:,
+    profile_name_widget:
-    group_id: nil
   )
     app_identifier = base_bundle_id
 
@@ -106,7 +97,7 @@ end
     if version_number
       increment_version_number(version_number: version_number)
     end
-
+    
     # Increment build number
     increment_build_number(
       build_number: latest_testflight_build_number(
@@ -115,14 +106,14 @@ end
       ) + 1,
       xcodeproj: "./Runner.xcodeproj"
     )
-
+    
     # Build the app
     build_app(
       scheme: "Runner",
       workspace: "Runner.xcworkspace",
       configuration: configuration,
       export_method: "app-store",
-      xcargs: build_xcargs(group_id: group_id),
+      xcargs: "-skipMacroValidation CODE_SIGN_IDENTITY='#{CODE_SIGN_IDENTITY}' CODE_SIGN_STYLE=Manual",
       export_options: {
         provisioningProfiles: {
           "#{app_identifier}" => profile_name_main,
@@ -174,8 +165,7 @@ end
       distribute_external: false,
       profile_name_main: main_profile_name,
       profile_name_share: share_profile_name,
-      profile_name_widget: widget_profile_name,
+      profile_name_widget: widget_profile_name
-      group_id: DEV_GROUP_ID
     )
   end
 
@@ -284,7 +274,7 @@ end
       configuration: "Release",
       export_method: "app-store",
       skip_package_ipa: true,
-      xcargs: build_xcargs(group_id: DEV_GROUP_ID),
+      xcargs: "-skipMacroValidation CODE_SIGN_IDENTITY='#{CODE_SIGN_IDENTITY}' CODE_SIGN_STYLE=Manual",
       export_options: {
         provisioningProfiles: {
           DEV_BUNDLE_ID => main_profile_name,

mobile/lib/constants/constants.dart

@@ -30,6 +30,7 @@ const int kTimelineAssetLoadBatchSize = 1024;
 const int kTimelineAssetLoadOppositeSize = 64;
 
 // Widget keys
+const String appShareGroupId = "group.app.immich.share";
 const String kWidgetAuthToken = "widget_auth_token";
 const String kWidgetServerEndpoint = "widget_server_url";
 const String kWidgetCustomHeaders = "widget_custom_headers";

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

@@ -8,11 +8,7 @@ class AssetService {
   final RemoteAssetRepository _remoteAssetRepository;
   final DriftLocalAssetRepository _localAssetRepository;
 
-  const AssetService({
+  const AssetService({required this._remoteAssetRepository, required this._localAssetRepository});
-    required RemoteAssetRepository remoteAssetRepository,
-    required DriftLocalAssetRepository localAssetRepository,
-  }) : _remoteAssetRepository = remoteAssetRepository,
-       _localAssetRepository = localAssetRepository;
 
   Future<BaseAsset?> getAsset(BaseAsset asset) {
     final id = asset is LocalAsset ? asset.id : (asset as RemoteAsset).id;

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

@@ -61,11 +61,9 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
 
   bool _isCleanedUp = false;
 
-  BackgroundWorkerBgService({required Drift drift, required DriftLogger driftLogger})
+  BackgroundWorkerBgService({required this._drift, required this._driftLogger})
-    : _drift = drift,
+    : _backgroundHostApi = BackgroundWorkerBgHostApi() {
-      _driftLogger = driftLogger,
+    _ref = ProviderContainer(overrides: [driftProvider.overrideWith(driftOverride(_drift))]);
-      _backgroundHostApi = BackgroundWorkerBgHostApi() {
-    _ref = ProviderContainer(overrides: [driftProvider.overrideWith(driftOverride(drift))]);
     BackgroundWorkerFlutterApi.setUp(this);
   }
 

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

@@ -21,18 +21,13 @@ class HashService {
   final _log = Logger('HashService');
 
   HashService({
-    required DriftLocalAlbumRepository localAlbumRepository,
+    required this._localAlbumRepository,
-    required DriftLocalAssetRepository localAssetRepository,
+    required this._localAssetRepository,
-    required DriftTrashedLocalAssetRepository trashedLocalAssetRepository,
+    required this._trashedLocalAssetRepository,
-    required NativeSyncApi nativeSyncApi,
+    required this._nativeSyncApi,
-    bool Function()? cancelChecker,
+    this._cancelChecker,
     int? batchSize,
-  }) : _localAlbumRepository = localAlbumRepository,
+  }) : _batchSize = batchSize ?? kBatchHashFileLimit;
-       _localAssetRepository = localAssetRepository,
-       _trashedLocalAssetRepository = trashedLocalAssetRepository,
-       _cancelChecker = cancelChecker,
-       _nativeSyncApi = nativeSyncApi,
-       _batchSize = batchSize ?? kBatchHashFileLimit;
 
   bool get isCancelled => _cancelChecker?.call() ?? false;
 

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

@@ -9,10 +9,10 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
-import 'package:immich_mobile/repositories/asset_media.repository.dart';
+import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
-import 'package:immich_mobile/repositories/permission.repository.dart';
 import 'package:immich_mobile/utils/datetime_helpers.dart';
 import 'package:immich_mobile/utils/diff.dart';
 import 'package:logging/logging.dart';
@@ -23,29 +23,24 @@ class LocalSyncService {
   final DriftLocalAssetRepository _localAssetRepository;
   final NativeSyncApi _nativeSyncApi;
   final DriftTrashedLocalAssetRepository _trashedLocalAssetRepository;
-  final AssetMediaRepository _assetMediaRepository;
+  final LocalFilesManagerRepository _localFilesManager;
-  final IPermissionRepository _permissionRepository;
+  final StorageRepository _storageRepository;
   final Logger _log = Logger("DeviceSyncService");
 
   LocalSyncService({
-    required DriftLocalAlbumRepository localAlbumRepository,
+    required this._localAlbumRepository,
-    required DriftLocalAssetRepository localAssetRepository,
+    required this._localAssetRepository,
-    required DriftTrashedLocalAssetRepository trashedLocalAssetRepository,
+    required this._trashedLocalAssetRepository,
-    required AssetMediaRepository assetMediaRepository,
+    required this._localFilesManager,
-    required IPermissionRepository permissionRepository,
+    required this._storageRepository,
-    required NativeSyncApi nativeSyncApi,
+    required this._nativeSyncApi,
-  }) : _localAlbumRepository = localAlbumRepository,
+  });
-       _localAssetRepository = localAssetRepository,
-       _trashedLocalAssetRepository = trashedLocalAssetRepository,
-       _assetMediaRepository = assetMediaRepository,
-       _permissionRepository = permissionRepository,
-       _nativeSyncApi = nativeSyncApi;
 
   Future<void> sync({bool full = false}) async {
     final Stopwatch stopwatch = Stopwatch()..start();
     try {
       if (CurrentPlatform.isAndroid && Store.get(StoreKey.manageLocalMediaAndroid, false)) {
-        final hasPermission = await _permissionRepository.hasManageMediaPermission();
+        final hasPermission = await _localFilesManager.hasManageMediaPermission();
         if (hasPermission) {
           await _syncTrashedAssets();
         } else {
@@ -373,7 +368,7 @@ class LocalSyncService {
 
     final assetsToRestore = await _trashedLocalAssetRepository.getToRestore();
     if (assetsToRestore.isNotEmpty) {
-      final restoredIds = await _assetMediaRepository.restoreAssetsFromTrash(assetsToRestore);
+      final restoredIds = await _localFilesManager.restoreAssetsFromTrash(assetsToRestore);
       await _trashedLocalAssetRepository.applyRestoredAssets(restoredIds);
     } else {
       _log.info("syncTrashedAssets, No remote assets found for restoration");
@@ -381,15 +376,15 @@ class LocalSyncService {
 
     final localAssetsToTrash = await _trashedLocalAssetRepository.getToTrash();
     if (localAssetsToTrash.isNotEmpty) {
-      final localIds = localAssetsToTrash.values.expand((assets) => assets).map((asset) => asset.id).toList();
+      final mediaUrls = await Future.wait(
-      _log.info("Moving to trash ${localIds.join(", ")} assets");
+        localAssetsToTrash.values
-      final movedIds = await _assetMediaRepository.deleteAll(localIds);
+            .expand((e) => e)
-      if (movedIds.isNotEmpty) {
+            .map((localAsset) => _storageRepository.getAssetEntityForAsset(localAsset).then((e) => e?.getMediaUrl())),
-        final movedAssetsByAlbum = localAssetsToTrash.map(
+      );
-          (albumId, assets) => MapEntry(albumId, assets.where((asset) => movedIds.contains(asset.id)).toList()),
+      _log.info("Moving to trash ${mediaUrls.join(", ")} assets");
-        )..removeWhere((_, assets) => assets.isEmpty);
+      final result = await _localFilesManager.moveToTrash(mediaUrls.nonNulls.toList());
-
+      if (result) {
-        await _trashedLocalAssetRepository.trashLocalAsset(movedAssetsByAlbum);
+        await _trashedLocalAssetRepository.trashLocalAsset(localAssetsToTrash);
       }
     } else {
       _log.info("syncTrashedAssets, No assets found in backup-enabled albums for move to trash");

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

@@ -10,7 +10,7 @@ typedef MapQuery = ({MapMarkerSource markerSource});
 class MapFactory {
   final DriftMapRepository _mapRepository;
 
-  const MapFactory({required DriftMapRepository mapRepository}) : _mapRepository = mapRepository;
+  const MapFactory({required this._mapRepository});
 
   MapService remote(List<String> ownerIds, TimelineMapOptions options) =>
       MapService(_mapRepository.remote(ownerIds, options));

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

@@ -9,7 +9,7 @@ final AppSetting = SettingsService(storeService: StoreService.I);
 class SettingsService {
   final StoreService _storeService;
 
-  const SettingsService({required StoreService storeService}) : _storeService = storeService;
+  const SettingsService({required this._storeService});
 
   T get<T>(Setting<T> setting) => _storeService.get(setting.storeKey, setting.defaultValue);
 

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

@@ -9,12 +9,12 @@ import 'package:immich_mobile/domain/models/sync_event.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_api.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_migration.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_stream.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
-import 'package:immich_mobile/repositories/asset_media.repository.dart';
+import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
-import 'package:immich_mobile/repositories/permission.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/utils/semver.dart';
 import 'package:logging/logging.dart';
@@ -34,31 +34,23 @@ class SyncStreamService {
   final SyncStreamRepository _syncStreamRepository;
   final DriftLocalAssetRepository _localAssetRepository;
   final DriftTrashedLocalAssetRepository _trashedLocalAssetRepository;
-  final AssetMediaRepository _assetMediaRepository;
+  final LocalFilesManagerRepository _localFilesManager;
-  final IPermissionRepository _permissionRepository;
+  final StorageRepository _storageRepository;
   final SyncMigrationRepository _syncMigrationRepository;
   final ApiService _api;
   final bool Function()? _cancelChecker;
 
   SyncStreamService({
-    required SyncApiRepository syncApiRepository,
+    required this._syncApiRepository,
-    required SyncStreamRepository syncStreamRepository,
+    required this._syncStreamRepository,
-    required DriftLocalAssetRepository localAssetRepository,
+    required this._localAssetRepository,
-    required DriftTrashedLocalAssetRepository trashedLocalAssetRepository,
+    required this._trashedLocalAssetRepository,
-    required AssetMediaRepository assetMediaRepository,
+    required this._localFilesManager,
-    required IPermissionRepository permissionRepository,
+    required this._storageRepository,
-    required SyncMigrationRepository syncMigrationRepository,
+    required this._syncMigrationRepository,
-    required ApiService api,
+    required this._api,
-    bool Function()? cancelChecker,
+    this._cancelChecker,
-  }) : _syncApiRepository = syncApiRepository,
+  });
-       _syncStreamRepository = syncStreamRepository,
-       _localAssetRepository = localAssetRepository,
-       _trashedLocalAssetRepository = trashedLocalAssetRepository,
-       _assetMediaRepository = assetMediaRepository,
-       _permissionRepository = permissionRepository,
-       _syncMigrationRepository = syncMigrationRepository,
-       _api = api,
-       _cancelChecker = cancelChecker;
 
   bool get isCancelled => _cancelChecker?.call() ?? false;
 
@@ -500,22 +492,22 @@ class SyncStreamService {
   }
 
   Future<void> _trashLocalAssets(Map<String, List<LocalAsset>> localAssetsToTrash) async {
-    final localIds = localAssetsToTrash.values.expand((assets) => assets).map((asset) => asset.id).toList();
+    final mediaUrls = await Future.wait(
-    _logger.info("Moving to trash ${localIds.join(", ")} assets");
+      localAssetsToTrash.values
-    final movedIds = await _assetMediaRepository.deleteAll(localIds);
+          .expand((e) => e)
-    if (movedIds.isNotEmpty) {
+          .map((localAsset) => _storageRepository.getAssetEntityForAsset(localAsset).then((e) => e?.getMediaUrl())),
-      final movedAssetsByAlbum = localAssetsToTrash.map(
+    );
-        (albumId, assets) => MapEntry(albumId, assets.where((asset) => movedIds.contains(asset.id)).toList()),
+    _logger.info("Moving to trash ${mediaUrls.join(", ")} assets");
-      )..removeWhere((_, assets) => assets.isEmpty);
+    final result = await _localFilesManager.moveToTrash(mediaUrls.nonNulls.toList());
-
+    if (result) {
-      await _trashedLocalAssetRepository.trashLocalAsset(movedAssetsByAlbum);
+      await _trashedLocalAssetRepository.trashLocalAsset(localAssetsToTrash);
     }
   }
 
   Future<void> _applyRemoteRestoreToLocal() async {
     final assetsToRestore = await _trashedLocalAssetRepository.getToRestore();
     if (assetsToRestore.isNotEmpty) {
-      final restoredIds = await _assetMediaRepository.restoreAssetsFromTrash(assetsToRestore);
+      final restoredIds = await _localFilesManager.restoreAssetsFromTrash(assetsToRestore);
       await _trashedLocalAssetRepository.applyRestoredAssets(restoredIds);
     } else {
       _logger.info("No remote assets found for restoration");
@@ -523,7 +515,7 @@ class SyncStreamService {
   }
 
   Future<void> _syncAssetTrashStatus(List<String> remoteIds) async {
-    if (!(await _permissionRepository.hasManageMediaPermission())) {
+    if (!(await _localFilesManager.hasManageMediaPermission())) {
       _logger.warning("Syncing asset trash status cannot proceed because MANAGE_MEDIA permission is missing");
       return;
     }
@@ -533,7 +525,7 @@ class SyncStreamService {
   }
 
   Future<void> _syncAssetDeletion(List<String> remoteIds) async {
-    if (!(await _permissionRepository.hasManageMediaPermission())) {
+    if (!(await _localFilesManager.hasManageMediaPermission())) {
       _logger.warning("Syncing asset deletion cannot proceed because MANAGE_MEDIA permission is missing");
       return;
     }

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

@@ -41,11 +41,7 @@ class TimelineFactory {
   final DriftTimelineRepository _timelineRepository;
   final MetadataRepository _metadataRepository;
 
-  const TimelineFactory({
+  const TimelineFactory({required this._timelineRepository, required this._metadataRepository});
-    required DriftTimelineRepository timelineRepository,
-    required MetadataRepository metadataRepository,
-  }) : _timelineRepository = timelineRepository,
-       _metadataRepository = metadataRepository;
 
   GroupAssetsBy get groupBy {
     final group = _metadataRepository.appConfig.timeline.groupAssetsBy;
@@ -108,12 +104,7 @@ class TimelineService {
   TimelineService(TimelineQuery query)
     : this._(assetSource: query.assetSource, bucketSource: query.bucketSource, origin: query.origin);
 
-  TimelineService._({
+  TimelineService._({required this._assetSource, required this._bucketSource, required this.origin}) {
-    required TimelineAssetSource assetSource,
-    required TimelineBucketSource bucketSource,
-    required this.origin,
-  }) : _assetSource = assetSource,
-       _bucketSource = bucketSource {
     _bucketSubscription = _bucketSource().listen((buckets) {
       _mutex.run(() async {
         final totalAssets = buckets.fold<int>(0, (acc, bucket) => acc + bucket.assetCount);

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

@@ -12,9 +12,7 @@ class UserService {
   final UserApiRepository _userApiRepository;
   final StoreService _storeService;
 
-  UserService({required UserApiRepository userApiRepository, required StoreService storeService})
+  UserService({required this._userApiRepository, required this._storeService});
-    : _userApiRepository = userApiRepository,
-      _storeService = storeService;
 
   UserDto getMyUser() {
     return _storeService.get(StoreKey.currentUser);

mobile/lib/platform/native_sync_api.g.dart

@@ -654,25 +654,6 @@ class NativeSyncApi {
     return (pigeonVar_replyValue! as Map<Object?, Object?>).cast<String, List<PlatformAsset>>();
   }
 
-  Future<bool> restoreFromTrashById(String mediaId, int type) async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.restoreFromTrashById$pigeonVar_messageChannelSuffix';
-    final pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[mediaId, type]);
-    final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-
-    final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: false,
-    );
-    return pigeonVar_replyValue! as bool;
-  }
-
   Future<List<CloudIdResult>> getCloudIdForAssetIds(List<String> assetIds) async {
     final pigeonVar_channelName =
         'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getCloudIdForAssetIds$pigeonVar_messageChannelSuffix';

mobile/lib/platform/network_api.g.dart

@@ -309,23 +309,4 @@ class NetworkApi {
 
     _extractReplyValueOrThrow(pigeonVar_replyList, pigeonVar_channelName, isNullValid: true);
   }
-
-  Future<String> getAppGroupId() async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.NetworkApi.getAppGroupId$pigeonVar_messageChannelSuffix';
-    final pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
-    final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-
-    final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: false,
-    );
-    return pigeonVar_replyValue! as String;
-  }
 }

mobile/lib/platform/permission_api.g.dart

@@ -1,119 +0,0 @@
-// Autogenerated from Pigeon (v26.3.4), do not edit directly.
-// See also: https://pub.dev/packages/pigeon
-// ignore_for_file: unused_import, unused_shown_name
-// ignore_for_file: type=lint
-
-import 'dart:async';
-import 'dart:typed_data' show Float64List, Int32List, Int64List;
-
-import 'package:flutter/services.dart';
-import 'package:meta/meta.dart' show immutable, protected, visibleForTesting;
-
-Object? _extractReplyValueOrThrow(List<Object?>? replyList, String channelName, {required bool isNullValid}) {
-  if (replyList == null) {
-    throw PlatformException(
-      code: 'channel-error',
-      message: 'Unable to establish connection on channel: "$channelName".',
-    );
-  } else if (replyList.length > 1) {
-    throw PlatformException(code: replyList[0]! as String, message: replyList[1] as String?, details: replyList[2]);
-  } else if (!isNullValid && (replyList.isNotEmpty && replyList[0] == null)) {
-    throw PlatformException(
-      code: 'null-error',
-      message: 'Host platform returned null value for non-null return value.',
-    );
-  }
-  return replyList.firstOrNull;
-}
-
-class _PigeonCodec extends StandardMessageCodec {
-  const _PigeonCodec();
-  @override
-  void writeValue(WriteBuffer buffer, Object? value) {
-    if (value is int) {
-      buffer.putUint8(4);
-      buffer.putInt64(value);
-    } else {
-      super.writeValue(buffer, value);
-    }
-  }
-
-  @override
-  Object? readValueOfType(int type, ReadBuffer buffer) {
-    switch (type) {
-      default:
-        return super.readValueOfType(type, buffer);
-    }
-  }
-}
-
-class PermissionApi {
-  /// Constructor for [PermissionApi].  The [binaryMessenger] named argument is
-  /// available for dependency injection.  If it is left null, the default
-  /// BinaryMessenger will be used which routes to the host platform.
-  PermissionApi({BinaryMessenger? binaryMessenger, String messageChannelSuffix = ''})
-    : pigeonVar_binaryMessenger = binaryMessenger,
-      pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
-  final BinaryMessenger? pigeonVar_binaryMessenger;
-
-  static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();
-
-  final String pigeonVar_messageChannelSuffix;
-
-  Future<bool> hasManageMediaPermission() async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.PermissionApi.hasManageMediaPermission$pigeonVar_messageChannelSuffix';
-    final pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
-    final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-
-    final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: false,
-    );
-    return pigeonVar_replyValue! as bool;
-  }
-
-  Future<bool> requestManageMediaPermission() async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.PermissionApi.requestManageMediaPermission$pigeonVar_messageChannelSuffix';
-    final pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
-    final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-
-    final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: false,
-    );
-    return pigeonVar_replyValue! as bool;
-  }
-
-  Future<bool> manageMediaPermission() async {
-    final pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.PermissionApi.manageMediaPermission$pigeonVar_messageChannelSuffix';
-    final pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
-    final pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-
-    final Object? pigeonVar_replyValue = _extractReplyValueOrThrow(
-      pigeonVar_replyList,
-      pigeonVar_channelName,
-      isNullValid: false,
-    );
-    return pigeonVar_replyValue! as bool;
-  }
-}

mobile/lib/presentation/widgets/images/thumbnail.widget.dart

@@ -296,16 +296,12 @@ class _ThumbnailRenderBox extends RenderBox {
   bool isRepaintBoundary = true;
 
   _ThumbnailRenderBox({
-    required ui.Image? image,
+    required this._image,
-    required ui.Image? previousImage,
+    required this._previousImage,
-    required double fadeValue,
+    required this._fadeValue,
-    required BoxFit fit,
+    required this._fit,
-    required Gradient placeholderGradient,
+    required this._placeholderGradient,
-  }) : _image = image,
+  });
-       _previousImage = previousImage,
-       _fadeValue = fadeValue,
-       _fit = fit,
-       _placeholderGradient = placeholderGradient;
 
   @override
   void paint(PaintingContext context, Offset offset) {

mobile/lib/presentation/widgets/timeline/fixed/row.dart

@@ -62,14 +62,11 @@ class RenderFixedRow extends RenderBox
         RenderBoxContainerDefaultsMixin<RenderBox, _RowParentData> {
   RenderFixedRow({
     List<RenderBox>? children,
-    required double height,
+    required this._height,
-    required List<double> widths,
+    required this._widths,
-    required double spacing,
+    required this._spacing,
-    required TextDirection textDirection,
+    required this._textDirection,
-  }) : _height = height,
+  }) {
-       _widths = widths,
-       _spacing = spacing,
-       _textDirection = textDirection {
     addAll(children);
   }
 

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

@@ -578,9 +578,7 @@ class _SlideFadeTransition extends StatelessWidget {
   final Animation<double> _animation;
   final Widget _child;
 
-  const _SlideFadeTransition({required Animation<double> animation, required Widget child})
+  const _SlideFadeTransition({required this._animation, required this._child});
-    : _animation = animation,
-      _child = child;
 
   @override
   Widget build(BuildContext context) {

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

@@ -397,7 +397,7 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
               final grid = CustomScrollView(
                 primary: true,
                 physics: _scrollPhysics,
-                cacheExtent: maxHeight * 2,
+                scrollCacheExtent: .pixels(maxHeight * 2),
                 slivers: [
                   if (isSelectionMode) const SelectionSliverAppBar() else if (widget.appBar != null) widget.appBar!,
                   if (widget.topSliverWidget != null) widget.topSliverWidget!,
@@ -503,7 +503,7 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
 class _SliverSegmentedList extends SliverMultiBoxAdaptorWidget {
   final List<Segment> _segments;
 
-  const _SliverSegmentedList({required List<Segment> segments, required super.delegate}) : _segments = segments;
+  const _SliverSegmentedList({required this._segments, required super.delegate});
 
   @override
   _RenderSliverTimelineBoxAdaptor createRenderObject(BuildContext context) =>
@@ -527,8 +527,7 @@ class _RenderSliverTimelineBoxAdaptor extends RenderSliverMultiBoxAdaptor {
     markNeedsLayout();
   }
 
-  _RenderSliverTimelineBoxAdaptor({required super.childManager, required List<Segment> segments})
+  _RenderSliverTimelineBoxAdaptor({required super.childManager, required this._segments});
-    : _segments = segments;
 
   int getMinChildIndexForScrollOffset(double offset) =>
       _segments.findByOffset(offset)?.getMinChildIndexForScrollOffset(offset) ?? 0;

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

@@ -3,10 +3,9 @@ import 'package:immich_mobile/domain/services/background_worker.service.dart';
 import 'package:immich_mobile/platform/background_worker_api.g.dart';
 import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
 import 'package:immich_mobile/platform/connectivity_api.g.dart';
-import 'package:immich_mobile/platform/local_image_api.g.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
+import 'package:immich_mobile/platform/local_image_api.g.dart';
 import 'package:immich_mobile/platform/network_api.g.dart';
-import 'package:immich_mobile/platform/permission_api.g.dart';
 import 'package:immich_mobile/platform/remote_image_api.g.dart';
 
 final backgroundWorkerFgServiceProvider = Provider((_) => BackgroundWorkerFgService(BackgroundWorkerFgHostApi()));
@@ -17,8 +16,6 @@ final backgroundWorkerLockServiceProvider = Provider<BackgroundWorkerLockService
 
 final nativeSyncApiProvider = Provider<NativeSyncApi>((_) => NativeSyncApi());
 
-final permissionApiProvider = Provider<PermissionApi>((_) => PermissionApi());
-
 final connectivityApiProvider = Provider<ConnectivityApi>((_) => ConnectivityApi());
 
 final localImageApi = LocalImageApi();

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

@@ -11,8 +11,8 @@ import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/cancel.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
-import 'package:immich_mobile/repositories/asset_media.repository.dart';
+import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
-import 'package:immich_mobile/repositories/permission.repository.dart';
+import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
 
 final syncMigrationRepositoryProvider = Provider((ref) => SyncMigrationRepository(ref.watch(driftProvider)));
 
@@ -22,8 +22,8 @@ final syncStreamServiceProvider = Provider(
     syncStreamRepository: ref.watch(syncStreamRepositoryProvider),
     localAssetRepository: ref.watch(localAssetRepository),
     trashedLocalAssetRepository: ref.watch(trashedLocalAssetRepository),
-    assetMediaRepository: ref.watch(assetMediaRepositoryProvider),
+    localFilesManager: ref.watch(localFilesManagerRepositoryProvider),
-    permissionRepository: ref.watch(permissionRepositoryProvider),
+    storageRepository: ref.watch(storageRepositoryProvider),
     syncMigrationRepository: ref.watch(syncMigrationRepositoryProvider),
     api: ref.watch(apiServiceProvider),
     cancelChecker: ref.watch(cancellationProvider),
@@ -39,8 +39,8 @@ final localSyncServiceProvider = Provider(
     localAlbumRepository: ref.watch(localAlbumRepository),
     localAssetRepository: ref.watch(localAssetRepository),
     trashedLocalAssetRepository: ref.watch(trashedLocalAssetRepository),
-    assetMediaRepository: ref.watch(assetMediaRepositoryProvider),
+    localFilesManager: ref.watch(localFilesManagerRepositoryProvider),
-    permissionRepository: ref.watch(permissionRepositoryProvider),
+    storageRepository: ref.watch(storageRepositoryProvider),
     nativeSyncApi: ref.watch(nativeSyncApiProvider),
   ),
 );

mobile/lib/repositories/asset_media.repository.dart

@@ -8,24 +8,19 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/extensions/response_extensions.dart';
-import 'package:immich_mobile/platform/native_sync_api.g.dart';
-import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/repositories/asset_api.repository.dart';
 import 'package:logging/logging.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:photo_manager/photo_manager.dart';
 import 'package:share_plus/share_plus.dart';
 
-final assetMediaRepositoryProvider = Provider(
+final assetMediaRepositoryProvider = Provider((ref) => AssetMediaRepository(ref.watch(assetApiRepositoryProvider)));
-  (ref) => AssetMediaRepository(ref.watch(assetApiRepositoryProvider), ref.watch(nativeSyncApiProvider)),
-);
 
 class AssetMediaRepository {
   final AssetApiRepository _assetApiRepository;
-  final NativeSyncApi _nativeSyncApi;
   static final Logger _log = Logger("AssetMediaRepository");
 
-  const AssetMediaRepository(this._assetApiRepository, this._nativeSyncApi);
+  const AssetMediaRepository(this._assetApiRepository);
 
   Future<bool> _androidSupportsTrash() async {
     if (Platform.isAndroid) {
@@ -50,27 +45,6 @@ class AssetMediaRepository {
     return PhotoManager.editor.deleteWithIds(ids);
   }
 
-  Future<bool> _restoreFromTrashById(String mediaId, int type) async {
-    try {
-      return await _nativeSyncApi.restoreFromTrashById(mediaId, type);
-    } catch (e, s) {
-      _log.warning('Error restore file from trash by Id', e, s);
-      return false;
-    }
-  }
-
-  Future<List<String>> restoreAssetsFromTrash(Iterable<LocalAsset> assets) async {
-    final restoredIds = <String>[];
-    for (final asset in assets) {
-      _log.info("Restoring from trash, localId: ${asset.id}, checksum: ${asset.checksum}");
-      final result = await _restoreFromTrashById(asset.id, asset.type.index);
-      if (result) {
-        restoredIds.add(asset.id);
-      }
-    }
-    return restoredIds;
-  }
-
   Future<AssetEntity?> get(String id) async {
     final entity = await AssetEntity.fromId(id);
     return entity;

mobile/lib/repositories/local_files_manager.repository.dart

@@ -0,0 +1,51 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/services/local_files_manager.service.dart';
+import 'package:logging/logging.dart';
+
+final localFilesManagerRepositoryProvider = Provider(
+  (ref) => LocalFilesManagerRepository(ref.watch(localFileManagerServiceProvider)),
+);
+
+class LocalFilesManagerRepository {
+  LocalFilesManagerRepository(this._service);
+
+  final Logger _logger = Logger('LocalFilesManagerRepo');
+  final LocalFilesManagerService _service;
+
+  Future<bool> moveToTrash(List<String> mediaUrls) async {
+    return await _service.moveToTrash(mediaUrls);
+  }
+
+  Future<bool> restoreFromTrash(String fileName, int type) async {
+    return await _service.restoreFromTrash(fileName, type);
+  }
+
+  Future<bool> requestManageMediaPermission() async {
+    return await _service.requestManageMediaPermission();
+  }
+
+  Future<bool> hasManageMediaPermission() async {
+    return await _service.hasManageMediaPermission();
+  }
+
+  Future<bool> manageMediaPermission() async {
+    return await _service.manageMediaPermission();
+  }
+
+  Future<List<String>> restoreAssetsFromTrash(Iterable<LocalAsset> assets) async {
+    final restoredIds = <String>[];
+    for (final asset in assets) {
+      _logger.info("Restoring from trash, localId: ${asset.id}, remoteId: ${asset.checksum}");
+      try {
+        final result = await _service.restoreFromTrashById(asset.id, asset.type.index);
+        if (result) {
+          restoredIds.add(asset.id);
+        }
+      } catch (e) {
+        _logger.warning("Restoring failure: $e");
+      }
+    }
+    return restoredIds;
+  }
+}

mobile/lib/repositories/permission.repository.dart

@@ -1,16 +1,12 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/platform/permission_api.g.dart';
-import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:permission_handler/permission_handler.dart';
 
-final permissionRepositoryProvider = Provider((ref) {
+final permissionRepositoryProvider = Provider((_) {
-  return PermissionRepository(ref.watch(permissionApiProvider));
+  return const PermissionRepository();
 });
 
 class PermissionRepository implements IPermissionRepository {
-  final PermissionApi _permissionApi;
+  const PermissionRepository();
-
-  const PermissionRepository(this._permissionApi);
 
   @override
   Future<bool> hasLocationWhenInUsePermission() {
@@ -38,21 +34,6 @@ class PermissionRepository implements IPermissionRepository {
   Future<bool> openSettings() {
     return openAppSettings();
   }
-
-  @override
-  Future<bool> hasManageMediaPermission() {
-    return _permissionApi.hasManageMediaPermission();
-  }
-
-  @override
-  Future<bool> requestManageMediaPermission() {
-    return _permissionApi.requestManageMediaPermission();
-  }
-
-  @override
-  Future<bool> manageMediaPermission() {
-    return _permissionApi.manageMediaPermission();
-  }
 }
 
 abstract interface class IPermissionRepository {
@@ -61,7 +42,4 @@ abstract interface class IPermissionRepository {
   Future<bool> hasLocationAlwaysPermission();
   Future<bool> requestLocationAlwaysPermission();
   Future<bool> openSettings();
-  Future<bool> hasManageMediaPermission();
-  Future<bool> requestManageMediaPermission();
-  Future<bool> manageMediaPermission();
 }

mobile/lib/repositories/widget.repository.dart

@@ -1,6 +1,5 @@
 import 'package:home_widget/home_widget.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 
 final widgetRepositoryProvider = Provider((_) => const WidgetRepository());
 
@@ -15,7 +14,7 @@ class WidgetRepository {
     await HomeWidget.updateWidget(iOSName: iosName, qualifiedAndroidName: androidName);
   }
 
-  Future<void> setAppGroupId() async {
+  Future<void> setAppGroupId(String appGroupId) async {
-    await HomeWidget.setAppGroupId(await networkApi.getAppGroupId());
+    await HomeWidget.setAppGroupId(appGroupId);
   }
 }

mobile/lib/services/local_files_manager.service.dart

@@ -0,0 +1,66 @@
+import 'package:flutter/services.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:logging/logging.dart';
+
+final localFileManagerServiceProvider = Provider<LocalFilesManagerService>((ref) => const LocalFilesManagerService());
+
+class LocalFilesManagerService {
+  const LocalFilesManagerService();
+
+  static final Logger _logger = Logger('LocalFilesManager');
+  static const MethodChannel _channel = MethodChannel('file_trash');
+
+  Future<bool> moveToTrash(List<String> mediaUrls) async {
+    try {
+      return await _channel.invokeMethod('moveToTrash', {'mediaUrls': mediaUrls});
+    } catch (e, s) {
+      _logger.warning('Error moving file to trash', e, s);
+      return false;
+    }
+  }
+
+  Future<bool> restoreFromTrash(String fileName, int type) async {
+    try {
+      return await _channel.invokeMethod('restoreFromTrash', {'fileName': fileName, 'type': type});
+    } catch (e, s) {
+      _logger.warning('Error restore file from trash', e, s);
+      return false;
+    }
+  }
+
+  Future<bool> restoreFromTrashById(String mediaId, int type) async {
+    try {
+      return await _channel.invokeMethod('restoreFromTrash', {'mediaId': mediaId, 'type': type});
+    } catch (e, s) {
+      _logger.warning('Error restore file from trash by Id', e, s);
+      return false;
+    }
+  }
+
+  Future<bool> requestManageMediaPermission() async {
+    try {
+      return await _channel.invokeMethod('requestManageMediaPermission');
+    } catch (e, s) {
+      _logger.warning('Error requesting manage media permission', e, s);
+      return false;
+    }
+  }
+
+  Future<bool> hasManageMediaPermission() async {
+    try {
+      return await _channel.invokeMethod('hasManageMediaPermission');
+    } catch (e, s) {
+      _logger.warning('Error requesting manage media permission state', e, s);
+      return false;
+    }
+  }
+
+  Future<bool> manageMediaPermission() async {
+    try {
+      return await _channel.invokeMethod('manageMediaPermission');
+    } catch (e, s) {
+      _logger.warning('Error requesting manage media permission settings', e, s);
+      return false;
+    }
+  }
+}

mobile/lib/services/widget.service.dart

@@ -12,7 +12,7 @@ class WidgetService {
   const WidgetService(this._repository);
 
   Future<void> writeCredentials(String serverURL, String sessionKey, String? customHeaders) async {
-    await _repository.setAppGroupId();
+    await _repository.setAppGroupId(appShareGroupId);
     await _repository.saveData(kWidgetServerEndpoint, serverURL);
     await _repository.saveData(kWidgetAuthToken, sessionKey);
 
@@ -25,7 +25,7 @@ class WidgetService {
   }
 
   Future<void> clearCredentials() async {
-    await _repository.setAppGroupId();
+    await _repository.setAppGroupId(appShareGroupId);
     await _repository.saveData(kWidgetServerEndpoint, "");
     await _repository.saveData(kWidgetAuthToken, "");
     await _repository.saveData(kWidgetCustomHeaders, "");

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

@@ -22,7 +22,7 @@ import 'package:immich_mobile/providers/gallery_permission.provider.dart';
 import 'package:immich_mobile/providers/oauth.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
-import 'package:immich_mobile/repositories/permission.repository.dart';
+import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/provider_utils.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
@@ -193,7 +193,7 @@ class LoginForm extends HookConsumerWidget {
     }
 
     getManageMediaPermission() async {
-      final hasPermission = await ref.read(permissionRepositoryProvider).hasManageMediaPermission();
+      final hasPermission = await ref.read(localFilesManagerRepositoryProvider).hasManageMediaPermission();
       if (!hasPermission) {
         await showDialog(
           context: context,
@@ -224,7 +224,7 @@ class LoginForm extends HookConsumerWidget {
                 ),
                 TextButton(
                   onPressed: () {
-                    unawaited(ref.read(permissionRepositoryProvider).requestManageMediaPermission());
+                    ref.read(localFilesManagerRepositoryProvider).requestManageMediaPermission();
                     Navigator.of(context).pop();
                   },
                   child: Text(

mobile/lib/widgets/settings/advanced_settings.dart

@@ -10,7 +10,7 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
-import 'package:immich_mobile/repositories/permission.repository.dart';
+import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/utils/bytes_units.dart';
 import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
@@ -57,7 +57,9 @@ class AdvancedSettings extends HookConsumerWidget {
       () async {
         isManageMediaSupported.value = await checkAndroidVersion();
         if (isManageMediaSupported.value) {
-          manageMediaAndroidPermission.value = await ref.read(permissionRepositoryProvider).hasManageMediaPermission();
+          manageMediaAndroidPermission.value = await ref
+              .read(localFilesManagerRepositoryProvider)
+              .hasManageMediaPermission();
         }
       }();
       return null;
@@ -80,7 +82,7 @@ class AdvancedSettings extends HookConsumerWidget {
               subtitle: "advanced_settings_sync_remote_deletions_subtitle".tr(),
               onChanged: (value) async {
                 if (value) {
-                  final result = await ref.read(permissionRepositoryProvider).requestManageMediaPermission();
+                  final result = await ref.read(localFilesManagerRepositoryProvider).requestManageMediaPermission();
                   manageLocalMediaAndroid.value = result;
                   manageMediaAndroidPermission.value = result;
                 }
@@ -94,7 +96,7 @@ class AdvancedSettings extends HookConsumerWidget {
                   ? const Color.fromARGB(255, 243, 188, 106)
                   : null,
               onActionTap: () async {
-                final result = await ref.read(permissionRepositoryProvider).manageMediaPermission();
+                final result = await ref.read(localFilesManagerRepositoryProvider).manageMediaPermission();
                 manageMediaAndroidPermission.value = result;
               },
             ),

mobile/lib/widgets/settings/language_settings.dart

@@ -1,12 +1,13 @@
 import 'dart:async';
+
+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:easy_localization/easy_localization.dart';
 import 'package:immich_mobile/constants/locales.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/services/localization.service.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/widgets/common/search_field.dart';
 
 class LanguageSettings extends HookConsumerWidget {
@@ -84,7 +85,7 @@ class LanguageSettings extends HookConsumerWidget {
                     padding: const EdgeInsets.all(8),
                     itemCount: filteredLocaleEntries.value.length,
                     itemExtent: 64.0,
-                    cacheExtent: 100,
+                    scrollCacheExtent: const .pixels(100),
                     itemBuilder: (context, index) {
                       final countryName = filteredLocaleEntries.value[index].key;
                       final localeValue = filteredLocaleEntries.value[index].value;

mobile/lib/widgets/settings/networking_settings/external_network_preference.dart

@@ -36,10 +36,6 @@ class ExternalNetworkPreference extends HookConsumerWidget {
     }
 
     handleReorder(int oldIndex, int newIndex) {
-      if (oldIndex < newIndex) {
-        newIndex -= 1;
-      }
-
       final entry = entries.value.removeAt(oldIndex);
       entries.value.insert(newIndex, entry);
       entries.value = [...entries.value];
@@ -113,7 +109,7 @@ class ExternalNetworkPreference extends HookConsumerWidget {
                     shrinkWrap: true,
                     physics: const NeverScrollableScrollPhysics(),
                     itemCount: entries.value.length,
-                    onReorder: handleReorder,
+                    onReorderItem: handleReorder,
                     itemBuilder: (context, index) {
                       return EndpointInput(
                         key: Key(index.toString()),

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

@@ -0,0 +1,60 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/widget_previews.dart';
+import 'package:immich_ui/src/theme.dart';
+
+const ColorScheme _lightColorScheme = ColorScheme.light(
+  primary: Color(0xFF4250AF),
+  onPrimary: Colors.white,
+  primaryContainer: Color(0xFFD4D6F0),
+  onPrimaryContainer: Color(0xFF181E44),
+  secondary: Color(0xFF737373),
+  onSecondary: Colors.white,
+  error: Color(0xFFE53E3E),
+  onError: Colors.white,
+  surface: Color(0xFFFAFAFA),
+  onSurface: Color(0xFF1A1C1E),
+  surfaceContainerHighest: Color(0xFFE3E4E8),
+  outline: Color(0xFFD1D3D9),
+  outlineVariant: Color(0xFFD4D4D4),
+);
+
+const ColorScheme _darkColorScheme = ColorScheme.dark(
+  primary: Color(0xFFACCBFA),
+  onPrimary: Color(0xFF0F1433),
+  primaryContainer: Color(0xFF616D94),
+  onPrimaryContainer: Color(0xFFD4D6F0),
+  secondary: Color(0xFFC4C6D0),
+  onSecondary: Color(0xFF2E3042),
+  error: Color(0xFFE88080),
+  onError: Color(0xFF0F1433),
+  surface: Color(0xFF0A0A0A),
+  onSurface: Color(0xFFE3E3E6),
+  surfaceContainerHighest: Color(0xFF262626),
+  outline: Color(0xFF8E9099),
+  outlineVariant: Color(0xFF43464F),
+);
+
+PreviewThemeData immichPreviewTheme() => PreviewThemeData(
+      materialLight: ThemeData(colorScheme: _lightColorScheme, useMaterial3: true),
+      materialDark: ThemeData(colorScheme: _darkColorScheme, useMaterial3: true),
+    );
+
+Widget immichPreviewWrapper(Widget child) {
+  return Builder(
+    builder: (context) => ImmichThemeProvider(
+      colorScheme: Theme.of(context).colorScheme,
+      child: Scaffold(
+        backgroundColor: Theme.of(context).colorScheme.surface,
+        body: Padding(
+          padding: const EdgeInsets.all(16),
+          child: Align(alignment: Alignment.topLeft, child: child),
+        ),
+      ),
+    ),
+  );
+}
+
+final class ImmichPreview extends Preview {
+  const ImmichPreview({super.name, super.group, super.size, super.textScaleFactor})
+      : super(theme: immichPreviewTheme, wrapper: immichPreviewWrapper);
+}

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

@@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+import 'package:immich_ui/src/components/close_button.dart';
+import 'package:immich_ui/src/previews.dart';
+import 'package:immich_ui/src/types.dart';
+
+void _previewNoop() {}
+
+@ImmichPreview(group: 'CloseButton', name: 'Variants')
+Widget previewCloseButtonVariants() => const Wrap(
+      spacing: 12,
+      runSpacing: 12,
+      children: [
+        ImmichCloseButton(onPressed: _previewNoop),
+        ImmichCloseButton(onPressed: _previewNoop, variant: ImmichVariant.filled),
+      ],
+    );
+
+@ImmichPreview(group: 'CloseButton', name: 'Colors')
+Widget previewCloseButtonColors() => const Wrap(
+      spacing: 12,
+      runSpacing: 12,
+      children: [
+        ImmichCloseButton(onPressed: _previewNoop),
+        ImmichCloseButton(onPressed: _previewNoop, color: ImmichColor.secondary),
+      ],
+    );

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

@@ -0,0 +1,72 @@
+import 'package:flutter/material.dart';
+import 'package:immich_ui/src/components/form.dart';
+import 'package:immich_ui/src/components/password_input.dart';
+import 'package:immich_ui/src/components/text_input.dart';
+import 'package:immich_ui/src/constants.dart';
+import 'package:immich_ui/src/previews.dart';
+
+@ImmichPreview(group: 'Form', name: 'Login Form')
+Widget previewFormLogin() => const _PreviewLoginForm();
+
+class _PreviewLoginForm extends StatefulWidget {
+  const _PreviewLoginForm();
+
+  @override
+  State<_PreviewLoginForm> createState() => _PreviewLoginFormState();
+}
+
+class _PreviewLoginFormState extends State<_PreviewLoginForm> {
+  final _emailController = TextEditingController();
+  final _passwordController = TextEditingController();
+  String _result = '';
+
+  @override
+  void dispose() {
+    _emailController.dispose();
+    _passwordController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        ImmichForm(
+          submitText: 'Login',
+          submitIcon: Icons.login,
+          onSubmit: () async {
+            await Future<void>.delayed(const Duration(seconds: 1));
+            if (!mounted) {
+              return;
+            }
+            setState(() {
+              _result = 'Form submitted!';
+            });
+          },
+          builder: (context, form) => Column(
+            spacing: ImmichSpacing.sm,
+            children: [
+              ImmichTextInput(
+                label: 'Email',
+                controller: _emailController,
+                keyboardType: TextInputType.emailAddress,
+                validator: (value) => value?.isEmpty ?? true ? 'Required' : null,
+              ),
+              ImmichPasswordInput(
+                label: 'Password',
+                controller: _passwordController,
+                validator: (value) => value?.isEmpty ?? true ? 'Required' : null,
+                onSubmit: (_) => form.submit(),
+              ),
+            ],
+          ),
+        ),
+        if (_result.isNotEmpty) ...[
+          const SizedBox(height: 16),
+          Text(_result, style: const TextStyle(color: Colors.green)),
+        ],
+      ],
+    );
+  }
+}

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

@@ -0,0 +1,50 @@
+import 'package:flutter/material.dart';
+import 'package:immich_ui/src/components/formatted_text.dart';
+import 'package:immich_ui/src/previews.dart';
+
+@ImmichPreview(group: 'FormattedText', name: 'Bold')
+Widget previewFormattedTextBold() => const ImmichFormattedText('This is <b>bold text</b>.');
+
+@ImmichPreview(group: 'FormattedText', name: 'Links')
+Widget previewFormattedTextLinks() => const _PreviewFormattedTextLinks();
+
+@ImmichPreview(group: 'FormattedText', name: 'Mixed Content')
+Widget previewFormattedTextMixed() => const _PreviewFormattedTextMixed();
+
+class _PreviewFormattedTextLinks extends StatelessWidget {
+  const _PreviewFormattedTextLinks();
+
+  @override
+  Widget build(BuildContext context) {
+    return ImmichFormattedText(
+      'Read the <docs-link>documentation</docs-link> or visit <github-link>GitHub</github-link>.',
+      spanBuilder: (tag) => FormattedSpan(
+        onTap: switch (tag) {
+          'docs-link' =>
+            () => ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Docs link clicked!'))),
+          'github-link' =>
+            () => ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('GitHub link clicked!'))),
+          _ => null,
+        },
+      ),
+    );
+  }
+}
+
+class _PreviewFormattedTextMixed extends StatelessWidget {
+  const _PreviewFormattedTextMixed();
+
+  @override
+  Widget build(BuildContext context) {
+    return ImmichFormattedText(
+      'You can use <b>bold text</b> and <link>links</link> together.',
+      spanBuilder: (tag) => switch (tag) {
+        'b' => const FormattedSpan(style: TextStyle(fontWeight: FontWeight.bold)),
+        _ => FormattedSpan(
+            onTap: () =>
+                ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Link clicked!'))),
+          ),
+      },
+    );
+  }
+}

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

@@ -0,0 +1,41 @@
+import 'package:flutter/material.dart';
+import 'package:immich_ui/src/components/icon_button.dart';
+import 'package:immich_ui/src/previews.dart';
+import 'package:immich_ui/src/types.dart';
+
+void _previewNoop() {}
+
+@ImmichPreview(group: 'IconButton', name: 'Variants')
+Widget previewIconButtonVariants() => const Wrap(
+      spacing: 12,
+      runSpacing: 12,
+      children: [
+        ImmichIconButton(icon: Icons.add, onPressed: _previewNoop),
+        ImmichIconButton(icon: Icons.edit, onPressed: _previewNoop, variant: ImmichVariant.ghost),
+      ],
+    );
+
+@ImmichPreview(group: 'IconButton', name: 'Colors')
+Widget previewIconButtonColors() => const Wrap(
+      spacing: 12,
+      runSpacing: 12,
+      children: [
+        ImmichIconButton(icon: Icons.favorite, onPressed: _previewNoop),
+        ImmichIconButton(icon: Icons.delete, onPressed: _previewNoop, color: ImmichColor.secondary),
+      ],
+    );
+
+@ImmichPreview(group: 'IconButton', name: 'Disabled')
+Widget previewIconButtonDisabled() => const Wrap(
+      spacing: 12,
+      runSpacing: 12,
+      children: [
+        ImmichIconButton(icon: Icons.settings, onPressed: _previewNoop, disabled: true),
+        ImmichIconButton(
+          icon: Icons.settings,
+          onPressed: _previewNoop,
+          disabled: true,
+          variant: ImmichVariant.ghost,
+        ),
+      ],
+    );

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

@@ -0,0 +1,18 @@
+import 'package:flutter/material.dart';
+import 'package:immich_ui/src/components/password_input.dart';
+import 'package:immich_ui/src/previews.dart';
+
+@ImmichPreview(group: 'PasswordInput', name: 'With Validator')
+Widget previewPasswordInput() => ImmichPasswordInput(
+      label: 'Password',
+      hintText: 'Enter your password',
+      validator: (value) {
+        if (value == null || value.isEmpty) {
+          return 'Password is required';
+        }
+        if (value.length < 8) {
+          return 'Password must be at least 8 characters';
+        }
+        return null;
+      },
+    );

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

@@ -0,0 +1,88 @@
+import 'package:flutter/material.dart';
+import 'package:immich_ui/src/components/text_button.dart';
+import 'package:immich_ui/src/previews.dart';
+import 'package:immich_ui/src/types.dart';
+
+void _previewNoop() {}
+
+@ImmichPreview(group: 'TextButton', name: 'Variants')
+Widget previewTextButtonVariants() => const Wrap(
+  spacing: 12,
+  runSpacing: 12,
+  children: [
+    ImmichTextButton(onPressed: _previewNoop, labelText: 'Filled', expanded: false),
+    ImmichTextButton(onPressed: _previewNoop, labelText: 'Ghost', variant: ImmichVariant.ghost, expanded: false),
+  ],
+);
+
+@ImmichPreview(group: 'TextButton', name: 'Colors')
+Widget previewTextButtonColors() => const Wrap(
+  spacing: 12,
+  runSpacing: 12,
+  children: [
+    ImmichTextButton(onPressed: _previewNoop, labelText: 'Primary', expanded: false),
+    ImmichTextButton(onPressed: _previewNoop, labelText: 'Secondary', color: ImmichColor.secondary, expanded: false),
+  ],
+);
+
+@ImmichPreview(group: 'TextButton', name: 'With Icons')
+Widget previewTextButtonWithIcons() => const Wrap(
+  spacing: 12,
+  runSpacing: 12,
+  children: [
+    ImmichTextButton(onPressed: _previewNoop, labelText: 'With Icon', icon: Icons.add, expanded: false),
+    ImmichTextButton(
+      onPressed: _previewNoop,
+      labelText: 'Download',
+      icon: Icons.download,
+      variant: ImmichVariant.ghost,
+      expanded: false,
+    ),
+  ],
+);
+
+@ImmichPreview(group: 'TextButton', name: 'Loading')
+Widget previewTextButtonLoading() => const _PreviewLoadingDemo();
+
+@ImmichPreview(group: 'TextButton', name: 'Disabled')
+Widget previewTextButtonDisabled() => const Wrap(
+  spacing: 12,
+  runSpacing: 12,
+  children: [
+    ImmichTextButton(onPressed: _previewNoop, labelText: 'Disabled', disabled: true, expanded: false),
+    ImmichTextButton(
+      onPressed: _previewNoop,
+      labelText: 'Disabled Ghost',
+      variant: ImmichVariant.ghost,
+      disabled: true,
+      expanded: false,
+    ),
+  ],
+);
+
+class _PreviewLoadingDemo extends StatefulWidget {
+  const _PreviewLoadingDemo();
+
+  @override
+  State<_PreviewLoadingDemo> createState() => _PreviewLoadingDemoState();
+}
+
+class _PreviewLoadingDemoState extends State<_PreviewLoadingDemo> {
+  bool _isLoading = false;
+
+  @override
+  Widget build(BuildContext context) {
+    return ImmichTextButton(
+      onPressed: () async {
+        setState(() => _isLoading = true);
+        await Future<void>.delayed(const Duration(seconds: 2));
+        if (mounted) {
+          setState(() => _isLoading = false);
+        }
+      },
+      labelText: _isLoading ? 'Loading...' : 'Click Me',
+      loading: _isLoading,
+      expanded: false,
+    );
+  }
+}

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

@@ -0,0 +1,71 @@
+import 'package:flutter/material.dart';
+import 'package:immich_ui/src/components/text_input.dart';
+import 'package:immich_ui/src/previews.dart';
+
+@ImmichPreview(group: 'TextInput', name: 'Basic')
+Widget previewTextInputBasic() => const _PreviewTextInputBasic();
+
+@ImmichPreview(group: 'TextInput', name: 'With Validator')
+Widget previewTextInputValidator() => const _PreviewTextInputValidator();
+
+class _PreviewTextInputBasic extends StatefulWidget {
+  const _PreviewTextInputBasic();
+
+  @override
+  State<_PreviewTextInputBasic> createState() => _PreviewTextInputBasicState();
+}
+
+class _PreviewTextInputBasicState extends State<_PreviewTextInputBasic> {
+  final _controller = TextEditingController();
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ImmichTextInput(
+      label: 'Email',
+      hintText: 'Enter your email',
+      controller: _controller,
+      keyboardType: TextInputType.emailAddress,
+    );
+  }
+}
+
+class _PreviewTextInputValidator extends StatefulWidget {
+  const _PreviewTextInputValidator();
+
+  @override
+  State<_PreviewTextInputValidator> createState() => _PreviewTextInputValidatorState();
+}
+
+class _PreviewTextInputValidatorState extends State<_PreviewTextInputValidator> {
+  final _controller = TextEditingController();
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ImmichTextInput(
+      label: 'Username',
+      controller: _controller,
+      autovalidateMode: AutovalidateMode.onUserInteraction,
+      validator: (value) {
+        if (value == null || value.isEmpty) {
+          return 'Username is required';
+        }
+        if (value.length < 3) {
+          return 'Username must be at least 3 characters';
+        }
+        return null;
+      },
+    );
+  }
+}

mobile/packages/ui/lib/src/previews/url_input.dart

@@ -0,0 +1,28 @@
+import 'package:flutter/material.dart';
+import 'package:immich_ui/src/components/url_input.dart';
+import 'package:immich_ui/src/previews.dart';
+
+@ImmichPreview(group: 'URLInput', name: 'Basic')
+Widget previewUrlInput() => const _PreviewUrlInput();
+
+class _PreviewUrlInput extends StatefulWidget {
+  const _PreviewUrlInput();
+
+  @override
+  State<_PreviewUrlInput> createState() => _PreviewUrlInputState();
+}
+
+class _PreviewUrlInputState extends State<_PreviewUrlInput> {
+  final _controller = TextEditingController();
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ImmichURLInput(label: 'Server URL', hintText: 'https://demo.immich.com', controller: _controller);
+  }
+}

mobile/packages/ui/pubspec.lock

@@ -185,5 +185,5 @@ packages:
     source: hosted
     version: "15.2.0"
 sdks:
-  dart: ">=3.11.0 <4.0.0"
+  dart: ">=3.12.0 <4.0.0"
   flutter: ">=3.18.0-18.0.pre.54"

mobile/packages/ui/pubspec.yaml

@@ -2,7 +2,7 @@ name: immich_ui
 publish_to: none
 
 environment:
-  sdk: '>=3.11.0 <4.0.0'
+  sdk: '>=3.12.0 <4.0.0'
 
 dependencies:
   flutter:

mobile/packages/ui/showcase/.gitignore

@@ -1,11 +0,0 @@
-# Build artifacts
-build/
-
-# Test cache and generated files
-.dart_tool/
-.packages
-.flutter-plugins
-.flutter-plugins-dependencies
-
-# IDE-specific files
-.vscode/

mobile/packages/ui/showcase/.metadata

@@ -1,30 +0,0 @@
-# This file tracks properties of this Flutter project.
-# Used by Flutter tool to assess capabilities and perform upgrades etc.
-#
-# This file should be version controlled and should not be manually edited.
-
-version:
-  revision: "adc901062556672b4138e18a4dc62a4be8f4b3c2"
-  channel: "stable"
-
-project_type: app
-
-# Tracks metadata for the flutter migrate command
-migration:
-  platforms:
-    - platform: root
-      create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
-      base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
-    - platform: web
-      create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
-      base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
-
-  # User provided section
-
-  # List of Local paths (relative to this file) that should be
-  # ignored by the migrate tool.
-  #
-  # Files that are not part of the templates will be ignored by default.
-  unmanaged_files:
-    - 'lib/main.dart'
-    - 'ios/Runner.xcodeproj/project.pbxproj'

mobile/packages/ui/showcase/analysis_options.yaml

@@ -1 +0,0 @@
-include: package:flutter_lints/flutter.yaml

mobile/packages/ui/showcase/assets/themes/github_dark.json

@@ -1,339 +0,0 @@
-{
-  "name": "GitHub Dark",
-  "settings": [
-    {
-      "settings": {
-        "foreground": "#e1e4e8",
-        "background": "#24292e"
-      }
-    },
-    {
-      "scope": [
-        "comment",
-        "punctuation.definition.comment",
-        "string.comment"
-      ],
-      "settings": {
-        "foreground": "#6a737d"
-      }
-    },
-    {
-      "scope": [
-        "constant",
-        "entity.name.constant",
-        "variable.other.constant",
-        "variable.other.enummember",
-        "variable.language"
-      ],
-      "settings": {
-        "foreground": "#79b8ff"
-      }
-    },
-    {
-      "scope": [
-        "entity",
-        "entity.name"
-      ],
-      "settings": {
-        "foreground": "#b392f0"
-      }
-    },
-    {
-      "scope": "variable.parameter.function",
-      "settings": {
-        "foreground": "#e1e4e8"
-      }
-    },
-    {
-      "scope": "entity.name.tag",
-      "settings": {
-        "foreground": "#85e89d"
-      }
-    },
-    {
-      "scope": "keyword",
-      "settings": {
-        "foreground": "#f97583"
-      }
-    },
-    {
-      "scope": [
-        "storage",
-        "storage.type"
-      ],
-      "settings": {
-        "foreground": "#f97583"
-      }
-    },
-    {
-      "scope": [
-        "storage.modifier.package",
-        "storage.modifier.import",
-        "storage.type.java"
-      ],
-      "settings": {
-        "foreground": "#e1e4e8"
-      }
-    },
-    {
-      "scope": [
-        "string",
-        "punctuation.definition.string",
-        "string punctuation.section.embedded source"
-      ],
-      "settings": {
-        "foreground": "#9ecbff"
-      }
-    },
-    {
-      "scope": "support",
-      "settings": {
-        "foreground": "#79b8ff"
-      }
-    },
-    {
-      "scope": "meta.property-name",
-      "settings": {
-        "foreground": "#79b8ff"
-      }
-    },
-    {
-      "scope": "variable",
-      "settings": {
-        "foreground": "#ffab70"
-      }
-    },
-    {
-      "scope": "variable.other",
-      "settings": {
-        "foreground": "#e1e4e8"
-      }
-    },
-    {
-      "scope": "invalid.broken",
-      "settings": {
-        "fontStyle": "italic",
-        "foreground": "#fdaeb7"
-      }
-    },
-    {
-      "scope": "invalid.deprecated",
-      "settings": {
-        "fontStyle": "italic",
-        "foreground": "#fdaeb7"
-      }
-    },
-    {
-      "scope": "invalid.illegal",
-      "settings": {
-        "fontStyle": "italic",
-        "foreground": "#fdaeb7"
-      }
-    },
-    {
-      "scope": "invalid.unimplemented",
-      "settings": {
-        "fontStyle": "italic",
-        "foreground": "#fdaeb7"
-      }
-    },
-    {
-      "scope": "message.error",
-      "settings": {
-        "foreground": "#fdaeb7"
-      }
-    },
-    {
-      "scope": "string variable",
-      "settings": {
-        "foreground": "#79b8ff"
-      }
-    },
-    {
-      "scope": [
-        "source.regexp",
-        "string.regexp"
-      ],
-      "settings": {
-        "foreground": "#dbedff"
-      }
-    },
-    {
-      "scope": [
-        "string.regexp.character-class",
-        "string.regexp constant.character.escape",
-        "string.regexp source.ruby.embedded",
-        "string.regexp string.regexp.arbitrary-repitition"
-      ],
-      "settings": {
-        "foreground": "#dbedff"
-      }
-    },
-    {
-      "scope": "string.regexp constant.character.escape",
-      "settings": {
-        "fontStyle": "bold",
-        "foreground": "#85e89d"
-      }
-    },
-    {
-      "scope": "support.constant",
-      "settings": {
-        "foreground": "#79b8ff"
-      }
-    },
-    {
-      "scope": "support.variable",
-      "settings": {
-        "foreground": "#79b8ff"
-      }
-    },
-    {
-      "scope": "meta.module-reference",
-      "settings": {
-        "foreground": "#79b8ff"
-      }
-    },
-    {
-      "scope": "punctuation.definition.list.begin.markdown",
-      "settings": {
-        "foreground": "#ffab70"
-      }
-    },
-    {
-      "scope": [
-        "markup.heading",
-        "markup.heading entity.name"
-      ],
-      "settings": {
-        "fontStyle": "bold",
-        "foreground": "#79b8ff"
-      }
-    },
-    {
-      "scope": "markup.quote",
-      "settings": {
-        "foreground": "#85e89d"
-      }
-    },
-    {
-      "scope": "markup.italic",
-      "settings": {
-        "fontStyle": "italic",
-        "foreground": "#e1e4e8"
-      }
-    },
-    {
-      "scope": "markup.bold",
-      "settings": {
-        "fontStyle": "bold",
-        "foreground": "#e1e4e8"
-      }
-    },
-    {
-      "scope": "markup.underline",
-      "settings": {
-        "fontStyle": "underline"
-      }
-    },
-    {
-      "scope": "markup.inline.raw",
-      "settings": {
-        "foreground": "#79b8ff"
-      }
-    },
-    {
-      "scope": [
-        "markup.deleted",
-        "meta.diff.header.from-file",
-        "punctuation.definition.deleted"
-      ],
-      "settings": {
-        "foreground": "#fdaeb7"
-      }
-    },
-    {
-      "scope": [
-        "markup.inserted",
-        "meta.diff.header.to-file",
-        "punctuation.definition.inserted"
-      ],
-      "settings": {
-        "foreground": "#85e89d"
-      }
-    },
-    {
-      "scope": [
-        "markup.changed",
-        "punctuation.definition.changed"
-      ],
-      "settings": {
-        "foreground": "#ffab70"
-      }
-    },
-    {
-      "scope": [
-        "markup.ignored",
-        "markup.untracked"
-      ],
-      "settings": {
-        "foreground": "#2f363d"
-      }
-    },
-    {
-      "scope": "meta.diff.range",
-      "settings": {
-        "fontStyle": "bold",
-        "foreground": "#b392f0"
-      }
-    },
-    {
-      "scope": "meta.diff.header",
-      "settings": {
-        "foreground": "#79b8ff"
-      }
-    },
-    {
-      "scope": "meta.separator",
-      "settings": {
-        "fontStyle": "bold",
-        "foreground": "#79b8ff"
-      }
-    },
-    {
-      "scope": "meta.output",
-      "settings": {
-        "foreground": "#79b8ff"
-      }
-    },
-    {
-      "scope": [
-        "brackethighlighter.tag",
-        "brackethighlighter.curly",
-        "brackethighlighter.round",
-        "brackethighlighter.square",
-        "brackethighlighter.angle",
-        "brackethighlighter.quote"
-      ],
-      "settings": {
-        "foreground": "#d1d5da"
-      }
-    },
-    {
-      "scope": "brackethighlighter.unmatched",
-      "settings": {
-        "foreground": "#fdaeb7"
-      }
-    },
-    {
-      "scope": [
-        "constant.other.reference.link",
-        "string.other.link"
-      ],
-      "settings": {
-        "fontStyle": "underline",
-        "foreground": "#dbedff"
-      }
-    }
-  ]
-}

mobile/packages/ui/showcase/lib/app_theme.dart

@@ -1,96 +0,0 @@
-import 'package:flutter/material.dart';
-
-class AppTheme {
-  // Light theme colors
-  static const _primary500 = Color(0xFF4250AF);
-  static const _primary100 = Color(0xFFD4D6F0);
-  static const _primary900 = Color(0xFF181E44);
-  static const _danger500 = Color(0xFFE53E3E);
-  static const _light50 = Color(0xFFFAFAFA);
-  static const _light300 = Color(0xFFD4D4D4);
-  static const _light500 = Color(0xFF737373);
-
-  // Dark theme colors
-  static const _darkPrimary500 = Color(0xFFACCBFA);
-  static const _darkPrimary300 = Color(0xFF616D94);
-  static const _darkDanger500 = Color(0xFFE88080);
-  static const _darkLight50 = Color(0xFF0A0A0A);
-  static const _darkLight100 = Color(0xFF171717);
-  static const _darkLight200 = Color(0xFF262626);
-
-  static ThemeData get lightTheme {
-    return ThemeData(
-      colorScheme: const ColorScheme.light(
-        primary: _primary500,
-        onPrimary: Colors.white,
-        primaryContainer: _primary100,
-        onPrimaryContainer: _primary900,
-        secondary: _light500,
-        onSecondary: Colors.white,
-        error: _danger500,
-        onError: Colors.white,
-        surface: _light50,
-        onSurface: Color(0xFF1A1C1E),
-        surfaceContainerHighest: Color(0xFFE3E4E8),
-        outline: Color(0xFFD1D3D9),
-        outlineVariant: _light300,
-      ),
-      useMaterial3: true,
-      fontFamily: 'GoogleSans',
-      scaffoldBackgroundColor: _light50,
-      cardTheme: const CardThemeData(
-        elevation: 0,
-        color: Colors.white,
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.all(Radius.circular(12)),
-          side: BorderSide(color: _light300, width: 1),
-        ),
-      ),
-      appBarTheme: const AppBarTheme(
-        centerTitle: false,
-        elevation: 0,
-        backgroundColor: Colors.white,
-        surfaceTintColor: Colors.transparent,
-        foregroundColor: Color(0xFF1A1C1E),
-      ),
-    );
-  }
-
-  static ThemeData get darkTheme {
-    return ThemeData(
-      colorScheme: const ColorScheme.dark(
-        primary: _darkPrimary500,
-        onPrimary: Color(0xFF0F1433),
-        primaryContainer: _darkPrimary300,
-        onPrimaryContainer: _primary100,
-        secondary: Color(0xFFC4C6D0),
-        onSecondary: Color(0xFF2E3042),
-        error: _darkDanger500,
-        onError: Color(0xFF0F1433),
-        surface: _darkLight50,
-        onSurface: Color(0xFFE3E3E6),
-        surfaceContainerHighest: _darkLight200,
-        outline: Color(0xFF8E9099),
-        outlineVariant: Color(0xFF43464F),
-      ),
-      useMaterial3: true,
-      fontFamily: 'GoogleSans',
-      scaffoldBackgroundColor: _darkLight50,
-      cardTheme: const CardThemeData(
-        elevation: 0,
-        color: _darkLight100,
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.all(Radius.circular(12)),
-          side: BorderSide(color: _darkLight200, width: 1),
-        ),
-      ),
-      appBarTheme: const AppBarTheme(
-        centerTitle: false,
-        elevation: 0,
-        backgroundColor: _darkLight50,
-        surfaceTintColor: Colors.transparent,
-        foregroundColor: Color(0xFFE3E3E6),
-      ),
-    );
-  }
-}

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

@@ -1,16 +0,0 @@
-const String appTitle = '@immich/ui';
-
-class LayoutConstants {
-  static const double sidebarWidth = 220.0;
-
-  static const double gridSpacing = 16.0;
-  static const double gridAspectRatio = 2.5;
-
-  static const double borderRadiusSmall = 6.0;
-  static const double borderRadiusMedium = 8.0;
-  static const double borderRadiusLarge = 12.0;
-
-  static const double iconSizeSmall = 16.0;
-  static const double iconSizeMedium = 18.0;
-  static const double iconSizeLarge = 20.0;
-}

mobile/packages/ui/showcase/lib/main.dart

@@ -1,55 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
-import 'package:immich_ui/immich_ui.dart';
-import 'package:showcase/app_theme.dart';
-import 'package:showcase/constants.dart';
-import 'package:showcase/router.dart';
-import 'package:showcase/widgets/example_card.dart';
-
-void main() async {
-  WidgetsFlutterBinding.ensureInitialized();
-  await initializeCodeHighlighter();
-  runApp(const ShowcaseApp());
-}
-
-class ShowcaseApp extends StatefulWidget {
-  const ShowcaseApp({super.key});
-
-  @override
-  State<ShowcaseApp> createState() => _ShowcaseAppState();
-}
-
-class _ShowcaseAppState extends State<ShowcaseApp> {
-  ThemeMode _themeMode = ThemeMode.light;
-  late final GoRouter _router;
-
-  @override
-  void initState() {
-    super.initState();
-    _router = AppRouter.createRouter(_toggleTheme);
-  }
-
-  void _toggleTheme() {
-    setState(() {
-      _themeMode = _themeMode == ThemeMode.light
-          ? ThemeMode.dark
-          : ThemeMode.light;
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return MaterialApp.router(
-      title: appTitle,
-      themeMode: _themeMode,
-      routerConfig: _router,
-      theme: AppTheme.lightTheme,
-      darkTheme: AppTheme.darkTheme,
-      debugShowCheckedModeBanner: false,
-      builder: (context, child) => ImmichThemeProvider(
-        colorScheme: Theme.of(context).colorScheme,
-        child: child!,
-      ),
-    );
-  }
-}

mobile/packages/ui/showcase/lib/pages/components/close_button_page.dart

@@ -1,41 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_ui/immich_ui.dart';
-import 'package:showcase/routes.dart';
-import 'package:showcase/widgets/component_examples.dart';
-import 'package:showcase/widgets/example_card.dart';
-import 'package:showcase/widgets/page_title.dart';
-
-class CloseButtonPage extends StatelessWidget {
-  const CloseButtonPage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return PageTitle(
-      title: AppRoute.closeButton.name,
-      child: ComponentExamples(
-        title: 'ImmichCloseButton',
-        subtitle: 'Pre-configured close button for dialogs and sheets.',
-        examples: [
-          ExampleCard(
-            title: 'Default & Custom',
-            preview: Wrap(
-              spacing: 12,
-              runSpacing: 12,
-              children: [
-                ImmichCloseButton(onPressed: () {}),
-                ImmichCloseButton(
-                  variant: ImmichVariant.filled,
-                  onPressed: () {},
-                ),
-                ImmichCloseButton(
-                  color: ImmichColor.secondary,
-                  onPressed: () {},
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

mobile/packages/ui/showcase/lib/pages/components/examples/formatted_text_bold_text.dart

@@ -1,11 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_ui/immich_ui.dart';
-
-class FormattedTextBoldText extends StatelessWidget {
-  const FormattedTextBoldText({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return ImmichFormattedText('This is <b>bold text</b>.');
-  }
-}

mobile/packages/ui/showcase/lib/pages/components/examples/formatted_text_links.dart

@@ -1,24 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_ui/immich_ui.dart';
-
-class FormattedTextLinks extends StatelessWidget {
-  const FormattedTextLinks({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return ImmichFormattedText(
-      'Read the <docs-link>documentation</docs-link> or visit <github-link>GitHub</github-link>.',
-      spanBuilder: (tag) => FormattedSpan(
-        onTap: switch (tag) {
-          'docs-link' => () => ScaffoldMessenger.of(
-            context,
-          ).showSnackBar(const SnackBar(content: Text('Docs link clicked!'))),
-          'github-link' => () => ScaffoldMessenger.of(
-            context,
-          ).showSnackBar(const SnackBar(content: Text('GitHub link clicked!'))),
-          _ => null,
-        },
-      ),
-    );
-  }
-}

mobile/packages/ui/showcase/lib/pages/components/examples/formatted_text_mixed_tags.dart

@@ -1,23 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_ui/immich_ui.dart';
-
-class FormattedTextMixedContent extends StatelessWidget {
-  const FormattedTextMixedContent({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return ImmichFormattedText(
-      'You can use <b>bold text</b> and <link>links</link> together.',
-      spanBuilder: (tag) => switch (tag) {
-        'b' => const FormattedSpan(
-          style: TextStyle(fontWeight: FontWeight.bold),
-        ),
-        _ => FormattedSpan(
-          onTap: () => ScaffoldMessenger.of(
-            context,
-          ).showSnackBar(const SnackBar(content: Text('Link clicked!'))),
-        ),
-      },
-    );
-  }
-}

mobile/packages/ui/showcase/lib/pages/components/form_page.dart

@@ -1,80 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_ui/immich_ui.dart';
-import 'package:showcase/routes.dart';
-import 'package:showcase/widgets/component_examples.dart';
-import 'package:showcase/widgets/example_card.dart';
-import 'package:showcase/widgets/page_title.dart';
-
-class FormPage extends StatefulWidget {
-  const FormPage({super.key});
-
-  @override
-  State<FormPage> createState() => _FormPageState();
-}
-
-class _FormPageState extends State<FormPage> {
-  final _emailController = TextEditingController();
-  final _passwordController = TextEditingController();
-  String _result = '';
-
-  @override
-  Widget build(BuildContext context) {
-    return PageTitle(
-      title: AppRoute.form.name,
-      child: ComponentExamples(
-        title: 'ImmichForm',
-        subtitle:
-            'Form container with built-in validation and submit handling.',
-        examples: [
-          ExampleCard(
-            title: 'Login Form',
-            preview: Column(
-              children: [
-                ImmichForm(
-                  submitText: 'Login',
-                  submitIcon: Icons.login,
-                  onSubmit: () async {
-                    await Future.delayed(const Duration(seconds: 1));
-                    setState(() {
-                      _result = 'Form submitted!';
-                    });
-                  },
-                  builder: (context, form) => Column(
-                    spacing: 10,
-                    children: [
-                      ImmichTextInput(
-                        label: 'Email',
-                        controller: _emailController,
-                        keyboardType: TextInputType.emailAddress,
-                        validator: (value) =>
-                            value?.isEmpty ?? true ? 'Required' : null,
-                      ),
-                      ImmichPasswordInput(
-                        label: 'Password',
-                        controller: _passwordController,
-                        validator: (value) =>
-                            value?.isEmpty ?? true ? 'Required' : null,
-                        onSubmit: (_) => form.submit(),
-                      ),
-                    ],
-                  ),
-                ),
-                if (_result.isNotEmpty) ...[
-                  const SizedBox(height: 16),
-                  Text(_result, style: const TextStyle(color: Colors.green)),
-                ],
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  @override
-  void dispose() {
-    _emailController.dispose();
-    _passwordController.dispose();
-    super.dispose();
-  }
-}

mobile/packages/ui/showcase/lib/pages/components/formatted_text_page.dart

@@ -1,40 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:showcase/pages/components/examples/formatted_text_bold_text.dart';
-import 'package:showcase/pages/components/examples/formatted_text_links.dart';
-import 'package:showcase/pages/components/examples/formatted_text_mixed_tags.dart';
-import 'package:showcase/routes.dart';
-import 'package:showcase/widgets/component_examples.dart';
-import 'package:showcase/widgets/example_card.dart';
-import 'package:showcase/widgets/page_title.dart';
-
-class FormattedTextPage extends StatelessWidget {
-  const FormattedTextPage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return PageTitle(
-      title: AppRoute.formattedText.name,
-      child: ComponentExamples(
-        title: 'ImmichFormattedText',
-        subtitle: 'Render text with HTML formatting (bold, links).',
-        examples: [
-          ExampleCard(
-            title: 'Bold Text',
-            preview: const FormattedTextBoldText(),
-            code: 'formatted_text_bold_text.dart',
-          ),
-          ExampleCard(
-            title: 'Links',
-            preview: const FormattedTextLinks(),
-            code: 'formatted_text_links.dart',
-          ),
-          ExampleCard(
-            title: 'Mixed Content',
-            preview: const FormattedTextMixedContent(),
-            code: 'formatted_text_mixed_tags.dart',
-          ),
-        ],
-      ),
-    );
-  }
-}

mobile/packages/ui/showcase/lib/pages/components/icon_button_page.dart

@@ -1,52 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_ui/immich_ui.dart';
-import 'package:showcase/routes.dart';
-import 'package:showcase/widgets/component_examples.dart';
-import 'package:showcase/widgets/example_card.dart';
-import 'package:showcase/widgets/page_title.dart';
-
-class IconButtonPage extends StatelessWidget {
-  const IconButtonPage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return PageTitle(
-      title: AppRoute.iconButton.name,
-      child: ComponentExamples(
-        title: 'ImmichIconButton',
-        subtitle: 'Icon-only button with customizable styling.',
-        examples: [
-          ExampleCard(
-            title: 'Variants & Colors',
-            preview: Wrap(
-              spacing: 12,
-              runSpacing: 12,
-              children: [
-                ImmichIconButton(
-                  icon: Icons.add,
-                  onPressed: () {},
-                  variant: ImmichVariant.filled,
-                ),
-                ImmichIconButton(
-                  icon: Icons.edit,
-                  onPressed: () {},
-                  variant: ImmichVariant.ghost,
-                ),
-                ImmichIconButton(
-                  icon: Icons.delete,
-                  onPressed: () {},
-                  color: ImmichColor.secondary,
-                ),
-                ImmichIconButton(
-                  icon: Icons.settings,
-                  onPressed: () {},
-                  disabled: true,
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

mobile/packages/ui/showcase/lib/pages/components/password_input_page.dart

@@ -1,39 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_ui/immich_ui.dart';
-import 'package:showcase/routes.dart';
-import 'package:showcase/widgets/component_examples.dart';
-import 'package:showcase/widgets/example_card.dart';
-import 'package:showcase/widgets/page_title.dart';
-
-class PasswordInputPage extends StatelessWidget {
-  const PasswordInputPage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return PageTitle(
-      title: AppRoute.passwordInput.name,
-      child: ComponentExamples(
-        title: 'ImmichPasswordInput',
-        subtitle: 'Password field with visibility toggle.',
-        examples: [
-          ExampleCard(
-            title: 'Password Input',
-            preview: ImmichPasswordInput(
-              label: 'Password',
-              hintText: 'Enter your password',
-              validator: (value) {
-                if (value == null || value.isEmpty) {
-                  return 'Password is required';
-                }
-                if (value.length < 8) {
-                  return 'Password must be at least 8 characters';
-                }
-                return null;
-              },
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

mobile/packages/ui/showcase/lib/pages/components/text_button_page.dart

@@ -1,140 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_ui/immich_ui.dart';
-import 'package:showcase/routes.dart';
-import 'package:showcase/widgets/component_examples.dart';
-import 'package:showcase/widgets/example_card.dart';
-import 'package:showcase/widgets/page_title.dart';
-
-class TextButtonPage extends StatefulWidget {
-  const TextButtonPage({super.key});
-
-  @override
-  State<TextButtonPage> createState() => _TextButtonPageState();
-}
-
-class _TextButtonPageState extends State<TextButtonPage> {
-  bool _isLoading = false;
-  @override
-  Widget build(BuildContext context) {
-    return PageTitle(
-      title: AppRoute.textButton.name,
-      child: ComponentExamples(
-        title: 'ImmichTextButton',
-        subtitle:
-            'A versatile button component with multiple variants and color options.',
-        examples: [
-          ExampleCard(
-            title: 'Variants',
-            description:
-                'Filled and ghost variants for different visual hierarchy',
-            preview: Wrap(
-              spacing: 12,
-              runSpacing: 12,
-              children: [
-                ImmichTextButton(
-                  onPressed: () {},
-                  labelText: 'Filled',
-                  variant: ImmichVariant.filled,
-                  expanded: false,
-                ),
-                ImmichTextButton(
-                  onPressed: () {},
-                  labelText: 'Ghost',
-                  variant: ImmichVariant.ghost,
-                  expanded: false,
-                ),
-              ],
-            ),
-          ),
-          ExampleCard(
-            title: 'Colors',
-            description: 'Primary and secondary color options',
-            preview: Wrap(
-              spacing: 12,
-              runSpacing: 12,
-              children: [
-                ImmichTextButton(
-                  onPressed: () {},
-                  labelText: 'Primary',
-                  color: ImmichColor.primary,
-                  expanded: false,
-                ),
-                ImmichTextButton(
-                  onPressed: () {},
-                  labelText: 'Secondary',
-                  color: ImmichColor.secondary,
-                  expanded: false,
-                ),
-              ],
-            ),
-          ),
-          ExampleCard(
-            title: 'With Icons',
-            description: 'Add leading icons',
-            preview: Wrap(
-              spacing: 12,
-              runSpacing: 12,
-              children: [
-                ImmichTextButton(
-                  onPressed: () {},
-                  labelText: 'With Icon',
-                  icon: Icons.add,
-                  expanded: false,
-                ),
-                ImmichTextButton(
-                  onPressed: () {},
-                  labelText: 'Download',
-                  icon: Icons.download,
-                  variant: ImmichVariant.ghost,
-                  expanded: false,
-                ),
-              ],
-            ),
-          ),
-          ExampleCard(
-            title: 'Loading State',
-            description: 'Shows loading indicator during async operations',
-            preview: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                ImmichTextButton(
-                  onPressed: () async {
-                    setState(() => _isLoading = true);
-                    await Future.delayed(const Duration(seconds: 2));
-                    if (mounted) setState(() => _isLoading = false);
-                  },
-                  labelText: _isLoading ? 'Loading...' : 'Click Me',
-                  loading: _isLoading,
-                  expanded: false,
-                ),
-              ],
-            ),
-          ),
-          ExampleCard(
-            title: 'Disabled State',
-            description: 'Buttons can be disabled',
-            preview: Wrap(
-              spacing: 12,
-              runSpacing: 12,
-              children: [
-                ImmichTextButton(
-                  onPressed: () {},
-                  labelText: 'Disabled',
-                  disabled: true,
-                  expanded: false,
-                ),
-                ImmichTextButton(
-                  onPressed: () {},
-                  labelText: 'Disabled Ghost',
-                  variant: ImmichVariant.ghost,
-                  disabled: true,
-                  expanded: false,
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

mobile/packages/ui/showcase/lib/pages/components/text_input_page.dart

@@ -1,65 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_ui/immich_ui.dart';
-import 'package:showcase/routes.dart';
-import 'package:showcase/widgets/component_examples.dart';
-import 'package:showcase/widgets/example_card.dart';
-import 'package:showcase/widgets/page_title.dart';
-
-class TextInputPage extends StatefulWidget {
-  const TextInputPage({super.key});
-
-  @override
-  State<TextInputPage> createState() => _TextInputPageState();
-}
-
-class _TextInputPageState extends State<TextInputPage> {
-  final _controller1 = TextEditingController();
-  final _controller2 = TextEditingController();
-
-  @override
-  Widget build(BuildContext context) {
-    return PageTitle(
-      title: AppRoute.textInput.name,
-      child: ComponentExamples(
-        title: 'ImmichTextInput',
-        subtitle: 'Text field with validation support.',
-        examples: [
-          ExampleCard(
-            title: 'Basic Usage',
-            preview: Column(
-              children: [
-                ImmichTextInput(
-                  label: 'Email',
-                  hintText: 'Enter your email',
-                  controller: _controller1,
-                  keyboardType: TextInputType.emailAddress,
-                ),
-                const SizedBox(height: 16),
-                ImmichTextInput(
-                  label: 'Username',
-                  controller: _controller2,
-                  validator: (value) {
-                    if (value == null || value.isEmpty) {
-                      return 'Username is required';
-                    }
-                    if (value.length < 3) {
-                      return 'Username must be at least 3 characters';
-                    }
-                    return null;
-                  },
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  @override
-  void dispose() {
-    _controller1.dispose();
-    _controller2.dispose();
-    super.dispose();
-  }
-}

mobile/packages/ui/showcase/lib/pages/design_system/constants_page.dart

@@ -1,396 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_ui/immich_ui.dart';
-import 'package:showcase/routes.dart';
-import 'package:showcase/widgets/component_examples.dart';
-import 'package:showcase/widgets/example_card.dart';
-import 'package:showcase/widgets/page_title.dart';
-
-class ConstantsPage extends StatefulWidget {
-  const ConstantsPage({super.key});
-
-  @override
-  State<ConstantsPage> createState() => _ConstantsPageState();
-}
-
-class _ConstantsPageState extends State<ConstantsPage> {
-  @override
-  Widget build(BuildContext context) {
-    return PageTitle(
-      title: AppRoute.constants.name,
-      child: ComponentExamples(
-        title: 'Constants',
-        subtitle: 'Consistent spacing, sizing, and styling constants.',
-        expand: true,
-        examples: [
-          const ExampleCard(
-            title: 'Spacing',
-            description: 'ImmichSpacing (4.0 → 48.0)',
-            preview: Column(
-              children: [
-                _SpacingBox(label: 'xs', size: ImmichSpacing.xs),
-                _SpacingBox(label: 'sm', size: ImmichSpacing.sm),
-                _SpacingBox(label: 'md', size: ImmichSpacing.md),
-                _SpacingBox(label: 'lg', size: ImmichSpacing.lg),
-                _SpacingBox(label: 'xl', size: ImmichSpacing.xl),
-                _SpacingBox(label: 'xxl', size: ImmichSpacing.xxl),
-                _SpacingBox(label: 'xxxl', size: ImmichSpacing.xxxl),
-              ],
-            ),
-          ),
-          const ExampleCard(
-            title: 'Border Radius',
-            description: 'ImmichRadius (0.0 → 24.0)',
-            preview: Wrap(
-              spacing: 12,
-              runSpacing: 12,
-              children: [
-                _RadiusBox(label: 'none', radius: ImmichRadius.none),
-                _RadiusBox(label: 'xs', radius: ImmichRadius.xs),
-                _RadiusBox(label: 'sm', radius: ImmichRadius.sm),
-                _RadiusBox(label: 'md', radius: ImmichRadius.md),
-                _RadiusBox(label: 'lg', radius: ImmichRadius.lg),
-                _RadiusBox(label: 'xl', radius: ImmichRadius.xl),
-                _RadiusBox(label: 'xxl', radius: ImmichRadius.xxl),
-              ],
-            ),
-          ),
-          const ExampleCard(
-            title: 'Icon Sizes',
-            description: 'ImmichIconSize (16.0 → 48.0)',
-            preview: Wrap(
-              spacing: 16,
-              runSpacing: 16,
-              alignment: WrapAlignment.start,
-              children: [
-                _IconSizeBox(label: 'xs', size: ImmichIconSize.xs),
-                _IconSizeBox(label: 'sm', size: ImmichIconSize.sm),
-                _IconSizeBox(label: 'md', size: ImmichIconSize.md),
-                _IconSizeBox(label: 'lg', size: ImmichIconSize.lg),
-                _IconSizeBox(label: 'xl', size: ImmichIconSize.xl),
-                _IconSizeBox(label: 'xxl', size: ImmichIconSize.xxl),
-              ],
-            ),
-          ),
-          const ExampleCard(
-            title: 'Text Sizes',
-            description: 'ImmichTextSize (10.0 → 60.0)',
-            preview: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(
-                  'Caption',
-                  style: TextStyle(fontSize: ImmichTextSize.caption),
-                ),
-                Text('Label', style: TextStyle(fontSize: ImmichTextSize.label)),
-                Text('Body', style: TextStyle(fontSize: ImmichTextSize.body)),
-                Text('H6', style: TextStyle(fontSize: ImmichTextSize.h6)),
-                Text('H5', style: TextStyle(fontSize: ImmichTextSize.h5)),
-                Text('H4', style: TextStyle(fontSize: ImmichTextSize.h4)),
-                Text('H3', style: TextStyle(fontSize: ImmichTextSize.h3)),
-                Text('H2', style: TextStyle(fontSize: ImmichTextSize.h2)),
-                Text('H1', style: TextStyle(fontSize: ImmichTextSize.h1)),
-              ],
-            ),
-          ),
-          const ExampleCard(
-            title: 'Elevation',
-            description: 'ImmichElevation (0.0 → 16.0)',
-            preview: Wrap(
-              spacing: 12,
-              runSpacing: 12,
-              children: [
-                _ElevationBox(label: 'none', elevation: ImmichElevation.none),
-                _ElevationBox(label: 'xs', elevation: ImmichElevation.xs),
-                _ElevationBox(label: 'sm', elevation: ImmichElevation.sm),
-                _ElevationBox(label: 'md', elevation: ImmichElevation.md),
-                _ElevationBox(label: 'lg', elevation: ImmichElevation.lg),
-                _ElevationBox(label: 'xl', elevation: ImmichElevation.xl),
-                _ElevationBox(label: 'xxl', elevation: ImmichElevation.xxl),
-              ],
-            ),
-          ),
-          const ExampleCard(
-            title: 'Border Width',
-            description: 'ImmichBorderWidth (0.5 → 4.0)',
-            preview: Column(
-              children: [
-                _BorderBox(
-                  label: 'hairline',
-                  borderWidth: ImmichBorderWidth.hairline,
-                ),
-                _BorderBox(label: 'base', borderWidth: ImmichBorderWidth.base),
-                _BorderBox(label: 'md', borderWidth: ImmichBorderWidth.md),
-                _BorderBox(label: 'lg', borderWidth: ImmichBorderWidth.lg),
-                _BorderBox(label: 'xl', borderWidth: ImmichBorderWidth.xl),
-              ],
-            ),
-          ),
-          const ExampleCard(
-            title: 'Animation Durations',
-            description: 'ImmichDuration (100ms → 700ms)',
-            preview: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              spacing: 8,
-              children: [
-                _AnimatedDurationBox(
-                  label: 'Extra Fast',
-                  duration: ImmichDuration.extraFast,
-                ),
-                _AnimatedDurationBox(
-                  label: 'Fast',
-                  duration: ImmichDuration.fast,
-                ),
-                _AnimatedDurationBox(
-                  label: 'Normal',
-                  duration: ImmichDuration.normal,
-                ),
-                _AnimatedDurationBox(
-                  label: 'Slow',
-                  duration: ImmichDuration.slow,
-                ),
-                _AnimatedDurationBox(
-                  label: 'Extra Slow',
-                  duration: ImmichDuration.extraSlow,
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-class _SpacingBox extends StatelessWidget {
-  final String label;
-  final double size;
-
-  const _SpacingBox({required this.label, required this.size});
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 4),
-      child: Row(
-        children: [
-          SizedBox(
-            width: 60,
-            child: Text(
-              label,
-              style: const TextStyle(fontFamily: 'GoogleSansCode'),
-            ),
-          ),
-          Container(
-            width: size,
-            height: 24,
-            color: Theme.of(context).colorScheme.primary,
-          ),
-          const SizedBox(width: 8),
-          Text('${size.toStringAsFixed(1)}px'),
-        ],
-      ),
-    );
-  }
-}
-
-class _RadiusBox extends StatelessWidget {
-  final String label;
-  final double radius;
-
-  const _RadiusBox({required this.label, required this.radius});
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        Container(
-          width: 60,
-          height: 60,
-          decoration: BoxDecoration(
-            color: Theme.of(context).colorScheme.primary,
-            borderRadius: BorderRadius.circular(radius),
-          ),
-        ),
-        const SizedBox(height: 4),
-        Text(label, style: const TextStyle(fontSize: 12)),
-      ],
-    );
-  }
-}
-
-class _IconSizeBox extends StatelessWidget {
-  final String label;
-  final double size;
-
-  const _IconSizeBox({required this.label, required this.size});
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        Icon(Icons.palette_rounded, size: size),
-        const SizedBox(height: 4),
-        Text(label, style: const TextStyle(fontSize: 12)),
-        Text(
-          '${size.toStringAsFixed(0)}px',
-          style: const TextStyle(fontSize: 10, color: Colors.grey),
-        ),
-      ],
-    );
-  }
-}
-
-class _ElevationBox extends StatelessWidget {
-  final String label;
-  final double elevation;
-
-  const _ElevationBox({required this.label, required this.elevation});
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        Material(
-          elevation: elevation,
-          borderRadius: const BorderRadius.all(Radius.circular(8)),
-          child: Container(
-            width: 60,
-            height: 60,
-            alignment: Alignment.center,
-            child: Text(label, style: const TextStyle(fontSize: 12)),
-          ),
-        ),
-        const SizedBox(height: 4),
-        Text(
-          elevation.toStringAsFixed(1),
-          style: const TextStyle(fontSize: 10),
-        ),
-      ],
-    );
-  }
-}
-
-class _BorderBox extends StatelessWidget {
-  final String label;
-  final double borderWidth;
-
-  const _BorderBox({required this.label, required this.borderWidth});
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 4),
-      child: Row(
-        children: [
-          SizedBox(
-            width: 80,
-            child: Text(
-              label,
-              style: const TextStyle(fontFamily: 'GoogleSansCode'),
-            ),
-          ),
-          Expanded(
-            child: Container(
-              height: 40,
-              decoration: BoxDecoration(
-                border: Border.all(
-                  color: Theme.of(context).colorScheme.primary,
-                  width: borderWidth,
-                ),
-                borderRadius: const BorderRadius.all(Radius.circular(4)),
-              ),
-            ),
-          ),
-          const SizedBox(width: 8),
-          Text('${borderWidth.toStringAsFixed(1)}px'),
-        ],
-      ),
-    );
-  }
-}
-
-class _AnimatedDurationBox extends StatefulWidget {
-  final String label;
-  final Duration duration;
-
-  const _AnimatedDurationBox({required this.label, required this.duration});
-
-  @override
-  State<_AnimatedDurationBox> createState() => _AnimatedDurationBoxState();
-}
-
-class _AnimatedDurationBoxState extends State<_AnimatedDurationBox> {
-  bool _atEnd = false;
-  bool _isAnimating = false;
-
-  void _playAnimation() async {
-    if (_isAnimating) return;
-    setState(() => _isAnimating = true);
-    setState(() => _atEnd = true);
-    await Future.delayed(widget.duration);
-    if (!mounted) return;
-    setState(() => _atEnd = false);
-    await Future.delayed(widget.duration);
-    if (!mounted) return;
-    setState(() => _isAnimating = false);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final colorScheme = Theme.of(context).colorScheme;
-    return Row(
-      children: [
-        SizedBox(
-          width: 90,
-          child: Text(
-            widget.label,
-            style: const TextStyle(fontFamily: 'GoogleSansCode', fontSize: 12),
-          ),
-        ),
-        Expanded(
-          child: Container(
-            height: 32,
-            decoration: BoxDecoration(
-              color: colorScheme.surfaceContainerHighest.withValues(alpha: 0.5),
-              borderRadius: BorderRadius.circular(6),
-            ),
-            child: AnimatedAlign(
-              duration: widget.duration,
-              curve: Curves.easeInOut,
-              alignment: _atEnd ? Alignment.centerRight : Alignment.centerLeft,
-              child: Container(
-                width: 60,
-                height: 28,
-                margin: const EdgeInsets.symmetric(horizontal: 2),
-                decoration: BoxDecoration(
-                  color: colorScheme.primary,
-                  borderRadius: BorderRadius.circular(4),
-                ),
-                alignment: Alignment.center,
-                child: Text(
-                  '${widget.duration.inMilliseconds}ms',
-                  style: TextStyle(
-                    fontSize: 11,
-                    color: colorScheme.onPrimary,
-                    fontWeight: FontWeight.w500,
-                  ),
-                ),
-              ),
-            ),
-          ),
-        ),
-        const SizedBox(width: 8),
-        IconButton(
-          onPressed: _isAnimating ? null : _playAnimation,
-          icon: Icon(
-            Icons.play_arrow_rounded,
-            color: _isAnimating ? colorScheme.outline : colorScheme.primary,
-          ),
-          iconSize: 24,
-          padding: EdgeInsets.zero,
-          constraints: const BoxConstraints(minWidth: 32, minHeight: 32),
-        ),
-      ],
-    );
-  }
-}

mobile/packages/ui/showcase/lib/pages/home_page.dart

@@ -1,118 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
-import 'package:showcase/constants.dart';
-import 'package:showcase/routes.dart';
-
-class HomePage extends StatelessWidget {
-  final VoidCallback onThemeToggle;
-
-  const HomePage({super.key, required this.onThemeToggle});
-
-  @override
-  Widget build(BuildContext context) {
-    return Title(
-      title: appTitle,
-      color: Theme.of(context).colorScheme.primary,
-      child: ListView(
-        padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 32),
-        children: [
-          Text(
-            appTitle,
-            style: Theme.of(context).textTheme.displaySmall?.copyWith(
-              fontWeight: FontWeight.bold,
-              color: Theme.of(context).colorScheme.onSurface,
-            ),
-          ),
-          const SizedBox(height: 12),
-          Text(
-            'A collection of Flutter components that are shared across all Immich projects',
-            style: Theme.of(context).textTheme.titleMedium?.copyWith(
-              color: Theme.of(context).colorScheme.onSurfaceVariant,
-              fontWeight: FontWeight.w400,
-              height: 1.5,
-            ),
-          ),
-          const SizedBox(height: 48),
-          ...routesByCategory.entries.map((entry) {
-            if (entry.key == AppRouteCategory.root) {
-              return const SizedBox.shrink();
-            }
-
-            return Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(
-                  entry.key.displayName,
-                  style: Theme.of(context).textTheme.headlineSmall?.copyWith(
-                    fontWeight: FontWeight.w600,
-                    color: Theme.of(context).colorScheme.onSurface,
-                  ),
-                ),
-                const SizedBox(height: 16),
-                GridView.builder(
-                  shrinkWrap: true,
-                  physics: const NeverScrollableScrollPhysics(),
-                  gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-                    crossAxisCount: 3,
-                    crossAxisSpacing: LayoutConstants.gridSpacing,
-                    mainAxisSpacing: LayoutConstants.gridSpacing,
-                    childAspectRatio: LayoutConstants.gridAspectRatio,
-                  ),
-                  itemCount: entry.value.length,
-                  itemBuilder: (context, index) {
-                    return _ComponentCard(route: entry.value[index]);
-                  },
-                ),
-                const SizedBox(height: 48),
-              ],
-            );
-          }),
-        ],
-      ),
-    );
-  }
-}
-
-class _ComponentCard extends StatelessWidget {
-  final AppRoute route;
-
-  const _ComponentCard({required this.route});
-
-  @override
-  Widget build(BuildContext context) {
-    return InkWell(
-      onTap: () => context.go(route.path),
-      borderRadius: const BorderRadius.all(Radius.circular(LayoutConstants.borderRadiusLarge)),
-      child: Card(
-        child: Padding(
-          padding: const EdgeInsets.all(20),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Icon(route.icon, size: 32, color: Theme.of(context).colorScheme.primary),
-              const SizedBox(height: 16),
-              Text(
-                route.name,
-                style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                  fontWeight: FontWeight.w600,
-                  color: Theme.of(context).colorScheme.onSurface,
-                ),
-              ),
-
-              const SizedBox(height: 8),
-              Text(
-                route.description,
-                style: Theme.of(
-                  context,
-                ).textTheme.bodyMedium?.copyWith(color: Theme.of(context).colorScheme.onSurfaceVariant, height: 1.4),
-                maxLines: 2,
-                overflow: TextOverflow.ellipsis,
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}

mobile/packages/ui/showcase/lib/router.dart

@@ -1,48 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
-import 'package:showcase/pages/components/close_button_page.dart';
-import 'package:showcase/pages/components/form_page.dart';
-import 'package:showcase/pages/components/formatted_text_page.dart';
-import 'package:showcase/pages/components/icon_button_page.dart';
-import 'package:showcase/pages/components/password_input_page.dart';
-import 'package:showcase/pages/components/text_button_page.dart';
-import 'package:showcase/pages/components/text_input_page.dart';
-import 'package:showcase/pages/design_system/constants_page.dart';
-import 'package:showcase/pages/home_page.dart';
-import 'package:showcase/routes.dart';
-import 'package:showcase/widgets/shell_layout.dart';
-
-class AppRouter {
-  static GoRouter createRouter(VoidCallback onThemeToggle) {
-    return GoRouter(
-      initialLocation: AppRoute.home.path,
-      routes: [
-        ShellRoute(
-          builder: (context, state, child) =>
-              ShellLayout(onThemeToggle: onThemeToggle, child: child),
-          routes: AppRoute.values
-              .map(
-                (route) => GoRoute(
-                  path: route.path,
-                  pageBuilder: (context, state) => NoTransitionPage(
-                    key: state.pageKey,
-                    child: switch (route) {
-                      AppRoute.home => HomePage(onThemeToggle: onThemeToggle),
-                      AppRoute.textButton => const TextButtonPage(),
-                      AppRoute.iconButton => const IconButtonPage(),
-                      AppRoute.closeButton => const CloseButtonPage(),
-                      AppRoute.textInput => const TextInputPage(),
-                      AppRoute.passwordInput => const PasswordInputPage(),
-                      AppRoute.form => const FormPage(),
-                      AppRoute.formattedText => const FormattedTextPage(),
-                      AppRoute.constants => const ConstantsPage(),
-                    },
-                  ),
-                ),
-              )
-              .toList(),
-        ),
-      ],
-    );
-  }
-}