fix(web): folder sort

feat(api): person delete

.github/workflows/build-mobile.yml

@@ -73,7 +73,7 @@ jobs:
           cache: 'gradle'
 
       - name: Setup Flutter SDK
-        uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # v2.19.0
+        uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a # v2.20.0
         with:
           channel: 'stable'
           flutter-version-file: ./mobile/pubspec.yaml

.github/workflows/cli.yml

@@ -70,7 +70,7 @@ jobs:
         uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
@@ -99,7 +99,7 @@ jobs:
             type=raw,value=latest,enable=${{ github.event_name == 'release' }}
 
       - name: Build and push image
-        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
         with:
           file: cli/Dockerfile
           platforms: linux/amd64,linux/arm64

.github/workflows/codeql-analysis.yml

@@ -50,7 +50,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -63,7 +63,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/autobuild@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -76,6 +76,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
         with:
           category: '/language:${{matrix.language}}'

.github/workflows/docker.yml

@@ -177,7 +177,7 @@ jobs:
     runs-on: ubuntu-latest
     if: always()
     steps:
-      - uses: immich-app/devtools/actions/success-check@6b81b1572e466f7f48ba3c823159ce3f4a4d66a6 # success-check-action-0.0.3
+      - uses: immich-app/devtools/actions/success-check@68f10eb389bb02a3cf9d1156111964c549eb421b # 0.0.4
         with:
           needs: ${{ toJSON(needs) }}
 
@@ -188,6 +188,6 @@ jobs:
     runs-on: ubuntu-latest
     if: always()
     steps:
-      - uses: immich-app/devtools/actions/success-check@6b81b1572e466f7f48ba3c823159ce3f4a4d66a6 # success-check-action-0.0.3
+      - uses: immich-app/devtools/actions/success-check@68f10eb389bb02a3cf9d1156111964c549eb421b # 0.0.4
         with:
           needs: ${{ toJSON(needs) }}

.github/workflows/prepare-release.yml

@@ -100,7 +100,7 @@ jobs:
           name: release-apk-signed
 
       - name: Create draft release
-        uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2
+        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
         with:
           draft: true
           tag_name: ${{ env.IMMICH_VERSION }}

.github/workflows/static_analysis.yml

@@ -49,7 +49,7 @@ jobs:
           persist-credentials: false
 
       - name: Setup Flutter SDK
-        uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # v2.19.0
+        uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a # v2.20.0
         with:
           channel: 'stable'
           flutter-version-file: ./mobile/pubspec.yaml
@@ -109,7 +109,7 @@ jobs:
         working-directory: ./mobile
 
       - name: Run DCM
-        run: dcm analyze lib
+        run: dcm analyze lib --fatal-style --fatal-warnings
         working-directory: ./mobile
 
   zizmor:
@@ -134,7 +134,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
         with:
           sarif_file: results.sarif
           category: zizmor

.github/workflows/test.yml

@@ -499,7 +499,7 @@ jobs:
     runs-on: ubuntu-latest
     if: always()
     steps:
-      - uses: immich-app/devtools/actions/success-check@6b81b1572e466f7f48ba3c823159ce3f4a4d66a6 # success-check-action-0.0.3
+      - uses: immich-app/devtools/actions/success-check@68f10eb389bb02a3cf9d1156111964c549eb421b # 0.0.4
         with:
           needs: ${{ toJSON(needs) }}
 
@@ -516,7 +516,7 @@ jobs:
           persist-credentials: false
 
       - name: Setup Flutter SDK
-        uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 # v2.19.0
+        uses: subosito/flutter-action@395322a6cded4e9ed503aebd4cc1965625f8e59a # v2.20.0
         with:
           channel: 'stable'
           flutter-version-file: ./mobile/pubspec.yaml
@@ -668,7 +668,7 @@ jobs:
       contents: read
     services:
       postgres:
-        image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3
+        image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3@sha256:1f5583fe3397210a0fbc7f11b0cec18bacc4a99e3e8ea0548e9bd6bcf26ec37a
         env:
           POSTGRES_PASSWORD: postgres
           POSTGRES_USER: postgres

.github/workflows/weblate-lock.yml

@@ -52,6 +52,6 @@ jobs:
     permissions: {}
     if: always()
     steps:
-      - uses: immich-app/devtools/actions/success-check@6b81b1572e466f7f48ba3c823159ce3f4a4d66a6 # success-check-action-0.0.3
+      - uses: immich-app/devtools/actions/success-check@68f10eb389bb02a3cf9d1156111964c549eb421b # 0.0.4
         with:
           needs: ${{ toJSON(needs) }}

mobile/analysis_options.yaml

@@ -146,6 +146,7 @@ dart_code_metrics:
   #  - no-empty-block
   #  - no-equal-then-else
   #  - prefer-correct-test-file-name
+    - prefer-const-border-radius
   #  - prefer-match-file-name
   #  - prefer-return-await
   #  - avoid-self-assignment
@@ -290,7 +291,8 @@ dart_code_metrics:
     # Style
   #  - prefer-trailing-comma
   #  - unnecessary-trailing-comma
-  #  - prefer-declaring-const-constructor
+    - prefer-declaring-const-constructor
   #  - prefer-single-widget-per-file
+    - prefer-switch-expression
   #  - prefer-prefixed-global-constants
   #  - prefer-correct-callback-field-name

mobile/integration_test/test_utils/login_helper.dart

@@ -7,7 +7,7 @@ import 'general_helper.dart';
 class ImmichTestLoginHelper {
   final WidgetTester tester;
 
-  ImmichTestLoginHelper(this.tester);
+  const ImmichTestLoginHelper(this.tester);
 
   Future<void> waitForLoginScreen() async {
     await pumpUntilFound(tester, find.text("Login"));
@@ -60,11 +60,11 @@ class ImmichTestLoginHelper {
     await tester.tap(button);
   }
 
-  Future<void> assertLoginSuccess({int timeoutSeconds = 15}) async {
+  Future<void> assertLoginSuccess() async {
     await pumpUntilFound(tester, find.text("home_page_building_timeline".tr()));
   }
 
-  Future<void> assertLoginFailed({int timeoutSeconds = 15}) async {
+  Future<void> assertLoginFailed() async {
     await pumpUntilFound(tester, find.text("login_form_failed_login".tr()));
   }
 }

mobile/lib/constants/errors.dart

@@ -4,6 +4,8 @@ sealed class ImmichErrors {
 }
 
 class NoResponseDtoError extends ImmichErrors implements Exception {
+  const NoResponseDtoError();
+
   @override
   String toString() => "Response Dto is null";
 }

mobile/lib/domain/models/person.model.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 
 class Person {
-  Person({
+  const Person({
     required this.id,
     this.birthDate,
     required this.isHidden,

mobile/lib/entities/asset.entity.dart

@@ -554,18 +554,12 @@ class Asset {
 }""";
   }
 
-  static getVisibility(AssetVisibility visibility) {
+  static getVisibility(AssetVisibility visibility) => switch (visibility) {
-    switch (visibility) {
+        AssetVisibility.archive => AssetVisibilityEnum.archive,
-      case AssetVisibility.timeline:
+        AssetVisibility.hidden => AssetVisibilityEnum.hidden,
-        return AssetVisibilityEnum.timeline;
+        AssetVisibility.locked => AssetVisibilityEnum.locked,
-      case AssetVisibility.archive:
+        AssetVisibility.timeline || _ => AssetVisibilityEnum.timeline,
-        return AssetVisibilityEnum.archive;
+      };
-      case AssetVisibility.hidden:
-        return AssetVisibilityEnum.hidden;
-      case AssetVisibility.locked:
-        return AssetVisibilityEnum.locked;
-    }
-  }
 }
 
 enum AssetType {

mobile/lib/entities/store.entity.dart

@@ -11,7 +11,7 @@ class SSLClientCertStoreVal {
   final Uint8List data;
   final String? password;
 
-  SSLClientCertStoreVal(this.data, this.password);
+  const SSLClientCertStoreVal(this.data, this.password);
 
   void save() {
     final b64Str = base64Encode(data);

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

@@ -5,7 +5,7 @@ class ApiRepository {
 
   Future<T> checkNull<T>(Future<T?> future) async {
     final response = await future;
-    if (response == null) throw NoResponseDtoError();
+    if (response == null) throw const NoResponseDtoError();
     return response;
   }
 }

mobile/lib/models/albums/album_viewer_page_state.model.dart

@@ -5,7 +5,7 @@ class AlbumViewerPageState {
   final String editTitleText;
   final String editDescriptionText;
 
-  AlbumViewerPageState({
+  const AlbumViewerPageState({
     required this.isEditAlbum,
     required this.editTitleText,
     required this.editDescriptionText,

mobile/lib/models/albums/asset_selection_page_result.model.dart

@@ -4,7 +4,7 @@ import 'package:immich_mobile/entities/asset.entity.dart';
 class AssetSelectionPageResult {
   final Set<Asset> selectedAssets;
 
-  AssetSelectionPageResult({
+  const AssetSelectionPageResult({
     required this.selectedAssets,
   });
   @override

mobile/lib/models/auth/auth_state.model.dart

@@ -7,7 +7,7 @@ class AuthState {
   final bool isAdmin;
   final String profileImagePath;
 
-  AuthState({
+  const AuthState({
     required this.deviceId,
     required this.userId,
     required this.userEmail,

mobile/lib/models/auth/auxilary_endpoint.model.dart

@@ -5,7 +5,7 @@ class AuxilaryEndpoint {
   final String url;
   final AuxCheckStatus status;
 
-  AuxilaryEndpoint({
+  const AuxilaryEndpoint({
     required this.url,
     required this.status,
   });
@@ -55,7 +55,7 @@ class AuxilaryEndpoint {
 
 class AuxCheckStatus {
   final String name;
-  AuxCheckStatus({
+  const AuxCheckStatus({
     required this.name,
   });
   const AuxCheckStatus._(this.name);

mobile/lib/models/auth/login_response.model.dart

@@ -13,7 +13,7 @@ class LoginResponse {
 
   final String userId;
 
-  LoginResponse({
+  const LoginResponse({
     required this.accessToken,
     required this.isAdmin,
     required this.name,

mobile/lib/models/backup/available_album.model.dart

@@ -4,7 +4,7 @@ class AvailableAlbum {
   final Album album;
   final int assetCount;
   final DateTime? lastBackup;
-  AvailableAlbum({
+  const AvailableAlbum({
     required this.album,
     required this.assetCount,
     this.lastBackup,

mobile/lib/models/backup/current_upload_asset.model.dart

@@ -9,7 +9,7 @@ class CurrentUploadAsset {
   final int? fileSize;
   final bool? iCloudAsset;
 
-  CurrentUploadAsset({
+  const CurrentUploadAsset({
     required this.id,
     required this.fileCreatedAt,
     required this.fileName,

mobile/lib/models/backup/success_upload_asset.model.dart

@@ -5,7 +5,7 @@ class SuccessUploadAsset {
   final String remoteAssetId;
   final bool isDuplicate;
 
-  SuccessUploadAsset({
+  const SuccessUploadAsset({
     required this.candidate,
     required this.remoteAssetId,
     required this.isDuplicate,

mobile/lib/models/download/download_state.model.dart

@@ -10,7 +10,7 @@ class DownloadInfo {
   // enum
   final TaskStatus status;
 
-  DownloadInfo({
+  const DownloadInfo({
     required this.fileName,
     required this.progress,
     required this.status,
@@ -71,7 +71,7 @@ class DownloadState {
   final TaskStatus downloadStatus;
   final Map<String, DownloadInfo> taskProgress;
   final bool showProgress;
-  DownloadState({
+  const DownloadState({
     required this.downloadStatus,
     required this.taskProgress,
     required this.showProgress,

mobile/lib/models/folder/recursive_folder.model.dart

@@ -3,7 +3,7 @@ import 'package:immich_mobile/models/folder/root_folder.model.dart';
 class RecursiveFolder extends RootFolder {
   final String name;
 
-  RecursiveFolder({
+  const RecursiveFolder({
     required this.name,
     required super.path,
     required super.subfolders,

mobile/lib/models/folder/root_folder.model.dart

@@ -4,7 +4,7 @@ class RootFolder {
   final List<RecursiveFolder> subfolders;
   final String path;
 
-  RootFolder({
+  const RootFolder({
     required this.subfolders,
     required this.path,
   });

mobile/lib/models/map/map_event.model.dart

@@ -8,4 +8,6 @@ class MapAssetsInBoundsUpdated extends MapEvent {
   const MapAssetsInBoundsUpdated(this.assetRemoteIds);
 }
 
-class MapCloseBottomSheet extends MapEvent {}
+class MapCloseBottomSheet extends MapEvent {
+  const MapCloseBottomSheet();
+}

mobile/lib/models/map/map_marker.model.dart

@@ -4,7 +4,7 @@ import 'package:openapi/api.dart';
 class MapMarker {
   final LatLng latLng;
   final String assetRemoteId;
-  MapMarker({
+  const MapMarker({
     required this.latLng,
     required this.assetRemoteId,
   });

mobile/lib/models/map/map_state.model.dart

@@ -11,7 +11,7 @@ class MapState {
   final AsyncValue<String> lightStyleFetched;
   final AsyncValue<String> darkStyleFetched;
 
-  MapState({
+  const MapState({
     this.themeMode = ThemeMode.system,
     this.showFavoriteOnly = false,
     this.includeArchived = false,

mobile/lib/models/memories/memory.model.dart

@@ -7,7 +7,7 @@ import 'package:immich_mobile/entities/asset.entity.dart';
 class Memory {
   final String title;
   final List<Asset> assets;
-  Memory({
+  const Memory({
     required this.title,
     required this.assets,
   });

mobile/lib/models/search/search_curated_content.model.dart

@@ -14,7 +14,7 @@ class SearchCuratedContent {
   /// The id to lookup the asset from the server
   final String id;
 
-  SearchCuratedContent({
+  const SearchCuratedContent({
     required this.label,
     required this.id,
     this.subtitle,

mobile/lib/models/search/search_result.model.dart

@@ -6,7 +6,7 @@ class SearchResult {
   final List<Asset> assets;
   final int? nextPage;
 
-  SearchResult({
+  const SearchResult({
     required this.assets,
     this.nextPage,
   });

mobile/lib/models/search/search_result_page_state.model.dart

@@ -8,7 +8,7 @@ class SearchResultPageState {
   final bool isSmart;
   final List<Asset> searchResult;
 
-  SearchResultPageState({
+  const SearchResultPageState({
     required this.isLoading,
     required this.isSuccess,
     required this.isError,

mobile/lib/models/server_info/server_info.model.dart

@@ -13,7 +13,7 @@ class ServerInfo {
   final bool isNewReleaseAvailable;
   final String versionMismatchErrorMessage;
 
-  ServerInfo({
+  const ServerInfo({
     required this.serverVersion,
     required this.latestVersion,
     required this.serverFeatures,

mobile/lib/pages/albums/albums.page.dart

@@ -105,7 +105,9 @@ class AlbumsPage extends HookConsumerWidget {
                   color: context.colorScheme.onSurface.withAlpha(0),
                   width: 0,
                 ),
-                borderRadius: BorderRadius.circular(24),
+                borderRadius: const BorderRadius.all(
+                  Radius.circular(24),
+                ),
                 gradient: LinearGradient(
                   colors: [
                     context.colorScheme.primary.withValues(alpha: 0.075),
@@ -301,7 +303,9 @@ class QuickFilterButton extends StatelessWidget {
         ),
         shape: WidgetStateProperty.all(
           RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(20),
+            borderRadius: const BorderRadius.all(
+              Radius.circular(20),
+            ),
             side: BorderSide(
               color: context.colorScheme.onSurface.withAlpha(25),
               width: 1,
@@ -334,8 +338,10 @@ class SortButton extends ConsumerWidget {
       style: MenuStyle(
         elevation: const WidgetStatePropertyAll(1),
         shape: WidgetStateProperty.all(
-          RoundedRectangleBorder(
+          const RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(24),
+            borderRadius: BorderRadius.all(
+              Radius.circular(24),
+            ),
           ),
         ),
         padding: const WidgetStatePropertyAll(
@@ -384,8 +390,10 @@ class SortButton extends ConsumerWidget {
                       : Colors.transparent,
                 ),
                 shape: WidgetStateProperty.all(
-                  RoundedRectangleBorder(
+                  const RoundedRectangleBorder(
-                    borderRadius: BorderRadius.circular(24),
+                    borderRadius: BorderRadius.all(
+                      Radius.circular(24),
+                    ),
                   ),
                 ),
               ),

mobile/lib/pages/backup/backup_album_selection.page.dart

@@ -246,8 +246,10 @@ class BackupAlbumSelectionPage extends HookConsumerWidget {
                         context: context,
                         builder: (BuildContext context) {
                           return AlertDialog(
-                            shape: RoundedRectangleBorder(
+                            shape: const RoundedRectangleBorder(
-                              borderRadius: BorderRadius.circular(10),
+                              borderRadius: BorderRadius.all(
+                                Radius.circular(10),
+                              ),
                             ),
                             elevation: 5,
                             title: Text(

mobile/lib/pages/backup/backup_controller.page.dart

@@ -147,7 +147,9 @@ class BackupControllerPage extends HookConsumerWidget {
         padding: const EdgeInsets.only(top: 8.0),
         child: Card(
           shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(20),
+            borderRadius: const BorderRadius.all(
+              Radius.circular(20),
+            ),
             side: BorderSide(
               color: context.colorScheme.outlineVariant,
               width: 1,

mobile/lib/pages/backup/failed_backup_status.page.dart

@@ -42,9 +42,11 @@ class FailedBackupStatusPage extends HookConsumerWidget {
               vertical: 4,
             ),
             child: Card(
-              shape: RoundedRectangleBorder(
+              shape: const RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(15), // if you need this
+                borderRadius: BorderRadius.all(
-                side: const BorderSide(
+                  Radius.circular(15), // if you need this
+                ),
+                side: BorderSide(
                   color: Colors.black12,
                   width: 1,
                 ),

mobile/lib/pages/common/app_log_detail.page.dart

@@ -60,7 +60,9 @@ class AppLogDetailPage extends HookConsumerWidget {
             Container(
               decoration: BoxDecoration(
                 color: context.colorScheme.surfaceContainerHigh,
-                borderRadius: BorderRadius.circular(15.0),
+                borderRadius: const BorderRadius.all(
+                  Radius.circular(15.0),
+                ),
               ),
               child: Padding(
                 padding: const EdgeInsets.all(8.0),
@@ -99,7 +101,9 @@ class AppLogDetailPage extends HookConsumerWidget {
             Container(
               decoration: BoxDecoration(
                 color: context.colorScheme.surfaceContainerHigh,
-                borderRadius: BorderRadius.circular(15.0),
+                borderRadius: const BorderRadius.all(
+                  Radius.circular(15.0),
+                ),
               ),
               child: Padding(
                 padding: const EdgeInsets.all(8.0),

mobile/lib/pages/common/create_album.page.dart

@@ -120,8 +120,10 @@ class CreateAlbumPage extends HookConsumerWidget {
                 alignment: Alignment.centerLeft,
                 padding:
                     const EdgeInsets.symmetric(vertical: 24, horizontal: 16),
-                shape: RoundedRectangleBorder(
+                shape: const RoundedRectangleBorder(
-                  borderRadius: BorderRadius.circular(10),
+                  borderRadius: BorderRadius.all(
+                    Radius.circular(10),
+                  ),
                 ),
                 backgroundColor: context.colorScheme.surfaceContainerHigh,
               ),

mobile/lib/pages/common/download_panel.dart

@@ -90,8 +90,10 @@ class DownloadTaskTile extends StatelessWidget {
       width: context.width - 32,
       child: Card(
         clipBehavior: Clip.antiAlias,
-        shape: RoundedRectangleBorder(
+        shape: const RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(16),
+          borderRadius: BorderRadius.all(
+            Radius.circular(16),
+          ),
         ),
         child: ListTile(
           minVerticalPadding: 18,

mobile/lib/pages/common/settings.page.dart

@@ -3,6 +3,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/settings/advanced_settings.dart';
 import 'package:immich_mobile/widgets/settings/asset_list_settings/asset_list_settings.dart';
 import 'package:immich_mobile/widgets/settings/asset_viewer_settings/asset_viewer_settings.dart';
@@ -11,7 +12,6 @@ import 'package:immich_mobile/widgets/settings/language_settings.dart';
 import 'package:immich_mobile/widgets/settings/networking_settings/networking_settings.dart';
 import 'package:immich_mobile/widgets/settings/notification_setting.dart';
 import 'package:immich_mobile/widgets/settings/preference_settings/preference_setting.dart';
-import 'package:immich_mobile/routing/router.dart';
 
 enum SettingSection {
   advanced(
@@ -85,12 +85,13 @@ class SettingsPage extends StatelessWidget {
         centerTitle: false,
         title: const Text('settings').tr(),
       ),
-      body: context.isMobile ? _MobileLayout() : _TabletLayout(),
+      body: context.isMobile ? const _MobileLayout() : const _TabletLayout(),
     );
   }
 }
 
 class _MobileLayout extends StatelessWidget {
+  const _MobileLayout();
   @override
   Widget build(BuildContext context) {
     return ListView(
@@ -147,6 +148,7 @@ class _MobileLayout extends StatelessWidget {
 }
 
 class _TabletLayout extends HookWidget {
+  const _TabletLayout();
   @override
   Widget build(BuildContext context) {
     final selectedSection =

mobile/lib/pages/common/tab_shell.page.dart

@@ -0,0 +1,183 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/providers/asset_viewer/scroll_notifier.provider.dart';
+import 'package:immich_mobile/providers/multiselect.provider.dart';
+import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
+import 'package:immich_mobile/providers/tab.provider.dart';
+
+@RoutePage()
+class TabShellPage extends ConsumerWidget {
+  const TabShellPage({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final isScreenLandscape = context.orientation == Orientation.landscape;
+
+    Widget buildIcon({required Widget icon, required bool isProcessing}) {
+      if (!isProcessing) return icon;
+      return Stack(
+        alignment: Alignment.center,
+        clipBehavior: Clip.none,
+        children: [
+          icon,
+          Positioned(
+            right: -18,
+            child: SizedBox(
+              height: 20,
+              width: 20,
+              child: CircularProgressIndicator(
+                strokeWidth: 2,
+                valueColor: AlwaysStoppedAnimation<Color>(
+                  context.primaryColor,
+                ),
+              ),
+            ),
+          ),
+        ],
+      );
+    }
+
+    void onNavigationSelected(TabsRouter router, int index) {
+      // On Photos page menu tapped
+      if (router.activeIndex == 0 && index == 0) {
+        scrollToTopNotifierProvider.scrollToTop();
+      }
+
+      // On Search page tapped
+      if (router.activeIndex == 1 && index == 1) {
+        ref.read(searchInputFocusProvider).requestFocus();
+      }
+
+      ref.read(hapticFeedbackProvider.notifier).selectionClick();
+      router.setActiveIndex(index);
+      ref.read(tabProvider.notifier).state = TabEnum.values[index];
+    }
+
+    final navigationDestinations = [
+      NavigationDestination(
+        label: 'photos'.tr(),
+        icon: const Icon(
+          Icons.photo_library_outlined,
+        ),
+        selectedIcon: buildIcon(
+          isProcessing: false,
+          icon: Icon(
+            Icons.photo_library,
+            color: context.primaryColor,
+          ),
+        ),
+      ),
+      NavigationDestination(
+        label: 'search'.tr(),
+        icon: const Icon(
+          Icons.search_rounded,
+        ),
+        selectedIcon: Icon(
+          Icons.search,
+          color: context.primaryColor,
+        ),
+      ),
+      NavigationDestination(
+        label: 'albums'.tr(),
+        icon: const Icon(
+          Icons.photo_album_outlined,
+        ),
+        selectedIcon: buildIcon(
+          isProcessing: false,
+          icon: Icon(
+            Icons.photo_album_rounded,
+            color: context.primaryColor,
+          ),
+        ),
+      ),
+      NavigationDestination(
+        label: 'library'.tr(),
+        icon: const Icon(
+          Icons.space_dashboard_outlined,
+        ),
+        selectedIcon: buildIcon(
+          isProcessing: false,
+          icon: Icon(
+            Icons.space_dashboard_rounded,
+            color: context.primaryColor,
+          ),
+        ),
+      ),
+    ];
+
+    Widget bottomNavigationBar(TabsRouter tabsRouter) {
+      return NavigationBar(
+        selectedIndex: tabsRouter.activeIndex,
+        onDestinationSelected: (index) =>
+            onNavigationSelected(tabsRouter, index),
+        destinations: navigationDestinations,
+      );
+    }
+
+    Widget navigationRail(TabsRouter tabsRouter) {
+      return NavigationRail(
+        destinations: navigationDestinations
+            .map(
+              (e) => NavigationRailDestination(
+                icon: e.icon,
+                label: Text(e.label),
+                selectedIcon: e.selectedIcon,
+              ),
+            )
+            .toList(),
+        onDestinationSelected: (index) =>
+            onNavigationSelected(tabsRouter, index),
+        selectedIndex: tabsRouter.activeIndex,
+        labelType: NavigationRailLabelType.all,
+        groupAlignment: 0.0,
+      );
+    }
+
+    final multiselectEnabled = ref.watch(multiselectProvider);
+    return AutoTabsRouter(
+      routes: [
+        const MainTimelineRoute(),
+        SearchRoute(),
+        const AlbumsRoute(),
+        const LibraryRoute(),
+      ],
+      duration: const Duration(milliseconds: 600),
+      transitionBuilder: (context, child, animation) => FadeTransition(
+        opacity: animation,
+        child: child,
+      ),
+      builder: (context, child) {
+        final tabsRouter = AutoTabsRouter.of(context);
+        final heroedChild = HeroControllerScope(
+          controller: HeroController(),
+          child: child,
+        );
+        return PopScope(
+          canPop: tabsRouter.activeIndex == 0,
+          onPopInvokedWithResult: (didPop, _) =>
+              !didPop ? tabsRouter.setActiveIndex(0) : null,
+          child: Scaffold(
+            resizeToAvoidBottomInset: false,
+            body: isScreenLandscape
+                ? Row(
+                    children: [
+                      navigationRail(tabsRouter),
+                      const VerticalDivider(),
+                      Expanded(child: heroedChild),
+                    ],
+                  )
+                : heroedChild,
+            bottomNavigationBar: multiselectEnabled || isScreenLandscape
+                ? null
+                : bottomNavigationBar(tabsRouter),
+          ),
+        );
+      },
+    );
+  }
+}

mobile/lib/pages/editing/edit.page.dart

@@ -124,7 +124,9 @@ class EditImagePage extends ConsumerWidget {
           ),
           child: Container(
             decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(7),
+              borderRadius: const BorderRadius.all(
+                Radius.circular(7),
+              ),
               boxShadow: [
                 BoxShadow(
                   color: Colors.black.withValues(alpha: 0.2),
@@ -135,7 +137,9 @@ class EditImagePage extends ConsumerWidget {
               ],
             ),
             child: ClipRRect(
-              borderRadius: BorderRadius.circular(7),
+              borderRadius: const BorderRadius.all(
+                Radius.circular(7),
+              ),
               child: Image(
                 image: image.image,
                 fit: BoxFit.contain,
@@ -149,7 +153,9 @@ class EditImagePage extends ConsumerWidget {
         margin: const EdgeInsets.only(bottom: 60, right: 10, left: 10, top: 10),
         decoration: BoxDecoration(
           color: context.scaffoldBackgroundColor,
-          borderRadius: BorderRadius.circular(30),
+          borderRadius: const BorderRadius.all(
+            Radius.circular(30),
+          ),
         ),
         child: Row(
           mainAxisAlignment: MainAxisAlignment.spaceEvenly,

mobile/lib/pages/editing/filter.page.dart

@@ -162,13 +162,17 @@ class _FilterButton extends StatelessWidget {
             width: 80,
             height: 80,
             decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(10),
+              borderRadius: const BorderRadius.all(
+                Radius.circular(10),
+              ),
               border: isSelected
                   ? Border.all(color: context.primaryColor, width: 3)
                   : null,
             ),
             child: ClipRRect(
-              borderRadius: BorderRadius.circular(10),
+              borderRadius: const BorderRadius.all(
+                Radius.circular(10),
+              ),
               child: ColorFiltered(
                 colorFilter: filter,
                 child: FittedBox(

mobile/lib/pages/library/library.page.dart

@@ -105,7 +105,9 @@ class QuickAccessButtons extends ConsumerWidget {
           color: context.colorScheme.onSurface.withAlpha(10),
           width: 1,
         ),
-        borderRadius: BorderRadius.circular(20),
+        borderRadius: const BorderRadius.all(
+          Radius.circular(20),
+        ),
         gradient: LinearGradient(
           colors: [
             context.colorScheme.primary.withAlpha(10),
@@ -240,7 +242,9 @@ class PeopleCollectionCard extends ConsumerWidget {
                 height: size,
                 width: size,
                 decoration: BoxDecoration(
-                  borderRadius: BorderRadius.circular(20),
+                  borderRadius: const BorderRadius.all(
+                    Radius.circular(20),
+                  ),
                   gradient: LinearGradient(
                     colors: [
                       context.colorScheme.primary.withAlpha(30),

mobile/lib/pages/library/partner/partner_detail.page.dart

@@ -80,7 +80,9 @@ class PartnerDetailPage extends HookConsumerWidget {
                 color: context.colorScheme.onSurface.withAlpha(10),
                 width: 1,
               ),
-              borderRadius: BorderRadius.circular(20),
+              borderRadius: const BorderRadius.all(
+                Radius.circular(20),
+              ),
               gradient: LinearGradient(
                 colors: [
                   context.colorScheme.primary.withAlpha(10),

mobile/lib/pages/library/places/places_collection.page.dart

@@ -143,7 +143,9 @@ class PlaceTile extends StatelessWidget {
         ),
       ),
       leading: ClipRRect(
-        borderRadius: BorderRadius.circular(20),
+        borderRadius: const BorderRadius.all(
+          Radius.circular(20),
+        ),
         child: CachedNetworkImage(
           width: 80,
           height: 80,

mobile/lib/pages/search/map/map.page.dart

@@ -156,7 +156,7 @@ class MapPage extends HookConsumerWidget {
       } else {
         // If no asset was previously selected and no new asset is available, close the bottom sheet
         if (selectedMarker.value == null) {
-          bottomSheetStreamController.add(MapCloseBottomSheet());
+          bottomSheetStreamController.add(const MapCloseBottomSheet());
         }
         selectedMarker.value = null;
       }

mobile/lib/pages/search/search.page.dart

@@ -511,16 +511,11 @@ class SearchPage extends HookConsumerWidget {
       search();
     }
 
-    IconData getSearchPrefixIcon() {
+    IconData getSearchPrefixIcon() => switch (textSearchType.value) {
-      switch (textSearchType.value) {
+          TextSearchType.context => Icons.image_search_rounded,
-        case TextSearchType.context:
+          TextSearchType.filename => Icons.abc_rounded,
-          return Icons.image_search_rounded;
+          TextSearchType.description => Icons.text_snippet_outlined,
-        case TextSearchType.filename:
+        };
-          return Icons.abc_rounded;
-        case TextSearchType.description:
-          return Icons.text_snippet_outlined;
-      }
-    }
 
     return Scaffold(
       resizeToAvoidBottomInset: false,
@@ -533,8 +528,10 @@ class SearchPage extends HookConsumerWidget {
               style: MenuStyle(
                 elevation: const WidgetStatePropertyAll(1),
                 shape: WidgetStateProperty.all(
-                  RoundedRectangleBorder(
+                  const RoundedRectangleBorder(
-                    borderRadius: BorderRadius.circular(24),
+                    borderRadius: BorderRadius.all(
+                      Radius.circular(24),
+                    ),
                   ),
                 ),
                 padding: const WidgetStatePropertyAll(
@@ -631,7 +628,9 @@ class SearchPage extends HookConsumerWidget {
               color: context.colorScheme.onSurface.withAlpha(0),
               width: 0,
             ),
-            borderRadius: BorderRadius.circular(24),
+            borderRadius: const BorderRadius.all(
+              Radius.circular(24),
+            ),
             gradient: LinearGradient(
               colors: [
                 context.colorScheme.primary.withValues(alpha: 0.075),
@@ -823,7 +822,9 @@ class QuickLinkList extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       decoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(20),
+        borderRadius: const BorderRadius.all(
+          Radius.circular(20),
+        ),
         border: Border.all(
           color: context.colorScheme.outline.withAlpha(10),
           width: 1,

mobile/lib/presentation/pages/dev/feat_in_development.page.dart

@@ -91,7 +91,7 @@ final _features = [
   _Feature(
     name: 'Main Timeline',
     icon: Icons.timeline_rounded,
-    onTap: (ctx, _) => ctx.pushRoute(const MainTimelineRoute()),
+    onTap: (ctx, _) => ctx.pushRoute(const TabShellRoute()),
   ),
 ];
 

mobile/lib/presentation/widgets/images/remote_thumb_provider.dart

@@ -15,7 +15,7 @@ class RemoteThumbProvider extends ImageProvider<RemoteThumbProvider> {
   final double width;
   final CacheManager? cacheManager;
 
-  RemoteThumbProvider({
+  const RemoteThumbProvider({
     required this.assetId,
     this.height = kTimelineFixedTileExtent,
     this.width = kTimelineFixedTileExtent,

mobile/lib/presentation/widgets/images/thumb_hash_provider.dart

@@ -8,7 +8,7 @@ import 'package:thumbhash/thumbhash.dart';
 class ThumbHashProvider extends ImageProvider<ThumbHashProvider> {
   final String thumbHash;
 
-  ThumbHashProvider({
+  const ThumbHashProvider({
     required this.thumbHash,
   });
 

mobile/lib/presentation/widgets/timeline/fixed/segment.model.dart

@@ -63,7 +63,8 @@ class FixedSegment extends Segment {
   }
 
   void _handleOnTap(WidgetRef ref, BaseAsset asset) {
-    if (!ref.read(multiSelectProvider.select((s) => s.isEnabled))) {
+    final multiSelectState = ref.read(multiSelectProvider);
+    if (!multiSelectState.isEnabled) {
       return;
     }
 
@@ -71,7 +72,8 @@ class FixedSegment extends Segment {
   }
 
   void _handleOnLongPress(WidgetRef ref, BaseAsset asset) {
-    if (ref.read(multiSelectProvider.select((s) => s.isEnabled))) {
+    final multiSelectState = ref.read(multiSelectProvider);
+    if (multiSelectState.isEnabled) {
       return;
     }
 
@@ -98,55 +100,63 @@ class FixedSegment extends Segment {
     return _buildRow(firstAssetIndex + assetIndex, numberOfAssets);
   }
 
-  Widget _buildRow(int assetIndex, int count) => Consumer(
+  Widget _buildRow(int assetIndex, int count) => RepaintBoundary(
-        builder: (ctx, ref, _) {
+        child: Consumer(
-          final isScrubbing =
+          builder: (ctx, ref, _) {
-              ref.watch(timelineStateProvider.select((s) => s.isScrubbing));
+            final isScrubbing =
-          final timelineService = ref.read(timelineServiceProvider);
+                ref.watch(timelineStateProvider.select((s) => s.isScrubbing));
+            final timelineService = ref.read(timelineServiceProvider);
 
-          // Timeline is being scrubbed, show placeholders
+            // Create stable callback references to prevent unnecessary rebuilds
-          if (isScrubbing) {
+            onTap(BaseAsset asset) => _handleOnTap(ref, asset);
-            return SegmentBuilder.buildPlaceholder(
+            onLongPress(BaseAsset asset) => _handleOnLongPress(ref, asset);
-              ctx,
-              count,
-              size: Size.square(tileHeight),
-              spacing: spacing,
-            );
-          }
 
-          // Bucket is already loaded, show the assets
+            // Timeline is being scrubbed, show placeholders
-          if (timelineService.hasRange(assetIndex, count)) {
+            if (isScrubbing) {
-            final assets = timelineService.getAssets(assetIndex, count);
+              return SegmentBuilder.buildPlaceholder(
-            return _buildAssetRow(
+                ctx,
-              ctx,
+                count,
-              assets,
+                size: Size.square(tileHeight),
-              onTap: (asset) => _handleOnTap(ref, asset),
+                spacing: spacing,
-              onLongPress: (asset) => _handleOnLongPress(ref, asset),
-            );
-          }
-
-          // Bucket is not loaded, show placeholders and load the bucket
-          return FutureBuilder(
-            future: timelineService.loadAssets(assetIndex, count),
-            builder: (ctxx, snap) {
-              if (snap.connectionState != ConnectionState.done) {
-                return SegmentBuilder.buildPlaceholder(
-                  ctx,
-                  count,
-                  size: Size.square(tileHeight),
-                  spacing: spacing,
-                );
-              }
-
-              return _buildAssetRow(
-                ctxx,
-                snap.requireData,
-                onTap: (asset) => _handleOnTap(ref, asset),
-                onLongPress: (asset) => _handleOnLongPress(ref, asset),
               );
-            },
+            }
-          );
+
-        },
+            // Bucket is already loaded, show the assets
+            if (timelineService.hasRange(assetIndex, count)) {
+              final assets = timelineService.getAssets(assetIndex, count);
+              return _buildAssetRow(
+                ctx,
+                assets,
+                baseAssetIndex: assetIndex,
+                onTap: onTap,
+                onLongPress: onLongPress,
+              );
+            }
+
+            // Bucket is not loaded, show placeholders and load the bucket
+            return FutureBuilder(
+              future: timelineService.loadAssets(assetIndex, count),
+              builder: (ctxx, snap) {
+                if (snap.connectionState != ConnectionState.done) {
+                  return SegmentBuilder.buildPlaceholder(
+                    ctx,
+                    count,
+                    size: Size.square(tileHeight),
+                    spacing: spacing,
+                  );
+                }
+
+                return _buildAssetRow(
+                  ctxx,
+                  snap.requireData,
+                  baseAssetIndex: assetIndex,
+                  onTap: onTap,
+                  onLongPress: onLongPress,
+                );
+              },
+            );
+          },
+        ),
       );
 
   Widget _buildAssetRow(
@@ -154,6 +164,7 @@ class FixedSegment extends Segment {
     List<BaseAsset> assets, {
     required void Function(BaseAsset) onTap,
     required void Function(BaseAsset) onLongPress,
+    required int baseAssetIndex,
   }) =>
       FixedTimelineRow(
         dimension: tileHeight,
@@ -161,13 +172,59 @@ class FixedSegment extends Segment {
         textDirection: Directionality.of(context),
         children: List.generate(
           assets.length,
-          (i) => RepaintBoundary(
+          (i) => _AssetTileWidget(
-            child: GestureDetector(
+            key: ValueKey(_generateUniqueKey(assets[i], baseAssetIndex + i)),
-              onTap: () => onTap(assets[i]),
+            asset: assets[i],
-              onLongPress: () => onLongPress(assets[i]),
+            onTap: onTap,
-              child: ThumbnailTile(assets[i]),
+            onLongPress: onLongPress,
-            ),
           ),
         ),
       );
+
+  /// Generates a unique key for an asset that handles different asset types
+  /// and prevents duplicate keys even when assets have the same name/timestamp
+  String _generateUniqueKey(BaseAsset asset, int assetIndex) {
+    // Try to get the most unique identifier based on asset type
+    if (asset is Asset) {
+      // For remote/merged assets, use the remote ID which is globally unique
+      return 'asset_${asset.id}';
+    } else if (asset is LocalAsset) {
+      // For local assets, use the local ID which should be unique per device
+      return 'local_${asset.id}';
+    } else {
+      // Fallback for any other BaseAsset implementation
+      // Use checksum if available for additional uniqueness
+      final checksum = asset.checksum;
+      if (checksum != null && checksum.isNotEmpty) {
+        return 'checksum_${checksum.hashCode}';
+      } else {
+        // Last resort: use global asset index + object hash for uniqueness
+        return 'fallback_${assetIndex}_${asset.hashCode}_${asset.createdAt.microsecondsSinceEpoch}';
+      }
+    }
+  }
+}
+
+class _AssetTileWidget extends StatelessWidget {
+  final BaseAsset asset;
+  final void Function(BaseAsset) onTap;
+  final void Function(BaseAsset) onLongPress;
+
+  const _AssetTileWidget({
+    super.key,
+    required this.asset,
+    required this.onTap,
+    required this.onLongPress,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return RepaintBoundary(
+      child: GestureDetector(
+        onTap: () => onTap(asset),
+        onLongPress: () => onLongPress(asset),
+        child: ThumbnailTile(asset),
+      ),
+    );
+  }
 }

mobile/lib/presentation/widgets/timeline/header.widget.dart

@@ -5,6 +5,7 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
+import 'package:immich_mobile/providers/haptic_feedback.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
 
@@ -80,12 +81,15 @@ class TimelineHeader extends ConsumerWidget {
                   if (header != HeaderType.monthAndDay)
                     _BulkSelectIconButton(
                       isAllSelected: isAllSelected,
-                      onPressed: () => ref
+                      onPressed: () {
-                          .read(multiSelectProvider.notifier)
+                        ref
-                          .toggleBucketSelection(
+                            .read(multiSelectProvider.notifier)
-                            assetOffset,
+                            .toggleBucketSelection(
-                            bucket.assetCount,
+                              assetOffset,
-                          ),
+                              bucket.assetCount,
+                            );
+                        ref.read(hapticFeedbackProvider.notifier).heavyImpact();
+                      },
                     ),
                 ],
               ),
@@ -101,9 +105,15 @@ class TimelineHeader extends ConsumerWidget {
                   const Spacer(),
                   _BulkSelectIconButton(
                     isAllSelected: isAllSelected,
-                    onPressed: () => ref
+                    onPressed: () {
-                        .read(multiSelectProvider.notifier)
+                      ref
-                        .toggleBucketSelection(assetOffset, bucket.assetCount),
+                          .read(multiSelectProvider.notifier)
+                          .toggleBucketSelection(
+                            assetOffset,
+                            bucket.assetCount,
+                          );
+                      ref.read(hapticFeedbackProvider.notifier).heavyImpact();
+                    },
                   ),
                 ],
               ),

mobile/lib/presentation/widgets/timeline/scrubber.widget.dart

@@ -44,12 +44,16 @@ List<_Segment> _buildSegments({
   required List<Segment> layoutSegments,
   required double timelineHeight,
 }) {
+  const double offsetThreshold = 20.0;
+
   final segments = <_Segment>[];
   if (layoutSegments.isEmpty || layoutSegments.first.bucket is! TimeBucket) {
     return [];
   }
 
   final formatter = DateFormat.yMMM();
+  DateTime? lastDate;
+  double lastOffset = -offsetThreshold;
   for (final layoutSegment in layoutSegments) {
     final scrollPercentage =
         layoutSegment.startOffset / layoutSegments.last.endOffset;
@@ -58,13 +62,21 @@ List<_Segment> _buildSegments({
     final date = (layoutSegment.bucket as TimeBucket).date;
     final label = formatter.format(date);
 
+    final showSegment = lastOffset + offsetThreshold <= startOffset &&
+        (lastDate == null || date.year != lastDate.year);
+
     segments.add(
       _Segment(
         date: date,
         startOffset: startOffset,
         scrollLabel: label,
+        showSegment: showSegment,
       ),
     );
+    lastDate = date;
+    if (showSegment) {
+      lastOffset = startOffset;
+    }
   }
 
   return segments;
@@ -85,12 +97,15 @@ class ScrubberState extends State<Scrubber> with TickerProviderStateMixin {
   double get _scrubberHeight =>
       widget.timelineHeight - widget.topPadding - widget.bottomPadding;
 
-  late final ScrollController _scrollController;
+  late ScrollController _scrollController;
 
-  double get _currentOffset =>
+  double get _currentOffset {
-      _scrollController.offset *
+    if (_scrollController.hasClients != true) return 0.0;
-      _scrubberHeight /
+
-      _scrollController.position.maxScrollExtent;
+    return _scrollController.offset *
+        _scrubberHeight /
+        _scrollController.position.maxScrollExtent;
+  }
 
   @override
   void initState() {
@@ -194,28 +209,102 @@ class ScrubberState extends State<Scrubber> with TickerProviderStateMixin {
       _thumbAnimationController.forward();
     }
 
-    final newOffset =
+    final dragPosition = _calculateDragPosition(details);
-        details.globalPosition.dy - widget.topPadding - widget.bottomPadding;
+    final nearestMonthSegment = _findNearestMonthSegment(dragPosition);
 
+    if (nearestMonthSegment != null) {
+      _snapToSegment(nearestMonthSegment);
+    }
+  }
+
+  /// Calculate the drag position relative to the scrubber area
+  ///
+  /// This method converts the global drag coordinates from the gesture detector
+  /// into a position relative to the scrubber's active area (excluding padding).
+  ///
+  /// The scrubber has padding at the top and bottom, so we need to:
+  /// 1. Calculate the actual draggable area (timelineHeight - topPadding - bottomPadding)
+  /// 2. Convert the global Y position to a position within this draggable area
+  /// 3. Clamp the result to ensure it stays within bounds (0 to dragAreaHeight)
+  ///
+  /// Example:
+  /// - If timelineHeight = 800, topPadding = 50, bottomPadding = 50
+  /// - Then dragAreaHeight = 700 (the actual scrubber area)
+  /// - If user drags to global Y position that's 100 pixels from the top
+  /// - The relative position would be 100 - 50 = 50 (50 pixels into the scrubber area)
+  double _calculateDragPosition(DragUpdateDetails details) {
+    final dragAreaTop = widget.topPadding;
+    final dragAreaBottom = widget.timelineHeight - widget.bottomPadding;
+    final dragAreaHeight = dragAreaBottom - dragAreaTop;
+
+    final relativePosition = details.globalPosition.dy - dragAreaTop;
+
+    // Make sure the position stays within the scrubber's bounds
+    return relativePosition.clamp(0.0, dragAreaHeight);
+  }
+
+  /// Find the segment closest to the given position
+  _Segment? _findNearestMonthSegment(double position) {
+    _Segment? nearestSegment;
+    double minDistance = double.infinity;
+
+    for (final segment in _segments) {
+      final distance = (segment.startOffset - position).abs();
+      if (distance < minDistance) {
+        minDistance = distance;
+        nearestSegment = segment;
+      }
+    }
+
+    return nearestSegment;
+  }
+
+  /// Snap the scrubber thumb and scroll view to the given segment
+  void _snapToSegment(_Segment segment) {
     setState(() {
-      _thumbTopOffset = newOffset.clamp(0, _scrubberHeight);
+      _thumbTopOffset = segment.startOffset;
-      final scrollPercentage = _thumbTopOffset / _scrubberHeight;
+
-      final maxScrollExtent = _scrollController.position.maxScrollExtent;
+      final layoutSegmentIndex = _findLayoutSegmentIndex(segment);
-      _scrollController.jumpTo(maxScrollExtent * scrollPercentage);
+
+      if (layoutSegmentIndex >= 0) {
+        _scrollToLayoutSegment(layoutSegmentIndex);
+      }
     });
   }
 
+  int _findLayoutSegmentIndex(_Segment segment) {
+    return widget.layoutSegments.indexWhere(
+      (layoutSegment) {
+        final bucket = layoutSegment.bucket as TimeBucket;
+        return bucket.date.year == segment.date.year &&
+            bucket.date.month == segment.date.month;
+      },
+    );
+  }
+
+  void _scrollToLayoutSegment(int layoutSegmentIndex) {
+    final layoutSegment = widget.layoutSegments[layoutSegmentIndex];
+    final maxScrollExtent = _scrollController.position.maxScrollExtent;
+    final viewportHeight = _scrollController.position.viewportDimension;
+
+    final targetScrollOffset = layoutSegment.startOffset;
+    final centeredOffset = targetScrollOffset - (viewportHeight / 4) + 100;
+
+    _scrollController.jumpTo(centeredOffset.clamp(0.0, maxScrollExtent));
+  }
+
   void _onDragEnd(WidgetRef ref) {
     ref.read(timelineStateProvider.notifier).setScrubbing(false);
     _labelAnimationController.reverse();
     _isDragging = false;
+
     _resetThumbTimer();
   }
 
   @override
   Widget build(BuildContext ctx) {
     Text? label;
-    if (_scrollController.hasClients) {
+    if (_scrollController.hasClients == true) {
       // Cache to avoid multiple calls to [_currentOffset]
       final scrollOffset = _currentOffset;
       final labelText = _segments
@@ -240,20 +329,31 @@ class ScrubberState extends State<Scrubber> with TickerProviderStateMixin {
       child: Stack(
         children: [
           RepaintBoundary(child: widget.child),
+          // Scroll Segments - wrapped in RepaintBoundary for better performance
+          RepaintBoundary(
+            child: _SegmentsLayer(
+              key: ValueKey('segments_${_isDragging}_${_segments.length}'),
+              segments: _segments,
+              topPadding: widget.topPadding,
+              isDragging: _isDragging,
+            ),
+          ),
           PositionedDirectional(
             top: _thumbTopOffset + widget.topPadding,
             end: 0,
-            child: Consumer(
+            child: RepaintBoundary(
-              builder: (_, ref, child) => GestureDetector(
+              child: Consumer(
-                onVerticalDragStart: (_) => _onDragStart(ref),
+                builder: (_, ref, child) => GestureDetector(
-                onVerticalDragUpdate: _onDragUpdate,
+                  onVerticalDragStart: (_) => _onDragStart(ref),
-                onVerticalDragEnd: (_) => _onDragEnd(ref),
+                  onVerticalDragUpdate: _onDragUpdate,
-                child: child,
+                  onVerticalDragEnd: (_) => _onDragEnd(ref),
-              ),
+                  child: child,
-              child: _Scrubber(
+                ),
-                thumbAnimation: _thumbAnimation,
+                child: _Scrubber(
-                labelAnimation: _labelAnimation,
+                  thumbAnimation: _thumbAnimation,
-                label: label,
+                  labelAnimation: _labelAnimation,
+                  label: label,
+                ),
               ),
             ),
           ),
@@ -263,6 +363,72 @@ class ScrubberState extends State<Scrubber> with TickerProviderStateMixin {
   }
 }
 
+class _SegmentsLayer extends StatelessWidget {
+  final List<_Segment> segments;
+  final double topPadding;
+  final bool isDragging;
+
+  const _SegmentsLayer({
+    super.key,
+    required this.segments,
+    required this.topPadding,
+    required this.isDragging,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Visibility(
+      visible: isDragging,
+      child: Stack(
+        children: segments
+            .where((segment) => segment.showSegment)
+            .map(
+              (segment) => PositionedDirectional(
+                key: ValueKey('segment_${segment.date.millisecondsSinceEpoch}'),
+                top: topPadding + segment.startOffset,
+                end: 100,
+                child: RepaintBoundary(
+                  child: _SegmentWidget(segment),
+                ),
+              ),
+            )
+            .toList(),
+      ),
+    );
+  }
+}
+
+class _SegmentWidget extends StatelessWidget {
+  final _Segment _segment;
+
+  const _SegmentWidget(this._segment);
+
+  @override
+  Widget build(BuildContext context) {
+    return IgnorePointer(
+      child: Container(
+        margin: const EdgeInsets.only(right: 12.0),
+        child: Material(
+          color: context.colorScheme.surface,
+          borderRadius: const BorderRadius.all(Radius.circular(16.0)),
+          child: Container(
+            constraints: const BoxConstraints(maxHeight: 28),
+            padding: const EdgeInsets.symmetric(horizontal: 10.0),
+            alignment: Alignment.center,
+            child: Text(
+              _segment.date.year.toString(),
+              style: context.textTheme.labelMedium?.copyWith(
+                fontFamily: "OverpassMono",
+                fontWeight: FontWeight.w600,
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
 class _ScrollLabel extends StatelessWidget {
   final Text label;
   final Color backgroundColor;
@@ -429,22 +595,26 @@ class _Segment {
   final DateTime date;
   final double startOffset;
   final String scrollLabel;
+  final bool showSegment;
 
   const _Segment({
     required this.date,
     required this.startOffset,
     required this.scrollLabel,
+    this.showSegment = false,
   });
 
   _Segment copyWith({
     DateTime? date,
     double? startOffset,
     String? scrollLabel,
+    bool? showSegment,
   }) {
     return _Segment(
       date: date ?? this.date,
       startOffset: startOffset ?? this.startOffset,
       scrollLabel: scrollLabel ?? this.scrollLabel,
+      showSegment: showSegment ?? this.showSegment,
     );
   }
 

mobile/lib/presentation/widgets/timeline/segment_builder.dart

@@ -15,18 +15,12 @@ abstract class SegmentBuilder {
     this.groupBy = GroupAssetsBy.day,
   });
 
-  static double headerExtent(HeaderType header) {
+  static double headerExtent(HeaderType header) => switch (header) {
-    switch (header) {
+        HeaderType.month => kTimelineHeaderExtent,
-      case HeaderType.month:
+        HeaderType.day => kTimelineHeaderExtent * 0.90,
-        return kTimelineHeaderExtent;
+        HeaderType.monthAndDay => kTimelineHeaderExtent * 1.6,
-      case HeaderType.day:
+        HeaderType.none => 0.0,
-        return kTimelineHeaderExtent * 0.90;
+      };
-      case HeaderType.monthAndDay:
-        return kTimelineHeaderExtent * 1.6;
-      case HeaderType.none:
-        return 0.0;
-    }
-  }
 
   static Widget buildPlaceholder(
     BuildContext context,

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

@@ -13,6 +13,8 @@ import 'package:immich_mobile/presentation/widgets/timeline/segment.model.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.state.dart';
 import 'package:immich_mobile/providers/infrastructure/setting.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/common/immich_sliver_app_bar.dart';
 
 class Timeline extends StatelessWidget {
   const Timeline({super.key});
@@ -63,38 +65,68 @@ class _SliverTimelineState extends State<_SliverTimeline> {
         final asyncSegments = ref.watch(timelineSegmentProvider);
         final maxHeight =
             ref.watch(timelineArgsProvider.select((args) => args.maxHeight));
+        final isMultiSelectEnabled =
+            ref.watch(multiSelectProvider.select((s) => s.isEnabled));
         return asyncSegments.widgetWhen(
           onData: (segments) {
             final childCount = (segments.lastOrNull?.lastIndex ?? -1) + 1;
+            final statusBarHeight = context.padding.top;
+            final totalAppBarHeight = statusBarHeight + kToolbarHeight;
+            const scrubberBottomPadding = 100.0;
 
             return PrimaryScrollController(
               controller: _scrollController,
-              child: Scrubber(
+              child: Stack(
-                layoutSegments: segments,
+                children: [
-                timelineHeight: maxHeight,
+                  Scrubber(
-                topPadding: context.padding.top + 10,
+                    layoutSegments: segments,
-                bottomPadding: context.padding.bottom + 10,
+                    timelineHeight: maxHeight,
-                child: CustomScrollView(
+                    topPadding: totalAppBarHeight + 10,
-                  primary: true,
+                    bottomPadding:
-                  cacheExtent: maxHeight * 2,
+                        context.padding.bottom + scrubberBottomPadding,
-                  slivers: [
+                    child: CustomScrollView(
-                    _SliverSegmentedList(
+                      primary: true,
-                      segments: segments,
+                      cacheExtent: maxHeight * 2,
-                      delegate: SliverChildBuilderDelegate(
+                      slivers: [
-                        (ctx, index) {
+                        SliverAnimatedOpacity(
-                          if (index >= childCount) return null;
+                          duration: Durations.medium1,
-                          final segment = segments.findByIndex(index);
+                          opacity: isMultiSelectEnabled ? 0 : 1,
-                          return segment?.builder(ctx, index) ??
+                          sliver: const ImmichSliverAppBar(
-                              const SizedBox.shrink();
+                            floating: true,
-                        },
+                            pinned: false,
-                        childCount: childCount,
+                            snap: false,
-                        addAutomaticKeepAlives: false,
+                          ),
-                        // We add repaint boundary around tiles, so skip the auto boundaries
+                        ),
-                        addRepaintBoundaries: false,
+                        _SliverSegmentedList(
-                      ),
+                          segments: segments,
+                          delegate: SliverChildBuilderDelegate(
+                            (ctx, index) {
+                              if (index >= childCount) return null;
+                              final segment = segments.findByIndex(index);
+                              return segment?.builder(ctx, index) ??
+                                  const SizedBox.shrink();
+                            },
+                            childCount: childCount,
+                            addAutomaticKeepAlives: false,
+                            // We add repaint boundary around tiles, so skip the auto boundaries
+                            addRepaintBoundaries: false,
+                          ),
+                        ),
+                        const SliverPadding(
+                          padding: EdgeInsets.only(
+                            bottom: scrubberBottomPadding,
+                          ),
+                        ),
+                      ],
                     ),
-                  ],
+                  ),
-                ),
+                  if (isMultiSelectEnabled)
+                    const Positioned(
+                      top: 60,
+                      left: 25,
+                      child: _MultiSelectStatusButton(),
+                    ),
+                ],
               ),
             );
           },
@@ -363,3 +395,27 @@ class _RenderSliverTimelineBoxAdaptor extends RenderSliverMultiBoxAdaptor {
     childManager.didFinishLayout();
   }
 }
+
+class _MultiSelectStatusButton extends ConsumerWidget {
+  const _MultiSelectStatusButton();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final selectCount =
+        ref.watch(multiSelectProvider.select((s) => s.selectedAssets.length));
+    return ElevatedButton.icon(
+      onPressed: () => ref.read(multiSelectProvider.notifier).clearSelection(),
+      icon: Icon(
+        Icons.close_rounded,
+        color: context.colorScheme.onPrimary,
+      ),
+      label: Text(
+        selectCount.toString(),
+        style: context.textTheme.titleMedium?.copyWith(
+          height: 2.5,
+          color: context.colorScheme.onPrimary,
+        ),
+      ),
+    );
+  }
+}

mobile/lib/providers/album/album_viewer.provider.dart

@@ -1,12 +1,12 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/entities/album.entity.dart';
 import 'package:immich_mobile/models/albums/album_viewer_page_state.model.dart';
 import 'package:immich_mobile/services/album.service.dart';
-import 'package:immich_mobile/entities/album.entity.dart';
 
 class AlbumViewerNotifier extends StateNotifier<AlbumViewerPageState> {
   AlbumViewerNotifier(this.ref)
       : super(
-          AlbumViewerPageState(
+          const AlbumViewerPageState(
             editTitleText: "",
             isEditAlbum: false,
             editDescriptionText: "",

mobile/lib/providers/app_settings.provider.dart

@@ -5,4 +5,4 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 part 'app_settings.provider.g.dart';
 
 @Riverpod(keepAlive: true)
-AppSettingsService appSettingsService(Ref _) => AppSettingsService();
+AppSettingsService appSettingsService(Ref _) => const AppSettingsService();

mobile/lib/providers/app_settings.provider.g.dart

@@ -7,7 +7,7 @@ part of 'app_settings.provider.dart';
 // **************************************************************************
 
 String _$appSettingsServiceHash() =>
-    r'2aa16d76a8df869c39486325efc1d08b2d2c284c';
+    r'89cece3a19e06612f5639ae290120e854a0c5a31';
 
 /// See also [appSettingsService].
 @ProviderFor(appSettingsService)

mobile/lib/providers/asset_viewer/download.provider.dart

@@ -23,7 +23,7 @@ class DownloadStateNotifier extends StateNotifier<DownloadState> {
     this._shareService,
     this._albumService,
   ) : super(
-          DownloadState(
+          const DownloadState(
             downloadStatus: TaskStatus.complete,
             showProgress: false,
             taskProgress: <String, DownloadInfo>{},

mobile/lib/providers/auth.provider.dart

@@ -45,7 +45,7 @@ class AuthNotifier extends StateNotifier<AuthState> {
     this._secureStorageService,
     this._widgetService,
   ) : super(
-          AuthState(
+          const AuthState(
             deviceId: "",
             userId: "",
             userEmail: "",
@@ -89,7 +89,7 @@ class AuthNotifier extends StateNotifier<AuthState> {
   }
 
   Future<void> _cleanUp() async {
-    state = AuthState(
+    state = const AuthState(
       deviceId: "",
       userId: "",
       userEmail: "",

mobile/lib/providers/backup/ios_background_settings.provider.dart

@@ -7,7 +7,7 @@ class IOSBackgroundSettings {
   final DateTime? timeOfLastFetch;
   final DateTime? timeOfLastProcessing;
 
-  IOSBackgroundSettings({
+  const IOSBackgroundSettings({
     required this.appRefreshEnabled,
     required this.numberOfBackgroundTasksQueued,
     this.timeOfLastFetch,

mobile/lib/providers/image/cache/image_loader.dart

@@ -42,6 +42,6 @@ class ImageLoader {
     }
 
     // If we get here, the image failed to load from the cache stream
-    throw ImageLoadingException('Could not load image from stream');
+    throw const ImageLoadingException('Could not load image from stream');
   }
 }

mobile/lib/providers/image/exceptions/image_loading_exception.dart

@@ -1,5 +1,5 @@
 /// An exception for the [ImageLoader] and the Immich image providers
 class ImageLoadingException implements Exception {
   final String message;
-  ImageLoadingException(this.message);
+  const ImageLoadingException(this.message);
 }

mobile/lib/providers/image/immich_remote_image_provider.dart

@@ -23,7 +23,7 @@ class ImmichRemoteImageProvider
   /// The image cache manager
   final CacheManager? cacheManager;
 
-  ImmichRemoteImageProvider({
+  const ImmichRemoteImageProvider({
     required this.assetId,
     this.cacheManager,
   });

mobile/lib/providers/image/immich_remote_thumbnail_provider.dart

@@ -24,7 +24,7 @@ class ImmichRemoteThumbnailProvider
   /// The image cache manager
   final CacheManager? cacheManager;
 
-  ImmichRemoteThumbnailProvider({
+  const ImmichRemoteThumbnailProvider({
     required this.assetId,
     this.height,
     this.width,

mobile/lib/providers/search/paginated_search.provider.dart

@@ -17,7 +17,7 @@ class PaginatedSearchNotifier extends StateNotifier<SearchResult> {
   final SearchService _searchService;
 
   PaginatedSearchNotifier(this._searchService)
-      : super(SearchResult(assets: [], nextPage: 1));
+      : super(const SearchResult(assets: [], nextPage: 1));
 
   Future<bool> search(SearchFilter filter) async {
     if (state.nextPage == null) {
@@ -39,7 +39,7 @@ class PaginatedSearchNotifier extends StateNotifier<SearchResult> {
   }
 
   clear() {
-    state = SearchResult(assets: [], nextPage: 1);
+    state = const SearchResult(assets: [], nextPage: 1);
   }
 }
 

mobile/lib/providers/server_info.provider.dart

@@ -1,36 +1,35 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/models/server_info/server_disk_info.model.dart';
-
-import 'package:immich_mobile/models/server_info/server_info.model.dart';
-import 'package:immich_mobile/services/server_info.service.dart';
 import 'package:immich_mobile/models/server_info/server_config.model.dart';
+import 'package:immich_mobile/models/server_info/server_disk_info.model.dart';
 import 'package:immich_mobile/models/server_info/server_features.model.dart';
+import 'package:immich_mobile/models/server_info/server_info.model.dart';
 import 'package:immich_mobile/models/server_info/server_version.model.dart';
+import 'package:immich_mobile/services/server_info.service.dart';
 import 'package:logging/logging.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 
 class ServerInfoNotifier extends StateNotifier<ServerInfo> {
   ServerInfoNotifier(this._serverInfoService)
       : super(
-          ServerInfo(
+          const ServerInfo(
-            serverVersion: const ServerVersion(
+            serverVersion: ServerVersion(
               major: 0,
               minor: 0,
               patch: 0,
             ),
-            latestVersion: const ServerVersion(
+            latestVersion: ServerVersion(
               major: 0,
               minor: 0,
               patch: 0,
             ),
-            serverFeatures: const ServerFeatures(
+            serverFeatures: ServerFeatures(
               map: true,
               trash: true,
               oauthEnabled: false,
               passwordLogin: true,
             ),
-            serverConfig: const ServerConfig(
+            serverConfig: ServerConfig(
               trashDays: 30,
               oauthButtonText: '',
               externalDomain: '',
@@ -38,7 +37,7 @@ class ServerInfoNotifier extends StateNotifier<ServerInfo> {
                   'https://tiles.immich.cloud/v1/style/light.json',
               mapDarkStyleUrl: 'https://tiles.immich.cloud/v1/style/dark.json',
             ),
-            serverDiskInfo: const ServerDiskInfo(
+            serverDiskInfo: ServerDiskInfo(
               diskAvailable: "0",
               diskSize: "0",
               diskUse: "0",

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

@@ -14,7 +14,7 @@ final multiSelectProvider =
 class MultiSelectState {
   final Set<BaseAsset> selectedAssets;
 
-  MultiSelectState({
+  const MultiSelectState({
     required this.selectedAssets,
   });
 
@@ -50,7 +50,7 @@ class MultiSelectNotifier extends Notifier<MultiSelectState> {
   MultiSelectState build() {
     _timelineService = ref.read(timelineServiceProvider);
 
-    return MultiSelectState(
+    return const MultiSelectState(
       selectedAssets: {},
     );
   }
@@ -83,6 +83,12 @@ class MultiSelectNotifier extends Notifier<MultiSelectState> {
     }
   }
 
+  void clearSelection() {
+    state = state.copyWith(
+      selectedAssets: {},
+    );
+  }
+
   /// Bucket bulk operations
   void selectBucket(int offset, int bucketCount) async {
     final assets = await _timelineService.loadAssets(offset, bucketCount);

mobile/lib/providers/upload_profile_image.provider.dart

@@ -17,7 +17,7 @@ class UploadProfileImageState {
   // enum
   final UploadProfileStatus status;
   final String profileImagePath;
-  UploadProfileImageState({
+  const UploadProfileImageState({
     required this.status,
     required this.profileImagePath,
   });
@@ -74,7 +74,7 @@ class UploadProfileImageNotifier
     extends StateNotifier<UploadProfileImageState> {
   UploadProfileImageNotifier(this._userService)
       : super(
-          UploadProfileImageState(
+          const UploadProfileImageState(
             profileImagePath: '',
             status: UploadProfileStatus.idle,
           ),

mobile/lib/providers/websocket.provider.dart

@@ -56,7 +56,7 @@ class WebsocketState {
   final bool isConnected;
   final List<PendingChange> pendingChanges;
 
-  WebsocketState({
+  const WebsocketState({
     this.socket,
     required this.isConnected,
     required this.pendingChanges,
@@ -94,7 +94,11 @@ class WebsocketState {
 class WebsocketNotifier extends StateNotifier<WebsocketState> {
   WebsocketNotifier(this._ref)
       : super(
-          WebsocketState(socket: null, isConnected: false, pendingChanges: []),
+          const WebsocketState(
+            socket: null,
+            isConnected: false,
+            pendingChanges: [],
+          ),
         );
 
   final _log = Logger('WebsocketNotifier');

mobile/lib/repositories/album.repository.dart

@@ -18,7 +18,7 @@ final albumRepositoryProvider =
     Provider((ref) => AlbumRepository(ref.watch(dbProvider)));
 
 class AlbumRepository extends DatabaseRepository {
-  AlbumRepository(super.db);
+  const AlbumRepository(super.db);
 
   Future<int> count({bool? local}) {
     final baseQuery = db.albums.where();

mobile/lib/repositories/api.repository.dart

@@ -3,7 +3,7 @@ import 'package:immich_mobile/constants/errors.dart';
 abstract class ApiRepository {
   Future<T> checkNull<T>(Future<T?> future) async {
     final response = await future;
-    if (response == null) throw NoResponseDtoError();
+    if (response == null) throw const NoResponseDtoError();
     return response;
   }
 }

mobile/lib/repositories/asset.repository.dart

@@ -15,7 +15,7 @@ final assetRepositoryProvider =
     Provider((ref) => AssetRepository(ref.watch(dbProvider)));
 
 class AssetRepository extends DatabaseRepository {
-  AssetRepository(super.db);
+  const AssetRepository(super.db);
 
   Future<List<Asset>> getByAlbum(
     Album album, {

mobile/lib/repositories/asset_api.repository.dart

@@ -56,18 +56,12 @@ class AssetApiRepository extends ApiRepository {
     );
   }
 
-  _mapVisibility(AssetVisibilityEnum visibility) {
+  _mapVisibility(AssetVisibilityEnum visibility) => switch (visibility) {
-    switch (visibility) {
+        AssetVisibilityEnum.timeline => AssetVisibility.timeline,
-      case AssetVisibilityEnum.timeline:
+        AssetVisibilityEnum.hidden => AssetVisibility.hidden,
-        return AssetVisibility.timeline;
+        AssetVisibilityEnum.locked => AssetVisibility.locked,
-      case AssetVisibilityEnum.hidden:
+        AssetVisibilityEnum.archive => AssetVisibility.archive,
-        return AssetVisibility.hidden;
+      };
-      case AssetVisibilityEnum.locked:
-        return AssetVisibility.locked;
-      case AssetVisibilityEnum.archive:
-        return AssetVisibility.archive;
-    }
-  }
 
   Future<String?> getAssetMIMEType(String assetId) async {
     final response = await checkNull(_api.getAssetInfo(assetId));

mobile/lib/repositories/asset_media.repository.dart

@@ -6,9 +6,11 @@ import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/utils/hash.dart';
 import 'package:photo_manager/photo_manager.dart' hide AssetType;
 
-final assetMediaRepositoryProvider = Provider((ref) => AssetMediaRepository());
+final assetMediaRepositoryProvider =
+    Provider((ref) => const AssetMediaRepository());
 
 class AssetMediaRepository {
+  const AssetMediaRepository();
   Future<List<String>> deleteAll(List<String> ids) =>
       PhotoManager.editor.deleteWithIds(ids);
 

mobile/lib/repositories/auth.repository.dart

@@ -22,7 +22,7 @@ final authRepositoryProvider = Provider<AuthRepository>(
 class AuthRepository extends DatabaseRepository {
   final Drift _drift;
 
-  AuthRepository(super.db, this._drift);
+  const AuthRepository(super.db, this._drift);
 
   Future<void> clearLocalData() {
     return db.writeTxn(() {

mobile/lib/repositories/backup.repository.dart

@@ -10,7 +10,7 @@ final backupAlbumRepositoryProvider =
     Provider((ref) => BackupAlbumRepository(ref.watch(dbProvider)));
 
 class BackupAlbumRepository extends DatabaseRepository {
-  BackupAlbumRepository(super.db);
+  const BackupAlbumRepository(super.db);
 
   Future<List<BackupAlbum>> getAll({BackupAlbumSort? sort}) {
     final baseQuery = db.backupAlbums.where();

mobile/lib/repositories/biometric.repository.dart

@@ -9,7 +9,7 @@ final biometricRepositoryProvider =
 class BiometricRepository {
   final LocalAuthentication _localAuth;
 
-  BiometricRepository(this._localAuth);
+  const BiometricRepository(this._localAuth);
 
   Future<BiometricStatus> getStatus() async {
     final bool canAuthenticateWithBiometrics =

mobile/lib/repositories/database.repository.dart

@@ -7,7 +7,7 @@ const Symbol _zoneTxn = #zoneTxn;
 
 abstract class DatabaseRepository implements IDatabaseRepository {
   final Isar db;
-  DatabaseRepository(this.db);
+  const DatabaseRepository(this.db);
 
   bool get inTxn => Zone.current[_zoneTxn] != null;
 

mobile/lib/repositories/etag.repository.dart

@@ -8,7 +8,7 @@ final etagRepositoryProvider =
     Provider((ref) => ETagRepository(ref.watch(dbProvider)));
 
 class ETagRepository extends DatabaseRepository {
-  ETagRepository(super.db);
+  const ETagRepository(super.db);
 
   Future<List<String>> getAllIds() => db.eTags.where().idProperty().findAll();
 

mobile/lib/repositories/file_media.repository.dart

@@ -6,9 +6,11 @@ import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:photo_manager/photo_manager.dart' hide AssetType;
 
-final fileMediaRepositoryProvider = Provider((ref) => FileMediaRepository());
+final fileMediaRepositoryProvider =
+    Provider((ref) => const FileMediaRepository());
 
 class FileMediaRepository {
+  const FileMediaRepository();
   Future<Asset?> saveImage(
     Uint8List data, {
     required String title,

mobile/lib/repositories/local_files_manager.repository.dart

@@ -7,7 +7,7 @@ final localFilesManagerRepositoryProvider = Provider(
 );
 
 class LocalFilesManagerRepository {
-  LocalFilesManagerRepository(this._service);
+  const LocalFilesManagerRepository(this._service);
 
   final LocalFilesManagerService _service;
 

mobile/lib/repositories/network.repository.dart

@@ -12,7 +12,7 @@ final networkRepositoryProvider = Provider((_) {
 class NetworkRepository {
   final NetworkInfo _networkInfo;
 
-  NetworkRepository(this._networkInfo);
+  const NetworkRepository(this._networkInfo);
 
   Future<String?> getWifiName() {
     if (Platform.isAndroid) {

mobile/lib/repositories/partner.repository.dart

@@ -11,7 +11,7 @@ final partnerRepositoryProvider = Provider(
 );
 
 class PartnerRepository extends DatabaseRepository {
-  PartnerRepository(super.db);
+  const PartnerRepository(super.db);
 
   Future<List<UserDto>> getSharedBy() async {
     return (await db.users

mobile/lib/repositories/permission.repository.dart

@@ -2,11 +2,11 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:permission_handler/permission_handler.dart';
 
 final permissionRepositoryProvider = Provider((_) {
-  return PermissionRepository();
+  return const PermissionRepository();
 });
 
 class PermissionRepository implements IPermissionRepository {
-  PermissionRepository();
+  const PermissionRepository();
 
   @override
   Future<bool> hasLocationWhenInUsePermission() {

mobile/lib/repositories/secure_storage.repository.dart

@@ -2,12 +2,12 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 final secureStorageRepositoryProvider =
-    Provider((ref) => SecureStorageRepository(const FlutterSecureStorage()));
+    Provider((ref) => const SecureStorageRepository(FlutterSecureStorage()));
 
 class SecureStorageRepository {
   final FlutterSecureStorage _secureStorage;
 
-  SecureStorageRepository(this._secureStorage);
+  const SecureStorageRepository(this._secureStorage);
 
   Future<String?> read(String key) {
     return _secureStorage.read(key: key);

mobile/lib/repositories/timeline.repository.dart

@@ -13,7 +13,7 @@ final timelineRepositoryProvider =
     Provider((ref) => TimelineRepository(ref.watch(dbProvider)));
 
 class TimelineRepository extends DatabaseRepository {
-  TimelineRepository(super.db);
+  const TimelineRepository(super.db);
 
   Future<List<String>> getTimelineUserIds(String id) {
     return db.users

mobile/lib/repositories/widget.repository.dart

@@ -1,10 +1,10 @@
 import 'package:home_widget/home_widget.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 
-final widgetRepositoryProvider = Provider((_) => WidgetRepository());
+final widgetRepositoryProvider = Provider((_) => const WidgetRepository());
 
 class WidgetRepository {
-  WidgetRepository();
+  const WidgetRepository();
 
   Future<void> saveData(String key, String value) async {
     await HomeWidget.saveWidgetData<String>(key, value);

mobile/lib/routing/backup_permission_guard.dart

@@ -5,7 +5,7 @@ import 'package:immich_mobile/routing/router.dart';
 class BackupPermissionGuard extends AutoRouteGuard {
   final GalleryPermissionNotifier _permission;
 
-  BackupPermissionGuard(this._permission);
+  const BackupPermissionGuard(this._permission);
 
   @override
   void onNavigation(NavigationResolver resolver, StackRouter router) async {

mobile/lib/routing/duplicate_guard.dart

@@ -3,7 +3,7 @@ import 'package:flutter/foundation.dart';
 
 /// Guards against duplicate navigation to this route
 class DuplicateGuard extends AutoRouteGuard {
-  DuplicateGuard();
+  const DuplicateGuard();
   @override
   void onNavigation(NavigationResolver resolver, StackRouter router) async {
     // Duplicate navigation

mobile/lib/routing/router.dart

@@ -31,6 +31,7 @@ import 'package:immich_mobile/pages/common/native_video_viewer.page.dart';
 import 'package:immich_mobile/pages/common/settings.page.dart';
 import 'package:immich_mobile/pages/common/splash_screen.page.dart';
 import 'package:immich_mobile/pages/common/tab_controller.page.dart';
+import 'package:immich_mobile/pages/common/tab_shell.page.dart';
 import 'package:immich_mobile/pages/editing/crop.page.dart';
 import 'package:immich_mobile/pages/editing/edit.page.dart';
 import 'package:immich_mobile/pages/editing/filter.page.dart';
@@ -105,7 +106,7 @@ class AppRouter extends RootStackRouter {
     LocalAuthService localAuthService,
   ) {
     _authGuard = AuthGuard(apiService);
-    _duplicateGuard = DuplicateGuard();
+    _duplicateGuard = const DuplicateGuard();
     _lockedGuard =
         LockedGuard(apiService, secureStorageService, localAuthService);
     _backupPermissionGuard = BackupPermissionGuard(galleryPermissionNotifier);
@@ -152,6 +153,30 @@ class AppRouter extends RootStackRouter {
       ],
       transitionsBuilder: TransitionsBuilders.fadeIn,
     ),
+    CustomRoute(
+      page: TabShellRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+      children: [
+        AutoRoute(
+          page: MainTimelineRoute.page,
+          guards: [_authGuard, _duplicateGuard],
+        ),
+        AutoRoute(
+          page: SearchRoute.page,
+          guards: [_authGuard, _duplicateGuard],
+          maintainState: false,
+        ),
+        AutoRoute(
+          page: LibraryRoute.page,
+          guards: [_authGuard, _duplicateGuard],
+        ),
+        AutoRoute(
+          page: AlbumsRoute.page,
+          guards: [_authGuard, _duplicateGuard],
+        ),
+      ],
+      transitionsBuilder: TransitionsBuilders.fadeIn,
+    ),
     CustomRoute(
       page: GalleryViewerRoute.page,
       guards: [_authGuard, _duplicateGuard],

mobile/lib/routing/router.gr.dart

@@ -1662,6 +1662,22 @@ class TabControllerRoute extends PageRouteInfo<void> {
   );
 }
 
+/// generated route for
+/// [TabShellPage]
+class TabShellRoute extends PageRouteInfo<void> {
+  const TabShellRoute({List<PageRouteInfo>? children})
+      : super(TabShellRoute.name, initialChildren: children);
+
+  static const String name = 'TabShellRoute';
+
+  static PageInfo page = PageInfo(
+    name,
+    builder: (data) {
+      return const TabShellPage();
+    },
+  );
+}
+
 /// generated route for
 /// [TrashPage]
 class TrashRoute extends PageRouteInfo<void> {

mobile/lib/services/app_settings.service.dart

@@ -100,6 +100,7 @@ enum AppSettingsEnum<T> {
 }
 
 class AppSettingsService {
+  const AppSettingsService();
   T getSetting<T>(AppSettingsEnum<T> setting) {
     return Store.get(setting.storeKey, setting.defaultValue);
   }

mobile/lib/services/backup_album.service.dart

@@ -9,7 +9,7 @@ final backupAlbumServiceProvider = Provider<BackupAlbumService>((ref) {
 class BackupAlbumService {
   final BackupAlbumRepository _backupAlbumRepository;
 
-  BackupAlbumService(this._backupAlbumRepository);
+  const BackupAlbumService(this._backupAlbumRepository);
 
   Future<List<BackupAlbum>> getAll({BackupAlbumSort? sort}) {
     return _backupAlbumRepository.getAll(sort: sort);

mobile/lib/services/deep_link.service.dart

@@ -25,7 +25,7 @@ class DeepLinkService {
   final CurrentAsset _currentAsset;
   final CurrentAlbum _currentAlbum;
 
-  DeepLinkService(
+  const DeepLinkService(
     this._memoryService,
     this._assetService,
     this._albumService,
@@ -38,16 +38,12 @@ class DeepLinkService {
     final intent = link.uri.host;
     final queryParams = link.uri.queryParameters;
 
-    PageRouteInfo<dynamic>? deepLinkRoute;
+    PageRouteInfo<dynamic>? deepLinkRoute = switch (intent) {
-
+      "memory" => await _buildMemoryDeepLink(queryParams['id'] ?? ''),
-    switch (intent) {
+      "asset" => await _buildAssetDeepLink(queryParams['id'] ?? ''),
-      case "memory":
+      "album" => await _buildAlbumDeepLink(queryParams['id'] ?? ''),
-        deepLinkRoute = await _buildMemoryDeepLink(queryParams['id'] ?? '');
+      _ => null,
-      case "asset":
+    };
-        deepLinkRoute = await _buildAssetDeepLink(queryParams['id'] ?? '');
-      case "album":
-        deepLinkRoute = await _buildAlbumDeepLink(queryParams['id'] ?? '');
-    }
 
     // Deep link resolution failed, safely handle it based on the app state
     if (deepLinkRoute == null) {
@@ -98,7 +94,7 @@ class DeepLinkService {
     ]);
   }
 
-  Future<MemoryRoute?> _buildMemoryDeepLink(String memoryId) async {
+  Future<PageRouteInfo?> _buildMemoryDeepLink(String memoryId) async {
     final memory = await _memoryService.getMemoryById(memoryId);
 
     if (memory == null) {
@@ -108,7 +104,7 @@ class DeepLinkService {
     return MemoryRoute(memories: [memory], memoryIndex: 0);
   }
 
-  Future<GalleryViewerRoute?> _buildAssetDeepLink(String assetId) async {
+  Future<PageRouteInfo?> _buildAssetDeepLink(String assetId) async {
     final asset = await _assetService.getAssetByRemoteId(assetId);
 
     if (asset == null) {
@@ -126,7 +122,7 @@ class DeepLinkService {
     );
   }
 
-  Future<AlbumViewerRoute?> _buildAlbumDeepLink(String albumId) async {
+  Future<PageRouteInfo?> _buildAlbumDeepLink(String albumId) async {
     final album = await _albumService.getAlbumByRemoteId(albumId);
 
     if (album == null) {

mobile/lib/services/device.service.dart

@@ -3,10 +3,10 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 
-final deviceServiceProvider = Provider((ref) => DeviceService());
+final deviceServiceProvider = Provider((ref) => const DeviceService());
 
 class DeviceService {
-  DeviceService();
+  const DeviceService();
 
   createDeviceId() {
     return FlutterUdid.consistentUdid;

mobile/lib/services/entity.service.dart

@@ -8,7 +8,7 @@ import 'package:immich_mobile/repositories/asset.repository.dart';
 class EntityService {
   final AssetRepository _assetRepository;
   final IsarUserRepository _isarUserRepository;
-  EntityService(
+  const EntityService(
     this._assetRepository,
     this._isarUserRepository,
   );