migrate mobile call sites

feat: plugins

chore: better types

feat: plugins

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

@@ -16,7 +16,7 @@ services:
       - ${UPLOAD_LOCATION:-upload-devcontainer-volume}${UPLOAD_LOCATION:+/photos}:/data
       - /etc/localtime:/etc/localtime:ro
       - pnpm_store_server:/buildcache/pnpm-store
-      - ../packages/plugins:/build/corePlugin
+      - ../packages/plugin-core:/build/plugins/immich-plugin-core
   immich-web:
     env_file: !reset []
   immich-machine-learning:

.github/workflows/test.yml

@@ -62,9 +62,6 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: read
-    defaults:
-      run:
-        working-directory: ./server
     steps:
       - id: token
         uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
@@ -84,7 +81,7 @@ jobs:
           github_token: ${{ steps.token.outputs.token }}
 
       - name: Run ci-unit
-        run: mise run ci-unit
+        run: mise run //server:ci-unit
 
   cli-unit-tests:
     name: Unit Test CLI
@@ -380,7 +377,7 @@ jobs:
           cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Setup packages
-        run: pnpm --filter "@immich/*" install --frozen-lockfile && pnpm --filter "@immich/*" build
+        run: pnpm --filter @immich/sdk --filter @immich/cli install --frozen-lockfile && pnpm --filter @immich/sdk --filter @immich/cli build
 
       - name: Run setup web
         run: pnpm install --frozen-lockfile && pnpm exec svelte-kit sync
@@ -678,7 +675,6 @@ jobs:
 
       - name: Install server dependencies
         run: SHARP_IGNORE_GLOBAL_LIBVIPS=true pnpm --filter immich install --frozen-lockfile
-
       - name: Run API generation
         run: mise //:open-api
         working-directory: open-api
@@ -717,9 +713,6 @@ jobs:
           --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
         ports:
           - 5432:5432
-    defaults:
-      run:
-        working-directory: ./server
     steps:
       - id: token
         uses: immich-app/devtools/actions/create-workflow-token@caa599d954228439ea3e8ce1c3328f41ab120ee6 # create-workflow-token-action-v2.0.0
@@ -741,18 +734,21 @@ jobs:
       - name: Install server dependencies
         run: SHARP_IGNORE_GLOBAL_LIBVIPS=true pnpm install --frozen-lockfile
 
+      - name: Build plugins
+        run: mise //:plugins
+
       - name: Build the app
-        run: pnpm build
+        run: mise //server:build
 
       - name: Run existing migrations
-        run: pnpm migrations:run
+        run: pnpm --filter immich migrations:run
 
       - name: Test npm run schema:reset command works
-        run: pnpm schema:reset
+        run: pnpm --filter immich schema:reset
 
       - name: Generate new migrations
         continue-on-error: true
-        run: pnpm migrations:generate src/TestMigration
+        run: pnpm --filter migrations:generate src/TestMigration
 
       - name: Find file changes
         uses: tj-actions/verify-changed-files@a1c6acee9df209257a246f2cc6ae8cb6581c1edf # v20.0.4
@@ -768,7 +764,7 @@ jobs:
         run: |
           echo "ERROR: Generated migration files not up to date!"
           echo "Changed files: ${CHANGED_FILES}"
-          cat ./src/*-TestMigration.ts
+          cat ./server/src/*-TestMigration.ts
           exit 1
 
       - name: Run SQL generation

docker/docker-compose.dev.yml

@@ -74,7 +74,7 @@ services:
       - ${UPLOAD_LOCATION}/photos:/data
       - /etc/localtime:/etc/localtime:ro
       - pnpm_store_server:/buildcache/pnpm-store
-      - ../packages/plugins:/build/corePlugin
+      - ../packages/plugin-core:/build/plugins/immich-plugin-core
     env_file:
       - .env
     environment:

docs/docs/developer/testing.md

@@ -18,7 +18,7 @@ make e2e
 Before you can run the tests, you need to run the following commands _once_:
 
 - `pnpm install`
-- `pnpm --filter "@immich/*" build`
+- `pnpm --filter @immich/sdk --filter @immich/cli build`
 - `mise //:open-api`
 
 Once the test environment is running, the e2e tests can be run via:

i18n/en.json

@@ -22,13 +22,12 @@
   "add_birthday": "Add a birthday",
   "add_endpoint": "Add endpoint",
   "add_exclusion_pattern": "Add exclusion pattern",
-  "add_filter": "Add filter",
-  "add_filter_description": "Click to add a filter condition",
   "add_location": "Add location",
   "add_more_users": "Add more users",
   "add_partner": "Add partner",
   "add_path": "Add path",
   "add_photos": "Add photos",
+  "add_step": "Add step",
   "add_tag": "Add tag",
   "add_to": "Add to…",
   "add_to_album": "Add to album",
@@ -42,7 +41,6 @@
   "add_to_shared_album": "Add to shared album",
   "add_upload_to_stack": "Add upload to stack",
   "add_url": "Add URL",
-  "add_workflow_step": "Add workflow step",
   "added_to_archive": "Added to archive",
   "added_to_favorites": "Added to favorites",
   "added_to_favorites_count": "Added {count, number} to favorites",
@@ -733,6 +731,7 @@
   "cannot_update_the_description": "Cannot update the description",
   "cast": "Cast",
   "cast_description": "Configure available cast destinations",
+  "change": "Change",
   "change_date": "Change date",
   "change_description": "Change description",
   "change_display_order": "Change display order",
@@ -761,6 +760,7 @@
   "check_corrupt_asset_backup_description": "Run this check only over Wi-Fi and once all assets have been backed-up. The procedure might take a few minutes.",
   "check_logs": "Check Logs",
   "checksum": "Checksum",
+  "choose": "Choose",
   "choose_matching_people_to_merge": "Choose matching people to merge",
   "city": "City",
   "cleanup_confirm_description": "Immich found {count} assets (created before {date}) safely backed up to the server. Remove the local copies from this device?",
@@ -778,6 +778,7 @@
   "clear": "Clear",
   "clear_all": "Clear all",
   "clear_all_recent_searches": "Clear all recent searches",
+  "clear_failed_count": "Clear failed ({count})",
   "clear_file_cache": "Clear File Cache",
   "clear_message": "Clear message",
   "clear_value": "Clear value",
@@ -809,6 +810,7 @@
   "comments_are_disabled": "Comments are disabled",
   "common_create_new_album": "Create new album",
   "completed": "Completed",
+  "configuration": "Configuration",
   "confirm": "Confirm",
   "confirm_admin_password": "Confirm Admin Password",
   "confirm_delete_face": "Are you sure you want to delete {name} face from the asset?",
@@ -823,6 +825,7 @@
   "contain": "Contain",
   "context": "Context",
   "continue": "Continue",
+  "control_bottom_app_bar_add_tags": "Add Tags",
   "control_bottom_app_bar_create_new_album": "Create new album",
   "control_bottom_app_bar_delete_from_immich": "Delete from Immich",
   "control_bottom_app_bar_delete_from_local": "Delete from device",
@@ -1074,6 +1077,7 @@
     "failed_to_remove_product_key": "Failed to remove product key",
     "failed_to_reset_pin_code": "Failed to reset PIN code",
     "failed_to_stack_assets": "Failed to stack assets",
+    "failed_to_tag_assets": "Failed to tag assets",
     "failed_to_unstack_assets": "Failed to un-stack assets",
     "failed_to_update_notification_status": "Failed to update notification status",
     "incorrect_email_or_password": "Incorrect email or password",
@@ -1628,7 +1632,6 @@
   "next": "Next",
   "next_memory": "Next memory",
   "no": "No",
-  "no_actions_added": "No actions added yet",
   "no_albums_found": "No albums found",
   "no_albums_message": "Create an album to organize your photos and videos",
   "no_albums_with_name_yet": "It looks like you do not have any albums with this name yet.",
@@ -1645,7 +1648,6 @@
   "no_exif_info_available": "No exif info available",
   "no_explore_results_message": "Upload more photos to explore your collection.",
   "no_favorites_message": "Add favorites to quickly find your best pictures and videos",
-  "no_filters_added": "No filters added yet",
   "no_libraries_message": "Create an external library to view your photos and videos",
   "no_local_assets_found": "No local assets found with this checksum",
   "no_location_set": "No location set",
@@ -1658,6 +1660,7 @@
   "no_results": "No results",
   "no_results_description": "Try a synonym or more general keyword",
   "no_shared_albums_message": "Create an album to share photos and videos with people in your network",
+  "no_steps": "No steps added yet",
   "no_uploads_in_progress": "No uploads in progress",
   "none": "None",
   "not_allowed": "Not allowed",
@@ -1794,6 +1797,8 @@
   "play_original_video_setting_description": "Prefer playback of original videos rather than transcoded videos. If original asset is not compatible it may not playback correctly.",
   "play_transcoded_video": "Play transcoded video",
   "please_auth_to_access": "Please authenticate to access",
+  "plugin_method_filter_type": "Filter",
+  "plugin_method_filter_type_description": "This method can filter events and conditionally prevent subsequent steps from running",
   "port": "Port",
   "preferences_settings_subtitle": "Manage the app's preferences",
   "preferences_settings_title": "Preferences",
@@ -2236,6 +2241,10 @@
   "start_date_before_end_date": "Start date must be before end date",
   "state": "State",
   "status": "Status",
+  "step_delete": "Delete step",
+  "step_delete_confirm": "Are you sure you want to delete this step?",
+  "step_details": "Step details",
+  "steps": "Steps",
   "stop_casting": "Stop casting",
   "stop_motion_photo": "Stop Motion Photo",
   "stop_photo_sharing": "Stop sharing your photos?",
@@ -2329,7 +2338,7 @@
   "trash_page_title": "Trash ({count})",
   "trashed_items_will_be_permanently_deleted_after": "Trashed items will be permanently deleted after {days, plural, one {# day} other {# days}}.",
   "trigger": "Trigger",
-  "trigger_asset_uploaded": "Asset Uploaded",
+  "trigger_asset_uploaded": "Asset Upload",
   "trigger_asset_uploaded_description": "Triggered when a new asset is uploaded",
   "trigger_description": "An event that kicks off the workflow",
   "trigger_person_recognized": "Person Recognized",
@@ -2369,7 +2378,6 @@
   "unsupported_field_type": "Unsupported field type",
   "unsupported_file_type": "File {file} can't be uploaded because its file type {type} is not supported.",
   "untagged": "Untagged",
-  "untitled_workflow": "Untitled workflow",
   "up_next": "Up next",
   "update_location_action_prompt": "Update the location of {count} selected assets with:",
   "updated_at": "Updated",
@@ -2461,6 +2469,7 @@
   "welcome_to_immich": "Welcome to Immich",
   "width": "Width",
   "wifi_name": "Wi-Fi Name",
+  "workflow": "Workflow",
   "workflow_delete_prompt": "Are you sure you want to delete this workflow?",
   "workflow_deleted": "Workflow deleted",
   "workflow_description": "Workflow description",

mise.toml

@@ -2,7 +2,7 @@ experimental_monorepo_root = true
 
 [monorepo]
 config_roots = [
-  "packages/plugins",
+  "packages/plugin-core",
   "server",
   "packages/cli",
   "deployment",
@@ -22,12 +22,22 @@ terragrunt = "1.0.3"
 opentofu = "1.11.6"
 java = "21.0.2"
 "npm:oazapfts" = "7.5.0"
+"github:extism/cli" = "1.6.3"
+"github:webassembly/binaryen" = "version_124"
+"github:extism/js-pdk" = "1.6.0"
 
 [tools."github:CQLabs/homebrew-dcm"]
 version = "1.37.0"
 bin = "dcm"
 postinstall = "chmod +x \"$MISE_TOOL_INSTALL_PATH/dcm\" || true"
 
+[tools."github:CQLabs/homebrew-dcm".platforms]
+linux-x64 = { asset_pattern = "dcm-linux-x64-release.zip" }
+linux-arm64 = { asset_pattern = "dcm-linux-arm-release.zip" }
+macos-x64 = { asset_pattern = "dcm-macos-x64-release.zip" }
+macos-arm64 = { asset_pattern = "dcm-macos-arm-release.zip" }
+windows-x64 = { asset_pattern = "dcm-windows-release.zip" }
+
 [tools."github:jellyfin/jellyfin-ffmpeg"]
 version = "7.1.3-6"
 
@@ -41,6 +51,12 @@ macos-arm64 = { asset_pattern = "jellyfin-ffmpeg_*_portable_macarm64-gpl.tar.xz"
 experimental = true
 pin = true
 
+[tasks.plugins]
+run = [
+  "pnpm --filter @immich/plugin-sdk --filter @immich/plugin-core install --frozen-lockfile",
+  "pnpm --filter @immich/plugin-sdk --filter @immich/plugin-core build"
+]
+
 [tasks.open-api-typescript]
 run = [
   "oazapfts --optimistic --argumentStyle=object --useEnumType --allSchemas open-api/immich-openapi-specs.json packages/sdk/src/fetch-client.ts",
@@ -55,6 +71,8 @@ run = "bash ./bin/generate-dart-sdk.sh"
 [tasks.open-api]
 env = { SHARP_IGNORE_GLOBAL_LIBVIPS = true }
 run = [
+  { task = "//:plugins" },
+  { task = "//server:build" },
   { task = "//server:install" },
   { task = "//server:build" },
   { task = "//server:sync-open-api" },

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

@@ -23,6 +23,8 @@ import java.io.IOException
 import java.nio.ByteBuffer
 import java.util.concurrent.ConcurrentHashMap
 
+private const val MAX_PREALLOC_BYTES = 128 * 1024 * 1024
+
 private class RemoteRequest(val cancellationSignal: CancellationSignal)
 
 class RemoteImagesImpl(context: Context) : RemoteImageApi {
@@ -228,7 +230,6 @@ private class CronetImageFetcher : ImageFetcher {
     private val onComplete: () -> Unit,
   ) : UrlRequest.Callback() {
     private var buffer: NativeByteBuffer? = null
-    private var wrapped: ByteBuffer? = null
     private var error: Exception? = null
 
     override fun onRedirectReceived(request: UrlRequest, info: UrlResponseInfo, newUrl: String) {
@@ -242,15 +243,16 @@ private class CronetImageFetcher : ImageFetcher {
       }
 
       try {
+        // Content-Length is a size hint only. With Content-Encoding (gzip/br/...),
+        // Cronet auto-decompresses and writes decompressed bytes to our buffer, which
+        // may exceed the wire/compressed Content-Length. Always use the growable
+        // buffer path so we can't overflow.
         val contentLength = info.allHeaders["content-length"]?.firstOrNull()?.toIntOrNull() ?: 0
-        if (contentLength > 0) {
-          buffer = NativeByteBuffer(contentLength + 1)
-          wrapped = NativeBuffer.wrap(buffer!!.pointer, contentLength + 1)
-          request.read(wrapped)
-        } else {
-          buffer = NativeByteBuffer(INITIAL_BUFFER_SIZE)
-          request.read(buffer!!.wrapRemaining())
-        }
+        // Cap the up-front alloc: Content-Length is untrusted and can be huge or near
+        // Int.MAX_VALUE (overflowing `+1`). For larger responses the grow path takes over.
+        val initialSize = if (contentLength in 1..MAX_PREALLOC_BYTES) contentLength + 1 else INITIAL_BUFFER_SIZE
+        buffer = NativeByteBuffer(initialSize)
+        request.read(buffer!!.wrapRemaining())
       } catch (e: Exception) {
         error = e
         return request.cancel()
@@ -263,14 +265,14 @@ private class CronetImageFetcher : ImageFetcher {
       byteBuffer: ByteBuffer
     ) {
       try {
-        val buf = if (wrapped == null) {
-          buffer!!.run {
-            advance(byteBuffer.position())
-            ensureHeadroom()
-            wrapRemaining()
-          }
-        } else {
-          wrapped
+        // Always pass a fresh wrap so byteBuffer.position() represents only the
+        // bytes Cronet wrote in this iteration. Reusing the caller-supplied
+        // ByteBuffer breaks advance(): Cronet's position keeps accumulating
+        // across reads, which would double-count previous iterations' bytes.
+        val buf = buffer!!.run {
+          advance(byteBuffer.position())
+          ensureHeadroom()
+          wrapRemaining()
         }
         request.read(buf)
       } catch (e: Exception) {
@@ -280,7 +282,6 @@ private class CronetImageFetcher : ImageFetcher {
     }
 
     override fun onSucceeded(request: UrlRequest, info: UrlResponseInfo) {
-      wrapped?.let { buffer!!.advance(it.position()) }
       onSuccess(buffer!!)
       onComplete()
     }

mobile/ios/Runner/Sync/MessagesImpl.swift

@@ -110,7 +110,7 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
         
         var domainAlbum = PlatformAlbum(
           id: album.localIdentifier,
-          name: album.localizedTitle!,
+          name: album.localizedTitle ?? album.localIdentifier,
           updatedAt: nil,
           isCloud: isCloud,
           assetCount: Int64(assets.count)

mobile/lib/constants/enums.dart

@@ -18,3 +18,7 @@ enum CleanupStep { selectDate, scan, delete }
 enum AssetKeepType { none, photosOnly, videosOnly }
 
 enum AssetDateAggregation { start, end }
+
+enum SlideshowLook { contain, cover, blurredBackground }
+
+enum SlideshowDirection { forward, backward, shuffle }

mobile/lib/domain/models/config/app_config.dart

@@ -4,6 +4,7 @@ import 'package:immich_mobile/domain/models/config/map_config.dart';
 import 'package:immich_mobile/domain/models/config/theme_config.dart';
 import 'package:immich_mobile/domain/models/config/timeline_config.dart';
 import 'package:immich_mobile/domain/models/config/viewer_config.dart';
+import 'package:immich_mobile/domain/models/config/slideshow_config.dart';
 
 class AppConfig {
   final ThemeConfig theme;
@@ -12,6 +13,7 @@ class AppConfig {
   final TimelineConfig timeline;
   final ImageConfig image;
   final ViewerConfig viewer;
+  final SlideshowConfig slideshow;
 
   const AppConfig({
     this.theme = const .new(),
@@ -20,6 +22,7 @@ class AppConfig {
     this.timeline = const .new(),
     this.image = const .new(),
     this.viewer = const .new(),
+    this.slideshow = const .new(),
   });
 
   AppConfig copyWith({
@@ -29,6 +32,7 @@ class AppConfig {
     TimelineConfig? timeline,
     ImageConfig? image,
     ViewerConfig? viewer,
+    SlideshowConfig? slideshow,
   }) => .new(
     theme: theme ?? this.theme,
     cleanup: cleanup ?? this.cleanup,
@@ -36,6 +40,7 @@ class AppConfig {
     timeline: timeline ?? this.timeline,
     image: image ?? this.image,
     viewer: viewer ?? this.viewer,
+    slideshow: slideshow ?? this.slideshow,
   );
 
   @override
@@ -47,12 +52,13 @@ class AppConfig {
           other.map == map &&
           other.timeline == timeline &&
           other.image == image &&
-          other.viewer == viewer);
+          other.viewer == viewer &&
+          other.slideshow == slideshow);
 
   @override
-  int get hashCode => Object.hash(theme, cleanup, map, timeline, image, viewer);
+  int get hashCode => Object.hash(theme, cleanup, map, timeline, image, viewer, slideshow);
 
   @override
   String toString() =>
-      'AppConfig(theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline, image: $image, viewer: $viewer)';
+      'AppConfig(theme: $theme, cleanup: $cleanup, map: $map, timeline: $timeline, image: $image, viewer: $viewer, slideshow: $slideshow)';
 }

mobile/lib/domain/models/config/slideshow_config.dart

@@ -0,0 +1,48 @@
+import 'package:immich_mobile/constants/enums.dart';
+
+class SlideshowConfig {
+  final bool transition;
+  final bool repeat;
+  final int duration;
+  final SlideshowLook look;
+  final SlideshowDirection direction;
+
+  const SlideshowConfig({
+    this.transition = true,
+    this.repeat = true,
+    this.duration = 5,
+    this.look = SlideshowLook.contain,
+    this.direction = SlideshowDirection.forward,
+  });
+
+  SlideshowConfig copyWith({
+    bool? transition,
+    bool? repeat,
+    int? duration,
+    SlideshowLook? look,
+    SlideshowDirection? direction,
+  }) => SlideshowConfig(
+    transition: transition ?? this.transition,
+    repeat: repeat ?? this.repeat,
+    duration: duration ?? this.duration,
+    look: look ?? this.look,
+    direction: direction ?? this.direction,
+  );
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is SlideshowConfig &&
+          other.transition == transition &&
+          other.repeat == repeat &&
+          other.duration == duration &&
+          other.look == look &&
+          other.direction == direction);
+
+  @override
+  int get hashCode => Object.hash(transition, repeat, duration, look, direction);
+
+  @override
+  String toString() =>
+      'SlideshowConfig(transition: $transition, repeat: $repeat, duration: $duration, look: $look, direction: $direction)';
+}

mobile/lib/domain/models/metadata_key.dart

@@ -64,7 +64,19 @@ enum MetadataKey<T extends Object> {
   ),
   cleanupKeepAlbumIds<List<String>>(.appConfig, 'cleanup.keepAlbumIds', [], _ListCodec(_PrimitiveCodec.string)),
   cleanupCutoffDaysAgo<int>(.appConfig, 'cleanup.cutoffDaysAgo', -1),
-  cleanupDefaultsInitialized<bool>(.appConfig, 'cleanup.defaultsInitialized', false);
+  cleanupDefaultsInitialized<bool>(.appConfig, 'cleanup.defaultsInitialized', false),
+
+  // Slideshow
+  slideshowTransition<bool>(.appConfig, 'slideshow.transition', true),
+  slideshowRepeat<bool>(.appConfig, 'slideshow.repeat', true),
+  slideshowDuration<int>(.appConfig, 'slideshow.duration', 5),
+  slideshowLook<SlideshowLook>(.appConfig, 'slideshow.look', SlideshowLook.contain, _EnumCodec(SlideshowLook.values)),
+  slideshowDirection<SlideshowDirection>(
+    .appConfig,
+    'slideshow.direction',
+    SlideshowDirection.forward,
+    _EnumCodec(SlideshowDirection.values),
+  );
 
   final MetadataDomain domain;
   final String name;

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

@@ -29,6 +29,9 @@ enum StoreKey<T> {
   readonlyModeEnabled<bool>._(138),
   albumGridView<bool>._(140),
 
+  // Image viewer navigation settings
+  tapToNavigate<bool>._(141),
+
   // Experimental stuff
   enableBackup<bool>._(1003),
   useWifiForUploadVideos<bool>._(1004),

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

@@ -9,12 +9,47 @@ import 'package:immich_mobile/infrastructure/repositories/remote_album.repositor
 import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
 import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
+import 'package:immich_mobile/services/foreground_upload.service.dart';
+import 'package:logging/logging.dart';
+
+/// Categorizes a heterogeneous asset selection into the candidates that can
+/// be added to an album immediately (already on the server) and the local-only
+/// candidates that must be uploaded first.
+class AlbumAssetCandidates {
+  final List<String> remoteAssetIds;
+  final List<LocalAsset> localAssetsToUpload;
+
+  const AlbumAssetCandidates({required this.remoteAssetIds, required this.localAssetsToUpload});
+}
 
 class RemoteAlbumService {
+  static final _logger = Logger('RemoteAlbumService');
+
   final DriftRemoteAlbumRepository _repository;
   final DriftAlbumApiRepository _albumApiRepository;
+  final ForegroundUploadService _uploadService;
 
-  const RemoteAlbumService(this._repository, this._albumApiRepository);
+  const RemoteAlbumService(this._repository, this._albumApiRepository, this._uploadService);
+
+  /// Categorizes a heterogeneous asset selection into already-on-server IDs
+  /// and local assets that still need to be uploaded.
+  static AlbumAssetCandidates categorizeCandidates(Iterable<BaseAsset> assets) {
+    final remoteIds = <String>[];
+    final localToUpload = <LocalAsset>[];
+    for (final asset in assets) {
+      if (asset is RemoteAsset) {
+        remoteIds.add(asset.id);
+      } else if (asset is LocalAsset) {
+        final remoteId = asset.remoteId;
+        if (remoteId != null) {
+          remoteIds.add(remoteId);
+        } else {
+          localToUpload.add(asset);
+        }
+      }
+    }
+    return AlbumAssetCandidates(remoteAssetIds: remoteIds, localAssetsToUpload: localToUpload);
+  }
 
   Stream<RemoteAlbum?> watchAlbum(String albumId) {
     return _repository.watchAlbum(albumId);
@@ -148,6 +183,122 @@ class RemoteAlbumService {
     return album.added.length;
   }
 
+  /// !TODO The name here is not clear as we have addAssets method above,
+  /// which is only add remote assets to album, for the next PR, we will allow
+  /// adding local assets from album from the timeline as well with this flow.
+  /// So saving that for the next refactor
+  Future<int> addAssetsToAlbum({
+    required String albumId,
+    required UserDto uploader,
+    required AlbumAssetCandidates candidates,
+    UploadCallbacks uploadCallbacks = const UploadCallbacks(),
+  }) async {
+    int addedCount = 0;
+    if (candidates.remoteAssetIds.isNotEmpty) {
+      addedCount += await addAssets(albumId: albumId, assetIds: candidates.remoteAssetIds);
+    }
+    if (candidates.localAssetsToUpload.isNotEmpty) {
+      addedCount += await _uploadAndAddLocals(albumId, uploader, candidates.localAssetsToUpload, uploadCallbacks);
+    }
+    return addedCount;
+  }
+
+  /// Creates an album, seeding it with already-remote asset IDs, then uploads
+  /// local-only assets and links each one as it finishes.
+  Future<RemoteAlbum> createAlbumWithAssets({
+    required String title,
+    required UserDto owner,
+    String? description,
+    AlbumAssetCandidates candidates = const AlbumAssetCandidates(remoteAssetIds: [], localAssetsToUpload: []),
+    UploadCallbacks uploadCallbacks = const UploadCallbacks(),
+  }) async {
+    final album = await createAlbum(
+      title: title,
+      owner: owner,
+      description: description,
+      assetIds: candidates.remoteAssetIds,
+    );
+    if (candidates.localAssetsToUpload.isNotEmpty) {
+      await _uploadAndAddLocals(album.id, owner, candidates.localAssetsToUpload, uploadCallbacks);
+    }
+    return album;
+  }
+
+  Future<int> _uploadAndAddLocals(
+    String albumId,
+    UserDto uploader,
+    List<LocalAsset> localAssets,
+    UploadCallbacks userCallbacks,
+  ) async {
+    int addedCount = 0;
+    final pendingAdds = <Future<void>>[];
+    final localById = {for (final a in localAssets) a.id: a};
+
+    final wrappedCallbacks = UploadCallbacks(
+      onProgress: (localId, filename, bytes, totalBytes) => _runUploadCallback(
+        'Upload progress callback failed for $localId',
+        () => userCallbacks.onProgress?.call(localId, filename, bytes, totalBytes),
+      ),
+      onICloudProgress: (localId, progress) => _runUploadCallback(
+        'iCloud progress callback failed for $localId',
+        () => userCallbacks.onICloudProgress?.call(localId, progress),
+      ),
+      onError: (localId, errorMessage) => _runUploadCallback(
+        'Upload error callback failed for $localId',
+        () => userCallbacks.onError?.call(localId, errorMessage),
+      ),
+      onSuccess: (localId, remoteId) {
+        _runUploadCallback(
+          'Upload success callback failed for $localId',
+          () => userCallbacks.onSuccess?.call(localId, remoteId),
+        );
+        final source = localById[localId];
+        if (source == null) {
+          _logger.warning('Upload success for $localId but source LocalAsset missing; skipping album link');
+          return;
+        }
+        pendingAdds.add(
+          _linkUploadedAssetToAlbum(albumId, remoteId, uploader, source)
+              .then<void>((added) {
+                addedCount += added;
+              })
+              .catchError((Object error, StackTrace stack) {
+                _logger.warning('Failed to add uploaded asset $remoteId to album $albumId', error, stack);
+              }),
+        );
+      },
+    );
+
+    await _uploadService.uploadManual(localAssets, callbacks: wrappedCallbacks);
+    await Future.wait(pendingAdds);
+    return addedCount;
+  }
+
+  void _runUploadCallback(String message, void Function() callback) {
+    try {
+      callback();
+    } catch (error, stack) {
+      _logger.warning(message, error, stack);
+    }
+  }
+
+  /// Links a freshly-uploaded asset to an album, ensuring the local DB
+  /// reflects the change without waiting for the next sync. We call the API
+  /// (server is the source of truth), then upsert a placeholder
+  /// `remote_asset_entity` row from the local source so the FK-protected
+  /// junction insert succeeds. Sync overwrites the placeholder later with
+  /// the authoritative server data.
+  Future<int> _linkUploadedAssetToAlbum(String albumId, String remoteId, UserDto uploader, LocalAsset source) async {
+    final result = await _albumApiRepository.addAssets(albumId, [remoteId]);
+    if (result.added.isEmpty) {
+      return 0;
+    }
+
+    await _repository.upsertRemoteAssetStub(remoteId: remoteId, ownerId: uploader.id, source: source);
+    await _repository.addAssets(albumId, result.added);
+    return result.added.length;
+  }
+
   Future<void> deleteAlbum(String albumId) async {
     await _albumApiRepository.deleteAlbum(albumId);
 

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

@@ -0,0 +1,31 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/tag.model.dart';
+import 'package:immich_mobile/infrastructure/repositories/tags_api.repository.dart';
+
+final tagServiceProvider = Provider<TagService>((ref) => TagService(ref.watch(tagsApiRepositoryProvider)));
+
+class TagService {
+  final TagsApiRepository _repository;
+
+  const TagService(this._repository);
+
+  Future<int> bulkTagAssets(List<String> assetIds, List<String> tagIds) async {
+    return _repository.bulkTagAssets(assetIds, tagIds);
+  }
+
+  Future<Set<Tag>> getAllTags() async {
+    final dtos = await _repository.getAllTags();
+    if (dtos == null) {
+      return {};
+    }
+    return dtos.map((dto) => Tag.fromDto(dto)).toSet();
+  }
+
+  Future<List<Tag>> upsertTags(List<String> tags) async {
+    final dtos = await _repository.upsertTags(tags);
+    if (dtos == null) {
+      return [];
+    }
+    return dtos.map((dto) => Tag.fromDto(dto)).toList();
+  }
+}

mobile/lib/extensions/asset_extensions.dart

@@ -18,11 +18,11 @@ extension DTOToAsset on api.AssetResponseDto {
       height: height?.toInt(),
       width: width?.toInt(),
       isFavorite: isFavorite,
-      livePhotoVideoId: livePhotoVideoId,
+      livePhotoVideoId: livePhotoVideoId.orElse(null),
       thumbHash: thumbhash,
       localId: null,
       type: type.toAssetType(),
-      stackId: stack?.id,
+      stackId: stack.orElse(null)?.id,
       isEdited: isEdited,
     );
   }
@@ -41,13 +41,13 @@ extension DTOToAsset on api.AssetResponseDto {
       height: height?.toInt(),
       width: width?.toInt(),
       isFavorite: isFavorite,
-      livePhotoVideoId: livePhotoVideoId,
+      livePhotoVideoId: livePhotoVideoId.orElse(null),
       thumbHash: thumbhash,
       localId: null,
       type: type.toAssetType(),
-      stackId: stack?.id,
+      stackId: stack.orElse(null)?.id,
       isEdited: isEdited,
-      exifInfo: exifInfo != null ? ExifDtoConverter.fromDto(exifInfo!) : const ExifInfo(),
+      exifInfo: exifInfo.orElse(null) != null ? ExifDtoConverter.fromDto(exifInfo.orElse(null)!) : const ExifInfo(),
     );
   }
 }

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

@@ -139,6 +139,13 @@ extension<T extends Object> on MetadataDomain<T> {
             autoPlayVideo: repo._read(.viewerAutoPlayVideo),
             tapToNavigate: repo._read(.viewerTapToNavigate),
           ),
+          slideshow: .new(
+            transition: repo._read(.slideshowTransition),
+            repeat: repo._read(.slideshowRepeat),
+            duration: repo._read(.slideshowDuration),
+            look: repo._read(.slideshowLook),
+            direction: repo._read(.slideshowDirection),
+          ),
         );
       case .systemConfig:
         repo._systemConfig = .new(logLevel: repo._read(.logLevel));

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

@@ -10,6 +10,7 @@ import 'package:immich_mobile/infrastructure/entities/remote_album.entity.drift.
 import 'package:immich_mobile/infrastructure/entities/remote_album_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album_user.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 
 enum SortRemoteAlbumsBy { id, updatedAt }
@@ -159,7 +160,7 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
         createdAt: Value(album.createdAt),
         updatedAt: Value(album.updatedAt),
         description: Value(album.description),
-        thumbnailAssetId: Value(album.thumbnailAssetId),
+        thumbnailAssetId: Value(album.thumbnailAssetId ?? (assetIds.isNotEmpty ? assetIds.first : null)),
         isActivityEnabled: Value(album.isActivityEnabled),
         order: Value(album.order),
       );
@@ -274,17 +275,59 @@ class DriftRemoteAlbumRepository extends DriftDatabaseRepository {
   }
 
   Future<int> addAssets(String albumId, List<String> assetIds) async {
+    if (assetIds.isEmpty) {
+      return 0;
+    }
+
     final albumAssets = assetIds.map(
       (assetId) => RemoteAlbumAssetEntityCompanion(albumId: Value(albumId), assetId: Value(assetId)),
     );
 
-    await _db.batch((batch) {
-      batch.insertAll(_db.remoteAlbumAssetEntity, albumAssets);
+    await _db.transaction(() async {
+      await _db.batch((batch) {
+        batch.insertAll(_db.remoteAlbumAssetEntity, albumAssets);
+      });
+
+      final album = _db.update(_db.remoteAlbumEntity)
+        ..where((row) => row.id.equals(albumId) & row.thumbnailAssetId.isNull());
+
+      await album.write(RemoteAlbumEntityCompanion(thumbnailAssetId: Value(assetIds.first)));
     });
 
     return assetIds.length;
   }
 
+  /// Inserts a placeholder `remote_asset_entity` row from a freshly-uploaded
+  /// local asset. Skips silently if a row with the same id or
+  /// (owner_id, checksum) already exists — sync will overwrite with the
+  /// authoritative server data once the AssetUploadReadyV1 event is processed.
+  Future<void> upsertRemoteAssetStub({
+    required String remoteId,
+    required String ownerId,
+    required LocalAsset source,
+  }) async {
+    await _db
+        .into(_db.remoteAssetEntity)
+        .insert(
+          RemoteAssetEntityCompanion(
+            id: Value(remoteId),
+            ownerId: Value(ownerId),
+            checksum: Value(source.checksum ?? remoteId),
+            name: Value(source.name),
+            type: Value(source.type),
+            createdAt: Value(source.createdAt),
+            updatedAt: Value(source.updatedAt),
+            width: Value(source.width),
+            height: Value(source.height),
+            durationMs: Value(source.durationMs),
+            isFavorite: Value(source.isFavorite),
+            visibility: const Value(AssetVisibility.timeline),
+            isEdited: Value(source.isEdited),
+          ),
+          mode: InsertMode.insertOrIgnore,
+        );
+  }
+
   Future<void> addUsers(String albumId, List<String> userIds) {
     final albumUsers = userIds.map(
       (assetId) => RemoteAlbumUserEntityCompanion(

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

@@ -20,50 +20,64 @@ class SearchApiRepository extends ApiRepository {
         (filter.assetId != null && filter.assetId!.isNotEmpty)) {
       return _api.searchSmart(
         SmartSearchDto(
-          query: filter.context,
-          queryAssetId: filter.assetId,
-          language: filter.language,
-          country: filter.location.country,
-          state: filter.location.state,
-          city: filter.location.city,
-          make: filter.camera.make,
-          model: filter.camera.model,
-          takenAfter: filter.date.takenAfter,
-          takenBefore: filter.date.takenBefore,
-          visibility: filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline,
-          rating: filter.rating.rating,
-          isFavorite: filter.display.isFavorite ? true : null,
-          isNotInAlbum: filter.display.isNotInAlbum ? true : null,
-          personIds: filter.people.map((e) => e.id).toList(),
-          tagIds: filter.tagIds,
-          type: type,
-          page: page,
-          size: 100,
+          query: filter.context == null ? const Optional.absent() : Optional.present(filter.context!),
+          queryAssetId: filter.assetId == null ? const Optional.absent() : Optional.present(filter.assetId!),
+          language: filter.language == null ? const Optional.absent() : Optional.present(filter.language!),
+          country: filter.location.country == null
+              ? const Optional.absent()
+              : Optional.present(filter.location.country!),
+          state: filter.location.state == null ? const Optional.absent() : Optional.present(filter.location.state!),
+          city: filter.location.city == null ? const Optional.absent() : Optional.present(filter.location.city!),
+          make: filter.camera.make == null ? const Optional.absent() : Optional.present(filter.camera.make!),
+          model: filter.camera.model == null ? const Optional.absent() : Optional.present(filter.camera.model!),
+          takenAfter: filter.date.takenAfter == null
+              ? const Optional.absent()
+              : Optional.present(filter.date.takenAfter!),
+          takenBefore: filter.date.takenBefore == null
+              ? const Optional.absent()
+              : Optional.present(filter.date.takenBefore!),
+          visibility: Optional.present(filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline),
+          rating: filter.rating.rating == null ? const Optional.absent() : Optional.present(filter.rating.rating!),
+          isFavorite: filter.display.isFavorite ? const Optional.present(true) : const Optional.absent(),
+          isNotInAlbum: filter.display.isNotInAlbum ? const Optional.present(true) : const Optional.absent(),
+          personIds: Optional.present(filter.people.map((e) => e.id).toList()),
+          tagIds: filter.tagIds == null ? const Optional.absent() : Optional.present(filter.tagIds!),
+          type: type == null ? const Optional.absent() : Optional.present(type),
+          page: Optional.present(page),
+          size: const Optional.present(100),
         ),
       );
     }
 
     return _api.searchAssets(
       MetadataSearchDto(
-        originalFileName: filter.filename != null && filter.filename!.isNotEmpty ? filter.filename : null,
-        country: filter.location.country,
-        description: filter.description != null && filter.description!.isNotEmpty ? filter.description : null,
-        ocr: filter.ocr != null && filter.ocr!.isNotEmpty ? filter.ocr : null,
-        state: filter.location.state,
-        city: filter.location.city,
-        make: filter.camera.make,
-        model: filter.camera.model,
-        takenAfter: filter.date.takenAfter,
-        takenBefore: filter.date.takenBefore,
-        visibility: filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline,
-        rating: filter.rating.rating,
-        isFavorite: filter.display.isFavorite ? true : null,
-        isNotInAlbum: filter.display.isNotInAlbum ? true : null,
-        personIds: filter.people.map((e) => e.id).toList(),
-        tagIds: filter.tagIds,
-        type: type,
-        page: page,
-        size: 1000,
+        originalFileName: filter.filename != null && filter.filename!.isNotEmpty
+            ? Optional.present(filter.filename!)
+            : const Optional.absent(),
+        country: filter.location.country == null ? const Optional.absent() : Optional.present(filter.location.country!),
+        description: filter.description != null && filter.description!.isNotEmpty
+            ? Optional.present(filter.description!)
+            : const Optional.absent(),
+        ocr: filter.ocr != null && filter.ocr!.isNotEmpty ? Optional.present(filter.ocr!) : const Optional.absent(),
+        state: filter.location.state == null ? const Optional.absent() : Optional.present(filter.location.state!),
+        city: filter.location.city == null ? const Optional.absent() : Optional.present(filter.location.city!),
+        make: filter.camera.make == null ? const Optional.absent() : Optional.present(filter.camera.make!),
+        model: filter.camera.model == null ? const Optional.absent() : Optional.present(filter.camera.model!),
+        takenAfter: filter.date.takenAfter == null
+            ? const Optional.absent()
+            : Optional.present(filter.date.takenAfter!),
+        takenBefore: filter.date.takenBefore == null
+            ? const Optional.absent()
+            : Optional.present(filter.date.takenBefore!),
+        visibility: Optional.present(filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline),
+        rating: filter.rating.rating == null ? const Optional.absent() : Optional.present(filter.rating.rating!),
+        isFavorite: filter.display.isFavorite ? const Optional.present(true) : const Optional.absent(),
+        isNotInAlbum: filter.display.isNotInAlbum ? const Optional.present(true) : const Optional.absent(),
+        personIds: Optional.present(filter.people.map((e) => e.id).toList()),
+        tagIds: filter.tagIds == null ? const Optional.absent() : Optional.present(filter.tagIds!),
+        type: type == null ? const Optional.absent() : Optional.present(type),
+        page: Optional.present(page),
+        size: const Optional.present(1000),
       ),
     );
   }

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

@@ -20,7 +20,7 @@ class SyncApiRepository {
   }
 
   Future<void> deleteSyncAck(List<SyncEntityType> types) {
-    return _api.syncApi.deleteSyncAck(SyncAckDeleteDto(types: types));
+    return _api.syncApi.deleteSyncAck(SyncAckDeleteDto(types: Optional.present(types)));
   }
 
   Future<void> streamChanges(

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

@@ -91,7 +91,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
             email: Value(user.email),
             hasProfileImage: Value(user.hasProfileImage),
             profileChangedAt: Value(user.profileChangedAt),
-            avatarColor: Value(user.avatarColor?.toAvatarColor() ?? AvatarColor.primary),
+            avatarColor: Value(user.avatarColor.orElse(null)?.toAvatarColor() ?? AvatarColor.primary),
             isAdmin: Value(user.isAdmin),
             pinCode: Value(user.pinCode),
             quotaSizeInBytes: Value(user.quotaSizeInBytes ?? 0),
@@ -133,7 +133,7 @@ class SyncStreamRepository extends DriftDatabaseRepository {
             email: Value(user.email),
             hasProfileImage: Value(user.hasProfileImage),
             profileChangedAt: Value(user.profileChangedAt),
-            avatarColor: Value(user.avatarColor?.toAvatarColor() ?? AvatarColor.primary),
+            avatarColor: Value(user.avatarColor.orElse(null)?.toAvatarColor() ?? AvatarColor.primary),
           );
 
           batch.insert(_db.userEntity, companion.copyWith(id: Value(user.id)), onConflict: DoUpdate((_) => companion));

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

@@ -14,4 +14,13 @@ class TagsApiRepository extends ApiRepository {
   Future<List<TagResponseDto>?> getAllTags() async {
     return await _api.getAllTags();
   }
+
+  Future<int> bulkTagAssets(List<String> assetIds, List<String> tagIds) async {
+    final response = await _api.bulkTagAssets(TagBulkAssetsDto(assetIds: assetIds, tagIds: tagIds));
+    return response?.count ?? 0;
+  }
+
+  Future<List<TagResponseDto>?> upsertTags(List<String> tags) async {
+    return _api.upsertTags(TagUpsertDto(tags: tags));
+  }
 }

mobile/lib/infrastructure/utils/exif.converter.dart

@@ -5,24 +5,24 @@ import 'package:openapi/api.dart';
 abstract final class ExifDtoConverter {
   static ExifInfo fromDto(ExifResponseDto dto) {
     return ExifInfo(
-      fileSize: dto.fileSizeInByte,
-      description: dto.description,
-      orientation: dto.orientation,
-      timeZone: dto.timeZone,
-      dateTimeOriginal: dto.dateTimeOriginal,
-      isFlipped: isOrientationFlipped(dto.orientation),
-      latitude: dto.latitude?.toDouble(),
-      longitude: dto.longitude?.toDouble(),
-      city: dto.city,
-      state: dto.state,
-      country: dto.country,
-      make: dto.make,
-      model: dto.model,
-      lens: dto.lensModel,
-      f: dto.fNumber?.toDouble(),
-      mm: dto.focalLength?.toDouble(),
-      iso: dto.iso?.toInt(),
-      exposureSeconds: exposureTimeToSeconds(dto.exposureTime),
+      fileSize: dto.fileSizeInByte.orElse(null),
+      description: dto.description.orElse(null),
+      orientation: dto.orientation.orElse(null),
+      timeZone: dto.timeZone.orElse(null),
+      dateTimeOriginal: dto.dateTimeOriginal.orElse(null),
+      isFlipped: isOrientationFlipped(dto.orientation.orElse(null)),
+      latitude: dto.latitude.orElse(null)?.toDouble(),
+      longitude: dto.longitude.orElse(null)?.toDouble(),
+      city: dto.city.orElse(null),
+      state: dto.state.orElse(null),
+      country: dto.country.orElse(null),
+      make: dto.make.orElse(null),
+      model: dto.model.orElse(null),
+      lens: dto.lensModel.orElse(null),
+      f: dto.fNumber.orElse(null)?.toDouble(),
+      mm: dto.focalLength.orElse(null)?.toDouble(),
+      iso: dto.iso.orElse(null)?.toInt(),
+      exposureSeconds: exposureTimeToSeconds(dto.exposureTime.orElse(null)),
     );
   }
 

mobile/lib/infrastructure/utils/user.converter.dart

@@ -40,7 +40,7 @@ abstract final class UserConverter {
     updatedAt: DateTime.now(),
     avatarColor: dto.avatarColor.toAvatarColor(),
     memoryEnabled: false,
-    inTimeline: dto.inTimeline ?? false,
+    inTimeline: dto.inTimeline.orElse(null) ?? false,
     isPartnerSharedBy: false,
     isPartnerSharedWith: false,
     profileChangedAt: dto.profileChangedAt,

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

@@ -73,10 +73,10 @@ class SharedLink {
       slug = dto.slug,
       type = dto.type == SharedLinkType.ALBUM ? SharedLinkSource.album : SharedLinkSource.individual,
       title = dto.type == SharedLinkType.ALBUM
-          ? dto.album?.albumName.toUpperCase() ?? "UNKNOWN SHARE"
+          ? dto.album.orElse(null)?.albumName.toUpperCase() ?? "UNKNOWN SHARE"
           : "INDIVIDUAL SHARE",
       thumbAssetId = dto.type == SharedLinkType.ALBUM
-          ? dto.album?.albumThumbnailAssetId
+          ? dto.album.orElse(null)?.albumThumbnailAssetId
           : dto.assets.isNotEmpty
           ? dto.assets[0].id
           : null;

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

@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/models/shared_link/shared_link.model.dart';
 import 'package:immich_mobile/providers/shared_link.provider.dart';
 import 'package:immich_mobile/widgets/shared_link/shared_link_item.dart';
@@ -28,71 +27,41 @@ class SharedLinkPage extends HookConsumerWidget {
     }, []);
 
     Widget buildNoShares() {
-      return Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Padding(
-            padding: const EdgeInsets.only(left: 16.0, top: 16.0),
-            child: const Text(
-              "shared_link_manage_links",
-              style: TextStyle(fontSize: 14, color: Colors.grey, fontWeight: FontWeight.bold),
-            ).tr(),
-          ),
-          Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 16.0),
-            child: Padding(
-              padding: const EdgeInsets.symmetric(vertical: 10),
-              child: const Text("you_dont_have_any_shared_links", style: TextStyle(fontSize: 14)).tr(),
-            ),
-          ),
-          Expanded(
-            child: Center(
-              child: Icon(Icons.link_off, size: 100, color: context.themeData.iconTheme.color?.withValues(alpha: 0.5)),
-            ),
-          ),
-        ],
+      return Center(
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.center,
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Icon(Icons.link_off, size: 100, color: Theme.of(context).colorScheme.onSurface.withAlpha(128)),
+            const SizedBox(height: 20),
+            const Text("you_dont_have_any_shared_links", style: TextStyle(fontSize: 14)).tr(),
+          ],
+        ),
       );
     }
 
     Widget buildSharesList(List<SharedLink> links) {
-      return Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Padding(
-            padding: const EdgeInsets.only(left: 16.0, top: 16.0, bottom: 30.0),
-            child: Text(
-              "shared_link_manage_links",
-              style: context.textTheme.labelLarge?.copyWith(color: context.textTheme.labelLarge?.color?.withAlpha(200)),
-            ).tr(),
-          ),
-          Expanded(
-            child: LayoutBuilder(
-              builder: (context, constraints) {
-                if (constraints.maxWidth > 600) {
-                  // Two column
-                  return GridView.builder(
-                    gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-                      crossAxisCount: 2,
-                      mainAxisExtent: 180,
-                    ),
-                    itemCount: links.length,
-                    itemBuilder: (context, index) {
-                      return SharedLinkItem(links.elementAt(index));
-                    },
-                  );
-                }
-
-                // Single column
-                return ListView.builder(
-                  itemCount: links.length,
-                  itemBuilder: (context, index) {
-                    return SharedLinkItem(links.elementAt(index));
-                  },
-                );
-              },
-            ),
-          ),
-        ],
+      return LayoutBuilder(
+        builder: (context, constraints) => constraints.maxWidth > 600
+            ? GridView.builder(
+                key: const PageStorageKey('shared-links-grid'),
+                gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                  crossAxisCount: 2,
+                  mainAxisExtent: 180,
+                  crossAxisSpacing: 12,
+                  mainAxisSpacing: 12,
+                ),
+                padding: const EdgeInsets.all(12),
+                itemCount: links.length,
+                itemBuilder: (context, index) => SharedLinkItem(links[index]),
+              )
+            : ListView.separated(
+                key: const PageStorageKey('shared-links-list'),
+                padding: const EdgeInsets.symmetric(vertical: 8),
+                itemCount: links.length,
+                itemBuilder: (context, index) => SharedLinkItem(links[index]),
+                separatorBuilder: (context, index) => const Divider(height: 1),
+              ),
       );
     }
 

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

@@ -6,15 +6,20 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/models/shared_link/shared_link.model.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/shared_link.provider.dart';
 import 'package:immich_mobile/services/shared_link.service.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
+import 'package:immich_mobile/widgets/common/confirm_dialog.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
+import 'package:share_plus/share_plus.dart';
 
 @RoutePage()
 class SharedLinkEditPage extends HookConsumerWidget {
+  static const int maxFutureDate = 365 * 2;
+
   final SharedLink? existingLink;
   final List<String>? assetsList;
   final String? albumId;
@@ -23,71 +28,82 @@ class SharedLinkEditPage extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    const padding = 20.0;
     final themeData = context.themeData;
     final colorScheme = context.colorScheme;
+    final externalDomain = ref.watch(serverInfoProvider.select((s) => s.serverConfig.externalDomain));
+    final displayServerUrl = externalDomain.isNotEmpty ? externalDomain : getServerUrl();
+    final expiryPresets = <(Duration, String)>[
+      (Duration.zero, context.t.never),
+      (const Duration(minutes: 30), context.t.shared_link_edit_expire_after_option_minutes(count: 30)),
+      (const Duration(hours: 1), context.t.shared_link_edit_expire_after_option_hour),
+      (const Duration(hours: 6), context.t.shared_link_edit_expire_after_option_hours(count: 6)),
+      (const Duration(days: 1), context.t.shared_link_edit_expire_after_option_day),
+      (const Duration(days: 7), context.t.shared_link_edit_expire_after_option_days(count: 7)),
+      (const Duration(days: 30), context.t.shared_link_edit_expire_after_option_days(count: 30)),
+      (const Duration(days: 90), context.t.shared_link_edit_expire_after_option_months(count: 3)),
+      (const Duration(days: 365), context.t.shared_link_edit_expire_after_option_year(count: 1)),
+    ];
     final descriptionController = useTextEditingController(text: existingLink?.description ?? "");
     final descriptionFocusNode = useFocusNode();
     final passwordController = useTextEditingController(text: existingLink?.password ?? "");
     final slugController = useTextEditingController(text: existingLink?.slug ?? "");
     final slugFocusNode = useFocusNode();
+    useListenable(slugController);
     final showMetadata = useState(existingLink?.showMetadata ?? true);
     final allowDownload = useState(existingLink?.allowDownload ?? true);
     final allowUpload = useState(existingLink?.allowUpload ?? false);
-    final editExpiry = useState(false);
-    final expiryAfter = useState(0);
+    final expiryAfter = useState<DateTime?>(existingLink?.expiresAt?.toLocal());
+    final selectedPresetIndex = useState<int?>(existingLink?.expiresAt == null ? 0 : null);
     final newShareLink = useState("");
 
+    Widget buildSharedLinkRow({required String leading, required String content}) {
+      return Row(
+        children: [
+          Expanded(
+            child: SingleChildScrollView(
+              scrollDirection: Axis.horizontal,
+              child: Text(
+                content,
+                style: TextStyle(color: colorScheme.primary, fontWeight: FontWeight.bold),
+              ),
+            ),
+          ),
+          const SizedBox(width: 8),
+          Text(leading, style: const TextStyle(fontWeight: FontWeight.bold)),
+        ],
+      );
+    }
+
     Widget buildLinkTitle() {
       if (existingLink != null) {
         if (existingLink!.type == SharedLinkSource.album) {
-          return Row(
-            children: [
-              const Text('public_album', style: TextStyle(fontWeight: FontWeight.bold)).tr(),
-              const Text(" | ", style: TextStyle(fontWeight: FontWeight.bold)),
-              Text(
-                existingLink!.title,
-                style: TextStyle(color: colorScheme.primary, fontWeight: FontWeight.bold),
-              ),
-            ],
-          );
+          return buildSharedLinkRow(leading: context.t.public_album, content: existingLink!.title);
         }
 
         if (existingLink!.type == SharedLinkSource.individual) {
-          return Row(
-            children: [
-              const Text('shared_link_individual_shared', style: TextStyle(fontWeight: FontWeight.bold)).tr(),
-              const Text(" | ", style: TextStyle(fontWeight: FontWeight.bold)),
-              Expanded(
-                child: Text(
-                  existingLink!.description ?? "--",
-                  style: TextStyle(color: colorScheme.primary, fontWeight: FontWeight.bold),
-                  overflow: TextOverflow.ellipsis,
-                ),
-              ),
-            ],
+          return buildSharedLinkRow(
+            leading: context.t.shared_link_individual_shared,
+            content: existingLink!.description ?? "--",
           );
         }
       }
 
-      return const Text("create_link_to_share_description", style: TextStyle(fontWeight: FontWeight.bold)).tr();
+      return Text(context.t.create_link_to_share_description, style: const TextStyle(fontWeight: FontWeight.bold));
     }
 
     Widget buildDescriptionField() {
       return TextField(
         controller: descriptionController,
-        enabled: newShareLink.value.isEmpty,
         focusNode: descriptionFocusNode,
         textInputAction: TextInputAction.done,
         autofocus: false,
         decoration: InputDecoration(
-          labelText: 'description'.tr(),
-          labelStyle: TextStyle(fontWeight: FontWeight.bold, color: colorScheme.primary),
+          labelText: context.t.description,
+          labelStyle: const TextStyle(fontWeight: FontWeight.bold),
           floatingLabelBehavior: FloatingLabelBehavior.always,
           border: const OutlineInputBorder(),
-          hintText: 'shared_link_edit_description_hint'.tr(),
+          hintText: context.t.shared_link_edit_description_hint,
           hintStyle: const TextStyle(fontWeight: FontWeight.normal, fontSize: 14),
-          disabledBorder: OutlineInputBorder(borderSide: BorderSide(color: Colors.grey.withValues(alpha: 0.5))),
         ),
         onTapOutside: (_) => descriptionFocusNode.unfocus(),
       );
@@ -96,16 +112,14 @@ class SharedLinkEditPage extends HookConsumerWidget {
     Widget buildPasswordField() {
       return TextField(
         controller: passwordController,
-        enabled: newShareLink.value.isEmpty,
         autofocus: false,
         decoration: InputDecoration(
-          labelText: 'password'.tr(),
-          labelStyle: TextStyle(fontWeight: FontWeight.bold, color: colorScheme.primary),
+          labelText: context.t.password,
+          labelStyle: const TextStyle(fontWeight: FontWeight.bold),
           floatingLabelBehavior: FloatingLabelBehavior.always,
           border: const OutlineInputBorder(),
-          hintText: 'shared_link_edit_password_hint'.tr(),
+          hintText: context.t.shared_link_edit_password_hint,
           hintStyle: const TextStyle(fontWeight: FontWeight.normal, fontSize: 14),
-          disabledBorder: OutlineInputBorder(borderSide: BorderSide(color: Colors.grey.withValues(alpha: 0.5))),
         ),
       );
     }
@@ -113,18 +127,16 @@ class SharedLinkEditPage extends HookConsumerWidget {
     Widget buildSlugField() {
       return TextField(
         controller: slugController,
-        enabled: newShareLink.value.isEmpty,
         focusNode: slugFocusNode,
         textInputAction: TextInputAction.done,
         autofocus: false,
         decoration: InputDecoration(
-          labelText: 'custom_url'.tr(),
-          labelStyle: TextStyle(fontWeight: FontWeight.bold, color: colorScheme.primary),
-          floatingLabelBehavior: FloatingLabelBehavior.always,
+          labelText: slugController.text.isNotEmpty ? context.t.custom_url : null,
+          labelStyle: const TextStyle(fontWeight: FontWeight.bold),
           border: const OutlineInputBorder(),
-          hintText: 'custom_url'.tr(),
-          hintStyle: const TextStyle(fontWeight: FontWeight.normal, fontSize: 14),
-          disabledBorder: OutlineInputBorder(borderSide: BorderSide(color: Colors.grey.withValues(alpha: 0.5))),
+          hintText: context.t.custom_url,
+          prefixText: slugController.text.isNotEmpty ? '/s/' : null,
+          prefixStyle: const TextStyle(fontWeight: FontWeight.bold, fontSize: 14),
         ),
         onTapOutside: (_) => slugFocusNode.unfocus(),
       );
@@ -133,145 +145,182 @@ class SharedLinkEditPage extends HookConsumerWidget {
     Widget buildShowMetaButton() {
       return SwitchListTile.adaptive(
         value: showMetadata.value,
-        onChanged: newShareLink.value.isEmpty ? (value) => showMetadata.value = value : null,
-        activeThumbColor: colorScheme.primary,
+        onChanged: (value) => showMetadata.value = value,
         dense: true,
-        title: Text("show_metadata", style: themeData.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.bold)).tr(),
+        title: Text(
+          context.t.show_metadata,
+          style: themeData.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.bold),
+        ),
       );
     }
 
     Widget buildAllowDownloadButton() {
       return SwitchListTile.adaptive(
         value: allowDownload.value,
-        onChanged: newShareLink.value.isEmpty ? (value) => allowDownload.value = value : null,
-        activeThumbColor: colorScheme.primary,
+        onChanged: (value) => allowDownload.value = value,
         dense: true,
         title: Text(
-          "allow_public_user_to_download",
+          context.t.allow_public_user_to_download,
           style: themeData.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.bold),
-        ).tr(),
+        ),
       );
     }
 
     Widget buildAllowUploadButton() {
       return SwitchListTile.adaptive(
         value: allowUpload.value,
-        onChanged: newShareLink.value.isEmpty ? (value) => allowUpload.value = value : null,
-        activeThumbColor: colorScheme.primary,
+        onChanged: (value) => allowUpload.value = value,
         dense: true,
         title: Text(
-          "allow_public_user_to_upload",
+          context.t.allow_public_user_to_upload,
           style: themeData.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.bold),
-        ).tr(),
+        ),
       );
     }
 
-    Widget buildEditExpiryButton() {
-      return SwitchListTile.adaptive(
-        value: editExpiry.value,
-        onChanged: newShareLink.value.isEmpty ? (value) => editExpiry.value = value : null,
-        activeThumbColor: colorScheme.primary,
-        dense: true,
-        title: Text(
-          "change_expiration_time",
-          style: themeData.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.bold),
-        ).tr(),
+    String formatDateTime(DateTime dateTime) => DateFormat.yMMMd(context.locale.toString()).add_Hm().format(dateTime);
+
+    DateTime? getExpiresAtFromPreset(Duration preset) => preset == Duration.zero ? null : DateTime.now().add(preset);
+
+    Future<void> selectDate() async {
+      final today = DateTime.now();
+      final safeInitialDate = expiryAfter.value ?? today.add(const Duration(days: 7));
+      final initialDate = safeInitialDate.isBefore(today) ? today : safeInitialDate;
+
+      final selectedDate = await showDatePicker(
+        context: context,
+        initialDate: initialDate,
+        firstDate: today,
+        lastDate: today.add(const Duration(days: maxFutureDate)),
       );
+
+      if (selectedDate != null && context.mounted) {
+        final isToday =
+            selectedDate.year == today.year && selectedDate.month == today.month && selectedDate.day == today.day;
+        final initialTime = isToday ? TimeOfDay.fromDateTime(today) : const TimeOfDay(hour: 12, minute: 0);
+
+        final selectedTime = await showTimePicker(context: context, initialTime: initialTime);
+
+        if (selectedTime != null) {
+          final now = DateTime.now();
+          var finalDateTime = DateTime(
+            selectedDate.year,
+            selectedDate.month,
+            selectedDate.day,
+            selectedTime.hour,
+            selectedTime.minute,
+          );
+
+          if (finalDateTime.isBefore(now) && isToday) {
+            finalDateTime = now;
+          }
+
+          selectedPresetIndex.value = null;
+          expiryAfter.value = finalDateTime;
+        }
+      }
     }
 
     Widget buildExpiryAfterButton() {
-      return DropdownMenu(
-        label: Text(
-          "expire_after",
-          style: TextStyle(fontWeight: FontWeight.bold, color: colorScheme.primary),
-        ).tr(),
-        enableSearch: false,
-        enableFilter: false,
-        width: context.width - 40,
-        initialSelection: expiryAfter.value,
-        enabled: newShareLink.value.isEmpty && (existingLink == null || editExpiry.value),
-        onSelected: (value) {
-          expiryAfter.value = value!;
-        },
-        dropdownMenuEntries: [
-          DropdownMenuEntry(value: 0, label: "never".tr()),
-          DropdownMenuEntry(
-            value: 30,
-            label: "shared_link_edit_expire_after_option_minutes".tr(namedArgs: {'count': "30"}),
-          ),
-          DropdownMenuEntry(value: 60, label: "shared_link_edit_expire_after_option_hour".tr()),
-          DropdownMenuEntry(
-            value: 60 * 6,
-            label: "shared_link_edit_expire_after_option_hours".tr(namedArgs: {'count': "6"}),
-          ),
-          DropdownMenuEntry(value: 60 * 24, label: "shared_link_edit_expire_after_option_day".tr()),
-          DropdownMenuEntry(
-            value: 60 * 24 * 7,
-            label: "shared_link_edit_expire_after_option_days".tr(namedArgs: {'count': "7"}),
-          ),
-          DropdownMenuEntry(
-            value: 60 * 24 * 30,
-            label: "shared_link_edit_expire_after_option_days".tr(namedArgs: {'count': "30"}),
-          ),
-          DropdownMenuEntry(
-            value: 60 * 24 * 30 * 3,
-            label: "shared_link_edit_expire_after_option_months".tr(namedArgs: {'count': "3"}),
-          ),
-          DropdownMenuEntry(
-            value: 60 * 24 * 30 * 12,
-            label: "shared_link_edit_expire_after_option_year".tr(namedArgs: {'count': "1"}),
-          ),
-        ],
-      );
-    }
-
-    void copyLinkToClipboard() {
-      Clipboard.setData(ClipboardData(text: newShareLink.value)).then((_) {
-        context.scaffoldMessenger.showSnackBar(
-          SnackBar(
-            content: Text(
-              "shared_link_clipboard_copied_massage",
-              style: context.textTheme.bodyLarge?.copyWith(color: context.primaryColor),
-            ).tr(),
-            duration: const Duration(seconds: 2),
-          ),
-        );
-      });
-    }
-
-    Widget buildNewLinkField() {
-      return Column(
+      return ExpansionTile(
+        title: Text(
+          context.t.expire_after,
+          style: themeData.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.bold),
+        ),
+        subtitle: Text(
+          expiryAfter.value == null ? context.t.shared_link_expires_never : formatDateTime(expiryAfter.value!),
+          style: TextStyle(color: themeData.colorScheme.primary),
+        ),
         children: [
-          const Padding(padding: EdgeInsets.only(top: 20, bottom: 20), child: Divider()),
-          TextFormField(
-            readOnly: true,
-            initialValue: newShareLink.value,
-            decoration: InputDecoration(
-              border: const OutlineInputBorder(),
-              enabledBorder: themeData.inputDecorationTheme.focusedBorder,
-              suffixIcon: IconButton(onPressed: copyLinkToClipboard, icon: const Icon(Icons.copy)),
-            ),
-          ),
           Padding(
-            padding: const EdgeInsets.only(top: 16.0),
-            child: Align(
-              alignment: Alignment.bottomRight,
-              child: ElevatedButton(
-                onPressed: () {
-                  context.maybePop();
-                },
-                child: const Text("done", style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold)).tr(),
-              ),
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Wrap(
+                  spacing: 8,
+                  runSpacing: 8,
+                  children: List.generate(expiryPresets.length, (index) {
+                    final preset = expiryPresets[index];
+                    return ChoiceChip(
+                      label: Text(preset.$2),
+                      selected: selectedPresetIndex.value == index,
+                      onSelected: (_) {
+                        selectedPresetIndex.value = index;
+                        expiryAfter.value = getExpiresAtFromPreset(preset.$1);
+                      },
+                    );
+                  }),
+                ),
+                if (expiryAfter.value != null) ...[
+                  const SizedBox(height: 16),
+                  SizedBox(
+                    width: double.infinity,
+                    child: OutlinedButton.icon(
+                      onPressed: selectDate,
+                      icon: const Icon(Icons.edit_calendar),
+                      label: Text(context.t.edit_date_and_time),
+                    ),
+                  ),
+                ],
+              ],
             ),
           ),
         ],
       );
     }
 
-    DateTime calculateExpiry() {
-      return DateTime.now().add(Duration(minutes: expiryAfter.value));
+    Future<void> copyToClipboard(String link) async {
+      await Clipboard.setData(ClipboardData(text: link));
+      if (!context.mounted) {
+        return;
+      }
+      context.scaffoldMessenger.showSnackBar(
+        SnackBar(
+          content: Text(
+            context.t.shared_link_clipboard_copied_massage,
+            style: context.textTheme.bodyLarge?.copyWith(color: context.primaryColor),
+          ),
+          duration: const Duration(seconds: 2),
+        ),
+      );
     }
 
+    Widget buildLinkCopyField(String link) {
+      return TextFormField(
+        readOnly: true,
+        onTap: () => copyToClipboard(link),
+        initialValue: link,
+        decoration: InputDecoration(
+          border: const OutlineInputBorder(),
+          enabledBorder: themeData.inputDecorationTheme.focusedBorder,
+          suffixIcon: IconButton(onPressed: () => Share.share(link), icon: const Icon(Icons.share)),
+        ),
+      );
+    }
+
+    Widget buildNewLinkReadyScreen() {
+      return Padding(
+        padding: const EdgeInsets.all(20),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Icon(Icons.add_link, size: 100, color: themeData.colorScheme.primary),
+            const SizedBox(height: 20),
+            buildLinkCopyField(newShareLink.value),
+            const SizedBox(height: 20),
+            ElevatedButton.icon(
+              onPressed: () => context.maybePop(),
+              icon: const Icon(Icons.check),
+              label: Text(context.t.done, style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)),
+            ),
+          ],
+        ),
+      );
+    }
+
+    DateTime? calculateExpiry() => expiryAfter.value;
+
     Future<void> handleNewLink() async {
       final newLink = await ref
           .read(sharedLinkServiceProvider)
@@ -284,30 +333,30 @@ class SharedLinkEditPage extends HookConsumerWidget {
             description: descriptionController.text.isEmpty ? null : descriptionController.text,
             password: passwordController.text.isEmpty ? null : passwordController.text,
             slug: slugController.text.isEmpty ? null : slugController.text,
-            expiresAt: expiryAfter.value == 0 ? null : calculateExpiry(),
+            expiresAt: calculateExpiry()?.toUtc(),
           );
+      if (!context.mounted) {
+        return;
+      }
       ref.invalidate(sharedLinksStateProvider);
 
       await ref.read(serverInfoProvider.notifier).getServerConfig();
+      if (!context.mounted) {
+        return;
+      }
       final externalDomain = ref.read(serverInfoProvider.select((s) => s.serverConfig.externalDomain));
 
-      var serverUrl = externalDomain.isNotEmpty ? externalDomain : getServerUrl();
-      if (serverUrl != null && !serverUrl.endsWith('/')) {
-        serverUrl += '/';
-      }
+      final serverUrl = externalDomain.isNotEmpty ? externalDomain : getServerUrl();
 
-      if (newLink != null && serverUrl != null) {
-        final hasSlug = newLink.slug?.isNotEmpty == true;
-        final urlPath = hasSlug ? newLink.slug : newLink.key;
-        final basePath = hasSlug ? 's' : 'share';
-        newShareLink.value = "$serverUrl$basePath/$urlPath";
-        copyLinkToClipboard();
-      } else if (newLink == null) {
+      if (newLink != null) {
+        newShareLink.value = buildSharedLinkUrl(baseUrl: serverUrl, slug: newLink.slug, key: newLink.key) ?? '';
+        await copyToClipboard(newShareLink.value);
+      } else {
         ImmichToast.show(
           context: context,
           gravity: ToastGravity.BOTTOM,
           toastType: ToastType.error,
-          msg: 'shared_link_create_error'.tr(),
+          msg: context.t.shared_link_create_error,
         );
       }
     }
@@ -348,8 +397,9 @@ class SharedLinkEditPage extends HookConsumerWidget {
         slug = existingLink!.slug;
       }
 
-      if (editExpiry.value) {
-        expiry = expiryAfter.value == 0 ? null : calculateExpiry();
+      final newExpiry = expiryAfter.value;
+      if (newExpiry?.toUtc() != existingLink!.expiresAt?.toUtc()) {
+        expiry = newExpiry;
         changeExpiry = true;
       }
 
@@ -363,69 +413,115 @@ class SharedLinkEditPage extends HookConsumerWidget {
             description: desc,
             password: password,
             slug: slug,
-            expiresAt: expiry,
+            expiresAt: expiry?.toUtc(),
             changeExpiry: changeExpiry,
           );
+      if (!context.mounted) {
+        return;
+      }
       ref.invalidate(sharedLinksStateProvider);
       await context.maybePop();
     }
 
+    Future<void> handleDeleteLink() async {
+      return showDialog(
+        context: context,
+        builder: (BuildContext context) => ConfirmDialog(
+          title: "delete_shared_link_dialog_title",
+          content: "confirm_delete_shared_link",
+          onOk: () async {
+            await ref.read(sharedLinkServiceProvider).deleteSharedLink(existingLink!.id);
+            ref.invalidate(sharedLinksStateProvider);
+            if (context.mounted) {
+              await context.maybePop();
+            }
+          },
+        ),
+      );
+    }
+
     return Scaffold(
       appBar: AppBar(
-        title: Text(existingLink == null ? "create_link_to_share" : "edit_link").tr(),
+        title: Text(existingLink == null ? context.t.create_link_to_share : context.t.edit_link),
         elevation: 0,
         leading: const CloseButton(),
         centerTitle: false,
       ),
       body: SafeArea(
-        child: ListView(
-          children: [
-            Padding(padding: const EdgeInsets.all(padding), child: buildLinkTitle()),
-            Padding(padding: const EdgeInsets.all(padding), child: buildDescriptionField()),
-            Padding(padding: const EdgeInsets.all(padding), child: buildPasswordField()),
-            Padding(padding: const EdgeInsets.all(padding), child: buildSlugField()),
-            Padding(
-              padding: const EdgeInsets.only(left: padding, right: padding, bottom: padding),
-              child: buildShowMetaButton(),
-            ),
-            Padding(
-              padding: const EdgeInsets.only(left: padding, right: padding, bottom: padding),
-              child: buildAllowDownloadButton(),
-            ),
-            Padding(
-              padding: const EdgeInsets.only(left: padding, right: 20, bottom: 20),
-              child: buildAllowUploadButton(),
-            ),
-            if (existingLink != null)
-              Padding(
-                padding: const EdgeInsets.only(left: padding, right: padding, bottom: padding),
-                child: buildEditExpiryButton(),
-              ),
-            Padding(
-              padding: const EdgeInsets.only(left: padding, right: padding, bottom: padding),
-              child: buildExpiryAfterButton(),
-            ),
-            if (newShareLink.value.isEmpty)
-              Align(
-                alignment: Alignment.bottomRight,
-                child: Padding(
-                  padding: const EdgeInsets.only(right: padding + 10, bottom: padding),
-                  child: ElevatedButton(
-                    onPressed: existingLink != null ? handleEditLink : handleNewLink,
-                    child: Text(
-                      existingLink != null ? "shared_link_edit_submit_button" : "create_link",
-                      style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
-                    ).tr(),
-                  ),
+        child: newShareLink.value.isEmpty
+            ? Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 20),
+                child: ListView(
+                  children: [
+                    const SizedBox(height: 20),
+                    buildLinkTitle(),
+                    if (existingLink != null)
+                      Column(
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        children: [
+                          const SizedBox(height: 16),
+                          buildLinkCopyField(
+                            buildSharedLinkUrl(
+                                  baseUrl: displayServerUrl,
+                                  slug: existingLink!.slug,
+                                  key: existingLink!.key,
+                                ) ??
+                                '',
+                          ),
+                          const SizedBox(height: 24),
+                          const Divider(),
+                        ],
+                      ),
+                    const SizedBox(height: 24),
+                    buildDescriptionField(),
+                    const SizedBox(height: 16),
+                    buildPasswordField(),
+                    const SizedBox(height: 16),
+                    buildSlugField(),
+                    const SizedBox(height: 16),
+                    buildShowMetaButton(),
+                    const SizedBox(height: 16),
+                    buildAllowDownloadButton(),
+                    const SizedBox(height: 16),
+                    buildAllowUploadButton(),
+                    const SizedBox(height: 16),
+                    buildExpiryAfterButton(),
+                    const SizedBox(height: 24),
+                    Align(
+                      alignment: Alignment.centerRight,
+                      child: Row(
+                        mainAxisSize: MainAxisSize.min,
+                        spacing: 8,
+                        children: [
+                          if (existingLink != null)
+                            OutlinedButton.icon(
+                              style: OutlinedButton.styleFrom(
+                                foregroundColor: themeData.colorScheme.error,
+                                side: BorderSide(color: themeData.colorScheme.error),
+                              ),
+                              onPressed: handleDeleteLink,
+                              icon: const Icon(Icons.delete_outline),
+                              label: Text(
+                                context.t.delete,
+                                style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
+                              ),
+                            ),
+                          ElevatedButton.icon(
+                            icon: const Icon(Icons.check),
+                            onPressed: existingLink != null ? handleEditLink : handleNewLink,
+                            label: Text(
+                              existingLink != null ? context.t.shared_link_edit_submit_button : context.t.create_link,
+                              style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                    const SizedBox(height: 40),
+                  ],
                 ),
-              ),
-            if (newShareLink.value.isNotEmpty)
-              Padding(
-                padding: const EdgeInsets.only(left: padding, right: padding, bottom: padding),
-                child: buildNewLinkField(),
-              ),
-          ],
-        ),
+              )
+            : Center(child: buildNewLinkReadyScreen()),
       ),
     );
   }

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

@@ -37,6 +37,7 @@ class _DriftAlbumsPageState extends ConsumerState<DriftAlbumsPage> {
 
     final scrollView = CustomScrollView(
       controller: _scrollController,
+      physics: const AlwaysScrollableScrollPhysics(),
       slivers: [
         ImmichSliverAppBar(
           snap: false,

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

@@ -5,7 +5,6 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
 
 @RoutePage()
 class DriftAssetSelectionTimelinePage extends ConsumerWidget {
@@ -22,17 +21,13 @@ class DriftAssetSelectionTimelinePage extends ConsumerWidget {
           ),
         ),
         timelineServiceProvider.overrideWith((ref) {
-          final user = ref.watch(currentUserProvider);
-          if (user == null) {
-            throw Exception('User must be logged in to access asset selection timeline');
-          }
-
-          final timelineService = ref.watch(timelineFactoryProvider).remoteAssets(user.id);
+          final timelineUsers = ref.watch(timelineUsersProvider).valueOrNull ?? [];
+          final timelineService = ref.watch(timelineFactoryProvider).main(timelineUsers);
           ref.onDispose(timelineService.dispose);
           return timelineService;
         }),
       ],
-      child: const Timeline(),
+      child: const Timeline(showStorageIndicator: true),
     );
   }
 }

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

@@ -179,17 +179,14 @@ class _DriftCreateAlbumPageState extends ConsumerState<DriftCreateAlbumPage> {
     }
 
     final album = await ref
-        .watch(remoteAlbumProvider.notifier)
-        .createAlbum(
+        .read(remoteAlbumProvider.notifier)
+        .createAlbumWithAssets(
           title: title,
           description: albumDescriptionController.text.trim(),
-          assetIds: selectedAssets.map((asset) {
-            final remoteAsset = asset as RemoteAsset;
-            return remoteAsset.id;
-          }).toList(),
+          assets: selectedAssets,
         );
 
-    if (album != null) {
+    if (album != null && context.mounted) {
       unawaited(context.replaceRoute(RemoteAlbumRoute(album: album)));
     }
   }

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

@@ -8,6 +8,7 @@ import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/album/pending_uploads_banner.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/remote_album_bottom_sheet.widget.dart';
 import 'package:immich_mobile/presentation/widgets/remote_album/drift_album_option.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
@@ -39,7 +40,8 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
   }
 
   Future<void> addAssets(BuildContext context) async {
-    final albumAssets = await ref.read(remoteAlbumProvider.notifier).getAssets(_album.id);
+    final notifier = ref.read(remoteAlbumProvider.notifier);
+    final albumAssets = await notifier.getAssets(_album.id);
 
     final newAssets = await context.pushRoute<Set<BaseAsset>>(
       DriftAssetSelectionTimelineRoute(lockedSelectionAssets: albumAssets.toSet()),
@@ -49,17 +51,9 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
       return;
     }
 
-    final added = await ref
-        .read(remoteAlbumProvider.notifier)
-        .addAssets(
-          _album.id,
-          newAssets.map((asset) {
-            final remoteAsset = asset as RemoteAsset;
-            return remoteAsset.id;
-          }).toList(),
-        );
+    final added = await notifier.addAssetsToAlbum(_album.id, newAssets);
 
-    if (added > 0) {
+    if (added > 0 && context.mounted) {
       ImmichToast.show(
         context: context,
         msg: "assets_added_to_album_count".t(context: context, args: {'count': added.toString()}),
@@ -186,6 +180,7 @@ class _RemoteAlbumPageState extends ConsumerState<RemoteAlbumPage> {
         currentRemoteAlbumScopedProvider.overrideWithValue(_album),
       ],
       child: Timeline(
+        topSliverWidget: PendingUploadsBanner(albumId: _album.id),
         appBar: RemoteAlbumSliverAppBar(
           icon: Icons.photo_album_outlined,
           kebabMenu: _AlbumKebabMenu(

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

@@ -0,0 +1,376 @@
+import 'dart:async';
+import 'dart:math';
+import 'dart:ui';
+
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/config/slideshow_config.dart';
+import 'package:immich_mobile/domain/services/timeline.service.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/scroll_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/pages/common/settings.page.dart';
+import 'package:immich_mobile/presentation/widgets/asset_viewer/video_viewer.widget.dart';
+import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
+import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
+import 'package:immich_mobile/providers/asset_viewer/video_player_provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/widgets/common/immich_loading_indicator.dart';
+import 'package:immich_mobile/widgets/photo_view/photo_view.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
+
+@RoutePage()
+class DriftSlideshowPage extends ConsumerStatefulWidget {
+  final TimelineService timeline;
+
+  const DriftSlideshowPage({super.key, required this.timeline});
+
+  @override
+  ConsumerState<DriftSlideshowPage> createState() => _DriftSlideshowPageState();
+}
+
+class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> {
+  late SlideshowConfig _config;
+  late final PageController _pageController;
+  late final Stopwatch _stopwatch;
+  late Timer _timer;
+  late int _index;
+  late int _nextIndex;
+  bool _paused = false;
+  bool _showAppBar = false;
+
+  @override
+  initState() {
+    super.initState();
+    _config = ref.read(appConfigProvider.select((s) => s.slideshow));
+    final asset = ref.read(assetViewerProvider).currentAsset;
+    _index = asset == null ? 0 : widget.timeline.getIndex(asset.heroTag) ?? 0;
+    _pageController = PageController(initialPage: _index);
+    _stopwatch = Stopwatch();
+    _createTimer();
+    _updateNextIndex();
+    ref.listenManual(appConfigProvider.select((s) => s.slideshow), _onConfigChanged);
+
+    SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
+    unawaited(WakelockPlus.enable());
+  }
+
+  @override
+  dispose() {
+    _timer.cancel();
+    _stopwatch.stop();
+    _pageController.dispose();
+    unawaited(WakelockPlus.disable());
+    SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+    super.dispose();
+  }
+
+  void _play() {
+    final asset = widget.timeline.getAssetSafe(_index)!;
+
+    if (asset.isImage) {
+      _createTimer();
+    } else if (ref.read(videoPlayerProvider(asset.heroTag)).status == VideoPlaybackStatus.paused) {
+      ref.read(videoPlayerProvider(asset.heroTag).notifier).play();
+    } else {
+      _nextPage();
+    }
+
+    _updateNextIndex();
+
+    setState(() {
+      _paused = false;
+    });
+  }
+
+  void _pause() {
+    _timer.cancel();
+    _stopwatch.stop();
+
+    final asset = widget.timeline.getAssetSafe(_index)!;
+
+    if (!asset.isImage) {
+      ref.read(videoPlayerProvider(asset.heroTag).notifier).pause();
+    }
+
+    setState(() {
+      _paused = true;
+    });
+  }
+
+  void _onConfigChanged(SlideshowConfig? previous, SlideshowConfig next) {
+    if (_config == next) {
+      return;
+    }
+
+    final durationChanged = _config.duration != next.duration;
+    _config = next;
+    _updateNextIndex();
+
+    final asset = widget.timeline.getAssetSafe(_index);
+    if (durationChanged && !_paused && asset?.isImage == true) {
+      _timer.cancel();
+      _createTimer();
+    }
+
+    setState(() {});
+  }
+
+  void _updateNextIndex() {
+    _nextIndex = switch (_config.direction) {
+      SlideshowDirection.forward => _index + 1,
+      SlideshowDirection.backward => _index - 1,
+      SlideshowDirection.shuffle => widget.timeline.getIndex(widget.timeline.getRandomAsset().heroTag)!,
+    };
+
+    if (!widget.timeline.hasRange(_nextIndex, 1)) {
+      widget.timeline.preloadAssets(_nextIndex);
+    }
+  }
+
+  void _nextPage() async {
+    if (_nextIndex < 0 || _nextIndex >= widget.timeline.totalAssets) {
+      if (_config.repeat) {
+        final wrapped = _config.direction == SlideshowDirection.forward ? 0 : widget.timeline.totalAssets - 1;
+        await widget.timeline.preloadAssets(wrapped);
+        _pageController.jumpToPage(wrapped);
+      } else {
+        setState(() {
+          _paused = true;
+        });
+      }
+      return;
+    }
+
+    if (!widget.timeline.hasRange(_nextIndex, 1)) {
+      await widget.timeline.preloadAssets(_nextIndex);
+    }
+
+    if (_config.direction == SlideshowDirection.shuffle || !_config.transition) {
+      _pageController.jumpToPage(_nextIndex);
+    } else {
+      unawaited(_pageController.animateToPage(_nextIndex, duration: Durations.long2, curve: Curves.easeIn));
+    }
+  }
+
+  void _createTimer() {
+    _timer = Timer(Duration(milliseconds: _config.duration * 1000 - _stopwatch.elapsedMilliseconds), () {
+      _stopwatch.stop();
+      _stopwatch.reset();
+      _nextPage();
+    });
+
+    _stopwatch.start();
+  }
+
+  void _pageChanged(int page) {
+    final asset = widget.timeline.getAssetSafe(page)!;
+
+    setState(() {
+      _index = page;
+
+      if (!asset.isImage) {
+        _paused = false;
+      }
+    });
+
+    _timer.cancel();
+    _stopwatch.stop();
+    _stopwatch.reset();
+
+    if (!_paused && asset.isImage) {
+      _createTimer();
+    }
+
+    _updateNextIndex();
+  }
+
+  void _onTapUp() async {
+    await SystemChrome.setEnabledSystemUIMode(_showAppBar ? SystemUiMode.immersive : SystemUiMode.edgeToEdge);
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      setState(() {
+        _showAppBar = !_showAppBar;
+      });
+    });
+  }
+
+  Widget _getProgressBar(BuildContext context) {
+    final asset = widget.timeline.getAssetSafe(_index);
+
+    if (asset == null) {
+      return Container();
+    }
+
+    if (asset.isImage) {
+      final elapsed = _stopwatch.elapsedMilliseconds;
+      final duration = _config.duration * 1000;
+
+      return TweenAnimationBuilder(
+        key: Key(_index.toString()),
+        tween: Tween<double>(begin: elapsed / duration.toDouble(), end: _paused ? elapsed / duration.toDouble() : 1.0),
+        duration: Duration(milliseconds: _paused ? 1 : max(duration - elapsed, 1)),
+        builder: (context, value, _) => LinearProgressIndicator(
+          color: context.colorScheme.primary,
+          borderRadius: const BorderRadius.all(Radius.zero),
+          minHeight: 5,
+          value: value,
+        ),
+      );
+    } else {
+      return LinearProgressIndicator(
+        color: context.colorScheme.primary,
+        borderRadius: const BorderRadius.all(Radius.zero),
+        minHeight: 5,
+        value:
+            ref.watch(videoPlayerProvider(asset.heroTag).select((s) => s.position)).inMilliseconds /
+            asset.duration.inMilliseconds,
+      );
+    }
+  }
+
+  Widget _getBlur(BuildContext context, int index) {
+    final asset = widget.timeline.getAssetSafe(index);
+
+    if (asset == null) {
+      return Container();
+    }
+
+    return ImageFiltered(
+      imageFilter: ImageFilter.blur(sigmaX: 30, sigmaY: 30),
+      child: Container(
+        decoration: BoxDecoration(
+          image: DecorationImage(
+            image: getFullImageProvider(asset, size: Size(context.width, context.height)),
+            fit: BoxFit.cover,
+          ),
+        ),
+        child: Container(color: Colors.black.withValues(alpha: 0.2)),
+      ),
+    );
+  }
+
+  Widget _getPhotoView(BuildContext context, int index) {
+    final asset = widget.timeline.getAssetSafe(index);
+
+    if (asset == null) {
+      return const Center(child: ImmichLoadingIndicator());
+    }
+
+    final scale = _config.look == SlideshowLook.cover
+        ? PhotoViewComputedScale.covered
+        : PhotoViewComputedScale.contained;
+    final isCurrent = _index == index;
+    final imageProvider = getFullImageProvider(asset, size: context.sizeData);
+
+    if (asset.isImage) {
+      final zoomOut = index % 2 == 1;
+      final elapsed = _stopwatch.elapsedMilliseconds;
+      final duration = _config.duration * 1000;
+      final progress = zoomOut ? 1.0 - elapsed / duration.toDouble() : elapsed / duration.toDouble();
+
+      return TweenAnimationBuilder(
+        tween: Tween<double>(
+          begin: progress,
+          end: _paused
+              ? progress
+              : zoomOut
+              ? 0.0
+              : 1.0,
+        ),
+        duration: Duration(milliseconds: _paused ? 1 : max(duration - elapsed, 1)),
+        builder: (context, value, _) => PhotoView(
+          imageProvider: imageProvider,
+          index: index,
+          disableScaleGestures: true,
+          gaplessPlayback: true,
+          filterQuality: FilterQuality.high,
+          initialScale: scale * (1.0 + value / 10.0),
+          controller: PhotoViewController(),
+          onTapUp: (_, _, _) => _onTapUp(),
+        ),
+      );
+    } else {
+      final status = ref.watch(videoPlayerProvider(asset.heroTag).select((s) => s.status));
+      final position = ref.read(videoPlayerProvider(asset.heroTag)).position;
+
+      if (status == VideoPlaybackStatus.completed && isCurrent && position.inMicroseconds > 0) {
+        _nextPage();
+      } else if (status == VideoPlaybackStatus.playing) {
+        ref.read(videoPlayerProvider(asset.heroTag).notifier).setLoop(false);
+      }
+
+      return PhotoView.customChild(
+        onTapUp: (_, _, _) => _onTapUp(),
+        disableScaleGestures: true,
+        filterQuality: FilterQuality.high,
+        initialScale: scale,
+        child: NativeVideoViewer(
+          asset: asset,
+          isCurrent: isCurrent,
+          image: Image(image: imageProvider, fit: BoxFit.contain, alignment: Alignment.center),
+        ),
+      );
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: PreferredSize(
+        preferredSize: Size(AppBar().preferredSize.width, AppBar().preferredSize.height + 5),
+        child: IgnorePointer(
+          ignoring: !_showAppBar,
+          child: AnimatedOpacity(
+            opacity: _showAppBar ? 1.0 : 0.0,
+            duration: Durations.short2,
+            child: Column(
+              children: [
+                AppBar(
+                  backgroundColor: context.scaffoldBackgroundColor,
+                  title: Text("slideshow".t(context: context)),
+                  actions: [
+                    IconButton(
+                      onPressed: _paused ? _play : _pause,
+                      icon: Icon(_paused ? Icons.play_arrow : Icons.pause),
+                    ),
+                    IconButton(
+                      onPressed: () {
+                        _pause();
+                        context.pushRoute(SettingsSubRoute(section: SettingSection.assetViewer));
+                      },
+                      icon: const Icon(Icons.settings),
+                    ),
+                  ],
+                ),
+                _getProgressBar(context),
+              ],
+            ),
+          ),
+        ),
+      ),
+      extendBody: true,
+      extendBodyBehindAppBar: true,
+      backgroundColor: Colors.black,
+      body: PhotoViewGestureDetectorScope(
+        axis: Axis.horizontal,
+        child: PageView.builder(
+          controller: _pageController,
+          physics: const FastClampingScrollPhysics(),
+          itemCount: widget.timeline.totalAssets,
+          onPageChanged: _pageChanged,
+          itemBuilder: (context, index) => Stack(
+            children: [
+              if (_config.look == SlideshowLook.blurredBackground) _getBlur(context, index),
+              _getPhotoView(context, index),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

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

@@ -186,7 +186,7 @@ class DriftSearchPage extends HookConsumerWidget {
             expanded: true,
             onSearch: handleApply,
             onClear: handleClear,
-            child: TagPicker(onSelect: handleOnSelect, filter: (filter.value.tagIds ?? []).toSet()),
+            child: TagPicker(onSelectExistingTag: handleOnSelect, filter: (filter.value.tagIds ?? []).toSet()),
           ),
         ),
       );

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

@@ -50,10 +50,13 @@ class BaseActionButton extends ConsumerWidget {
       final iconColor = this.iconColor;
 
       return MenuItemButton(
-        style: MenuItemButton.styleFrom(alignment: Alignment.centerLeft, padding: const EdgeInsets.all(16)),
-        leadingIcon: Icon(iconData, color: iconColor),
+        style: MenuItemButton.styleFrom(
+          alignment: Alignment.centerLeft,
+          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
+        ),
+        leadingIcon: Icon(iconData, color: iconColor, size: 20),
         onPressed: onPressed,
-        child: Text(label, style: TextStyle(fontSize: 16, color: iconColor)),
+        child: Text(label, style: TextStyle(fontSize: 15, color: iconColor)),
       );
     }
 

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

@@ -0,0 +1,46 @@
+import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
+
+class BulkTagAssetsActionButton extends ConsumerWidget {
+  final ActionSource source;
+
+  const BulkTagAssetsActionButton({super.key, required this.source});
+
+  Future<void> _onTap(BuildContext context, WidgetRef ref) async {
+    final result = await ref.read(actionProvider.notifier).tagAssets(source, context);
+    if (result == null) {
+      return;
+    }
+
+    ref.read(multiSelectProvider.notifier).reset();
+
+    if (!context.mounted) {
+      return;
+    }
+
+    ImmichToast.show(
+      context: context,
+      msg: result.success
+          ? 'tagged_assets'.t(context: context, args: {'count': result.count.toString()})
+          : 'errors.failed_to_tag_assets'.t(context: context),
+      gravity: ToastGravity.BOTTOM,
+      toastType: result.success ? ToastType.success : ToastType.error,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData: Icons.sell_outlined,
+      label: "control_bottom_app_bar_add_tags".t(context: context),
+      onPressed: () => _onTap(context, ref),
+    );
+  }
+}

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

@@ -0,0 +1,34 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+
+class SlideshowActionButton extends ConsumerWidget {
+  final bool iconOnly;
+  final bool menuItem;
+
+  const SlideshowActionButton({super.key, this.iconOnly = false, this.menuItem = false});
+
+  void _onTap(BuildContext context, WidgetRef ref) {
+    if (!context.mounted) {
+      return;
+    }
+
+    context.pushRoute(DriftSlideshowRoute(timeline: ref.read(timelineServiceProvider)));
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return BaseActionButton(
+      iconData: Icons.slideshow,
+      label: "slideshow".t(context: context),
+      iconOnly: iconOnly,
+      menuItem: menuItem,
+      onPressed: () => _onTap(context, ref),
+      maxWidth: 100,
+    );
+  }
+}

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

@@ -0,0 +1,252 @@
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/providers/album/pending_album_uploads.provider.dart';
+
+/// Pinned banner sliver that surfaces in-flight album uploads directly under
+/// the album app bar. Renders nothing while the queue is empty. Tapping the
+/// banner opens a bottom sheet with per-asset progress.
+class PendingUploadsBanner extends ConsumerWidget {
+  static const double _height = 52;
+
+  final String albumId;
+
+  const PendingUploadsBanner({super.key, required this.albumId});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final pending = ref.watch(pendingAlbumUploadsProvider(albumId));
+    if (pending.isEmpty) {
+      return const SliverToBoxAdapter(child: SizedBox.shrink());
+    }
+
+    final hasFailures = pending.any((p) => p.failed);
+    final clamped = pending.map((p) => p.progress.clamp(0.0, 1.0)).toList(growable: false);
+    final overallProgress = clamped.isEmpty ? 0.0 : clamped.reduce((a, b) => a + b) / clamped.length;
+    final isIndeterminate = overallProgress <= 0.0;
+
+    return SliverPersistentHeader(
+      pinned: true,
+      delegate: _PendingUploadsBannerDelegate(
+        height: _height,
+        child: _PendingUploadsBannerContent(
+          albumId: albumId,
+          previewAsset: pending.first.asset,
+          count: pending.length,
+          overallProgress: overallProgress,
+          isIndeterminate: isIndeterminate,
+          hasFailures: hasFailures,
+        ),
+      ),
+    );
+  }
+
+  static void _openSheet(BuildContext context, String albumId) {
+    showModalBottomSheet(
+      context: context,
+      showDragHandle: true,
+      builder: (_) => _PendingUploadsSheet(albumId: albumId),
+    );
+  }
+}
+
+class _PendingUploadsBannerDelegate extends SliverPersistentHeaderDelegate {
+  final double height;
+  final Widget child;
+
+  const _PendingUploadsBannerDelegate({required this.height, required this.child});
+
+  @override
+  double get minExtent => height;
+
+  @override
+  double get maxExtent => height;
+
+  @override
+  Widget build(BuildContext context, double shrinkOffset, bool overlapsContent) => child;
+
+  @override
+  bool shouldRebuild(covariant _PendingUploadsBannerDelegate oldDelegate) =>
+      height != oldDelegate.height || child != oldDelegate.child;
+}
+
+class _PendingUploadsBannerContent extends StatelessWidget {
+  final String albumId;
+  final BaseAsset previewAsset;
+  final int count;
+  final double overallProgress;
+  final bool isIndeterminate;
+  final bool hasFailures;
+
+  const _PendingUploadsBannerContent({
+    required this.albumId,
+    required this.previewAsset,
+    required this.count,
+    required this.overallProgress,
+    required this.isIndeterminate,
+    required this.hasFailures,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final percentLabel = isIndeterminate ? '' : ' · ${(overallProgress * 100).toInt()}%';
+    return Material(
+      color: hasFailures ? context.colorScheme.errorContainer : context.colorScheme.surfaceContainerHigh,
+      child: InkWell(
+        onTap: () => PendingUploadsBanner._openSheet(context, albumId),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Expanded(
+              child: Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 16),
+                child: Row(
+                  children: [
+                    ClipRRect(
+                      borderRadius: const BorderRadius.all(Radius.circular(4)),
+                      child: SizedBox(width: 32, height: 32, child: Thumbnail.fromAsset(asset: previewAsset)),
+                    ),
+                    const SizedBox(width: 12),
+                    Expanded(
+                      child: Text(
+                        '${'uploading'.t(context: context)} $count$percentLabel',
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                        style: context.textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.w500),
+                      ),
+                    ),
+                    if (hasFailures)
+                      Padding(
+                        padding: const EdgeInsets.only(left: 8),
+                        child: Icon(Icons.error_outline, color: context.colorScheme.error, size: 20),
+                      ),
+                    Icon(Icons.chevron_right_rounded, color: context.colorScheme.onSurfaceVariant),
+                  ],
+                ),
+              ),
+            ),
+            SizedBox(
+              height: 3,
+              child: LinearProgressIndicator(
+                value: isIndeterminate ? null : overallProgress,
+                backgroundColor: context.colorScheme.surfaceContainerHighest,
+                valueColor: AlwaysStoppedAnimation<Color>(
+                  hasFailures ? context.colorScheme.error : context.colorScheme.primary,
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _PendingUploadsSheet extends ConsumerWidget {
+  final String albumId;
+
+  const _PendingUploadsSheet({required this.albumId});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final pending = ref.watch(pendingAlbumUploadsProvider(albumId));
+
+    // Auto-dismiss when the queue empties.
+    if (pending.isEmpty) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (Navigator.of(context).canPop()) {
+          Navigator.of(context).pop();
+        }
+      });
+      return const SizedBox.shrink();
+    }
+
+    final failedCount = pending.where((p) => p.failed).length;
+
+    return SafeArea(
+      child: Padding(
+        padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Padding(
+              padding: const EdgeInsets.only(bottom: 12),
+              child: Row(
+                children: [
+                  Expanded(
+                    child: Text(
+                      '${'uploading'.t(context: context)} (${pending.length})',
+                      style: context.textTheme.titleMedium,
+                    ),
+                  ),
+                  if (failedCount > 0)
+                    TextButton.icon(
+                      onPressed: () => ref.read(pendingAlbumUploadsProvider(albumId).notifier).clearFailed(),
+                      icon: const Icon(Icons.clear_rounded, size: 18),
+                      label: Text('clear_failed_count'.t(context: context, args: {'count': failedCount})),
+                      style: TextButton.styleFrom(foregroundColor: context.colorScheme.error),
+                    ),
+                ],
+              ),
+            ),
+            SizedBox(
+              height: 96,
+              child: ListView.separated(
+                scrollDirection: Axis.horizontal,
+                itemCount: pending.length,
+                separatorBuilder: (_, __) => const SizedBox(width: 8),
+                itemBuilder: (_, index) => _PendingUploadTile(entry: pending[index]),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _PendingUploadTile extends StatelessWidget {
+  final PendingAlbumUpload entry;
+
+  const _PendingUploadTile({required this.entry});
+
+  @override
+  Widget build(BuildContext context) {
+    return ClipRRect(
+      borderRadius: const BorderRadius.all(Radius.circular(8)),
+      child: SizedBox(
+        width: 96,
+        height: 96,
+        child: Stack(
+          fit: StackFit.expand,
+          children: [
+            Thumbnail.fromAsset(asset: entry.asset),
+            Positioned.fill(
+              child: ColoredBox(
+                color: entry.failed ? Colors.red.withValues(alpha: 0.6) : Colors.black54,
+                child: Center(
+                  child: entry.failed
+                      ? const Icon(Icons.error_outline, color: Colors.white, size: 28)
+                      : SizedBox(
+                          width: 32,
+                          height: 32,
+                          child: CircularProgressIndicator(
+                            value: entry.progress > 0 ? entry.progress : null,
+                            strokeWidth: 2.5,
+                            backgroundColor: Colors.white24,
+                            valueColor: const AlwaysStoppedAnimation<Color>(Colors.white),
+                          ),
+                        ),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

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

@@ -56,10 +56,13 @@ class _AssetPageState extends ConsumerState<AssetPage> {
   _DragIntent _dragIntent = _DragIntent.none;
   Drag? _drag;
 
+  BaseAsset? _asset;
+
   @override
   void initState() {
     super.initState();
     _eventSubscription = EventStream.shared.listen(_onEvent);
+    _asset = ref.read(timelineServiceProvider).getAssetSafe(widget.index);
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (!mounted || !_scrollController.hasClients) {
         return;
@@ -71,6 +74,14 @@ class _AssetPageState extends ConsumerState<AssetPage> {
     });
   }
 
+  @override
+  void didUpdateWidget(AssetPage oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.index != widget.index) {
+      _asset = ref.read(timelineServiceProvider).getAssetSafe(widget.index);
+    }
+  }
+
   @override
   void dispose() {
     _scrollController.dispose();
@@ -383,7 +394,7 @@ class _AssetPageState extends ConsumerState<AssetPage> {
     final stackIndex = ref.watch(assetViewerProvider.select((s) => s.stackIndex));
     final isPlayingMotionVideo = ref.watch(isPlayingMotionVideoProvider);
 
-    final asset = ref.read(timelineServiceProvider).getAssetSafe(widget.index);
+    final asset = _asset;
     if (asset == null) {
       return const Center(child: ImmichLoadingIndicator());
     }

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

@@ -8,6 +8,7 @@ import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/advanced_info_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/bulk_tag_assets_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
@@ -26,6 +27,7 @@ import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.d
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/user_metadata.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
@@ -57,6 +59,9 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
     final multiselect = ref.watch(multiSelectProvider);
     final isTrashEnable = ref.watch(serverInfoProvider.select((state) => state.serverFeatures.trash));
     final advancedTroubleshooting = ref.watch(settingsProvider.notifier).get(Setting.advancedTroubleshooting);
+    final tagsEnabled = ref.watch(
+      userMetadataPreferencesProvider.select((value) => value.valueOrNull?.tagsEnabled ?? false),
+    );
 
     Future<void> addAssetsToAlbum(RemoteAlbum album) async {
       final selectedAssets = multiselect.selectedAssets;
@@ -114,6 +119,7 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
               : const DeletePermanentActionButton(source: ActionSource.timeline),
           const FavoriteActionButton(source: ActionSource.timeline),
           const ArchiveActionButton(source: ActionSource.timeline),
+          if (tagsEnabled) const BulkTagAssetsActionButton(source: ActionSource.timeline),
           const EditDateTimeActionButton(source: ActionSource.timeline),
           const EditLocationActionButton(source: ActionSource.timeline),
           const MoveToLockFolderActionButton(source: ActionSource.timeline),

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

@@ -120,6 +120,9 @@ class _ThumbnailTileState extends ConsumerState<ThumbnailTile> {
                     },
                     flightShuttleBuilder: (context, animation, direction, from, to) {
                       void animationStatusListener(AnimationStatus status) {
+                        if (!mounted) {
+                          return;
+                        }
                         final heroInFlight = status == AnimationStatus.forward || status == AnimationStatus.reverse;
                         if (_hideIndicators != heroInFlight) {
                           setState(() => _hideIndicators = heroInFlight);

mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart

@@ -242,7 +242,11 @@ class _AssetTileWidget extends ConsumerWidget {
       return false;
     }
 
-    return lockSelectionAssets.contains(asset);
+    // Iterate with `==` instead of `Set.contains` because `RemoteAsset.hashCode`
+    // includes `localId` while `==` does not — so the same server asset can
+    // hash to a different bucket when its `localId` differs (e.g., album-fetched
+    // copy has localId=null, merged-timeline copy has it populated).
+    return lockSelectionAssets.any((a) => a == asset);
   }
 
   @override

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

@@ -64,36 +64,32 @@ class Timeline extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      resizeToAvoidBottomInset: false,
-      floatingActionButton: const DownloadStatusFloatingButton(),
-      body: LayoutBuilder(
-        builder: (_, constraints) => ProviderScope(
-          overrides: [
-            timelineArgsProvider.overrideWith(
-              (ref) => TimelineArgs(
-                maxWidth: constraints.maxWidth,
-                maxHeight: constraints.maxHeight,
-                columnCount: ref.watch(appConfigProvider.select((config) => config.timeline.tilesPerRow)),
-                showStorageIndicator: showStorageIndicator,
-                withStack: withStack,
-                groupBy: groupBy,
-              ),
+    return LayoutBuilder(
+      builder: (_, constraints) => ProviderScope(
+        overrides: [
+          timelineArgsProvider.overrideWith(
+            (ref) => TimelineArgs(
+              maxWidth: constraints.maxWidth,
+              maxHeight: constraints.maxHeight,
+              columnCount: ref.watch(appConfigProvider.select((config) => config.timeline.tilesPerRow)),
+              showStorageIndicator: showStorageIndicator,
+              withStack: withStack,
+              groupBy: groupBy,
             ),
-            if (readOnly) readonlyModeProvider.overrideWith(() => _AlwaysReadOnlyNotifier()),
-          ],
-          child: _SliverTimeline(
-            topSliverWidget: topSliverWidget,
-            topSliverWidgetHeight: topSliverWidgetHeight,
-            bottomSliverWidget: bottomSliverWidget,
-            appBar: appBar,
-            bottomSheet: bottomSheet,
-            withScrubber: withScrubber,
-            persistentBottomBar: persistentBottomBar,
-            snapToMonth: snapToMonth,
-            maxWidth: constraints.maxWidth,
-            loadingWidget: loadingWidget,
           ),
+          if (readOnly) readonlyModeProvider.overrideWith(() => _AlwaysReadOnlyNotifier()),
+        ],
+        child: _SliverTimeline(
+          topSliverWidget: topSliverWidget,
+          topSliverWidgetHeight: topSliverWidgetHeight,
+          bottomSliverWidget: bottomSliverWidget,
+          appBar: appBar,
+          bottomSheet: bottomSheet,
+          withScrubber: withScrubber,
+          persistentBottomBar: persistentBottomBar,
+          snapToMonth: snapToMonth,
+          maxWidth: constraints.maxWidth,
+          loadingWidget: loadingWidget,
         ),
       ),
     );
@@ -379,121 +375,126 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
           ref.read(multiSelectProvider.notifier).reset();
         }
       },
-      child: asyncSegments.widgetWhen(
-        onLoading: widget.loadingWidget != null ? () => widget.loadingWidget! : null,
-        onData: (segments) {
-          final childCount = (segments.lastOrNull?.lastIndex ?? -1) + 1;
-          final double appBarExpandedHeight = widget.appBar != null && widget.appBar is MesmerizingSliverAppBar
-              ? 200
-              : 0;
-          final topPadding = context.padding.top + (widget.appBar == null ? 0 : kToolbarHeight) + 10;
+      child: PrimaryScrollController(
+        controller: _scrollController,
+        child: Scaffold(
+          resizeToAvoidBottomInset: false,
+          floatingActionButton: const DownloadStatusFloatingButton(),
+          body: asyncSegments.widgetWhen(
+            onLoading: widget.loadingWidget != null ? () => widget.loadingWidget! : null,
+            onData: (segments) {
+              final childCount = (segments.lastOrNull?.lastIndex ?? -1) + 1;
+              final double appBarExpandedHeight = widget.appBar != null && widget.appBar is MesmerizingSliverAppBar
+                  ? 200
+                  : 0;
+              final topPadding = context.padding.top + (widget.appBar == null ? 0 : kToolbarHeight) + 10;
 
-          const bottomSheetOpenModifier = 120.0;
-          final contentBottomPadding = context.padding.bottom + (isMultiSelectEnabled ? bottomSheetOpenModifier : 0);
-          final scrubberBottomPadding = contentBottomPadding + kScrubberThumbHeight;
+              const bottomSheetOpenModifier = 120.0;
+              final contentBottomPadding =
+                  context.padding.bottom + (isMultiSelectEnabled ? bottomSheetOpenModifier : 0);
+              final scrubberBottomPadding = contentBottomPadding + kScrubberThumbHeight;
 
-          final grid = CustomScrollView(
-            primary: true,
-            physics: _scrollPhysics,
-            cacheExtent: maxHeight * 2,
-            slivers: [
-              if (isSelectionMode) const SelectionSliverAppBar() else if (widget.appBar != null) widget.appBar!,
-              if (widget.topSliverWidget != null) widget.topSliverWidget!,
-              _SliverSegmentedList(
-                segments: segments,
-                delegate: SliverChildBuilderDelegate(
-                  (ctx, index) {
-                    if (index >= childCount) {
-                      return null;
-                    }
-                    final segment = segments.findByIndex(index);
-                    return segment?.builder(ctx, index) ?? const SizedBox.shrink();
-                  },
-                  childCount: childCount,
-                  addAutomaticKeepAlives: false,
-                  // We add repaint boundary around tiles, so skip the auto boundaries
-                  addRepaintBoundaries: false,
-                ),
-              ),
-              if (widget.bottomSliverWidget != null) widget.bottomSliverWidget!,
-              SliverPadding(padding: EdgeInsets.only(bottom: contentBottomPadding)),
-            ],
-          );
+              final grid = CustomScrollView(
+                primary: true,
+                physics: _scrollPhysics,
+                cacheExtent: maxHeight * 2,
+                slivers: [
+                  if (isSelectionMode) const SelectionSliverAppBar() else if (widget.appBar != null) widget.appBar!,
+                  if (widget.topSliverWidget != null) widget.topSliverWidget!,
+                  _SliverSegmentedList(
+                    segments: segments,
+                    delegate: SliverChildBuilderDelegate(
+                      (ctx, index) {
+                        if (index >= childCount) {
+                          return null;
+                        }
+                        final segment = segments.findByIndex(index);
+                        return segment?.builder(ctx, index) ?? const SizedBox.shrink();
+                      },
+                      childCount: childCount,
+                      addAutomaticKeepAlives: false,
+                      // We add repaint boundary around tiles, so skip the auto boundaries
+                      addRepaintBoundaries: false,
+                    ),
+                  ),
+                  if (widget.bottomSliverWidget != null) widget.bottomSliverWidget!,
+                  SliverPadding(padding: EdgeInsets.only(bottom: contentBottomPadding)),
+                ],
+              );
 
-          final Widget timeline;
-          if (widget.withScrubber) {
-            timeline = Scrubber(
-              snapToMonth: widget.snapToMonth,
-              layoutSegments: segments,
-              timelineHeight: maxHeight,
-              topPadding: topPadding,
-              bottomPadding: scrubberBottomPadding,
-              monthSegmentSnappingOffset: widget.topSliverWidgetHeight ?? 0 + appBarExpandedHeight,
-              hasAppBar: widget.appBar != null,
-              child: grid,
-            );
-          } else {
-            timeline = grid;
-          }
+              final Widget timeline;
+              if (widget.withScrubber) {
+                timeline = Scrubber(
+                  snapToMonth: widget.snapToMonth,
+                  layoutSegments: segments,
+                  timelineHeight: maxHeight,
+                  topPadding: topPadding,
+                  bottomPadding: scrubberBottomPadding,
+                  monthSegmentSnappingOffset: widget.topSliverWidgetHeight ?? 0 + appBarExpandedHeight,
+                  hasAppBar: widget.appBar != null,
+                  child: grid,
+                );
+              } else {
+                timeline = grid;
+              }
 
-          return PrimaryScrollController(
-            controller: _scrollController,
-            child: RawGestureDetector(
-              gestures: {
-                CustomScaleGestureRecognizer: GestureRecognizerFactoryWithHandlers<CustomScaleGestureRecognizer>(
-                  () => CustomScaleGestureRecognizer(),
-                  (CustomScaleGestureRecognizer scale) {
-                    scale.onStart = (details) {
-                      _baseScaleFactor = _scaleFactor;
-                    };
+              return RawGestureDetector(
+                gestures: {
+                  CustomScaleGestureRecognizer: GestureRecognizerFactoryWithHandlers<CustomScaleGestureRecognizer>(
+                    () => CustomScaleGestureRecognizer(),
+                    (CustomScaleGestureRecognizer scale) {
+                      scale.onStart = (details) {
+                        _baseScaleFactor = _scaleFactor;
+                      };
 
-                    scale.onUpdate = (details) {
-                      final newScaleFactor = math.max(math.min(5.0, _baseScaleFactor * details.scale), 1.0);
-                      final newPerRow = 7 - newScaleFactor.toInt();
+                      scale.onUpdate = (details) {
+                        final newScaleFactor = math.max(math.min(5.0, _baseScaleFactor * details.scale), 1.0);
+                        final newPerRow = 7 - newScaleFactor.toInt();
 
-                      if (newPerRow != _perRow) {
-                        final targetAssetIndex = _getCurrentAssetIndex(segments);
-                        setState(() {
-                          _scaleFactor = newScaleFactor;
-                          _perRow = newPerRow;
-                          _restoreAssetIndex = targetAssetIndex;
-                        });
+                        if (newPerRow != _perRow) {
+                          final targetAssetIndex = _getCurrentAssetIndex(segments);
+                          setState(() {
+                            _scaleFactor = newScaleFactor;
+                            _perRow = newPerRow;
+                            _restoreAssetIndex = targetAssetIndex;
+                          });
 
-                        ref.read(metadataProvider).write(MetadataKey.timelineTilesPerRow, _perRow);
-                      }
-                    };
-                  },
-                ),
-              },
-              child: TimelineDragRegion(
-                onStart: !isReadonlyModeEnabled ? _setDragStartIndex : null,
-                onAssetEnter: _handleDragAssetEnter,
-                onEnd: !isReadonlyModeEnabled ? _stopDrag : null,
-                onScroll: _dragScroll,
-                onScrollStart: () {
-                  // Minimize the bottom sheet when drag selection starts
-                  ref.read(timelineStateProvider.notifier).setScrolling(true);
+                          ref.read(metadataProvider).write(MetadataKey.timelineTilesPerRow, _perRow);
+                        }
+                      };
+                    },
+                  ),
                 },
-                child: Stack(
-                  clipBehavior: Clip.none,
-                  children: [
-                    timeline,
-                    if (isBottomWidgetVisible)
-                      Positioned(
-                        top: MediaQuery.paddingOf(context).top,
-                        left: 25,
-                        child: const SizedBox(
-                          height: kToolbarHeight,
-                          child: Center(child: _MultiSelectStatusButton()),
+                child: TimelineDragRegion(
+                  onStart: !isReadonlyModeEnabled ? _setDragStartIndex : null,
+                  onAssetEnter: _handleDragAssetEnter,
+                  onEnd: !isReadonlyModeEnabled ? _stopDrag : null,
+                  onScroll: _dragScroll,
+                  onScrollStart: () {
+                    // Minimize the bottom sheet when drag selection starts
+                    ref.read(timelineStateProvider.notifier).setScrolling(true);
+                  },
+                  child: Stack(
+                    clipBehavior: Clip.none,
+                    children: [
+                      timeline,
+                      if (isBottomWidgetVisible)
+                        Positioned(
+                          top: MediaQuery.paddingOf(context).top,
+                          left: 25,
+                          child: const SizedBox(
+                            height: kToolbarHeight,
+                            child: Center(child: _MultiSelectStatusButton()),
+                          ),
                         ),
-                      ),
-                    if (isBottomWidgetVisible) widget.bottomSheet!,
-                  ],
+                      if (isBottomWidgetVisible) widget.bottomSheet!,
+                    ],
+                  ),
                 ),
-              ),
-            ),
-          );
-        },
+              );
+            },
+          ),
+        ),
       ),
     );
   }

mobile/lib/providers/album/pending_album_uploads.provider.dart

@@ -0,0 +1,81 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+
+class PendingAlbumUpload {
+  final LocalAsset asset;
+  final double progress;
+  final bool failed;
+
+  const PendingAlbumUpload({required this.asset, this.progress = 0.0, this.failed = false});
+
+  PendingAlbumUpload copyWith({double? progress, bool? failed}) =>
+      PendingAlbumUpload(asset: asset, progress: progress ?? this.progress, failed: failed ?? this.failed);
+}
+
+class AlbumPendingUploadsNotifier extends AutoDisposeFamilyNotifier<List<PendingAlbumUpload>, String> {
+  KeepAliveLink? _keepAliveLink;
+
+  @override
+  List<PendingAlbumUpload> build(String albumId) {
+    ref.onDispose(() {
+      _keepAliveLink?.close();
+      _keepAliveLink = null;
+    });
+
+    return const [];
+  }
+
+  void enqueue(Iterable<LocalAsset> assets) {
+    if (assets.isEmpty) {
+      return;
+    }
+
+    final existingIds = state.map((e) => e.asset.id).toSet();
+    final additions = assets.where((a) => !existingIds.contains(a.id)).map((a) => PendingAlbumUpload(asset: a));
+    state = [...state, ...additions];
+    _syncKeepAlive();
+  }
+
+  void updateProgress(String localAssetId, double progress) {
+    state = [
+      for (final entry in state)
+        if (entry.asset.id == localAssetId) entry.copyWith(progress: progress, failed: false) else entry,
+    ];
+    _syncKeepAlive();
+  }
+
+  void markFailed(String localAssetId) {
+    state = [
+      for (final entry in state)
+        if (entry.asset.id == localAssetId) entry.copyWith(failed: true) else entry,
+    ];
+    _syncKeepAlive();
+  }
+
+  void markAllFailed() {
+    state = [for (final entry in state) entry.copyWith(failed: true)];
+    _syncKeepAlive();
+  }
+
+  void remove(String localAssetId) {
+    state = state.where((e) => e.asset.id != localAssetId).toList();
+    _syncKeepAlive();
+  }
+
+  void clearFailed() {
+    state = state.where((e) => !e.failed).toList();
+    _syncKeepAlive();
+  }
+
+  void _syncKeepAlive() {
+    if (state.isEmpty) {
+      _keepAliveLink?.close();
+      _keepAliveLink = null;
+    } else {
+      _keepAliveLink ??= ref.keepAlive();
+    }
+  }
+}
+
+final pendingAlbumUploadsProvider = NotifierProvider.autoDispose
+    .family<AlbumPendingUploadsNotifier, List<PendingAlbumUpload>, String>(AlbumPendingUploadsNotifier.new);

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

@@ -13,6 +13,7 @@ import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart'
 import 'package:immich_mobile/providers/backup/asset_upload_progress.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/asset.provider.dart' show assetExifProvider;
+import 'package:immich_mobile/providers/infrastructure/tag.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
@@ -353,6 +354,23 @@ class ActionNotifier extends Notifier<void> {
     }
   }
 
+  Future<ActionResult?> tagAssets(ActionSource source, BuildContext context) async {
+    final ids = _getOwnedRemoteIdsForSource(source);
+    try {
+      final count = await _service.tagAssets(ids, context);
+      if (count == null) {
+        return null;
+      }
+
+      ref.invalidate(tagProvider);
+      return ActionResult(count: count, success: true);
+    } catch (error, stack) {
+      _logger.severe('Failed to tag assets', error, stack);
+      ref.invalidate(tagProvider);
+      return ActionResult(count: ids.length, success: false, error: error.toString());
+    }
+  }
+
   Future<ActionResult> removeFromAlbum(ActionSource source, String albumId) async {
     final ids = _getRemoteIdsForSource(source);
     try {

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

@@ -9,6 +9,7 @@ import 'package:immich_mobile/infrastructure/repositories/remote_album.repositor
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/remote_album.provider.dart';
 import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
+import 'package:immich_mobile/services/foreground_upload.service.dart';
 
 final localAlbumRepository = Provider<DriftLocalAlbumRepository>(
   (ref) => DriftLocalAlbumRepository(ref.watch(driftProvider)),
@@ -33,7 +34,11 @@ final remoteAlbumRepository = Provider<DriftRemoteAlbumRepository>(
 );
 
 final remoteAlbumServiceProvider = Provider<RemoteAlbumService>(
-  (ref) => RemoteAlbumService(ref.watch(remoteAlbumRepository), ref.watch(driftAlbumApiRepositoryProvider)),
+  (ref) => RemoteAlbumService(
+    ref.watch(remoteAlbumRepository),
+    ref.watch(driftAlbumApiRepositoryProvider),
+    ref.watch(foregroundUploadServiceProvider),
+  ),
   dependencies: [remoteAlbumRepository],
 );
 

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

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
@@ -6,8 +8,10 @@ import 'package:immich_mobile/domain/models/user.model.dart';
 import 'package:immich_mobile/domain/services/remote_album.service.dart';
 import 'package:immich_mobile/models/albums/album_search.model.dart';
 import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
+import 'package:immich_mobile/providers/album/pending_album_uploads.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/services/foreground_upload.service.dart';
 import 'package:logging/logging.dart';
 
 class RemoteAlbumState {
@@ -105,6 +109,46 @@ class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
     }
   }
 
+  /// Creates an album from a heterogeneous asset selection. Already-remote
+  /// assets seed the album immediately; local-only assets are uploaded in the
+  /// background and linked one-by-one as each upload completes.
+  Future<RemoteAlbum?> createAlbumWithAssets({
+    required String title,
+    String? description,
+    Iterable<BaseAsset> assets = const [],
+  }) async {
+    try {
+      final currentUser = ref.read(currentUserProvider);
+      if (currentUser == null) {
+        throw Exception('User not logged in');
+      }
+
+      final candidates = RemoteAlbumService.categorizeCandidates(assets);
+      final album = await _remoteAlbumService.createAlbum(
+        title: title,
+        owner: currentUser,
+        description: description,
+        assetIds: candidates.remoteAssetIds,
+      );
+
+      state = state.copyWith(albums: [...state.albums, album]);
+
+      if (candidates.localAssetsToUpload.isNotEmpty) {
+        unawaited(
+          addAssetsToAlbum(
+            album.id,
+            candidates.localAssetsToUpload,
+          ).then<void>((_) {}).catchError((Object _, StackTrace _) {}),
+        );
+      }
+
+      return album;
+    } catch (error, stack) {
+      _logger.severe('Failed to create album with assets', error, stack);
+      rethrow;
+    }
+  }
+
   Future<RemoteAlbum?> updateAlbum(
     String albumId, {
     String? name,
@@ -155,8 +199,65 @@ class RemoteAlbumNotifier extends Notifier<RemoteAlbumState> {
     return _remoteAlbumService.getAssets(albumId);
   }
 
-  Future<int> addAssets(String albumId, List<String> assetIds) {
-    return _remoteAlbumService.addAssets(albumId: albumId, assetIds: assetIds);
+  Future<int> addAssets(String albumId, List<String> assetIds) async {
+    final added = await _remoteAlbumService.addAssets(albumId: albumId, assetIds: assetIds);
+    if (added > 0) {
+      await _refreshAlbumInState(albumId);
+    }
+    return added;
+  }
+
+  /// Adds a heterogeneous asset selection to an album. Already-remote assets
+  /// are linked immediately; local-only assets are queued in
+  /// [pendingAlbumUploadsProvider] (so the album page can show them with
+  /// progress indicators), uploaded, and linked one-by-one as each finishes.
+  Future<int> addAssetsToAlbum(String albumId, Iterable<BaseAsset> assets) async {
+    final currentUser = ref.read(currentUserProvider);
+    if (currentUser == null) {
+      throw Exception('User not logged in');
+    }
+
+    final candidates = RemoteAlbumService.categorizeCandidates(assets);
+    final pendingNotifier = ref.read(pendingAlbumUploadsProvider(albumId).notifier);
+    pendingNotifier.enqueue(candidates.localAssetsToUpload);
+
+    try {
+      final added = await _remoteAlbumService.addAssetsToAlbum(
+        albumId: albumId,
+        uploader: currentUser,
+        candidates: candidates,
+        uploadCallbacks: UploadCallbacks(
+          onProgress: (localAssetId, _, bytes, totalBytes) {
+            final progress = totalBytes > 0 ? bytes / totalBytes : 0.0;
+            pendingNotifier.updateProgress(localAssetId, progress);
+          },
+          onSuccess: (localAssetId, _) => pendingNotifier.remove(localAssetId),
+          onError: (localAssetId, _) => pendingNotifier.markFailed(localAssetId),
+        ),
+      );
+      if (added > 0) {
+        await _refreshAlbumInState(albumId);
+      }
+      return added;
+    } catch (error, stack) {
+      if (candidates.localAssetsToUpload.isNotEmpty) {
+        pendingNotifier.markAllFailed();
+      }
+      _logger.severe('Failed to add assets to album $albumId', error, stack);
+      rethrow;
+    }
+  }
+
+  /// Re-reads a single album from the local DB and replaces it in [state] so
+  /// that views bound to the album list (counts, thumbnails) reflect the
+  /// latest junction-table changes without a full `refresh()`.
+  Future<void> _refreshAlbumInState(String albumId) async {
+    final updated = await _remoteAlbumService.get(albumId);
+    if (updated == null) {
+      return;
+    }
+
+    state = state.copyWith(albums: state.albums.map((album) => album.id == albumId ? updated : album).toList());
   }
 
   Future<void> addUsers(String albumId, List<String> userIds) {

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

@@ -1,16 +1,22 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/tag.model.dart';
-import 'package:immich_mobile/infrastructure/repositories/tags_api.repository.dart';
+import 'package:immich_mobile/domain/services/tag.service.dart';
 
 class TagNotifier extends AsyncNotifier<Set<Tag>> {
   @override
   Future<Set<Tag>> build() async {
-    final repo = ref.read(tagsApiRepositoryProvider);
-    final allTags = await repo.getAllTags();
-    if (allTags == null) {
-      return {};
-    }
-    return allTags.map((t) => Tag.fromDto(t)).toSet();
+    return ref.watch(tagServiceProvider).getAllTags();
+  }
+
+  Future<int> bulkTagAssets(List<String> assetIds, List<String> tagIds) async {
+    return ref.read(tagServiceProvider).bulkTagAssets(assetIds, tagIds);
+  }
+
+  Future<List<Tag>> upsertTags(List<String> tags) async {
+    final upsertedTags = await ref.read(tagServiceProvider).upsertTags(tags);
+
+    state = AsyncValue.data({...?state.valueOrNull, ...upsertedTags});
+    return upsertedTags;
   }
 }
 

mobile/lib/providers/search/search_page_state.provider.dart

@@ -29,7 +29,7 @@ final getAllPlacesProvider = FutureProvider.autoDispose<List<SearchCuratedConten
   }
 
   final curatedContent = assetPlaces
-      .map((data) => SearchCuratedContent(label: data.exifInfo!.city!, id: data.id))
+      .map((data) => SearchCuratedContent(label: data.exifInfo.orElse(null)!.city.orElse(null)!, id: data.id))
       .toList();
 
   return curatedContent;

mobile/lib/repositories/activity_api.repository.dart

@@ -23,8 +23,8 @@ class ActivityApiRepository extends ApiRepository {
     final dto = ActivityCreateDto(
       albumId: albumId,
       type: type == ActivityType.comment ? ReactionType.comment : ReactionType.like,
-      assetId: assetId,
-      comment: comment,
+      assetId: assetId == null ? const Optional.absent() : Optional.present(assetId),
+      comment: comment == null ? const Optional.absent() : Optional.present(comment),
     );
     final response = await checkNull(_api.createActivity(dto));
     return _toActivity(response);
@@ -45,6 +45,6 @@ class ActivityApiRepository extends ApiRepository {
     type: dto.type == ReactionType.comment ? ActivityType.comment : ActivityType.like,
     user: UserConverter.fromSimpleUserDto(dto.user),
     assetId: dto.assetId,
-    comment: dto.comment,
+    comment: dto.comment.orElse(null),
   );
 }

mobile/lib/repositories/asset_api.repository.dart

@@ -24,7 +24,7 @@ class AssetApiRepository extends ApiRepository {
   AssetApiRepository(this._api, this._stacksApi, this._trashApi);
 
   Future<void> delete(List<String> ids, bool force) async {
-    return _api.deleteAssets(AssetBulkDeleteDto(ids: ids, force: force));
+    return _api.deleteAssets(AssetBulkDeleteDto(ids: ids, force: Optional.present(force)));
   }
 
   Future<void> restoreTrash(List<String> ids) async {
@@ -42,19 +42,27 @@ class AssetApiRepository extends ApiRepository {
   }
 
   Future<void> updateVisibility(List<String> ids, AssetVisibilityEnum visibility) async {
-    return _api.updateAssets(AssetBulkUpdateDto(ids: ids, visibility: _mapVisibility(visibility)));
+    return _api.updateAssets(AssetBulkUpdateDto(ids: ids, visibility: Optional.present(_mapVisibility(visibility))));
   }
 
   Future<void> updateFavorite(List<String> ids, bool isFavorite) async {
-    return _api.updateAssets(AssetBulkUpdateDto(ids: ids, isFavorite: isFavorite));
+    return _api.updateAssets(AssetBulkUpdateDto(ids: ids, isFavorite: Optional.present(isFavorite)));
   }
 
   Future<void> updateLocation(List<String> ids, LatLng location) async {
-    return _api.updateAssets(AssetBulkUpdateDto(ids: ids, latitude: location.latitude, longitude: location.longitude));
+    return _api.updateAssets(
+      AssetBulkUpdateDto(
+        ids: ids,
+        latitude: Optional.present(location.latitude),
+        longitude: Optional.present(location.longitude),
+      ),
+    );
   }
 
   Future<void> updateDateTime(List<String> ids, DateTime dateTime) async {
-    return _api.updateAssets(AssetBulkUpdateDto(ids: ids, dateTimeOriginal: dateTime.toIso8601String()));
+    return _api.updateAssets(
+      AssetBulkUpdateDto(ids: ids, dateTimeOriginal: Optional.present(dateTime.toIso8601String())),
+    );
   }
 
   Future<StackResponse> stack(List<String> ids) async {
@@ -82,15 +90,15 @@ class AssetApiRepository extends ApiRepository {
     final response = await checkNull(_api.getAssetInfo(assetId));
 
     // we need to get the MIME of the thumbnail once that gets added to the API
-    return response.originalMimeType;
+    return response.originalMimeType.orElse(null);
   }
 
   Future<void> updateDescription(String assetId, String description) {
-    return _api.updateAsset(assetId, UpdateAssetDto(description: description));
+    return _api.updateAsset(assetId, UpdateAssetDto(description: Optional.present(description)));
   }
 
   Future<void> updateRating(String assetId, int rating) {
-    return _api.updateAsset(assetId, UpdateAssetDto(rating: rating));
+    return _api.updateAsset(assetId, UpdateAssetDto(rating: Optional.present(rating)));
   }
 
   Future<AssetEditsResponseDto?> editAsset(String assetId, List<AssetEdit> edits) {

mobile/lib/repositories/auth_api.repository.dart

@@ -13,7 +13,7 @@ class AuthApiRepository extends ApiRepository {
   AuthApiRepository(this._apiService);
 
   Future<void> changePassword(String newPassword) async {
-    await _apiService.usersApi.updateMyUser(UserUpdateMeDto(password: newPassword));
+    await _apiService.usersApi.updateMyUser(UserUpdateMeDto(password: Optional.present(newPassword)));
   }
 
   Future<LoginResponse> login(String email, String password) async {
@@ -46,7 +46,7 @@ class AuthApiRepository extends ApiRepository {
 
   Future<bool> unlockPinCode(String pinCode) async {
     try {
-      await _apiService.authenticationApi.unlockAuthSession(SessionUnlockDto(pinCode: pinCode));
+      await _apiService.authenticationApi.unlockAuthSession(SessionUnlockDto(pinCode: Optional.present(pinCode)));
       return true;
     } catch (_) {
       return false;

mobile/lib/repositories/drift_album_api_repository.dart

@@ -22,7 +22,13 @@ class DriftAlbumApiRepository extends ApiRepository {
     String? description,
   }) async {
     final responseDto = await checkNull(
-      _api.createAlbum(CreateAlbumDto(albumName: name, description: description, assetIds: assetIds.toList())),
+      _api.createAlbum(
+        CreateAlbumDto(
+          albumName: name,
+          description: description == null ? const Optional.absent() : Optional.present(description),
+          assetIds: Optional.present(assetIds.toList()),
+        ),
+      ),
     );
 
     return responseDto.toRemoteAlbum(owner);
@@ -73,11 +79,13 @@ class DriftAlbumApiRepository extends ApiRepository {
       _api.updateAlbumInfo(
         albumId,
         UpdateAlbumDto(
-          albumName: name,
-          description: description,
-          albumThumbnailAssetId: thumbnailAssetId,
-          isActivityEnabled: isActivityEnabled,
-          order: apiOrder,
+          albumName: name == null ? const Optional.absent() : Optional.present(name),
+          description: description == null ? const Optional.absent() : Optional.present(description),
+          albumThumbnailAssetId: thumbnailAssetId == null
+              ? const Optional.absent()
+              : Optional.present(thumbnailAssetId),
+          isActivityEnabled: isActivityEnabled == null ? const Optional.absent() : Optional.present(isActivityEnabled),
+          order: apiOrder == null ? const Optional.absent() : Optional.present(apiOrder),
         ),
       ),
     );
@@ -99,7 +107,9 @@ class DriftAlbumApiRepository extends ApiRepository {
   }
 
   Future<bool> setActivityStatus(String albumId, bool isEnabled) async {
-    final response = await checkNull(_api.updateAlbumInfo(albumId, UpdateAlbumDto(isActivityEnabled: isEnabled)));
+    final response = await checkNull(
+      _api.updateAlbumInfo(albumId, UpdateAlbumDto(isActivityEnabled: Optional.present(isEnabled))),
+    );
     return response.isActivityEnabled;
   }
 }
@@ -116,7 +126,7 @@ extension on AlbumResponseDto {
       updatedAt: updatedAt,
       thumbnailAssetId: albumThumbnailAssetId,
       isActivityEnabled: isActivityEnabled,
-      order: order == AssetOrder.asc ? AlbumAssetOrder.asc : AlbumAssetOrder.desc,
+      order: order.orElse(null) == AssetOrder.asc ? AlbumAssetOrder.asc : AlbumAssetOrder.desc,
       assetCount: assetCount,
       isShared: albumUsers.length > 2,
     );

mobile/lib/repositories/partner_api.repository.dart

@@ -16,7 +16,7 @@ class PartnerApiRepository extends ApiRepository {
 
   Future<List<UserDto>> getAll(Direction direction) async {
     final response = await checkNull(
-      _api.getPartners(direction == Direction.sharedByMe ? PartnerDirection.by : PartnerDirection.with_),
+      _api.getPartners(direction == Direction.sharedByMe ? PartnerDirection.sharedBy : PartnerDirection.sharedWith),
     );
     return response.map(UserConverter.fromPartnerDto).toList();
   }

mobile/lib/repositories/person_api.repository.dart

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

mobile/lib/repositories/sessions_api.repository.dart

@@ -15,7 +15,13 @@ class SessionsAPIRepository extends ApiRepository {
 
   Future<SessionCreateResponse> createSession(String deviceType, String deviceOS, {int? duration}) async {
     final dto = await checkNull(
-      _api.createSession(SessionCreateDto(deviceType: deviceType, deviceOS: deviceOS, duration: duration)),
+      _api.createSession(
+        SessionCreateDto(
+          deviceType: Optional.present(deviceType),
+          deviceOS: Optional.present(deviceOS),
+          duration: duration == null ? const Optional.absent() : Optional.present(duration),
+        ),
+      ),
     );
 
     return SessionCreateResponse(
@@ -23,7 +29,7 @@ class SessionsAPIRepository extends ApiRepository {
       current: dto.current,
       deviceType: deviceType,
       deviceOS: deviceOS,
-      expiresAt: dto.expiresAt,
+      expiresAt: dto.expiresAt.orElse(null),
       createdAt: dto.createdAt,
       updatedAt: dto.updatedAt,
       token: dto.token,

mobile/lib/routing/locked_guard.dart

@@ -55,7 +55,7 @@ class LockedGuard extends AutoRouteGuard {
         return;
       }
 
-      await _apiService.authenticationApi.unlockAuthSession(SessionUnlockDto(pinCode: securePinCode));
+      await _apiService.authenticationApi.unlockAuthSession(SessionUnlockDto(pinCode: Optional.present(securePinCode)));
 
       resolver.next(true);
     } on PlatformException catch (error) {

mobile/lib/routing/router.dart

@@ -60,6 +60,7 @@ import 'package:immich_mobile/presentation/pages/drift_place_detail.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_recently_taken.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_recently_added.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_remote_album.page.dart';
+import 'package:immich_mobile/presentation/pages/drift_slideshow.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_trash.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_user_selection.page.dart';
 import 'package:immich_mobile/presentation/pages/drift_video.page.dart';
@@ -189,6 +190,7 @@ class AppRouter extends RootStackRouter {
     AutoRoute(page: AssetTroubleshootRoute.page, guards: [_authGuard, _duplicateGuard]),
     AutoRoute(page: DownloadInfoRoute.page, guards: [_authGuard, _duplicateGuard]),
     AutoRoute(page: CleanupPreviewRoute.page, guards: [_authGuard, _duplicateGuard]),
+    AutoRoute(page: DriftSlideshowRoute.page, guards: [_authGuard, _duplicateGuard]),
     // required to handle all deeplinks in deep_link.service.dart
     // auto_route_library#1722
     RedirectRoute(path: '*', redirectTo: '/'),

mobile/lib/routing/router.gr.dart

@@ -1095,6 +1095,53 @@ class DriftSearchRoute extends PageRouteInfo<void> {
   );
 }
 
+/// generated route for
+/// [DriftSlideshowPage]
+class DriftSlideshowRoute extends PageRouteInfo<DriftSlideshowRouteArgs> {
+  DriftSlideshowRoute({
+    Key? key,
+    required TimelineService timeline,
+    List<PageRouteInfo>? children,
+  }) : super(
+         DriftSlideshowRoute.name,
+         args: DriftSlideshowRouteArgs(key: key, timeline: timeline),
+         initialChildren: children,
+       );
+
+  static const String name = 'DriftSlideshowRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      final args = data.argsAs<DriftSlideshowRouteArgs>();
+      return DriftSlideshowPage(key: args.key, timeline: args.timeline);
+    },
+  );
+}
+
+class DriftSlideshowRouteArgs {
+  const DriftSlideshowRouteArgs({this.key, required this.timeline});
+
+  final Key? key;
+
+  final TimelineService timeline;
+
+  @override
+  String toString() {
+    return 'DriftSlideshowRouteArgs{key: $key, timeline: $timeline}';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    if (other is! DriftSlideshowRouteArgs) return false;
+    return key == other.key && timeline == other.timeline;
+  }
+
+  @override
+  int get hashCode => key.hashCode ^ timeline.hashCode;
+}
+
 /// generated route for
 /// [DriftTrashPage]
 class DriftTrashRoute extends PageRouteInfo<void> {

mobile/lib/services/action.service.dart

@@ -7,6 +7,7 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/asset_edit.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/domain/services/tag.service.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';
@@ -23,6 +24,7 @@ import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/timezone.dart';
 import 'package:immich_mobile/widgets/common/date_time_picker.dart';
 import 'package:immich_mobile/widgets/common/location_picker.dart';
+import 'package:immich_mobile/widgets/common/tag_picker.dart';
 import 'package:maplibre_gl/maplibre_gl.dart' as maplibre;
 
 final actionServiceProvider = Provider<ActionService>(
@@ -35,6 +37,7 @@ final actionServiceProvider = Provider<ActionService>(
     ref.watch(trashedLocalAssetRepository),
     ref.watch(assetMediaRepositoryProvider),
     ref.watch(downloadRepositoryProvider),
+    ref.watch(tagServiceProvider),
   ),
 );
 
@@ -47,6 +50,7 @@ class ActionService {
   final DriftTrashedLocalAssetRepository _trashedLocalAssetRepository;
   final AssetMediaRepository _assetMediaRepository;
   final DownloadRepository _downloadRepository;
+  final TagService _tagService;
 
   const ActionService(
     this._assetApiRepository,
@@ -57,6 +61,7 @@ class ActionService {
     this._trashedLocalAssetRepository,
     this._assetMediaRepository,
     this._downloadRepository,
+    this._tagService,
   );
 
   Future<void> shareLink(List<String> remoteIds, BuildContext context) async {
@@ -234,6 +239,26 @@ class ActionService {
     return true;
   }
 
+  Future<int?> tagAssets(List<String> remoteIds, BuildContext context) async {
+    final tagResults = await showTagPickerModal(context: context);
+    if (tagResults == null) {
+      // user cancelled
+      return null;
+    }
+
+    final selectedTagIds = Set<String>.from(tagResults.$1);
+    final selectedNewTagValues = tagResults.$2;
+
+    if (selectedNewTagValues.isNotEmpty) {
+      final upsertedTags = await _tagService.upsertTags(selectedNewTagValues.toList());
+      selectedTagIds.addAll(upsertedTags.map((t) => t.id));
+    }
+    if (selectedTagIds.isEmpty) {
+      return 0;
+    }
+    return _tagService.bulkTagAssets(remoteIds, selectedTagIds.toList());
+  }
+
   Future<void> stack(String userId, List<String> remoteIds) async {
     final stack = await _assetApiRepository.stack(remoteIds);
     await _remoteAssetRepository.stack(userId, stack);

mobile/lib/services/oauth.service.dart

@@ -18,7 +18,11 @@ class OAuthService {
     log.info("Starting OAuth flow with redirect URI: $redirectUri");
 
     final dto = await _apiService.oAuthApi.startOAuth(
-      OAuthConfigDto(redirectUri: redirectUri, state: state, codeChallenge: codeChallenge),
+      OAuthConfigDto(
+        redirectUri: redirectUri,
+        state: Optional.present(state),
+        codeChallenge: Optional.present(codeChallenge),
+      ),
     );
 
     final authUrl = dto?.url;
@@ -37,7 +41,7 @@ class OAuthService {
     }
 
     return await _apiService.oAuthApi.finishOAuth(
-      OAuthCallbackDto(url: result, state: state, codeVerifier: codeVerifier),
+      OAuthCallbackDto(url: result, state: Optional.present(state), codeVerifier: Optional.present(codeVerifier)),
     );
   }
 }

mobile/lib/services/shared_link.service.dart

@@ -48,26 +48,26 @@ class SharedLinkService {
       if (type == SharedLinkType.ALBUM) {
         dto = SharedLinkCreateDto(
           type: type,
-          albumId: albumId,
-          showMetadata: showMeta,
-          allowDownload: allowDownload,
-          allowUpload: allowUpload,
-          expiresAt: expiresAt,
-          description: description,
-          password: password,
-          slug: slug,
+          albumId: albumId == null ? const Optional.absent() : Optional.present(albumId),
+          showMetadata: Optional.present(showMeta),
+          allowDownload: Optional.present(allowDownload),
+          allowUpload: Optional.present(allowUpload),
+          expiresAt: expiresAt == null ? const Optional.absent() : Optional.present(expiresAt),
+          description: description == null ? const Optional.absent() : Optional.present(description),
+          password: password == null ? const Optional.absent() : Optional.present(password),
+          slug: slug == null ? const Optional.absent() : Optional.present(slug),
         );
       } else if (assetIds != null) {
         dto = SharedLinkCreateDto(
           type: type,
-          showMetadata: showMeta,
-          allowDownload: allowDownload,
-          allowUpload: allowUpload,
-          expiresAt: expiresAt,
-          description: description,
-          password: password,
-          slug: slug,
-          assetIds: assetIds,
+          showMetadata: Optional.present(showMeta),
+          allowDownload: Optional.present(allowDownload),
+          allowUpload: Optional.present(allowUpload),
+          expiresAt: expiresAt == null ? const Optional.absent() : Optional.present(expiresAt),
+          description: description == null ? const Optional.absent() : Optional.present(description),
+          password: password == null ? const Optional.absent() : Optional.present(password),
+          slug: slug == null ? const Optional.absent() : Optional.present(slug),
+          assetIds: Optional.present(assetIds),
         );
       }
 
@@ -98,14 +98,14 @@ class SharedLinkService {
       final responseDto = await _apiService.sharedLinksApi.updateSharedLink(
         id,
         SharedLinkEditDto(
-          showMetadata: showMeta,
-          allowDownload: allowDownload,
-          allowUpload: allowUpload,
-          expiresAt: expiresAt,
-          description: description,
-          password: password,
-          slug: slug,
-          changeExpiryTime: changeExpiry,
+          showMetadata: showMeta == null ? const Optional.absent() : Optional.present(showMeta),
+          allowDownload: allowDownload == null ? const Optional.absent() : Optional.present(allowDownload),
+          allowUpload: allowUpload == null ? const Optional.absent() : Optional.present(allowUpload),
+          expiresAt: expiresAt == null ? const Optional.absent() : Optional.present(expiresAt),
+          description: description == null ? const Optional.absent() : Optional.present(description),
+          password: password == null ? const Optional.absent() : Optional.present(password),
+          slug: slug == null ? const Optional.absent() : Optional.present(slug),
+          changeExpiryTime: changeExpiry == null ? const Optional.absent() : Optional.present(changeExpiry),
         ),
       );
       if (responseDto != null) {

mobile/lib/utils/action_button.utils.dart

@@ -27,6 +27,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/set_profile_pi
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/similar_photos_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/slideshow_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unarchive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
@@ -73,6 +74,7 @@ enum ActionButtonType {
   similarPhotos,
   setProfilePicture,
   viewInTimeline,
+  slideshow,
   download,
   upload,
   openInBrowser,
@@ -179,6 +181,7 @@ enum ActionButtonType {
             context.timelineOrigin != TimelineOrigin.localAlbum &&
             context.isOwner,
       ActionButtonType.cast => context.isCasting || context.asset.hasRemote,
+      ActionButtonType.slideshow => true,
     };
   }
 
@@ -200,6 +203,7 @@ enum ActionButtonType {
         iconOnly: iconOnly,
         menuItem: menuItem,
       ),
+      ActionButtonType.slideshow => SlideshowActionButton(iconOnly: iconOnly, menuItem: menuItem),
       ActionButtonType.archive => ArchiveActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
       ActionButtonType.unarchive => UnArchiveActionButton(
         source: context.source,

mobile/lib/utils/url_helper.dart

@@ -24,6 +24,17 @@ String? getServerUrl() {
   );
 }
 
+String? buildSharedLinkUrl({required String? baseUrl, required String key, String? slug}) {
+  if (baseUrl == null || baseUrl.isEmpty) {
+    return null;
+  }
+
+  final normalizedBaseUrl = baseUrl.endsWith('/') ? baseUrl : '$baseUrl/';
+  final path = (slug != null && slug.isNotEmpty) ? 's/$slug' : 'share/$key';
+
+  return '$normalizedBaseUrl$path';
+}
+
 /// Converts a Unicode URL to its ASCII-compatible encoding (Punycode).
 ///
 /// This is especially useful for internationalized domain names (IDNs),

mobile/lib/widgets/common/remote_album_sliver_app_bar.dart

@@ -18,6 +18,7 @@ import 'package:immich_mobile/providers/infrastructure/current_album.provider.da
 import 'package:immich_mobile/providers/infrastructure/remote_album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/album/remote_album_shared_user_icons.dart';
 
 class RemoteAlbumSliverAppBar extends ConsumerStatefulWidget {
@@ -89,6 +90,10 @@ class _MesmerizingSliverAppBarState extends ConsumerState<RemoteAlbumSliverAppBa
               onPressed: () => context.maybePop(),
             ),
       actions: [
+        IconButton(
+          onPressed: () => context.pushRoute(DriftSlideshowRoute(timeline: ref.read(timelineServiceProvider))),
+          icon: Icon(Icons.slideshow_outlined, color: actionIconColor, shadows: actionIconShadows),
+        ),
         if (currentAlbum.isActivityEnabled && currentAlbum.isShared)
           IconButton(
             icon: Icon(Icons.chat_outlined, color: actionIconColor, shadows: actionIconShadows),

mobile/lib/widgets/common/tag_picker.dart

@@ -8,12 +8,78 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/providers/infrastructure/tag.provider.dart';
 import 'package:immich_mobile/widgets/common/search_field.dart';
 
-class TagPicker extends HookConsumerWidget {
-  const TagPicker({super.key, required this.onSelect, required this.filter});
+String _trimSlashes(String s) => s.replaceAll(RegExp(r'^/+|/+$'), '');
+
+Future<(Set<String>, Set<String>)?> showTagPickerModal({required BuildContext context, Set<String>? initialSelection}) {
+  return showDialog<(Set<String>, Set<String>)?>(
+    context: context,
+    builder: (context) => _TagPickerModal(initialSelection: initialSelection),
+  );
+}
+
+class _TagPickerModal extends HookConsumerWidget {
+  final Set<String>? initialSelection;
+
+  const _TagPickerModal({this.initialSelection});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final selectedTagIds = useState<Set<String>>(initialSelection ?? {});
+    final newTagValues = useState<Set<String>>({});
+
+    void onSelectExistingTag(Iterable<Tag> tags) {
+      selectedTagIds.value = tags.map((tag) => tag.id).toSet();
+    }
+
+    void onSelectNewTag(Set<String> tags) {
+      newTagValues.value = tags;
+    }
+
+    return AlertDialog(
+      contentPadding: const EdgeInsets.symmetric(vertical: 16, horizontal: 0),
+      actions: [
+        TextButton(
+          onPressed: () => context.pop(),
+          child: Text(
+            "cancel",
+            style: context.textTheme.bodyMedium?.copyWith(
+              fontWeight: FontWeight.w600,
+              color: context.colorScheme.error,
+            ),
+          ).tr(),
+        ),
+        TextButton(
+          onPressed: () => context.pop((selectedTagIds.value, newTagValues.value)),
+          child: Text(
+            "action_common_update",
+            style: context.textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.w600, color: context.primaryColor),
+          ).tr(),
+        ),
+      ],
+      content: SizedBox(
+        width: MediaQuery.of(context).size.width * 0.8,
+        height: MediaQuery.of(context).size.height * 0.6,
+        child: TagPicker(
+          onSelectExistingTag: onSelectExistingTag,
+          filter: selectedTagIds.value,
+          onSelectNewTag: onSelectNewTag,
+        ),
+      ),
+    );
+  }
+}
+
+class TagPicker extends HookConsumerWidget {
+  const TagPicker({super.key, required this.onSelectExistingTag, required this.filter, this.onSelectNewTag});
 
-  final Function(Iterable<Tag>) onSelect;
   final Set<String> filter;
 
+  /// Callback when existing tags are selected/deselected.
+  final Function(Iterable<Tag>) onSelectExistingTag;
+
+  /// If not null, shows a tile to create a new tag with user's filter input.
+  final Function(Set<String>)? onSelectNewTag;
+
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final formFocus = useFocusNode();
@@ -21,6 +87,7 @@ class TagPicker extends HookConsumerWidget {
     final tags = ref.watch(tagProvider);
     final selectedTagIds = useState<Set<String>>(filter);
     final borderRadius = const BorderRadius.all(Radius.circular(10));
+    final selectedNewTagValues = useState<Set<String>>({});
 
     return Column(
       children: [
@@ -41,13 +108,53 @@ class TagPicker extends HookConsumerWidget {
         Expanded(
           child: tags.widgetWhen(
             onData: (tags) {
+              final trimmedQuery = _trimSlashes(searchQuery.value);
               final queryResult = tags
-                  .where((t) => t.value.toLowerCase().contains(searchQuery.value.toLowerCase()))
+                  .where((t) => t.value.toLowerCase().contains(trimmedQuery.toLowerCase()))
                   .toList();
+              final showCreateTile =
+                  (onSelectNewTag != null) &&
+                  trimmedQuery.isNotEmpty &&
+                  !tags.any((t) => t.value.toLowerCase() == trimmedQuery.toLowerCase());
+              final isCreateSelected = selectedNewTagValues.value.contains(trimmedQuery);
               return ListView.builder(
-                itemCount: queryResult.length,
+                itemCount: queryResult.length + (showCreateTile ? 1 : 0),
                 padding: const EdgeInsets.all(8),
                 itemBuilder: (context, index) {
+                  if (showCreateTile && index == queryResult.length) {
+                    // Create new tag tile
+                    return Padding(
+                      padding: const EdgeInsets.only(bottom: 2.0),
+                      child: Container(
+                        decoration: BoxDecoration(
+                          color: isCreateSelected ? context.primaryColor : context.primaryColor.withAlpha(25),
+                          borderRadius: const BorderRadius.all(Radius.circular(10)),
+                        ),
+                        child: ListTile(
+                          title: Text(
+                            trimmedQuery,
+                            style: context.textTheme.bodyLarge?.copyWith(
+                              color: isCreateSelected ? context.colorScheme.onPrimary : context.colorScheme.onSurface,
+                            ),
+                          ),
+                          trailing: Icon(
+                            Icons.add,
+                            color: isCreateSelected ? context.colorScheme.onPrimary : context.colorScheme.onSurface,
+                          ),
+                          onTap: () {
+                            final newSelectedNewTagValues = {...selectedNewTagValues.value};
+                            if (isCreateSelected) {
+                              newSelectedNewTagValues.remove(trimmedQuery);
+                            } else {
+                              newSelectedNewTagValues.add(trimmedQuery);
+                            }
+                            selectedNewTagValues.value = newSelectedNewTagValues;
+                            onSelectNewTag!.call(newSelectedNewTagValues);
+                          },
+                        ),
+                      ),
+                    );
+                  }
                   final tag = queryResult[index];
                   final isSelected = selectedTagIds.value.any((id) => id == tag.id);
 
@@ -73,7 +180,7 @@ class TagPicker extends HookConsumerWidget {
                             newSelected.add(tag.id);
                           }
                           selectedTagIds.value = newSelected;
-                          onSelect(tags.where((t) => newSelected.contains(t.id)));
+                          onSelectExistingTag(tags.where((t) => newSelected.contains(t.id)));
                         },
                       ),
                     ),

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

@@ -400,15 +400,12 @@ class LoginForm extends HookConsumerWidget {
                   submitText: 'next'.t(context: context),
                   submitIcon: Icons.arrow_forward_rounded,
                   onSubmit: getServerAuthSettings,
-                  child: ImmichTextInput(
+                  child: ImmichURLInput(
                     controller: serverEndpointController,
                     label: 'login_form_endpoint_url'.t(context: context),
                     hintText: 'login_form_endpoint_hint'.t(context: context),
                     validator: _validateUrl,
-                    keyboardAction: TextInputAction.next,
-                    keyboardType: TextInputType.url,
-                    autofillHints: const [AutofillHints.url],
-                    autoCorrect: false,
+                    keyboardAction: .next,
                     onSubmit: (ctx, _) => ImmichForm.of(ctx).submit(),
                   ),
                 ),

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

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:immich_mobile/widgets/settings/asset_viewer_settings/image_viewer_quality_setting.dart';
 import 'package:immich_mobile/widgets/settings/asset_viewer_settings/image_viewer_tap_to_navigate_setting.dart';
 import 'package:immich_mobile/widgets/settings/asset_viewer_settings/video_viewer_settings.dart';
+import 'package:immich_mobile/widgets/settings/asset_viewer_settings/slideshow_settings.dart';
 import 'package:immich_mobile/widgets/settings/settings_sub_page_scaffold.dart';
 
 class AssetViewerSettings extends StatelessWidget {
@@ -13,6 +14,7 @@ class AssetViewerSettings extends StatelessWidget {
       const ImageViewerQualitySetting(),
       const ImageViewerTapToNavigateSetting(),
       const VideoViewerSettings(),
+      const SlideshowSettings(),
     ];
 
     return SettingsSubPageScaffold(settings: assetViewerSetting, showDivider: true);

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

@@ -0,0 +1,123 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
+import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
+import 'package:immich_mobile/widgets/settings/settings_radio_list_tile.dart';
+import 'package:immich_mobile/widgets/settings/settings_slider_list_tile.dart';
+import 'package:immich_mobile/widgets/settings/settings_sub_title.dart';
+import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
+
+class SlideshowSettings extends HookConsumerWidget {
+  const SlideshowSettings({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final slideshow = ref.read(appConfigProvider).slideshow;
+    final useTransition = useState(slideshow.transition);
+    final useRepeat = useState(slideshow.repeat);
+    final useDuration = useState(slideshow.duration);
+    final useLook = useState(slideshow.look);
+    final useDirection = useState(slideshow.direction);
+
+    useValueChanged<bool, void>(useTransition.value, (_, __) {
+      ref.read(metadataProvider).write(.slideshowTransition, useTransition.value);
+    });
+    useValueChanged<bool, void>(useRepeat.value, (_, __) {
+      ref.read(metadataProvider).write(.slideshowRepeat, useRepeat.value);
+    });
+    useValueChanged<int, void>(useDuration.value, (_, __) {
+      ref.read(metadataProvider).write(.slideshowDuration, useDuration.value);
+    });
+    useValueChanged<SlideshowLook, void>(useLook.value, (_, __) {
+      ref.read(metadataProvider).write(.slideshowLook, useLook.value);
+    });
+    useValueChanged<SlideshowDirection, void>(useDirection.value, (_, __) {
+      ref.read(metadataProvider).write(.slideshowDirection, useDirection.value);
+    });
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        SettingGroupTitle(
+          title: 'slideshow'.t(context: context),
+          icon: Icons.slideshow_outlined,
+        ),
+        SettingsSwitchListTile(
+          valueNotifier: useTransition,
+          title: "show_slideshow_transition".t(context: context),
+          enabled: useDirection.value != SlideshowDirection.shuffle,
+        ),
+        SettingsSwitchListTile(
+          valueNotifier: useRepeat,
+          title: "slideshow_repeat".t(context: context),
+          subtitle: "slideshow_repeat_description".t(context: context),
+        ),
+        SettingsSliderListTile(
+          valueNotifier: useDuration,
+          text: "duration".t(context: context),
+          minValue: 5,
+          noDivisons: 5,
+          maxValue: 30,
+        ),
+        Padding(
+          padding: const EdgeInsets.only(top: 20),
+          child: SettingsSubTitle(title: 'look'.t(context: context)),
+        ),
+        SettingsRadioListTile(
+          groups: [
+            SettingsRadioGroup(
+              title: 'contain'.t(context: context),
+              value: SlideshowLook.contain,
+            ),
+            SettingsRadioGroup(
+              title: 'cover'.t(context: context),
+              value: SlideshowLook.cover,
+            ),
+            SettingsRadioGroup(
+              title: 'blurred_background'.t(context: context),
+              value: SlideshowLook.blurredBackground,
+            ),
+          ],
+          groupBy: useLook.value,
+          onRadioChanged: (value) {
+            if (value != null) {
+              useLook.value = value;
+            }
+          },
+        ),
+        Padding(
+          padding: const EdgeInsets.only(top: 20),
+          child: SettingsSubTitle(title: 'direction'.t(context: context)),
+        ),
+        Padding(
+          padding: const EdgeInsets.only(bottom: 32),
+          child: SettingsRadioListTile(
+            groups: [
+              SettingsRadioGroup(
+                title: 'forward'.t(context: context),
+                value: SlideshowDirection.forward,
+              ),
+              SettingsRadioGroup(
+                title: 'backward'.t(context: context),
+                value: SlideshowDirection.backward,
+              ),
+              SettingsRadioGroup(
+                title: 'shuffle'.t(context: context),
+                value: SlideshowDirection.shuffle,
+              ),
+            ],
+            groupBy: useDirection.value,
+            onRadioChanged: (value) {
+              if (value != null) {
+                useDirection.value = value;
+              }
+            },
+          ),
+        ),
+      ],
+    );
+  }
+}

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

@@ -1,10 +1,10 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/models/auth/auxilary_endpoint.model.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/widgets/settings/networking_settings/networking_settings.dart';
+import 'package:immich_ui/immich_ui.dart';
 
 class EndpointInput extends StatefulHookConsumerWidget {
   const EndpointInput({
@@ -111,28 +111,12 @@ class EndpointInputState extends ConsumerState<EndpointInput> {
           status: auxCheckStatus,
           enabled: widget.enabled,
         ),
-        subtitle: TextFormField(
+        subtitle: ImmichURLInput(
           enabled: widget.enabled,
-          onTapOutside: (_) => focusNode.unfocus(),
-          autovalidateMode: AutovalidateMode.onUserInteraction,
+          autovalidateMode: .onUserInteraction,
           validator: validateUrl,
-          keyboardType: TextInputType.url,
-          style: const TextStyle(fontFamily: 'GoogleSansCode', fontSize: 14),
-          decoration: InputDecoration(
-            hintText: 'http(s)://immich.domain.com',
-            contentPadding: const EdgeInsets.all(16),
-            filled: true,
-            fillColor: context.colorScheme.surfaceContainer,
-            border: const OutlineInputBorder(borderRadius: BorderRadius.all(Radius.circular(16))),
-            errorBorder: OutlineInputBorder(
-              borderSide: BorderSide(color: Colors.red[300]!),
-              borderRadius: const BorderRadius.all(Radius.circular(16)),
-            ),
-            disabledBorder: OutlineInputBorder(
-              borderSide: BorderSide(color: context.isDarkTheme ? Colors.grey[900]! : Colors.grey[300]!),
-              borderRadius: const BorderRadius.all(Radius.circular(16)),
-            ),
-          ),
+          keyboardAction: .next,
+          hintText: 'http(s)://immich.domain.com',
           controller: controller,
           focusNode: focusNode,
         ),

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

@@ -8,24 +8,29 @@ import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/providers/auth.provider.dart';
 import 'package:immich_mobile/providers/network.provider.dart';
+import 'package:immich_ui/immich_ui.dart';
 
 class LocalNetworkPreference extends HookConsumerWidget {
   const LocalNetworkPreference({super.key, required this.enabled});
 
   final bool enabled;
 
-  Future<String?> _showEditDialog(BuildContext context, String title, String hintText, String initialValue) {
+  Future<String?> _showEditDialog(
+    BuildContext context,
+    String title,
+    String hintText,
+    String initialValue, {
+    bool isUrlField = false,
+  }) {
     final controller = TextEditingController(text: initialValue);
 
     return showDialog<String>(
       context: context,
       builder: (context) => AlertDialog(
         title: Text(title),
-        content: TextField(
-          controller: controller,
-          autofocus: true,
-          decoration: InputDecoration(border: const OutlineInputBorder(), hintText: hintText),
-        ),
+        content: isUrlField
+            ? ImmichURLInput(controller: controller, autofocus: true, keyboardAction: .done, hintText: hintText)
+            : ImmichTextInput(controller: controller, autofocus: true, keyboardAction: .done, hintText: hintText),
         actions: [
           TextButton(
             onPressed: () => Navigator.pop(context),
@@ -81,6 +86,7 @@ class LocalNetworkPreference extends HookConsumerWidget {
         "server_endpoint".tr(),
         "http://local-ip:2283",
         localEndpointText.value,
+        isUrlField: true,
       );
 
       if (localEndpoint != null) {

mobile/lib/widgets/shared_link/shared_link_item.dart

@@ -1,201 +1,140 @@
 import 'dart:math' as math;
 
 import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/models/shared_link/shared_link.model.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/shared_link.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
 import 'package:immich_mobile/widgets/common/confirm_dialog.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 import 'package:immich_mobile/widgets/search/thumbnail_with_info.dart';
-import 'package:immich_mobile/utils/debug_print.dart';
 
 class SharedLinkItem extends ConsumerWidget {
   final SharedLink sharedLink;
 
   const SharedLinkItem(this.sharedLink, {super.key});
 
-  bool isExpired() {
-    if (sharedLink.expiresAt != null) {
-      return DateTime.now().isAfter(sharedLink.expiresAt!);
-    }
-    return false;
-  }
+  bool isExpired() => sharedLink.expiresAt?.isBefore(DateTime.now()) ?? false;
+
+  Widget buildExpiryDuration(BuildContext context) {
+    var expiresText = context.t.shared_link_expires_never;
+    IconData expiryIcon = Icons.schedule;
 
-  Widget getExpiryDuration(bool isDarkMode) {
-    var expiresText = "shared_link_expires_never".tr();
     if (sharedLink.expiresAt != null) {
       if (isExpired()) {
-        return Text("expired", style: TextStyle(color: Colors.red[300])).tr();
+        expiresText = context.t.expired;
+        expiryIcon = Icons.timer_off_outlined;
       }
+
       final difference = sharedLink.expiresAt!.difference(DateTime.now());
       dPrint(() => "Difference: $difference");
+
       if (difference.inDays > 0) {
         var dayDifference = difference.inDays;
         if (difference.inHours % 24 > 12) {
           dayDifference += 1;
         }
-        expiresText = "shared_link_expires_days".tr(namedArgs: {'count': dayDifference.toString()});
+        expiresText = context.t.shared_link_expires_days(count: dayDifference);
       } else if (difference.inHours > 0) {
-        expiresText = "shared_link_expires_hours".tr(namedArgs: {'count': difference.inHours.toString()});
+        expiresText = context.t.shared_link_expires_hours(count: difference.inHours);
       } else if (difference.inMinutes > 0) {
-        expiresText = "shared_link_expires_minutes".tr(namedArgs: {'count': difference.inMinutes.toString()});
+        expiresText = context.t.shared_link_expires_minutes(count: difference.inMinutes);
       } else if (difference.inSeconds > 0) {
-        expiresText = "shared_link_expires_seconds".tr(namedArgs: {'count': difference.inSeconds.toString()});
+        expiresText = context.t.shared_link_expires_seconds(count: difference.inSeconds);
       }
     }
-    return Text(expiresText, style: TextStyle(color: isDarkMode ? Colors.grey[400] : Colors.grey[600]));
+
+    return Row(
+      children: [
+        Icon(expiryIcon, size: 12, color: isExpired() ? context.colorScheme.error : context.colorScheme.onSurface),
+        const SizedBox(width: 4),
+        Text(
+          expiresText,
+          style: TextStyle(color: isExpired() ? context.colorScheme.error : context.colorScheme.onSurface),
+        ),
+      ],
+    );
   }
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final colorScheme = context.colorScheme;
-    final isDarkMode = colorScheme.brightness == Brightness.dark;
     final thumbnailUrl = sharedLink.thumbAssetId != null ? getThumbnailUrlForRemoteId(sharedLink.thumbAssetId!) : null;
     final imageSize = math.min(context.width / 4, 100.0);
 
-    void copyShareLinkToClipboard() {
+    Future<void> copyShareLinkToClipboard() async {
       final externalDomain = ref.read(serverInfoProvider.select((s) => s.serverConfig.externalDomain));
-      var serverUrl = externalDomain.isNotEmpty ? externalDomain : getServerUrl();
-      if (serverUrl != null && !serverUrl.endsWith('/')) {
-        serverUrl += '/';
-      }
-      if (serverUrl == null) {
+      final serverUrl = externalDomain.isNotEmpty ? externalDomain : getServerUrl();
+      final shareUrl = buildSharedLinkUrl(baseUrl: serverUrl, slug: sharedLink.slug, key: sharedLink.key);
+
+      if (shareUrl == null) {
         ImmichToast.show(
           context: context,
           gravity: ToastGravity.BOTTOM,
           toastType: ToastType.error,
-          msg: "shared_link_error_server_url_fetch".tr(),
+          msg: context.t.shared_link_error_server_url_fetch,
         );
         return;
       }
 
-      final hasSlug = sharedLink.slug?.isNotEmpty == true;
-      final urlPath = hasSlug ? sharedLink.slug : sharedLink.key;
-      final basePath = hasSlug ? 's' : 'share';
-      Clipboard.setData(ClipboardData(text: "$serverUrl$basePath/$urlPath")).then((_) {
-        context.scaffoldMessenger.showSnackBar(
-          SnackBar(
-            content: Text(
-              "shared_link_clipboard_copied_massage",
-              style: context.textTheme.bodyLarge?.copyWith(color: context.primaryColor),
-            ).tr(),
-            duration: const Duration(seconds: 2),
+      await Clipboard.setData(ClipboardData(text: shareUrl));
+      if (!context.mounted) {
+        return;
+      }
+      context.scaffoldMessenger.showSnackBar(
+        SnackBar(
+          content: Text(
+            context.t.shared_link_clipboard_copied_massage,
+            style: context.textTheme.bodyLarge?.copyWith(color: context.primaryColor),
           ),
-        );
-      });
-    }
-
-    Future<void> deleteShareLink() async {
-      return showDialog(
-        context: context,
-        builder: (BuildContext context) {
-          return ConfirmDialog(
-            title: "delete_shared_link_dialog_title",
-            content: "confirm_delete_shared_link",
-            onOk: () => ref.read(sharedLinksStateProvider.notifier).deleteLink(sharedLink.id),
-          );
-        },
+          duration: const Duration(seconds: 2),
+        ),
       );
     }
 
     Widget buildThumbnail() {
-      if (thumbnailUrl == null) {
-        return Container(
-          height: imageSize * 1.2,
-          width: imageSize,
-          decoration: BoxDecoration(color: isDarkMode ? Colors.grey[800] : Colors.grey[200]),
-          child: Center(
-            child: Icon(Icons.image_not_supported_outlined, color: isDarkMode ? Colors.grey[100] : Colors.grey[700]),
-          ),
-        );
-      }
       return SizedBox(
         height: imageSize * 1.2,
         width: imageSize,
-        child: Padding(
-          padding: const EdgeInsets.only(right: 4.0),
-          child: ThumbnailWithInfo(
-            imageUrl: thumbnailUrl,
-            key: key,
-            textInfo: '',
-            noImageIcon: Icons.image_not_supported_outlined,
-            onTap: () {},
-          ),
-        ),
+        child: thumbnailUrl == null
+            ? const Card(
+                shape: RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(10))),
+                child: Icon(Icons.image_not_supported_outlined),
+              )
+            : ThumbnailWithInfo(
+                imageUrl: thumbnailUrl,
+                key: key,
+                textInfo: '',
+                noImageIcon: Icons.image_not_supported_outlined,
+                onTap: () => context.pushRoute(SharedLinkEditRoute(existingLink: sharedLink)),
+              ),
       );
     }
 
     Widget buildInfoChip(String labelText) {
-      return Padding(
-        padding: const EdgeInsets.only(right: 10),
-        child: Chip(
-          backgroundColor: colorScheme.primary,
-          label: Text(
-            labelText,
-            style: TextStyle(
-              fontSize: 11,
-              fontWeight: FontWeight.w500,
-              color: isDarkMode ? Colors.black : Colors.white,
-            ),
-          ),
-          shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(25))),
+      return Card.outlined(
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 6),
+          child: Text(labelText, style: const TextStyle(fontSize: 11)),
         ),
       );
     }
 
-    Widget buildBottomInfo() {
+    Widget buildShareParameterInfos() {
       return Row(
+        spacing: 4,
         children: [
-          if (sharedLink.allowUpload) buildInfoChip("upload".tr()),
-          if (sharedLink.allowDownload) buildInfoChip("download".tr()),
-          if (sharedLink.showMetadata) buildInfoChip("shared_link_info_chip_metadata".tr()),
-        ],
-      );
-    }
-
-    Widget buildSharedLinkActions() {
-      const actionIconSize = 20.0;
-      return Row(
-        children: [
-          IconButton(
-            splashRadius: 25,
-            constraints: const BoxConstraints(),
-            iconSize: actionIconSize,
-            icon: const Icon(Icons.delete_outline),
-            style: const ButtonStyle(
-              tapTargetSize: MaterialTapTargetSize.shrinkWrap, // the '2023' part
-            ),
-            onPressed: deleteShareLink,
-          ),
-          IconButton(
-            splashRadius: 25,
-            constraints: const BoxConstraints(),
-            iconSize: actionIconSize,
-            icon: const Icon(Icons.edit_outlined),
-            style: const ButtonStyle(
-              tapTargetSize: MaterialTapTargetSize.shrinkWrap, // the '2023' part
-            ),
-            onPressed: () => context.pushRoute(SharedLinkEditRoute(existingLink: sharedLink)),
-          ),
-          IconButton(
-            splashRadius: 25,
-            constraints: const BoxConstraints(),
-            iconSize: actionIconSize,
-            icon: const Icon(Icons.copy_outlined),
-            style: const ButtonStyle(
-              tapTargetSize: MaterialTapTargetSize.shrinkWrap, // the '2023' part
-            ),
-            onPressed: copyShareLinkToClipboard,
-          ),
+          if (sharedLink.allowUpload) buildInfoChip(context.t.upload),
+          if (sharedLink.allowDownload) buildInfoChip(context.t.download),
+          if (sharedLink.showMetadata) buildInfoChip(context.t.shared_link_info_chip_metadata),
         ],
       );
     }
@@ -204,69 +143,64 @@ class SharedLinkItem extends ConsumerWidget {
       return Column(
         crossAxisAlignment: CrossAxisAlignment.stretch,
         children: [
-          getExpiryDuration(isDarkMode),
-          Padding(
-            padding: const EdgeInsets.only(top: 5),
-            child: Tooltip(
-              verticalOffset: 0,
-              decoration: BoxDecoration(
-                color: colorScheme.primary.withValues(alpha: 0.9),
-                borderRadius: const BorderRadius.all(Radius.circular(10)),
-              ),
-              textStyle: TextStyle(color: isDarkMode ? Colors.black : Colors.white, fontWeight: FontWeight.bold),
-              message: sharedLink.title,
-              preferBelow: false,
-              triggerMode: TooltipTriggerMode.tap,
-              child: Text(
-                sharedLink.title,
-                style: TextStyle(
-                  color: colorScheme.primary,
-                  fontWeight: FontWeight.bold,
-                  overflow: TextOverflow.ellipsis,
-                ),
-              ),
+          const SizedBox(height: 5),
+          Text(
+            sharedLink.title,
+            style: TextStyle(
+              color: Theme.of(context).colorScheme.primary,
+              fontWeight: FontWeight.bold,
+              overflow: TextOverflow.ellipsis,
             ),
           ),
-          Row(
-            mainAxisSize: MainAxisSize.max,
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              Expanded(
-                child: Tooltip(
-                  verticalOffset: 0,
-                  decoration: BoxDecoration(
-                    color: colorScheme.primary.withValues(alpha: 0.9),
-                    borderRadius: const BorderRadius.all(Radius.circular(10)),
-                  ),
-                  textStyle: TextStyle(color: isDarkMode ? Colors.black : Colors.white, fontWeight: FontWeight.bold),
-                  message: sharedLink.description ?? "",
-                  preferBelow: false,
-                  triggerMode: TooltipTriggerMode.tap,
-                  child: Text(sharedLink.description ?? "", overflow: TextOverflow.ellipsis),
-                ),
-              ),
-              Padding(padding: const EdgeInsets.only(right: 15), child: buildSharedLinkActions()),
-            ],
-          ),
-          buildBottomInfo(),
+          if (sharedLink.description?.isNotEmpty ?? false)
+            Text(sharedLink.description!, overflow: TextOverflow.ellipsis),
+          buildExpiryDuration(context),
+          buildShareParameterInfos(),
         ],
       );
     }
 
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Row(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Padding(padding: const EdgeInsets.only(left: 15), child: buildThumbnail()),
-            Expanded(
-              child: Padding(padding: const EdgeInsets.only(left: 15), child: buildSharedLinkDetails()),
-            ),
-          ],
+    return Dismissible(
+      key: ValueKey(sharedLink.id),
+      direction: DismissDirection.endToStart,
+      background: Container(
+        color: Theme.of(context).colorScheme.error,
+        alignment: Alignment.centerRight,
+        padding: const EdgeInsets.only(right: 20),
+        child: Icon(Icons.delete, color: Theme.of(context).colorScheme.onError),
+      ),
+      confirmDismiss: (_) async {
+        final confirmed = await showDialog<bool>(
+          context: context,
+          builder: (BuildContext context) => ConfirmDialog(
+            title: "delete_shared_link_dialog_title",
+            content: "confirm_delete_shared_link",
+            onOk: () {},
+          ),
+        );
+
+        if (confirmed == true) {
+          await ref.read(sharedLinksStateProvider.notifier).deleteLink(sharedLink.id);
+          return true;
+        }
+
+        return false;
+      },
+      child: InkWell(
+        onTap: () => context.pushRoute(SharedLinkEditRoute(existingLink: sharedLink)),
+        onLongPress: copyShareLinkToClipboard,
+        child: Padding(
+          padding: const EdgeInsets.all(12),
+          child: Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              buildThumbnail(),
+              const SizedBox(width: 12),
+              Expanded(child: buildSharedLinkDetails()),
+            ],
+          ),
         ),
-        const Padding(padding: EdgeInsets.all(20), child: Divider(height: 0)),
-      ],
+      ),
     );
   }
 }

mobile/mise.toml

@@ -1,11 +1,3 @@
-[tools]
-flutter = "3.41.9"
-
-[tools."github:CQLabs/homebrew-dcm"]
-version = "1.30.0"
-bin = "dcm"
-postinstall = "chmod +x $MISE_TOOL_INSTALL_PATH/dcm"
-
 [tasks."codegen:dart"]
 alias = "codegen"
 description = "Execute build_runner to auto-generate dart code"

mobile/openapi/.openapi-generator/VERSION

@@ -1 +1 @@
-7.8.0
+7.22.0

mobile/openapi/README.md

@@ -4,7 +4,7 @@ Immich API
 This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: 3.0.0
-- Generator version: 7.8.0
+- Generator version: 7.22.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen
 
 ## Requirements
@@ -205,8 +205,8 @@ Class | Method | HTTP request | Description
 *PeopleApi* | [**updatePeople**](doc//PeopleApi.md#updatepeople) | **PUT** /people | Update people
 *PeopleApi* | [**updatePerson**](doc//PeopleApi.md#updateperson) | **PUT** /people/{id} | Update person
 *PluginsApi* | [**getPlugin**](doc//PluginsApi.md#getplugin) | **GET** /plugins/{id} | Retrieve a plugin
-*PluginsApi* | [**getPluginTriggers**](doc//PluginsApi.md#getplugintriggers) | **GET** /plugins/triggers | List all plugin triggers
-*PluginsApi* | [**getPlugins**](doc//PluginsApi.md#getplugins) | **GET** /plugins | List all plugins
+*PluginsApi* | [**searchPluginMethods**](doc//PluginsApi.md#searchpluginmethods) | **GET** /plugins/methods | Retrieve plugin methods
+*PluginsApi* | [**searchPlugins**](doc//PluginsApi.md#searchplugins) | **GET** /plugins | List all plugins
 *QueuesApi* | [**emptyQueue**](doc//QueuesApi.md#emptyqueue) | **DELETE** /queues/{name}/jobs | Empty a queue
 *QueuesApi* | [**getQueue**](doc//QueuesApi.md#getqueue) | **GET** /queues/{name} | Retrieve a queue
 *QueuesApi* | [**getQueueJobs**](doc//QueuesApi.md#getqueuejobs) | **GET** /queues/{name}/jobs | Retrieve queue jobs
@@ -314,7 +314,9 @@ Class | Method | HTTP request | Description
 *WorkflowsApi* | [**createWorkflow**](doc//WorkflowsApi.md#createworkflow) | **POST** /workflows | Create a workflow
 *WorkflowsApi* | [**deleteWorkflow**](doc//WorkflowsApi.md#deleteworkflow) | **DELETE** /workflows/{id} | Delete a workflow
 *WorkflowsApi* | [**getWorkflow**](doc//WorkflowsApi.md#getworkflow) | **GET** /workflows/{id} | Retrieve a workflow
-*WorkflowsApi* | [**getWorkflows**](doc//WorkflowsApi.md#getworkflows) | **GET** /workflows | List all workflows
+*WorkflowsApi* | [**getWorkflowForShare**](doc//WorkflowsApi.md#getworkflowforshare) | **GET** /workflows/{id}/share | Retrieve a workflow
+*WorkflowsApi* | [**getWorkflowTriggers**](doc//WorkflowsApi.md#getworkflowtriggers) | **GET** /workflows/triggers | List all workflow triggers
+*WorkflowsApi* | [**searchWorkflows**](doc//WorkflowsApi.md#searchworkflows) | **GET** /workflows | List all workflows
 *WorkflowsApi* | [**updateWorkflow**](doc//WorkflowsApi.md#updateworkflow) | **PUT** /workflows/{id} | Update a workflow
 
 
@@ -487,16 +489,8 @@ Class | Method | HTTP request | Description
  - [PinCodeResetDto](doc//PinCodeResetDto.md)
  - [PinCodeSetupDto](doc//PinCodeSetupDto.md)
  - [PlacesResponseDto](doc//PlacesResponseDto.md)
- - [PluginActionResponseDto](doc//PluginActionResponseDto.md)
- - [PluginContextType](doc//PluginContextType.md)
- - [PluginFilterResponseDto](doc//PluginFilterResponseDto.md)
- - [PluginJsonSchema](doc//PluginJsonSchema.md)
- - [PluginJsonSchemaProperty](doc//PluginJsonSchemaProperty.md)
- - [PluginJsonSchemaPropertyAdditionalProperties](doc//PluginJsonSchemaPropertyAdditionalProperties.md)
- - [PluginJsonSchemaType](doc//PluginJsonSchemaType.md)
+ - [PluginMethodResponseDto](doc//PluginMethodResponseDto.md)
  - [PluginResponseDto](doc//PluginResponseDto.md)
- - [PluginTriggerResponseDto](doc//PluginTriggerResponseDto.md)
- - [PluginTriggerType](doc//PluginTriggerType.md)
  - [PurchaseResponse](doc//PurchaseResponse.md)
  - [PurchaseUpdate](doc//PurchaseUpdate.md)
  - [QueueCommand](doc//QueueCommand.md)
@@ -669,12 +663,14 @@ Class | Method | HTTP request | Description
  - [VersionCheckStateResponseDto](doc//VersionCheckStateResponseDto.md)
  - [VideoCodec](doc//VideoCodec.md)
  - [VideoContainer](doc//VideoContainer.md)
- - [WorkflowActionItemDto](doc//WorkflowActionItemDto.md)
- - [WorkflowActionResponseDto](doc//WorkflowActionResponseDto.md)
  - [WorkflowCreateDto](doc//WorkflowCreateDto.md)
- - [WorkflowFilterItemDto](doc//WorkflowFilterItemDto.md)
- - [WorkflowFilterResponseDto](doc//WorkflowFilterResponseDto.md)
  - [WorkflowResponseDto](doc//WorkflowResponseDto.md)
+ - [WorkflowShareResponseDto](doc//WorkflowShareResponseDto.md)
+ - [WorkflowShareStepDto](doc//WorkflowShareStepDto.md)
+ - [WorkflowStepDto](doc//WorkflowStepDto.md)
+ - [WorkflowTrigger](doc//WorkflowTrigger.md)
+ - [WorkflowTriggerResponseDto](doc//WorkflowTriggerResponseDto.md)
+ - [WorkflowType](doc//WorkflowType.md)
  - [WorkflowUpdateDto](doc//WorkflowUpdateDto.md)
 
 

mobile/openapi/lib/api.dart

@@ -29,6 +29,7 @@ part 'auth/api_key_auth.dart';
 part 'auth/oauth.dart';
 part 'auth/http_basic_auth.dart';
 part 'auth/http_bearer_auth.dart';
+part 'optional.dart';
 
 part 'api/api_keys_api.dart';
 part 'api/activities_api.dart';
@@ -235,16 +236,8 @@ part 'model/pin_code_change_dto.dart';
 part 'model/pin_code_reset_dto.dart';
 part 'model/pin_code_setup_dto.dart';
 part 'model/places_response_dto.dart';
-part 'model/plugin_action_response_dto.dart';
-part 'model/plugin_context_type.dart';
-part 'model/plugin_filter_response_dto.dart';
-part 'model/plugin_json_schema.dart';
-part 'model/plugin_json_schema_property.dart';
-part 'model/plugin_json_schema_property_additional_properties.dart';
-part 'model/plugin_json_schema_type.dart';
+part 'model/plugin_method_response_dto.dart';
 part 'model/plugin_response_dto.dart';
-part 'model/plugin_trigger_response_dto.dart';
-part 'model/plugin_trigger_type.dart';
 part 'model/purchase_response.dart';
 part 'model/purchase_update.dart';
 part 'model/queue_command.dart';
@@ -417,12 +410,14 @@ part 'model/validate_library_response_dto.dart';
 part 'model/version_check_state_response_dto.dart';
 part 'model/video_codec.dart';
 part 'model/video_container.dart';
-part 'model/workflow_action_item_dto.dart';
-part 'model/workflow_action_response_dto.dart';
 part 'model/workflow_create_dto.dart';
-part 'model/workflow_filter_item_dto.dart';
-part 'model/workflow_filter_response_dto.dart';
 part 'model/workflow_response_dto.dart';
+part 'model/workflow_share_response_dto.dart';
+part 'model/workflow_share_step_dto.dart';
+part 'model/workflow_step_dto.dart';
+part 'model/workflow_trigger.dart';
+part 'model/workflow_trigger_response_dto.dart';
+part 'model/workflow_type.dart';
 part 'model/workflow_update_dto.dart';
 
 

mobile/openapi/lib/api/plugins_api.dart

@@ -73,14 +73,40 @@ class PluginsApi {
     return null;
   }
 
-  /// List all plugin triggers
+  /// Retrieve plugin methods
   ///
-  /// Retrieve a list of all available plugin triggers.
+  /// Retrieve a list of plugin methods
   ///
   /// Note: This method returns the HTTP [Response].
-  Future<Response> getPluginTriggersWithHttpInfo() async {
+  ///
+  /// Parameters:
+  ///
+  /// * [String] description:
+  ///
+  /// * [bool] enabled:
+  ///   Whether the plugin method is enabled
+  ///
+  /// * [String] id:
+  ///   Plugin method ID
+  ///
+  /// * [String] name:
+  ///
+  /// * [String] pluginName:
+  ///   Plugin name
+  ///
+  /// * [String] pluginVersion:
+  ///   Plugin version
+  ///
+  /// * [String] title:
+  ///
+  /// * [WorkflowTrigger] trigger:
+  ///   Workflow trigger
+  ///
+  /// * [WorkflowType] type:
+  ///   Workflow types
+  Future<Response> searchPluginMethodsWithHttpInfo({ String? description, bool? enabled, String? id, String? name, String? pluginName, String? pluginVersion, String? title, WorkflowTrigger? trigger, WorkflowType? type, }) async {
     // ignore: prefer_const_declarations
-    final apiPath = r'/plugins/triggers';
+    final apiPath = r'/plugins/methods';
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -89,6 +115,34 @@ class PluginsApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+    if (description != null) {
+      queryParams.addAll(_queryParams('', 'description', description));
+    }
+    if (enabled != null) {
+      queryParams.addAll(_queryParams('', 'enabled', enabled));
+    }
+    if (id != null) {
+      queryParams.addAll(_queryParams('', 'id', id));
+    }
+    if (name != null) {
+      queryParams.addAll(_queryParams('', 'name', name));
+    }
+    if (pluginName != null) {
+      queryParams.addAll(_queryParams('', 'pluginName', pluginName));
+    }
+    if (pluginVersion != null) {
+      queryParams.addAll(_queryParams('', 'pluginVersion', pluginVersion));
+    }
+    if (title != null) {
+      queryParams.addAll(_queryParams('', 'title', title));
+    }
+    if (trigger != null) {
+      queryParams.addAll(_queryParams('', 'trigger', trigger));
+    }
+    if (type != null) {
+      queryParams.addAll(_queryParams('', 'type', type));
+    }
+
     const contentTypes = <String>[];
 
 
@@ -103,11 +157,37 @@ class PluginsApi {
     );
   }
 
-  /// List all plugin triggers
+  /// Retrieve plugin methods
   ///
-  /// Retrieve a list of all available plugin triggers.
-  Future<List<PluginTriggerResponseDto>?> getPluginTriggers() async {
-    final response = await getPluginTriggersWithHttpInfo();
+  /// Retrieve a list of plugin methods
+  ///
+  /// Parameters:
+  ///
+  /// * [String] description:
+  ///
+  /// * [bool] enabled:
+  ///   Whether the plugin method is enabled
+  ///
+  /// * [String] id:
+  ///   Plugin method ID
+  ///
+  /// * [String] name:
+  ///
+  /// * [String] pluginName:
+  ///   Plugin name
+  ///
+  /// * [String] pluginVersion:
+  ///   Plugin version
+  ///
+  /// * [String] title:
+  ///
+  /// * [WorkflowTrigger] trigger:
+  ///   Workflow trigger
+  ///
+  /// * [WorkflowType] type:
+  ///   Workflow types
+  Future<List<PluginMethodResponseDto>?> searchPluginMethods({ String? description, bool? enabled, String? id, String? name, String? pluginName, String? pluginVersion, String? title, WorkflowTrigger? trigger, WorkflowType? type, }) async {
+    final response = await searchPluginMethodsWithHttpInfo( description: description, enabled: enabled, id: id, name: name, pluginName: pluginName, pluginVersion: pluginVersion, title: title, trigger: trigger, type: type, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -116,8 +196,8 @@ class PluginsApi {
     // FormatException when trying to decode an empty string.
     if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
       final responseBody = await _decodeBodyBytes(response);
-      return (await apiClient.deserializeAsync(responseBody, 'List<PluginTriggerResponseDto>') as List)
-        .cast<PluginTriggerResponseDto>()
+      return (await apiClient.deserializeAsync(responseBody, 'List<PluginMethodResponseDto>') as List)
+        .cast<PluginMethodResponseDto>()
         .toList(growable: false);
 
     }
@@ -129,7 +209,23 @@ class PluginsApi {
   /// Retrieve a list of plugins available to the authenticated user.
   ///
   /// Note: This method returns the HTTP [Response].
-  Future<Response> getPluginsWithHttpInfo() async {
+  ///
+  /// Parameters:
+  ///
+  /// * [String] description:
+  ///
+  /// * [bool] enabled:
+  ///   Whether the plugin is enabled
+  ///
+  /// * [String] id:
+  ///   Plugin ID
+  ///
+  /// * [String] name:
+  ///
+  /// * [String] title:
+  ///
+  /// * [String] version:
+  Future<Response> searchPluginsWithHttpInfo({ String? description, bool? enabled, String? id, String? name, String? title, String? version, }) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/plugins';
 
@@ -140,6 +236,25 @@ class PluginsApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
+    if (description != null) {
+      queryParams.addAll(_queryParams('', 'description', description));
+    }
+    if (enabled != null) {
+      queryParams.addAll(_queryParams('', 'enabled', enabled));
+    }
+    if (id != null) {
+      queryParams.addAll(_queryParams('', 'id', id));
+    }
+    if (name != null) {
+      queryParams.addAll(_queryParams('', 'name', name));
+    }
+    if (title != null) {
+      queryParams.addAll(_queryParams('', 'title', title));
+    }
+    if (version != null) {
+      queryParams.addAll(_queryParams('', 'version', version));
+    }
+
     const contentTypes = <String>[];
 
 
@@ -157,8 +272,24 @@ class PluginsApi {
   /// List all plugins
   ///
   /// Retrieve a list of plugins available to the authenticated user.
-  Future<List<PluginResponseDto>?> getPlugins() async {
-    final response = await getPluginsWithHttpInfo();
+  ///
+  /// Parameters:
+  ///
+  /// * [String] description:
+  ///
+  /// * [bool] enabled:
+  ///   Whether the plugin is enabled
+  ///
+  /// * [String] id:
+  ///   Plugin ID
+  ///
+  /// * [String] name:
+  ///
+  /// * [String] title:
+  ///
+  /// * [String] version:
+  Future<List<PluginResponseDto>?> searchPlugins({ String? description, bool? enabled, String? id, String? name, String? title, String? version, }) async {
+    final response = await searchPluginsWithHttpInfo( description: description, enabled: enabled, id: id, name: name, title: title, version: version, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }

mobile/openapi/lib/api/workflows_api.dart

@@ -178,14 +178,19 @@ class WorkflowsApi {
     return null;
   }
 
-  /// List all workflows
+  /// Retrieve a workflow
   ///
-  /// Retrieve a list of workflows available to the authenticated user.
+  /// Retrieve a workflow details without ids, default values, etc.
   ///
   /// Note: This method returns the HTTP [Response].
-  Future<Response> getWorkflowsWithHttpInfo() async {
+  ///
+  /// Parameters:
+  ///
+  /// * [String] id (required):
+  Future<Response> getWorkflowForShareWithHttpInfo(String id,) async {
     // ignore: prefer_const_declarations
-    final apiPath = r'/workflows';
+    final apiPath = r'/workflows/{id}/share'
+      .replaceAll('{id}', id);
 
     // ignore: prefer_final_locals
     Object? postBody;
@@ -208,11 +213,164 @@ class WorkflowsApi {
     );
   }
 
+  /// Retrieve a workflow
+  ///
+  /// Retrieve a workflow details without ids, default values, etc.
+  ///
+  /// Parameters:
+  ///
+  /// * [String] id (required):
+  Future<WorkflowShareResponseDto?> getWorkflowForShare(String id,) async {
+    final response = await getWorkflowForShareWithHttpInfo(id,);
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+    // When a remote server returns no body with a status of 204, we shall not decode it.
+    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
+    // FormatException when trying to decode an empty string.
+    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'WorkflowShareResponseDto',) as WorkflowShareResponseDto;
+    
+    }
+    return null;
+  }
+
+  /// List all workflow triggers
+  ///
+  /// Retrieve a list of all available workflow triggers.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  Future<Response> getWorkflowTriggersWithHttpInfo() async {
+    // ignore: prefer_const_declarations
+    final apiPath = r'/workflows/triggers';
+
+    // ignore: prefer_final_locals
+    Object? postBody;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>[];
+
+
+    return apiClient.invokeAPI(
+      apiPath,
+      'GET',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// List all workflow triggers
+  ///
+  /// Retrieve a list of all available workflow triggers.
+  Future<List<WorkflowTriggerResponseDto>?> getWorkflowTriggers() async {
+    final response = await getWorkflowTriggersWithHttpInfo();
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+    // When a remote server returns no body with a status of 204, we shall not decode it.
+    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
+    // FormatException when trying to decode an empty string.
+    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
+      final responseBody = await _decodeBodyBytes(response);
+      return (await apiClient.deserializeAsync(responseBody, 'List<WorkflowTriggerResponseDto>') as List)
+        .cast<WorkflowTriggerResponseDto>()
+        .toList(growable: false);
+
+    }
+    return null;
+  }
+
   /// List all workflows
   ///
   /// Retrieve a list of workflows available to the authenticated user.
-  Future<List<WorkflowResponseDto>?> getWorkflows() async {
-    final response = await getWorkflowsWithHttpInfo();
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
+  /// Parameters:
+  ///
+  /// * [String] description:
+  ///   Workflow description
+  ///
+  /// * [bool] enabled:
+  ///   Workflow enabled
+  ///
+  /// * [String] id:
+  ///   Workflow ID
+  ///
+  /// * [String] name:
+  ///   Workflow name
+  ///
+  /// * [WorkflowTrigger] trigger:
+  ///   Workflow trigger type
+  Future<Response> searchWorkflowsWithHttpInfo({ String? description, bool? enabled, String? id, String? name, WorkflowTrigger? trigger, }) async {
+    // ignore: prefer_const_declarations
+    final apiPath = r'/workflows';
+
+    // ignore: prefer_final_locals
+    Object? postBody;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    if (description != null) {
+      queryParams.addAll(_queryParams('', 'description', description));
+    }
+    if (enabled != null) {
+      queryParams.addAll(_queryParams('', 'enabled', enabled));
+    }
+    if (id != null) {
+      queryParams.addAll(_queryParams('', 'id', id));
+    }
+    if (name != null) {
+      queryParams.addAll(_queryParams('', 'name', name));
+    }
+    if (trigger != null) {
+      queryParams.addAll(_queryParams('', 'trigger', trigger));
+    }
+
+    const contentTypes = <String>[];
+
+
+    return apiClient.invokeAPI(
+      apiPath,
+      'GET',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// List all workflows
+  ///
+  /// Retrieve a list of workflows available to the authenticated user.
+  ///
+  /// Parameters:
+  ///
+  /// * [String] description:
+  ///   Workflow description
+  ///
+  /// * [bool] enabled:
+  ///   Workflow enabled
+  ///
+  /// * [String] id:
+  ///   Workflow ID
+  ///
+  /// * [String] name:
+  ///   Workflow name
+  ///
+  /// * [WorkflowTrigger] trigger:
+  ///   Workflow trigger type
+  Future<List<WorkflowResponseDto>?> searchWorkflows({ String? description, bool? enabled, String? id, String? name, WorkflowTrigger? trigger, }) async {
+    final response = await searchWorkflowsWithHttpInfo( description: description, enabled: enabled, id: id, name: name, trigger: trigger, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }

mobile/openapi/lib/api_client.dart

@@ -143,19 +143,19 @@ class ApiClient {
     );
   }
 
-  Future<dynamic> deserializeAsync(String value, String targetType, {bool growable = false,}) =>
+  Future<dynamic> deserializeAsync(String value, String targetType, {bool growable = false,}) async =>
     // ignore: deprecated_member_use_from_same_package
     deserialize(value, targetType, growable: growable);
 
   @Deprecated('Scheduled for removal in OpenAPI Generator 6.x. Use deserializeAsync() instead.')
-  Future<dynamic> deserialize(String value, String targetType, {bool growable = false,}) async {
+  dynamic deserialize(String value, String targetType, {bool growable = false,}) {
     // Remove all spaces. Necessary for regular expressions as well.
     targetType = targetType.replaceAll(' ', ''); // ignore: parameter_assignments
 
     // If the expected target type is String, nothing to do...
     return targetType == 'String'
       ? value
-      : fromJson(await compute((String j) => json.decode(j), value), targetType, growable: growable);
+      : fromJson(json.decode(value), targetType, growable: growable);
   }
 
   // ignore: deprecated_member_use_from_same_package
@@ -516,26 +516,10 @@ class ApiClient {
           return PinCodeSetupDto.fromJson(value);
         case 'PlacesResponseDto':
           return PlacesResponseDto.fromJson(value);
-        case 'PluginActionResponseDto':
-          return PluginActionResponseDto.fromJson(value);
-        case 'PluginContextType':
-          return PluginContextTypeTypeTransformer().decode(value);
-        case 'PluginFilterResponseDto':
-          return PluginFilterResponseDto.fromJson(value);
-        case 'PluginJsonSchema':
-          return PluginJsonSchema.fromJson(value);
-        case 'PluginJsonSchemaProperty':
-          return PluginJsonSchemaProperty.fromJson(value);
-        case 'PluginJsonSchemaPropertyAdditionalProperties':
-          return PluginJsonSchemaPropertyAdditionalProperties.fromJson(value);
-        case 'PluginJsonSchemaType':
-          return PluginJsonSchemaTypeTypeTransformer().decode(value);
+        case 'PluginMethodResponseDto':
+          return PluginMethodResponseDto.fromJson(value);
         case 'PluginResponseDto':
           return PluginResponseDto.fromJson(value);
-        case 'PluginTriggerResponseDto':
-          return PluginTriggerResponseDto.fromJson(value);
-        case 'PluginTriggerType':
-          return PluginTriggerTypeTypeTransformer().decode(value);
         case 'PurchaseResponse':
           return PurchaseResponse.fromJson(value);
         case 'PurchaseUpdate':
@@ -880,18 +864,22 @@ class ApiClient {
           return VideoCodecTypeTransformer().decode(value);
         case 'VideoContainer':
           return VideoContainerTypeTransformer().decode(value);
-        case 'WorkflowActionItemDto':
-          return WorkflowActionItemDto.fromJson(value);
-        case 'WorkflowActionResponseDto':
-          return WorkflowActionResponseDto.fromJson(value);
         case 'WorkflowCreateDto':
           return WorkflowCreateDto.fromJson(value);
-        case 'WorkflowFilterItemDto':
-          return WorkflowFilterItemDto.fromJson(value);
-        case 'WorkflowFilterResponseDto':
-          return WorkflowFilterResponseDto.fromJson(value);
         case 'WorkflowResponseDto':
           return WorkflowResponseDto.fromJson(value);
+        case 'WorkflowShareResponseDto':
+          return WorkflowShareResponseDto.fromJson(value);
+        case 'WorkflowShareStepDto':
+          return WorkflowShareStepDto.fromJson(value);
+        case 'WorkflowStepDto':
+          return WorkflowStepDto.fromJson(value);
+        case 'WorkflowTrigger':
+          return WorkflowTriggerTypeTransformer().decode(value);
+        case 'WorkflowTriggerResponseDto':
+          return WorkflowTriggerResponseDto.fromJson(value);
+        case 'WorkflowType':
+          return WorkflowTypeTypeTransformer().decode(value);
         case 'WorkflowUpdateDto':
           return WorkflowUpdateDto.fromJson(value);
         default:

mobile/openapi/lib/api_helper.dart

@@ -142,15 +142,6 @@ String parameterToString(dynamic value) {
   if (value is Permission) {
     return PermissionTypeTransformer().encode(value).toString();
   }
-  if (value is PluginContextType) {
-    return PluginContextTypeTypeTransformer().encode(value).toString();
-  }
-  if (value is PluginJsonSchemaType) {
-    return PluginJsonSchemaTypeTypeTransformer().encode(value).toString();
-  }
-  if (value is PluginTriggerType) {
-    return PluginTriggerTypeTypeTransformer().encode(value).toString();
-  }
   if (value is QueueCommand) {
     return QueueCommandTypeTransformer().encode(value).toString();
   }
@@ -208,6 +199,12 @@ String parameterToString(dynamic value) {
   if (value is VideoContainer) {
     return VideoContainerTypeTransformer().encode(value).toString();
   }
+  if (value is WorkflowTrigger) {
+    return WorkflowTriggerTypeTransformer().encode(value).toString();
+  }
+  if (value is WorkflowType) {
+    return WorkflowTypeTypeTransformer().encode(value).toString();
+  }
   return value.toString();
 }
 
@@ -223,6 +220,9 @@ Future<String> _decodeBodyBytes(Response response) async {
 /// Returns a valid [T] value found at the specified Map [key], null otherwise.
 T? mapValueOfType<T>(dynamic map, String key) {
   final dynamic value = map is Map ? map[key] : null;
+  if (T == double && value is int) {
+    return value.toDouble() as T;
+  }
   return value is T ? value : null;
 }
 

mobile/openapi/lib/model/activity_create_dto.dart

@@ -14,8 +14,8 @@ class ActivityCreateDto {
   /// Returns a new [ActivityCreateDto] instance.
   ActivityCreateDto({
     required this.albumId,
-    this.assetId,
-    this.comment,
+    this.assetId = const Optional.absent(),
+    this.comment = const Optional.absent(),
     required this.type,
   });
 
@@ -29,7 +29,7 @@ class ActivityCreateDto {
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  String? assetId;
+  Optional<String?> assetId;
 
   /// Comment text (required if type is comment)
   ///
@@ -38,7 +38,7 @@ class ActivityCreateDto {
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  String? comment;
+  Optional<String?> comment;
 
   ReactionType type;
 
@@ -63,15 +63,13 @@ class ActivityCreateDto {
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
       json[r'albumId'] = this.albumId;
-    if (this.assetId != null) {
-      json[r'assetId'] = this.assetId;
-    } else {
-    //  json[r'assetId'] = null;
+    if (this.assetId.isPresent) {
+      final value = this.assetId.value;
+      json[r'assetId'] = value;
     }
-    if (this.comment != null) {
-      json[r'comment'] = this.comment;
-    } else {
-    //  json[r'comment'] = null;
+    if (this.comment.isPresent) {
+      final value = this.comment.value;
+      json[r'comment'] = value;
     }
       json[r'type'] = this.type;
     return json;
@@ -85,10 +83,21 @@ class ActivityCreateDto {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        assert(json.containsKey(r'albumId'), 'Required key "ActivityCreateDto[albumId]" is missing from JSON.');
+        assert(json[r'albumId'] != null, 'Required key "ActivityCreateDto[albumId]" has a null value in JSON.');
+        assert(json.containsKey(r'type'), 'Required key "ActivityCreateDto[type]" is missing from JSON.');
+        assert(json[r'type'] != null, 'Required key "ActivityCreateDto[type]" has a null value in JSON.');
+        return true;
+      }());
+
       return ActivityCreateDto(
         albumId: mapValueOfType<String>(json, r'albumId')!,
-        assetId: mapValueOfType<String>(json, r'assetId'),
-        comment: mapValueOfType<String>(json, r'comment'),
+        assetId: json.containsKey(r'assetId') ? Optional.present(mapValueOfType<String>(json, r'assetId')) : const Optional.absent(),
+        comment: json.containsKey(r'comment') ? Optional.present(mapValueOfType<String>(json, r'comment')) : const Optional.absent(),
         type: ReactionType.fromJson(json[r'type'])!,
       );
     }

mobile/openapi/lib/model/activity_response_dto.dart

@@ -14,7 +14,7 @@ class ActivityResponseDto {
   /// Returns a new [ActivityResponseDto] instance.
   ActivityResponseDto({
     required this.assetId,
-    this.comment,
+    this.comment = const Optional.absent(),
     required this.createdAt,
     required this.id,
     required this.type,
@@ -25,7 +25,7 @@ class ActivityResponseDto {
   String? assetId;
 
   /// Comment text (for comment activities)
-  String? comment;
+  Optional<String?> comment;
 
   /// Creation date
   DateTime createdAt;
@@ -64,12 +64,11 @@ class ActivityResponseDto {
     if (this.assetId != null) {
       json[r'assetId'] = this.assetId;
     } else {
-    //  json[r'assetId'] = null;
+      json[r'assetId'] = null;
     }
-    if (this.comment != null) {
-      json[r'comment'] = this.comment;
-    } else {
-    //  json[r'comment'] = null;
+    if (this.comment.isPresent) {
+      final value = this.comment.value;
+      json[r'comment'] = value;
     }
       json[r'createdAt'] = _isEpochMarker(r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')
         ? this.createdAt.millisecondsSinceEpoch
@@ -88,9 +87,25 @@ class ActivityResponseDto {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        assert(json.containsKey(r'assetId'), 'Required key "ActivityResponseDto[assetId]" is missing from JSON.');
+        assert(json.containsKey(r'createdAt'), 'Required key "ActivityResponseDto[createdAt]" is missing from JSON.');
+        assert(json[r'createdAt'] != null, 'Required key "ActivityResponseDto[createdAt]" has a null value in JSON.');
+        assert(json.containsKey(r'id'), 'Required key "ActivityResponseDto[id]" is missing from JSON.');
+        assert(json[r'id'] != null, 'Required key "ActivityResponseDto[id]" has a null value in JSON.');
+        assert(json.containsKey(r'type'), 'Required key "ActivityResponseDto[type]" is missing from JSON.');
+        assert(json[r'type'] != null, 'Required key "ActivityResponseDto[type]" has a null value in JSON.');
+        assert(json.containsKey(r'user'), 'Required key "ActivityResponseDto[user]" is missing from JSON.');
+        assert(json[r'user'] != null, 'Required key "ActivityResponseDto[user]" has a null value in JSON.');
+        return true;
+      }());
+
       return ActivityResponseDto(
         assetId: mapValueOfType<String>(json, r'assetId'),
-        comment: mapValueOfType<String>(json, r'comment'),
+        comment: json.containsKey(r'comment') ? Optional.present(mapValueOfType<String>(json, r'comment')) : const Optional.absent(),
         createdAt: mapDateTime(json, r'createdAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')!,
         id: mapValueOfType<String>(json, r'id')!,
         type: ReactionType.fromJson(json[r'type'])!,

mobile/openapi/lib/model/activity_statistics_response_dto.dart

@@ -58,6 +58,17 @@ class ActivityStatisticsResponseDto {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        assert(json.containsKey(r'comments'), 'Required key "ActivityStatisticsResponseDto[comments]" is missing from JSON.');
+        assert(json[r'comments'] != null, 'Required key "ActivityStatisticsResponseDto[comments]" has a null value in JSON.');
+        assert(json.containsKey(r'likes'), 'Required key "ActivityStatisticsResponseDto[likes]" is missing from JSON.');
+        assert(json[r'likes'] != null, 'Required key "ActivityStatisticsResponseDto[likes]" has a null value in JSON.');
+        return true;
+      }());
+
       return ActivityStatisticsResponseDto(
         comments: mapValueOfType<int>(json, r'comments')!,
         likes: mapValueOfType<int>(json, r'likes')!,

mobile/openapi/lib/model/add_users_dto.dart

@@ -45,6 +45,15 @@ class AddUsersDto {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        assert(json.containsKey(r'albumUsers'), 'Required key "AddUsersDto[albumUsers]" is missing from JSON.');
+        assert(json[r'albumUsers'] != null, 'Required key "AddUsersDto[albumUsers]" has a null value in JSON.');
+        return true;
+      }());
+
       return AddUsersDto(
         albumUsers: AlbumUserAddDto.listFromJson(json[r'albumUsers']),
       );

mobile/openapi/lib/model/admin_onboarding_update_dto.dart

@@ -45,6 +45,15 @@ class AdminOnboardingUpdateDto {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        assert(json.containsKey(r'isOnboarded'), 'Required key "AdminOnboardingUpdateDto[isOnboarded]" is missing from JSON.');
+        assert(json[r'isOnboarded'] != null, 'Required key "AdminOnboardingUpdateDto[isOnboarded]" has a null value in JSON.');
+        return true;
+      }());
+
       return AdminOnboardingUpdateDto(
         isOnboarded: mapValueOfType<bool>(json, r'isOnboarded')!,
       );

mobile/openapi/lib/model/album_response_dto.dart

@@ -17,17 +17,17 @@ class AlbumResponseDto {
     required this.albumThumbnailAssetId,
     this.albumUsers = const [],
     required this.assetCount,
-    this.contributorCounts = const [],
+    this.contributorCounts = const Optional.present(const []),
     required this.createdAt,
     required this.description,
-    this.endDate,
+    this.endDate = const Optional.absent(),
     required this.hasSharedLink,
     required this.id,
     required this.isActivityEnabled,
-    this.lastModifiedAssetTimestamp,
-    this.order,
+    this.lastModifiedAssetTimestamp = const Optional.absent(),
+    this.order = const Optional.absent(),
     required this.shared,
-    this.startDate,
+    this.startDate = const Optional.absent(),
     required this.updatedAt,
   });
 
@@ -46,7 +46,7 @@ class AlbumResponseDto {
   /// Maximum value: 9007199254740991
   int assetCount;
 
-  List<ContributorCountResponseDto> contributorCounts;
+  Optional<List<ContributorCountResponseDto>?> contributorCounts;
 
   /// Creation date
   DateTime createdAt;
@@ -61,7 +61,7 @@ class AlbumResponseDto {
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  DateTime? endDate;
+  Optional<DateTime?> endDate;
 
   /// Has shared link
   bool hasSharedLink;
@@ -79,7 +79,7 @@ class AlbumResponseDto {
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  DateTime? lastModifiedAssetTimestamp;
+  Optional<DateTime?> lastModifiedAssetTimestamp;
 
   ///
   /// Please note: This property should have been non-nullable! Since the specification file
@@ -87,7 +87,7 @@ class AlbumResponseDto {
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  AssetOrder? order;
+  Optional<AssetOrder?> order;
 
   /// Is shared album
   bool shared;
@@ -99,7 +99,7 @@ class AlbumResponseDto {
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  DateTime? startDate;
+  Optional<DateTime?> startDate;
 
   /// Last update date
   DateTime updatedAt;
@@ -152,36 +152,35 @@ class AlbumResponseDto {
     if (this.albumThumbnailAssetId != null) {
       json[r'albumThumbnailAssetId'] = this.albumThumbnailAssetId;
     } else {
-    //  json[r'albumThumbnailAssetId'] = null;
+      json[r'albumThumbnailAssetId'] = null;
     }
       json[r'albumUsers'] = this.albumUsers;
       json[r'assetCount'] = this.assetCount;
-      json[r'contributorCounts'] = this.contributorCounts;
+    if (this.contributorCounts.isPresent) {
+      final value = this.contributorCounts.value;
+      json[r'contributorCounts'] = value;
+    }
       json[r'createdAt'] = this.createdAt.toUtc().toIso8601String();
       json[r'description'] = this.description;
-    if (this.endDate != null) {
-      json[r'endDate'] = this.endDate!.toUtc().toIso8601String();
-    } else {
-    //  json[r'endDate'] = null;
+    if (this.endDate.isPresent) {
+      final value = this.endDate.value;
+      json[r'endDate'] = value == null ? null : value.toUtc().toIso8601String();
     }
       json[r'hasSharedLink'] = this.hasSharedLink;
       json[r'id'] = this.id;
       json[r'isActivityEnabled'] = this.isActivityEnabled;
-    if (this.lastModifiedAssetTimestamp != null) {
-      json[r'lastModifiedAssetTimestamp'] = this.lastModifiedAssetTimestamp!.toUtc().toIso8601String();
-    } else {
-    //  json[r'lastModifiedAssetTimestamp'] = null;
+    if (this.lastModifiedAssetTimestamp.isPresent) {
+      final value = this.lastModifiedAssetTimestamp.value;
+      json[r'lastModifiedAssetTimestamp'] = value == null ? null : value.toUtc().toIso8601String();
     }
-    if (this.order != null) {
-      json[r'order'] = this.order;
-    } else {
-    //  json[r'order'] = null;
+    if (this.order.isPresent) {
+      final value = this.order.value;
+      json[r'order'] = value;
     }
       json[r'shared'] = this.shared;
-    if (this.startDate != null) {
-      json[r'startDate'] = this.startDate!.toUtc().toIso8601String();
-    } else {
-    //  json[r'startDate'] = null;
+    if (this.startDate.isPresent) {
+      final value = this.startDate.value;
+      json[r'startDate'] = value == null ? null : value.toUtc().toIso8601String();
     }
       json[r'updatedAt'] = this.updatedAt.toUtc().toIso8601String();
     return json;
@@ -195,22 +194,50 @@ class AlbumResponseDto {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        assert(json.containsKey(r'albumName'), 'Required key "AlbumResponseDto[albumName]" is missing from JSON.');
+        assert(json[r'albumName'] != null, 'Required key "AlbumResponseDto[albumName]" has a null value in JSON.');
+        assert(json.containsKey(r'albumThumbnailAssetId'), 'Required key "AlbumResponseDto[albumThumbnailAssetId]" is missing from JSON.');
+        assert(json.containsKey(r'albumUsers'), 'Required key "AlbumResponseDto[albumUsers]" is missing from JSON.');
+        assert(json[r'albumUsers'] != null, 'Required key "AlbumResponseDto[albumUsers]" has a null value in JSON.');
+        assert(json.containsKey(r'assetCount'), 'Required key "AlbumResponseDto[assetCount]" is missing from JSON.');
+        assert(json[r'assetCount'] != null, 'Required key "AlbumResponseDto[assetCount]" has a null value in JSON.');
+        assert(json.containsKey(r'createdAt'), 'Required key "AlbumResponseDto[createdAt]" is missing from JSON.');
+        assert(json[r'createdAt'] != null, 'Required key "AlbumResponseDto[createdAt]" has a null value in JSON.');
+        assert(json.containsKey(r'description'), 'Required key "AlbumResponseDto[description]" is missing from JSON.');
+        assert(json[r'description'] != null, 'Required key "AlbumResponseDto[description]" has a null value in JSON.');
+        assert(json.containsKey(r'hasSharedLink'), 'Required key "AlbumResponseDto[hasSharedLink]" is missing from JSON.');
+        assert(json[r'hasSharedLink'] != null, 'Required key "AlbumResponseDto[hasSharedLink]" has a null value in JSON.');
+        assert(json.containsKey(r'id'), 'Required key "AlbumResponseDto[id]" is missing from JSON.');
+        assert(json[r'id'] != null, 'Required key "AlbumResponseDto[id]" has a null value in JSON.');
+        assert(json.containsKey(r'isActivityEnabled'), 'Required key "AlbumResponseDto[isActivityEnabled]" is missing from JSON.');
+        assert(json[r'isActivityEnabled'] != null, 'Required key "AlbumResponseDto[isActivityEnabled]" has a null value in JSON.');
+        assert(json.containsKey(r'shared'), 'Required key "AlbumResponseDto[shared]" is missing from JSON.');
+        assert(json[r'shared'] != null, 'Required key "AlbumResponseDto[shared]" has a null value in JSON.');
+        assert(json.containsKey(r'updatedAt'), 'Required key "AlbumResponseDto[updatedAt]" is missing from JSON.');
+        assert(json[r'updatedAt'] != null, 'Required key "AlbumResponseDto[updatedAt]" has a null value in JSON.');
+        return true;
+      }());
+
       return AlbumResponseDto(
         albumName: mapValueOfType<String>(json, r'albumName')!,
         albumThumbnailAssetId: mapValueOfType<String>(json, r'albumThumbnailAssetId'),
         albumUsers: AlbumUserResponseDto.listFromJson(json[r'albumUsers']),
         assetCount: mapValueOfType<int>(json, r'assetCount')!,
-        contributorCounts: ContributorCountResponseDto.listFromJson(json[r'contributorCounts']),
+        contributorCounts: json.containsKey(r'contributorCounts') ? Optional.present(ContributorCountResponseDto.listFromJson(json[r'contributorCounts'])) : const Optional.absent(),
         createdAt: mapDateTime(json, r'createdAt', r'')!,
         description: mapValueOfType<String>(json, r'description')!,
-        endDate: mapDateTime(json, r'endDate', r''),
+        endDate: json.containsKey(r'endDate') ? Optional.present(mapDateTime(json, r'endDate', r'')) : const Optional.absent(),
         hasSharedLink: mapValueOfType<bool>(json, r'hasSharedLink')!,
         id: mapValueOfType<String>(json, r'id')!,
         isActivityEnabled: mapValueOfType<bool>(json, r'isActivityEnabled')!,
-        lastModifiedAssetTimestamp: mapDateTime(json, r'lastModifiedAssetTimestamp', r''),
-        order: AssetOrder.fromJson(json[r'order']),
+        lastModifiedAssetTimestamp: json.containsKey(r'lastModifiedAssetTimestamp') ? Optional.present(mapDateTime(json, r'lastModifiedAssetTimestamp', r'')) : const Optional.absent(),
+        order: json.containsKey(r'order') ? Optional.present(AssetOrder.fromJson(json[r'order'])) : const Optional.absent(),
         shared: mapValueOfType<bool>(json, r'shared')!,
-        startDate: mapDateTime(json, r'startDate', r''),
+        startDate: json.containsKey(r'startDate') ? Optional.present(mapDateTime(json, r'startDate', r'')) : const Optional.absent(),
         updatedAt: mapDateTime(json, r'updatedAt', r'')!,
       );
     }

mobile/openapi/lib/model/album_statistics_response_dto.dart

@@ -68,6 +68,19 @@ class AlbumStatisticsResponseDto {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        assert(json.containsKey(r'notShared'), 'Required key "AlbumStatisticsResponseDto[notShared]" is missing from JSON.');
+        assert(json[r'notShared'] != null, 'Required key "AlbumStatisticsResponseDto[notShared]" has a null value in JSON.');
+        assert(json.containsKey(r'owned'), 'Required key "AlbumStatisticsResponseDto[owned]" is missing from JSON.');
+        assert(json[r'owned'] != null, 'Required key "AlbumStatisticsResponseDto[owned]" has a null value in JSON.');
+        assert(json.containsKey(r'shared'), 'Required key "AlbumStatisticsResponseDto[shared]" is missing from JSON.');
+        assert(json[r'shared'] != null, 'Required key "AlbumStatisticsResponseDto[shared]" has a null value in JSON.');
+        return true;
+      }());
+
       return AlbumStatisticsResponseDto(
         notShared: mapValueOfType<int>(json, r'notShared')!,
         owned: mapValueOfType<int>(json, r'owned')!,

mobile/openapi/lib/model/album_user_add_dto.dart

@@ -13,7 +13,7 @@ part of openapi.api;
 class AlbumUserAddDto {
   /// Returns a new [AlbumUserAddDto] instance.
   AlbumUserAddDto({
-    this.role,
+    this.role = const Optional.absent(),
     required this.userId,
   });
 
@@ -23,7 +23,7 @@ class AlbumUserAddDto {
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  AlbumUserRole? role;
+  Optional<AlbumUserRole?> role;
 
   /// User ID
   String userId;
@@ -44,10 +44,9 @@ class AlbumUserAddDto {
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
-    if (this.role != null) {
-      json[r'role'] = this.role;
-    } else {
-    //  json[r'role'] = null;
+    if (this.role.isPresent) {
+      final value = this.role.value;
+      json[r'role'] = value;
     }
       json[r'userId'] = this.userId;
     return json;
@@ -61,8 +60,17 @@ class AlbumUserAddDto {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        assert(json.containsKey(r'userId'), 'Required key "AlbumUserAddDto[userId]" is missing from JSON.');
+        assert(json[r'userId'] != null, 'Required key "AlbumUserAddDto[userId]" has a null value in JSON.');
+        return true;
+      }());
+
       return AlbumUserAddDto(
-        role: AlbumUserRole.fromJson(json[r'role']),
+        role: json.containsKey(r'role') ? Optional.present(AlbumUserRole.fromJson(json[r'role'])) : const Optional.absent(),
         userId: mapValueOfType<String>(json, r'userId')!,
       );
     }

mobile/openapi/lib/model/album_user_create_dto.dart

@@ -51,6 +51,17 @@ class AlbumUserCreateDto {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        assert(json.containsKey(r'role'), 'Required key "AlbumUserCreateDto[role]" is missing from JSON.');
+        assert(json[r'role'] != null, 'Required key "AlbumUserCreateDto[role]" has a null value in JSON.');
+        assert(json.containsKey(r'userId'), 'Required key "AlbumUserCreateDto[userId]" is missing from JSON.');
+        assert(json[r'userId'] != null, 'Required key "AlbumUserCreateDto[userId]" has a null value in JSON.');
+        return true;
+      }());
+
       return AlbumUserCreateDto(
         role: AlbumUserRole.fromJson(json[r'role'])!,
         userId: mapValueOfType<String>(json, r'userId')!,

mobile/openapi/lib/model/album_user_response_dto.dart

@@ -50,6 +50,17 @@ class AlbumUserResponseDto {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        assert(json.containsKey(r'role'), 'Required key "AlbumUserResponseDto[role]" is missing from JSON.');
+        assert(json[r'role'] != null, 'Required key "AlbumUserResponseDto[role]" has a null value in JSON.');
+        assert(json.containsKey(r'user'), 'Required key "AlbumUserResponseDto[user]" is missing from JSON.');
+        assert(json[r'user'] != null, 'Required key "AlbumUserResponseDto[user]" has a null value in JSON.');
+        return true;
+      }());
+
       return AlbumUserResponseDto(
         role: AlbumUserRole.fromJson(json[r'role'])!,
         user: UserResponseDto.fromJson(json[r'user'])!,

mobile/openapi/lib/model/albums_add_assets_dto.dart

@@ -52,6 +52,17 @@ class AlbumsAddAssetsDto {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        assert(json.containsKey(r'albumIds'), 'Required key "AlbumsAddAssetsDto[albumIds]" is missing from JSON.');
+        assert(json[r'albumIds'] != null, 'Required key "AlbumsAddAssetsDto[albumIds]" has a null value in JSON.');
+        assert(json.containsKey(r'assetIds'), 'Required key "AlbumsAddAssetsDto[assetIds]" is missing from JSON.');
+        assert(json[r'assetIds'] != null, 'Required key "AlbumsAddAssetsDto[assetIds]" has a null value in JSON.');
+        return true;
+      }());
+
       return AlbumsAddAssetsDto(
         albumIds: json[r'albumIds'] is Iterable
             ? (json[r'albumIds'] as Iterable).cast<String>().toList(growable: false)

mobile/openapi/lib/model/albums_add_assets_response_dto.dart

@@ -13,7 +13,7 @@ part of openapi.api;
 class AlbumsAddAssetsResponseDto {
   /// Returns a new [AlbumsAddAssetsResponseDto] instance.
   AlbumsAddAssetsResponseDto({
-    this.error,
+    this.error = const Optional.absent(),
     required this.success,
   });
 
@@ -23,7 +23,7 @@ class AlbumsAddAssetsResponseDto {
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  BulkIdErrorReason? error;
+  Optional<BulkIdErrorReason?> error;
 
   /// Operation success
   bool success;
@@ -44,10 +44,9 @@ class AlbumsAddAssetsResponseDto {
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
-    if (this.error != null) {
-      json[r'error'] = this.error;
-    } else {
-    //  json[r'error'] = null;
+    if (this.error.isPresent) {
+      final value = this.error.value;
+      json[r'error'] = value;
     }
       json[r'success'] = this.success;
     return json;
@@ -61,8 +60,17 @@ class AlbumsAddAssetsResponseDto {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        assert(json.containsKey(r'success'), 'Required key "AlbumsAddAssetsResponseDto[success]" is missing from JSON.');
+        assert(json[r'success'] != null, 'Required key "AlbumsAddAssetsResponseDto[success]" has a null value in JSON.');
+        return true;
+      }());
+
       return AlbumsAddAssetsResponseDto(
-        error: BulkIdErrorReason.fromJson(json[r'error']),
+        error: json.containsKey(r'error') ? Optional.present(BulkIdErrorReason.fromJson(json[r'error'])) : const Optional.absent(),
         success: mapValueOfType<bool>(json, r'success')!,
       );
     }

mobile/openapi/lib/model/albums_response.dart

@@ -44,6 +44,15 @@ class AlbumsResponse {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        assert(json.containsKey(r'defaultAssetOrder'), 'Required key "AlbumsResponse[defaultAssetOrder]" is missing from JSON.');
+        assert(json[r'defaultAssetOrder'] != null, 'Required key "AlbumsResponse[defaultAssetOrder]" has a null value in JSON.');
+        return true;
+      }());
+
       return AlbumsResponse(
         defaultAssetOrder: AssetOrder.fromJson(json[r'defaultAssetOrder'])!,
       );

mobile/openapi/lib/model/albums_update.dart

@@ -13,7 +13,7 @@ part of openapi.api;
 class AlbumsUpdate {
   /// Returns a new [AlbumsUpdate] instance.
   AlbumsUpdate({
-    this.defaultAssetOrder,
+    this.defaultAssetOrder = const Optional.absent(),
   });
 
   ///
@@ -22,7 +22,7 @@ class AlbumsUpdate {
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  AssetOrder? defaultAssetOrder;
+  Optional<AssetOrder?> defaultAssetOrder;
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is AlbumsUpdate &&
@@ -38,10 +38,9 @@ class AlbumsUpdate {
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
-    if (this.defaultAssetOrder != null) {
-      json[r'defaultAssetOrder'] = this.defaultAssetOrder;
-    } else {
-    //  json[r'defaultAssetOrder'] = null;
+    if (this.defaultAssetOrder.isPresent) {
+      final value = this.defaultAssetOrder.value;
+      json[r'defaultAssetOrder'] = value;
     }
     return json;
   }
@@ -54,8 +53,15 @@ class AlbumsUpdate {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        return true;
+      }());
+
       return AlbumsUpdate(
-        defaultAssetOrder: AssetOrder.fromJson(json[r'defaultAssetOrder']),
+        defaultAssetOrder: json.containsKey(r'defaultAssetOrder') ? Optional.present(AssetOrder.fromJson(json[r'defaultAssetOrder'])) : const Optional.absent(),
       );
     }
     return null;

mobile/openapi/lib/model/api_key_create_dto.dart

@@ -13,7 +13,7 @@ part of openapi.api;
 class ApiKeyCreateDto {
   /// Returns a new [ApiKeyCreateDto] instance.
   ApiKeyCreateDto({
-    this.name,
+    this.name = const Optional.absent(),
     this.permissions = const [],
   });
 
@@ -24,7 +24,7 @@ class ApiKeyCreateDto {
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  String? name;
+  Optional<String?> name;
 
   /// List of permissions
   List<Permission> permissions;
@@ -45,10 +45,9 @@ class ApiKeyCreateDto {
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
-    if (this.name != null) {
-      json[r'name'] = this.name;
-    } else {
-    //  json[r'name'] = null;
+    if (this.name.isPresent) {
+      final value = this.name.value;
+      json[r'name'] = value;
     }
       json[r'permissions'] = this.permissions;
     return json;
@@ -62,8 +61,17 @@ class ApiKeyCreateDto {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        assert(json.containsKey(r'permissions'), 'Required key "ApiKeyCreateDto[permissions]" is missing from JSON.');
+        assert(json[r'permissions'] != null, 'Required key "ApiKeyCreateDto[permissions]" has a null value in JSON.');
+        return true;
+      }());
+
       return ApiKeyCreateDto(
-        name: mapValueOfType<String>(json, r'name'),
+        name: json.containsKey(r'name') ? Optional.present(mapValueOfType<String>(json, r'name')) : const Optional.absent(),
         permissions: Permission.listFromJson(json[r'permissions']),
       );
     }

mobile/openapi/lib/model/api_key_create_response_dto.dart

@@ -51,6 +51,17 @@ class ApiKeyCreateResponseDto {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        assert(json.containsKey(r'apiKey'), 'Required key "ApiKeyCreateResponseDto[apiKey]" is missing from JSON.');
+        assert(json[r'apiKey'] != null, 'Required key "ApiKeyCreateResponseDto[apiKey]" has a null value in JSON.');
+        assert(json.containsKey(r'secret'), 'Required key "ApiKeyCreateResponseDto[secret]" is missing from JSON.');
+        assert(json[r'secret'] != null, 'Required key "ApiKeyCreateResponseDto[secret]" has a null value in JSON.');
+        return true;
+      }());
+
       return ApiKeyCreateResponseDto(
         apiKey: ApiKeyResponseDto.fromJson(json[r'apiKey'])!,
         secret: mapValueOfType<String>(json, r'secret')!,

mobile/openapi/lib/model/api_key_response_dto.dart

@@ -77,6 +77,23 @@ class ApiKeyResponseDto {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        assert(json.containsKey(r'createdAt'), 'Required key "ApiKeyResponseDto[createdAt]" is missing from JSON.');
+        assert(json[r'createdAt'] != null, 'Required key "ApiKeyResponseDto[createdAt]" has a null value in JSON.');
+        assert(json.containsKey(r'id'), 'Required key "ApiKeyResponseDto[id]" is missing from JSON.');
+        assert(json[r'id'] != null, 'Required key "ApiKeyResponseDto[id]" has a null value in JSON.');
+        assert(json.containsKey(r'name'), 'Required key "ApiKeyResponseDto[name]" is missing from JSON.');
+        assert(json[r'name'] != null, 'Required key "ApiKeyResponseDto[name]" has a null value in JSON.');
+        assert(json.containsKey(r'permissions'), 'Required key "ApiKeyResponseDto[permissions]" is missing from JSON.');
+        assert(json[r'permissions'] != null, 'Required key "ApiKeyResponseDto[permissions]" has a null value in JSON.');
+        assert(json.containsKey(r'updatedAt'), 'Required key "ApiKeyResponseDto[updatedAt]" is missing from JSON.');
+        assert(json[r'updatedAt'] != null, 'Required key "ApiKeyResponseDto[updatedAt]" has a null value in JSON.');
+        return true;
+      }());
+
       return ApiKeyResponseDto(
         createdAt: mapDateTime(json, r'createdAt', r'/^(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))T(?:(?:[01]\\d|2[0-3]):[0-5]\\d(?::[0-5]\\d(?:\\.\\d+)?)?(?:Z))$/')!,
         id: mapValueOfType<String>(json, r'id')!,

mobile/openapi/lib/model/api_key_update_dto.dart

@@ -13,8 +13,8 @@ part of openapi.api;
 class ApiKeyUpdateDto {
   /// Returns a new [ApiKeyUpdateDto] instance.
   ApiKeyUpdateDto({
-    this.name,
-    this.permissions = const [],
+    this.name = const Optional.absent(),
+    this.permissions = const Optional.present(const []),
   });
 
   /// API key name
@@ -24,10 +24,10 @@ class ApiKeyUpdateDto {
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  String? name;
+  Optional<String?> name;
 
   /// List of permissions
-  List<Permission> permissions;
+  Optional<List<Permission>?> permissions;
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is ApiKeyUpdateDto &&
@@ -45,12 +45,14 @@ class ApiKeyUpdateDto {
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
-    if (this.name != null) {
-      json[r'name'] = this.name;
-    } else {
-    //  json[r'name'] = null;
+    if (this.name.isPresent) {
+      final value = this.name.value;
+      json[r'name'] = value;
+    }
+    if (this.permissions.isPresent) {
+      final value = this.permissions.value;
+      json[r'permissions'] = value;
     }
-      json[r'permissions'] = this.permissions;
     return json;
   }
 
@@ -62,9 +64,16 @@ class ApiKeyUpdateDto {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        return true;
+      }());
+
       return ApiKeyUpdateDto(
-        name: mapValueOfType<String>(json, r'name'),
-        permissions: Permission.listFromJson(json[r'permissions']),
+        name: json.containsKey(r'name') ? Optional.present(mapValueOfType<String>(json, r'name')) : const Optional.absent(),
+        permissions: json.containsKey(r'permissions') ? Optional.present(Permission.listFromJson(json[r'permissions'])) : const Optional.absent(),
       );
     }
     return null;

mobile/openapi/lib/model/asset_bulk_delete_dto.dart

@@ -13,7 +13,7 @@ part of openapi.api;
 class AssetBulkDeleteDto {
   /// Returns a new [AssetBulkDeleteDto] instance.
   AssetBulkDeleteDto({
-    this.force,
+    this.force = const Optional.absent(),
     this.ids = const [],
   });
 
@@ -24,7 +24,7 @@ class AssetBulkDeleteDto {
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  bool? force;
+  Optional<bool?> force;
 
   /// IDs to process
   List<String> ids;
@@ -45,10 +45,9 @@ class AssetBulkDeleteDto {
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
-    if (this.force != null) {
-      json[r'force'] = this.force;
-    } else {
-    //  json[r'force'] = null;
+    if (this.force.isPresent) {
+      final value = this.force.value;
+      json[r'force'] = value;
     }
       json[r'ids'] = this.ids;
     return json;
@@ -62,8 +61,17 @@ class AssetBulkDeleteDto {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        assert(json.containsKey(r'ids'), 'Required key "AssetBulkDeleteDto[ids]" is missing from JSON.');
+        assert(json[r'ids'] != null, 'Required key "AssetBulkDeleteDto[ids]" has a null value in JSON.');
+        return true;
+      }());
+
       return AssetBulkDeleteDto(
-        force: mapValueOfType<bool>(json, r'force'),
+        force: json.containsKey(r'force') ? Optional.present(mapValueOfType<bool>(json, r'force')) : const Optional.absent(),
         ids: json[r'ids'] is Iterable
             ? (json[r'ids'] as Iterable).cast<String>().toList(growable: false)
             : const [],

mobile/openapi/lib/model/asset_bulk_update_dto.dart

@@ -13,17 +13,17 @@ part of openapi.api;
 class AssetBulkUpdateDto {
   /// Returns a new [AssetBulkUpdateDto] instance.
   AssetBulkUpdateDto({
-    this.dateTimeOriginal,
-    this.dateTimeRelative,
-    this.description,
-    this.duplicateId,
+    this.dateTimeOriginal = const Optional.absent(),
+    this.dateTimeRelative = const Optional.absent(),
+    this.description = const Optional.absent(),
+    this.duplicateId = const Optional.absent(),
     this.ids = const [],
-    this.isFavorite,
-    this.latitude,
-    this.longitude,
-    this.rating,
-    this.timeZone,
-    this.visibility,
+    this.isFavorite = const Optional.absent(),
+    this.latitude = const Optional.absent(),
+    this.longitude = const Optional.absent(),
+    this.rating = const Optional.absent(),
+    this.timeZone = const Optional.absent(),
+    this.visibility = const Optional.absent(),
   });
 
   /// Original date and time
@@ -33,7 +33,7 @@ class AssetBulkUpdateDto {
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  String? dateTimeOriginal;
+  Optional<String?> dateTimeOriginal;
 
   /// Relative time offset in seconds
   ///
@@ -45,7 +45,7 @@ class AssetBulkUpdateDto {
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  int? dateTimeRelative;
+  Optional<int?> dateTimeRelative;
 
   /// Asset description
   ///
@@ -54,10 +54,10 @@ class AssetBulkUpdateDto {
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  String? description;
+  Optional<String?> description;
 
   /// Duplicate ID
-  String? duplicateId;
+  Optional<String?> duplicateId;
 
   /// Asset IDs to update
   List<String> ids;
@@ -69,7 +69,7 @@ class AssetBulkUpdateDto {
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  bool? isFavorite;
+  Optional<bool?> isFavorite;
 
   /// Latitude coordinate
   ///
@@ -81,7 +81,7 @@ class AssetBulkUpdateDto {
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  num? latitude;
+  Optional<num?> latitude;
 
   /// Longitude coordinate
   ///
@@ -93,13 +93,13 @@ class AssetBulkUpdateDto {
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  num? longitude;
+  Optional<num?> longitude;
 
   /// Rating in range [1-5], or null for unrated
   ///
   /// Minimum value: -1
   /// Maximum value: 5
-  int? rating;
+  Optional<int?> rating;
 
   /// Time zone (IANA timezone)
   ///
@@ -108,7 +108,7 @@ class AssetBulkUpdateDto {
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  String? timeZone;
+  Optional<String?> timeZone;
 
   ///
   /// Please note: This property should have been non-nullable! Since the specification file
@@ -116,7 +116,7 @@ class AssetBulkUpdateDto {
   /// source code must fall back to having a nullable type.
   /// Consider adding a "default:" property in the specification file to hide this note.
   ///
-  AssetVisibility? visibility;
+  Optional<AssetVisibility?> visibility;
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is AssetBulkUpdateDto &&
@@ -152,56 +152,46 @@ class AssetBulkUpdateDto {
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
-    if (this.dateTimeOriginal != null) {
-      json[r'dateTimeOriginal'] = this.dateTimeOriginal;
-    } else {
-    //  json[r'dateTimeOriginal'] = null;
+    if (this.dateTimeOriginal.isPresent) {
+      final value = this.dateTimeOriginal.value;
+      json[r'dateTimeOriginal'] = value;
     }
-    if (this.dateTimeRelative != null) {
-      json[r'dateTimeRelative'] = this.dateTimeRelative;
-    } else {
-    //  json[r'dateTimeRelative'] = null;
+    if (this.dateTimeRelative.isPresent) {
+      final value = this.dateTimeRelative.value;
+      json[r'dateTimeRelative'] = value;
     }
-    if (this.description != null) {
-      json[r'description'] = this.description;
-    } else {
-    //  json[r'description'] = null;
+    if (this.description.isPresent) {
+      final value = this.description.value;
+      json[r'description'] = value;
     }
-    if (this.duplicateId != null) {
-      json[r'duplicateId'] = this.duplicateId;
-    } else {
-    //  json[r'duplicateId'] = null;
+    if (this.duplicateId.isPresent) {
+      final value = this.duplicateId.value;
+      json[r'duplicateId'] = value;
     }
       json[r'ids'] = this.ids;
-    if (this.isFavorite != null) {
-      json[r'isFavorite'] = this.isFavorite;
-    } else {
-    //  json[r'isFavorite'] = null;
+    if (this.isFavorite.isPresent) {
+      final value = this.isFavorite.value;
+      json[r'isFavorite'] = value;
     }
-    if (this.latitude != null) {
-      json[r'latitude'] = this.latitude;
-    } else {
-    //  json[r'latitude'] = null;
+    if (this.latitude.isPresent) {
+      final value = this.latitude.value;
+      json[r'latitude'] = value;
     }
-    if (this.longitude != null) {
-      json[r'longitude'] = this.longitude;
-    } else {
-    //  json[r'longitude'] = null;
+    if (this.longitude.isPresent) {
+      final value = this.longitude.value;
+      json[r'longitude'] = value;
     }
-    if (this.rating != null) {
-      json[r'rating'] = this.rating;
-    } else {
-    //  json[r'rating'] = null;
+    if (this.rating.isPresent) {
+      final value = this.rating.value;
+      json[r'rating'] = value;
     }
-    if (this.timeZone != null) {
-      json[r'timeZone'] = this.timeZone;
-    } else {
-    //  json[r'timeZone'] = null;
+    if (this.timeZone.isPresent) {
+      final value = this.timeZone.value;
+      json[r'timeZone'] = value;
     }
-    if (this.visibility != null) {
-      json[r'visibility'] = this.visibility;
-    } else {
-    //  json[r'visibility'] = null;
+    if (this.visibility.isPresent) {
+      final value = this.visibility.value;
+      json[r'visibility'] = value;
     }
     return json;
   }
@@ -214,20 +204,29 @@ class AssetBulkUpdateDto {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        assert(json.containsKey(r'ids'), 'Required key "AssetBulkUpdateDto[ids]" is missing from JSON.');
+        assert(json[r'ids'] != null, 'Required key "AssetBulkUpdateDto[ids]" has a null value in JSON.');
+        return true;
+      }());
+
       return AssetBulkUpdateDto(
-        dateTimeOriginal: mapValueOfType<String>(json, r'dateTimeOriginal'),
-        dateTimeRelative: mapValueOfType<int>(json, r'dateTimeRelative'),
-        description: mapValueOfType<String>(json, r'description'),
-        duplicateId: mapValueOfType<String>(json, r'duplicateId'),
+        dateTimeOriginal: json.containsKey(r'dateTimeOriginal') ? Optional.present(mapValueOfType<String>(json, r'dateTimeOriginal')) : const Optional.absent(),
+        dateTimeRelative: json.containsKey(r'dateTimeRelative') ? Optional.present(json[r'dateTimeRelative'] == null ? null : int.parse('${json[r'dateTimeRelative']}')) : const Optional.absent(),
+        description: json.containsKey(r'description') ? Optional.present(mapValueOfType<String>(json, r'description')) : const Optional.absent(),
+        duplicateId: json.containsKey(r'duplicateId') ? Optional.present(mapValueOfType<String>(json, r'duplicateId')) : const Optional.absent(),
         ids: json[r'ids'] is Iterable
             ? (json[r'ids'] as Iterable).cast<String>().toList(growable: false)
             : const [],
-        isFavorite: mapValueOfType<bool>(json, r'isFavorite'),
-        latitude: num.parse('${json[r'latitude']}'),
-        longitude: num.parse('${json[r'longitude']}'),
-        rating: mapValueOfType<int>(json, r'rating'),
-        timeZone: mapValueOfType<String>(json, r'timeZone'),
-        visibility: AssetVisibility.fromJson(json[r'visibility']),
+        isFavorite: json.containsKey(r'isFavorite') ? Optional.present(mapValueOfType<bool>(json, r'isFavorite')) : const Optional.absent(),
+        latitude: json.containsKey(r'latitude') ? Optional.present(json[r'latitude'] == null ? null : num.parse('${json[r'latitude']}')) : const Optional.absent(),
+        longitude: json.containsKey(r'longitude') ? Optional.present(json[r'longitude'] == null ? null : num.parse('${json[r'longitude']}')) : const Optional.absent(),
+        rating: json.containsKey(r'rating') ? Optional.present(json[r'rating'] == null ? null : int.parse('${json[r'rating']}')) : const Optional.absent(),
+        timeZone: json.containsKey(r'timeZone') ? Optional.present(mapValueOfType<String>(json, r'timeZone')) : const Optional.absent(),
+        visibility: json.containsKey(r'visibility') ? Optional.present(AssetVisibility.fromJson(json[r'visibility'])) : const Optional.absent(),
       );
     }
     return null;

mobile/openapi/lib/model/asset_bulk_upload_check_dto.dart

@@ -45,6 +45,15 @@ class AssetBulkUploadCheckDto {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
+      // Ensure that the map contains the required keys.
+      // Note 1: the values aren't checked for validity beyond being non-null.
+      // Note 2: this code is stripped in release mode!
+      assert(() {
+        assert(json.containsKey(r'assets'), 'Required key "AssetBulkUploadCheckDto[assets]" is missing from JSON.');
+        assert(json[r'assets'] != null, 'Required key "AssetBulkUploadCheckDto[assets]" has a null value in JSON.');
+        return true;
+      }());
+
       return AssetBulkUploadCheckDto(
         assets: AssetBulkUploadCheckItem.listFromJson(json[r'assets']),
       );