add fil to mobile locales

mobile/lib/constants/locales.dart

@@ -17,7 +17,8 @@ const Map<String, Locale> locales = {
   'Dutch (nl)': Locale('nl'),
   'English (United Kingdom) (en_GB)': Locale('en', 'GB'),
   'Estonian (et)': Locale('et'),
-  'Filipino (tl)': Locale('tl'),
+  'Filipino (fil)': Locale('fil'),
+  'Filipino (Tagalog) (tl)': Locale('tl'),
   'Finnish (fi)': Locale('fi'),
   'French (fr)': Locale('fr'),
   'Galician (gl)': Locale('gl'),

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

@@ -142,6 +142,7 @@ class AppConfig {
             .cleanupCutoffDaysAgo => cleanup.cutoffDaysAgo,
             .cleanupDefaultsInitialized => cleanup.defaultsInitialized,
             .shareFileType => share.fileType,
+            .slideshowTransition => slideshow.transition,
             .slideshowRepeat => slideshow.repeat,
             .slideshowDuration => slideshow.duration,
             .slideshowLook => slideshow.look,
@@ -195,6 +196,7 @@ class AppConfig {
       .cleanupCutoffDaysAgo => copyWith(cleanup: cleanup.copyWith(cutoffDaysAgo: value as int)),
       .cleanupDefaultsInitialized => copyWith(cleanup: cleanup.copyWith(defaultsInitialized: value as bool)),
       .shareFileType => copyWith(share: share.copyWith(fileType: value as ShareAssetType)),
+      .slideshowTransition => copyWith(slideshow: slideshow.copyWith(transition: value as bool)),
       .slideshowRepeat => copyWith(slideshow: slideshow.copyWith(repeat: value as bool)),
       .slideshowDuration => copyWith(slideshow: slideshow.copyWith(duration: value as int)),
       .slideshowLook => copyWith(slideshow: slideshow.copyWith(look: value as SlideshowLook)),

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

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

mobile/lib/domain/models/settings_key.dart

@@ -70,6 +70,7 @@ enum SettingsKey<T> {
   shareFileType<ShareAssetType>(codec: _EnumCodec(ShareAssetType.values)),
 
   // Slideshow
+  slideshowTransition<bool>(),
   slideshowRepeat<bool>(),
   slideshowDuration<int>(),
   slideshowLook<SlideshowLook>(codec: _EnumCodec(SlideshowLook.values)),

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

@@ -33,9 +33,7 @@ class DriftSlideshowPage extends ConsumerStatefulWidget {
   ConsumerState<DriftSlideshowPage> createState() => _DriftSlideshowPageState();
 }
 
-class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with SingleTickerProviderStateMixin {
-  static const double _kenBurnsZoom = 0.1;
-
+class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> {
   late SlideshowConfig _config;
   late final PageController _pageController;
   late final Stopwatch _stopwatch;
@@ -45,12 +43,6 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
   bool _paused = false;
   bool _showAppBar = false;
 
-  late final AnimationController _crossfadeController;
-  late final Animation<double> _crossfadeOpacity;
-  int? _crossfadeFromIndex;
-  int? _crossfadeToIndex;
-  int _zoomCycle = 0;
-
   @override
   initState() {
     super.initState();
@@ -58,8 +50,6 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
     final asset = ref.read(assetViewerProvider).currentAsset;
     _index = asset == null ? 0 : widget.timeline.getIndex(asset.heroTag) ?? 0;
     _pageController = PageController(initialPage: _index);
-    _crossfadeController = AnimationController(vsync: this, duration: Durations.extralong2);
-    _crossfadeOpacity = Tween<double>(begin: 1.0, end: 0.0).animate(_crossfadeController);
     _stopwatch = Stopwatch();
     _createTimer();
     _updateNextIndex();
@@ -74,7 +64,6 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
     _timer.cancel();
     _stopwatch.stop();
     _pageController.dispose();
-    _crossfadeController.dispose();
     unawaited(WakelockPlus.disable());
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
     super.dispose();
@@ -161,64 +150,11 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
       await widget.timeline.preloadAssets(_nextIndex);
     }
 
-    _crossFadeToPage(_nextIndex);
-  }
-
-  void _crossFadeToPage(int page) {
-    final previousIndex = _index;
-    _pageController.jumpToPage(page);
-    setState(() {
-      _crossfadeFromIndex = previousIndex;
-      _crossfadeToIndex = page;
-    });
-    _crossfadeController.forward(from: 0.0).whenComplete(() {
-      if (mounted) {
-        setState(() {
-          _crossfadeFromIndex = null;
-          _crossfadeToIndex = null;
-        });
-      }
-    });
-  }
-
-  Widget _getCrossfadeLayer(BuildContext context, int index, {required bool isIncoming}) {
-    final asset = widget.timeline.getAssetSafe(index);
-
-    final Widget child;
-    if (isIncoming && asset?.isImage == true) {
-      child = _getPhotoView(context, index);
+    if (_config.direction == SlideshowDirection.shuffle || !_config.transition) {
+      _pageController.jumpToPage(_nextIndex);
     } else {
-      final zoomOut = isIncoming ? _zoomCycle.isOdd : _zoomCycle.isEven;
-      final zoom = isIncoming ? (zoomOut ? 1.0 : 0.0) : (zoomOut ? 0.0 : 1.0);
-      child = _getCrossfadeChild(context, index, zoom);
+      unawaited(_pageController.animateToPage(_nextIndex, duration: Durations.long2, curve: Curves.easeIn));
     }
-
-    return Stack(
-      fit: StackFit.expand,
-      children: [if (_config.look == SlideshowLook.blurredBackground) _getBlur(context, index), child],
-    );
-  }
-
-  Widget _getCrossfadeChild(BuildContext context, int index, double zoom) {
-    final asset = widget.timeline.getAssetSafe(index);
-
-    if (asset == null) {
-      return const SizedBox.shrink();
-    }
-
-    final scale = _config.look == SlideshowLook.cover
-        ? PhotoViewComputedScale.covered
-        : PhotoViewComputedScale.contained;
-
-    return PhotoView(
-      imageProvider: getFullImageProvider(asset, size: context.sizeData),
-      index: index,
-      disableScaleGestures: true,
-      gaplessPlayback: true,
-      filterQuality: FilterQuality.high,
-      initialScale: scale * (1.0 + zoom * _kenBurnsZoom),
-      controller: PhotoViewController(),
-    );
   }
 
   void _createTimer() {
@@ -236,7 +172,6 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
 
     setState(() {
       _index = page;
-      _zoomCycle++;
 
       if (!asset.isImage) {
         _paused = false;
@@ -333,7 +268,7 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
     final imageProvider = getFullImageProvider(asset, size: context.sizeData);
 
     if (asset.isImage) {
-      final zoomOut = _zoomCycle.isOdd;
+      final zoomOut = index % 2 == 1;
       final elapsed = _stopwatch.elapsedMilliseconds;
       final duration = _config.duration * 1000;
       final progress = zoomOut ? 1.0 - elapsed / duration.toDouble() : elapsed / duration.toDouble();
@@ -354,7 +289,7 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
           disableScaleGestures: true,
           gaplessPlayback: true,
           filterQuality: FilterQuality.high,
-          initialScale: scale * (1.0 + value * _kenBurnsZoom),
+          initialScale: scale * (1.0 + value / 10.0),
           controller: PhotoViewController(),
           onTapUp: (_, _, _) => _onTapUp(),
         ),
@@ -421,43 +356,20 @@ class _DriftSlideshowPageState extends ConsumerState<DriftSlideshowPage> with Si
       extendBody: true,
       extendBodyBehindAppBar: true,
       backgroundColor: Colors.black,
-      body: Stack(
-        children: [
-          PhotoViewGestureDetectorScope(
-            axis: Axis.horizontal,
-            child: PageView.builder(
-              controller: _pageController,
-              physics: const FastClampingScrollPhysics(),
-              itemCount: widget.timeline.totalAssets,
-              onPageChanged: _pageChanged,
-              itemBuilder: (context, index) => Stack(
-                children: [
-                  if (_config.look == SlideshowLook.blurredBackground) _getBlur(context, index),
-                  _getPhotoView(context, index),
-                ],
-              ),
-            ),
+      body: PhotoViewGestureDetectorScope(
+        axis: Axis.horizontal,
+        child: PageView.builder(
+          controller: _pageController,
+          physics: const FastClampingScrollPhysics(),
+          itemCount: widget.timeline.totalAssets,
+          onPageChanged: _pageChanged,
+          itemBuilder: (context, index) => Stack(
+            children: [
+              if (_config.look == SlideshowLook.blurredBackground) _getBlur(context, index),
+              _getPhotoView(context, index),
+            ],
           ),
-          if (_crossfadeFromIndex != null && _crossfadeToIndex != null)
-            Positioned.fill(
-              child: IgnorePointer(
-                child: Stack(
-                  fit: StackFit.expand,
-                  children: [
-                    const ColoredBox(color: Colors.black),
-                    FadeTransition(
-                      opacity: _crossfadeController,
-                      child: _getCrossfadeLayer(context, _crossfadeToIndex!, isIncoming: true),
-                    ),
-                    FadeTransition(
-                      opacity: _crossfadeOpacity,
-                      child: _getCrossfadeLayer(context, _crossfadeFromIndex!, isIncoming: false),
-                    ),
-                  ],
-                ),
-              ),
-            ),
-        ],
+        ),
       ),
     );
   }

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

@@ -16,11 +16,15 @@ class SlideshowSettings extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final slideshow = ref.read(appConfigProvider).slideshow;
+    final useTransition = useState(slideshow.transition);
     final useRepeat = useState(slideshow.repeat);
     final useDuration = useState(slideshow.duration);
     final useLook = useState(slideshow.look);
     final useDirection = useState(slideshow.direction);
 
+    useValueChanged<bool, void>(useTransition.value, (_, __) {
+      ref.read(settingsProvider).write(.slideshowTransition, useTransition.value);
+    });
     useValueChanged<bool, void>(useRepeat.value, (_, __) {
       ref.read(settingsProvider).write(.slideshowRepeat, useRepeat.value);
     });
@@ -41,6 +45,11 @@ class SlideshowSettings extends HookConsumerWidget {
           title: 'slideshow'.t(context: context),
           icon: Icons.slideshow_outlined,
         ),
+        SettingsSwitchListTile(
+          valueNotifier: useTransition,
+          title: "show_slideshow_transition".t(context: context),
+          enabled: useDirection.value != SlideshowDirection.shuffle,
+        ),
         SettingsSwitchListTile(
           valueNotifier: useRepeat,
           title: "slideshow_repeat".t(context: context),

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

@@ -369,26 +369,6 @@ describe(DuplicateService.name, () => {
       expect(mocks.job.queueAll).toHaveBeenCalledWith([{ name: JobName.SidecarWrite, data: { id: asset1.id } }]);
     });
 
-    it('should not merge metadata when multiple assets are kept', async () => {
-      const asset1 = AssetFactory.create({ isFavorite: true });
-      const asset2 = AssetFactory.create();
-      mocks.access.duplicate.checkOwnerAccess.mockResolvedValue(new Set(['group-1']));
-      mocks.duplicateRepository.get.mockResolvedValue({
-        duplicateId: 'group-1',
-        assets: [asset1 as unknown as MapAsset, asset2 as unknown as MapAsset],
-      });
-
-      const result = await sut.resolve(authStub.admin, {
-        groups: [{ duplicateId: 'group-1', keepAssetIds: [asset1.id, asset2.id], trashAssetIds: [] }],
-      });
-
-      expect(result[0].success).toBe(true);
-      expect(mocks.album.addAssetIdsToAlbums).not.toHaveBeenCalled();
-      expect(mocks.tag.replaceAssetTags).not.toHaveBeenCalled();
-      expect(mocks.asset.updateAllExif).not.toHaveBeenCalled();
-      expect(mocks.asset.updateAll).toHaveBeenCalledWith([asset1.id, asset2.id], { duplicateId: null });
-    });
-
     // NOTE: The following integration-style tests are covered by E2E tests instead
     // to avoid complex mock setup. The validation and error-handling logic above
     // is thoroughly unit tested.

server/src/services/duplicate.service.ts

@@ -156,51 +156,51 @@ export class DuplicateService extends BaseService {
       }
     }
 
-    // Only merge metadata into the keeper when exactly one asset can absorb trashed duplicates.
-    if (idsToKeep.length === 1 && idsToTrash.length > 0) {
-      const assetAlbumMap = await this.albumRepository.getByAssetIds(auth.user.id, [...groupAssetIds]);
+    const assetAlbumMap = await this.albumRepository.getByAssetIds(auth.user.id, [...groupAssetIds]);
 
-      const { assetUpdate, exifUpdate, mergedAlbumIds, mergedTagIds, mergedTagValues } = this.getSyncMergeResult(
-        duplicateGroup.assets,
-        assetAlbumMap,
-      );
+    const { assetUpdate, exifUpdate, mergedAlbumIds, mergedTagIds, mergedTagValues } = this.getSyncMergeResult(
+      duplicateGroup.assets,
+      assetAlbumMap,
+    );
 
-      if (mergedAlbumIds.length > 0) {
-        const allowedAlbumIds = await this.checkAccess({
-          auth,
-          permission: Permission.AlbumAssetCreate,
-          ids: mergedAlbumIds,
-        });
+    if (mergedAlbumIds.length > 0) {
+      const allowedAlbumIds = await this.checkAccess({
+        auth,
+        permission: Permission.AlbumAssetCreate,
+        ids: mergedAlbumIds,
+      });
 
-        const allowedShareIds = await this.checkAccess({
-          auth,
-          permission: Permission.AssetShare,
-          ids: idsToKeep,
-        });
+      const allowedShareIds = await this.checkAccess({
+        auth,
+        permission: Permission.AssetShare,
+        ids: idsToKeep,
+      });
 
-        if (allowedAlbumIds.size > 0 && allowedShareIds.size > 0) {
-          await this.albumRepository.addAssetIdsToAlbums(
-            [...allowedAlbumIds].flatMap((albumId) => [...allowedShareIds].map((assetId) => ({ albumId, assetId }))),
-          );
-        }
+      if (allowedAlbumIds.size > 0 && allowedShareIds.size > 0) {
+        await this.albumRepository.addAssetIdsToAlbums(
+          [...allowedAlbumIds].flatMap((albumId) => [...allowedShareIds].map((assetId) => ({ albumId, assetId }))),
+        );
       }
+    }
 
-      if (mergedTagIds.length > 0) {
-        const allowedTagIds = await this.checkAccess({
-          auth,
-          permission: Permission.TagAsset,
-          ids: mergedTagIds,
-        });
+    if (mergedTagIds.length > 0) {
+      const allowedTagIds = await this.checkAccess({
+        auth,
+        permission: Permission.TagAsset,
+        ids: mergedTagIds,
+      });
 
-        if (allowedTagIds.size > 0) {
-          await Promise.all(
-            idsToKeep.map((assetId) => this.tagRepository.replaceAssetTags(assetId, [...allowedTagIds])),
-          );
+      if (allowedTagIds.size > 0) {
+        // Replace tags for each keeper asset to ensure all merged tags are applied
+        await Promise.all(idsToKeep.map((assetId) => this.tagRepository.replaceAssetTags(assetId, [...allowedTagIds])));
 
-          await this.assetRepository.updateAllExif(idsToKeep, { tags: mergedTagValues });
-        }
+        // Update asset_exif.tags so the subsequent SidecarWrite + MetadataExtraction
+        // cycle preserves the merged tags (updateAllExif locks the property automatically)
+        await this.assetRepository.updateAllExif(idsToKeep, { tags: mergedTagValues });
       }
+    }
 
+    if (idsToKeep.length > 0) {
       const hasExifUpdate = Object.keys(exifUpdate).length > 0;
       const hasTagUpdate = mergedTagIds.length > 0;
 
@@ -213,8 +213,6 @@ export class DuplicateService extends BaseService {
       }
 
       await this.assetRepository.updateAll(idsToKeep, { duplicateId: null, ...assetUpdate });
-    } else if (idsToKeep.length > 0) {
-      await this.assetRepository.updateAll(idsToKeep, { duplicateId: null });
     }
 
     if (idsToTrash.length > 0) {

web/src/lib/utils/i18n.ts

@@ -116,6 +116,7 @@ const nonIntlNames: Record<string, string> = {
   kxm: 'Khmer Surin',
   mfa: 'Malay (Pattani)',
   swg: 'Schwäbisch',
+  tl: 'Tagalog',
 };
 
 const getLanguageName = (code: string) =>

web/src/routes/admin/system-settings/FFmpegSettings.svelte

@@ -88,7 +88,6 @@
               desc={$t('admin.transcoding_accepted_video_codecs_description')}
               bind:value={configToEdit.ffmpeg.acceptedVideoCodecs}
               name="videoCodecs"
-              lockedOptions={[configToEdit.ffmpeg.targetVideoCodec]}
               options={[
                 { value: VideoCodec.H264, text: 'H.264' },
                 { value: VideoCodec.Hevc, text: 'HEVC' },
@@ -107,7 +106,6 @@
               desc={$t('admin.transcoding_accepted_audio_codecs_description')}
               bind:value={configToEdit.ffmpeg.acceptedAudioCodecs}
               name="audioCodecs"
-              lockedOptions={[configToEdit.ffmpeg.targetAudioCodec]}
               options={[
                 { value: AudioCodec.Aac, text: 'AAC' },
                 { value: AudioCodec.Mp3, text: 'MP3' },

web/src/routes/admin/system-settings/SettingCheckboxes.svelte

@@ -1,18 +1,17 @@
-<script lang="ts" generics="T extends string">
+<script lang="ts">
   import { Checkbox, Label } from '@immich/ui';
   import { t } from 'svelte-i18n';
   import { quintOut } from 'svelte/easing';
   import { fly } from 'svelte/transition';
 
   interface Props {
-    value: T[];
-    options: { value: T; text: string }[];
+    value: string[];
+    options: { value: string; text: string }[];
     label?: string;
     desc?: string;
     name?: string;
     isEdited?: boolean;
     disabled?: boolean;
-    lockedOptions?: T[];
   }
 
   let {
@@ -23,10 +22,9 @@
     name = '',
     isEdited = false,
     disabled = false,
-    lockedOptions = [],
   }: Props = $props();
 
-  function handleCheckboxChange(option: T) {
+  function handleCheckboxChange(option: string) {
     value = value.includes(option) ? value.filter((item) => item !== option) : [...value, option];
   }
 </script>
@@ -59,7 +57,7 @@
           size="tiny"
           id="{option.value}-checkbox"
           checked={value.includes(option.value)}
-          disabled={disabled || lockedOptions.includes(option.value)}
+          {disabled}
           onCheckedChange={() => handleCheckboxChange(option.value)}
         />
         <Label label={option.text} for="{option.value}-checkbox" size="small" />