refactor: action view

# Conflicts:
#	mobile/lib/domain/services/asset.service.dart
#	mobile/lib/presentation/actions/favorite.action.dart
#	mobile/lib/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart
#	mobile/lib/utils/action_button.utils.dart
#	mobile/test/unit/factories/remote_asset_factory.dart
#	mobile/test/unit/mocks.dart

CODEOWNERS

@@ -5,4 +5,3 @@
 /machine-learning/ @mertalev
 /e2e/ @danieldietzler
 /mobile/ @shenlong-tanwen @santoshakil
-/native/ @santoshakil @mertalev

mobile/android/app/CMakeLists.txt

@@ -7,6 +7,7 @@ project(native_buffer LANGUAGES C)
 
 add_library(native_buffer SHARED
     src/main/cpp/native_buffer.c
+    src/main/cpp/native_image.c
 )
 
 target_link_libraries(native_buffer jnigraphics)

mobile/android/app/src/main/cpp/native_image.c

@@ -0,0 +1,109 @@
+#include <jni.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <android/bitmap.h>
+
+// Cache-friendly block size for the tiled rotation (in pixels). 32x32 uint32 = 4KB, fits L1.
+#define TILE 32
+
+// EXIF orientation values (androidx.exifinterface.media.ExifInterface.ORIENTATION_*).
+enum {
+  ORIENTATION_FLIP_HORIZONTAL = 2,
+  ORIENTATION_ROTATE_180 = 3,
+  ORIENTATION_FLIP_VERTICAL = 4,
+  ORIENTATION_TRANSPOSE = 5,
+  ORIENTATION_ROTATE_90 = 6,
+  ORIENTATION_TRANSVERSE = 7,
+  ORIENTATION_ROTATE_270 = 8,
+};
+
+// The orientations that swap width and height. Must stay in sync with affine_for's dim usage.
+static int swaps_dims(int o) {
+  return o == ORIENTATION_ROTATE_90 || o == ORIENTATION_ROTATE_270 ||
+         o == ORIENTATION_TRANSPOSE || o == ORIENTATION_TRANSVERSE;
+}
+
+// A source pixel (sx, sy) maps to destination index base + sx*stepX + sy*stepY, where dw is the
+// destination width. This affine form covers all 8 EXIF orientations and matches the pixel layout
+// of Bitmap.createBitmap(src, matrixForExifOrientation(o)). int64_t so it stays correct on
+// armeabi-v7a (32-bit long) regardless of how large MAX_RAW_DECODE_PIXELS grows.
+static void affine_for(int o, int sw, int sh, int dw, int64_t *base, int64_t *stepX, int64_t *stepY) {
+  switch (o) {
+    case ORIENTATION_ROTATE_90:       *base = sh - 1;                             *stepX = dw;  *stepY = -1;  break;
+    case ORIENTATION_ROTATE_270:      *base = (int64_t) (sw - 1) * dw;            *stepX = -dw; *stepY = 1;   break;
+    case ORIENTATION_ROTATE_180:      *base = (int64_t) (sh - 1) * dw + (sw - 1); *stepX = -1;  *stepY = -dw; break;
+    case ORIENTATION_FLIP_HORIZONTAL: *base = sw - 1;                             *stepX = -1;  *stepY = dw;  break;
+    case ORIENTATION_FLIP_VERTICAL:   *base = (int64_t) (sh - 1) * dw;            *stepX = 1;   *stepY = -dw; break;
+    case ORIENTATION_TRANSPOSE:       *base = 0;                                  *stepX = dw;  *stepY = 1;   break;
+    case ORIENTATION_TRANSVERSE:      *base = (int64_t) (sw - 1) * dw + (sh - 1); *stepX = -dw; *stepY = -1;  break;
+    default:                          *base = 0;                                  *stepX = 1;   *stepY = dw;  break;
+  }
+}
+
+// Copy each source pixel (whole uint32, so channel order/premult is irrelevant) to its rotated
+// destination, walking TILE x TILE blocks so the scattered writes of a 90/270 transpose stay
+// cache-resident. dst is densely packed (rowBytes == dw*4, no padding), which the affine math relies on.
+static void rotate_tiled(const uint8_t *src, int srcStride, uint32_t *dst,
+                         int sw, int sh, int64_t base, int64_t stepX, int64_t stepY) {
+  for (int ty = 0; ty < sh; ty += TILE) {
+    int yEnd = ty + TILE < sh ? ty + TILE : sh;
+    for (int tx = 0; tx < sw; tx += TILE) {
+      int xEnd = tx + TILE < sw ? tx + TILE : sw;
+      for (int sy = ty; sy < yEnd; sy++) {
+        const uint32_t *srcRow = (const uint32_t *) (src + (size_t) sy * srcStride);
+        int64_t idx = base + (int64_t) sy * stepY + (int64_t) tx * stepX;
+        for (int sx = tx; sx < xEnd; sx++) {
+          dst[idx] = srcRow[sx];
+          idx += stepX;
+        }
+      }
+    }
+  }
+}
+
+// Rotates an RGBA_8888 bitmap to the given EXIF orientation into a freshly malloc'd buffer (free it
+// via NativeBuffer.free). Fills outInfo with {width, height, rowBytes} and returns the buffer
+// address, or 0 if the bitmap can't be handled (e.g. a non-8888 format) so the caller can fall back.
+JNIEXPORT jlong JNICALL
+Java_app_alextran_immich_NativeImage_rotate(
+    JNIEnv *env, jclass clazz, jobject bitmap, jint orientation, jintArray outInfo) {
+  AndroidBitmapInfo info;
+  if (AndroidBitmap_getInfo(env, bitmap, &info) != ANDROID_BITMAP_RESULT_SUCCESS) {
+    return 0;
+  }
+  if (info.format != ANDROID_BITMAP_FORMAT_RGBA_8888) {
+    return 0;
+  }
+
+  int sw = (int) info.width;
+  int sh = (int) info.height;
+  int dw = swaps_dims(orientation) ? sh : sw;
+  int dh = swaps_dims(orientation) ? sw : sh;
+
+  uint32_t *dst = (uint32_t *) malloc((size_t) dw * dh * 4);
+  if (dst == NULL) {
+    return 0;
+  }
+
+  void *srcPixels = NULL;
+  if (AndroidBitmap_lockPixels(env, bitmap, &srcPixels) != ANDROID_BITMAP_RESULT_SUCCESS) {
+    free(dst);
+    return 0;
+  }
+
+  int64_t base, stepX, stepY;
+  affine_for(orientation, sw, sh, dw, &base, &stepX, &stepY);
+  rotate_tiled((const uint8_t *) srcPixels, (int) info.stride, dst, sw, sh, base, stepX, stepY);
+
+  AndroidBitmap_unlockPixels(env, bitmap);
+
+  jint dims[3] = {dw, dh, dw * 4};
+  (*env)->SetIntArrayRegion(env, outInfo, 0, 3, dims);
+  // Keep ownership in C until the buffer is safely handed back: if outInfo was somehow too small,
+  // SetIntArrayRegion left a pending exception and Kotlin will never receive (or free) dst.
+  if ((*env)->ExceptionCheck(env)) {
+    free(dst);
+    return 0;
+  }
+  return (jlong) dst;
+}

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

@@ -0,0 +1,19 @@
+package app.alextran.immich
+
+import android.graphics.Bitmap
+
+object NativeImage {
+  init {
+    // rotate() is compiled into the native_buffer shared lib (which already links jnigraphics).
+    System.loadLibrary("native_buffer")
+  }
+
+  /**
+   * Rotates an RGBA_8888 [bitmap] to the given EXIF [orientation], writing the result into a freshly
+   * malloc'd native buffer. Returns the buffer address (free it with [NativeBuffer.free]) and fills
+   * [outInfo] with {width, height, rowBytes}. Returns 0 when the bitmap can't be handled (e.g. a
+   * non-8888 config) so the caller can fall back.
+   */
+  @JvmStatic
+  external fun rotate(bitmap: Bitmap, orientation: Int, outInfo: IntArray): Long
+}

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

@@ -12,7 +12,9 @@ import android.provider.MediaStore.Images
 import android.provider.MediaStore.Video
 import android.util.Size
 import androidx.annotation.RequiresApi
+import androidx.exifinterface.media.ExifInterface
 import app.alextran.immich.NativeBuffer
+import app.alextran.immich.NativeImage
 import kotlin.math.*
 import java.io.IOException
 import java.util.concurrent.Executors
@@ -181,35 +183,88 @@ class LocalImagesImpl(context: Context) : LocalImageApi {
     val id = assetId.toLong()
 
     signal.throwIfCanceled()
-    val bitmap = if (isVideo) {
-      decodeVideoThumbnail(id, size, signal)
-    } else {
-      decodeImage(id, size, signal)
-    }
-
     try {
-      signal.throwIfCanceled()
-      val res = bitmap.toNativeBuffer()
-      signal.throwIfCanceled()
+      val res = if (isVideo) {
+        decodeVideoThumbnail(id, size, signal).toNativeBuffer()
+      } else {
+        val (bitmap, orientation) = decodeImage(id, size, signal)
+        signal.throwIfCanceled()
+        if (orientation == ExifInterface.ORIENTATION_NORMAL || orientation == ExifInterface.ORIENTATION_UNDEFINED) {
+          bitmap.toNativeBuffer()
+        } else {
+          rotateToNativeBuffer(bitmap, orientation, signal)
+        }
+      }
+      // Don't re-check cancellation here: res owns a malloc'd buffer, and bailing to CANCELLED would
+      // orphan it. Deliver it; Dart frees the buffer itself if the request was cancelled meanwhile.
       callback(Result.success(res))
     } catch (e: Exception) {
       callback(if (e is OperationCanceledException) CANCELLED else Result.failure(e))
     }
   }
 
-  private fun decodeImage(id: Long, size: Size, signal: CancellationSignal): Bitmap {
+  // Returns the decoded bitmap plus the EXIF orientation that still needs applying. Only Q+ raw
+  // decodes come back unrotated (ImageDecoder / loadThumbnail skip EXIF for raw like DNG); every
+  // other path already orients itself, so it reports ORIENTATION_NORMAL.
+  private fun decodeImage(id: Long, size: Size, signal: CancellationSignal): Pair<Bitmap, Int> {
     signal.throwIfCanceled()
     val uri = ContentUris.withAppendedId(Images.Media.EXTERNAL_CONTENT_URI, id)
+    val handleRaw = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && isRawMime(uri)
+    val orientation = if (handleRaw) rawOrientation(uri) else ExifInterface.ORIENTATION_NORMAL
+
     if (size.width <= 0 || size.height <= 0 || size.width > 768 || size.height > 768) {
-      return decodeSource(uri, size, signal)
+      // A "load original" request is unsized -> a full-res decode (a sized > 768 just samples to target).
+      return decodeSource(uri, size, signal) to orientation
     }
 
-    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+    val bitmap = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
       resolver.loadThumbnail(uri, size, signal)
     } else {
       signal.setOnCancelListener { Images.Thumbnails.cancelThumbnailRequest(resolver, id) }
       Images.Thumbnails.getThumbnail(resolver, id, Images.Thumbnails.MINI_KIND, OPTIONS)
     }
+    return bitmap to orientation
+  }
+
+  private fun isRawMime(uri: Uri): Boolean {
+    val mime = resolver.getType(uri) ?: return false
+    return mime.startsWith("image/x-") || mime == "image/dng"
+  }
+
+  private fun rawOrientation(uri: Uri): Int {
+    return resolver.openInputStream(uri)?.use {
+      ExifInterface(it).getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL)
+    } ?: ExifInterface.ORIENTATION_NORMAL
+  }
+
+  // ImageDecoder / loadThumbnail skip EXIF orientation for raw (e.g. DNG) on Q+, so the decoded
+  // bitmap comes back unrotated. Rotate it into the output buffer in native code (one pass, no
+  // intermediate rotated bitmap).
+  private fun rotateToNativeBuffer(bitmap: Bitmap, orientation: Int, signal: CancellationSignal): Map<String, Long> {
+    signal.throwIfCanceled()
+    // Force ARGB_8888: the native rotate needs a lockable 8888 buffer, and toNativeBuffer() below
+    // allocates width*height*4 (an F16/HDR decode would otherwise under-allocate). No-op for the
+    // common already-8888 case.
+    val src = if (bitmap.config != Bitmap.Config.ARGB_8888) {
+      val converted = bitmap.copy(Bitmap.Config.ARGB_8888, false)
+      bitmap.recycle()
+      converted ?: throw IOException("could not convert bitmap to ARGB_8888")
+    } else {
+      bitmap
+    }
+    try {
+      val info = IntArray(3)
+      val pointer = NativeImage.rotate(src, orientation, info)
+      if (pointer == 0L) throw IOException("native rotate failed for orientation $orientation")
+      return mapOf(
+        "pointer" to pointer,
+        "width" to info[0].toLong(),
+        "height" to info[1].toLong(),
+        "rowBytes" to info[2].toLong()
+      )
+    } finally {
+      if (!src.isRecycled) src.recycle()
+    }
   }
 
   private fun decodeVideoThumbnail(id: Long, target: Size, signal: CancellationSignal): Bitmap {

mobile/integration_test/native_core_test.dart

@@ -1,33 +0,0 @@
-// Plumbing check: proves immich_native_core is usable from the real immich app on
-// a real device/sim — the build-hook compiled the Rust for this target, the code
-// asset bundled into the app, and the @Native symbols resolve at runtime.
-// Self-contained: does NOT boot the immich app or need a server.
-//
-// Run:  flutter test integration_test/native_core_test.dart -d <device>
-import 'dart:convert';
-import 'dart:typed_data';
-
-import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_native_core/immich_native_core.dart';
-import 'package:integration_test/integration_test.dart';
-
-void main() {
-  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-
-  test('native core loads: coreVersion is non-empty', () {
-    expect(coreVersion(), isNotEmpty);
-  });
-
-  test('sha1Hex matches the FIPS-180 vector', () {
-    expect(
-      sha1Hex(Uint8List.fromList(utf8.encode('abc'))),
-      'a9993e364706816aba3e25717850c26c9cd0d89d',
-    );
-  });
-
-  test('rotateRgba8888 (the PR #29337 algorithm) rotates 180', () {
-    // 2x1: red, green -> green, red
-    final src = Uint8List.fromList([255, 0, 0, 255, 0, 255, 0, 255]);
-    expect(rotateRgba8888(src, 8, 2, 1, 3), [0, 255, 0, 255, 255, 0, 0, 255]);
-  });
-}

mobile/lib/constants/enums.dart

@@ -9,8 +9,6 @@ enum SortOrder {
 
 enum TextSearchType { context, filename, description, ocr }
 
-enum AssetVisibilityEnum { timeline, hidden, archive, locked }
-
 enum ActionSource { timeline, viewer }
 
 enum ShareAssetType { original, preview }

mobile/lib/domain/models/asset/remote_asset.model.dart

@@ -52,6 +52,10 @@ class RemoteAsset extends BaseAsset {
 
   bool get isTrashed => deletedAt != null;
 
+  bool get isStacked => stackId != null;
+
+  bool get isArchived => visibility == .archive;
+
   @override
   String toString() {
     return '''Asset {

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

@@ -77,4 +77,40 @@ class AssetService {
     await _apiRepository.updateFavorite(remoteIds, isFavorite);
     await _remoteRepository.updateFavorite(remoteIds, isFavorite);
   }
+
+  Future<void> restoreTrash(List<String> remoteIds) async {
+    if (remoteIds.isEmpty) {
+      return;
+    }
+
+    await _apiRepository.restoreTrash(remoteIds);
+    await _remoteRepository.restoreTrash(remoteIds);
+  }
+
+  Future<void> stack(String userId, List<String> remoteIds) async {
+    if (remoteIds.isEmpty) {
+      return;
+    }
+
+    final stack = await _apiRepository.stack(remoteIds);
+    await _remoteRepository.stack(userId, stack);
+  }
+
+  Future<void> unstack(List<String> stackIds) async {
+    if (stackIds.isEmpty) {
+      return;
+    }
+
+    await _remoteRepository.unStack(stackIds);
+    await _apiRepository.unStack(stackIds);
+  }
+
+  Future<void> updateVisibility(List<String> remoteIds, AssetVisibility visibility) async {
+    if (remoteIds.isEmpty) {
+      return;
+    }
+
+    await _apiRepository.updateVisibility(remoteIds, visibility);
+    await _remoteRepository.updateVisibility(remoteIds, visibility);
+  }
 }

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

@@ -10,6 +10,7 @@ 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/entities/stack.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/utils/option.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 
 class RemoteAssetRepository extends DriftDatabaseRepository {
@@ -286,4 +287,20 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
       ..orderBy([(row) => OrderingTerm.asc(row.sequence)]);
     return query.map((row) => row.toDto()!).get();
   }
+
+  Future<void> update(
+    List<String> remoteIds, {
+    Option<bool> isFavorite = const .none(),
+    Option<AssetVisibility> visibility = const .none(),
+  }) {
+    final companion = RemoteAssetEntityCompanion(
+      visibility: visibility.toDriftValue(),
+      isFavorite: isFavorite.toDriftValue(),
+    );
+    return _db.batch((batch) {
+      for (final remoteId in remoteIds) {
+        batch.update(_db.remoteAssetEntity, companion, where: (e) => e.id.equals(remoteId));
+      }
+    });
+  }
 }

mobile/lib/presentation/actions/action.dart

@@ -1,7 +1,10 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/user.model.dart';
+import 'package:immich_mobile/utils/asset_filter.dart';
 
 class ActionScope {
   final BuildContext context;
@@ -14,13 +17,7 @@ class ActionScope {
 abstract class BaseAction {
   const BaseAction();
 
-  IconData get icon;
-
-  String label(ActionScope scope);
-
-  bool isVisible(ActionScope scope) => true;
-
-  Future<void> onAction(ActionScope scope);
+  ActionView resolve(ActionScope scope);
 }
 
 abstract class AssetAction<T extends BaseAsset> extends BaseAction {
@@ -28,5 +25,31 @@ abstract class AssetAction<T extends BaseAsset> extends BaseAction {
 
   const AssetAction({required this.assets});
 
-  Iterable<T> filter(ActionScope scope) => assets.whereType<T>();
+  @override
+  AssetActionView resolve(ActionScope scope);
+}
+
+abstract class ActionView {
+  final ActionScope scope;
+
+  const ActionView({required this.scope});
+
+  IconData get icon;
+
+  String get label;
+
+  bool get isVisible => true;
+
+  FutureOr<void> onAction();
+}
+
+abstract class AssetActionView<T extends BaseAsset> extends ActionView {
+  final Iterable<BaseAsset> assets;
+
+  const AssetActionView({required this.assets, required super.scope});
+
+  AssetFilter<T> get filter => .new(assets.whereType<T>());
+
+  @override
+  bool get isVisible => filter.isNotEmpty;
 }

mobile/lib/presentation/actions/action.widget.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -7,10 +9,11 @@ import 'package:immich_mobile/utils/error_handler.dart';
 import 'package:immich_ui/immich_ui.dart';
 
 class _ActionWidgetScope {
+  final IconData icon;
   final String label;
-  final VoidCallback onAction;
+  final FutureOr<void> Function() onAction;
 
-  const _ActionWidgetScope({required this.label, required this.onAction});
+  const _ActionWidgetScope({required this.icon, required this.label, required this.onAction});
 }
 
 class _ActionWidget extends ConsumerWidget {
@@ -19,11 +22,11 @@ class _ActionWidget extends ConsumerWidget {
 
   const _ActionWidget({required this.action, required this.builder});
 
-  Future<void> _onAction(ActionScope scope) async {
+  Future<void> _onAction(FutureOr<void> Function() action) async {
     try {
-      await action.onAction(scope);
+      await action();
     } catch (error, stackTrace) {
-      handleError(scope.context, error, stack: stackTrace, description: 'Action failed: ${action.runtimeType}');
+      handleError(error, stack: stackTrace, description: 'Action failed: ${action.runtimeType}');
     }
   }
 
@@ -35,11 +38,13 @@ class _ActionWidget extends ConsumerWidget {
     }
 
     final scope = ActionScope(context: context, ref: ref, authUser: authUser);
-    if (!action.isVisible(scope)) {
+    final view = action.resolve(scope);
+
+    if (!view.isVisible) {
       return const SizedBox.shrink();
     }
 
-    return builder(.new(label: action.label(scope), onAction: () => _onAction(scope)));
+    return builder(.new(icon: view.icon, label: view.label, onAction: () => _onAction(view.onAction)));
   }
 }
 
@@ -52,7 +57,7 @@ class ActionIconButtonWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) => _ActionWidget(
     action: action,
-    builder: (ctx) => ImmichIconButton(icon: action.icon, onPressed: ctx.onAction, variant: variant),
+    builder: (ctx) => ImmichIconButton(icon: ctx.icon, onPressed: ctx.onAction, variant: variant),
   );
 }
 
@@ -65,8 +70,7 @@ class ActionButtonWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) => _ActionWidget(
     action: action,
-    builder: (ctx) =>
-        ImmichTextButton(labelText: ctx.label, icon: action.icon, onPressed: ctx.onAction, variant: variant),
+    builder: (ctx) => ImmichTextButton(labelText: ctx.label, icon: ctx.icon, onPressed: ctx.onAction, variant: variant),
   );
 }
 
@@ -78,7 +82,7 @@ class ActionColumnButtonWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) => _ActionWidget(
     action: action,
-    builder: (ctx) => ImmichColumnButton(icon: action.icon, label: ctx.label, onPressed: ctx.onAction),
+    builder: (ctx) => ImmichColumnButton(icon: ctx.icon, label: ctx.label, onPressed: ctx.onAction),
   );
 }
 
@@ -90,6 +94,6 @@ class ActionMenuItemWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) => _ActionWidget(
     action: action,
-    builder: (ctx) => ImmichMenuItem(icon: action.icon, label: ctx.label, onPressed: ctx.onAction),
+    builder: (ctx) => ImmichMenuItem(icon: ctx.icon, label: ctx.label, onPressed: ctx.onAction),
   );
 }

mobile/lib/presentation/actions/archive.action.dart

@@ -0,0 +1,68 @@
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/generated/translations.g.dart';
+import 'package:immich_mobile/presentation/actions/action.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/toast.provider.dart';
+import 'package:immich_mobile/providers/routes.provider.dart';
+import 'package:immich_mobile/utils/asset_filter.dart';
+
+class ArchiveAction extends AssetAction<RemoteAsset> {
+  const ArchiveAction({required super.assets});
+
+  @override
+  AssetActionView<RemoteAsset> resolve(ActionScope scope) {
+    final hasNonArchived = AssetFilter(assets).owned(scope.authUser.id).any((asset) => asset.visibility != .archive);
+    return hasNonArchived ? ArchiveView(assets: assets, scope: scope) : UnarchiveView(assets: assets, scope: scope);
+  }
+}
+
+@visibleForTesting
+class ArchiveView extends AssetActionView<RemoteAsset> {
+  const ArchiveView({required super.assets, required super.scope});
+
+  @override
+  IconData get icon => Icons.archive_outlined;
+
+  @override
+  String get label => scope.context.t.archive;
+
+  @override
+  AssetFilter<RemoteAsset> get filter => .new(assets).owned(scope.authUser.id).archived(isArchived: false);
+
+  @override
+  bool get isVisible => !scope.ref.watch(inLockedViewProvider) && filter.isNotEmpty;
+
+  @override
+  Future<void> onAction() async {
+    final ActionScope(:ref, :context) = scope;
+    final ids = filter.map((asset) => asset.id).toList(growable: false);
+    await ref.read(assetServiceProvider).updateVisibility(ids, .archive);
+    ref.read(toastRepositoryProvider).success(context.t.archive_action_prompt(count: ids.length));
+  }
+}
+
+@visibleForTesting
+class UnarchiveView extends AssetActionView<RemoteAsset> {
+  const UnarchiveView({required super.assets, required super.scope});
+
+  @override
+  IconData get icon => Icons.unarchive_outlined;
+
+  @override
+  String get label => scope.context.t.unarchive;
+
+  @override
+  AssetFilter<RemoteAsset> get filter => .new(assets).owned(scope.authUser.id).archived();
+
+  @override
+  bool get isVisible => !scope.ref.watch(inLockedViewProvider) && filter.isNotEmpty;
+
+  @override
+  Future<void> onAction() async {
+    final ActionScope(:ref, :context) = scope;
+    final ids = filter.map((asset) => asset.id).toList(growable: false);
+    await ref.read(assetServiceProvider).updateVisibility(ids, .timeline);
+    ref.read(toastRepositoryProvider).success(context.t.unarchive_action_prompt(count: ids.length));
+  }
+}

mobile/lib/presentation/actions/asset_debug.action.dart

@@ -11,17 +11,23 @@ import 'package:immich_mobile/routing/router.dart';
 class AssetDebugAction extends AssetAction<BaseAsset> {
   const AssetDebugAction({required super.assets});
 
+  @override
+  AssetDebugActionView resolve(ActionScope scope) => .new(assets: assets, scope: scope);
+}
+
+@visibleForTesting
+class AssetDebugActionView extends AssetActionView<BaseAsset> {
+  const AssetDebugActionView({required super.assets, required super.scope});
+
   @override
   IconData get icon => Icons.help_outline_rounded;
 
   @override
-  String label(ActionScope scope) => scope.context.t.troubleshoot;
+  String get label => scope.context.t.troubleshoot;
 
   @override
-  bool isVisible(ActionScope scope) =>
-      assets.length == 1 && scope.ref.watch(settingsProvider.notifier).get(.advancedTroubleshooting);
+  bool get isVisible => scope.ref.watch(settingsProvider.notifier).get(.advancedTroubleshooting) && assets.length == 1;
 
   @override
-  Future<void> onAction(ActionScope scope) async =>
-      unawaited(scope.context.pushRoute(AssetTroubleshootRoute(asset: assets.first)));
+  Future<void> onAction() async => unawaited(scope.context.pushRoute(AssetTroubleshootRoute(asset: assets.first)));
 }

mobile/lib/presentation/actions/favorite.action.dart

@@ -3,38 +3,61 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
-import 'package:immich_ui/immich_ui.dart';
+import 'package:immich_mobile/providers/infrastructure/toast.provider.dart';
+import 'package:immich_mobile/utils/asset_filter.dart';
 
-class FavoriteAction extends AssetAction<RemoteAsset> {
-  final bool shouldFavorite;
+class FavoriteAction extends BaseAction {
+  final Iterable<BaseAsset> assets;
 
-  FavoriteAction({required super.assets}) : shouldFavorite = assets.any((asset) => !asset.isFavorite);
+  const FavoriteAction({required this.assets});
 
   @override
-  IconData get icon => shouldFavorite ? Icons.favorite_border_rounded : Icons.favorite_rounded;
-
-  @override
-  String label(ActionScope scope) => shouldFavorite ? scope.context.t.favorite : scope.context.t.unfavorite;
-
-  @override
-  Iterable<RemoteAsset> filter(ActionScope scope) => assets
-      .where(
-        (asset) => asset is RemoteAsset && asset.ownerId == scope.authUser.id && asset.isFavorite == !shouldFavorite,
-      )
-      .cast<RemoteAsset>();
-
-  @override
-  bool isVisible(ActionScope scope) => filter(scope).isNotEmpty;
-
-  @override
-  Future<void> onAction(ActionScope scope) async {
-    final ActionScope(:ref) = scope;
-    final assets = filter(scope).map((asset) => asset.id).toList(growable: false);
-
-    await ref.read(assetServiceProvider).updateFavorite(assets, shouldFavorite);
-    final message = shouldFavorite
-        ? StaticTranslations.instance.favorite_action_prompt(count: assets.length)
-        : StaticTranslations.instance.unfavorite_action_prompt(count: assets.length);
-    snackbar.success(message);
+  AssetActionView<RemoteAsset> resolve(ActionScope scope) {
+    final hasNonFavorite = AssetFilter(assets).owned(scope.authUser.id).any((asset) => !asset.isFavorite);
+    return hasNonFavorite ? FavoriteView(assets: assets, scope: scope) : UnfavoriteView(assets: assets, scope: scope);
+  }
+}
+
+@visibleForTesting
+class FavoriteView extends AssetActionView<RemoteAsset> {
+  const FavoriteView({required super.assets, required super.scope});
+
+  @override
+  IconData get icon => Icons.favorite_border_rounded;
+
+  @override
+  String get label => scope.context.t.favorite;
+
+  @override
+  AssetFilter<RemoteAsset> get filter => .new(assets).owned(scope.authUser.id).favorite(isFavorite: false);
+
+  @override
+  Future<void> onAction() async {
+    final ActionScope(:ref, :context) = scope;
+    final ids = filter.map((asset) => asset.id).toList(growable: false);
+    await ref.read(assetServiceProvider).updateFavorite(ids, true);
+    ref.read(toastRepositoryProvider).success(context.t.favorite_action_prompt(count: ids.length));
+  }
+}
+
+@visibleForTesting
+class UnfavoriteView extends AssetActionView<RemoteAsset> {
+  const UnfavoriteView({required super.assets, required super.scope});
+
+  @override
+  IconData get icon => Icons.favorite_rounded;
+
+  @override
+  String get label => scope.context.t.unfavorite;
+
+  @override
+  AssetFilter<RemoteAsset> get filter => .new(assets).owned(scope.authUser.id).favorite();
+
+  @override
+  Future<void> onAction() async {
+    final ActionScope(:ref, :context) = scope;
+    final ids = filter.map((asset) => asset.id).toList(growable: false);
+    await ref.read(assetServiceProvider).updateFavorite(ids, false);
+    ref.read(toastRepositoryProvider).success(context.t.unfavorite_action_prompt(count: ids.length));
   }
 }

mobile/lib/presentation/actions/partner.action.dart

@@ -11,14 +11,22 @@ import 'package:immich_mobile/widgets/common/confirm_dialog.dart';
 class PartnerAddAction extends BaseAction {
   const PartnerAddAction();
 
+  @override
+  PartnerAddActionView resolve(ActionScope scope) => .new(scope: scope);
+}
+
+@visibleForTesting
+class PartnerAddActionView extends ActionView {
+  const PartnerAddActionView({required super.scope});
+
   @override
   IconData get icon => Icons.person_add_rounded;
 
   @override
-  String label(ActionScope scope) => scope.context.t.add_partner;
+  String get label => scope.context.t.add_partner;
 
   @override
-  Future<void> onAction(ActionScope scope) async {
+  Future<void> onAction() async {
     final ActionScope(:context, :ref, :authUser) = scope;
     final selected = await showDialog<User>(context: context, builder: (_) => const PartnerSelectionDialog());
     if (selected == null) {
@@ -35,14 +43,26 @@ class PartnerRemoveAction extends BaseAction {
   final String sharedWithId;
   final String partnerName;
 
+  @override
+  PartnerRemoveActionView resolve(ActionScope scope) =>
+      .new(sharedWithId: sharedWithId, partnerName: partnerName, scope: scope);
+}
+
+@visibleForTesting
+class PartnerRemoveActionView extends ActionView {
+  final String sharedWithId;
+  final String partnerName;
+
+  const PartnerRemoveActionView({required this.sharedWithId, required this.partnerName, required super.scope});
+
   @override
   IconData get icon => Icons.person_remove_rounded;
 
   @override
-  String label(ActionScope scope) => scope.context.t.remove;
+  String get label => scope.context.t.remove;
 
   @override
-  Future<void> onAction(ActionScope scope) async {
+  Future<void> onAction() async {
     final ActionScope(:context, :ref, :authUser) = scope;
 
     final confirmed = await showDialog<bool>(

mobile/lib/presentation/actions/restore.action.dart

@@ -0,0 +1,36 @@
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/generated/translations.g.dart';
+import 'package:immich_mobile/presentation/actions/action.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/toast.provider.dart';
+import 'package:immich_mobile/utils/asset_filter.dart';
+
+class RestoreAction extends AssetAction<RemoteAsset> {
+  const RestoreAction({required super.assets});
+
+  @override
+  RestoreActionView resolve(ActionScope scope) => .new(assets: assets, scope: scope);
+}
+
+@visibleForTesting
+class RestoreActionView extends AssetActionView<RemoteAsset> {
+  const RestoreActionView({required super.assets, required super.scope});
+
+  @override
+  IconData get icon => Icons.history_rounded;
+
+  @override
+  String get label => scope.context.t.restore;
+
+  @override
+  AssetFilter<RemoteAsset> get filter => .new(assets).owned(scope.authUser.id).trashed();
+
+  @override
+  Future<void> onAction() async {
+    final ActionScope(:ref, :context) = scope;
+    final ids = filter.map((asset) => asset.id).toList(growable: false);
+    await ref.read(assetServiceProvider).restoreTrash(ids);
+    ref.read(toastRepositoryProvider).success(context.t.assets_restored_count(count: ids.length));
+  }
+}

mobile/lib/presentation/actions/stack.action.dart

@@ -0,0 +1,65 @@
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/generated/translations.g.dart';
+import 'package:immich_mobile/presentation/actions/action.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/toast.provider.dart';
+import 'package:immich_mobile/utils/asset_filter.dart';
+
+class StackAction extends AssetAction<RemoteAsset> {
+  const StackAction({required super.assets});
+
+  @override
+  AssetActionView<RemoteAsset> resolve(ActionScope scope) {
+    final unstacked = AssetFilter(assets).owned(scope.authUser.id).any((asset) => asset.stackId == null);
+    return unstacked ? StackView(assets: assets, scope: scope) : UnstackView(assets: assets, scope: scope);
+  }
+}
+
+@visibleForTesting
+class StackView extends AssetActionView<RemoteAsset> {
+  const StackView({required super.assets, required super.scope});
+
+  @override
+  IconData get icon => Icons.filter_none_rounded;
+
+  @override
+  String get label => scope.context.t.stack;
+
+  @override
+  AssetFilter<RemoteAsset> get filter => .new(assets).owned(scope.authUser.id);
+
+  @override
+  bool get isVisible => filter.length > 1;
+
+  @override
+  Future<void> onAction() async {
+    final ActionScope(:ref, :context) = scope;
+    final ids = filter.map((asset) => asset.id).toList(growable: false);
+    await ref.read(assetServiceProvider).stack(scope.authUser.id, ids);
+    ref.read(toastRepositoryProvider).success(context.t.stacked_assets_count(count: ids.length));
+  }
+}
+
+@visibleForTesting
+class UnstackView extends AssetActionView<RemoteAsset> {
+  const UnstackView({required super.assets, required super.scope});
+
+  @override
+  IconData get icon => Icons.layers_clear_outlined;
+
+  @override
+  String get label => scope.context.t.unstack;
+
+  @override
+  AssetFilter<RemoteAsset> get filter => .new(assets).owned(scope.authUser.id);
+
+  @override
+  Future<void> onAction() async {
+    final ActionScope(:ref, :context) = scope;
+    final assets = filter.toList(growable: false);
+    final stackIds = assets.map((asset) => asset.stackId).nonNulls.toList(growable: false);
+    await ref.read(assetServiceProvider).unstack(stackIds);
+    ref.read(toastRepositoryProvider).success(context.t.unstacked_assets_count(count: assets.length));
+  }
+}

mobile/lib/presentation/actions/timeline.action.dart

@@ -8,17 +8,27 @@ class TimelineAction extends BaseAction {
   const TimelineAction({required this.action});
 
   @override
-  IconData get icon => action.icon;
+  TimelineActionView resolve(ActionScope scope) => .new(view: action.resolve(scope), scope: scope);
+}
+
+@visibleForTesting
+class TimelineActionView extends ActionView {
+  final ActionView view;
+
+  const TimelineActionView({required this.view, required super.scope});
 
   @override
-  String label(ActionScope scope) => action.label(scope);
+  IconData get icon => view.icon;
 
   @override
-  bool isVisible(ActionScope scope) => action.isVisible(scope);
+  String get label => view.label;
 
   @override
-  Future<void> onAction(ActionScope scope) async {
-    await action.onAction(scope);
+  bool get isVisible => view.isVisible;
+
+  @override
+  Future<void> onAction() async {
+    await view.onAction();
     scope.ref.read(multiSelectProvider.notifier).reset();
   }
 }

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

@@ -1,26 +1,24 @@
 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/presentation/widgets/action_buttons/base_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/unarchive_action_button.widget.dart';
-import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
-import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
-import 'package:immich_mobile/providers/routes.provider.dart';
-import 'package:immich_mobile/widgets/common/immich_toast.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
-
+import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-
-import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/presentation/actions/action.widget.dart';
+import 'package:immich_mobile/presentation/actions/archive.action.dart';
+import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';
+import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
+import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_toast.dart';
+import 'package:immich_ui/immich_ui.dart';
 
-enum AddToMenuItem { album, archive, unarchive, lockedFolder }
+enum AddToMenuItem { album, lockedFolder }
 
 class AddActionButton extends ConsumerStatefulWidget {
   const AddActionButton({super.key, this.originalTheme});
@@ -37,12 +35,6 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
       case AddToMenuItem.album:
         _openAlbumSelector();
         break;
-      case AddToMenuItem.archive:
-        performArchiveAction(context, ref, source: ActionSource.viewer);
-        break;
-      case AddToMenuItem.unarchive:
-        performUnArchiveAction(context, ref, source: ActionSource.viewer);
-        break;
       case AddToMenuItem.lockedFolder:
         performMoveToLockFolderAction(context, ref, source: ActionSource.viewer);
         break;
@@ -57,11 +49,6 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
 
     final user = ref.read(currentUserProvider);
     final isOwner = asset is RemoteAsset && asset.ownerId == user?.id;
-    final isInLockedView = ref.watch(inLockedViewProvider);
-    final isArchived = asset is RemoteAsset && asset.visibility == AssetVisibility.archive;
-    final hasRemote = asset is RemoteAsset;
-    final showArchive = isOwner && !isInLockedView && hasRemote && !isArchived;
-    final showUnarchive = isOwner && !isInLockedView && hasRemote && isArchived;
 
     return [
       Padding(
@@ -81,20 +68,7 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
           padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
           child: Text("move_to".tr(), style: context.textTheme.labelMedium),
         ),
-        if (showArchive)
-          BaseActionButton(
-            iconData: Icons.archive_outlined,
-            label: "archive".tr(),
-            menuItem: true,
-            onPressed: () => _handleMenuSelection(AddToMenuItem.archive),
-          ),
-        if (showUnarchive)
-          BaseActionButton(
-            iconData: Icons.unarchive_outlined,
-            label: "unarchive".tr(),
-            menuItem: true,
-            onPressed: () => _handleMenuSelection(AddToMenuItem.unarchive),
-          ),
+        ActionMenuItemWidget(action: ArchiveAction(assets: [asset])),
         BaseActionButton(
           iconData: Icons.lock_outline,
           label: "locked_folder".tr(),
@@ -184,7 +158,7 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
 
     final themeData = widget.originalTheme ?? context.themeData;
 
-    return MenuAnchor(
+    return ImmichMenu(
       consumeOutsideTap: true,
       style: MenuStyle(
         backgroundColor: WidgetStatePropertyAll(themeData.scaffoldBackgroundColor),
@@ -195,7 +169,7 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
         ),
         padding: const WidgetStatePropertyAll(EdgeInsets.symmetric(vertical: 6)),
       ),
-      menuChildren: widget.originalTheme != null
+      children: widget.originalTheme != null
           ? [
               Theme(
                 data: widget.originalTheme!,

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

@@ -1,59 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/events.model.dart';
-import 'package:immich_mobile/domain/utils/event_stream.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
-import 'package:immich_mobile/widgets/common/immich_toast.dart';
-
-// used to allow performing archive action from different sources  (without duplicating code)
-Future<void> performArchiveAction(BuildContext context, WidgetRef ref, {required ActionSource source}) async {
-  if (!context.mounted) {
-    return;
-  }
-
-  if (source == ActionSource.viewer) {
-    EventStream.shared.emit(const ViewerReloadAssetEvent());
-  }
-
-  final result = await ref.read(actionProvider.notifier).archive(source);
-  ref.read(multiSelectProvider.notifier).reset();
-
-  final successMessage = 'archive_action_prompt'.t(context: context, args: {'count': result.count.toString()});
-
-  if (context.mounted) {
-    ImmichToast.show(
-      context: context,
-      msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
-      gravity: ToastGravity.BOTTOM,
-      toastType: result.success ? ToastType.success : ToastType.error,
-    );
-  }
-}
-
-class ArchiveActionButton extends ConsumerWidget {
-  final ActionSource source;
-  final bool iconOnly;
-  final bool menuItem;
-
-  const ArchiveActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
-
-  Future<void> _onTap(BuildContext context, WidgetRef ref) async {
-    await performArchiveAction(context, ref, source: source);
-  }
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return BaseActionButton(
-      iconData: Icons.archive_outlined,
-      label: "to_archive".t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
-      onPressed: () => _onTap(context, ref),
-    );
-  }
-}

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

@@ -1,61 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
-import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.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 FavoriteActionButton extends ConsumerWidget {
-  final ActionSource source;
-  final bool iconOnly;
-  final bool menuItem;
-
-  const FavoriteActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
-
-  void _onTap(BuildContext context, WidgetRef ref) async {
-    if (!context.mounted) {
-      return;
-    }
-
-    final result = await ref.read(actionProvider.notifier).favorite(source);
-
-    if (source == ActionSource.viewer) {
-      if (result.success) {
-        final currentAsset = ref.read(assetViewerProvider).currentAsset;
-        if (currentAsset is RemoteAsset && !currentAsset.isFavorite) {
-          ref.read(assetViewerProvider.notifier).setAsset(currentAsset.copyWith(isFavorite: true));
-        }
-      }
-      return;
-    }
-
-    ref.read(multiSelectProvider.notifier).reset();
-
-    final successMessage = 'favorite_action_prompt'.t(context: context, args: {'count': result.count.toString()});
-
-    if (context.mounted) {
-      ImmichToast.show(
-        context: context,
-        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
-        gravity: ToastGravity.BOTTOM,
-        toastType: result.success ? ToastType.success : ToastType.error,
-      );
-    }
-  }
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return BaseActionButton(
-      iconData: Icons.favorite_border_rounded,
-      label: "favorite".t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
-      onPressed: () => _onTap(context, ref),
-    );
-  }
-}

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

@@ -1,55 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/events.model.dart';
-import 'package:immich_mobile/domain/utils/event_stream.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
-import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
-import 'package:immich_mobile/widgets/common/immich_toast.dart';
-
-class RestoreActionButton extends ConsumerWidget {
-  final ActionSource source;
-  final bool iconOnly;
-  final bool menuItem;
-
-  const RestoreActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
-
-  void _onTap(BuildContext context, WidgetRef ref) async {
-    if (!context.mounted) {
-      return;
-    }
-
-    final result = await ref.read(actionProvider.notifier).restoreTrash(source);
-    ref.read(multiSelectProvider.notifier).reset();
-
-    if (source == ActionSource.viewer) {
-      EventStream.shared.emit(const ViewerReloadAssetEvent());
-    }
-
-    final successMessage = 'assets_restored_count'.t(context: context, args: {'count': result.count.toString()});
-
-    if (context.mounted) {
-      ImmichToast.show(
-        context: context,
-        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
-        gravity: ToastGravity.BOTTOM,
-        toastType: result.success ? ToastType.success : ToastType.error,
-      );
-    }
-  }
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return BaseActionButton(
-      iconData: Icons.history_rounded,
-      label: 'restore'.t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
-      onPressed: () => _onTap(context, ref),
-      maxWidth: 100.0,
-    );
-  }
-}

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

@@ -1,43 +0,0 @@
-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/providers/infrastructure/action.provider.dart';
-import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
-import 'package:immich_mobile/widgets/common/immich_toast.dart';
-
-class RestoreTrashActionButton extends ConsumerWidget {
-  final ActionSource source;
-
-  const RestoreTrashActionButton({super.key, required this.source});
-
-  void _onTap(BuildContext context, WidgetRef ref) async {
-    if (!context.mounted) {
-      return;
-    }
-
-    final result = await ref.read(actionProvider.notifier).restoreTrash(source);
-    ref.read(multiSelectProvider.notifier).reset();
-
-    final successMessage = 'assets_restored_count'.t(context: context, args: {'count': result.count.toString()});
-
-    if (context.mounted) {
-      ImmichToast.show(
-        context: context,
-        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
-        gravity: ToastGravity.BOTTOM,
-        toastType: result.success ? ToastType.success : ToastType.error,
-      );
-    }
-  }
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return TextButton.icon(
-      icon: const Icon(Icons.history_rounded),
-      label: Text('restore'.t(), style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold)),
-      onPressed: () => _onTap(context, ref),
-    );
-  }
-}

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

@@ -1,50 +0,0 @@
-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/providers/user.provider.dart';
-import 'package:immich_mobile/widgets/common/immich_toast.dart';
-
-class StackActionButton extends ConsumerWidget {
-  final ActionSource source;
-
-  const StackActionButton({super.key, required this.source});
-
-  void _onTap(BuildContext context, WidgetRef ref) async {
-    if (!context.mounted) {
-      return;
-    }
-
-    final user = ref.watch(currentUserProvider);
-    if (user == null) {
-      throw Exception('User must be logged in to access stack action');
-    }
-
-    final result = await ref.read(actionProvider.notifier).stack(user.id, source);
-    ref.read(multiSelectProvider.notifier).reset();
-
-    final successMessage = 'stack_action_prompt'.t(context: context, args: {'count': result.count.toString()});
-
-    if (context.mounted) {
-      ImmichToast.show(
-        context: context,
-        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
-        gravity: ToastGravity.BOTTOM,
-        toastType: result.success ? ToastType.success : ToastType.error,
-      );
-    }
-  }
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return BaseActionButton(
-      iconData: Icons.filter_none_rounded,
-      label: "stack".t(context: context),
-      onPressed: () => _onTap(context, ref),
-    );
-  }
-}

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

@@ -1,61 +0,0 @@
-// dart
-// File: `lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart`
-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';
-import 'package:immich_mobile/domain/models/events.model.dart';
-import 'package:immich_mobile/domain/utils/event_stream.dart';
-
-// used to allow performing unarchive action from different sources (without duplicating code)
-Future<void> performUnArchiveAction(BuildContext context, WidgetRef ref, {required ActionSource source}) async {
-  if (!context.mounted) {
-    return;
-  }
-
-  if (source == ActionSource.viewer) {
-    EventStream.shared.emit(const ViewerReloadAssetEvent());
-  }
-
-  final result = await ref.read(actionProvider.notifier).unArchive(source);
-  ref.read(multiSelectProvider.notifier).reset();
-
-  final successMessage = 'unarchive_action_prompt'.t(context: context, args: {'count': result.count.toString()});
-
-  if (context.mounted) {
-    ImmichToast.show(
-      context: context,
-      msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
-      gravity: ToastGravity.BOTTOM,
-      toastType: result.success ? ToastType.success : ToastType.error,
-    );
-  }
-}
-
-class UnArchiveActionButton extends ConsumerWidget {
-  final ActionSource source;
-  final bool iconOnly;
-  final bool menuItem;
-
-  const UnArchiveActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
-
-  Future<void> _onTap(BuildContext context, WidgetRef ref) async {
-    await performUnArchiveAction(context, ref, source: source);
-  }
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return BaseActionButton(
-      iconData: Icons.unarchive_outlined,
-      label: "unarchive".t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
-      onPressed: () => _onTap(context, ref),
-    );
-  }
-}

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

@@ -1,61 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/enums.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
-import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.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 UnFavoriteActionButton extends ConsumerWidget {
-  final ActionSource source;
-  final bool iconOnly;
-  final bool menuItem;
-
-  const UnFavoriteActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
-
-  void _onTap(BuildContext context, WidgetRef ref) async {
-    if (!context.mounted) {
-      return;
-    }
-
-    final result = await ref.read(actionProvider.notifier).unFavorite(source);
-
-    if (source == ActionSource.viewer) {
-      if (result.success) {
-        final currentAsset = ref.read(assetViewerProvider).currentAsset;
-        if (currentAsset is RemoteAsset && currentAsset.isFavorite) {
-          ref.read(assetViewerProvider.notifier).setAsset(currentAsset.copyWith(isFavorite: false));
-        }
-      }
-      return;
-    }
-
-    ref.read(multiSelectProvider.notifier).reset();
-
-    final successMessage = 'unfavorite_action_prompt'.t(context: context, args: {'count': result.count.toString()});
-
-    if (context.mounted) {
-      ImmichToast.show(
-        context: context,
-        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
-        gravity: ToastGravity.BOTTOM,
-        toastType: result.success ? ToastType.success : ToastType.error,
-      );
-    }
-  }
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return BaseActionButton(
-      iconData: Icons.favorite_rounded,
-      label: "unfavorite".t(context: context),
-      onPressed: () => _onTap(context, ref),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
-    );
-  }
-}

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

@@ -1,48 +0,0 @@
-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 UnStackActionButton extends ConsumerWidget {
-  final ActionSource source;
-  final bool iconOnly;
-  final bool menuItem;
-
-  const UnStackActionButton({super.key, required this.source, this.iconOnly = false, this.menuItem = false});
-
-  void _onTap(BuildContext context, WidgetRef ref) async {
-    if (!context.mounted) {
-      return;
-    }
-
-    final result = await ref.read(actionProvider.notifier).unStack(source);
-    ref.read(multiSelectProvider.notifier).reset();
-
-    final successMessage = 'unstack_action_prompt'.t(context: context, args: {'count': result.count.toString()});
-
-    if (context.mounted) {
-      ImmichToast.show(
-        context: context,
-        msg: result.success ? successMessage : 'scaffold_body_error_occurred'.t(context: context),
-        gravity: ToastGravity.BOTTOM,
-        toastType: result.success ? ToastType.success : ToastType.error,
-      );
-    }
-  }
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return BaseActionButton(
-      iconData: Icons.layers_clear_outlined,
-      label: "unstack".t(context: context),
-      iconOnly: iconOnly,
-      menuItem: menuItem,
-      onPressed: () => _onTap(context, ref),
-    );
-  }
-}

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

@@ -4,12 +4,13 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/presentation/actions/action.widget.dart';
+import 'package:immich_mobile/presentation/actions/restore.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/add_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_image_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/restore_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/ocr_toggle_button.widget.dart';
@@ -42,11 +43,10 @@ class ViewerBottomBar extends ConsumerWidget {
 
     final originalTheme = context.themeData;
 
+    final assets = [asset];
     final actions = <Widget>[
-      if (isInTrash && isOwner && asset.hasRemote)
-        const RestoreActionButton(source: ActionSource.viewer)
-      else
-        const ShareActionButton(source: ActionSource.viewer),
+      ActionColumnButtonWidget(action: RestoreAction(assets: assets)),
+      const ShareActionButton(source: ActionSource.viewer),
 
       if (!isInLockedView) ...[
         if (!isInTrash) ...[

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

@@ -4,7 +4,9 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
+import 'package:immich_mobile/presentation/actions/archive.action.dart';
 import 'package:immich_mobile/presentation/actions/favorite.action.dart';
+import 'package:immich_mobile/presentation/actions/stack.action.dart';
 import 'package:immich_mobile/presentation/actions/timeline.action.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';
@@ -14,10 +16,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_
 import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/unarchive_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
@@ -77,7 +76,7 @@ class _ArchiveBottomSheetState extends ConsumerState<ArchiveBottomSheet> {
     }
 
     final assets = multiselect.selectedAssets.toList(growable: false);
-    final actions = [FavoriteAction(assets: assets)];
+    final actions = [FavoriteAction(assets: assets), ArchiveAction(assets: assets), StackAction(assets: assets)];
 
     return BaseBottomSheet(
       controller: sheetController,
@@ -88,7 +87,6 @@ class _ArchiveBottomSheetState extends ConsumerState<ArchiveBottomSheet> {
         const ShareActionButton(source: ActionSource.timeline),
         if (multiselect.hasRemote) ...[
           const ShareLinkActionButton(source: ActionSource.timeline),
-          const UnArchiveActionButton(source: ActionSource.timeline),
           ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
           if (multiselect.onlyRemote) const DownloadActionButton(source: ActionSource.timeline),
           isTrashEnable
@@ -97,8 +95,6 @@ class _ArchiveBottomSheetState extends ConsumerState<ArchiveBottomSheet> {
           const EditDateTimeActionButton(source: ActionSource.timeline),
           const EditLocationActionButton(source: ActionSource.timeline),
           const MoveToLockFolderActionButton(source: ActionSource.timeline),
-          if (multiselect.selectedAssets.length > 1) const StackActionButton(source: ActionSource.timeline),
-          if (multiselect.hasStacked) const UnStackActionButton(source: ActionSource.timeline),
         ],
         if (multiselect.hasMerged) const DeleteLocalActionButton(source: ActionSource.timeline),
       ],

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

@@ -5,9 +5,10 @@ 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/translate_extensions.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
+import 'package:immich_mobile/presentation/actions/archive.action.dart';
 import 'package:immich_mobile/presentation/actions/favorite.action.dart';
+import 'package:immich_mobile/presentation/actions/stack.action.dart';
 import 'package:immich_mobile/presentation/actions/timeline.action.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
@@ -16,9 +17,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_
 import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
@@ -68,7 +67,7 @@ class FavoriteBottomSheet extends ConsumerWidget {
     }
 
     final assets = multiselect.selectedAssets.toList(growable: false);
-    final actions = [FavoriteAction(assets: assets)];
+    final actions = [FavoriteAction(assets: assets), ArchiveAction(assets: assets), StackAction(assets: assets)];
 
     return BaseBottomSheet(
       initialChildSize: 0.4,
@@ -79,7 +78,6 @@ class FavoriteBottomSheet extends ConsumerWidget {
         if (multiselect.hasRemote) ...[
           const ShareLinkActionButton(source: ActionSource.timeline),
           ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
-          const ArchiveActionButton(source: ActionSource.timeline),
           if (multiselect.onlyRemote) const DownloadActionButton(source: ActionSource.timeline),
           isTrashEnable
               ? const TrashActionButton(source: ActionSource.timeline)
@@ -87,8 +85,6 @@ class FavoriteBottomSheet extends ConsumerWidget {
           const EditDateTimeActionButton(source: ActionSource.timeline),
           const EditLocationActionButton(source: ActionSource.timeline),
           const MoveToLockFolderActionButton(source: ActionSource.timeline),
-          if (multiselect.selectedAssets.length > 1) const StackActionButton(source: ActionSource.timeline),
-          if (multiselect.hasStacked) const UnStackActionButton(source: ActionSource.timeline),
         ],
         if (multiselect.hasMerged) const DeleteLocalActionButton(source: ActionSource.timeline),
       ],

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

@@ -4,9 +4,11 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
+import 'package:immich_mobile/presentation/actions/archive.action.dart';
 import 'package:immich_mobile/presentation/actions/asset_debug.action.dart';
+import 'package:immich_mobile/presentation/actions/favorite.action.dart';
+import 'package:immich_mobile/presentation/actions/stack.action.dart';
 import 'package:immich_mobile/presentation/actions/timeline.action.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';
@@ -14,13 +16,10 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permane
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_date_time_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/edit_location_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/favorite_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
@@ -84,7 +83,12 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
     }
 
     final assets = multiselect.selectedAssets.toList(growable: false);
-    final actions = [AssetDebugAction(assets: assets)];
+    final actions = [
+      AssetDebugAction(assets: assets),
+      FavoriteAction(assets: assets),
+      ArchiveAction(assets: assets),
+      StackAction(assets: assets),
+    ];
 
     return BaseBottomSheet(
       controller: sheetController,
@@ -101,14 +105,10 @@ class _GeneralBottomSheetState extends ConsumerState<GeneralBottomSheet> {
           isTrashEnable
               ? const TrashActionButton(source: ActionSource.timeline)
               : 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),
-          if (multiselect.selectedAssets.length > 1) const StackActionButton(source: ActionSource.timeline),
-          if (multiselect.hasStacked) const UnStackActionButton(source: ActionSource.timeline),
           if (multiselect.onlyLocal || multiselect.hasMerged) const DeleteActionButton(source: ActionSource.timeline),
         ],
         if (multiselect.onlyLocal || multiselect.hasMerged)

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

@@ -4,9 +4,10 @@ import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
+import 'package:immich_mobile/presentation/actions/archive.action.dart';
 import 'package:immich_mobile/presentation/actions/favorite.action.dart';
+import 'package:immich_mobile/presentation/actions/stack.action.dart';
 import 'package:immich_mobile/presentation/actions/timeline.action.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_local_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/download_action_button.widget.dart';
@@ -17,9 +18,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_al
 import 'package:immich_mobile/presentation/widgets/action_buttons/set_album_cover.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/stack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/trash_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/unstack_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/album/album_selector.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
@@ -86,7 +85,7 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
     }
 
     final assets = multiselect.selectedAssets.toList(growable: false);
-    final actions = [FavoriteAction(assets: assets)];
+    final actions = [FavoriteAction(assets: assets), ArchiveAction(assets: assets), StackAction(assets: assets)];
 
     return BaseBottomSheet(
       controller: sheetController,
@@ -100,7 +99,6 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
           const ShareLinkActionButton(source: ActionSource.timeline),
 
           if (ownsAlbum) ...[
-            const ArchiveActionButton(source: ActionSource.timeline),
             ...actions.map((action) => ActionColumnButtonWidget(action: TimelineAction(action: action))),
           ],
           const DownloadActionButton(source: ActionSource.timeline),
@@ -111,8 +109,6 @@ class _RemoteAlbumBottomSheetState extends ConsumerState<RemoteAlbumBottomSheet>
             const EditDateTimeActionButton(source: ActionSource.timeline),
             const EditLocationActionButton(source: ActionSource.timeline),
             const MoveToLockFolderActionButton(source: ActionSource.timeline),
-            if (multiselect.selectedAssets.length > 1) const StackActionButton(source: ActionSource.timeline),
-            if (multiselect.hasStacked) const UnStackActionButton(source: ActionSource.timeline),
           ],
         ],
         if (multiselect.hasMerged) const DeleteLocalActionButton(source: ActionSource.timeline),

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

@@ -2,26 +2,33 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/presentation/actions/action.widget.dart';
+import 'package:immich_mobile/presentation/actions/restore.action.dart';
+import 'package:immich_mobile/presentation/actions/timeline.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_trash_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/restore_trash_action_button.widget.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 
 class TrashBottomBar extends ConsumerWidget {
   const TrashBottomBar({super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final assets = ref.watch(multiSelectProvider.select((s) => s.selectedAssets)).toList(growable: false);
+
     return Align(
       alignment: Alignment.bottomCenter,
       child: Container(
         color: context.themeData.canvasColor,
         padding: const EdgeInsets.symmetric(vertical: 8),
-        child: const SafeArea(
+        child: SafeArea(
           top: false,
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceEvenly,
             children: [
-              DeleteTrashActionButton(source: ActionSource.timeline),
-              RestoreTrashActionButton(source: ActionSource.timeline),
+              const DeleteTrashActionButton(source: ActionSource.timeline),
+              ActionColumnButtonWidget(
+                action: TimelineAction(action: RestoreAction(assets: assets)),
+              ),
             ],
           ),
         ),

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

@@ -156,50 +156,6 @@ class ActionNotifier extends Notifier<void> {
     }
   }
 
-  Future<ActionResult> favorite(ActionSource source) async {
-    final ids = _getOwnedRemoteIdsForSource(source);
-    try {
-      await _service.favorite(ids);
-      return ActionResult(count: ids.length, success: true);
-    } catch (error, stack) {
-      _logger.severe('Failed to favorite assets', error, stack);
-      return ActionResult(count: ids.length, success: false, error: error.toString());
-    }
-  }
-
-  Future<ActionResult> unFavorite(ActionSource source) async {
-    final ids = _getOwnedRemoteIdsForSource(source);
-    try {
-      await _service.unFavorite(ids);
-      return ActionResult(count: ids.length, success: true);
-    } catch (error, stack) {
-      _logger.severe('Failed to unfavorite assets', error, stack);
-      return ActionResult(count: ids.length, success: false, error: error.toString());
-    }
-  }
-
-  Future<ActionResult> archive(ActionSource source) async {
-    final ids = _getOwnedRemoteIdsForSource(source);
-    try {
-      await _service.archive(ids);
-      return ActionResult(count: ids.length, success: true);
-    } catch (error, stack) {
-      _logger.severe('Failed to archive assets', error, stack);
-      return ActionResult(count: ids.length, success: false, error: error.toString());
-    }
-  }
-
-  Future<ActionResult> unArchive(ActionSource source) async {
-    final ids = _getOwnedRemoteIdsForSource(source);
-    try {
-      await _service.unArchive(ids);
-      return ActionResult(count: ids.length, success: true);
-    } catch (error, stack) {
-      _logger.severe('Failed to unarchive assets', error, stack);
-      return ActionResult(count: ids.length, success: false, error: error.toString());
-    }
-  }
-
   Future<ActionResult> moveToLockFolder(ActionSource source) async {
     final ids = _getOwnedRemoteIdsForSource(source);
     final localIds = _getLocalIdsForSource(source, ignoreLocalOnly: true);
@@ -235,17 +191,6 @@ class ActionNotifier extends Notifier<void> {
     }
   }
 
-  Future<ActionResult> restoreTrash(ActionSource source) async {
-    final ids = _getOwnedRemoteIdsForSource(source);
-    try {
-      await _service.restoreTrash(ids);
-      return ActionResult(count: ids.length, success: true);
-    } catch (error, stack) {
-      _logger.severe('Failed to restore trash assets', error, stack);
-      return ActionResult(count: ids.length, success: false, error: error.toString());
-    }
-  }
-
   Future<ActionResult> emptyTrash(String userId) async {
     try {
       final count = await _service.emptyTrash(userId);

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

@@ -0,0 +1,4 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/repositories/toast.repository.dart';
+
+final toastRepositoryProvider = Provider<ToastRepository>((ref) => const .new());

mobile/lib/providers/timeline/multiselect.provider.dart

@@ -22,8 +22,6 @@ class MultiSelectState {
   bool get hasRemote =>
       selectedAssets.any((asset) => asset.storage == AssetState.remote || asset.storage == AssetState.merged);
 
-  bool get hasStacked => selectedAssets.any((asset) => asset is RemoteAsset && asset.stackId != null);
-
   bool get hasMerged => selectedAssets.any((asset) => asset.storage == AssetState.merged);
 
   bool get onlyLocal => selectedAssets.any((asset) => asset.storage == AssetState.local);

mobile/lib/repositories/asset_api.repository.dart

@@ -1,12 +1,14 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:http/http.dart';
-import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/asset_edit.model.dart' hide AssetEditAction;
 import 'package:immich_mobile/domain/models/stack.model.dart';
 import 'package:immich_mobile/providers/api.provider.dart';
 import 'package:immich_mobile/repositories/api.repository.dart';
+import 'package:immich_mobile/utils/option.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
-import 'package:openapi/api.dart';
+import 'package:openapi/api.dart' as api show AssetVisibility;
+import 'package:openapi/api.dart' hide AssetVisibility;
 
 final assetApiRepositoryProvider = Provider(
   (ref) => AssetApiRepository(
@@ -41,7 +43,7 @@ class AssetApiRepository extends ApiRepository {
     return response?.count ?? 0;
   }
 
-  Future<void> updateVisibility(List<String> ids, AssetVisibilityEnum visibility) async {
+  Future<void> updateVisibility(List<String> ids, AssetVisibility visibility) async {
     return _api.updateAssets(AssetBulkUpdateDto(ids: ids, visibility: Optional.present(_mapVisibility(visibility))));
   }
 
@@ -77,11 +79,11 @@ class AssetApiRepository extends ApiRepository {
     return _api.downloadAssetWithHttpInfo(id, edited: edited);
   }
 
-  _mapVisibility(AssetVisibilityEnum visibility) => switch (visibility) {
-    AssetVisibilityEnum.timeline => AssetVisibility.timeline,
-    AssetVisibilityEnum.hidden => AssetVisibility.hidden,
-    AssetVisibilityEnum.locked => AssetVisibility.locked,
-    AssetVisibilityEnum.archive => AssetVisibility.archive,
+  api.AssetVisibility _mapVisibility(AssetVisibility visibility) => switch (visibility) {
+    AssetVisibility.timeline => api.AssetVisibility.timeline,
+    AssetVisibility.hidden => api.AssetVisibility.hidden,
+    AssetVisibility.locked => api.AssetVisibility.locked,
+    AssetVisibility.archive => api.AssetVisibility.archive,
   };
 
   Future<String?> getAssetMIMEType(String assetId) async {
@@ -106,6 +108,20 @@ class AssetApiRepository extends ApiRepository {
   Future<void> removeEdits(String assetId) async {
     return _api.removeAssetEdits(assetId);
   }
+
+  Future<void> update(
+    List<String> remoteIds, {
+    Option<bool> isFavorite = const .none(),
+    Option<AssetVisibility> visibility = const .none(),
+  }) {
+    return _api.updateAssets(
+      AssetBulkUpdateDto(
+        ids: remoteIds,
+        isFavorite: isFavorite.toOptional(),
+        visibility: visibility.map(_mapVisibility).toOptional(),
+      ),
+    );
+  }
 }
 
 extension on StackResponseDto {

mobile/lib/repositories/toast.repository.dart

@@ -0,0 +1,26 @@
+import 'dart:async';
+
+import 'package:immich_ui/immich_ui.dart';
+
+class ToastOption {
+  final Duration? timeout;
+  final FutureOr<void> Function()? onUndo;
+
+  const ToastOption({this.timeout, this.onUndo});
+}
+
+class ToastRepository {
+  const ToastRepository();
+
+  FutureOr<void> success(String message, {ToastOption? toast}) {
+    snackbar.success(message, duration: toast?.timeout);
+  }
+
+  FutureOr<void> info(String message, {ToastOption? toast}) {
+    snackbar.info(message, duration: toast?.timeout);
+  }
+
+  FutureOr<void> error(String message, {ToastOption? toast}) {
+    snackbar.error(message, duration: toast?.timeout);
+  }
+}

mobile/lib/services/action.service.dart

@@ -68,28 +68,8 @@ class ActionService {
     unawaited(context.pushRoute(SharedLinkEditRoute(assetsList: remoteIds)));
   }
 
-  Future<void> favorite(List<String> remoteIds) async {
-    await _assetApiRepository.updateFavorite(remoteIds, true);
-    await _remoteAssetRepository.updateFavorite(remoteIds, true);
-  }
-
-  Future<void> unFavorite(List<String> remoteIds) async {
-    await _assetApiRepository.updateFavorite(remoteIds, false);
-    await _remoteAssetRepository.updateFavorite(remoteIds, false);
-  }
-
-  Future<void> archive(List<String> remoteIds) async {
-    await _assetApiRepository.updateVisibility(remoteIds, AssetVisibilityEnum.archive);
-    await _remoteAssetRepository.updateVisibility(remoteIds, AssetVisibility.archive);
-  }
-
-  Future<void> unArchive(List<String> remoteIds) async {
-    await _assetApiRepository.updateVisibility(remoteIds, AssetVisibilityEnum.timeline);
-    await _remoteAssetRepository.updateVisibility(remoteIds, AssetVisibility.timeline);
-  }
-
   Future<void> moveToLockFolder(List<String> remoteIds, List<String> localIds) async {
-    await _assetApiRepository.updateVisibility(remoteIds, AssetVisibilityEnum.locked);
+    await _assetApiRepository.updateVisibility(remoteIds, .locked);
     await _remoteAssetRepository.updateVisibility(remoteIds, AssetVisibility.locked);
 
     // Ask user if they want to delete local copies
@@ -99,7 +79,7 @@ class ActionService {
   }
 
   Future<void> removeFromLockFolder(List<String> remoteIds) async {
-    await _assetApiRepository.updateVisibility(remoteIds, AssetVisibilityEnum.timeline);
+    await _assetApiRepository.updateVisibility(remoteIds, .timeline);
     await _remoteAssetRepository.updateVisibility(remoteIds, AssetVisibility.timeline);
   }
 
@@ -108,11 +88,6 @@ class ActionService {
     await _remoteAssetRepository.trash(remoteIds);
   }
 
-  Future<void> restoreTrash(List<String> ids) async {
-    await _assetApiRepository.restoreTrash(ids);
-    await _remoteAssetRepository.restoreTrash(ids);
-  }
-
   Future<int> emptyTrash(String userId) async {
     final count = await _assetApiRepository.emptyTrash();
     await _remoteAssetRepository.emptyTrash(userId);

mobile/lib/utils/action_button.utils.dart

@@ -8,8 +8,10 @@ import 'package:immich_mobile/domain/models/events.model.dart';
 import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
+import 'package:immich_mobile/presentation/actions/archive.action.dart';
 import 'package:immich_mobile/presentation/actions/asset_debug.action.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/archive_action_button.widget.dart';
+import 'package:immich_mobile/presentation/actions/stack.action.dart';
+import 'package:immich_mobile/presentation/actions/restore.action.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/cast_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/delete_action_button.widget.dart';
@@ -21,7 +23,6 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/move_to_lock_f
 import 'package:immich_mobile/presentation/widgets/action_buttons/open_in_browser_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_album_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/remove_from_lock_folder_action_button.widget.dart';
-import 'package:immich_mobile/presentation/widgets/action_buttons/restore_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/set_album_cover.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/set_profile_picture_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_button.widget.dart';
@@ -29,8 +30,6 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/share_link_act
 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';
 import 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';
 import 'package:immich_mobile/routing/router.dart';
 
@@ -200,19 +199,11 @@ enum ActionButtonType {
         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,
-        iconOnly: iconOnly,
-        menuItem: menuItem,
-      ),
+      ActionButtonType.archive ||
+      ActionButtonType.unarchive => ActionMenuItemWidget(action: ArchiveAction(assets: [context.asset])),
       ActionButtonType.download => DownloadActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
       ActionButtonType.trash => TrashActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
-      ActionButtonType.restoreTrash => RestoreActionButton(
-        source: context.source,
-        iconOnly: iconOnly,
-        menuItem: menuItem,
-      ),
+      ActionButtonType.restoreTrash => ActionMenuItemWidget(action: RestoreAction(assets: [context.asset])),
       ActionButtonType.deletePermanent => DeletePermanentActionButton(
         source: context.source,
         iconOnly: iconOnly,
@@ -248,7 +239,7 @@ enum ActionButtonType {
         menuItem: menuItem,
       ),
       ActionButtonType.likeActivity => LikeActivityActionButton(iconOnly: iconOnly, menuItem: menuItem),
-      ActionButtonType.unstack => UnStackActionButton(source: context.source, iconOnly: iconOnly, menuItem: menuItem),
+      ActionButtonType.unstack => ActionMenuItemWidget(action: StackAction(assets: [context.asset])),
       ActionButtonType.openInBrowser => OpenInBrowserActionButton(
         remoteId: context.asset.remoteId!,
         origin: context.timelineOrigin,

mobile/lib/utils/asset_filter.dart

@@ -0,0 +1,23 @@
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+
+extension type const AssetFilter<T extends BaseAsset>(Iterable<T> assets) implements Iterable<T> {
+  AssetFilter<T> where(bool Function(T asset) test) => AssetFilter(assets.where(test));
+  AssetFilter<T> whereNot(bool Function(T asset) test) => AssetFilter(assets.where((asset) => !test(asset)));
+
+  AssetFilter<T> type(AssetType type) => where((asset) => asset.type == type);
+  AssetFilter<T> favorite({bool isFavorite = true}) => where((asset) => asset.isFavorite == isFavorite);
+
+  AssetFilter<RemoteAsset> remote() => AssetFilter(assets.whereType<RemoteAsset>());
+  AssetFilter<RemoteAsset> owned(String ownerId) => remote().where((asset) => asset.ownerId == ownerId);
+  AssetFilter<RemoteAsset> visibility(AssetVisibility visibility) =>
+      remote().where((asset) => asset.visibility == visibility);
+  AssetFilter<RemoteAsset> notVisibility(AssetVisibility visibility) =>
+      remote().where((asset) => asset.visibility != visibility);
+  AssetFilter<RemoteAsset> archived({bool isArchived = true}) =>
+      remote().where((asset) => asset.isArchived == isArchived);
+  AssetFilter<RemoteAsset> stacked({bool isStacked = true}) => remote().where((asset) => asset.isStacked == isStacked);
+  AssetFilter<RemoteAsset> trashed({bool isTrashed = true}) => remote().where((asset) => asset.isTrashed == isTrashed);
+
+  AssetFilter<LocalAsset> local() => AssetFilter(assets.whereType<LocalAsset>());
+  AssetFilter<LocalAsset> backedUp() => local().where((asset) => asset.remoteAssetId != null);
+}

mobile/lib/utils/error_handler.dart

@@ -8,7 +8,7 @@ import 'package:openapi/api.dart';
 // ignore: depend_on_referenced_packages
 import 'package:stack_trace/stack_trace.dart';
 
-void handleError(BuildContext context, Object error, {StackTrace? stack, String? description}) {
+void handleError(Object error, {StackTrace? stack, String? description}) {
   String? stackTrace;
   if (stack != null) {
     final trace = Trace.from(stack);
@@ -23,17 +23,13 @@ void handleError(BuildContext context, Object error, {StackTrace? stack, String?
     () => 'Error${description != null ? ' ($description)' : ''}: $error${stackTrace != null ? '\n$stackTrace' : ''}',
   );
 
-  if (!context.mounted) {
-    return;
-  }
-
   final String message;
   if (serverErrorMessage(error) case String serverMessage) {
     message = serverMessage;
   } else if (isConnectionError(error)) {
-    message = context.t.login_form_server_error;
+    message = StaticTranslations.instance.login_form_server_error;
   } else {
-    message = context.t.scaffold_body_error_occurred;
+    message = StaticTranslations.instance.scaffold_body_error_occurred;
   }
 
   snackbar.error(message);

mobile/lib/utils/option.dart

@@ -1,3 +1,4 @@
+import 'package:drift/drift.dart';
 import 'package:openapi/api.dart' show Optional;
 
 sealed class Option<T> {
@@ -21,6 +22,11 @@ sealed class Option<T> {
     None() => null,
   };
 
+  Option<U> map<U>(U Function(T value) f) => switch (this) {
+    Some(:final value) => Some(f(value)),
+    None() => None<U>(),
+  };
+
   U fold<U>(U Function(T value) onSome, U Function() onNone) => switch (this) {
     Some(:final value) => onSome(value),
     None() => onNone(),
@@ -65,3 +71,10 @@ extension OptionToOptional<T> on Option<T> {
     Some(:final value) => Optional.present(value),
   };
 }
+
+extension OptionToDriftValue<T> on Option<T> {
+  Value<T> toDriftValue() => switch (this) {
+    Some(:final value) => Value(value),
+    None() => const Value.absent(),
+  };
+}

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

@@ -6,18 +6,23 @@ final scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
 class SnackbarManager {
   const SnackbarManager();
 
-  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? show(String message, SnackbarType type) {
+  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? show(
+    String message,
+    SnackbarType type, {
+    Duration? duration,
+  }) {
     final messenger = scaffoldMessengerKey.currentState;
     final context = scaffoldMessengerKey.currentContext;
     if (messenger == null || context == null) {
       return null;
     }
 
+    duration ??= const .new(seconds: 4);
     messenger.hideCurrentSnackBar();
-    return messenger.showSnackBar(_build(context, message, type));
+    return messenger.showSnackBar(_build(context, message, type, duration));
   }
 
-  SnackBar _build(BuildContext context, String message, SnackbarType type) {
+  SnackBar _build(BuildContext context, String message, SnackbarType type, Duration duration) {
     final theme = Theme.of(context);
     final colors = theme.extension<ImmichColors>() ?? ImmichColors.harmonized(theme.colorScheme);
     final (IconData icon, Color background, Color foreground) = switch (type) {
@@ -29,7 +34,7 @@ class SnackbarManager {
     return SnackBar(
       behavior: .floating,
       backgroundColor: background,
-      duration: const .new(seconds: 4),
+      duration: duration,
       shape: const RoundedRectangleBorder(borderRadius: .all(.circular(ImmichRadius.sm))),
       content: Row(
         children: [
@@ -48,11 +53,14 @@ class SnackbarManager {
     );
   }
 
-  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? info(String message) => show(message, .info);
+  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? info(String message, {Duration? duration}) =>
+      show(message, .info, duration: duration);
 
-  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? success(String message) => show(message, .success);
+  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? success(String message, {Duration? duration}) =>
+      show(message, .success, duration: duration);
 
-  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? error(String message) => show(message, .error);
+  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? error(String message, {Duration? duration}) =>
+      show(message, .error, duration: duration);
 }
 
 const snackbar = SnackbarManager();

mobile/pubspec.lock

@@ -912,13 +912,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.2.2"
-  immich_native_core:
-    dependency: "direct main"
-    description:
-      path: "../native/immich_native_core"
-      relative: true
-    source: path
-    version: "0.1.0"
   immich_ui:
     dependency: "direct main"
     description:
@@ -1131,14 +1124,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.19.1"
-  native_toolchain_rust:
-    dependency: transitive
-    description:
-      name: native_toolchain_rust
-      sha256: faa57d2258a3b0fd2a634054f54e4496c9fcbd971977e7d2b7e6916d56892857
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.4+0"
   native_video_player:
     dependency: "direct main"
     description:
@@ -1770,14 +1755,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.9.4"
-  toml:
-    dependency: transitive
-    description:
-      name: toml
-      sha256: "35a35f782228656a2af31e8c73d1353cc4ef3d683fd68af1111b44631879c05e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.18.0"
   typed_data:
     dependency: transitive
     description:

mobile/pubspec.yaml

@@ -39,8 +39,6 @@ dependencies:
   hooks_riverpod: ^2.6.1
   http: ^1.6.0
   image_picker: ^1.2.1
-  immich_native_core:
-    path: ../native/immich_native_core
   immich_ui:
     path: './packages/ui'
   intl: ^0.20.2

mobile/test/infrastructure/repository.mock.dart

@@ -3,9 +3,9 @@ import 'package:immich_mobile/infrastructure/repositories/local_album.repository
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/log.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/partner.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/settings.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_api.repository.dart';
@@ -15,6 +15,7 @@ import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.re
 import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/user_api.repository.dart';
 import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
+import 'package:immich_mobile/repositories/toast.repository.dart';
 import 'package:immich_mobile/repositories/upload.repository.dart';
 import 'package:mocktail/mocktail.dart';
 
@@ -50,6 +51,8 @@ class MockUserRepository extends Mock implements UserRepository {}
 
 class MockPartnerRepository extends Mock implements PartnerRepository {}
 
+class MockToastRepository extends Mock implements ToastRepository {}
+
 // API Repos
 class MockUserApiRepository extends Mock implements UserApiRepository {}
 

mobile/test/unit/factories/remote_asset_factory.dart

@@ -5,7 +5,15 @@ import '../../utils.dart';
 class RemoteAssetFactory {
   const RemoteAssetFactory();
 
-  static RemoteAsset create({String? id, String? name, String? ownerId, bool isFavorite = false}) {
+  static RemoteAsset create({
+    String? id,
+    String? name,
+    String? ownerId,
+    bool isFavorite = false,
+    AssetVisibility visibility = AssetVisibility.timeline,
+    String? stackId,
+    DateTime? deletedAt,
+  }) {
     id = TestUtils.uuid(id);
 
     return RemoteAsset(
@@ -17,7 +25,10 @@ class RemoteAssetFactory {
       createdAt: TestUtils.yesterday(),
       updatedAt: TestUtils.now(),
       isFavorite: isFavorite,
+      visibility: visibility,
+      stackId: stackId,
       isEdited: false,
+      deletedAt: deletedAt,
     );
   }
 }

mobile/test/unit/mocks.dart

@@ -18,6 +18,7 @@ class RepositoryMocks {
   final localAlbum = LocalAlbumRepositoryStub(MockLocalAlbumRepository());
   final localAsset = LocalAssetRepositoryStub(MockDriftLocalAssetRepository());
   final trashedAsset = MockTrashedLocalAssetRepository();
+  final toast = MockToastRepository();
 
   final nativeApi = NativeSyncApiStub(MockNativeSyncApi());
 
@@ -31,6 +32,7 @@ class RepositoryMocks {
     localAsset.reset();
     reset(trashedAsset);
     nativeApi.reset();
+    reset(toast);
     _stubLocalAlbumRepository();
     _stubLocalAssetRepository();
     _stubNativeSyncApi();
@@ -89,6 +91,10 @@ class ServiceMocks {
 
   void _stubAssetService() {
     when(asset.updateFavorite).thenAnswer((_) async {});
+    when(asset.stack).thenAnswer((_) async {});
+    when(asset.unstack).thenAnswer((_) async {});
+    when(asset.restoreTrash).thenAnswer((_) async {});
+    when(asset.updateVisibility).thenAnswer((_) async {});
   }
 }
 
@@ -96,6 +102,7 @@ void _registerFallbacks() {
   registerFallbackValue(LocalAlbumFactory.create());
   registerFallbackValue(LocalAssetFactory.create());
   registerFallbackValue(Uint8List(0));
+  registerFallbackValue(AssetVisibility.timeline);
 }
 
 extension type const Stub<T extends Mock>(T mockedClass) {
@@ -167,6 +174,18 @@ extension type const UserServiceStub(MockUserService service) implements Stub<Mo
 extension type const AssetServiceStub(MockAssetService service) implements Stub<MockAssetService> {
   Future<void> Function() get updateFavorite =>
       () => service.updateFavorite(any(), any());
+
+  Future<void> Function() get stack =>
+      () => service.stack(any(), any());
+
+  Future<void> Function() get unstack =>
+      () => service.unstack(any());
+
+  Future<void> Function() get restoreTrash =>
+      () => service.restoreTrash(any());
+
+  Future<void> Function() get updateVisibility =>
+      () => service.updateVisibility(any(), any());
 }
 
 extension type const NativeSyncApiStub(MockNativeSyncApi api) implements Stub<MockNativeSyncApi> {

mobile/test/unit/presentation/actions/archive_action_test.dart

@@ -0,0 +1,107 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/generated/translations.g.dart';
+import 'package:immich_mobile/presentation/actions/archive.action.dart';
+import 'package:mocktail/mocktail.dart';
+
+import '../../../domain/service.mock.dart';
+import '../../factories/remote_asset_factory.dart';
+import '../presentation_context.dart';
+
+void main() {
+  late PresentationContext context;
+  late MockAssetService assetService;
+
+  setUp(() async {
+    context = await PresentationContext.create();
+    assetService = context.service.asset.service;
+  });
+
+  tearDown(() {
+    context.dispose();
+  });
+
+  RemoteAsset owned({AssetVisibility visibility = AssetVisibility.timeline}) =>
+      RemoteAssetFactory.create(ownerId: context.currentUser.id, visibility: visibility);
+
+  group('ArchiveAction', () {
+    testWidgets('archives the eligible owned assets', (tester) async {
+      final asset = owned();
+      final view = await tester.pumpTestAction(context, ArchiveAction(assets: [asset]));
+
+      expect(view, isA<ArchiveView>());
+      expect(view.icon, Icons.archive_outlined);
+      expect(view.label, StaticTranslations.instance.archive);
+
+      await view.onAction();
+      verify(() => assetService.updateVisibility([asset.id], .archive)).called(1);
+    });
+
+    testWidgets('unarchive the eligible owned assets', (tester) async {
+      final asset = owned(visibility: .archive);
+      final view = await tester.pumpTestAction(context, ArchiveAction(assets: [asset]));
+
+      expect(view, isA<UnarchiveView>());
+      expect(view.icon, Icons.unarchive_outlined);
+      expect(view.label, StaticTranslations.instance.unarchive);
+
+      await view.onAction();
+      verify(() => assetService.updateVisibility([asset.id], .timeline)).called(1);
+    });
+
+    testWidgets('dispatches on owned state, ignoring assets owned by others', (tester) async {
+      final mine = owned(visibility: .archive);
+      final theirs = RemoteAssetFactory.create();
+      final view = await tester.pumpTestAction(context, ArchiveAction(assets: [mine, theirs]));
+      expect(view, isA<UnarchiveView>());
+
+      await view.onAction();
+      verify(() => assetService.updateVisibility([mine.id], .timeline)).called(1);
+    });
+
+    testWidgets('batches every eligible owned asset into a single call', (tester) async {
+      final first = owned();
+      final second = owned();
+
+      await tester.pumpTestAction(context, ArchiveAction(assets: [first, second]));
+
+      verify(() => assetService.updateVisibility([first.id, second.id], .archive)).called(1);
+    });
+
+    testWidgets('archives only the owned assets not already archived', (tester) async {
+      final stale = owned();
+      final alreadyArchived = owned(visibility: .archive);
+
+      await tester.pumpTestAction(context, ArchiveAction(assets: [stale, alreadyArchived]));
+
+      verify(() => assetService.updateVisibility([stale.id], .archive)).called(1);
+    });
+
+    testWidgets('reports the archived count through the toast repository', (tester) async {
+      final toast = context.repository.toast;
+
+      await tester.pumpTestAction(context, ArchiveAction(assets: [owned(), owned()]));
+
+      final message = verify(() => toast.success(captureAny())).captured.single as String;
+      expect(message, StaticTranslations.instance.archive_action_prompt(count: 2));
+    });
+
+    testWidgets('reports the unarchive count through the toast repository', (tester) async {
+      final toast = context.repository.toast;
+
+      await tester.pumpTestAction(
+        context,
+        ArchiveAction(
+          assets: [
+            owned(visibility: .archive),
+            owned(visibility: .archive),
+          ],
+        ),
+      );
+
+      final message = verify(() => toast.success(captureAny())).captured.single as String;
+      expect(message, StaticTranslations.instance.unarchive_action_prompt(count: 2));
+    });
+  });
+}

mobile/test/unit/presentation/actions/favorite_action_test.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/generated/translations.g.dart';
 import 'package:immich_mobile/presentation/actions/favorite.action.dart';
 import 'package:mocktail/mocktail.dart';
 
@@ -27,27 +28,36 @@ void main() {
   group('FavoriteAction', () {
     testWidgets('favorites the eligible owned assets', (tester) async {
       final asset = owned();
+      final view = await tester.pumpTestAction(context, FavoriteAction(assets: [asset]));
 
-      await tester.pumpTestAction(context, FavoriteAction(assets: [asset]));
+      expect(view, isA<FavoriteView>());
+      expect(view.icon, Icons.favorite_border_rounded);
+      expect(view.label, StaticTranslations.instance.favorite);
 
+      await view.onAction();
       verify(() => assetService.updateFavorite([asset.id], true)).called(1);
     });
 
     testWidgets('unfavorite the eligible owned assets', (tester) async {
       final asset = owned(isFavorite: true);
+      final view = await tester.pumpTestAction(context, FavoriteAction(assets: [asset]));
 
-      await tester.pumpTestAction(context, FavoriteAction(assets: [asset]));
+      expect(view, isA<UnfavoriteView>());
+      expect(view.icon, Icons.favorite_rounded);
+      expect(view.label, StaticTranslations.instance.unfavorite);
 
+      await view.onAction();
       verify(() => assetService.updateFavorite([asset.id], false)).called(1);
     });
 
-    testWidgets('ignores assets owned by someone else', (tester) async {
-      final mine = owned();
+    testWidgets('dispatches on owned state, ignoring assets owned by others', (tester) async {
+      final mine = owned(isFavorite: true);
       final theirs = RemoteAssetFactory.create();
+      final view = await tester.pumpTestAction(context, FavoriteAction(assets: [mine, theirs]));
+      expect(view, isA<UnfavoriteView>());
 
-      await tester.pumpTestAction(context, FavoriteAction(assets: [mine, theirs]));
-
-      verify(() => assetService.updateFavorite([mine.id], true)).called(1);
+      await view.onAction();
+      verify(() => assetService.updateFavorite([mine.id], false)).called(1);
     });
 
     testWidgets('batches every eligible owned asset into a single call', (tester) async {
@@ -59,7 +69,7 @@ void main() {
       verify(() => assetService.updateFavorite([first.id, second.id], true)).called(1);
     });
 
-    testWidgets('skips owned assets already in the target state', (tester) async {
+    testWidgets('favorites only the owned assets not already favorite', (tester) async {
       final stale = owned();
       final alreadyFavorite = owned(isFavorite: true);
 
@@ -68,11 +78,22 @@ void main() {
       verify(() => assetService.updateFavorite([stale.id], true)).called(1);
     });
 
-    testWidgets('shows a confirmation snackbar on success', (tester) async {
-      await tester.pumpTestAction(context, FavoriteAction(assets: [owned()]));
-      await tester.pumpUntilFound(find.byType(SnackBar));
+    testWidgets('reports the favorite count through the toast repository', (tester) async {
+      final toast = context.repository.toast;
 
-      expect(find.byType(SnackBar), findsOneWidget);
+      await tester.pumpTestAction(context, FavoriteAction(assets: [owned(), owned()]));
+
+      final message = verify(() => toast.success(captureAny())).captured.single as String;
+      expect(message, StaticTranslations.instance.favorite_action_prompt(count: 2));
+    });
+
+    testWidgets('reports the unfavorite count through the toast repository', (tester) async {
+      final toast = context.repository.toast;
+
+      await tester.pumpTestAction(context, FavoriteAction(assets: [owned(isFavorite: true), owned(isFavorite: true)]));
+
+      final message = verify(() => toast.success(captureAny())).captured.single as String;
+      expect(message, StaticTranslations.instance.unfavorite_action_prompt(count: 2));
     });
   });
 }

mobile/test/unit/presentation/actions/restore_action_test.dart

@@ -0,0 +1,72 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/generated/translations.g.dart';
+import 'package:immich_mobile/presentation/actions/restore.action.dart';
+import 'package:mocktail/mocktail.dart';
+
+import '../../../domain/service.mock.dart';
+import '../../factories/remote_asset_factory.dart';
+import '../presentation_context.dart';
+
+void main() {
+  late PresentationContext context;
+  late MockAssetService assetService;
+
+  setUp(() async {
+    context = await PresentationContext.create();
+    assetService = context.service.asset.service;
+  });
+
+  tearDown(() {
+    context.dispose();
+  });
+
+  RemoteAsset owned({bool trashed = true}) =>
+      RemoteAssetFactory.create(ownerId: context.currentUser.id, deletedAt: trashed ? DateTime(2020) : null);
+
+  group('RestoreAction', () {
+    testWidgets('restores the eligible owned trashed assets', (tester) async {
+      final asset = owned();
+
+      await tester.pumpTestAction(context, RestoreAction(assets: [asset]));
+
+      verify(() => assetService.restoreTrash([asset.id])).called(1);
+    });
+
+    testWidgets('ignores assets owned by someone else', (tester) async {
+      final mine = owned();
+      final theirs = RemoteAssetFactory.create(deletedAt: DateTime(2020));
+
+      await tester.pumpTestAction(context, RestoreAction(assets: [mine, theirs]));
+
+      verify(() => assetService.restoreTrash([mine.id])).called(1);
+    });
+
+    testWidgets('restores only the owned assets that are trashed', (tester) async {
+      final trashed = owned();
+      final live = owned(trashed: false);
+
+      await tester.pumpTestAction(context, RestoreAction(assets: [trashed, live]));
+
+      verify(() => assetService.restoreTrash([trashed.id])).called(1);
+    });
+
+    testWidgets('batches every eligible owned asset into a single call', (tester) async {
+      final first = owned();
+      final second = owned();
+
+      await tester.pumpTestAction(context, RestoreAction(assets: [first, second]));
+
+      verify(() => assetService.restoreTrash([first.id, second.id])).called(1);
+    });
+
+    testWidgets('reports success through the toast repository with the restored count', (tester) async {
+      final toast = context.repository.toast;
+
+      await tester.pumpTestAction(context, RestoreAction(assets: [owned(), owned()]));
+
+      final message = verify(() => toast.success(captureAny())).captured.single as String;
+      expect(message, StaticTranslations.instance.assets_restored_count(count: 2));
+    });
+  });
+}

mobile/test/unit/presentation/actions/stack_action_test.dart

@@ -0,0 +1,109 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/generated/translations.g.dart';
+import 'package:immich_mobile/presentation/actions/stack.action.dart';
+import 'package:mocktail/mocktail.dart';
+
+import '../../../domain/service.mock.dart';
+import '../../factories/remote_asset_factory.dart';
+import '../presentation_context.dart';
+
+void main() {
+  late PresentationContext context;
+  late MockAssetService assetService;
+
+  setUp(() async {
+    context = await PresentationContext.create();
+    assetService = context.service.asset.service;
+  });
+
+  tearDown(() {
+    context.dispose();
+  });
+
+  RemoteAsset owned({String? stackId}) => RemoteAssetFactory.create(ownerId: context.currentUser.id, stackId: stackId);
+
+  group('StackAction', () {
+    testWidgets('stacks the eligible owned assets', (tester) async {
+      final first = owned();
+      final second = owned();
+      final view = await tester.pumpTestAction(context, StackAction(assets: [first, second]));
+
+      expect(view, isA<StackView>());
+      expect(view.icon, Icons.filter_none_rounded);
+      expect(view.label, StaticTranslations.instance.stack);
+
+      await view.onAction();
+      verify(() => assetService.stack(context.currentUser.id, [first.id, second.id])).called(1);
+    });
+
+    testWidgets('unstacks the eligible owned assets', (tester) async {
+      final asset = owned(stackId: 'stack');
+      final view = await tester.pumpTestAction(context, StackAction(assets: [asset]));
+
+      expect(view, isA<UnstackView>());
+      expect(view.icon, Icons.layers_clear_outlined);
+      expect(view.label, StaticTranslations.instance.unstack);
+
+      await view.onAction();
+      verify(() => assetService.unstack(['stack'])).called(1);
+    });
+
+    testWidgets('prioritizes stack when the owned selection is mixed', (tester) async {
+      final first = owned();
+      final second = owned(stackId: 'stack');
+      final view = await tester.pumpTestAction(context, StackAction(assets: [first, second]));
+
+      expect(view, isA<StackView>());
+
+      await view.onAction();
+      verify(() => assetService.stack(context.currentUser.id, [first.id, second.id])).called(1);
+    });
+
+    testWidgets('dispatches on owned state, ignoring assets owned by others', (tester) async {
+      final mine = owned();
+      final other = owned();
+      final theirs = RemoteAssetFactory.create();
+
+      await tester.pumpTestAction(context, StackAction(assets: [mine, other, theirs]));
+
+      verify(() => assetService.stack(context.currentUser.id, [mine.id, other.id])).called(1);
+    });
+
+    testWidgets('unstacks every selected stack in a single call', (tester) async {
+      final first = owned(stackId: 'stack-1');
+      final second = owned(stackId: 'stack-2');
+
+      await tester.pumpTestAction(context, StackAction(assets: [first, second]));
+
+      verify(() => assetService.unstack(['stack-1', 'stack-2'])).called(1);
+    });
+
+    testWidgets('reports the stacked count through the toast repository', (tester) async {
+      final toast = context.repository.toast;
+
+      await tester.pumpTestAction(context, StackAction(assets: [owned(), owned()]));
+
+      final message = verify(() => toast.success(captureAny())).captured.single as String;
+      expect(message, StaticTranslations.instance.stacked_assets_count(count: 2));
+    });
+
+    testWidgets('reports the unstacked count through the toast repository', (tester) async {
+      final toast = context.repository.toast;
+
+      await tester.pumpTestAction(
+        context,
+        StackAction(
+          assets: [
+            owned(stackId: 'stack-1'),
+            owned(stackId: 'stack-2'),
+          ],
+        ),
+      );
+
+      final message = verify(() => toast.success(captureAny())).captured.single as String;
+      expect(message, StaticTranslations.instance.unstacked_assets_count(count: 2));
+    });
+  });
+}

mobile/test/unit/presentation/actions/timeline_action_test.dart

@@ -18,21 +18,30 @@ class _FakeAction extends BaseAction {
   bool ran = false;
   bool? selectionDuringOnAction;
 
+  @override
+  ActionView resolve(ActionScope scope) => _FakeActionView(this, scope);
+}
+
+class _FakeActionView extends ActionView {
+  final _FakeAction action;
+
+  _FakeActionView(this.action, ActionScope scope) : super(scope: scope);
+
   @override
   IconData get icon => Icons.bolt;
 
   @override
-  String label(ActionScope scope) => 'fake';
+  String get label => 'fake';
 
   @override
-  bool isVisible(ActionScope scope) => visible;
+  bool get isVisible => action.visible;
 
   @override
-  Future<void> onAction(ActionScope scope) async {
-    ran = true;
-    selectionDuringOnAction = scope.ref.read(multiSelectProvider).isEnabled;
-    if (error != null) {
-      throw error!;
+  Future<void> onAction() async {
+    action.ran = true;
+    action.selectionDuringOnAction = scope.ref.read(multiSelectProvider).isEnabled;
+    if (action.error != null) {
+      throw action.error!;
     }
   }
 }
@@ -77,7 +86,7 @@ void main() {
     testWidgets('runs the wrapped action and then clears the selection', (tester) async {
       final inner = _FakeAction();
       final (scope, container) = await pumpScope(tester);
-      await TimelineAction(action: inner).onAction(scope);
+      await TimelineAction(action: inner).resolve(scope).onAction();
 
       expect(inner.ran, isTrue);
       expect(inner.selectionDuringOnAction, isTrue, reason: 'reset must run after the inner action, not before');
@@ -89,7 +98,7 @@ void main() {
       final inner = _FakeAction(error: error);
       final (scope, container) = await pumpScope(tester);
 
-      await expectLater(TimelineAction(action: inner).onAction(scope), throwsA(same(error)));
+      await expectLater(TimelineAction(action: inner).resolve(scope).onAction(), throwsA(same(error)));
 
       expect(inner.ran, isTrue);
       expect(container.read(multiSelectProvider).isEnabled, isTrue);

mobile/test/unit/presentation/partner_page_test.dart

@@ -17,12 +17,10 @@ void main() {
 
   group('PartnerSharedByList', () {
     testWidgets('shows the empty-state add button when there are no partners', (tester) async {
-      final action = const PartnerAddAction();
-
       await tester.pumpTestWidget(context, const PartnerSharedByList(partners: []));
 
       expect(find.byType(ListView), findsNothing);
-      expect(find.widgetWithIcon(TextButton, action.icon), findsOneWidget);
+      expect(find.widgetWithIcon(TextButton, Icons.person_add_rounded), findsOneWidget);
     });
 
     testWidgets('renders a tile per partner with name and email', (tester) async {
@@ -39,9 +37,8 @@ void main() {
     testWidgets('renders a remove action for each partner', (tester) async {
       final partner1 = PartnerFactory.create(inTimeline: true);
       final partner2 = PartnerFactory.create();
-      final action = const PartnerRemoveAction(sharedWithId: '', partnerName: '');
       await tester.pumpTestWidget(context, PartnerSharedByList(partners: [partner1, partner2]));
-      expect(find.byIcon(action.icon), findsNWidgets(2));
+      expect(find.byIcon(Icons.person_remove_rounded), findsNWidgets(2));
     });
   });
 

mobile/test/unit/presentation/presentation_context.dart

@@ -14,6 +14,7 @@ import 'package:immich_mobile/infrastructure/repositories/store.repository.dart'
 import 'package:immich_mobile/presentation/actions/action.dart';
 import 'package:immich_mobile/presentation/actions/action.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/toast.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/user.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_ui/immich_ui.dart';
@@ -43,6 +44,7 @@ class PresentationContext {
     currentUserProvider.overrideWith((ref) => CurrentUserProvider(service.user.service)),
     assetServiceProvider.overrideWithValue(service.asset.service),
     partnerServiceProvider.overrideWithValue(service.partner.service),
+    toastRepositoryProvider.overrideWithValue(repository.toast),
   ];
 
   static Future<PresentationContext> create() async {
@@ -96,14 +98,25 @@ extension PumpPresentationWidget on WidgetTester {
     await pumpAndSettle();
   }
 
-  Future<void> pumpTestAction(
+  Future<ActionView> pumpTestAction(
     PresentationContext context,
     BaseAction action, {
     List<Override> overrides = const [],
   }) async {
-    await pumpTestWidget(context, ActionIconButtonWidget(action: action), overrides: overrides);
+    late ActionView view;
+    await pumpTestWidget(
+      context,
+      Consumer(
+        builder: (innerContext, ref, _) {
+          view = action.resolve(ActionScope(context: innerContext, ref: ref, authUser: context.currentUser));
+          return ActionIconButtonWidget(action: action);
+        },
+      ),
+      overrides: overrides,
+    );
     await tap(find.byType(ImmichIconButton));
     await pump();
+    return view;
   }
 
   Future<void> pumpUntilFound(Finder finder, {int maxFrames = 10}) async {

mobile/test/unit/utils/asset_filter_test.dart

@@ -0,0 +1,200 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/utils/asset_filter.dart';
+
+import '../factories/local_asset_factory.dart';
+import '../factories/remote_asset_factory.dart';
+
+void main() {
+  group('AssetFilter', () {
+    group('type promotion', () {
+      test('a bare filter retains every BaseAsset', () {
+        final remoteAsset = RemoteAssetFactory.create();
+        final localAsset = LocalAssetFactory.create();
+
+        final AssetFilter<BaseAsset> filter = AssetFilter(<BaseAsset>[remoteAsset, localAsset]);
+
+        expect(filter.toList(), [remoteAsset, localAsset]);
+      });
+
+      test('remote keeps only remote assets', () {
+        final remoteAsset = RemoteAssetFactory.create();
+        final localAsset = LocalAssetFactory.create();
+
+        final AssetFilter<RemoteAsset> remoteOnly = AssetFilter(<BaseAsset>[remoteAsset, localAsset]).remote();
+
+        expect(remoteOnly.toList(), [remoteAsset]);
+      });
+
+      test('local keeps only local assets', () {
+        final remoteAsset = RemoteAssetFactory.create();
+        final localAsset = LocalAssetFactory.create();
+
+        final AssetFilter<LocalAsset> localOnly = AssetFilter(<BaseAsset>[remoteAsset, localAsset]).local();
+
+        expect(localOnly.toList(), [localAsset]);
+      });
+
+      test('owned promotes to RemoteAsset and drops local assets', () {
+        final remoteAsset = RemoteAssetFactory.create();
+        final localAsset = LocalAssetFactory.create();
+
+        final AssetFilter<RemoteAsset> remoteOnly = AssetFilter(<BaseAsset>[
+          remoteAsset,
+          localAsset,
+        ]).owned(remoteAsset.ownerId);
+
+        expect(remoteOnly.toList(), [remoteAsset]);
+      });
+
+      test('backedUp promotes to LocalAsset and drops remote assets', () {
+        final syncedPhoto = LocalAssetFactory.create().copyWith(remoteId: 'remote');
+        final offlinePhoto = LocalAssetFactory.create();
+        final remotePhoto = RemoteAssetFactory.create();
+
+        final AssetFilter<LocalAsset> syncedPhotos = AssetFilter(<BaseAsset>[
+          syncedPhoto,
+          offlinePhoto,
+          remotePhoto,
+        ]).backedUp();
+
+        expect(syncedPhotos.toList(), [syncedPhoto]);
+      });
+    });
+
+    group('named filters', () {
+      test('owned keeps only assets of the given owner', () {
+        final asset1 = RemoteAssetFactory.create();
+        final asset2 = RemoteAssetFactory.create();
+
+        final alexPhotos = AssetFilter([asset1, asset2]).owned(asset1.ownerId);
+
+        expect(alexPhotos.toList(), [asset1]);
+      });
+
+      test('favorites keeps only favorite assets', () {
+        final asset1 = RemoteAssetFactory.create(isFavorite: true);
+        final asset2 = RemoteAssetFactory.create(ownerId: asset1.ownerId);
+
+        final favorites = AssetFilter([asset1, asset2]).favorite();
+
+        expect(favorites.toList(), [asset1]);
+      });
+
+      test('type keeps only assets of the given type', () {
+        final image = RemoteAssetFactory.create();
+        final video = RemoteAssetFactory.create(ownerId: image.ownerId).copyWith(type: .video);
+
+        final videos = AssetFilter([image, video]).type(.video);
+
+        expect(videos.toList(), [video]);
+      });
+
+      test('visibility keeps only assets with the given visibility', () {
+        final locked = RemoteAssetFactory.create(visibility: AssetVisibility.locked);
+        final onTimeline = RemoteAssetFactory.create(ownerId: locked.ownerId);
+
+        final lockedPhotos = AssetFilter([locked, onTimeline]).visibility(.locked);
+
+        expect(lockedPhotos.toList(), [locked]);
+      });
+
+      test('archived keeps only archived assets', () {
+        final archived = RemoteAssetFactory.create(visibility: AssetVisibility.archive);
+        final onTimeline = RemoteAssetFactory.create(ownerId: archived.ownerId);
+
+        final archivedPhotos = AssetFilter([archived, onTimeline]).archived();
+
+        expect(archivedPhotos.toList(), [archived]);
+      });
+
+      test('stacked keeps only assets belonging to a stack', () {
+        final stacked = RemoteAssetFactory.create(stackId: 'stack');
+        final loose = RemoteAssetFactory.create(ownerId: stacked.ownerId);
+
+        final stackedPhotos = AssetFilter([stacked, loose]).stacked();
+
+        expect(stackedPhotos.toList(), [stacked]);
+      });
+    });
+
+    group('inversion', () {
+      test('notArchived keeps every non-archived visibility', () {
+        final archived = RemoteAssetFactory.create(visibility: AssetVisibility.archive);
+        final onTimeline = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.timeline);
+        final hidden = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.hidden);
+        final locked = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.locked);
+
+        final visiblePhotos = AssetFilter([archived, onTimeline, hidden, locked]).archived(isArchived: false);
+
+        expect(visiblePhotos.toSet(), {onTimeline, hidden, locked});
+      });
+
+      test('notVisibility keeps every asset not at the target visibility', () {
+        final archived = RemoteAssetFactory.create(visibility: AssetVisibility.archive);
+        final onTimeline = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.timeline);
+        final locked = RemoteAssetFactory.create(ownerId: archived.ownerId, visibility: AssetVisibility.locked);
+
+        final toArchive = AssetFilter([archived, onTimeline, locked]).notVisibility(.archive);
+
+        expect(toArchive.toSet(), {onTimeline, locked});
+      });
+
+      test('notStacked keeps only assets without a stack', () {
+        final stacked = RemoteAssetFactory.create(stackId: 'stack');
+        final loose = RemoteAssetFactory.create(ownerId: stacked.ownerId);
+
+        final loosePhotos = AssetFilter([stacked, loose]).stacked(isStacked: false);
+
+        expect(loosePhotos.toList(), [loose]);
+      });
+
+      test('whereNot inverts an arbitrary predicate', () {
+        final favorite = RemoteAssetFactory.create(isFavorite: true);
+        final regular = RemoteAssetFactory.create(ownerId: favorite.ownerId);
+
+        final nonFavorites = AssetFilter([favorite, regular]).whereNot((asset) => asset.isFavorite);
+
+        expect(nonFavorites.toList(), [regular]);
+      });
+
+      test('notFavorites keeps only non-favorite assets', () {
+        final favorite = RemoteAssetFactory.create(isFavorite: true);
+        final regular = RemoteAssetFactory.create(ownerId: favorite.ownerId);
+
+        final nonFavorites = AssetFilter([favorite, regular]).favorite(isFavorite: false);
+
+        expect(nonFavorites.toList(), [regular]);
+      });
+    });
+
+    group('chaining', () {
+      test('combines predicates across owner, visibility and stack', () {
+        final asset = RemoteAssetFactory.create();
+        final wrongOwner = RemoteAssetFactory.create();
+        final archived = RemoteAssetFactory.create(ownerId: asset.ownerId, visibility: AssetVisibility.archive);
+        final stacked = RemoteAssetFactory.create(ownerId: asset.ownerId, stackId: 'stack-1');
+        final localPhoto = LocalAssetFactory.create();
+
+        final result = AssetFilter(<BaseAsset>[
+          asset,
+          wrongOwner,
+          archived,
+          stacked,
+          localPhoto,
+        ]).owned(asset.ownerId).archived(isArchived: false).stacked(isStacked: false);
+
+        expect(result.toList(), [asset]);
+      });
+
+      test('a base filter after a promotion retains the promoted type', () {
+        final favorite = RemoteAssetFactory.create(isFavorite: true);
+        final regular = RemoteAssetFactory.create(ownerId: favorite.ownerId);
+
+        final AssetFilter<RemoteAsset> result = AssetFilter([favorite, regular]).owned(favorite.ownerId).favorite();
+
+        expect(result.toList(), [favorite]);
+      });
+    });
+  });
+}

native/.gitignore

@@ -1,5 +0,0 @@
-/target
-smoke/*.node
-# generated + committed (regen via `mise run codegen`):
-#   crates/immich_core_dart/include/immich_core.h                     (cbindgen)
-#   immich_native_core/lib/immich_native_core_bindings_generated.dart (ffigen)

native/Cargo.lock

@@ -1,619 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 4
-
-[[package]]
-name = "bitflags"
-version = "2.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
-
-[[package]]
-name = "block-buffer"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa"
-dependencies = [
- "hybrid-array",
-]
-
-[[package]]
-name = "cbindgen"
-version = "0.29.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ecb53484c9c167ba674026b656d8a27d7657a58e6066aa902bfb1a4aa00ae20"
-dependencies = [
- "heck",
- "indexmap",
- "log",
- "proc-macro2",
- "quote",
- "serde",
- "serde_json",
- "syn",
- "tempfile",
- "toml",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
-
-[[package]]
-name = "convert_case"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "affbf0190ed2caf063e3def54ff444b449371d55c58e513a95ab98eca50adb49"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "cpufeatures"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crypto-common"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453"
-dependencies = [
- "hybrid-array",
-]
-
-[[package]]
-name = "ctor"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01334b89b69ff726750c5ce5073fc8bd860e99aa9a8fc5ca11b04730e3aee97a"
-
-[[package]]
-name = "digest"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2"
-dependencies = [
- "block-buffer",
- "crypto-common",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
-
-[[package]]
-name = "errno"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
-dependencies = [
- "libc",
- "windows-sys",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
-
-[[package]]
-name = "futures"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
-
-[[package]]
-name = "futures-task"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
-
-[[package]]
-name = "futures-util"
-version = "0.3.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "slab",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
-dependencies = [
- "cfg-if",
- "libc",
- "r-efi",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "hybrid-array"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9155a582abd142abc056962c29e3ce5ff2ad5469f4246b537ed42c5deba857da"
-dependencies = [
- "typenum",
-]
-
-[[package]]
-name = "immich_core"
-version = "0.1.0"
-dependencies = [
- "memmap2",
- "sha1",
-]
-
-[[package]]
-name = "immich_core_dart"
-version = "0.1.0"
-dependencies = [
- "cbindgen",
- "immich_core",
-]
-
-[[package]]
-name = "immich_core_napi"
-version = "0.1.0"
-dependencies = [
- "immich_core",
- "napi",
- "napi-build",
- "napi-derive",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
-dependencies = [
- "equivalent",
- "hashbrown",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
-
-[[package]]
-name = "libc"
-version = "0.2.186"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
-
-[[package]]
-name = "libloading"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "754ca22de805bb5744484a5b151a9e1a8e837d5dc232c2d7d8c2e3492edc8b60"
-dependencies = [
- "cfg-if",
- "windows-link",
-]
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
-
-[[package]]
-name = "log"
-version = "0.4.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
-
-[[package]]
-name = "memchr"
-version = "2.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4"
-
-[[package]]
-name = "memmap2"
-version = "0.9.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1219ed1b7f229ee7104d281dd01d6802fe28bb6e95d292942c4daacdeb798c0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "napi"
-version = "3.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b41bda2ac390efb5e8d22025d925ccc3f3807d8c1bea6d19b36127247c4b8f83"
-dependencies = [
- "bitflags",
- "ctor",
- "futures",
- "napi-build",
- "napi-sys",
- "nohash-hasher",
- "rustc-hash",
-]
-
-[[package]]
-name = "napi-build"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9c366d2c8c60b86fa632df75f745509b52f9128f91a6bad4c796e44abb505e1"
-
-[[package]]
-name = "napi-derive"
-version = "3.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61d66f70256ad5aef58659966064471d0ad90e2897bc36a5a5e0389c85aabc1e"
-dependencies = [
- "convert_case",
- "ctor",
- "napi-derive-backend",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "napi-derive-backend"
-version = "5.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81b4b08f15eed7a2a20c3f4c6314013fc3ac890a3afa9892b594485299ebdb2d"
-dependencies = [
- "convert_case",
- "proc-macro2",
- "quote",
- "semver",
- "syn",
-]
-
-[[package]]
-name = "napi-sys"
-version = "3.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f5bcdf71abd3a50d00b49c1c2c75251cb3c913777d6139cd37dabc093a5e400"
-dependencies = [
- "libloading",
-]
-
-[[package]]
-name = "nohash-hasher"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
-
-[[package]]
-name = "once_cell"
-version = "1.21.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.106"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "r-efi"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
-
-[[package]]
-name = "rustc-hash"
-version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"
-
-[[package]]
-name = "rustix"
-version = "1.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
-dependencies = [
- "bitflags",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
-
-[[package]]
-name = "serde"
-version = "1.0.228"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
-dependencies = [
- "serde_core",
- "serde_derive",
-]
-
-[[package]]
-name = "serde_core"
-version = "1.0.228"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.228"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.150"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
-dependencies = [
- "itoa",
- "memchr",
- "serde",
- "serde_core",
- "zmij",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
-dependencies = [
- "serde_core",
-]
-
-[[package]]
-name = "sha1"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
-
-[[package]]
-name = "syn"
-version = "2.0.118"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
-dependencies = [
- "fastrand",
- "getrandom",
- "once_cell",
- "rustix",
- "windows-sys",
-]
-
-[[package]]
-name = "toml"
-version = "0.9.12+spec-1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863"
-dependencies = [
- "indexmap",
- "serde_core",
- "serde_spanned",
- "toml_datetime",
- "toml_parser",
- "toml_writer",
- "winnow 0.7.15",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.7.5+spec-1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
-dependencies = [
- "serde_core",
-]
-
-[[package]]
-name = "toml_parser"
-version = "1.1.2+spec-1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
-dependencies = [
- "winnow 1.0.3",
-]
-
-[[package]]
-name = "toml_writer"
-version = "1.1.1+spec-1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db"
-
-[[package]]
-name = "typenum"
-version = "1.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8"
-
-[[package]]
-name = "windows-link"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
-
-[[package]]
-name = "windows-sys"
-version = "0.61.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
-dependencies = [
- "windows-link",
-]
-
-[[package]]
-name = "winnow"
-version = "0.7.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945"
-
-[[package]]
-name = "winnow"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1"
-
-[[package]]
-name = "zmij"
-version = "1.0.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"

native/Cargo.toml

@@ -1,44 +0,0 @@
-[workspace]
-resolver = "2"
-members = [
-    "crates/immich_core",
-    "crates/immich_core_dart",
-    "crates/immich_core_napi",
-]
-
-# shared logic lives in immich_core (no binding deps). each binding crate is a
-# thin wrapper that picks its own crate-type: immich_core_dart -> cdylib/staticlib
-# for dart:ffi (mobile), immich_core_napi -> cdylib (.node) for the node server.
-# capabilities (hashing, exif, ...) are cargo features on immich_core so both
-# bindings opt into the same set. crate-type can't be feature-gated, which is why
-# the bindings are separate crates rather than one crate with feature flags.
-
-[workspace.package]
-version = "0.1.0"
-edition = "2021"
-license = "AGPL-3.0-only"
-
-# single source of truth for all external dep versions. inner crates reference
-# these with `{ workspace = true }` and never hardcode a version.
-# default-features = false MUST live here (workspace level) — cargo ignores it if
-# set only on the inner crate. inner crates then add the minimal features they need.
-[workspace.dependencies]
-sha1 = { version = "0.11", default-features = false }
-memmap2 = { version = "0.9", default-features = false }
-napi = { version = "3", default-features = false }
-napi-derive = "3"
-napi-build = "2"
-cbindgen = { version = "0.29", default-features = false }
-
-# CI-enforced (not review-hoped): the boundary crate also #![deny]s unwrap/expect.
-[workspace.lints.clippy]
-undocumented_unsafe_blocks = "deny"
-
-# NB: no `panic = "abort"` — the FFI boundary relies on catch_unwind, which is a
-# no-op under abort. default unwind is what lets a boundary panic become a null
-# return instead of taking down the host (Flutter app / node server).
-[profile.release]
-opt-level = 3
-lto = true
-codegen-units = 1
-strip = true

native/README.md

@@ -1,61 +0,0 @@
-# immich_native_core (PoC)
-
-Shared Rust core consumed by the **mobile** app (Flutter, dart:ffi) and the
-**server** (Node, napi `.node` addon).
-
-Status: **plumbing PoC.** It proves the wiring — Rust → codegen → build-from-source
-on each app build → load on both platforms — not a perf win yet. The one capability
-(`sha1_hex`) is single-shot in-memory, and the local-sync probe found hashing isn't
-the hot path; a measured payload is the next step. `core_version` is a smoke
-entrypoint. Mobile is the consumed path; the server napi crate builds and
-round-trips but is not wired into the server yet.
-
-## Layout
-```
-crates/
-  immich_core        pure logic, no binding deps. capabilities = cargo features (hashing).
-  immich_core_dart   cdylib/staticlib + cbindgen header for dart:ffi (mobile)
-  immich_core_napi   cdylib (.node) via napi-rs (server, unwired)
-immich_native_core/  the Flutter package mobile depends on. build hook + ffigen @Native bindings.
-smoke/               host dart + node roundtrip scripts (no device)
-```
-Bindings are separate crates (Cargo can't gate `crate-type` by feature).
-
-## How the native lib is built (Flutter native assets — no prebuilt, no CI)
-`immich_native_core/hook/build.dart` (`native_toolchain_rust`) compiles
-`crates/immich_core_dart` **from source on every app build** via rustup and bundles
-it as a Flutter *code asset*. The Dart side uses ffigen `@Native` externals bound to
-that asset — no `DynamicLibrary`, no prebuilt artifacts, no fetch/publish/separate-repo.
-
-Native assets is on by default on Flutter stable (3.38+), so a stock `flutter build`
-runs the hook. Each builder needs **rustup** (the hook auto-installs the pinned
-toolchain + targets from `crates/immich_core_dart/rust-toolchain.toml`).
-
-## Dev commands (mise)
-```
-mise run build         cargo build --workspace
-mise run test          cargo test --workspace     (host Rust tests, incl. FFI-boundary)
-mise run lint          clippy -D warnings         (fmt: mise run fmt)
-mise run codegen       regen cbindgen header + ffigen @Native bindings — commit the result
-mise run test:flutter  HOST FFI roundtrip through the real build hook (no device)
-mise run smoke         Rust tests + host dart:ffi + host napi roundtrips
-```
-
-## Add a capability (end to end)
-1. add the logic to `crates/immich_core` (behind a cargo feature if it pulls a dep).
-2. expose a C entry in `crates/immich_core_dart/src/lib.rs` — `#[no_mangle] pub extern "C"`,
-   wrap the body in `guard(...)` (panic at the boundary → null, never unwind into the host),
-   validate pointers, return Rust-owned memory the caller frees via `immich_core_free_string`.
-3. `mise run codegen` — regenerates the committed cbindgen header + ffigen `@Native` bindings.
-4. add an ergonomic wrapper + null-check in `immich_native_core/lib/immich_native_core.dart`.
-5. (optional) mirror it in `crates/immich_core_napi/src/lib.rs` for the server.
-6. `mise run test:flutter` (host) + add a case to `immich_native_core/test/`, and to
-   `mobile/integration_test/native_core_test.dart` to exercise it on a device.
-
-## Consume from immich/mobile
-`immich_native_core: { path: ../native/immich_native_core }` in `mobile/pubspec.yaml`,
-then `dart pub get`. No app-level Gradle/Podfile edits — the hook builds + bundles the
-lib. Builders need rustup. See the package README for the iOS App-Extension caveat.
-
-`/native/` is codeowned by @santoshakil + @mertalev. License: reuses the immich
-repo-root AGPL-3.0 (no separate license file).

native/crates/immich_core/Cargo.toml

@@ -1,17 +0,0 @@
-[package]
-name = "immich_core"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[features]
-default = ["hashing", "image"]
-hashing = ["dep:sha1", "dep:memmap2"]
-image = [] # pure pixel math, no deps
-
-[dependencies]
-sha1 = { workspace = true, optional = true }
-memmap2 = { workspace = true, optional = true }
-
-[lints]
-workspace = true

native/crates/immich_core/src/hashing.rs

@@ -1,75 +0,0 @@
-//! SHA-1 hashing. SHA-1 is immich's asset-identity checksum (server contract):
-//! the algorithm is fixed. The win is in HOW it's computed — `sha1_file` mmaps the
-//! file and feeds the OS-paged bytes straight to a hardware-accelerated digest, so
-//! the whole file never lands in the caller's heap and there's no read+copy hop.
-
-use sha1::{Digest, Sha1};
-use std::fmt::Write;
-use std::fs::File;
-use std::io;
-use std::path::Path;
-
-/// Lowercase-hex SHA-1 of a byte slice.
-pub fn sha1_hex(bytes: &[u8]) -> String {
-    let digest = Sha1::digest(bytes);
-    let mut out = String::with_capacity(40);
-    for b in digest {
-        let _ = write!(out, "{b:02x}");
-    }
-    out
-}
-
-/// Lowercase-hex SHA-1 of the file at `path`, read via mmap. The OS pages the file
-/// in on demand, so memory stays bounded regardless of file size — no full read
-/// into a buffer, no copy.
-pub fn sha1_file(path: impl AsRef<Path>) -> io::Result<String> {
-    let file = File::open(path)?;
-    if file.metadata()?.len() == 0 {
-        return Ok(sha1_hex(&[]));
-    }
-    // SAFETY: the file is opened read-only and the mapping is read as immutable
-    // bytes for the duration of the hash. immich assets are not mutated in place;
-    // a concurrent truncation could SIGBUS, which is the documented mmap trade-off.
-    let mmap = unsafe { memmap2::Mmap::map(&file)? };
-    Ok(sha1_hex(&mmap))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn sha1_known_vector() {
-        // FIPS-180 worked example.
-        assert_eq!(sha1_hex(b"abc"), "a9993e364706816aba3e25717850c26c9cd0d89d");
-    }
-
-    #[test]
-    fn sha1_empty() {
-        assert_eq!(sha1_hex(b""), "da39a3ee5e6b4b0d3255bfef95601890afd80709");
-    }
-
-    #[test]
-    fn sha1_file_matches_in_memory() {
-        let dir = std::env::temp_dir();
-        let path = dir.join(format!("immich_core_sha1_file_{}.bin", std::process::id()));
-        let data: Vec<u8> = (0..100_000u32).map(|i| (i % 251) as u8).collect();
-        std::fs::write(&path, &data).unwrap();
-        assert_eq!(sha1_file(&path).unwrap(), sha1_hex(&data));
-        std::fs::remove_file(&path).ok();
-    }
-
-    #[test]
-    fn sha1_file_empty() {
-        let path =
-            std::env::temp_dir().join(format!("immich_core_empty_{}.bin", std::process::id()));
-        std::fs::write(&path, b"").unwrap();
-        assert_eq!(sha1_file(&path).unwrap(), sha1_hex(b""));
-        std::fs::remove_file(&path).ok();
-    }
-
-    #[test]
-    fn sha1_file_missing_errors() {
-        assert!(sha1_file("/no/such/immich_core/file").is_err());
-    }
-}

native/crates/immich_core/src/image.rs

@@ -1,173 +0,0 @@
-//! EXIF-orientation rotation of RGBA8888 pixel buffers, ported from the Android
-//! native_image.c (immich PR #29337). Lives here so the perf-critical pixel math
-//! exists once, tested, callable from any platform's decode pipeline (Android RAW
-//! today; the algorithm is platform-agnostic). The platform side keeps the bitmap
-//! lock + output allocation and calls this to fill the destination buffer.
-
-// EXIF orientation values (androidx ExifInterface.ORIENTATION_*).
-const FLIP_HORIZONTAL: i32 = 2;
-const ROTATE_180: i32 = 3;
-const FLIP_VERTICAL: i32 = 4;
-const TRANSPOSE: i32 = 5;
-const ROTATE_90: i32 = 6;
-const TRANSVERSE: i32 = 7;
-const ROTATE_270: i32 = 8;
-
-// 32x32 u32 tile = 4KB, L1-resident so a 90/270 transpose's scattered writes stay hot.
-const TILE: usize = 32;
-
-/// Whether the orientation swaps width and height (the 90/270 + transpose family).
-pub fn swaps_dims(orientation: i32) -> bool {
-    matches!(orientation, ROTATE_90 | ROTATE_270 | TRANSPOSE | TRANSVERSE)
-}
-
-// (base, step_x, step_y): src pixel (sx,sy) maps to dst pixel index
-// base + sx*step_x + sy*step_y for a destination of width `dw`. Mirrors
-// native_image.c affine_for byte-for-byte. i64 so the math stays correct on 32-bit.
-fn affine_for(o: i32, sw: i64, sh: i64, dw: i64) -> (i64, i64, i64) {
-    match o {
-        ROTATE_90 => (sh - 1, dw, -1),
-        ROTATE_270 => ((sw - 1) * dw, -dw, 1),
-        ROTATE_180 => ((sh - 1) * dw + (sw - 1), -1, -dw),
-        FLIP_HORIZONTAL => (sw - 1, -1, dw),
-        FLIP_VERTICAL => ((sh - 1) * dw, 1, -dw),
-        TRANSPOSE => (0, dw, 1),
-        TRANSVERSE => ((sw - 1) * dw + (sh - 1), -dw, -1),
-        _ => (0, 1, dw),
-    }
-}
-
-/// Rotate `src` (RGBA8888, `sh` rows of `src_stride` bytes, `sw` pixels per row) into
-/// `dst` (densely packed, `dw*dh*4` bytes) for the given EXIF orientation, where
-/// (dw,dh) swap for the 90/270/transpose family. Returns `false` without touching
-/// out-of-range memory if the sizes are inconsistent, so the caller can fall back.
-/// Indexing is bounds-checked: a bad input fails safe (panic caught at the FFI
-/// boundary / false here), never an out-of-bounds write like the raw C.
-pub fn rotate_rgba8888(
-    src: &[u8],
-    src_stride: usize,
-    sw: usize,
-    sh: usize,
-    orientation: i32,
-    dst: &mut [u8],
-) -> bool {
-    if sw == 0 || sh == 0 || src_stride < sw * 4 {
-        return false;
-    }
-    let dw = if swaps_dims(orientation) { sh } else { sw };
-    let dh = if swaps_dims(orientation) { sw } else { sh };
-    if src.len() < src_stride * sh || dst.len() < dw * dh * 4 {
-        return false;
-    }
-    let (base, step_x, step_y) = affine_for(orientation, sw as i64, sh as i64, dw as i64);
-    for ty in (0..sh).step_by(TILE) {
-        let y_end = (ty + TILE).min(sh);
-        for tx in (0..sw).step_by(TILE) {
-            let x_end = (tx + TILE).min(sw);
-            for sy in ty..y_end {
-                let row = sy * src_stride;
-                let mut idx = base + sy as i64 * step_y + tx as i64 * step_x;
-                for sx in tx..x_end {
-                    let s = row + sx * 4;
-                    let d = idx as usize * 4;
-                    dst[d..d + 4].copy_from_slice(&src[s..s + 4]);
-                    idx += step_x;
-                }
-            }
-        }
-    }
-    true
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    // Independent textbook EXIF transform: src(sx,sy) -> dst(dx,dy). Verifies the
-    // affine port against orientation *semantics*, not against itself.
-    fn ref_dst_xy(o: i32, sx: usize, sy: usize, sw: usize, sh: usize) -> (usize, usize) {
-        match o {
-            FLIP_HORIZONTAL => (sw - 1 - sx, sy),
-            ROTATE_180 => (sw - 1 - sx, sh - 1 - sy),
-            FLIP_VERTICAL => (sx, sh - 1 - sy),
-            TRANSPOSE => (sy, sx),
-            ROTATE_90 => (sh - 1 - sy, sx),
-            TRANSVERSE => (sh - 1 - sy, sw - 1 - sx),
-            ROTATE_270 => (sy, sw - 1 - sx),
-            _ => (sx, sy),
-        }
-    }
-
-    fn pixel(i: usize) -> [u8; 4] {
-        [
-            (i & 0xff) as u8,
-            ((i >> 8) & 0xff) as u8,
-            ((i >> 16) & 0xff) as u8,
-            0xff,
-        ]
-    }
-
-    fn check(o: i32, sw: usize, sh: usize) {
-        let mut src = vec![0u8; sw * sh * 4];
-        for sy in 0..sh {
-            for sx in 0..sw {
-                let i = sy * sw + sx;
-                src[i * 4..i * 4 + 4].copy_from_slice(&pixel(i));
-            }
-        }
-        let (dw, dh) = if swaps_dims(o) { (sh, sw) } else { (sw, sh) };
-        let mut dst = vec![0u8; dw * dh * 4];
-        assert!(rotate_rgba8888(&src, sw * 4, sw, sh, o, &mut dst));
-        for sy in 0..sh {
-            for sx in 0..sw {
-                let (dx, dy) = ref_dst_xy(o, sx, sy, sw, sh);
-                let di = dy * dw + dx;
-                let si = sy * sw + sx;
-                assert_eq!(&dst[di * 4..di * 4 + 4], &pixel(si), "o={o} src({sx},{sy})");
-            }
-        }
-    }
-
-    #[test]
-    fn all_orientations_match_exif_reference() {
-        for o in [1, 2, 3, 4, 5, 6, 7, 8] {
-            check(o, 4, 3);
-            check(o, 1, 5);
-            check(o, 5, 1);
-            check(o, 40, 33); // spans multiple tiles
-        }
-    }
-
-    #[test]
-    fn identity_for_normal_orientation() {
-        let src: Vec<u8> = (0..24u8).collect(); // 2x3 RGBA
-        let mut dst = vec![0u8; 24];
-        assert!(rotate_rgba8888(&src, 8, 2, 3, 1, &mut dst));
-        assert_eq!(src, dst);
-    }
-
-    #[test]
-    fn respects_src_stride_padding() {
-        let (sw, sh, stride) = (2usize, 2usize, 12usize); // 4 bytes row padding
-        let mut src = vec![0u8; stride * sh];
-        for sy in 0..sh {
-            for sx in 0..sw {
-                let i = sy * sw + sx;
-                src[sy * stride + sx * 4..sy * stride + sx * 4 + 4].copy_from_slice(&pixel(i));
-            }
-        }
-        let mut dst = vec![0u8; sw * sh * 4];
-        assert!(rotate_rgba8888(&src, stride, sw, sh, ROTATE_180, &mut dst));
-        for i in 0..4 {
-            assert_eq!(&dst[i * 4..i * 4 + 4], &pixel(3 - i)); // 180: i -> N-1-i
-        }
-    }
-
-    #[test]
-    fn rejects_bad_sizes() {
-        let src = vec![0u8; 16];
-        let mut small = vec![0u8; 4];
-        assert!(!rotate_rgba8888(&src, 8, 2, 2, ROTATE_90, &mut small)); // dst too small
-        assert!(!rotate_rgba8888(&src, 4, 2, 2, 1, &mut small)); // stride < sw*4
-    }
-}

native/crates/immich_core/src/lib.rs

@@ -1,26 +0,0 @@
-//! immich_native_core — shared Rust core for the immich server (napi) and mobile (dart:ffi).
-//!
-//! Pure logic only: no binding or platform deps live here. Each binding crate
-//! (`immich_core_dart`, `immich_core_napi`) is a thin wrapper. Capabilities are
-//! cargo features (`hashing`, `image`, ...) so every binding opts into the same set.
-
-#[cfg(feature = "hashing")]
-pub mod hashing;
-
-#[cfg(feature = "image")]
-pub mod image;
-
-/// Version of the native core. Smoke-test entrypoint exercised by every binding.
-pub fn core_version() -> &'static str {
-    env!("CARGO_PKG_VERSION")
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn version_is_present() {
-        assert!(!core_version().is_empty());
-    }
-}

native/crates/immich_core_dart/Cargo.toml

@@ -1,21 +0,0 @@
-[package]
-name = "immich_core_dart"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
-
-# native_toolchain_rust requires cdylib (the bundled lib) + staticlib (iOS). It
-# derives the artifact name from [package].name, so no [lib] name override here.
-[lib]
-crate-type = ["cdylib", "staticlib"]
-
-# hashing (SHA-1 asset identity) is the reason this lib exists — always on, so the
-# cbindgen header + ffigen bindings always match the exported symbols.
-[dependencies]
-immich_core = { path = "../immich_core", default-features = false, features = ["hashing", "image"] }
-
-[build-dependencies]
-cbindgen = { workspace = true }
-
-[lints]
-workspace = true

native/crates/immich_core_dart/build.rs

@@ -1,19 +0,0 @@
-use std::path::Path;
-
-fn main() {
-    println!("cargo:rerun-if-changed=src/lib.rs");
-    println!("cargo:rerun-if-changed=cbindgen.toml");
-
-    let crate_dir = std::env::var("CARGO_MANIFEST_DIR").unwrap();
-    let out = Path::new(&crate_dir).join("include").join("immich_core.h");
-    std::fs::create_dir_all(out.parent().unwrap()).ok();
-
-    // Hard-fail, not a warning: the CI drift gate diffs this header, so a silent
-    // codegen failure would let a stale header sail through green.
-    match cbindgen::generate(&crate_dir) {
-        Ok(bindings) => {
-            bindings.write_to_file(&out);
-        }
-        Err(e) => panic!("cbindgen failed: {e}"),
-    }
-}

native/crates/immich_core_dart/cbindgen.toml

@@ -1,3 +0,0 @@
-language = "C"
-pragma_once = true
-autogen_warning = "// Generated by cbindgen — do not edit."

native/crates/immich_core_dart/include/immich_core.h

@@ -1,60 +0,0 @@
-#pragma once
-
-// Generated by cbindgen — do not edit.
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-/**
- * Native core version as a NUL-terminated UTF-8 string.
- * Free the result with [`immich_core_free_string`].
- */
-char *immich_core_version(void);
-
-/**
- * SHA-1 (lowercase hex) of `len` bytes at `ptr`. Returns NULL on a null pointer.
- * Free the result with [`immich_core_free_string`].
- *
- * # Safety
- * `ptr` must be valid for reads of `len` bytes.
- */
-char *immich_core_sha1_hex(const unsigned char *ptr, uintptr_t len);
-
-/**
- * SHA-1 (lowercase hex) of the file at `path` (NUL-terminated UTF-8), read via
- * mmap — no Dart-side read or copy. Returns NULL on a null path, non-UTF-8 path,
- * or any IO error. Free the result with [`immich_core_free_string`].
- *
- * # Safety
- * `path` must be a valid NUL-terminated C string, or null.
- */
-char *immich_core_sha1_file(const char *path);
-
-/**
- * Rotate an RGBA8888 image to the given EXIF `orientation`. `src` is `sh` rows of
- * `src_stride` bytes; `dst` is the caller's densely-packed `dw*dh*4` output (dims
- * swap for 90/270/transpose). Returns false (a safe no-op) on null pointers or
- * inconsistent sizes so the caller can fall back. The platform side owns the
- * bitmap lock + the dst allocation; this only fills dst.
- *
- * # Safety
- * `src` must be valid for reads of `src_len` bytes and `dst` for writes of `dst_len`.
- */
-bool immich_core_rotate_rgba8888(const uint8_t *src,
-                                 uintptr_t src_len,
-                                 uintptr_t src_stride,
-                                 uint32_t width,
-                                 uint32_t height,
-                                 int32_t orientation,
-                                 uint8_t *dst,
-                                 uintptr_t dst_len);
-
-/**
- * Release a string returned by this library.
- *
- * # Safety
- * `ptr` must be a pointer previously returned by this library, or null.
- */
-void immich_core_free_string(char *ptr);

native/crates/immich_core_dart/rust-toolchain.toml

@@ -1,18 +0,0 @@
-# The build hook (native_toolchain_rust) drives cargo via rustup and auto-installs
-# this toolchain + targets. Pin a version (never bare stable/beta) for reproducible
-# builds. Keep the channel in sync with mise.toml's rust pin.
-[toolchain]
-channel = "1.92.0"
-targets = [
-  # Android
-  "armv7-linux-androideabi",
-  "aarch64-linux-android",
-  "x86_64-linux-android",
-  # iOS (device + simulator)
-  "aarch64-apple-ios",
-  "aarch64-apple-ios-sim",
-  "x86_64-apple-ios",
-  # host (local test / macOS)
-  "aarch64-apple-darwin",
-  "x86_64-apple-darwin",
-]

native/crates/immich_core_dart/src/lib.rs

@@ -1,197 +0,0 @@
-//! dart:ffi binding for immich_core (mobile).
-//!
-//! Returns heap-allocated C strings the caller must release with
-//! `immich_core_free_string`. cbindgen emits `include/immich_core.h` at build time.
-#![deny(clippy::unwrap_used, clippy::expect_used)]
-
-use std::ffi::{c_char, CStr, CString};
-use std::os::raw::c_uchar;
-use std::ptr;
-
-/// Native core version as a NUL-terminated UTF-8 string.
-/// Free the result with [`immich_core_free_string`].
-#[no_mangle]
-pub extern "C" fn immich_core_version() -> *mut c_char {
-    guard(ptr::null_mut(), || {
-        into_c_string(immich_core::core_version().to_owned())
-    })
-}
-
-/// SHA-1 (lowercase hex) of `len` bytes at `ptr`. Returns NULL on a null pointer.
-/// Free the result with [`immich_core_free_string`].
-///
-/// # Safety
-/// `ptr` must be valid for reads of `len` bytes.
-#[no_mangle]
-pub unsafe extern "C" fn immich_core_sha1_hex(ptr: *const c_uchar, len: usize) -> *mut c_char {
-    if ptr.is_null() {
-        return ptr::null_mut();
-    }
-    // SAFETY: caller guarantees `ptr` is valid for reads of `len` bytes (see # Safety).
-    let bytes = unsafe { std::slice::from_raw_parts(ptr, len) };
-    guard(ptr::null_mut(), || {
-        into_c_string(immich_core::hashing::sha1_hex(bytes))
-    })
-}
-
-/// SHA-1 (lowercase hex) of the file at `path` (NUL-terminated UTF-8), read via
-/// mmap — no Dart-side read or copy. Returns NULL on a null path, non-UTF-8 path,
-/// or any IO error. Free the result with [`immich_core_free_string`].
-///
-/// # Safety
-/// `path` must be a valid NUL-terminated C string, or null.
-#[no_mangle]
-pub unsafe extern "C" fn immich_core_sha1_file(path: *const c_char) -> *mut c_char {
-    if path.is_null() {
-        return ptr::null_mut();
-    }
-    // SAFETY: caller guarantees `path` is a valid NUL-terminated C string (see # Safety).
-    let cpath = unsafe { CStr::from_ptr(path) };
-    guard(ptr::null_mut(), || match cpath.to_str() {
-        Ok(s) => match immich_core::hashing::sha1_file(s) {
-            Ok(hex) => into_c_string(hex),
-            Err(_) => ptr::null_mut(),
-        },
-        Err(_) => ptr::null_mut(),
-    })
-}
-
-/// Rotate an RGBA8888 image to the given EXIF `orientation`. `src` is `sh` rows of
-/// `src_stride` bytes; `dst` is the caller's densely-packed `dw*dh*4` output (dims
-/// swap for 90/270/transpose). Returns false (a safe no-op) on null pointers or
-/// inconsistent sizes so the caller can fall back. The platform side owns the
-/// bitmap lock + the dst allocation; this only fills dst.
-///
-/// # Safety
-/// `src` must be valid for reads of `src_len` bytes and `dst` for writes of `dst_len`.
-#[no_mangle]
-pub unsafe extern "C" fn immich_core_rotate_rgba8888(
-    src: *const u8,
-    src_len: usize,
-    src_stride: usize,
-    width: u32,
-    height: u32,
-    orientation: i32,
-    dst: *mut u8,
-    dst_len: usize,
-) -> bool {
-    if src.is_null() || dst.is_null() {
-        return false;
-    }
-    // SAFETY: caller guarantees `src` is valid for reads of `src_len` bytes (see # Safety).
-    let src_slice = unsafe { std::slice::from_raw_parts(src, src_len) };
-    // SAFETY: caller guarantees `dst` is valid for writes of `dst_len` bytes (see # Safety).
-    let dst_slice = unsafe { std::slice::from_raw_parts_mut(dst, dst_len) };
-    // AssertUnwindSafe: the closure writes through `&mut dst_slice`, which isn't
-    // UnwindSafe, but a panic mid-rotate only leaves dst partially written — not a
-    // broken invariant — and we return false so the caller discards the buffer.
-    std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
-        immich_core::image::rotate_rgba8888(
-            src_slice,
-            src_stride,
-            width as usize,
-            height as usize,
-            orientation,
-            dst_slice,
-        )
-    }))
-    .unwrap_or(false)
-}
-
-/// Release a string returned by this library.
-///
-/// # Safety
-/// `ptr` must be a pointer previously returned by this library, or null.
-#[no_mangle]
-pub unsafe extern "C" fn immich_core_free_string(ptr: *mut c_char) {
-    if ptr.is_null() {
-        return;
-    }
-    guard((), || {
-        // SAFETY: `ptr` came from this library's `CString::into_raw` (see # Safety).
-        let s = unsafe { CString::from_raw(ptr) };
-        drop(s);
-    });
-}
-
-/// Run `f` at the FFI boundary, turning a panic into `sentinel` rather than
-/// unwinding across `extern "C"` into the host. Guards panics only — a bad `len`
-/// or a double/foreign free is caller-contract UB that stays the caller's
-/// `# Safety` obligation, not something this can catch.
-fn guard<T>(sentinel: T, f: impl FnOnce() -> T + std::panic::UnwindSafe) -> T {
-    std::panic::catch_unwind(f).unwrap_or(sentinel)
-}
-
-fn into_c_string(s: String) -> *mut c_char {
-    match CString::new(s) {
-        Ok(c) => c.into_raw(),
-        Err(_) => ptr::null_mut(),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    #![allow(clippy::unwrap_used)]
-    use super::*;
-    use std::ffi::CStr;
-
-    #[test]
-    fn version_roundtrips_and_frees() {
-        let p = immich_core_version();
-        assert!(!p.is_null());
-        // SAFETY: `p` is a non-null NUL-terminated string from this library.
-        let s = unsafe { CStr::from_ptr(p) }.to_str().unwrap();
-        assert!(!s.is_empty());
-        // SAFETY: `p` was returned by this library and is freed exactly once.
-        unsafe { immich_core_free_string(p) };
-    }
-
-    #[test]
-    fn sha1_null_ptr_returns_null() {
-        // SAFETY: a null ptr is the documented null-returning case.
-        let p = unsafe { immich_core_sha1_hex(ptr::null(), 0) };
-        assert!(p.is_null());
-    }
-
-    #[test]
-    fn sha1_known_vector_roundtrips_and_frees() {
-        let input = b"abc";
-        // SAFETY: `input` is valid for reads of `input.len()` bytes.
-        let p = unsafe { immich_core_sha1_hex(input.as_ptr(), input.len()) };
-        assert!(!p.is_null());
-        // SAFETY: `p` is a non-null NUL-terminated string from this library.
-        let s = unsafe { CStr::from_ptr(p) }.to_str().unwrap();
-        assert_eq!(s, "a9993e364706816aba3e25717850c26c9cd0d89d");
-        // SAFETY: `p` was returned by this library and is freed exactly once.
-        unsafe { immich_core_free_string(p) };
-    }
-
-    #[test]
-    fn free_null_is_noop() {
-        // SAFETY: free_string explicitly accepts null.
-        unsafe { immich_core_free_string(ptr::null_mut()) };
-    }
-
-    #[test]
-    fn sha1_file_roundtrips_and_frees() {
-        let path = std::env::temp_dir().join(format!("immich_core_ffi_{}.bin", std::process::id()));
-        std::fs::write(&path, b"abc").unwrap();
-        let c = std::ffi::CString::new(path.to_str().unwrap()).unwrap();
-        // SAFETY: `c` is a valid NUL-terminated path string.
-        let p = unsafe { immich_core_sha1_file(c.as_ptr()) };
-        assert!(!p.is_null());
-        // SAFETY: `p` is a non-null string from this library.
-        let s = unsafe { CStr::from_ptr(p) }.to_str().unwrap();
-        assert_eq!(s, "a9993e364706816aba3e25717850c26c9cd0d89d");
-        // SAFETY: `p` was returned by this library, freed once.
-        unsafe { immich_core_free_string(p) };
-        std::fs::remove_file(&path).ok();
-    }
-
-    #[test]
-    fn sha1_file_null_returns_null() {
-        // SAFETY: a null path is the documented null-returning case.
-        let p = unsafe { immich_core_sha1_file(ptr::null()) };
-        assert!(p.is_null());
-    }
-}

native/crates/immich_core_napi/Cargo.toml

@@ -1,19 +0,0 @@
-[package]
-name = "immich_core_napi"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
-
-[lib]
-crate-type = ["cdylib"]
-
-[dependencies]
-immich_core = { path = "../immich_core", default-features = false, features = ["hashing"] }
-napi = { workspace = true, features = ["napi4", "dyn-symbols"] }
-napi-derive = { workspace = true }
-
-[build-dependencies]
-napi-build = { workspace = true }
-
-[lints]
-workspace = true

native/crates/immich_core_napi/build.rs

@@ -1,3 +0,0 @@
-fn main() {
-    napi_build::setup();
-}

native/crates/immich_core_napi/src/lib.rs

@@ -1,24 +0,0 @@
-//! napi-rs binding for immich_core (node server).
-//!
-//! Built as a cdylib loaded as a `.node` addon — the same shape as the server's
-//! existing native deps (sharp, bcrypt).
-
-use napi_derive::napi;
-
-/// Native core version. JS: `core.coreVersion()`.
-#[napi]
-pub fn core_version() -> String {
-    immich_core::core_version().to_owned()
-}
-
-/// SHA-1 (lowercase hex) of a buffer. JS: `core.sha1Hex(Buffer.from(...))`.
-#[napi]
-pub fn sha1_hex(bytes: napi::bindgen_prelude::Buffer) -> String {
-    immich_core::hashing::sha1_hex(bytes.as_ref())
-}
-
-/// SHA-1 (lowercase hex) of a file, read via mmap. JS: `core.sha1File(path)`.
-#[napi]
-pub fn sha1_file(path: String) -> napi::Result<String> {
-    immich_core::hashing::sha1_file(&path).map_err(|e| napi::Error::from_reason(e.to_string()))
-}

native/immich_native_core/.gitignore

@@ -1,33 +0,0 @@
-# Miscellaneous
-*.class
-*.log
-*.pyc
-*.swp
-.DS_Store
-.atom/
-.build/
-.buildlog/
-.history
-.svn/
-.swiftpm/
-migrate_working_dir/
-
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# The .vscode folder contains launch configuration and tasks you configure in
-# VS Code which you may wish to be included in version control, so this line
-# is commented out by default.
-#.vscode/
-
-# Flutter/Dart/Pub related
-# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
-/pubspec.lock
-**/doc/api/
-.dart_tool/
-.flutter-plugins-dependencies
-/build/
-/coverage/

native/immich_native_core/README.md

@@ -1,48 +0,0 @@
-# immich_native_core (Flutter package)
-
-dart:ffi bindings to the `immich_native_core` Rust core. The native code is **built
-from source on every app build** via a Dart build hook (Flutter native assets) — no
-prebuilt binaries, no `DynamicLibrary`, no platform plugin glue.
-
-## Use it from immich/mobile
-
-```yaml
-# mobile/pubspec.yaml
-dependencies:
-  immich_native_core:
-    path: ../native/immich_native_core
-```
-
-`dart pub get`, then call it:
-
-```dart
-import 'package:immich_native_core/immich_native_core.dart';
-
-final version = coreVersion();
-final hex = sha1Hex(bytes); // hash large inputs off the main isolate (worker_manager)
-```
-
-No app-level Gradle/Podfile edits. `hook/build.dart` compiles the Rust crate and
-Flutter bundles it as a code asset; the `@Native` bindings resolve against it.
-**Requirement:** every machine that builds the app needs [rustup](https://rustup.rs)
-— the hook auto-installs the pinned toolchain + targets from the crate's
-`rust-toolchain.toml`.
-
-## Layout
-
-- `hook/build.dart` — builds `../crates/immich_core_dart` via `native_toolchain_rust`.
-- `lib/immich_native_core.dart` — barrel, the public API.
-- `lib/src/{core,hashing,image}.dart` — thin wrappers, one file per Rust module.
-- `lib/src/ffi/bindings.g.dart` — ffigen `@Native` output (committed; do not edit).
-- `ffigen.yaml` — ffi-native mode; asset-id must match the hook's `assetName`.
-- `test/` — host FFI roundtrip (`flutter test`); device runs via `mobile/integration_test`.
-
-## ⚠ iOS App Extensions
-
-Code assets are bundled into the app's **Runner** target. immich ships a Share
-Extension and a Widget Extension — if the core is ever called from one of those,
-verify the symbols resolve there (same family as the embed-into-Runner-only gotcha).
-Not an issue while only the main app calls it.
-
-The Rust workspace, the codegen/build/test commands, and the "add a function" loop
-live in [`../README.md`](../README.md).

native/immich_native_core/analysis_options.yaml

@@ -1,4 +0,0 @@
-include: package:flutter_lints/flutter.yaml
-
-# Additional information about this file can be found at
-# https://dart.dev/guides/language/analysis-options

native/immich_native_core/ffigen.yaml

@@ -1,20 +0,0 @@
-# Regenerate: `mise run codegen` (cbindgen header -> ffigen @Native bindings).
-# ffi-native mode emits top-level @Native externals + a library @DefaultAsset
-# pointing at the code asset hook/build.dart produces — no DynamicLibrary loader.
-# asset-id MUST equal the generated file's package URI (and the hook's assetName).
-name: ImmichNativeCoreBindings
-ffi-native:
-  asset-id: 'package:immich_native_core/src/ffi/bindings.g.dart'
-description: 'FFI bindings to immich_native_core — generated, do not edit.'
-output: 'lib/src/ffi/bindings.g.dart'
-headers:
-  entry-points:
-    - '../crates/immich_core_dart/include/immich_core.h'
-  include-directives:
-    - '**/immich_core.h'
-functions:
-  include:
-    - 'immich_core_.*'
-comments:
-  style: any
-  length: full

native/immich_native_core/hook/build.dart

@@ -1,14 +0,0 @@
-import 'package:hooks/hooks.dart';
-import 'package:native_toolchain_rust/native_toolchain_rust.dart';
-
-// Builds crates/immich_core_dart from source on every app build and bundles it as
-// a code asset. assetName must match the ffigen output (its package URI is the
-// @Native DefaultAsset id). The crate is a sibling, so point cratePath at it.
-void main(List<String> args) async {
-  await build(args, (input, output) async {
-    await RustBuilder(
-      assetName: 'src/ffi/bindings.g.dart',
-      cratePath: '../crates/immich_core_dart',
-    ).run(input: input, output: output);
-  });
-}

native/immich_native_core/lib/immich_native_core.dart

@@ -1,8 +0,0 @@
-/// dart:ffi bindings to the immich_native_core Rust core (built from source via
-/// Dart build hooks). Public API only — implementation lives in `src/`, organised
-/// to mirror the Rust crate's modules (core / hashing / image).
-library;
-
-export 'src/core.dart';
-export 'src/hashing.dart';
-export 'src/image.dart';

native/immich_native_core/lib/src/core.dart

@@ -1,5 +0,0 @@
-import 'ffi/bindings.g.dart' as bindings;
-import 'ffi/ffi.dart';
-
-/// Version baked into the native core. Cheap — fine on the main isolate.
-String coreVersion() => readAndFree(bindings.immich_core_version(), 'core_version');

native/immich_native_core/lib/src/ffi/bindings.g.dart

@@ -1,75 +0,0 @@
-// AUTO GENERATED FILE, DO NOT EDIT.
-//
-// Generated by `package:ffigen`.
-// ignore_for_file: type=lint, unused_import
-@ffi.DefaultAsset('package:immich_native_core/src/ffi/bindings.g.dart')
-library;
-
-import 'dart:ffi' as ffi;
-
-/// Native core version as a NUL-terminated UTF-8 string.
-/// Free the result with [`immich_core_free_string`].
-@ffi.Native<ffi.Pointer<ffi.Char> Function()>()
-external ffi.Pointer<ffi.Char> immich_core_version();
-
-/// SHA-1 (lowercase hex) of `len` bytes at `ptr`. Returns NULL on a null pointer.
-/// Free the result with [`immich_core_free_string`].
-///
-/// # Safety
-/// `ptr` must be valid for reads of `len` bytes.
-@ffi.Native<
-  ffi.Pointer<ffi.Char> Function(ffi.Pointer<ffi.UnsignedChar>, ffi.UintPtr)
->()
-external ffi.Pointer<ffi.Char> immich_core_sha1_hex(
-  ffi.Pointer<ffi.UnsignedChar> ptr,
-  int len,
-);
-
-/// SHA-1 (lowercase hex) of the file at `path` (NUL-terminated UTF-8), read via
-/// mmap — no Dart-side read or copy. Returns NULL on a null path, non-UTF-8 path,
-/// or any IO error. Free the result with [`immich_core_free_string`].
-///
-/// # Safety
-/// `path` must be a valid NUL-terminated C string, or null.
-@ffi.Native<ffi.Pointer<ffi.Char> Function(ffi.Pointer<ffi.Char>)>()
-external ffi.Pointer<ffi.Char> immich_core_sha1_file(
-  ffi.Pointer<ffi.Char> path,
-);
-
-/// Rotate an RGBA8888 image to the given EXIF `orientation`. `src` is `sh` rows of
-/// `src_stride` bytes; `dst` is the caller's densely-packed `dw*dh*4` output (dims
-/// swap for 90/270/transpose). Returns false (a safe no-op) on null pointers or
-/// inconsistent sizes so the caller can fall back. The platform side owns the
-/// bitmap lock + the dst allocation; this only fills dst.
-///
-/// # Safety
-/// `src` must be valid for reads of `src_len` bytes and `dst` for writes of `dst_len`.
-@ffi.Native<
-  ffi.Bool Function(
-    ffi.Pointer<ffi.Uint8>,
-    ffi.UintPtr,
-    ffi.UintPtr,
-    ffi.Uint32,
-    ffi.Uint32,
-    ffi.Int32,
-    ffi.Pointer<ffi.Uint8>,
-    ffi.UintPtr,
-  )
->()
-external bool immich_core_rotate_rgba8888(
-  ffi.Pointer<ffi.Uint8> src,
-  int src_len,
-  int src_stride,
-  int width,
-  int height,
-  int orientation,
-  ffi.Pointer<ffi.Uint8> dst,
-  int dst_len,
-);
-
-/// Release a string returned by this library.
-///
-/// # Safety
-/// `ptr` must be a pointer previously returned by this library, or null.
-@ffi.Native<ffi.Void Function(ffi.Pointer<ffi.Char>)>()
-external void immich_core_free_string(ffi.Pointer<ffi.Char> ptr);

native/immich_native_core/lib/src/ffi/ffi.dart

@@ -1,19 +0,0 @@
-import 'dart:ffi';
-
-import 'package:ffi/ffi.dart';
-
-import 'bindings.g.dart' as bindings;
-
-/// Read a C string the core returned into a Dart string and free it. A null
-/// return means the native call failed (panic caught at the boundary, or error),
-/// so we throw rather than hand back a silent empty value.
-String readAndFree(Pointer<Char> ptr, String op) {
-  if (ptr == nullptr) {
-    throw StateError('immich_native_core: $op returned null');
-  }
-  try {
-    return ptr.cast<Utf8>().toDartString();
-  } finally {
-    bindings.immich_core_free_string(ptr);
-  }
-}

native/immich_native_core/lib/src/hashing.dart

@@ -1,34 +0,0 @@
-import 'dart:ffi';
-import 'dart:typed_data';
-
-import 'package:ffi/ffi.dart';
-
-import 'ffi/bindings.g.dart' as bindings;
-import 'ffi/ffi.dart';
-
-/// Lowercase-hex SHA-1 of [bytes]. Reads every byte natively and blocks the
-/// calling thread, so hash large inputs off the main isolate.
-String sha1Hex(Uint8List bytes) {
-  // allocate at least 1 byte — malloc(0) may return null (allocator-defined),
-  // which package:ffi would reject. The native side still reads only [len] bytes.
-  final len = bytes.length;
-  final buf = malloc<Uint8>(len == 0 ? 1 : len);
-  try {
-    if (len > 0) buf.asTypedList(len).setAll(0, bytes);
-    return readAndFree(bindings.immich_core_sha1_hex(buf.cast(), len), 'sha1_hex');
-  } finally {
-    malloc.free(buf);
-  }
-}
-
-/// Lowercase-hex SHA-1 of the file at [path], hashed natively via mmap — the file
-/// is never read into the Dart heap. Blocks the calling thread, so hash large
-/// files off the main isolate. Throws if the file is missing/unreadable.
-String sha1File(String path) {
-  final cpath = path.toNativeUtf8();
-  try {
-    return readAndFree(bindings.immich_core_sha1_file(cpath.cast()), 'sha1_file');
-  } finally {
-    malloc.free(cpath);
-  }
-}

native/immich_native_core/lib/src/image.dart

@@ -1,42 +0,0 @@
-import 'dart:ffi';
-import 'dart:typed_data';
-
-import 'package:ffi/ffi.dart';
-
-import 'ffi/bindings.g.dart' as bindings;
-
-/// True if [orientation] (EXIF) swaps width and height (the 90/270/transpose family).
-bool orientationSwapsDims(int orientation) =>
-    orientation == 5 || orientation == 6 || orientation == 7 || orientation == 8;
-
-/// Rotate an RGBA8888 image to the given EXIF [orientation], returning a freshly
-/// packed buffer (dims swap for 90/270/transpose). [srcStride] is bytes per source
-/// row (>= width*4). Returns null if the native rotate declines (bad sizes).
-///
-/// The production caller is the platform decode pipeline (it has the locked native
-/// bitmap); this Dart entry mirrors that path and is what the host tests exercise.
-Uint8List? rotateRgba8888(Uint8List src, int srcStride, int width, int height, int orientation) {
-  final dw = orientationSwapsDims(orientation) ? height : width;
-  final dh = orientationSwapsDims(orientation) ? width : height;
-  final dstLen = dw * dh * 4;
-  final srcPtr = malloc<Uint8>(src.isEmpty ? 1 : src.length);
-  final dstPtr = malloc<Uint8>(dstLen == 0 ? 1 : dstLen);
-  try {
-    if (src.isNotEmpty) srcPtr.asTypedList(src.length).setAll(0, src);
-    final ok = bindings.immich_core_rotate_rgba8888(
-      srcPtr.cast(),
-      src.length,
-      srcStride,
-      width,
-      height,
-      orientation,
-      dstPtr.cast(),
-      dstLen,
-    );
-    if (!ok) return null;
-    return Uint8List.fromList(dstPtr.asTypedList(dstLen));
-  } finally {
-    malloc.free(srcPtr);
-    malloc.free(dstPtr);
-  }
-}

native/immich_native_core/pubspec.yaml

@@ -1,26 +0,0 @@
-name: immich_native_core
-description: "dart:ffi bindings to the immich_native_core Rust core, built from source via Dart build hooks."
-version: 0.1.0
-homepage: https://github.com/immich-app/immich
-publish_to: none
-
-environment:
-  sdk: '>=3.11.0 <4.0.0'
-  flutter: '>=3.3.0'
-
-# Not a platform plugin: the native lib is built + bundled by hook/build.dart as a
-# code asset (Flutter native assets), so there is no ffiPlugin / android / ios dir.
-dependencies:
-  flutter:
-    sdk: flutter
-  ffi: ^2.2.0
-  # build-hook deps — run at build time to compile the Rust crate (need rustup).
-  hooks: ^2.0.2
-  native_toolchain_rust: ^1.0.4
-
-dev_dependencies:
-  ffigen: 20.1.1 # pinned exact — a caret bump can re-emit bindings
-  crypto: ^3.0.7 # pure-Dart SHA-1 baseline for the perf bench only
-  flutter_test:
-    sdk: flutter
-  flutter_lints: ^6.0.0

native/immich_native_core/test/native_core_test.dart

@@ -1,53 +0,0 @@
-// Host FFI roundtrip — `flutter test` builds the hook for the host platform and
-// resolves the @Native symbols, no device needed. (Device runs: example/integration_test.)
-import 'dart:convert';
-import 'dart:io';
-import 'dart:typed_data';
-
-import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_native_core/immich_native_core.dart';
-
-void main() {
-  test('coreVersion returns a non-empty version', () {
-    expect(coreVersion(), isNotEmpty);
-  });
-
-  test('sha1Hex matches the FIPS-180 vector for "abc"', () {
-    expect(
-      sha1Hex(Uint8List.fromList(utf8.encode('abc'))),
-      'a9993e364706816aba3e25717850c26c9cd0d89d',
-    );
-  });
-
-  test('sha1Hex of empty input', () {
-    expect(sha1Hex(Uint8List(0)), 'da39a3ee5e6b4b0d3255bfef95601890afd80709');
-  });
-
-  test('sha1File matches the in-memory hash (mmap path)', () {
-    final tmp = Directory.systemTemp.createTempSync('native_core');
-    final path = '${tmp.path}/abc.bin';
-    File(path).writeAsBytesSync(utf8.encode('abc'));
-    expect(sha1File(path), 'a9993e364706816aba3e25717850c26c9cd0d89d');
-    tmp.deleteSync(recursive: true);
-  });
-
-  test('sha1File throws on a missing file', () {
-    expect(() => sha1File('/no/such/immich_native_core/file'), throwsStateError);
-  });
-
-  test('rotateRgba8888: 180 reverses pixels, 90 swaps dims', () {
-    // 2x1 image: pixel0 = red, pixel1 = green (RGBA).
-    final src = Uint8List.fromList([255, 0, 0, 255, 0, 255, 0, 255]);
-    final r180 = rotateRgba8888(src, 8, 2, 1, 3)!; // ROTATE_180
-    expect(r180, [0, 255, 0, 255, 255, 0, 0, 255]); // green, red
-
-    final r90 = rotateRgba8888(src, 8, 2, 1, 6)!; // ROTATE_90 -> 1x2
-    expect(r90.length, 8); // dims swapped to 1x2, still 2 pixels
-  });
-
-  test('rotateRgba8888 returns null on an undersized result expectation', () {
-    // width*height*4 mismatch is guarded natively; a 0x0 image yields empty.
-    final empty = rotateRgba8888(Uint8List(0), 0, 0, 0, 1);
-    expect(empty, anyOf(isNull, isEmpty));
-  });
-}

native/immich_native_core/test/sha1_bench.dart

@@ -1,82 +0,0 @@
-// SHA-1 perf bench — run explicitly: `flutter test test/sha1_bench.dart`.
-// (Not named *_test.dart so it stays out of the default `flutter test` run.)
-//
-// Three ways to hash a file, to isolate where the win is:
-//   A) sha1File(path)                 — Rust: open + mmap + HW-SHA, no Dart read
-//   B) File.read + sha1Hex(bytes)     — Dart reads into heap, Rust HW-SHA the bytes
-//   C) File.read + crypto.sha1(bytes) — Dart reads into heap, pure-Dart SHA-1 (naive)
-// A vs B = mmap/zero-copy win; B vs C = HW-SHA vs pure-Dart; A vs C = total vs naive.
-//
-// IMPORTANT — C (pure-Dart) is NOT immich's real baseline. immich already hashes
-// assets natively + hardware-accelerated on BOTH platforms (Android Kotlin
-// MessageDigest SHA-1, iOS Swift CryptoKit Insecure.SHA1), streamed over a read
-// buffer, via pigeon. So the real-world comparison is A vs ~B (Rust mmap vs a
-// buffered native read with HW-SHA), i.e. roughly the A/B gap (~1.3x), NOT A/C.
-// ignore_for_file: avoid_print
-import 'dart:io';
-import 'dart:typed_data';
-
-import 'package:crypto/crypto.dart' as crypto;
-import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_native_core/immich_native_core.dart';
-
-void main() {
-  test('sha1 throughput: mmap(Rust) vs read+Rust vs read+pure-Dart', () {
-    final tmp = Directory.systemTemp.createTempSync('sha1_bench');
-    final sizesMb = [1, 16, 64, 256];
-
-    double msMin(int iters, void Function() f) {
-      var best = double.infinity;
-      for (var i = 0; i < iters; i++) {
-        final sw = Stopwatch()..start();
-        f();
-        sw.stop();
-        final ms = sw.elapsedMicroseconds / 1000.0;
-        if (ms < best) best = ms;
-      }
-      return best;
-    }
-
-    String mbps(int mb, double ms) => (mb / (ms / 1000.0)).toStringAsFixed(0);
-
-    print('');
-    print('size │  A mmap(Rust)   │  B read+Rust    │  C read+pureDart │ A vs C');
-    print('─────┼─────────────────┼─────────────────┼──────────────────┼───────');
-    for (final mb in sizesMb) {
-      final path = '${tmp.path}/f_$mb.bin';
-      final chunk = Uint8List(1 << 20); // 1 MiB pattern
-      for (var i = 0; i < chunk.length; i++) {
-        chunk[i] = (i * 31 + 7) & 0xff;
-      }
-      final sink = File(path).openSync(mode: FileMode.write);
-      for (var i = 0; i < mb; i++) {
-        sink.writeFromSync(chunk);
-      }
-      sink.closeSync();
-
-      final bytes = File(path).readAsBytesSync(); // for B/C; also baked into their totals below
-      final tRead = msMin(3, () => File(path).readAsBytesSync());
-
-      final tA = msMin(5, () => sha1File(path));
-      final tB = tRead + msMin(5, () => sha1Hex(bytes));
-      final tC = tRead + msMin(2, () => crypto.sha1.convert(bytes));
-
-      final hA = sha1File(path);
-      final hB = sha1Hex(bytes);
-      final hC = crypto.sha1.convert(bytes).toString();
-      expect(hA, hB);
-      expect(hA, hC);
-
-      final speedup = (tC / tA).toStringAsFixed(1);
-      String cell(double ms, int mb) =>
-          '${ms.toStringAsFixed(1)}ms ${mbps(mb, ms).padLeft(5)}MB/s';
-      print(
-        '${mb.toString().padLeft(3)}M │ ${cell(tA, mb)} │ ${cell(tB, mb)} │ ${cell(tC, mb).padRight(16)} │ ${speedup}x',
-      );
-    }
-    print('(A/B/C identical SHA-1; read time included in B/C totals.)');
-    print('(NOTE: immich already hashes natively+HW on both platforms — real');
-    print(' baseline ~= B, not C. Rust mmap edge over it is the A/B gap (~1.3x).)');
-    tmp.deleteSync(recursive: true);
-  }, timeout: const Timeout(Duration(minutes: 10)));
-}

native/mise.toml

@@ -1,68 +0,0 @@
-[tools]
-rust = "1.92.0" # keep in sync with rust-toolchain.toml (the build hook uses rustup)
-
-[tasks.build]
-description = "Build all native core crates (host)"
-run = "cargo build --workspace"
-
-[tasks.test]
-description = "Run native core Rust tests"
-run = "cargo test --workspace"
-
-[tasks.fmt]
-description = "Format all crates"
-run = "cargo fmt --all"
-
-[tasks.lint]
-description = "Clippy (warnings = errors)"
-run = "cargo clippy --workspace --all-targets -- -D warnings"
-
-# Regen the committed cbindgen header + ffigen @Native bindings.
-[tasks."codegen:ffigen"]
-alias = "codegen"
-description = "Generate the C header (cbindgen) + Dart @Native bindings (ffigen)"
-sources = [
-    "crates/immich_core_dart/src/lib.rs",
-    "crates/immich_core_dart/cbindgen.toml",
-    "immich_native_core/ffigen.yaml",
-]
-outputs = [
-    "crates/immich_core_dart/include/immich_core.h",
-    "immich_native_core/lib/immich_native_core_bindings_generated.dart",
-]
-run = [
-    "cargo build -p immich_core_dart",
-    "cd immich_native_core && dart run ffigen --config ffigen.yaml && dart format lib/immich_native_core_bindings_generated.dart",
-]
-
-# Host FFI roundtrip through the real build hook — no device. Builds the Rust crate
-# via rustup + resolves the @Native code asset.
-[tasks."test:flutter"]
-description = "Host FFI roundtrip via the build hook (flutter test)"
-dir = "immich_native_core"
-run = "flutter test"
-
-[tasks."build:dart"]
-description = "Build the dart:ffi cdylib directly (host, raw cargo)"
-run = "cargo build -p immich_core_dart"
-
-[tasks."build:napi"]
-description = "Build the node addon + stage a .node for require() (server, unwired)"
-run = [
-    "cargo build -p immich_core_napi --release",
-    "cp target/release/libimmich_core_napi.dylib smoke/immich_core_napi.node 2>/dev/null || cp target/release/libimmich_core_napi.so smoke/immich_core_napi.node",
-]
-
-[tasks."smoke:dart"]
-description = "Host dart:ffi ABI roundtrip (raw DynamicLibrary on the cdylib)"
-depends = ["build:dart"]
-run = "dart run smoke/dart_smoke.dart target/debug/libimmich_core_dart.dylib"
-
-[tasks."smoke:node"]
-description = "Host napi roundtrip"
-depends = ["build:napi"]
-run = "node smoke/node_smoke.mjs"
-
-[tasks.smoke]
-description = "Rust tests + host dart:ffi + host napi roundtrips"
-depends = ["test", "smoke:dart", "smoke:node"]

native/scripts/build-linux.sh

@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-# Cross-build the napi addon for Linux server (x86_64 + aarch64) via zigbuild
-# (no Docker) and stage as .node under dist/server/<target>/.
-# In CI you'd build these natively per-arch instead; this is local convenience.
-set -euo pipefail
-cd "$(dirname "$0")/.."
-
-CRATE=immich_core_napi
-
-for t in x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu; do
-    rustup target add "$t" >/dev/null 2>&1 || true
-    cargo zigbuild -p "$CRATE" --target "$t" --release
-    mkdir -p "dist/server/$t"
-    cp "target/$t/release/lib${CRATE}.so" "dist/server/$t/immich_core_napi.node"
-done
-
-echo "linux -> dist/server/*/immich_core_napi.node"

native/smoke/dart_smoke.dart

@@ -1,31 +0,0 @@
-// Mobile-side roundtrip: open the dart:ffi cdylib and call into the shared core.
-// Standalone script (no package:ffi dep) — reads the returned C string by hand.
-//
-//   dart run smoke/dart_smoke.dart target/debug/libimmich_core_dart.dylib
-
-import 'dart:ffi';
-
-typedef _VersionNative = Pointer<Uint8> Function();
-typedef _FreeNative = Void Function(Pointer<Uint8>);
-typedef _FreeDart = void Function(Pointer<Uint8>);
-
-String _readCString(Pointer<Uint8> p) {
-  final bytes = <int>[];
-  for (var i = 0; p[i] != 0; i++) {
-    bytes.add(p[i]);
-  }
-  return String.fromCharCodes(bytes);
-}
-
-void main(List<String> args) {
-  final libPath = args.isNotEmpty ? args.first : 'target/debug/libimmich_core_dart.dylib';
-  final lib = DynamicLibrary.open(libPath);
-
-  final version = lib.lookupFunction<_VersionNative, _VersionNative>('immich_core_version');
-  final free = lib.lookupFunction<_FreeNative, _FreeDart>('immich_core_free_string');
-
-  final ptr = version();
-  print('DART core_version = ${_readCString(ptr)}');
-  free(ptr);
-  print('DART roundtrip OK');
-}

native/smoke/node_smoke.mjs

@@ -1,17 +0,0 @@
-// Server-side roundtrip: load the napi addon and call into the shared core.
-import { createRequire } from 'node:module';
-
-const require = createRequire(import.meta.url);
-const core = require('./immich_core_napi.node');
-
-const version = core.coreVersion();
-console.log(`NAPI core_version = ${version}`);
-
-const hash = core.sha1Hex(Buffer.from('abc'));
-console.log(`NAPI sha1Hex("abc") = ${hash}`);
-
-if (hash !== 'a9993e364706816aba3e25717850c26c9cd0d89d') {
-  console.error('NAPI sha1 mismatch');
-  process.exit(1);
-}
-console.log('NAPI roundtrip OK');

server/src/repositories/metadata.repository.ts

@@ -53,10 +53,10 @@ export interface ImmichTags extends Omit<Tags, TagsWithWrongTypes> {
     RegionList: {
       Area: {
         // (X,Y) // center of the rectangle
-        X: number;
-        Y: number;
-        W: number;
-        H: number;
+        X: number | string;
+        Y: number | string;
+        W: number | string;
+        H: number | string;
         Unit: string;
       };
       Rotation?: number;

server/src/services/metadata.service.spec.ts

@@ -39,7 +39,10 @@ const forSidecarJob = (
   };
 };
 
-const makeFaceTags = (face: Partial<{ Name: string }> = {}, orientation?: ImmichTags['Orientation']) => ({
+const makeFaceTags = (
+  face: Partial<{ Name: string }> = {},
+  orientation?: ImmichTags['Orientation'],
+): Partial<ImmichTags> => ({
   Orientation: orientation,
   RegionInfo: {
     AppliedToDimensions: { W: 1000, H: 100, Unit: 'pixel' },
@@ -1371,6 +1374,35 @@ describe(MetadataService.name, () => {
       expect(mocks.person.updateAll).not.toHaveBeenCalled();
     });
 
+    it('should handle string coordinates in face region bounding box calculation by limiting to 16 decimal places', async () => {
+      const asset = AssetFactory.create();
+      const person = PersonFactory.create();
+
+      mocks.assetJob.getForMetadataExtraction.mockResolvedValue(getForMetadataExtraction(asset));
+      mocks.systemMetadata.get.mockResolvedValue({ metadata: { faces: { import: true } } });
+      const faceTags = makeFaceTags({ Name: person.name });
+
+      // Simulating EXIF returning a string with >16 decimal places
+      faceTags.RegionInfo!.RegionList[0].Area.X = '0.48564814814814824';
+      faceTags.RegionInfo!.RegionList[0].Area.W = '0.2';
+
+      mockReadTags(faceTags);
+      mocks.person.getDistinctNames.mockResolvedValue([]);
+      mocks.person.createAll.mockResolvedValue([person.id]);
+      mocks.person.update.mockResolvedValue(person);
+
+      await sut.handleMetadataExtraction({ id: asset.id });
+
+      expect(mocks.person.refreshFaces).toHaveBeenCalledWith(
+        [
+          expect.objectContaining({
+            boundingBoxX1: Math.floor((0.485_648_148_148_148_2 - 0.2 / 2) * 1000),
+          }),
+        ],
+        [],
+      );
+    });
+
     it('should apply metadata face tags creating new people', async () => {
       const asset = AssetFactory.create();
       const person = PersonFactory.create();

server/src/services/metadata.service.ts

@@ -854,6 +854,13 @@ export class MetadataService extends BaseService {
     // update area coordinates and dimensions in RegionList assuming "normalized" unit as per MWG guidelines
     const adjustedRegionList = regionInfo.RegionList.map((region) => {
       let { X, Y, W, H } = region.Area;
+
+      // EXIF floats with >16 decimals are serialized as strings. Ensure they are numbers.
+      X = Number(X);
+      Y = Number(Y);
+      W = Number(W);
+      H = Number(H);
+
       switch (orientation) {
         case ExifOrientation.MirrorHorizontal: {
           X = 1 - X;
@@ -926,16 +933,21 @@ export class MetadataService extends BaseService {
       const loweredName = region.Name.toLowerCase();
       const personId = existingNameMap.get(loweredName) || this.cryptoRepository.randomUUID();
 
+      const X = Number(region.Area.X);
+      const Y = Number(region.Area.Y);
+      const W = Number(region.Area.W);
+      const H = Number(region.Area.H);
+
       const face = {
         id: this.cryptoRepository.randomUUID(),
         personId,
         assetId: asset.id,
         imageWidth,
         imageHeight,
-        boundingBoxX1: Math.floor((region.Area.X - region.Area.W / 2) * imageWidth),
-        boundingBoxY1: Math.floor((region.Area.Y - region.Area.H / 2) * imageHeight),
-        boundingBoxX2: Math.floor((region.Area.X + region.Area.W / 2) * imageWidth),
-        boundingBoxY2: Math.floor((region.Area.Y + region.Area.H / 2) * imageHeight),
+        boundingBoxX1: Math.floor((X - W / 2) * imageWidth),
+        boundingBoxY1: Math.floor((Y - H / 2) * imageHeight),
+        boundingBoxX2: Math.floor((X + W / 2) * imageWidth),
+        boundingBoxY2: Math.floor((Y + H / 2) * imageHeight),
         sourceType: SourceType.Exif,
       };