fix(mobile): live debounced map bounds tracking

.github/workflows/fdroid.yml

@@ -1,50 +0,0 @@
-name: Update F-Droid Repo
-
-on:
-  release:
-    types: [published]
-
-permissions: {}
-
-jobs:
-  update-index:
-    runs-on: ubuntu-latest
-    if: ${{ !github.event.release.prerelease }}
-    permissions:
-      contents: read
-    steps:
-      - name: Checkout pubspec for versionCode
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-        with:
-          ref: ${{ github.event.release.tag_name }}
-          persist-credentials: false
-          sparse-checkout: mobile/pubspec.yaml
-          sparse-checkout-cone-mode: false
-
-      - name: Update F-Droid repo
-        env:
-          GITLAB_TOKEN: ${{ secrets.FDROID_REPO_TOKEN }}
-          RELEASE: ${{ toJSON(github.event.release) }}
-          TAG: ${{ github.event.release.tag_name }}
-        run: |
-          export VERSION_CODE=$(yq '.version' mobile/pubspec.yaml | cut -d+ -f2)
-
-          git clone --depth 1 "https://oauth2:${GITLAB_TOKEN}@gitlab.futo.org/fdroid/repo-v2.git" fdroid-repo
-          cd fdroid-repo
-
-          yq -i '
-            [env(RELEASE).assets[] | select(.name == "app-release.apk")] as $matches |
-            with(select($matches | length == 0); error("app-release.apk not found in release assets")) |
-            with(select([.apks[] | select(."version-code" == env(VERSION_CODE))] | length > 0); error("version-code already in index")) |
-            .apks = [{
-              "url": $matches[0].browser_download_url,
-              "sha256sum": ($matches[0].digest | sub("^sha256:", "")),
-              "date": (env(RELEASE).published_at | split("T") | .[0]),
-              "version-code": env(VERSION_CODE)
-            }] + .apks
-          ' apps/Immich/index.yml
-
-          git config user.name "Immich Release Bot"
-          git config user.email "bot@immich.app"
-          git commit -am "Immich: add version-code ${VERSION_CODE} (${TAG})"
-          git push

i18n/fr.json

@@ -431,8 +431,8 @@
     "transcoding_realtime_description": "Permet au transcodage d'être réalisé en temps réel durant la diffusion du flux de la vidéo. Active la bascule automatique entre résolutions, mais peut entraîner une latence importante de lecture et des microcoupures en fonction des capacités du serveur.",
     "transcoding_realtime_enabled": "Activer la transcodification en temps réel",
     "transcoding_realtime_enabled_description": "Si désactivé, le serveur refusera de démarrer de nouvelles sessions de transcodifications en temps réel.",
-    "transcoding_realtime_resolutions": "Résolutions",
-    "transcoding_realtime_resolutions_description": "Les résolutions proposées pour le transcodage en temps réel. Des résolutions supérieures peuvent causer des soucis pendant la lecture si le serveur ne peut pas les transcoder suffisamment rapidement.",
+    "transcoding_realtime_resolutions": "Définitions",
+    "transcoding_realtime_resolutions_description": "Les définitions proposées pour le transcodage en temps réel. Des définitions supérieures peuvent causer des soucis pendant la lecture si le serveur ne peut pas les transcoder suffisamment rapidement.",
     "transcoding_realtime_video_codecs": "Codecs vidéo",
     "transcoding_realtime_video_codecs_description": "Les codecs vidéo proposés pour le transcodage en temps réel. Les clients choisissent la meilleure option qu'ils supportent durant la lecture. AV1 est plus efficace que HEVC, qui est plus efficace que H.264. En utilisant l'accélération matérielle, sélectionnez seulement les codecs que l'accélérateur peut encoder. En utilisant le transcodage logiciel, notez que H.264 est plus rapide que AV1, qui est plus rapide que HEVC.",
     "transcoding_reference_frames": "Trames de référence",

mobile/lib/extensions/maplibrecontroller_extensions.dart

@@ -1,71 +1,9 @@
 import 'dart:async';
-import 'dart:io';
-import 'dart:math';
 
 import 'package:flutter/services.dart';
-import 'package:immich_mobile/models/map/map_marker.model.dart';
-import 'package:immich_mobile/utils/map_utils.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 
 extension MapMarkers on MapLibreMapController {
-  static var _completer = Completer()..complete();
-
-  Future<void> addGeoJSONSourceForMarkers(List<MapMarker> markers) async {
-    return addSource(
-      MapUtils.defaultSourceId,
-      GeojsonSourceProperties(data: MapUtils.generateGeoJsonForMarkers(markers.toList())),
-    );
-  }
-
-  Future<void> reloadAllLayersForMarkers(List<MapMarker> markers) async {
-    // Wait for previous reload to complete
-    if (!_completer.isCompleted) {
-      return _completer.future;
-    }
-    _completer = Completer();
-
-    // !! Make sure to remove layers before sources else the native
-    // maplibre library would crash when removing the source saying that
-    // the source is still in use
-    final existingLayers = await getLayerIds();
-    if (existingLayers.contains(MapUtils.defaultHeatMapLayerId)) {
-      await removeLayer(MapUtils.defaultHeatMapLayerId);
-    }
-
-    final existingSources = await getSourceIds();
-    if (existingSources.contains(MapUtils.defaultSourceId)) {
-      await removeSource(MapUtils.defaultSourceId);
-    }
-
-    await addGeoJSONSourceForMarkers(markers);
-
-    if (Platform.isAndroid) {
-      await addCircleLayer(
-        MapUtils.defaultSourceId,
-        MapUtils.defaultHeatMapLayerId,
-        const CircleLayerProperties(
-          circleRadius: 10,
-          circleColor: "rgba(150,86,34,0.7)",
-          circleBlur: 1.0,
-          circleOpacity: 0.7,
-          circleStrokeWidth: 0.1,
-          circleStrokeColor: "rgba(203,46,19,0.5)",
-          circleStrokeOpacity: 0.7,
-        ),
-      );
-    }
-
-    if (Platform.isIOS) {
-      await addHeatmapLayer(
-        MapUtils.defaultSourceId,
-        MapUtils.defaultHeatMapLayerId,
-        MapUtils.defaultHeatMapLayerProperties,
-      );
-    }
-
-    _completer.complete();
-  }
-
   Future<Symbol?> addMarkerAtLatLng(LatLng centre) async {
     // no marker is displayed if asset-path is incorrect
     try {
@@ -76,14 +14,4 @@ extension MapMarkers on MapLibreMapController {
       // no-op
     }
   }
-
-  Future<LatLngBounds> getBoundsFromPoint(Point<double> point, double distance) async {
-    final southWestPx = Point(point.x - distance, point.y + distance);
-    final northEastPx = Point(point.x + distance, point.y - distance);
-
-    final southWest = await toLatLng(southWestPx);
-    final northEast = await toLatLng(northEastPx);
-
-    return LatLngBounds(southwest: southWest, northeast: northEast);
-  }
 }

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

@@ -52,7 +52,12 @@ class DriftMap extends ConsumerStatefulWidget {
 class _DriftMapState extends ConsumerState<DriftMap> {
   MapLibreMapController? mapController;
   final _reloadMutex = AsyncMutex();
-  final _debouncer = Debouncer(interval: const Duration(milliseconds: 500), maxWaitTime: const Duration(seconds: 2));
+
+  final _debouncer = Debouncer(
+    interval: const Duration(milliseconds: 150),
+    maxWaitTime: const Duration(milliseconds: 500),
+  );
+
   final ValueNotifier<double> bottomSheetOffset = ValueNotifier(0.25);
   final GlobalKey _bottomSheetKey = GlobalKey();
   StreamSubscription? _eventSubscription;
@@ -117,7 +122,7 @@ class _DriftMapState extends ConsumerState<DriftMap> {
   }
 
   void onMapMoved() {
-    if (mapController!.isCameraMoving || !mounted) {
+    if (!mounted) {
       return;
     }
 
@@ -213,6 +218,8 @@ class _Map extends StatelessWidget {
               : CameraPosition(target: initialLocation, zoom: MapUtils.mapZoomToAssetLevel),
           compassEnabled: false,
           rotateGesturesEnabled: false,
+          // Get continuous movement events for bounds tracking
+          trackCameraPosition: true,
           styleString: style,
           onMapCreated: onMapCreated,
           onStyleLoadedCallback: onMapReady,

web/src/lib/components/asset-viewer/AssetViewerNavBar.spec.ts

@@ -7,16 +7,6 @@ import { preferencesFactory } from '@test-data/factories/preferences-factory';
 import { userAdminFactory } from '@test-data/factories/user-factory';
 import AssetViewerNavBar from './AssetViewerNavBar.svelte';
 
-vi.mock(import('$lib/managers/feature-flags-manager.svelte'), function () {
-  return {
-    featureFlagsManager: {
-      init: vi.fn(),
-      loadFeatureFlags: vi.fn(),
-      value: { smartSearch: true, trash: true },
-    } as never,
-  };
-});
-
 describe('AssetViewerNavBar component', () => {
   const additionalProps = {
     preAction: () => {},
@@ -34,6 +24,15 @@ describe('AssetViewerNavBar component', () => {
       };
     });
     vi.stubGlobal('ResizeObserver', getResizeObserverMock());
+    vi.mock(import('$lib/managers/feature-flags-manager.svelte'), function () {
+      return {
+        featureFlagsManager: {
+          init: vi.fn(),
+          loadFeatureFlags: vi.fn(),
+          value: { smartSearch: true, trash: true },
+        } as never,
+      };
+    });
   });
 
   afterEach(() => {

web/src/lib/components/asset-viewer/actions/DeleteAction.spec.ts

@@ -4,14 +4,16 @@ import { renderWithTooltips } from '$tests/helpers';
 import { assetFactory } from '@test-data/factories/asset-factory';
 import DeleteAction from './DeleteAction.svelte';
 
-vi.mock(import('$lib/managers/feature-flags-manager.svelte'), () => {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return { featureFlagsManager: { init: vi.fn(), loadFeatureFlags: vi.fn(), value: { trash: true } } as any };
-});
-
 let asset: AssetResponseDto;
 
 describe('DeleteAction component', () => {
+  beforeEach(() => {
+    vi.mock(import('$lib/managers/feature-flags-manager.svelte'), () => {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      return { featureFlagsManager: { init: vi.fn(), loadFeatureFlags: vi.fn(), value: { trash: true } } as any };
+    });
+  });
+
   describe('given an asset which is not trashed yet', () => {
     beforeEach(() => {
       asset = assetFactory.build({ isTrashed: false });

web/src/lib/components/assets/thumbnail/__test__/Thumbnail.spec.ts

@@ -4,11 +4,6 @@ import Thumbnail from '$lib/components/assets/thumbnail/Thumbnail.svelte';
 import { getTabbable } from '$lib/utils/focus-util';
 import { assetFactory } from '@test-data/factories/asset-factory';
 
-vi.mock('$lib/utils/navigation', () => ({
-  currentUrlReplaceAssetId: vi.fn(),
-  isSharedLinkRoute: vi.fn().mockReturnValue(false),
-}));
-
 vi.hoisted(() => {
   Object.defineProperty(globalThis, 'matchMedia', {
     writable: true,
@@ -31,6 +26,10 @@ vi.hoisted(() => {
 describe('Thumbnail component', () => {
   beforeAll(() => {
     vi.stubGlobal('IntersectionObserver', getIntersectionObserverMock());
+    vi.mock('$lib/utils/navigation', () => ({
+      currentUrlReplaceAssetId: vi.fn(),
+      isSharedLinkRoute: vi.fn().mockReturnValue(false),
+    }));
   });
 
   it('should only contain a single tabbable element (the container)', () => {

web/src/lib/components/shared-components/side-bar/RecentAlbums.spec.ts

@@ -16,7 +16,7 @@ describe('RecentAlbums component', () => {
     sdkMock.getAllAlbums.mockResolvedValueOnce([...albums]);
     render(RecentAlbums);
 
-    expect(sdkMock.getAllAlbums).toHaveBeenCalledOnce();
+    expect(sdkMock.getAllAlbums).toBeCalledTimes(1);
 
     // wtf
     await tick();

web/src/lib/elements/__test__/FormatMessage.spec.ts

@@ -35,7 +35,7 @@ describe('FormatMessage component', () => {
 
   it('throws an error when locale is empty', async () => {
     await locale.set(undefined);
-    expect(() => render(FormatMessage, { key: '' as Translations })).toThrow();
+    expect(() => render(FormatMessage, { key: '' as Translations })).toThrowError();
     await locale.set('en');
   });
 

web/src/lib/managers/timeline-manager/timeline-manager.svelte.spec.ts

@@ -70,7 +70,7 @@ describe('TimelineManager', () => {
     });
 
     it('should load months in viewport', () => {
-      expect(sdkMock.getTimeBuckets).toHaveBeenCalledOnce();
+      expect(sdkMock.getTimeBuckets).toBeCalledTimes(1);
       expect(sdkMock.getTimeBucket).toHaveBeenCalledTimes(2);
     });
 
@@ -133,13 +133,13 @@ describe('TimelineManager', () => {
     it('loads a month', async () => {
       expect(getTimelineMonthByDate(timelineManager, { year: 2024, month: 1 })?.getAssets().length).toEqual(0);
       await timelineManager.loadTimelineMonth({ year: 2024, month: 1 });
-      expect(sdkMock.getTimeBucket).toHaveBeenCalledOnce();
+      expect(sdkMock.getTimeBucket).toBeCalledTimes(1);
       expect(getTimelineMonthByDate(timelineManager, { year: 2024, month: 1 })?.getAssets().length).toEqual(3);
     });
 
     it('ignores invalid months', async () => {
       await timelineManager.loadTimelineMonth({ year: 2023, month: 1 });
-      expect(sdkMock.getTimeBucket).not.toHaveBeenCalled();
+      expect(sdkMock.getTimeBucket).toBeCalledTimes(0);
     });
 
     it('cancels month loading', async () => {
@@ -147,7 +147,7 @@ describe('TimelineManager', () => {
       void timelineManager.loadTimelineMonth({ year: 2024, month: 1 });
       const abortSpy = vi.spyOn(month!.loader!.cancelToken!, 'abort');
       month?.cancel();
-      expect(abortSpy).toHaveBeenCalledOnce();
+      expect(abortSpy).toBeCalledTimes(1);
       await timelineManager.loadTimelineMonth({ year: 2024, month: 1 });
       expect(getTimelineMonthByDate(timelineManager, { year: 2024, month: 1 })?.getAssets().length).toEqual(3);
     });
@@ -157,10 +157,10 @@ describe('TimelineManager', () => {
         timelineManager.loadTimelineMonth({ year: 2024, month: 1 }),
         timelineManager.loadTimelineMonth({ year: 2024, month: 1 }),
       ]);
-      expect(sdkMock.getTimeBucket).toHaveBeenCalledOnce();
+      expect(sdkMock.getTimeBucket).toBeCalledTimes(1);
 
       await timelineManager.loadTimelineMonth({ year: 2024, month: 1 });
-      expect(sdkMock.getTimeBucket).toHaveBeenCalledOnce();
+      expect(sdkMock.getTimeBucket).toBeCalledTimes(1);
     });
 
     it('allows loading a canceled month', async () => {
@@ -283,7 +283,7 @@ describe('TimelineManager', () => {
       const asset = deriveLocalDateTimeFromFileCreatedAt(timelineAssetFactory.build());
       timelineManager.upsertAssets([asset]);
 
-      expect(updateAssetsSpy).toHaveBeenCalledWith([asset]);
+      expect(updateAssetsSpy).toBeCalledWith([asset]);
       expect(timelineManager.assetCount).toEqual(1);
     });
 
@@ -642,8 +642,8 @@ describe('TimelineManager', () => {
       const previousMonthSpy = vi.spyOn(previousMonth!.loader!, 'execute');
       const previous = await timelineManager.getLaterAsset(a);
       expect(previous).toEqual(b);
-      expect(loadTimelineMonthSpy).not.toHaveBeenCalled();
-      expect(previousMonthSpy).not.toHaveBeenCalled();
+      expect(loadTimelineMonthSpy).toBeCalledTimes(0);
+      expect(previousMonthSpy).toBeCalledTimes(0);
     });
 
     it('skips removed assets', async () => {

web/src/lib/services/shared-link.service.spec.ts

@@ -2,15 +2,17 @@ import type { ServerConfigDto } from '@immich/sdk';
 import { asUrl } from '$lib/services/shared-link.service';
 import { sharedLinkFactory } from '@test-data/factories/shared-link-factory';
 
-vi.mock(import('$lib/managers/server-config-manager.svelte'), () => ({
-  serverConfigManager: {
-    value: { externalDomain: 'http://localhost:2283' } as ServerConfigDto,
-    init: vi.fn(),
-    loadServerConfig: vi.fn(),
-  },
-}));
-
 describe('SharedLinkService', () => {
+  beforeAll(() => {
+    vi.mock(import('$lib/managers/server-config-manager.svelte'), () => ({
+      serverConfigManager: {
+        value: { externalDomain: 'http://localhost:2283' } as ServerConfigDto,
+        init: vi.fn(),
+        loadServerConfig: vi.fn(),
+      },
+    }));
+  });
+
   describe('asUrl', () => {
     it('should properly encode characters in slug', () => {
       expect(asUrl(sharedLinkFactory.build({ slug: 'foo/bar' }))).toBe('http://localhost:2283/s/foo%2Fbar');

web/src/lib/utils/date-time.spec.ts

@@ -1,10 +1,6 @@
 import { writable } from 'svelte/store';
 import { getAlbumDateRange, getShortDateRange } from './date-time';
 
-vitest.mock('$lib/stores/preferences.store', () => ({
-  locale: writable('en'),
-}));
-
 describe('getShortDateRange', () => {
   beforeEach(() => {
     vi.stubEnv('TZ', 'UTC');
@@ -45,6 +41,10 @@ describe('getShortDateRange', () => {
 describe('getAlbumDate', () => {
   beforeAll(() => {
     process.env.TZ = 'UTC';
+
+    vitest.mock('$lib/stores/preferences.store', () => ({
+      locale: writable('en'),
+    }));
   });
 
   it('should work with only a start date', () => {

web/src/lib/utils/executor-queue.spec.ts

@@ -34,7 +34,7 @@ describe('Executor Queue test', function () {
     // The last task will be executed after 200ms and will finish at 400ms
     void eq.addTask(() => timeoutPromiseBuilder(200, 'T4'));
 
-    expect(finished).not.toHaveBeenCalled();
+    expect(finished).not.toBeCalled();
     expect(started).toHaveBeenCalledTimes(3);
 
     vi.advanceTimersByTime(100);