New Crowdin translations by GitHub Action

## Description

## Tests

.github/workflows/mobile-daily-internal.yml

@@ -8,7 +8,7 @@ on:
 
 env:
     FLUTTER_VERSION: "3.32.8"
-    RUST_VERSION: "1.85.1"
+    RUST_VERSION: "1.86.0"
 
 permissions:
     contents: read
@@ -27,6 +27,38 @@ jobs:
               with:
                   submodules: recursive
 
+            - name: Free up disk space
+              run: |
+                  echo "Initial disk usage:"
+                  df -h /
+                  # Get available space in KB
+                  INITIAL=$(df / | awk 'NR==2 {print $4}')
+                  
+                  echo -e "\n=== Removing .NET SDK (~20-25GB) ==="
+                  BEFORE=$(df / | awk 'NR==2 {print $4}')
+                  START=$(date +%s)
+                  sudo rm -rf /usr/share/dotnet
+                  END=$(date +%s)
+                  AFTER=$(df / | awk 'NR==2 {print $4}')
+                  FREED=$(( (AFTER - BEFORE) / 1048576 ))  # Convert KB to GB
+                  echo "Time: $((END-START))s | Freed: ${FREED}GB"
+                  
+                  echo -e "\n=== Removing cached tools (~5-10GB) ==="
+                  BEFORE=$(df / | awk 'NR==2 {print $4}')
+                  START=$(date +%s)
+                  sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+                  END=$(date +%s)
+                  AFTER=$(df / | awk 'NR==2 {print $4}')
+                  FREED=$(( (AFTER - BEFORE) / 1048576 ))
+                  echo "Time: $((END-START))s | Freed: ${FREED}GB"
+                  
+                  echo -e "\n=== Final Summary ==="
+                  FINAL=$(df / | awk 'NR==2 {print $4}')
+                  TOTAL_FREED=$(( (FINAL - INITIAL) / 1048576 ))
+                  echo "Total space freed: ${TOTAL_FREED}GB"
+                  echo "Final disk usage:"
+                  df -h /
+
             - name: Setup JDK 17
               uses: actions/setup-java@v1
               with:
@@ -39,14 +71,12 @@ jobs:
                   flutter-version: ${{ env.FLUTTER_VERSION }}
                   cache: true
 
-            - name: Install Rust ${{ env.RUST_VERSION }}
-              uses: dtolnay/rust-toolchain@master
-              with:
-                  toolchain: ${{ env.RUST_VERSION }}
-
             - name: Install Flutter Rust Bridge
               run: cargo install flutter_rust_bridge_codegen
 
+            - name: Generate Rust bindings
+              run: flutter_rust_bridge_codegen generate
+
             - name: Increment version code for build
               run: |
                   CURRENT_VERSION=$(grep '^version:' pubspec.yaml | sed 's/version: //')

.github/workflows/mobile-internal-release.yml

@@ -1,77 +0,0 @@
-name: "Old Internal release (photos)"
-
-on:
-    workflow_dispatch: # Allow manually running the action
-
-env:
-    FLUTTER_VERSION: "3.32.8"
-    RUST_VERSION: "1.85.1"
-
-permissions:
-    contents: write
-
-jobs:
-    build:
-        runs-on: ubuntu-latest
-
-        defaults:
-            run:
-                working-directory: mobile/apps/photos
-
-        steps:
-            - name: Checkout code and submodules
-              uses: actions/checkout@v4
-              with:
-                  submodules: recursive
-
-            - name: Setup JDK 17
-              uses: actions/setup-java@v1
-              with:
-                  java-version: 17
-
-            - name: Install Flutter ${{ env.FLUTTER_VERSION  }}
-              uses: subosito/flutter-action@v2
-              with:
-                  channel: "stable"
-                  flutter-version: ${{ env.FLUTTER_VERSION  }}
-                  cache: true
-
-            - name: Install Rust ${{ env.RUST_VERSION }}
-              uses: dtolnay/rust-toolchain@master
-              with:
-                  toolchain: ${{ env.RUST_VERSION }}
-
-            - name: Install Flutter Rust Bridge
-              run: cargo install flutter_rust_bridge_codegen
-
-            - name: Setup keys
-              uses: timheuer/base64-to-file@v1
-              with:
-                  fileName: "keystore/ente_photos_key.jks"
-                  encodedString: ${{ secrets.SIGNING_KEY_PHOTOS }}
-
-            - name: Build PlayStore AAB
-              run: |
-                  flutter build appbundle --dart-define=cronetHttpNoPlay=true --release --flavor playstore
-              env:
-                  SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_photos_key.jks"
-                  SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS_PHOTOS }}
-                  SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD_PHOTOS }}
-                  SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD_PHOTOS }}
-
-            - name: Upload AAB to PlayStore
-              uses: r0adkll/upload-google-play@v1
-              with:
-                  serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
-                  packageName: io.ente.photos
-                  releaseFiles: mobile/apps/photos/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
-                  track: internal
-
-            - name: Notify Discord
-              uses: sarisia/actions-status-discord@v1
-              with:
-                  webhook: ${{ secrets.DISCORD_INTERNAL_RELEASE_WEBHOOK }}
-                  nodetail: true
-                  title: "🏆 Internal release Photos (Branch: ${{ github.ref_name }})"
-                  description: "[Download](https://play.google.com/store/apps/details?id=io.ente.photos)"
-                  color: 0x00ff00

.github/workflows/mobile-lint.yml

@@ -9,6 +9,7 @@ on:
 
 env:
     FLUTTER_VERSION: "3.32.8"
+    RUST_VERSION: "1.86.0"
 
 permissions:
     contents: read
@@ -31,7 +32,18 @@ jobs:
                   channel: "stable"
                   flutter-version: ${{ env.FLUTTER_VERSION  }}
                   cache: true
-
+                  
             - run: flutter pub get
+                  
+            - name: Install Rust ${{ env.RUST_VERSION }}
+              uses: dtolnay/rust-toolchain@master
+              with:
+                  toolchain: ${{ env.RUST_VERSION }}
+                  
+            - name: Install Flutter Rust Bridge
+              run: cargo install flutter_rust_bridge_codegen
+              
+            - name: Generate Rust bindings
+              run: flutter_rust_bridge_codegen generate
 
             - run: flutter analyze --no-fatal-infos

.github/workflows/mobile-release.yml

@@ -28,6 +28,38 @@ jobs:
               with:
                   submodules: recursive
 
+            - name: Free up disk space
+              run: |
+                  echo "Initial disk usage:"
+                  df -h /
+                  # Get available space in KB
+                  INITIAL=$(df / | awk 'NR==2 {print $4}')
+                  
+                  echo -e "\n=== Removing .NET SDK (~20-25GB) ==="
+                  BEFORE=$(df / | awk 'NR==2 {print $4}')
+                  START=$(date +%s)
+                  sudo rm -rf /usr/share/dotnet
+                  END=$(date +%s)
+                  AFTER=$(df / | awk 'NR==2 {print $4}')
+                  FREED=$(( (AFTER - BEFORE) / 1048576 ))  # Convert KB to GB
+                  echo "Time: $((END-START))s | Freed: ${FREED}GB"
+                  
+                  echo -e "\n=== Removing cached tools (~5-10GB) ==="
+                  BEFORE=$(df / | awk 'NR==2 {print $4}')
+                  START=$(date +%s)
+                  sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+                  END=$(date +%s)
+                  AFTER=$(df / | awk 'NR==2 {print $4}')
+                  FREED=$(( (AFTER - BEFORE) / 1048576 ))
+                  echo "Time: $((END-START))s | Freed: ${FREED}GB"
+                  
+                  echo -e "\n=== Final Summary ==="
+                  FINAL=$(df / | awk 'NR==2 {print $4}')
+                  TOTAL_FREED=$(( (FINAL - INITIAL) / 1048576 ))
+                  echo "Total space freed: ${TOTAL_FREED}GB"
+                  echo "Final disk usage:"
+                  df -h /
+
             - name: Setup JDK 17
               uses: actions/setup-java@v1
               with:
@@ -40,6 +72,12 @@ jobs:
                   flutter-version: ${{ env.FLUTTER_VERSION  }}
                   cache: true
 
+            - name: Install Flutter Rust Bridge
+              run: cargo install flutter_rust_bridge_codegen
+
+            - name: Generate Rust bindings
+              run: flutter_rust_bridge_codegen generate
+
             - name: Setup keys
               uses: timheuer/base64-to-file@v1
               with:

CONTRIBUTING.md

@@ -48,7 +48,11 @@ See [docs/](docs/README.md) for how to edit these documents.
 
 ## Code contributions
 
-If you'd like to contribute code, it is best to start small. Consider some well-scoped changes, say like adding more [custom icons to auth](mobile/apps/auth/docs/adding-icons.md), or fixing a specific bug.
+If you'd like to contribute code, it is best to start small. Consider some well-scoped changes, say like adding more [custom icons to auth](mobile/apps/auth/docs/adding-icons.md), or fixing a specific bug. There is a (possibly outdated) list of tasks with the ["help wanted" or "good first issue"](<https://github.com/ente-io/ente/issues?q=state%3Aopen%20(label%3A%22good%20first%20issue%22%20OR%20label%3A%22help%20wanted%22%20)>) label too.
+
+If you use any form of AI assistance, please include a co-author attribution in the commit for transparency.
+
+In your PR, please include before / after screenshots, and clearly indicate the tests that you performed.
 
 Code that changes the behaviour of the product might not get merged, at least not initially. The PR can serve as a discussion bed, but you might find it easier to just start a discussion instead, or post your perspective in the (likely) existing thread about the behaviour change or new feature you wish for.
 

desktop/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## v1.7.15 (Unreleased)
 
+- Custom domains.
+- Support Czech translations.
 - .
 
 ## v1.7.14

docs/docs/photos/features/custom-domains/index.md

@@ -44,7 +44,7 @@ The first step is to let Ente know about the domain or subdomain you wish to use
 
 > [!WARNING]
 >
-> Currently (Aug 2025) the ability to link a custom domain is only present in Ente's web app, [web.ente.io](https://web.ente.io). It will come to Ente mobile and desktop when their next versions get released.
+> Currently (Sep 2025) the ability to link a custom domain is only present in Ente's web app, [web.ente.io](https://web.ente.io).
 
 Head over to Preferences > Custom domains, in the domain field enter "pics.example.org" (replace with your subdomain) and press "Save". That's it. The linking is done.
 
@@ -94,7 +94,7 @@ Using is trivial. When you go to an album's sharing options and copy the link to
 
 > [!WARNING]
 >
-> Currently (Aug 2025) the ability to automatically substitute your custom domain is only present in Ente's web app, [web.ente.io](https://web.ente.io). It will come to Ente mobile and desktop when their next versions get released.
+> Currently (Sep 2025) the ability to automatically substitute your custom domain is present in Ente's web and mobile apps, but not in the desktop app (The next desktop version to be released will have that ability too).
 
 ## Unsetting
 
@@ -103,3 +103,7 @@ To stop using your custom domain, we need to undo the two steps we did during se
 1. Unlink your domain in Ente. This can be done just by going to Preferences > Custom Domains, clearing the value in the "Domain" input and pressing "Update".
 
 2. Remove the CNAME record you added during setup in your DNS provider.
+
+## Implementation
+
+Our engineers also wrote [explainer](https://ente.io/blog/custom-domains/) of how this works behind the scenes.

docs/docs/photos/features/deduplicate.md

@@ -6,7 +6,7 @@ description: Removing duplicates photos using Ente Photos
 # Deduplicate
 
 Ente performs two different duplicate detections: one during uploads, and one
-that can be manually run afterwards to remove duplicates across albums.
+that can be manually run afterwards to remove duplicates and very similar files across albums.
 
 ## During uploads
 
@@ -16,7 +16,7 @@ When uploading, Ente will ignore exact duplicate files. This allows you to
 resume interrupted uploads, or drag and drop the same folder, or reinstall the
 app, and expect Ente to automatically skip duplicates and only add new files.
 
-The duplicate detection works slightly different on each platform, to cater to
+The duplicate detection works slightly differently on each platform, to cater to
 the platform's nuances.
 
 #### Mobile
@@ -48,7 +48,7 @@ to album", and the actual files are not re-uploaded.
 
 ## Manual deduplication
 
-Ente also provides a tool for manual de-duplication in _Settings → Backup →
+Ente provides a tool for manual de-duplication in _Settings → Backup → Free up space →
 Remove duplicates_. This is useful if you have an existing library with
 duplicates across different albums, but wish to keep only one copy.
 
@@ -57,6 +57,13 @@ single copy, and add symlinks to this copy within all existing albums. So your
 existing album structure remains unchanged, while the space consumed by the
 duplicate data is freed up.
 
+## Filtering similar images
+
+Ente also provides a tool for manual removal of images that are similar, but not the exact same, using our private ML. This feature can be found in _Settings → Backup → Free up space →
+Similar images_. This is useful if you've taken a lot of similar photos, potentiall even in different albums, and want to keep only the best ones.
+
+During this filtering process you can choose which photos to keep and which to delete for each set of similar images. Ente will then automatically add symlinks for the kept photos to any albums that only had the deleted images. This way you can easily prune similar images, without worrying about accidentally removing the best ones from a certain album.
+
 ## Adding to Ente album creates symlinks
 
 Note that once a file is in Ente, adding it to another Ente album will create a

docs/docs/self-hosting/administration/cli.md

@@ -8,6 +8,12 @@ description: Guide to configuring Ente CLI for Self Hosted Instance
 If you are self-hosting, you can configure Ente CLI to export data & perform
 basic administrative actions.
 
+::: tip Installing Ente CLI
+
+For instructions on installing the Ente CLI, see the [README available on Github](https://github.com/ente-io/ente/tree/main/cli/README.md).
+
+:::
+
 ## Step 1: Configure endpoint
 
 To do this, first configure the CLI to use your server's endpoint.

docs/docs/self-hosting/administration/users.md

@@ -22,8 +22,7 @@ can achieve this the following steps:
     # Change the DB name and DB user name if you use different
     # values.
     # If using Docker
-
-    docker exec -it <postgres-ente-container-name>
+    docker exec -it <postgres-ente-container-name> sh
     psql -U pguser -d ente_db
 
     # Or when using psql directly

docs/docs/self-hosting/installation/post-install/index.md

@@ -46,7 +46,7 @@ If running Museum without Docker, the code should be visible in the terminal
     # Change the DB name and DB user name if you use different
     # values.
 
-    # If using Docker docker exec -it <postgres-ente-container-name>
+    # If using Docker docker exec -it <postgres-ente-container-name> sh
     psql -U pguser -d ente_db
 
     # Or when using psql directly

mobile/.gitignore

@@ -0,0 +1,45 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+melos_*.iml
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+.pub-cache/
+.pub/
+/build/
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release

mobile/analysis_options.yaml

@@ -0,0 +1,72 @@
+# For more linters, we can check https://dart-lang.github.io/linter/lints/index.html
+# or https://pub.dev/packages/lint (Effective dart)
+# use "flutter analyze ." or "dart  analyze ." for running lint checks
+
+include: package:flutter_lints/flutter.yaml
+linter:
+  rules:
+    # Ref https://github.com/flutter/packages/blob/master/packages/flutter_lints/lib/flutter.yaml
+    # Ref https://dart-lang.github.io/linter/lints/
+    - avoid_print
+    - avoid_unnecessary_containers
+    - avoid_web_libraries_in_flutter
+    - no_logic_in_create_state
+    - prefer_const_constructors
+    - prefer_const_constructors_in_immutables
+    - prefer_const_declarations
+    - prefer_const_literals_to_create_immutables
+    - prefer_final_locals
+    - require_trailing_commas
+    - sized_box_for_whitespace
+    - use_full_hex_values_for_flutter_colors
+    - use_key_in_widget_constructors
+    - cancel_subscriptions
+
+
+    - avoid_empty_else
+    - exhaustive_cases
+
+    # just style suggestions
+    - sort_pub_dependencies
+    - use_rethrow_when_possible
+    - prefer_double_quotes
+    - directives_ordering
+    - always_use_package_imports
+    - sort_child_properties_last
+    - unawaited_futures
+
+analyzer:
+  errors:
+    avoid_empty_else: error
+    exhaustive_cases: error
+    curly_braces_in_flow_control_structures: error
+    directives_ordering: error
+    require_trailing_commas: error
+    always_use_package_imports: warning
+    prefer_final_fields: error
+    unused_import: error
+    camel_case_types: error
+    prefer_is_empty: warning
+    use_rethrow_when_possible: info
+    unused_field: warning
+    use_key_in_widget_constructors: warning
+    sort_child_properties_last: warning
+    sort_pub_dependencies: warning
+    library_private_types_in_public_api: warning
+    constant_identifier_names: ignore
+    prefer_const_constructors: warning
+    prefer_const_declarations: warning
+    prefer_const_constructors_in_immutables: warning
+    prefer_final_locals: warning
+    unnecessary_const: error
+    cancel_subscriptions: error
+    unrelated_type_equality_checks: error
+    unnecessary_cast: info
+
+
+    unawaited_futures: warning # convert to warning after fixing existing issues
+    invalid_dependency: info
+    use_build_context_synchronously: ignore # experimental lint, requires many changes
+    prefer_interpolation_to_compose_strings: ignore # later too many warnings
+    prefer_double_quotes: ignore # too many warnings
+    avoid_renaming_method_parameters: ignore # incorrect warnings for `equals` overrides

mobile/apps/auth/assets/custom-icons/_data/custom-icons.json

@@ -382,6 +382,11 @@
     {
       "title": "CoinDCX"
     },
+    {
+  "title": "CoinTracking",
+  "slug": "cointracking", 
+  "altNames": ["cointracking.info", "Coin Tracking"]
+    },
     {
       "title": "colorado",
       "altNames": [
@@ -735,6 +740,11 @@
     {
       "title": "Hivelocity"
     },
+    {
+  "title": "HRDocumentBox",
+  "slug": "hrdocumentbox", 
+  "altNames": ["HRDocumentBox", "HR Document Box"]
+    },
     {
       "title": "HSA Bank",
       "slug": "hsa_bank",
@@ -1040,6 +1050,13 @@
         "MistralAI"
       ]
     },
+    {
+      "title": "Mobile01",
+      "slug": "mobile01",
+      "altNames": [
+        "M01"
+      ]
+    },
     {
       "title": "Mozilla"
     },
@@ -1219,6 +1236,12 @@
       "title": "Parqet",
       "slug": "parqet"
     },
+    {
+      "title": "Parallels",
+      "slug": "parallels",
+      "hex": "#E61E25",
+      "altNames": ["Parallels Desktop", "Parallels VM"]
+    },
     {
       "title": "Parsec"
     },
@@ -1773,6 +1796,11 @@
         "uollet.com.br"
       ]
     },
+    {
+  "title": "VHV",
+  "slug": "vhv", 
+  "altNames": ["VHV", "VHV Versicherung"]
+    },
     {
       "title": "Vikunja"
     },

mobile/apps/auth/assets/custom-icons/icons/cointracking.svg

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1220.8 227.9" style="enable-background:new 0 0 1220.8 227.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#0D253E;}
+	.st1{fill:#008AFB;}
+</style>
+<title>CoinTracking light</title>
+<g id="Layer_2_1_">
+	<g id="Layer_1-2">
+		<path class="st0" d="M198.1,167c-30.2,0-54.7-24.5-54.7-54.7s24.5-54.7,54.7-54.7s54.7,24.5,54.7,54.7l0,0    C252.8,142.5,228.3,167,198.1,167z M198.1,81.6c-17,0-30.7,13.7-30.7,30.7s13.7,30.7,30.7,30.7s30.7-13.7,30.7-30.7l0,0    C228.8,95.4,215,81.6,198.1,81.6z"/>
+		<path class="st0" d="M292.2,59.5h-23.6v107.9h23.6V59.5z"/>
+		<path class="st0" d="M339.5,167.4h-23.8V59.5h23.8v16.2c6.2-12.5,21-18.5,33-18.5c26.1,0,41.1,16.9,41.1,47.3v62.8h-23.8v-60.1    c0-17.1-8.8-26.8-22.6-26.8c-14.1,0-27.7,7.6-27.7,28.9V167.4z"/>
+		<path class="st1" d="M390.6,8.2h151.7v22.9h-65.9v136.3h-25V31.1h-60.9V8.2H390.6z"/>
+		<path class="st1" d="M540.3,167.4h-23.8V59.5h23.8V79c7.4-13.5,15.4-19.5,29.6-21.8c7.5-1.2,15.7,1.8,19.2,4.2l-3.9,22    c-4.9-2.5-10.4-3.8-15.9-3.7c-20.3,0-28.9,20.3-28.9,49L540.3,167.4L540.3,167.4z"/>
+		<path class="st1" d="M680.7,151.9c-7.2,11.8-22.9,17.8-36.3,17.8c-29.1,0-54.8-21.9-54.8-56.4s25.6-56.1,54.8-56.1    c12.9,0,28.9,5.3,36.3,17.5V59.5h23.6v107.9h-23.6V151.9z M647.2,146.6c17.6,0,33.3-12.2,33.3-33.5s-17.1-32.8-33.3-32.8    c-18,0-33,12.9-33,32.8S629.2,146.6,647.2,146.6L647.2,146.6z"/>
+		<path class="st1" d="M778.4,57.2c17.1,0,32.6,6.7,42.7,18.7l-18.5,14.8c-5.8-6.7-14.8-10.4-24.3-10.4c-18,0-34,12.7-34,32.8    s15.9,33.7,34,33.7c9.5,0,18.5-3.9,24.3-10.6l18.7,14.6c-10.2,12-25.6,18.9-43,18.9c-31,0-57.5-22.4-57.5-56.6    S747.4,57.2,778.4,57.2z"/>
+		<path class="st1" d="M860.3,117.2v50.1h-23.6V0.8h23.6V95l34.2-35.6h31.9l-46,46.9l56.4,61h-30.5L860.3,117.2z"/>
+		<path class="st1" d="M967.4,59.5h-23.6v107.9h23.6V59.5z"/>
+		<path class="st1" d="M1014.7,167.4h-23.8V59.5h23.8v16.2c6.2-12.5,21-18.5,33-18.5c26.1,0,41.1,16.9,41.1,47.3v62.8H1065v-60.1    c0-17.1-8.8-26.8-22.6-26.8c-14.1,0-27.7,7.6-27.7,28.9V167.4z"/>
+		<path class="st1" d="M1220.2,111.5c0-12.3-4.5-24.2-12.5-33.6l13-17.1l-19.6-13l-11.9,15.7c-8.3-4.1-17.5-6.2-26.8-6.2    c-31.9,0-57.8,24.4-57.8,54.3s25.9,54.3,57.8,54.3c20.2,0,34.2,10.2,34.2,19.3s-14.1,19.3-34.2,19.3s-34.2-10.2-34.2-19.3h-23.6    c0,24,25.4,42.9,57.8,42.9s57.8-18.8,57.8-42.9c0-13.2-7.7-24.8-19.9-32.6C1212.5,142.5,1220.2,127.8,1220.2,111.5z M1128.2,111.5    c0-16.9,15.4-30.7,34.2-30.7s34.2,13.8,34.2,30.7s-15.4,30.7-34.2,30.7S1128.2,128.4,1128.2,111.5L1128.2,111.5z"/>
+		<path class="st0" d="M81.4,170.5C36.4,170.5,0,134,0,89c0-21.6,8.6-42.3,23.9-57.6c31.8-31.8,83.4-31.8,115.2,0l0,0l-17.7,17.7    C99.3,27,63.6,27,41.5,49.1s-22.1,57.8,0,79.9s57.8,22.1,79.9,0l17.7,17.7C123.8,162,103.1,170.6,81.4,170.5z"/>
+		<circle class="st0" cx="280.7" cy="15.5" r="15.5"/>
+		<circle class="st1" cx="954.7" cy="15.5" r="15.5"/>
+	</g>
+</g>
+</svg>

mobile/apps/auth/assets/custom-icons/icons/mobile01.svg

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<svg width="320" height="280" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" version="1.1">
+
+ <g class="layer">
+  <title>Layer 1</title>
+  <g id="Layer1000">
+   <g id="Layer1002">
+    <g id="Layer1003">
+     <path d="m123.08,34.29c-66.43,0 -120.27,53.85 -120.27,120.27c0,66.43 53.85,120.27 120.27,120.27c66.47,0 120.32,-53.85 120.32,-120.27c0,-66.43 -53.85,-120.27 -120.32,-120.27zm0,215.67c-52.67,0 -95.36,-42.73 -95.36,-95.4c0,-52.67 42.68,-95.4 95.36,-95.4c52.72,0 95.4,42.73 95.4,95.4c0,52.67 -42.68,95.4 -95.4,95.4z" fill="#2a5e00" fill-rule="evenodd" id="path7"/>
+     <g id="Layer1004">
+      <g id="Layer1005">
+       <path d="m138.72,146.29l59.61,-41.47l7.78,33.7l-67.39,7.78z" fill="#2a5e00" fill-rule="evenodd" id="path8"/>
+       <path d="m110.88,146.29l-59.61,-41.47l-7.78,33.7l67.39,7.78z" fill="#2a5e00" fill-rule="evenodd" id="path9"/>
+      </g>
+      <path d="m43.95,192.02l74.62,49.75l87.12,-78.8l-161.75,29.05z" fill="#2a5e00" fill-rule="evenodd" id="path10"/>
+     </g>
+     <path d="m94.24,59.29l-30.48,-55.1l54.26,33.24l-23.79,21.86z" fill="#2a5e00" fill-rule="evenodd" id="path11"/>
+     <path d="m202.64,78.1l30.43,-55.1l-54.22,33.24l23.79,21.86z" fill="#2a5e00" fill-rule="evenodd" id="path12"/>
+    </g>
+    <path d="m275.63,274.67l29.35,0l0,-240.76l-29.35,0l0,240.76z" fill="#2a5e00" fill-rule="evenodd" id="path13"/>
+    <path d="m317.94,125.93c0,15.3 -12.33,27.63 -27.63,27.63c-15.26,0 -27.63,-12.33 -27.63,-27.63c0,-15.26 12.37,-27.63 27.63,-27.63c15.3,0 27.63,12.37 27.63,27.63z" fill="#2a5e00" fill-rule="evenodd" id="path14"/>
+    <path d="m288.84,33.91l-41.76,0l16.76,45.99l23.58,0l1.42,-45.99z" fill="#2a5e00" fill-rule="evenodd" id="path15"/>
+   </g>
+  </g>
+ </g>
+</svg>

mobile/apps/auth/assets/custom-icons/icons/parallels.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
+  <rect x="20" y="10" width="10" height="80" rx="5" fill="#E61E25"/>
+  <rect x="50" y="10" width="10" height="80" rx="5" fill="#E61E25"/>
+</svg>

mobile/apps/auth/assets/custom-icons/icons/vhv.svg

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Created with Inkscape (http://www.inkscape.org/) by Marsupilami -->
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="1024" height="357" viewBox="-1.98252 -1.98252 201.02104 70.04904" id="svg3349">
+  <defs id="defs3351"/>
+  <path d="m 0,0 11.76,0 4.455,31.962 0.12,0 L 20.789,0 32.55,0 23.402,42.417 9.147,42.417 0,0" id="path3131" style="fill:#1e1e1e;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+  <path d="m 34.039,0 11.05,0 0,15.567 6.771,0 0,-15.567 11.05,0 0,42.417 -11.05,0 0,-17.465 -6.771,0 0,17.465 -11.05,0 0,-42.417" id="path3133" style="fill:#1e1e1e;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+  <path d="m 64.395,0 11.757,0 4.457,31.962 0.121,0 L 85.185,0 96.944,0 87.797,42.417 73.54,42.417 64.395,0" id="path3135" style="fill:#1e1e1e;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+  <path d="m 97.576,42.414 8.907,0 9.222,-42.41 -8.912,0 -9.217,42.41" id="path3137" style="fill:#f0ab00;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+  <path d="m 111.026,42.424 8.908,-0.01 9.218,-42.41 -8.913,0 -9.213,42.42" id="path3139" style="fill:#f0ab00;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+  <path d="m 124.564,42.414 8.906,0 9.217,-42.41 -8.906,0 -9.217,42.41" id="path3141" style="fill:#f0ab00;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+  <path d="m 4.169,46.784 5.251,0 1.985,14.261 0.05,0 1.99,-14.261 5.247,0 -4.082,18.928 -6.363,0 -4.082,-18.928" id="path3143" style="fill:#1e1e1e;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+  <path d="m 19.356,46.784 11.216,0 0,4.031 -6.282,0 0,3.234 5.882,0 0,3.87 -5.882,0 0,3.763 6.517,0 0,4.03 -11.451,0 0,-18.928" id="path3145" style="fill:#1e1e1e;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+  <path d="m 54.93,52.247 0,-0.45 c 0,-1.117 -0.449,-2.043 -1.405,-2.043 -1.06,0 -1.538,0.823 -1.538,1.67 0,3.739 8.059,1.91 8.059,8.828 0,4.027 -2.357,5.832 -6.705,5.832 -4.082,0 -6.362,-1.404 -6.362,-5.331 l 0,-0.663 4.772,0 0,0.453 c 0,1.615 0.663,2.202 1.614,2.202 1.007,0 1.594,-0.798 1.594,-1.831 0,-3.739 -7.743,-1.88 -7.743,-8.586 0,-3.819 2.043,-5.913 6.205,-5.913 4.294,0 6.12,1.775 6.12,5.832 l -4.611,0" id="path3147" style="fill:#1e1e1e;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+  <path d="m 61.476,65.712 4.932,0 0,-18.928 -4.932,0 0,18.928 z" id="path3149" style="fill:#1e1e1e;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+  <path d="m 32.477,46.784 7.714,0 c 3.766,0 5.195,2.124 5.195,5.039 0,2.516 -0.979,4.16 -3.232,4.506 2.385,0.265 3.103,1.776 3.103,4.294 l 0,1.616 c 0,0.981 0,2.251 0.237,2.626 0.132,0.209 0.237,0.422 0.558,0.582 l 0,0.265 -5.25,0 C 40.325,64.705 40.325,62.9 40.325,62.109 l 0,-1.275 c 0,-2.147 -0.423,-2.704 -1.619,-2.704 l -1.296,0 0,7.582 -4.933,0 0,-18.928 z m 4.933,8.008 0.98,0 c 1.405,0 2.066,-0.9 2.066,-2.252 0,-1.541 -0.609,-2.202 -2.094,-2.202 l -0.952,0 0,4.454" id="path3151" style="fill:#1e1e1e;fill-opacity:1;fill-rule:evenodd;stroke:none"/>
+  <path d="m 75.975,52.54 c 0,-2.147 -0.396,-2.786 -1.35,-2.786 -1.513,0 -1.67,1.381 -1.67,6.494 0,5.117 0.157,6.497 1.67,6.497 1.22,0 1.485,-1.063 1.485,-4.64 l 4.771,0 0,1.405 c 0,5.3 -3.101,6.574 -6.256,6.574 -5.54,0 -6.76,-2.784 -6.76,-9.836 0,-7.236 1.642,-9.833 6.76,-9.833 4.451,0 6.12,2.334 6.12,5.992 l 0,1.19 -4.77,0 0,-1.057" id="path3153" style="fill:#1e1e1e;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+  <path d="m 82.524,46.784 4.928,0 0,6.948 3.02,0 0,-6.948 4.932,0 0,18.928 -4.932,0 0,-7.793 -3.02,0 0,7.793 -4.928,0 0,-18.928" id="path3155" style="fill:#1e1e1e;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+  <path d="m 97.606,46.784 11.21,0 0,4.031 -6.282,0 0,3.234 5.886,0 0,3.87 -5.886,0 0,3.763 6.522,0 0,4.03 -11.45,0 0,-18.928" id="path3157" style="fill:#1e1e1e;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+  <path d="m 130.526,46.784 0,13.655 c 0,1.824 0.559,2.306 1.485,2.306 0.928,0 1.485,-0.482 1.485,-2.306 l 0,-13.655 4.929,0 0,12.408 c 0,5.298 -2.28,6.892 -6.414,6.892 -4.135,0 -6.412,-1.594 -6.412,-6.892 l 0,-12.408 4.927,0" id="path3159" style="fill:#1e1e1e;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+  <path d="m 140.415,46.784 5.51,0 3.185,11.665 0.05,0 0,-11.665 4.614,0 0,18.928 -5.407,0 -3.288,-11.689 -0.05,0 0,11.689 -4.613,0 0,-18.928" id="path3161" style="fill:#1e1e1e;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+  <path d="m 110.726,46.784 7.716,0 c 3.76,0 5.192,2.124 5.192,5.039 0,2.516 -0.979,4.16 -3.234,4.506 2.383,0.265 3.101,1.776 3.101,4.294 l 0,1.616 c 0,0.981 0,2.251 0.238,2.626 0.131,0.209 0.24,0.422 0.558,0.582 l 0,0.265 -5.251,0 c -0.477,-1.007 -0.477,-2.812 -0.477,-3.603 l 0,-1.275 c 0,-2.147 -0.422,-2.704 -1.612,-2.704 l -1.301,0 0,7.582 -4.93,0 0,-18.928 z m 4.93,8.008 0.979,0 c 1.404,0 2.07,-0.9 2.07,-2.252 0,-1.541 -0.61,-2.202 -2.095,-2.202 l -0.954,0 0,4.454" id="path3163" style="fill:#1e1e1e;fill-opacity:1;fill-rule:evenodd;stroke:none"/>
+  <path d="m 162.334,55.428 6.361,0 0,10.284 -3.34,0 -0.113,-1.669 -0.05,0 c -0.662,1.617 -2.412,2.041 -4.082,2.041 -5.01,0 -5.459,-3.58 -5.459,-9.836 0,-6.336 1.22,-9.833 7.047,-9.833 3.502,0 5.993,1.775 5.993,6.36 l -4.771,0 c 0,-0.952 -0.07,-1.695 -0.266,-2.198 -0.185,-0.53 -0.554,-0.823 -1.139,-0.823 -1.612,0 -1.774,1.381 -1.774,6.494 0,5.117 0.161,6.497 1.67,6.497 1.034,0 1.639,-0.666 1.669,-3.978 l -1.75,0 0,-3.339" id="path3165" style="fill:#1e1e1e;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+  <path d="m 170.577,46.784 11.213,0 0,4.031 -6.28,0 0,3.234 5.885,0 0,3.87 -5.885,0 0,3.763 6.519,0 0,4.03 -11.452,0 0,-18.928" id="path3167" style="fill:#1e1e1e;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+  <path d="m 183.697,46.784 5.514,0 3.18,11.665 0.05,0 0,-11.665 4.615,0 0,18.928 -5.408,0 -3.284,-11.689 -0.05,0 0,11.689 -4.614,0 0,-18.928" id="path3169" style="fill:#1e1e1e;fill-opacity:1;fill-rule:nonzero;stroke:none"/>
+</svg>
+<!-- version: 20110311, original size: 197.056 66.084, border: 3% -->

mobile/apps/auth/ios/Podfile.lock

@@ -39,6 +39,8 @@ PODS:
   - DKPhotoGallery/Resource (0.0.19):
     - SDWebImage
     - SwiftyGif
+  - ente_qr (0.0.1):
+    - Flutter
   - file_picker (0.0.1):
     - DKImagePickerController/PhotoGallery
     - Flutter
@@ -126,6 +128,8 @@ PODS:
     - sqlite3/perf-threadsafe
     - sqlite3/rtree
   - SwiftyGif (5.4.5)
+  - ua_client_hints (1.4.1):
+    - Flutter
   - url_launcher_ios (0.0.1):
     - Flutter
 
@@ -134,6 +138,7 @@ DEPENDENCIES:
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - cupertino_http (from `.symlinks/plugins/cupertino_http/darwin`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
+  - ente_qr (from `.symlinks/plugins/ente_qr/ios`)
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
   - file_saver (from `.symlinks/plugins/file_saver/ios`)
   - fk_user_agent (from `.symlinks/plugins/fk_user_agent/ios`)
@@ -158,6 +163,7 @@ DEPENDENCIES:
   - sodium_libs (from `.symlinks/plugins/sodium_libs/ios`)
   - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
   - sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/darwin`)
+  - ua_client_hints (from `.symlinks/plugins/ua_client_hints/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
 
 SPEC REPOS:
@@ -180,6 +186,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/cupertino_http/darwin"
   device_info_plus:
     :path: ".symlinks/plugins/device_info_plus/ios"
+  ente_qr:
+    :path: ".symlinks/plugins/ente_qr/ios"
   file_picker:
     :path: ".symlinks/plugins/file_picker/ios"
   file_saver:
@@ -228,6 +236,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/sqflite_darwin/darwin"
   sqlite3_flutter_libs:
     :path: ".symlinks/plugins/sqlite3_flutter_libs/darwin"
+  ua_client_hints:
+    :path: ".symlinks/plugins/ua_client_hints/ios"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
@@ -238,6 +248,7 @@ SPEC CHECKSUMS:
   device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
   DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
   DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
+  ente_qr: f39434aa69ea0e71047b49316365b2737f8a20aa
   file_picker: b159e0c068aef54932bb15dc9fd1571818edaf49
   file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808
   fk_user_agent: 1f47ec39291e8372b1d692b50084b0d54103c545
@@ -268,6 +279,7 @@ SPEC CHECKSUMS:
   sqlite3: 3e82a2daae39ba3b41ae6ee84a130494585460fc
   sqlite3_flutter_libs: 2c48c4ee7217fd653251975e43412250d5bcbbe2
   SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
+  ua_client_hints: aeabd123262c087f0ce151ef96fa3ab77bfc8b38
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
 
 PODFILE CHECKSUM: 78f002751f1a8f65042b8da97902ba4124271c5a

mobile/apps/auth/lib/l10n/arb/app_ar.arb

@@ -111,6 +111,7 @@
   "importAegisGuide": "استخدم خيار \"Export the vault\" في إعدادات Aegis.\n\nإذا كان المخزن الخاص بك مشفرًا، فستحتاج إلى إدخال كلمة مرور المخزن لفك تشفير المخزن.",
   "import2FasGuide": "استخدم خيار \"الإعدادات -> النسخ الاحتياطي - التصدير\" في 2FAS.\n\nإذا تم تشفير النسخة الاحتياطية، سوف تحتاج إلى إدخال كلمة المرور لفك تشفير النسخة الاحتياطية",
   "importLastpassGuide": "استخدم خيار \"حسابات النقل\" ضمن إعدادات مصادقة Lastpass، واضغط على \"تصدير الحسابات إلى الملف\". استيراد JSON الذي تم تنزيله.",
+  "importProtonAuthGuide": "‎استخدم اختيار “التصدير” في إعدادات الموثق بروتون لتصدير رموزك.",
   "exportCodes": "تصدير الرموز",
   "importLabel": "استيراد",
   "importInstruction": "الرجاء تحديد ملف يحتوي على قائمة بالرموز الخاصة بك بالشكل التالي",
@@ -519,5 +520,12 @@
   "algorithm": "الخوارزمية",
   "type": "النوع",
   "period": "المدّة",
-  "digits": "الأرقام"
+  "digits": "الأرقام",
+  "importFromGallery": "‎استيراد من معر الصور ‎",
+  "errorCouldNotReadImage": "تعذر قراءة ‎الصورة المحدد.",
+  "errorInvalidQRCode": "رمز QR غير صالح",
+  "errorInvalidQRCodeBody": "رمز QR الممسوح ليس حساب 2FA صحيح.",
+  "errorNoQRCode": "لم يتم العثور على رمز QR",
+  "errorGenericTitle": "حدث خطأ",
+  "errorGenericBody": "‎حدث خطأ غير متوقع خلال الاستيراد."
 }

mobile/apps/auth/lib/l10n/arb/app_cs.arb

@@ -111,6 +111,7 @@
   "importAegisGuide": "Použijte možnost \"Export the vault\" v nastavení aplikace Aegis.",
   "import2FasGuide": "Použijte možnost \"Settings->Backup -Export\" v 2FA.\n\nPokud je Vaše záloha šifrovaná, budete muset zadat heslo pro její odemčení",
   "importLastpassGuide": "V nastavení aplikace Lastpass Authenticator vyberte možnost \"Transfer accounts\" a poté \"Export accounts to file\". Vygenerovaný soubor JSON následně nahrajte sem.",
+  "importProtonAuthGuide": "K exportu kódů použijte možnost „Exportovat“ v nastavení aplikace Proton Authenticator.",
   "exportCodes": "Exportovat kódy",
   "importLabel": "Importovat",
   "importInstruction": "Vyberte, prosím, soubor obsahující seznam Vašich kódů v následujícím formátu",
@@ -124,6 +125,7 @@
   "authToChangeYourEmail": "Pro změnu svého e-mailu se, prosím, ověřte",
   "authToChangeYourPassword": "Pro změnu svého hesla se, prosím, ověřte",
   "authToViewSecrets": "Pro zobrazení svých tajných údajů se musíte ověřit",
+  "authToInitiateSignIn": "Proveďte ověření a přihlaste se k zálohování.",
   "ok": "Ok",
   "cancel": "Zrušit",
   "yes": "Ano",
@@ -155,6 +157,7 @@
   "enterCodeHint": "Zadejte 6místný kód ze své autentizační aplikace",
   "lostDeviceTitle": "Ztratili jste zařízení?",
   "twoFactorAuthTitle": "Dvoufaktorové ověření",
+  "passkeyAuthTitle": "Ověření pomocí přístupového klíče",
   "verifyPasskey": "Ověřit přístupový klíč",
   "loginWithTOTP": "Přihlášení s TOTP",
   "recoverAccount": "Obnovit účet",
@@ -171,6 +174,7 @@
   "invalidQRCode": "Neplatný QR kód",
   "noRecoveryKeyTitle": "Nemáte obnovovací klíč?",
   "enterEmailHint": "Zadejte svou e-mailovou adresu",
+  "enterNewEmailHint": "Zadejte novou e-mailovou adresu",
   "invalidEmailTitle": "Neplatná e-mailová adresa",
   "invalidEmailMessage": "Prosím, zadejte platnou e-mailovou adresu.",
   "deleteAccount": "Odstranit účet",
@@ -509,6 +513,19 @@
   "supportEnte": "Podpořte <bold-green>ente</bold-green>",
   "giveUsAStarOnGithub": "Dejte nám hvězdu na Githubu",
   "free5GB": "5GB zdarma na <bold-green>ente</bold-green> Fotky",
+  "loginWithAuthAccount": "Přihlásit se pomocí účtu Auth",
   "freeStorageOffer": "10% sleva na <bold-green>ente</bold-green> fotky",
-  "freeStorageOfferDescription": "Použijte kód \"AUTH\" pro získání 10% slevy na první rok"
+  "freeStorageOfferDescription": "Použijte kód \"AUTH\" pro získání 10% slevy na první rok",
+  "advanced": "Pokročilé",
+  "algorithm": "Algoritmus",
+  "type": "Typ",
+  "period": "Období",
+  "digits": "Digitální",
+  "importFromGallery": "Importovat z galerie",
+  "errorCouldNotReadImage": "Nelze přečíst vybraný obrazový soubor.",
+  "errorInvalidQRCode": "Neplatný QR kód",
+  "errorInvalidQRCodeBody": "Naskenovaný QR kód není platným účtem 2FA.",
+  "errorNoQRCode": "Nenalezen žádný QR kód",
+  "errorGenericTitle": "Došlo k chybě",
+  "errorGenericBody": "Při importu došlo k neočekávané chybě."
 }

mobile/apps/auth/lib/l10n/arb/app_de.arb

@@ -111,6 +111,7 @@
   "importAegisGuide": "Verwenden Sie die Option \"Tresor exportieren\" in den Einstellungen von Aegis.\n\nFalls Ihr Tresor verschlüsselt ist, müssen Sie das Passwort für den Tresor eingeben, um ihn zu entschlüsseln.",
   "import2FasGuide": "Verwenden Sie unter \"Einstellungen → Backup\" die Option \"Exportieren\" in 2FAS.\n\nFalls Ihr Backup verschlüsselt ist, müssen Sie das Passwort eingeben, um das Backup zu entschlüsseln.",
   "importLastpassGuide": "Verwenden Sie die Option \"Konten übertragen → Konten in Datei exportieren\" in den Lastpass Authenticator Einstellungen. \nImportieren Sie anschließend die heruntergeladene JSON-Datei.",
+  "importProtonAuthGuide": "Verwenden Sie die Option \"Exportieren\" in den Proton Authenticator Settings um Ihre Codes zu exportieren.",
   "exportCodes": "Codes exportieren",
   "importLabel": "Importieren",
   "importInstruction": "Bitte wählen Sie eine Datei die Codes in folgendem Format beinhaltet",
@@ -519,5 +520,12 @@
   "algorithm": "Algorithmus",
   "type": "Typ",
   "period": "Periode",
-  "digits": "Ziffern"
+  "digits": "Ziffern",
+  "importFromGallery": "Aus Galerie importieren",
+  "errorCouldNotReadImage": "Die ausgewählte Bild-Datei konnte nicht verarbeitet werden.",
+  "errorInvalidQRCode": "Ungültiger QR-Code",
+  "errorInvalidQRCodeBody": "Der gescannte QR-Code ist kein gültiges 2FA-Konto.",
+  "errorNoQRCode": "Kein QR-Code gefunden",
+  "errorGenericTitle": "Ein Fehler ist aufgetreten",
+  "errorGenericBody": "Beim Importieren ist ein unerwarteter Fehler aufgetreten."
 }

mobile/apps/auth/lib/l10n/arb/app_en.arb

@@ -111,6 +111,7 @@
   "importAegisGuide": "Use the \"Export the vault\" option in Aegis's Settings.\n\nIf your vault is encrypted, you will need to enter vault password to decrypt the vault.",
   "import2FasGuide": "Use the \"Settings->Backup -Export\" option in 2FAS.\n\nIf your backup is encrypted, you will need to enter the password to decrypt the backup",
   "importLastpassGuide": "Use the \"Transfer accounts\" option within Lastpass Authenticator Settings and press \"Export accounts to file\". Import the JSON downloaded.",
+  "importProtonAuthGuide": "Use the \"Export\" option in Proton Authenticator Settings to export your codes.",
   "exportCodes": "Export codes",
   "importLabel": "Import",
   "importInstruction": "Please select a file that contains a list of your codes in the following format",
@@ -519,5 +520,12 @@
   "algorithm": "Algorithm",
   "type": "Type",
   "period": "Period",
-  "digits": "Digits"
+  "digits": "Digits",
+  "importFromGallery": "Import from gallery",
+  "errorCouldNotReadImage": "Could not read the selected image file.",
+  "errorInvalidQRCode": "Invalid QR Code",
+  "errorInvalidQRCodeBody": "The scanned QR code is not a valid 2FA account.",
+  "errorNoQRCode": "No QR code found",
+  "errorGenericTitle": "An Error Occurred",
+  "errorGenericBody": "An unexpected error occurred while importing."
 }

mobile/apps/auth/lib/l10n/arb/app_et.arb

@@ -89,7 +89,7 @@
   "changePassword": "Muuda salasõna",
   "data": "Andmed",
   "importCodes": "Impordi koode",
-  "importTypePlainText": "Votmindamata tekstina",
+  "importTypePlainText": "Vormindamata tekstina",
   "importTypeEnteEncrypted": "Ente krüptitud ekspordina",
   "passwordForDecryptingExport": "Salasõna eksporditud andmete dekrüptimiseks",
   "passwordEmptyError": "Salasõna väli ei saa olla tühi",
@@ -214,7 +214,40 @@
   "@iUnderStand": {
     "description": "Text for the button to confirm the user understands the warning"
   },
+  "authToExportCodes": "Oma koodide eksportimiseks palun tuvasta end",
+  "importSuccessDesc": "Sa oled importinud {count} koodi!",
+  "@importSuccessDesc": {
+    "placeholders": {
+      "count": {
+        "description": "The number of codes imported",
+        "type": "int",
+        "example": "1"
+      }
+    }
+  },
+  "pendingSyncsWarningBody": "Mõned sinu koodid on varundamata.\n\nEnne väljalogimist palun kontrolli, et sa oleksid nad varundanud.",
+  "tapToEnterCode": "Koodi sisestamiseks klõpsa",
+  "terminateSession": "Kas lõpetad sessiooni?",
+  "terminate": "Lõpeta",
+  "thisDevice": "See seade",
+  "toResetVerifyEmail": "Salasõna lähtestamiseks palun esmalt kinnita oma e-posti aadress.",
+  "thisEmailIsAlreadyInUse": "See e-posti aadress on juba kasutuses",
+  "verificationFailedPleaseTryAgain": "Kinnitamine ei õnnestunud, palun proovi uuesti",
+  "yourVerificationCodeHasExpired": "Sinu verifitseerimiskood on aegunud",
+  "incorrectCode": "Vigane kood",
+  "sorryTheCodeYouveEnteredIsIncorrect": "Vabandust, sinu sisestatud kood on vigane",
+  "emailChangedTo": "E-posti aadress on nüüd muudetud, uus aadress on {newEmail}",
+  "authenticationFailedPleaseTryAgain": "Autentimine ei õnnestunud, palun proovi uuesti",
+  "authenticationSuccessful": "Autentimine õnnestus!",
+  "incorrectRecoveryKey": "Vigane taasetvõti",
+  "theRecoveryKeyYouEnteredIsIncorrect": "Sinu sisestatud taasetvõti on vigane",
   "enterPassword": "Sisesta salasõna",
+  "selectExportFormat": "Vali ekspordivorming",
+  "exportDialogDesc": "Krüptitud ekspordifailid on kaitstud sinu sisestatud salasõnaga.",
+  "encrypted": "Krüptitud",
+  "plainText": "Vormindamata tekst",
+  "pinnedCodeMessage": "{code} on tõstetud esile",
+  "unpinnedCodeMessage": "{code} esiletõstmine on lõppenud",
   "createNewTag": "Lisa uus silt",
   "tag": "Silt",
   "create": "Loo",
@@ -225,5 +258,9 @@
   "reEnterPassword": "Sisesta salasõna uuesti",
   "setNewPassword": "Sisesta uus salasõna",
   "enterPin": "Sisesta PIN-kood",
-  "setNewPin": "Määra uus PIN-kood"
+  "setNewPin": "Määra uus PIN-kood",
+  "plainHTML": "Tavaline HTML",
+  "errorInvalidQRCode": "Vigane QR-kood",
+  "errorInvalidQRCodeBody": "Skaneeritud QR-kood pole korrektne 2FA kasutajakonto.",
+  "errorNoQRCode": "QR-koodi ei leidu"
 }

mobile/apps/auth/lib/l10n/arb/app_fr.arb

@@ -6,7 +6,7 @@
   "@counterAppBarTitle": {
     "description": "Text shown in the AppBar of the Counter Page"
   },
-  "onBoardingBody": "Sauvegarder vos codes A2F",
+  "onBoardingBody": "Sécurisez vos codes A2F",
   "onBoardingGetStarted": "Premiers pas",
   "setupFirstAccount": "Configurez votre premier compte",
   "importScanQrCode": "Scannez un QR Code",
@@ -111,6 +111,7 @@
   "importAegisGuide": "Utilisez l'option \"Exporter le coffre-fort\" dans les paramètres d'Aegis.\n\nSi votre coffre-fort est crypté, vous devrez saisir le mot de passe du coffre-fort pour déchiffrer le coffre-fort.",
   "import2FasGuide": "Utilisez l'option \"Paramètres->Sauvegarde -Export\" dans 2FAS.\n\nSi votre sauvegarde est chiffrée, vous devrez entrer le mot de passe pour déchiffrer la sauvegarde",
   "importLastpassGuide": "Utilisez l'option \"Transférer des comptes\" dans les paramètres de l'authentificateur Lastpass et appuyez sur \"Exporter des comptes vers un fichier\". Importez le JSON téléchargé.",
+  "importProtonAuthGuide": "Utilisez l'option \"Export\" dans les paramètres de Proton Authenticator pour exporter vos codes.",
   "exportCodes": "Exporter les codes",
   "importLabel": "Importer",
   "importInstruction": "Veuillez sélectionner un fichier qui contient une liste de vos codes dans le format suivant",
@@ -519,5 +520,12 @@
   "algorithm": "Algorithme",
   "type": "Type",
   "period": "Période",
-  "digits": "Chiffres"
+  "digits": "Chiffres",
+  "importFromGallery": "Importer depuis la galerie",
+  "errorCouldNotReadImage": "Impossible de lire le fichier sélectionné.",
+  "errorInvalidQRCode": "QR Code invalide",
+  "errorInvalidQRCodeBody": "Le code QR scanné n'est pas un compte 2FA valide.",
+  "errorNoQRCode": "Aucun code QR trouvé",
+  "errorGenericTitle": "Une erreur s'est produite",
+  "errorGenericBody": "Une erreur inattendue est survenue lors de l'importation."
 }

mobile/apps/auth/lib/l10n/arb/app_id.arb

@@ -111,6 +111,7 @@
   "importAegisGuide": "Gunakan opsi \"Export the vault\" di Pengaturan Aegis.\n\nJika brankas Anda terenkripsi, Anda perlu memasukkan kata sandi brankas untuk mendekripsi brankas.",
   "import2FasGuide": "Gunakan opsi \"Settings->Backup -Export\" di 2FAS.\n\nJika cadangan Anda terenkripsi, Anda perlu memasukkan kata sandi untuk mendekripsi cadangan",
   "importLastpassGuide": "Gunakan opsi \"Transfer accounts\" di Pengaturan Lastpass Authenticator dan tekan \"Export accounts to file\". Impor file JSON yang diunduh.",
+  "importProtonAuthGuide": "Gunakan opsi \"Ekspor\" di pengaturan Proton Authenticator untuk mengekspor kode anda.",
   "exportCodes": "Ekspor kode",
   "importLabel": "Impor",
   "importInstruction": "Harap pilih file yang berisi daftar kode Anda dalam format berikut",
@@ -500,16 +501,31 @@
   "appLockOfflineModeWarning": "Anda telah memilih untuk mengunci aplikasi tanpa cadangan apa pun. Jika Anda lupa kode Pengunci Apl Anda, Anda tidak akan dapat mengakses data-data Anda.",
   "duplicateCodes": "Kode duplikat",
   "noDuplicates": "✨ Tak ada duplikat",
+  "youveNoDuplicateCodesThatCanBeCleared": "Anda tidak memiliki kode duplikat yang dapat dihapus",
   "deduplicateCodes": "Hapus kode duplikat",
   "deselectAll": "Batalkan semua pilihan",
   "selectAll": "Pilih semua",
   "deleteDuplicates": "Hapus duplikat",
   "plainHTML": "HTML Sederhana",
   "tellUsWhatYouThink": "Berikan pendapatmu",
+  "dropReviewiOS": "Berikan ulasan di App Store",
   "dropReviewAndroid": "Berikan ulasan di Play Store",
+  "supportEnte": "Dukung <bold-green>ente</bold-green>",
+  "giveUsAStarOnGithub": "Beri kami bintang di Github",
+  "free5GB": "5GB gratis di  <bold-green>ente</bold-green> Photos",
+  "loginWithAuthAccount": "Masuk dengan akun Auth anda",
+  "freeStorageOffer": "Potongan 10% di <bold-green>ente</bold-green> photos",
+  "freeStorageOfferDescription": "Gunakan kode \"AUTH\" untuk mendapatkan potongan 10% untuk tahun pertama",
   "advanced": "Lanjutan",
   "algorithm": "Algoritma",
   "type": "Tipe",
   "period": "Periode",
-  "digits": "Digit"
+  "digits": "Digit",
+  "importFromGallery": "Impor dari galeri",
+  "errorCouldNotReadImage": "Tidak dapat membaca file gambar yang dipilih.",
+  "errorInvalidQRCode": "Kode QR tidak valid",
+  "errorInvalidQRCodeBody": "Kode QR yang dipindai bukan akun 2FA yang valid.",
+  "errorNoQRCode": "Kode QR tidak ditemukan",
+  "errorGenericTitle": "Terjadi kesalahan",
+  "errorGenericBody": "Terjadi kesalahan yang tidak terduga saat mengimpor."
 }

mobile/apps/auth/lib/l10n/arb/app_it.arb

@@ -519,5 +519,12 @@
   "algorithm": "Algoritmo",
   "type": "Tipo",
   "period": "Periodo",
-  "digits": "Cifre"
+  "digits": "Cifre",
+  "importFromGallery": "Importa dalla galleria",
+  "errorCouldNotReadImage": "Impossibile leggere il file immagine selezionato.",
+  "errorInvalidQRCode": "Codice QR non valido",
+  "errorInvalidQRCodeBody": "Il codice QR scansionato non è un account 2FA valido.",
+  "errorNoQRCode": "Nessun codice QR trovato",
+  "errorGenericTitle": "Si è verificato un errore",
+  "errorGenericBody": "Si è verificato un errore imprevisto durante l'importazione."
 }

mobile/apps/auth/lib/l10n/arb/app_lt.arb

@@ -111,6 +111,7 @@
   "importAegisGuide": "Naudokite „Aegis“ nustatymuose esančią parinktį Eksportuoti slėptuvę.\n\nJei jūsų saugykla užšifruota, turėsite įvesti saugyklos slaptažodį, kad iššifruotumėte saugyklą.",
   "import2FasGuide": "Naudokite programoje 2FAS esančią parinktį „Settings->2FAS Backup->Export to file“.\n\nJei atsarginė kopija užšifruota, turėsite įvesti slaptažodį, kad iššifruotumėte atsarginę kopiją.",
   "importLastpassGuide": "Naudokite „Lastpass Authenticator“ nustatymuose esančią parinktį „Transfer accounts“ (perkelti paskyras) ir paspauskite „Export accounts to file“ (eksportuoti paskyras į failą). Importuokite atsisiųstą JSON failą.",
+  "importProtonAuthGuide": "Naudokite „Proton Authenticator“ nustatymuose esančią parinktį „Export“ (eksportuoti), kad eksportuotumėte savo kodus.",
   "exportCodes": "Eksportuoti kodus",
   "importLabel": "Importuoti",
   "importInstruction": "Pasirinkite failą, kuriame yra tokio formato jūsų kodų sąrašas",
@@ -519,5 +520,12 @@
   "algorithm": "Algoritmas",
   "type": "Tipas",
   "period": "Laikotarpis",
-  "digits": "Skaitmenys"
+  "digits": "Skaitmenys",
+  "importFromGallery": "Importuoti iš galerijos",
+  "errorCouldNotReadImage": "Nepavyko perskaityti pasirinkto vaizdo failo.",
+  "errorInvalidQRCode": "Netinkamas QR kodas",
+  "errorInvalidQRCodeBody": "Nuskenuotas QR kodas nėra tinkama 2FA paskyra.",
+  "errorNoQRCode": "QR kodas nerastas.",
+  "errorGenericTitle": "Įvyko klaida",
+  "errorGenericBody": "Importuojant įvyko netikėta klaida."
 }

mobile/apps/auth/lib/l10n/arb/app_pl.arb

@@ -111,6 +111,7 @@
   "importAegisGuide": "Użyj opcji \"Eksportuj sejf\" w ustawieniach Aegis.\n\nJeśli twój sejf jest zaszyfrowany, musisz wprowadzić hasło sejfu, aby odszyfrować sejf.",
   "import2FasGuide": "Użyj opcji \"Ustawienia->Kopia Zapasowa-Eksport\" w 2FAS.\n\nJeśli twoja kopia zapasowa jest zaszyfrowana, musisz wprowadzić hasło, aby odszyfrować kopię zapasową",
   "importLastpassGuide": "Użyj opcji \"Przenieś konta\" w Ustawieniach Lastpass Authenticator i naciśnij \"Eksportuj konta do pliku\". Zaimportuj pobrany plik JSON.",
+  "importProtonAuthGuide": "Użyj opcji „Eksportuj” w ustawieniach Proton Authenticator, aby wyeksportować kody.",
   "exportCodes": "Eksportuj kody",
   "importLabel": "Importuj",
   "importInstruction": "Wybierz plik, który zawiera listę twoich kodów w następującym formacie",
@@ -519,5 +520,12 @@
   "algorithm": "Algorytm",
   "type": "Rodzaj",
   "period": "Okres",
-  "digits": "Cyfry"
+  "digits": "Cyfry",
+  "importFromGallery": "Importuj z galerii",
+  "errorCouldNotReadImage": "Nie można odczytać wybranego pliku obrazu.",
+  "errorInvalidQRCode": "Nieprawidłowy kod QR",
+  "errorInvalidQRCodeBody": "Zeskanowany kod QR nie wskazuje na prawidłowe konto 2FA.",
+  "errorNoQRCode": "Nie znaleziono kodu QR",
+  "errorGenericTitle": "Wystąpił błąd",
+  "errorGenericBody": "Podczas importowania wystąpił nieoczekiwany błąd."
 }

mobile/apps/auth/lib/l10n/arb/app_sv.arb

@@ -18,7 +18,7 @@
   "incorrectDetails": "Felaktiga uppgifter",
   "pleaseVerifyDetails": "Kontrollera dina detaljer och försök igen",
   "codeIssuerHint": "Utfärdare",
-  "codeSecretKeyHint": "Secret Key",
+  "codeSecretKeyHint": "Hemlig nyckel",
   "secret": "Säkerhetsnyckel",
   "all": "Alla",
   "notes": "Anteckningar",
@@ -33,7 +33,7 @@
       }
     }
   },
-  "codeAccountHint": "Konto (du@domän.com)",
+  "codeAccountHint": "Konto (du@domain.com)",
   "codeTagHint": "Tagg",
   "accountKeyType": "Typ av nyckel",
   "sessionExpired": "Sessionen har gått ut",
@@ -68,7 +68,7 @@
   "reportABug": "Rapportera en bugg",
   "crashAndErrorReporting": "Krasch och felrapportering",
   "reportBug": "Rapportera bugg",
-  "emailUsMessage": "Skicka e-mail till {email}",
+  "emailUsMessage": "Skicka e-post till {email}",
   "@emailUsMessage": {
     "placeholders": {
       "email": {
@@ -79,7 +79,7 @@
   "contactSupport": "Kontakta support",
   "rateUsOnStore": "Betygsätt på {storeName}",
   "blog": "Blogg",
-  "merchandise": "Merchandise",
+  "merchandise": "Produkter",
   "verifyPassword": "Bekräfta lösenord",
   "pleaseWait": "Vänligen vänta...",
   "generatingEncryptionKeysTitle": "Skapar krypteringsnycklar...",
@@ -104,13 +104,14 @@
   "importFromApp": "Importera koder från {appName}",
   "importGoogleAuthGuide": "Exportera dina konton från Google Authenticator till en QR-kod med alternativet \"Överföra konton\". Använd sedan en annan enhet och skanna QR-koden.\n\nTips: Du kan använda din bärbara dators webbkamera för att ta en bild av QR-koden.",
   "importSelectJsonFile": "Välj JSON-fil",
-  "importSelectAppExport": "Välj {appName} exportfil",
+  "importSelectAppExport": "Välj {appName} exporteringsfil",
   "importEnteEncGuide": "Välj den krypterade JSON-filen som exporteras från Ente",
   "importRaivoGuide": "Använd alternativet \"Exportera OTPs till zip-arkiv\" i Raivos inställningar.\n\nExtrahera zip-filen och importera JSON-filen.",
   "importBitwardenGuide": "Använd alternativet \"Exportera valv\" inom Bitwarden Tools och importera den okrypterade JSON-filen.",
   "importAegisGuide": "Använd alternativet \"Exportera valvet\" i Aegis inställningar.\n\nOm ditt valv är krypterat måste du ange valvlösenordet för att dekryptera valvet.",
   "import2FasGuide": "Använd alternativet \"Inställningar->Säkerhetskopiera -Exportera\" i 2FAS.\n\nOm din säkerhetskopia är krypterad måste du ange lösenordet för att dekryptera säkerhetskopian.",
   "importLastpassGuide": "Använd alternativet \"Överför konton\" i LastPass Authenticators inställningar och tryck på \"Exportera konton till fil\". Importera JSON-filen som laddas ner.",
+  "importProtonAuthGuide": "Använd alternativet \"Exportera\" i Proton Authenticator-inställningarna för att exportera koder.",
   "exportCodes": "Exportera koder",
   "importLabel": "Importera",
   "importInstruction": "Vänligen välj en fil som innehåller en lista över dina koder i följande format",
@@ -119,11 +120,11 @@
   "emailVerificationToggle": "E-postverifiering",
   "emailVerificationEnableWarning": "För att undvika att bli låst från ditt konto, se till att spara en kopia av din e-post 2FA utanför Ente Auth innan du aktiverar e-postverifiering.",
   "authToChangeEmailVerificationSetting": "Autentisera för att ändra din e-postadress",
-  "authenticateGeneric": "Var god autentisera",
+  "authenticateGeneric": "Vänligen autentisera",
   "authToViewYourRecoveryKey": "Autentisera för att visa din återställningsnyckel",
   "authToChangeYourEmail": "Autentisera för att ändra din e-postadress",
   "authToChangeYourPassword": "Autentisera för att ändra ditt lösenord",
-  "authToViewSecrets": "Autentisera för att visa din återställningsnyckel",
+  "authToViewSecrets": "Vänligen autentisera för att visa din återställningsnyckel",
   "authToInitiateSignIn": "Vänligen autentisera för att initiera inloggning för säkerhetskopiering.",
   "ok": "OK",
   "cancel": "Avbryt",
@@ -147,7 +148,7 @@
   "leaveFamily": "Lämna familjen",
   "leaveFamilyMessage": "Är du säker på att du vill lämna familjeplanen?",
   "inFamilyPlanMessage": "Du är på en familjeplan!",
-  "hintForMobile": "Håll i på en kod för att redigera eller ta bort.",
+  "hintForMobile": "Tryck länge på en kod för att redigera eller ta bort.",
   "hintForDesktop": "Högerklicka på en kod för att redigera eller ta bort.",
   "scan": "Skanna",
   "scanACode": "Skanna kod",
@@ -191,7 +192,7 @@
   "oopsSomethingWentWrong": "Hoppsan! Något gick fel.",
   "selectLanguage": "Välj språk",
   "language": "Språk",
-  "social": "Social",
+  "social": "Socialt",
   "security": "Säkerhet",
   "lockscreen": "Låsskärm",
   "authToChangeLockscreenSetting": "Vänligen autentisera för att ändra låsskärms inställningar",
@@ -200,7 +201,7 @@
   "authToViewYourActiveSessions": "Autentisera för att visa dina aktiva sessioner",
   "searchHint": "Sök...",
   "search": "Sök",
-  "sorryUnableToGenCode": "Tyvärr, det gick inte att generera en kod för {issuerName}",
+  "sorryUnableToGenCode": "Tyvärr, kunde inte generera en kod för {issuerName}",
   "noResult": "Inga resultat",
   "addCode": "Lägg till kod",
   "scanAQrCode": "Skanna en QR-kod",
@@ -215,7 +216,7 @@
   "error": "Fel",
   "recoveryKeyCopiedToClipboard": "Återställningsnyckel kopierad till urklipp",
   "recoveryKeyOnForgotPassword": "Om du glömmer ditt lösenord är det enda sättet du kan återställa dina data med denna nyckel.",
-  "recoveryKeySaveDescription": "Vi lagrar inte och har därför inte åtkomst till denna nyckel, vänligen spara denna 24 ords nyckel på en säker plats.",
+  "recoveryKeySaveDescription": "Vi lagrar inte och har därför inte åtkomst till denna nyckel, vänligen spara denna 24 ordsnyckeln på en säker plats.",
   "doThisLater": "Gör detta senare",
   "saveKey": "Spara nyckel",
   "save": "Spara",
@@ -254,7 +255,7 @@
   "insecureDevice": "Osäker enhet",
   "sorryWeCouldNotGenerateSecureKeysOnThisDevicennplease": "Tyvärr, kunde vi inte generera säkra nycklar på den här enheten.\n\nvänligen registrera dig från en annan enhet.",
   "howItWorks": "Så här fungerar det",
-  "ackPasswordLostWarning": "Jag förstår att om jag förlorar mitt lösenord kan jag förlora mina data eftersom min data är <underline>end-to-end-krypterad</underline>.",
+  "ackPasswordLostWarning": "Jag förstår att om jag förlorar mitt lösenord kan jag förlora mina data eftersom min data är <underline>totalsträckskrypterad</underline>.",
   "loginTerms": "Jag samtycker till <u-terms>användarvillkoren</u-terms> och <u-policy>integritetspolicyn</u-policy>",
   "logInLabel": "Logga in",
   "logout": "Logga ut",
@@ -278,7 +279,7 @@
   "recoveryKeyVerifyReason": "Din återställningsnyckel är det enda sättet att återställa dina foton om du glömmer ditt lösenord. Du hittar din återställningsnyckel i Inställningar > Säkerhet.\n\nAnge din återställningsnyckel här för att verifiera att du har sparat den ordentligt.",
   "confirmYourRecoveryKey": "Bekräfta din återställningsnyckel",
   "confirm": "Bekräfta",
-  "emailYourLogs": "Maila dina loggar",
+  "emailYourLogs": "E-posta dina loggar",
   "pleaseSendTheLogsTo": "Vänligen skicka loggarna till \n{toEmail}",
   "copyEmailAddress": "Kopiera e-postadress",
   "exportLogs": "Exportera loggar",
@@ -297,7 +298,7 @@
   "criticalUpdateAvailable": "Kritisk uppdatering tillgänglig",
   "updateAvailable": "Uppdatering tillgänglig",
   "update": "Uppdatera",
-  "checking": "Kontrollerar ...",
+  "checking": "Kontrollerar...",
   "youAreOnTheLatestVersion": "Du är på den senaste versionen",
   "warning": "Varning",
   "exportWarningDesc": "Den exporterade filen innehåller känslig information. Förvara den på ett säkert sätt.",
@@ -306,7 +307,7 @@
     "description": "Text for the button to confirm the user understands the warning"
   },
   "authToExportCodes": "Autentisera för att exportera dina koder",
-  "importSuccessTitle": "Jippi!",
+  "importSuccessTitle": "Hurra!",
   "importSuccessDesc": "Du har importerat {count} koder!",
   "@importSuccessDesc": {
     "placeholders": {
@@ -324,7 +325,7 @@
   "checkInboxAndSpamFolder": "Vänligen kontrollera din inkorg (och skräppost) för att slutföra verifieringen",
   "tapToEnterCode": "Tryck för att ange kod",
   "resendEmail": "Skicka e-post igen",
-  "weHaveSendEmailTo": "Vi har skickat ett mail till <green>{email}</green>",
+  "weHaveSendEmailTo": "Vi har skickat ett e-postmeddelande till <green>{email}</green>",
   "@weHaveSendEmailTo": {
     "description": "Text to indicate that we have sent a mail to the user",
     "placeholders": {
@@ -362,7 +363,7 @@
   "selectExportFormat": "Välj exportformat",
   "exportDialogDesc": "Krypterad export skyddas av ett lösenord som du väljer.",
   "encrypted": "Krypterad",
-  "plainText": "Enkel text",
+  "plainText": "Oformaterad text",
   "passwordToEncryptExport": "Lösenord för att kryptera export",
   "export": "Exportera",
   "useOffline": "Använd utan säkerhetskopior",
@@ -374,14 +375,14 @@
   "compactMode": "Kompakt läge",
   "shouldHideCode": "Dölj koder",
   "doubleTapToViewHiddenCode": "Du kan dubbeltrycka på en post för att visa koden",
-  "focusOnSearchBar": "Fokusera på sök vid appstart",
+  "focusOnSearchBar": "Fokusera på sök vid uppstart av app",
   "confirmUpdatingkey": "Är du säker på att du vill uppdatera den hemliga nyckeln?",
   "minimizeAppOnCopy": "Minimera appen vid kopiering",
   "editCodeAuthMessage": "Autentisera för att redigera kod",
   "deleteCodeAuthMessage": "Autentisera för att radera kod",
   "showQRAuthMessage": "Autentisera för att visa QR-kod",
   "confirmAccountDeleteTitle": "Bekräfta radering av kontot",
-  "confirmAccountDeleteMessage": "Detta konto är kopplat till andra Ente apps, om du använder någon.\n\nDina uppladdade data, över alla Ente appar, kommer att schemaläggas för radering och ditt konto kommer att raderas permanent.",
+  "confirmAccountDeleteMessage": "Detta konto är kopplat till andra Ente applikationer, om du använder någon.\n\nDina uppladdade data, över alla Ente applikationer, kommer att schemaläggas för radering och ditt konto kommer att raderas permanent.",
   "androidBiometricHint": "Verifiera identitet",
   "@androidBiometricHint": {
     "description": "Hint message advising the user how to authenticate with biometrics. It is used on Android side. Maximum 60 characters."
@@ -390,7 +391,7 @@
   "@androidBiometricNotRecognized": {
     "description": "Message to let the user know that authentication was failed. It is used on Android side. Maximum 60 characters."
   },
-  "androidBiometricSuccess": "Slutförd",
+  "androidBiometricSuccess": "Lyckades",
   "@androidBiometricSuccess": {
     "description": "Message to let the user know that authentication was successful. It is used on Android side. Maximum 60 characters."
   },
@@ -441,7 +442,7 @@
   "signOutOtherDevices": "Logga ut andra enheter",
   "doNotSignOut": "Logga inte ut",
   "hearUsWhereTitle": "Hur hörde du talas om Ente? (valfritt)",
-  "hearUsExplanation": "Vi spårar inte appinstallationer, Det skulle hjälpa oss om du berättade var du hittade oss!",
+  "hearUsExplanation": "Vi spårar inte installationer. Det skulle hjälpa oss om du berättade hur du hittade oss!",
   "recoveryKeySaved": "Återställningsnyckel sparad i nedladdningsmappen!",
   "waitingForBrowserRequest": "Väntar på webbläsarbegäran...",
   "waitingForVerification": "Väntar på verifiering...",
@@ -488,6 +489,8 @@
   "hideContent": "Dölj innehåll",
   "hideContentDescriptionAndroid": "Döljer appinnehåll i app-växlaren och inaktiverar skärmdumpar",
   "hideContentDescriptioniOS": "Döljer appinnehåll i app-växlaren",
+  "autoLockFeatureDescription": "Tid efter vilken appen låses efter att ha satts i bakgrunden",
+  "appLockDescription": "Välj mellan enhetens förvalda låsskärm och en anpassad låsskärm med en PIN-kod eller lösenord.",
   "pinLock": "Pinkodslås",
   "enterPin": "Ange PIN-kod",
   "setNewPin": "Ställ in ny PIN-kod",
@@ -498,9 +501,31 @@
   "appLockOfflineModeWarning": "Du har valt att fortsätta utan säkerhetskopior. Om du glömmer ditt applås, kommer du att bli utelåst från att komma åt dina data.",
   "duplicateCodes": "Dubblettkoder",
   "noDuplicates": "✨ Inga dubbletter",
+  "youveNoDuplicateCodesThatCanBeCleared": "Du har inga dubbla koder som kan rensas",
   "deduplicateCodes": "Deduplicera koder",
   "deselectAll": "Avmarkera alla",
   "selectAll": "Markera alla",
   "deleteDuplicates": "Radera dubbletter",
-  "plainHTML": "Ren HTML"
+  "plainHTML": "Ren HTML",
+  "tellUsWhatYouThink": "Berätta vad du tycker",
+  "dropReviewiOS": "Skriv en recension på App Store",
+  "dropReviewAndroid": "Skriv en recension på Play Store",
+  "supportEnte": "Stöd <bold-green>ente</bold-green>",
+  "giveUsAStarOnGithub": "Ge oss en stjärna på Github",
+  "free5GB": "5 GB gratis på <bold-green>ente</bold-green> Foton",
+  "loginWithAuthAccount": "Logga in med ditt Auth-konto",
+  "freeStorageOffer": "10% rabatt på <bold-green>ente</bold-green> foton",
+  "freeStorageOfferDescription": "Använd koden \"AUTH\" för att få 10% rabatt första året",
+  "advanced": "Avancerad",
+  "algorithm": "Algoritm",
+  "type": "Typ",
+  "period": "Tidsperiod",
+  "digits": "Siffror",
+  "importFromGallery": "Importera från galleri",
+  "errorCouldNotReadImage": "Kunde inte läsa den valda bildfilen.",
+  "errorInvalidQRCode": "Ogiltig QR-kod",
+  "errorInvalidQRCodeBody": "Den skannade QR-koden är inte ett giltigt 2FA konto.",
+  "errorNoQRCode": "Ingen QR-kod hittades",
+  "errorGenericTitle": "Ett fel inträffade",
+  "errorGenericBody": "Ett oväntat fel inträffade vid import."
 }

mobile/apps/auth/lib/l10n/arb/app_zh_CN.arb

@@ -6,7 +6,7 @@
   "@counterAppBarTitle": {
     "description": "Text shown in the AppBar of the Counter Page"
   },
-  "onBoardingBody": "妥善保管您的两步验证码",
+  "onBoardingBody": "妥善保管您的双重认证代码",
   "onBoardingGetStarted": "开始",
   "setupFirstAccount": "设置您的第一个账户",
   "importScanQrCode": "扫描二维码",
@@ -111,13 +111,14 @@
   "importAegisGuide": "使用 Aegis 设置中的“导出密码库”选项。\n\n如果您的密码库已加密，则需要输入密码库密码才能解密密码库。",
   "import2FasGuide": "使用 2FAS 中的“设置 -> 备份 -> 导出”选项。\n\n如果您的备份已加密，则需要输入密码来解密备份",
   "importLastpassGuide": "使用 Lastpass Authenticator 设置中的“转移账户”选项，然后按“将账户导出到文件”。导入下载的 JSON。",
+  "importProtonAuthGuide": "使用 Proton Authenticator 设置中的“导出”选项导出您的代码。",
   "exportCodes": "导出代码",
   "importLabel": "导入",
   "importInstruction": "请选择一个包含以下格式的代码列表的文件",
   "importCodeDelimiterInfo": "代码可以用逗号或换行符分隔",
   "selectFile": "选择文件",
   "emailVerificationToggle": "电子邮件验证",
-  "emailVerificationEnableWarning": "为避免被锁在您的账户之外，请在启用电子邮件验证之前确保在 Ente Auth 之外存储电子邮件两步验证的副本。",
+  "emailVerificationEnableWarning": "为避免被锁在您的账户之外，请在启用电子邮件验证之前确保在 Ente Auth 之外存储电子邮件双重认证的副本。",
   "authToChangeEmailVerificationSetting": "请进行身份验证以更改电子邮件验证",
   "authenticateGeneric": "请验证",
   "authToViewYourRecoveryKey": "请验证以查看您的恢复密钥",
@@ -155,7 +156,7 @@
   "verifyEmail": "验证电子邮件",
   "enterCodeHint": "从你的身份验证器应用中\n输入6位数字代码",
   "lostDeviceTitle": "丢失了设备吗？",
-  "twoFactorAuthTitle": "两步验证",
+  "twoFactorAuthTitle": "双重认证",
   "passkeyAuthTitle": "通行密钥验证",
   "verifyPasskey": "验证通行密钥",
   "loginWithTOTP": "使用 TOTP 登录",
@@ -519,5 +520,12 @@
   "algorithm": "算法",
   "type": "类型",
   "period": "周期",
-  "digits": "数字"
+  "digits": "数字",
+  "importFromGallery": "从图库导入",
+  "errorCouldNotReadImage": "无法读取所选图片文件。",
+  "errorInvalidQRCode": "二维码无效",
+  "errorInvalidQRCodeBody": "扫描的二维码不是有效的双重认证账户。",
+  "errorNoQRCode": "未找到二维码",
+  "errorGenericTitle": "出错了",
+  "errorGenericBody": "导入时发生意外错误。"
 }

mobile/apps/auth/lib/ui/home_page.dart

@@ -39,7 +39,9 @@ import 'package:ente_auth/utils/totp_util.dart';
 import 'package:ente_events/event_bus.dart';
 import 'package:ente_lock_screen/lock_screen_settings.dart';
 import 'package:ente_lock_screen/ui/app_lock.dart';
+import 'package:ente_qr/ente_qr.dart';
 import 'package:ente_ui/pages/base_home_page.dart';
+import 'package:file_picker/file_picker.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -48,7 +50,7 @@ import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
 import 'package:logging/logging.dart';
 import 'package:move_to_background/move_to_background.dart';
 
-class HomePage extends BaseHomePage  {
+class HomePage extends BaseHomePage {
   const HomePage({super.key});
 
   @override
@@ -62,6 +64,7 @@ class _HomePageState extends State<HomePage> {
   );
   bool _hasLoaded = false;
   bool _isSettingsOpen = false;
+  bool _isImportingFromGallery = false;
   final Logger _logger = Logger("HomePage");
   final scaffoldKey = GlobalKey<ScaffoldState>();
 
@@ -288,6 +291,63 @@ class _HomePageState extends State<HomePage> {
     }
   }
 
+  Future<void> _importFromGalleryNative() async {
+    final l10n = AppLocalizations.of(context);
+
+    if (_isImportingFromGallery) {
+      return;
+    }
+
+    _isImportingFromGallery = true;
+
+    try {
+      final FilePickerResult? result = await FilePicker.platform.pickFiles(
+        type: FileType.image,
+      );
+
+      if (result == null || result.files.single.path == null) {
+        return;
+      }
+
+      final String imagePath = result.files.single.path!;
+      final enteQr = EnteQr();
+      final QrScanResult qrResult = await enteQr.scanQrFromImage(imagePath);
+
+      if (qrResult.success && qrResult.content != null) {
+        try {
+          final newCode = Code.fromOTPAuthUrl(qrResult.content!);
+          await CodeStore.instance.addCode(newCode, shouldSync: false);
+          // Focus the new code by searching
+          if ((_allCodes?.where((e) => !e.hasError).length ?? 0) > 2) {
+            _focusNewCode(newCode);
+          }
+        } catch (e) {
+          _logger.severe('Error adding code from QR scan', e);
+          await showErrorDialog(
+            context,
+            l10n.errorInvalidQRCode,
+            l10n.errorInvalidQRCodeBody,
+          );
+        }
+      } else {
+        _logger.warning('QR scan failed: ${qrResult.error}');
+        await showErrorDialog(
+          context,
+          l10n.errorNoQRCode,
+          qrResult.error ?? l10n.errorNoQRCode,
+        );
+      }
+    } catch (e) {
+      await showErrorDialog(
+        context,
+        l10n.errorGenericTitle,
+        l10n.errorGenericBody,
+      );
+    } finally {
+      _isImportingFromGallery = false;
+    }
+  }
+
   Future<void> _redirectToScannerPage() async {
     final Code? code = await Navigator.of(context).push(
       MaterialPageRoute(
@@ -322,7 +382,8 @@ class _HomePageState extends State<HomePage> {
     final bool shouldShowLockScreen =
         await LockScreenSettings.instance.shouldShowLockScreen();
     if (shouldShowLockScreen) {
-      await AppLock.of(context)!.showLockScreen();
+      // Manual lock: do not auto-prompt Touch ID; wait for user tap
+      await AppLock.of(context)!.showManualLockScreen();
     } else {
       await showDialogWidget(
         context: context,
@@ -745,6 +806,14 @@ class _HomePageState extends State<HomePage> {
           labelWidget: SpeedDialLabelWidget(context.l10n.enterDetailsManually),
           onTap: _redirectToManualEntryPage,
         ),
+        if (PlatformUtil.isMobile())
+          SpeedDialChild(
+            child: const Icon(Icons.image),
+            backgroundColor: Theme.of(context).colorScheme.fabBackgroundColor,
+            foregroundColor: Theme.of(context).colorScheme.fabForegroundColor,
+            labelWidget: SpeedDialLabelWidget(context.l10n.importFromGallery),
+            onTap: _importFromGalleryNative,
+          ),
       ],
     );
   }

mobile/apps/auth/lib/ui/settings/data/import/import_service.dart

@@ -4,6 +4,7 @@ import 'package:ente_auth/ui/settings/data/import/encrypted_ente_import.dart';
 import 'package:ente_auth/ui/settings/data/import/google_auth_import.dart';
 import 'package:ente_auth/ui/settings/data/import/lastpass_import.dart';
 import 'package:ente_auth/ui/settings/data/import/plain_text_import.dart';
+import 'package:ente_auth/ui/settings/data/import/proton_import.dart';
 import 'package:ente_auth/ui/settings/data/import/raivo_plain_text_import.dart';
 import 'package:ente_auth/ui/settings/data/import/two_fas_import.dart';
 import 'package:ente_auth/ui/settings/data/import_page.dart';
@@ -43,6 +44,9 @@ class ImportService {
       case ImportType.lastpass:
         await showLastpassImportInstruction(context);
         break;
+      case ImportType.proton:
+        await showProtonImportInstruction(context);
+        break;
     }
   }
 }

mobile/apps/auth/lib/ui/settings/data/import/proton_import.dart

@@ -0,0 +1,171 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:ente_auth/l10n/l10n.dart';
+import 'package:ente_auth/models/code.dart';
+import 'package:ente_auth/services/authenticator_service.dart';
+import 'package:ente_auth/store/code_store.dart';
+import 'package:ente_auth/ui/common/progress_dialog.dart';
+import 'package:ente_auth/ui/components/buttons/button_widget.dart';
+import 'package:ente_auth/ui/components/dialog_widget.dart';
+import 'package:ente_auth/ui/components/models/button_type.dart';
+import 'package:ente_auth/ui/settings/data/import/import_success.dart';
+import 'package:ente_auth/utils/dialog_util.dart';
+import 'package:file_picker/file_picker.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:logging/logging.dart';
+
+Future<void> showProtonImportInstruction(BuildContext context) async {
+  final l10n = context.l10n;
+  final result = await showDialogWidget(
+    context: context,
+    title: l10n.importFromApp("Proton Authenticator"),
+    body: l10n.importProtonAuthGuide,
+    buttons: [
+      ButtonWidget(
+        buttonType: ButtonType.primary,
+        labelText: l10n.importSelectJsonFile,
+        isInAlert: true,
+        buttonSize: ButtonSize.large,
+        buttonAction: ButtonAction.first,
+      ),
+      ButtonWidget(
+        buttonType: ButtonType.secondary,
+        labelText: context.l10n.cancel,
+        buttonSize: ButtonSize.large,
+        isInAlert: true,
+        buttonAction: ButtonAction.second,
+      ),
+    ],
+  );
+  if (result?.action != null && result!.action != ButtonAction.cancel) {
+    if (result.action == ButtonAction.first) {
+      await _pickProtonJsonFile(context);
+    }
+  }
+}
+
+Future<void> _pickProtonJsonFile(BuildContext context) async {
+  final l10n = context.l10n;
+  FilePickerResult? result = await FilePicker.platform
+      .pickFiles(dialogTitle: l10n.importSelectJsonFile);
+  if (result == null) {
+    return;
+  }
+  final ProgressDialog progressDialog =
+      createProgressDialog(context, l10n.pleaseWait);
+  await progressDialog.show();
+  try {
+    String path = result.files.single.path!;
+    int? count = await _processProtonExportFile(context, path, progressDialog);
+    await progressDialog.hide();
+    if (count != null) {
+      await importSuccessDialog(context, count);
+    }
+  } catch (e, s) {
+    Logger('ProtonImport')
+        .severe('exception while processing proton import', e, s);
+    await progressDialog.hide();
+    await showErrorDialog(
+      context,
+      context.l10n.sorry,
+      "${context.l10n.importFailureDescNew}\n Error: ${e.toString()}",
+    );
+  }
+}
+
+Future<int?> _processProtonExportFile(
+  BuildContext context,
+  String path,
+  final ProgressDialog dialog,
+) async {
+  File file = File(path);
+
+  final jsonString = await file.readAsString();
+  final decodedJson = jsonDecode(jsonString);
+
+  // Validate that this is a Proton export
+  if (decodedJson['version'] == null || decodedJson['entries'] == null) {
+    await dialog.hide();
+    await showErrorDialog(
+      context,
+      'Invalid Proton export',
+      'The selected file is not a valid Proton Authenticator export.',
+    );
+    return null;
+  }
+
+  final parsedCodes = <Code>[];
+  final entries = decodedJson['entries'] as List;
+
+  for (var entry in entries) {
+    try {
+      final content = entry['content'];
+      if (content == null) {
+        continue; // Skip entries without content
+      }
+
+      final entryType = content['entry_type'] as String?;
+      if (entryType != 'Totp' && entryType != 'Steam') {
+        // log warning
+        Logger('ProtonImport').warning('Unsupported entry type: $entryType');
+        continue; // Skip non-TOTP and non-Steam entries
+      }
+
+      Code code;
+
+      if (entryType == 'Steam') {
+        // Handle Steam entries with steam:// format
+        final steamUri = content['uri'] as String?;
+        if (steamUri == null || !steamUri.startsWith('steam://')) {
+          continue; // Skip invalid Steam URIs
+        }
+
+        final secret = steamUri.split('steam://')[1];
+        final name = content['name'] as String? ?? '';
+
+        code = Code.fromAccountAndSecret(
+          Type.steam,
+          '', // Steam doesn't typically have separate account
+          name, // Use name as issuer
+          secret,
+          null,
+          Code.steamDigits,
+        );
+      } else {
+        // Handle TOTP entries with otpauth:// format
+        final otpUri = content['uri'] as String?;
+        if (otpUri == null || !otpUri.startsWith('otpauth://')) {
+          continue; // Skip invalid OTP URIs
+        }
+        // Create code from OTP auth URL
+        code = Code.fromOTPAuthUrl(otpUri);
+      }
+
+      // Add note if present
+      final note = entry['note'] as String?;
+      if (note != null && note.isNotEmpty) {
+        code = code.copyWith(
+          display: code.display.copyWith(note: note),
+        );
+      }
+
+      parsedCodes.add(code);
+    } catch (e, s) {
+      Logger('ProtonImport').warning('Failed to parse entry', e, s);
+      // Continue processing other entries
+    }
+  }
+
+  // Add all parsed codes to the store
+  for (final code in parsedCodes) {
+    await CodeStore.instance.addCode(code, shouldSync: false);
+  }
+
+  // Trigger sync
+  unawaited(AuthenticatorService.instance.onlineSync());
+
+  return parsedCodes.length;
+}

mobile/apps/auth/lib/ui/settings/data/import_page.dart

@@ -17,6 +17,7 @@ enum ImportType {
   twoFas,
   bitwarden,
   lastpass,
+  proton,
 }
 
 class ImportCodePage extends StatelessWidget {
@@ -29,6 +30,7 @@ class ImportCodePage extends StatelessWidget {
     ImportType.aegis,
     ImportType.bitwarden,
     ImportType.googleAuthenticator,
+    ImportType.proton,
     ImportType.ravio,
     ImportType.lastpass,
   ];
@@ -51,6 +53,8 @@ class ImportCodePage extends StatelessWidget {
         return 'Bitwarden';
       case ImportType.lastpass:
         return 'LastPass Authenticator';
+      case ImportType.proton:
+        return 'Proton Authenticator';
     }
   }
 

mobile/apps/auth/plugins/qr/.metadata

@@ -0,0 +1,33 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: "761747bfc538b5af34aa0d3fac380f1bc331ec49"
+  channel: "stable"
+
+project_type: plugin
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+    - platform: android
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+    - platform: ios
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

mobile/apps/auth/plugins/qr/CHANGELOG.md

@@ -0,0 +1,8 @@
+## 0.0.1
+
+* Initial release of ente_qr plugin
+* Support for scanning QR codes from image files
+* Android implementation using ZXing library
+* iOS implementation using Core Image framework
+* Comprehensive error handling
+* Example app demonstrating usage with file picker

mobile/apps/auth/plugins/qr/README.md

@@ -0,0 +1,170 @@
+# ente_qr
+
+A Flutter plugin for scanning QR codes from image files. This plugin provides a simple interface to scan QR codes from images on both Android and iOS platforms.
+
+## Features
+
+- Scan QR codes from image files
+- Support for Android (using ZXing library)
+- Support for iOS (using AVFoundation/Core Image)
+- Returns structured results with error handling
+- Works with images from file picker or camera
+
+## Platform Support
+
+| Platform | Support |
+|----------|---------|
+| Android  | ✅      |
+| iOS      | ✅      |
+| Web      | ❌      |
+| macOS    | ❌      |
+| Windows  | ❌      |
+| Linux    | ❌      |
+
+## Installation
+
+Add this to your package's `pubspec.yaml` file:
+
+```yaml
+dependencies:
+  ente_qr:
+    path: path/to/ente_qr
+```
+
+## Usage
+
+### Basic Usage
+
+```dart
+import 'package:ente_qr/ente_qr.dart';
+
+final qr = EnteQr();
+
+// Scan QR code from an image file
+final result = await qr.scanQrFromImage('/path/to/image.jpg');
+
+if (result.success) {
+  print('QR Code content: ${result.content}');
+} else {
+  print('Error: ${result.error}');
+}
+```
+
+### Complete Example with File Picker
+
+```dart
+import 'package:flutter/material.dart';
+import 'package:ente_qr/ente_qr.dart';
+import 'package:file_picker/file_picker.dart';
+
+class QrScannerPage extends StatefulWidget {
+  @override
+  _QrScannerPageState createState() => _QrScannerPageState();
+}
+
+class _QrScannerPageState extends State<QrScannerPage> {
+  final _enteQr = EnteQr();
+  String _result = 'No QR code scanned';
+
+  Future<void> _scanQrFromImage() async {
+    // Pick an image file
+    FilePickerResult? fileResult = await FilePicker.platform.pickFiles(
+      type: FileType.image,
+      allowMultiple: false,
+    );
+
+    if (fileResult != null && fileResult.files.single.path != null) {
+      final imagePath = fileResult.files.single.path!;
+      
+      // Scan QR code from the selected image
+      final qrResult = await _enteQr.scanQrFromImage(imagePath);
+      
+      setState(() {
+        if (qrResult.success) {
+          _result = 'QR Code: ${qrResult.content}';
+        } else {
+          _result = 'Error: ${qrResult.error}';
+        }
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: Text('QR Scanner')),
+      body: Column(
+        children: [
+          ElevatedButton(
+            onPressed: _scanQrFromImage,
+            child: Text('Pick Image and Scan QR'),
+          ),
+          Text(_result),
+        ],
+      ),
+    );
+  }
+}
+```
+
+## API Reference
+
+### EnteQr
+
+The main class for QR code scanning operations.
+
+#### Methods
+
+##### `scanQrFromImage(String imagePath)`
+
+Scans a QR code from an image file.
+
+**Parameters:**
+- `imagePath` (String): The file path to the image containing the QR code
+
+**Returns:**
+- `Future<QrScanResult>`: A result object containing either the QR code content or an error
+
+### QrScanResult
+
+The result object returned by QR scanning operations.
+
+**Properties:**
+- `content` (String?): The QR code content if successful, null otherwise
+- `error` (String?): Error message if scanning failed, null otherwise  
+- `success` (bool): Whether the scanning operation was successful
+
+**Factory Constructors:**
+- `QrScanResult.success(String content)`: Creates a successful result
+- `QrScanResult.error(String error)`: Creates an error result
+
+## Implementation Details
+
+### Android
+
+The Android implementation uses the ZXing library (com.google.zxing) for QR code detection:
+- `com.journeyapps:zxing-android-embedded:4.3.0`
+- `com.google.zxing:core:3.5.1`
+
+### iOS
+
+The iOS implementation uses Core Image framework's built-in QR code detection capabilities via `CIDetector`.
+
+## Error Handling
+
+The plugin provides comprehensive error handling for common scenarios:
+- File not found
+- Invalid image format
+- No QR code found in image
+- Platform-specific errors
+- Unexpected errors
+
+All errors are returned as part of the `QrScanResult` object with descriptive error messages.
+
+## Contributing
+
+Contributions are welcome! Please feel free to submit a Pull Request.
+
+## License
+
+This project is licensed under the same license as the Ente project.

mobile/apps/auth/plugins/qr/analysis_options.yaml

@@ -0,0 +1 @@
+include: ../../analysis_options.yaml

mobile/apps/auth/plugins/qr/android/build.gradle

@@ -0,0 +1,65 @@
+group 'io.ente.auth.ente_qr'
+version '1.0-SNAPSHOT'
+
+buildscript {
+    ext.kotlin_version = '1.7.10'
+    repositories {
+        google()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
+rootProject.allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion 33
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+        test.java.srcDirs += 'src/test/kotlin'
+    }
+
+    defaultConfig {
+        minSdkVersion 16
+    }
+
+    dependencies {
+        implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+        implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
+        implementation 'com.google.zxing:core:3.5.1'
+    }
+
+    testOptions {
+        unitTests.all {
+            useJUnitPlatform()
+
+            testLogging {
+               events "passed", "skipped", "failed", "standardOut", "standardError"
+               outputs.upToDateWhen {false}
+               showStandardStreams = true
+            }
+        }
+    }
+}

mobile/apps/auth/plugins/qr/android/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'ente_qr'

mobile/apps/auth/plugins/qr/android/src/main/AndroidManifest.xml

@@ -0,0 +1,3 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="io.ente.auth.ente_qr">
+</manifest>

mobile/apps/auth/plugins/qr/android/src/main/kotlin/io/ente/auth/ente_qr/EnteQrPlugin.kt

@@ -0,0 +1,138 @@
+package io.ente.auth.ente_qr
+
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import androidx.annotation.NonNull
+import com.google.zxing.BarcodeFormat
+import com.google.zxing.BinaryBitmap
+import com.google.zxing.DecodeHintType
+import com.google.zxing.MultiFormatReader
+import com.google.zxing.NotFoundException
+import com.google.zxing.RGBLuminanceSource
+import com.google.zxing.Result as ZXingResult
+import com.google.zxing.common.HybridBinarizer
+import io.flutter.embedding.engine.plugins.FlutterPlugin
+import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.MethodChannel
+import io.flutter.plugin.common.MethodChannel.MethodCallHandler
+import io.flutter.plugin.common.MethodChannel.Result
+import java.io.File
+import java.util.*
+
+/** EnteQrPlugin */
+class EnteQrPlugin: FlutterPlugin, MethodCallHandler {
+  /// The MethodChannel that will the communication between Flutter and native Android
+  ///
+  /// This local reference serves to register the plugin with the Flutter Engine and unregister it
+  /// when the Flutter Engine is detached from the Activity
+  private lateinit var channel : MethodChannel
+
+  override fun onAttachedToEngine(@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
+    channel = MethodChannel(flutterPluginBinding.binaryMessenger, "ente_qr")
+    channel.setMethodCallHandler(this)
+  }
+
+  override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) {
+    when (call.method) {
+      "getPlatformVersion" -> {
+        result.success("Android ${android.os.Build.VERSION.RELEASE}")
+      }
+      "scanQrFromImage" -> {
+        val imagePath = call.argument<String>("imagePath")
+        if (imagePath == null) {
+          result.success(mapOf(
+            "success" to false,
+            "error" to "Image path is required"
+          ))
+          return
+        }
+        
+        try {
+          val qrResult = scanQrCode(imagePath)
+          result.success(qrResult)
+        } catch (e: Exception) {
+          result.success(mapOf(
+            "success" to false,
+            "error" to "Error scanning QR code: ${e.message}"
+          ))
+        }
+      }
+      else -> {
+        result.notImplemented()
+      }
+    }
+  }
+
+  private fun scanQrCode(imagePath: String): Map<String, Any> {
+    try {
+      val file = File(imagePath)
+      if (!file.exists()) {
+        return mapOf(
+          "success" to false,
+          "error" to "Image file not found: $imagePath"
+        )
+      }
+
+      var bitmap = BitmapFactory.decodeFile(imagePath)
+      if (bitmap == null) {
+        return mapOf(
+          "success" to false,
+          "error" to "Unable to decode image file"
+        )
+      }
+
+      // Try multiple times with different image sizes like Aegis does
+      for (i in 0..2) {
+        if (i != 0) {
+          // Resize bitmap for subsequent attempts
+          val newWidth = bitmap.width / (i * 2)
+          val newHeight = bitmap.height / (i * 2)
+          if (newWidth > 0 && newHeight > 0) {
+            bitmap = Bitmap.createScaledBitmap(bitmap, newWidth, newHeight, true)
+          }
+        }
+
+        try {
+          val width = bitmap.width
+          val height = bitmap.height
+          val pixels = IntArray(width * height)
+          bitmap.getPixels(pixels, 0, width, 0, 0, width, height)
+
+          val source = RGBLuminanceSource(width, height, pixels)
+          val binaryBitmap = BinaryBitmap(HybridBinarizer(source))
+
+          val reader = MultiFormatReader()
+          val hints = HashMap<DecodeHintType, Any>()
+          hints[DecodeHintType.POSSIBLE_FORMATS] = listOf(BarcodeFormat.QR_CODE)
+          hints[DecodeHintType.TRY_HARDER] = true
+          hints[DecodeHintType.ALSO_INVERTED] = true
+          reader.setHints(hints)
+
+          val qrResult: ZXingResult = reader.decode(binaryBitmap)
+          
+          return mapOf(
+            "success" to true,
+            "content" to qrResult.text
+          )
+        } catch (e: NotFoundException) {
+          // Continue to next iteration
+          continue
+        }
+      }
+
+      return mapOf(
+        "success" to false,
+        "error" to "No QR code found in image"
+      )
+    } catch (e: Exception) {
+      return mapOf(
+        "success" to false,
+        "error" to "Error scanning QR code: ${e.message}"
+      )
+    }
+  }
+
+  override fun onDetachedFromEngine(@NonNull binding: FlutterPlugin.FlutterPluginBinding) {
+    channel.setMethodCallHandler(null)
+  }
+}

mobile/apps/auth/plugins/qr/ios/Classes/EnteQrPlugin.swift

@@ -0,0 +1,77 @@
+import Flutter
+import UIKit
+import AVFoundation
+
+public class EnteQrPlugin: NSObject, FlutterPlugin {
+  public static func register(with registrar: FlutterPluginRegistrar) {
+    let channel = FlutterMethodChannel(name: "ente_qr", binaryMessenger: registrar.messenger())
+    let instance = EnteQrPlugin()
+    registrar.addMethodCallDelegate(instance, channel: channel)
+  }
+
+  public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+    switch call.method {
+    case "getPlatformVersion":
+      result("iOS " + UIDevice.current.systemVersion)
+    case "scanQrFromImage":
+      guard let args = call.arguments as? [String: Any],
+            let imagePath = args["imagePath"] as? String else {
+        result([
+          "success": false,
+          "error": "Image path is required"
+        ])
+        return
+      }
+      
+      scanQrCode(from: imagePath, result: result)
+    default:
+      result(FlutterMethodNotImplemented)
+    }
+  }
+  
+  private func scanQrCode(from imagePath: String, result: @escaping FlutterResult) {
+    guard let image = UIImage(contentsOfFile: imagePath) else {
+      result([
+        "success": false,
+        "error": "Unable to load image from path: \(imagePath)"
+      ])
+      return
+    }
+    
+    guard let cgImage = image.cgImage else {
+      result([
+        "success": false,
+        "error": "Unable to get CGImage from UIImage"
+      ])
+      return
+    }
+    
+    let detector = CIDetector(ofType: CIDetectorTypeQRCode, 
+                             context: nil, 
+                             options: [CIDetectorAccuracy: CIDetectorAccuracyHigh])
+    
+    guard let qrDetector = detector else {
+      result([
+        "success": false,
+        "error": "Unable to create QR code detector"
+      ])
+      return
+    }
+    
+    let ciImage = CIImage(cgImage: cgImage)
+    let features = qrDetector.features(in: ciImage)
+    
+    if let qrFeature = features.first as? CIQRCodeFeature,
+       let messageString = qrFeature.messageString {
+      result([
+        "success": true,
+        "content": messageString
+      ])
+    } else {
+      result([
+        "success": false,
+        "error": "No QR code found in image"
+      ])
+    }
+  }
+}

mobile/apps/auth/plugins/qr/ios/ente_qr.podspec

@@ -0,0 +1,23 @@
+#
+# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html.
+# Run `pod lib lint ente_qr.podspec` to validate before publishing.
+#
+Pod::Spec.new do |s|
+  s.name             = 'ente_qr'
+  s.version          = '0.0.1'
+  s.summary          = 'A QR code reader plugin for Ente.'
+  s.description      = <<-DESC
+A QR code reader plugin for Ente.
+                       DESC
+  s.homepage         = 'https://ente.io'
+  s.license          = { :file => '../LICENSE' }
+  s.author           = { 'Ente' => 'team@ente.io' }
+  s.source           = { :path => '.' }
+  s.source_files = 'Classes/**/*'
+  s.dependency 'Flutter'
+  s.platform = :ios, '9.0'
+
+  # Flutter.framework does not contain a i386 slice.
+  s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
+  s.swift_version = '5.0'
+end

mobile/apps/auth/plugins/qr/lib/ente_qr.dart

@@ -0,0 +1,30 @@
+import 'package:ente_qr/ente_qr_platform_interface.dart';
+
+export 'ente_qr_platform_interface.dart' show QrScanResult;
+
+class EnteQr {
+  Future<String?> getPlatformVersion() {
+    return EnteQrPlatform.instance.getPlatformVersion();
+  }
+
+  /// Scans a QR code from an image file at the given path.
+  ///
+  /// [imagePath] - The file path to the image containing the QR code
+  ///
+  /// Returns a [QrScanResult] containing either the QR code content on success
+  /// or an error message on failure.
+  ///
+  /// Example:
+  /// ```dart
+  /// final qr = EnteQr();
+  /// final result = await qr.scanQrFromImage('/path/to/image.jpg');
+  /// if (result.success) {
+  ///   print('QR Code content: ${result.content}');
+  /// } else {
+  ///   print('Error: ${result.error}');
+  /// }
+  /// ```
+  Future<QrScanResult> scanQrFromImage(String imagePath) {
+    return EnteQrPlatform.instance.scanQrFromImage(imagePath);
+  }
+}

mobile/apps/auth/plugins/qr/lib/ente_qr_method_channel.dart

@@ -0,0 +1,52 @@
+import 'package:ente_qr/ente_qr_platform_interface.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
+
+/// An implementation of [EnteQrPlatform] that uses method channels.
+class MethodChannelEnteQr extends EnteQrPlatform {
+  /// The method channel used to interact with the native platform.
+  @visibleForTesting
+  final methodChannel = const MethodChannel('ente_qr');
+
+  @override
+  Future<String?> getPlatformVersion() async {
+    final version =
+        await methodChannel.invokeMethod<String>('getPlatformVersion');
+    return version;
+  }
+
+  @override
+  Future<QrScanResult> scanQrFromImage(String imagePath) async {
+    try {
+      final dynamic result = await methodChannel.invokeMethod(
+        'scanQrFromImage',
+        {'imagePath': imagePath},
+      );
+
+      if (result == null) {
+        return QrScanResult.error('Failed to scan QR code');
+      }
+
+      // Convert to Map<String, dynamic> safely
+      final Map<String, dynamic> resultMap =
+          Map<String, dynamic>.from(result as Map);
+
+      final bool success = resultMap['success'] as bool? ?? false;
+      if (success) {
+        final String? content = resultMap['content'] as String?;
+        if (content != null && content.isNotEmpty) {
+          return QrScanResult.success(content);
+        } else {
+          return QrScanResult.error('No QR code found in image');
+        }
+      } else {
+        final String? error = resultMap['error'] as String?;
+        return QrScanResult.error(error ?? 'Unknown error occurred');
+      }
+    } on PlatformException catch (e) {
+      return QrScanResult.error('Platform error: ${e.message}');
+    } catch (e) {
+      return QrScanResult.error('Unexpected error: $e');
+    }
+  }
+}

mobile/apps/auth/plugins/qr/lib/ente_qr_platform_interface.dart

@@ -0,0 +1,61 @@
+import 'package:ente_qr/ente_qr_method_channel.dart';
+import 'package:plugin_platform_interface/plugin_platform_interface.dart';
+
+/// The result of QR code scanning
+class QrScanResult {
+  final String? content;
+  final String? error;
+  final bool success;
+
+  const QrScanResult({
+    this.content,
+    this.error,
+    required this.success,
+  });
+
+  factory QrScanResult.success(String content) {
+    return QrScanResult(
+      content: content,
+      success: true,
+    );
+  }
+
+  factory QrScanResult.error(String error) {
+    return QrScanResult(
+      error: error,
+      success: false,
+    );
+  }
+}
+
+abstract class EnteQrPlatform extends PlatformInterface {
+  /// Constructs a EnteQrPlatform.
+  EnteQrPlatform() : super(token: _token);
+
+  static final Object _token = Object();
+
+  static EnteQrPlatform _instance = MethodChannelEnteQr();
+
+  /// The default instance of [EnteQrPlatform] to use.
+  ///
+  /// Defaults to [MethodChannelEnteQr].
+  static EnteQrPlatform get instance => _instance;
+
+  /// Platform-specific implementations should set this with their own
+  /// platform-specific class that extends [EnteQrPlatform] when
+  /// they register themselves.
+  static set instance(EnteQrPlatform instance) {
+    PlatformInterface.verifyToken(instance, _token);
+    _instance = instance;
+  }
+
+  Future<String?> getPlatformVersion() {
+    throw UnimplementedError('platformVersion() has not been implemented.');
+  }
+
+  /// Scans a QR code from an image file at the given path.
+  /// Returns the QR code content as a string if successful, null otherwise.
+  Future<QrScanResult> scanQrFromImage(String imagePath) {
+    throw UnimplementedError('scanQrFromImage() has not been implemented.');
+  }
+}

mobile/apps/auth/plugins/qr/pubspec.lock

@@ -0,0 +1,213 @@
+# Generated by pub
+# See https://dart.dev/tools/pub/glossary#lockfile
+packages:
+  async:
+    dependency: transitive
+    description:
+      name: async
+      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.13.0"
+  boolean_selector:
+    dependency: transitive
+    description:
+      name: boolean_selector
+      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.0"
+  clock:
+    dependency: transitive
+    description:
+      name: clock
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.2"
+  collection:
+    dependency: transitive
+    description:
+      name: collection
+      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.19.1"
+  fake_async:
+    dependency: transitive
+    description:
+      name: fake_async
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.3"
+  flutter:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  flutter_lints:
+    dependency: "direct dev"
+    description:
+      name: flutter_lints
+      sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
+  flutter_test:
+    dependency: "direct dev"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.9"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.9"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
+  lints:
+    dependency: transitive
+    description:
+      name: lints
+      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
+  matcher:
+    dependency: transitive
+    description:
+      name: matcher
+      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.12.17"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.11.1"
+  meta:
+    dependency: transitive
+    description:
+      name: meta
+      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.16.0"
+  path:
+    dependency: transitive
+    description:
+      name: path
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.9.1"
+  plugin_platform_interface:
+    dependency: "direct main"
+    description:
+      name: plugin_platform_interface
+      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.8"
+  sky_engine:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  source_span:
+    dependency: transitive
+    description:
+      name: source_span
+      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.10.1"
+  stack_trace:
+    dependency: transitive
+    description:
+      name: stack_trace
+      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.12.1"
+  stream_channel:
+    dependency: transitive
+    description:
+      name: stream_channel
+      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.4"
+  string_scanner:
+    dependency: transitive
+    description:
+      name: string_scanner
+      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.1"
+  term_glyph:
+    dependency: transitive
+    description:
+      name: term_glyph
+      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.2"
+  test_api:
+    dependency: transitive
+    description:
+      name: test_api
+      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.7.4"
+  vector_math:
+    dependency: transitive
+    description:
+      name: vector_math
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.4"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
+      url: "https://pub.dev"
+    source: hosted
+    version: "15.0.0"
+sdks:
+  dart: ">=3.7.0-0 <4.0.0"
+  flutter: ">=3.18.0-18.0.pre.54"

mobile/apps/auth/plugins/qr/pubspec.yaml

@@ -0,0 +1,29 @@
+name: ente_qr
+description: "A QR code reader plugin for Ente."
+version: 0.0.1
+homepage: https://ente.io
+
+environment:
+  sdk: '>=3.4.3 <4.0.0'
+  flutter: '>=3.3.0'
+
+dependencies:
+  flutter:
+    sdk: flutter
+  plugin_platform_interface: ^2.0.2
+
+dev_dependencies:
+  flutter_lints: ^3.0.0
+  flutter_test:
+    sdk: flutter
+
+# The following section is specific to Flutter packages.
+flutter:
+  # This section identifies this Flutter project as a plugin project.
+  plugin:
+    platforms:
+      android:
+        package: io.ente.auth.ente_qr
+        pluginClass: EnteQrPlugin
+      ios:
+        pluginClass: EnteQrPlugin

mobile/apps/auth/plugins/qr/test/ente_qr_test.dart

@@ -0,0 +1,32 @@
+import 'package:ente_qr/ente_qr.dart';
+import 'package:ente_qr/ente_qr_method_channel.dart';
+import 'package:ente_qr/ente_qr_platform_interface.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:plugin_platform_interface/plugin_platform_interface.dart';
+
+class MockEnteQrPlatform
+    with MockPlatformInterfaceMixin
+    implements EnteQrPlatform {
+  @override
+  Future<String?> getPlatformVersion() => Future.value('42');
+
+  @override
+  Future<QrScanResult> scanQrFromImage(String imagePath) =>
+      Future.value(QrScanResult.error('Mock implementation'));
+}
+
+void main() {
+  final EnteQrPlatform initialPlatform = EnteQrPlatform.instance;
+
+  test('$MethodChannelEnteQr is the default instance', () {
+    expect(initialPlatform, isInstanceOf<MethodChannelEnteQr>());
+  });
+
+  test('getPlatformVersion', () async {
+    final EnteQr enteQrPlugin = EnteQr();
+    final MockEnteQrPlatform fakePlatform = MockEnteQrPlatform();
+    EnteQrPlatform.instance = fakePlatform;
+
+    expect(await enteQrPlugin.getPlatformVersion(), '42');
+  });
+}

mobile/apps/auth/pubspec.lock

@@ -451,6 +451,13 @@ packages:
       relative: true
     source: path
     version: "1.0.0"
+  ente_qr:
+    dependency: "direct main"
+    description:
+      path: "plugins/qr"
+      relative: true
+    source: path
+    version: "0.0.1"
   ente_strings:
     dependency: "direct main"
     description:
@@ -466,7 +473,7 @@ packages:
     source: path
     version: "1.0.0"
   ente_utils:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
       path: "../../packages/utils"
       relative: true
@@ -532,10 +539,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: ef9908739bdd9c476353d6adff72e88fd00c625f5b959ae23f7567bd5137db0a
+      sha256: e7e16c9d15c36330b94ca0e2ad8cb61f93cd5282d0158c09805aed13b5452f22
       url: "https://pub.dev"
     source: hosted
-    version: "10.2.0"
+    version: "10.3.2"
   file_saver:
     dependency: "direct main"
     description:
@@ -951,7 +958,7 @@ packages:
     source: hosted
     version: "0.1.0"
   image:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: image
       sha256: "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928"

mobile/apps/auth/pubspec.yaml

@@ -1,6 +1,6 @@
 name: ente_auth
 description: ente two-factor authenticator
-version: 4.4.6+446
+version: 4.4.7+447
 publish_to: none
 
 environment:
@@ -41,6 +41,8 @@ dependencies:
     path: ../../packages/logging
   ente_network:
     path: ../../packages/network
+  ente_qr:
+    path: plugins/qr
   ente_strings:
     path: ../../packages/strings
   ente_ui:
@@ -50,7 +52,7 @@ dependencies:
   expansion_tile_card: ^3.0.0
   ffi: ^2.1.0
   figma_squircle: ^0.6.3
-  file_picker: ^10.2.0
+  file_picker: ^10.3.2
   file_saver: ^0.3.1
   fixnum: ^1.1.0
   fk_user_agent: # no package updates on pub.dev
@@ -84,6 +86,7 @@ dependencies:
   google_nav_bar: ^5.0.5 #supported
   gradient_borders: ^1.0.0
   http: ^1.1.0
+  image: ^4.5.4
   intl: ^0.20.2
   io: ^1.0.4
   json_annotation: ^4.5.0

mobile/apps/auth/pubspec_overrides.yaml

@@ -0,0 +1,22 @@
+# melos_managed_dependency_overrides: ente_accounts,ente_base,ente_configuration,ente_events,ente_lock_screen,ente_logging,ente_network,ente_strings,ente_ui,ente_utils
+dependency_overrides:
+  ente_accounts:
+    path: ../../packages/accounts
+  ente_base:
+    path: ../../packages/base
+  ente_configuration:
+    path: ../../packages/configuration
+  ente_events:
+    path: ../../packages/events
+  ente_lock_screen:
+    path: ../../packages/lock_screen
+  ente_logging:
+    path: ../../packages/logging
+  ente_network:
+    path: ../../packages/network
+  ente_strings:
+    path: ../../packages/strings
+  ente_ui:
+    path: ../../packages/ui
+  ente_utils:
+    path: ../../packages/utils

mobile/apps/locker/analysis_options.yaml

@@ -1,72 +1 @@
-# For more linters, we can check https://dart-lang.github.io/linter/lints/index.html
-# or https://pub.dev/packages/lint (Effective dart)
-# use "flutter analyze ." or "dart  analyze ." for running lint checks
-
-include: package:flutter_lints/flutter.yaml
-linter:
-  rules:
-    # Ref https://github.com/flutter/packages/blob/master/packages/flutter_lints/lib/flutter.yaml
-    # Ref https://dart-lang.github.io/linter/lints/
-    - avoid_print
-    - avoid_unnecessary_containers
-    - avoid_web_libraries_in_flutter
-    - no_logic_in_create_state
-    - prefer_const_constructors
-    - prefer_const_constructors_in_immutables
-    - prefer_const_declarations
-    - prefer_const_literals_to_create_immutables
-    - prefer_final_locals
-    - require_trailing_commas
-    - sized_box_for_whitespace
-    - use_full_hex_values_for_flutter_colors
-    - use_key_in_widget_constructors
-    - cancel_subscriptions
-
-
-    - avoid_empty_else
-    - exhaustive_cases
-
-    # just style suggestions
-    - sort_pub_dependencies
-    - use_rethrow_when_possible
-    - prefer_double_quotes
-    - directives_ordering
-    - always_use_package_imports
-    - sort_child_properties_last
-    - unawaited_futures
-
-analyzer:
-  errors:
-    avoid_empty_else: error
-    exhaustive_cases: error
-    curly_braces_in_flow_control_structures: error
-    directives_ordering: error
-    require_trailing_commas: error
-    always_use_package_imports: warning
-    prefer_final_fields: error
-    unused_import: error
-    camel_case_types: error
-    prefer_is_empty: warning
-    use_rethrow_when_possible: info
-    unused_field: warning
-    use_key_in_widget_constructors: warning
-    sort_child_properties_last: warning
-    sort_pub_dependencies: warning
-    library_private_types_in_public_api: warning
-    constant_identifier_names: ignore
-    prefer_const_constructors: warning
-    prefer_const_declarations: warning
-    prefer_const_constructors_in_immutables: warning
-    prefer_final_locals: warning
-    unnecessary_const: error
-    cancel_subscriptions: error
-    unrelated_type_equality_checks: error
-    unnecessary_cast: info
-
-
-    unawaited_futures: warning # convert to warning after fixing existing issues
-    invalid_dependency: info
-    use_build_context_synchronously: ignore # experimental lint, requires many changes
-    prefer_interpolation_to_compose_strings: ignore # later too many warnings
-    prefer_double_quotes: ignore # too many warnings
-    avoid_renaming_method_parameters: ignore # incorrect warnings for `equals` overrides
+include: ../../analysis_options.yaml

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

@@ -54,4 +54,5 @@
             <data android:mimeType="text/plain"/>
         </intent>
     </queries>
+    <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
 </manifest>

mobile/apps/locker/android/app/src/main/kotlin/io/ente/locker/MainActivity.kt

@@ -1,5 +1,6 @@
 package io.ente.locker
 
-import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.android.FlutterFragmentActivity
 
-class MainActivity: FlutterActivity()
+class MainActivity: FlutterFragmentActivity() {
+}

mobile/apps/locker/ios/Podfile.lock

@@ -188,37 +188,37 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
-  app_links: f3e17e4ee5e357b39d8b95290a9b2c299fca71c6
-  cupertino_http: 947a233f40cfea55167a49f2facc18434ea117ba
-  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
+  app_links: 76b66b60cc809390ca1ad69bfd66b998d2387ac7
+  cupertino_http: 94ac07f5ff090b8effa6c5e2c47871d48ab7c86c
+  device_info_plus: 335f3ce08d2e174b9fdc3db3db0f4e3b1f66bd89
   DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
   DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
-  file_picker: b159e0c068aef54932bb15dc9fd1571818edaf49
-  file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808
+  file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
+  file_saver: 6cdbcddd690cb02b0c1a0c225b37cd805c2bf8b6
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_email_sender: e03bdda7637bcd3539bfe718fddd980e9508efaa
-  flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
-  flutter_local_authentication: 1172a4dd88f6306dadce067454e2c4caf07977bb
-  flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
-  fluttertoast: 21eecd6935e7064cc1fcb733a4c5a428f3f24f0f
-  listen_sharing_intent: 74a842adcbcf7bedf7bbc938c749da9155141b9a
-  local_auth_darwin: 66e40372f1c29f383a314c738c7446e2f7fdadc3
-  objective_c: 77e887b5ba1827970907e10e832eec1683f3431d
-  open_file_ios: 461db5853723763573e140de3193656f91990d9e
+  flutter_email_sender: aa1e9772696691d02cd91fea829856c11efb8e58
+  flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
+  flutter_local_authentication: 989278c681612f1ee0e36019e149137f114b9d7f
+  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
+  fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1
+  listen_sharing_intent: fe0b9a59913cc124dd6cbd55cd9f881de5f75759
+  local_auth_darwin: 553ce4f9b16d3fdfeafce9cf042e7c9f77c1c391
+  objective_c: 89e720c30d716b036faf9c9684022048eee1eee2
+  open_file_ios: 5ff7526df64e4394b4fe207636b67a95e83078bb
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
-  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  privacy_screen: 1a131c052ceb3c3659934b003b0d397c2381a24e
+  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  privacy_screen: 3159a541f5d3a31bea916cfd4e58f9dc722b3fd4
   SDWebImage: f29024626962457f3470184232766516dee8dfea
   Sentry: da60d980b197a46db0b35ea12cb8f39af48d8854
-  sentry_flutter: 2df8b0aab7e4aba81261c230cbea31c82a62dd1b
-  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  sodium_libs: 1faae17af662384acbd13e41867a0008cd2e2318
-  sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
+  sentry_flutter: 27892878729f42701297c628eb90e7c6529f3684
+  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  sodium_libs: 6c6d0e83f4ee427c6464caa1f1bdc2abf3ca0b7f
+  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
   SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
-  ua_client_hints: aeabd123262c087f0ce151ef96fa3ab77bfc8b38
-  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
+  ua_client_hints: 92fe0d139619b73ec9fcb46cc7e079a26178f586
+  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
 
 PODFILE CHECKSUM: d2d3220ea22664a259778d9e314054751db31361
 

mobile/apps/locker/lib/app.dart

@@ -7,8 +7,7 @@ import 'package:ente_events/event_bus.dart';
 import 'package:ente_events/models/signed_in_event.dart';
 import 'package:ente_events/models/signed_out_event.dart';
 import 'package:ente_strings/l10n/strings_localizations.dart';
-import 'package:ente_ui/theme/colors.dart';
-import 'package:ente_ui/theme/ente_theme_data.dart';
+import "package:ente_ui/theme/ente_theme_data.dart";
 import 'package:ente_ui/utils/window_listener_service.dart';
 import 'package:flutter/foundation.dart';
 import "package:flutter/material.dart";
@@ -87,37 +86,14 @@ class _AppState extends State<App>
 
   @override
   Widget build(BuildContext context) {
-    final schemes = ColorSchemeBuilder.fromCustomColors(
-      primary700: const Color(0xFF1565C0), // Dark blue
-      primary500: const Color(0xFF2196F3), // Material blue
-      primary400: const Color(0xFF42A5F5), // Light blue
-      primary300: const Color(0xFF90CAF9), // Very light blue
-      iconButtonColor: const Color(0xFF1976D2), // Custom icon color
-      gradientButtonBgColors: const [
-        Color(0xFF1565C0),
-        Color(0xFF2196F3),
-        Color(0xFF42A5F5),
-      ],
-    );
-
-    final lightTheme = createAppThemeData(
-      brightness: Brightness.light,
-      colorScheme: schemes.light,
-    );
-
-    final darkTheme = createAppThemeData(
-      brightness: Brightness.dark,
-      colorScheme: schemes.dark,
-    );
-
     Widget buildApp() {
       if (Platform.isAndroid ||
           Platform.isWindows ||
           Platform.isLinux ||
           kDebugMode) {
         return AdaptiveTheme(
-          light: lightTheme,
-          dark: darkTheme,
+          light: lightThemeData,
+          dark: darkThemeData,
           initial: AdaptiveThemeMode.system,
           builder: (lightTheme, dartTheme) => MaterialApp(
             title: "ente",
@@ -142,8 +118,8 @@ class _AppState extends State<App>
         return MaterialApp(
           title: "ente",
           themeMode: ThemeMode.system,
-          theme: lightTheme,
-          darkTheme: darkTheme,
+          theme: lightThemeData,
+          darkTheme: darkThemeData,
           debugShowCheckedModeBanner: false,
           locale: locale,
           supportedLocales: appSupportedLocales,

mobile/apps/locker/lib/core/constants.dart

@@ -18,6 +18,9 @@ final tempDirCleanUpInterval = kDebugMode
     ? const Duration(hours: 1).inMicroseconds
     : const Duration(hours: 6).inMicroseconds;
 
+// Note: 0 indicates no device limit
+const publicLinkDeviceLimits = [0, 50, 25, 10, 5, 2, 1];
+
 const uploadTempFilePrefix = "upload_file_";
 
 const blackThumbnailBase64 = '/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAEBAQEBAQEB'

mobile/apps/locker/lib/core/errors.dart

@@ -17,6 +17,8 @@ class WiFiUnavailableError extends Error {}
 
 class SilentlyCancelUploadsError extends Error {}
 
+class SharingNotPermittedForFreeAccountsError extends Error {}
+
 class InvalidFileError extends ArgumentError {
   final InvalidReason reason;
 

mobile/apps/locker/lib/extensions/user_extension.dart

@@ -0,0 +1,12 @@
+import "package:ente_sharing/models/user.dart"; 
+
+extension UserExtension on User {
+  //Some initial users have name in name field.
+  String? get displayName =>
+      // ignore: deprecated_member_use_from_same_package, deprecated_member_use
+      ((name?.isEmpty ?? true) ? null : name);
+
+  String get nameOrEmail {
+    return email.substring(0, email.indexOf("@"));
+  }
+}

mobile/apps/locker/lib/l10n/app_en.arb

@@ -349,5 +349,162 @@
   "mastodon": "Mastodon",
   "matrix": "Matrix",
   "discord": "Discord",
-  "reddit": "Reddit"
+  "reddit": "Reddit",
+  "allowDownloads": "Allow downloads",
+  "sharedByYou": "Shared by you",
+  "sharedWithYou": "Shared with you",
+  "manageLink": "Manage link",
+  "linkExpiry": "Link expiry",
+  "linkNeverExpires": "Never",
+  "linkExpired": "Expired",
+  "linkEnabled": "Enabled",
+  "setAPassword": "Set a password",
+  "lockButtonLabel": "Lock",
+  "enterPassword": "Enter password",
+  "removeLink": "Remove link",
+  "sendLink": "Send link",
+  "setPasswordTitle": "Set password",
+  "resetPasswordTitle": "Reset password",
+  "allowAddingFiles": "Allow adding files",
+  "disableDownloadWarningTitle": "Please note",
+  "disableDownloadWarningBody": "Viewers can still take screenshots or save a copy of your files using external tools.",
+  "allowAddFilesDescription": "Allow people with the link to also add files to the shared collection.",
+  "after1Hour": "After 1 hour",
+  "after1Day": "After 1 day",
+  "after1Week": "After 1 week",
+  "after1Month": "After 1 month",
+  "after1Year": "After 1 year",
+  "never": "Never",
+  "custom": "Custom",
+  "selectTime": "Select time",
+  "selectDate": "Select date",
+  "previous": "Previous",
+  "done": "Done",
+  "next": "Next",
+  "noDeviceLimit": "None",
+  "linkDeviceLimit": "Device limit",
+  "expiredLinkInfo": "This link has expired. Please select a new expiry time or disable link expiry.",
+  "linkExpiresOn": "Link will expire on {expiryTime}",
+  "shareWithPeopleSectionTitle": "{numberOfPeople, plural, =0 {Share with specific people} =1 {Shared with 1 person} other {Shared with {numberOfPeople} people}}",
+  "@shareWithPeopleSectionTitle": {
+    "placeholders": {
+      "numberOfPeople": {
+        "type": "int",
+        "example": "2"
+      }
+    }
+  },
+  "linkHasExpired": "Link has expired",
+  "publicLinkEnabled": "Public link enabled",
+  "shareALink": "Share a link",
+  "addViewer": "Add viewer",
+  "addCollaborator": "Add collaborator",
+  "addANewEmail": "Add a new email",
+  "orPickAnExistingOne": "Or pick an existing one",
+  "sharedCollectionSectionDescription": "Create shared and collaborative collections with other Ente users, including users on free plans.",
+  "createPublicLink": "Create public link",
+  "addParticipants": "Add participants",
+  "add": "Add",
+  "collaboratorsCanAddFilesToTheSharedCollection": "Collaborators can add files to the shared collection.",
+  "enterEmail": "Enter email",
+  "viewersSuccessfullyAdded": "{count, plural, =0 {Added 0 viewers} =1 {Added 1 viewer} other {Added {count} viewers}}",
+  "@viewersSuccessfullyAdded": {
+    "placeholders": {
+      "count": {
+        "type": "int",
+        "example": "2"
+      }
+    },
+    "description": "Number of viewers that were successfully added to a collection."
+  },
+  "collaboratorsSuccessfullyAdded": "{count, plural, =0 {Added 0 collaborator} =1 {Added 1 collaborator} other {Added {count} collaborators}}",
+  "@collaboratorsSuccessfullyAdded": {
+    "placeholders": {
+      "count": {
+        "type": "int",
+        "example": "2"
+      }
+    },
+    "description": "Number of collaborators that were successfully added to a collection."
+  },
+  "addViewers": "{count, plural, =0 {Add viewer} =1 {Add viewer} other {Add viewers}}",
+  "addCollaborators": "{count, plural, =0 {Add collaborator} =1 {Add collaborator} other {Add collaborators}}",
+  "longPressAnEmailToVerifyEndToEndEncryption": "Long press an email to verify end to end encryption.",
+  "sharing": "Sharing...",
+  "invalidEmailAddress": "Invalid email address",
+  "enterValidEmail": "Please enter a valid email address.",
+  "oops": "Oops",
+  "youCannotShareWithYourself": "You cannot share with yourself",
+  "inviteToEnte": "Invite to Ente",
+  "sendInvite": "Send invite",
+  "shareTextRecommendUsingEnte": "Download Ente so we can easily share original quality files\n\nhttps://ente.io",
+  "thisIsYourVerificationId": "This is your Verification ID",
+  "someoneSharingAlbumsWithYouShouldSeeTheSameId": "Someone sharing albums with you should see the same ID on their device.",
+  "howToViewShareeVerificationID": "Please ask them to long-press their email address on the settings screen, and verify that the IDs on both devices match.",
+  "thisIsPersonVerificationId": "This is {email}'s Verification ID",
+  "@thisIsPersonVerificationId": {
+    "placeholders": {
+      "email": {
+        "type": "String",
+        "example": "someone@ente.io"
+      }
+    }
+  },
+  "verificationId": "Verification ID",
+  "verifyEmailID": "Verify {email}",
+  "emailNoEnteAccount": "{email} does not have an Ente account.\n\nSend them an invite to share files.",
+  "shareMyVerificationID": "Here's my verification ID: {verificationID} for ente.io.",
+  "shareTextConfirmOthersVerificationID": "Hey, can you confirm that this is your ente.io verification ID: {verificationID}",
+  "passwordLock": "Password lock",
+  "manage": "Manage",
+  "addedAs": "Added as",
+  "removeParticipant": "Remove participant",
+  "yesConvertToViewer": "Yes, convert to viewer",
+  "changePermissions": "Change permissions",
+  "cannotAddMoreFilesAfterBecomingViewer": "{name} will no longer be able to add files to the collection after becoming a viewer.",
+  "@cannotAddMoreFilesAfterBecomingViewer": {
+    "description": "Warning message when changing a collaborator to viewer",
+    "placeholders": {
+      "name": {
+        "type": "String",
+        "example": "John"
+      }
+    }
+  },
+  "removeWithQuestionMark": "Remove?",
+  "removeParticipantBody": "{userEmail} will be removed from this shared collection\n\nAny files added by them will also be removed from the collection",
+  "yesRemove": "Yes, remove",
+  "remove": "Remove",
+  "viewer": "Viewer",
+  "collaborator": "Collaborator",
+  "collaboratorsCanAddFilesToTheSharedAlbum": "Collaborators can add files to the shared collection.",
+  "albumParticipantsCount": "{count, plural, =0 {No Participants} =1 {1 Participant} other {{count} Participants}}",
+  "@albumParticipantsCount": {
+    "description": "The count of participants in an album",
+    "placeholders": {
+      "count": {
+        "type": "int",
+        "example": "5"
+      }
+    }
+  },
+  "addMore": "Add more",
+  "you": "You",
+  "albumOwner": "Owner",
+  "typeOfCollectionTypeIsNotSupportedForRename": "Type of collection {collectionType} is not supported for rename",
+  "@typeOfCollectionTypeIsNotSupportedForRename": {
+    "placeholders": {
+      "collectionType": {
+        "type": "String",
+        "example": "no network"
+      }
+    }
+  },
+  "leaveCollection": "Leave collection",
+  "filesAddedByYouWillBeRemovedFromTheCollection": "Files added by you will be removed from the collection",
+  "leaveSharedCollection": "Leave shared collection?",
+  "noSystemLockFound": "No system lock found",
+  "toEnableAppLockPleaseSetupDevicePasscodeOrScreen": "To enable app lock, please setup device passcode or screen lock in your system settings.",
+  "legacy": "Legacy",
+  "authToManageLegacy": "Please authenticate to manage your trusted contacts"
 }

mobile/apps/locker/lib/l10n/app_localizations.dart

@@ -1017,6 +1017,588 @@ abstract class AppLocalizations {
   /// In en, this message translates to:
   /// **'Reddit'**
   String get reddit;
+
+  /// No description provided for @allowDownloads.
+  ///
+  /// In en, this message translates to:
+  /// **'Allow downloads'**
+  String get allowDownloads;
+
+  /// No description provided for @sharedByYou.
+  ///
+  /// In en, this message translates to:
+  /// **'Shared by you'**
+  String get sharedByYou;
+
+  /// No description provided for @sharedWithYou.
+  ///
+  /// In en, this message translates to:
+  /// **'Shared with you'**
+  String get sharedWithYou;
+
+  /// No description provided for @manageLink.
+  ///
+  /// In en, this message translates to:
+  /// **'Manage link'**
+  String get manageLink;
+
+  /// No description provided for @linkExpiry.
+  ///
+  /// In en, this message translates to:
+  /// **'Link expiry'**
+  String get linkExpiry;
+
+  /// No description provided for @linkNeverExpires.
+  ///
+  /// In en, this message translates to:
+  /// **'Never'**
+  String get linkNeverExpires;
+
+  /// No description provided for @linkExpired.
+  ///
+  /// In en, this message translates to:
+  /// **'Expired'**
+  String get linkExpired;
+
+  /// No description provided for @linkEnabled.
+  ///
+  /// In en, this message translates to:
+  /// **'Enabled'**
+  String get linkEnabled;
+
+  /// No description provided for @setAPassword.
+  ///
+  /// In en, this message translates to:
+  /// **'Set a password'**
+  String get setAPassword;
+
+  /// No description provided for @lockButtonLabel.
+  ///
+  /// In en, this message translates to:
+  /// **'Lock'**
+  String get lockButtonLabel;
+
+  /// No description provided for @enterPassword.
+  ///
+  /// In en, this message translates to:
+  /// **'Enter password'**
+  String get enterPassword;
+
+  /// No description provided for @removeLink.
+  ///
+  /// In en, this message translates to:
+  /// **'Remove link'**
+  String get removeLink;
+
+  /// No description provided for @sendLink.
+  ///
+  /// In en, this message translates to:
+  /// **'Send link'**
+  String get sendLink;
+
+  /// No description provided for @setPasswordTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Set password'**
+  String get setPasswordTitle;
+
+  /// No description provided for @resetPasswordTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Reset password'**
+  String get resetPasswordTitle;
+
+  /// No description provided for @allowAddingFiles.
+  ///
+  /// In en, this message translates to:
+  /// **'Allow adding files'**
+  String get allowAddingFiles;
+
+  /// No description provided for @disableDownloadWarningTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Please note'**
+  String get disableDownloadWarningTitle;
+
+  /// No description provided for @disableDownloadWarningBody.
+  ///
+  /// In en, this message translates to:
+  /// **'Viewers can still take screenshots or save a copy of your files using external tools.'**
+  String get disableDownloadWarningBody;
+
+  /// No description provided for @allowAddFilesDescription.
+  ///
+  /// In en, this message translates to:
+  /// **'Allow people with the link to also add files to the shared collection.'**
+  String get allowAddFilesDescription;
+
+  /// No description provided for @after1Hour.
+  ///
+  /// In en, this message translates to:
+  /// **'After 1 hour'**
+  String get after1Hour;
+
+  /// No description provided for @after1Day.
+  ///
+  /// In en, this message translates to:
+  /// **'After 1 day'**
+  String get after1Day;
+
+  /// No description provided for @after1Week.
+  ///
+  /// In en, this message translates to:
+  /// **'After 1 week'**
+  String get after1Week;
+
+  /// No description provided for @after1Month.
+  ///
+  /// In en, this message translates to:
+  /// **'After 1 month'**
+  String get after1Month;
+
+  /// No description provided for @after1Year.
+  ///
+  /// In en, this message translates to:
+  /// **'After 1 year'**
+  String get after1Year;
+
+  /// No description provided for @never.
+  ///
+  /// In en, this message translates to:
+  /// **'Never'**
+  String get never;
+
+  /// No description provided for @custom.
+  ///
+  /// In en, this message translates to:
+  /// **'Custom'**
+  String get custom;
+
+  /// No description provided for @selectTime.
+  ///
+  /// In en, this message translates to:
+  /// **'Select time'**
+  String get selectTime;
+
+  /// No description provided for @selectDate.
+  ///
+  /// In en, this message translates to:
+  /// **'Select date'**
+  String get selectDate;
+
+  /// No description provided for @previous.
+  ///
+  /// In en, this message translates to:
+  /// **'Previous'**
+  String get previous;
+
+  /// No description provided for @done.
+  ///
+  /// In en, this message translates to:
+  /// **'Done'**
+  String get done;
+
+  /// No description provided for @next.
+  ///
+  /// In en, this message translates to:
+  /// **'Next'**
+  String get next;
+
+  /// No description provided for @noDeviceLimit.
+  ///
+  /// In en, this message translates to:
+  /// **'None'**
+  String get noDeviceLimit;
+
+  /// No description provided for @linkDeviceLimit.
+  ///
+  /// In en, this message translates to:
+  /// **'Device limit'**
+  String get linkDeviceLimit;
+
+  /// No description provided for @expiredLinkInfo.
+  ///
+  /// In en, this message translates to:
+  /// **'This link has expired. Please select a new expiry time or disable link expiry.'**
+  String get expiredLinkInfo;
+
+  /// No description provided for @linkExpiresOn.
+  ///
+  /// In en, this message translates to:
+  /// **'Link will expire on {expiryTime}'**
+  String linkExpiresOn(Object expiryTime);
+
+  /// No description provided for @shareWithPeopleSectionTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'{numberOfPeople, plural, =0 {Share with specific people} =1 {Shared with 1 person} other {Shared with {numberOfPeople} people}}'**
+  String shareWithPeopleSectionTitle(int numberOfPeople);
+
+  /// No description provided for @linkHasExpired.
+  ///
+  /// In en, this message translates to:
+  /// **'Link has expired'**
+  String get linkHasExpired;
+
+  /// No description provided for @publicLinkEnabled.
+  ///
+  /// In en, this message translates to:
+  /// **'Public link enabled'**
+  String get publicLinkEnabled;
+
+  /// No description provided for @shareALink.
+  ///
+  /// In en, this message translates to:
+  /// **'Share a link'**
+  String get shareALink;
+
+  /// No description provided for @addViewer.
+  ///
+  /// In en, this message translates to:
+  /// **'Add viewer'**
+  String get addViewer;
+
+  /// No description provided for @addCollaborator.
+  ///
+  /// In en, this message translates to:
+  /// **'Add collaborator'**
+  String get addCollaborator;
+
+  /// No description provided for @addANewEmail.
+  ///
+  /// In en, this message translates to:
+  /// **'Add a new email'**
+  String get addANewEmail;
+
+  /// No description provided for @orPickAnExistingOne.
+  ///
+  /// In en, this message translates to:
+  /// **'Or pick an existing one'**
+  String get orPickAnExistingOne;
+
+  /// No description provided for @sharedCollectionSectionDescription.
+  ///
+  /// In en, this message translates to:
+  /// **'Create shared and collaborative collections with other Ente users, including users on free plans.'**
+  String get sharedCollectionSectionDescription;
+
+  /// No description provided for @createPublicLink.
+  ///
+  /// In en, this message translates to:
+  /// **'Create public link'**
+  String get createPublicLink;
+
+  /// No description provided for @addParticipants.
+  ///
+  /// In en, this message translates to:
+  /// **'Add participants'**
+  String get addParticipants;
+
+  /// No description provided for @add.
+  ///
+  /// In en, this message translates to:
+  /// **'Add'**
+  String get add;
+
+  /// No description provided for @collaboratorsCanAddFilesToTheSharedCollection.
+  ///
+  /// In en, this message translates to:
+  /// **'Collaborators can add files to the shared collection.'**
+  String get collaboratorsCanAddFilesToTheSharedCollection;
+
+  /// No description provided for @enterEmail.
+  ///
+  /// In en, this message translates to:
+  /// **'Enter email'**
+  String get enterEmail;
+
+  /// Number of viewers that were successfully added to a collection.
+  ///
+  /// In en, this message translates to:
+  /// **'{count, plural, =0 {Added 0 viewers} =1 {Added 1 viewer} other {Added {count} viewers}}'**
+  String viewersSuccessfullyAdded(int count);
+
+  /// Number of collaborators that were successfully added to a collection.
+  ///
+  /// In en, this message translates to:
+  /// **'{count, plural, =0 {Added 0 collaborator} =1 {Added 1 collaborator} other {Added {count} collaborators}}'**
+  String collaboratorsSuccessfullyAdded(int count);
+
+  /// No description provided for @addViewers.
+  ///
+  /// In en, this message translates to:
+  /// **'{count, plural, =0 {Add viewer} =1 {Add viewer} other {Add viewers}}'**
+  String addViewers(num count);
+
+  /// No description provided for @addCollaborators.
+  ///
+  /// In en, this message translates to:
+  /// **'{count, plural, =0 {Add collaborator} =1 {Add collaborator} other {Add collaborators}}'**
+  String addCollaborators(num count);
+
+  /// No description provided for @longPressAnEmailToVerifyEndToEndEncryption.
+  ///
+  /// In en, this message translates to:
+  /// **'Long press an email to verify end to end encryption.'**
+  String get longPressAnEmailToVerifyEndToEndEncryption;
+
+  /// No description provided for @sharing.
+  ///
+  /// In en, this message translates to:
+  /// **'Sharing...'**
+  String get sharing;
+
+  /// No description provided for @invalidEmailAddress.
+  ///
+  /// In en, this message translates to:
+  /// **'Invalid email address'**
+  String get invalidEmailAddress;
+
+  /// No description provided for @enterValidEmail.
+  ///
+  /// In en, this message translates to:
+  /// **'Please enter a valid email address.'**
+  String get enterValidEmail;
+
+  /// No description provided for @oops.
+  ///
+  /// In en, this message translates to:
+  /// **'Oops'**
+  String get oops;
+
+  /// No description provided for @youCannotShareWithYourself.
+  ///
+  /// In en, this message translates to:
+  /// **'You cannot share with yourself'**
+  String get youCannotShareWithYourself;
+
+  /// No description provided for @inviteToEnte.
+  ///
+  /// In en, this message translates to:
+  /// **'Invite to Ente'**
+  String get inviteToEnte;
+
+  /// No description provided for @sendInvite.
+  ///
+  /// In en, this message translates to:
+  /// **'Send invite'**
+  String get sendInvite;
+
+  /// No description provided for @shareTextRecommendUsingEnte.
+  ///
+  /// In en, this message translates to:
+  /// **'Download Ente so we can easily share original quality files\n\nhttps://ente.io'**
+  String get shareTextRecommendUsingEnte;
+
+  /// No description provided for @thisIsYourVerificationId.
+  ///
+  /// In en, this message translates to:
+  /// **'This is your Verification ID'**
+  String get thisIsYourVerificationId;
+
+  /// No description provided for @someoneSharingAlbumsWithYouShouldSeeTheSameId.
+  ///
+  /// In en, this message translates to:
+  /// **'Someone sharing albums with you should see the same ID on their device.'**
+  String get someoneSharingAlbumsWithYouShouldSeeTheSameId;
+
+  /// No description provided for @howToViewShareeVerificationID.
+  ///
+  /// In en, this message translates to:
+  /// **'Please ask them to long-press their email address on the settings screen, and verify that the IDs on both devices match.'**
+  String get howToViewShareeVerificationID;
+
+  /// No description provided for @thisIsPersonVerificationId.
+  ///
+  /// In en, this message translates to:
+  /// **'This is {email}\'s Verification ID'**
+  String thisIsPersonVerificationId(String email);
+
+  /// No description provided for @verificationId.
+  ///
+  /// In en, this message translates to:
+  /// **'Verification ID'**
+  String get verificationId;
+
+  /// No description provided for @verifyEmailID.
+  ///
+  /// In en, this message translates to:
+  /// **'Verify {email}'**
+  String verifyEmailID(Object email);
+
+  /// No description provided for @emailNoEnteAccount.
+  ///
+  /// In en, this message translates to:
+  /// **'{email} does not have an Ente account.\n\nSend them an invite to share files.'**
+  String emailNoEnteAccount(Object email);
+
+  /// No description provided for @shareMyVerificationID.
+  ///
+  /// In en, this message translates to:
+  /// **'Here\'s my verification ID: {verificationID} for ente.io.'**
+  String shareMyVerificationID(Object verificationID);
+
+  /// No description provided for @shareTextConfirmOthersVerificationID.
+  ///
+  /// In en, this message translates to:
+  /// **'Hey, can you confirm that this is your ente.io verification ID: {verificationID}'**
+  String shareTextConfirmOthersVerificationID(Object verificationID);
+
+  /// No description provided for @passwordLock.
+  ///
+  /// In en, this message translates to:
+  /// **'Password lock'**
+  String get passwordLock;
+
+  /// No description provided for @manage.
+  ///
+  /// In en, this message translates to:
+  /// **'Manage'**
+  String get manage;
+
+  /// No description provided for @addedAs.
+  ///
+  /// In en, this message translates to:
+  /// **'Added as'**
+  String get addedAs;
+
+  /// No description provided for @removeParticipant.
+  ///
+  /// In en, this message translates to:
+  /// **'Remove participant'**
+  String get removeParticipant;
+
+  /// No description provided for @yesConvertToViewer.
+  ///
+  /// In en, this message translates to:
+  /// **'Yes, convert to viewer'**
+  String get yesConvertToViewer;
+
+  /// No description provided for @changePermissions.
+  ///
+  /// In en, this message translates to:
+  /// **'Change permissions'**
+  String get changePermissions;
+
+  /// Warning message when changing a collaborator to viewer
+  ///
+  /// In en, this message translates to:
+  /// **'{name} will no longer be able to add files to the collection after becoming a viewer.'**
+  String cannotAddMoreFilesAfterBecomingViewer(String name);
+
+  /// No description provided for @removeWithQuestionMark.
+  ///
+  /// In en, this message translates to:
+  /// **'Remove?'**
+  String get removeWithQuestionMark;
+
+  /// No description provided for @removeParticipantBody.
+  ///
+  /// In en, this message translates to:
+  /// **'{userEmail} will be removed from this shared collection\n\nAny files added by them will also be removed from the collection'**
+  String removeParticipantBody(Object userEmail);
+
+  /// No description provided for @yesRemove.
+  ///
+  /// In en, this message translates to:
+  /// **'Yes, remove'**
+  String get yesRemove;
+
+  /// No description provided for @remove.
+  ///
+  /// In en, this message translates to:
+  /// **'Remove'**
+  String get remove;
+
+  /// No description provided for @viewer.
+  ///
+  /// In en, this message translates to:
+  /// **'Viewer'**
+  String get viewer;
+
+  /// No description provided for @collaborator.
+  ///
+  /// In en, this message translates to:
+  /// **'Collaborator'**
+  String get collaborator;
+
+  /// No description provided for @collaboratorsCanAddFilesToTheSharedAlbum.
+  ///
+  /// In en, this message translates to:
+  /// **'Collaborators can add files to the shared collection.'**
+  String get collaboratorsCanAddFilesToTheSharedAlbum;
+
+  /// The count of participants in an album
+  ///
+  /// In en, this message translates to:
+  /// **'{count, plural, =0 {No Participants} =1 {1 Participant} other {{count} Participants}}'**
+  String albumParticipantsCount(int count);
+
+  /// No description provided for @addMore.
+  ///
+  /// In en, this message translates to:
+  /// **'Add more'**
+  String get addMore;
+
+  /// No description provided for @you.
+  ///
+  /// In en, this message translates to:
+  /// **'You'**
+  String get you;
+
+  /// No description provided for @albumOwner.
+  ///
+  /// In en, this message translates to:
+  /// **'Owner'**
+  String get albumOwner;
+
+  /// No description provided for @typeOfCollectionTypeIsNotSupportedForRename.
+  ///
+  /// In en, this message translates to:
+  /// **'Type of collection {collectionType} is not supported for rename'**
+  String typeOfCollectionTypeIsNotSupportedForRename(String collectionType);
+
+  /// No description provided for @leaveCollection.
+  ///
+  /// In en, this message translates to:
+  /// **'Leave collection'**
+  String get leaveCollection;
+
+  /// No description provided for @filesAddedByYouWillBeRemovedFromTheCollection.
+  ///
+  /// In en, this message translates to:
+  /// **'Files added by you will be removed from the collection'**
+  String get filesAddedByYouWillBeRemovedFromTheCollection;
+
+  /// No description provided for @leaveSharedCollection.
+  ///
+  /// In en, this message translates to:
+  /// **'Leave shared collection?'**
+  String get leaveSharedCollection;
+
+  /// No description provided for @noSystemLockFound.
+  ///
+  /// In en, this message translates to:
+  /// **'No system lock found'**
+  String get noSystemLockFound;
+
+  /// No description provided for @toEnableAppLockPleaseSetupDevicePasscodeOrScreen.
+  ///
+  /// In en, this message translates to:
+  /// **'To enable app lock, please setup device passcode or screen lock in your system settings.'**
+  String get toEnableAppLockPleaseSetupDevicePasscodeOrScreen;
+
+  /// No description provided for @legacy.
+  ///
+  /// In en, this message translates to:
+  /// **'Legacy'**
+  String get legacy;
+
+  /// No description provided for @authToManageLegacy.
+  ///
+  /// In en, this message translates to:
+  /// **'Please authenticate to manage your trusted contacts'**
+  String get authToManageLegacy;
 }
 
 class _AppLocalizationsDelegate

mobile/apps/locker/lib/l10n/app_localizations_en.dart

@@ -534,4 +534,380 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get reddit => 'Reddit';
+
+  @override
+  String get allowDownloads => 'Allow downloads';
+
+  @override
+  String get sharedByYou => 'Shared by you';
+
+  @override
+  String get sharedWithYou => 'Shared with you';
+
+  @override
+  String get manageLink => 'Manage link';
+
+  @override
+  String get linkExpiry => 'Link expiry';
+
+  @override
+  String get linkNeverExpires => 'Never';
+
+  @override
+  String get linkExpired => 'Expired';
+
+  @override
+  String get linkEnabled => 'Enabled';
+
+  @override
+  String get setAPassword => 'Set a password';
+
+  @override
+  String get lockButtonLabel => 'Lock';
+
+  @override
+  String get enterPassword => 'Enter password';
+
+  @override
+  String get removeLink => 'Remove link';
+
+  @override
+  String get sendLink => 'Send link';
+
+  @override
+  String get setPasswordTitle => 'Set password';
+
+  @override
+  String get resetPasswordTitle => 'Reset password';
+
+  @override
+  String get allowAddingFiles => 'Allow adding files';
+
+  @override
+  String get disableDownloadWarningTitle => 'Please note';
+
+  @override
+  String get disableDownloadWarningBody =>
+      'Viewers can still take screenshots or save a copy of your files using external tools.';
+
+  @override
+  String get allowAddFilesDescription =>
+      'Allow people with the link to also add files to the shared collection.';
+
+  @override
+  String get after1Hour => 'After 1 hour';
+
+  @override
+  String get after1Day => 'After 1 day';
+
+  @override
+  String get after1Week => 'After 1 week';
+
+  @override
+  String get after1Month => 'After 1 month';
+
+  @override
+  String get after1Year => 'After 1 year';
+
+  @override
+  String get never => 'Never';
+
+  @override
+  String get custom => 'Custom';
+
+  @override
+  String get selectTime => 'Select time';
+
+  @override
+  String get selectDate => 'Select date';
+
+  @override
+  String get previous => 'Previous';
+
+  @override
+  String get done => 'Done';
+
+  @override
+  String get next => 'Next';
+
+  @override
+  String get noDeviceLimit => 'None';
+
+  @override
+  String get linkDeviceLimit => 'Device limit';
+
+  @override
+  String get expiredLinkInfo =>
+      'This link has expired. Please select a new expiry time or disable link expiry.';
+
+  @override
+  String linkExpiresOn(Object expiryTime) {
+    return 'Link will expire on $expiryTime';
+  }
+
+  @override
+  String shareWithPeopleSectionTitle(int numberOfPeople) {
+    String _temp0 = intl.Intl.pluralLogic(
+      numberOfPeople,
+      locale: localeName,
+      other: 'Shared with $numberOfPeople people',
+      one: 'Shared with 1 person',
+      zero: 'Share with specific people',
+    );
+    return '$_temp0';
+  }
+
+  @override
+  String get linkHasExpired => 'Link has expired';
+
+  @override
+  String get publicLinkEnabled => 'Public link enabled';
+
+  @override
+  String get shareALink => 'Share a link';
+
+  @override
+  String get addViewer => 'Add viewer';
+
+  @override
+  String get addCollaborator => 'Add collaborator';
+
+  @override
+  String get addANewEmail => 'Add a new email';
+
+  @override
+  String get orPickAnExistingOne => 'Or pick an existing one';
+
+  @override
+  String get sharedCollectionSectionDescription =>
+      'Create shared and collaborative collections with other Ente users, including users on free plans.';
+
+  @override
+  String get createPublicLink => 'Create public link';
+
+  @override
+  String get addParticipants => 'Add participants';
+
+  @override
+  String get add => 'Add';
+
+  @override
+  String get collaboratorsCanAddFilesToTheSharedCollection =>
+      'Collaborators can add files to the shared collection.';
+
+  @override
+  String get enterEmail => 'Enter email';
+
+  @override
+  String viewersSuccessfullyAdded(int count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: 'Added $count viewers',
+      one: 'Added 1 viewer',
+      zero: 'Added 0 viewers',
+    );
+    return '$_temp0';
+  }
+
+  @override
+  String collaboratorsSuccessfullyAdded(int count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: 'Added $count collaborators',
+      one: 'Added 1 collaborator',
+      zero: 'Added 0 collaborator',
+    );
+    return '$_temp0';
+  }
+
+  @override
+  String addViewers(num count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: 'Add viewers',
+      one: 'Add viewer',
+      zero: 'Add viewer',
+    );
+    return '$_temp0';
+  }
+
+  @override
+  String addCollaborators(num count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: 'Add collaborators',
+      one: 'Add collaborator',
+      zero: 'Add collaborator',
+    );
+    return '$_temp0';
+  }
+
+  @override
+  String get longPressAnEmailToVerifyEndToEndEncryption =>
+      'Long press an email to verify end to end encryption.';
+
+  @override
+  String get sharing => 'Sharing...';
+
+  @override
+  String get invalidEmailAddress => 'Invalid email address';
+
+  @override
+  String get enterValidEmail => 'Please enter a valid email address.';
+
+  @override
+  String get oops => 'Oops';
+
+  @override
+  String get youCannotShareWithYourself => 'You cannot share with yourself';
+
+  @override
+  String get inviteToEnte => 'Invite to Ente';
+
+  @override
+  String get sendInvite => 'Send invite';
+
+  @override
+  String get shareTextRecommendUsingEnte =>
+      'Download Ente so we can easily share original quality files\n\nhttps://ente.io';
+
+  @override
+  String get thisIsYourVerificationId => 'This is your Verification ID';
+
+  @override
+  String get someoneSharingAlbumsWithYouShouldSeeTheSameId =>
+      'Someone sharing albums with you should see the same ID on their device.';
+
+  @override
+  String get howToViewShareeVerificationID =>
+      'Please ask them to long-press their email address on the settings screen, and verify that the IDs on both devices match.';
+
+  @override
+  String thisIsPersonVerificationId(String email) {
+    return 'This is $email\'s Verification ID';
+  }
+
+  @override
+  String get verificationId => 'Verification ID';
+
+  @override
+  String verifyEmailID(Object email) {
+    return 'Verify $email';
+  }
+
+  @override
+  String emailNoEnteAccount(Object email) {
+    return '$email does not have an Ente account.\n\nSend them an invite to share files.';
+  }
+
+  @override
+  String shareMyVerificationID(Object verificationID) {
+    return 'Here\'s my verification ID: $verificationID for ente.io.';
+  }
+
+  @override
+  String shareTextConfirmOthersVerificationID(Object verificationID) {
+    return 'Hey, can you confirm that this is your ente.io verification ID: $verificationID';
+  }
+
+  @override
+  String get passwordLock => 'Password lock';
+
+  @override
+  String get manage => 'Manage';
+
+  @override
+  String get addedAs => 'Added as';
+
+  @override
+  String get removeParticipant => 'Remove participant';
+
+  @override
+  String get yesConvertToViewer => 'Yes, convert to viewer';
+
+  @override
+  String get changePermissions => 'Change permissions';
+
+  @override
+  String cannotAddMoreFilesAfterBecomingViewer(String name) {
+    return '$name will no longer be able to add files to the collection after becoming a viewer.';
+  }
+
+  @override
+  String get removeWithQuestionMark => 'Remove?';
+
+  @override
+  String removeParticipantBody(Object userEmail) {
+    return '$userEmail will be removed from this shared collection\n\nAny files added by them will also be removed from the collection';
+  }
+
+  @override
+  String get yesRemove => 'Yes, remove';
+
+  @override
+  String get remove => 'Remove';
+
+  @override
+  String get viewer => 'Viewer';
+
+  @override
+  String get collaborator => 'Collaborator';
+
+  @override
+  String get collaboratorsCanAddFilesToTheSharedAlbum =>
+      'Collaborators can add files to the shared collection.';
+
+  @override
+  String albumParticipantsCount(int count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: '$count Participants',
+      one: '1 Participant',
+      zero: 'No Participants',
+    );
+    return '$_temp0';
+  }
+
+  @override
+  String get addMore => 'Add more';
+
+  @override
+  String get you => 'You';
+
+  @override
+  String get albumOwner => 'Owner';
+
+  @override
+  String typeOfCollectionTypeIsNotSupportedForRename(String collectionType) {
+    return 'Type of collection $collectionType is not supported for rename';
+  }
+
+  @override
+  String get leaveCollection => 'Leave collection';
+
+  @override
+  String get filesAddedByYouWillBeRemovedFromTheCollection =>
+      'Files added by you will be removed from the collection';
+
+  @override
+  String get leaveSharedCollection => 'Leave shared collection?';
+
+  @override
+  String get noSystemLockFound => 'No system lock found';
+
+  @override
+  String get toEnableAppLockPleaseSetupDevicePasscodeOrScreen =>
+      'To enable app lock, please setup device passcode or screen lock in your system settings.';
+
+  @override
+  String get legacy => 'Legacy';
+
+  @override
+  String get authToManageLegacy =>
+      'Please authenticate to manage your trusted contacts';
 }

mobile/apps/locker/lib/main.dart

@@ -4,12 +4,14 @@ import 'dart:io';
 import 'package:adaptive_theme/adaptive_theme.dart';
 import 'package:ente_accounts/services/user_service.dart';
 import 'package:ente_crypto_dart/ente_crypto_dart.dart';
+import "package:ente_legacy/services/emergency_service.dart";
 import 'package:ente_lock_screen/lock_screen_settings.dart';
 import 'package:ente_lock_screen/ui/app_lock.dart';
 import 'package:ente_lock_screen/ui/lock_screen.dart';
 import 'package:ente_logging/logging.dart';
 import 'package:ente_network/network.dart';
 import "package:ente_strings/l10n/strings_localizations.dart";
+import "package:ente_ui/theme/ente_theme_data.dart";
 import "package:ente_ui/theme/theme_config.dart";
 import 'package:ente_ui/utils/window_listener_service.dart';
 import 'package:ente_utils/platform_util.dart';
@@ -103,6 +105,8 @@ Future<void> _runInForeground() async {
         lockScreen: LockScreen(Configuration.instance),
         enabled: await LockScreenSettings.instance.shouldShowLockScreen(),
         locale: locale,
+        lightTheme: lightThemeData,
+        darkTheme: darkThemeData,
         savedThemeMode: savedThemeMode,
         supportedLocales: appSupportedLocales,
         localizationsDelegates: const [
@@ -166,4 +170,8 @@ Future<void> _init(bool bool, {String? via}) async {
     packageInfo,
   );
   await TrashService.instance.init(preferences);
+  await EmergencyContactService.instance.init(
+    UserService.instance,
+    Configuration.instance,
+  );
 }

mobile/apps/locker/lib/services/collections/collections_api_client.dart

@@ -1,16 +1,23 @@
+import "dart:async";
 import 'dart:convert';
 import 'dart:math';
 import 'dart:typed_data';
 
 import 'package:dio/dio.dart';
 import 'package:ente_crypto_dart/ente_crypto_dart.dart';
+import "package:ente_events/event_bus.dart";
 import 'package:ente_network/network.dart';
+import "package:ente_sharing/collection_sharing_service.dart";
+import "package:ente_sharing/models/user.dart";
 import 'package:locker/core/errors.dart';
+import "package:locker/events/collections_updated_event.dart";
+import "package:locker/services/collections/collections_db.dart";
 import "package:locker/services/collections/collections_service.dart";
 import 'package:locker/services/collections/models/collection.dart';
 import 'package:locker/services/collections/models/collection_file_item.dart';
 import 'package:locker/services/collections/models/collection_magic.dart';
 import 'package:locker/services/collections/models/diff.dart';
+import "package:locker/services/collections/models/public_url.dart";
 import 'package:locker/services/configuration.dart';
 import "package:locker/services/files/sync/metadata_updater_service.dart";
 import 'package:locker/services/files/sync/models/file.dart';
@@ -29,7 +36,11 @@ class CollectionApiClient {
   final _enteDio = Network.instance.enteDio;
   final _config = Configuration.instance;
 
-  Future<void> init() async {}
+  late CollectionDB _db;
+
+  Future<void> init() async {
+    _db = CollectionDB.instance;
+  }
 
   Future<List<Collection>> getCollections(int sinceTime) async {
     try {
@@ -161,6 +172,18 @@ class CollectionApiClient {
     }
   }
 
+  Future<void> leaveCollection(Collection collection) async {
+    await CollectionSharingService.instance.leaveCollection(collection.id);
+    await _handleCollectionDeletion(collection);
+  }
+
+  Future<void> _handleCollectionDeletion(Collection collection) async {
+    await _db.deleteCollection(collection);
+    final deletedCollection = collection.copyWith(isDeleted: true);
+    await _updateCollectionInDB(deletedCollection);
+    await CollectionService.instance.sync();
+  }
+
   Future<void> move(
     EnteFile file,
     Collection fromCollection,
@@ -394,6 +417,86 @@ class CollectionApiClient {
       return collection;
     });
   }
+
+  Future<void> createShareUrl(
+    Collection collection, {
+    bool enableCollect = false,
+  }) async {
+    final response = await CollectionSharingService.instance.createShareUrl(
+      collection.id,
+      enableCollect,
+    );
+
+    collection.publicURLs.add(PublicURL.fromMap(response.data["result"]));
+    await _updateCollectionInDB(collection);
+    Bus.instance.fire(CollectionsUpdatedEvent());
+  }
+
+  Future<void> disableShareUrl(Collection collection) async {
+    await CollectionSharingService.instance.disableShareUrl(collection.id);
+    collection.publicURLs.clear();
+    await _updateCollectionInDB(collection);
+    Bus.instance.fire(CollectionsUpdatedEvent());
+  }
+
+  Future<void> updateShareUrl(
+    Collection collection,
+    Map<String, dynamic> prop,
+  ) async {
+    prop.putIfAbsent('collectionID', () => collection.id);
+
+    final response = await CollectionSharingService.instance.updateShareUrl(
+      collection.id,
+      prop,
+    );
+    // remove existing url information
+    collection.publicURLs.clear();
+    collection.publicURLs.add(PublicURL.fromMap(response.data["result"]));
+    await _updateCollectionInDB(collection);
+    Bus.instance.fire(CollectionsUpdatedEvent());
+  }
+
+  Future<List<User>> share(
+    int collectionID,
+    String email,
+    String publicKey,
+    CollectionParticipantRole role,
+  ) async {
+    final collectionKey =
+        CollectionService.instance.getCollectionKey(collectionID);
+    final encryptedKey = CryptoUtil.sealSync(
+      collectionKey,
+      CryptoUtil.base642bin(publicKey),
+    );
+
+    final sharees = await CollectionSharingService.instance.share(
+      collectionID,
+      email,
+      publicKey,
+      role.toStringVal(),
+      collectionKey,
+      encryptedKey,
+    );
+
+    final collection = CollectionService.instance.getFromCache(collectionID);
+    final updatedCollection = collection!.copyWith(sharees: sharees);
+    await _updateCollectionInDB(updatedCollection);
+    return sharees;
+  }
+
+  Future<List<User>> unshare(int collectionID, String email) async {
+    final sharees =
+        await CollectionSharingService.instance.unshare(collectionID, email);
+    final collection = CollectionService.instance.getFromCache(collectionID);
+    final updatedCollection = collection!.copyWith(sharees: sharees);
+    await _updateCollectionInDB(updatedCollection);
+    return sharees;
+  }
+
+  Future<void> _updateCollectionInDB(Collection collection) async {
+    await _db.updateCollections([collection]);
+    CollectionService.instance.updateCollectionCache(collection);
+  }
 }
 
 class CreateRequest {

mobile/apps/locker/lib/services/collections/collections_db.dart

@@ -1,9 +1,9 @@
 import 'dart:convert';
 
 import "package:ente_base/models/database.dart";
+import "package:ente_sharing/models/user.dart";
 import 'package:locker/services/collections/models/collection.dart';
 import 'package:locker/services/collections/models/public_url.dart';
-import 'package:locker/services/collections/models/user.dart';
 import 'package:locker/services/files/sync/models/file.dart';
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';

mobile/apps/locker/lib/services/collections/collections_service.dart

@@ -4,10 +4,15 @@ import 'dart:typed_data';
 
 import 'package:ente_events/event_bus.dart';
 import 'package:ente_events/models/signed_in_event.dart';
+import "package:ente_sharing/models/user.dart";
+import "package:fast_base58/fast_base58.dart";
+import "package:flutter/foundation.dart";
 import 'package:locker/events/collections_updated_event.dart';
 import "package:locker/services/collections/collections_api_client.dart";
 import "package:locker/services/collections/collections_db.dart";
 import 'package:locker/services/collections/models/collection.dart';
+import "package:locker/services/collections/models/collection_items.dart";
+import "package:locker/services/collections/models/public_url.dart"; 
 import 'package:locker/services/configuration.dart';
 import 'package:locker/services/files/sync/models/file.dart';
 import 'package:locker/services/trash/models/trash_item_request.dart';
@@ -16,8 +21,6 @@ import "package:locker/utils/crypto_helper.dart";
 import 'package:logging/logging.dart';
 
 class CollectionService {
-  CollectionService._privateConstructor();
-
   static final CollectionService instance =
       CollectionService._privateConstructor();
 
@@ -36,7 +39,16 @@ class CollectionService {
   };
 
   final _logger = Logger("CollectionService");
-  final _apiClient = CollectionApiClient.instance;
+
+  late CollectionApiClient _apiClient;
+  late CollectionDB _db;
+
+  final _collectionIDToCollections = <int, Collection>{};
+
+  CollectionService._privateConstructor() {
+    _db = CollectionDB.instance;
+    _apiClient = CollectionApiClient.instance;
+  }
 
   Future<void> init() async {
     if (Configuration.instance.hasConfiguredAccount()) {
@@ -50,41 +62,45 @@ class CollectionService {
   }
 
   Future<void> sync() async {
-    final updatedCollections = await CollectionApiClient.instance
-        .getCollections(CollectionDB.instance.getSyncTime());
+    final updatedCollections =
+        await CollectionApiClient.instance.getCollections(_db.getSyncTime());
     if (updatedCollections.isEmpty) {
       _logger.info("No collections to sync.");
       return;
     }
-    await CollectionDB.instance.updateCollections(updatedCollections);
-    await CollectionDB.instance
-        .setSyncTime(updatedCollections.last.updationTime);
+    await _db.updateCollections(updatedCollections);
+    // Update the cache with new/updated collections
+    for (final collection in updatedCollections) {
+      _collectionIDToCollections[collection.id] = collection;
+    }
+    await _db.setSyncTime(updatedCollections.last.updationTime);
+
     final List<Future> fileFutures = [];
     for (final collection in updatedCollections) {
       if (collection.isDeleted) {
-        await CollectionDB.instance.deleteCollection(collection);
+        await _db.deleteCollection(collection);
+        _collectionIDToCollections.remove(collection.id);
         continue;
       }
-      final syncTime =
-          CollectionDB.instance.getCollectionSyncTime(collection.id);
+      final syncTime = _db.getCollectionSyncTime(collection.id);
       fileFutures.add(
-        CollectionApiClient.instance
-            .getFiles(collection, syncTime)
-            .then((diff) async {
+        _apiClient.getFiles(collection, syncTime).then((diff) async {
           if (diff.updatedFiles.isNotEmpty) {
-            await CollectionDB.instance.addFilesToCollection(
+            await _db.addFilesToCollection(
               collection,
               diff.updatedFiles,
             );
           }
           if (diff.deletedFiles.isNotEmpty) {
-            await CollectionDB.instance.deleteFilesFromCollection(
+            await _db.deleteFilesFromCollection(
               collection,
               diff.deletedFiles,
             );
           }
-          await CollectionDB.instance
-              .setCollectionSyncTime(collection.id, diff.latestUpdatedAtTime);
+          await _db.setCollectionSyncTime(
+            collection.id,
+            diff.latestUpdatedAtTime,
+          );
         }).catchError((e) {
           _logger.warning(
             "Failed to fetch files for collection ${collection.id}: $e",
@@ -100,7 +116,7 @@ class CollectionService {
 
   bool hasCompletedFirstSync() {
     return Configuration.instance.hasConfiguredAccount() &&
-        CollectionDB.instance.getSyncTime() > 0;
+        _db.getSyncTime() > 0;
   }
 
   Future<Collection> createCollection(
@@ -120,17 +136,37 @@ class CollectionService {
   }
 
   Future<List<Collection>> getCollections() async {
-    return CollectionDB.instance.getCollections();
+    return _db.getCollections();
+  }
+
+  Future<SharedCollections> getSharedCollections() async {
+    final List<Collection> outgoing = [];
+    final List<Collection> incoming = [];
+    final List<Collection> quickLinks = [];
+
+    final List<Collection> collections = await getCollections();
+
+    for (final c in collections) {
+      if (c.owner.id == Configuration.instance.getUserID()) {
+        if (c.hasSharees || c.hasLink && !c.isQuickLinkCollection()) {
+          outgoing.add(c);
+        } else if (c.isQuickLinkCollection()) {
+          quickLinks.add(c);
+        }
+      } else {
+        incoming.add(c);
+      }
+    }
+    return SharedCollections(outgoing, incoming, quickLinks);
   }
 
   Future<List<Collection>> getCollectionsForFile(EnteFile file) async {
-    return CollectionDB.instance.getCollectionsForFile(file);
+    return _db.getCollectionsForFile(file);
   }
 
   Future<List<EnteFile>> getFilesInCollection(Collection collection) async {
     try {
-      final files =
-          await CollectionDB.instance.getFilesInCollection(collection);
+      final files = await _db.getFilesInCollection(collection);
       return files;
     } catch (e) {
       _logger.severe(
@@ -142,7 +178,7 @@ class CollectionService {
 
   Future<List<EnteFile>> getAllFiles() async {
     try {
-      final allFiles = await CollectionDB.instance.getAllFiles();
+      final allFiles = await _db.getAllFiles();
       return allFiles;
     } catch (e) {
       _logger.severe("Failed to fetch all files: $e");
@@ -178,7 +214,7 @@ class CollectionService {
 
   Future<void> rename(Collection collection, String newName) async {
     try {
-      await CollectionApiClient.instance.rename(
+      await _apiClient.rename(
         collection,
         newName,
       );
@@ -212,6 +248,10 @@ class CollectionService {
     }).catchError((error) {
       _logger.severe("Failed to initialize collections: $error");
     });
+    final collections = await _db.getCollections();
+    for (final collection in collections) {
+      _collectionIDToCollections[collection.id] = collection;
+    }
   }
 
   Future<Collection> _getOrCreateImportantCollection() async {
@@ -313,12 +353,17 @@ class CollectionService {
   }
 
   Future<Collection> getCollection(int collectionID) async {
-    return await CollectionDB.instance.getCollection(collectionID);
+    if (_collectionIDToCollections.containsKey(collectionID)) {
+      return _collectionIDToCollections[collectionID]!;
+    }
+    final collection = await _db.getCollection(collectionID);
+    _collectionIDToCollections[collectionID] = collection;
+    return collection;
   }
 
-  Future<Uint8List> getCollectionKey(int collectionID) async {
-    final collection = await getCollection(collectionID);
-    final collectionKey = CryptoHelper.instance.getCollectionKey(collection);
+  Uint8List getCollectionKey(int collectionID) {
+    final collection = _collectionIDToCollections[collectionID];
+    final collectionKey = CryptoHelper.instance.getCollectionKey(collection!);
     return collectionKey;
   }
 
@@ -340,4 +385,94 @@ class CollectionService {
       rethrow;
     }
   }
+
+  // getActiveCollections returns list of collections which are not deleted yet
+  List<Collection> getActiveCollections() {
+    return _collectionIDToCollections.values
+        .toList()
+        .where((element) => !element.isDeleted)
+        .toList();
+  }
+
+  /// Returns Contacts(Users) that are relevant to the account owner.
+  /// Note: "User" refers to the account owner in the points below.
+  /// This includes:
+  /// 	- Collaborators and viewers of collections owned by user
+  ///   - Owners of collections shared to user.
+  ///   - All collaborators of collections in which user is a collaborator or
+  ///     a viewer.
+  List<User> getRelevantContacts() {
+    final List<User> relevantUsers = [];
+    final existingEmails = <String>{};
+    final int ownerID = Configuration.instance.getUserID()!;
+    final String ownerEmail = Configuration.instance.getEmail()!;
+    existingEmails.add(ownerEmail);
+
+    for (final c in getActiveCollections()) {
+      // Add collaborators and viewers of collections owned by user
+      if (c.owner.id == ownerID) {
+        for (final User u in c.sharees) {
+          if (u.id != null && u.email.isNotEmpty) {
+            if (!existingEmails.contains(u.email)) {
+              relevantUsers.add(u);
+              existingEmails.add(u.email);
+            }
+          }
+        }
+      } else if (c.owner.id != null && c.owner.email.isNotEmpty) {
+        // Add owners of collections shared with user
+        if (!existingEmails.contains(c.owner.email)) {
+          relevantUsers.add(c.owner);
+          existingEmails.add(c.owner.email);
+        }
+        // Add collaborators of collections shared with user where user is a
+        // viewer or a collaborator
+        for (final User u in c.sharees) {
+          if (u.id != null &&
+              u.email.isNotEmpty &&
+              u.email == ownerEmail &&
+              (u.isCollaborator || u.isViewer)) {
+            for (final User u in c.sharees) {
+              if (u.id != null && u.email.isNotEmpty && u.isCollaborator) {
+                if (!existingEmails.contains(u.email)) {
+                  relevantUsers.add(u);
+                  existingEmails.add(u.email);
+                }
+              }
+            }
+            break;
+          }
+        }
+      }
+    }
+
+    return relevantUsers;
+  }
+
+  String getPublicUrl(Collection c) {
+    final PublicURL url = c.publicURLs.firstOrNull!;
+    final Uri publicUrl = Uri.parse(url.url);
+
+    final cKey = getCollectionKey(c.id);
+    final String collectionKey = Base58Encode(cKey);
+    final String urlValue = "${publicUrl.toString()}#$collectionKey";
+    return urlValue;
+  }
+
+  void clearCache() {
+    _collectionIDToCollections.clear();
+  }
+
+  // Methods for managing collection cache
+  void updateCollectionCache(Collection collection) {
+    _collectionIDToCollections[collection.id] = collection;
+  }
+
+  void removeFromCache(int collectionId) {
+    _collectionIDToCollections.remove(collectionId);
+  }
+
+  Collection? getFromCache(int collectionId) {
+    return _collectionIDToCollections[collectionId];
+  }
 }

mobile/apps/locker/lib/services/collections/models/collection.dart

@@ -1,9 +1,9 @@
 import 'dart:core';
 
+import "package:ente_sharing/models/user.dart";
 import 'package:flutter/foundation.dart';
 import 'package:locker/services/collections/models/collection_magic.dart';
-import 'package:locker/services/collections/models/public_url.dart';
-import 'package:locker/services/collections/models/user.dart';
+import 'package:locker/services/collections/models/public_url.dart'; 
 import 'package:locker/services/files/sync/models/common_keys.dart';
 
 class Collection {

mobile/apps/locker/lib/services/collections/models/collection_items.dart

@@ -0,0 +1,9 @@
+import "package:locker/services/collections/models/collection.dart";
+
+class SharedCollections {
+  final List<Collection> outgoing;
+  final List<Collection> incoming;
+  final List<Collection> quickLinks;
+
+  SharedCollections(this.outgoing, this.incoming, this.quickLinks);
+}

mobile/apps/locker/lib/services/collections/models/collection_view_type.dart

@@ -0,0 +1,33 @@
+import "package:flutter/material.dart";
+import "package:locker/services/collections/models/collection.dart";
+
+enum CollectionViewType {
+  ownedCollection,
+  sharedCollection,
+  hiddenOwnedCollection,
+  hiddenSection,
+  quickLink,
+  uncategorized,
+  favorite
+}
+
+
+CollectionViewType getCollectionViewType(Collection c, int userID) {
+  if (!c.isOwner(userID)) {
+    return CollectionViewType.sharedCollection;
+  }
+  if (c.isDefaultHidden()) {
+    return CollectionViewType.hiddenSection;
+  } else if (c.type == CollectionType.uncategorized) {
+    return CollectionViewType.uncategorized;
+  } else if (c.type == CollectionType.favorites) {
+    return CollectionViewType.favorite;
+  } else if (c.isQuickLinkCollection()) {
+    return CollectionViewType.quickLink;
+  } else if (c.isHidden()) {
+    return CollectionViewType.hiddenOwnedCollection;
+  }
+  debugPrint("Unknown collection type for collection ${c.id}, falling back to "
+      "default");
+  return CollectionViewType.ownedCollection;
+}

mobile/apps/locker/lib/ui/collections/collection_flex_grid_view.dart

@@ -0,0 +1,115 @@
+import "dart:math";
+
+import "package:ente_ui/theme/ente_theme.dart";
+import "package:flutter/material.dart";
+import "package:locker/l10n/l10n.dart";
+import "package:locker/services/collections/models/collection.dart";
+import "package:locker/ui/pages/collection_page.dart";
+
+class CollectionFlexGridViewWidget extends StatefulWidget {
+  final List<Collection> collections;
+  final Map<int, int> collectionFileCounts;
+  const CollectionFlexGridViewWidget({
+    super.key,
+    required this.collections,
+    required this.collectionFileCounts,
+  });
+
+  @override
+  State<CollectionFlexGridViewWidget> createState() =>
+      _CollectionFlexGridViewWidgetState();
+}
+
+class _CollectionFlexGridViewWidgetState
+    extends State<CollectionFlexGridViewWidget> {
+  late List<Collection> _displayedCollections;
+  late Map<int, int> _collectionFileCounts;
+
+  @override
+  void initState() {
+    super.initState();
+    _displayedCollections = widget.collections;
+    _collectionFileCounts = widget.collectionFileCounts;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return MediaQuery.removePadding(
+      context: context,
+      removeBottom: true,
+      removeTop: true,
+      child: GridView.builder(
+        shrinkWrap: true,
+        physics: const NeverScrollableScrollPhysics(),
+        gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+          crossAxisCount: 2,
+          crossAxisSpacing: 12,
+          mainAxisSpacing: 12,
+          childAspectRatio: 2.2,
+        ),
+        itemCount: min(_displayedCollections.length, 4),
+        itemBuilder: (context, index) {
+          final collection = _displayedCollections[index];
+          final collectionName = collection.name ?? 'Unnamed Collection';
+
+          return GestureDetector(
+            onTap: () => _navigateToCollection(collection),
+            child: Container(
+              decoration: BoxDecoration(
+                borderRadius: BorderRadius.circular(8),
+                color: getEnteColorScheme(context).fillFaint,
+              ),
+              padding: const EdgeInsets.all(12),
+              child: Stack(
+                children: [
+                  Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      Text(
+                        collectionName,
+                        style: getEnteTextTheme(context).body.copyWith(
+                              fontWeight: FontWeight.w500,
+                            ),
+                        textAlign: TextAlign.left,
+                        overflow: TextOverflow.ellipsis,
+                        maxLines: 1,
+                      ),
+                      const SizedBox(height: 4),
+                      Text(
+                        context.l10n
+                            .items(_collectionFileCounts[collection.id] ?? 0),
+                        style: getEnteTextTheme(context).small.copyWith(
+                              color: Colors.grey[600],
+                            ),
+                        textAlign: TextAlign.left,
+                      ),
+                    ],
+                  ),
+                  if (collection.type == CollectionType.favorites)
+                    Positioned(
+                      top: 0,
+                      right: 0,
+                      child: Icon(
+                        Icons.star,
+                        color: getEnteColorScheme(context).primary500,
+                        size: 18,
+                      ),
+                    ),
+                ],
+              ),
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  void _navigateToCollection(Collection collection) {
+    Navigator.of(context).push(
+      MaterialPageRoute(
+        builder: (context) => CollectionPage(collection: collection),
+      ),
+    );
+  }
+}

mobile/apps/locker/lib/ui/collections/section_title.dart

@@ -0,0 +1,67 @@
+import "package:ente_ui/theme/ente_theme.dart";
+import 'package:flutter/material.dart';
+
+class SectionTitle extends StatelessWidget {
+  final String? title;
+  final bool mutedTitle;
+  final Widget? titleWithBrand;
+  final EdgeInsetsGeometry? padding;
+
+  const SectionTitle({
+    this.title,
+    this.titleWithBrand,
+    this.mutedTitle = false,
+    super.key,
+    this.padding,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    Widget child;
+    if (titleWithBrand != null) {
+      child = titleWithBrand!;
+    } else if (title != null) {
+      child = Text(
+        title!,
+        style: getEnteTextTheme(context).h3Bold,
+      );
+    } else {
+      child = const SizedBox.shrink();
+    }
+    return child;
+  }
+}
+
+class SectionOptions extends StatelessWidget {
+  final Widget title;
+  final Widget? trailingWidget;
+  final VoidCallback? onTap;
+
+  const SectionOptions(
+    this.title, {
+    this.trailingWidget,
+    super.key,
+    this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    if (trailingWidget != null) {
+      return GestureDetector(
+        behavior: HitTestBehavior.opaque,
+        onTap: onTap,
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            title,
+            trailingWidget!,
+          ],
+        ),
+      );
+    } else {
+      return Container(
+        child: title,
+      );
+    }
+  }
+}

mobile/apps/locker/lib/ui/components/button/copy_button.dart

@@ -0,0 +1,53 @@
+import "package:ente_ui/theme/ente_theme.dart";
+import "package:flutter/material.dart";
+import "package:flutter/services.dart";
+import "package:locker/l10n/l10n.dart";
+
+class CopyButton extends StatefulWidget {
+  final String url;
+
+  const CopyButton({
+    super.key,
+    required this.url,
+  });
+
+  @override
+  State<CopyButton> createState() => _CopyButtonState();
+}
+
+class _CopyButtonState extends State<CopyButton> {
+  bool _isCopied = false;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = getEnteColorScheme(context);
+
+    return IconButton(
+      onPressed: () async {
+        await Clipboard.setData(ClipboardData(text: widget.url));
+        setState(() {
+          _isCopied = true;
+        });
+        // Reset the state after 2 seconds
+        Future.delayed(const Duration(seconds: 2), () {
+          if (mounted) {
+            setState(() {
+              _isCopied = false;
+            });
+          }
+        });
+      },
+      icon: Icon(
+        _isCopied ? Icons.check : Icons.copy,
+        size: 16,
+        color: _isCopied ? colorScheme.primary500 : colorScheme.primary500,
+      ),
+      iconSize: 16,
+      constraints: const BoxConstraints(),
+      padding: const EdgeInsets.all(4),
+      tooltip: _isCopied
+          ? context.l10n.linkCopiedToClipboard
+          : context.l10n.copyLink,
+    );
+  }
+}

mobile/apps/locker/lib/ui/components/collection_row_widget.dart

@@ -0,0 +1,210 @@
+import "package:ente_events/event_bus.dart";
+import "package:ente_ui/theme/ente_theme.dart";
+import "package:flutter/material.dart";
+import "package:locker/events/collections_updated_event.dart";
+import "package:locker/l10n/l10n.dart";
+import "package:locker/services/collections/models/collection.dart";
+import "package:locker/services/collections/models/collection_view_type.dart";
+import "package:locker/services/configuration.dart";
+import "package:locker/ui/components/item_list_view.dart";
+import "package:locker/ui/pages/collection_page.dart";
+import "package:locker/utils/collection_actions.dart";
+import "package:locker/utils/date_time_util.dart";
+
+class CollectionRowWidget extends StatelessWidget {
+  final Collection collection;
+  final List<OverflowMenuAction>? overflowActions;
+  final bool isLastItem;
+
+  const CollectionRowWidget({
+    super.key,
+    required this.collection,
+    this.overflowActions,
+    this.isLastItem = false,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final updateTime =
+        DateTime.fromMicrosecondsSinceEpoch(collection.updationTime);
+
+    return InkWell(
+      onTap: () => _openCollection(context),
+      child: Container(
+        padding: EdgeInsets.fromLTRB(16.0, 2, 16.0, isLastItem ? 8 : 2),
+        decoration: BoxDecoration(
+          border: isLastItem
+              ? null
+              : Border(
+                  bottom: BorderSide(
+                    color: Theme.of(context).dividerColor.withAlpha(30),
+                    width: 0.5,
+                  ),
+                ),
+        ),
+        child: Row(
+          children: [
+            Expanded(
+              flex: 2,
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Row(
+                    children: [
+                      Icon(
+                        Icons.folder_open,
+                        color: collection.type == CollectionType.favorites
+                            ? getEnteColorScheme(context).primary500
+                            : Colors.grey,
+                        size: 20,
+                      ),
+                      const SizedBox(width: 12),
+                      Flexible(
+                        child: Text(
+                          collection.name ?? 'Unnamed Collection',
+                          overflow: TextOverflow.ellipsis,
+                          maxLines: 1,
+                          style: getEnteTextTheme(context).body,
+                        ),
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+            ),
+            Expanded(
+              flex: 1,
+              child: Text(
+                formatDate(context, updateTime),
+                style: getEnteTextTheme(context).small.copyWith(
+                      color: Theme.of(context).textTheme.bodySmall?.color,
+                    ),
+                overflow: TextOverflow.ellipsis,
+                maxLines: 1,
+              ),
+            ),
+            PopupMenuButton<String>(
+              onSelected: (value) => _handleMenuAction(context, value),
+              icon: const Icon(
+                Icons.more_vert,
+                size: 20,
+              ),
+              itemBuilder: (BuildContext context) {
+                return _buildPopupMenuItems(context);
+              },
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  List<PopupMenuItem<String>> _buildPopupMenuItems(BuildContext context) {
+    final collectionViewType =
+        getCollectionViewType(collection, Configuration.instance.getUserID()!);
+    if (overflowActions != null && overflowActions!.isNotEmpty) {
+      return overflowActions!
+          .map(
+            (action) => PopupMenuItem<String>(
+              value: action.id,
+              child: Row(
+                children: [
+                  Icon(action.icon, size: 16),
+                  const SizedBox(width: 8),
+                  Text(action.label),
+                ],
+              ),
+            ),
+          )
+          .toList();
+    } else {
+      return [
+        if (collectionViewType == CollectionViewType.ownedCollection ||
+            collectionViewType == CollectionViewType.hiddenOwnedCollection ||
+            collectionViewType == CollectionViewType.quickLink)
+          PopupMenuItem<String>(
+            value: 'edit',
+            child: Row(
+              children: [
+                const Icon(Icons.edit, size: 16),
+                const SizedBox(width: 8),
+                Text(context.l10n.edit),
+              ],
+            ),
+          ),
+        if (collectionViewType == CollectionViewType.ownedCollection ||
+            collectionViewType == CollectionViewType.hiddenOwnedCollection ||
+            collectionViewType == CollectionViewType.quickLink)
+          PopupMenuItem<String>(
+            value: 'delete',
+            child: Row(
+              children: [
+                const Icon(Icons.delete, size: 16),
+                const SizedBox(width: 8),
+                Text(context.l10n.delete),
+              ],
+            ),
+          ),
+        if (collectionViewType == CollectionViewType.sharedCollection)
+          PopupMenuItem<String>(
+            value: 'leave_collection',
+            child: Row(
+              children: [
+                const Icon(Icons.logout),
+                const SizedBox(width: 12),
+                Text(context.l10n.leaveCollection),
+              ],
+            ),
+          ),
+      ];
+    }
+  }
+
+  void _handleMenuAction(BuildContext context, String action) {
+    if (overflowActions != null && overflowActions!.isNotEmpty) {
+      final customAction = overflowActions!.firstWhere(
+        (a) => a.id == action,
+        orElse: () => throw StateError('Action not found'),
+      );
+      customAction.onTap(context, null, collection);
+    } else {
+      switch (action) {
+        case 'edit':
+          _editCollection(context);
+          break;
+        case 'delete':
+          _deleteCollection(context);
+          break;
+        case 'leave_collection':
+          _leaveCollection(context);
+          break;
+      }
+    }
+  }
+
+  void _editCollection(BuildContext context) {
+    CollectionActions.editCollection(context, collection);
+  }
+
+  void _deleteCollection(BuildContext context) {
+    CollectionActions.deleteCollection(context, collection);
+  }
+
+  void _openCollection(BuildContext context) {
+    Navigator.of(context).push(
+      MaterialPageRoute(
+        builder: (context) => CollectionPage(collection: collection),
+      ),
+    );
+  }
+
+  Future<void> _leaveCollection(BuildContext context) async {
+    await CollectionActions.leaveCollection(
+      context,
+      collection,
+      onSuccess: () {
+        Bus.instance.fire(CollectionsUpdatedEvent());
+      },
+    );
+  }
+}

mobile/apps/locker/lib/ui/components/file_row_widget.dart

@@ -0,0 +1,572 @@
+import "dart:io";
+
+import "package:ente_ui/components/buttons/button_widget.dart";
+import "package:ente_ui/components/buttons/models/button_type.dart";
+import "package:ente_ui/theme/ente_theme.dart";
+import "package:ente_ui/utils/dialog_util.dart";
+import "package:ente_utils/share_utils.dart";
+import "package:flutter/material.dart";
+import "package:locker/l10n/l10n.dart";
+import "package:locker/services/collections/collections_service.dart";
+import "package:locker/services/collections/models/collection.dart";
+import "package:locker/services/configuration.dart";
+import "package:locker/services/files/download/file_downloader.dart";
+import "package:locker/services/files/links/links_service.dart";
+import "package:locker/services/files/sync/metadata_updater_service.dart";
+import "package:locker/services/files/sync/models/file.dart";
+import "package:locker/ui/components/button/copy_button.dart";
+import "package:locker/ui/components/file_edit_dialog.dart";
+import "package:locker/ui/components/item_list_view.dart";
+import "package:locker/utils/date_time_util.dart";
+import "package:locker/utils/file_icon_utils.dart";
+import "package:locker/utils/snack_bar_utils.dart";
+import "package:open_file/open_file.dart";
+
+class FileRowWidget extends StatelessWidget {
+  final EnteFile file;
+  final List<Collection> collections;
+  final List<OverflowMenuAction>? overflowActions;
+  final bool isLastItem;
+
+  const FileRowWidget({
+    super.key,
+    required this.file,
+    required this.collections,
+    this.overflowActions,
+    this.isLastItem = false,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final updateTime = file.updationTime != null
+        ? DateTime.fromMicrosecondsSinceEpoch(file.updationTime!)
+        : (file.modificationTime != null
+            ? DateTime.fromMillisecondsSinceEpoch(file.modificationTime!)
+            : (file.creationTime != null
+                ? DateTime.fromMillisecondsSinceEpoch(file.creationTime!)
+                : DateTime.now()));
+
+    return InkWell(
+      onTap: () => _openFile(context),
+      child: Container(
+        padding: EdgeInsets.fromLTRB(16.0, 2, 16.0, isLastItem ? 8 : 2),
+        decoration: BoxDecoration(
+          border: isLastItem
+              ? null
+              : Border(
+                  bottom: BorderSide(
+                    color: Theme.of(context).dividerColor.withOpacity(0.3),
+                    width: 0.5,
+                  ),
+                ),
+        ),
+        child: Row(
+          children: [
+            Expanded(
+              flex: 2,
+              child: Padding(
+                padding: const EdgeInsets.only(right: 16.0),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      children: [
+                        Icon(
+                          FileIconUtils.getFileIcon(file.displayName),
+                          color:
+                              FileIconUtils.getFileIconColor(file.displayName),
+                          size: 20,
+                        ),
+                        const SizedBox(width: 12),
+                        Flexible(
+                          child: Text(
+                            file.displayName,
+                            overflow: TextOverflow.ellipsis,
+                            maxLines: 1,
+                            style: getEnteTextTheme(context).body,
+                          ),
+                        ),
+                      ],
+                    ),
+                  ],
+                ),
+              ),
+            ),
+            Expanded(
+              flex: 1,
+              child: Text(
+                formatDate(context, updateTime),
+                style: getEnteTextTheme(context).small.copyWith(
+                      color: Theme.of(context).textTheme.bodySmall?.color,
+                    ),
+                overflow: TextOverflow.ellipsis,
+                maxLines: 1,
+              ),
+            ),
+            PopupMenuButton<String>(
+              onSelected: (value) => _handleMenuAction(context, value),
+              icon: const Icon(
+                Icons.more_vert,
+                size: 20,
+              ),
+              itemBuilder: (BuildContext context) {
+                if (overflowActions != null && overflowActions!.isNotEmpty) {
+                  return overflowActions!
+                      .map(
+                        (action) => PopupMenuItem<String>(
+                          value: action.id,
+                          child: Row(
+                            children: [
+                              Icon(action.icon, size: 16),
+                              const SizedBox(width: 8),
+                              Text(action.label),
+                            ],
+                          ),
+                        ),
+                      )
+                      .toList();
+                } else {
+                  return [
+                    PopupMenuItem<String>(
+                      value: 'edit',
+                      child: Row(
+                        children: [
+                          const Icon(Icons.edit, size: 16),
+                          const SizedBox(width: 8),
+                          Text(context.l10n.edit),
+                        ],
+                      ),
+                    ),
+                    PopupMenuItem<String>(
+                      value: 'share_link',
+                      child: Row(
+                        children: [
+                          const Icon(Icons.share, size: 16),
+                          const SizedBox(width: 8),
+                          Text(context.l10n.share),
+                        ],
+                      ),
+                    ),
+                    PopupMenuItem<String>(
+                      value: 'delete',
+                      child: Row(
+                        children: [
+                          const Icon(Icons.delete, size: 16),
+                          const SizedBox(width: 8),
+                          Text(context.l10n.delete),
+                        ],
+                      ),
+                    ),
+                  ];
+                }
+              },
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  void _handleMenuAction(BuildContext context, String action) {
+    if (overflowActions != null && overflowActions!.isNotEmpty) {
+      final customAction = overflowActions!.firstWhere(
+        (a) => a.id == action,
+        orElse: () => throw StateError('Action not found'),
+      );
+      customAction.onTap(context, file, null);
+    } else {
+      switch (action) {
+        case 'edit':
+          _showEditDialog(context);
+          break;
+        case 'share_link':
+          _shareLink(context);
+          break;
+        case 'delete':
+          _showDeleteConfirmationDialog(context);
+          break;
+      }
+    }
+  }
+
+  Future<void> _shareLink(BuildContext context) async {
+    final dialog = createProgressDialog(
+      context,
+      context.l10n.creatingShareLink,
+      isDismissible: false,
+    );
+
+    try {
+      await dialog.show();
+
+      // Get or create the share link
+      final shareableLink = await LinksService.instance.getOrCreateLink(file);
+
+      await dialog.hide();
+
+      // Show the link dialog with copy and delete options
+      if (context.mounted) {
+        await _showShareLinkDialog(
+          context,
+          shareableLink.fullURL!,
+          shareableLink.linkID,
+        );
+      }
+    } catch (e) {
+      await dialog.hide();
+
+      if (context.mounted) {
+        SnackBarUtils.showWarningSnackBar(
+          context,
+          '${context.l10n.failedToCreateShareLink}: ${e.toString()}',
+        );
+      }
+    }
+  }
+
+  Future<void> _showShareLinkDialog(
+    BuildContext context,
+    String url,
+    String linkID,
+  ) async {
+    final colorScheme = getEnteColorScheme(context);
+    final textTheme = getEnteTextTheme(context);
+    // Capture the root context (with Scaffold) before showing dialog
+    final rootContext = context;
+
+    await showDialog<void>(
+      context: context,
+      builder: (BuildContext dialogContext) {
+        return StatefulBuilder(
+          builder: (context, setState) {
+            return AlertDialog(
+              title: Text(
+                dialogContext.l10n.share,
+                style: textTheme.largeBold,
+              ),
+              content: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    dialogContext.l10n.shareThisLink,
+                    style: textTheme.body,
+                  ),
+                  const SizedBox(height: 20),
+                  Container(
+                    padding: const EdgeInsets.all(12),
+                    decoration: BoxDecoration(
+                      color: colorScheme.fillFaint,
+                      borderRadius: BorderRadius.circular(8),
+                      border: Border.all(color: colorScheme.strokeFaint),
+                    ),
+                    child: Row(
+                      children: [
+                        Expanded(
+                          child: SelectableText(
+                            url,
+                            style: textTheme.small,
+                          ),
+                        ),
+                        const SizedBox(width: 8),
+                        CopyButton(url: url),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+              actions: [
+                TextButton(
+                  onPressed: () async {
+                    Navigator.of(context).pop();
+                    await _deleteShareLink(rootContext, file.uploadedFileID!);
+                  },
+                  child: Text(
+                    dialogContext.l10n.deleteLink,
+                    style:
+                        textTheme.body.copyWith(color: colorScheme.warning500),
+                  ),
+                ),
+                TextButton(
+                  onPressed: () async {
+                    Navigator.of(dialogContext).pop();
+                    // Use system share sheet to share the URL
+                    await shareText(
+                      url,
+                      context: rootContext,
+                    );
+                  },
+                  child: Text(
+                    dialogContext.l10n.shareLink,
+                    style:
+                        textTheme.body.copyWith(color: colorScheme.primary500),
+                  ),
+                ),
+              ],
+            );
+          },
+        );
+      },
+    );
+  }
+
+  Future<void> _deleteShareLink(BuildContext context, int fileID) async {
+    final result = await showChoiceDialog(
+      context,
+      title: context.l10n.deleteShareLinkDialogTitle,
+      body: context.l10n.deleteShareLinkConfirmation,
+      firstButtonLabel: context.l10n.delete,
+      secondButtonLabel: context.l10n.cancel,
+      firstButtonType: ButtonType.critical,
+      isCritical: true,
+    );
+    if (result?.action == ButtonAction.first && context.mounted) {
+      final dialog = createProgressDialog(
+        context,
+        context.l10n.deletingShareLink,
+        isDismissible: false,
+      );
+
+      try {
+        await dialog.show();
+        await LinksService.instance.deleteLink(fileID);
+        await dialog.hide();
+
+        if (context.mounted) {
+          SnackBarUtils.showInfoSnackBar(
+            context,
+            context.l10n.shareLinkDeletedSuccessfully,
+          );
+        }
+      } catch (e) {
+        await dialog.hide();
+
+        if (context.mounted) {
+          SnackBarUtils.showWarningSnackBar(
+            context,
+            '${context.l10n.failedToDeleteShareLink}: ${e.toString()}',
+          );
+        }
+      }
+    }
+  }
+
+  Future<void> _showDeleteConfirmationDialog(BuildContext context) async {
+    final result = await showChoiceDialog(
+      context,
+      title: context.l10n.deleteFile,
+      body: context.l10n.deleteFileConfirmation(file.displayName),
+      firstButtonLabel: context.l10n.delete,
+      secondButtonLabel: context.l10n.cancel,
+      firstButtonType: ButtonType.critical,
+      isCritical: true,
+    );
+
+    if (result?.action == ButtonAction.first && context.mounted) {
+      await _deleteFile(context);
+    }
+  }
+
+  Future<void> _deleteFile(BuildContext context) async {
+    final dialog = createProgressDialog(
+      context,
+      context.l10n.deletingFile,
+      isDismissible: false,
+    );
+
+    try {
+      await dialog.show();
+
+      final collections =
+          await CollectionService.instance.getCollectionsForFile(file);
+      if (collections.isNotEmpty) {
+        await CollectionService.instance.trashFile(file, collections.first);
+      }
+
+      await dialog.hide();
+
+      SnackBarUtils.showInfoSnackBar(
+        context,
+        context.l10n.fileDeletedSuccessfully,
+      );
+    } catch (e) {
+      await dialog.hide();
+
+      SnackBarUtils.showWarningSnackBar(
+        context,
+        context.l10n.failedToDeleteFile(e.toString()),
+      );
+    }
+  }
+
+  Future<void> _showEditDialog(BuildContext context) async {
+    final allCollections = await CollectionService.instance.getCollections();
+    allCollections.removeWhere(
+      (c) => c.type == CollectionType.uncategorized,
+    );
+
+    final result = await showFileEditDialog(
+      context,
+      file: file,
+      collections: allCollections,
+    );
+
+    if (result != null && context.mounted) {
+      List<Collection> currentCollections;
+      try {
+        currentCollections =
+            await CollectionService.instance.getCollectionsForFile(file);
+      } catch (e) {
+        currentCollections = <Collection>[];
+      }
+
+      final currentCollectionsSet = currentCollections.toSet();
+
+      final newCollectionsSet = result.selectedCollections.toSet();
+
+      final collectionsToAdd =
+          newCollectionsSet.difference(currentCollectionsSet).toList();
+
+      final collectionsToRemove =
+          currentCollectionsSet.difference(newCollectionsSet).toList();
+
+      final currentTitle = file.displayName;
+      final currentCaption = file.caption ?? '';
+      final hasMetadataChanged =
+          result.title != currentTitle || result.caption != currentCaption;
+
+      if (hasMetadataChanged || currentCollectionsSet != newCollectionsSet) {
+        final dialog = createProgressDialog(
+          context,
+          context.l10n.pleaseWait,
+          isDismissible: false,
+        );
+        await dialog.show();
+
+        try {
+          final List<Future<void>> apiCalls = [];
+          for (final collection in collectionsToAdd) {
+            apiCalls.add(
+              CollectionService.instance.addToCollection(collection, file),
+            );
+          }
+          await Future.wait(apiCalls);
+          apiCalls.clear();
+
+          for (final collection in collectionsToRemove) {
+            apiCalls.add(
+              CollectionService.instance
+                  .move(file, collection, newCollectionsSet.first),
+            );
+          }
+          if (hasMetadataChanged) {
+            apiCalls.add(
+              MetadataUpdaterService.instance
+                  .editFileNameAndCaption(file, result.title, result.caption),
+            );
+          }
+          await Future.wait(apiCalls);
+
+          await dialog.hide();
+
+          SnackBarUtils.showInfoSnackBar(
+            context,
+            context.l10n.fileUpdatedSuccessfully,
+          );
+        } catch (e) {
+          await dialog.hide();
+
+          SnackBarUtils.showWarningSnackBar(
+            context,
+            context.l10n.failedToUpdateFile(e.toString()),
+          );
+        }
+      } else {
+        SnackBarUtils.showWarningSnackBar(
+          context,
+          context.l10n.noChangesWereMade,
+        );
+      }
+    }
+  }
+
+  Future<void> _openFile(BuildContext context) async {
+    if (file.localPath != null) {
+      final localFile = File(file.localPath!);
+      if (await localFile.exists()) {
+        await _launchFile(context, localFile, file.displayName);
+        return;
+      }
+    }
+
+    final String cachedFilePath =
+        "${Configuration.instance.getCacheDirectory()}${file.displayName}";
+    final File cachedFile = File(cachedFilePath);
+    if (await cachedFile.exists()) {
+      await _launchFile(context, cachedFile, file.displayName);
+      return;
+    }
+
+    final dialog = createProgressDialog(
+      context,
+      context.l10n.downloading,
+      isDismissible: false,
+    );
+
+    try {
+      await dialog.show();
+      final fileKey = await CollectionService.instance.getFileKey(file);
+      final decryptedFile = await downloadAndDecrypt(
+        file,
+        fileKey,
+        progressCallback: (downloaded, total) {
+          if (total > 0 && downloaded >= 0) {
+            final percentage =
+                ((downloaded / total) * 100).clamp(0, 100).round();
+            dialog.update(
+              message: context.l10n.downloadingProgress(percentage),
+            );
+          } else {
+            dialog.update(message: context.l10n.downloading);
+          }
+        },
+        shouldUseCache: true,
+      );
+
+      await dialog.hide();
+
+      if (decryptedFile != null) {
+        await _launchFile(context, decryptedFile, file.displayName);
+      } else {
+        await showErrorDialog(
+          context,
+          context.l10n.downloadFailed,
+          context.l10n.failedToDownloadOrDecrypt,
+        );
+      }
+    } catch (e) {
+      await dialog.hide();
+      await showErrorDialog(
+        context,
+        context.l10n.errorOpeningFile,
+        context.l10n.errorOpeningFileMessage(e.toString()),
+      );
+    }
+  }
+
+  Future<void> _launchFile(
+    BuildContext context,
+    File file,
+    String fileName,
+  ) async {
+    try {
+      await OpenFile.open(file.path);
+    } catch (e) {
+      await showErrorDialog(
+        context,
+        context.l10n.errorOpeningFile,
+        context.l10n.couldNotOpenFile(e.toString()),
+      );
+    }
+  }
+}

mobile/apps/locker/lib/ui/components/item_list_view.dart

@@ -1,28 +1,12 @@
-import 'dart:io';
 
-import 'package:ente_ui/components/buttons/button_widget.dart';
-import 'package:ente_ui/components/buttons/models/button_type.dart';
 import 'package:ente_ui/theme/ente_theme.dart';
-import 'package:ente_ui/utils/dialog_util.dart';
-import 'package:ente_utils/share_utils.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
+import 'package:flutter/material.dart'; 
 import 'package:locker/l10n/l10n.dart';
-import 'package:locker/services/collections/collections_service.dart';
 import 'package:locker/services/collections/models/collection.dart';
-import 'package:locker/services/configuration.dart';
-import 'package:locker/services/files/download/file_downloader.dart';
-import 'package:locker/services/files/links/links_service.dart';
-import 'package:locker/services/files/sync/metadata_updater_service.dart';
 import 'package:locker/services/files/sync/models/file.dart';
-import 'package:locker/ui/components/file_edit_dialog.dart';
-import 'package:locker/ui/pages/collection_page.dart';
-import 'package:locker/utils/collection_actions.dart';
+import "package:locker/ui/components/collection_row_widget.dart";
+import "package:locker/ui/components/file_row_widget.dart";
 import 'package:locker/utils/collection_sort_util.dart';
-import 'package:locker/utils/date_time_util.dart';
-import 'package:locker/utils/file_icon_utils.dart';
-import 'package:locker/utils/snack_bar_utils.dart';
-import 'package:open_file/open_file.dart';
 
 class OverflowMenuAction {
   final String id;
@@ -400,767 +384,6 @@ class ListItemWidget extends StatelessWidget {
   }
 }
 
-class CollectionRowWidget extends StatelessWidget {
-  final Collection collection;
-  final List<OverflowMenuAction>? overflowActions;
-  final bool isLastItem;
-
-  const CollectionRowWidget({
-    super.key,
-    required this.collection,
-    this.overflowActions,
-    this.isLastItem = false,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final updateTime =
-        DateTime.fromMicrosecondsSinceEpoch(collection.updationTime);
-
-    return InkWell(
-      onTap: () => _openCollection(context),
-      child: Container(
-        padding: EdgeInsets.fromLTRB(16.0, 2, 16.0, isLastItem ? 8 : 2),
-        decoration: BoxDecoration(
-          border: isLastItem
-              ? null
-              : Border(
-                  bottom: BorderSide(
-                    color: Theme.of(context).dividerColor.withOpacity(0.3),
-                    width: 0.5,
-                  ),
-                ),
-        ),
-        child: Row(
-          children: [
-            Expanded(
-              flex: 2,
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Row(
-                    children: [
-                      Icon(
-                        Icons.folder_open,
-                        color: collection.type == CollectionType.favorites
-                            ? getEnteColorScheme(context).primary500
-                            : Colors.grey,
-                        size: 20,
-                      ),
-                      const SizedBox(width: 12),
-                      Flexible(
-                        child: Text(
-                          collection.name ?? 'Unnamed Collection',
-                          overflow: TextOverflow.ellipsis,
-                          maxLines: 1,
-                          style: getEnteTextTheme(context).body,
-                        ),
-                      ),
-                    ],
-                  ),
-                ],
-              ),
-            ),
-            Expanded(
-              flex: 1,
-              child: Text(
-                formatDate(context, updateTime),
-                style: getEnteTextTheme(context).small.copyWith(
-                      color: Theme.of(context).textTheme.bodySmall?.color,
-                    ),
-                overflow: TextOverflow.ellipsis,
-                maxLines: 1,
-              ),
-            ),
-            PopupMenuButton<String>(
-              onSelected: (value) => _handleMenuAction(context, value),
-              icon: const Icon(
-                Icons.more_vert,
-                size: 20,
-              ),
-              itemBuilder: (BuildContext context) {
-                if (overflowActions != null && overflowActions!.isNotEmpty) {
-                  return overflowActions!
-                      .map(
-                        (action) => PopupMenuItem<String>(
-                          value: action.id,
-                          child: Row(
-                            children: [
-                              Icon(action.icon, size: 16),
-                              const SizedBox(width: 8),
-                              Text(action.label),
-                            ],
-                          ),
-                        ),
-                      )
-                      .toList();
-                } else {
-                  return [
-                    PopupMenuItem<String>(
-                      value: 'edit',
-                      child: Row(
-                        children: [
-                          const Icon(Icons.edit, size: 16),
-                          const SizedBox(width: 8),
-                          Text(context.l10n.edit),
-                        ],
-                      ),
-                    ),
-                    PopupMenuItem<String>(
-                      value: 'delete',
-                      child: Row(
-                        children: [
-                          const Icon(Icons.delete, size: 16),
-                          const SizedBox(width: 8),
-                          Text(context.l10n.delete),
-                        ],
-                      ),
-                    ),
-                  ];
-                }
-              },
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  void _handleMenuAction(BuildContext context, String action) {
-    if (overflowActions != null && overflowActions!.isNotEmpty) {
-      final customAction = overflowActions!.firstWhere(
-        (a) => a.id == action,
-        orElse: () => throw StateError('Action not found'),
-      );
-      customAction.onTap(context, null, collection);
-    } else {
-      switch (action) {
-        case 'edit':
-          _editCollection(context);
-          break;
-        case 'delete':
-          _deleteCollection(context);
-          break;
-      }
-    }
-  }
-
-  void _editCollection(BuildContext context) {
-    CollectionActions.editCollection(context, collection);
-  }
-
-  void _deleteCollection(BuildContext context) {
-    CollectionActions.deleteCollection(context, collection);
-  }
-
-  void _openCollection(BuildContext context) {
-    Navigator.of(context).push(
-      MaterialPageRoute(
-        builder: (context) => CollectionPage(collection: collection),
-      ),
-    );
-  }
-}
-
-class FileRowWidget extends StatelessWidget {
-  final EnteFile file;
-  final List<Collection> collections;
-  final List<OverflowMenuAction>? overflowActions;
-  final bool isLastItem;
-
-  const FileRowWidget({
-    super.key,
-    required this.file,
-    required this.collections,
-    this.overflowActions,
-    this.isLastItem = false,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final updateTime = file.updationTime != null
-        ? DateTime.fromMicrosecondsSinceEpoch(file.updationTime!)
-        : (file.modificationTime != null
-            ? DateTime.fromMillisecondsSinceEpoch(file.modificationTime!)
-            : (file.creationTime != null
-                ? DateTime.fromMillisecondsSinceEpoch(file.creationTime!)
-                : DateTime.now()));
-
-    return InkWell(
-      onTap: () => _openFile(context),
-      child: Container(
-        padding: EdgeInsets.fromLTRB(16.0, 2, 16.0, isLastItem ? 8 : 2),
-        decoration: BoxDecoration(
-          border: isLastItem
-              ? null
-              : Border(
-                  bottom: BorderSide(
-                    color: Theme.of(context).dividerColor.withOpacity(0.3),
-                    width: 0.5,
-                  ),
-                ),
-        ),
-        child: Row(
-          children: [
-            Expanded(
-              flex: 2,
-              child: Padding(
-                padding: const EdgeInsets.only(right: 16.0),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Row(
-                      children: [
-                        Icon(
-                          FileIconUtils.getFileIcon(file.displayName),
-                          color:
-                              FileIconUtils.getFileIconColor(file.displayName),
-                          size: 20,
-                        ),
-                        const SizedBox(width: 12),
-                        Flexible(
-                          child: Text(
-                            file.displayName,
-                            overflow: TextOverflow.ellipsis,
-                            maxLines: 1,
-                            style: getEnteTextTheme(context).body,
-                          ),
-                        ),
-                      ],
-                    ),
-                  ],
-                ),
-              ),
-            ),
-            Expanded(
-              flex: 1,
-              child: Text(
-                formatDate(context, updateTime),
-                style: getEnteTextTheme(context).small.copyWith(
-                      color: Theme.of(context).textTheme.bodySmall?.color,
-                    ),
-                overflow: TextOverflow.ellipsis,
-                maxLines: 1,
-              ),
-            ),
-            PopupMenuButton<String>(
-              onSelected: (value) => _handleMenuAction(context, value),
-              icon: const Icon(
-                Icons.more_vert,
-                size: 20,
-              ),
-              itemBuilder: (BuildContext context) {
-                if (overflowActions != null && overflowActions!.isNotEmpty) {
-                  return overflowActions!
-                      .map(
-                        (action) => PopupMenuItem<String>(
-                          value: action.id,
-                          child: Row(
-                            children: [
-                              Icon(action.icon, size: 16),
-                              const SizedBox(width: 8),
-                              Text(action.label),
-                            ],
-                          ),
-                        ),
-                      )
-                      .toList();
-                } else {
-                  return [
-                    PopupMenuItem<String>(
-                      value: 'edit',
-                      child: Row(
-                        children: [
-                          const Icon(Icons.edit, size: 16),
-                          const SizedBox(width: 8),
-                          Text(context.l10n.edit),
-                        ],
-                      ),
-                    ),
-                    PopupMenuItem<String>(
-                      value: 'share_link',
-                      child: Row(
-                        children: [
-                          const Icon(Icons.share, size: 16),
-                          const SizedBox(width: 8),
-                          Text(context.l10n.share),
-                        ],
-                      ),
-                    ),
-                    PopupMenuItem<String>(
-                      value: 'delete',
-                      child: Row(
-                        children: [
-                          const Icon(Icons.delete, size: 16),
-                          const SizedBox(width: 8),
-                          Text(context.l10n.delete),
-                        ],
-                      ),
-                    ),
-                  ];
-                }
-              },
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  void _handleMenuAction(BuildContext context, String action) {
-    if (overflowActions != null && overflowActions!.isNotEmpty) {
-      final customAction = overflowActions!.firstWhere(
-        (a) => a.id == action,
-        orElse: () => throw StateError('Action not found'),
-      );
-      customAction.onTap(context, file, null);
-    } else {
-      switch (action) {
-        case 'edit':
-          _showEditDialog(context);
-          break;
-        case 'share_link':
-          _shareLink(context);
-          break;
-        case 'delete':
-          _showDeleteConfirmationDialog(context);
-          break;
-      }
-    }
-  }
-
-  Future<void> _shareLink(BuildContext context) async {
-    final dialog = createProgressDialog(
-      context,
-      context.l10n.creatingShareLink,
-      isDismissible: false,
-    );
-
-    try {
-      await dialog.show();
-
-      // Get or create the share link
-      final shareableLink = await LinksService.instance.getOrCreateLink(file);
-
-      await dialog.hide();
-
-      // Show the link dialog with copy and delete options
-      if (context.mounted) {
-        await _showShareLinkDialog(
-          context,
-          shareableLink.fullURL!,
-          shareableLink.linkID,
-        );
-      }
-    } catch (e) {
-      await dialog.hide();
-
-      if (context.mounted) {
-        SnackBarUtils.showWarningSnackBar(
-          context,
-          '${context.l10n.failedToCreateShareLink}: ${e.toString()}',
-        );
-      }
-    }
-  }
-
-  Future<void> _showShareLinkDialog(
-    BuildContext context,
-    String url,
-    String linkID,
-  ) async {
-    final colorScheme = getEnteColorScheme(context);
-    final textTheme = getEnteTextTheme(context);
-    // Capture the root context (with Scaffold) before showing dialog
-    final rootContext = context;
-
-    await showDialog<void>(
-      context: context,
-      builder: (BuildContext dialogContext) {
-        return StatefulBuilder(
-          builder: (context, setState) {
-            return AlertDialog(
-              title: Text(
-                dialogContext.l10n.share,
-                style: textTheme.largeBold,
-              ),
-              content: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Text(
-                    dialogContext.l10n.shareThisLink,
-                    style: textTheme.body,
-                  ),
-                  const SizedBox(height: 20),
-                  Container(
-                    padding: const EdgeInsets.all(12),
-                    decoration: BoxDecoration(
-                      color: colorScheme.fillFaint,
-                      borderRadius: BorderRadius.circular(8),
-                      border: Border.all(color: colorScheme.strokeFaint),
-                    ),
-                    child: Row(
-                      children: [
-                        Expanded(
-                          child: SelectableText(
-                            url,
-                            style: textTheme.small,
-                          ),
-                        ),
-                        const SizedBox(width: 8),
-                        _CopyButton(
-                          url: url,
-                        ),
-                      ],
-                    ),
-                  ),
-                ],
-              ),
-              actions: [
-                TextButton(
-                  onPressed: () async {
-                    Navigator.of(context).pop();
-                    await _deleteShareLink(rootContext, file.uploadedFileID!);
-                  },
-                  child: Text(
-                    dialogContext.l10n.deleteLink,
-                    style:
-                        textTheme.body.copyWith(color: colorScheme.warning500),
-                  ),
-                ),
-                TextButton(
-                  onPressed: () async {
-                    Navigator.of(dialogContext).pop();
-                    // Use system share sheet to share the URL
-                    await shareText(
-                      url,
-                      context: rootContext,
-                    );
-                  },
-                  child: Text(
-                    dialogContext.l10n.shareLink,
-                    style:
-                        textTheme.body.copyWith(color: colorScheme.primary500),
-                  ),
-                ),
-              ],
-            );
-          },
-        );
-      },
-    );
-  }
-
-  Future<void> _deleteShareLink(BuildContext context, int fileID) async {
-    final result = await showChoiceDialog(
-      context,
-      title: context.l10n.deleteShareLinkDialogTitle,
-      body: context.l10n.deleteShareLinkConfirmation,
-      firstButtonLabel: context.l10n.delete,
-      secondButtonLabel: context.l10n.cancel,
-      firstButtonType: ButtonType.critical,
-      isCritical: true,
-    );
-    if (result?.action == ButtonAction.first && context.mounted) {
-      final dialog = createProgressDialog(
-        context,
-        context.l10n.deletingShareLink,
-        isDismissible: false,
-      );
-
-      try {
-        await dialog.show();
-        await LinksService.instance.deleteLink(fileID);
-        await dialog.hide();
-
-        if (context.mounted) {
-          SnackBarUtils.showInfoSnackBar(
-            context,
-            context.l10n.shareLinkDeletedSuccessfully,
-          );
-        }
-      } catch (e) {
-        await dialog.hide();
-
-        if (context.mounted) {
-          SnackBarUtils.showWarningSnackBar(
-            context,
-            '${context.l10n.failedToDeleteShareLink}: ${e.toString()}',
-          );
-        }
-      }
-    }
-  }
-
-  Future<void> _showDeleteConfirmationDialog(BuildContext context) async {
-    final result = await showChoiceDialog(
-      context,
-      title: context.l10n.deleteFile,
-      body: context.l10n.deleteFileConfirmation(file.displayName),
-      firstButtonLabel: context.l10n.delete,
-      secondButtonLabel: context.l10n.cancel,
-      firstButtonType: ButtonType.critical,
-      isCritical: true,
-    );
-
-    if (result?.action == ButtonAction.first && context.mounted) {
-      await _deleteFile(context);
-    }
-  }
-
-  Future<void> _deleteFile(BuildContext context) async {
-    final dialog = createProgressDialog(
-      context,
-      context.l10n.deletingFile,
-      isDismissible: false,
-    );
-
-    try {
-      await dialog.show();
-
-      final collections =
-          await CollectionService.instance.getCollectionsForFile(file);
-      if (collections.isNotEmpty) {
-        await CollectionService.instance.trashFile(file, collections.first);
-      }
-
-      await dialog.hide();
-
-      SnackBarUtils.showInfoSnackBar(
-        context,
-        context.l10n.fileDeletedSuccessfully,
-      );
-    } catch (e) {
-      await dialog.hide();
-
-      SnackBarUtils.showWarningSnackBar(
-        context,
-        context.l10n.failedToDeleteFile(e.toString()),
-      );
-    }
-  }
-
-  Future<void> _showEditDialog(BuildContext context) async {
-    final allCollections = await CollectionService.instance.getCollections();
-    allCollections.removeWhere(
-      (c) => c.type == CollectionType.uncategorized,
-    );
-
-    final result = await showFileEditDialog(
-      context,
-      file: file,
-      collections: allCollections,
-    );
-
-    if (result != null && context.mounted) {
-      List<Collection> currentCollections;
-      try {
-        currentCollections =
-            await CollectionService.instance.getCollectionsForFile(file);
-      } catch (e) {
-        currentCollections = <Collection>[];
-      }
-
-      final currentCollectionsSet = currentCollections.toSet();
-
-      final newCollectionsSet = result.selectedCollections.toSet();
-
-      final collectionsToAdd =
-          newCollectionsSet.difference(currentCollectionsSet).toList();
-
-      final collectionsToRemove =
-          currentCollectionsSet.difference(newCollectionsSet).toList();
-
-      final currentTitle = file.displayName;
-      final currentCaption = file.caption ?? '';
-      final hasMetadataChanged =
-          result.title != currentTitle || result.caption != currentCaption;
-
-      if (hasMetadataChanged || currentCollectionsSet != newCollectionsSet) {
-        final dialog = createProgressDialog(
-          context,
-          context.l10n.pleaseWait,
-          isDismissible: false,
-        );
-        await dialog.show();
-
-        try {
-          final List<Future<void>> apiCalls = [];
-          for (final collection in collectionsToAdd) {
-            apiCalls.add(
-              CollectionService.instance.addToCollection(collection, file),
-            );
-          }
-          await Future.wait(apiCalls);
-          apiCalls.clear();
-
-          for (final collection in collectionsToRemove) {
-            apiCalls.add(
-              CollectionService.instance
-                  .move(file, collection, newCollectionsSet.first),
-            );
-          }
-          if (hasMetadataChanged) {
-            apiCalls.add(
-              MetadataUpdaterService.instance
-                  .editFileNameAndCaption(file, result.title, result.caption),
-            );
-          }
-          await Future.wait(apiCalls);
-
-          await dialog.hide();
-
-          SnackBarUtils.showInfoSnackBar(
-            context,
-            context.l10n.fileUpdatedSuccessfully,
-          );
-        } catch (e) {
-          await dialog.hide();
-
-          SnackBarUtils.showWarningSnackBar(
-            context,
-            context.l10n.failedToUpdateFile(e.toString()),
-          );
-        }
-      } else {
-        SnackBarUtils.showWarningSnackBar(
-          context,
-          context.l10n.noChangesWereMade,
-        );
-      }
-    }
-  }
-
-  Future<void> _openFile(BuildContext context) async {
-    if (file.localPath != null) {
-      final localFile = File(file.localPath!);
-      if (await localFile.exists()) {
-        await _launchFile(context, localFile, file.displayName);
-        return;
-      }
-    }
-
-    final String cachedFilePath =
-        "${Configuration.instance.getCacheDirectory()}${file.displayName}";
-    final File cachedFile = File(cachedFilePath);
-    if (await cachedFile.exists()) {
-      await _launchFile(context, cachedFile, file.displayName);
-      return;
-    }
-
-    final dialog = createProgressDialog(
-      context,
-      context.l10n.downloading,
-      isDismissible: false,
-    );
-
-    try {
-      await dialog.show();
-      final fileKey = await CollectionService.instance.getFileKey(file);
-      final decryptedFile = await downloadAndDecrypt(
-        file,
-        fileKey,
-        progressCallback: (downloaded, total) {
-          if (total > 0 && downloaded >= 0) {
-            final percentage =
-                ((downloaded / total) * 100).clamp(0, 100).round();
-            dialog.update(
-              message: context.l10n.downloadingProgress(percentage),
-            );
-          } else {
-            dialog.update(message: context.l10n.downloading);
-          }
-        },
-        shouldUseCache: true,
-      );
-
-      await dialog.hide();
-
-      if (decryptedFile != null) {
-        await _launchFile(context, decryptedFile, file.displayName);
-      } else {
-        await showErrorDialog(
-          context,
-          context.l10n.downloadFailed,
-          context.l10n.failedToDownloadOrDecrypt,
-        );
-      }
-    } catch (e) {
-      await dialog.hide();
-      await showErrorDialog(
-        context,
-        context.l10n.errorOpeningFile,
-        context.l10n.errorOpeningFileMessage(e.toString()),
-      );
-    }
-  }
-
-  Future<void> _launchFile(
-    BuildContext context,
-    File file,
-    String fileName,
-  ) async {
-    try {
-      await OpenFile.open(file.path);
-    } catch (e) {
-      await showErrorDialog(
-        context,
-        context.l10n.errorOpeningFile,
-        context.l10n.couldNotOpenFile(e.toString()),
-      );
-    }
-  }
-}
-
-class _CopyButton extends StatefulWidget {
-  final String url;
-
-  const _CopyButton({
-    required this.url,
-  });
-
-  @override
-  State<_CopyButton> createState() => _CopyButtonState();
-}
-
-class _CopyButtonState extends State<_CopyButton> {
-  bool _isCopied = false;
-
-  @override
-  Widget build(BuildContext context) {
-    final colorScheme = getEnteColorScheme(context);
-
-    return IconButton(
-      onPressed: () async {
-        await Clipboard.setData(ClipboardData(text: widget.url));
-        setState(() {
-          _isCopied = true;
-        });
-        // Reset the state after 2 seconds
-        Future.delayed(const Duration(seconds: 2), () {
-          if (mounted) {
-            setState(() {
-              _isCopied = false;
-            });
-          }
-        });
-      },
-      icon: Icon(
-        _isCopied ? Icons.check : Icons.copy,
-        size: 16,
-        color: _isCopied ? colorScheme.primary500 : colorScheme.primary500,
-      ),
-      iconSize: 16,
-      constraints: const BoxConstraints(),
-      padding: const EdgeInsets.all(4),
-      tooltip: _isCopied
-          ? context.l10n.linkCopiedToClipboard
-          : context.l10n.copyLink,
-    );
-  }
-}
-
 class FileListViewHelpers {
   static Widget createSearchEmptyState({
     required String searchQuery,

mobile/apps/locker/lib/ui/pages/all_collections_page.dart

@@ -18,8 +18,19 @@ import 'package:locker/ui/pages/trash_page.dart';
 import 'package:locker/utils/collection_sort_util.dart';
 import 'package:logging/logging.dart';
 
+enum UISectionType {
+  incomingCollections,
+  outgoingCollections,
+  homeCollections,
+}
+
 class AllCollectionsPage extends StatefulWidget {
-  const AllCollectionsPage({super.key});
+  final UISectionType viewType;
+
+  const AllCollectionsPage({
+    super.key,
+    this.viewType = UISectionType.homeCollections,
+  });
 
   @override
   State<AllCollectionsPage> createState() => _AllCollectionsPageState();
@@ -34,6 +45,8 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
   List<EnteFile> _allFiles = [];
   bool _isLoading = true;
   String? _error;
+  bool showTrash = false;
+  bool showUncategorized = false;
   final _logger = Logger("AllCollectionsPage");
 
   @override
@@ -68,6 +81,10 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
     Bus.instance.on<CollectionsUpdatedEvent>().listen((event) async {
       await _loadCollections();
     });
+    if (widget.viewType == UISectionType.homeCollections) {
+      showTrash = true;
+      showUncategorized = true;
+    }
   }
 
   Future<void> _loadCollections() async {
@@ -77,7 +94,19 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
     });
 
     try {
-      final collections = await CollectionService.instance.getCollections();
+      List<Collection> collections = [];
+
+      if (widget.viewType == UISectionType.homeCollections) {
+        collections = await CollectionService.instance.getCollections();
+      } else {
+        final sharedCollections =
+            await CollectionService.instance.getSharedCollections();
+        if (widget.viewType == UISectionType.outgoingCollections) {
+          collections = sharedCollections.outgoing;
+        } else if (widget.viewType == UISectionType.incomingCollections) {
+          collections = sharedCollections.incoming;
+        }
+      }
 
       final regularCollections = <Collection>[];
       Collection? uncategorized;
@@ -94,8 +123,12 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
 
       _allCollections = List.from(collections);
       _sortedCollections = List.from(regularCollections);
-      _uncategorizedCollection = uncategorized;
-      _uncategorizedFileCount = uncategorized != null
+      _uncategorizedCollection =
+          widget.viewType == UISectionType.homeCollections
+              ? uncategorized
+              : null;
+      _uncategorizedFileCount = uncategorized != null &&
+              widget.viewType == UISectionType.homeCollections
           ? (await CollectionService.instance
                   .getFilesInCollection(uncategorized))
               .length
@@ -122,7 +155,7 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
       child: Scaffold(
         appBar: AppBar(
           leading: buildSearchLeading(),
-          title: Text(context.l10n.collections),
+          title: Text(_getTitle(context)),
           centerTitle: false,
           backgroundColor: Theme.of(context).scaffoldBackgroundColor,
           foregroundColor: Theme.of(context).textTheme.bodyLarge?.color,
@@ -237,9 +270,11 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
               enableSorting: true,
             ),
           ),
-          if (!isSearchActive && _uncategorizedCollection != null)
+          if (!isSearchActive &&
+              _uncategorizedCollection != null &&
+              showUncategorized)
             _buildUncategorizedHook(),
-          _buildTrashHook(),
+          if (showTrash) _buildTrashHook(),
         ],
       ),
     );
@@ -254,9 +289,9 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
         child: Container(
           padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 16.0),
           decoration: BoxDecoration(
-            color: Theme.of(context).colorScheme.surface.withOpacity(0.3),
+            color: Theme.of(context).colorScheme.surface.withAlpha(30),
             border: Border.all(
-              color: Theme.of(context).dividerColor.withOpacity(0.5),
+              color: Theme.of(context).dividerColor.withAlpha(50),
               width: 0.5,
             ),
             borderRadius: BorderRadius.circular(12.0),
@@ -265,11 +300,8 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
             children: [
               Icon(
                 Icons.delete_outline,
-                color: Theme.of(context)
-                    .textTheme
-                    .bodyLarge
-                    ?.color
-                    ?.withOpacity(0.7),
+                color:
+                    Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(70),
                 size: 22,
               ),
               const SizedBox(width: 12),
@@ -287,7 +319,7 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
                     .textTheme
                     .bodyMedium
                     ?.color
-                    ?.withOpacity(0.6),
+                    ?.withAlpha(60),
                 size: 20,
               ),
             ],
@@ -326,9 +358,9 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
         child: Container(
           padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 16.0),
           decoration: BoxDecoration(
-            color: Theme.of(context).colorScheme.surface.withOpacity(0.3),
+            color: Theme.of(context).colorScheme.surface.withAlpha(30),
             border: Border.all(
-              color: Theme.of(context).dividerColor.withOpacity(0.5),
+              color: Theme.of(context).dividerColor.withAlpha(50),
               width: 0.5,
             ),
             borderRadius: BorderRadius.circular(12.0),
@@ -337,11 +369,8 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
             children: [
               Icon(
                 Icons.folder_open_outlined,
-                color: Theme.of(context)
-                    .textTheme
-                    .bodyLarge
-                    ?.color
-                    ?.withOpacity(0.7),
+                color:
+                    Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(70),
                 size: 22,
               ),
               const SizedBox(width: 12),
@@ -363,7 +392,7 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
                                   .textTheme
                                   .bodySmall
                                   ?.color
-                                  ?.withOpacity(0.5),
+                                  ?.withAlpha(50),
                             ),
                       ),
                       const SizedBox(width: 8),
@@ -374,7 +403,7 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
                                   .textTheme
                                   .bodySmall
                                   ?.color
-                                  ?.withOpacity(0.7),
+                                  ?.withAlpha(70),
                             ),
                       ),
                     ],
@@ -387,7 +416,7 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
                     .textTheme
                     .bodyMedium
                     ?.color
-                    ?.withOpacity(0.6),
+                    ?.withAlpha(60),
                 size: 20,
               ),
             ],
@@ -405,4 +434,15 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
       ),
     );
   }
+
+  String _getTitle(BuildContext context) {
+    switch (widget.viewType) {
+      case UISectionType.homeCollections:
+        return context.l10n.collections;
+      case UISectionType.outgoingCollections:
+        return context.l10n.sharedByYou;
+      case UISectionType.incomingCollections:
+        return context.l10n.sharedWithYou;
+    }
+  }
 }

mobile/apps/locker/lib/ui/pages/collection_page.dart

@@ -1,17 +1,27 @@
+import "dart:async";
+
 import 'package:ente_events/event_bus.dart';
 import 'package:ente_ui/theme/ente_theme.dart';
+import "package:ente_ui/utils/dialog_util.dart";
+import "package:ente_utils/navigation_util.dart";
 import 'package:flutter/material.dart';
 import 'package:locker/events/collections_updated_event.dart';
 import 'package:locker/l10n/l10n.dart';
 import 'package:locker/services/collections/collections_service.dart';
 import 'package:locker/services/collections/models/collection.dart';
+import "package:locker/services/collections/models/collection_view_type.dart";
+import "package:locker/services/configuration.dart";
 import 'package:locker/services/files/sync/models/file.dart';
 import 'package:locker/ui/components/item_list_view.dart';
 import 'package:locker/ui/components/search_result_view.dart';
 import 'package:locker/ui/mixins/search_mixin.dart';
 import 'package:locker/ui/pages/home_page.dart';
 import 'package:locker/ui/pages/uploader_page.dart';
+import "package:locker/ui/sharing/album_participants_page.dart";
+import "package:locker/ui/sharing/manage_links_widget.dart";
+import "package:locker/ui/sharing/share_collection_page.dart";
 import 'package:locker/utils/collection_actions.dart';
+import "package:logging/logging.dart";
 
 class CollectionPage extends UploaderPage {
   final Collection collection;
@@ -27,9 +37,16 @@ class CollectionPage extends UploaderPage {
 
 class _CollectionPageState extends UploaderPageState<CollectionPage>
     with SearchMixin {
+  final _logger = Logger("CollectionPage");
+  late StreamSubscription<CollectionsUpdatedEvent>
+      _collectionUpdateSubscription;
+
   late Collection _collection;
   List<EnteFile> _files = [];
   List<EnteFile> _filteredFiles = [];
+  late CollectionViewType collectionViewType;
+  bool isQuickLink = false;
+  bool showFAB = true;
 
   @override
   void onFileUploadComplete() {
@@ -51,7 +68,9 @@ class _CollectionPageState extends UploaderPageState<CollectionPage>
 
   @override
   void onSearchResultsChanged(
-      List<Collection> collections, List<EnteFile> files,) {
+    List<Collection> collections,
+    List<EnteFile> files,
+  ) {
     setState(() {
       _filteredFiles = files;
     });
@@ -66,6 +85,12 @@ class _CollectionPageState extends UploaderPageState<CollectionPage>
     }
   }
 
+  @override
+  void dispose() {
+    _collectionUpdateSubscription.cancel();
+    super.dispose();
+  }
+
   List<EnteFile> get _displayedFiles =>
       isSearchActive ? _filteredFiles : _files;
 
@@ -73,14 +98,40 @@ class _CollectionPageState extends UploaderPageState<CollectionPage>
   void initState() {
     super.initState();
     _initializeData(widget.collection);
-    Bus.instance.on<CollectionsUpdatedEvent>().listen((event) async {
-      final collection = (await CollectionService.instance.getCollections())
-          .where(
-            (c) => c.id == widget.collection.id,
-          )
-          .first;
-      await _initializeData(collection);
+    _collectionUpdateSubscription =
+        Bus.instance.on<CollectionsUpdatedEvent>().listen((event) async {
+      if (!mounted) return;
+
+      try {
+        final collections = await CollectionService.instance.getCollections();
+
+        final matchingCollection = collections.where(
+          (c) => c.id == widget.collection.id,
+        );
+
+        if (matchingCollection.isNotEmpty) {
+          await _initializeData(matchingCollection.first);
+        } else {
+          _logger.warning(
+            'Collection ${widget.collection.id} no longer exists, navigating back',
+          );
+          if (mounted) {
+            Navigator.of(context).pop();
+          }
+        }
+      } catch (e) {
+        _logger.severe('Error updating collection: $e');
+      }
     });
+
+    collectionViewType = getCollectionViewType(
+      _collection,
+      Configuration.instance.getUserID()!,
+    );
+
+    showFAB = collectionViewType == CollectionViewType.ownedCollection ||
+        collectionViewType == CollectionViewType.hiddenOwnedCollection ||
+        collectionViewType == CollectionViewType.quickLink;
   }
 
   Future<void> _initializeData(Collection collection) async {
@@ -112,6 +163,48 @@ class _CollectionPageState extends UploaderPageState<CollectionPage>
     );
   }
 
+  Future<void> _shareCollection() async {
+    final collection = widget.collection;
+    try {
+      if ((collectionViewType != CollectionViewType.ownedCollection &&
+          collectionViewType != CollectionViewType.sharedCollection &&
+          collectionViewType != CollectionViewType.hiddenOwnedCollection &&
+          collectionViewType != CollectionViewType.favorite &&
+          !isQuickLink)) {
+        throw Exception(
+          "Cannot share collection of type $collectionViewType",
+        );
+      }
+      if (Configuration.instance.getUserID() == collection.owner.id) {
+        unawaited(
+          routeToPage(
+            context,
+            (isQuickLink && (collection.hasLink))
+                ? ManageSharedLinkWidget(collection: collection)
+                : ShareCollectionPage(collection: collection),
+          ),
+        );
+      } else {
+        unawaited(
+          routeToPage(
+            context,
+            AlbumParticipantsPage(collection),
+          ),
+        );
+      }
+    } catch (e, s) {
+      _logger.severe(e, s);
+      await showGenericErrorDialog(context: context, error: e);
+    }
+  }
+
+  Future<void> _leaveCollection() async {
+    await CollectionActions.leaveCollection(
+      context,
+      _collection,
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     return KeyboardListener(
@@ -139,6 +232,14 @@ class _CollectionPageState extends UploaderPageState<CollectionPage>
       actions: [
         buildSearchAction(),
         ...buildSearchActions(),
+        IconButton(
+          icon: Icon(
+            Icons.adaptive.share,
+          ),
+          onPressed: () async {
+            await _shareCollection();
+          },
+        ),
         _buildMenuButton(),
       ],
     );
@@ -155,33 +256,53 @@ class _CollectionPageState extends UploaderPageState<CollectionPage>
           case 'delete':
             _deleteCollection();
             break;
+          case 'leave_collection':
+            _leaveCollection();
+            break;
         }
       },
       itemBuilder: (BuildContext context) {
         return [
-          PopupMenuItem<String>(
-            value: 'edit',
-            child: Row(
-              children: [
-                const Icon(Icons.edit),
-                const SizedBox(width: 12),
-                Text(context.l10n.edit),
-              ],
+          if (collectionViewType == CollectionViewType.ownedCollection ||
+              collectionViewType == CollectionViewType.hiddenOwnedCollection ||
+              collectionViewType == CollectionViewType.quickLink)
+            PopupMenuItem<String>(
+              value: 'edit',
+              child: Row(
+                children: [
+                  const Icon(Icons.edit),
+                  const SizedBox(width: 12),
+                  Text(context.l10n.edit),
+                ],
+              ),
             ),
-          ),
-          PopupMenuItem<String>(
-            value: 'delete',
-            child: Row(
-              children: [
-                const Icon(Icons.delete, color: Colors.red),
-                const SizedBox(width: 12),
-                Text(
-                  context.l10n.delete,
-                  style: const TextStyle(color: Colors.red),
-                ),
-              ],
+          if (collectionViewType == CollectionViewType.ownedCollection ||
+              collectionViewType == CollectionViewType.hiddenOwnedCollection ||
+              collectionViewType == CollectionViewType.quickLink)
+            PopupMenuItem<String>(
+              value: 'delete',
+              child: Row(
+                children: [
+                  const Icon(Icons.delete, color: Colors.red),
+                  const SizedBox(width: 12),
+                  Text(
+                    context.l10n.delete,
+                    style: const TextStyle(color: Colors.red),
+                  ),
+                ],
+              ),
+            ),
+          if (collectionViewType == CollectionViewType.sharedCollection)
+            PopupMenuItem<String>(
+              value: 'leave_collection',
+              child: Row(
+                children: [
+                  const Icon(Icons.logout),
+                  const SizedBox(width: 12),
+                  Text(context.l10n.leaveCollection),
+                ],
+              ),
             ),
-          ),
         ];
       },
     );
@@ -266,10 +387,12 @@ class _CollectionPageState extends UploaderPageState<CollectionPage>
   }
 
   Widget _buildFAB() {
-    return FloatingActionButton(
-      onPressed: addFile,
-      tooltip: context.l10n.addFiles,
-      child: const Icon(Icons.add),
-    );
+    return showFAB
+        ? FloatingActionButton(
+            onPressed: addFile,
+            tooltip: context.l10n.addFiles,
+            child: const Icon(Icons.add),
+          )
+        : const SizedBox.shrink();
   }
 }

mobile/apps/locker/lib/ui/pages/home_page.dart

@@ -1,10 +1,10 @@
 import 'dart:async';
 import 'dart:io';
-import 'dart:math';
 
 import "package:ente_accounts/services/user_service.dart";
 import 'package:ente_events/event_bus.dart';
 import 'package:ente_ui/components/buttons/gradient_button.dart';
+import "package:ente_ui/components/buttons/icon_button_widget.dart";
 import 'package:ente_ui/theme/ente_theme.dart';
 import 'package:ente_ui/utils/dialog_util.dart';
 import 'package:ente_utils/email_util.dart';
@@ -15,6 +15,8 @@ import 'package:locker/l10n/l10n.dart';
 import 'package:locker/services/collections/collections_service.dart';
 import 'package:locker/services/collections/models/collection.dart';
 import 'package:locker/services/files/sync/models/file.dart';
+import "package:locker/ui/collections/collection_flex_grid_view.dart";
+import "package:locker/ui/collections/section_title.dart";
 import 'package:locker/ui/components/recents_section_widget.dart';
 import 'package:locker/ui/components/search_result_view.dart';
 import 'package:locker/ui/mixins/search_mixin.dart';
@@ -24,7 +26,6 @@ import "package:locker/ui/pages/settings_page.dart";
 import 'package:locker/ui/pages/uploader_page.dart';
 import 'package:locker/utils/collection_actions.dart';
 import 'package:locker/utils/collection_sort_util.dart';
-import "package:locker/utils/snack_bar_utils.dart";
 import 'package:logging/logging.dart';
 
 class HomePage extends UploaderPage {
@@ -50,7 +51,13 @@ class _HomePageState extends UploaderPageState<HomePage>
   List<Collection> _filteredCollections = [];
   List<EnteFile> _recentFiles = [];
   List<EnteFile> _filteredFiles = [];
-  Map<int, int> _collectionFileCounts = {};
+  List<Collection> outgoingCollections = [];
+  List<Collection> incomingCollections = [];
+  List<Collection> quickLinks = [];
+  Map<int, int> _outgoingCollectionFileCounts = {};
+  Map<int, int> _incomingCollectionFileCounts = {};
+  Map<int, int> _homeCollectionFileCounts = {};
+
   String? _error;
   final _logger = Logger('HomePage');
   StreamSubscription? _mediaStreamSubscription;
@@ -88,7 +95,17 @@ class _HomePageState extends UploaderPageState<HomePage>
   }
 
   List<Collection> get _displayedCollections {
-    final collections = isSearchActive ? _filteredCollections : _collections;
+    final List<Collection> collections;
+    if (isSearchActive) {
+      collections = _filteredCollections;
+    } else {
+      final excludeIds = {
+        ...incomingCollections.map((c) => c.id),
+        ...quickLinks.map((c) => c.id),
+      };
+      collections =
+          _collections.where((c) => !excludeIds.contains(c.id)).toList();
+    }
     return _filterOutUncategorized(collections);
   }
 
@@ -268,10 +285,16 @@ class _HomePageState extends UploaderPageState<HomePage>
       final sortedCollections =
           CollectionSortUtil.getSortedCollections(collections);
 
+      final sharedCollections =
+          await CollectionService.instance.getSharedCollections();
+
       setState(() {
         _collections = sortedCollections;
         _filteredCollections = _filterOutUncategorized(sortedCollections);
         _filteredFiles = _recentFiles;
+        incomingCollections = sharedCollections.incoming;
+        outgoingCollections = sharedCollections.outgoing;
+        quickLinks = sharedCollections.quickLinks;
         _isLoading = false;
       });
 
@@ -491,10 +514,26 @@ class _HomePageState extends UploaderPageState<HomePage>
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                _buildCollectionsHeader(),
-                const SizedBox(height: 24),
-                _buildCollectionsGrid(),
-                const SizedBox(height: 24),
+                ..._buildCollectionSection(
+                  title: context.l10n.collections,
+                  collections: _displayedCollections,
+                  viewType: UISectionType.homeCollections,
+                  fileCounts: _homeCollectionFileCounts,
+                ),
+                if (outgoingCollections.isNotEmpty)
+                  ..._buildCollectionSection(
+                    title: context.l10n.sharedByYou,
+                    collections: outgoingCollections,
+                    viewType: UISectionType.outgoingCollections,
+                    fileCounts: _outgoingCollectionFileCounts,
+                  ),
+                if (incomingCollections.isNotEmpty)
+                  ..._buildCollectionSection(
+                    title: context.l10n.sharedWithYou,
+                    collections: incomingCollections,
+                    viewType: UISectionType.incomingCollections,
+                    fileCounts: _incomingCollectionFileCounts,
+                  ),
                 _buildRecentsSection(),
               ],
             ),
@@ -557,105 +596,6 @@ class _HomePageState extends UploaderPageState<HomePage>
     }
   }
 
-  Widget _buildCollectionsHeader() {
-    return GestureDetector(
-      behavior: HitTestBehavior.opaque,
-      onTap: () {
-        SnackBarUtils.showWarningSnackBar(context, "Hello");
-        Navigator.of(context).push(
-          MaterialPageRoute(
-            builder: (context) => const AllCollectionsPage(),
-          ),
-        );
-      },
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          Text(
-            context.l10n.collections,
-            style: getEnteTextTheme(context).h3Bold,
-          ),
-          const Icon(
-            Icons.chevron_right,
-            color: Colors.grey,
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildCollectionsGrid() {
-    return MediaQuery.removePadding(
-      context: context,
-      removeBottom: true,
-      removeTop: true,
-      child: GridView.builder(
-        shrinkWrap: true,
-        physics: const NeverScrollableScrollPhysics(),
-        gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-          crossAxisCount: 2,
-          crossAxisSpacing: 12,
-          mainAxisSpacing: 12,
-          childAspectRatio: 2.2,
-        ),
-        itemCount: min(_displayedCollections.length, 4),
-        itemBuilder: (context, index) {
-          final collection = _displayedCollections[index];
-          final collectionName = collection.name ?? 'Unnamed Collection';
-
-          return GestureDetector(
-            onTap: () => _navigateToCollection(collection),
-            child: Container(
-              decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(8),
-                color: getEnteColorScheme(context).fillFaint,
-              ),
-              padding: const EdgeInsets.all(12),
-              child: Stack(
-                children: [
-                  Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      Text(
-                        collectionName,
-                        style: getEnteTextTheme(context).body.copyWith(
-                              fontWeight: FontWeight.w500,
-                            ),
-                        textAlign: TextAlign.left,
-                        overflow: TextOverflow.ellipsis,
-                        maxLines: 1,
-                      ),
-                      const SizedBox(height: 4),
-                      Text(
-                        context.l10n
-                            .items(_collectionFileCounts[collection.id] ?? 0),
-                        style: getEnteTextTheme(context).small.copyWith(
-                              color: Colors.grey[600],
-                            ),
-                        textAlign: TextAlign.left,
-                      ),
-                    ],
-                  ),
-                  if (collection.type == CollectionType.favorites)
-                    Positioned(
-                      top: 0,
-                      right: 0,
-                      child: Icon(
-                        Icons.star,
-                        color: getEnteColorScheme(context).primary500,
-                        size: 18,
-                      ),
-                    ),
-                ],
-              ),
-            ),
-          );
-        },
-      ),
-    );
-  }
-
   Widget _buildMultiOptionFab() {
     return ValueListenableBuilder<bool>(
       valueListenable: _isFabOpen,
@@ -790,22 +730,79 @@ class _HomePageState extends UploaderPageState<HomePage>
   }
 
   Future<void> _loadCollectionFileCounts() async {
-    final counts = <int, int>{};
+    final mainCounts = <int, int>{};
+    final outgoingCounts = <int, int>{};
+    final incomingCounts = <int, int>{};
 
-    for (final collection in _displayedCollections.take(4)) {
-      try {
-        final files =
-            await CollectionService.instance.getFilesInCollection(collection);
-        counts[collection.id] = files.length;
-      } catch (e) {
-        counts[collection.id] = 0;
-      }
-    }
+    await Future.wait([
+      ..._displayedCollections.take(4).map((collection) async {
+        try {
+          final files =
+              await CollectionService.instance.getFilesInCollection(collection);
+          mainCounts[collection.id] = files.length;
+        } catch (e) {
+          mainCounts[collection.id] = 0;
+        }
+      }),
+      ...outgoingCollections.take(4).map((collection) async {
+        try {
+          final files =
+              await CollectionService.instance.getFilesInCollection(collection);
+          outgoingCounts[collection.id] = files.length;
+        } catch (e) {
+          outgoingCounts[collection.id] = 0;
+        }
+      }),
+      ...incomingCollections.take(4).map((collection) async {
+        try {
+          final files =
+              await CollectionService.instance.getFilesInCollection(collection);
+          incomingCounts[collection.id] = files.length;
+        } catch (e) {
+          incomingCounts[collection.id] = 0;
+        }
+      }),
+    ]);
 
     if (mounted) {
       setState(() {
-        _collectionFileCounts = counts;
+        _homeCollectionFileCounts = mainCounts;
+        _outgoingCollectionFileCounts = outgoingCounts;
+        _incomingCollectionFileCounts = incomingCounts;
       });
     }
   }
+
+  List<Widget> _buildCollectionSection({
+    required String title,
+    required List<Collection> collections,
+    required UISectionType viewType,
+    required Map<int, int> fileCounts,
+  }) {
+    return [
+      SectionOptions(
+        onTap: () {
+          Navigator.of(context).push(
+            MaterialPageRoute(
+              builder: (context) => AllCollectionsPage(
+                viewType: viewType,
+              ),
+            ),
+          );
+        },
+        SectionTitle(title: title),
+        trailingWidget: IconButtonWidget(
+          icon: Icons.chevron_right,
+          iconButtonType: IconButtonType.secondary,
+          iconColor: getEnteColorScheme(context).blurStrokePressed,
+        ),
+      ),
+      const SizedBox(height: 24),
+      CollectionFlexGridViewWidget(
+        collections: collections,
+        collectionFileCounts: fileCounts,
+      ),
+      const SizedBox(height: 24),
+    ];
+  }
 }

mobile/apps/locker/lib/ui/settings/account_section_widget.dart

@@ -4,6 +4,7 @@ import "package:ente_accounts/pages/password_entry_page.dart";
 import "package:ente_accounts/pages/recovery_key_page.dart";
 import "package:ente_accounts/services/user_service.dart";
 import "package:ente_crypto_dart/ente_crypto_dart.dart";
+import "package:ente_legacy/pages/emergency_page.dart";
 import "package:ente_lock_screen/local_authentication_service.dart";
 import "package:ente_ui/components/captioned_text_widget.dart";
 import "package:ente_ui/components/menu_item_widget.dart";
@@ -11,6 +12,7 @@ import "package:ente_ui/theme/ente_theme.dart";
 import "package:ente_ui/utils/dialog_util.dart";
 import "package:ente_utils/navigation_util.dart";
 import "package:ente_utils/platform_util.dart";
+import "package:flutter/foundation.dart";
 import "package:flutter/material.dart";
 import "package:locker/l10n/l10n.dart";
 import "package:locker/services/configuration.dart";
@@ -135,6 +137,35 @@ class AccountSectionWidget extends StatelessWidget {
         },
       ),
       sectionOptionSpacing,
+      MenuItemWidget(
+        captionedTextWidget: CaptionedTextWidget(
+          title: context.l10n.legacy,
+        ),
+        pressedColor: getEnteColorScheme(context).fillFaint,
+        trailingIcon: Icons.chevron_right_outlined,
+        trailingIconIsMuted: true,
+        showOnlyLoadingState: true,
+        onTap: () async {
+          final hasAuthenticated = kDebugMode ||
+              await LocalAuthenticationService.instance
+                  .requestLocalAuthentication(
+                context,
+                "Authenticate to manage legacy contacts",
+              );
+          if (hasAuthenticated) {
+            Navigator.of(context).push(
+              MaterialPageRoute(
+                builder: (BuildContext context) {
+                  return EmergencyPage(
+                    config: Configuration.instance,
+                  );
+                },
+              ),
+            ).ignore();
+          }
+        },
+      ),
+      sectionOptionSpacing,
       MenuItemWidget(
         captionedTextWidget: CaptionedTextWidget(
           title: context.l10n.logout,

mobile/apps/locker/lib/ui/settings/security_section_widget.dart

@@ -13,7 +13,7 @@ import "package:ente_lock_screen/ui/lock_screen_options.dart";
 import "package:ente_ui/components/captioned_text_widget.dart";
 import "package:ente_ui/components/menu_item_widget.dart";
 import "package:ente_ui/components/toggle_switch_widget.dart";
-import "package:ente_ui/theme/ente_theme.dart";
+import "package:ente_ui/theme/ente_theme.dart"; 
 import "package:ente_ui/utils/dialog_util.dart";
 import "package:ente_ui/utils/toast_util.dart";
 import "package:ente_utils/navigation_util.dart";
@@ -122,7 +122,7 @@ class _SecuritySectionWidgetState extends State<SecuritySectionWidget> {
         trailingIcon: Icons.chevron_right_outlined,
         trailingIconIsMuted: true,
         onTap: () async {
-          if (await LockScreenSettings.instance.shouldShowLockScreen()) {
+          if (await LockScreenSettings.instance.isDeviceSupported()) {
             final bool result = await requestAuthentication(
               context,
               context.l10n.authToChangeLockscreenSetting,
@@ -137,19 +137,17 @@ class _SecuritySectionWidgetState extends State<SecuritySectionWidget> {
               );
             }
           } else {
-            await Navigator.of(context).push(
-              MaterialPageRoute(
-                builder: (BuildContext context) {
-                  return const LockScreenOptions();
-                },
-              ),
+            await showErrorDialog(
+              context,
+              context.l10n.noSystemLockFound,
+              context.l10n.toEnableAppLockPleaseSetupDevicePasscodeOrScreen,
             );
           }
         },
       ),
       sectionOptionSpacing,
     ]);
-    
+
     return Column(
       children: children,
     );

mobile/apps/locker/lib/ui/sharing/add_participant_page.dart

@@ -0,0 +1,471 @@
+import 'package:email_validator/email_validator.dart';
+import "package:ente_sharing/models/user.dart";
+import "package:ente_sharing/user_avator_widget.dart";
+import "package:ente_sharing/verify_identity_dialog.dart";
+import "package:ente_ui/components/buttons/button_widget.dart";
+import "package:ente_ui/components/buttons/models/button_type.dart";
+import "package:ente_ui/components/captioned_text_widget.dart";
+import "package:ente_ui/components/divider_widget.dart";
+import "package:ente_ui/components/menu_item_widget.dart";
+import "package:ente_ui/components/menu_section_description_widget.dart";
+import "package:ente_ui/components/menu_section_title.dart";
+import "package:ente_ui/components/separators.dart";
+import "package:ente_ui/theme/ente_theme.dart";
+import "package:ente_ui/utils/toast_util.dart";
+import 'package:flutter/material.dart';
+import "package:locker/extensions/user_extension.dart";
+import "package:locker/l10n/l10n.dart";
+import "package:locker/services/collections/collections_service.dart";
+import "package:locker/services/collections/models/collection.dart";
+import "package:locker/services/configuration.dart";
+import "package:locker/utils/collection_actions.dart";
+
+enum ActionTypesToShow {
+  addViewer,
+  addCollaborator,
+}
+
+class AddParticipantPage extends StatefulWidget {
+  /// Cannot be empty
+  final List<ActionTypesToShow> actionTypesToShow;
+  final List<Collection> collections;
+
+  AddParticipantPage(
+    this.collections,
+    this.actionTypesToShow, {
+    super.key,
+  }) : assert(
+          actionTypesToShow.isNotEmpty,
+          'actionTypesToShow cannot be empty',
+        );
+
+  @override
+  State<StatefulWidget> createState() => _AddParticipantPage();
+}
+
+class _AddParticipantPage extends State<AddParticipantPage> {
+  final _selectedEmails = <String>{};
+  String _newEmail = '';
+  bool _emailIsValid = false;
+  bool isKeypadOpen = false;
+  late List<User> _suggestedUsers;
+
+  // Focus nodes are necessary
+  final textFieldFocusNode = FocusNode();
+  final _textController = TextEditingController();
+
+  late CollectionActions collectionActions;
+
+  @override
+  void initState() {
+    super.initState();
+    _suggestedUsers = _getSuggestedUser();
+    collectionActions = CollectionActions();
+  }
+
+  @override
+  void dispose() {
+    _textController.dispose();
+    textFieldFocusNode.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final filterSuggestedUsers = _suggestedUsers
+        .where(
+          (element) =>
+              (element.displayName ?? element.email).toLowerCase().contains(
+                    _textController.text.trim().toLowerCase(),
+                  ),
+        )
+        .toList();
+    isKeypadOpen = MediaQuery.viewInsetsOf(context).bottom > 100;
+    final enteTextTheme = getEnteTextTheme(context);
+    final enteColorScheme = getEnteColorScheme(context);
+    return Scaffold(
+      resizeToAvoidBottomInset: isKeypadOpen,
+      appBar: AppBar(
+        title: Text(
+          _getTitle(),
+        ),
+      ),
+      body: Column(
+        mainAxisAlignment: MainAxisAlignment.start,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          const SizedBox(height: 12),
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 16.0),
+            child: Text(
+              context.l10n.addANewEmail,
+              style: enteTextTheme.small
+                  .copyWith(color: enteColorScheme.textMuted),
+            ),
+          ),
+          const SizedBox(height: 4),
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 16.0),
+            child: _enterEmailField(),
+          ),
+          Expanded(
+            child: Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 16.0),
+              child: Column(
+                children: [
+                  filterSuggestedUsers.isNotEmpty
+                      ? MenuSectionTitle(
+                          title: context.l10n.orPickAnExistingOne,
+                        )
+                      : const SizedBox.shrink(),
+                  Expanded(
+                    child: ListView.builder(
+                      physics: const BouncingScrollPhysics(),
+                      itemBuilder: (context, index) {
+                        if (index >= filterSuggestedUsers.length) {
+                          return Padding(
+                            padding: const EdgeInsets.symmetric(
+                              vertical: 8.0,
+                            ),
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                filterSuggestedUsers.isNotEmpty
+                                    ? MenuSectionDescriptionWidget(
+                                        content: context.l10n
+                                            .longPressAnEmailToVerifyEndToEndEncryption,
+                                      )
+                                    : const SizedBox.shrink(),
+                                widget.actionTypesToShow.contains(
+                                  ActionTypesToShow.addCollaborator,
+                                )
+                                    ? MenuSectionDescriptionWidget(
+                                        content: context.l10n
+                                            .collaboratorsCanAddFilesToTheSharedCollection,
+                                      )
+                                    : const SizedBox.shrink(),
+                              ],
+                            ),
+                          );
+                        }
+                        final currentUser = filterSuggestedUsers[index];
+                        return Column(
+                          children: [
+                            MenuItemWidget(
+                              key: ValueKey(
+                                currentUser.displayName ?? currentUser.email,
+                              ),
+                              captionedTextWidget: CaptionedTextWidget(
+                                title: currentUser.displayName ??
+                                    currentUser.email,
+                              ),
+                              leadingIconSize: 24.0,
+                              leadingIconWidget: UserAvatarWidget(
+                                currentUser,
+                                type: AvatarType.mini,
+                                config: Configuration.instance,
+                              ),
+                              menuItemColor:
+                                  getEnteColorScheme(context).fillFaint,
+                              pressedColor:
+                                  getEnteColorScheme(context).fillFaint,
+                              trailingIcon:
+                                  (_selectedEmails.contains(currentUser.email))
+                                      ? Icons.check
+                                      : null,
+                              onTap: () async {
+                                textFieldFocusNode.unfocus();
+                                if (_selectedEmails
+                                    .contains(currentUser.email)) {
+                                  _selectedEmails.remove(currentUser.email);
+                                } else {
+                                  _selectedEmails.add(currentUser.email);
+                                }
+
+                                setState(() => {});
+                                // showShortToast(context, "yet to implement");
+                              },
+                              onLongPress: () {
+                                showDialog(
+                                  useRootNavigator: false,
+                                  context: context,
+                                  builder: (BuildContext context) {
+                                    return VerifyIdentityDialog(
+                                      self: false,
+                                      email: currentUser.email,
+                                      config: Configuration.instance,
+                                    );
+                                  },
+                                );
+                              },
+                              isTopBorderRadiusRemoved: index > 0,
+                              isBottomBorderRadiusRemoved:
+                                  index < (filterSuggestedUsers.length - 1),
+                            ),
+                            (index == (filterSuggestedUsers.length - 1))
+                                ? const SizedBox.shrink()
+                                : DividerWidget(
+                                    dividerType: DividerType.menu,
+                                    bgColor:
+                                        getEnteColorScheme(context).fillFaint,
+                                  ),
+                          ],
+                        );
+                      },
+                      itemCount: filterSuggestedUsers.length + 1,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+          SafeArea(
+            child: Padding(
+              padding: const EdgeInsets.only(
+                top: 8,
+                bottom: 8,
+                left: 16,
+                right: 16,
+              ),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: [
+                  const SizedBox(height: 8),
+                  ..._actionButtons(),
+                  const SizedBox(height: 12),
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  List<Widget> _actionButtons() {
+    final widgets = <Widget>[];
+    if (widget.actionTypesToShow.contains(ActionTypesToShow.addViewer)) {
+      widgets.add(
+        ButtonWidget(
+          buttonType: ButtonType.primary,
+          buttonSize: ButtonSize.large,
+          labelText: context.l10n.addViewers(_selectedEmails.length),
+          isDisabled: _selectedEmails.isEmpty,
+          onTap: () async {
+            final results = <bool>[];
+            final collections = widget.collections;
+
+            for (String email in _selectedEmails) {
+              bool result = false;
+              for (Collection collection in collections) {
+                result = await collectionActions.addEmailToCollection(
+                  context,
+                  collection,
+                  email,
+                  CollectionParticipantRole.viewer,
+                );
+              }
+              results.add(result);
+            }
+
+            final noOfSuccessfullAdds = results.where((e) => e).length;
+            showToast(
+              context,
+              context.l10n.viewersSuccessfullyAdded(noOfSuccessfullAdds),
+            );
+
+            if (!results.any((e) => e == false) && mounted) {
+              Navigator.of(context).pop(true);
+            }
+          },
+        ),
+      );
+    }
+    if (widget.actionTypesToShow.contains(
+      ActionTypesToShow.addCollaborator,
+    )) {
+      widgets.add(
+        ButtonWidget(
+          buttonType:
+              widget.actionTypesToShow.contains(ActionTypesToShow.addViewer)
+                  ? ButtonType.neutral
+                  : ButtonType.primary,
+          buttonSize: ButtonSize.large,
+          labelText: context.l10n.addCollaborators(_selectedEmails.length),
+          isDisabled: _selectedEmails.isEmpty,
+          onTap: () async {
+            // TODO: This is not currently designed for best UX for action on
+            // multiple collections and emails, especially if some operations
+            // fail. Can be improved by using a different 'addEmailToCollection'
+            // that accepts list of emails and list of collections.
+            final results = <bool>[];
+            final collections = widget.collections;
+
+            for (String email in _selectedEmails) {
+              bool result = false;
+              for (Collection collection in collections) {
+                result = await collectionActions.addEmailToCollection(
+                  context,
+                  collection,
+                  email,
+                  CollectionParticipantRole.collaborator,
+                );
+              }
+              results.add(result);
+            }
+
+            final noOfSuccessfullAdds = results.where((e) => e).length;
+            showToast(
+              context,
+              context.l10n.collaboratorsSuccessfullyAdded(noOfSuccessfullAdds),
+            );
+
+            if (!results.any((e) => e == false) && mounted) {
+              Navigator.of(context).pop(true);
+            }
+          },
+        ),
+      );
+    }
+    final widgetsWithSpaceBetween = addSeparators(
+      widgets,
+      const SizedBox(
+        height: 8,
+      ),
+    );
+    return widgetsWithSpaceBetween;
+  }
+
+  void clearFocus() {
+    _textController.clear();
+    _newEmail = _textController.text;
+    _emailIsValid = false;
+    textFieldFocusNode.unfocus();
+    setState(() => {});
+  }
+
+  Widget _enterEmailField() {
+    return Row(
+      children: [
+        Expanded(
+          child: TextFormField(
+            controller: _textController,
+            focusNode: textFieldFocusNode,
+            style: getEnteTextTheme(context).body,
+            autofillHints: const [AutofillHints.email],
+            decoration: InputDecoration(
+              focusedBorder: OutlineInputBorder(
+                borderRadius: const BorderRadius.all(Radius.circular(4.0)),
+                borderSide:
+                    BorderSide(color: getEnteColorScheme(context).strokeMuted),
+              ),
+              fillColor: getEnteColorScheme(context).fillFaint,
+              filled: true,
+              hintText: context.l10n.enterEmail,
+              contentPadding: const EdgeInsets.symmetric(
+                horizontal: 16,
+                vertical: 14,
+              ),
+              border: UnderlineInputBorder(
+                borderSide: BorderSide.none,
+                borderRadius: BorderRadius.circular(4),
+              ),
+              prefixIcon: Icon(
+                Icons.email_outlined,
+                color: getEnteColorScheme(context).strokeMuted,
+              ),
+              suffixIcon: _newEmail == ''
+                  ? null
+                  : IconButton(
+                      onPressed: clearFocus,
+                      icon: Icon(
+                        Icons.cancel,
+                        color: getEnteColorScheme(context).strokeMuted,
+                      ),
+                    ),
+            ),
+            onChanged: (value) {
+              _newEmail = value.trim();
+              _emailIsValid = EmailValidator.validate(_newEmail);
+              setState(() {});
+            },
+            autocorrect: false,
+            keyboardType: TextInputType.emailAddress,
+            //initialValue: _email,
+            textInputAction: TextInputAction.next,
+          ),
+        ),
+        const SizedBox(width: 8),
+        ButtonWidget(
+          buttonType: ButtonType.secondary,
+          buttonSize: ButtonSize.small,
+          labelText: context.l10n.add,
+          isDisabled: !_emailIsValid,
+          onTap: () async {
+            if (_emailIsValid) {
+              final result = await collectionActions.doesEmailHaveAccount(
+                context,
+                _newEmail,
+              );
+              if (result && mounted) {
+                setState(() {
+                  for (var suggestedUser in _suggestedUsers) {
+                    if (suggestedUser.email == _newEmail) {
+                      _selectedEmails.add(suggestedUser.email);
+                      clearFocus();
+
+                      return;
+                    }
+                  }
+                  _suggestedUsers.insert(0, User(email: _newEmail));
+                  _selectedEmails.add(_newEmail);
+                  clearFocus();
+                });
+              }
+            }
+          },
+        ),
+      ],
+    );
+  }
+
+  List<User> _getSuggestedUser() {
+    final Set<String> existingEmails = {};
+    final collections = widget.collections;
+    if (collections.isEmpty) {
+      return [];
+    }
+
+    for (final Collection collection in collections) {
+      for (final User u in collection.sharees) {
+        if (u.id != null && u.email.isNotEmpty) {
+          existingEmails.add(u.email);
+        }
+      }
+    }
+
+    final List<User> suggestedUsers =
+        CollectionService.instance.getRelevantContacts();
+
+    if (_textController.text.trim().isNotEmpty) {
+      suggestedUsers.removeWhere(
+        (element) => !(element.displayName ?? element.email)
+            .toLowerCase()
+            .contains(_textController.text.trim().toLowerCase()),
+      );
+    }
+    suggestedUsers.sort((a, b) => a.email.compareTo(b.email));
+
+    return suggestedUsers;
+  }
+
+  String _getTitle() {
+    if (widget.actionTypesToShow.length > 1) {
+      return context.l10n.addParticipants;
+    } else if (widget.actionTypesToShow.first == ActionTypesToShow.addViewer) {
+      return context.l10n.addViewer;
+    } else {
+      return context.l10n.addCollaborator;
+    }
+  }
+}

mobile/apps/locker/lib/ui/sharing/album_participants_page.dart

@@ -0,0 +1,310 @@
+import "package:ente_sharing/models/user.dart";
+import "package:ente_sharing/user_avator_widget.dart";
+import "package:ente_ui/components/captioned_text_widget.dart";
+import "package:ente_ui/components/divider_widget.dart";
+import "package:ente_ui/components/menu_item_widget.dart";
+import "package:ente_ui/components/menu_section_title.dart";
+import "package:ente_ui/components/title_bar_title_widget.dart";
+import "package:ente_ui/components/title_bar_widget.dart";
+import "package:ente_ui/theme/ente_theme.dart";
+import "package:ente_utils/ente_utils.dart";
+import 'package:flutter/material.dart';
+import "package:locker/extensions/user_extension.dart";
+import "package:locker/l10n/l10n.dart";
+import "package:locker/services/collections/models/collection.dart";
+import "package:locker/services/configuration.dart";
+import "package:locker/ui/sharing/add_participant_page.dart";
+import "package:locker/ui/sharing/manage_album_participant.dart";
+
+class AlbumParticipantsPage extends StatefulWidget {
+  final Collection collection;
+
+  const AlbumParticipantsPage(
+    this.collection, {
+    super.key,
+  });
+
+  @override
+  State<AlbumParticipantsPage> createState() => _AlbumParticipantsPageState();
+}
+
+class _AlbumParticipantsPageState extends State<AlbumParticipantsPage> {
+  late int currentUserID;
+
+  @override
+  void initState() {
+    currentUserID = Configuration.instance.getUserID()!;
+    super.initState();
+  }
+
+  Future<void> _navigateToManageUser(User user) async {
+    if (user.id == currentUserID) {
+      return;
+    }
+    await routeToPage(
+      context,
+      ManageIndividualParticipant(collection: widget.collection, user: user),
+    );
+    if (mounted) {
+      setState(() => {});
+    }
+  }
+
+  Future<void> _navigateToAddUser(bool addingViewer) async {
+    await routeToPage(
+      context,
+      AddParticipantPage(
+        [widget.collection],
+        addingViewer
+            ? [ActionTypesToShow.addViewer]
+            : [ActionTypesToShow.addCollaborator],
+      ),
+    );
+    if (mounted) {
+      setState(() => {});
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final isOwner =
+        widget.collection.owner.id == Configuration.instance.getUserID();
+    final colorScheme = getEnteColorScheme(context);
+    final currentUserID = Configuration.instance.getUserID()!;
+    final int participants = 1 + widget.collection.getSharees().length;
+    final User owner = widget.collection.owner;
+    if (owner.id == currentUserID && owner.email == "") {
+      owner.email = Configuration.instance.getEmail()!;
+    }
+    final splitResult =
+        widget.collection.getSharees().splitMatch((x) => x.isViewer);
+    final List<User> viewers = splitResult.matched;
+    viewers.sort((a, b) => a.email.compareTo(b.email));
+    final List<User> collaborators = splitResult.unmatched;
+    collaborators.sort((a, b) => a.email.compareTo(b.email));
+
+    return Scaffold(
+      body: CustomScrollView(
+        primary: false,
+        slivers: <Widget>[
+          TitleBarWidget(
+            flexibleSpaceTitle: TitleBarTitleWidget(
+              title: widget.collection.name,
+            ),
+            flexibleSpaceCaption:
+                context.l10n.albumParticipantsCount(participants),
+          ),
+          SliverList(
+            delegate: SliverChildBuilderDelegate(
+              (context, index) {
+                return Padding(
+                  padding: const EdgeInsets.only(top: 20, left: 16, right: 16),
+                  child: Column(
+                    children: [
+                      Column(
+                        children: [
+                          MenuSectionTitle(
+                            title: context.l10n.albumOwner,
+                            iconData: Icons.admin_panel_settings_outlined,
+                          ),
+                          MenuItemWidget(
+                            captionedTextWidget: CaptionedTextWidget(
+                              title: isOwner
+                                  ? context.l10n.you
+                                  : _nameIfAvailableElseEmail(
+                                      widget.collection.owner,
+                                    ),
+                              makeTextBold: isOwner,
+                            ),
+                            leadingIconWidget: UserAvatarWidget(
+                              owner,
+                              currentUserID: currentUserID,
+                              config: Configuration.instance,
+                            ),
+                            leadingIconSize: 24,
+                            menuItemColor: colorScheme.fillFaint,
+                            singleBorderRadius: 8,
+                            isGestureDetectorDisabled: true,
+                          ),
+                        ],
+                      ),
+                    ],
+                  ),
+                );
+              },
+              childCount: 1,
+            ),
+          ),
+          SliverPadding(
+            padding: const EdgeInsets.only(top: 20, left: 16, right: 16),
+            sliver: SliverList(
+              delegate: SliverChildBuilderDelegate(
+                (context, index) {
+                  if (index == 0 && (isOwner || collaborators.isNotEmpty)) {
+                    return MenuSectionTitle(
+                      title: context.l10n.collaborator,
+                      iconData: Icons.edit_outlined,
+                    );
+                  } else if (index > 0 && index <= collaborators.length) {
+                    final listIndex = index - 1;
+                    final currentUser = collaborators[listIndex];
+                    final isSameAsLoggedInUser =
+                        currentUserID == currentUser.id;
+                    final isLastItem =
+                        !isOwner && index == collaborators.length;
+                    return Column(
+                      children: [
+                        MenuItemWidget(
+                          captionedTextWidget: CaptionedTextWidget(
+                            title: isSameAsLoggedInUser
+                                ? context.l10n.you
+                                : _nameIfAvailableElseEmail(currentUser),
+                            makeTextBold: isSameAsLoggedInUser,
+                          ),
+                          leadingIconSize: 24.0,
+                          leadingIconWidget: UserAvatarWidget(
+                            currentUser,
+                            type: AvatarType.mini,
+                            currentUserID: currentUserID,
+                            config: Configuration.instance,
+                          ),
+                          menuItemColor: getEnteColorScheme(context).fillFaint,
+                          trailingIcon: isOwner ? Icons.chevron_right : null,
+                          trailingIconIsMuted: true,
+                          onTap: isOwner
+                              ? () async {
+                                  if (isOwner) {
+                                    // ignore: unawaited_futures
+                                    _navigateToManageUser(currentUser);
+                                  }
+                                }
+                              : null,
+                          isTopBorderRadiusRemoved: listIndex > 0,
+                          isBottomBorderRadiusRemoved: !isLastItem,
+                          singleBorderRadius: 8,
+                        ),
+                        isLastItem
+                            ? const SizedBox.shrink()
+                            : DividerWidget(
+                                dividerType: DividerType.menu,
+                                bgColor: getEnteColorScheme(context).fillFaint,
+                              ),
+                      ],
+                    );
+                  } else if (index == (1 + collaborators.length) && isOwner) {
+                    return MenuItemWidget(
+                      captionedTextWidget: CaptionedTextWidget(
+                        title: collaborators.isNotEmpty
+                            ? context.l10n.addMore
+                            : context.l10n.addCollaborator,
+                        makeTextBold: true,
+                      ),
+                      leadingIcon: Icons.add_outlined,
+                      menuItemColor: getEnteColorScheme(context).fillFaint,
+                      onTap: () async {
+                        // ignore: unawaited_futures
+                        _navigateToAddUser(false);
+                      },
+                      isTopBorderRadiusRemoved: collaborators.isNotEmpty,
+                      singleBorderRadius: 8,
+                    );
+                  }
+                  return const SizedBox.shrink();
+                },
+                childCount: 1 + collaborators.length + 1,
+              ),
+            ),
+          ),
+          SliverPadding(
+            padding: const EdgeInsets.only(top: 24, left: 16, right: 16),
+            sliver: SliverList(
+              delegate: SliverChildBuilderDelegate(
+                (context, index) {
+                  if (index == 0 && (isOwner || viewers.isNotEmpty)) {
+                    return MenuSectionTitle(
+                      title: context.l10n.viewer,
+                      iconData: Icons.photo_outlined,
+                    );
+                  } else if (index > 0 && index <= viewers.length) {
+                    final listIndex = index - 1;
+                    final currentUser = viewers[listIndex];
+                    final isSameAsLoggedInUser =
+                        currentUserID == currentUser.id;
+                    final isLastItem = !isOwner && index == viewers.length;
+                    return Column(
+                      children: [
+                        MenuItemWidget(
+                          captionedTextWidget: CaptionedTextWidget(
+                            title: isSameAsLoggedInUser
+                                ? context.l10n.you
+                                : _nameIfAvailableElseEmail(currentUser),
+                            makeTextBold: isSameAsLoggedInUser,
+                          ),
+                          leadingIconSize: 24.0,
+                          leadingIconWidget: UserAvatarWidget(
+                            currentUser,
+                            type: AvatarType.mini,
+                            currentUserID: currentUserID,
+                            config: Configuration.instance,
+                          ),
+                          menuItemColor: getEnteColorScheme(context).fillFaint,
+                          trailingIcon: isOwner ? Icons.chevron_right : null,
+                          trailingIconIsMuted: true,
+                          onTap: isOwner
+                              ? () async {
+                                  if (isOwner) {
+                                    // ignore: unawaited_futures
+                                    _navigateToManageUser(currentUser);
+                                  }
+                                }
+                              : null,
+                          isTopBorderRadiusRemoved: listIndex > 0,
+                          isBottomBorderRadiusRemoved: !isLastItem,
+                          singleBorderRadius: 8,
+                        ),
+                        isLastItem
+                            ? const SizedBox.shrink()
+                            : DividerWidget(
+                                dividerType: DividerType.menu,
+                                bgColor: getEnteColorScheme(context).fillFaint,
+                              ),
+                      ],
+                    );
+                  } else if (index == (1 + viewers.length) && isOwner) {
+                    return MenuItemWidget(
+                      captionedTextWidget: CaptionedTextWidget(
+                        title: viewers.isNotEmpty
+                            ? context.l10n.addMore
+                            : context.l10n.addViewer,
+                        makeTextBold: true,
+                      ),
+                      leadingIcon: Icons.add_outlined,
+                      menuItemColor: getEnteColorScheme(context).fillFaint,
+                      onTap: () async {
+                        // ignore: unawaited_futures
+                        _navigateToAddUser(true);
+                      },
+                      isTopBorderRadiusRemoved: viewers.isNotEmpty,
+                      singleBorderRadius: 8,
+                    );
+                  }
+                  return const SizedBox.shrink();
+                },
+                childCount: 1 + viewers.length + 1,
+              ),
+            ),
+          ),
+          const SliverToBoxAdapter(child: SizedBox(height: 72)),
+        ],
+      ),
+    );
+  }
+
+  String _nameIfAvailableElseEmail(User user) {
+    final name = user.displayName;
+    if (name != null && name.isNotEmpty) {
+      return name;
+    }
+    return user.email;
+  }
+}

mobile/apps/locker/lib/ui/sharing/album_share_info_widget.dart

@@ -0,0 +1,104 @@
+import "dart:math";
+
+import "package:ente_sharing/models/user.dart";
+import "package:ente_sharing/user_avator_widget.dart";
+import "package:flutter/material.dart";
+import "package:locker/services/configuration.dart";
+import "package:locker/ui/sharing/more_count_badge.dart";
+
+class AlbumSharesIcons extends StatelessWidget {
+  final List<User> sharees;
+  final int limitCountTo;
+  final AvatarType type;
+  final bool removeBorder;
+  final EdgeInsets padding;
+  final Widget? trailingWidget;
+  final Alignment stackAlignment;
+
+  const AlbumSharesIcons({
+    super.key,
+    required this.sharees,
+    this.type = AvatarType.tiny,
+    this.limitCountTo = 2,
+    this.removeBorder = true,
+    this.trailingWidget,
+    this.padding = const EdgeInsets.only(left: 10.0, top: 10, bottom: 10),
+    this.stackAlignment = Alignment.topLeft,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final displayCount = min(sharees.length, limitCountTo);
+    final hasMore = sharees.length > limitCountTo;
+    final double overlapPadding = getOverlapPadding(type);
+    final widgets = List<Widget>.generate(
+      displayCount,
+      (index) => Positioned(
+        left: overlapPadding * index,
+        child: UserAvatarWidget(
+          sharees[index],
+          thumbnailView: removeBorder,
+          type: type,
+          config: Configuration.instance,
+        ),
+      ),
+    );
+
+    if (hasMore) {
+      widgets.add(
+        Positioned(
+          left: (overlapPadding * displayCount),
+          child: MoreCountWidget(
+            sharees.length - displayCount,
+            type: moreCountTypeFromAvatarType(type),
+            thumbnailView: removeBorder,
+          ),
+        ),
+      );
+    }
+    if (trailingWidget != null) {
+      widgets.add(
+        Positioned(
+          left: (overlapPadding * (displayCount + (hasMore ? 1 : 0))) +
+              (displayCount > 0 ? 12 : 0),
+          child: trailingWidget!,
+        ),
+      );
+    }
+
+    return Padding(
+      padding: padding,
+      child: Stack(
+        alignment: stackAlignment,
+        clipBehavior: Clip.none,
+        children: widgets,
+      ),
+    );
+  }
+}
+
+double getOverlapPadding(AvatarType type) {
+  switch (type) {
+    case AvatarType.extra:
+      return 14.0;
+    case AvatarType.tiny:
+      return 14.0;
+    case AvatarType.mini:
+      return 20.0;
+    case AvatarType.small:
+      return 28.0;
+  }
+}
+
+MoreCountType moreCountTypeFromAvatarType(AvatarType type) {
+  switch (type) {
+    case AvatarType.extra:
+      return MoreCountType.extra;
+    case AvatarType.tiny:
+      return MoreCountType.tiny;
+    case AvatarType.mini:
+      return MoreCountType.mini;
+    case AvatarType.small:
+      return MoreCountType.small;
+  }
+}

mobile/apps/locker/lib/ui/sharing/manage_album_participant.dart

@@ -0,0 +1,188 @@
+import "package:ente_sharing/models/user.dart";
+import "package:ente_ui/components/buttons/button_widget.dart";
+import "package:ente_ui/components/captioned_text_widget.dart";
+import "package:ente_ui/components/divider_widget.dart";
+import "package:ente_ui/components/menu_item_widget.dart";
+import "package:ente_ui/components/menu_section_description_widget.dart";
+import "package:ente_ui/components/menu_section_title.dart";
+import "package:ente_ui/components/title_bar_title_widget.dart";
+import "package:ente_ui/theme/colors.dart";
+import "package:ente_ui/theme/ente_theme.dart";
+import "package:ente_ui/utils/dialog_util.dart";
+import 'package:flutter/material.dart';
+import "package:locker/extensions/user_extension.dart";
+import "package:locker/l10n/l10n.dart";
+import "package:locker/services/collections/models/collection.dart"; 
+import "package:locker/utils/collection_actions.dart";
+
+class ManageIndividualParticipant extends StatefulWidget {
+  final Collection collection;
+  final User user;
+
+  const ManageIndividualParticipant({
+    super.key,
+    required this.collection,
+    required this.user,
+  });
+
+  @override
+  State<StatefulWidget> createState() => _ManageIndividualParticipantState();
+}
+
+class _ManageIndividualParticipantState
+    extends State<ManageIndividualParticipant> {
+  late CollectionActions collectionActions;
+
+  @override
+  void initState() {
+    super.initState();
+    collectionActions = CollectionActions();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = getEnteColorScheme(context);
+    final textTheme = getEnteTextTheme(context);
+    bool isConvertToViewSuccess = false;
+    return Scaffold(
+      appBar: AppBar(),
+      body: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 16.0),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.start,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            SafeArea(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  const SizedBox(
+                    height: 12,
+                  ),
+                  TitleBarTitleWidget(
+                    title: context.l10n.manage,
+                  ),
+                  Text(
+                    widget.user.email,
+                    textAlign: TextAlign.left,
+                    style:
+                        textTheme.small.copyWith(color: colorScheme.textMuted),
+                  ),
+                ],
+              ),
+            ),
+            const SizedBox(height: 12),
+            MenuSectionTitle(title: context.l10n.addedAs),
+            MenuItemWidget(
+              captionedTextWidget: CaptionedTextWidget(
+                title: context.l10n.collaborator,
+              ),
+              leadingIcon: Icons.edit_outlined,
+              menuItemColor: getEnteColorScheme(context).fillFaint,
+              trailingIcon: widget.user.isCollaborator ? Icons.check : null,
+              onTap: widget.user.isCollaborator
+                  ? null
+                  : () async {
+                      final result =
+                          await collectionActions.addEmailToCollection(
+                        context,
+                        widget.collection,
+                        widget.user.email,
+                        CollectionParticipantRole.collaborator,
+                      );
+                      if (result && mounted) {
+                        widget.user.role = CollectionParticipantRole
+                            .collaborator
+                            .toStringVal();
+                        setState(() => {});
+                      }
+                    },
+              isBottomBorderRadiusRemoved: true,
+            ),
+            DividerWidget(
+              dividerType: DividerType.menu,
+              bgColor: getEnteColorScheme(context).fillFaint,
+            ),
+            MenuItemWidget(
+              captionedTextWidget: CaptionedTextWidget(
+                title: context.l10n.viewer,
+              ),
+              leadingIcon: Icons.photo_outlined,
+              leadingIconColor: getEnteColorScheme(context).strokeBase,
+              menuItemColor: getEnteColorScheme(context).fillFaint,
+              trailingIcon: widget.user.isViewer ? Icons.check : null,
+              showOnlyLoadingState: true,
+              onTap: widget.user.isViewer
+                  ? null
+                  : () async {
+                      final actionResult = await showChoiceActionSheet(
+                        context,
+                        title: context.l10n.changePermissions,
+                        firstButtonLabel: context.l10n.yesConvertToViewer,
+                        body:
+                            context.l10n.cannotAddMoreFilesAfterBecomingViewer(
+                          widget.user.displayName ?? widget.user.email,
+                        ),
+                        isCritical: true,
+                      );
+                      if (actionResult?.action != null) {
+                        if (actionResult!.action == ButtonAction.first) {
+                          try {
+                            isConvertToViewSuccess =
+                                await collectionActions.addEmailToCollection(
+                              context,
+                              widget.collection,
+                              widget.user.email,
+                              CollectionParticipantRole.viewer,
+                            );
+                          } catch (e) {
+                            await showGenericErrorDialog(
+                              context: context,
+                              error: e,
+                            );
+                          }
+                          if (isConvertToViewSuccess && mounted) {
+                            // reset value
+                            isConvertToViewSuccess = false;
+                            widget.user.role =
+                                CollectionParticipantRole.viewer.toStringVal();
+                            setState(() => {});
+                          }
+                        }
+                      }
+                    },
+              isTopBorderRadiusRemoved: true,
+            ),
+            MenuSectionDescriptionWidget(
+              content: context.l10n.collaboratorsCanAddFilesToTheSharedAlbum,
+            ),
+            const SizedBox(height: 24),
+            MenuSectionTitle(title: context.l10n.removeParticipant),
+            MenuItemWidget(
+              captionedTextWidget: CaptionedTextWidget(
+                title: context.l10n.remove,
+                textColor: warning500,
+                makeTextBold: true,
+              ),
+              leadingIcon: Icons.not_interested_outlined,
+              leadingIconColor: warning500,
+              menuItemColor: getEnteColorScheme(context).fillFaint,
+              surfaceExecutionStates: false,
+              onTap: () async {
+                final result = await collectionActions.removeParticipant(
+                  context,
+                  widget.collection,
+                  widget.user,
+                );
+
+                if ((result) && mounted) {
+                  Navigator.of(context).pop(true);
+                }
+              },
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

mobile/apps/locker/lib/ui/sharing/manage_links_widget.dart

@@ -0,0 +1,353 @@
+import "dart:convert";
+
+import "package:ente_crypto_dart/ente_crypto_dart.dart";
+import "package:ente_ui/components/captioned_text_widget.dart";
+import "package:ente_ui/components/divider_widget.dart";
+import "package:ente_ui/components/menu_item_widget.dart";
+import "package:ente_ui/components/menu_section_description_widget.dart";
+import "package:ente_ui/components/toggle_switch_widget.dart";
+import "package:ente_ui/theme/colors.dart";
+import "package:ente_ui/theme/ente_theme.dart";
+import "package:ente_ui/utils/dialog_util.dart";
+import "package:ente_ui/utils/toast_util.dart";
+import "package:ente_utils/navigation_util.dart";
+import "package:ente_utils/share_utils.dart";
+import "package:flutter/material.dart";
+import "package:flutter/services.dart";
+import "package:locker/l10n/l10n.dart";
+import "package:locker/services/collections/collections_api_client.dart";
+import "package:locker/services/collections/collections_service.dart";
+import "package:locker/services/collections/models/collection.dart";
+import "package:locker/services/collections/models/public_url.dart"; 
+import "package:locker/ui/sharing/pickers/device_limit_picker_page.dart";
+import "package:locker/ui/sharing/pickers/link_expiry_picker_page.dart";
+import "package:locker/utils/collection_actions.dart";
+import "package:locker/utils/date_time_util.dart";
+
+class ManageSharedLinkWidget extends StatefulWidget {
+  final Collection? collection;
+
+  const ManageSharedLinkWidget({super.key, this.collection});
+
+  @override
+  State<ManageSharedLinkWidget> createState() => _ManageSharedLinkWidgetState();
+}
+
+class _ManageSharedLinkWidgetState extends State<ManageSharedLinkWidget> {
+  final GlobalKey sendLinkButtonKey = GlobalKey();
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final isCollectEnabled =
+        widget.collection!.publicURLs.firstOrNull?.enableCollect ?? false;
+    final isDownloadEnabled =
+        widget.collection!.publicURLs.firstOrNull?.enableDownload ?? true;
+    final isPasswordEnabled =
+        widget.collection!.publicURLs.firstOrNull?.passwordEnabled ?? false;
+    final enteColorScheme = getEnteColorScheme(context);
+    final PublicURL url = widget.collection!.publicURLs.firstOrNull!;
+    final String urlValue =
+        CollectionService.instance.getPublicUrl(widget.collection!);
+    return Scaffold(
+      appBar: AppBar(
+        elevation: 0,
+        title: Text(context.l10n.manageLink),
+      ),
+      body: SingleChildScrollView(
+        child: ListBody(
+          children: <Widget>[
+            Padding(
+              padding: const EdgeInsets.fromLTRB(16, 12, 16, 12),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  MenuItemWidget(
+                    key: ValueKey("Allow collect $isCollectEnabled"),
+                    captionedTextWidget: CaptionedTextWidget(
+                      title: context.l10n.allowAddingFiles,
+                    ),
+                    alignCaptionedTextToLeft: true,
+                    menuItemColor: getEnteColorScheme(context).fillFaint,
+                    trailingWidget: ToggleSwitchWidget(
+                      value: () => isCollectEnabled,
+                      onChanged: () async {
+                        await _updateUrlSettings(
+                          context,
+                          {'enableCollect': !isCollectEnabled},
+                        );
+                      },
+                    ),
+                  ),
+                  MenuSectionDescriptionWidget(
+                    content: context.l10n.allowAddFilesDescription,
+                  ),
+                  const SizedBox(height: 24),
+                  MenuItemWidget(
+                    alignCaptionedTextToLeft: true,
+                    captionedTextWidget: CaptionedTextWidget(
+                      title: context.l10n.linkExpiry,
+                      subTitle: (url.hasExpiry
+                          ? (url.isExpired
+                              ? context.l10n.linkExpired
+                              : context.l10n.linkEnabled)
+                          : context.l10n.linkNeverExpires),
+                      subTitleColor: url.isExpired ? warning500 : null,
+                    ),
+                    trailingIcon: Icons.chevron_right,
+                    menuItemColor: enteColorScheme.fillFaint,
+                    surfaceExecutionStates: false,
+                    onTap: () async {
+                      // ignore: unawaited_futures
+                      routeToPage(
+                        context,
+                        LinkExpiryPickerPage(widget.collection!),
+                      ).then((value) {
+                        setState(() {});
+                      });
+                    },
+                  ),
+                  url.hasExpiry
+                      ? MenuSectionDescriptionWidget(
+                          content: url.isExpired
+                              ? context.l10n.expiredLinkInfo
+                              : context.l10n.linkExpiresOn(
+                                  getFormattedTime(
+                                    DateTime.fromMicrosecondsSinceEpoch(
+                                      url.validTill,
+                                    ),
+                                  ),
+                                ),
+                        )
+                      : const SizedBox.shrink(),
+                  const Padding(padding: EdgeInsets.only(top: 24)),
+                  MenuItemWidget(
+                    captionedTextWidget: CaptionedTextWidget(
+                      title: context.l10n.linkDeviceLimit,
+                      subTitle: url.deviceLimit == 0
+                          ? context.l10n.noDeviceLimit
+                          : "${url.deviceLimit}",
+                    ),
+                    trailingIcon: Icons.chevron_right,
+                    menuItemColor: enteColorScheme.fillFaint,
+                    alignCaptionedTextToLeft: true,
+                    isBottomBorderRadiusRemoved: true,
+                    onTap: () async {
+                      // ignore: unawaited_futures
+                      routeToPage(
+                        context,
+                        DeviceLimitPickerPage(widget.collection!),
+                      ).then((value) {
+                        setState(() {});
+                      });
+                    },
+                    surfaceExecutionStates: false,
+                  ),
+                  DividerWidget(
+                    dividerType: DividerType.menuNoIcon,
+                    bgColor: getEnteColorScheme(context).fillFaint,
+                  ),
+                  MenuItemWidget(
+                    key: ValueKey("Allow downloads $isDownloadEnabled"),
+                    captionedTextWidget: CaptionedTextWidget(
+                      title: context.l10n.allowDownloads,
+                    ),
+                    alignCaptionedTextToLeft: true,
+                    isBottomBorderRadiusRemoved: true,
+                    isTopBorderRadiusRemoved: true,
+                    menuItemColor: getEnteColorScheme(context).fillFaint,
+                    trailingWidget: ToggleSwitchWidget(
+                      value: () => isDownloadEnabled,
+                      onChanged: () async {
+                        await _updateUrlSettings(
+                          context,
+                          {'enableDownload': !isDownloadEnabled},
+                        );
+                        if (isDownloadEnabled) {
+                          // ignore: unawaited_futures
+                          showErrorDialog(
+                            context,
+                            context.l10n.disableDownloadWarningTitle,
+                            context.l10n.disableDownloadWarningBody,
+                          );
+                        }
+                      },
+                    ),
+                  ),
+                  DividerWidget(
+                    dividerType: DividerType.menuNoIcon,
+                    bgColor: getEnteColorScheme(context).fillFaint,
+                  ),
+                  MenuItemWidget(
+                    key: ValueKey("Password lock $isPasswordEnabled"),
+                    captionedTextWidget:   CaptionedTextWidget(
+                      title: context.l10n.passwordLock,
+                    ),
+                    alignCaptionedTextToLeft: true,
+                    isTopBorderRadiusRemoved: true,
+                    menuItemColor: getEnteColorScheme(context).fillFaint,
+                    trailingWidget: ToggleSwitchWidget(
+                      value: () => isPasswordEnabled,
+                      onChanged: () async {
+                        if (!isPasswordEnabled) {
+                          // ignore: unawaited_futures
+                          showTextInputDialog(
+                            context,
+                            title: context.l10n.setPasswordTitle,
+                            submitButtonLabel: context.l10n.lockButtonLabel,
+                            hintText: context.l10n.enterPassword,
+                            isPasswordInput: true,
+                            alwaysShowSuccessState: true,
+                            onSubmit: (String password) async {
+                              if (password.trim().isNotEmpty) {
+                                final propToUpdate =
+                                    await _getEncryptedPassword(
+                                  password,
+                                );
+                                await _updateUrlSettings(
+                                  context,
+                                  propToUpdate,
+                                  showProgressDialog: false,
+                                );
+                              }
+                            },
+                          );
+                        } else {
+                          await _updateUrlSettings(
+                            context,
+                            {'disablePassword': true},
+                          );
+                        }
+                      },
+                    ),
+                  ),
+                  const SizedBox(
+                    height: 24,
+                  ),
+                  if (url.isExpired)
+                    MenuItemWidget(
+                      captionedTextWidget: CaptionedTextWidget(
+                        title: context.l10n.linkExpired,
+                        textColor: getEnteColorScheme(context).warning500,
+                      ),
+                      leadingIcon: Icons.error_outline,
+                      leadingIconColor: getEnteColorScheme(context).warning500,
+                      menuItemColor: getEnteColorScheme(context).fillFaint,
+                      isBottomBorderRadiusRemoved: true,
+                    ),
+                  if (!url.isExpired)
+                    MenuItemWidget(
+                      captionedTextWidget: CaptionedTextWidget(
+                        title: context.l10n.copyLink,
+                        makeTextBold: true,
+                      ),
+                      leadingIcon: Icons.copy,
+                      menuItemColor: getEnteColorScheme(context).fillFaint,
+                      showOnlyLoadingState: true,
+                      onTap: () async {
+                        await Clipboard.setData(ClipboardData(text: urlValue));
+                        showShortToast(
+                          context,
+                          context.l10n.linkCopiedToClipboard,
+                        );
+                      },
+                      isBottomBorderRadiusRemoved: true,
+                    ),
+                  if (!url.isExpired)
+                    DividerWidget(
+                      dividerType: DividerType.menu,
+                      bgColor: getEnteColorScheme(context).fillFaint,
+                    ),
+                  if (!url.isExpired)
+                    MenuItemWidget(
+                      key: sendLinkButtonKey,
+                      captionedTextWidget: CaptionedTextWidget(
+                        title: context.l10n.sendLink,
+                        makeTextBold: true,
+                      ),
+                      leadingIcon: Icons.adaptive.share,
+                      menuItemColor: getEnteColorScheme(context).fillFaint,
+                      onTap: () async {
+                        // ignore: unawaited_futures
+                        await shareText(
+                          urlValue,
+                          context: context,
+                        );
+                      },
+                      isTopBorderRadiusRemoved: true,
+                    ),
+                  const SizedBox(height: 24),
+                  MenuItemWidget(
+                    captionedTextWidget: CaptionedTextWidget(
+                      title: context.l10n.removeLink,
+                      textColor: warning500,
+                      makeTextBold: true,
+                    ),
+                    leadingIcon: Icons.remove_circle_outline,
+                    leadingIconColor: warning500,
+                    menuItemColor: getEnteColorScheme(context).fillFaint,
+                    surfaceExecutionStates: false,
+                    onTap: () async {
+                      final bool result = await CollectionActions.disableUrl(
+                        context,
+                        widget.collection!,
+                      );
+                      if (result && mounted) {
+                        Navigator.of(context).pop();
+                        if (widget.collection!.isQuickLinkCollection()) {
+                          Navigator.of(context).pop();
+                        }
+                      }
+                    },
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Future<Map<String, dynamic>> _getEncryptedPassword(String pass) async {
+    final kekSalt = CryptoUtil.getSaltToDeriveKey();
+    final result = await CryptoUtil.deriveInteractiveKey(
+      utf8.encode(pass),
+      kekSalt,
+    );
+    return {
+      'passHash': CryptoUtil.bin2base64(result.key),
+      'nonce': CryptoUtil.bin2base64(kekSalt),
+      'memLimit': result.memLimit,
+      'opsLimit': result.opsLimit,
+    };
+  }
+
+  Future<void> _updateUrlSettings(
+    BuildContext context,
+    Map<String, dynamic> prop, {
+    bool showProgressDialog = true,
+  }) async {
+    final dialog = showProgressDialog
+        ? createProgressDialog(context, context.l10n.pleaseWait)
+        : null;
+    await dialog?.show();
+    try {
+      await CollectionApiClient.instance
+          .updateShareUrl(widget.collection!, prop);
+      await dialog?.hide();
+      showShortToast(context, "Collection updated");
+      if (mounted) {
+        setState(() {});
+      }
+    } catch (e) {
+      await dialog?.hide();
+      await showGenericErrorDialog(context: context, error: e);
+      rethrow;
+    }
+  }
+}

mobile/apps/locker/lib/ui/sharing/more_count_badge.dart

@@ -0,0 +1,79 @@
+import "package:ente_ui/theme/colors.dart";
+import "package:ente_ui/theme/ente_theme.dart";
+import 'package:flutter/material.dart'; 
+import 'package:tuple/tuple.dart';
+
+enum MoreCountType { small, mini, tiny, extra }
+
+class MoreCountWidget extends StatelessWidget {
+  final MoreCountType type;
+  final bool thumbnailView;
+  final int count;
+
+  const MoreCountWidget(
+    this.count, {
+    super.key,
+    this.type = MoreCountType.mini,
+    this.thumbnailView = false,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = getEnteColorScheme(context);
+    final displayChar = "+$count";
+    final Color decorationColor = thumbnailView
+        ? backgroundElevated2Light
+        : colorScheme.backgroundElevated2;
+
+    final avatarStyle = getAvatarStyle(context, type);
+    final double size = avatarStyle.item1;
+    final TextStyle textStyle = thumbnailView
+        ? avatarStyle.item2.copyWith(color: textFaintLight)
+        : avatarStyle.item2.copyWith(color: Colors.white);
+    return Container(
+      padding: const EdgeInsets.all(0.5),
+      decoration: BoxDecoration(
+        shape: BoxShape.circle,
+        border: Border.all(
+          color: thumbnailView
+              ? strokeMutedDark
+              : getEnteColorScheme(context).strokeMuted,
+          width: 1.0,
+          strokeAlign: BorderSide.strokeAlignOutside,
+        ),
+      ),
+      child: SizedBox(
+        height: size,
+        width: size,
+        child: CircleAvatar(
+          backgroundColor: decorationColor,
+          child: Transform.scale(
+            scale: 0.85,
+            child: Text(
+              displayChar.toUpperCase(),
+              // fixed color
+              style: textStyle,
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Tuple2<double, TextStyle> getAvatarStyle(
+    BuildContext context,
+    MoreCountType type,
+  ) {
+    final enteTextTheme = getEnteTextTheme(context);
+    switch (type) {
+      case MoreCountType.small:
+        return Tuple2(32.0, enteTextTheme.small);
+      case MoreCountType.mini:
+        return Tuple2(24.0, enteTextTheme.mini);
+      case MoreCountType.tiny:
+        return Tuple2(18.0, enteTextTheme.tiny);
+      case MoreCountType.extra:
+        return Tuple2(18.0, enteTextTheme.tiny);
+    }
+  }
+}

mobile/apps/locker/lib/ui/sharing/pickers/device_limit_picker_page.dart

@@ -0,0 +1,145 @@
+import "package:ente_ui/components/captioned_text_widget.dart";
+import "package:ente_ui/components/divider_widget.dart";
+import "package:ente_ui/components/menu_item_widget.dart";
+import "package:ente_ui/components/separators.dart";
+import "package:ente_ui/components/title_bar_title_widget.dart";
+import "package:ente_ui/components/title_bar_widget.dart";
+import "package:ente_ui/theme/ente_theme.dart";
+import "package:ente_ui/utils/dialog_util.dart";
+import 'package:flutter/material.dart';
+import "package:locker/core/constants.dart";
+import "package:locker/l10n/l10n.dart";
+import "package:locker/services/collections/collections_api_client.dart";
+import "package:locker/services/collections/models/collection.dart";
+
+class DeviceLimitPickerPage extends StatelessWidget {
+  final Collection collection;
+  const DeviceLimitPickerPage(this.collection, {super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: CustomScrollView(
+        primary: false,
+        slivers: <Widget>[
+          TitleBarWidget(
+            flexibleSpaceTitle: TitleBarTitleWidget(
+              title: context.l10n.linkDeviceLimit,
+            ),
+          ),
+          SliverList(
+            delegate: SliverChildBuilderDelegate(
+              (context, index) {
+                return Padding(
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: 16,
+                    vertical: 20,
+                  ),
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      ClipRRect(
+                        borderRadius:
+                            const BorderRadius.all(Radius.circular(8)),
+                        child: ItemsWidget(collection),
+                      ),
+                    ],
+                  ),
+                );
+              },
+              childCount: 1,
+            ),
+          ),
+          const SliverPadding(padding: EdgeInsets.symmetric(vertical: 12)),
+        ],
+      ),
+    );
+  }
+}
+
+class ItemsWidget extends StatefulWidget {
+  final Collection collection;
+  const ItemsWidget(this.collection, {super.key});
+
+  @override
+  State<ItemsWidget> createState() => _ItemsWidgetState();
+}
+
+class _ItemsWidgetState extends State<ItemsWidget> {
+  late int currentDeviceLimit;
+  late int initialDeviceLimit;
+  List<Widget> items = [];
+  bool isCustomLimit = false;
+  @override
+  void initState() {
+    currentDeviceLimit = widget.collection.publicURLs.first.deviceLimit;
+    initialDeviceLimit = currentDeviceLimit;
+    if (!publicLinkDeviceLimits.contains(currentDeviceLimit)) {
+      isCustomLimit = true;
+    }
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    items.clear();
+    if (isCustomLimit) {
+      items.add(
+        _menuItemForPicker(initialDeviceLimit),
+      );
+    }
+    for (int deviceLimit in publicLinkDeviceLimits) {
+      items.add(
+        _menuItemForPicker(deviceLimit),
+      );
+    }
+    items = addSeparators(
+      items,
+      DividerWidget(
+        dividerType: DividerType.menuNoIcon,
+        bgColor: getEnteColorScheme(context).fillFaint,
+      ),
+    );
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: items,
+    );
+  }
+
+  Widget _menuItemForPicker(int deviceLimit) {
+    return MenuItemWidget(
+      key: ValueKey(deviceLimit),
+      menuItemColor: getEnteColorScheme(context).fillFaint,
+      captionedTextWidget: CaptionedTextWidget(
+        title: deviceLimit == 0 ? context.l10n.noDeviceLimit : "$deviceLimit",
+      ),
+      trailingIcon: currentDeviceLimit == deviceLimit ? Icons.check : null,
+      alignCaptionedTextToLeft: true,
+      isTopBorderRadiusRemoved: true,
+      isBottomBorderRadiusRemoved: true,
+      showOnlyLoadingState: true,
+      onTap: () async {
+        await _updateUrlSettings(context, {
+          'deviceLimit': deviceLimit,
+        }).then(
+          (value) => setState(() {
+            currentDeviceLimit = deviceLimit;
+          }),
+        );
+      },
+    );
+  }
+
+  Future<void> _updateUrlSettings(
+    BuildContext context,
+    Map<String, dynamic> prop,
+  ) async {
+    try {
+      await CollectionApiClient.instance
+          .updateShareUrl(widget.collection, prop);
+    } catch (e) {
+      await showGenericErrorDialog(context: context, error: e);
+      rethrow;
+    }
+  }
+}

mobile/apps/locker/lib/ui/sharing/pickers/link_expiry_picker_page.dart

@@ -0,0 +1,168 @@
+import "package:ente_ui/components/captioned_text_widget.dart";
+import "package:ente_ui/components/divider_widget.dart";
+import "package:ente_ui/components/menu_item_widget.dart";
+import "package:ente_ui/components/separators.dart";
+import "package:ente_ui/components/title_bar_title_widget.dart";
+import "package:ente_ui/components/title_bar_widget.dart";
+import "package:ente_ui/theme/ente_theme.dart";
+import "package:ente_ui/utils/dialog_util.dart";
+import 'package:flutter/material.dart';
+import "package:locker/l10n/l10n.dart";
+import "package:locker/services/collections/collections_api_client.dart";
+import "package:locker/services/collections/models/collection.dart";
+import "package:locker/ui/viewer/date/date_time_picker.dart";
+import "package:tuple/tuple.dart";
+
+class LinkExpiryPickerPage extends StatelessWidget {
+  final Collection collection;
+  const LinkExpiryPickerPage(this.collection, {super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: CustomScrollView(
+        primary: false,
+        slivers: <Widget>[
+          TitleBarWidget(
+            flexibleSpaceTitle: TitleBarTitleWidget(
+              title: context.l10n.linkExpiry,
+            ),
+          ),
+          SliverList(
+            delegate: SliverChildBuilderDelegate(
+              (context, index) {
+                return Padding(
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: 16,
+                    vertical: 20,
+                  ),
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      ClipRRect(
+                        borderRadius:
+                            const BorderRadius.all(Radius.circular(8)),
+                        child: ItemsWidget(collection),
+                      ),
+                    ],
+                  ),
+                );
+              },
+              childCount: 1,
+            ),
+          ),
+          const SliverPadding(padding: EdgeInsets.symmetric(vertical: 12)),
+        ],
+      ),
+    );
+  }
+}
+
+class ItemsWidget extends StatefulWidget {
+  final Collection collection;
+  const ItemsWidget(this.collection, {super.key});
+
+  @override
+  State<ItemsWidget> createState() => _ItemsWidgetState();
+}
+
+class _ItemsWidgetState extends State<ItemsWidget> {
+  // index, title, milliseconds in future post which link should expire (when >0)
+  late final List<Tuple2<String, int>> _expiryOptions = [
+    Tuple2(context.l10n.never, 0),
+    Tuple2(context.l10n.after1Hour, const Duration(hours: 1).inMicroseconds),
+    Tuple2(context.l10n.after1Day, const Duration(days: 1).inMicroseconds),
+    Tuple2(context.l10n.after1Week, const Duration(days: 7).inMicroseconds),
+    // todo: make this time calculation perfect
+    Tuple2(context.l10n.after1Month, const Duration(days: 30).inMicroseconds),
+    Tuple2(context.l10n.after1Year, const Duration(days: 365).inMicroseconds),
+    Tuple2(context.l10n.custom, -1),
+  ];
+
+  @override
+  Widget build(BuildContext context) {
+    List<Widget> items = [];
+    for (Tuple2<String, int> expiryOpiton in _expiryOptions) {
+      items.add(
+        _menuItemForPicker(context, expiryOpiton),
+      );
+    }
+    items = addSeparators(
+      items,
+      DividerWidget(
+        dividerType: DividerType.menuNoIcon,
+        bgColor: getEnteColorScheme(context).fillFaint,
+      ),
+    );
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: items,
+    );
+  }
+
+  Widget _menuItemForPicker(
+    BuildContext context,
+    Tuple2<String, int> expiryOpiton,
+  ) {
+    return MenuItemWidget(
+      menuItemColor: getEnteColorScheme(context).fillFaint,
+      captionedTextWidget: CaptionedTextWidget(
+        title: expiryOpiton.item1,
+      ),
+      alignCaptionedTextToLeft: true,
+      isTopBorderRadiusRemoved: true,
+      isBottomBorderRadiusRemoved: true,
+      alwaysShowSuccessState: true,
+      surfaceExecutionStates: expiryOpiton.item2 == -1 ? false : true,
+      onTap: () async {
+        int newValidTill = -1;
+        final int expireAfterInMicroseconds = expiryOpiton.item2;
+        // need to manually select time
+        if (expireAfterInMicroseconds < 0) {
+          final now = DateTime.now();
+          final DateTime? picked = await showDatePickerSheet(
+            context,
+            initialDate: now,
+            minDate: now,
+          );
+          final timeInMicrosecondsFromEpoch = picked?.microsecondsSinceEpoch;
+          if (timeInMicrosecondsFromEpoch != null) {
+            newValidTill = timeInMicrosecondsFromEpoch;
+          }
+        } else if (expireAfterInMicroseconds == 0) {
+          // no expiry
+          newValidTill = 0;
+        } else {
+          newValidTill =
+              DateTime.now().microsecondsSinceEpoch + expireAfterInMicroseconds;
+        }
+        if (newValidTill >= 0) {
+          debugPrint(
+            "Setting expire date to  ${DateTime.fromMicrosecondsSinceEpoch(newValidTill)}",
+          );
+          await updateTime(newValidTill, context);
+        }
+      },
+    );
+  }
+
+  Future<void> updateTime(int newValidTill, BuildContext context) async {
+    await _updateUrlSettings(
+      context,
+      {'validTill': newValidTill},
+    );
+  }
+
+  Future<void> _updateUrlSettings(
+    BuildContext context,
+    Map<String, dynamic> prop,
+  ) async {
+    try {
+      await CollectionApiClient.instance
+          .updateShareUrl(widget.collection, prop);
+    } catch (e) {
+      await showGenericErrorDialog(context: context, error: e);
+      rethrow;
+    }
+  }
+}

mobile/apps/locker/lib/ui/sharing/share_collection_page.dart

@@ -0,0 +1,404 @@
+import "package:ente_sharing/models/user.dart";
+import "package:ente_sharing/user_avator_widget.dart";
+import "package:ente_ui/components/captioned_text_widget.dart";
+import "package:ente_ui/components/divider_widget.dart";
+import "package:ente_ui/components/menu_item_widget.dart";
+import "package:ente_ui/components/menu_section_description_widget.dart";
+import "package:ente_ui/components/menu_section_title.dart";
+import "package:ente_ui/theme/colors.dart";
+import "package:ente_ui/theme/ente_theme.dart";
+import "package:ente_ui/utils/toast_util.dart";
+import "package:ente_utils/ente_utils.dart";
+import "package:flutter/material.dart";
+import "package:flutter/services.dart";
+import "package:locker/extensions/user_extension.dart";
+import "package:locker/l10n/l10n.dart";
+import "package:locker/services/collections/collections_service.dart";
+import "package:locker/services/collections/models/collection.dart";
+import "package:locker/services/configuration.dart"; 
+import "package:locker/ui/sharing/add_participant_page.dart";
+import "package:locker/ui/sharing/album_participants_page.dart";
+import "package:locker/ui/sharing/album_share_info_widget.dart";
+import "package:locker/ui/sharing/manage_album_participant.dart";
+import "package:locker/ui/sharing/manage_links_widget.dart";
+import "package:locker/utils/collection_actions.dart";
+
+class ShareCollectionPage extends StatefulWidget {
+  final Collection collection;
+  const ShareCollectionPage({super.key, required this.collection});
+
+  @override
+  State<ShareCollectionPage> createState() => _ShareCollectionPageState();
+}
+
+class _ShareCollectionPageState extends State<ShareCollectionPage> {
+  late List<User?> _sharees;
+
+  Future<void> _navigateToManageUser() async {
+    if (_sharees.length == 1) {
+      await routeToPage(
+        context,
+        ManageIndividualParticipant(
+          collection: widget.collection,
+          user: _sharees.first!,
+        ),
+      );
+    } else {
+      await routeToPage(
+        context,
+        AlbumParticipantsPage(widget.collection),
+      );
+    }
+    if (mounted) {
+      setState(() => {});
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final bool hasUrl = widget.collection.hasLink;
+    final bool hasExpired =
+        widget.collection.publicURLs.firstOrNull?.isExpired ?? false;
+    _sharees = widget.collection.sharees;
+
+    final children = <Widget>[];
+
+    children.add(
+      MenuSectionTitle(
+        title: context.l10n.shareWithPeopleSectionTitle(_sharees.length),
+        iconData: Icons.workspaces,
+      ),
+    );
+
+    children.add(
+      EmailItemWidget(
+        widget.collection,
+        onTap: _navigateToManageUser,
+      ),
+    );
+
+    children.add(
+      MenuItemWidget(
+        captionedTextWidget: CaptionedTextWidget(
+          title: context.l10n.addViewer,
+          makeTextBold: true,
+        ),
+        leadingIcon: Icons.add,
+        menuItemColor: getEnteColorScheme(context).fillFaint,
+        isTopBorderRadiusRemoved: _sharees.isNotEmpty,
+        isBottomBorderRadiusRemoved: true,
+        onTap: () async {
+          // ignore: unawaited_futures
+          routeToPage(
+          context,
+          AddParticipantPage(
+            [widget.collection],
+            const [ActionTypesToShow.addViewer],
+          ),
+          ).then(
+            (value) => {
+              if (mounted) {setState(() => {})},
+            },
+          );
+        },
+      ),
+    );
+    children.add(
+      DividerWidget(
+        dividerType: DividerType.menu,
+        bgColor: getEnteColorScheme(context).fillFaint,
+      ),
+    );
+
+    children.add(
+      MenuItemWidget(
+        captionedTextWidget: CaptionedTextWidget(
+          title: context.l10n.addCollaborator,
+          makeTextBold: true,
+        ),
+        leadingIcon: Icons.add,
+        menuItemColor: getEnteColorScheme(context).fillFaint,
+        isTopBorderRadiusRemoved: true,
+        onTap: () async {
+          // ignore: unawaited_futures
+          routeToPage(
+            context,
+            AddParticipantPage(
+              [widget.collection],
+              const [ActionTypesToShow.addCollaborator],
+            ),
+          ).then(
+            (value) => {
+              if (mounted) {setState(() => {})},
+            },
+          );
+        },
+      ),
+    );
+
+    if (_sharees.isEmpty && !hasUrl) {
+      children.add(
+        MenuSectionDescriptionWidget(
+          content: context.l10n.sharedCollectionSectionDescription,
+        ),
+      );
+    }
+
+    children.addAll([
+      const SizedBox(
+        height: 24,
+      ),
+      MenuSectionTitle(
+        title:
+            hasUrl ? context.l10n.publicLinkEnabled : context.l10n.shareALink,
+        iconData: Icons.public,
+      ),
+    ]);
+    if (hasUrl) {
+      if (hasExpired) {
+        children.add(
+          MenuItemWidget(
+            captionedTextWidget: CaptionedTextWidget(
+              title: context.l10n.linkHasExpired,
+              textColor: getEnteColorScheme(context).warning500,
+            ),
+            leadingIcon: Icons.error_outline,
+            leadingIconColor: getEnteColorScheme(context).warning500,
+            menuItemColor: getEnteColorScheme(context).fillFaint,
+            isBottomBorderRadiusRemoved: true,
+          ),
+        );
+      } else {
+        final String url =
+            CollectionService.instance.getPublicUrl(widget.collection);
+        children.addAll(
+          [
+            MenuItemWidget(
+              captionedTextWidget: CaptionedTextWidget(
+                title: context.l10n.copyLink,
+                makeTextBold: true,
+              ),
+              leadingIcon: Icons.copy,
+              menuItemColor: getEnteColorScheme(context).fillFaint,
+              showOnlyLoadingState: true,
+              onTap: () async {
+                await Clipboard.setData(ClipboardData(text: url));
+                showShortToast(context, "Link copied to clipboard");
+              },
+              isBottomBorderRadiusRemoved: true,
+            ),
+            DividerWidget(
+              dividerType: DividerType.menu,
+              bgColor: getEnteColorScheme(context).fillFaint,
+            ),
+            MenuItemWidget(
+              captionedTextWidget: CaptionedTextWidget(
+                title: context.l10n.sendLink,
+                makeTextBold: true,
+              ),
+              leadingIcon: Icons.adaptive.share,
+              menuItemColor: getEnteColorScheme(context).fillFaint,
+              onTap: () async {
+                // ignore: unawaited_futures
+                await shareText(
+                  url,
+                  context: context,
+                );
+              },
+              isTopBorderRadiusRemoved: true,
+              isBottomBorderRadiusRemoved: true,
+            ),
+          ],
+        );
+      }
+
+      children.addAll(
+        [
+          DividerWidget(
+            dividerType: DividerType.menu,
+            bgColor: getEnteColorScheme(context).fillFaint,
+          ),
+          MenuItemWidget(
+            captionedTextWidget: CaptionedTextWidget(
+              title: context.l10n.manageLink,
+              makeTextBold: true,
+            ),
+            leadingIcon: Icons.link,
+            trailingIcon: Icons.navigate_next,
+            menuItemColor: getEnteColorScheme(context).fillFaint,
+            trailingIconIsMuted: true,
+            onTap: () async {
+              // ignore: unawaited_futures
+              routeToPage(
+                context,
+                ManageSharedLinkWidget(collection: widget.collection),
+              ).then(
+                (value) => {
+                  if (mounted) {setState(() => {})},
+                },
+              );
+            },
+            isTopBorderRadiusRemoved: true,
+          ),
+          const SizedBox(height: 24),
+          MenuItemWidget(
+            captionedTextWidget: CaptionedTextWidget(
+              title: context.l10n.removeLink,
+              textColor: warning500,
+              makeTextBold: true,
+            ),
+            leadingIcon: Icons.remove_circle_outline,
+            leadingIconColor: warning500,
+            menuItemColor: getEnteColorScheme(context).fillFaint,
+            surfaceExecutionStates: false,
+            onTap: () async {
+              final bool result = await CollectionActions.disableUrl(
+                context,
+                widget.collection,
+              );
+              if (result && mounted) {
+                Navigator.of(context).pop();
+                if (widget.collection.isQuickLinkCollection()) {
+                  Navigator.of(context).pop();
+                }
+              }
+            },
+          ),
+        ],
+      );
+    } else {
+      children.addAll(
+        [
+          MenuItemWidget(
+            captionedTextWidget: CaptionedTextWidget(
+              title: context.l10n.createPublicLink,
+              makeTextBold: true,
+            ),
+            leadingIcon: Icons.link,
+            menuItemColor: getEnteColorScheme(context).fillFaint,
+            showOnlyLoadingState: true,
+            onTap: () async {
+              final bool result =
+                  await CollectionActions.enableUrl(context, widget.collection);
+              if (result && mounted) {
+                setState(() => {});
+              }
+            },
+          ),
+        ],
+      );
+    }
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(
+          widget.collection.name ?? "Collection",
+          style:
+              Theme.of(context).textTheme.headlineSmall?.copyWith(fontSize: 16),
+        ),
+        elevation: 0,
+        centerTitle: false,
+      ),
+      body: SingleChildScrollView(
+        child: ListBody(
+          children: <Widget>[
+            Padding(
+              padding:
+                  const EdgeInsets.symmetric(vertical: 4.0, horizontal: 16),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: children,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class EmailItemWidget extends StatelessWidget {
+  final Collection collection;
+  final Function? onTap;
+
+  const EmailItemWidget(
+    this.collection, {
+    this.onTap,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    if (collection.getSharees().isEmpty) {
+      return const SizedBox.shrink();
+    } else if (collection.getSharees().length == 1) {
+      final User? user = collection.getSharees().firstOrNull;
+      return Column(
+        mainAxisAlignment: MainAxisAlignment.start,
+        children: [
+          MenuItemWidget(
+            captionedTextWidget: CaptionedTextWidget(
+              title: user?.displayName ?? user?.email ?? '',
+            ),
+            leadingIconWidget: UserAvatarWidget(
+              collection.getSharees().first,
+              thumbnailView: false,
+              config: Configuration.instance,
+            ),
+            leadingIconSize: 24,
+            menuItemColor: getEnteColorScheme(context).fillFaint,
+            trailingIconIsMuted: true,
+            trailingIcon: Icons.chevron_right,
+            onTap: () async {
+              if (onTap != null) {
+                onTap!();
+              }
+            },
+            isBottomBorderRadiusRemoved: true,
+          ),
+          DividerWidget(
+            dividerType: DividerType.menu,
+            bgColor: getEnteColorScheme(context).fillFaint,
+          ),
+        ],
+      );
+    } else {
+      return Column(
+        mainAxisAlignment: MainAxisAlignment.start,
+        children: [
+          MenuItemWidget(
+            captionedTextWidget: Flexible(
+              child: Padding(
+                padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 0),
+                child: SizedBox(
+                  height: 24,
+                  child: AlbumSharesIcons(
+                    sharees: collection.getSharees(),
+                    padding: const EdgeInsets.all(0),
+                    limitCountTo: 10,
+                    type: AvatarType.mini,
+                    removeBorder: false,
+                  ),
+                ),
+              ),
+            ),
+            alignCaptionedTextToLeft: true,
+            // leadingIcon: Icons.people_outline,
+            menuItemColor: getEnteColorScheme(context).fillFaint,
+            trailingIconIsMuted: true,
+            trailingIcon: Icons.chevron_right,
+            onTap: () async {
+              if (onTap != null) {
+                onTap!();
+              }
+            },
+            isBottomBorderRadiusRemoved: true,
+          ),
+          DividerWidget(
+            dividerType: DividerType.menu,
+            bgColor: getEnteColorScheme(context).fillFaint,
+          ),
+        ],
+      );
+    }
+  }
+}

mobile/apps/locker/lib/ui/viewer/date/date_time_picker.dart

@@ -0,0 +1,227 @@
+import "package:ente_ui/theme/ente_theme.dart";
+import "package:flutter/cupertino.dart";
+import "package:flutter/material.dart";
+import "package:locker/l10n/l10n.dart";
+
+Future<DateTime?> showDatePickerSheet(
+  BuildContext context, {
+  required DateTime initialDate,
+  DateTime? maxDate,
+  DateTime? minDate,
+  bool startWithTime = false,
+}) async {
+  final colorScheme = getEnteColorScheme(context);
+  final sheet = Container(
+    decoration: BoxDecoration(
+      color: colorScheme.backgroundElevated,
+      borderRadius: const BorderRadius.only(
+        topLeft: Radius.circular(12),
+        topRight: Radius.circular(12),
+      ),
+    ),
+    child: Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: DateTimePickerWidget(
+        (DateTime dateTime) {
+          Navigator.of(context).pop(dateTime);
+        },
+        () {
+          Navigator.of(context).pop(null);
+        },
+        initialDate,
+        minDateTime: minDate,
+        maxDateTime: maxDate,
+      ),
+    ),
+  );
+  final newDate = await showModalBottomSheet<DateTime?>(
+    context: context,
+    isScrollControlled: true,
+    builder: (context) => sheet,
+  );
+  return newDate;
+}
+
+class DateTimePickerWidget extends StatefulWidget {
+  final Function(DateTime) onDateTimeSelected;
+  final Function() onCancel;
+  final DateTime initialDateTime;
+  final DateTime? maxDateTime;
+  final DateTime? minDateTime;
+  final bool startWithTime;
+
+  const DateTimePickerWidget(
+    this.onDateTimeSelected,
+    this.onCancel,
+    this.initialDateTime, {
+    this.maxDateTime,
+    this.minDateTime,
+    this.startWithTime = false,
+    super.key,
+  });
+
+  @override
+  State<DateTimePickerWidget> createState() => _DateTimePickerWidgetState();
+}
+
+class _DateTimePickerWidgetState extends State<DateTimePickerWidget> {
+  late DateTime _selectedDateTime;
+  bool _showTimePicker = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _showTimePicker = widget.startWithTime;
+    _selectedDateTime = widget.initialDateTime;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = getEnteColorScheme(context);
+    return Container(
+      color: colorScheme.backgroundElevated,
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          // Header
+          Padding(
+            padding: const EdgeInsets.symmetric(vertical: 16),
+            child: Align(
+              alignment: Alignment.centerLeft,
+              child: Text(
+                _showTimePicker
+                    ? context.l10n.selectTime
+                    : context.l10n.selectDate,
+                style: TextStyle(
+                  color: colorScheme.textBase,
+                  fontSize: 16,
+                ),
+              ),
+            ),
+          ),
+
+          // Date/Time Picker
+          Container(
+            height: 220,
+            decoration: BoxDecoration(
+              color: colorScheme.backgroundElevated2,
+              borderRadius: BorderRadius.circular(12),
+            ),
+            child: CupertinoTheme(
+              data: CupertinoThemeData(
+                brightness: Brightness.dark,
+                textTheme: CupertinoTextThemeData(
+                  dateTimePickerTextStyle: TextStyle(
+                    color: colorScheme.textBase,
+                    fontSize: 22,
+                  ),
+                ),
+              ),
+              child: CupertinoDatePicker(
+                key: ValueKey(_showTimePicker),
+                mode: _showTimePicker
+                    ? CupertinoDatePickerMode.time
+                    : CupertinoDatePickerMode.date,
+                initialDateTime: _selectedDateTime,
+                minimumDate: widget.minDateTime ?? DateTime(1800),
+                maximumDate: widget.maxDateTime ?? DateTime(2200),
+                use24hFormat: MediaQuery.of(context).alwaysUse24HourFormat,
+                showDayOfWeek: !_showTimePicker,
+                onDateTimeChanged: (DateTime newDateTime) {
+                  setState(() {
+                    if (_showTimePicker) {
+                      // Keep the date but update the time
+                      _selectedDateTime = DateTime(
+                        _selectedDateTime.year,
+                        _selectedDateTime.month,
+                        _selectedDateTime.day,
+                        newDateTime.hour,
+                        newDateTime.minute,
+                      );
+                    } else {
+                      // Keep the time but update the date
+                      _selectedDateTime = DateTime(
+                        newDateTime.year,
+                        newDateTime.month,
+                        newDateTime.day,
+                        _selectedDateTime.hour,
+                        _selectedDateTime.minute,
+                      );
+                    }
+
+                    // Ensure the selected date doesn't exceed maxDateTime or minDateTime
+                    if (widget.minDateTime != null &&
+                        _selectedDateTime.isBefore(widget.minDateTime!)) {
+                      _selectedDateTime = widget.minDateTime!;
+                    }
+                    if (widget.maxDateTime != null &&
+                        _selectedDateTime.isAfter(widget.maxDateTime!)) {
+                      _selectedDateTime = widget.maxDateTime!;
+                    }
+                  });
+                },
+              ),
+            ),
+          ),
+
+          // Buttons
+          Padding(
+            padding: const EdgeInsets.symmetric(vertical: 12.0),
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                // Cancel Button
+                CupertinoButton(
+                  padding: EdgeInsets.zero,
+                  child: Text(
+                    _showTimePicker
+                        ? context.l10n.previous
+                        : context.l10n.cancel,
+                    style: TextStyle(
+                      color: colorScheme.textBase,
+                      fontSize: 14,
+                    ),
+                  ),
+                  onPressed: () {
+                    if (_showTimePicker) {
+                      // Go back to date picker
+                      setState(() {
+                        _showTimePicker = false;
+                      });
+                    } else {
+                      widget.onCancel();
+                    }
+                  },
+                ),
+
+                // Next/Done Button
+                CupertinoButton(
+                  padding: EdgeInsets.zero,
+                  child: Text(
+                    _showTimePicker ? context.l10n.done : context.l10n.next,
+                    style: TextStyle(
+                      color: colorScheme.primary700,
+                      fontSize: 14,
+                      fontWeight: FontWeight.bold,
+                    ),
+                  ),
+                  onPressed: () {
+                    if (_showTimePicker) {
+                      // We're done, call the callback
+                      widget.onDateTimeSelected(_selectedDateTime);
+                    } else {
+                      // Move to time picker
+                      setState(() {
+                        _showTimePicker = true;
+                      });
+                    }
+                  },
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

mobile/apps/locker/lib/utils/collection_actions.dart

@@ -1,10 +1,24 @@
+import "dart:async";
+
+import "package:ente_accounts/services/user_service.dart";
+import "package:ente_sharing/models/user.dart";
+import "package:ente_ui/components/action_sheet_widget.dart";
 import 'package:ente_ui/components/buttons/button_widget.dart';
 import 'package:ente_ui/components/buttons/models/button_type.dart';
+import "package:ente_ui/components/dialog_widget.dart";
+import "package:ente_ui/components/progress_dialog.dart";
+import "package:ente_ui/components/user_dialogs.dart";
 import 'package:ente_ui/utils/dialog_util.dart';
+import "package:ente_utils/email_util.dart";
+import "package:ente_utils/share_utils.dart";
 import 'package:flutter/material.dart';
+import "package:locker/core/errors.dart";
+import "package:locker/extensions/user_extension.dart";
 import 'package:locker/l10n/l10n.dart';
+import "package:locker/services/collections/collections_api_client.dart";
 import 'package:locker/services/collections/collections_service.dart';
-import 'package:locker/services/collections/models/collection.dart';
+import 'package:locker/services/collections/models/collection.dart'; 
+import "package:locker/services/configuration.dart";
 import 'package:locker/utils/snack_bar_utils.dart';
 import 'package:logging/logging.dart';
 
@@ -157,4 +171,336 @@ class CollectionActions {
       );
     }
   }
+
+  static Future<void> leaveCollection(
+    BuildContext context,
+    Collection collection, {
+    VoidCallback? onSuccess,
+  }) async {
+    final actionResult = await showActionSheet(
+      context: context,
+      buttons: [
+        ButtonWidget(
+          buttonType: ButtonType.critical,
+          isInAlert: true,
+          shouldStickToDarkTheme: true,
+          buttonAction: ButtonAction.first,
+          shouldSurfaceExecutionStates: true,
+          labelText: context.l10n.leaveCollection,
+          onTap: () async {
+            await CollectionApiClient.instance.leaveCollection(collection);
+          },
+        ),
+        ButtonWidget(
+          buttonType: ButtonType.secondary,
+          buttonAction: ButtonAction.cancel,
+          isInAlert: true,
+          shouldStickToDarkTheme: true,
+          labelText: context.l10n.cancel,
+        ),
+      ],
+      title: context.l10n.leaveCollection,
+      body: context.l10n.filesAddedByYouWillBeRemovedFromTheCollection,
+    );
+    if (actionResult?.action != null && context.mounted) {
+      if (actionResult!.action == ButtonAction.error) {
+        await showGenericErrorDialog(
+          context: context,
+          error: actionResult.exception,
+        );
+      } else if (actionResult.action == ButtonAction.first) {
+        onSuccess?.call();
+        Navigator.of(context).pop();
+        SnackBarUtils.showInfoSnackBar(
+          context,
+          "Leave collection successfully",
+        );
+      }
+    }
+  }
+
+  static Future<bool> enableUrl(
+    BuildContext context,
+    Collection collection, {
+    bool enableCollect = false,
+  }) async {
+    try {
+      await CollectionApiClient.instance.createShareUrl(
+        collection,
+        enableCollect: enableCollect,
+      );
+      return true;
+    } catch (e) {
+      if (e is SharingNotPermittedForFreeAccountsError) {
+        await _showUnSupportedAlert(context);
+      } else {
+        _logger.severe("Failed to update shareUrl collection", e);
+        await showGenericErrorDialog(context: context, error: e);
+      }
+      return false;
+    }
+  }
+
+  static Future<bool> disableUrl(
+    BuildContext context,
+    Collection collection,
+  ) async {
+    final actionResult = await showActionSheet(
+      context: context,
+      buttons: [
+        ButtonWidget(
+          buttonType: ButtonType.critical,
+          isInAlert: true,
+          shouldStickToDarkTheme: true,
+          buttonAction: ButtonAction.first,
+          shouldSurfaceExecutionStates: true,
+          labelText: "Yes, remove",
+          onTap: () async {
+            await CollectionApiClient.instance.disableShareUrl(collection);
+          },
+        ),
+        ButtonWidget(
+          buttonType: ButtonType.secondary,
+          buttonAction: ButtonAction.cancel,
+          isInAlert: true,
+          shouldStickToDarkTheme: true,
+          labelText: context.l10n.cancel,
+        ),
+      ],
+      title: "Remove public link",
+      body:
+          "This will remove the public link for accessing \"${collection.name}\".",
+    );
+    if (actionResult?.action != null) {
+      if (actionResult!.action == ButtonAction.error) {
+        await showGenericErrorDialog(
+          context: context,
+          error: actionResult.exception,
+        );
+      }
+      return actionResult.action == ButtonAction.first;
+    } else {
+      return false;
+    }
+  }
+
+  static Future<void> _showUnSupportedAlert(BuildContext context) async {
+    final AlertDialog alert = AlertDialog(
+      title: const Text("Sorry"),
+      content: const Text(
+        "You need an active paid subscription to enable sharing.",
+      ),
+      actions: [
+        ButtonWidget(
+          buttonType: ButtonType.primary,
+          isInAlert: true,
+          shouldStickToDarkTheme: false,
+          buttonAction: ButtonAction.first,
+          shouldSurfaceExecutionStates: true,
+          labelText: "Subscribe",
+          onTap: () async {
+            // TODO: If we are having subscriptions for locker
+            // Navigator.of(context).push(
+            //   MaterialPageRoute(
+            //     builder: (BuildContext context) {
+            //       return getSubscriptionPage();
+            //     },
+            //   ),
+            // ).ignore();
+            Navigator.of(context).pop();
+          },
+        ),
+        Padding(
+          padding: const EdgeInsets.only(top: 8.0),
+          child: ButtonWidget(
+            buttonType: ButtonType.secondary,
+            buttonAction: ButtonAction.cancel,
+            isInAlert: true,
+            shouldStickToDarkTheme: false,
+            labelText: context.l10n.ok,
+          ),
+        ),
+      ],
+    );
+
+    return showDialog(
+      useRootNavigator: false,
+      context: context,
+      builder: (BuildContext context) {
+        return alert;
+      },
+      barrierDismissible: true,
+    );
+  }
+
+  Future<bool> doesEmailHaveAccount(
+    BuildContext context,
+    String email, {
+    bool showProgress = false,
+  }) async {
+    ProgressDialog? dialog;
+    String? publicKey;
+    if (showProgress) {
+      dialog = createProgressDialog(
+        context,
+        context.l10n.sharing,
+        isDismissible: true,
+      );
+      await dialog.show();
+    }
+    try {
+      publicKey = await UserService.instance.getPublicKey(email);
+    } catch (e) {
+      await dialog?.hide();
+      _logger.severe("Failed to get public key", e);
+      await showGenericErrorDialog(context: context, error: e);
+      return false;
+    }
+    // getPublicKey can return null when no user is associated with given
+    // email id
+    if (publicKey == null || publicKey == '') {
+      // todo: neeraj replace this as per the design where a new screen
+      // is used for error. Do this change along with handling of network errors
+      await showInviteDialog(context, email);
+      return false;
+    } else {
+      return true;
+    }
+  }
+
+  // addEmailToCollection returns true if add operation was successful
+  Future<bool> addEmailToCollection(
+    BuildContext context,
+    Collection collection,
+    String email,
+    CollectionParticipantRole role, {
+    bool showProgress = false,
+  }) async {
+    if (!isValidEmail(email)) {
+      await showErrorDialog(
+        context,
+        context.l10n.invalidEmailAddress,
+        context.l10n.enterValidEmail,
+      );
+      return false;
+    } else if (email.trim() == Configuration.instance.getEmail()) {
+      await showErrorDialog(
+        context,
+        context.l10n.oops,
+        context.l10n.youCannotShareWithYourself,
+      );
+      return false;
+    }
+
+    ProgressDialog? dialog;
+    String? publicKey;
+    if (showProgress) {
+      dialog = createProgressDialog(
+        context,
+        context.l10n.sharing,
+        isDismissible: true,
+      );
+      await dialog.show();
+    }
+
+    try {
+      publicKey = await UserService.instance.getPublicKey(email);
+    } catch (e) {
+      await dialog?.hide();
+      _logger.severe("Failed to get public key", e);
+      await showGenericErrorDialog(context: context, error: e);
+      return false;
+    }
+    // getPublicKey can return null when no user is associated with given
+    // email id
+    if (publicKey == null || publicKey == '') {
+      // todo: neeraj replace this as per the design where a new screen
+      // is used for error. Do this change along with handling of network errors
+      await showDialogWidget(
+        context: context,
+        title: context.l10n.inviteToEnte,
+        icon: Icons.info_outline,
+        body: context.l10n.emailNoEnteAccount(email),
+        isDismissible: true,
+        buttons: [
+          ButtonWidget(
+            buttonType: ButtonType.neutral,
+            icon: Icons.adaptive.share,
+            labelText: context.l10n.sendInvite,
+            isInAlert: true,
+            onTap: () async {
+              unawaited(
+                shareText(
+                  context.l10n.shareTextRecommendUsingEnte,
+                ),
+              );
+            },
+          ),
+        ],
+      );
+      return false;
+    } else {
+      try {
+        final newSharees = await CollectionApiClient.instance
+            .share(collection.id, email, publicKey, role);
+        await dialog?.hide();
+        collection.updateSharees(newSharees);
+        return true;
+      } catch (e) {
+        await dialog?.hide();
+        if (e is SharingNotPermittedForFreeAccountsError) {
+          await _showUnSupportedAlert(context);
+        } else {
+          _logger.severe("failed to share collection", e);
+          await showGenericErrorDialog(context: context, error: e);
+        }
+        return false;
+      }
+    }
+  }
+
+  // removeParticipant remove the user from a share album
+  Future<bool> removeParticipant(
+    BuildContext context,
+    Collection collection,
+    User user,
+  ) async {
+    final actionResult = await showActionSheet(
+      context: context,
+      buttons: [
+        ButtonWidget(
+          buttonType: ButtonType.critical,
+          isInAlert: true,
+          shouldStickToDarkTheme: true,
+          buttonAction: ButtonAction.first,
+          shouldSurfaceExecutionStates: true,
+          labelText: context.l10n.yesRemove,
+          onTap: () async {
+            final newSharees = await CollectionApiClient.instance
+                .unshare(collection.id, user.email);
+            collection.updateSharees(newSharees);
+          },
+        ),
+        ButtonWidget(
+          buttonType: ButtonType.secondary,
+          buttonAction: ButtonAction.cancel,
+          isInAlert: true,
+          shouldStickToDarkTheme: true,
+          labelText: context.l10n.cancel,
+        ),
+      ],
+      title: context.l10n.removeWithQuestionMark,
+      body: context.l10n.removeParticipantBody(user.displayName ?? user.email),
+    );
+    if (actionResult?.action != null) {
+      if (actionResult!.action == ButtonAction.error) {
+        await showGenericErrorDialog(
+          context: context,
+          error: actionResult.exception,
+        );
+      }
+      return actionResult.action == ButtonAction.first;
+    }
+    return false;
+  }
 }

mobile/apps/locker/pubspec.lock

@@ -66,7 +66,7 @@ packages:
     source: hosted
     version: "2.13.0"
   bip39:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: bip39
       sha256: de1ee27ebe7d96b84bb3a04a4132a0a3007dcdd5ad27dd14aa87a29d97c45edc
@@ -146,7 +146,7 @@ packages:
     source: hosted
     version: "0.3.4+2"
   crypto:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: crypto
       sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
@@ -202,7 +202,7 @@ packages:
     source: hosted
     version: "2.1.1"
   dotted_border:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: dotted_border
       sha256: "99b091ec6891ba0c5331fdc2b502993c7c108f898995739a73c6845d71dad70c"
@@ -254,6 +254,13 @@ packages:
       relative: true
     source: path
     version: "1.0.0"
+  ente_legacy:
+    dependency: "direct main"
+    description:
+      path: "../../packages/legacy"
+      relative: true
+    source: path
+    version: "1.0.0"
   ente_lock_screen:
     dependency: "direct main"
     description:
@@ -275,6 +282,13 @@ packages:
       relative: true
     source: path
     version: "1.0.0"
+  ente_sharing:
+    dependency: "direct main"
+    description:
+      path: "../../packages/sharing"
+      relative: true
+    source: path
+    version: "1.0.0"
   ente_strings:
     dependency: "direct main"
     description:
@@ -555,6 +569,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.1.3"
+  flutter_svg:
+    dependency: "direct main"
+    description:
+      name: flutter_svg
+      sha256: b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -606,7 +628,7 @@ packages:
     source: hosted
     version: "0.15.6"
   http:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: http
       sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b"
@@ -638,7 +660,7 @@ packages:
     source: hosted
     version: "4.5.4"
   intl:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: intl
       sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
@@ -933,6 +955,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.9.1"
+  path_parsing:
+    dependency: transitive
+    description:
+      name: path_parsing
+      sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
   path_provider:
     dependency: "direct main"
     description:
@@ -1291,7 +1321,7 @@ packages:
     source: hosted
     version: "1.4.1"
   styled_text:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: styled_text
       sha256: fd624172cf629751b4f171dd0ecf9acf02a06df3f8a81bb56c0caa4f1df706c3
@@ -1331,7 +1361,7 @@ packages:
     source: hosted
     version: "0.5.0"
   tuple:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: tuple
       sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151
@@ -1434,6 +1464,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.5.1"
+  vector_graphics:
+    dependency: transitive
+    description:
+      name: vector_graphics
+      sha256: a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.19"
+  vector_graphics_codec:
+    dependency: transitive
+    description:
+      name: vector_graphics_codec
+      sha256: "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.13"
+  vector_graphics_compiler:
+    dependency: transitive
+    description:
+      name: vector_graphics_compiler
+      sha256: d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.19"
   vector_math:
     dependency: transitive
     description:
@@ -1524,4 +1578,4 @@ packages:
     version: "3.1.3"
 sdks:
   dart: ">=3.8.0 <4.0.0"
-  flutter: ">=3.27.0"
+  flutter: ">=3.29.0"

mobile/apps/locker/pubspec.yaml

@@ -8,8 +8,11 @@ environment:
 
 dependencies:
   adaptive_theme: ^3.6.0
+  bip39: ^1.0.6
   collection: ^1.18.0
-  dio: ^5.8.0+1
+  crypto: ^3.0.6
+  dio: ^5.8.0+1 
+  dotted_border: ^3.1.0
   email_validator: ^3.0.0
   ente_accounts:
     path: ../../packages/accounts
@@ -22,19 +25,23 @@ dependencies:
       url: https://github.com/ente-io/ente_crypto_dart.git
   ente_events:
     path: ../../packages/events
+  ente_legacy: 
+    path: ../../packages/legacy
   ente_lock_screen:
     path: ../../packages/lock_screen
   ente_logging:
     path: ../../packages/logging
   ente_network:
     path: ../../packages/network
+  ente_sharing:
+    path: ../../packages/sharing
   ente_strings:
     path: ../../packages/strings
   ente_ui:
     path: ../../packages/ui
   ente_utils:
     path: ../../packages/utils
-  event_bus: ^2.0.1
+  event_bus: ^2.0.1 
   expandable: ^5.0.1
   fast_base58: ^0.2.1
   file_picker: ^10.2.0
@@ -46,8 +53,9 @@ dependencies:
       url: https://github.com/eaceto/flutter_local_authentication
       ref: 1ac346a04592a05fd75acccf2e01fa3c7e955d96
   flutter_localizations:
-    sdk: flutter
-  http: ^1.4.0
+    sdk: flutter 
+  flutter_svg: ^2.2.1
+  intl: ^0.20.2
   io: ^1.0.5
   listen_sharing_intent: ^1.9.2
   logging: ^1.3.0
@@ -56,12 +64,12 @@ dependencies:
   path: ^1.9.0
   path_provider: ^2.1.5
   shared_preferences: ^2.5.3
-  sqflite: ^2.4.1
-  styled_text: ^8.1.0
+  sqflite: ^2.4.1 
   tray_manager: ^0.5.0
+  tuple: ^2.0.2
   url_launcher: ^6.3.2
-  uuid: ^4.5.1
-  window_manager: ^0.5.0
+  uuid: ^4.5.1 
+  window_manager: ^0.5.1
 
 dev_dependencies:
   flutter_launcher_icons: ^0.14.3

mobile/apps/locker/pubspec_overrides.yaml

@@ -0,0 +1,26 @@
+# melos_managed_dependency_overrides: ente_accounts,ente_base,ente_configuration,ente_events,ente_lock_screen,ente_logging,ente_network,ente_strings,ente_ui,ente_utils,ente_sharing,ente_legacy
+dependency_overrides:
+  ente_accounts:
+    path: ../../packages/accounts
+  ente_base:
+    path: ../../packages/base
+  ente_configuration:
+    path: ../../packages/configuration
+  ente_events:
+    path: ../../packages/events
+  ente_legacy:
+    path: ../../packages/legacy
+  ente_lock_screen:
+    path: ../../packages/lock_screen
+  ente_logging:
+    path: ../../packages/logging
+  ente_network:
+    path: ../../packages/network
+  ente_sharing:
+    path: ../../packages/sharing
+  ente_strings:
+    path: ../../packages/strings
+  ente_ui:
+    path: ../../packages/ui
+  ente_utils:
+    path: ../../packages/utils

mobile/apps/photos/.gitignore

@@ -45,4 +45,11 @@ fastlane/report.xml
 android/app/build/
 
 # FVM Version Cache
-.fvm/
+.fvm/
+
+lib/generated/intl/app_localizations*.dart
+
+# Generated rust bindings
+lib/src/rust/*
+rust/src/frb_generated*
+test/**/*.mocks.dart

mobile/apps/photos/CLAUDE.md

@@ -0,0 +1,204 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Project Philosophy
+
+Ente is focused on privacy, transparency and trust. It's a fully open-source, end-to-end encrypted platform for storing data in the cloud. When contributing, always prioritize:
+- User privacy and data security
+- End-to-end encryption integrity
+- Transparent, auditable code
+- Zero-knowledge architecture principles
+
+## Monorepo Context
+
+This is the Ente Photos mobile app within the Ente monorepo. The monorepo contains:
+- Mobile apps (Photos, Auth, Locker) at `mobile/apps/`
+- Shared packages at `mobile/packages/`
+- Web, desktop, CLI, and server components in parent directories
+
+### Package Architecture
+The Photos app uses two types of packages:
+- **Shared packages** (`../../packages/`): Common code shared across multiple Ente apps (Photos, Auth, Locker)
+- **Photos-specific plugins** (`./plugins/`): Custom Flutter plugins specific to Photos app for separation and testability
+
+## Commit & PR Guidelines
+
+⚠️ **CRITICAL: From the default template, use ONLY: Co-Authored-By: Claude <noreply@anthropic.com>** ⚠️
+
+### Pre-commit/PR Checklist (RUN BEFORE EVERY COMMIT OR PR!)
+
+**CRITICAL: CI will fail if ANY of these checks fail. Run ALL commands and ensure they ALL pass.**
+
+```bash
+# 1. Analyze flutter code for errors and warnings
+flutter analyze
+```
+
+**Why CI might fail even after running these:**
+
+- Skipping any command above
+- Assuming auto-fix tools handle everything (they don't)
+- Not fixing warnings that flutter reports
+- Making changes after running the checks
+
+### Commit & PR Message Rules
+
+**These rules apply to BOTH commit messages AND pull request descriptions**
+
+- Keep messages CONCISE (no walls of text)
+- Subject line under 72 chars (no body text unless critical)
+- NO emojis
+- NO promotional text or links (except Co-Authored-By line)
+
+### Additional Guidelines
+
+- Check `git status` before committing to avoid adding temporary/binary files
+- Never commit to main branch
+- All CI checks must pass - run the checklist commands above before committing or creating PR
+
+## Development Commands
+
+### Using Melos (Monorepo Management)
+```bash
+# From mobile/ directory - bootstrap all packages
+melos bootstrap
+
+# Run Photos app specifically
+melos run:photos:apk
+
+# Build Photos APK
+melos build:photos:apk
+
+# Clean Photos app
+melos clean:photos
+```
+
+### Direct Flutter Commands
+```bash
+# Development run with environment variables
+./run.sh                                    # Uses .env file with --flavor dev
+
+# Development run without env file
+flutter run -t lib/main.dart --flavor independent
+
+# Build release APK
+flutter build apk --release --flavor independent
+
+# iOS build
+cd ios && pod install && cd ..
+flutter build ios
+```
+
+### Code Quality
+```bash
+# Static analysis and linting
+flutter analyze .
+
+# Run tests
+flutter test
+```
+
+## Architecture Overview
+
+### Service-Oriented Architecture
+The app uses a service layer pattern with 28+ specialized services:
+- **collections_service.dart**: Album and collection management
+- **search_service.dart**: Search functionality with ML support
+- **smart_memories_service.dart**: AI-powered memory curation
+- **sync_service.dart**: Local/remote synchronization
+- **Machine Learning Services**: Face recognition, semantic search, similar images
+
+### Key Patterns
+- **Service Locator**: Dependency injection via `lib/service_locator.dart`
+- **Event Bus**: Loose coupling via `lib/core/event_bus.dart`
+- **Repository Pattern**: Database abstraction in `lib/db/`
+- **Rust Integration**: Performance-critical operations via Flutter Rust Bridge
+
+### Security Architecture
+- End-to-end encryption with `ente_crypto` package
+- BIP39 mnemonic-based key generation (24 words)
+- Secure storage using platform-specific implementations
+- App lock and privacy screen features
+
+## Project Structure
+
+```
+lib/
+├── core/           # Configuration, constants, networking
+├── services/       # Business logic (28+ services)
+├── ui/            # UI components (18 subdirectories)
+├── models/        # Data models (17 subdirectories)
+├── db/            # SQLite database layer
+├── utils/         # Utilities and helpers
+├── gateways/      # API gateway interfaces
+├── events/        # Event system
+├── l10n/          # Localization files (intl_*.arb)
+└── generated/     # Auto-generated code including localizations
+```
+
+## Localization (Flutter)
+
+- Add new strings to `lib/l10n/intl_en.arb` (English base file)
+- Use `AppLocalizations` to access localized strings in code
+- Example: `AppLocalizations.of(context).yourStringKey`
+- Run code generation after adding new strings: `flutter pub get`
+- Translations managed via Crowdin for other languages
+
+## Key Dependencies
+
+- **Flutter 3.32.8** with Dart SDK >=3.3.0 <4.0.0
+- **Media**: `photo_manager`, `video_editor`, `ffmpeg_kit_flutter`
+- **Storage**: `sqlite_async`, `flutter_secure_storage`
+- **ML/AI**: Custom ONNX runtime, `ml_linalg`
+- **Rust**: Flutter Rust Bridge for performance
+
+## Development Setup Requirements
+
+1. Install Flutter v3.32.8 and Rust
+2. Install Flutter Rust Bridge: `cargo install flutter_rust_bridge_codegen`
+3. Generate Rust bindings: `flutter_rust_bridge_codegen generate`
+4. Update submodules: `git submodule update --init --recursive`
+5. Enable git hooks: `git config core.hooksPath hooks`
+
+## Critical Coding Requirements
+
+### 1. Code Quality - MANDATORY
+**Every code change MUST pass `flutter analyze` with zero issues**
+- Run `flutter analyze` after EVERY code modification
+- Resolve ALL issues (info, warning, error) - no exceptions
+- The codebase has zero issues by default, so any issue is from your changes
+- DO NOT commit or consider work complete until `flutter analyze` passes cleanly
+
+### 2. Component Reuse - MANDATORY
+**Always try to reuse existing components**
+- Use a subagent to search for existing components before creating new ones
+- Only create new components if none exist that meet the requirements
+- Check both UI components in `lib/ui/` and shared components in `../../packages/`
+
+### 3. Design System - MANDATORY
+**Never hardcode colors or text styles**
+- Always use the Ente design system for colors and typography
+- Use a subagent to find the appropriate design tokens
+- Access colors via theme: `getEnteColorScheme(context)`
+- Access text styles via theme: `getEnteTextTheme(context)`
+- Call above theme getters only at the top of (`build`) methods and re-use them throughout the component
+- If you MUST use custom colors/styles (extremely rare), explicitly inform the user with a clear warning
+
+### 4. Documentation Sync - MANDATORY
+**Keep spec documents synchronized with code changes**
+- When modifying code, also update any associated spec documents
+- Check for related spec files in `docs/` or project directories
+- Ensure documentation reflects the current implementation
+- Update examples in specs if behavior changes
+
+## Important Notes
+
+- Large service files (some 70k+ lines) - consider file context when editing
+- 400+ dependencies - check existing libraries before adding new ones
+- When adding functionality, check both `../../packages/` for shared code and `./plugins/` for Photos-specific plugins
+- Performance-critical paths use Rust integration
+- Always follow existing code conventions and patterns in neighboring files
+
+# Individual Preferences
+- @~/.claude/my-project-instructions.md