Up version for release

feat(mobile): cosmetic update
Added haptic feedback to incorect login
2025-12-09 17:23:13 +03:00 · 2022-10-14 16:21:26 -05:00 · 2022-10-14 16:17:14 -05:00 · 2022-10-14 16:13:35 -05:00 · 2022-10-14 16:04:21 -05:00 · 2022-10-14 15:58:26 -05:00
51 changed files with 1085 additions and 1230 deletions
--- a/.github/workflows/build_push_docker_latest.yml
+++ b/.github/workflows/build_push_docker_latest.yml
@@ -17,17 +17,17 @@ jobs:
          fetch-depth: 0

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.0.0
+        uses: docker/setup-qemu-action@v2.1.0
      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v2.0.0
+        uses: docker/setup-buildx-action@v2.1.0
      - name: Login to Docker Hub
        uses: docker/login-action@v2
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Build and push Immich Mono Repo
-        uses: docker/build-push-action@v3.1.1
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./server
          file: ./server/Dockerfile
@@ -45,17 +45,17 @@ jobs:
          fetch-depth: 0

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.0.0
+        uses: docker/setup-qemu-action@v2.1.0
      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v2.0.0
+        uses: docker/setup-buildx-action@v2.1.0
      - name: Login to Docker Hub
        uses: docker/login-action@v2
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Build and Push Machine Learning
-        uses: docker/build-push-action@v3.1.1
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./machine-learning
          file: ./machine-learning/Dockerfile
@@ -72,17 +72,17 @@ jobs:
        with:
          fetch-depth: 0
      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.0.0
+        uses: docker/setup-qemu-action@v2.1.0
      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v2.0.0
+        uses: docker/setup-buildx-action@v2.1.0
      - name: Login to Docker Hub
        uses: docker/login-action@v2
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Build and Push Web
-        uses: docker/build-push-action@v3.1.1
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./web
          file: ./web/Dockerfile
@@ -100,17 +100,17 @@ jobs:
        with:
          fetch-depth: 0
      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.0.0
+        uses: docker/setup-qemu-action@v2.1.0
      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v2.0.0
+        uses: docker/setup-buildx-action@v2.1.0
      - name: Login to Docker Hub
        uses: docker/login-action@v2
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Build and Push Proxy
-        uses: docker/build-push-action@v3.1.1
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./nginx
          file: ./nginx/Dockerfile
--- a/.github/workflows/build_push_docker_staging.yml
+++ b/.github/workflows/build_push_docker_staging.yml
@@ -17,10 +17,10 @@ jobs:
          fetch-depth: 0

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.0.0
+        uses: docker/setup-qemu-action@v2.1.0
      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v2.0.0
+        uses: docker/setup-buildx-action@v2.1.0
      - name: Login to Docker Hub
        if: ${{ github.repository == 'immich-app/immich' }}
        uses: docker/login-action@v2
@@ -28,7 +28,7 @@ jobs:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Build and push Immich Mono Repo
-        uses: docker/build-push-action@v3.1.1
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./server
          file: ./server/Dockerfile
@@ -47,10 +47,10 @@ jobs:
          fetch-depth: 0

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.0.0
+        uses: docker/setup-qemu-action@v2.1.0
      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v2.0.0
+        uses: docker/setup-buildx-action@v2.1.0
      - name: Login to Docker Hub
        if: ${{ github.repository == 'immich-app/immich' }}
        uses: docker/login-action@v2
@@ -58,7 +58,7 @@ jobs:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Build and Push Machine Learning
-        uses: docker/build-push-action@v3.1.1
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./machine-learning
          file: ./machine-learning/Dockerfile
@@ -76,10 +76,10 @@ jobs:
        with:
          fetch-depth: 0
      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.0.0
+        uses: docker/setup-qemu-action@v2.1.0
      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v2.0.0
+        uses: docker/setup-buildx-action@v2.1.0
      - name: Login to Docker Hub
        if: ${{ github.repository == 'immich-app/immich' }}
        uses: docker/login-action@v2
@@ -87,7 +87,7 @@ jobs:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Build and Push Web
-        uses: docker/build-push-action@v3.1.1
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./web
          file: ./web/Dockerfile
@@ -106,10 +106,10 @@ jobs:
        with:
          fetch-depth: 0
      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.0.0
+        uses: docker/setup-qemu-action@v2.1.0
      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v2.0.0
+        uses: docker/setup-buildx-action@v2.1.0
      - name: Login to Docker Hub
        if: ${{ github.repository == 'immich-app/immich' }}
        uses: docker/login-action@v2
@@ -117,7 +117,7 @@ jobs:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Build and Push Proxy
-        uses: docker/build-push-action@v3.1.1
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./nginx
          file: ./nginx/Dockerfile
--- a/.github/workflows/build_push_server_release.yml
+++ b/.github/workflows/build_push_server_release.yml
@@ -22,11 +22,11 @@ jobs:
          fallback: latest

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.0.0
+        uses: docker/setup-qemu-action@v2.1.0

      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v2.0.0
+        uses: docker/setup-buildx-action@v2.1.0

      - name: Login to Docker Hub
        uses: docker/login-action@v2
@@ -35,7 +35,7 @@ jobs:
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Build and push immich-server release
-        uses: docker/build-push-action@v3.1.1
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./server
          file: ./server/Dockerfile
@@ -58,17 +58,17 @@ jobs:
        with:
          fallback: latest
      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.0.0
+        uses: docker/setup-qemu-action@v2.1.0
      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v2.0.0
+        uses: docker/setup-buildx-action@v2.1.0
      - name: Login to Docker Hub
        uses: docker/login-action@v2
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Build and Push Machine Learning
-        uses: docker/build-push-action@v3.1.1
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./machine-learning
          file: ./machine-learning/Dockerfile
@@ -94,11 +94,11 @@ jobs:
          fallback: latest

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.0.0
+        uses: docker/setup-qemu-action@v2.1.0

      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v2.0.0
+        uses: docker/setup-buildx-action@v2.1.0

      - name: Login to Docker Hub
        uses: docker/login-action@v2
@@ -107,7 +107,7 @@ jobs:
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Build and push immich-web release
-        uses: docker/build-push-action@v3.1.1
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./web
          file: ./web/Dockerfile
@@ -134,11 +134,11 @@ jobs:
          fallback: latest

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.0.0
+        uses: docker/setup-qemu-action@v2.1.0

      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@v2.0.0
+        uses: docker/setup-buildx-action@v2.1.0

      - name: Login to Docker Hub
        uses: docker/login-action@v2
@@ -147,7 +147,7 @@ jobs:
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Build and push immich-proxy release
-        uses: docker/build-push-action@v3.1.1
+        uses: docker/build-push-action@v3.2.0
        with:
          context: ./nginx
          file: ./nginx/Dockerfile
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ Spec: Free-tier Oracle VM - Amsterdam - 2.4Ghz quad-core ARM64 CPU, 24GB RAM

 # Features 

-> ⚠️ WARNING: **NOT READY FOR PRODUCTION! DO NOT USE TO STORE YOUR ASSETS**. This project is under heavy development, there will be continuous functions, features and api changes.
+> ⚠️ WARNING: **NOT READY FOR PRODUCTION! DO NOT USE TO STORE YOUR ASSETS**. This project is under heavy development. There will be continuous functions, features and api changes.

 | Features | Mobile | Web |
 | - | - | - | 
@@ -118,11 +118,11 @@ There are several services that compose Immich:

 NOTE: When using a reverse proxy in front of Immich (such as NGINX), the reverse proxy might require extra configuration to allow large files to be uploaded (such as client_max_body_size in the case of NGINX).

-## Testing One-step installation (not recommended for production)
+## Testing one-step installation (not recommended for production)

-> ⚠️ *This installation method is for evaluating Immich before futher customization to meet the users' needs.*
+> ⚠️ *This installation method is for evaluating Immich before further customization to meet the users' needs.*

-*Applicable system: Ubuntu, Debian, MacOS*
+*Applicable operating systems: Ubuntu, Debian, MacOS*

 - In the shell, from the directory of your choice, run the following command:

@@ -204,7 +204,7 @@ docker-compose pull && docker-compose up -d
 | - | - | - |
 | <a href="https://f-droid.org/packages/app.alextran.immich"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="80"></a> | <p align="left"> <a href="https://play.google.com/store/apps/details?id=app.alextran.immich"><img src="design/google-play-qr-code.png" width="200" title="Google Play Store"></a> <p/> | <p align="left"> <a href="https://apps.apple.com/us/app/immich/id1613945652"><img src="design/ios-qr-code.png" width="200" title="Apple App Store"></a> <p/> |

-> *The Play/App Store version might be lagging behind the latest release due to the review process.*
+> *The Play/App Store version might be lagging behind the latest release due to their review process.*

 # App Beta release channel

--- a/docker/.env.example
+++ b/docker/.env.example
@@ -38,7 +38,10 @@ LOG_LEVEL=simple
 # JWT SECRET
 ###################################################################################

-JWT_SECRET=randomstringthatissolongandpowerfulthatnoonecanguess
+# This JWT_SECRET is used to sign the authentication keys for user login
+# You should set it to a long randomly generated value
+# You can use this command to generate one: openssl rand -base64 128
+JWT_SECRET=

 ###################################################################################
 # Reverse Geocoding
--- a/install.sh
+++ b/install.sh
@@ -18,33 +18,37 @@ get_release_version() {
 create_immich_directory() {
  echo "Creating Immich directory..."
  mkdir -p ./immich-app/immich-data
+  cd ./immich-app
 }

 download_docker_compose_file() {
  echo "Downloading docker-compose.yml..."
-  curl -L https://raw.githubusercontent.com/immich-app/immich/$release_version/docker/docker-compose.yml -o ./immich-app/docker-compose.yml >/dev/null 2>&1
+  curl -L https://raw.githubusercontent.com/immich-app/immich/$release_version/docker/docker-compose.yml -o ./docker-compose.yml >/dev/null 2>&1
 }

 download_dot_env_file() {
  echo "Downloading .env file..."
-  curl -L https://raw.githubusercontent.com/immich-app/immich/$release_version/docker/.env.example -o ./immich-app/.env >/dev/null 2>&1
+  curl -L https://raw.githubusercontent.com/immich-app/immich/$release_version/docker/.env.example -o ./.env >/dev/null 2>&1
+}
+
+replace_env_value() {
+  if [[ "$OSTYPE" == "darwin"* ]]; then
+    sed -i '' "s|$1=.*|$1=$2|" ./.env
+  else
+    sed -i "s|$1=.*|$1=$2|" ./.env
+  fi
 }

 populate_upload_location() {
  echo "Populating default UPLOAD_LOCATION value..."
+  upload_location=$(pwd)/immich-data
+  replace_env_value "UPLOAD_LOCATION" $upload_location
+}

-  cd ./immich-app/immich-data
-
-  upload_location=$(pwd)
-
-  # Replace value of UPLOAD_LOCATION in .env with upload_location path
-  if [[ "$OSTYPE" == "darwin"* ]]; then
-    sed -i '' "s|UPLOAD_LOCATION=.*|UPLOAD_LOCATION=$upload_location|" ../.env
-  else
-    sed -i "s|UPLOAD_LOCATION=.*|UPLOAD_LOCATION=$upload_location|" ../.env
-  fi
-
-  cd ..
+generate_jwt_secret() {
+  echo "Generating JWT_SECRET value..."
+  jwt_secret=$(openssl rand -base64 128)
+  replace_env_value "JWT_SECRET" $jwt_secret
 }

 start_docker_compose() {
@@ -88,4 +92,5 @@ create_immich_directory
 download_docker_compose_file
 download_dot_env_file
 populate_upload_location
+generate_jwt_secret
 start_docker_compose
--- a/mobile/android/fastlane/Fastfile
+++ b/mobile/android/fastlane/Fastfile
@@ -35,8 +35,8 @@ platform :android do
      task: 'bundle', 
      build_type: 'Release',
      properties: {
-        "android.injected.version.code" => 49,
-        "android.injected.version.name" => "1.31.0",
+        "android.injected.version.code" => 50,
+        "android.injected.version.name" => "1.32.0",
      }
    )
    upload_to_play_store(skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, aab: '../build/app/outputs/bundle/release/app-release.aab')
--- a/mobile/android/fastlane/metadata/android/en-US/changelogs/50.txt
+++ b/mobile/android/fastlane/metadata/android/en-US/changelogs/50.txt
@@ -0,0 +1,2 @@
+* Integrate new grid system to the main timeline.
+* Minor UI update.
--- a/mobile/assets/i18n/en-US.json
+++ b/mobile/assets/i18n/en-US.json
@@ -46,7 +46,7 @@
  "backup_controller_page_backup_sub": "Backed up photos and videos",
  "backup_controller_page_cancel": "Cancel",
  "backup_controller_page_created": "Created on: {}",
-  "backup_controller_page_desc_backup": "Turn on backup to automatically upload new assets to the server.",
+  "backup_controller_page_desc_backup": "Turn on foreground backup to automatically upload new assets to the server when opening the app.",
  "backup_controller_page_excluded": "Excluded: ",
  "backup_controller_page_failed": "Failed ({})",
  "backup_controller_page_filename": "File name: {} [{}]",
@@ -58,14 +58,14 @@
  "backup_controller_page_select": "Select",
  "backup_controller_page_server_storage": "Server Storage",
  "backup_controller_page_start_backup": "Start Backup",
-  "backup_controller_page_status_off": "Backup is off",
-  "backup_controller_page_status_on": "Backup is on",
+  "backup_controller_page_status_off": "Automatic foreground backup is off",
+  "backup_controller_page_status_on": "Automatic foreground backup is on",
  "backup_controller_page_storage_format": "{} of {} used",
  "backup_controller_page_to_backup": "Albums to be backup",
  "backup_controller_page_total": "Total",
  "backup_controller_page_total_sub": "All unique photos and videos from selected albums",
-  "backup_controller_page_turn_off": "Turn off Backup",
-  "backup_controller_page_turn_on": "Turn on Backup",
+  "backup_controller_page_turn_off": "Turn off foreground backup",
+  "backup_controller_page_turn_on": "Turn on foreground backup",
  "backup_controller_page_uploading_file_info": "Uploading file info",
  "backup_err_only_album": "Cannot remove the only album",
  "backup_info_card_assets": "assets",
@@ -171,8 +171,5 @@
  "version_announcement_overlay_text_3": " and ensure your docker-compose and .env setup is up-to-date to prevent any misconfigurations, especially if you use WatchTower or any mechanism that handles updating your server application automatically.",
  "version_announcement_overlay_title": "New Server Version Available \uD83C\uDF89",
  "experimental_settings_title": "Experimental",
-  "experimental_settings_subtitle": "Use at your own risk!",
-  "experimental_settings_new_asset_list_title": "Enable experimental photo grid",
-  "experimental_settings_new_asset_list_subtitle": "Work in progress",
-  "settings_require_restart": "Please restart Immich to apply this setting"
-}
+  "experimental_settings_subtitle": "Use at your own risk!"
+}
--- a/mobile/ios/fastlane/Fastfile
+++ b/mobile/ios/fastlane/Fastfile
@@ -19,7 +19,7 @@ platform :ios do
  desc "iOS Beta"
  lane :beta do
    increment_version_number(
-      version_number: "1.31.0"
+      version_number: "1.32.0"
    )
    increment_build_number(
      build_number: latest_testflight_build_number + 1,
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -7,7 +7,6 @@ import 'package:flutter/services.dart';
 import 'package:flutter_displaymode/flutter_displaymode.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/immich_colors.dart';
 import 'package:immich_mobile/constants/locales.dart';
 import 'package:immich_mobile/modules/backup/background_service/background.service.dart';
 import 'package:immich_mobile/modules/backup/models/hive_backup_albums.model.dart';
--- a/mobile/lib/modules/album/ui/album_viewer_appbar.dart
+++ b/mobile/lib/modules/album/ui/album_viewer_appbar.dart
@@ -3,7 +3,6 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/immich_colors.dart';
 import 'package:immich_mobile/modules/album/providers/album.provider.dart';
 import 'package:immich_mobile/modules/album/providers/album_viewer.provider.dart';
 import 'package:immich_mobile/modules/album/providers/asset_selection.provider.dart';
--- a/mobile/lib/modules/album/views/select_user_for_sharing_page.dart
+++ b/mobile/lib/modules/album/views/select_user_for_sharing_page.dart
@@ -151,7 +151,7 @@ class SelectUserForSharingPage extends HookConsumerWidget {
        actions: [
          TextButton(
            style: TextButton.styleFrom(
-              primary: Theme.of(context).primaryColor,
+              foregroundColor: Theme.of(context).primaryColor,
            ),
            onPressed:
                sharedUsersList.value.isEmpty ? null : _createSharedAlbum,
--- a/mobile/lib/modules/asset_viewer/views/gallery_viewer.dart
+++ b/mobile/lib/modules/asset_viewer/views/gallery_viewer.dart
@@ -1,5 +1,6 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_swipe_detector/flutter_swipe_detector.dart';
 import 'package:hive/hive.dart';
@@ -111,6 +112,9 @@ class GalleryViewerPage extends HookConsumerWidget {
              : const BouncingScrollPhysics(),
          itemCount: assetList.length,
          scrollDirection: Axis.horizontal,
+          onPageChanged: (value) {
+            HapticFeedback.selectionClick();
+          },
          itemBuilder: (context, index) {
            initState(index);

--- a/mobile/lib/modules/backup/background_service/localization.dart
+++ b/mobile/lib/modules/backup/background_service/localization.dart
@@ -21,7 +21,9 @@ Future<bool> loadTranslations() async {

  await controller.loadTranslations();

-  return Localization.load(controller.locale,
-      translations: controller.translations,
-      fallbackTranslations: controller.fallbackTranslations);
+  return Localization.load(
+    controller.locale,
+    translations: controller.translations,
+    fallbackTranslations: controller.fallbackTranslations,
+  );
 }
--- a/mobile/lib/modules/backup/views/album_preview_page.dart
+++ b/mobile/lib/modules/backup/views/album_preview_page.dart
@@ -16,8 +16,8 @@ class AlbumPreviewPage extends HookConsumerWidget {
    final assets = useState<List<AssetEntity>>([]);

    _getAssetsInAlbum() async {
-      assets.value =
-          await album.getAssetListRange(start: 0, end: album.assetCount);
+      assets.value = await album.getAssetListRange(
+          start: 0, end: await album.assetCountAsync);
    }

    useEffect(
@@ -34,7 +34,7 @@ class AlbumPreviewPage extends HookConsumerWidget {
        title: Column(
          children: [
            Text(
-              "${album.name} (${album.assetCount})",
+              "${album.name} (${album.assetCountAsync})",
              style: const TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
            ),
            Padding(
--- a/mobile/lib/modules/backup/views/backup_controller_page.dart
+++ b/mobile/lib/modules/backup/views/backup_controller_page.dart
@@ -158,7 +158,6 @@ class BackupControllerPage extends HookConsumerWidget {
    }

    void _showBatteryOptimizationInfoToUser() {
-      final buttonTextColor = Theme.of(context).primaryColor;
      showDialog<void>(
        context: context,
        barrierDismissible: false,
@@ -173,13 +172,14 @@ class BackupControllerPage extends HookConsumerWidget {
              ).tr(),
            ),
            actions: [
-              OutlinedButton(
+              ElevatedButton(
                onPressed: () => launchUrl(
                  Uri.parse('https://dontkillmyapp.com'),
                  mode: LaunchMode.externalApplication,
                ),
                child: const Text(
                  "backup_controller_page_background_battery_info_link",
+                  style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12),
                ).tr(),
              ),
              ElevatedButton(
@@ -220,7 +220,12 @@ class BackupControllerPage extends HookConsumerWidget {
          crossAxisAlignment: CrossAxisAlignment.start,
          children: [
            if (!isBackgroundEnabled)
-              const Text("backup_controller_page_background_description").tr(),
+              Padding(
+                padding: const EdgeInsets.symmetric(vertical: 8.0),
+                child:
+                    const Text("backup_controller_page_background_description")
+                        .tr(),
+              ),
            if (isBackgroundEnabled)
              SwitchListTile(
                title:
--- a/mobile/lib/modules/home/models/home_page_state.model.dart
+++ b/mobile/lib/modules/home/models/home_page_state.model.dart
@@ -1,47 +0,0 @@
-import 'package:collection/collection.dart';
-
-import 'package:openapi/api.dart';
-
-class HomePageState {
-  final bool isMultiSelectEnable;
-  final Set<AssetResponseDto> selectedItems;
-  final Set<String> selectedDateGroup;
-  HomePageState({
-    required this.isMultiSelectEnable,
-    required this.selectedItems,
-    required this.selectedDateGroup,
-  });
-
-  HomePageState copyWith({
-    bool? isMultiSelectEnable,
-    Set<AssetResponseDto>? selectedItems,
-    Set<String>? selectedDateGroup,
-  }) {
-    return HomePageState(
-      isMultiSelectEnable: isMultiSelectEnable ?? this.isMultiSelectEnable,
-      selectedItems: selectedItems ?? this.selectedItems,
-      selectedDateGroup: selectedDateGroup ?? this.selectedDateGroup,
-    );
-  }
-
-  @override
-  String toString() =>
-      'HomePageState(isMultiSelectEnable: $isMultiSelectEnable, selectedItems: $selectedItems, selectedDateGroup: $selectedDateGroup)';
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-    final setEquals = const DeepCollectionEquality().equals;
-
-    return other is HomePageState &&
-        other.isMultiSelectEnable == isMultiSelectEnable &&
-        setEquals(other.selectedItems, selectedItems) &&
-        setEquals(other.selectedDateGroup, selectedDateGroup);
-  }
-
-  @override
-  int get hashCode =>
-      isMultiSelectEnable.hashCode ^
-      selectedItems.hashCode ^
-      selectedDateGroup.hashCode;
-}
--- a/mobile/lib/modules/home/providers/home_page_render_list_provider.dart
+++ b/mobile/lib/modules/home/providers/home_page_render_list_provider.dart
@@ -1,95 +1,14 @@
-import 'dart:math';
-
-import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structure.dart';
 import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart';
 import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
 import 'package:immich_mobile/shared/providers/asset.provider.dart';
-import 'package:openapi/api.dart';
-
-enum RenderAssetGridElementType {
-  assetRow,
-  dayTitle,
-  monthTitle;
-}
-
-class RenderAssetGridRow {
-  final List<AssetResponseDto> assets;
-
-  RenderAssetGridRow(this.assets);
-}
-
-class RenderAssetGridElement {
-  final RenderAssetGridElementType type;
-  final RenderAssetGridRow? assetRow;
-  final String? title;
-  final DateTime date;
-  final List<AssetResponseDto>? relatedAssetList;
-
-  RenderAssetGridElement(
-    this.type, {
-    this.assetRow,
-    this.title,
-    required this.date,
-    this.relatedAssetList,
-  });
-}

 final renderListProvider = StateProvider((ref) {
  var assetGroups = ref.watch(assetGroupByDateTimeProvider);
-  var settings = ref.watch(appSettingsServiceProvider);

+  var settings = ref.watch(appSettingsServiceProvider);
  final assetsPerRow = settings.getSetting(AppSettingsEnum.tilesPerRow);

-  List<RenderAssetGridElement> elements = [];
-  DateTime? lastDate;
-
-  assetGroups.forEach((groupName, assets) {
-    try {
-      final date = DateTime.parse(groupName);
-
-      if (lastDate == null || lastDate!.month != date.month) {
-        elements.add(
-          RenderAssetGridElement(
-            RenderAssetGridElementType.monthTitle,
-            title: groupName,
-            date: date,
-          ),
-        );
-      }
-
-      // Add group title
-      elements.add(
-        RenderAssetGridElement(
-          RenderAssetGridElementType.dayTitle,
-          title: groupName,
-          date: date,
-          relatedAssetList: assets,
-        ),
-      );
-
-      // Add rows
-      int cursor = 0;
-      while (cursor < assets.length) {
-        int rowElements = min(assets.length - cursor, assetsPerRow);
-
-        final rowElement = RenderAssetGridElement(
-          RenderAssetGridElementType.assetRow,
-          date: date,
-          assetRow: RenderAssetGridRow(
-            assets.sublist(cursor, cursor + rowElements),
-          ),
-        );
-
-        elements.add(rowElement);
-        cursor += rowElements;
-      }
-
-      lastDate = date;
-    } catch (e) {
-      debugPrint(e.toString());
-    }
-  });
-
-  return elements;
+  return assetGroupsToRenderList(assetGroups, assetsPerRow);
 });
--- a/mobile/lib/modules/home/providers/home_page_state.provider.dart
+++ b/mobile/lib/modules/home/providers/home_page_state.provider.dart
@@ -1,92 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/modules/home/models/home_page_state.model.dart';
-import 'package:immich_mobile/shared/services/share.service.dart';
-import 'package:immich_mobile/shared/ui/share_dialog.dart';
-import 'package:openapi/api.dart';
-
-class HomePageStateNotifier extends StateNotifier<HomePageState> {
-
-  final ShareService _shareService;
-
-  HomePageStateNotifier(this._shareService)
-      : super(
-          HomePageState(
-            isMultiSelectEnable: false,
-            selectedItems: {},
-            selectedDateGroup: {},
-          ),
-        );
-
-  void addSelectedDateGroup(String dateGroupTitle) {
-    state = state.copyWith(
-      selectedDateGroup: {...state.selectedDateGroup, dateGroupTitle},
-    );
-  }
-
-  void removeSelectedDateGroup(String dateGroupTitle) {
-    var currentDateGroup = state.selectedDateGroup;
-
-    currentDateGroup.removeWhere((e) => e == dateGroupTitle);
-
-    state = state.copyWith(selectedDateGroup: currentDateGroup);
-  }
-
-  void enableMultiSelect(Set<AssetResponseDto> selectedItems) {
-    state =
-        state.copyWith(isMultiSelectEnable: true, selectedItems: selectedItems);
-  }
-
-  void disableMultiSelect() {
-    state = state.copyWith(
-      isMultiSelectEnable: false,
-      selectedItems: {},
-      selectedDateGroup: {},
-    );
-  }
-
-  void addSingleSelectedItem(AssetResponseDto asset) {
-    state = state.copyWith(selectedItems: {...state.selectedItems, asset});
-  }
-
-  void addMultipleSelectedItems(List<AssetResponseDto> assets) {
-    state = state.copyWith(selectedItems: {...state.selectedItems, ...assets});
-  }
-
-  void removeSingleSelectedItem(AssetResponseDto asset) {
-    Set<AssetResponseDto> currentList = state.selectedItems;
-
-    currentList.removeWhere((e) => e.id == asset.id);
-
-    state = state.copyWith(selectedItems: currentList);
-  }
-
-  void removeMultipleSelectedItem(List<AssetResponseDto> assets) {
-    Set<AssetResponseDto> currentList = state.selectedItems;
-
-    for (AssetResponseDto asset in assets) {
-      currentList.removeWhere((e) => e.id == asset.id);
-    }
-
-    state = state.copyWith(selectedItems: currentList);
-  }
-
-  void shareAssets(List<AssetResponseDto> assets, BuildContext context) {
-    showDialog(
-      context: context,
-      builder: (BuildContext buildContext) {
-        _shareService
-            .shareAssets(assets)
-            .then((_) => Navigator.of(buildContext).pop());
-        return const ShareDialog();
-      },
-      barrierDismissible: false,
-    );
-  }
-}
-
-final homePageStateProvider =
-    StateNotifierProvider<HomePageStateNotifier, HomePageState>(
-  ((ref) => HomePageStateNotifier(ref.watch(shareServiceProvider))),
-);
--- a/mobile/lib/modules/home/providers/multiselect.provider.dart
+++ b/mobile/lib/modules/home/providers/multiselect.provider.dart
@@ -0,0 +1,5 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+final multiselectProvider = StateProvider((ref) {
+  return false;
+});
--- a/mobile/lib/modules/home/ui/asset_grid/asset_grid_data_structure.dart
+++ b/mobile/lib/modules/home/ui/asset_grid/asset_grid_data_structure.dart
@@ -0,0 +1,103 @@
+import 'dart:math';
+
+import 'package:openapi/api.dart';
+
+enum RenderAssetGridElementType {
+  assetRow,
+  dayTitle,
+  monthTitle;
+}
+
+class RenderAssetGridRow {
+  final List<AssetResponseDto> assets;
+
+  RenderAssetGridRow(this.assets);
+}
+
+class RenderAssetGridElement {
+  final RenderAssetGridElementType type;
+  final RenderAssetGridRow? assetRow;
+  final String? title;
+  final DateTime date;
+  final List<AssetResponseDto>? relatedAssetList;
+
+  RenderAssetGridElement(
+    this.type, {
+    this.assetRow,
+    this.title,
+    required this.date,
+    this.relatedAssetList,
+  });
+}
+
+List<RenderAssetGridElement> assetsToRenderList(
+    List<AssetResponseDto> assets, int assetsPerRow) {
+  List<RenderAssetGridElement> elements = [];
+
+  int cursor = 0;
+  while (cursor < assets.length) {
+    int rowElements = min(assets.length - cursor, assetsPerRow);
+    final date = DateTime.parse(assets[cursor].createdAt);
+
+    final rowElement = RenderAssetGridElement(
+      RenderAssetGridElementType.assetRow,
+      date: date,
+      assetRow: RenderAssetGridRow(
+        assets.sublist(cursor, cursor + rowElements),
+      ),
+    );
+
+    elements.add(rowElement);
+    cursor += rowElements;
+  }
+
+  return elements;
+}
+
+List<RenderAssetGridElement> assetGroupsToRenderList(
+    Map<String, List<AssetResponseDto>> assetGroups, int assetsPerRow) {
+  List<RenderAssetGridElement> elements = [];
+  DateTime? lastDate;
+
+  assetGroups.forEach((groupName, assets) {
+    final date = DateTime.parse(groupName);
+
+    if (lastDate == null || lastDate!.month != date.month) {
+      elements.add(
+        RenderAssetGridElement(RenderAssetGridElementType.monthTitle,
+            title: groupName, date: date),
+      );
+    }
+
+    // Add group title
+    elements.add(
+      RenderAssetGridElement(
+        RenderAssetGridElementType.dayTitle,
+        title: groupName,
+        date: date,
+        relatedAssetList: assets,
+      ),
+    );
+
+    // Add rows
+    int cursor = 0;
+    while (cursor < assets.length) {
+      int rowElements = min(assets.length - cursor, assetsPerRow);
+
+      final rowElement = RenderAssetGridElement(
+        RenderAssetGridElementType.assetRow,
+        date: date,
+        assetRow: RenderAssetGridRow(
+          assets.sublist(cursor, cursor + rowElements),
+        ),
+      );
+
+      elements.add(rowElement);
+      cursor += rowElements;
+    }
+
+    lastDate = date;
+  });
+
+  return elements;
+}
--- a/mobile/lib/modules/home/ui/asset_grid/daily_title_text.dart
+++ b/mobile/lib/modules/home/ui/asset_grid/daily_title_text.dart
@@ -0,0 +1,72 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+class DailyTitleText extends ConsumerWidget {
+  const DailyTitleText({
+    Key? key,
+    required this.isoDate,
+    required this.multiselectEnabled,
+    required this.onSelect,
+    required this.onDeselect,
+    required this.selected,
+  }) : super(key: key);
+
+  final String isoDate;
+  final bool multiselectEnabled;
+  final Function onSelect;
+  final Function onDeselect;
+  final bool selected;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    var currentYear = DateTime.now().year;
+    var groupYear = DateTime.parse(isoDate).year;
+    var formatDateTemplate = currentYear == groupYear
+        ? "daily_title_text_date".tr()
+        : "daily_title_text_date_year".tr();
+    var dateText =
+        DateFormat(formatDateTemplate).format(DateTime.parse(isoDate));
+
+    void handleTitleIconClick() {
+      if (selected) {
+        onDeselect();
+      } else {
+        onSelect();
+      }
+    }
+
+    return Padding(
+      padding: const EdgeInsets.only(
+        top: 29.0,
+        bottom: 29.0,
+        left: 12.0,
+        right: 12.0,
+      ),
+      child: Row(
+        children: [
+          Text(
+            dateText,
+            style: const TextStyle(
+              fontSize: 14,
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+          const Spacer(),
+          GestureDetector(
+            onTap: handleTitleIconClick,
+            child: multiselectEnabled && selected
+                ? Icon(
+                    Icons.check_circle_rounded,
+                    color: Theme.of(context).primaryColor,
+                  )
+                : const Icon(
+                    Icons.check_circle_outline_rounded,
+                    color: Colors.grey,
+                  ),
+          )
+        ],
+      ),
+    );
+  }
+}
--- a/mobile/lib/modules/home/ui/asset_grid/disable_multi_select_button.dart
+++ b/mobile/lib/modules/home/ui/asset_grid/disable_multi_select_button.dart
@@ -1,40 +1,36 @@
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-
-class DisableMultiSelectButton extends ConsumerWidget {
-  const DisableMultiSelectButton({
-    Key? key,
-    required this.onPressed,
-    required this.selectedItemCount,
-  }) : super(key: key);
-
-  final Function onPressed;
-  final int selectedItemCount;
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return Positioned(
-      top: 10,
-      left: 0,
-      child: Padding(
-        padding: const EdgeInsets.only(left: 16.0, top: 46),
-        child: Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 4.0),
-          child: ElevatedButton.icon(
-            onPressed: () {
-              onPressed();
-            },
-            icon: const Icon(Icons.close_rounded),
-            label: Text(
-              '$selectedItemCount',
-              style: const TextStyle(
-                fontWeight: FontWeight.w600,
-                fontSize: 18,
-              ),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+
+class DisableMultiSelectButton extends ConsumerWidget {
+  const DisableMultiSelectButton({
+    Key? key,
+    required this.onPressed,
+    required this.selectedItemCount,
+  }) : super(key: key);
+
+  final Function onPressed;
+  final int selectedItemCount;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return Padding(
+        padding: const EdgeInsets.only(left: 16.0, top: 15),
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 4.0),
+          child: ElevatedButton.icon(
+            onPressed: () {
+              onPressed();
+            },
+            icon: const Icon(Icons.close_rounded),
+            label: Text(
+              '$selectedItemCount',
+              style: const TextStyle(
+                fontWeight: FontWeight.w600,
+                fontSize: 18,
+              ),
+            ),
+          ),
+        ),
+    );
+  }
+}
--- a/mobile/lib/modules/home/ui/asset_list_v2/draggable_scrollbar_custom.dart
+++ b/mobile/lib/modules/home/ui/asset_list_v2/draggable_scrollbar_custom.dart
--- a/mobile/lib/modules/home/ui/asset_grid/immich_asset_grid.dart
+++ b/mobile/lib/modules/home/ui/asset_grid/immich_asset_grid.dart
@@ -0,0 +1,274 @@
+import 'dart:collection';
+
+import 'package:collection/collection.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/modules/home/ui/asset_grid/thumbnail_image.dart';
+import 'package:openapi/api.dart';
+import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
+import 'asset_grid_data_structure.dart';
+import 'daily_title_text.dart';
+import 'disable_multi_select_button.dart';
+import 'draggable_scrollbar_custom.dart';
+
+typedef ImmichAssetGridSelectionListener = void Function(
+  bool,
+  Set<AssetResponseDto>,
+);
+
+class ImmichAssetGridState extends State<ImmichAssetGrid> {
+  final ItemScrollController _itemScrollController = ItemScrollController();
+  final ItemPositionsListener _itemPositionsListener =
+      ItemPositionsListener.create();
+
+  bool _scrolling = false;
+  final Set<String> _selectedAssets = HashSet();
+
+  List<AssetResponseDto> get _assets {
+    return widget.renderList
+        .map((e) {
+          if (e.type == RenderAssetGridElementType.assetRow) {
+            return e.assetRow!.assets;
+          } else {
+            return List<AssetResponseDto>.empty();
+          }
+        })
+        .flattened
+        .toList();
+  }
+
+  Set<AssetResponseDto> _getSelectedAssets() {
+    return _selectedAssets
+        .map((e) => _assets.firstWhereOrNull((a) => a.id == e))
+        .whereNotNull()
+        .toSet();
+  }
+
+  void _callSelectionListener(bool selectionActive) {
+    widget.listener?.call(selectionActive, _getSelectedAssets());
+  }
+
+  void _selectAssets(List<AssetResponseDto> assets) {
+    setState(() {
+      for (var e in assets) {
+        _selectedAssets.add(e.id);
+      }
+      _callSelectionListener(true);
+    });
+  }
+
+  void _deselectAssets(List<AssetResponseDto> assets) {
+    setState(() {
+      for (var e in assets) {
+        _selectedAssets.remove(e.id);
+      }
+      _callSelectionListener(_selectedAssets.isNotEmpty);
+    });
+  }
+
+  void _deselectAll() {
+    setState(() {
+      _selectedAssets.clear();
+    });
+
+    _callSelectionListener(false);
+  }
+
+  bool _allAssetsSelected(List<AssetResponseDto> assets) {
+    return widget.selectionActive &&
+        assets.firstWhereOrNull((e) => !_selectedAssets.contains(e.id)) == null;
+  }
+
+  double _getItemSize(BuildContext context) {
+    return MediaQuery.of(context).size.width / widget.assetsPerRow -
+        widget.margin * (widget.assetsPerRow - 1) / widget.assetsPerRow;
+  }
+
+  Widget _buildThumbnailOrPlaceholder(
+    AssetResponseDto asset,
+    bool placeholder,
+  ) {
+    if (placeholder) {
+      return const DecoratedBox(
+        decoration: BoxDecoration(color: Colors.grey),
+      );
+    }
+    return ThumbnailImage(
+      asset: asset,
+      assetList: _assets,
+      multiselectEnabled: widget.selectionActive,
+      isSelected: _selectedAssets.contains(asset.id),
+      onSelect: () => _selectAssets([asset]),
+      onDeselect: () => _deselectAssets([asset]),
+      useGrayBoxPlaceholder: true,
+      showStorageIndicator: widget.showStorageIndicator,
+    );
+  }
+
+  Widget _buildAssetRow(
+    BuildContext context,
+    RenderAssetGridRow row,
+    bool scrolling,
+  ) {
+    double size = _getItemSize(context);
+
+    return Row(
+      key: Key("asset-row-${row.assets.first.id}"),
+      children: row.assets.map((AssetResponseDto asset) {
+        bool last = asset == row.assets.last;
+
+        return Container(
+          key: Key("asset-${asset.id}"),
+          width: size,
+          height: size,
+          margin: EdgeInsets.only(
+            top: widget.margin,
+            right: last ? 0.0 : widget.margin,
+          ),
+          child: _buildThumbnailOrPlaceholder(asset, scrolling),
+        );
+      }).toList(),
+    );
+  }
+
+  Widget _buildTitle(
+    BuildContext context,
+    String title,
+    List<AssetResponseDto> assets,
+  ) {
+    return DailyTitleText(
+      isoDate: title,
+      multiselectEnabled: widget.selectionActive,
+      onSelect: () => _selectAssets(assets),
+      onDeselect: () => _deselectAssets(assets),
+      selected: _allAssetsSelected(assets),
+    );
+  }
+
+  Widget _buildMonthTitle(BuildContext context, String title) {
+    var monthTitleText = DateFormat("monthly_title_text_date_format".tr())
+        .format(DateTime.parse(title));
+
+    return Padding(
+      key: Key("month-$title"),
+      padding: const EdgeInsets.only(left: 12.0, top: 32),
+      child: Text(
+        monthTitleText,
+        style: TextStyle(
+          fontSize: 26,
+          fontWeight: FontWeight.bold,
+          color: Theme.of(context).textTheme.headline1?.color,
+        ),
+      ),
+    );
+  }
+
+  Widget _itemBuilder(BuildContext c, int position) {
+    final item = widget.renderList[position];
+
+    if (item.type == RenderAssetGridElementType.dayTitle) {
+      return _buildTitle(c, item.title!, item.relatedAssetList!);
+    } else if (item.type == RenderAssetGridElementType.monthTitle) {
+      return _buildMonthTitle(c, item.title!);
+    } else if (item.type == RenderAssetGridElementType.assetRow) {
+      return _buildAssetRow(c, item.assetRow!, _scrolling);
+    }
+
+    return const Text("Invalid widget type!");
+  }
+
+  Text _labelBuilder(int pos) {
+    final date = widget.renderList[pos].date;
+    return Text(
+      DateFormat.yMMMd().format(date),
+      style: const TextStyle(
+        color: Colors.white,
+        fontWeight: FontWeight.bold,
+      ),
+    );
+  }
+
+  Widget _buildMultiSelectIndicator() {
+    return DisableMultiSelectButton(
+      onPressed: () => _deselectAll(),
+      selectedItemCount: _selectedAssets.length,
+    );
+  }
+
+  Widget _buildAssetGrid() {
+    final useDragScrolling = _assets.length >= 20;
+
+    void dragScrolling(bool active) {
+      setState(() {
+        _scrolling = active;
+      });
+    }
+
+    final listWidget = ScrollablePositionedList.builder(
+      itemBuilder: _itemBuilder,
+      itemPositionsListener: _itemPositionsListener,
+      itemScrollController: _itemScrollController,
+      itemCount: widget.renderList.length,
+    );
+
+    if (!useDragScrolling) {
+      return listWidget;
+    }
+
+    return DraggableScrollbar.semicircle(
+      scrollStateListener: dragScrolling,
+      itemPositionsListener: _itemPositionsListener,
+      controller: _itemScrollController,
+      backgroundColor: Theme.of(context).hintColor,
+      labelTextBuilder: _labelBuilder,
+      labelConstraints: const BoxConstraints(maxHeight: 28),
+      scrollbarAnimationDuration: const Duration(seconds: 1),
+      scrollbarTimeToFade: const Duration(seconds: 4),
+      child: listWidget,
+    );
+  }
+
+  @override
+  void didUpdateWidget(ImmichAssetGrid oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (!widget.selectionActive) {
+      setState(() {
+        _selectedAssets.clear();
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Stack(
+      children: [
+        _buildAssetGrid(),
+        if (widget.selectionActive) _buildMultiSelectIndicator(),
+      ],
+    );
+  }
+}
+
+class ImmichAssetGrid extends StatefulWidget {
+  final List<RenderAssetGridElement> renderList;
+  final int assetsPerRow;
+  final double margin;
+  final bool showStorageIndicator;
+  final ImmichAssetGridSelectionListener? listener;
+  final bool selectionActive;
+
+  const ImmichAssetGrid({
+    super.key,
+    required this.renderList,
+    required this.assetsPerRow,
+    required this.showStorageIndicator,
+    this.listener,
+    this.margin = 5.0,
+    this.selectionActive = false,
+  });
+
+  @override
+  State<StatefulWidget> createState() {
+    return ImmichAssetGridState();
+  }
+}
--- a/mobile/lib/modules/home/ui/asset_grid/monthly_title_text.dart
+++ b/mobile/lib/modules/home/ui/asset_grid/monthly_title_text.dart
--- a/mobile/lib/modules/home/ui/asset_grid/thumbnail_image.dart
+++ b/mobile/lib/modules/home/ui/asset_grid/thumbnail_image.dart
@@ -1,176 +1,172 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:cached_network_image/cached_network_image.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:hive_flutter/hive_flutter.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/hive_box.dart';
-import 'package:immich_mobile/modules/home/providers/home_page_state.provider.dart';
-import 'package:immich_mobile/modules/login/providers/authentication.provider.dart';
-import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/utils/image_url_builder.dart';
-import 'package:openapi/api.dart';
-
-class ThumbnailImage extends HookConsumerWidget {
-  final AssetResponseDto asset;
-  final List<AssetResponseDto> assetList;
-  final bool showStorageIndicator;
-  final bool useGrayBoxPlaceholder;
-
-  const ThumbnailImage({
-    Key? key,
-    required this.asset,
-    required this.assetList,
-    this.showStorageIndicator = true,
-    this.useGrayBoxPlaceholder = false,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    var box = Hive.box(userInfoBox);
-    var thumbnailRequestUrl = getThumbnailUrl(asset);
-    var selectedAsset = ref.watch(homePageStateProvider).selectedItems;
-    var isMultiSelectEnable =
-        ref.watch(homePageStateProvider).isMultiSelectEnable;
-    var deviceId = ref.watch(authenticationProvider).deviceId;
-
-    Widget buildSelectionIcon(AssetResponseDto asset) {
-      if (selectedAsset.contains(asset)) {
-        return Icon(
-          Icons.check_circle,
-          color: Theme.of(context).primaryColor,
-        );
-      } else {
-        return const Icon(
-          Icons.circle_outlined,
-          color: Colors.white,
-        );
-      }
-    }
-
-    return GestureDetector(
-      onTap: () {
-        if (isMultiSelectEnable &&
-            selectedAsset.contains(asset) &&
-            selectedAsset.length == 1) {
-          ref.watch(homePageStateProvider.notifier).disableMultiSelect();
-        } else if (isMultiSelectEnable &&
-            selectedAsset.contains(asset) &&
-            selectedAsset.length > 1) {
-          ref
-              .watch(homePageStateProvider.notifier)
-              .removeSingleSelectedItem(asset);
-        } else if (isMultiSelectEnable && !selectedAsset.contains(asset)) {
-          ref
-              .watch(homePageStateProvider.notifier)
-              .addSingleSelectedItem(asset);
-        } else {
-          AutoRouter.of(context).push(
-            GalleryViewerRoute(
-              assetList: assetList,
-              asset: asset,
-            ),
-          );
-        }
-      },
-      onLongPress: () {
-        // Enable multi select function
-        ref.watch(homePageStateProvider.notifier).enableMultiSelect({asset});
-        HapticFeedback.heavyImpact();
-      },
-      child: Hero(
-        tag: asset.id,
-        child: Stack(
-          children: [
-            Container(
-              decoration: BoxDecoration(
-                border: isMultiSelectEnable && selectedAsset.contains(asset)
-                    ? Border.all(
-                        color: Theme.of(context).primaryColorLight,
-                        width: 10,
-                      )
-                    : const Border(),
-              ),
-              child: CachedNetworkImage(
-                cacheKey: 'thumbnail-image-${asset.id}',
-                width: 300,
-                height: 300,
-                memCacheHeight: 200,
-                maxWidthDiskCache: 200,
-                maxHeightDiskCache: 200,
-                fit: BoxFit.cover,
-                imageUrl: thumbnailRequestUrl,
-                httpHeaders: {
-                  "Authorization": "Bearer ${box.get(accessTokenKey)}"
-                },
-                fadeInDuration: const Duration(milliseconds: 250),
-                progressIndicatorBuilder: (context, url, downloadProgress) {
-                  if (useGrayBoxPlaceholder) {
-                    return const DecoratedBox(
-                      decoration: BoxDecoration(color: Colors.grey),
-                    );
-                  }
-                  return Transform.scale(
-                    scale: 0.2,
-                    child: CircularProgressIndicator(
-                      value: downloadProgress.progress,
-                    ),
-                  );
-                },
-                errorWidget: (context, url, error) {
-                  debugPrint("Error getting thumbnail $url = $error");
-                  CachedNetworkImage.evictFromCache(thumbnailRequestUrl);
-
-                  return Icon(
-                    Icons.image_not_supported_outlined,
-                    color: Theme.of(context).primaryColor,
-                  );
-                },
-              ),
-            ),
-            if (isMultiSelectEnable)
-              Padding(
-                padding: const EdgeInsets.all(3.0),
-                child: Align(
-                  alignment: Alignment.topLeft,
-                  child: buildSelectionIcon(asset),
-                ),
-              ),
-            if (showStorageIndicator)
-              Positioned(
-                right: 10,
-                bottom: 5,
-                child: Icon(
-                  (deviceId != asset.deviceId)
-                      ? Icons.cloud_done_outlined
-                      : Icons.photo_library_rounded,
-                  color: Colors.white,
-                  size: 18,
-                ),
-              ),
-            if (asset.type != AssetTypeEnum.IMAGE)
-              Positioned(
-                top: 5,
-                right: 5,
-                child: Row(
-                  children: [
-                    Text(
-                      asset.duration.toString().substring(0, 7),
-                      style: const TextStyle(
-                        color: Colors.white,
-                        fontSize: 10,
-                      ),
-                    ),
-                    const Icon(
-                      Icons.play_circle_outline_rounded,
-                      color: Colors.white,
-                    ),
-                  ],
-                ),
-              ),
-          ],
-        ),
-      ),
-    );
-  }
-}
+import 'package:auto_route/auto_route.dart';
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:hive_flutter/hive_flutter.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/hive_box.dart';
+import 'package:immich_mobile/modules/login/providers/authentication.provider.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/utils/image_url_builder.dart';
+import 'package:openapi/api.dart';
+
+class ThumbnailImage extends HookConsumerWidget {
+  final AssetResponseDto asset;
+  final List<AssetResponseDto> assetList;
+  final bool showStorageIndicator;
+  final bool useGrayBoxPlaceholder;
+  final bool isSelected;
+  final bool multiselectEnabled;
+  final Function? onSelect;
+  final Function? onDeselect;
+
+  const ThumbnailImage({
+    Key? key,
+    required this.asset,
+    required this.assetList,
+    this.showStorageIndicator = true,
+    this.useGrayBoxPlaceholder = false,
+    this.isSelected = false,
+    this.multiselectEnabled = false,
+    this.onDeselect,
+    this.onSelect,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    var box = Hive.box(userInfoBox);
+    var thumbnailRequestUrl = getThumbnailUrl(asset);
+    var deviceId = ref.watch(authenticationProvider).deviceId;
+
+
+    Widget buildSelectionIcon(AssetResponseDto asset) {
+      if (isSelected) {
+        return Icon(
+          Icons.check_circle,
+          color: Theme.of(context).primaryColor,
+        );
+      } else {
+        return const Icon(
+          Icons.circle_outlined,
+          color: Colors.white,
+        );
+      }
+    }
+
+    return GestureDetector(
+      onTap: () {
+        if (multiselectEnabled) {
+          if (isSelected) {
+            onDeselect?.call();
+          } else {
+            onSelect?.call();
+          }
+        } else {
+          AutoRouter.of(context).push(
+            GalleryViewerRoute(
+              assetList: assetList,
+              asset: asset,
+            ),
+          );
+        }
+      },
+      onLongPress: () {
+        onSelect?.call();
+        HapticFeedback.heavyImpact();
+      },
+      child: Hero(
+        tag: asset.id,
+        child: Stack(
+          children: [
+            Container(
+              decoration: BoxDecoration(
+                border: multiselectEnabled && isSelected
+                    ? Border.all(
+                        color: Theme.of(context).primaryColorLight,
+                        width: 10,
+                      )
+                    : const Border(),
+              ),
+              child: CachedNetworkImage(
+                cacheKey: 'thumbnail-image-${asset.id}',
+                width: 300,
+                height: 300,
+                memCacheHeight: 200,
+                maxWidthDiskCache: 200,
+                maxHeightDiskCache: 200,
+                fit: BoxFit.cover,
+                imageUrl: thumbnailRequestUrl,
+                httpHeaders: {
+                  "Authorization": "Bearer ${box.get(accessTokenKey)}"
+                },
+                fadeInDuration: const Duration(milliseconds: 250),
+                progressIndicatorBuilder: (context, url, downloadProgress) {
+                  if (useGrayBoxPlaceholder) {
+                    return const DecoratedBox(
+                      decoration: BoxDecoration(color: Colors.grey),
+                    );
+                  }
+                  return Transform.scale(
+                    scale: 0.2,
+                    child: CircularProgressIndicator(
+                      value: downloadProgress.progress,
+                    ),
+                  );
+                },
+                errorWidget: (context, url, error) {
+                  debugPrint("Error getting thumbnail $url = $error");
+                  CachedNetworkImage.evictFromCache(thumbnailRequestUrl);
+
+                  return Icon(
+                    Icons.image_not_supported_outlined,
+                    color: Theme.of(context).primaryColor,
+                  );
+                },
+              ),
+            ),
+            if (multiselectEnabled)
+              Padding(
+                padding: const EdgeInsets.all(3.0),
+                child: Align(
+                  alignment: Alignment.topLeft,
+                  child: buildSelectionIcon(asset),
+                ),
+              ),
+            if (showStorageIndicator)
+              Positioned(
+                right: 10,
+                bottom: 5,
+                child: Icon(
+                  (deviceId != asset.deviceId)
+                      ? Icons.cloud_done_outlined
+                      : Icons.photo_library_rounded,
+                  color: Colors.white,
+                  size: 18,
+                ),
+              ),
+            if (asset.type != AssetTypeEnum.IMAGE)
+              Positioned(
+                top: 5,
+                right: 5,
+                child: Row(
+                  children: [
+                    Text(
+                      asset.duration.toString().substring(0, 7),
+                      style: const TextStyle(
+                        color: Colors.white,
+                        fontSize: 10,
+                      ),
+                    ),
+                    const Icon(
+                      Icons.play_circle_outline_rounded,
+                      color: Colors.white,
+                    ),
+                  ],
+                ),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+}
--- a/mobile/lib/modules/home/ui/asset_list_v2/daily_title_text.dart
+++ b/mobile/lib/modules/home/ui/asset_list_v2/daily_title_text.dart
@@ -1,107 +0,0 @@
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/modules/home/providers/home_page_state.provider.dart';
-import 'package:openapi/api.dart';
-
-class DailyTitleText extends ConsumerWidget {
-  const DailyTitleText({
-    Key? key,
-    required this.isoDate,
-    required this.assetGroup,
-  }) : super(key: key);
-
-  final String isoDate;
-  final List<AssetResponseDto> assetGroup;
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    var currentYear = DateTime.now().year;
-    var groupYear = DateTime.parse(isoDate).year;
-    var formatDateTemplate = currentYear == groupYear
-        ? "daily_title_text_date".tr()
-        : "daily_title_text_date_year".tr();
-    var dateText =
-        DateFormat(formatDateTemplate).format(DateTime.parse(isoDate));
-    var isMultiSelectEnable =
-        ref.watch(homePageStateProvider).isMultiSelectEnable;
-    var selectedDateGroup = ref.watch(homePageStateProvider).selectedDateGroup;
-    var selectedItems = ref.watch(homePageStateProvider).selectedItems;
-
-    void _handleTitleIconClick() {
-      if (isMultiSelectEnable &&
-          selectedDateGroup.contains(dateText) &&
-          selectedDateGroup.length == 1 &&
-          selectedItems.length <= assetGroup.length) {
-        // Multi select is active - click again on the icon while it is the only active group -> disable multi select
-        ref.watch(homePageStateProvider.notifier).disableMultiSelect();
-      } else if (isMultiSelectEnable &&
-          selectedDateGroup.contains(dateText) &&
-          selectedItems.length != assetGroup.length) {
-        // Multi select is active - click again on the icon while it is not the only active group -> remove that group from selected group/items
-        ref
-            .watch(homePageStateProvider.notifier)
-            .removeSelectedDateGroup(dateText);
-        ref
-            .watch(homePageStateProvider.notifier)
-            .removeMultipleSelectedItem(assetGroup);
-      } else if (isMultiSelectEnable &&
-          selectedDateGroup.contains(dateText) &&
-          selectedDateGroup.length > 1) {
-        ref
-            .watch(homePageStateProvider.notifier)
-            .removeSelectedDateGroup(dateText);
-        ref
-            .watch(homePageStateProvider.notifier)
-            .removeMultipleSelectedItem(assetGroup);
-      } else if (isMultiSelectEnable && !selectedDateGroup.contains(dateText)) {
-        ref
-            .watch(homePageStateProvider.notifier)
-            .addSelectedDateGroup(dateText);
-        ref
-            .watch(homePageStateProvider.notifier)
-            .addMultipleSelectedItems(assetGroup);
-      } else {
-        ref
-            .watch(homePageStateProvider.notifier)
-            .enableMultiSelect(assetGroup.toSet());
-        ref
-            .watch(homePageStateProvider.notifier)
-            .addSelectedDateGroup(dateText);
-      }
-    }
-
-    return Padding(
-      padding: const EdgeInsets.only(
-        top: 29.0,
-        bottom: 29.0,
-        left: 12.0,
-        right: 12.0,
-      ),
-      child: Row(
-        children: [
-          Text(
-            dateText,
-            style: const TextStyle(
-              fontSize: 14,
-              fontWeight: FontWeight.bold,
-            ),
-          ),
-          const Spacer(),
-          GestureDetector(
-            onTap: _handleTitleIconClick,
-            child: isMultiSelectEnable && selectedDateGroup.contains(dateText)
-                ? Icon(
-                    Icons.check_circle_rounded,
-                    color: Theme.of(context).primaryColor,
-                  )
-                : const Icon(
-                    Icons.check_circle_outline_rounded,
-                    color: Colors.grey,
-                  ),
-          )
-        ],
-      ),
-    );
-  }
-}
--- a/mobile/lib/modules/home/ui/asset_list_v2/immich_asset_grid.dart
+++ b/mobile/lib/modules/home/ui/asset_list_v2/immich_asset_grid.dart
@@ -1,167 +0,0 @@
-import 'dart:math';
-
-import 'package:collection/collection.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/src/widgets/framework.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/modules/home/providers/home_page_render_list_provider.dart';
-import 'package:immich_mobile/modules/home/ui/asset_list_v2/daily_title_text.dart';
-import 'package:immich_mobile/modules/home/ui/asset_list_v2/draggable_scrollbar_custom.dart';
-import 'package:openapi/api.dart';
-import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
-
-import '../thumbnail_image.dart';
-
-class ImmichAssetGrid extends HookConsumerWidget {
-  final ItemScrollController _itemScrollController = ItemScrollController();
-  final ItemPositionsListener _itemPositionsListener =
-      ItemPositionsListener.create();
-
-  final List<RenderAssetGridElement> renderList;
-  final int assetsPerRow;
-  final double margin;
-  final bool showStorageIndicator;
-
-  ImmichAssetGrid({
-    super.key,
-    required this.renderList,
-    required this.assetsPerRow,
-    required this.showStorageIndicator,
-    this.margin = 5.0,
-  });
-
-  List<AssetResponseDto> get _assets {
-    return renderList
-        .map((e) {
-          if (e.type == RenderAssetGridElementType.assetRow) {
-            return e.assetRow!.assets;
-          } else {
-            return List<AssetResponseDto>.empty();
-          }
-        })
-        .flattened
-        .toList();
-  }
-
-  double _getItemSize(BuildContext context) {
-    return MediaQuery.of(context).size.width / assetsPerRow -
-        margin * (assetsPerRow - 1) / assetsPerRow;
-  }
-
-  Widget _buildThumbnailOrPlaceholder(
-      AssetResponseDto asset, bool placeholder) {
-    if (placeholder) {
-      return const DecoratedBox(
-        decoration: BoxDecoration(color: Colors.grey),
-      );
-    }
-    return ThumbnailImage(
-      asset: asset,
-      assetList: _assets,
-      showStorageIndicator: showStorageIndicator,
-      useGrayBoxPlaceholder: true,
-    );
-  }
-
-  Widget _buildAssetRow(
-      BuildContext context, RenderAssetGridRow row, bool scrolling) {
-    double size = _getItemSize(context);
-
-    return Row(
-      key: Key("asset-row-${row.assets.first.id}"),
-      children: row.assets.map((AssetResponseDto asset) {
-        bool last = asset == row.assets.last;
-
-        return Container(
-          key: Key("asset-${asset.id}"),
-          width: size,
-          height: size,
-          margin: EdgeInsets.only(top: margin, right: last ? 0.0 : margin),
-          child: _buildThumbnailOrPlaceholder(asset, scrolling),
-        );
-      }).toList(),
-    );
-  }
-
-  Widget _buildTitle(
-      BuildContext context, String title, List<AssetResponseDto> assets) {
-    return DailyTitleText(
-      isoDate: title,
-      assetGroup: assets,
-    );
-  }
-
-  Widget _buildMonthTitle(BuildContext context, String title) {
-    var monthTitleText = DateFormat("monthly_title_text_date_format".tr())
-        .format(DateTime.parse(title));
-
-    return Padding(
-      key: Key("month-$title"),
-      padding: const EdgeInsets.only(left: 12.0, top: 32),
-      child: Text(
-        monthTitleText,
-        style: TextStyle(
-          fontSize: 26,
-          fontWeight: FontWeight.bold,
-          color: Theme.of(context).textTheme.headline1?.color,
-        ),
-      ),
-    );
-  }
-
-  Widget _itemBuilder(BuildContext c, int position, bool scrolling) {
-    final item = renderList[position];
-
-    if (item.type == RenderAssetGridElementType.dayTitle) {
-      return _buildTitle(c, item.title!, item.relatedAssetList!);
-    } else if (item.type == RenderAssetGridElementType.monthTitle) {
-      return _buildMonthTitle(c, item.title!);
-    } else if (item.type == RenderAssetGridElementType.assetRow) {
-      return _buildAssetRow(c, item.assetRow!, scrolling);
-    }
-
-    return const Text("Invalid widget type!");
-  }
-
-  Text _labelBuilder(int pos) {
-    final date = renderList[pos].date;
-    return Text(DateFormat.yMMMd().format(date),
-      style: const TextStyle(
-        color: Colors.white,
-        fontWeight: FontWeight.bold,
-      ),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final scrolling = useState(false);
-
-    void dragScrolling(bool active) {
-      scrolling.value = active;
-    }
-
-    Widget itemBuilder(BuildContext c, int position) {
-      return _itemBuilder(c, position, scrolling.value);
-    }
-
-    return DraggableScrollbar.semicircle(
-        scrollStateListener: dragScrolling,
-        itemPositionsListener: _itemPositionsListener,
-        controller: _itemScrollController,
-        backgroundColor: Theme.of(context).hintColor,
-        labelTextBuilder: _labelBuilder,
-        labelConstraints: const BoxConstraints(maxHeight: 28),
-        scrollbarAnimationDuration: const Duration(seconds: 1),
-        scrollbarTimeToFade: const Duration(seconds: 4),
-        child: ScrollablePositionedList.builder(
-          itemBuilder: itemBuilder,
-          itemPositionsListener: _itemPositionsListener,
-          itemScrollController: _itemScrollController,
-          itemCount: renderList.length,
-        ));
-  }
-}
--- a/mobile/lib/modules/home/ui/control_bottom_app_bar.dart
+++ b/mobile/lib/modules/home/ui/control_bottom_app_bar.dart
@@ -1,11 +1,15 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/modules/home/providers/home_page_state.provider.dart';
 import 'package:immich_mobile/modules/home/ui/delete_diaglog.dart';

 class ControlBottomAppBar extends ConsumerWidget {
-  const ControlBottomAppBar({Key? key}) : super(key: key);
+  final Function onShare;
+  final Function onDelete;
+
+  const ControlBottomAppBar(
+      {Key? key, required this.onShare, required this.onDelete})
+      : super(key: key);

  @override
  Widget build(BuildContext context, WidgetRef ref) {
@@ -36,7 +40,9 @@ class ControlBottomAppBar extends ConsumerWidget {
                      showDialog(
                        context: context,
                        builder: (BuildContext context) {
-                          return const DeleteDialog();
+                          return DeleteDialog(
+                            onDelete: onDelete,
+                          );
                        },
                      );
                    },
@@ -45,14 +51,7 @@ class ControlBottomAppBar extends ConsumerWidget {
                    iconData: Icons.share,
                    label: "control_bottom_app_bar_share".tr(),
                    onPressed: () {
-                      final homePageState = ref.watch(homePageStateProvider);
-                      ref.watch(homePageStateProvider.notifier).shareAssets(
-                            homePageState.selectedItems.toList(),
-                            context,
-                          );
-                      ref
-                          .watch(homePageStateProvider.notifier)
-                          .disableMultiSelect();
+                      onShare();
                    },
                  ),
                ],
--- a/mobile/lib/modules/home/ui/daily_title_text.dart
+++ b/mobile/lib/modules/home/ui/daily_title_text.dart
@@ -1,109 +0,0 @@
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/modules/home/providers/home_page_state.provider.dart';
-import 'package:openapi/api.dart';
-
-class DailyTitleText extends ConsumerWidget {
-  const DailyTitleText({
-    Key? key,
-    required this.isoDate,
-    required this.assetGroup,
-  }) : super(key: key);
-
-  final String isoDate;
-  final List<AssetResponseDto> assetGroup;
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    var currentYear = DateTime.now().year;
-    var groupYear = DateTime.parse(isoDate).year;
-    var formatDateTemplate = currentYear == groupYear
-        ? "daily_title_text_date".tr()
-        : "daily_title_text_date_year".tr();
-    var dateText = DateFormat(formatDateTemplate)
-        .format(DateTime.parse(isoDate).toLocal());
-    var isMultiSelectEnable =
-        ref.watch(homePageStateProvider).isMultiSelectEnable;
-    var selectedDateGroup = ref.watch(homePageStateProvider).selectedDateGroup;
-    var selectedItems = ref.watch(homePageStateProvider).selectedItems;
-
-    void _handleTitleIconClick() {
-      if (isMultiSelectEnable &&
-          selectedDateGroup.contains(dateText) &&
-          selectedDateGroup.length == 1 &&
-          selectedItems.length <= assetGroup.length) {
-        // Multi select is active - click again on the icon while it is the only active group -> disable multi select
-        ref.watch(homePageStateProvider.notifier).disableMultiSelect();
-      } else if (isMultiSelectEnable &&
-          selectedDateGroup.contains(dateText) &&
-          selectedItems.length != assetGroup.length) {
-        // Multi select is active - click again on the icon while it is not the only active group -> remove that group from selected group/items
-        ref
-            .watch(homePageStateProvider.notifier)
-            .removeSelectedDateGroup(dateText);
-        ref
-            .watch(homePageStateProvider.notifier)
-            .removeMultipleSelectedItem(assetGroup);
-      } else if (isMultiSelectEnable &&
-          selectedDateGroup.contains(dateText) &&
-          selectedDateGroup.length > 1) {
-        ref
-            .watch(homePageStateProvider.notifier)
-            .removeSelectedDateGroup(dateText);
-        ref
-            .watch(homePageStateProvider.notifier)
-            .removeMultipleSelectedItem(assetGroup);
-      } else if (isMultiSelectEnable && !selectedDateGroup.contains(dateText)) {
-        ref
-            .watch(homePageStateProvider.notifier)
-            .addSelectedDateGroup(dateText);
-        ref
-            .watch(homePageStateProvider.notifier)
-            .addMultipleSelectedItems(assetGroup);
-      } else {
-        ref
-            .watch(homePageStateProvider.notifier)
-            .enableMultiSelect(assetGroup.toSet());
-        ref
-            .watch(homePageStateProvider.notifier)
-            .addSelectedDateGroup(dateText);
-      }
-    }
-
-    return SliverToBoxAdapter(
-      child: Padding(
-        padding: const EdgeInsets.only(
-          top: 29.0,
-          bottom: 29.0,
-          left: 12.0,
-          right: 12.0,
-        ),
-        child: Row(
-          children: [
-            Text(
-              dateText,
-              style: const TextStyle(
-                fontSize: 14,
-                fontWeight: FontWeight.bold,
-              ),
-            ),
-            const Spacer(),
-            GestureDetector(
-              onTap: _handleTitleIconClick,
-              child: isMultiSelectEnable && selectedDateGroup.contains(dateText)
-                  ? Icon(
-                      Icons.check_circle_rounded,
-                      color: Theme.of(context).primaryColor,
-                    )
-                  : const Icon(
-                      Icons.check_circle_outline_rounded,
-                      color: Colors.grey,
-                    ),
-            )
-          ],
-        ),
-      ),
-    );
-  }
-}
--- a/mobile/lib/modules/home/ui/delete_diaglog.dart
+++ b/mobile/lib/modules/home/ui/delete_diaglog.dart
@@ -1,18 +1,17 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/shared/providers/asset.provider.dart';
-import 'package:immich_mobile/modules/home/providers/home_page_state.provider.dart';

 class DeleteDialog extends ConsumerWidget {
-  const DeleteDialog({Key? key}) : super(key: key);
+  final Function onDelete;
+
+  const DeleteDialog({Key? key, required this.onDelete}) : super(key: key);

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    final homePageState = ref.watch(homePageStateProvider);

    return AlertDialog(
-      backgroundColor: Colors.grey[200],
+      // backgroundColor: Colors.grey[200],
      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
      title: const Text("delete_dialog_title").tr(),
      content: const Text("delete_dialog_alert").tr(),
@@ -21,23 +20,25 @@ class DeleteDialog extends ConsumerWidget {
          onPressed: () {
            Navigator.of(context).pop();
          },
-          child: const Text(
+          child: Text(
            "delete_dialog_cancel",
-            style: TextStyle(color: Colors.blueGrey),
+            style: TextStyle(
+              color: Theme.of(context).primaryColor,
+              fontWeight: FontWeight.bold,
+            ),
          ).tr(),
        ),
        TextButton(
          onPressed: () {
-            ref
-                .watch(assetProvider.notifier)
-                .deleteAssets(homePageState.selectedItems);
-            ref.watch(homePageStateProvider.notifier).disableMultiSelect();
-
+            onDelete();
            Navigator.of(context).pop();
          },
          child: Text(
            "delete_dialog_ok",
-            style: TextStyle(color: Colors.red[400]),
+            style: TextStyle(
+              color: Colors.red[400],
+              fontWeight: FontWeight.bold,
+            ),
          ).tr(),
        ),
      ],
--- a/mobile/lib/modules/home/ui/image_grid.dart
+++ b/mobile/lib/modules/home/ui/image_grid.dart
@@ -1,47 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/modules/home/ui/thumbnail_image.dart';
-import 'package:openapi/api.dart';
-
-// ignore: must_be_immutable
-class ImageGrid extends ConsumerWidget {
-  final List<AssetResponseDto> assetGroup;
-  final List<AssetResponseDto> sortedAssetGroup;
-  final int tilesPerRow;
-  final bool showStorageIndicator;
-
-  ImageGrid({
-    Key? key,
-    required this.assetGroup,
-    required this.sortedAssetGroup,
-    this.tilesPerRow = 4,
-    this.showStorageIndicator = true,
-  }) : super(key: key);
-
-  List<AssetResponseDto> imageSortedList = [];
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    return SliverGrid(
-      gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-        crossAxisCount: tilesPerRow,
-        crossAxisSpacing: 5.0,
-        mainAxisSpacing: 5,
-      ),
-      delegate: SliverChildBuilderDelegate(
-        (BuildContext context, int index) {
-          var assetType = assetGroup[index].type;
-          return GestureDetector(
-            onTap: () {},
-            child: ThumbnailImage(
-              asset: assetGroup[index],
-              assetList: sortedAssetGroup,
-              showStorageIndicator: showStorageIndicator,
-            ),
-          );
-        },
-        childCount: assetGroup.length,
-      ),
-    );
-  }
-}
--- a/mobile/lib/modules/home/views/home_page.dart
+++ b/mobile/lib/modules/home/views/home_page.dart
@@ -2,22 +2,17 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/modules/home/providers/home_page_render_list_provider.dart';
-import 'package:immich_mobile/modules/home/providers/home_page_state.provider.dart';
+import 'package:immich_mobile/modules/home/providers/multiselect.provider.dart';
+import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid.dart';
 import 'package:immich_mobile/modules/home/ui/control_bottom_app_bar.dart';
-import 'package:immich_mobile/modules/home/ui/daily_title_text.dart';
-import 'package:immich_mobile/modules/home/ui/disable_multi_select_button.dart';
-import 'package:immich_mobile/modules/home/ui/draggable_scrollbar.dart';
-import 'package:immich_mobile/modules/home/ui/image_grid.dart';
-import 'package:immich_mobile/modules/home/ui/asset_list_v2/immich_asset_grid.dart';
 import 'package:immich_mobile/modules/home/ui/immich_sliver_appbar.dart';
-import 'package:immich_mobile/modules/home/ui/monthly_title_text.dart';
 import 'package:immich_mobile/modules/home/ui/profile_drawer/profile_drawer.dart';
 import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart';
 import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
-
 import 'package:immich_mobile/shared/providers/asset.provider.dart';
 import 'package:immich_mobile/shared/providers/server_info.provider.dart';
 import 'package:immich_mobile/shared/providers/websocket.provider.dart';
+import 'package:immich_mobile/shared/services/share.service.dart';
 import 'package:openapi/api.dart';

 class HomePage extends HookConsumerWidget {
@@ -26,22 +21,9 @@ class HomePage extends HookConsumerWidget {
  @override
  Widget build(BuildContext context, WidgetRef ref) {
    final appSettingService = ref.watch(appSettingsServiceProvider);
-
    var renderList = ref.watch(renderListProvider);
-
-    ScrollController scrollController = useScrollController();
-    var assetGroupByDateTime = ref.watch(assetGroupByDateTimeProvider);
-    List<Widget> imageGridGroup = [];
-    var isMultiSelectEnable =
-        ref.watch(homePageStateProvider).isMultiSelectEnable;
-    var homePageState = ref.watch(homePageStateProvider);
-    List<AssetResponseDto> sortedAssetList = [];
-    // set sorted List
-    for (var group in assetGroupByDateTime.values) {
-      for (var value in group) {
-        sortedAssetList.add(value);
-      }
-    }
+    final multiselectEnabled = ref.watch(multiselectProvider.notifier);
+    final selection = useState(<AssetResponseDto>{});

    useEffect(
      () {
@@ -57,115 +39,61 @@ class HomePage extends HookConsumerWidget {
      ref.read(assetProvider.notifier).getAllAsset();
    }

-    _buildSelectedItemCountIndicator() {
-      return DisableMultiSelectButton(
-        onPressed: ref.watch(homePageStateProvider.notifier).disableMultiSelect,
-        selectedItemCount: homePageState.selectedItems.length,
-      );
-    }
-
-    Widget _buildBody() {
-      if (assetGroupByDateTime.isNotEmpty) {
-        int? lastMonth;
-
-        assetGroupByDateTime.forEach((dateGroup, immichAssetList) {
-          try {
-            DateTime parseDateGroup = DateTime.parse(dateGroup);
-            int currentMonth = parseDateGroup.month;
-
-            if (lastMonth != null) {
-              if (currentMonth - lastMonth! != 0) {
-                imageGridGroup.add(
-                  MonthlyTitleText(
-                    isoDate: dateGroup,
-                  ),
-                );
-              }
-            }
-
-            imageGridGroup.add(
-              DailyTitleText(
-                key: Key('${dateGroup.toString()}title'),
-                isoDate: dateGroup,
-                assetGroup: immichAssetList,
-              ),
-            );
-
-            imageGridGroup.add(
-              ImageGrid(
-                assetGroup: immichAssetList,
-                sortedAssetGroup: sortedAssetList,
-                tilesPerRow:
-                    appSettingService.getSetting(AppSettingsEnum.tilesPerRow),
-                showStorageIndicator: appSettingService
-                    .getSetting(AppSettingsEnum.storageIndicator),
-              ),
-            );
-
-            lastMonth = currentMonth;
-          } catch (e) {
-            debugPrint(
-              "[ERROR] Cannot parse $dateGroup - Wrong create date format : ${immichAssetList.map((asset) => asset.createdAt).toList()}",
-            );
-          }
-        });
+    Widget buildBody() {
+      void selectionListener(
+        bool multiselect,
+        Set<AssetResponseDto> selectedAssets,
+      ) {
+        multiselectEnabled.state = multiselect;
+        selection.value = selectedAssets;
      }

-      _buildSliverAppBar() {
-        return isMultiSelectEnable
-            ? const SliverToBoxAdapter(
-                child: SizedBox(
-                  height: 70,
-                  child: null,
-                ),
-              )
-            : ImmichSliverAppBar(
-                onPopBack: reloadAllAsset,
-              );
+      void onShareAssets() {
+        ref.watch(shareServiceProvider).shareAssets(selection.value.toList());
+        multiselectEnabled.state = false;
      }

-      _buildAssetGrid() {
-        if (appSettingService
-            .getSetting(AppSettingsEnum.useExperimentalAssetGrid)) {
-          return ImmichAssetGrid(
-              renderList: renderList,
-              assetsPerRow:
-              appSettingService.getSetting(AppSettingsEnum.tilesPerRow),
-              showStorageIndicator: appSettingService
-                  .getSetting(AppSettingsEnum.storageIndicator),
-            );
-        } else {
-          return DraggableScrollbar.semicircle(
-            backgroundColor: Theme.of(context).hintColor,
-            controller: scrollController,
-            heightScrollThumb: 48.0,
-            child: CustomScrollView(
-              controller: scrollController,
-              slivers: [
-                ...imageGridGroup,
-              ],
-            ),
-          );
-        }
+      void onDelete() {
+        ref.watch(assetProvider.notifier).deleteAssets(selection.value);
+        multiselectEnabled.state = false;
      }

      return SafeArea(
-        bottom: !isMultiSelectEnable,
-        top: !isMultiSelectEnable,
+        bottom: !multiselectEnabled.state,
+        top: !multiselectEnabled.state,
        child: Stack(
          children: [
            CustomScrollView(
              slivers: [
-                _buildSliverAppBar(),
+                multiselectEnabled.state
+                    ? const SliverToBoxAdapter(
+                        child: SizedBox(
+                          height: 70,
+                          child: null,
+                        ),
+                      )
+                    : ImmichSliverAppBar(
+                        onPopBack: reloadAllAsset,
+                      ),
              ],
            ),
            Padding(
              padding: const EdgeInsets.only(top: 60.0, bottom: 0.0),
-              child: _buildAssetGrid(),
+              child: ImmichAssetGrid(
+                renderList: renderList,
+                assetsPerRow:
+                    appSettingService.getSetting(AppSettingsEnum.tilesPerRow),
+                showStorageIndicator: appSettingService
+                    .getSetting(AppSettingsEnum.storageIndicator),
+                listener: selectionListener,
+                selectionActive: multiselectEnabled.state,
+              ),
            ),
-            if (isMultiSelectEnable) ...[
-              _buildSelectedItemCountIndicator(),
-              const ControlBottomAppBar(),
+            if (multiselectEnabled.state) ...[
+              ControlBottomAppBar(
+                onShare: onShareAssets,
+                onDelete: onDelete,
+              ),
            ],
          ],
        ),
@@ -174,7 +102,7 @@ class HomePage extends HookConsumerWidget {

    return Scaffold(
      drawer: const ProfileDrawer(),
-      body: _buildBody(),
+      body: buildBody(),
    );
  }
 }
--- a/mobile/lib/modules/login/providers/authentication.provider.dart
+++ b/mobile/lib/modules/login/providers/authentication.provider.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:hive/hive.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/hive_box.dart';
@@ -120,6 +121,7 @@ class AuthenticationNotifier extends StateNotifier<AuthenticationState> {
            .delete(savedLoginInfoKey);
      }
    } catch (e) {
+      HapticFeedback.vibrate();
      debugPrint("Error logging in $e");
      return false;
    }
--- a/mobile/lib/modules/login/ui/change_password_form.dart
+++ b/mobile/lib/modules/login/ui/change_password_form.dart
@@ -142,8 +142,8 @@ class ChangePasswordButton extends ConsumerWidget {
    return ElevatedButton(
      style: ElevatedButton.styleFrom(
        visualDensity: VisualDensity.standard,
-        primary: Theme.of(context).primaryColor,
-        onPrimary: Colors.grey[50],
+        backgroundColor: Theme.of(context).primaryColor,
+        foregroundColor: Colors.grey[50],
        elevation: 2,
        padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 25),
      ),
--- a/mobile/lib/modules/login/ui/login_form.dart
+++ b/mobile/lib/modules/login/ui/login_form.dart
@@ -203,8 +203,8 @@ class LoginButton extends ConsumerWidget {
    return ElevatedButton(
      style: ElevatedButton.styleFrom(
        visualDensity: VisualDensity.standard,
-        primary: Theme.of(context).primaryColor,
-        onPrimary: Colors.grey[50],
+        backgroundColor: Theme.of(context).primaryColor,
+        foregroundColor: Colors.grey[50],
        elevation: 2,
        padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 25),
      ),
--- a/mobile/lib/modules/search/providers/search_result_page.provider.dart
+++ b/mobile/lib/modules/search/providers/search_result_page.provider.dart
@@ -1,8 +1,11 @@
 import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structure.dart';
 import 'package:immich_mobile/modules/search/models/search_result_page_state.model.dart';

 import 'package:immich_mobile/modules/search/services/search.service.dart';
+import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart';
+import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
 import 'package:intl/intl.dart';
 import 'package:openapi/api.dart';

@@ -66,3 +69,12 @@ final searchResultGroupByDateTimeProvider = StateProvider((ref) {
        .format(DateTime.parse(element.createdAt).toLocal()),
  );
 });
+
+final searchRenderListProvider = StateProvider((ref) {
+  var assetGroups = ref.watch(searchResultGroupByDateTimeProvider);
+
+  var settings = ref.watch(appSettingsServiceProvider);
+  final assetsPerRow = settings.getSetting(AppSettingsEnum.tilesPerRow);
+
+  return assetGroupsToRenderList(assetGroups, assetsPerRow);
+});
--- a/mobile/lib/modules/search/views/search_result_page.dart
+++ b/mobile/lib/modules/search/views/search_result_page.dart
@@ -4,14 +4,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/modules/home/ui/daily_title_text.dart';
-import 'package:immich_mobile/modules/home/ui/draggable_scrollbar.dart';
-import 'package:immich_mobile/modules/home/ui/image_grid.dart';
-import 'package:immich_mobile/modules/home/ui/monthly_title_text.dart';
+import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid.dart';
 import 'package:immich_mobile/modules/search/providers/search_page_state.provider.dart';
 import 'package:immich_mobile/modules/search/providers/search_result_page.provider.dart';
 import 'package:immich_mobile/modules/search/ui/search_suggestion_list.dart';
-import 'package:openapi/api.dart';
+import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart';
+import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';

 class SearchResultPage extends HookConsumerWidget {
  const SearchResultPage({Key? key, required this.searchTerm})
@@ -21,17 +19,12 @@ class SearchResultPage extends HookConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    ScrollController scrollController = useScrollController();
    final searchTermController = useTextEditingController(text: "");
    final isNewSearch = useState(false);
    final currentSearchTerm = useState(searchTerm);

-    final List<Widget> imageGridGroup = [];
-
    FocusNode? searchFocusNode;

-    List<AssetResponseDto> sortedAssetList = [];
-
    useEffect(
      () {
        searchFocusNode = FocusNode();
@@ -117,7 +110,12 @@ class SearchResultPage extends HookConsumerWidget {

    _buildSearchResult() {
      var searchResultPageState = ref.watch(searchResultPageProvider);
-      var assetGroupByDateTime = ref.watch(searchResultGroupByDateTimeProvider);
+      var searchResultRenderList = ref.watch(searchRenderListProvider);
+
+      var settings = ref.watch(appSettingsServiceProvider);
+      final assetsPerRow = settings.getSetting(AppSettingsEnum.tilesPerRow);
+      final showStorageIndicator =
+          settings.getSetting(AppSettingsEnum.storageIndicator);

      if (searchResultPageState.isError) {
        return const Text("Error");
@@ -132,57 +130,11 @@ class SearchResultPage extends HookConsumerWidget {
      }

      if (searchResultPageState.isSuccess) {
-        if (searchResultPageState.searchResult.isNotEmpty) {
-          int? lastMonth;
-          // set sorted List
-          for (var group in assetGroupByDateTime.values) {
-            for (var value in group) {
-              sortedAssetList.add(value);
-            }
-          }
-          assetGroupByDateTime.forEach((dateGroup, immichAssetList) {
-            DateTime parseDateGroup = DateTime.parse(dateGroup);
-            int currentMonth = parseDateGroup.month;
-
-            if (lastMonth != null) {
-              if (currentMonth - lastMonth! != 0) {
-                imageGridGroup.add(
-                  MonthlyTitleText(
-                    isoDate: dateGroup,
-                  ),
-                );
-              }
-            }
-
-            imageGridGroup.add(
-              DailyTitleText(
-                isoDate: dateGroup,
-                assetGroup: immichAssetList,
-              ),
-            );
-
-            imageGridGroup.add(
-              ImageGrid(
-                assetGroup: immichAssetList,
-                sortedAssetGroup: sortedAssetList,
-              ),
-            );
-
-            lastMonth = currentMonth;
-          });
-
-          return DraggableScrollbar.semicircle(
-            backgroundColor: Theme.of(context).hintColor,
-            controller: scrollController,
-            heightScrollThumb: 48.0,
-            child: CustomScrollView(
-              controller: scrollController,
-              slivers: [...imageGridGroup],
-            ),
-          );
-        } else {
-          return const Text("No assets found");
-        }
+        return ImmichAssetGrid(
+          renderList: searchResultRenderList,
+          assetsPerRow: assetsPerRow,
+          showStorageIndicator: showStorageIndicator,
+        );
      }

      return const SizedBox();
--- a/mobile/lib/modules/settings/ui/experimental_settings/experimental_settings.dart
+++ b/mobile/lib/modules/settings/ui/experimental_settings/experimental_settings.dart
@@ -1,11 +1,6 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart';
-import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
-import 'package:immich_mobile/shared/ui/immich_toast.dart';

 class ExperimentalSettings extends HookConsumerWidget {
  const ExperimentalSettings({
@@ -14,33 +9,6 @@ class ExperimentalSettings extends HookConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    final appSettingService = ref.watch(appSettingsServiceProvider);
-
-    final useExperimentalAssetGrid = useState(false);
-
-    useEffect(
-      () {
-        useExperimentalAssetGrid.value = appSettingService
-            .getSetting(AppSettingsEnum.useExperimentalAssetGrid);
-        return null;
-      },
-      [],
-    );
-
-    void changeUseExperimentalAssetGrid(bool status) {
-      useExperimentalAssetGrid.value = status;
-      appSettingService.setSetting(
-        AppSettingsEnum.useExperimentalAssetGrid,
-        status,
-      );
-
-      ImmichToast.show(
-        context: context,
-        msg: "settings_require_restart".tr(),
-        gravity: ToastGravity.BOTTOM,
-      );
-    }
-
    return ExpansionTile(
      textColor: Theme.of(context).primaryColor,
      title: const Text(
@@ -55,25 +23,25 @@ class ExperimentalSettings extends HookConsumerWidget {
          fontSize: 13,
        ),
      ).tr(),
-      children: [
-        SwitchListTile.adaptive(
-          activeColor: Theme.of(context).primaryColor,
-          title: const Text(
-            "experimental_settings_new_asset_list_title",
-            style: TextStyle(
-              fontSize: 12,
-              fontWeight: FontWeight.bold,
-            ),
-          ).tr(),
-          subtitle: const Text(
-            "experimental_settings_new_asset_list_subtitle",
-            style: TextStyle(
-              fontSize: 12,
-            ),
-          ).tr(),
-          value: useExperimentalAssetGrid.value,
-          onChanged: changeUseExperimentalAssetGrid,
-        ),
+      children: const [
+        // SwitchListTile.adaptive(
+        //   activeColor: Theme.of(context).primaryColor,
+        //   title: const Text(
+        //     "experimental_settings_new_asset_list_title",
+        //     style: TextStyle(
+        //       fontSize: 12,
+        //       fontWeight: FontWeight.bold,
+        //     ),
+        //   ).tr(),
+        //   subtitle: const Text(
+        //     "experimental_settings_new_asset_list_subtitle",
+        //     style: TextStyle(
+        //       fontSize: 12,
+        //     ),
+        //   ).tr(),
+        //   value: useExperimentalAssetGrid.value,
+        //   onChanged: changeUseExperimentalAssetGrid,
+        // ),
      ],
    );
  }
--- a/mobile/lib/modules/settings/views/settings_page.dart
+++ b/mobile/lib/modules/settings/views/settings_page.dart
@@ -43,7 +43,7 @@ class SettingsPage extends HookConsumerWidget {
              const ThemeSetting(),
              const AssetListSettings(),
              if (Platform.isAndroid) const NotificationSetting(),
-              const ExperimentalSettings(),
+              //const ExperimentalSettings(),
            ],
          ).toList(),
        ],
--- a/mobile/lib/shared/views/tab_controller_page.dart
+++ b/mobile/lib/shared/views/tab_controller_page.dart
@@ -1,8 +1,9 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/modules/home/providers/home_page_state.provider.dart';
+import 'package:immich_mobile/modules/home/providers/multiselect.provider.dart';
 import 'package:immich_mobile/routing/router.dart';

 class TabControllerPage extends ConsumerWidget {
@@ -10,8 +11,7 @@ class TabControllerPage extends ConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    var isMultiSelectEnable =
-        ref.watch(homePageStateProvider).isMultiSelectEnable;
+    final multiselectEnabled = ref.watch(multiselectProvider);

    return AutoTabsRouter(
      routes: [
@@ -32,7 +32,7 @@ class TabControllerPage extends ConsumerWidget {
              opacity: animation,
              child: child,
            ),
-            bottomNavigationBar: isMultiSelectEnable
+            bottomNavigationBar: multiselectEnabled
                ? null
                : BottomNavigationBar(
                    selectedLabelStyle: const TextStyle(
@@ -45,6 +45,7 @@ class TabControllerPage extends ConsumerWidget {
                    ),
                    currentIndex: tabsRouter.activeIndex,
                    onTap: (index) {
+                      HapticFeedback.selectionClick();
                      tabsRouter.setActiveIndex(index);
                    },
                    items: [
--- a/mobile/lib/shared/views/version_announcement_overlay.dart
+++ b/mobile/lib/shared/views/version_announcement_overlay.dart
@@ -103,8 +103,8 @@ class VersionAnnouncementOverlay extends HookConsumerWidget {
                                style: ElevatedButton.styleFrom(
                                  shape: const StadiumBorder(),
                                  visualDensity: VisualDensity.standard,
-                                  primary: Colors.indigo,
-                                  onPrimary: Colors.grey[50],
+                                  backgroundColor: Colors.indigo,
+                                  foregroundColor: Colors.grey[50],
                                  elevation: 2,
                                  padding: const EdgeInsets.symmetric(
                                    vertical: 10,
--- a/mobile/lib/utils/image_url_builder.dart
+++ b/mobile/lib/utils/image_url_builder.dart
@@ -25,9 +25,11 @@ String getImageUrl(final AssetResponseDto asset) {
  return '${box.get(serverEndpointKey)}/asset/file?aid=${asset.deviceAssetId}&did=${asset.deviceId}&isThumb=false';
 }

-String _getThumbnailUrl(final String id,
-    {ThumbnailFormat type = ThumbnailFormat.WEBP}) {
+String _getThumbnailUrl(
+  final String id, {
+  ThumbnailFormat type = ThumbnailFormat.WEBP,
+}) {
  final box = Hive.box(userInfoBox);

-  return '${box.get(serverEndpointKey)}/asset/thumbnail/${id}?format=${type.value}';
+  return '${box.get(serverEndpointKey)}/asset/thumbnail/$id?format=${type.value}';
 }
--- a/mobile/lib/utils/immich_app_theme.dart
+++ b/mobile/lib/utils/immich_app_theme.dart
@@ -72,8 +72,8 @@ ThemeData immichDarkTheme = ThemeData(
  cardColor: Colors.grey[900],
  elevatedButtonTheme: ElevatedButtonThemeData(
    style: ElevatedButton.styleFrom(
-      onPrimary: Colors.black87,
-      primary: immichDarkThemePrimaryColor,
+      foregroundColor: Colors.black87,
+      backgroundColor: immichDarkThemePrimaryColor,
    ),
  ),
 );
@@ -126,8 +126,8 @@ ThemeData immichLightTheme = ThemeData(
  ),
  elevatedButtonTheme: ElevatedButtonThemeData(
    style: ElevatedButton.styleFrom(
-      primary: Colors.indigo,
-      onPrimary: Colors.white,
+      backgroundColor: Colors.indigo,
+      foregroundColor: Colors.white,
    ),
  ),
 );
--- a/mobile/lib/utils/immich_cache_info_repository.dart
+++ b/mobile/lib/utils/immich_cache_info_repository.dart
@@ -112,8 +112,10 @@ class ImmichCacheInfoRepository extends ImmichCacheRepository {
  }

  @override
-  Future<CacheObject> insert(CacheObject cacheObject,
-      {bool setTouchedToNow = true}) async {
+  Future<CacheObject> insert(
+    CacheObject cacheObject, {
+    bool setTouchedToNow = true,
+  }) async {
    int newId = keyLookupHiveBox.length == 0
        ? 0
        : keyLookupHiveBox.values.reduce(max) + 1;
@@ -144,8 +146,10 @@ class ImmichCacheInfoRepository extends ImmichCacheRepository {
  }

  @override
-  Future<int> update(CacheObject cacheObject,
-      {bool setTouchedToNow = true}) async {
+  Future<int> update(
+    CacheObject cacheObject, {
+    bool setTouchedToNow = true,
+  }) async {
    if (cacheObject.id != null) {
      cacheObjectLookupBox.put(cacheObject.id, cacheObject.toMap());
      return 1;
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -2,7 +2,7 @@ name: immich_mobile
 description: Immich - selfhosted backup media file on mobile phone

 publish_to: "none"
-version: 1.31.0+49
+version: 1.32.0+50

 environment:
  sdk: ">=2.17.0 <3.0.0"
--- a/mobile/test/asset_grid_data_structure_test.dart
+++ b/mobile/test/asset_grid_data_structure_test.dart
@@ -0,0 +1,159 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structure.dart';
+import 'package:openapi/api.dart';
+
+void main() {
+  final List<AssetResponseDto> testAssets = [];
+
+  for (int i = 0; i < 150; i++) {
+    int month = i ~/ 31;
+    int day = (i % 31).toInt();
+
+    DateTime date = DateTime(2022, month, day);
+
+    testAssets.add(AssetResponseDto(
+      type: AssetTypeEnum.IMAGE,
+      id: '$i',
+      deviceAssetId: '',
+      ownerId: '',
+      deviceId: '',
+      originalPath: '',
+      resizePath: '',
+      createdAt: date.toIso8601String(),
+      modifiedAt: date.toIso8601String(),
+      isFavorite: false,
+      mimeType: 'image/jpeg',
+      duration: '',
+      webpPath: '',
+      encodedVideoPath: '',
+    ));
+  }
+
+  final Map<String, List<AssetResponseDto>> groups = {
+    '2022-01-05': testAssets.sublist(0, 5).map((e) {
+      e.createdAt = DateTime(2022, 1, 5).toIso8601String();
+      return e;
+    }).toList(),
+    '2022-01-10': testAssets.sublist(5, 10).map((e) {
+      e.createdAt = DateTime(2022, 1, 10).toIso8601String();
+      return e;
+    }).toList(),
+    '2022-02-17': testAssets.sublist(10, 15).map((e) {
+      e.createdAt = DateTime(2022, 2, 17).toIso8601String();
+      return e;
+    }).toList(),
+    '2022-10-15': testAssets.sublist(15, 30).map((e) {
+      e.createdAt = DateTime(2022, 10, 15).toIso8601String();
+      return e;
+    }).toList()
+  };
+
+  group('Asset only list', () {
+    test('items < itemsPerRow', () {
+      final assets = testAssets.sublist(0, 2);
+      final renderList = assetsToRenderList(assets, 3);
+
+      expect(renderList.length, 1);
+      expect(renderList[0].assetRow!.assets.length, 2);
+    });
+
+    test('items = itemsPerRow', () {
+      final assets = testAssets.sublist(0, 3);
+      final renderList = assetsToRenderList(assets, 3);
+
+      expect(renderList.length, 1);
+      expect(renderList[0].assetRow!.assets.length, 3);
+    });
+
+    test('items > itemsPerRow', () {
+      final assets = testAssets.sublist(0, 20);
+      final renderList = assetsToRenderList(assets, 3);
+
+      expect(renderList.length, 7);
+      expect(renderList[6].assetRow!.assets.length, 2);
+    });
+
+    test('items > itemsPerRow partition 4', () {
+      final assets = testAssets.sublist(0, 21);
+      final renderList = assetsToRenderList(assets, 4);
+
+      expect(renderList.length, 6);
+      expect(renderList[5].assetRow!.assets.length, 1);
+    });
+
+    test('items > itemsPerRow check ids', () {
+      final assets = testAssets.sublist(0, 21);
+      final renderList = assetsToRenderList(assets, 3);
+
+      expect(renderList.length, 7);
+      expect(renderList[6].assetRow!.assets.length, 3);
+      expect(renderList[0].assetRow!.assets[0].id, '0');
+      expect(renderList[1].assetRow!.assets[1].id, '4');
+      expect(renderList[3].assetRow!.assets[2].id, '11');
+      expect(renderList[6].assetRow!.assets[2].id, '20');
+    });
+  });
+
+  group('Test grouped', () {
+    test('test grouped check months', () {
+      final renderList = assetGroupsToRenderList(groups, 3);
+
+      // Jan
+      // Day 1
+      // 5 Assets => 2 Rows
+      // Day 2
+      // 5 Assets => 2 Rows
+      // Feb
+      // Day 1
+      // 5 Assets => 2 Rows
+      // Oct
+      // Day 1
+      // 15 Assets => 5 Rows
+      expect(renderList.length, 18);
+      expect(renderList[0].type, RenderAssetGridElementType.monthTitle);
+      expect(renderList[0].date.month, 1);
+      expect(renderList[7].type, RenderAssetGridElementType.monthTitle);
+      expect(renderList[7].date.month, 2);
+      expect(renderList[11].type, RenderAssetGridElementType.monthTitle);
+      expect(renderList[11].date.month, 10);
+    });
+
+    test('test grouped check types', () {
+      final renderList = assetGroupsToRenderList(groups, 5);
+
+      // Jan
+      // Day 1
+      // 5 Assets
+      // Day 2
+      // 5 Assets
+      // Feb
+      // Day 1
+      // 5 Assets
+      // Oct
+      // Day 1
+      // 15 Assets => 3 Rows
+
+      final types = [
+        RenderAssetGridElementType.monthTitle,
+        RenderAssetGridElementType.dayTitle,
+        RenderAssetGridElementType.assetRow,
+        RenderAssetGridElementType.dayTitle,
+        RenderAssetGridElementType.assetRow,
+        RenderAssetGridElementType.monthTitle,
+        RenderAssetGridElementType.dayTitle,
+        RenderAssetGridElementType.assetRow,
+        RenderAssetGridElementType.monthTitle,
+        RenderAssetGridElementType.dayTitle,
+        RenderAssetGridElementType.assetRow,
+        RenderAssetGridElementType.assetRow,
+        RenderAssetGridElementType.assetRow
+      ];
+
+      expect(renderList.length, types.length);
+
+      for (int i = 0; i < renderList.length; i++) {
+        expect(renderList[i].type, types[i]);
+      }
+    });
+  });
+}
--- a/server/apps/immich/src/constants/server_version.constant.ts
+++ b/server/apps/immich/src/constants/server_version.constant.ts
@@ -10,7 +10,7 @@ export interface IServerVersion {

 export const serverVersion: IServerVersion = {
  major: 1,
-  minor: 31,
+  minor: 32,
  patch: 0,
-  build: 49,
+  build: 50,
 };
--- a/server/libs/common/src/config/app.config.ts
+++ b/server/libs/common/src/config/app.config.ts
@@ -1,5 +1,20 @@
+import { Logger } from '@nestjs/common';
 import { ConfigModuleOptions } from '@nestjs/config';
 import Joi from 'joi';
+import { createSecretKey, generateKeySync } from 'node:crypto'
+
+const jwtSecretValidator: Joi.CustomValidator<string> = (value, ) => {
+  const key = createSecretKey(value, "base64")
+  const keySizeBits = (key.symmetricKeySize ?? 0) * 8
+
+  if (keySizeBits < 128) {
+    const newKey = generateKeySync('hmac', { length: 256 }).export().toString('base64')
+    Logger.warn("The current JWT_SECRET key is insecure. It should be at least 128 bits long!")
+    Logger.warn(`Here is a new, securely generated key that you can use instead: ${newKey}`)
+  }
+
+  return value;
+}

 export const immichAppConfig: ConfigModuleOptions = {
  envFilePath: '.env',
@@ -9,7 +24,7 @@ export const immichAppConfig: ConfigModuleOptions = {
    DB_USERNAME: Joi.string().required(),
    DB_PASSWORD: Joi.string().required(),
    DB_DATABASE_NAME: Joi.string().required(),
-    JWT_SECRET: Joi.string().required(),
+    JWT_SECRET: Joi.string().required().custom(jwtSecretValidator),
    DISABLE_REVERSE_GEOCODING: Joi.boolean().optional().valid(true, false).default(false),
    REVERSE_GEOCODING_PRECISION: Joi.number().optional().valid(0,1,2,3).default(3),
    LOG_LEVEL: Joi.string().optional().valid('simple', 'verbose').default('simple'),
Author	SHA1	Message	Date
Alex Tran	c271f0c224	Up version for release	2022-10-14 16:21:26 -05:00
Alex	a7f14dc103	feat(mobile): cosmetic update	2022-10-14 16:17:14 -05:00
Alex Tran	f05d5bdb9e	Added haptic feedback to incorect login	2022-10-14 16:13:35 -05:00
Alex Tran	e99c400f59	Added haptic feedback to tab bar switching	2022-10-14 16:04:21 -05:00
Alex Tran	e38166837d	Merge branch 'main' of github.com:immich-app/immich into dev/mobile-cosmetic-improvement	2022-10-14 15:58:26 -05:00
Alex	d43a08eb71	feat(mobile) integrate new grid system to upstream	2022-10-14 15:39:16 -05:00
Alex Tran	293e713af6	Hide bottom app bar when multiselect enabled	2022-10-14 15:37:15 -05:00
Alex Tran	03866b4c31	Merge branch 'feature/albums-new-grid' of github.com:immich-app/immich into feature/albums-new-grid	2022-10-14 14:52:07 -05:00
Alex Tran	4f2c08525f	Merge upstream	2022-10-14 14:52:00 -05:00
Matthias Rupp	2c12f53937	Fix storage indicator settings	2022-10-14 21:17:23 +02:00
Alex Tran	c88e5f9be2	Add haptic feedback on swiping asset	2022-10-14 11:26:10 -05:00
Alex Tran	0f51a9794e	fixed delete dialog colors	2022-10-14 11:15:19 -05:00
Alex Tran	edd1f49e57	Update text for foreground backup to make things clearer	2022-10-14 10:50:40 -05:00
Alex	4df0cf2d07	Merge pull request #821 from immich-app/feature/jwt-bits-warning Log a warning if JWT_SECRET key does not have enough bits	2022-10-14 08:42:27 -05:00
bo0tzz	87ba99755b	Remove unused variable	2022-10-13 22:17:31 +02:00
bo0tzz	c03f860f8e	Log a warning if JWT_SECRET key does not have enough bits	2022-10-13 21:54:29 +02:00
Alex	f2e0e3f345	Merge pull request #820 from immich-app/dependabot/github_actions/docker/setup-qemu-action-2.1.0 chore(deps): bump docker/setup-qemu-action from 2.0.0 to 2.1.0	2022-10-13 08:44:37 -05:00
dependabot[bot]	fee652dfd7	chore(deps): bump docker/setup-qemu-action from 2.0.0 to 2.1.0 Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 2.0.0 to 2.1.0. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](https://github.com/docker/setup-qemu-action/compare/v2.0.0...v2.1.0) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-10-13 10:55:56 +00:00
Alex	839446a88d	Merge pull request #816 from immich-app/dependabot/github_actions/docker/build-push-action-3.2.0 chore(deps): bump docker/build-push-action from 3.1.1 to 3.2.0	2022-10-12 08:50:14 -05:00
Alex	028b8c8bcc	Merge pull request #815 from immich-app/dependabot/github_actions/docker/setup-buildx-action-2.1.0 chore(deps): bump docker/setup-buildx-action from 2.0.0 to 2.1.0	2022-10-12 08:50:02 -05:00
dependabot[bot]	64b1d4ca3b	chore(deps): bump docker/build-push-action from 3.1.1 to 3.2.0 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3.1.1 to 3.2.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v3.1.1...v3.2.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-10-12 10:47:08 +00:00
dependabot[bot]	c6cbee6563	chore(deps): bump docker/setup-buildx-action from 2.0.0 to 2.1.0 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2.0.0 to 2.1.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v2.0.0...v2.1.0) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2022-10-12 10:47:05 +00:00
Alex	a406f6e7cc	feat(server): Remove default JWT_SECRET value in .env	2022-10-12 03:52:06 -05:00
bo0tzz	9869b92c2b	Generate random JWT_SECRET value in install.sh	2022-10-12 09:34:10 +02:00
bo0tzz	00549eed79	Uncomment JWT_SECRET in default .env Co-authored-by: Alex <alex.tran1502@gmail.com>	2022-10-12 09:18:43 +02:00
bo0tzz	0c4968dc30	Fix: Remove default JWT_SECRET value in .env	2022-10-11 21:13:37 +02:00
Alex	704335c898	Merge pull request #801 from EvilOlaf/patch-1	2022-10-10 05:06:07 -05:00
Werner	ec74feea5a	Typo/minor cosmetics	2022-10-10 07:46:23 +02:00
Matthias Rupp	6ab6507db9	Revert changes to albums	2022-10-08 13:18:45 +02:00
Matthias Rupp	3c807ae86e	Exernalize multiselect state	2022-10-08 13:08:56 +02:00
Matthias Rupp	6b84534632	Get rid of home page state provider	2022-10-06 22:41:56 +02:00
Matthias Rupp	a117e897ca	Move selection logic to asset grid class	2022-10-01 19:19:40 +02:00
Matthias Rupp	347ac70063	Make new asset grid the default	2022-10-01 10:38:11 +02:00
Matthias Rupp	50842ef815	Add tests	2022-09-30 11:38:00 +02:00
Matthias Rupp	1970a64f6f	Use new asset grid for search result page	2022-09-30 11:05:54 +02:00
Matthias Rupp	dd71a53f5e	Hide scroll handle for lists < 100 assets	2022-09-30 10:47:31 +02:00
Matthias Rupp	8440d9890c	Improve scrolling performance in albums and search	2022-09-29 21:53:35 +02:00