fix(mobile): blank notifications page after enabling notifications

the old notification toggles were removed in a cleanup, so once notifications were enabled the page had nothing left and went blank. show a "notifications enabled" status tile with a shortcut to the system notification settings instead.

docker/example.env

@@ -10,7 +10,7 @@ DB_DATA_LOCATION=./postgres
 # TZ=Etc/UTC
 
 # The Immich version to use. You can pin this to a specific version like "v2.1.0"
-IMMICH_VERSION=v3
+IMMICH_VERSION=v2
 
 # Connection secret for postgres. You should change it to a random password
 # Please use only the characters `A-Za-z0-9`, without special characters or spaces

docs/docs/install/environment-variables.md

@@ -19,7 +19,7 @@ If this does not work, try running `docker compose up -d --force-recreate`.
 
 | Variable           | Description                     | Default | Containers               |
 | :----------------- | :------------------------------ | :-----: | :----------------------- |
-| `IMMICH_VERSION`   | Image tags                      |  `v3`   | server, machine learning |
+| `IMMICH_VERSION`   | Image tags                      |  `v2`   | server, machine learning |
 | `UPLOAD_LOCATION`  | Host path for uploads           |         | server                   |
 | `DB_DATA_LOCATION` | Host path for Postgres database |         | database                 |
 

docs/docs/install/upgrading.md

@@ -29,7 +29,7 @@ docker image prune
 ## Versioning Policy
 
 Immich follows [semantic versioning][semver], which tags releases in the format `<major>.<minor>.<patch>`. We intend for breaking changes to be limited to major version releases.
-You can configure your Docker image to point to the current major version by using a metatag, such as `:v3`.
+You can configure your Docker image to point to the current major version by using a metatag, such as `:v2`.
 
 Currently, we have no plans to backport patches to earlier versions. We encourage all users to run the most recent release of Immich.
 Switching back to an earlier version, even within the same minor release tag, is not supported.

i18n/en.json

@@ -1548,7 +1548,7 @@
   "map_location_picker_page_use_location": "Use this location",
   "map_location_service_disabled_content": "Location service needs to be enabled to display assets from your current location. Do you want to enable it now?",
   "map_location_service_disabled_title": "Location Service disabled",
-  "map_marker_for_image": "Map marker for image taken in {city}, {country}",
+  "map_marker_for_images": "Map marker for images taken in {city}, {country}",
   "map_marker_with_image": "Map marker with image",
   "map_no_location_permission_content": "Location permission is needed to display assets from your current location. Do you want to allow it now?",
   "map_no_location_permission_title": "Location Permission denied",
@@ -1715,6 +1715,9 @@
   "notes": "Notes",
   "nothing_here_yet": "Nothing here yet",
   "notification_backup_reliability": "Enable notifications to improve background backup reliability",
+  "notification_enabled_list_tile_content": "Immich uses notifications for background backup. Manage them in your device settings.",
+  "notification_enabled_list_tile_open_button": "Open settings",
+  "notification_enabled_list_tile_title": "Notifications enabled",
   "notification_permission_dialog_content": "To enable notifications, go to Settings and select allow.",
   "notification_permission_list_tile_content": "Grant permission to enable notifications.",
   "notification_permission_list_tile_enable_button": "Enable Notifications",

mobile/lib/utils/version_compatibility.dart

@@ -1,16 +1,7 @@
-import 'package:immich_mobile/utils/semver.dart';
-
-String? getVersionCompatibilityMessage(SemVer serverVersion, SemVer appVersion) {
+String? getVersionCompatibilityMessage(int _, int appMinor, int _, int serverMinor) {
   // Add latest compat info up top
-
-  // ensure mobile app major version is not behind server major version
-  if (appVersion.major < serverVersion.major) {
-    return 'Your mobile app version is not compatible with the server! Please update your mobile app to the latest version.';
-  }
-
-  // ensure mobile app major version is not ahead of server major version by more than 1 major version
-  if (appVersion.major > serverVersion.major + 1) {
-    return 'Your server version is not compatible with the mobile app! Please update your server to the latest version.';
+  if (serverMinor < 106 && appMinor >= 106) {
+    return 'Your app minor version is not compatible with the server! Please update your server to version v1.106.0 or newer to login';
   }
 
   return null;

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

@@ -26,7 +26,6 @@ import 'package:immich_mobile/providers/websocket.provider.dart';
 import 'package:immich_mobile/repositories/permission.repository.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/provider_utils.dart';
-import 'package:immich_mobile/utils/semver.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
 import 'package:immich_mobile/utils/version_compatibility.dart';
 import 'package:immich_mobile/widgets/common/immich_logo.dart';
@@ -89,9 +88,18 @@ class LoginForm extends HookConsumerWidget {
     checkVersionMismatch() async {
       try {
         final packageInfo = await PackageInfo.fromPlatform();
-        final appSemVer = SemVer.fromString(packageInfo.version);
-        final serverSemVer = serverInfo.serverVersion;
-        warningMessage.value = getVersionCompatibilityMessage(appSemVer, serverSemVer);
+        final appVersion = packageInfo.version;
+        final appMajorVersion = int.parse(appVersion.split('.')[0]);
+        final appMinorVersion = int.parse(appVersion.split('.')[1]);
+        final serverMajorVersion = serverInfo.serverVersion.major;
+        final serverMinorVersion = serverInfo.serverVersion.minor;
+
+        warningMessage.value = getVersionCompatibilityMessage(
+          appMajorVersion,
+          appMinorVersion,
+          serverMajorVersion,
+          serverMinorVersion,
+        );
       } catch (error) {
         warningMessage.value = 'Error checking version compatibility';
       }

mobile/lib/widgets/settings/notification_setting.dart

@@ -48,6 +48,14 @@ class NotificationSetting extends HookConsumerWidget {
                   showPermissionsDialog();
                 }
               }),
+        )
+      else
+        SettingsButtonListTile(
+          icon: Icons.notifications_active_outlined,
+          title: 'notification_enabled_list_tile_title'.tr(),
+          subtileText: 'notification_enabled_list_tile_content'.tr(),
+          buttonText: 'notification_enabled_list_tile_open_button'.tr(),
+          onButtonTap: () => openAppSettings(),
         ),
     ];
 

mobile/packages/ui/lib/immich_ui.dart

@@ -1,9 +1,7 @@
 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';

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/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/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/test/modules/utils/version_compatibility_test.dart

@@ -1,47 +1,29 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:immich_mobile/utils/semver.dart';
 import 'package:immich_mobile/utils/version_compatibility.dart';
 
 void main() {
-  group('app major version behind server', () {
-    const message =
-        'Your mobile app version is not compatible with the server! Please update your mobile app to the latest version.';
+  test('getVersionCompatibilityMessage', () {
+    String? result;
 
-    test('returns message when app major is behind server major', () {
-      final result = getVersionCompatibilityMessage(
-        const SemVer(major: 2, minor: 0, patch: 0),
-        const SemVer(major: 1, minor: 200, patch: 0),
-      );
-      expect(result, message);
-    });
+    result = getVersionCompatibilityMessage(1, 106, 1, 105);
+    expect(
+      result,
+      'Your app minor version is not compatible with the server! Please update your server to version v1.106.0 or newer to login',
+    );
 
-    test('returns null when app major matches server major', () {
-      final result = getVersionCompatibilityMessage(
-        const SemVer(major: 2, minor: 0, patch: 0),
-        const SemVer(major: 2, minor: 0, patch: 0),
-      );
-      expect(result, null);
-    });
-  });
+    result = getVersionCompatibilityMessage(1, 107, 1, 105);
+    expect(
+      result,
+      'Your app minor version is not compatible with the server! Please update your server to version v1.106.0 or newer to login',
+    );
 
-  group('app major version too far ahead of server', () {
-    const message =
-        'Your server version is not compatible with the mobile app! Please update your server to the latest version.';
+    result = getVersionCompatibilityMessage(1, 106, 1, 106);
+    expect(result, null);
 
-    test('returns message when app major is more than one ahead of server', () {
-      final result = getVersionCompatibilityMessage(
-        const SemVer(major: 1, minor: 200, patch: 0),
-        const SemVer(major: 3, minor: 0, patch: 0),
-      );
-      expect(result, message);
-    });
+    result = getVersionCompatibilityMessage(1, 107, 1, 106);
+    expect(result, null);
 
-    test('returns null when app major is exactly one ahead of server', () {
-      final result = getVersionCompatibilityMessage(
-        const SemVer(major: 1, minor: 200, patch: 0),
-        const SemVer(major: 2, minor: 0, patch: 0),
-      );
-      expect(result, null);
-    });
+    result = getVersionCompatibilityMessage(1, 107, 1, 108);
+    expect(result, null);
   });
 }

readme_i18n/README_tr_TR.md

@@ -38,8 +38,8 @@
 </p>
 
 > [!WARNING]
-> ⚠️ Değerli fotoğraflarınız ve videolarınız için daima [3-2-1](https://www.backblaze.com/blog/the-3-2-1-backup-strategy/) yedekleme planını uygulayın!
-> 
+> ⚠️ Always follow [3-2-1](https://www.backblaze.com/blog/the-3-2-1-backup-strategy/) backup plan for your precious photos and videos!
+>
 
 > [!NOTE]
 > Kurulum dahil olmak üzere resmi belgeleri https://immich.app/ adresinde bulabilirsiniz.

server/src/queries/integrity.repository.sql

@@ -129,7 +129,6 @@ from
   and "integrity_report"."type" = $1
 where
   "asset"."deletedAt" is null
-  and "asset"."isExternal" = false
   and "integrity_report"."createdAt" >= $2
   and "integrity_report"."createdAt" <= $3
 order by

server/src/repositories/integrity.repository.ts

@@ -177,7 +177,6 @@ export class IntegrityRepository {
         'asset.id as assetId',
         'integrity_report.id as reportId',
       ])
-      .where('asset.isExternal', '=', sql.lit(false))
       .$if(startMarker !== undefined, (qb) => qb.where('integrity_report.createdAt', '>=', startMarker!))
       .$if(endMarker !== undefined, (qb) => qb.where('integrity_report.createdAt', '<=', endMarker!))
       .orderBy('integrity_report.createdAt', 'asc')

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

@@ -2939,8 +2939,6 @@ describe(MediaService.name, () => {
             '7',
             '-global_quality:v',
             '23',
-            '-b:v',
-            '6897k',
             '-maxrate',
             '10000k',
             '-bufsize',

server/src/utils/media.ts

@@ -788,12 +788,6 @@ export class QsvSwDecodeConfig extends BaseHWConfig {
     const options = [`-${this.useCQP() ? 'q:v' : 'global_quality:v'}`, `${this.config.crf}`];
     const bitrates = this.getBitrateDistribution();
     if (bitrates.max > 0) {
-      // Workaround for https://github.com/immich-app/immich/issues/29220, to be revisited
-      // QSV seems to ignore -maxrate without -b:v
-      // -b:v alongside global_quality uses QVBR
-      if (!this.useCQP()) {
-        options.push('-b:v', `${bitrates.target}${bitrates.unit}`);
-      }
       options.push('-maxrate', `${bitrates.max}${bitrates.unit}`, '-bufsize', `${bitrates.max * 2}${bitrates.unit}`);
     }
     return options;

server/test/medium/specs/services/integrity.service.spec.ts

@@ -686,22 +686,6 @@ describe(IntegrityService.name, () => {
         nextCursor: undefined,
       });
     });
-
-    it('should skip external library files', async () => {
-      const { sut, ctx } = setup();
-      const job = ctx.getMock(JobRepository);
-      job.queue.mockResolvedValue(void 0);
-
-      const { user } = await ctx.newUser();
-
-      await ctx.newAsset({ ownerId: user.id, isExternal: true });
-
-      await sut.handleChecksumFiles({ refreshOnly: false });
-
-      await expect(
-        ctx.get(IntegrityRepository).getIntegrityReport({ limit: 100 }, IntegrityReport.ChecksumFail),
-      ).resolves.toEqual({ items: [], nextCursor: undefined });
-    });
   });
 
   describe('handleChecksumRefresh', () => {

web/src/app.css

@@ -159,9 +159,7 @@
   }
 
   .text-white-shadow {
-    text-shadow:
-      0 0 4px rgba(0, 0, 0, 0.9),
-      0 1px 3px rgba(0, 0, 0, 0.8);
+    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.8);
   }
 
   .icon-white-drop-shadow {

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

@@ -23,7 +23,7 @@
     type AlbumResponseDto,
     type AssetResponseDto,
   } from '@immich/sdk';
-  import { Icon, IconButton, Link, LoadingSpinner, Text } from '@immich/ui';
+  import { Icon, IconButton, LoadingSpinner, Text } from '@immich/ui';
   import { mdiCamera, mdiCameraIris, mdiClose, mdiImageOutline, mdiInformationOutline } from '@mdi/js';
   import { onDestroy } from 'svelte';
   import { t } from 'svelte-i18n';
@@ -310,13 +310,14 @@
           {#snippet popup({ marker })}
             {@const { lat, lon } = marker}
             <div class="flex flex-col items-center gap-1">
-              <Text fontWeight="bold">{lat.toPrecision(6)}, {lon.toPrecision(6)}</Text>
-              <Link
+              <p class="font-bold">{lat.toPrecision(6)}, {lon.toPrecision(6)}</p>
+              <a
                 href="https://www.openstreetmap.org/?mlat={lat}&mlon={lon}&zoom=13#map=15/{lat}/{lon}"
-                class="text-primary"
+                target="_blank"
+                class="font-medium text-primary underline focus:outline-none"
               >
                 {$t('open_in_openstreetmap')}
-              </Link>
+              </a>
             </div>
           {/snippet}
         </Map>

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

@@ -324,18 +324,6 @@
       shortcut: { key: ' ' },
       onShortcut: () => (videoPlayer?.paused ? videoPlayer?.play() : videoPlayer?.pause()),
     },
-    {
-      shortcut: { shift: true, key: 'ArrowLeft' },
-      onShortcut: () =>
-        videoPlayer ? (videoPlayer.currentTime = Math.max(videoPlayer.currentTime - 0.4, 0)) : undefined,
-    },
-    {
-      shortcut: { shift: true, key: 'ArrowRight' },
-      onShortcut: () =>
-        videoPlayer
-          ? (videoPlayer.currentTime = Math.min(videoPlayer.currentTime + 0.4, videoPlayer.duration))
-          : undefined,
-    },
   ]}
 />
 

web/src/lib/components/assets/thumbnail/Thumbnail.svelte

@@ -342,7 +342,7 @@
 
         {#if !!assetOwner}
           <div class="absolute inset-e-2 bottom-1 z-2 max-w-[50%]">
-            <p class="text-white-shadow max-w-full truncate p-1 text-xs font-medium text-white">
+            <p class="max-w-full truncate text-xs font-medium text-white drop-shadow-lg">
               {assetOwner.name}
             </p>
           </div>

web/src/lib/components/shared-components/map/Map.svelte

@@ -38,6 +38,7 @@
     Control,
     ControlButton,
     ControlGroup,
+    FullscreenControl,
     GeoJSON,
     GeolocateControl,
     MapLibre,
@@ -342,6 +343,7 @@
 
       {#if !simplified}
         <GeolocateControl position="top-left" />
+        <FullscreenControl position="top-left" />
         <ScaleControl />
         <AttributionControl compact={false} />
       {/if}
@@ -399,13 +401,13 @@
       >
         {#snippet children({ feature }: { feature: Feature })}
           {#if useLocationPin}
-            <Icon icon={mdiMapMarker} size="50px" class="translate-y-[calc(5px-50%)] text-primary" />
+            <Icon icon={mdiMapMarker} size="50px" class="translate-y-[-50%] text-primary" />
           {:else}
             <img
               src={getAssetMediaUrl({ id: feature.properties?.id })}
               class="size-15 rounded-full border-2 border-immich-primary bg-immich-primary object-cover shadow-lg transition-all duration-200 hover:scale-150 hover:border-immich-dark-primary"
               alt={feature.properties?.city && feature.properties.country
-                ? $t('map_marker_for_image', {
+                ? $t('map_marker_for_images', {
                     values: { city: feature.properties.city, country: feature.properties.country },
                   })
                 : $t('map_marker_with_image')}
@@ -413,7 +415,7 @@
           {/if}
           {#if popup}
             <Popup offset={[0, -30]} openOn="click" closeOnClickOutside>
-              {@render popup({ marker: asMarker(feature) })}
+              {@render popup?.({ marker: asMarker(feature) })}
             </Popup>
           {/if}
         {/snippet}

web/src/lib/stores/face.svelte.ts

@@ -24,8 +24,7 @@ class FaceManager {
   });
 
   readonly people = $derived.by(() => {
-    // eslint-disable-next-line svelte/prefer-svelte-reactivity
-    const people = new Map<string, PersonResponseDto>();
+    const people = new SvelteMap<string, PersonResponseDto>();
 
     for (const face of this.data) {
       if (face.person) {
@@ -33,7 +32,7 @@ class FaceManager {
       }
     }
 
-    return Array.from(people.values());
+    return people.values();
   });
 
   readonly facesByPersonId = $derived.by(() => {

web/src/routes/(user)/people/manage/+page.svelte

@@ -169,9 +169,7 @@
             preload={false}
           />
           {#if person.name}
-            <span
-              class="text-white-shadow absolute inset-s-0 bottom-2 w-full px-1 text-center font-medium text-white select-text"
-            >
+            <span class="absolute inset-s-0 bottom-2 w-full px-1 text-center font-medium text-white select-text">
               {person.name}
             </span>
           {/if}