Merge pull request #799 from AnTheMaker/patch-1

Update local-reverse-geocoder to 0.12.5

.github/workflows/build_push_docker_staging.yml

@@ -2,8 +2,6 @@ name: Build and Push Docker Image - Staging
 
 on:
   workflow_dispatch:
-  push:
-    branches: [main]
   pull_request:
     branches: [main]
 
@@ -38,6 +36,7 @@ jobs:
           push: ${{ github.event_name == 'pull_request' && github.repository == 'immich-app/immich' }}
           tags: |
             altran1502/immich-server:staging
+            altran1502/immich-server:${{ github.event.pull_request.number }}
 
   build_and_push_machine_learning_staging:
     runs-on: ubuntu-latest
@@ -67,6 +66,7 @@ jobs:
           push: ${{ github.event_name == 'pull_request' && github.repository == 'immich-app/immich' }}
           tags: |
             altran1502/immich-machine-learning:staging
+            altran1502/immich-machine-learning:${{ github.event.pull_request.number }}
 
   build_and_push_web_staging:
     runs-on: ubuntu-latest
@@ -96,6 +96,7 @@ jobs:
           push: ${{ github.event_name == 'pull_request' && github.repository == 'immich-app/immich' }}
           tags: |
             altran1502/immich-web:staging
+            altran1502/immich-web:${{ github.event.pull_request.number }}
 
   build_and_push_nginx_staging:
     runs-on: ubuntu-latest
@@ -124,3 +125,4 @@ jobs:
           push: ${{ github.event_name == 'pull_request' && github.repository == 'immich-app/immich' }}
           tags: |
             altran1502/immich-proxy:staging
+            altran1502/immich-proxy:${{ github.event.pull_request.number }}

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,74 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "main" ]
+  schedule:
+    - cron: '20 13 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript', 'python' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+        
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/openapi-generator.yml

@@ -0,0 +1,83 @@
+name: Generate OpenAPI SDK
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [main]
+
+jobs:
+  generate-typescript-axios:
+    runs-on: ubuntu-latest
+    name: OpenAPI Generator
+    steps:
+      # Checkout your code
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.GH_TOKEN }}
+
+      # Use the action to generate a client package
+      # This uses the default path for the openapi document and thus assumes there is an openapi.json in the current workspace.
+      - name: Generate Typescript Axios Client
+        uses: openapi-generators/openapitools-generator-action@v1
+        with:
+          generator: typescript-axios
+          generator-tag: v6.2.0
+          openapi-file: server/immich-openapi-specs.json
+
+      # Do something with the generated client (likely publishing it somewhere)
+      - name: Push to typescript repo
+        run: |
+          git config --global init.defaultBranch main
+          git config --global pull.rebase false
+          git config --global user.email "alex.tran1502@gmail.com"
+          git config --global user.name "Alex Tran"
+          cd typescript-axios-client  
+          git init
+          git add .
+          git commit -m "Update SDK"
+          git remote add origin https://immich-app:"${{ secrets.GH_TOKEN }}"@github.com/immich-app/immich-sdk-typescript-axios.git
+          git pull origin main --allow-unrelated-histories
+          git push origin main 2>&1 | grep -v 'To https'
+
+      - name: Generate Dart SDK
+        uses: openapi-generators/openapitools-generator-action@v1
+        with:
+          generator: dart
+          generator-tag: v6.2.0
+          openapi-file: server/immich-openapi-specs.json
+
+      - name: Push to Dart repo
+        run: |
+          git config --global init.defaultBranch main
+          git config --global pull.rebase false
+          git config --global user.email "alex.tran1502@gmail.com"
+          git config --global user.name "Alex Tran"
+          cd dart-client
+          git init
+          git add .
+          git commit -m "Update SDK"
+          git remote add origin https://immich-app:"${{ secrets.GH_TOKEN }}"@github.com/immich-app/immich-sdk-dart.git
+          git pull origin main --allow-unrelated-histories
+          git push origin main 2>&1 | grep -v 'To https'
+
+      - name: Generate Rust SDK
+        uses: openapi-generators/openapitools-generator-action@v1
+        with:
+          generator: rust
+          generator-tag: v6.2.0
+          openapi-file: server/immich-openapi-specs.json
+
+      - name: Push to Rust repo
+        run: |
+          git config --global init.defaultBranch main
+          git config --global pull.rebase false
+          git config --global user.email "alex.tran1502@gmail.com"
+          git config --global user.name "Alex Tran"
+          cd rust-client
+          git init
+          git add .
+          git commit -m "Update SDK"
+          git remote add origin https://immich-app:"${{ secrets.GH_TOKEN }}"@github.com/immich-app/immich-sdk-rust.git
+          git pull origin main --allow-unrelated-histories
+          git push origin main 2>&1 | grep -v 'To https'

.github/workflows/test.yml

@@ -13,18 +13,29 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
-      - name: Run Immich Server 2E2 Test
+      - name: Run Immich Server E2E Test
         run: docker-compose -f ./docker/docker-compose.test.yml --env-file ./docker/.env.test up --abort-on-container-exit --exit-code-from immich-server-test
 
-  unit-tests:
-    name: Run unit test suites
+  server-unit-tests:
+    name: Run server unit test suites and checks
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Run tests
-        run: cd server && npm install && npm run test
+        run: cd server && npm ci && npm run check:all
+
+  web-unit-tests:
+    name: Run web unit test suites and checks
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Run tests
+        run: cd web && npm ci && npm run check:all

CODE_OF_CONDUCT.md

@@ -0,0 +1,134 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation
+in our community a harassment-free experience for everyone, regardless
+of age, body size, visible or invisible disability, ethnicity, sex
+characteristics, gender identity and expression, level of experience,
+education, socio-economic status, nationality, personal appearance,
+race, religion, or sexual identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open,
+welcoming, diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for
+our community include:
+
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our
+  mistakes, and learning from the experience
+- Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+- The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+- Trolling, insulting or derogatory comments, and personal or
+  political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+- Other conduct which could reasonably be considered inappropriate in
+  a professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our
+standards of acceptable behavior and will take appropriate and fair
+corrective action in response to any behavior that they deem
+inappropriate, threatening, offensive, or harmful.
+
+Community leaders have the right and responsibility to remove, edit,
+or reject comments, commits, code, wiki edits, issues, and other
+contributions that are not aligned to this Code of Conduct, and will
+communicate reasons for moderation decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also
+applies when an individual is officially representing the community in
+public spaces. Examples of representing our community include using an
+official e-mail address, posting via an official social media account,
+or acting as an appointed representative at an online or offline
+event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior
+may be reported to the community leaders responsible for enforcement
+at our Discord channel. All complaints
+will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and
+security of the reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in
+determining the consequences for any action they deem in violation of
+this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior
+deemed unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders,
+providing clarity around the nature of the violation and an
+explanation of why the behavior was inappropriate. A public apology
+may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued
+behavior. No interaction with the people involved, including
+unsolicited interaction with those enforcing the Code of Conduct, for
+a specified period of time. This includes avoiding interactions in
+community spaces as well as external channels like social
+media. Violating these terms may lead to a temporary or permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards,
+including sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or
+public communication with the community for a specified period of
+time. No public or private interaction with the people involved,
+including unsolicited interaction with those enforcing the Code of
+Conduct, is allowed during this period. Violating these terms may lead
+to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of
+community standards, including sustained inappropriate behavior,
+harassment of an individual, or aggression toward or disparagement of
+classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction
+within the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor
+Covenant][homepage], version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of
+conduct enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the
+FAQ at https://www.contributor-covenant.org/faq. Translations are
+available at https://www.contributor-covenant.org/translations.

README.md

@@ -23,11 +23,30 @@
   <br/>   
 </p>
 
+## Demo
+
+You can access the web demo at https://demo.immich.app
+
+For the mobile app, you can use https://demo.immich.app/api for the `Server Endpoint URL`
+
+
+```
+The credential
+email: demo@immich.app
+password: demo
+```
+
+```
+Spec: Free-tier Oracle VM - Amsterdam - 2.4Ghz quad-core ARM64 CPU, 24GB RAM
+```
+
 ## Content
 - [Features](#features)
 - [Screenshots](#screenshots)
 - [Installation](#installation)
-- [Mobile App](#-mobile-app)
+- [Update](#update)
+- [Mobile App](#mobile-app)
+- [App Beta Invitation links](#App-Beta-release-channel)
 - [Development](#development)
 - [Support](#support)
 - [Known Issues](#known-issues)
@@ -36,20 +55,22 @@
 
 > ⚠️ 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.
 
-|  | Mobile | Web |
+| Features | Mobile | Web |
 | - | - | - | 
-| ☁️ Upload and view videos and photos | Yes | Yes 
-| 🔄 Auto backup when the app is opened | Yes | N/A
-| ☑️ Selective album(s) for backup | Yes | N/A
-| ⬇️ Download photos and videos to local device | Yes | Yes
-| 👪 Multi-user support | Yes | Yes
-| 🖼️ Album | Yes | Yes
-| 🤝 Shared Albums | Yes | Yes
-| 🚀 Quick navigation with draggable scrollbar | Yes | Yes
-| 🗃️ Support RAW (HEIC, HEIF, DNG, Apple ProRaw) | Yes | Yes
-| 🧭 Metadata view (EXIF, map) | Yes | Yes
-| 🔎 Search by metadata, objects and image tags | Yes | No
-| ⚙️ Administrative functions (user management) | N/A | Yes
+| Upload and view videos and photos | Yes | Yes 
+| Auto backup when the app is opened | Yes | N/A
+| Selective album(s) for backup | Yes | N/A
+| Download photos and videos to local device | Yes | Yes
+| Multi-user support | Yes | Yes
+| Album | Yes | Yes
+| Shared Albums | Yes | Yes
+| Quick navigation with draggable scrollbar | Yes | Yes
+| Support RAW (HEIC, HEIF, DNG, Apple ProRaw) | Yes | Yes
+| Metadata view (EXIF, map) | Yes | Yes
+| Search by metadata, objects and image tags | Yes | No
+| Administrative functions (user management) | N/A | Yes
+| Background backup | Android | N/A
+| Virtual scroll | N/A | Yes
 
 
   <br/>  
@@ -95,6 +116,8 @@ There are several services that compose Immich:
 
 # Installation
 
+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)
 
 > ⚠️ *This installation method is for evaluating Immich before futher customization to meet the users' needs.*
@@ -141,7 +164,6 @@ wget -O .env https://raw.githubusercontent.com/immich-app/immich/main/docker/.en
 * Populate custom database information if necessary.
 * Populate `UPLOAD_LOCATION` as prefered location for storing backup assets.
 * Populate a secret value for `JWT_SECRET`, you can use this command: `openssl rand -base64 128`
-* [Optional] Populate Mapbox value to use reverse geocoding.
 
 ### Step 3 - Start the containers
 
@@ -168,15 +190,27 @@ wget -O .env https://raw.githubusercontent.com/immich-app/immich/main/docker/.en
 
   <br/>  
 
+## Update
+
+If you have installed, you can update the application by navigate to the directory that contains the `docker-compose.yml` file and run the following command:
+
+```bash
+docker-compose pull && docker-compose up -d
+```
+
 # Mobile app
 
 | F-Droid | Google Play | iOS |
 | - | - | - |
-| <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"> <img src="design/google-play-qr-code.png" width="200" title="Google Play Store"> <p/> | <p align="left"> <img src="design/ios-qr-code.png" width="200" title="Apple App Store"> <p/> |
+| <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 App 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 the review process.*
 
+# App Beta release channel
 
+You can opt-in to join app beta release channel by following the links below:
+* Android: Invitation link from [web](https://play.google.com/store/apps/details?id=app.alextran.immich) or from [mobile](https://play.google.com/store/apps/details?id=app.alextran.immich)
+* iOS: [TestFlight invitation link](https://testflight.apple.com/join/1vYsAa8P)
   <br/>  
 
 # Development
@@ -223,7 +257,7 @@ Cheers! 🎉
 
 ## TensorFlow Build Issue
 
-*This is a known issue for incorrect Promox setup*
+*This is a known issue for incorrect Proxmox setup*
 
 TensorFlow doesn't run with older CPU architecture, it requires a CPU with AVX and AVX2 instruction set. If you encounter the error `illegal instruction core dump` when running the docker-compose command above, check for your CPU flags with the command and make sure you see `AVX` and `AVX2`:
  
@@ -231,7 +265,7 @@ TensorFlow doesn't run with older CPU architecture, it requires a CPU with AVX a
 more /proc/cpuinfo | grep flags
 ``` 
   
-If you are running virtualization in Promox, the VM doesn't have the flag enabled.
+If you are running virtualization in Proxmox, the VM doesn't have the flag enabled.
   
 You need to change the CPU type from `kvm64` to `host` under VMs hardware tab.
   

SECURITY.md

@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please report security issues to `alex.tran1502@gmail.com`

dev-setup.md

@@ -0,0 +1,32 @@
+# Development Setup
+
+## Lint / format extensions
+
+Setting these in the IDE give a better developer experience auto-formatting code on save and providing instant feedback on lint issues.
+
+### VSCode
+Install Prettier, ESLint and Svelte extensions.
+
+in User `settings.json` (`cmd + shift + p` and search for Open User Settings JSON) add the following:
+
+```json
+{
+  "editor.formatOnSave": true,
+  "[javascript][typescript][css]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.tabSize": 2,
+    "editor.formatOnSave": true
+  },
+  "[svelte]": {
+    "editor.defaultFormatter": "svelte.svelte-vscode",
+    "editor.tabSize": 2
+  },
+  "svelte.enable-ts-plugin": true,
+  "eslint.validate": ["javascript", "svelte"]
+}
+```
+
+## Running tests / checks
+
+In both server and web:
+`npm run check:all`

docker/.env.example

@@ -10,9 +10,6 @@ DB_DATABASE_NAME=immich
 # Optional Database settings:
 # DB_PORT=5432
 
-
-
-
 ###################################################################################
 # Redis
 ###################################################################################
@@ -25,18 +22,17 @@ REDIS_HOSTNAME=immich_redis
 # REDIS_PASSWORD=
 # REDIS_SOCKET=
 
-
-
-
-
 ###################################################################################
 # Upload File Config
 ###################################################################################
 
 UPLOAD_LOCATION=absolute_location_on_your_machine_where_you_want_to_store_the_backup
 
+###################################################################################
+# Log message level - [simple|verbose]
+###################################################################################
 
-
+LOG_LEVEL=simple
 
 ###################################################################################
 # JWT SECRET
@@ -44,23 +40,27 @@ UPLOAD_LOCATION=absolute_location_on_your_machine_where_you_want_to_store_the_ba
 
 JWT_SECRET=randomstringthatissolongandpowerfulthatnoonecanguess
 
-
-
-
 ###################################################################################
-# MAPBOX
+# Reverse Geocoding
 ####################################################################################
 
-# ENABLE_MAPBOX is either true of false -> if true, you have to provide MAPBOX_KEY
-ENABLE_MAPBOX=false
-MAPBOX_KEY=
+# DISABLE_REVERSE_GEOCODING=false
 
+# Reverse geocoding is done locally which has a small impact on memory usage
+# This memory usage can be altered by changing the REVERSE_GEOCODING_PRECISION variable
+# This ranges from 0-3 with 3 being the most precise
+# 3 - Cities > 500 population: ~200MB RAM
+# 2 - Cities > 1000 population: ~150MB RAM
+# 1 - Cities > 5000 population: ~80MB RAM
+# 0 - Cities > 15000 population: ~40MB RAM
+
+# REVERSE_GEOCODING_PRECISION=3
 
 ####################################################################################
 # WEB - Optional
 ####################################################################################
 
 # Custom message on the login page, should be written in HTML form.
-# For example VITE_LOGIN_PAGE_MESSAGE="This is a demo instance of Immich.<br><br>Email: <i>demo@demo.de</i><br>Password: <i>demo</i>"
+# For example PUBLIC_LOGIN_PAGE_MESSAGE="This is a demo instance of Immich.<br><br>Email: <i>demo@demo.de</i><br>Password: <i>demo</i>"
 
-VITE_LOGIN_PAGE_MESSAGE=
+PUBLIC_LOGIN_PAGE_MESSAGE=

docker/.env.test

@@ -19,4 +19,4 @@ ENABLE_MAPBOX=false
 
 # WEB
 MAPBOX_KEY=
-VITE_SERVER_ENDPOINT=http://localhost:2283/api
+VITE_SERVER_ENDPOINT=http://localhost:2283/api

docker/docker-compose.dev.yml

@@ -6,6 +6,7 @@ services:
     build:
       context: ../server
       dockerfile: Dockerfile
+      target: builder
     command: npm run start:dev immich
     volumes:
       - ../server:/usr/src/app
@@ -24,6 +25,7 @@ services:
     build:
       context: ../machine-learning
       dockerfile: Dockerfile
+      target: builder
     command: npm run start:dev
     volumes:
       - ../machine-learning:/usr/src/app
@@ -41,6 +43,7 @@ services:
     build:
       context: ../server
       dockerfile: Dockerfile
+      target: builder
     command: npm run start:dev microservices
     volumes:
       - ../server:/usr/src/app
@@ -99,8 +102,7 @@ services:
       context: ../nginx
       dockerfile: Dockerfile
     ports:
-      - 2283:80
-      - 2284:443
+      - 2283:8080
     logging:
       driver: none
     depends_on:

docker/docker-compose.staging.yml

@@ -72,8 +72,7 @@ services:
     container_name: immich_proxy
     image: altran1502/immich-proxy:staging
     ports:
-      - 2283:80
-      - 2284:443
+      - 2283:8080
     logging:
       driver: none
     depends_on:

docker/docker-compose.yml

@@ -72,7 +72,7 @@ services:
     container_name: immich_proxy
     image: altran1502/immich-proxy:release
     ports:
-      - 2283:80
+      - 2283:8080
     logging:
       driver: none
     depends_on:

install.sh

@@ -2,12 +2,17 @@ echo "Starting Immich installation..."
 
 ip_address=$(hostname -I | awk '{print $1}')
 
+release_version=$(curl --silent "https://api.github.com/repos/immich-app/immich/releases/latest" |
+  grep '"tag_name":' |
+  sed -E 's/.*"([^"]+)".*/\1/')
 RED='\033[0;31m'
 GREEN='\032[0;31m'
 NC='\033[0m' # No Color
 
-machine_has() {
-  type "$1" >/dev/null 2>&1
+get_release_version() {
+  curl --silent "https://api.github.com/repos/immich-app/immich/releases/latest" | # Get latest release from GitHub api
+    grep '"tag_name":' |                                                           # Get tag line
+    sed -E 's/.*"([^"]+)".*/\1/'                                                   # Pluck JSON value
 }
 
 create_immich_directory() {
@@ -17,12 +22,12 @@ create_immich_directory() {
 
 download_docker_compose_file() {
   echo "Downloading docker-compose.yml..."
-  curl -L https://raw.githubusercontent.com/immich-app/immich/main/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 ./immich-app/docker-compose.yml >/dev/null 2>&1
 }
 
 download_dot_env_file() {
   echo "Downloading .env file..."
-  curl -L https://raw.githubusercontent.com/immich-app/immich/main/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 ./immich-app/.env >/dev/null 2>&1
 }
 
 populate_upload_location() {
@@ -45,18 +50,21 @@ populate_upload_location() {
 start_docker_compose() {
   echo "Starting Immich's docker containers"
 
-  if machine_has "docker compose"; then {
-    docker compose up --remove-orphans -d
-
-    show_friendly_message
-    exit 0
-  }; fi
-
-  if machine_has "docker-compose"; then
-    docker-compose up --remove-orphans -d
+  if docker compose &>/dev/null; then
+    docker_bin="docker compose"
+  elif docker-compose &>/dev/null; then
+    docker_bin="docker-compose"
+  else
+    echo 'Cannot find `docker compose` or `docker-compose`.'
+    exit 1
+  fi
 
+  if $docker_bin up --remove-orphans -d; then
     show_friendly_message
     exit 0
+  else
+    echo "Could not start. Check for errors above."
+    exit 1
   fi
 }
 
@@ -65,7 +73,7 @@ show_friendly_message() {
   echo "You can access the website at http://$ip_address:2283 and the server URL for the mobile app is http://$ip_address:2283/api"
   echo "The backup (or upload) location is $upload_location"
   echo "---------------------------------------------------"
-  echo "If you want to confgure custom information of the server, including the database, Redis information, or the backup (or upload) location, etc. 
+  echo "If you want to configure custom information of the server, including the database, Redis information, or the backup (or upload) location, etc. 
   
   1. First bring down the containers with the command 'docker-compose down' in the immich-app directory, 
   

localizely.yml

@@ -9,6 +9,14 @@ upload:
       locale_code: de-DE
     - file: mobile/assets/i18n/fr-FR.json
       locale_code: fr-FR
+    - file: mobile/assets/i18n/it-IT.json
+      locale_code: it-IT
+    - file: mobile/assets/i18n/nl-NL.json
+      locale_code: nl-NL
+    - file: mobile/assets/i18n/ko-KR.json
+      locale_code: ko-KR
+    - file: mobile/assets/i18n/da-DK.json
+      locale_code: da-DK
 download:
   files:
     - file: mobile/assets/i18n/en-US.json
@@ -17,3 +25,11 @@ download:
       locale_code: de-DE
     - file: mobile/assets/i18n/fr-FR.json
       locale_code: fr-FR
+    - file: mobile/assets/i18n/it-IT.json
+      locale_code: it-IT
+    - file: mobile/assets/i18n/nl-NL.json
+      locale_code: nl-NL
+    - file: mobile/assets/i18n/ko-KR.json
+      locale_code: ko-KR
+    - file: mobile/assets/i18n/da-DK.json
+      locale_code: da-DK

machine-learning/package.json

@@ -25,7 +25,6 @@
     "@nestjs/core": "^8.0.0",
     "@nestjs/mapped-types": "^1.0.1",
     "@nestjs/platform-express": "^8.0.0",
-    "@nestjs/typeorm": "^8.0.3",
     "@tensorflow-models/coco-ssd": "^2.2.2",
     "@tensorflow-models/mobilenet": "^2.1.0",
     "@tensorflow/tfjs": "^3.19.0",
@@ -34,11 +33,9 @@
     "@tensorflow/tfjs-node": "^3.19.0",
     "@tensorflow/tfjs-node-gpu": "^3.19.0",
     "@trpc/server": "^9.20.3",
-    "pg": "^8.7.3",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",
-    "rxjs": "^7.2.0",
-    "typeorm": "^0.2.45"
+    "rxjs": "^7.2.0"
   },
   "devDependencies": {
     "@nestjs/cli": "^8.2.4",

machine-learning/src/app.module.ts

@@ -1,15 +1,9 @@
 import { Module } from '@nestjs/common';
 import { ImageClassifierModule } from './image-classifier/image-classifier.module';
-import { databaseConfig } from './config/database.config';
-import { TypeOrmModule } from '@nestjs/typeorm';
 import { ObjectDetectionModule } from './object-detection/object-detection.module';
 
 @Module({
-  imports: [
-    TypeOrmModule.forRoot(databaseConfig),
-    ImageClassifierModule,
-    ObjectDetectionModule,
-  ],
+  imports: [ImageClassifierModule, ObjectDetectionModule],
   controllers: [],
   providers: [],
 })

machine-learning/src/config/database.config.ts

@@ -1,11 +0,0 @@
-import { TypeOrmModuleOptions } from '@nestjs/typeorm';
-
-export const databaseConfig: TypeOrmModuleOptions = {
-  type: 'postgres',
-  host: process.env.DB_HOSTNAME || 'immich_postgres',
-  port: parseInt(process.env.DB_PORT || '5432'),
-  username: process.env.DB_USERNAME,
-  password: process.env.DB_PASSWORD,
-  database: process.env.DB_DATABASE_NAME,
-  synchronize: false,
-};

mobile/android/.gitignore

@@ -11,3 +11,6 @@ GeneratedPluginRegistrant.java
 key.properties
 **/*.keystore
 **/*.jks
+
+# Fastlane
+/fastlane/report.xml

mobile/android/app/build.gradle

@@ -51,7 +51,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "app.alextran.immich"
-        minSdkVersion 21
+        minSdkVersion 23
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

mobile/android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="app.alextran.immich">
-  <application android:label="Immich" android:name="${applicationName}" android:usesCleartextTraffic="true" android:icon="@mipmap/ic_launcher" android:requestLegacyExternalStorage="true">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="app.alextran.immich" xmlns:tools="http://schemas.android.com/tools">
+  <application android:label="Immich" android:name=".ImmichApp" android:usesCleartextTraffic="true" android:icon="@mipmap/ic_launcher" android:requestLegacyExternalStorage="true">
     <activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
       <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
@@ -15,8 +15,12 @@
     <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
     <meta-data android:name="flutterEmbedding" android:value="2" />
-
-
+    <!-- Disables default WorkManager initialization to use our custom initialization -->
+    <provider
+        android:name="androidx.startup.InitializationProvider"
+        android:authorities="${applicationId}.androidx-startup"
+        tools:node="remove">
+    </provider>
   </application>
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

mobile/android/app/src/main/kotlin/com/example/mobile/BackgroundServicePlugin.kt

@@ -1,11 +1,6 @@
 package app.alextran.immich
 
 import android.content.Context
-import android.net.Uri
-import android.content.Intent
-import android.provider.Settings
-import android.util.Log
-import android.widget.Toast
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.plugin.common.BinaryMessenger
 import io.flutter.plugin.common.MethodCall
@@ -15,7 +10,7 @@ import io.flutter.plugin.common.MethodChannel
  * Android plugin for Dart `BackgroundService`
  *
  * Receives messages/method calls from the foreground Dart side to manage
- * the background service, e.g. start (enqueue), stop (cancel) 
+ * the background service, e.g. start (enqueue), stop (cancel)
  */
 class BackgroundServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
 
@@ -43,52 +38,35 @@ class BackgroundServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
 
     override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
         val ctx = context!!
-        when(call.method) {
-            "initialize" -> { // needs to be called prior to any other method
+        when (call.method) {
+            "enable" -> {
                 val args = call.arguments<ArrayList<*>>()!!
                 ctx.getSharedPreferences(BackupWorker.SHARED_PREF_NAME, Context.MODE_PRIVATE)
-                    .edit().putLong(BackupWorker.SHARED_PREF_CALLBACK_KEY, args.get(0) as Long).apply()
+                        .edit()
+                        .putBoolean(ContentObserverWorker.SHARED_PREF_SERVICE_ENABLED, true)
+                        .putLong(BackupWorker.SHARED_PREF_CALLBACK_KEY, args.get(0) as Long)
+                        .putString(BackupWorker.SHARED_PREF_NOTIFICATION_TITLE, args.get(1) as String)
+                        .apply()
+                ContentObserverWorker.enable(ctx, immediate = args.get(2) as Boolean)
                 result.success(true)
             }
-            "start" -> {
+            "configure" -> {
                 val args = call.arguments<ArrayList<*>>()!!
-                val immediate = args.get(0) as Boolean
-                val keepExisting = args.get(1) as Boolean
-                val requireUnmeteredNetwork = args.get(2) as Boolean
-                val requireCharging = args.get(3) as Boolean
-                val notificationTitle = args.get(4) as String
-                ctx.getSharedPreferences(BackupWorker.SHARED_PREF_NAME, Context.MODE_PRIVATE)
-                    .edit().putString(BackupWorker.SHARED_PREF_NOTIFICATION_TITLE, notificationTitle).apply()
-                BackupWorker.startWork(ctx, immediate, keepExisting, requireUnmeteredNetwork, requireCharging)
+                val requireUnmeteredNetwork = args.get(0) as Boolean
+                val requireCharging = args.get(1) as Boolean
+                ContentObserverWorker.configureWork(ctx, requireUnmeteredNetwork, requireCharging)
                 result.success(true)
             }
-            "stop" -> {
+            "disable" -> {
+                ContentObserverWorker.disable(ctx)
                 BackupWorker.stopWork(ctx)
                 result.success(true)
             }
             "isEnabled" -> {
-                result.success(BackupWorker.isEnabled(ctx))
+                result.success(ContentObserverWorker.isEnabled(ctx))
             }
-            "disableBatteryOptimizations" -> {
-                if(!BackupWorker.isIgnoringBatteryOptimizations(ctx)) {
-                    val args = call.arguments<ArrayList<*>>()!!
-                    val text = args.get(0) as String
-                    Toast.makeText(ctx, text, Toast.LENGTH_LONG).show()
-                    val intent = Intent(Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS)
-                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                    intent.setData(Uri.parse("package:" + ctx.getPackageName()))
-                    try {
-                        ctx.startActivity(intent)
-                    } catch(e: Exception) {
-                        intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-                        try {
-                            ctx.startActivity(intent)
-                        } catch (e2: Exception) {
-                            return result.success(false)
-                        }
-                    }
-                }
-                result.success(true)
+            "isIgnoringBatteryOptimizations" -> {
+                result.success(BackupWorker.isIgnoringBatteryOptimizations(ctx))
             }
             else -> result.notImplemented()
         }

mobile/android/app/src/main/kotlin/com/example/mobile/BackupWorker.kt

@@ -1,5 +1,6 @@
 package app.alextran.immich
 
+import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
@@ -8,17 +9,12 @@ import android.os.Handler
 import android.os.Looper
 import android.os.PowerManager
 import android.os.SystemClock
-import android.provider.MediaStore
-import android.provider.BaseColumns
-import android.provider.MediaStore.MediaColumns
-import android.provider.MediaStore.Images.Media
 import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import androidx.concurrent.futures.ResolvableFuture
 import androidx.work.BackoffPolicy
 import androidx.work.Constraints
-import androidx.work.Data
 import androidx.work.ForegroundInfo
 import androidx.work.ListenableWorker
 import androidx.work.NetworkType
@@ -26,6 +22,7 @@ import androidx.work.WorkerParameters
 import androidx.work.ExistingWorkPolicy
 import androidx.work.OneTimeWorkRequest
 import androidx.work.WorkManager
+import androidx.work.WorkInfo
 import com.google.common.util.concurrent.ListenableFuture
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.embedding.engine.dart.DartExecutor
@@ -41,14 +38,7 @@ import java.util.concurrent.TimeUnit
  * Starts the Dart runtime/engine and calls `_nativeEntry` function in
  * `background.service.dart` to run the actual backup logic.
  * Called by Android WorkManager when all constraints for the work are met,
- * i.e. a new photo/video is created on the device AND battery is not low.
- * Optionally, unmetered network (wifi) and charging can be required.
- * As this work is not triggered periodically, but on content change, the
- * worker enqueues itself again with the same settings.
- * In case the worker is stopped by the system (e.g. constraints like wifi
- * are no longer met, or the system needs memory resources for more other
- * more important work), the worker is replaced without the constraint on
- * changed contents to run again as soon as deemed possible by the system.
+ * i.e. battery is not low and optionally Wifi and charging are active.
  */
 class BackupWorker(ctx: Context, params: WorkerParameters) : ListenableWorker(ctx, params), MethodChannel.MethodCallHandler {
 
@@ -57,14 +47,15 @@ class BackupWorker(ctx: Context, params: WorkerParameters) : ListenableWorker(ct
     private lateinit var backgroundChannel: MethodChannel
     private val notificationManager = ctx.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
     private val isIgnoringBatteryOptimizations = isIgnoringBatteryOptimizations(applicationContext)
+    private var timeBackupStarted: Long = 0L
+    private var notificationBuilder: NotificationCompat.Builder? = null
+    private var notificationDetailBuilder: NotificationCompat.Builder? = null
 
     override fun startWork(): ListenableFuture<ListenableWorker.Result> {
 
+        Log.d(TAG, "startWork")
+
         val ctx = applicationContext
-        // enqueue itself once again to continue to listen on added photos/videos
-        enqueueMoreWork(ctx,
-                        requireUnmeteredNetwork = inputData.getBoolean(DATA_KEY_UNMETERED, true),
-                        requireCharging = inputData.getBoolean(DATA_KEY_CHARGING, false))
 
         if (!flutterLoader.initialized()) {
             flutterLoader.startInitialization(ctx)
@@ -80,7 +71,7 @@ class BackupWorker(ctx: Context, params: WorkerParameters) : ListenableWorker(ct
             // or by the system learning that immich is important to the user)
             val title = ctx.getSharedPreferences(SHARED_PREF_NAME, Context.MODE_PRIVATE)
                 .getString(SHARED_PREF_NOTIFICATION_TITLE, NOTIFICATION_DEFAULT_TITLE)!!
-            setForegroundAsync(createForegroundInfo(title))
+            showInfo(getInfoBuilder(title, indeterminate=true).build())
         }
         engine = FlutterEngine(ctx)
 
@@ -115,6 +106,7 @@ class BackupWorker(ctx: Context, params: WorkerParameters) : ListenableWorker(ct
     }
 
     override fun onStopped() {
+        Log.d(TAG, "onStopped")
         // called when the system has to stop this worker because constraints are
         // no longer met or the system needs resources for more important tasks
         Handler(Looper.getMainLooper()).postAtFrontOfQueue {
@@ -130,24 +122,18 @@ class BackupWorker(ctx: Context, params: WorkerParameters) : ListenableWorker(ct
 
     private fun stopEngine(result: Result?) {
         if (result != null) {
+            Log.d(TAG, "stopEngine result=${result}")
             resolvableFuture.set(result)
-        } else if (engine != null && inputData.getInt(DATA_KEY_RETRIES, 0) == 0) {
-            // stopped by system and this is the first time (content change constraints active)
-            // replace the task without the content constraints to finish the backup as soon as possible
-            enqueueMoreWork(applicationContext,
-                immediate = true,
-                requireUnmeteredNetwork = inputData.getBoolean(DATA_KEY_UNMETERED, true),
-                requireCharging = inputData.getBoolean(DATA_KEY_CHARGING, false),
-                initialDelayInMs = ONE_MINUTE,
-                retries = inputData.getInt(DATA_KEY_RETRIES, 0) + 1)
         }
         engine?.destroy()
         engine = null
+        clearBackgroundNotification()
     }
 
     override fun onMethodCall(call: MethodCall, r: MethodChannel.Result) {
         when (call.method) {
-            "initialized" ->
+            "initialized" -> {
+                timeBackupStarted = SystemClock.uptimeMillis()
                 backgroundChannel.invokeMethod(
                     "onAssetsChanged",
                     null,
@@ -163,46 +149,49 @@ class BackupWorker(ctx: Context, params: WorkerParameters) : ListenableWorker(ct
                         override fun success(receivedResult: Any?) {
                             val success = receivedResult as Boolean
                             stopEngine(if(success) Result.success() else Result.retry())
-                            if (!success && inputData.getInt(DATA_KEY_RETRIES, 0) == 0) {
-                                // there was an error (e.g. server not available)
-                                // replace the task without the content constraints to finish the backup as soon as possible
-                                enqueueMoreWork(applicationContext,
-                                    immediate = true,
-                                    requireUnmeteredNetwork = inputData.getBoolean(DATA_KEY_UNMETERED, true),
-                                    requireCharging = inputData.getBoolean(DATA_KEY_CHARGING, false),
-                                    initialDelayInMs = ONE_MINUTE,
-                                    retries = inputData.getInt(DATA_KEY_RETRIES, 0) + 1)
-                            }
                         }
                     }
                 )
+            }
             "updateNotification" -> {
                 val args = call.arguments<ArrayList<*>>()!!
-                val title = args.get(0) as String
-                val content = args.get(1) as String
-                if (isIgnoringBatteryOptimizations) {
-                    setForegroundAsync(createForegroundInfo(title, content))
+                val title = args.get(0) as String?
+                val content = args.get(1) as String?
+                val progress = args.get(2) as Int
+                val max = args.get(3) as Int
+                val indeterminate = args.get(4) as Boolean
+                val isDetail = args.get(5) as Boolean
+                val onlyIfFG = args.get(6) as Boolean
+                if (!onlyIfFG || isIgnoringBatteryOptimizations) {
+                    showInfo(getInfoBuilder(title, content, isDetail, progress, max, indeterminate).build(), isDetail)
                 }
             }
             "showError" -> {
                 val args = call.arguments<ArrayList<*>>()!!
                 val title = args.get(0) as String
-                val content = args.get(1) as String
+                val content = args.get(1) as String?
                 val individualTag = args.get(2) as String?
                 showError(title, content, individualTag)
             }
             "clearErrorNotifications" -> clearErrorNotifications()
+            "hasContentChanged" -> {
+                val lastChange = applicationContext
+                    .getSharedPreferences(SHARED_PREF_NAME, Context.MODE_PRIVATE)
+                    .getLong(SHARED_PREF_LAST_CHANGE, timeBackupStarted)
+                val hasContentChanged = lastChange > timeBackupStarted;
+                timeBackupStarted = SystemClock.uptimeMillis()
+                r.success(hasContentChanged)
+            }
             else -> r.notImplemented()
         }
     }
 
-    private fun showError(title: String, content: String, individualTag: String?) {
+    private fun showError(title: String, content: String?, individualTag: String?) {
         val notification = NotificationCompat.Builder(applicationContext, NOTIFICATION_CHANNEL_ERROR_ID)
            .setContentTitle(title)
            .setTicker(title)
            .setContentText(content)
            .setSmallIcon(R.mipmap.ic_launcher)
-           .setOnlyAlertOnce(true)
            .build()
         notificationManager.notify(individualTag, NOTIFICATION_ERROR_ID, notification)
     }
@@ -211,111 +200,116 @@ class BackupWorker(ctx: Context, params: WorkerParameters) : ListenableWorker(ct
         notificationManager.cancel(NOTIFICATION_ERROR_ID)
     }
 
-    private fun createForegroundInfo(title: String = NOTIFICATION_DEFAULT_TITLE, content: String? = null): ForegroundInfo {
-       val notification = NotificationCompat.Builder(applicationContext, NOTIFICATION_CHANNEL_ID)
-           .setContentTitle(title)
-           .setTicker(title)
-           .setContentText(content)
-           .setSmallIcon(R.mipmap.ic_launcher)
-           .setOngoing(true)
-           .build()
-       return ForegroundInfo(NOTIFICATION_ID, notification)
-   }
+    private fun clearBackgroundNotification() {
+        notificationManager.cancel(NOTIFICATION_ID)
+        notificationManager.cancel(NOTIFICATION_DETAIL_ID)
+    }
+
+    private fun showInfo(notification: Notification, isDetail: Boolean = false) {
+        val id = if(isDetail) NOTIFICATION_DETAIL_ID else NOTIFICATION_ID
+        if (isIgnoringBatteryOptimizations) {
+            setForegroundAsync(ForegroundInfo(id, notification))
+        } else {
+            notificationManager.notify(id, notification)
+        }
+    }
+
+    private fun getInfoBuilder(
+        title: String? = null,
+        content: String? = null,
+        isDetail: Boolean = false,
+        progress: Int = 0,
+        max: Int = 0,
+        indeterminate: Boolean = false,
+    ): NotificationCompat.Builder {
+        var builder = if(isDetail) notificationDetailBuilder else notificationBuilder
+        if (builder == null) {
+            builder = NotificationCompat.Builder(applicationContext, NOTIFICATION_CHANNEL_ID)
+                .setSmallIcon(R.mipmap.ic_launcher)
+                .setOnlyAlertOnce(true)
+                .setOngoing(true)
+            if (isDetail) {
+                notificationDetailBuilder = builder
+            } else {
+                notificationBuilder = builder
+            }
+        }
+        if (title != null) {
+            builder.setTicker(title).setContentTitle(title)
+        }
+        if (content != null) {
+            builder.setContentText(content)
+        }
+        return builder.setProgress(max, progress, indeterminate)
+    }
 
     @RequiresApi(Build.VERSION_CODES.O)
     private fun createChannel() {
         val foreground = NotificationChannel(NOTIFICATION_CHANNEL_ID, NOTIFICATION_CHANNEL_ID, NotificationManager.IMPORTANCE_LOW)
         notificationManager.createNotificationChannel(foreground)
-        val error = NotificationChannel(NOTIFICATION_CHANNEL_ERROR_ID, NOTIFICATION_CHANNEL_ERROR_ID, NotificationManager.IMPORTANCE_DEFAULT)
+        val error = NotificationChannel(NOTIFICATION_CHANNEL_ERROR_ID, NOTIFICATION_CHANNEL_ERROR_ID, NotificationManager.IMPORTANCE_HIGH)
         notificationManager.createNotificationChannel(error)
     }
 
     companion object {
         const val SHARED_PREF_NAME = "immichBackgroundService"
         const val SHARED_PREF_CALLBACK_KEY = "callbackDispatcherHandle"
-        const val SHARED_PREF_SERVICE_ENABLED = "serviceEnabled"
         const val SHARED_PREF_NOTIFICATION_TITLE = "notificationTitle"
+        const val SHARED_PREF_LAST_CHANGE = "lastChange"
 
-        private const val TASK_NAME = "immich/photoListener"
-        private const val DATA_KEY_UNMETERED = "unmetered"
-        private const val DATA_KEY_CHARGING = "charging"
-        private const val DATA_KEY_RETRIES = "retries"
+        private const val TASK_NAME_BACKUP = "immich/BackupWorker"
         private const val NOTIFICATION_CHANNEL_ID = "immich/backgroundService"
         private const val NOTIFICATION_CHANNEL_ERROR_ID = "immich/backgroundServiceError"
         private const val NOTIFICATION_DEFAULT_TITLE = "Immich"
         private const val NOTIFICATION_ID = 1
         private const val NOTIFICATION_ERROR_ID = 2 
-        private const val ONE_MINUTE: Long = 60000
+        private const val NOTIFICATION_DETAIL_ID = 3
+        private const val ONE_MINUTE = 60000L
 
         /**
-         * Enqueues the `BackupWorker` to run when all constraints are met.
-         * 
-         * @param context Android Context
-         * @param immediate whether to enqueue(replace) the worker without the content change constraint
-         * @param keepExisting if true, use `ExistingWorkPolicy.KEEP`, else `ExistingWorkPolicy.APPEND_OR_REPLACE`
-         * @param requireUnmeteredNetwork if true, task only runs if connected to wifi
-         * @param requireCharging if true, task only runs if device is charging
-         * @param retries retry count (should be 0 unless an error occured and this is a retry)
+         * Enqueues the BackupWorker to run once the constraints are met
          */
-        fun startWork(context: Context,
-                        immediate: Boolean = false,
-                        keepExisting: Boolean = false,
-                        requireUnmeteredNetwork: Boolean = false,
-                        requireCharging: Boolean = false) {
-            context.getSharedPreferences(SHARED_PREF_NAME, Context.MODE_PRIVATE)
-                    .edit().putBoolean(SHARED_PREF_SERVICE_ENABLED, true).apply()
-            enqueueMoreWork(context, immediate, keepExisting, requireUnmeteredNetwork, requireCharging)
+        fun enqueueBackupWorker(context: Context,
+                                requireWifi: Boolean = false,
+                                requireCharging: Boolean = false,
+                                delayMilliseconds: Long = 0L) {
+            val workRequest = buildWorkRequest(requireWifi, requireCharging, delayMilliseconds)
+            WorkManager.getInstance(context).enqueueUniqueWork(TASK_NAME_BACKUP, ExistingWorkPolicy.KEEP, workRequest)
+            Log.d(TAG, "enqueueBackupWorker: BackupWorker enqueued")
         }
 
-        private fun enqueueMoreWork(context: Context,
-                                    immediate: Boolean = false,
-                                    keepExisting: Boolean = false,
-                                    requireUnmeteredNetwork: Boolean = false,
-                                    requireCharging: Boolean = false,
-                                    initialDelayInMs: Long = 0,
-                                    retries: Int = 0) {
-            if (!isEnabled(context)) {
-                return
+        /**
+         * Updates the constraints of an already enqueued BackupWorker
+         */
+        fun updateBackupWorker(context: Context,
+                               requireWifi: Boolean = false,
+                               requireCharging: Boolean = false) {
+            try {
+                val wm = WorkManager.getInstance(context)
+                val workInfoFuture = wm.getWorkInfosForUniqueWork(TASK_NAME_BACKUP)
+                val workInfoList = workInfoFuture.get(1000, TimeUnit.MILLISECONDS)
+                if (workInfoList != null) {
+                    for (workInfo in workInfoList) {
+                        if (workInfo.getState() == WorkInfo.State.ENQUEUED) {
+                            val workRequest = buildWorkRequest(requireWifi, requireCharging)
+                            wm.enqueueUniqueWork(TASK_NAME_BACKUP, ExistingWorkPolicy.REPLACE, workRequest)
+                            Log.d(TAG, "updateBackupWorker updated BackupWorker constraints")
+                            return
+                        }
+                    }
+                }
+                Log.d(TAG, "updateBackupWorker: BackupWorker not enqueued")
+            } catch (e: Exception) {
+                Log.d(TAG, "updateBackupWorker failed: ${e}")
             }
-            val constraints = Constraints.Builder()
-                .setRequiredNetworkType(if (requireUnmeteredNetwork) NetworkType.UNMETERED else NetworkType.CONNECTED)
-                .setRequiresBatteryNotLow(true)
-                .setRequiresCharging(requireCharging);
-            if (!immediate) {
-                constraints
-                .addContentUriTrigger(MediaStore.Images.Media.INTERNAL_CONTENT_URI, true)
-                .addContentUriTrigger(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, true)
-                .addContentUriTrigger(MediaStore.Video.Media.INTERNAL_CONTENT_URI, true)
-                .addContentUriTrigger(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, true)
-            }
-
-            val inputData = Data.Builder()
-                .putBoolean(DATA_KEY_CHARGING, requireCharging)
-                .putBoolean(DATA_KEY_UNMETERED, requireUnmeteredNetwork)
-                .putInt(DATA_KEY_RETRIES, retries)
-                .build()
-                
-            val photoCheck = OneTimeWorkRequest.Builder(BackupWorker::class.java)
-                .setConstraints(constraints.build())
-                .setInputData(inputData)
-                .setInitialDelay(initialDelayInMs, TimeUnit.MILLISECONDS)
-                .setBackoffCriteria(
-                    BackoffPolicy.EXPONENTIAL,
-                    ONE_MINUTE,
-                    TimeUnit.MILLISECONDS)
-                .build()
-            val policy = if (immediate) ExistingWorkPolicy.REPLACE else (if (keepExisting) ExistingWorkPolicy.KEEP else ExistingWorkPolicy.APPEND_OR_REPLACE)
-            val op = WorkManager.getInstance(context).enqueueUniqueWork(TASK_NAME, policy, photoCheck)
-            val result = op.getResult().get()
         }
 
         /**
          * Stops the currently running worker (if any) and removes it from the work queue
          */
         fun stopWork(context: Context) {
-            context.getSharedPreferences(SHARED_PREF_NAME, Context.MODE_PRIVATE)
-                    .edit().putBoolean(SHARED_PREF_SERVICE_ENABLED, false).apply()
-            WorkManager.getInstance(context).cancelUniqueWork(TASK_NAME)
+            WorkManager.getInstance(context).cancelUniqueWork(TASK_NAME_BACKUP)
+            Log.d(TAG, "stopWork: BackupWorker cancelled")
         }
 
         /**
@@ -330,12 +324,21 @@ class BackupWorker(ctx: Context, params: WorkerParameters) : ListenableWorker(ct
             return true
         }
 
-        /**
-         * Return true if the user has enabled the background backup service
-         */
-        fun isEnabled(ctx: Context): Boolean {
-            return ctx.getSharedPreferences(SHARED_PREF_NAME, Context.MODE_PRIVATE)
-                    .getBoolean(SHARED_PREF_SERVICE_ENABLED, false)
+        private fun buildWorkRequest(requireWifi: Boolean = false,
+                                     requireCharging: Boolean = false,
+                                     delayMilliseconds: Long = 0L): OneTimeWorkRequest {
+            val constraints = Constraints.Builder()
+                .setRequiredNetworkType(if (requireWifi) NetworkType.UNMETERED else NetworkType.CONNECTED)
+                .setRequiresBatteryNotLow(true)
+                .setRequiresCharging(requireCharging)
+                .build();
+            
+            val work = OneTimeWorkRequest.Builder(BackupWorker::class.java)
+                .setConstraints(constraints)
+                .setBackoffCriteria(BackoffPolicy.EXPONENTIAL, ONE_MINUTE, TimeUnit.MILLISECONDS)
+                .setInitialDelay(delayMilliseconds, TimeUnit.MILLISECONDS)
+                .build()
+            return work
         }
 
         private val flutterLoader = FlutterLoader()

mobile/android/app/src/main/kotlin/com/example/mobile/ContentObserverWorker.kt

@@ -0,0 +1,136 @@
+package app.alextran.immich
+
+import android.content.Context
+import android.os.SystemClock
+import android.provider.MediaStore
+import android.util.Log
+import androidx.work.Constraints
+import androidx.work.Worker
+import androidx.work.WorkerParameters
+import androidx.work.ExistingWorkPolicy
+import androidx.work.OneTimeWorkRequest
+import androidx.work.WorkManager
+import androidx.work.Operation
+import java.util.concurrent.TimeUnit
+
+/**
+ * Worker executed by Android WorkManager observing content changes (new photos/videos)
+ *
+ * Immediately enqueues the BackupWorker when running. 
+ * As this work is not triggered periodically, but on content change, the
+ * worker enqueues itself again after each run.
+ */
+class ContentObserverWorker(ctx: Context, params: WorkerParameters) : Worker(ctx, params) {
+
+    override fun doWork(): Result {
+        if (!isEnabled(applicationContext)) {
+            return Result.failure()
+        }
+        if (getTriggeredContentUris().size > 0) {
+            startBackupWorker(applicationContext, delayMilliseconds = 0)
+        }
+        enqueueObserverWorker(applicationContext, ExistingWorkPolicy.REPLACE)
+        return Result.success()
+    }
+
+    companion object {
+        const val SHARED_PREF_SERVICE_ENABLED = "serviceEnabled"
+        const val SHARED_PREF_REQUIRE_WIFI = "requireWifi"
+        const val SHARED_PREF_REQUIRE_CHARGING = "requireCharging"
+
+        private const val TASK_NAME_OBSERVER = "immich/ContentObserver"
+
+        /**
+         * Enqueues the `ContentObserverWorker`.
+         * 
+         * @param context Android Context
+         */
+        fun enable(context: Context, immediate: Boolean = false) {
+            enqueueObserverWorker(context, ExistingWorkPolicy.KEEP)
+            Log.d(TAG, "enabled ContentObserverWorker")
+            if (immediate) {
+                startBackupWorker(context, delayMilliseconds = 5000)
+            }
+        }
+
+        /**
+         * Configures the `BackupWorker` to run when all constraints are met.
+         * 
+         * @param context Android Context
+         * @param requireWifi if true, task only runs if connected to wifi
+         * @param requireCharging if true, task only runs if device is charging
+         */
+        fun configureWork(context: Context,
+                          requireWifi: Boolean = false,
+                          requireCharging: Boolean = false) {
+            context.getSharedPreferences(BackupWorker.SHARED_PREF_NAME, Context.MODE_PRIVATE)
+                .edit()
+                .putBoolean(SHARED_PREF_SERVICE_ENABLED, true)
+                .putBoolean(SHARED_PREF_REQUIRE_WIFI, requireWifi)
+                .putBoolean(SHARED_PREF_REQUIRE_CHARGING, requireCharging)
+                .apply()
+            BackupWorker.updateBackupWorker(context, requireWifi, requireCharging)
+        }
+
+        /**
+         * Stops the currently running worker (if any) and removes it from the work queue
+         */
+        fun disable(context: Context) {
+            context.getSharedPreferences(BackupWorker.SHARED_PREF_NAME, Context.MODE_PRIVATE)
+                    .edit().putBoolean(SHARED_PREF_SERVICE_ENABLED, false).apply()
+            WorkManager.getInstance(context).cancelUniqueWork(TASK_NAME_OBSERVER)
+            Log.d(TAG, "disabled ContentObserverWorker")
+        }
+
+        /**
+         * Return true if the user has enabled the background backup service
+         */
+        fun isEnabled(ctx: Context): Boolean {
+            return ctx.getSharedPreferences(BackupWorker.SHARED_PREF_NAME, Context.MODE_PRIVATE)
+                    .getBoolean(SHARED_PREF_SERVICE_ENABLED, false)
+        }
+
+        /**
+         * Enqueue and replace the worker without the content trigger but with a short delay
+         */
+        fun workManagerAppClearedWorkaround(context: Context) {
+            val work = OneTimeWorkRequest.Builder(ContentObserverWorker::class.java)
+                .setInitialDelay(500, TimeUnit.MILLISECONDS)
+                .build()
+            WorkManager
+                .getInstance(context)
+                .enqueueUniqueWork(TASK_NAME_OBSERVER, ExistingWorkPolicy.REPLACE, work)
+                .getResult()
+                .get()
+            Log.d(TAG, "workManagerAppClearedWorkaround")
+        }
+
+        private fun enqueueObserverWorker(context: Context, policy: ExistingWorkPolicy) {
+            val constraints = Constraints.Builder()
+                .addContentUriTrigger(MediaStore.Images.Media.INTERNAL_CONTENT_URI, true)
+                .addContentUriTrigger(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, true)
+                .addContentUriTrigger(MediaStore.Video.Media.INTERNAL_CONTENT_URI, true)
+                .addContentUriTrigger(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, true)
+                .setTriggerContentUpdateDelay(5000, TimeUnit.MILLISECONDS)
+                .build()
+                
+            val work = OneTimeWorkRequest.Builder(ContentObserverWorker::class.java)
+                .setConstraints(constraints)
+                .build()
+            WorkManager.getInstance(context).enqueueUniqueWork(TASK_NAME_OBSERVER, policy, work)
+        }
+
+        fun startBackupWorker(context: Context, delayMilliseconds: Long) {
+            val sp = context.getSharedPreferences(BackupWorker.SHARED_PREF_NAME, Context.MODE_PRIVATE)
+            if (!sp.getBoolean(SHARED_PREF_SERVICE_ENABLED, false))
+                return
+            val requireWifi = sp.getBoolean(SHARED_PREF_REQUIRE_WIFI, true)
+            val requireCharging = sp.getBoolean(SHARED_PREF_REQUIRE_CHARGING, false)
+            BackupWorker.enqueueBackupWorker(context, requireWifi, requireCharging, delayMilliseconds)
+            sp.edit().putLong(BackupWorker.SHARED_PREF_LAST_CHANGE, SystemClock.uptimeMillis()).apply()
+        }
+
+    }
+}
+
+private const val TAG = "ContentObserverWorker"

mobile/android/app/src/main/kotlin/com/example/mobile/ImmichApp.kt

@@ -0,0 +1,19 @@
+package app.alextran.immich
+
+import android.app.Application
+import androidx.work.Configuration
+import androidx.work.WorkManager
+
+class ImmichApp : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        val config = Configuration.Builder().build()
+        WorkManager.initialize(this, config)
+        // always start BackupWorker after WorkManager init; this fixes the following bug:
+        // After the process is killed (by user or system), the first trigger (taking a new picture) is lost.
+        // Thus, the BackupWorker is not started. If the system kills the process after each initialization
+        // (because of low memory etc.), the backup is never performed.
+        // As a workaround, we also run a backup check when initializing the application
+        ContentObserverWorker.startBackupWorker(context = this, delayMilliseconds = 0)
+    }
+}

mobile/android/app/src/main/kotlin/com/example/mobile/MainActivity.kt

@@ -2,12 +2,14 @@ package app.alextran.immich
 
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
+import android.os.Bundle
+import android.content.Intent
 
-class MainActivity: FlutterActivity() {
+class MainActivity : FlutterActivity() {
 
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
-        flutterEngine.getPlugins().add(BackgroundServicePlugin())
+        flutterEngine.plugins.add(BackgroundServicePlugin())
     }
 
 }

mobile/android/fastlane/Fastfile

@@ -16,12 +16,17 @@
 default_platform(:android)
 
 platform :android do
-  desc "Build Android"
-  lane :build do
+  desc "Build Android and Release Testing"
+  lane :beta do
     gradle(
       task: 'bundle', 
       build_type: 'Release',
+      properties: {
+        "android.injected.version.code" => 47,
+        "android.injected.version.name" => "1.30.2",
+      }
     )
+    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', track: 'beta')
   end
 
   desc "Build and Release Android"
@@ -30,8 +35,8 @@ platform :android do
       task: 'bundle', 
       build_type: 'Release',
       properties: {
-        "android.injected.version.code" => 35,
-        "android.injected.version.name" => "1.25.0",
+        "android.injected.version.code" => 49,
+        "android.injected.version.name" => "1.31.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')

mobile/android/fastlane/README.md

@@ -15,13 +15,13 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do
 
 ## Android
 
-### android build
+### android beta
 
 ```sh
-[bundle exec] fastlane android build
+[bundle exec] fastlane android beta
 ```
 
-Build Android
+Build Android and Release Testing
 
 ### android release
 

mobile/android/fastlane/metadata/android/en-US/changelogs/36.txt

@@ -0,0 +1 @@
+* Fixed rendering blank when failed to parse datetime on main timeline

mobile/android/fastlane/metadata/android/en-US/changelogs/37.txt

@@ -0,0 +1,2 @@
+* Add cache setting and improve caching mechanism
+* Persist WiFi + charging settings of background backup

mobile/android/fastlane/metadata/android/en-US/changelogs/38.txt

@@ -0,0 +1,2 @@
+* Fixed remove empty translations
+* Fixed search page crashes the app on some Android models

mobile/android/fastlane/metadata/android/en-US/changelogs/39.txt

@@ -0,0 +1 @@
+* Improve Android background service reliability

mobile/android/fastlane/metadata/android/en-US/changelogs/40.txt

@@ -0,0 +1 @@
+* Fix background service cannot run in release build

mobile/android/fastlane/metadata/android/en-US/changelogs/41.txt

@@ -0,0 +1,2 @@
+* Fixed oversize play button on video
+* Fixed app crashing when swipe between assets

mobile/android/fastlane/metadata/android/en-US/changelogs/42.txt

@@ -0,0 +1,2 @@
+* Fixed Android BackgroundServiceStartNotAllowedException
+* Restore old cache mechanism

mobile/android/fastlane/metadata/android/en-US/changelogs/43.txt

@@ -0,0 +1 @@
+* Update deprecated API that causes notification not dismissing after background upload progress finished.

mobile/android/fastlane/metadata/android/en-US/changelogs/44.txt

@@ -0,0 +1 @@
+* Fixed app crashes when there is no object detection result.

mobile/android/fastlane/metadata/android/en-US/changelogs/45.txt

@@ -0,0 +1 @@
+* Correctly display time based on timezone

mobile/android/fastlane/metadata/android/en-US/changelogs/46.txt

@@ -0,0 +1 @@
+* Added improvement for timeline view

mobile/android/fastlane/metadata/android/en-US/changelogs/47.txt

@@ -0,0 +1 @@
+* Improve scroll thumb date info

mobile/android/fastlane/metadata/android/en-US/changelogs/48.txt

@@ -0,0 +1 @@
+* Fixed parsing date error prevent timeline to be loaded.

mobile/android/fastlane/metadata/android/en-US/changelogs/49.txt

@@ -0,0 +1,2 @@
+* Fixed run background service after being killed 
+* Added background backup progress notifications

mobile/android/fastlane/report.xml

@@ -5,12 +5,17 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000212">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000233">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="3.608039">
+      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="61.699536">
+        
+      </testcase>
+    
+      
+      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="46.210553">
         
       </testcase>
     

mobile/assets/i18n/de-DE.json

@@ -1,6 +1,9 @@
 {
   "album_info_card_backup_album_excluded": "AUSGESCHLOSSEN",
   "album_info_card_backup_album_included": "EINGESCHLOSSEN",
+  "album_thumbnail_card_item": "1 Element",
+  "album_thumbnail_card_items": "{} Elemente",
+  "album_thumbnail_card_shared": " · Geteilt",
   "album_viewer_appbar_share_delete": "Album löschen",
   "album_viewer_appbar_share_err_delete": "Album konnte nicht gelöscht werden",
   "album_viewer_appbar_share_err_leave": "Album konnte nicht verlassen werden",
@@ -46,9 +49,11 @@
   "backup_err_only_album": "Das einzige Album kann nicht entfernt werden",
   "backup_info_card_assets": "Elemente",
   "control_bottom_app_bar_delete": "Löschen",
-  "create_shared_album_page_share": "Teilen",
+  "control_bottom_app_bar_share": "Teilen",
+  "create_album_page_untitled": "Unbenannt",
   "create_shared_album_page_create": "Erstellen",
-  "create_shared_album_page_share_add_assets": "FOTOS HINZUFÜGEN",
+  "create_shared_album_page_share": "Teilen",
+  "create_shared_album_page_share_add_assets": "ELEMENTE HINZUFÜGEN",
   "create_shared_album_page_share_select_photos": "Fotos auswählen",
   "daily_title_text_date": "E, dd MMM",
   "daily_title_text_date_year": "E, dd MMM, yyyy",
@@ -60,6 +65,8 @@
   "exif_bottom_sheet_description": "Beschreibung hinzufügen...",
   "exif_bottom_sheet_details": "DETAILS",
   "exif_bottom_sheet_location": "STANDORT",
+  "library_page_albums": "Alben",
+  "library_page_new_album": "Neues Album",
   "login_form_button_text": "Anmelden",
   "login_form_email_hint": "deine@email.de",
   "login_form_endpoint_hint": "http://deine-server-ip:port/api",
@@ -68,15 +75,15 @@
   "login_form_err_invalid_email": "Ungültige E-Mail",
   "login_form_err_leading_whitespace": "Führendes Leerzichen",
   "login_form_err_trailing_whitespace": "Folgendes Leerzeichen",
-  "login_form_failed_login": "Fehler bei der Anmeldung, überprüfen Sie Server URL, E-Mail und Passwort",
+  "login_form_failed_login": "Error logging you in, check server url, email and password",
   "login_form_label_email": "E-Mail",
   "login_form_label_password": "Passwort",
-  "login_form_password_hint": "Passwort",
+  "login_form_password_hint": "password",
   "login_form_save_login": "Angemeldet bleiben",
   "monthly_title_text_date_format": "MMMM y",
   "profile_drawer_client_server_up_to_date": "App und Server sind aktuell",
-  "profile_drawer_sign_out": "Abmelden",
   "profile_drawer_settings": "Einstellungen",
+  "profile_drawer_sign_out": "Abmelden",
   "search_bar_hint": "Durchsuche deine Fotos",
   "search_page_no_objects": "Keine Objektinformationen verfügbar",
   "search_page_no_places": "Keine Informationen über Orte verfügbar",
@@ -85,42 +92,35 @@
   "search_result_page_new_search_hint": "Neue Suche",
   "select_additional_user_for_sharing_page_suggestions": "Vorschläge",
   "select_user_for_sharing_page_err_album": "Album konnte nicht erstellt werden",
-  "select_user_for_sharing_page_share_suggestions": "Vorschläge",
+  "select_user_for_sharing_page_share_suggestions": "Suggestions",
+  "setting_pages_app_bar_settings": "Einstellungen",
   "share_add": "Hinzufügen",
   "share_add_photos": "Fotos hinzufügen",
   "share_add_title": "Titel hinzufügen",
   "share_create_album": "Album erstellen",
+  "share_dialog_preparing": "Vorbereiten...",
   "share_invite": "Zum Album einladen",
   "sharing_page_album": "Geteilte Alben",
   "sharing_page_description": "Erstelle ein geteiltes Album um Fotos und Videos mit Personen in deinem Netzwerk zu teilen.",
   "sharing_page_empty_list": "LEERE LISTE",
   "sharing_silver_appbar_create_shared_album": "Neues geteiltes Album",
   "sharing_silver_appbar_share_partner": "Teile mit Partner",
+  "tab_controller_nav_library": "Bibliothek",
   "tab_controller_nav_photos": "Fotos",
   "tab_controller_nav_search": "Suche",
   "tab_controller_nav_sharing": "Teilen",
-  "tab_controller_nav_library": "Bibliothek",
+  "theme_setting_dark_mode_switch": "Dunkler Modus",
+  "theme_setting_image_viewer_quality_subtitle": "Einstellen der Qualität des Detailbildbetrachters",
+  "theme_setting_image_viewer_quality_title": "Qualität des Bildbetrachters",
+  "theme_setting_system_theme_switch": "Automatisch (Systemeinstellung folgen)",
+  "theme_setting_theme_subtitle": "Wählen Sie die Themeneinstellung der App",
+  "theme_setting_theme_title": "Theme",
+  "theme_setting_three_stage_loading_subtitle": "Das dreistufige Ladeverfahren kann die Performance beim Laden verbessern, erhöht allerdings den Datenverbrauch deutlich",
+  "theme_setting_three_stage_loading_title": "Dreistufiges Laden aktivieren",
   "version_announcement_overlay_ack": "Ich habe verstanden",
   "version_announcement_overlay_release_notes": "Änderungsprotokoll",
   "version_announcement_overlay_text_1": "Hallo mein Freund! Es gibt eine neue Version von",
   "version_announcement_overlay_text_2": "Bitte nehm dir die Zeit und lese das ",
   "version_announcement_overlay_text_3": " und achte darauf, dass deine docker-compose und .env Dateien aktuell sind, vor allem wenn du ein System für automatische Updates benutzt (z.B. Watchtower).",
-  "version_announcement_overlay_title": "Neue Server-Version verfügbar \uD83C\uDF89",
-  "album_thumbnail_card_item": "1 Element",
-  "album_thumbnail_card_items": "{} Elemente",
-  "album_thumbnail_card_shared": " · Geteilt",
-  "library_page_albums": "Alben",
-  "library_page_new_album": "Neues Album",
-  "create_album_page_untitled": "Unbenannt",
-  "share_dialog_preparing": "Vorbereiten...",
-  "control_bottom_app_bar_share": "Teilen",
-  "setting_pages_app_bar_settings": "Einstellungen",
-  "theme_setting_theme_title": "Theme",
-  "theme_setting_theme_subtitle": "Wählen Sie die Themeneinstellung der App",
-  "theme_setting_system_theme_switch": "Automatisch (Systemeinstellung folgen)",
-  "theme_setting_dark_mode_switch": "Dunkler Modus",
-  "theme_setting_image_viewer_quality_title": "Qualität des Bildbetrachters",
-  "theme_setting_image_viewer_quality_subtitle": "Einstellen der Qualität des Detailbildbetrachters",
-  "theme_setting_three_stage_loading_title": "Dreistufiges Laden aktivieren",
-  "theme_setting_three_stage_loading_subtitle": "Das dreistufige Ladeverfahren kann die Performance beim Laden verbessern, erhöht allerdings den Datenverbrauch deutlich"
-}
+  "version_announcement_overlay_title": "Neue Server-Version verfügbar \uD83C\uDF89"
+}

mobile/assets/i18n/en-US.json

@@ -1,6 +1,9 @@
 {
   "album_info_card_backup_album_excluded": "EXCLUDED",
   "album_info_card_backup_album_included": "INCLUDED",
+  "album_thumbnail_card_item": "1 item",
+  "album_thumbnail_card_items": "{} items",
+  "album_thumbnail_card_shared": " · Shared",
   "album_viewer_appbar_share_delete": "Delete album",
   "album_viewer_appbar_share_err_delete": "Failed to delete album",
   "album_viewer_appbar_share_err_leave": "Failed to leave album",
@@ -9,6 +12,8 @@
   "album_viewer_appbar_share_leave": "Leave album",
   "album_viewer_appbar_share_remove": "Remove from album",
   "album_viewer_page_share_add_users": "Add users",
+  "asset_list_settings_subtitle": "Photo grid layout settings",
+  "asset_list_settings_title": "Photo Grid",
   "backup_album_selection_page_albums_device": "Albums on device ({})",
   "backup_album_selection_page_albums_tap": "Tap to include, double tap to exclude",
   "backup_album_selection_page_assets_scatter": "Assets can scatter across multiple albums. Thus, albums can be included or excluded during the backup process.",
@@ -16,26 +21,29 @@
   "backup_album_selection_page_selection_info": "Selection Info",
   "backup_album_selection_page_total_assets": "Total unique assets",
   "backup_all": "All",
-  "backup_background_service_default_notification": "Checking for new assets…",
-  "backup_background_service_disable_battery_optimizations": "Please disable battery optimization for Immich to enable background backup",
-  "backup_background_service_upload_failure_notification": "Failed to upload {}",
-  "backup_background_service_in_progress_notification": "Backing up your assets…",
-  "backup_background_service_current_upload_notification": "Uploading {}",
-  "backup_background_service_error_title": "Backup error",
-  "backup_background_service_connection_failed_message": "Failed to connect to the server. Retrying…",
   "backup_background_service_backup_failed_message": "Failed to backup assets. Retrying…",
+  "backup_background_service_connection_failed_message": "Failed to connect to the server. Retrying…",
+  "backup_background_service_current_upload_notification": "Uploading {}",
+  "backup_background_service_default_notification": "Checking for new assets…",
+  "backup_background_service_error_title": "Backup error",
+  "backup_background_service_in_progress_notification": "Backing up your assets…",
+  "backup_background_service_upload_failure_notification": "Failed to upload {}",
   "backup_controller_page_albums": "Backup Albums",
+  "backup_controller_page_background_battery_info_link": "Show me how",
+  "backup_controller_page_background_battery_info_message": "For the best background backup experience, please disable any battery optimizations restricting background activity for Immich.\n\nSince this is device-specific, please lookup the required information for your device manufacturer.",
+  "backup_controller_page_background_battery_info_ok": "OK",
+  "backup_controller_page_background_battery_info_title": "Battery optimizations",
+  "backup_controller_page_background_charging": "Only while charging",
+  "backup_controller_page_background_configure_error": "Failed to configure the background service",
+  "backup_controller_page_background_description": "Turn on the background service to automatically backup any new assets without needing to open the app",
+  "backup_controller_page_background_is_off": "Automatic background backup is off",
+  "backup_controller_page_background_is_on": "Automatic background backup is on",
+  "backup_controller_page_background_turn_off": "Turn off background service",
+  "backup_controller_page_background_turn_on": "Turn on background service",
+  "backup_controller_page_background_wifi": "Only on WiFi",
   "backup_controller_page_backup": "Backup",
   "backup_controller_page_backup_selected": "Selected: ",
   "backup_controller_page_backup_sub": "Backed up photos and videos",
-  "backup_controller_page_background_description": "Turn on the background service to automatically backup any new assets without needing to open the app",
-  "backup_controller_page_background_wifi": "Only on WiFi",
-  "backup_controller_page_background_charging": "Only while charging",
-  "backup_controller_page_background_is_on": "Automatic background backup is on",
-  "backup_controller_page_background_is_off": "Automatic background backup is off",
-  "backup_controller_page_background_turn_on": "Turn on background service",
-  "backup_controller_page_background_turn_off": "Turn off background service",
-  "backup_controller_page_background_configure_error": "Failed to configure the background service",
   "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.",
@@ -61,10 +69,25 @@
   "backup_controller_page_uploading_file_info": "Uploading file info",
   "backup_err_only_album": "Cannot remove the only album",
   "backup_info_card_assets": "assets",
+  "cache_settings_album_thumbnails": "Library page thumbnails ({} assets)",
+  "cache_settings_clear_cache_button": "Clear cache",
+  "cache_settings_clear_cache_button_title": "Clears the app's cache. This will significantly impact the app's performance until the cache has rebuilt.",
+  "cache_settings_image_cache_size": "Image cache size ({} assets)",
+  "cache_settings_statistics_album": "Library thumbnails",
+  "cache_settings_statistics_assets": "{} assets ({})",
+  "cache_settings_statistics_full": "Full images",
+  "cache_settings_statistics_shared": "Shared album thumbnails",
+  "cache_settings_statistics_thumbnail": "Thumbnails",
+  "cache_settings_statistics_title": "Cache usage",
+  "cache_settings_subtitle": "Control the caching behaviour of the Immich mobile application",
+  "cache_settings_thumbnail_size": "Thumbnail cache size ({} assets)",
+  "cache_settings_title": "Caching Settings",
   "control_bottom_app_bar_delete": "Delete",
-  "create_shared_album_page_share": "Share",
+  "control_bottom_app_bar_share": "Share",
+  "create_album_page_untitled": "Untitled",
   "create_shared_album_page_create": "Create",
-  "create_shared_album_page_share_add_assets": "ADD PHOTOS",
+  "create_shared_album_page_share": "Share",
+  "create_shared_album_page_share_add_assets": "ADD ASSETS",
   "create_shared_album_page_share_select_photos": "Select Photos",
   "daily_title_text_date": "E, MMM dd",
   "daily_title_text_date_year": "E, MMM dd, yyyy",
@@ -76,6 +99,8 @@
   "exif_bottom_sheet_description": "Add Description...",
   "exif_bottom_sheet_details": "DETAILS",
   "exif_bottom_sheet_location": "LOCATION",
+  "library_page_albums": "Albums",
+  "library_page_new_album": "New album",
   "login_form_button_text": "Login",
   "login_form_email_hint": "youremail@email.com",
   "login_form_endpoint_hint": "http://your-server-ip:port/api",
@@ -91,8 +116,8 @@
   "login_form_save_login": "Stay logged in",
   "monthly_title_text_date_format": "MMMM y",
   "profile_drawer_client_server_up_to_date": "Client and Server are up-to-date",
-  "profile_drawer_sign_out": "Sign out",
   "profile_drawer_settings": "Settings",
+  "profile_drawer_sign_out": "Sign Out",
   "search_bar_hint": "Search your photos",
   "search_page_no_objects": "No Objects Info Available",
   "search_page_no_places": "No Places Info Available",
@@ -102,52 +127,52 @@
   "select_additional_user_for_sharing_page_suggestions": "Suggestions",
   "select_user_for_sharing_page_err_album": "Failed to create album",
   "select_user_for_sharing_page_share_suggestions": "Suggestions",
+  "setting_notifications_notify_failures_grace_period": "Notify background backup failures: {}",
+  "setting_notifications_notify_hours": "{} hours",
+  "setting_notifications_notify_immediately": "immediately",
+  "setting_notifications_notify_minutes": "{} minutes",
+  "setting_notifications_notify_never": "never",
+  "setting_notifications_subtitle": "Adjust your notification preferences",
+  "setting_notifications_title": "Notifications",
+  "setting_notifications_total_progress_title": "Show background backup total progress",
+  "setting_notifications_total_progress_subtitle": "Overall upload progress (done/total assets)",
+  "setting_notifications_single_progress_title": "Show background backup detail progress",
+  "setting_notifications_single_progress_subtitle": "Detailed upload progress information per asset",
+  "setting_pages_app_bar_settings": "Settings",
   "share_add": "Add",
   "share_add_photos": "Add photos",
   "share_add_title": "Add a title",
   "share_create_album": "Create album",
+  "share_dialog_preparing": "Preparing...",
   "share_invite": "Invite to album",
   "sharing_page_album": "Shared albums",
   "sharing_page_description": "Create shared albums to share photos and videos with people in your network.",
   "sharing_page_empty_list": "EMPTY LIST",
   "sharing_silver_appbar_create_shared_album": "Create shared album",
   "sharing_silver_appbar_share_partner": "Share with partner",
+  "tab_controller_nav_library": "Library",
   "tab_controller_nav_photos": "Photos",
   "tab_controller_nav_search": "Search",
   "tab_controller_nav_sharing": "Sharing",
-  "tab_controller_nav_library": "Library",
+  "theme_setting_asset_list_storage_indicator_title": "Show storage indicator on asset tiles",
+  "theme_setting_asset_list_tiles_per_row_title": "Number of assets per row ({})",
+  "theme_setting_dark_mode_switch": "Dark mode",
+  "theme_setting_image_viewer_quality_subtitle": "Adjust the quality of the detail image viewer",
+  "theme_setting_image_viewer_quality_title": "Image viewer quality",
+  "theme_setting_system_theme_switch": "Automatic (Follow system setting)",
+  "theme_setting_theme_subtitle": "Choose the app's theme setting",
+  "theme_setting_theme_title": "Theme",
+  "theme_setting_three_stage_loading_subtitle": "Three-stage loading might increase the loading performance but causes significantly higher network load",
+  "theme_setting_three_stage_loading_title": "Enable three-stage loading",
   "version_announcement_overlay_ack": "Acknowledge",
   "version_announcement_overlay_release_notes": "release notes",
   "version_announcement_overlay_text_1": "Hi friend, there is a new release of",
   "version_announcement_overlay_text_2": "please take your time to visit the ",
   "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",
-  "album_thumbnail_card_item": "1 item",
-  "album_thumbnail_card_items": "{} items",
-  "album_thumbnail_card_shared": " · Shared",
-  "library_page_albums": "Albums",
-  "library_page_new_album": "New album",
-  "create_album_page_untitled": "Untitled",
-  "share_dialog_preparing": "Preparing...",
-  "control_bottom_app_bar_share": "Share",
-  "setting_pages_app_bar_settings": "Settings",
-  "theme_setting_theme_title": "Theme",
-  "theme_setting_theme_subtitle": "Choose the app's theme setting",
-  "theme_setting_system_theme_switch": "Automatic (Follow system setting)",
-  "theme_setting_dark_mode_switch": "Dark mode",
-  "theme_setting_image_viewer_quality_title": "Image viewer quality",
-  "theme_setting_image_viewer_quality_subtitle": "Adjust the quality of the detail image viewer",
-  "theme_setting_three_stage_loading_title": "Enable three-stage loading",
-  "theme_setting_three_stage_loading_subtitle": "Three-stage loading might increase the loading performance but causes significantly higher network load",
-  "asset_list_settings_title": "Photo Grid",
-  "asset_list_settings_subtitle": "Photo grid layout settings",
-  "theme_setting_asset_list_storage_indicator_title": "Show storage indicator on asset tiles",
-  "theme_setting_asset_list_tiles_per_row_title": "Number of assets per row ({})",
-  "setting_notifications_title": "Notifications",
-  "setting_notifications_subtitle": "Adjust your notification preferences",
-  "setting_notifications_notify_failures_grace_period": "Notify background backup failures: {}",
-  "setting_notifications_notify_immediately": "immediately",
-  "setting_notifications_notify_minutes": "{} minutes",
-  "setting_notifications_notify_hours": "{} hours",
-  "setting_notifications_notify_never": "never"
-}
+  "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"
+}

mobile/assets/i18n/es-ES.json

@@ -21,12 +21,8 @@
   "backup_controller_page_backup_selected": "Seleccionado:",
   "backup_controller_page_backup_sub": "Copia de seguridad de fotos y vídeos",
   "backup_controller_page_cancel": "Cancelar",
-  "backup_controller_page_created": "",
   "backup_controller_page_desc_backup": "Active la copia de seguridad para cargar automáticamente los nuevos activos al servidor.",
   "backup_controller_page_excluded": "Excluido:",
-  "backup_controller_page_failed": "",
-  "backup_controller_page_filename": "",
-  "backup_controller_page_id": "",
   "backup_controller_page_info": "Información de la Copia de Seguridad",
   "backup_controller_page_none_selected": "Ninguno seleccionado",
   "backup_controller_page_remainder": "Remanente",
@@ -42,7 +38,6 @@
   "backup_controller_page_total_sub": "Todas las fotos y vídeos únicos de los álbumes seleccionados",
   "backup_controller_page_turn_off": "Apagar la copia de seguridad",
   "backup_controller_page_turn_on": "Activar la copia de seguridad",
-  "backup_controller_page_uploading_file_info": "",
   "backup_err_only_album": "No se puede eliminar el único álbum",
   "backup_info_card_assets": "activos",
   "control_bottom_app_bar_delete": "Eliminar",
@@ -67,7 +62,6 @@
   "login_form_err_invalid_email": "Correo electrónico no válido",
   "login_form_err_leading_whitespace": "Espacio en blanco inicial",
   "login_form_err_trailing_whitespace": "Espacio en blanco al final",
-  "login_form_failed_login": "",
   "login_form_label_email": "Correo",
   "login_form_label_password": "Contraseña",
   "login_form_password_hint": "contraseña",
@@ -76,14 +70,12 @@
   "profile_drawer_client_server_up_to_date": "El Cliente y el Servidor están actualizados",
   "profile_drawer_sign_out": "Cerrar Sesión",
   "search_bar_hint": "Busca tus fotos",
-  "search_page_no_objects": "",
   "search_page_no_places": "No hay información de lugares disponibles",
   "search_page_places": "Lugares",
   "search_page_things": "Cosas",
   "search_result_page_new_search_hint": "Nueva Busqueda",
   "select_additional_user_for_sharing_page_suggestions": "Sugerencias",
   "select_user_for_sharing_page_err_album": "Fallo al crear el álbum",
-  "select_user_for_sharing_page_share_suggestions": "",
   "share_add": "Añadir",
   "share_add_photos": "Añadir fotos",
   "share_add_title": "Añadir un título",

mobile/assets/i18n/fi-FI.json

@@ -49,9 +49,6 @@
   "create_shared_album_page_share": "Jaa",
   "create_shared_album_page_share_add_assets": "LISÄÄ KOHTEITA",
   "create_shared_album_page_share_select_photos": "Valitse kuvat",
-  "daily_title_text_date": "",
-  "daily_title_text_date_year": "",
-  "date_format": "",
   "delete_dialog_alert": "Nämä kohteet poistetaan pysyvästi Immich:stä ja laitteeltasi",
   "delete_dialog_cancel": "Peruuta",
   "delete_dialog_ok": "Poista",
@@ -72,7 +69,6 @@
   "login_form_label_password": "Salasana",
   "login_form_password_hint": "salasana",
   "login_form_save_login": "Pysy kirjautuneena",
-  "monthly_title_text_date_format": "",
   "profile_drawer_client_server_up_to_date": "Asiakassovellus ja palvelin ovat ajan tasalla",
   "profile_drawer_sign_out": "Kirjaudu ulos",
   "search_bar_hint": "Etsi kuvia",

mobile/assets/i18n/fr-FR.json

@@ -1,6 +1,9 @@
 {
   "album_info_card_backup_album_excluded": "EXCLU",
   "album_info_card_backup_album_included": "INCLUS",
+  "album_thumbnail_card_item": "1 élément",
+  "album_thumbnail_card_items": "{} éléments",
+  "album_thumbnail_card_shared": " · Partagé",
   "album_viewer_appbar_share_delete": "Supprimer l'album",
   "album_viewer_appbar_share_err_delete": "Échec de la suppression de l'album",
   "album_viewer_appbar_share_err_leave": "Impossible de quitter l'album",
@@ -46,6 +49,9 @@
   "backup_err_only_album": "Impossible de retirer le seul album",
   "backup_info_card_assets": "éléments",
   "control_bottom_app_bar_delete": "Supprimer",
+  "control_bottom_app_bar_share": "Partager",
+  "create_album_page_untitled": "Sans titre",
+  "create_shared_album_page_create": "Créer",
   "create_shared_album_page_share": "Partager",
   "create_shared_album_page_share_add_assets": "AJOUTER DES ÉLÉMENTS",
   "create_shared_album_page_share_select_photos": "Sélectionner les photos",
@@ -59,6 +65,8 @@
   "exif_bottom_sheet_description": "Ajouter une description...",
   "exif_bottom_sheet_details": "DÉTAILS",
   "exif_bottom_sheet_location": "LOCALISATION",
+  "library_page_albums": "Albums",
+  "library_page_new_album": "Nouvel album",
   "login_form_button_text": "Connexion",
   "login_form_email_hint": "votreemail@email.com",
   "login_form_endpoint_hint": "http://adresse-ip-serveur:port/api",
@@ -74,6 +82,7 @@
   "login_form_save_login": "Rester connecté",
   "monthly_title_text_date_format": "MMMM y",
   "profile_drawer_client_server_up_to_date": "Le client et le serveur sont à jour",
+  "profile_drawer_settings": "Paramètres",
   "profile_drawer_sign_out": "Se déconnecter",
   "search_bar_hint": "Rechercher vos photos",
   "search_page_no_objects": "Aucune information disponible sur les objets",
@@ -88,12 +97,14 @@
   "share_add_photos": "Ajouter des photos",
   "share_add_title": "Ajouter un titre",
   "share_create_album": "Créer un album",
+  "share_dialog_preparing": "Préparation...",
   "share_invite": "Inviter à l'album",
   "sharing_page_album": "Albums partagés",
   "sharing_page_description": "Créez des albums partagés pour partager des photos et des vidéos avec les personnes de votre réseau.",
   "sharing_page_empty_list": "LISTE VIDE",
   "sharing_silver_appbar_create_shared_album": "Créer un album partagé",
   "sharing_silver_appbar_share_partner": "Partager avec un partenaire",
+  "tab_controller_nav_library": "Bibliothèque",
   "tab_controller_nav_photos": "Photos",
   "tab_controller_nav_search": "Recherche",
   "tab_controller_nav_sharing": "Partage",

mobile/assets/i18n/it-IT.json

@@ -1,28 +1,52 @@
 {
   "album_info_card_backup_album_excluded": "ESCLUSI",
   "album_info_card_backup_album_included": "INCLUSI",
+  "album_thumbnail_card_item": "1 elemento ",
+  "album_thumbnail_card_items": "{} elementi",
+  "album_thumbnail_card_shared": "Condiviso",
   "album_viewer_appbar_share_delete": "Elimina album ",
-  "album_viewer_appbar_share_err_delete": "Fallito nel cancellare l'album ",
-  "album_viewer_appbar_share_err_leave": "Fallito nel lasciare l'album ",
+  "album_viewer_appbar_share_err_delete": "Errore nel cancellare l'album ",
+  "album_viewer_appbar_share_err_leave": "Errore nel lasciare l'album ",
   "album_viewer_appbar_share_err_remove": "Ci sono problemi nel rimuovere oggetti dall'album ",
-  "album_viewer_appbar_share_err_title": "Fallito nel cambiare titolo dell'album ",
-  "album_viewer_appbar_share_leave": "Lascia l'album",
+  "album_viewer_appbar_share_err_title": "Errore nel cambiare il titolo dell'album ",
+  "album_viewer_appbar_share_leave": "Lascia album",
   "album_viewer_appbar_share_remove": "Rimuovere dall'album ",
   "album_viewer_page_share_add_users": "Aggiungi utenti",
-  "backup_album_selection_page_albums_device": "Albums nel device ({})",
+  "asset_list_settings_subtitle": "Impostazion del layout della griglia delle foto",
+  "asset_list_settings_title": "Griglia foto",
+  "backup_album_selection_page_albums_device": "Albums sul device ({})",
   "backup_album_selection_page_albums_tap": "Tap per includere, doppio tap per escludere.",
   "backup_album_selection_page_assets_scatter": "Stesse immagini e video possono trovarsi tra più album, così gli album possono essere inclusi o esclusi dal backup.",
   "backup_album_selection_page_select_albums": "Seleziona gli album",
   "backup_album_selection_page_selection_info": "Informazioni sulla selezione ",
   "backup_album_selection_page_total_assets": "Numero totale di oggetti unici",
   "backup_all": "Tutti",
-  "backup_controller_page_albums": "Backup album",
+  "backup_background_service_backup_failed_message": "Impossibile caricare contenuti. Nuovo tentativo…",
+  "backup_background_service_connection_failed_message": "Impossibile connettersi al server. Nuovo tentativo…",
+  "backup_background_service_current_upload_notification": "Caricamento {}",
+  "backup_background_service_default_notification": "Verifica di nuovi contenuti…",
+  "backup_background_service_error_title": "Errore di Backup",
+  "backup_background_service_in_progress_notification": "Backing dei tuoi contenuti…",
+  "backup_background_service_upload_failure_notification": "Impossibile caricare {}",
+  "backup_controller_page_albums": "Backup Album",
+  "backup_controller_page_background_battery_info_link": "Mostrami come",
+  "backup_controller_page_background_battery_info_message": "Per una migliore esperienza di backup, disabilita le ottimisazioni della batteria per l'app Immich.\n\nDal momento che è una funzionalità specifica del dispositivo, per favore consulta il manuale del produttore.",
+  "backup_controller_page_background_battery_info_ok": "OK",
+  "backup_controller_page_background_battery_info_title": "Ottimizzazioni batteria",
+  "backup_controller_page_background_charging": "Solo durante la ricarica",
+  "backup_controller_page_background_configure_error": "Impossibile configurare i servizi in background",
+  "backup_controller_page_background_description": "Abilita i servizi in background per sincronizzare tutti i nuovi contenuti senza la necessità di aprire l'app",
+  "backup_controller_page_background_is_off": "Backup automatico spento",
+  "backup_controller_page_background_is_on": "Backup automatico attivo",
+  "backup_controller_page_background_turn_off": "Disabilita servizi in background",
+  "backup_controller_page_background_turn_on": "Abilita servizi in background",
+  "backup_controller_page_background_wifi": "Solo su WiFi",
   "backup_controller_page_backup": "Backup",
   "backup_controller_page_backup_selected": "Selezionati:",
-  "backup_controller_page_backup_sub": "Photo e video salvati",
+  "backup_controller_page_backup_sub": "Foto e video caricati",
   "backup_controller_page_cancel": "Cancella ",
   "backup_controller_page_created": "Creato il: {}",
-  "backup_controller_page_desc_backup": "Attiva il backup automatico per eseguire upload sul server",
+  "backup_controller_page_desc_backup": "Attiva il backup per eseguire il caricamento automatico sul server",
   "backup_controller_page_excluded": "Esclusi:",
   "backup_controller_page_failed": "Falliti: ({})",
   "backup_controller_page_filename": "Nome del file: {} [{}]",
@@ -30,39 +54,57 @@
   "backup_controller_page_info": "Informazioni sul backup",
   "backup_controller_page_none_selected": "Nessuna selezione",
   "backup_controller_page_remainder": "Promemoria ",
-  "backup_controller_page_remainder_sub": "Photo e album selezionati che rimangono da salvare",
+  "backup_controller_page_remainder_sub": "Photo e album selezionati che rimangono da caricare",
   "backup_controller_page_select": "Seleziona ",
-  "backup_controller_page_server_storage": "Spazio nel server",
+  "backup_controller_page_server_storage": "Spazio sul server",
   "backup_controller_page_start_backup": "Inizia backup ",
   "backup_controller_page_status_off": "Backup è disattivato ",
   "backup_controller_page_status_on": "Backup è attivato",
   "backup_controller_page_storage_format": "{} di {} usati",
-  "backup_controller_page_to_backup": "Album da salvare",
+  "backup_controller_page_to_backup": "Album da caricare",
   "backup_controller_page_total": "Totale",
-  "backup_controller_page_total_sub": "Tutte le foto e i video unici salvati dagli album selezionati ",
+  "backup_controller_page_total_sub": "Tutte le foto e i video unici caricati dagli album selezionati ",
   "backup_controller_page_turn_off": "Disattiva backup",
   "backup_controller_page_turn_on": "Attiva backup ",
   "backup_controller_page_uploading_file_info": "Info sul file caricato",
   "backup_err_only_album": "Non è possibile rimuovere l'unico album",
-  "backup_info_card_assets": "Oggetti ",
+  "backup_info_card_assets": "oggetti ",
+  "cache_settings_album_thumbnails": "Anteprime pagine librerie ({} assets)",
+  "cache_settings_clear_cache_button": "Cancella cache",
+  "cache_settings_clear_cache_button_title": "Cancella cache app. Questo impatterà sulle prestazioni applicative fino a quando la cache non sarà rigenerata.",
+  "cache_settings_image_cache_size": "Dimensione cache foto ({} assets)",
+  "cache_settings_statistics_album": "Anteprime librerie",
+  "cache_settings_statistics_assets": "{} contenuti ({})",
+  "cache_settings_statistics_full": "Immagini complete",
+  "cache_settings_statistics_shared": "Anteprime album condivisi",
+  "cache_settings_statistics_thumbnail": "Anteprime",
+  "cache_settings_statistics_title": "Uso della cache",
+  "cache_settings_subtitle": "Controlla il comportamento della cache",
+  "cache_settings_thumbnail_size": "Dimensione cache anteprime ({} assets)",
+  "cache_settings_title": "Impostazioni della Cache",
   "control_bottom_app_bar_delete": "Elimina",
+  "control_bottom_app_bar_share": "Condividi",
+  "create_album_page_untitled": "Senza titolo",
+  "create_shared_album_page_create": "Crea",
   "create_shared_album_page_share": "Condividi",
   "create_shared_album_page_share_add_assets": "AGGIUNGI OGGETTI",
   "create_shared_album_page_share_select_photos": "Seleziona foto",
   "daily_title_text_date": "E, dd MMM",
   "daily_title_text_date_year": "E, dd MMM, yyyy",
   "date_format": "E, d LLL, y • hh:mm",
-  "delete_dialog_alert": "Questi oggetti saranno cancellati permanentemente da Immich e dal tuo device",
+  "delete_dialog_alert": "Questi oggetti saranno cancellati definitivamente da Immich e dal tuo device",
   "delete_dialog_cancel": "Annulla",
   "delete_dialog_ok": "Elimina",
-  "delete_dialog_title": "Cancella in modo permanente ",
+  "delete_dialog_title": "Cancella definitivamente",
   "exif_bottom_sheet_description": "Aggiungi una descrizione...",
   "exif_bottom_sheet_details": "DETTAGLI",
   "exif_bottom_sheet_location": "POSIZIONE",
-  "login_form_button_text": "Accedi",
+  "library_page_albums": "Album",
+  "library_page_new_album": "Nuovo Album",
+  "login_form_button_text": "Login",
   "login_form_email_hint": "tuaemail@email.com",
   "login_form_endpoint_hint": "http://tuo-ip-del-server:port/api",
-  "login_form_endpoint_url": "URL del Server Endpoint",
+  "login_form_endpoint_url": "Server Endpoint URL",
   "login_form_err_http": "Per favore specificare http:// o https://",
   "login_form_err_invalid_email": "Email non valida",
   "login_form_err_leading_whitespace": "Spazio bianco all'inizio ",
@@ -74,33 +116,54 @@
   "login_form_save_login": "Rimani connesso ",
   "monthly_title_text_date_format": "MMMM y",
   "profile_drawer_client_server_up_to_date": "Client e server sono aggiornati",
-  "profile_drawer_sign_out": "Esci",
+  "profile_drawer_settings": "Impostazioni ",
+  "profile_drawer_sign_out": "Logout",
   "search_bar_hint": "Cerca le tue foto",
-  "search_page_no_objects": "Nessuna Informazione relativa all'Oggetto Disponibile",
-  "search_page_no_places": "Nessun informazione sulla posizione ",
+  "search_page_no_objects": "Nessuna informazione relativa all'oggetto disponibile",
+  "search_page_no_places": "Nessun informazione sul luogo disponibile",
   "search_page_places": "Luoghi",
   "search_page_things": "Oggetti",
   "search_result_page_new_search_hint": "Nuova ricerca ",
   "select_additional_user_for_sharing_page_suggestions": "Suggerimenti ",
-  "select_user_for_sharing_page_err_album": "Fallito nel creare l'album ",
+  "select_user_for_sharing_page_err_album": "Errore nel creare l'album ",
   "select_user_for_sharing_page_share_suggestions": "Suggerimenti",
+  "setting_notifications_notify_failures_grace_period": "Notifica caricamenti falliti in background: {}",
+  "setting_notifications_notify_hours": "{} Ore",
+  "setting_notifications_notify_immediately": "Immediatamente",
+  "setting_notifications_notify_minutes": "{} Minuti",
+  "setting_notifications_notify_never": "Mai",
+  "setting_notifications_subtitle": "Cambia le impostazioni di notifica",
+  "setting_notifications_title": "Notifiche",
+  "setting_pages_app_bar_settings": "Impostazioni",
   "share_add": "Aggiungi",
   "share_add_photos": "Aggiungi foto",
   "share_add_title": "Aggiungi un titolo ",
   "share_create_album": "Crea album",
-  "share_invite": "Invitare all'album ",
+  "share_dialog_preparing": "Preparo…",
+  "share_invite": "Invitare nell'album ",
   "sharing_page_album": "Album condivisi",
-  "sharing_page_description": "Crea un album condiviso per condividere foto e video con gente nel tuo network",
+  "sharing_page_description": "Crea un album condiviso per condividere foto e video con persone nel tuo network",
   "sharing_page_empty_list": "LISTA VUOTA",
   "sharing_silver_appbar_create_shared_album": "Crea album condiviso",
   "sharing_silver_appbar_share_partner": "Condividi con il partner",
+  "tab_controller_nav_library": "Libreria",
   "tab_controller_nav_photos": "Foto",
   "tab_controller_nav_search": "Cerca",
   "tab_controller_nav_sharing": "Condividi",
+  "theme_setting_asset_list_storage_indicator_title": "Mostra indicatore dello storage nei titoli dei contenuti",
+  "theme_setting_asset_list_tiles_per_row_title": "Numero di contenuti per riga ({})",
+  "theme_setting_dark_mode_switch": "Dark mode",
+  "theme_setting_image_viewer_quality_subtitle": "Cambia la qualità del dettaglio dell'immagine",
+  "theme_setting_image_viewer_quality_title": "Qualità immagine",
+  "theme_setting_system_theme_switch": "Automatico (Vai alle impostazioni di sistema)",
+  "theme_setting_theme_subtitle": "Scegli un'impostazione per il tema",
+  "theme_setting_theme_title": "Tema",
+  "theme_setting_three_stage_loading_subtitle": "Il caricamento in 3 stage aumenterà le performance di caricamento ma anche il consumo di banda",
+  "theme_setting_three_stage_loading_title": "Abilita il caricamento a tre stage",
   "version_announcement_overlay_ack": "Riconosci ",
-  "version_announcement_overlay_release_notes": "le note di rilascio ",
+  "version_announcement_overlay_release_notes": "note di rilascio ",
   "version_announcement_overlay_text_1": "Ciao amico, c'è una nuova versione di",
-  "version_announcement_overlay_text_2": "prova a controllare ",
+  "version_announcement_overlay_text_2": "per favore prenditi il tuo tempo per controllare il",
   "version_announcement_overlay_text_3": "e verifica che il tuo docker-compose e il file .env siano aggiornati per impedire qualsiasi errore nella configurazione, specialmente se utilizzate WatchTower o altri strumenti per l'aggiornamento automatico delle immagini docker.",
-  "version_announcement_overlay_title": "Nuova versione di server disponibile! \uD83C\uDF89"
+  "version_announcement_overlay_title": "Nuova versione del server disponibile! \uD83C\uDF89"
 }

mobile/assets/i18n/ko-KR.json

@@ -0,0 +1,152 @@
+{
+  "album_info_card_backup_album_excluded": "제외됨",
+  "album_info_card_backup_album_included": "포함됨",
+  "album_viewer_appbar_share_delete": "앨범 삭제",
+  "album_viewer_appbar_share_err_delete": "앨범 삭제 실패",
+  "album_viewer_appbar_share_err_leave": "앨범에서 나가지 못했습니다",
+  "album_viewer_appbar_share_err_remove": "앨범에서 미디어를 제거하는 데 문제가 있습니다",
+  "album_viewer_appbar_share_err_title": "앨범 제목 변경 실패",
+  "album_viewer_appbar_share_leave": "앨범 나가기",
+  "album_viewer_appbar_share_remove": "앨범에서 제거",
+  "album_viewer_page_share_add_users": "사용자 추가",
+  "backup_album_selection_page_albums_device": "기기의 앨범({})",
+  "backup_album_selection_page_albums_tap": "포함하려면 탭하고 제외하려면 두 번 탭하세요",
+  "backup_album_selection_page_assets_scatter": "미디어파일은 여러 앨범에 분산될 수 있습니다. 따라서 백업 프로세스 중에 앨범에서 포함하거나 제외할 수 있습니다.",
+  "backup_album_selection_page_select_albums": "앨범 선택",
+  "backup_album_selection_page_selection_info": "선택 정보",
+  "backup_album_selection_page_total_assets": "총 미디어파일 수",
+  "backup_all": "모두",
+  "backup_background_service_default_notification": "새 미디어파일 확인중...",
+  "backup_background_service_upload_failure_notification": "{} 업로드 실패",
+  "backup_background_service_in_progress_notification": "미디어파일 백업 중...",
+  "backup_background_service_current_upload_notification": "{} 업로드 중",
+  "backup_background_service_error_title": "백업 오류",
+  "backup_background_service_connection_failed_message": "서버에 연결하지 못했습니다. 다시 시도하는 중...",
+  "backup_background_service_backup_failed_message": "미디어파일을 백업하지 못했습니다. 다시 시도하는 중...",
+  "backup_controller_page_albums": "백업대상",
+  "backup_controller_page_backup": "백업",
+  "backup_controller_page_backup_selected": "선택됨: ",
+  "backup_controller_page_backup_sub": "백업된 사진 및 비디오",
+  "backup_controller_page_background_description": "백그라운드 서비스를 켜서 앱을 열지 않고도 새 미디어파일을 자동으로 백업합니다.",
+  "backup_controller_page_background_wifi": "WiFi에서만",
+  "backup_controller_page_background_charging": "충전 중일 때만",
+  "backup_controller_page_background_is_on": "자동 백그라운드 백업이 켜져 있습니다",
+  "backup_controller_page_background_is_off": "자동 백그라운드 백업이 꺼져 있습니다",
+  "backup_controller_page_background_turn_on": "백그라운드 서비스 켜기",
+  "backup_controller_page_background_turn_off": "백그라운드 서비스 끄기",
+  "backup_controller_page_background_configure_error": "백그라운드 서비스를 구성하지 못했습니다",
+  "backup_controller_page_cancel": "취소",
+  "backup_controller_page_created": "생성일: {}",
+  "backup_controller_page_desc_backup": "새 미디어파일을 서버에 자동으로 업로드하려면 백업을 켜주세요.",
+  "backup_controller_page_excluded": "제외됨: ",
+  "backup_controller_page_failed": "실패함 ({})",
+  "backup_controller_page_filename": "파일 이름: {} [{}]",
+  "backup_controller_page_id": "ID: {}",
+  "backup_controller_page_info": "정보",
+  "backup_controller_page_none_selected": "선택되지 않음",
+  "backup_controller_page_remainder": "남은 백업파일",
+  "backup_controller_page_remainder_sub": "백업 대기중인 남은 사진 및 비디오",
+  "backup_controller_page_select": "선택",
+  "backup_controller_page_server_storage": "서버 저장소",
+  "backup_controller_page_start_backup": "백업 시작",
+  "backup_controller_page_status_off": "백업이 꺼져 있습니다",
+  "backup_controller_page_status_on": "백업이 켜져 있습니다",
+  "backup_controller_page_storage_format": "{}/{} 사용",
+  "backup_controller_page_to_backup": "백업할 앨범",
+  "backup_controller_page_total": "전체 백업대상",
+  "backup_controller_page_total_sub": "선택한 앨범의 모든 사진 및 비디오",
+  "backup_controller_page_turn_off": "백업 끄기",
+  "backup_controller_page_turn_on": "백업 켜기",
+  "backup_controller_page_uploading_file_info": "파일 정보 업로드 중",
+  "backup_err_only_album": "유일한 앨범은 제거할 수 없습니다",
+  "backup_info_card_assets": "미디어",
+  "control_bottom_app_bar_delete": "삭제",
+  "create_shared_album_page_share": "공유",
+  "create_shared_album_page_create": "만들기",
+  "create_shared_album_page_share_add_assets": "사진 추가",
+  "create_shared_album_page_share_select_photos": "사진 선택",
+  "daily_title_text_date": "E, M월 d일",
+  "daily_title_text_date_year": "E, M월 d일, yyyy",
+  "date_format": "yyyy년 M월 d일, EEEE • a h:mm",
+  "delete_dialog_alert": "이 항목은 Immich 및 휴대폰에서 영구적으로 삭제됩니다",
+  "delete_dialog_cancel": "취소",
+  "delete_dialog_ok": "삭제",
+  "delete_dialog_title": "영구적으로 삭제",
+  "exif_bottom_sheet_description": "설명 추가...",
+  "exif_bottom_sheet_details": "상세정보",
+  "exif_bottom_sheet_location": "위치",
+  "login_form_button_text": "로그인",
+  "login_form_email_hint": "youremail@email.com",
+  "login_form_endpoint_hint": "https://your-server-ip:port/api",
+  "login_form_endpoint_url": "서버 엔드포인트 URL",
+  "login_form_err_http": "엔드포인트는 http:// 또는 https://로 시작해야 합니다",
+  "login_form_err_invalid_email": "잘못된 이메일 형식입니다",
+  "login_form_err_leading_whitespace": "이메일 앞에 공백문자가 포함되어 있습니다",
+  "login_form_err_trailing_whitespace": "이메일 뒤에 공백문자가 포함되어 있습니다",
+  "login_form_failed_login": "로그인 오류, 서버 URL, 이메일 및 비밀번호를 확인하세요",
+  "login_form_label_email": "이메일",
+  "login_form_label_password": "비밀번호",
+  "login_form_password_hint": "비밀번호",
+  "login_form_save_login": "로그인상태 유지",
+  "monthly_title_text_date_format": "y년 M월",
+  "profile_drawer_client_server_up_to_date": "클라이언트와 서버가 최신 상태입니다",
+  "profile_drawer_sign_out": "로그아웃",
+  "profile_drawer_settings": "설정",
+  "search_bar_hint": "사진 검색",
+  "search_page_no_objects": "발견된 사물이\n없습니다",
+  "search_page_no_places": "발견된 장소가\n없습니다",
+  "search_page_places": "장소",
+  "search_page_things": "사물",
+  "search_result_page_new_search_hint": "새 검색",
+  "select_additional_user_for_sharing_page_suggestions": "초대 가능한 사용자 제안",
+  "select_user_for_sharing_page_err_album": "앨범 생성 실패",
+  "select_user_for_sharing_page_share_suggestions": "초대 가능한 사용자 제안",
+  "share_add": "추가",
+  "share_add_photos": "사진 추가",
+  "share_add_title": "새 앨범제목",
+  "share_create_album": "앨범 만들기",
+  "share_invite": "앨범에 초대",
+  "sharing_page_album": "공유앨범",
+  "sharing_page_description": "공유앨범을 만들어 다른 사용자들과 사진 및 비디오를 공유합니다.",
+  "sharing_page_empty_list": "공유앨범 없음",
+  "sharing_silver_appbar_create_shared_album": "공유앨범 만들기",
+  "sharing_silver_appbar_share_partner": "파트너와 공유",
+  "tab_controller_nav_photos": "사진",
+  "tab_controller_nav_search": "검색",
+  "tab_controller_nav_sharing": "공유",
+  "tab_controller_nav_library": "라이브러리",
+  "version_announcement_overlay_ack": "승인",
+  "version_announcement_overlay_release_notes": "릴리스 정보",
+  "version_announcement_overlay_text_1": "안녕하세요!",
+  "version_announcement_overlay_text_2": "앱에 새로운 업데이트가 있습니다!",
+  "version_announcement_overlay_text_3": "특히 WatchTower 또는 서버 응용 프로그램 자동 업데이트를 처리하는 메커니즘을 사용하는 경우 잘못된 구성을 방지하기 위해 docker-compose 및 .env 설정이 최신 상태인지 확인하세요.",
+  "version_announcement_overlay_title": "새 서버 버전 사용 가능 \uD83C\uDF89",
+  "album_thumbnail_card_item": "1개 항목",
+  "album_thumbnail_card_items": "{}개 항목",
+  "album_thumbnail_card_shared": " · 공유",
+  "library_page_albums": "앨범",
+  "library_page_new_album": "새 앨범",
+  "create_album_page_untitled": "제목없음",
+  "share_dialog_preparing": "준비중...",
+  "control_bottom_app_bar_share": "공유",
+  "setting_pages_app_bar_settings": "설정",
+  "theme_setting_theme_title": "테마",
+  "theme_setting_theme_subtitle": "앱테마 선택",
+  "theme_setting_system_theme_switch": "자동(시스템 설정에 따름)",
+  "theme_setting_dark_mode_switch": "다크모드",
+  "theme_setting_image_viewer_quality_title": "이미지 뷰어 품질",
+  "theme_setting_image_viewer_quality_subtitle": "디테일 이미지 뷰어 품질 조정",
+  "theme_setting_three_stage_loading_title": "3단계 로딩 활성화",
+  "theme_setting_three_stage_loading_subtitle": "이 기능은 로딩 성능을 향상시킬 수 있지만 훨씬 더 많은 데이터를 사용합니다.",
+  "asset_list_settings_title": "사진 배열",
+  "asset_list_settings_subtitle": "사진 배열 레이아웃 설정",
+  "theme_setting_asset_list_storage_indicator_title": "미디어 타일에 스토리지 싱크여부 표시",
+  "theme_setting_asset_list_tiles_per_row_title": "한 줄에 표시할 미디어 수 ({})",
+  "setting_notifications_title": "알림",
+  "setting_notifications_subtitle": "알림 기본 설정 조정",
+  "setting_notifications_notify_failures_grace_period": "백그라운드 백업 실패 알림: {}",
+  "setting_notifications_notify_immediately": "즉시",
+  "setting_notifications_notify_minutes": "{}분 뒤",
+  "setting_notifications_notify_hours": "{}시간 뒤",
+  "setting_notifications_notify_never": "알리지 않음"
+}

mobile/assets/i18n/nl-NL.json

@@ -0,0 +1,152 @@
+{
+  "album_info_card_backup_album_excluded": "UITGESLOTEN",
+  "album_info_card_backup_album_included": "INGESLOTEN",
+  "album_viewer_appbar_share_delete": "Verwijder album",
+  "album_viewer_appbar_share_err_delete": "Fout bij verwijderen album",
+  "album_viewer_appbar_share_err_leave": "Fout bij verlaten album",
+  "album_viewer_appbar_share_err_remove": "Er gaat iets mis bij het verwijderen van items uit het album",
+  "album_viewer_appbar_share_err_title": "Fout bij wijzigen album titel",
+  "album_viewer_appbar_share_leave": "Verlaat album",
+  "album_viewer_appbar_share_remove": "Verwijder uit album",
+  "album_viewer_page_share_add_users": "Voeg gebruiker toe",
+  "backup_album_selection_page_albums_device": "Albums op apparaat ({})",
+  "backup_album_selection_page_albums_tap": "Tik om in te voegen, dubbel tik om uit te sluiten",
+  "backup_album_selection_page_assets_scatter": "Items kunnen over verschillende albums verdeeld zijn, dus albums kunnen ingesloten of uitgesloten zijn van het backup proces.",
+  "backup_album_selection_page_select_albums": "Selecteer albums",
+  "backup_album_selection_page_selection_info": "Selectie info",
+  "backup_album_selection_page_total_assets": "Totaal unieke items",
+  "backup_all": "Alle",
+  "backup_background_service_default_notification": "Controleren op nieuw items…",
+  "backup_background_service_upload_failure_notification": "Fout bij upload {}",
+  "backup_background_service_in_progress_notification": "Backuppen van items…",
+  "backup_background_service_current_upload_notification": "Uploaden {}",
+  "backup_background_service_error_title": "Backup fout",
+  "backup_background_service_connection_failed_message": "Fout bij verbinden server. Opnieuw proberen…",
+  "backup_background_service_backup_failed_message": "Fout bij backuppen items. Opnieuw proberen…",
+  "backup_controller_page_albums": "Backup Albums",
+  "backup_controller_page_backup": "Backup",
+  "backup_controller_page_backup_selected": "Geselecteerd: ",
+  "backup_controller_page_backup_sub": "Foto's en video's gebackupped",
+  "backup_controller_page_background_description": "Gebruik achtergrondservice om automatisch nieuwe items te uploaden naar server zonder de app te openen",
+  "backup_controller_page_background_wifi": "Alleen op WiFi",
+  "backup_controller_page_background_charging": "Alleen tijdens opladen",
+  "backup_controller_page_background_is_on": "Automatische achtergrond backup staat aan",
+  "backup_controller_page_background_is_off": "Automatische achtergrond backup staat uit",
+  "backup_controller_page_background_turn_on": "Zet achtergrondservice aan",
+  "backup_controller_page_background_turn_off": "Zet achtergrondservice uit",
+  "backup_controller_page_background_configure_error": "Achtergrondservice configuratie mislukt",
+  "backup_controller_page_cancel": "Annuleren",
+  "backup_controller_page_created": "Gemaakt op: {}",
+  "backup_controller_page_desc_backup": "Configureer backup om automatisch nieuwe items te uploaden naar server.",
+  "backup_controller_page_excluded": "Uitgezonderd: ",
+  "backup_controller_page_failed": "Mislukt ({})",
+  "backup_controller_page_filename": "Bestandsnaam: {} [{}]",
+  "backup_controller_page_id": "ID: {}",
+  "backup_controller_page_info": "Backup informatie",
+  "backup_controller_page_none_selected": "Geen geselecteerd",
+  "backup_controller_page_remainder": "Rest",
+  "backup_controller_page_remainder_sub": "Overgebleven foto's en video's om te backuppen uit selectie",
+  "backup_controller_page_select": "Selecteer",
+  "backup_controller_page_server_storage": "Server Opslag",
+  "backup_controller_page_start_backup": "Start Backup",
+  "backup_controller_page_status_off": "Backup staat uit",
+  "backup_controller_page_status_on": "Backup staat aan",
+  "backup_controller_page_storage_format": "{} van {} gebruikt",
+  "backup_controller_page_to_backup": "Albums om te backuppen",
+  "backup_controller_page_total": "Totaal",
+  "backup_controller_page_total_sub": "Alle unieke foto's en video's uit geselecteerde albums",
+  "backup_controller_page_turn_off": "Backup uitzetten",
+  "backup_controller_page_turn_on": "Backup aanzetten",
+  "backup_controller_page_uploading_file_info": "Bestandsgegevens uploaden",
+  "backup_err_only_album": "Kan niet alleen het album verwijderen",
+  "backup_info_card_assets": "items",
+  "control_bottom_app_bar_delete": "Verwijderen",
+  "create_shared_album_page_share": "Delen",
+  "create_shared_album_page_create": "Aanmaken",
+  "create_shared_album_page_share_add_assets": "VOEG FOTO'S TOE",
+  "create_shared_album_page_share_select_photos": "Selecteer Foto's",
+  "daily_title_text_date": "E, MMM dd",
+  "daily_title_text_date_year": "E, MMM dd, yyyy",
+  "date_format": "E, LLL d, y • h:mm a",
+  "delete_dialog_alert": "Deze items zullen permanent verwijderd worden van Immich en je apparaat",
+  "delete_dialog_cancel": "Annuleren",
+  "delete_dialog_ok": "Verwijderen",
+  "delete_dialog_title": "Verwijder permanent",
+  "exif_bottom_sheet_description": "Voeg beschrijving toe...",
+  "exif_bottom_sheet_details": "DETAILS",
+  "exif_bottom_sheet_location": "LOCATIE",
+  "login_form_button_text": "Login",
+  "login_form_email_hint": "jouwemail@email.com",
+  "login_form_endpoint_hint": "http://jouw-server-ip:port/api",
+  "login_form_endpoint_url": "Server URL",
+  "login_form_err_http": "Voer http:// of https:// in",
+  "login_form_err_invalid_email": "Ongeldige Email",
+  "login_form_err_leading_whitespace": "Spatie aan het begin",
+  "login_form_err_trailing_whitespace": "Spatie aan het eind",
+  "login_form_failed_login": "Fout bij inloggen, controleer server url, email en wachtwoord",
+  "login_form_label_email": "Email",
+  "login_form_label_password": "Wachtwoord",
+  "login_form_password_hint": "wachtwoord",
+  "login_form_save_login": "Ingelogd blijven",
+  "monthly_title_text_date_format": "MMMM y",
+  "profile_drawer_client_server_up_to_date": "Client en Server zijn up-to-date",
+  "profile_drawer_sign_out": "Uitloggen",
+  "profile_drawer_settings": "Instellingen",
+  "search_bar_hint": "Zoek je foto's",
+  "search_page_no_objects": "Geen object gegevens beschikbaar",
+  "search_page_no_places": "Geen locatie gegevens beschikbaar",
+  "search_page_places": "Plaatsen",
+  "search_page_things": "Dingen",
+  "search_result_page_new_search_hint": "Nieuw resultaat",
+  "select_additional_user_for_sharing_page_suggestions": "Suggesties",
+  "select_user_for_sharing_page_err_album": "Album aanmaken mislukt",
+  "select_user_for_sharing_page_share_suggestions": "Suggesties",
+  "share_add": "Toevoegen",
+  "share_add_photos": "Foto's toevoegen",
+  "share_add_title": "Titel toevoegen",
+  "share_create_album": "Album aanmaken",
+  "share_invite": "Uitnodigen voor album",
+  "sharing_page_album": "Gedeelde albums",
+  "sharing_page_description": "Maak gedeelde albums om foto's en video's te delen met mensen in je netwerk.",
+  "sharing_page_empty_list": "LEGE LIJST",
+  "sharing_silver_appbar_create_shared_album": "Maak gedeeld album",
+  "sharing_silver_appbar_share_partner": "Delen met partner",
+  "tab_controller_nav_photos": "Foto's",
+  "tab_controller_nav_search": "Zoeken",
+  "tab_controller_nav_sharing": "Delen",
+  "tab_controller_nav_library": "Bibliotheek",
+  "version_announcement_overlay_ack": "Bevestig",
+  "version_announcement_overlay_release_notes": "release opmerkingen",
+  "version_announcement_overlay_text_1": "Er is een nieuwe versie beschikbaar van",
+  "version_announcement_overlay_text_2": "neem je tijd en bezoek de ",
+  "version_announcement_overlay_text_3": " controleer of je docker-compose en .env up-to-date zijn om te voorkomen dat er misconfiguraties zijn, in het bijzonder als je gebruik maakt van WatchTower of een ander mechanisme dat je server automatisch configureert.",
+  "version_announcement_overlay_title": "Nieuwe server versie beschikbaar \uD83C\uDF89",
+  "album_thumbnail_card_item": "1 item",
+  "album_thumbnail_card_items": "{} items",
+  "album_thumbnail_card_shared": " · Gedeeld",
+  "library_page_albums": "Albums",
+  "library_page_new_album": "Nieuw album",
+  "create_album_page_untitled": "Naamloos",
+  "share_dialog_preparing": "Voorbereiden...",
+  "control_bottom_app_bar_share": "Delen",
+  "setting_pages_app_bar_settings": "Instellingen",
+  "theme_setting_theme_title": "Thema",
+  "theme_setting_theme_subtitle": "Kies de thema instelling van de app",
+  "theme_setting_system_theme_switch": "Automatisch (volg systeeminstelling)",
+  "theme_setting_dark_mode_switch": "Donkere modus",
+  "theme_setting_image_viewer_quality_title": "Foto weergave kwaliteit",
+  "theme_setting_image_viewer_quality_subtitle": "Pas de kwaliteit aan van de gedetailleerde foto weergave",
+  "theme_setting_three_stage_loading_title": "Drie-laags laden inschakelen",
+  "theme_setting_three_stage_loading_subtitle": "Three-stage loading might increase the loading performance but causes significantly higher network load",
+  "asset_list_settings_title": "Foto Grid",
+  "asset_list_settings_subtitle": "Foto grid layout instellingen",
+  "theme_setting_asset_list_storage_indicator_title": "Laat ruimte indicator zien bij item tegels",
+  "theme_setting_asset_list_tiles_per_row_title": "Aantal items per rij ({})",
+  "setting_notifications_title": "Notificaties",
+  "setting_notifications_subtitle": "Werk je notificatievoorkeuren bij",
+  "setting_notifications_notify_failures_grace_period": "Melding achtergrond backup fouten: {}",
+  "setting_notifications_notify_immediately": "meteen",
+  "setting_notifications_notify_minutes": "{} minuten",
+  "setting_notifications_notify_hours": "{} uur",
+  "setting_notifications_notify_never": "nooit"
+}

mobile/assets/i18n/pt-BR.json

@@ -17,7 +17,6 @@
     "backup_album_selection_page_total_assets": "Total de recursos exclusivos",
     "backup_all": "Todos",
     "backup_background_service_default_notification": "Checking for new assets…",
-    "backup_background_service_disable_battery_optimizations": "Por favor, desabilite a otimização da bateria para Immich para habilitar o backup em segundo plano",
     "backup_background_service_upload_failure_notification": "Falha ao carregar {}",
     "backup_background_service_in_progress_notification": "Fazendo backup de seus ativos…",
     "backup_background_service_current_upload_notification": "Enviando {}",

mobile/ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>11.0</string>
 </dict>
 </plist>

mobile/ios/Podfile.lock

@@ -84,7 +84,7 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/wakelock/ios"
 
 SPEC CHECKSUMS:
-  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_udid: 0848809dbed4c055175747ae6a45a8b4f6771e1c
   fluttertoast: 16fbe6039d06a763f3533670197d01fc73459037
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -360,11 +360,11 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 62;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -495,11 +495,11 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 62;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -522,11 +522,11 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 40;
+				CURRENT_PROJECT_VERSION = 62;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

mobile/ios/Runner/Info.plist

@@ -17,11 +17,11 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.21.0</string>
+    <string>1.30.1</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>40</string>
+    <string>62</string>
     <key>LSRequiresIPhoneOS</key>
     <true />
     <key>MGLMapboxMetricsEnabledSettingShownInApp</key>
@@ -92,7 +92,10 @@
       <string>it</string>
       <string>fi</string>
       <string>ja</string>
+      <string>ko</string>
+      <string>nl</string>
       <string>pl</string>
+      <string>pt</string>
     </array>
   </dict>
 </plist>

mobile/ios/fastlane/Fastfile

@@ -19,7 +19,7 @@ platform :ios do
   desc "iOS Beta"
   lane :beta do
     increment_version_number(
-    version_number: "1.25.0"
+      version_number: "1.31.0"
     )
     increment_build_number(
       build_number: latest_testflight_build_number + 1,

mobile/ios/fastlane/report.xml

@@ -5,32 +5,32 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000205">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000209">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.360401">
+      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.78333">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="4.012696">
+      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="3.947588">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.378836">
+      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.505399">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="4: build_app" time="80.023705">
+      <testcase classname="fastlane.lanes" name="4: build_app" time="80.954627">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="98.18403">
+      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="58.295965">
         
       </testcase>
     

mobile/lib/constants/hive_box.dart

@@ -22,4 +22,6 @@ const String userSettingInfoBox = "immichUserSettingInfoBox";
 
 // Background backup Info
 const String backgroundBackupInfoBox = "immichBackgroundBackupInfoBox"; // Box
-const String backupFailedSince = "immichBackupFailedSince"; // Key 1
+const String backupFailedSince = "immichBackupFailedSince"; // Key 1
+const String backupRequireWifi = "immichBackupRequireWifi"; // Key 2
+const String backupRequireCharging = "immichBackupRequireCharging"; // Key 3

mobile/lib/constants/locales.dart

@@ -11,8 +11,10 @@ const List<Locale> locales = [
   Locale('fr', 'FR'),
   Locale('it', 'IT'),
   Locale('ja', 'JP'),
+  Locale('nl', 'NL'),
   Locale('pl', 'PL'),
-  Locale('pt', 'PR')
+  Locale('pt', 'PR'),
+  Locale('ko', 'KR'),
 ];
 
 const String translationsPath = 'assets/i18n';

mobile/lib/modules/album/ui/album_thumbnail_card.dart

@@ -7,7 +7,6 @@ import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
 import 'package:immich_mobile/constants/hive_box.dart';
 import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/shared/services/cache.service.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
 import 'package:openapi/api.dart';
 
@@ -15,11 +14,9 @@ class AlbumThumbnailCard extends StatelessWidget {
   const AlbumThumbnailCard({
     Key? key,
     required this.album,
-    required this.cacheService,
   }) : super(key: key);
 
   final AlbumResponseDto album;
-  final CacheService cacheService;
 
   @override
   Widget build(BuildContext context) {
@@ -39,7 +36,6 @@ class AlbumThumbnailCard extends StatelessWidget {
             ClipRRect(
               borderRadius: BorderRadius.circular(8),
               child: CachedNetworkImage(
-                cacheManager: cacheService.getCache(CacheType.albumThumbnail),
                 memCacheHeight: max(400, cardSize.toInt() * 3),
                 width: cardSize,
                 height: cardSize,

mobile/lib/modules/album/ui/album_viewer_thumbnail.dart

@@ -1,7 +1,6 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/hive_box.dart';
@@ -25,7 +24,6 @@ class AlbumViewerThumbnail extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final cacheKey = useState(1);
     var box = Hive.box(userInfoBox);
     var thumbnailRequestUrl = getThumbnailUrl(asset);
     var deviceId = ref.watch(authenticationProvider).deviceId;
@@ -123,7 +121,7 @@ class AlbumViewerThumbnail extends HookConsumerWidget {
       return Container(
         decoration: BoxDecoration(border: drawBorderColor()),
         child: CachedNetworkImage(
-          cacheKey: "${asset.id}-${cacheKey.value}",
+          cacheKey: asset.id,
           width: 300,
           height: 300,
           memCacheHeight: 200,

mobile/lib/modules/album/ui/selection_thumbnail_image.dart

@@ -1,10 +1,10 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.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/album/providers/asset_selection.provider.dart';
+import 'package:immich_mobile/utils/image_url_builder.dart';
 import 'package:openapi/api.dart';
 
 class SelectionThumbnailImage extends HookConsumerWidget {
@@ -15,10 +15,8 @@ class SelectionThumbnailImage extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final cacheKey = useState(1);
     var box = Hive.box(userInfoBox);
-    var thumbnailRequestUrl =
-        '${box.get(serverEndpointKey)}/asset/thumbnail/${asset.id}';
+    var thumbnailRequestUrl = getThumbnailUrl(asset);
     var selectedAsset =
         ref.watch(assetSelectionProvider).selectedNewAssetsForAlbum;
     var newAssetsForAlbum =
@@ -113,7 +111,7 @@ class SelectionThumbnailImage extends HookConsumerWidget {
           Container(
             decoration: BoxDecoration(border: drawBorderColor()),
             child: CachedNetworkImage(
-              cacheKey: "${asset.id}-${cacheKey.value}",
+              cacheKey: asset.id,
               width: 150,
               height: 150,
               memCacheHeight: asset.type == AssetTypeEnum.IMAGE ? 150 : 150,

mobile/lib/modules/album/ui/shared_album_thumbnail_image.dart

@@ -1,6 +1,5 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/hive_box.dart';
@@ -15,8 +14,6 @@ class SharedAlbumThumbnailImage extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final cacheKey = useState(1);
-
     var box = Hive.box(userInfoBox);
 
     return GestureDetector(
@@ -26,7 +23,7 @@ class SharedAlbumThumbnailImage extends HookConsumerWidget {
       child: Stack(
         children: [
           CachedNetworkImage(
-            cacheKey: "${asset.id}-${cacheKey.value}",
+            cacheKey: asset.id,
             width: 500,
             height: 500,
             memCacheHeight: 500,

mobile/lib/modules/album/views/library_page.dart

@@ -6,7 +6,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/modules/album/providers/album.provider.dart';
 import 'package:immich_mobile/modules/album/ui/album_thumbnail_card.dart';
 import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/shared/services/cache.service.dart';
 
 class LibraryPage extends HookConsumerWidget {
   const LibraryPage({Key? key}) : super(key: key);
@@ -14,7 +13,6 @@ class LibraryPage extends HookConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final albums = ref.watch(albumProvider);
-    final cacheService = ref.watch(cacheServiceProvider);
 
     useEffect(
       () {
@@ -104,7 +102,6 @@ class LibraryPage extends HookConsumerWidget {
                   _buildCreateAlbumButton(),
                   for (var album in albums)
                     AlbumThumbnailCard(
-                      cacheService: cacheService,
                       album: album,
                     ),
                 ],

mobile/lib/modules/album/views/sharing_page.dart

@@ -9,7 +9,6 @@ import 'package:immich_mobile/constants/hive_box.dart';
 import 'package:immich_mobile/modules/album/providers/shared_album.provider.dart';
 import 'package:immich_mobile/modules/album/ui/sharing_sliver_appbar.dart';
 import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/shared/services/cache.service.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
 import 'package:openapi/api.dart';
 
@@ -21,7 +20,6 @@ class SharingPage extends HookConsumerWidget {
     var box = Hive.box(userInfoBox);
     var thumbnailRequestUrl = '${box.get(serverEndpointKey)}/asset/thumbnail';
     final List<AlbumResponseDto> sharedAlbums = ref.watch(sharedAlbumProvider);
-    final CacheService cacheService = ref.watch(cacheServiceProvider);
 
     useEffect(
       () {
@@ -47,8 +45,6 @@ class SharingPage extends HookConsumerWidget {
                   height: 60,
                   memCacheHeight: 200,
                   fit: BoxFit.cover,
-                  cacheManager:
-                      cacheService.getCache(CacheType.sharedAlbumThumbnail),
                   imageUrl: getAlbumThumbnailUrl(album),
                   cacheKey: album.albumThumbnailAssetId,
                   httpHeaders: {
@@ -95,12 +91,12 @@ class SharingPage extends HookConsumerWidget {
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  const Padding(
-                    padding: EdgeInsets.only(left: 5.0, bottom: 5),
+                  Padding(
+                    padding: const EdgeInsets.only(left: 5.0, bottom: 5),
                     child: Icon(
                       Icons.offline_share_outlined,
                       size: 50,
-                      // color: Theme.of(context).primaryColor,
+                      color: Theme.of(context).primaryColor,
                     ),
                   ),
                   Padding(

mobile/lib/modules/asset_viewer/ui/exif_bottom_sheet.dart

@@ -81,7 +81,7 @@ class ExifBottomSheet extends ConsumerWidget {
           if (assetDetail.exifInfo?.dateTimeOriginal != null)
             Text(
               DateFormat('date_format'.tr()).format(
-                assetDetail.exifInfo!.dateTimeOriginal!,
+                assetDetail.exifInfo!.dateTimeOriginal!.toLocal(),
               ),
               style: TextStyle(
                 color: Colors.grey[400],

mobile/lib/modules/asset_viewer/ui/remote_photo_view.dart

@@ -1,5 +1,4 @@
 import 'package:cached_network_image/cached_network_image.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:photo_view/photo_view.dart';
 
@@ -11,6 +10,9 @@ class _RemotePhotoViewState extends State<RemotePhotoView> {
   bool _zoomedIn = false;
 
   static const int swipeThreshold = 100;
+  late CachedNetworkImageProvider fullProvider;
+  late CachedNetworkImageProvider previewProvider;
+  late CachedNetworkImageProvider thumbnailProvider;
 
   @override
   Widget build(BuildContext context) {
@@ -55,19 +57,14 @@ class _RemotePhotoViewState extends State<RemotePhotoView> {
     widget.isZoomedFunction();
   }
 
-  void _fireStartLoadingEvent() {
-    widget.onLoadingStart();
-  }
-
-  void _fireFinishedLoadingEvent() {
-    widget.onLoadingCompleted();
-  }
-
-  CachedNetworkImageProvider _authorizedImageProvider(String url) {
+  CachedNetworkImageProvider _authorizedImageProvider(
+    String url,
+    String cacheKey,
+  ) {
     return CachedNetworkImageProvider(
       url,
       headers: {"Authorization": widget.authToken},
-      cacheKey: url,
+      cacheKey: cacheKey,
     );
   }
 
@@ -88,12 +85,6 @@ class _RemotePhotoViewState extends State<RemotePhotoView> {
 
     if (!mounted) return;
 
-    if (newStatus != _RemoteImageStatus.full) {
-      _fireStartLoadingEvent();
-    } else {
-      _fireFinishedLoadingEvent();
-    }
-
     setState(() {
       _status = newStatus;
       _imageProvider = provider;
@@ -101,8 +92,10 @@ class _RemotePhotoViewState extends State<RemotePhotoView> {
   }
 
   void _loadImages() {
-    CachedNetworkImageProvider thumbnailProvider =
-        _authorizedImageProvider(widget.thumbnailUrl);
+    thumbnailProvider = _authorizedImageProvider(
+      widget.thumbnailUrl,
+      widget.cacheKey,
+    );
     _imageProvider = thumbnailProvider;
 
     thumbnailProvider.resolve(const ImageConfiguration()).addListener(
@@ -115,8 +108,10 @@ class _RemotePhotoViewState extends State<RemotePhotoView> {
     );
 
     if (widget.previewUrl != null) {
-      CachedNetworkImageProvider previewProvider =
-          _authorizedImageProvider(widget.previewUrl!);
+      previewProvider = _authorizedImageProvider(
+        widget.previewUrl!,
+        "${widget.cacheKey}_previewStage",
+      );
       previewProvider.resolve(const ImageConfiguration()).addListener(
         ImageStreamListener((ImageInfo imageInfo, _) {
           _performStateTransition(_RemoteImageStatus.preview, previewProvider);
@@ -124,8 +119,10 @@ class _RemotePhotoViewState extends State<RemotePhotoView> {
       );
     }
 
-    CachedNetworkImageProvider fullProvider =
-        _authorizedImageProvider(widget.imageUrl);
+    fullProvider = _authorizedImageProvider(
+      widget.imageUrl,
+      "${widget.cacheKey}_fullStage",
+    );
     fullProvider.resolve(const ImageConfiguration()).addListener(
       ImageStreamListener((ImageInfo imageInfo, _) {
         _performStateTransition(_RemoteImageStatus.full, fullProvider);
@@ -135,8 +132,23 @@ class _RemotePhotoViewState extends State<RemotePhotoView> {
 
   @override
   void initState() {
-    _loadImages();
     super.initState();
+    _loadImages();
+  }
+
+  @override
+  void dispose() async {
+    super.dispose();
+
+    if (_status == _RemoteImageStatus.full) {
+      await fullProvider.evict();
+    } else if (_status == _RemoteImageStatus.preview) {
+      await previewProvider.evict();
+    } else if (_status == _RemoteImageStatus.thumbnail) {
+      await thumbnailProvider.evict();
+    }
+
+    await _imageProvider.evict();
   }
 }
 
@@ -151,16 +163,14 @@ class RemotePhotoView extends StatefulWidget {
     required this.onSwipeDown,
     required this.onSwipeUp,
     this.previewUrl,
-    required this.onLoadingCompleted,
-    required this.onLoadingStart,
+    required this.cacheKey,
   }) : super(key: key);
 
   final String thumbnailUrl;
   final String imageUrl;
   final String authToken;
   final String? previewUrl;
-  final Function onLoadingCompleted;
-  final Function onLoadingStart;
+  final String cacheKey;
 
   final void Function() onSwipeDown;
   final void Function() onSwipeUp;

mobile/lib/modules/asset_viewer/ui/top_control_app_bar.dart

@@ -1,5 +1,3 @@
-import 'dart:developer';
-
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -12,7 +10,7 @@ class TopControlAppBar extends ConsumerWidget with PreferredSizeWidget {
     required this.onMoreInfoPressed,
     required this.onDownloadPressed,
     required this.onSharePressed,
-    this.loading = false
+    this.loading = false,
   }) : super(key: key);
 
   final AssetResponseDto asset;
@@ -28,42 +26,37 @@ class TopControlAppBar extends ConsumerWidget with PreferredSizeWidget {
     return AppBar(
       foregroundColor: Colors.grey[100],
       toolbarHeight: 60,
-      backgroundColor: Colors.black,
+      backgroundColor: Colors.transparent,
       leading: IconButton(
         onPressed: () {
           AutoRouter.of(context).pop();
         },
-        icon: const Icon(
+        icon: Icon(
           Icons.arrow_back_ios_new_rounded,
           size: 20.0,
+          color: Colors.grey[200],
         ),
       ),
       actions: [
-        if (loading) Center(
-          child: Container(
-            margin: const EdgeInsets.symmetric(horizontal: 15.0),
-            width: iconSize,
-            height: iconSize,
-            child: const CircularProgressIndicator(strokeWidth: 2.0),
+        if (loading)
+          Center(
+            child: Container(
+              margin: const EdgeInsets.symmetric(horizontal: 15.0),
+              width: iconSize,
+              height: iconSize,
+              child: const CircularProgressIndicator(strokeWidth: 2.0),
+            ),
           ),
-        ) ,
         IconButton(
           iconSize: iconSize,
           splashRadius: iconSize,
           onPressed: () {
             onDownloadPressed();
           },
-          icon: const Icon(Icons.cloud_download_rounded),
-        ),
-        IconButton(
-          iconSize: iconSize,
-          splashRadius: iconSize,
-          onPressed: () {
-            log("favorite");
-          },
-          icon: asset.isFavorite
-              ? const Icon(Icons.favorite_rounded)
-              : const Icon(Icons.favorite_border_rounded),
+          icon: Icon(
+            Icons.cloud_download_rounded,
+            color: Colors.grey[200],
+          ),
         ),
         IconButton(
           iconSize: iconSize,
@@ -71,7 +64,10 @@ class TopControlAppBar extends ConsumerWidget with PreferredSizeWidget {
           onPressed: () {
             onSharePressed();
           },
-          icon: const Icon(Icons.share),
+          icon: Icon(
+            Icons.share,
+            color: Colors.grey[200],
+          ),
         ),
         IconButton(
           iconSize: iconSize,
@@ -79,7 +75,10 @@ class TopControlAppBar extends ConsumerWidget with PreferredSizeWidget {
           onPressed: () {
             onMoreInfoPressed();
           },
-          icon: const Icon(Icons.more_horiz_rounded),
+          icon: Icon(
+            Icons.more_horiz_rounded,
+            color: Colors.grey[200],
+          ),
         )
       ],
     );

mobile/lib/modules/asset_viewer/views/gallery_viewer.dart

@@ -121,8 +121,6 @@ class GalleryViewerPage extends HookConsumerWidget {
                 authToken: 'Bearer ${box.get(accessTokenKey)}',
                 isZoomedFunction: isZoomedMethod,
                 isZoomedListener: isZoomedListener,
-                onLoadingCompleted: () => {},
-                onLoadingStart: () => {},
                 asset: assetList[index],
                 heroTag: assetList[index].id,
                 threeStageLoading: threeStageLoading.value,

mobile/lib/modules/asset_viewer/views/image_viewer_page.dart

@@ -18,8 +18,6 @@ class ImageViewerPage extends HookConsumerWidget {
   final String authToken;
   final ValueNotifier<bool> isZoomedListener;
   final void Function() isZoomedFunction;
-  final void Function() onLoadingCompleted;
-  final void Function() onLoadingStart;
   final bool threeStageLoading;
 
   ImageViewerPage({
@@ -29,8 +27,6 @@ class ImageViewerPage extends HookConsumerWidget {
     required this.authToken,
     required this.isZoomedFunction,
     required this.isZoomedListener,
-    required this.onLoadingCompleted,
-    required this.onLoadingStart,
     required this.threeStageLoading,
   }) : super(key: key);
 
@@ -73,6 +69,7 @@ class ImageViewerPage extends HookConsumerWidget {
             tag: heroTag,
             child: RemotePhotoView(
               thumbnailUrl: getThumbnailUrl(asset),
+              cacheKey: asset.id,
               imageUrl: getImageUrl(asset),
               previewUrl: threeStageLoading
                   ? getThumbnailUrl(asset, type: ThumbnailFormat.JPEG)
@@ -82,8 +79,6 @@ class ImageViewerPage extends HookConsumerWidget {
               isZoomedListener: isZoomedListener,
               onSwipeDown: () => AutoRouter.of(context).pop(),
               onSwipeUp: () => showInfo(),
-              onLoadingCompleted: onLoadingCompleted,
-              onLoadingStart: onLoadingStart,
             ),
           ),
         ),

mobile/lib/modules/asset_viewer/views/video_viewer_page.dart

@@ -79,7 +79,7 @@ class _VideoThumbnailPlayerState extends State<VideoThumbnailPlayer> {
   _createChewieController() {
     chewieController = ChewieController(
       showOptions: true,
-      showControlsOnInitialize: true,
+      showControlsOnInitialize: false,
       videoPlayerController: videoPlayerController,
       autoPlay: true,
       autoInitialize: true,

mobile/lib/modules/backup/background_service/background.service.dart

@@ -4,7 +4,6 @@ import 'dart:io';
 import 'dart:isolate';
 import 'dart:ui' show IsolateNameServer, PluginUtilities;
 import 'package:cancellation_token_http/http.dart';
-import 'package:collection/collection.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
@@ -28,12 +27,11 @@ final backgroundServiceProvider = Provider(
 /// Background backup service
 class BackgroundService {
   static const String _portNameLock = "immichLock";
-  BackgroundService();
   static const MethodChannel _foregroundChannel =
       MethodChannel('immich/foregroundChannel');
   static const MethodChannel _backgroundChannel =
       MethodChannel('immich/backgroundChannel');
-  bool _isForegroundInitialized = false;
+  static final NumberFormat numberFormat = NumberFormat("###0.##");
   bool _isBackgroundInitialized = false;
   CancellationToken? _cancellationToken;
   bool _canceledBySystem = false;
@@ -42,33 +40,39 @@ class BackgroundService {
   SendPort? _waitingIsolate;
   ReceivePort? _rp;
   bool _errorGracePeriodExceeded = true;
-
-  bool get isForegroundInitialized {
-    return _isForegroundInitialized;
-  }
+  int _uploadedAssetsCount = 0;
+  int _assetsToUploadCount = 0;
+  int _lastDetailProgressUpdate = 0;
+  String _lastPrintedProgress = "";
 
   bool get isBackgroundInitialized {
     return _isBackgroundInitialized;
   }
 
-  Future<bool> _initialize() async {
-    final callback = PluginUtilities.getCallbackHandle(_nativeEntry)!;
-    var result = await _foregroundChannel
-        .invokeMethod('initialize', [callback.toRawHandle()]);
-    _isForegroundInitialized = true;
-    return result;
-  }
-
   /// Ensures that the background service is enqueued if enabled in settings
   Future<bool> resumeServiceIfEnabled() async {
-    return await isBackgroundBackupEnabled() &&
-        await startService(keepExisting: true);
+    return await isBackgroundBackupEnabled() && await enableService();
   }
 
   /// Enqueues the background service
-  Future<bool> startService({
-    bool immediate = false,
-    bool keepExisting = false,
+  Future<bool> enableService({bool immediate = false}) async {
+    if (!Platform.isAndroid) {
+      return true;
+    }
+    try {
+      final callback = PluginUtilities.getCallbackHandle(_nativeEntry)!;
+      final String title =
+          "backup_background_service_default_notification".tr();
+      final bool ok = await _foregroundChannel
+          .invokeMethod('enable', [callback.toRawHandle(), title, immediate]);
+      return ok;
+    } catch (error) {
+      return false;
+    }
+  }
+
+  /// Configures the background service
+  Future<bool> configureService({
     bool requireUnmetered = true,
     bool requireCharging = false,
   }) async {
@@ -76,14 +80,9 @@ class BackgroundService {
       return true;
     }
     try {
-      if (!_isForegroundInitialized) {
-        await _initialize();
-      }
-      final String title =
-          "backup_background_service_default_notification".tr();
       final bool ok = await _foregroundChannel.invokeMethod(
-        'start',
-        [immediate, keepExisting, requireUnmetered, requireCharging, title],
+        'configure',
+        [requireUnmetered, requireCharging],
       );
       return ok;
     } catch (error) {
@@ -92,15 +91,12 @@ class BackgroundService {
   }
 
   /// Cancels the background service (if currently running) and removes it from work queue
-  Future<bool> stopService() async {
+  Future<bool> disableService() async {
     if (!Platform.isAndroid) {
       return true;
     }
     try {
-      if (!_isForegroundInitialized) {
-        await _initialize();
-      }
-      final ok = await _foregroundChannel.invokeMethod('stop');
+      final ok = await _foregroundChannel.invokeMethod('disable');
       return ok;
     } catch (error) {
       return false;
@@ -113,52 +109,49 @@ class BackgroundService {
       return false;
     }
     try {
-      if (!_isForegroundInitialized) {
-        await _initialize();
-      }
       return await _foregroundChannel.invokeMethod("isEnabled");
     } catch (error) {
       return false;
     }
   }
 
-  /// Opens an activity to let the user disable battery optimizations for Immich
-  Future<bool> disableBatteryOptimizations() async {
+  /// Returns `true` if battery optimizations are disabled
+  Future<bool> isIgnoringBatteryOptimizations() async {
     if (!Platform.isAndroid) {
       return true;
     }
     try {
-      if (!_isForegroundInitialized) {
-        await _initialize();
-      }
-      final String message =
-          "backup_background_service_disable_battery_optimizations".tr();
-      return await _foregroundChannel.invokeMethod(
-        'disableBatteryOptimizations',
-        message,
-      );
+      return await _foregroundChannel
+          .invokeMethod('isIgnoringBatteryOptimizations');
     } catch (error) {
       return false;
     }
   }
 
   /// Updates the notification shown by the background service
-  Future<bool> _updateNotification({
-    required String title,
+  Future<bool?> _updateNotification({
+    String? title,
     String? content,
+    int progress = 0,
+    int max = 0,
+    bool indeterminate = false,
+    bool isDetail = false,
+    bool onlyIfFG = false,
   }) async {
     if (!Platform.isAndroid) {
       return true;
     }
     try {
       if (_isBackgroundInitialized) {
-        return await _backgroundChannel
-            .invokeMethod('updateNotification', [title, content]);
+        return _backgroundChannel.invokeMethod<bool>(
+          'updateNotification',
+          [title, content, progress, max, indeterminate, isDetail, onlyIfFG],
+        );
       }
     } catch (error) {
       debugPrint("[_updateNotification] failed to communicate with plugin");
     }
-    return Future.value(false);
+    return false;
   }
 
   /// Shows a new priority notification
@@ -191,7 +184,8 @@ class BackgroundService {
       }
     } catch (error) {
       debugPrint(
-          "[_clearErrorNotifications] failed to communicate with plugin");
+        "[_clearErrorNotifications] failed to communicate with plugin",
+      );
     }
     return false;
   }
@@ -291,20 +285,14 @@ class BackgroundService {
       case "onAssetsChanged":
         final Future<bool> translationsLoaded = loadTranslations();
         try {
+          _clearErrorNotifications();
           final bool hasAccess = await acquireLock();
           if (!hasAccess) {
-            debugPrint("[_callHandler] could acquire lock, exiting");
+            debugPrint("[_callHandler] could not acquire lock, exiting");
             return false;
           }
           await translationsLoaded;
           final bool ok = await _onAssetsChanged();
-          if (ok) {
-            Hive.box(backgroundBackupInfoBox).delete(backupFailedSince);
-          } else if (Hive.box(backgroundBackupInfoBox).get(backupFailedSince) ==
-              null) {
-            Hive.box(backgroundBackupInfoBox)
-                .put(backupFailedSince, DateTime.now());
-          }
           return ok;
         } catch (error) {
           debugPrint(error.toString());
@@ -337,17 +325,51 @@ class BackgroundService {
     apiService.setEndpoint(Hive.box(userInfoBox).get(serverEndpointKey));
     apiService.setAccessToken(Hive.box(userInfoBox).get(accessTokenKey));
     BackupService backupService = BackupService(apiService);
+    AppSettingsService settingsService = AppSettingsService();
 
     final Box<HiveBackupAlbums> box =
         await Hive.openBox<HiveBackupAlbums>(hiveBackupInfoBox);
     final HiveBackupAlbums? backupAlbumInfo = box.get(backupInfoKey);
     if (backupAlbumInfo == null) {
-      _clearErrorNotifications();
       return true;
     }
 
     await PhotoManager.setIgnorePermissionCheck(true);
-    _errorGracePeriodExceeded = _isErrorGracePeriodExceeded();
+
+    do {
+      final bool backupOk = await _runBackup(
+        backupService,
+        settingsService,
+        backupAlbumInfo,
+      );
+      if (backupOk) {
+        await Hive.box(backgroundBackupInfoBox).delete(backupFailedSince);
+        await box.put(
+          backupInfoKey,
+          backupAlbumInfo,
+        );
+      } else if (Hive.box(backgroundBackupInfoBox).get(backupFailedSince) ==
+          null) {
+        Hive.box(backgroundBackupInfoBox)
+            .put(backupFailedSince, DateTime.now());
+        return false;
+      }
+      // check for new assets added while performing backup
+    } while (true ==
+        await _backgroundChannel.invokeMethod<bool>("hasContentChanged"));
+    return true;
+  }
+
+  Future<bool> _runBackup(
+    BackupService backupService,
+    AppSettingsService settingsService,
+    HiveBackupAlbums backupAlbumInfo,
+  ) async {
+    _errorGracePeriodExceeded = _isErrorGracePeriodExceeded(settingsService);
+    final bool notifyTotalProgress = settingsService
+        .getSetting<bool>(AppSettingsEnum.backgroundBackupTotalProgress);
+    final bool notifySingleProgress = settingsService
+        .getSetting<bool>(AppSettingsEnum.backgroundBackupSingleProgress);
 
     if (_canceledBySystem) {
       return false;
@@ -371,26 +393,29 @@ class BackgroundService {
     }
 
     if (toUpload.isEmpty) {
-      _clearErrorNotifications();
       return true;
     }
+    _assetsToUploadCount = toUpload.length;
+    _uploadedAssetsCount = 0;
+    _updateNotification(
+      title: "backup_background_service_in_progress_notification".tr(),
+      content: notifyTotalProgress ? _formatAssetBackupProgress() : null,
+      progress: 0,
+      max: notifyTotalProgress ? _assetsToUploadCount : 0,
+      indeterminate: !notifyTotalProgress,
+      onlyIfFG: !notifyTotalProgress,
+    );
 
     _cancellationToken = CancellationToken();
     final bool ok = await backupService.backupAsset(
       toUpload,
       _cancellationToken!,
-      _onAssetUploaded,
-      _onProgress,
-      _onSetCurrentBackupAsset,
+      notifyTotalProgress ? _onAssetUploaded : (assetId, deviceId) {},
+      notifySingleProgress ? _onProgress : (sent, total) {},
+      notifySingleProgress ? _onSetCurrentBackupAsset : (asset) {},
       _onBackupError,
     );
-    if (ok) {
-      _clearErrorNotifications();
-      await box.put(
-        backupInfoKey,
-        backupAlbumInfo,
-      );
-    } else {
+    if (!ok && !_cancellationToken!.isCancelled) {
       _showErrorNotification(
         title: "backup_background_service_error_title".tr(),
         content: "backup_background_service_backup_failed_message".tr(),
@@ -399,16 +424,43 @@ class BackgroundService {
     return ok;
   }
 
-  void _onAssetUploaded(String deviceAssetId, String deviceId) {
-    debugPrint("Uploaded $deviceAssetId from $deviceId");
+  String _formatAssetBackupProgress() {
+    final int percent = (_uploadedAssetsCount * 100) ~/ _assetsToUploadCount;
+    return "$percent% ($_uploadedAssetsCount/$_assetsToUploadCount)";
   }
 
-  void _onProgress(int sent, int total) {}
+  void _onAssetUploaded(String deviceAssetId, String deviceId) {
+    debugPrint("Uploaded $deviceAssetId from $deviceId");
+    _uploadedAssetsCount++;
+    _updateNotification(
+      progress: _uploadedAssetsCount,
+      max: _assetsToUploadCount,
+      content: _formatAssetBackupProgress(),
+    );
+  }
+
+  void _onProgress(int sent, int total) {
+    final int now = Timeline.now;
+    // limit updates to 10 per second (or Android drops important notifications)
+    if (now > _lastDetailProgressUpdate + 100000) {
+      final String msg = _humanReadableBytesProgress(sent, total);
+      // only update if message actually differs (to stop many useless notification updates on large assets or slow connections)
+      if (msg != _lastPrintedProgress) {
+        _lastDetailProgressUpdate = now;
+        _lastPrintedProgress = msg;
+        _updateNotification(
+          progress: sent,
+          max: total,
+          isDetail: true,
+          content: msg,
+        );
+      }
+    }
+  }
 
   void _onBackupError(ErrorUploadAsset errorAssetInfo) {
     _showErrorNotification(
-      title: "Upload failed",
-      content: "backup_background_service_upload_failure_notification"
+      title: "backup_background_service_upload_failure_notification"
           .tr(args: [errorAssetInfo.fileName]),
       individualTag: errorAssetInfo.id,
     );
@@ -416,14 +468,17 @@ class BackgroundService {
 
   void _onSetCurrentBackupAsset(CurrentUploadAsset currentUploadAsset) {
     _updateNotification(
-      title: "backup_background_service_in_progress_notification".tr(),
-      content: "backup_background_service_current_upload_notification"
+      title: "backup_background_service_current_upload_notification"
           .tr(args: [currentUploadAsset.fileName]),
+      content: "",
+      isDetail: true,
+      progress: 0,
+      max: 0,
     );
   }
 
-  bool _isErrorGracePeriodExceeded() {
-    final int value = AppSettingsService()
+  bool _isErrorGracePeriodExceeded(AppSettingsService appSettingsService) {
+    final int value = appSettingsService
         .getSetting(AppSettingsEnum.uploadErrorNotificationGracePeriod);
     if (value == 0) {
       return true;
@@ -448,9 +503,30 @@ class BackgroundService {
     assert(false, "Invalid value");
     return true;
   }
+
+  /// prints percentage and absolute progress in useful (kilo/mega/giga)bytes
+  static String _humanReadableBytesProgress(int bytes, int bytesTotal) {
+    String unit = "KB"; // Kilobyte
+    if (bytesTotal >= 0x40000000) {
+      unit = "GB"; // Gigabyte
+      bytes >>= 20;
+      bytesTotal >>= 20;
+    } else if (bytesTotal >= 0x100000) {
+      unit = "MB"; // Megabyte
+      bytes >>= 10;
+      bytesTotal >>= 10;
+    } else if (bytesTotal < 0x400) {
+      return "$bytes / $bytesTotal B";
+    }
+    final int percent = (bytes * 100) ~/ bytesTotal;
+    final String done = numberFormat.format(bytes / 1024.0);
+    final String total = numberFormat.format(bytesTotal / 1024.0);
+    return "$percent% ($done/$total$unit)";
+  }
 }
 
 /// entry point called by Kotlin/Java code; needs to be a top-level function
+@pragma('vm:entry-point')
 void _nativeEntry() {
   WidgetsFlutterBinding.ensureInitialized();
   BackgroundService backgroundService = BackgroundService();

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

@@ -26,7 +26,7 @@ class AvailableAlbum {
 
   String get name => albumEntity.name;
 
-  int get assetCount => albumEntity.assetCount;
+  Future<int> get assetCount => albumEntity.assetCountAsync;
 
   String get id => albumEntity.id;
 

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

@@ -117,6 +117,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
     bool? requireWifi,
     bool? requireCharging,
     required void Function(String msg) onError,
+    required void Function() onBatteryInfo,
   }) async {
     assert(enabled != null || requireWifi != null || requireCharging != null);
     if (Platform.isAndroid) {
@@ -130,15 +131,24 @@ class BackupNotifier extends StateNotifier<BackUpState> {
       );
 
       if (state.backgroundBackup) {
+        bool success = true;
         if (!wasEnabled) {
-          await _backgroundService.disableBatteryOptimizations();
+          if (!await _backgroundService.isIgnoringBatteryOptimizations()) {
+            onBatteryInfo();
+          }
+          success &= await _backgroundService.enableService(immediate: true);
         }
-        final bool success = await _backgroundService.stopService() &&
-            await _backgroundService.startService(
+        success &= success &&
+            await _backgroundService.configureService(
               requireUnmetered: state.backupRequireWifi,
               requireCharging: state.backupRequireCharging,
             );
-        if (!success) {
+        if (success) {
+          await Hive.box(backgroundBackupInfoBox)
+              .put(backupRequireWifi, state.backupRequireWifi);
+          await Hive.box(backgroundBackupInfoBox)
+              .put(backupRequireCharging, state.backupRequireCharging);
+        } else {
           state = state.copyWith(
             backgroundBackup: wasEnabled,
             backupRequireWifi: wasWifi,
@@ -147,7 +157,7 @@ class BackupNotifier extends StateNotifier<BackUpState> {
           onError("backup_controller_page_background_configure_error");
         }
       } else {
-        final bool success = await _backgroundService.stopService();
+        final bool success = await _backgroundService.disableService();
         if (!success) {
           state = state.copyWith(backgroundBackup: wasEnabled);
           onError("backup_controller_page_background_configure_error");
@@ -173,17 +183,21 @@ class BackupNotifier extends StateNotifier<BackUpState> {
     for (AssetPathEntity album in albums) {
       AvailableAlbum availableAlbum = AvailableAlbum(albumEntity: album);
 
-      var assetList =
-          await album.getAssetListRange(start: 0, end: album.assetCount);
+      var assetCountInAlbum = await album.assetCountAsync;
+      if (assetCountInAlbum > 0) {
+        var assetList =
+            await album.getAssetListRange(start: 0, end: assetCountInAlbum);
 
-      if (assetList.isNotEmpty) {
-        var thumbnailAsset = assetList.first;
-        var thumbnailData = await thumbnailAsset
-            .thumbnailDataWithSize(const ThumbnailSize(512, 512));
-        availableAlbum = availableAlbum.copyWith(thumbnailData: thumbnailData);
+        if (assetList.isNotEmpty) {
+          var thumbnailAsset = assetList.first;
+          var thumbnailData = await thumbnailAsset
+              .thumbnailDataWithSize(const ThumbnailSize(512, 512));
+          availableAlbum =
+              availableAlbum.copyWith(thumbnailData: thumbnailData);
+        }
+
+        availableAlbums.add(availableAlbum);
       }
-
-      availableAlbums.add(availableAlbum);
     }
 
     state = state.copyWith(availableAlbums: availableAlbums);
@@ -286,14 +300,18 @@ class BackupNotifier extends StateNotifier<BackUpState> {
     Set<AssetEntity> assetsFromExcludedAlbums = {};
 
     for (var album in state.selectedBackupAlbums) {
-      var assets = await album.albumEntity
-          .getAssetListRange(start: 0, end: album.assetCount);
+      var assets = await album.albumEntity.getAssetListRange(
+        start: 0,
+        end: await album.albumEntity.assetCountAsync,
+      );
       assetsFromSelectedAlbums.addAll(assets);
     }
 
     for (var album in state.excludedBackupAlbums) {
-      var assets = await album.albumEntity
-          .getAssetListRange(start: 0, end: album.assetCount);
+      var assets = await album.albumEntity.getAssetListRange(
+        start: 0,
+        end: await album.albumEntity.assetCountAsync,
+      );
       assetsFromExcludedAlbums.addAll(assets);
     }
 
@@ -343,11 +361,8 @@ class BackupNotifier extends StateNotifier<BackUpState> {
     final bool isEnabled = await _backgroundService.isBackgroundBackupEnabled();
     state = state.copyWith(backgroundBackup: isEnabled);
     if (state.backupProgress != BackUpProgressEnum.inBackground) {
-      await Future.wait([
-        _getBackupAlbumsInfo(),
-        _updateServerInfo(),
-      ]);
-
+      await _getBackupAlbumsInfo();
+      await _updateServerInfo();
       await _updateBackupAssetCount();
     }
   }
@@ -549,10 +564,13 @@ class BackupNotifier extends StateNotifier<BackUpState> {
           albums.lastExcludedBackupTime,
         );
       }
+      final Box backgroundBox = await Hive.openBox(backgroundBackupInfoBox);
       state = state.copyWith(
         backupProgress: previous,
         selectedBackupAlbums: selectedAlbums,
         excludedBackupAlbums: excludedAlbums,
+        backupRequireWifi: backgroundBox.get(backupRequireWifi),
+        backupRequireCharging: backgroundBox.get(backupRequireCharging),
       );
     }
     return _resumeBackup();
@@ -590,6 +608,13 @@ class BackupNotifier extends StateNotifier<BackUpState> {
       } catch (error) {
         debugPrint("[_notifyBackgroundServiceCanRun] failed to close box");
       }
+      try {
+        if (Hive.isBoxOpen(backgroundBackupInfoBox)) {
+          await Hive.box(backgroundBackupInfoBox).close();
+        }
+      } catch (error) {
+        debugPrint("[_notifyBackgroundServiceCanRun] failed to close box");
+      }
       _backgroundService.releaseLock();
     }
   }

mobile/lib/modules/backup/services/backup.service.dart

@@ -127,7 +127,9 @@ class BackupService {
     for (int i = 0; i < albums.length; i++) {
       final AssetPathEntity? a = albums[i];
       if (a != null && a.lastModified?.isBefore(lastBackup[i]) != true) {
-        result.addAll(await a.getAssetListRange(start: 0, end: a.assetCount));
+        result.addAll(
+          await a.getAssetListRange(start: 0, end: await a.assetCountAsync),
+        );
         lastBackup[i] = now;
       }
     }

mobile/lib/modules/backup/ui/album_info_card.dart

@@ -1,5 +1,3 @@
-import 'dart:typed_data';
-
 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
@@ -205,15 +203,23 @@ class AlbumInfoCard extends HookConsumerWidget {
                           ),
                           Padding(
                             padding: const EdgeInsets.only(top: 2.0),
-                            child: Text(
-                              albumInfo.assetCount.toString() +
-                                  (albumInfo.isAll
-                                      ? " (${'backup_all'.tr()})"
-                                      : ""),
-                              style: TextStyle(
-                                fontSize: 12,
-                                color: Colors.grey[600],
-                              ),
+                            child: FutureBuilder(
+                              builder: ((context, snapshot) {
+                                if (snapshot.hasData) {
+                                  return Text(
+                                    snapshot.data.toString() +
+                                        (albumInfo.isAll
+                                            ? " (${'backup_all'.tr()})"
+                                            : ""),
+                                    style: TextStyle(
+                                      fontSize: 12,
+                                      color: Colors.grey[600],
+                                    ),
+                                  );
+                                }
+                                return const Text("0");
+                              }),
+                              future: albumInfo.assetCount,
                             ),
                           )
                         ],

mobile/lib/modules/backup/views/backup_controller_page.dart

@@ -14,6 +14,7 @@ import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/shared/providers/websocket.provider.dart';
 import 'package:immich_mobile/modules/backup/ui/backup_info_card.dart';
 import 'package:percent_indicator/linear_percent_indicator.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 class BackupControllerPage extends HookConsumerWidget {
   const BackupControllerPage({Key? key}) : super(key: key);
@@ -156,6 +157,46 @@ class BackupControllerPage extends HookConsumerWidget {
       ScaffoldMessenger.of(context).showSnackBar(snackBar);
     }
 
+    void _showBatteryOptimizationInfoToUser() {
+      final buttonTextColor = Theme.of(context).primaryColor;
+      showDialog<void>(
+        context: context,
+        barrierDismissible: false,
+        builder: (BuildContext context) {
+          return AlertDialog(
+            title: const Text(
+              'backup_controller_page_background_battery_info_title',
+            ).tr(),
+            content: SingleChildScrollView(
+              child: const Text(
+                'backup_controller_page_background_battery_info_message',
+              ).tr(),
+            ),
+            actions: [
+              OutlinedButton(
+                onPressed: () => launchUrl(
+                  Uri.parse('https://dontkillmyapp.com'),
+                  mode: LaunchMode.externalApplication,
+                ),
+                child: const Text(
+                  "backup_controller_page_background_battery_info_link",
+                ).tr(),
+              ),
+              ElevatedButton(
+                child: const Text(
+                  'backup_controller_page_background_battery_info_ok',
+                  style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12),
+                ).tr(),
+                onPressed: () {
+                  Navigator.of(context).pop();
+                },
+              ),
+            ],
+          );
+        },
+      );
+    }
+
     ListTile _buildBackgroundBackupController() {
       final bool isBackgroundEnabled = backupState.backgroundBackup;
       final bool isWifiRequired = backupState.backupRequireWifi;
@@ -197,6 +238,7 @@ class BackupControllerPage extends HookConsumerWidget {
                         .configureBackgroundBackup(
                           requireWifi: isChecked,
                           onError: _showErrorToUser,
+                          onBatteryInfo: _showBatteryOptimizationInfoToUser,
                         )
                     : null,
               ),
@@ -217,6 +259,7 @@ class BackupControllerPage extends HookConsumerWidget {
                         .configureBackgroundBackup(
                           requireCharging: isChecked,
                           onError: _showErrorToUser,
+                          onBatteryInfo: _showBatteryOptimizationInfoToUser,
                         )
                     : null,
               ),
@@ -225,6 +268,7 @@ class BackupControllerPage extends HookConsumerWidget {
                   ref.read(backupProvider.notifier).configureBackgroundBackup(
                         enabled: !isBackgroundEnabled,
                         onError: _showErrorToUser,
+                        onBatteryInfo: _showBatteryOptimizationInfoToUser,
                       ),
               child: Text(
                 isBackgroundEnabled
@@ -464,7 +508,7 @@ class BackupControllerPage extends HookConsumerWidget {
                                 DateTime.parse(
                                   backupState.currentUploadAsset.createdAt
                                       .toString(),
-                                ),
+                                ).toLocal(),
                               )
                             ],
                           ),
@@ -592,8 +636,8 @@ class BackupControllerPage extends HookConsumerWidget {
                     backupState.backupProgress == BackUpProgressEnum.inProgress
                         ? ElevatedButton(
                             style: ElevatedButton.styleFrom(
-                              primary: Colors.red[300],
-                              onPrimary: Colors.grey[50],
+                              foregroundColor: Colors.grey[50],
+                              backgroundColor: Colors.red[300],
                               // padding: const EdgeInsets.all(14),
                             ),
                             onPressed: () {

mobile/lib/modules/backup/views/failed_backup_status_page.dart

@@ -90,7 +90,7 @@ class FailedBackupStatusPage extends HookConsumerWidget {
                                 DateFormat.yMMMMd('en_US').format(
                                   DateTime.parse(
                                     errorAsset.createdAt.toString(),
-                                  ),
+                                  ).toLocal(),
                                 ),
                                 style: TextStyle(
                                   fontSize: 12,

mobile/lib/modules/home/providers/home_page_render_list_provider.dart

@@ -0,0 +1,95 @@
+import 'dart:math';
+
+import 'package:flutter/material.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/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);
+
+  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;
+});

mobile/lib/modules/home/ui/asset_list_v2/daily_title_text.dart

@@ -0,0 +1,107 @@
+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,
+                  ),
+          )
+        ],
+      ),
+    );
+  }
+}

mobile/lib/modules/home/ui/asset_list_v2/draggable_scrollbar_custom.dart

@@ -0,0 +1,535 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
+
+/// Build the Scroll Thumb and label using the current configuration
+typedef ScrollThumbBuilder = Widget Function(
+  Color backgroundColor,
+  Animation<double> thumbAnimation,
+  Animation<double> labelAnimation,
+  double height, {
+  Text? labelText,
+  BoxConstraints? labelConstraints,
+});
+
+/// Build a Text widget using the current scroll offset
+typedef LabelTextBuilder = Text Function(int item);
+
+/// A widget that will display a BoxScrollView with a ScrollThumb that can be dragged
+/// for quick navigation of the BoxScrollView.
+class DraggableScrollbar extends StatefulWidget {
+  /// The view that will be scrolled with the scroll thumb
+  final ScrollablePositionedList child;
+
+  final ItemPositionsListener itemPositionsListener;
+
+  /// A function that builds a thumb using the current configuration
+  final ScrollThumbBuilder scrollThumbBuilder;
+
+  /// The height of the scroll thumb
+  final double heightScrollThumb;
+
+  /// The background color of the label and thumb
+  final Color backgroundColor;
+
+  /// The amount of padding that should surround the thumb
+  final EdgeInsetsGeometry? padding;
+
+  /// Determines how quickly the scrollbar will animate in and out
+  final Duration scrollbarAnimationDuration;
+
+  /// How long should the thumb be visible before fading out
+  final Duration scrollbarTimeToFade;
+
+  /// Build a Text widget from the current offset in the BoxScrollView
+  final LabelTextBuilder? labelTextBuilder;
+
+  /// Determines box constraints for Container displaying label
+  final BoxConstraints? labelConstraints;
+
+  /// The ScrollController for the BoxScrollView
+  final ItemScrollController controller;
+
+  /// Determines scrollThumb displaying. If you draw own ScrollThumb and it is true you just don't need to use animation parameters in [scrollThumbBuilder]
+  final bool alwaysVisibleScrollThumb;
+
+  final Function(bool scrolling) scrollStateListener;
+
+  DraggableScrollbar.semicircle({
+    Key? key,
+    Key? scrollThumbKey,
+    this.alwaysVisibleScrollThumb = false,
+    required this.child,
+    required this.controller,
+    required this.itemPositionsListener,
+    required this.scrollStateListener,
+    this.heightScrollThumb = 48.0,
+    this.backgroundColor = Colors.white,
+    this.padding,
+    this.scrollbarAnimationDuration = const Duration(milliseconds: 300),
+    this.scrollbarTimeToFade = const Duration(milliseconds: 600),
+    this.labelTextBuilder,
+    this.labelConstraints,
+  })  : assert(child.scrollDirection == Axis.vertical),
+        scrollThumbBuilder = _thumbSemicircleBuilder(
+          heightScrollThumb * 0.6,
+          scrollThumbKey,
+          alwaysVisibleScrollThumb,
+        ),
+        super(key: key);
+
+  @override
+  DraggableScrollbarState createState() => DraggableScrollbarState();
+
+  static buildScrollThumbAndLabel({
+    required Widget scrollThumb,
+    required Color backgroundColor,
+    required Animation<double>? thumbAnimation,
+    required Animation<double>? labelAnimation,
+    required Text? labelText,
+    required BoxConstraints? labelConstraints,
+    required bool alwaysVisibleScrollThumb,
+  }) {
+    var scrollThumbAndLabel = labelText == null
+        ? scrollThumb
+        : Row(
+            mainAxisSize: MainAxisSize.min,
+            mainAxisAlignment: MainAxisAlignment.end,
+            children: [
+              ScrollLabel(
+                animation: labelAnimation,
+                backgroundColor: backgroundColor,
+                constraints: labelConstraints,
+                child: labelText,
+              ),
+              scrollThumb,
+            ],
+          );
+
+    if (alwaysVisibleScrollThumb) {
+      return scrollThumbAndLabel;
+    }
+    return SlideFadeTransition(
+      animation: thumbAnimation!,
+      child: scrollThumbAndLabel,
+    );
+  }
+
+  static ScrollThumbBuilder _thumbSemicircleBuilder(
+    double width,
+    Key? scrollThumbKey,
+    bool alwaysVisibleScrollThumb,
+  ) {
+    return (
+      Color backgroundColor,
+      Animation<double> thumbAnimation,
+      Animation<double> labelAnimation,
+      double height, {
+      Text? labelText,
+      BoxConstraints? labelConstraints,
+    }) {
+      final scrollThumb = CustomPaint(
+        key: scrollThumbKey,
+        foregroundPainter: ArrowCustomPainter(Colors.white),
+        child: Material(
+          elevation: 4.0,
+          color: backgroundColor,
+          borderRadius: BorderRadius.only(
+            topLeft: Radius.circular(height),
+            bottomLeft: Radius.circular(height),
+            topRight: const Radius.circular(4.0),
+            bottomRight: const Radius.circular(4.0),
+          ),
+          child: Container(
+            constraints: BoxConstraints.tight(Size(width, height)),
+          ),
+        ),
+      );
+
+      return buildScrollThumbAndLabel(
+        scrollThumb: scrollThumb,
+        backgroundColor: backgroundColor,
+        thumbAnimation: thumbAnimation,
+        labelAnimation: labelAnimation,
+        labelText: labelText,
+        labelConstraints: labelConstraints,
+        alwaysVisibleScrollThumb: alwaysVisibleScrollThumb,
+      );
+    };
+  }
+}
+
+class ScrollLabel extends StatelessWidget {
+  final Animation<double>? animation;
+  final Color backgroundColor;
+  final Text child;
+
+  final BoxConstraints? constraints;
+  static const BoxConstraints _defaultConstraints =
+      BoxConstraints.tightFor(width: 72.0, height: 28.0);
+
+  const ScrollLabel({
+    Key? key,
+    required this.child,
+    required this.animation,
+    required this.backgroundColor,
+    this.constraints = _defaultConstraints,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return FadeTransition(
+      opacity: animation!,
+      child: Container(
+        margin: const EdgeInsets.only(right: 12.0),
+        child: Material(
+          elevation: 4.0,
+          color: backgroundColor,
+          borderRadius: const BorderRadius.all(Radius.circular(16.0)),
+          child: Container(
+            constraints: constraints ?? _defaultConstraints,
+            padding: const EdgeInsets.symmetric(horizontal: 10.0),
+            alignment: Alignment.center,
+            child: child,
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class DraggableScrollbarState extends State<DraggableScrollbar>
+    with TickerProviderStateMixin {
+  late double _barOffset;
+  late bool _isDragInProcess;
+  late int _currentItem;
+
+  late AnimationController _thumbAnimationController;
+  late Animation<double> _thumbAnimation;
+  late AnimationController _labelAnimationController;
+  late Animation<double> _labelAnimation;
+  Timer? _fadeoutTimer;
+
+  @override
+  void initState() {
+    super.initState();
+    _barOffset = 0.0;
+    _isDragInProcess = false;
+    _currentItem = 0;
+
+    _thumbAnimationController = AnimationController(
+      vsync: this,
+      duration: widget.scrollbarAnimationDuration,
+    );
+
+    _thumbAnimation = CurvedAnimation(
+      parent: _thumbAnimationController,
+      curve: Curves.fastOutSlowIn,
+    );
+
+    _labelAnimationController = AnimationController(
+      vsync: this,
+      duration: widget.scrollbarAnimationDuration,
+    );
+
+    _labelAnimation = CurvedAnimation(
+      parent: _labelAnimationController,
+      curve: Curves.fastOutSlowIn,
+    );
+  }
+
+  @override
+  void dispose() {
+    _thumbAnimationController.dispose();
+    _labelAnimationController.dispose();
+    _fadeoutTimer?.cancel();
+    super.dispose();
+  }
+
+  double get barMaxScrollExtent =>
+      (context.size?.height ?? 0) - widget.heightScrollThumb;
+
+  double get barMinScrollExtent => 0;
+
+  int get maxItemCount => widget.child.itemCount;
+
+  @override
+  Widget build(BuildContext context) {
+    Text? labelText;
+    if (widget.labelTextBuilder != null && _isDragInProcess) {
+      labelText = widget.labelTextBuilder!(_currentItem);
+    }
+
+    return LayoutBuilder(
+      builder: (BuildContext context, BoxConstraints constraints) {
+        //print("LayoutBuilder constraints=$constraints");
+
+        return NotificationListener<ScrollNotification>(
+          onNotification: (ScrollNotification notification) {
+            changePosition(notification);
+            return false;
+          },
+          child: Stack(
+            children: <Widget>[
+              RepaintBoundary(
+                child: widget.child,
+              ),
+              RepaintBoundary(
+                child: GestureDetector(
+                  onVerticalDragStart: _onVerticalDragStart,
+                  onVerticalDragUpdate: _onVerticalDragUpdate,
+                  onVerticalDragEnd: _onVerticalDragEnd,
+                  child: Container(
+                    alignment: Alignment.topRight,
+                    margin: EdgeInsets.only(top: _barOffset),
+                    padding: widget.padding,
+                    child: widget.scrollThumbBuilder(
+                      widget.backgroundColor,
+                      _thumbAnimation,
+                      _labelAnimation,
+                      widget.heightScrollThumb,
+                      labelText: labelText,
+                      labelConstraints: widget.labelConstraints,
+                    ),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+
+  // scroll bar has received notification that it's view was scrolled
+  // so it should also changes his position
+  // but only if it isn't dragged
+  changePosition(ScrollNotification notification) {
+    if (_isDragInProcess) {
+      return;
+    }
+
+    setState(() {
+      int firstItemIndex =
+          widget.itemPositionsListener.itemPositions.value.first.index;
+
+      if (notification is ScrollUpdateNotification) {
+        _barOffset = (firstItemIndex / maxItemCount) * barMaxScrollExtent;
+
+        if (_barOffset < barMinScrollExtent) {
+          _barOffset = barMinScrollExtent;
+        }
+        if (_barOffset > barMaxScrollExtent) {
+          _barOffset = barMaxScrollExtent;
+        }
+      }
+
+      if (notification is ScrollUpdateNotification ||
+          notification is OverscrollNotification) {
+        if (_thumbAnimationController.status != AnimationStatus.forward) {
+          _thumbAnimationController.forward();
+        }
+
+        if (itemPos < maxItemCount) {
+          _currentItem = itemPos;
+        }
+
+        _fadeoutTimer?.cancel();
+        _fadeoutTimer = Timer(widget.scrollbarTimeToFade, () {
+          _thumbAnimationController.reverse();
+          _labelAnimationController.reverse();
+          _fadeoutTimer = null;
+        });
+      }
+    });
+  }
+
+  void _onVerticalDragStart(DragStartDetails details) {
+    setState(() {
+      _isDragInProcess = true;
+      _labelAnimationController.forward();
+      _fadeoutTimer?.cancel();
+    });
+
+    widget.scrollStateListener(true);
+  }
+
+  int get itemPos {
+    int numberOfItems = widget.child.itemCount;
+    return ((_barOffset / barMaxScrollExtent) * numberOfItems).toInt();
+  }
+
+  void _jumpToBarPos() {
+    if (itemPos > maxItemCount - 1) {
+      return;
+    }
+
+    _currentItem = itemPos;
+
+    widget.controller.jumpTo(
+      index: itemPos,
+    );
+  }
+
+  Timer? dragHaltTimer;
+  int lastTimerPos = 0;
+
+  void _onVerticalDragUpdate(DragUpdateDetails details) {
+    setState(() {
+      if (_thumbAnimationController.status != AnimationStatus.forward) {
+        _thumbAnimationController.forward();
+      }
+      if (_isDragInProcess) {
+        _barOffset += details.delta.dy;
+
+        if (_barOffset < barMinScrollExtent) {
+          _barOffset = barMinScrollExtent;
+        }
+        if (_barOffset > barMaxScrollExtent) {
+          _barOffset = barMaxScrollExtent;
+        }
+
+        if (itemPos != lastTimerPos) {
+          lastTimerPos = itemPos;
+          dragHaltTimer?.cancel();
+          widget.scrollStateListener(true);
+
+          dragHaltTimer = Timer(
+            const Duration(milliseconds: 200),
+                () {
+              widget.scrollStateListener(false);
+            },
+          );
+        }
+
+        _jumpToBarPos();
+      }
+    });
+  }
+
+  void _onVerticalDragEnd(DragEndDetails details) {
+    _fadeoutTimer = Timer(widget.scrollbarTimeToFade, () {
+      _thumbAnimationController.reverse();
+      _labelAnimationController.reverse();
+      _fadeoutTimer = null;
+    });
+
+    setState(() {
+      _jumpToBarPos();
+      _isDragInProcess = false;
+    });
+
+    widget.scrollStateListener(false);
+  }
+}
+
+/// Draws 2 triangles like arrow up and arrow down
+class ArrowCustomPainter extends CustomPainter {
+  Color color;
+
+  ArrowCustomPainter(this.color);
+
+  @override
+  bool shouldRepaint(covariant CustomPainter oldDelegate) => false;
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    final paint = Paint()..color = color;
+    const width = 12.0;
+    const height = 8.0;
+    final baseX = size.width / 2;
+    final baseY = size.height / 2;
+
+    canvas.drawPath(
+      _trianglePath(Offset(baseX, baseY - 2.0), width, height, true),
+      paint,
+    );
+    canvas.drawPath(
+      _trianglePath(Offset(baseX, baseY + 2.0), width, height, false),
+      paint,
+    );
+  }
+
+  static Path _trianglePath(Offset o, double width, double height, bool isUp) {
+    return Path()
+      ..moveTo(o.dx, o.dy)
+      ..lineTo(o.dx + width, o.dy)
+      ..lineTo(o.dx + (width / 2), isUp ? o.dy - height : o.dy + height)
+      ..close();
+  }
+}
+
+///This cut 2 lines in arrow shape
+class ArrowClipper extends CustomClipper<Path> {
+  @override
+  Path getClip(Size size) {
+    Path path = Path();
+    path.lineTo(0.0, size.height);
+    path.lineTo(size.width, size.height);
+    path.lineTo(size.width, 0.0);
+    path.lineTo(0.0, 0.0);
+    path.close();
+
+    double arrowWidth = 8.0;
+    double startPointX = (size.width - arrowWidth) / 2;
+    double startPointY = size.height / 2 - arrowWidth / 2;
+    path.moveTo(startPointX, startPointY);
+    path.lineTo(startPointX + arrowWidth / 2, startPointY - arrowWidth / 2);
+    path.lineTo(startPointX + arrowWidth, startPointY);
+    path.lineTo(startPointX + arrowWidth, startPointY + 1.0);
+    path.lineTo(
+      startPointX + arrowWidth / 2,
+      startPointY - arrowWidth / 2 + 1.0,
+    );
+    path.lineTo(startPointX, startPointY + 1.0);
+    path.close();
+
+    startPointY = size.height / 2 + arrowWidth / 2;
+    path.moveTo(startPointX + arrowWidth, startPointY);
+    path.lineTo(startPointX + arrowWidth / 2, startPointY + arrowWidth / 2);
+    path.lineTo(startPointX, startPointY);
+    path.lineTo(startPointX, startPointY - 1.0);
+    path.lineTo(
+      startPointX + arrowWidth / 2,
+      startPointY + arrowWidth / 2 - 1.0,
+    );
+    path.lineTo(startPointX + arrowWidth, startPointY - 1.0);
+    path.close();
+
+    return path;
+  }
+
+  @override
+  bool shouldReclip(CustomClipper<Path> oldClipper) => false;
+}
+
+class SlideFadeTransition extends StatelessWidget {
+  final Animation<double> animation;
+  final Widget child;
+
+  const SlideFadeTransition({
+    Key? key,
+    required this.animation,
+    required this.child,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedBuilder(
+      animation: animation,
+      builder: (context, child) =>
+          animation.value == 0.0 ? const SizedBox() : child!,
+      child: SlideTransition(
+        position: Tween(
+          begin: const Offset(0.3, 0.0),
+          end: const Offset(0.0, 0.0),
+        ).animate(animation),
+        child: FadeTransition(
+          opacity: animation,
+          child: child,
+        ),
+      ),
+    );
+  }
+}

mobile/lib/modules/home/ui/asset_list_v2/immich_asset_grid.dart

@@ -0,0 +1,167 @@
+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,
+        ));
+  }
+}

mobile/lib/modules/home/ui/daily_title_text.dart

@@ -21,8 +21,8 @@ class DailyTitleText extends ConsumerWidget {
     var formatDateTemplate = currentYear == groupYear
         ? "daily_title_text_date".tr()
         : "daily_title_text_date_year".tr();
-    var dateText =
-        DateFormat(formatDateTemplate).format(DateTime.parse(isoDate));
+    var dateText = DateFormat(formatDateTemplate)
+        .format(DateTime.parse(isoDate).toLocal());
     var isMultiSelectEnable =
         ref.watch(homePageStateProvider).isMultiSelectEnable;
     var selectedDateGroup = ref.watch(homePageStateProvider).selectedDateGroup;

mobile/lib/modules/home/ui/image_grid.dart

@@ -33,34 +33,10 @@ class ImageGrid extends ConsumerWidget {
           var assetType = assetGroup[index].type;
           return GestureDetector(
             onTap: () {},
-            child: Stack(
-              children: [
-                ThumbnailImage(
-                  asset: assetGroup[index],
-                  assetList: sortedAssetGroup,
-                  showStorageIndicator: showStorageIndicator,
-                ),
-                if (assetType != AssetTypeEnum.IMAGE)
-                  Positioned(
-                    top: 5,
-                    right: 5,
-                    child: Row(
-                      children: [
-                        Text(
-                          assetGroup[index].duration.toString().substring(0, 7),
-                          style: const TextStyle(
-                            color: Colors.white,
-                            fontSize: 10,
-                          ),
-                        ),
-                        const Icon(
-                          Icons.play_circle_outline_rounded,
-                          color: Colors.white,
-                        ),
-                      ],
-                    ),
-                  ),
-              ],
+            child: ThumbnailImage(
+              asset: assetGroup[index],
+              assetList: sortedAssetGroup,
+              showStorageIndicator: showStorageIndicator,
             ),
           );
         },

mobile/lib/modules/home/ui/immich_sliver_appbar.dart

@@ -21,7 +21,7 @@ class ImmichSliverAppBar extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final BackUpState backupState = ref.watch(backupProvider);
-    bool isEnableAutoBackup =
+    bool isEnableAutoBackup = backupState.backgroundBackup ||
         ref.watch(authenticationProvider).deviceInfo.isAutoBackup;
     final ServerInfoState serverInfoState = ref.watch(serverInfoProvider);
 
@@ -42,9 +42,10 @@ class ImmichSliverAppBar extends ConsumerWidget {
                 top: 5,
                 child: IconButton(
                   splashRadius: 25,
-                  icon: const Icon(
+                  icon: Icon(
                     Icons.face_outlined,
                     size: 30,
+                    color: Theme.of(context).primaryColor,
                   ),
                   onPressed: () {
                     Scaffold.of(context).openDrawer();
@@ -109,7 +110,10 @@ class ImmichSliverAppBar extends ConsumerWidget {
               splashRadius: 25,
               iconSize: 30,
               icon: isEnableAutoBackup
-                  ? const Icon(Icons.backup_rounded)
+                  ? Icon(
+                      Icons.backup_rounded,
+                      color: Theme.of(context).primaryColor,
+                    )
                   : Badge(
                       padding: const EdgeInsets.all(4),
                       elevation: 3,
@@ -120,7 +124,10 @@ class ImmichSliverAppBar extends ConsumerWidget {
                         size: 8,
                         color: Colors.indigo,
                       ),
-                      child: const Icon(Icons.backup_rounded),
+                      child: Icon(
+                        Icons.backup_rounded,
+                        color: Theme.of(context).primaryColor,
+                      ),
                     ),
               onPressed: () async {
                 var onPop = await AutoRouter.of(context)

mobile/lib/modules/home/ui/monthly_title_text.dart

@@ -12,7 +12,7 @@ class MonthlyTitleText extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     var monthTitleText = DateFormat("monthly_title_text_date_format".tr())
-        .format(DateTime.parse(isoDate));
+        .format(DateTime.parse(isoDate).toLocal());
 
     return SliverToBoxAdapter(
       child: Padding(

mobile/lib/modules/home/ui/thumbnail_image.dart

@@ -2,7 +2,6 @@ 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:flutter_hooks/flutter_hooks.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/hive_box.dart';
@@ -16,18 +15,18 @@ 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})
-      : super(key: key);
+  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) {
-    final cacheKey = useState(1);
-
     var box = Hive.box(userInfoBox);
     var thumbnailRequestUrl = getThumbnailUrl(asset);
     var selectedAsset = ref.watch(homePageStateProvider).selectedItems;
@@ -35,7 +34,7 @@ class ThumbnailImage extends HookConsumerWidget {
         ref.watch(homePageStateProvider).isMultiSelectEnable;
     var deviceId = ref.watch(authenticationProvider).deviceId;
 
-    Widget _buildSelectionIcon(AssetResponseDto asset) {
+    Widget buildSelectionIcon(AssetResponseDto asset) {
       if (selectedAsset.contains(asset)) {
         return Icon(
           Icons.check_circle,
@@ -51,7 +50,6 @@ class ThumbnailImage extends HookConsumerWidget {
 
     return GestureDetector(
       onTap: () {
-        debugPrint("View ${asset.id}");
         if (isMultiSelectEnable &&
             selectedAsset.contains(asset) &&
             selectedAsset.length == 1) {
@@ -94,25 +92,35 @@ class ThumbnailImage extends HookConsumerWidget {
                     : const Border(),
               ),
               child: CachedNetworkImage(
-                cacheKey: "${asset.id}-${cacheKey.value}",
+                cacheKey: 'thumbnail-image-${asset.id}',
                 width: 300,
                 height: 300,
-                memCacheHeight: asset.type == AssetTypeEnum.IMAGE ? 250 : 400,
+                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) =>
-                    Transform.scale(
-                  scale: 0.2,
-                  child: CircularProgressIndicator(
-                    value: downloadProgress.progress,
-                  ),
-                ),
+                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,
@@ -125,20 +133,41 @@ class ThumbnailImage extends HookConsumerWidget {
                 padding: const EdgeInsets.all(3.0),
                 child: Align(
                   alignment: Alignment.topLeft,
-                  child: _buildSelectionIcon(asset),
+                  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 (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,
+                    ),
+                  ],
+                ),
               ),
-            )
           ],
         ),
       ),

mobile/lib/modules/home/views/home_page.dart

@@ -1,12 +1,14 @@
 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/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';
@@ -25,6 +27,8 @@ class HomePage extends HookConsumerWidget {
   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 = [];
@@ -65,37 +69,45 @@ class HomePage extends HookConsumerWidget {
         int? lastMonth;
 
         assetGroupByDateTime.forEach((dateGroup, immichAssetList) {
-          DateTime parseDateGroup = DateTime.parse(dateGroup);
-          int currentMonth = parseDateGroup.month;
+          try {
+            DateTime parseDateGroup = DateTime.parse(dateGroup);
+            int currentMonth = parseDateGroup.month;
 
-          if (lastMonth != null) {
-            if (currentMonth - lastMonth! != 0) {
-              imageGridGroup.add(
-                MonthlyTitleText(
-                  isoDate: dateGroup,
-                ),
-              );
+            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()}",
+            );
           }
-
-          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;
         });
       }
 
@@ -112,6 +124,31 @@ class HomePage extends HookConsumerWidget {
               );
       }
 
+      _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,
+              ],
+            ),
+          );
+        }
+      }
+
       return SafeArea(
         bottom: !isMultiSelectEnable,
         top: !isMultiSelectEnable,
@@ -124,17 +161,7 @@ class HomePage extends HookConsumerWidget {
             ),
             Padding(
               padding: const EdgeInsets.only(top: 60.0, bottom: 0.0),
-              child: DraggableScrollbar.semicircle(
-                backgroundColor: Theme.of(context).hintColor,
-                controller: scrollController,
-                heightScrollThumb: 48.0,
-                child: CustomScrollView(
-                  controller: scrollController,
-                  slivers: [
-                    ...imageGridGroup,
-                  ],
-                ),
-              ),
+              child: _buildAssetGrid(),
             ),
             if (isMultiSelectEnable) ...[
               _buildSelectedItemCountIndicator(),

mobile/lib/modules/search/providers/search_result_page.provider.dart

@@ -62,7 +62,7 @@ final searchResultGroupByDateTimeProvider = StateProvider((ref) {
     (a, b) => b.compareTo(a),
   );
   return assets.groupListsBy(
-    (element) =>
-        DateFormat('y-MM-dd').format(DateTime.parse(element.createdAt)),
+    (element) => DateFormat('y-MM-dd')
+        .format(DateTime.parse(element.createdAt).toLocal()),
   );
 });

mobile/lib/modules/search/views/search_page.dart

@@ -99,9 +99,9 @@ class SearchPage extends HookConsumerWidget {
 
     _buildThings() {
       return curatedObjects.when(
-        loading: () => const SizedBox(
-          height: 200,
-          child: Center(child: ImmichLoadingIndicator()),
+        loading: () => SizedBox(
+          height: imageSize,
+          child: const Center(child: ImmichLoadingIndicator()),
         ),
         error: (err, stack) => Text('Error: $err'),
         data: (objects) {
@@ -133,8 +133,7 @@ class SearchPage extends HookConsumerWidget {
                   ),
                 )
               : SizedBox(
-                  // height: imageSize,
-                  width: imageSize,
+                  height: imageSize,
                   child: ListView.builder(
                     padding: const EdgeInsets.only(left: 16),
                     scrollDirection: Axis.horizontal,

mobile/lib/modules/settings/services/app_settings.service.dart

@@ -6,8 +6,16 @@ enum AppSettingsEnum<T> {
   themeMode<String>("themeMode", "system"), // "light","dark","system"
   tilesPerRow<int>("tilesPerRow", 4),
   uploadErrorNotificationGracePeriod<int>(
-      "uploadErrorNotificationGracePeriod", 2),
-  storageIndicator<bool>("storageIndicator", true);
+    "uploadErrorNotificationGracePeriod",
+    2,
+  ),
+  backgroundBackupTotalProgress<bool>("backgroundBackupTotalProgress", true),
+  backgroundBackupSingleProgress<bool>("backgroundBackupSingleProgress", false),
+  storageIndicator<bool>("storageIndicator", true),
+  thumbnailCacheSize<int>("thumbnailCacheSize", 10000),
+  imageCacheSize<int>("imageCacheSize", 350),
+  albumThumbnailCacheSize<int>("albumThumbnailCacheSize", 200),
+  useExperimentalAssetGrid<bool>("useExperimentalAssetGrid", false);
 
   const AppSettingsEnum(this.hiveKey, this.defaultValue);
 

mobile/lib/modules/settings/ui/cache_settings/cache_settings.dart

@@ -0,0 +1,150 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
+import 'package:immich_mobile/modules/settings/ui/cache_settings/cache_settings_slider_pref.dart';
+import 'package:immich_mobile/shared/services/cache.service.dart';
+import 'package:immich_mobile/utils/bytes_units.dart';
+
+class CacheSettings extends HookConsumerWidget {
+  const CacheSettings({
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final CacheService cacheService = ref.watch(cacheServiceProvider);
+    final clearCacheState = useState(false);
+
+    Future<void> clearCache() async {
+      await cacheService.emptyAllCaches();
+      clearCacheState.value = true;
+    }
+
+    Widget cacheStatisticsRow(String name, CacheType type) {
+      final cacheSize = useState(0);
+      final cacheAssets = useState(0);
+
+      if (!clearCacheState.value) {
+        final repo = cacheService.getCacheRepo(type);
+
+        repo.open().then((_) {
+          cacheSize.value = repo.getCacheSize();
+          cacheAssets.value = repo.getNumberOfCachedObjects();
+        });
+      } else {
+        cacheSize.value = 0;
+        cacheAssets.value = 0;
+      }
+
+      return Container(
+        margin: const EdgeInsets.only(left: 20, bottom: 10),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              name,
+              style: const TextStyle(
+                fontWeight: FontWeight.bold,
+              ),
+            ),
+            const Text(
+              "cache_settings_statistics_assets",
+              style: TextStyle(color: Colors.grey),
+            ).tr(
+              args: ["${cacheAssets.value}", formatBytes(cacheSize.value)],
+            ),
+          ],
+        ),
+      );
+    }
+
+    return ExpansionTile(
+      expandedCrossAxisAlignment: CrossAxisAlignment.start,
+      textColor: Theme.of(context).primaryColor,
+      title: const Text(
+        'cache_settings_title',
+        style: TextStyle(
+          fontWeight: FontWeight.bold,
+        ),
+      ).tr(),
+      subtitle: const Text(
+        'cache_settings_subtitle',
+        style: TextStyle(
+          fontSize: 13,
+        ),
+      ).tr(),
+      children: [
+        const CacheSettingsSliderPref(
+          setting: AppSettingsEnum.thumbnailCacheSize,
+          translationKey: "cache_settings_thumbnail_size",
+          min: 1000,
+          max: 20000,
+          divisions: 19,
+        ),
+        const CacheSettingsSliderPref(
+          setting: AppSettingsEnum.imageCacheSize,
+          translationKey: "cache_settings_image_cache_size",
+          min: 0,
+          max: 1000,
+          divisions: 20,
+        ),
+        const CacheSettingsSliderPref(
+          setting: AppSettingsEnum.albumThumbnailCacheSize,
+          translationKey: "cache_settings_album_thumbnails",
+          min: 0,
+          max: 1000,
+          divisions: 20,
+        ),
+        ListTile(
+          title: const Text(
+            "cache_settings_statistics_title",
+            style: TextStyle(
+              fontSize: 12,
+              fontWeight: FontWeight.bold,
+            ),
+          ).tr(),
+        ),
+        cacheStatisticsRow(
+          "cache_settings_statistics_thumbnail".tr(),
+          CacheType.thumbnail,
+        ),
+        cacheStatisticsRow(
+          "cache_settings_statistics_album".tr(),
+          CacheType.albumThumbnail,
+        ),
+        cacheStatisticsRow(
+          "cache_settings_statistics_shared".tr(),
+          CacheType.sharedAlbumThumbnail,
+        ),
+        cacheStatisticsRow(
+          "cache_settings_statistics_full".tr(),
+          CacheType.imageViewerFull,
+        ),
+        ListTile(
+          title: const Text(
+            "cache_settings_clear_cache_button_title",
+            style: TextStyle(
+              fontSize: 12,
+              fontWeight: FontWeight.bold,
+            ),
+          ).tr(),
+        ),
+        Container(
+          alignment: Alignment.center,
+          child: ElevatedButton(
+            onPressed: clearCache,
+            child: const Text(
+              "cache_settings_clear_cache_button",
+              style: TextStyle(
+                fontWeight: FontWeight.bold,
+                fontSize: 12,
+              ),
+            ).tr(),
+          ),
+        )
+      ],
+    );
+  }
+}

mobile/lib/modules/settings/ui/cache_settings/cache_settings_slider_pref.dart

@@ -0,0 +1,63 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.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';
+
+class CacheSettingsSliderPref extends HookConsumerWidget {
+  final AppSettingsEnum<int> setting;
+  final String translationKey;
+  final int min;
+  final int max;
+  final int divisions;
+
+  const CacheSettingsSliderPref({
+    Key? key,
+    required this.setting,
+    required this.translationKey,
+    required this.min,
+    required this.max,
+    required this.divisions,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final appSettingService = ref.watch(appSettingsServiceProvider);
+
+    final itemsValue = useState(appSettingService.getSetting<int>(setting));
+
+    void sliderChanged(double value) {
+      itemsValue.value = value.toInt();
+    }
+
+    void sliderChangedEnd(double value) {
+      appSettingService.setSetting(setting, value.toInt());
+    }
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        ListTile(
+          title: Text(
+            translationKey,
+            style: const TextStyle(
+              fontSize: 12,
+              fontWeight: FontWeight.bold,
+            ),
+          ).tr(args: ["${itemsValue.value.toInt()}"]),
+        ),
+        Slider(
+          onChangeEnd: sliderChangedEnd,
+          onChanged: sliderChanged,
+          value: itemsValue.value.toDouble(),
+          min: min.toDouble(),
+          max: max.toDouble(),
+          divisions: divisions,
+          label: "${itemsValue.value.toInt()}",
+          activeColor: Theme.of(context).primaryColor,
+        ),
+      ],
+    );
+  }
+}

mobile/lib/modules/settings/ui/experimental_settings/experimental_settings.dart

@@ -0,0 +1,80 @@
+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({
+    Key? key,
+  }) : super(key: key);
+
+  @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(
+        'experimental_settings_title',
+        style: TextStyle(
+          fontWeight: FontWeight.bold,
+        ),
+      ).tr(),
+      subtitle: const Text(
+        'experimental_settings_subtitle',
+        style: TextStyle(
+          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,
+        ),
+      ],
+    );
+  }
+}

mobile/lib/modules/settings/ui/notification_setting/notification_setting.dart

@@ -15,12 +15,20 @@ class NotificationSetting extends HookConsumerWidget {
     final appSettingService = ref.watch(appSettingsServiceProvider);
 
     final sliderValue = useState(0.0);
+    final totalProgressValue =
+        useState(AppSettingsEnum.backgroundBackupTotalProgress.defaultValue);
+    final singleProgressValue =
+        useState(AppSettingsEnum.backgroundBackupSingleProgress.defaultValue);
 
     useEffect(
       () {
         sliderValue.value = appSettingService
             .getSetting<int>(AppSettingsEnum.uploadErrorNotificationGracePeriod)
             .toDouble();
+        totalProgressValue.value = appSettingService
+            .getSetting<bool>(AppSettingsEnum.backgroundBackupTotalProgress);
+        singleProgressValue.value = appSettingService
+            .getSetting<bool>(AppSettingsEnum.backgroundBackupSingleProgress);
         return null;
       },
       [],
@@ -42,6 +50,22 @@ class NotificationSetting extends HookConsumerWidget {
         ),
       ).tr(),
       children: [
+        _buildSwitchListTile(
+          context,
+          appSettingService,
+          totalProgressValue,
+          AppSettingsEnum.backgroundBackupTotalProgress,
+          title: 'setting_notifications_total_progress_title'.tr(),
+          subtitle: 'setting_notifications_total_progress_subtitle'.tr(),
+        ),
+        _buildSwitchListTile(
+          context,
+          appSettingService,
+          singleProgressValue,
+          AppSettingsEnum.backgroundBackupSingleProgress,
+          title: 'setting_notifications_single_progress_title'.tr(),
+          subtitle: 'setting_notifications_single_progress_subtitle'.tr(),
+        ),
         ListTile(
           isThreeLine: false,
           dense: true,
@@ -53,7 +77,9 @@ class NotificationSetting extends HookConsumerWidget {
             value: sliderValue.value,
             onChanged: (double v) => sliderValue.value = v,
             onChangeEnd: (double v) => appSettingService.setSetting(
-                AppSettingsEnum.uploadErrorNotificationGracePeriod, v.toInt()),
+              AppSettingsEnum.uploadErrorNotificationGracePeriod,
+              v.toInt(),
+            ),
             max: 5.0,
             divisions: 5,
             label: formattedValue,
@@ -65,6 +91,28 @@ class NotificationSetting extends HookConsumerWidget {
   }
 }
 
+SwitchListTile _buildSwitchListTile(
+  BuildContext context,
+  AppSettingsService appSettingService,
+  ValueNotifier<bool> valueNotifier,
+  AppSettingsEnum settingsEnum, {
+  required String title,
+  String? subtitle,
+}) {
+  return SwitchListTile(
+    key: Key(settingsEnum.name),
+    value: valueNotifier.value,
+    onChanged: (value) {
+      valueNotifier.value = value;
+      appSettingService.setSetting(settingsEnum, value);
+    },
+    activeColor: Theme.of(context).primaryColor,
+    dense: true,
+    title: Text(title, style: const TextStyle(fontWeight: FontWeight.bold)),
+    subtitle: subtitle != null ? Text(subtitle) : null,
+  );
+}
+
 String _formatSliderValue(double v) {
   if (v == 0.0) {
     return 'setting_notifications_notify_immediately'.tr();

mobile/lib/modules/settings/views/settings_page.dart

@@ -4,6 +4,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/modules/settings/ui/asset_list_settings/asset_list_settings.dart';
+import 'package:immich_mobile/modules/settings/ui/experimental_settings/experimental_settings.dart';
 import 'package:immich_mobile/modules/settings/ui/image_viewer_quality_setting/image_viewer_quality_setting.dart';
 import 'package:immich_mobile/modules/settings/ui/notification_setting/notification_setting.dart';
 import 'package:immich_mobile/modules/settings/ui/theme_setting/theme_setting.dart';
@@ -42,6 +43,7 @@ class SettingsPage extends HookConsumerWidget {
               const ThemeSetting(),
               const AssetListSettings(),
               if (Platform.isAndroid) const NotificationSetting(),
+              const ExperimentalSettings(),
             ],
           ).toList(),
         ],

mobile/lib/routing/router.gr.dart

@@ -59,8 +59,6 @@ class _$AppRouter extends RootStackRouter {
               authToken: args.authToken,
               isZoomedFunction: args.isZoomedFunction,
               isZoomedListener: args.isZoomedListener,
-              onLoadingCompleted: args.onLoadingCompleted,
-              onLoadingStart: args.onLoadingStart,
               threeStageLoading: args.threeStageLoading));
     },
     VideoViewerRoute.name: (routeData) {
@@ -297,8 +295,6 @@ class ImageViewerRoute extends PageRouteInfo<ImageViewerRouteArgs> {
       required String authToken,
       required void Function() isZoomedFunction,
       required ValueNotifier<bool> isZoomedListener,
-      required void Function() onLoadingCompleted,
-      required void Function() onLoadingStart,
       required bool threeStageLoading})
       : super(ImageViewerRoute.name,
             path: '/image-viewer-page',
@@ -309,8 +305,6 @@ class ImageViewerRoute extends PageRouteInfo<ImageViewerRouteArgs> {
                 authToken: authToken,
                 isZoomedFunction: isZoomedFunction,
                 isZoomedListener: isZoomedListener,
-                onLoadingCompleted: onLoadingCompleted,
-                onLoadingStart: onLoadingStart,
                 threeStageLoading: threeStageLoading));
 
   static const String name = 'ImageViewerRoute';
@@ -324,8 +318,6 @@ class ImageViewerRouteArgs {
       required this.authToken,
       required this.isZoomedFunction,
       required this.isZoomedListener,
-      required this.onLoadingCompleted,
-      required this.onLoadingStart,
       required this.threeStageLoading});
 
   final Key? key;
@@ -340,15 +332,11 @@ class ImageViewerRouteArgs {
 
   final ValueNotifier<bool> isZoomedListener;
 
-  final void Function() onLoadingCompleted;
-
-  final void Function() onLoadingStart;
-
   final bool threeStageLoading;
 
   @override
   String toString() {
-    return 'ImageViewerRouteArgs{key: $key, heroTag: $heroTag, asset: $asset, authToken: $authToken, isZoomedFunction: $isZoomedFunction, isZoomedListener: $isZoomedListener, onLoadingCompleted: $onLoadingCompleted, onLoadingStart: $onLoadingStart, threeStageLoading: $threeStageLoading}';
+    return 'ImageViewerRouteArgs{key: $key, heroTag: $heroTag, asset: $asset, authToken: $authToken, isZoomedFunction: $isZoomedFunction, isZoomedListener: $isZoomedListener, threeStageLoading: $threeStageLoading}';
   }
 }
 

mobile/lib/shared/providers/asset.provider.dart

@@ -81,8 +81,8 @@ final assetGroupByDateTimeProvider = StateProvider((ref) {
     (a, b) => b.compareTo(a),
   );
   return assets.groupListsBy(
-    (element) =>
-        DateFormat('y-MM-dd').format(DateTime.parse(element.createdAt)),
+    (element) => DateFormat('y-MM-dd')
+        .format(DateTime.parse(element.createdAt).toLocal()),
   );
 });
 
@@ -95,7 +95,7 @@ final assetGroupByMonthYearProvider = StateProvider((ref) {
   );
 
   return assets.groupListsBy(
-    (element) =>
-        DateFormat('MMMM, y').format(DateTime.parse(element.createdAt)),
+    (element) => DateFormat('MMMM, y')
+        .format(DateTime.parse(element.createdAt).toLocal()),
   );
 });