refactor(web): simple actions

mobile/lib/main.dart

@@ -263,7 +263,6 @@ class ImmichAppState extends ConsumerState<ImmichApp> with WidgetsBindingObserve
       child: MaterialApp.router(
         title: 'Immich',
         debugShowCheckedModeBanner: true,
-        scaffoldMessengerKey: scaffoldMessengerKey,
         localizationsDelegates: context.localizationDelegates,
         supportedLocales: context.supportedLocales,
         locale: context.locale,

mobile/packages/ui/lib/immich_ui.dart

@@ -1,15 +1,12 @@
 export 'src/components/close_button.dart';
-export 'src/components/column_button.dart';
 export 'src/components/form.dart';
 export 'src/components/formatted_text.dart';
 export 'src/components/icon_button.dart';
-export 'src/components/menu_item.dart';
 export 'src/components/password_input.dart';
 export 'src/components/text_button.dart';
 export 'src/components/text_input.dart';
 export 'src/components/url_input.dart';
 export 'src/constants.dart';
-export 'src/snackbar.dart';
 export 'src/theme.dart';
 export 'src/translation.dart';
 export 'src/types.dart';

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

@@ -1,13 +0,0 @@
-import 'package:flutter/widgets.dart';
-
-class ImmichColorOverride extends InheritedWidget {
-  const ImmichColorOverride({super.key, required this.color, required super.child});
-
-  final Color color;
-
-  static Color? maybeOf(BuildContext context) =>
-      context.dependOnInheritedWidgetOfExactType<ImmichColorOverride>()?.color;
-
-  @override
-  bool updateShouldNotify(ImmichColorOverride oldWidget) => color != oldWidget.color;
-}

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

@@ -16,9 +16,10 @@ class ImmichCloseButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) => ImmichIconButton(
-    icon: Icons.close,
-    color: color,
-    variant: variant,
-    onPressed: onPressed ?? () => Navigator.of(context).pop(),
-  );
+        key: key,
+        icon: Icons.close,
+        color: color,
+        variant: variant,
+        onPressed: onPressed ?? () => Navigator.of(context).pop(),
+      );
 }

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

@@ -1,78 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-import 'package:immich_ui/src/constants.dart';
-import 'package:immich_ui/src/internal.dart';
-
-class ImmichColumnButton extends StatefulWidget {
-  final IconData icon;
-  final String label;
-  final FutureOr<void> Function() onPressed;
-  final bool disabled;
-  final bool? loading;
-
-  const ImmichColumnButton({
-    super.key,
-    required this.icon,
-    required this.label,
-    required this.onPressed,
-    this.disabled = false,
-    this.loading,
-  });
-
-  @override
-  State<ImmichColumnButton> createState() => _ImmichColumnButtonState();
-}
-
-class _ImmichColumnButtonState extends State<ImmichColumnButton> {
-  bool _loading = false;
-  bool get _isLoading => widget.loading ?? _loading;
-
-  Future<void> _onPressed() async {
-    setState(() => _loading = true);
-    try {
-      await widget.onPressed();
-    } finally {
-      if (mounted) {
-        setState(() => _loading = false);
-      }
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final foreground = context.colorOverride ?? Theme.of(context).colorScheme.onSurface;
-
-    return TextButton(
-      onPressed: widget.disabled || _isLoading ? null : _onPressed,
-      style: TextButton.styleFrom(
-        foregroundColor: foreground,
-        padding: const .symmetric(horizontal: ImmichSpacing.sm, vertical: ImmichSpacing.md),
-        tapTargetSize: .shrinkWrap,
-        shape: const RoundedRectangleBorder(borderRadius: .all(.circular(ImmichRadius.xl))),
-      ),
-      child: ConstrainedBox(
-        constraints: const .new(maxWidth: 90),
-        child: Column(
-          mainAxisSize: .min,
-          children: [
-            _isLoading
-                ? const SizedBox.square(
-                    dimension: ImmichIconSize.md,
-                    child: CircularProgressIndicator(strokeWidth: ImmichBorderWidth.lg),
-                  )
-                : Icon(widget.icon, size: ImmichIconSize.md),
-            const SizedBox(height: ImmichSpacing.sm),
-            Text(
-              widget.label,
-              maxLines: 2,
-              textAlign: .center,
-              overflow: .ellipsis,
-              style: const .new(fontSize: ImmichTextSize.label, fontWeight: .w500),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

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

@@ -88,7 +88,7 @@ class _ImmichFormState extends State<ImmichForm> {
             builder: (context, _) => ImmichTextButton(
               labelText: submitText,
               icon: widget.submitIcon,
-              variant: .filled,
+              variant: ImmichVariant.filled,
               loading: _controller.isLoading,
               onPressed: _controller.submit,
               disabled: _controller.onSubmit == null,

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

@@ -94,12 +94,12 @@ class _ImmichFormattedTextState extends State<ImmichFormattedText> {
 
       final tag = match.group(1)!.toLowerCase();
       final content = match.group(2)!;
-      final span = widget.spanBuilder?.call(tag);
-      final style = span?.style ?? _defaultTextStyle(tag);
+      final formattedSpan = (widget.spanBuilder ?? _defaultSpanBuilder)(tag);
+      final style = formattedSpan.style ?? _defaultTextStyle(tag);
 
       GestureRecognizer? recognizer;
-      if (span?.onTap != null) {
-        recognizer = TapGestureRecognizer()..onTap = span!.onTap;
+      if (formattedSpan.onTap != null) {
+        recognizer = TapGestureRecognizer()..onTap = formattedSpan.onTap;
         _recognizers.add(recognizer);
       }
       spans.add(TextSpan(text: content, style: style, recognizer: recognizer));
@@ -114,12 +114,19 @@ class _ImmichFormattedTextState extends State<ImmichFormattedText> {
     return spans;
   }
 
+  FormattedSpan _defaultSpanBuilder(String tag) => switch (tag) {
+        'b' => const FormattedSpan(style: TextStyle(fontWeight: FontWeight.bold)),
+        'link' => const FormattedSpan(style: TextStyle(decoration: TextDecoration.underline)),
+        _ when tag.endsWith('-link') => const FormattedSpan(style: TextStyle(decoration: TextDecoration.underline)),
+        _ => const FormattedSpan(),
+      };
+
   TextStyle? _defaultTextStyle(String tag) => switch (tag) {
-    'b' => const TextStyle(fontWeight: FontWeight.bold),
-    'link' => const TextStyle(decoration: TextDecoration.underline),
-    _ when tag.endsWith('-link') => const TextStyle(decoration: TextDecoration.underline),
-    _ => null,
-  };
+        'b' => const TextStyle(fontWeight: FontWeight.bold),
+        'link' => const TextStyle(decoration: TextDecoration.underline),
+        _ when tag.endsWith('-link') => const TextStyle(decoration: TextDecoration.underline),
+        _ => null,
+      };
 
   @override
   Widget build(BuildContext context) {

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

@@ -1,80 +1,54 @@
-import 'dart:async';
-
 import 'package:flutter/material.dart';
-import 'package:immich_ui/immich_ui.dart';
-import 'package:immich_ui/src/internal.dart';
+import 'package:immich_ui/src/types.dart';
 
-class ImmichIconButton extends StatefulWidget {
+class ImmichIconButton extends StatelessWidget {
   final IconData icon;
-  final FutureOr<void> Function() onPressed;
+  final VoidCallback onPressed;
   final ImmichVariant variant;
   final ImmichColor color;
   final bool disabled;
-  final bool? loading;
 
   const ImmichIconButton({
     super.key,
     required this.icon,
     required this.onPressed,
-    this.color = .primary,
-    this.variant = .filled,
+    this.color = ImmichColor.primary,
+    this.variant = ImmichVariant.filled,
     this.disabled = false,
-    this.loading,
   });
 
-  @override
-  State<ImmichIconButton> createState() => _ImmichIconButtonState();
-}
-
-class _ImmichIconButtonState extends State<ImmichIconButton> {
-  bool _loading = false;
-  bool get _isLoading => widget.loading ?? _loading;
-
-  Future<void> _onPressed() async {
-    setState(() => _loading = true);
-    try {
-      await widget.onPressed();
-    } finally {
-      if (mounted) {
-        setState(() => _loading = false);
-      }
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
 
-    final background = switch (widget.variant) {
-      .filled => switch (widget.color) {
-        .primary => colorScheme.primary,
-        .secondary => colorScheme.secondary,
-      },
-      .ghost => Colors.transparent,
+    final background = switch (variant) {
+      ImmichVariant.filled => switch (color) {
+          ImmichColor.primary => colorScheme.primary,
+          ImmichColor.secondary => colorScheme.secondary,
+        },
+      ImmichVariant.ghost => Colors.transparent,
     };
 
-    final foreground =
-        context.colorOverride ??
-        switch (widget.variant) {
-          .filled => switch (widget.color) {
-            .primary => colorScheme.onPrimary,
-            .secondary => colorScheme.onSecondary,
-          },
-          .ghost => switch (widget.color) {
-            .primary => colorScheme.primary,
-            .secondary => colorScheme.secondary,
-          },
-        };
+    final foreground = switch (variant) {
+      ImmichVariant.filled => switch (color) {
+          ImmichColor.primary => colorScheme.onPrimary,
+          ImmichColor.secondary => colorScheme.onSecondary,
+        },
+      ImmichVariant.ghost => switch (color) {
+          ImmichColor.primary => colorScheme.primary,
+          ImmichColor.secondary => colorScheme.secondary,
+        },
+    };
+
+    final effectiveOnPressed = disabled ? null : onPressed;
 
     return IconButton(
-      icon: _isLoading
-          ? const SizedBox.square(
-              dimension: ImmichIconSize.sm,
-              child: CircularProgressIndicator(strokeWidth: ImmichBorderWidth.md),
-            )
-          : Icon(widget.icon),
-      onPressed: widget.disabled || _isLoading ? null : _onPressed,
-      style: IconButton.styleFrom(backgroundColor: background, foregroundColor: foreground),
+      icon: Icon(icon),
+      onPressed: effectiveOnPressed,
+      style: IconButton.styleFrom(
+        backgroundColor: background,
+        foregroundColor: foreground,
+      ),
     );
   }
 }

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

@@ -1,100 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-import 'package:immich_ui/src/constants.dart';
-import 'package:immich_ui/src/internal.dart';
-
-class ImmichMenu extends StatefulWidget {
-  final List<Widget> children;
-  final MenuAnchorChildBuilder builder;
-  final MenuStyle? style;
-  final bool consumeOutsideTap;
-  final Widget? child;
-
-  const ImmichMenu({
-    super.key,
-    required this.children,
-    required this.builder,
-    this.style,
-    this.consumeOutsideTap = false,
-    this.child,
-  });
-
-  @override
-  State<ImmichMenu> createState() => _ImmichMenuState();
-}
-
-class _ImmichMenuState extends State<ImmichMenu> {
-  final _controller = MenuController();
-
-  @override
-  Widget build(BuildContext context) {
-    return _ImmichMenuScope(
-      controller: _controller,
-      child: MenuAnchor(
-        controller: _controller,
-        style: widget.style,
-        consumeOutsideTap: widget.consumeOutsideTap,
-        menuChildren: widget.children,
-        builder: widget.builder,
-        child: widget.child,
-      ),
-    );
-  }
-}
-
-class _ImmichMenuScope extends InheritedWidget {
-  final MenuController controller;
-
-  const _ImmichMenuScope({required this.controller, required super.child});
-
-  static MenuController? maybeOf(BuildContext context) =>
-      context.dependOnInheritedWidgetOfExactType<_ImmichMenuScope>()?.controller;
-
-  @override
-  bool updateShouldNotify(_ImmichMenuScope oldWidget) => controller != oldWidget.controller;
-}
-
-class ImmichMenuItem extends StatefulWidget {
-  final IconData icon;
-  final String label;
-  final FutureOr<void> Function() onPressed;
-  final bool disabled;
-
-  const ImmichMenuItem({
-    super.key,
-    required this.icon,
-    required this.label,
-    required this.onPressed,
-    this.disabled = false,
-  });
-
-  @override
-  State<ImmichMenuItem> createState() => _ImmichMenuItemState();
-}
-
-class _ImmichMenuItemState extends State<ImmichMenuItem> {
-  Future<void> _onPressed(MenuController? controller) async {
-    try {
-      await widget.onPressed();
-    } finally {
-      controller?.close();
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final controller = _ImmichMenuScope.maybeOf(context);
-    return MenuItemButton(
-      onPressed: widget.disabled ? null : () => _onPressed(controller),
-      closeOnActivate: controller == null,
-      style: MenuItemButton.styleFrom(
-        foregroundColor: context.colorOverride,
-        alignment: .centerLeft,
-        padding: const .symmetric(horizontal: ImmichSpacing.lg, vertical: ImmichSpacing.md),
-      ),
-      leadingIcon: Icon(widget.icon, size: ImmichIconSize.sm),
-      child: Text(widget.label, style: const .new(fontSize: ImmichTextSize.body)),
-    );
-  }
-}

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

@@ -52,6 +52,7 @@ class _ImmichPasswordInputState extends State<ImmichPasswordInput> {
         icon: Icon(_visible ? Icons.visibility_off_rounded : Icons.visibility_rounded),
       ),
       autofillHints: [AutofillHints.password],
+      keyboardType: TextInputType.text,
     );
   }
 }

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

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

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

@@ -1,11 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:immich_ui/src/color_override.dart';
 import 'package:immich_ui/src/translation.dart';
 
 extension TranslationHelper on BuildContext {
   ImmichTranslations get translations => ImmichTranslationProvider.of(this);
 }
-
-extension ColorHelper on BuildContext {
-  Color? get colorOverride => ImmichColorOverride.maybeOf(this);
-}

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

@@ -1,27 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_ui/src/components/column_button.dart';
-import 'package:immich_ui/src/previews.dart';
-
-void _previewNoop() {}
-
-@ImmichPreview(group: 'ColumnButton', name: 'Default')
-Widget previewColumnButtonDefault() => const Wrap(
-  spacing: 12,
-  runSpacing: 12,
-  children: [
-    ImmichColumnButton(onPressed: _previewNoop, icon: Icons.favorite_border_rounded, label: 'Favorite'),
-    ImmichColumnButton(onPressed: _previewNoop, icon: Icons.archive_outlined, label: 'Archive'),
-    ImmichColumnButton(onPressed: _previewNoop, icon: Icons.delete_outline_rounded, label: 'Delete'),
-  ],
-);
-
-@ImmichPreview(group: 'ColumnButton', name: 'Loading')
-Widget previewColumnButtonLoading() => ImmichColumnButton(
-  onPressed: () => Future<void>.delayed(const .new(seconds: 2)),
-  icon: Icons.download,
-  label: 'Download',
-);
-
-@ImmichPreview(group: 'ColumnButton', name: 'Disabled')
-Widget previewColumnButtonDisabled() =>
-    const ImmichColumnButton(onPressed: _previewNoop, icon: Icons.ios_share_rounded, label: 'Share', disabled: true);

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

@@ -1,19 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_ui/src/components/menu_item.dart';
-import 'package:immich_ui/src/previews.dart';
-
-void _previewNoop() {}
-
-@ImmichPreview(group: 'MenuItem', name: 'Default')
-Widget previewMenuItemDefault() => const Column(
-  mainAxisSize: MainAxisSize.min,
-  children: [
-    ImmichMenuItem(onPressed: _previewNoop, icon: Icons.info_outline, label: 'Info'),
-    ImmichMenuItem(onPressed: _previewNoop, icon: Icons.help_outline_rounded, label: 'Troubleshoot'),
-    ImmichMenuItem(onPressed: _previewNoop, icon: Icons.cast_rounded, label: 'Cast'),
-  ],
-);
-
-@ImmichPreview(group: 'MenuItem', name: 'Disabled')
-Widget previewMenuItemDisabled() =>
-    const ImmichMenuItem(onPressed: _previewNoop, icon: Icons.delete_outline_rounded, label: 'Delete', disabled: true);

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

@@ -1,32 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_ui/src/constants.dart';
-import 'package:immich_ui/src/previews.dart';
-import 'package:immich_ui/src/snackbar.dart';
-
-@ImmichPreview(group: 'Snackbar', name: 'Types')
-Widget previewSnackbarTypes() => const _SnackbarDemo();
-
-class _SnackbarDemo extends StatelessWidget {
-  const _SnackbarDemo();
-
-  @override
-  Widget build(BuildContext context) {
-    return ScaffoldMessenger(
-      key: scaffoldMessengerKey,
-      child: Scaffold(
-        backgroundColor: Colors.transparent,
-        body: Center(
-          child: Wrap(
-            spacing: ImmichSpacing.md,
-            runSpacing: ImmichSpacing.md,
-            children: [
-              ElevatedButton(onPressed: () => snackbar.info('Info message'), child: const Text('Info')),
-              ElevatedButton(onPressed: () => snackbar.success('Saved'), child: const Text('Success')),
-              ElevatedButton(onPressed: () => snackbar.error('Something failed'), child: const Text('Error')),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}

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

@@ -15,6 +15,16 @@ Widget previewTextButtonVariants() => const Wrap(
   ],
 );
 
+@ImmichPreview(group: 'TextButton', name: 'Colors')
+Widget previewTextButtonColors() => const Wrap(
+  spacing: 12,
+  runSpacing: 12,
+  children: [
+    ImmichTextButton(onPressed: _previewNoop, labelText: 'Primary', expanded: false),
+    ImmichTextButton(onPressed: _previewNoop, labelText: 'Secondary', color: ImmichColor.secondary, expanded: false),
+  ],
+);
+
 @ImmichPreview(group: 'TextButton', name: 'With Icons')
 Widget previewTextButtonWithIcons() => const Wrap(
   spacing: 12,
@@ -32,11 +42,7 @@ Widget previewTextButtonWithIcons() => const Wrap(
 );
 
 @ImmichPreview(group: 'TextButton', name: 'Loading')
-Widget previewTextButtonLoading() => ImmichTextButton(
-  onPressed: () => Future<void>.delayed(const Duration(seconds: 2)),
-  labelText: 'Click me',
-  expanded: false,
-);
+Widget previewTextButtonLoading() => const _PreviewLoadingDemo();
 
 @ImmichPreview(group: 'TextButton', name: 'Disabled')
 Widget previewTextButtonDisabled() => const Wrap(
@@ -53,3 +59,30 @@ Widget previewTextButtonDisabled() => const Wrap(
     ),
   ],
 );
+
+class _PreviewLoadingDemo extends StatefulWidget {
+  const _PreviewLoadingDemo();
+
+  @override
+  State<_PreviewLoadingDemo> createState() => _PreviewLoadingDemoState();
+}
+
+class _PreviewLoadingDemoState extends State<_PreviewLoadingDemo> {
+  bool _isLoading = false;
+
+  @override
+  Widget build(BuildContext context) {
+    return ImmichTextButton(
+      onPressed: () async {
+        setState(() => _isLoading = true);
+        await Future<void>.delayed(const Duration(seconds: 2));
+        if (mounted) {
+          setState(() => _isLoading = false);
+        }
+      },
+      labelText: _isLoading ? 'Loading...' : 'Click Me',
+      loading: _isLoading,
+      expanded: false,
+    );
+  }
+}

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

@@ -1,58 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_ui/immich_ui.dart';
-
-final scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
-
-class SnackbarManager {
-  const SnackbarManager();
-
-  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? show(String message, SnackbarType type) {
-    final messenger = scaffoldMessengerKey.currentState;
-    final context = scaffoldMessengerKey.currentContext;
-    if (messenger == null || context == null) {
-      return null;
-    }
-
-    messenger.hideCurrentSnackBar();
-    return messenger.showSnackBar(_build(context, message, type));
-  }
-
-  SnackBar _build(BuildContext context, String message, SnackbarType type) {
-    final theme = Theme.of(context);
-    final colors = theme.extension<ImmichColors>() ?? ImmichColors.harmonized(theme.colorScheme);
-    final (IconData icon, Color background, Color foreground) = switch (type) {
-      .info => (Icons.info_rounded, colors.info, colors.onInfo),
-      .success => (Icons.check_circle_rounded, colors.success, colors.onSuccess),
-      .error => (Icons.warning_rounded, colors.error, colors.onError),
-    };
-
-    return SnackBar(
-      behavior: .floating,
-      backgroundColor: background,
-      duration: const .new(seconds: 4),
-      shape: const RoundedRectangleBorder(borderRadius: .all(.circular(ImmichRadius.sm))),
-      content: Row(
-        children: [
-          Icon(icon, color: foreground, size: ImmichIconSize.sm),
-          const SizedBox(width: ImmichSpacing.md),
-          Expanded(
-            child: Text(
-              message,
-              maxLines: 2,
-              overflow: .ellipsis,
-              style: .new(color: foreground, fontWeight: .w600, fontSize: ImmichTextSize.body),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? info(String message) => show(message, .info);
-
-  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? success(String message) => show(message, .success);
-
-  ScaffoldFeatureController<SnackBar, SnackBarClosedReason>? error(String message) => show(message, .error);
-}
-
-const snackbar = SnackbarManager();

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

@@ -1,8 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:immich_ui/src/constants.dart';
-import 'package:material_color_utilities/blend/blend.dart';
-import 'package:material_color_utilities/hct/hct.dart';
-import 'package:material_color_utilities/palettes/tonal_palette.dart';
 
 class ImmichThemeProvider extends StatelessWidget {
   final ColorScheme colorScheme;
@@ -14,7 +11,6 @@ class ImmichThemeProvider extends StatelessWidget {
   Widget build(BuildContext context) {
     return Theme(
       data: Theme.of(context).copyWith(
-        extensions: [ImmichColors.harmonized(colorScheme)],
         colorScheme: colorScheme,
         brightness: colorScheme.brightness,
         inputDecorationTheme: InputDecorationTheme(
@@ -23,8 +19,8 @@ class ImmichThemeProvider extends StatelessWidget {
             final color = states.contains(WidgetState.error)
                 ? colorScheme.error
                 : states.contains(WidgetState.focused)
-                ? colorScheme.primary
-                : colorScheme.outline;
+                    ? colorScheme.primary
+                    : colorScheme.outline;
             return OutlineInputBorder(
               borderSide: BorderSide(color: color),
               borderRadius: const BorderRadius.all(Radius.circular(ImmichRadius.md)),
@@ -42,71 +38,3 @@ class ImmichThemeProvider extends StatelessWidget {
     );
   }
 }
-
-class ImmichColors extends ThemeExtension<ImmichColors> {
-  final Color info;
-  final Color onInfo;
-  final Color success;
-  final Color onSuccess;
-  final Color error;
-  final Color onError;
-
-  const ImmichColors({
-    required this.info,
-    required this.onInfo,
-    required this.success,
-    required this.onSuccess,
-    required this.error,
-    required this.onError,
-  });
-
-  factory ImmichColors.harmonized(ColorScheme scheme) {
-    final (info, onInfo) = scheme.harmonized(const Color(0xFF1984E9));
-    final (success, onSuccess) = scheme.harmonized(const Color(0xFF10C14D));
-    final (error, onError) = scheme.harmonized(const Color(0xFFFA2921));
-    return ImmichColors(
-      info: info,
-      onInfo: onInfo,
-      success: success,
-      onSuccess: onSuccess,
-      error: error,
-      onError: onError,
-    );
-  }
-
-  @override
-  ImmichColors copyWith({Color? info, Color? onInfo, Color? success, Color? onSuccess, Color? error, Color? onError}) {
-    return ImmichColors(
-      info: info ?? this.info,
-      onInfo: onInfo ?? this.onInfo,
-      success: success ?? this.success,
-      onSuccess: onSuccess ?? this.onSuccess,
-      error: error ?? this.error,
-      onError: onError ?? this.onError,
-    );
-  }
-
-  @override
-  ImmichColors lerp(ImmichColors? other, double t) {
-    if (other == null) {
-      return this;
-    }
-    return ImmichColors(
-      info: Color.lerp(info, other.info, t)!,
-      onInfo: Color.lerp(onInfo, other.onInfo, t)!,
-      success: Color.lerp(success, other.success, t)!,
-      onSuccess: Color.lerp(onSuccess, other.onSuccess, t)!,
-      error: Color.lerp(error, other.error, t)!,
-      onError: Color.lerp(onError, other.onError, t)!,
-    );
-  }
-}
-
-extension on ColorScheme {
-  (Color container, Color onContainer) harmonized(Color seed) {
-    final hct = Hct.fromInt(Blend.harmonize(seed.toARGB32(), primary.toARGB32()));
-    final tones = TonalPalette.of(hct.hue, hct.chroma);
-    final isDark = brightness == Brightness.dark;
-    return (Color(tones.get(isDark ? 30 : 90)), Color(tones.get(isDark ? 90 : 10)));
-  }
-}

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

@@ -1,5 +1,9 @@
-enum ImmichVariant { filled, ghost }
+enum ImmichVariant {
+  filled,
+  ghost,
+}
 
-enum ImmichColor { primary, secondary }
-
-enum SnackbarType { info, success, error }
+enum ImmichColor {
+  primary,
+  secondary,
+}

mobile/packages/ui/pubspec.lock

@@ -92,7 +92,7 @@ packages:
     source: hosted
     version: "0.12.19"
   material_color_utilities:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: material_color_utilities
       sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"

mobile/packages/ui/pubspec.yaml

@@ -7,7 +7,6 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  material_color_utilities: any
 
 dev_dependencies:
   flutter_test:

mobile/packages/ui/test/color_override_test.dart

@@ -1,53 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_ui/src/color_override.dart';
-import 'package:immich_ui/src/components/icon_button.dart';
-
-import 'test_utils.dart';
-
-void main() {
-  group('ImmichColorOverride', () {
-    testWidgets('exposes the override color to descendants', (tester) async {
-      Color? captured;
-      await tester.pumpTestWidget(
-        ImmichColorOverride(
-          color: Colors.green,
-          child: Builder(
-            builder: (context) {
-              captured = ImmichColorOverride.maybeOf(context);
-              return const SizedBox.shrink();
-            },
-          ),
-        ),
-      );
-
-      expect(captured, Colors.green);
-    });
-
-    testWidgets('maybeOf returns null when there is no override', (tester) async {
-      Color? captured = Colors.black;
-      await tester.pumpTestWidget(
-        Builder(
-          builder: (context) {
-            captured = ImmichColorOverride.maybeOf(context);
-            return const SizedBox.shrink();
-          },
-        ),
-      );
-
-      expect(captured, isNull);
-    });
-
-    testWidgets('a descendant component adopts the override as its foreground', (tester) async {
-      await tester.pumpTestWidget(
-        ImmichColorOverride(
-          color: Colors.green,
-          child: ImmichIconButton(icon: Icons.add, onPressed: () {}),
-        ),
-      );
-
-      final button = tester.widget<IconButton>(find.byType(IconButton));
-      expect(button.style?.foregroundColor?.resolve(<WidgetState>{}), Colors.green);
-    });
-  });
-}

mobile/packages/ui/test/snackbar_test.dart

@@ -1,35 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_ui/src/snackbar.dart';
-
-import 'test_utils.dart';
-
-void main() {
-  group('SnackbarManager', () {
-    testWidgets('shows the message', (tester) async {
-      await tester.pumpTestWidget(const SizedBox());
-
-      snackbar.success('hello');
-      await tester.pump();
-
-      expect(find.text('hello'), findsOneWidget);
-      expect(find.byType(SnackBar), findsOneWidget);
-    });
-
-    testWidgets('replaces the current snackbar', (tester) async {
-      await tester.pumpTestWidget(const SizedBox());
-
-      snackbar.info('first');
-      await tester.pump();
-      snackbar.error('second');
-      await tester.pump();
-
-      expect(find.text('first'), findsNothing);
-      expect(find.text('second'), findsOneWidget);
-    });
-
-    testWidgets('no-ops when the messenger is unmounted', (tester) async {
-      expect(snackbar.show('x', .info), isNull);
-    });
-  });
-}

mobile/packages/ui/test/test_utils.dart

@@ -1,14 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_ui/src/snackbar.dart';
 
 extension WidgetTesterExtension on WidgetTester {
+  /// Pumps a widget wrapped in MaterialApp and Scaffold for testing.
   Future<void> pumpTestWidget(Widget widget) {
-    return pumpWidget(
-      MaterialApp(
-        scaffoldMessengerKey: scaffoldMessengerKey,
-        home: Scaffold(body: widget),
-      ),
-    );
+    return pumpWidget(MaterialApp(home: Scaffold(body: widget)));
   }
 }

server/src/queries/sync.repository.sql

@@ -88,7 +88,7 @@ from
 where
   "album_asset"."updateId" < $3
   and "album_asset"."updateId" <= $4
-  and "album_asset"."updateId" > $5
+  and "album_asset"."updateId" >= $5
   and "album_asset"."albumId" = $6
 order by
   "album_asset"."updateId" asc
@@ -202,7 +202,7 @@ from
 where
   "album_asset"."updateId" < $1
   and "album_asset"."updateId" <= $2
-  and "album_asset"."updateId" > $3
+  and "album_asset"."updateId" >= $3
   and "album_asset"."albumId" = $4
 order by
   "album_asset"."updateId" asc
@@ -297,7 +297,7 @@ from
 where
   "album_asset"."updateId" < $1
   and "album_asset"."updateId" <= $2
-  and "album_asset"."updateId" > $3
+  and "album_asset"."updateId" >= $3
   and "album_asset"."albumId" = $4
 order by
   "album_asset"."updateId" asc
@@ -349,7 +349,7 @@ from
 where
   "album_user"."updateId" < $1
   and "album_user"."updateId" <= $2
-  and "album_user"."updateId" > $3
+  and "album_user"."updateId" >= $3
   and "albumId" = $4
 order by
   "album_user"."updateId" asc
@@ -810,7 +810,7 @@ from
 where
   "asset"."updateId" < $2
   and "asset"."updateId" <= $3
-  and "asset"."updateId" > $4
+  and "asset"."updateId" >= $4
   and "ownerId" = $5
 order by
   "asset"."updateId" asc
@@ -908,7 +908,7 @@ from
 where
   "asset_exif"."updateId" < $1
   and "asset_exif"."updateId" <= $2
-  and "asset_exif"."updateId" > $3
+  and "asset_exif"."updateId" >= $3
   and "asset"."ownerId" = $4
 order by
   "asset_exif"."updateId" asc
@@ -997,7 +997,7 @@ from
 where
   "stack"."updateId" < $1
   and "stack"."updateId" <= $2
-  and "stack"."updateId" > $3
+  and "stack"."updateId" >= $3
   and "ownerId" = $4
 order by
   "stack"."updateId" asc

server/src/repositories/sync.repository.ts

@@ -106,7 +106,7 @@ export class BaseSync {
       .selectFrom(table(t).as(t))
       .where(updateIdRef, '<', nowId)
       .where(updateIdRef, '<=', beforeUpdateId)
-      .$if(!!afterUpdateId, (qb) => qb.where(updateIdRef, '>', afterUpdateId!))
+      .$if(!!afterUpdateId, (qb) => qb.where(updateIdRef, '>=', afterUpdateId!))
       .orderBy(updateIdRef, 'asc');
   }
 

server/test/medium/specs/sync/sync-album-to-asset.spec.ts

@@ -155,57 +155,6 @@ describe(SyncRequestType.AlbumToAssetsV1, () => {
     await ctx.assertSyncIsComplete(auth, [SyncRequestType.AlbumToAssetsV1]);
   });
 
-  it('should not resend an already-acked item when backfill resumes', async () => {
-    const { auth, ctx } = await setup();
-    const { user: user2 } = await ctx.newUser();
-
-    // backfill needs assets with an older updateId
-    const { asset: sharedAsset1 } = await ctx.newAsset({ ownerId: user2.id });
-    const { asset: sharedAsset2 } = await ctx.newAsset({ ownerId: user2.id });
-
-    await wait(2);
-
-    const { album: sharedAlbum } = await ctx.newAlbum({ ownerId: user2.id });
-    await ctx.newAlbumAsset({ albumId: sharedAlbum.id, assetId: sharedAsset1.id });
-    await ctx.newAlbumAsset({ albumId: sharedAlbum.id, assetId: sharedAsset2.id });
-
-    await wait(2);
-
-    // backfill needs an initial ack, otherwise it syncs everything
-    const { asset: ownedAsset } = await ctx.newAsset({ ownerId: auth.user.id });
-    const { album: ownedAlbum } = await ctx.newAlbum({ ownerId: auth.user.id });
-    await ctx.newAlbumAsset({ albumId: ownedAlbum.id, assetId: ownedAsset.id });
-
-    const setupResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumToAssetsV1]);
-    await ctx.syncAckAll(auth, setupResponse);
-
-    // share album to trigger backfill
-    await ctx.newAlbumUser({ albumId: sharedAlbum.id, userId: auth.user.id, role: AlbumUserRole.Editor });
-
-    const response1 = await ctx.syncStream(auth, [SyncRequestType.AlbumToAssetsV1]);
-    expect(response1).toEqual([
-      // receive both
-      expect.objectContaining({ data: { albumId: sharedAlbum.id, assetId: sharedAsset1.id } }),
-      expect.objectContaining({ data: { albumId: sharedAlbum.id, assetId: sharedAsset2.id } }),
-      expect.objectContaining({ type: SyncEntityType.SyncAckV1 }),
-      expect.objectContaining({ type: SyncEntityType.SyncCompleteV1 }),
-    ]);
-
-    // ack 1st
-    await ctx.sut.setAcks(auth, { acks: [response1[0].ack] });
-
-    const response2 = await ctx.syncStream(auth, [SyncRequestType.AlbumToAssetsV1]);
-    expect(response2).toEqual([
-      // receive 2nd
-      expect.objectContaining({ data: { albumId: sharedAlbum.id, assetId: sharedAsset2.id } }),
-      expect.objectContaining({ type: SyncEntityType.SyncAckV1 }),
-      expect.objectContaining({ type: SyncEntityType.SyncCompleteV1 }),
-    ]);
-
-    await ctx.syncAckAll(auth, response2);
-    await ctx.assertSyncIsComplete(auth, [SyncRequestType.AlbumToAssetsV1]);
-  });
-
   it('should detect and sync a deleted album to asset relation', async () => {
     const { auth, ctx } = await setup();
     const albumRepo = ctx.get(AlbumRepository);

server/test/medium/specs/sync/sync-partner-asset.spec.ts

@@ -279,68 +279,6 @@ describe(SyncRequestType.PartnerAssetsV2, () => {
     await ctx.assertSyncIsComplete(auth, [SyncRequestType.PartnerAssetsV2]);
   });
 
-  it('should not resend an already-acked item when backfill resumes', async () => {
-    const { auth, ctx } = await setup();
-    const { user: user2 } = await ctx.newUser();
-    const { user: user3 } = await ctx.newUser();
-
-    // backfill needs assets with an older updateId
-    const { asset: partnerAsset1 } = await ctx.newAsset({ ownerId: user3.id });
-    await wait(2);
-    const { asset: partnerAsset2 } = await ctx.newAsset({ ownerId: user3.id });
-
-    await wait(2);
-
-    // backfill needs an initial ack, otherwise it syncs everything
-    const { asset: initialAsset } = await ctx.newAsset({ ownerId: user2.id });
-    await ctx.newPartner({ sharedById: user2.id, sharedWithId: auth.user.id });
-
-    const setupResponse = await ctx.syncStream(auth, [SyncRequestType.PartnerAssetsV2]);
-    expect(setupResponse).toEqual([
-      expect.objectContaining({
-        data: expect.objectContaining({ id: initialAsset.id }),
-        type: SyncEntityType.PartnerAssetV2,
-      }),
-      expect.objectContaining({ type: SyncEntityType.SyncCompleteV1 }),
-    ]);
-    await ctx.syncAckAll(auth, setupResponse);
-
-    // partner share to trigger backfill
-    await ctx.newPartner({ sharedById: user3.id, sharedWithId: auth.user.id });
-
-    const response1 = await ctx.syncStream(auth, [SyncRequestType.PartnerAssetsV2]);
-    expect(response1).toEqual([
-      // receive both
-      expect.objectContaining({
-        data: expect.objectContaining({ id: partnerAsset1.id }),
-        type: SyncEntityType.PartnerAssetBackfillV2,
-      }),
-      expect.objectContaining({
-        data: expect.objectContaining({ id: partnerAsset2.id }),
-        type: SyncEntityType.PartnerAssetBackfillV2,
-      }),
-      expect.objectContaining({ type: SyncEntityType.SyncAckV1 }),
-      expect.objectContaining({ type: SyncEntityType.SyncCompleteV1 }),
-    ]);
-
-    // ack 1st
-    await ctx.sut.setAcks(auth, { acks: [response1[0].ack] });
-
-    const response2 = await ctx.syncStream(auth, [SyncRequestType.PartnerAssetsV2]);
-    expect(response2).toEqual([
-      // receive 2nd
-      expect.objectContaining({
-        data: expect.objectContaining({ id: partnerAsset2.id }),
-        type: SyncEntityType.PartnerAssetBackfillV2,
-      }),
-      expect.objectContaining({ type: SyncEntityType.SyncAckV1 }),
-      expect.objectContaining({ type: SyncEntityType.SyncCompleteV1 }),
-    ]);
-
-    await ctx.syncAckAll(auth, response2);
-    await ctx.assertSyncIsComplete(auth, [SyncRequestType.PartnerAssetsV2]);
-  });
-
   it('should hide isFavorite for partner assets', async () => {
     const { auth, ctx } = await setup();
     const { user: user2 } = await ctx.newUser();

web/src/lib/components/asset-viewer/AssetViewerNavBar.svelte

@@ -10,13 +10,11 @@
   import RemoveAssetFromStack from '$lib/components/asset-viewer/actions/RemoveAssetFromStack.svelte';
   import RestoreAction from '$lib/components/asset-viewer/actions/RestoreAction.svelte';
   import SetFeaturedPhotoAction from '$lib/components/asset-viewer/actions/SetPersonFeaturedAction.svelte';
-  import SetProfilePictureAction from '$lib/components/asset-viewer/actions/SetProfilePictureAction.svelte';
   import SetStackPrimaryAsset from '$lib/components/asset-viewer/actions/SetStackPrimaryAsset.svelte';
   import SetVisibilityAction from '$lib/components/asset-viewer/actions/SetVisibilityAction.svelte';
   import UnstackAction from '$lib/components/asset-viewer/actions/UnstackAction.svelte';
   import LoadingDots from '$lib/components/LoadingDots.svelte';
   import ButtonContextMenu from '$lib/components/shared-components/context-menu/ButtonContextMenu.svelte';
-  import MenuOption from '$lib/components/shared-components/context-menu/MenuOption.svelte';
   import RemoveFromAlbumAction from '$lib/components/timeline/actions/RemoveFromAlbumAction.svelte';
   import { assetViewerManager } from '$lib/managers/asset-viewer-manager.svelte';
   import { authManager } from '$lib/managers/auth-manager.svelte';
@@ -84,6 +82,27 @@
     shortcuts: [{ key: 'Escape' }],
   });
 
+  const PlayOriginalVideo: ActionItem = $derived({
+    title: playOriginalVideo ? $t('play_transcoded_video') : $t('play_original_video'),
+    icon: mdiVideoOutline,
+    $if: () => asset.type === AssetTypeEnum.Video,
+    onAction: () => setPlayOriginalVideo(!playOriginalVideo),
+  });
+
+  const ViewInTimeline: ActionItem = $derived({
+    title: $t('view_in_timeline'),
+    icon: mdiImageSearch,
+    $if: () => isOwner && !isLocked && !asset.isArchived && !asset.isTrashed,
+    onAction: () => goto(Route.photos({ at: stack?.primaryAssetId ?? asset.id })),
+  });
+
+  const ViewSimilar: ActionItem = $derived({
+    title: $t('view_similar_photos'),
+    icon: mdiCompare,
+    $if: () => !isLocked && !asset.isArchived && !asset.isTrashed && smartSearchEnabled,
+    onAction: () => goto(Route.search({ queryAssetId: stack?.primaryAssetId ?? asset.id })),
+  });
+
   const Actions = $derived(getAssetActions($t, asset));
   const sharedLink = getSharedLink();
 </script>
@@ -169,41 +188,21 @@
         {#if person}
           <SetFeaturedPhotoAction {asset} {person} {onAction} />
         {/if}
-        {#if asset.type === AssetTypeEnum.Image && !isLocked}
-          <SetProfilePictureAction {asset} />
-        {/if}
 
-        {#if !isLocked}
-          {#if isOwner}
-            <ArchiveAction {asset} {onAction} {preAction} />
-            {#if !asset.isArchived && !asset.isTrashed}
-              <MenuOption
-                icon={mdiImageSearch}
-                onClick={() => goto(Route.photos({ at: stack?.primaryAssetId ?? asset.id }))}
-                text={$t('view_in_timeline')}
-              />
-            {/if}
-          {/if}
-          {#if !asset.isArchived && !asset.isTrashed && smartSearchEnabled}
-            <MenuOption
-              icon={mdiCompare}
-              onClick={() => goto(Route.search({ queryAssetId: stack?.primaryAssetId ?? asset.id }))}
-              text={$t('view_similar_photos')}
-            />
-          {/if}
+        <ActionMenuItem action={Actions.SetProfilePicture} />
+
+        {#if isOwner && !isLocked}
+          <ArchiveAction {asset} {onAction} {preAction} />
         {/if}
+        <ActionMenuItem action={ViewInTimeline} />
+        <ActionMenuItem action={ViewSimilar} />
 
         {#if !asset.isTrashed && isOwner}
           <SetVisibilityAction asset={toTimelineAsset(asset)} {onAction} {preAction} />
         {/if}
 
-        {#if asset.type === AssetTypeEnum.Video}
-          <MenuOption
-            icon={mdiVideoOutline}
-            onClick={() => setPlayOriginalVideo(!playOriginalVideo)}
-            text={playOriginalVideo ? $t('play_transcoded_video') : $t('play_original_video')}
-          />
-        {/if}
+        <ActionMenuItem action={PlayOriginalVideo} />
+
         {#if isOwner}
           <hr />
           <ActionMenuItem action={Actions.RefreshFacesJob} />

web/src/lib/components/asset-viewer/actions/SetProfilePictureAction.svelte

@@ -1,20 +0,0 @@
-<script lang="ts">
-  import MenuOption from '$lib/components/shared-components/context-menu/MenuOption.svelte';
-  import ProfileImageCropperModal from '$lib/modals/ProfileImageCropperModal.svelte';
-  import type { AssetResponseDto } from '@immich/sdk';
-  import { modalManager } from '@immich/ui';
-  import { mdiAccountCircleOutline } from '@mdi/js';
-  import { t } from 'svelte-i18n';
-
-  interface Props {
-    asset: AssetResponseDto;
-  }
-
-  let { asset }: Props = $props();
-</script>
-
-<MenuOption
-  icon={mdiAccountCircleOutline}
-  onClick={() => modalManager.show(ProfileImageCropperModal, { asset })}
-  text={$t('set_as_profile_picture')}
-/>

web/src/lib/services/asset.service.ts

@@ -11,6 +11,7 @@ import {
 } from '@immich/sdk';
 import { modalManager, toastManager, type ActionItem } from '@immich/ui';
 import {
+  mdiAccountCircleOutline,
   mdiAlertOutline,
   mdiCogRefreshOutline,
   mdiContentCopy,
@@ -41,6 +42,7 @@ import { authManager } from '$lib/managers/auth-manager.svelte';
 import { eventManager } from '$lib/managers/event-manager.svelte';
 import AssetAddToAlbumModal from '$lib/modals/AssetAddToAlbumModal.svelte';
 import AssetTagModal from '$lib/modals/AssetTagModal.svelte';
+import ProfileImageCropperModal from '$lib/modals/ProfileImageCropperModal.svelte';
 import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
 import { SlideshowState, slideshowStore } from '$lib/stores/slideshow.store';
 import { getAssetMediaUrl, getSharedLink, sleep } from '$lib/utils';
@@ -242,6 +244,13 @@ export const getAssetActions = ($t: MessageFormatter, asset: AssetResponseDto) =
     shortcuts: [{ key: 'e' }],
   };
 
+  const SetProfilePicture: ActionItem = {
+    title: $t('set_as_profile_picture'),
+    icon: mdiAccountCircleOutline,
+    $if: () => asset.type === AssetTypeEnum.Image && asset.visibility !== AssetVisibility.Locked,
+    onAction: () => modalManager.show(ProfileImageCropperModal, { asset }),
+  };
+
   const RefreshFacesJob: ActionItem = {
     title: $t('refresh_faces'),
     icon: mdiHeadSyncOutline,
@@ -286,6 +295,7 @@ export const getAssetActions = ($t: MessageFormatter, asset: AssetResponseDto) =
     Tag,
     TagPeople,
     Edit,
+    SetProfilePicture,
     RefreshFacesJob,
     RefreshMetadataJob,
     RegenerateThumbnailJob,