Fix deprecated Share usage by using SharePlus.instance.share()

CLAUDE.md

@@ -0,0 +1,65 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Repository Overview
+
+Ente is a monorepo containing end-to-end encrypted cloud storage applications (Photos and Auth), with clients for multiple platforms and a self-hostable backend server. The codebase uses end-to-end encryption for all user data, ensuring privacy and security.
+
+## Common Development Commands
+
+### Web Development
+- **Run Photos app**: `cd web && yarn dev:photos` (port 3000)
+- **Run Auth app**: `cd web && yarn dev:auth` (port 3003)
+- **Build Photos**: `cd web && yarn build:photos`
+- **Lint and typecheck**: `cd web && yarn lint`
+- **Fix linting issues**: `cd web && yarn lint-fix`
+
+### Mobile Development (Flutter)
+- **Bootstrap monorepo**: `cd mobile && melos bootstrap`
+- **Run Photos app**: `cd mobile && melos run:photos:apk`
+- **Run Auth app**: `cd mobile && melos run:auth:apk`
+- **Build Photos APK**: `cd mobile && melos build:photos:apk`
+- **Clean all projects**: `cd mobile && melos clean:all`
+
+### Desktop Development (Electron)
+- **Run development**: `cd desktop && yarn dev`
+- **Build quickly**: `cd desktop && yarn build:quick`
+- **Full build**: `cd desktop && yarn build`
+- **Lint**: `cd desktop && yarn lint`
+
+### Server Development (Go)
+- **Run locally**: `cd server && docker compose up --build`
+- **API endpoint**: `http://localhost:8080`
+- **Health check**: `curl http://localhost:8080/ping`
+
+## Architecture
+
+### Encryption Architecture
+The system implements end-to-end encryption using:
+- **Master Key**: Generated client-side, never leaves device unencrypted
+- **Key Encryption Key**: Derived from user password using Argon2
+- **Collection Keys**: Per-folder/album encryption keys
+- **File Keys**: Individual encryption for each file
+- Uses libsodium for all cryptographic operations
+
+### Project Structure
+- `web/apps/` - Next.js web applications (photos, auth, accounts, etc.)
+- `mobile/apps/` - Flutter applications for iOS/Android
+- `desktop/` - Electron desktop application
+- `server/` - Go backend API (Museum)
+- `cli/` - Command-line interface
+- `docs/` - Documentation
+- `infra/` - Infrastructure and deployment configs
+
+### Key Technologies
+- **Frontend**: Next.js, React, TypeScript
+- **Mobile**: Flutter, Dart
+- **Desktop**: Electron, TypeScript
+- **Backend**: Go, PostgreSQL, Docker
+- **Cryptography**: libsodium, end-to-end encryption
+
+## Testing Approach
+- Check for test scripts in package.json files
+- Mobile tests can be run with Flutter's test command
+- Server tests use Go's built-in testing framework

CONTRIBUTING.md

@@ -48,11 +48,7 @@ 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. 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.
+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.
 
 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.
 

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 (Sep 2025) the ability to link a custom domain is only present in Ente's web app, [web.ente.io](https://web.ente.io).
+> 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.
 
 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 (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).
+> 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.
 
 ## Unsetting
 
@@ -103,7 +103,3 @@ 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 and very similar files across albums.
+that can be manually run afterwards to remove duplicates 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 differently on each platform, to cater to
+The duplicate detection works slightly different 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 provides a tool for manual de-duplication in _Settings → Backup → Free up space →
+Ente also provides a tool for manual de-duplication in _Settings → Backup →
 Remove duplicates_. This is useful if you have an existing library with
 duplicates across different albums, but wish to keep only one copy.
 
@@ -57,13 +57,6 @@ 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

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

@@ -54,5 +54,4 @@
             <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,6 +1,5 @@
 package io.ente.locker
 
-import io.flutter.embedding.android.FlutterFragmentActivity
+import io.flutter.embedding.android.FlutterActivity
 
-class MainActivity: FlutterFragmentActivity() {
-}
+class MainActivity: FlutterActivity()

mobile/apps/locker/assets/icons/legacy-dark.svg

@@ -1,20 +0,0 @@
-<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_34053_111310)">
-<path d="M170 66.7593C170 71.8084 169.042 76.732 167.151 81.3933C165.192 86.2233 162.316 90.5536 158.606 94.265L147.36 105.511L151.657 109.806C152.962 111.112 152.26 113.347 150.441 113.671L128.349 117.598C126.785 117.875 125.423 116.513 125.7 114.949L129.628 92.8595C129.952 91.0413 132.187 90.3393 133.492 91.6442L137.12 95.2717L148.366 84.0261C152.978 79.4144 155.519 73.282 155.519 66.7609C155.519 60.2383 152.978 54.105 148.365 49.4941C143.753 44.8815 137.621 42.3422 131.097 42.3422C124.574 42.3422 118.442 44.8815 113.83 49.4941L107.387 55.936C107.383 55.9064 107.378 55.8784 107.373 55.8488L104.299 38.5628C107.848 35.1847 111.936 32.5447 116.463 30.7097C121.123 28.818 126.048 27.8594 131.097 27.8594C136.146 27.8594 141.07 28.818 145.732 30.7089C150.564 32.667 154.894 35.5421 158.606 39.2528C162.317 42.9643 165.192 47.2946 167.151 52.1246C169.041 56.7859 169.999 61.711 170 66.7593Z" fill="#4AAF3C"/>
-<path d="M133.814 119.087L105.12 147.779C103.762 149.137 101.92 149.9 99.9998 149.9C98.0791 149.9 96.2375 149.137 94.879 147.779L70.7775 123.678L67.503 126.953C66.1972 128.259 63.9623 127.556 63.6392 125.737L59.7107 103.646C59.4332 102.083 60.7966 100.72 62.3598 100.997L84.4519 104.925C86.2702 105.249 86.9731 107.483 85.6673 108.789L81.0183 113.438L100.001 132.42L124.507 107.914L123.318 114.601C123.053 116.096 123.535 117.63 124.609 118.703C125.684 119.778 127.217 120.259 128.712 119.994L133.814 119.087H133.814Z" fill="#4AAF3C"/>
-<path d="M102.359 58.8607L80.2668 54.9325C78.4485 54.6095 77.7456 52.3748 79.0514 51.0692L83.1799 46.9412C79.0498 43.9533 74.1009 42.3406 68.9034 42.3406C62.3808 42.3406 56.2477 44.88 51.6363 49.4925C47.0232 54.1042 44.4828 60.2359 44.4828 66.7585C44.4828 73.2812 47.0232 79.4128 51.6363 84.0246L66.9435 99.3301L62.7415 98.5834C61.2462 98.3179 59.7125 98.8 58.6386 99.8738C57.5647 100.948 57.0825 102.482 57.348 103.977L58.697 111.564L41.3955 94.2635C37.6836 90.552 34.8089 86.2217 32.8499 81.3917C30.9588 76.7312 30 71.8076 30 66.7593C30 61.711 30.9588 56.7867 32.8491 52.1254C34.8081 47.2946 37.6836 42.9643 41.3947 39.2536C45.1057 35.5421 49.4365 32.6678 54.267 30.7097C58.9296 28.818 63.8537 27.8594 68.9034 27.8594C73.953 27.8594 78.8771 28.818 83.5389 30.7081C87.158 32.1753 90.4956 34.1565 93.503 36.6183L97.2157 32.9061C98.5215 31.6004 100.756 32.3032 101.079 34.1214L105.007 56.211C105.286 57.7741 103.922 59.1381 102.359 58.8607Z" fill="#4AAF3C"/>
-</g>
-<g filter="url(#filter0_f_34053_111310)">
-<ellipse cx="102.576" cy="170.536" rx="27.5758" ry="1.59085" fill="#1CA609" fill-opacity="0.5"/>
-</g>
-<defs>
-<filter id="filter0_f_34053_111310" x="70.5" y="164.445" width="64.1515" height="12.1797" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feGaussianBlur stdDeviation="2.25" result="effect1_foregroundBlur_34053_111310"/>
-</filter>
-<clipPath id="clip0_34053_111310">
-<rect width="140" height="122" fill="white" transform="translate(30 27.8828)"/>
-</clipPath>
-</defs>
-</svg>

mobile/apps/locker/assets/icons/legacy-light.svg

@@ -1,20 +0,0 @@
-<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_34053_111286)">
-<path d="M170 66.7593C170 71.8084 169.042 76.732 167.151 81.3933C165.192 86.2233 162.316 90.5536 158.606 94.265L147.36 105.511L151.657 109.806C152.962 111.112 152.26 113.347 150.441 113.671L128.349 117.598C126.785 117.875 125.423 116.513 125.7 114.949L129.628 92.8594C129.952 91.0413 132.187 90.3393 133.492 91.6441L137.12 95.2717L148.366 84.0261C152.978 79.4144 155.519 73.2819 155.519 66.7609C155.519 60.2383 152.978 54.105 148.365 49.4941C143.753 44.8815 137.621 42.3422 131.097 42.3422C124.574 42.3422 118.442 44.8815 113.83 49.4941L107.387 55.936C107.383 55.9064 107.378 55.8784 107.373 55.8488L104.299 38.5628C107.848 35.1847 111.936 32.5447 116.463 30.7097C121.123 28.818 126.048 27.8594 131.097 27.8594C136.146 27.8594 141.07 28.818 145.732 30.7089C150.564 32.667 154.894 35.5421 158.606 39.2528C162.317 42.9643 165.192 47.2946 167.151 52.1246C169.041 56.7859 169.999 61.7102 170 66.7585V66.7593Z" fill="#4AAF3C"/>
-<path d="M133.814 119.087L105.12 147.779C103.762 149.137 101.92 149.9 99.9998 149.9C98.0791 149.9 96.2375 149.137 94.879 147.779L70.7775 123.678L67.503 126.953C66.1972 128.259 63.9623 127.556 63.6392 125.737L59.7107 103.646C59.4332 102.083 60.7966 100.72 62.3598 100.997L84.4519 104.925C86.2702 105.249 86.9731 107.483 85.6673 108.789L81.0183 113.438L100.001 132.42L124.507 107.914L123.318 114.601C123.053 116.096 123.535 117.63 124.609 118.703C125.684 119.778 127.217 120.259 128.712 119.994L133.814 119.087H133.814Z" fill="#4AAF3C"/>
-<path d="M102.359 58.8607L80.2668 54.9325C78.4485 54.6095 77.7456 52.3748 79.0514 51.0692L83.1799 46.9412C79.0498 43.9533 74.1009 42.3406 68.9034 42.3406C62.3808 42.3406 56.2477 44.88 51.6363 49.4925C47.0232 54.1042 44.4828 60.2359 44.4828 66.7585C44.4828 73.2812 47.0232 79.4128 51.6363 84.0246L66.9435 99.3301L62.7415 98.5834C61.2462 98.3179 59.7125 98.8 58.6386 99.8738C57.5647 100.948 57.0825 102.482 57.348 103.977L58.697 111.564L41.3955 94.2635C37.6836 90.552 34.8089 86.2217 32.8499 81.3917C30.9588 76.7312 30 71.8076 30 66.7593C30 61.711 30.9588 56.7867 32.8491 52.1254C34.8081 47.2946 37.6836 42.9643 41.3947 39.2536C45.1057 35.5421 49.4365 32.6678 54.267 30.7097C58.9296 28.818 63.8537 27.8594 68.9034 27.8594C73.953 27.8594 78.8771 28.818 83.5389 30.7081C87.158 32.1753 90.4957 34.1565 93.503 36.6183L97.2157 32.9061C98.5215 31.6004 100.756 32.3032 101.079 34.1214L105.007 56.211C105.286 57.7741 103.922 59.1373 102.359 58.8599V58.8607Z" fill="#4AAF3C"/>
-</g>
-<g filter="url(#filter0_f_34053_111286)">
-<ellipse cx="101.576" cy="170.536" rx="27.5758" ry="1.59085" fill="#E1E1E1" fill-opacity="0.5"/>
-</g>
-<defs>
-<filter id="filter0_f_34053_111286" x="69.5" y="164.445" width="64.1515" height="12.1797" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feGaussianBlur stdDeviation="2.25" result="effect1_foregroundBlur_34053_111286"/>
-</filter>
-<clipPath id="clip0_34053_111286">
-<rect width="140" height="122" fill="white" transform="translate(30 27.8828)"/>
-</clipPath>
-</defs>
-</svg>

mobile/apps/locker/ios/Podfile.lock

@@ -188,37 +188,37 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
-  app_links: 76b66b60cc809390ca1ad69bfd66b998d2387ac7
-  cupertino_http: 94ac07f5ff090b8effa6c5e2c47871d48ab7c86c
-  device_info_plus: 335f3ce08d2e174b9fdc3db3db0f4e3b1f66bd89
+  app_links: f3e17e4ee5e357b39d8b95290a9b2c299fca71c6
+  cupertino_http: 947a233f40cfea55167a49f2facc18434ea117ba
+  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
   DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
   DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
-  file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
-  file_saver: 6cdbcddd690cb02b0c1a0c225b37cd805c2bf8b6
+  file_picker: b159e0c068aef54932bb15dc9fd1571818edaf49
+  file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  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
+  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
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
-  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
-  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
-  privacy_screen: 3159a541f5d3a31bea916cfd4e58f9dc722b3fd4
+  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+  privacy_screen: 1a131c052ceb3c3659934b003b0d397c2381a24e
   SDWebImage: f29024626962457f3470184232766516dee8dfea
   Sentry: da60d980b197a46db0b35ea12cb8f39af48d8854
-  sentry_flutter: 27892878729f42701297c628eb90e7c6529f3684
-  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
-  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
-  sodium_libs: 6c6d0e83f4ee427c6464caa1f1bdc2abf3ca0b7f
-  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
+  sentry_flutter: 2df8b0aab7e4aba81261c230cbea31c82a62dd1b
+  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
+  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+  sodium_libs: 1faae17af662384acbd13e41867a0008cd2e2318
+  sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
   SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
-  ua_client_hints: 92fe0d139619b73ec9fcb46cc7e079a26178f586
-  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
+  ua_client_hints: aeabd123262c087f0ce151ef96fa3ab77bfc8b38
+  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
 
 PODFILE CHECKSUM: d2d3220ea22664a259778d9e314054751db31361
 

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

@@ -18,9 +18,6 @@ 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,8 +17,6 @@ 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

@@ -1,12 +0,0 @@
-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,162 +349,5 @@
   "mastodon": "Mastodon",
   "matrix": "Matrix",
   "discord": "Discord",
-  "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"
+  "reddit": "Reddit"
 }

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

@@ -1017,588 +1017,6 @@ 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,380 +534,4 @@ 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,7 +4,6 @@ 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';
@@ -170,8 +169,4 @@ 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,23 +1,16 @@
-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';
@@ -36,11 +29,7 @@ class CollectionApiClient {
   final _enteDio = Network.instance.enteDio;
   final _config = Configuration.instance;
 
-  late CollectionDB _db;
-
-  Future<void> init() async {
-    _db = CollectionDB.instance;
-  }
+  Future<void> init() async {}
 
   Future<List<Collection>> getCollections(int sinceTime) async {
     try {
@@ -172,18 +161,6 @@ 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,
@@ -417,86 +394,6 @@ 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,15 +4,10 @@ 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';
@@ -21,6 +16,8 @@ import "package:locker/utils/crypto_helper.dart";
 import 'package:logging/logging.dart';
 
 class CollectionService {
+  CollectionService._privateConstructor();
+
   static final CollectionService instance =
       CollectionService._privateConstructor();
 
@@ -39,16 +36,7 @@ class CollectionService {
   };
 
   final _logger = Logger("CollectionService");
-
-  late CollectionApiClient _apiClient;
-  late CollectionDB _db;
-
-  final _collectionIDToCollections = <int, Collection>{};
-
-  CollectionService._privateConstructor() {
-    _db = CollectionDB.instance;
-    _apiClient = CollectionApiClient.instance;
-  }
+  final _apiClient = CollectionApiClient.instance;
 
   Future<void> init() async {
     if (Configuration.instance.hasConfiguredAccount()) {
@@ -62,45 +50,41 @@ class CollectionService {
   }
 
   Future<void> sync() async {
-    final updatedCollections =
-        await CollectionApiClient.instance.getCollections(_db.getSyncTime());
+    final updatedCollections = await CollectionApiClient.instance
+        .getCollections(CollectionDB.instance.getSyncTime());
     if (updatedCollections.isEmpty) {
       _logger.info("No collections to sync.");
       return;
     }
-    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);
-
+    await CollectionDB.instance.updateCollections(updatedCollections);
+    await CollectionDB.instance
+        .setSyncTime(updatedCollections.last.updationTime);
     final List<Future> fileFutures = [];
     for (final collection in updatedCollections) {
       if (collection.isDeleted) {
-        await _db.deleteCollection(collection);
-        _collectionIDToCollections.remove(collection.id);
+        await CollectionDB.instance.deleteCollection(collection);
         continue;
       }
-      final syncTime = _db.getCollectionSyncTime(collection.id);
+      final syncTime =
+          CollectionDB.instance.getCollectionSyncTime(collection.id);
       fileFutures.add(
-        _apiClient.getFiles(collection, syncTime).then((diff) async {
+        CollectionApiClient.instance
+            .getFiles(collection, syncTime)
+            .then((diff) async {
           if (diff.updatedFiles.isNotEmpty) {
-            await _db.addFilesToCollection(
+            await CollectionDB.instance.addFilesToCollection(
               collection,
               diff.updatedFiles,
             );
           }
           if (diff.deletedFiles.isNotEmpty) {
-            await _db.deleteFilesFromCollection(
+            await CollectionDB.instance.deleteFilesFromCollection(
               collection,
               diff.deletedFiles,
             );
           }
-          await _db.setCollectionSyncTime(
-            collection.id,
-            diff.latestUpdatedAtTime,
-          );
+          await CollectionDB.instance
+              .setCollectionSyncTime(collection.id, diff.latestUpdatedAtTime);
         }).catchError((e) {
           _logger.warning(
             "Failed to fetch files for collection ${collection.id}: $e",
@@ -116,7 +100,7 @@ class CollectionService {
 
   bool hasCompletedFirstSync() {
     return Configuration.instance.hasConfiguredAccount() &&
-        _db.getSyncTime() > 0;
+        CollectionDB.instance.getSyncTime() > 0;
   }
 
   Future<Collection> createCollection(
@@ -136,37 +120,17 @@ class CollectionService {
   }
 
   Future<List<Collection>> getCollections() async {
-    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);
+    return CollectionDB.instance.getCollections();
   }
 
   Future<List<Collection>> getCollectionsForFile(EnteFile file) async {
-    return _db.getCollectionsForFile(file);
+    return CollectionDB.instance.getCollectionsForFile(file);
   }
 
   Future<List<EnteFile>> getFilesInCollection(Collection collection) async {
     try {
-      final files = await _db.getFilesInCollection(collection);
+      final files =
+          await CollectionDB.instance.getFilesInCollection(collection);
       return files;
     } catch (e) {
       _logger.severe(
@@ -178,7 +142,7 @@ class CollectionService {
 
   Future<List<EnteFile>> getAllFiles() async {
     try {
-      final allFiles = await _db.getAllFiles();
+      final allFiles = await CollectionDB.instance.getAllFiles();
       return allFiles;
     } catch (e) {
       _logger.severe("Failed to fetch all files: $e");
@@ -214,7 +178,7 @@ class CollectionService {
 
   Future<void> rename(Collection collection, String newName) async {
     try {
-      await _apiClient.rename(
+      await CollectionApiClient.instance.rename(
         collection,
         newName,
       );
@@ -248,10 +212,6 @@ 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 {
@@ -353,17 +313,12 @@ class CollectionService {
   }
 
   Future<Collection> getCollection(int collectionID) async {
-    if (_collectionIDToCollections.containsKey(collectionID)) {
-      return _collectionIDToCollections[collectionID]!;
-    }
-    final collection = await _db.getCollection(collectionID);
-    _collectionIDToCollections[collectionID] = collection;
-    return collection;
+    return await CollectionDB.instance.getCollection(collectionID);
   }
 
-  Uint8List getCollectionKey(int collectionID) {
-    final collection = _collectionIDToCollections[collectionID];
-    final collectionKey = CryptoHelper.instance.getCollectionKey(collection!);
+  Future<Uint8List> getCollectionKey(int collectionID) async {
+    final collection = await getCollection(collectionID);
+    final collectionKey = CryptoHelper.instance.getCollectionKey(collection);
     return collectionKey;
   }
 
@@ -385,94 +340,4 @@ 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/public_url.dart';
+import 'package:locker/services/collections/models/user.dart';
 import 'package:locker/services/files/sync/models/common_keys.dart';
 
 class Collection {

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

@@ -1,9 +0,0 @@
-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

@@ -1,33 +0,0 @@
-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

@@ -1,115 +0,0 @@
-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

@@ -1,67 +0,0 @@
-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

@@ -1,53 +0,0 @@
-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

@@ -1,210 +0,0 @@
-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

@@ -1,572 +0,0 @@
-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,12 +1,28 @@
+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:flutter/material.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: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/collection_row_widget.dart";
-import "package:locker/ui/components/file_row_widget.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/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;
@@ -384,6 +400,767 @@ 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,19 +18,8 @@ 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 {
-  final UISectionType viewType;
-
-  const AllCollectionsPage({
-    super.key,
-    this.viewType = UISectionType.homeCollections,
-  });
+  const AllCollectionsPage({super.key});
 
   @override
   State<AllCollectionsPage> createState() => _AllCollectionsPageState();
@@ -45,8 +34,6 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
   List<EnteFile> _allFiles = [];
   bool _isLoading = true;
   String? _error;
-  bool showTrash = false;
-  bool showUncategorized = false;
   final _logger = Logger("AllCollectionsPage");
 
   @override
@@ -81,10 +68,6 @@ 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 {
@@ -94,19 +77,7 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
     });
 
     try {
-      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 collections = await CollectionService.instance.getCollections();
 
       final regularCollections = <Collection>[];
       Collection? uncategorized;
@@ -123,12 +94,8 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
 
       _allCollections = List.from(collections);
       _sortedCollections = List.from(regularCollections);
-      _uncategorizedCollection =
-          widget.viewType == UISectionType.homeCollections
-              ? uncategorized
-              : null;
-      _uncategorizedFileCount = uncategorized != null &&
-              widget.viewType == UISectionType.homeCollections
+      _uncategorizedCollection = uncategorized;
+      _uncategorizedFileCount = uncategorized != null
           ? (await CollectionService.instance
                   .getFilesInCollection(uncategorized))
               .length
@@ -155,7 +122,7 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
       child: Scaffold(
         appBar: AppBar(
           leading: buildSearchLeading(),
-          title: Text(_getTitle(context)),
+          title: Text(context.l10n.collections),
           centerTitle: false,
           backgroundColor: Theme.of(context).scaffoldBackgroundColor,
           foregroundColor: Theme.of(context).textTheme.bodyLarge?.color,
@@ -270,11 +237,9 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
               enableSorting: true,
             ),
           ),
-          if (!isSearchActive &&
-              _uncategorizedCollection != null &&
-              showUncategorized)
+          if (!isSearchActive && _uncategorizedCollection != null)
             _buildUncategorizedHook(),
-          if (showTrash) _buildTrashHook(),
+          _buildTrashHook(),
         ],
       ),
     );
@@ -289,9 +254,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.withAlpha(30),
+            color: Theme.of(context).colorScheme.surface.withOpacity(0.3),
             border: Border.all(
-              color: Theme.of(context).dividerColor.withAlpha(50),
+              color: Theme.of(context).dividerColor.withOpacity(0.5),
               width: 0.5,
             ),
             borderRadius: BorderRadius.circular(12.0),
@@ -300,8 +265,11 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
             children: [
               Icon(
                 Icons.delete_outline,
-                color:
-                    Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(70),
+                color: Theme.of(context)
+                    .textTheme
+                    .bodyLarge
+                    ?.color
+                    ?.withOpacity(0.7),
                 size: 22,
               ),
               const SizedBox(width: 12),
@@ -319,7 +287,7 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
                     .textTheme
                     .bodyMedium
                     ?.color
-                    ?.withAlpha(60),
+                    ?.withOpacity(0.6),
                 size: 20,
               ),
             ],
@@ -358,9 +326,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.withAlpha(30),
+            color: Theme.of(context).colorScheme.surface.withOpacity(0.3),
             border: Border.all(
-              color: Theme.of(context).dividerColor.withAlpha(50),
+              color: Theme.of(context).dividerColor.withOpacity(0.5),
               width: 0.5,
             ),
             borderRadius: BorderRadius.circular(12.0),
@@ -369,8 +337,11 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
             children: [
               Icon(
                 Icons.folder_open_outlined,
-                color:
-                    Theme.of(context).textTheme.bodyLarge?.color?.withAlpha(70),
+                color: Theme.of(context)
+                    .textTheme
+                    .bodyLarge
+                    ?.color
+                    ?.withOpacity(0.7),
                 size: 22,
               ),
               const SizedBox(width: 12),
@@ -392,7 +363,7 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
                                   .textTheme
                                   .bodySmall
                                   ?.color
-                                  ?.withAlpha(50),
+                                  ?.withOpacity(0.5),
                             ),
                       ),
                       const SizedBox(width: 8),
@@ -403,7 +374,7 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
                                   .textTheme
                                   .bodySmall
                                   ?.color
-                                  ?.withAlpha(70),
+                                  ?.withOpacity(0.7),
                             ),
                       ),
                     ],
@@ -416,7 +387,7 @@ class _AllCollectionsPageState extends State<AllCollectionsPage>
                     .textTheme
                     .bodyMedium
                     ?.color
-                    ?.withAlpha(60),
+                    ?.withOpacity(0.6),
                 size: 20,
               ),
             ],
@@ -434,15 +405,4 @@ 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,27 +1,17 @@
-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;
@@ -37,16 +27,9 @@ 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() {
@@ -68,9 +51,7 @@ class _CollectionPageState extends UploaderPageState<CollectionPage>
 
   @override
   void onSearchResultsChanged(
-    List<Collection> collections,
-    List<EnteFile> files,
-  ) {
+      List<Collection> collections, List<EnteFile> files,) {
     setState(() {
       _filteredFiles = files;
     });
@@ -85,12 +66,6 @@ class _CollectionPageState extends UploaderPageState<CollectionPage>
     }
   }
 
-  @override
-  void dispose() {
-    _collectionUpdateSubscription.cancel();
-    super.dispose();
-  }
-
   List<EnteFile> get _displayedFiles =>
       isSearchActive ? _filteredFiles : _files;
 
@@ -98,40 +73,14 @@ class _CollectionPageState extends UploaderPageState<CollectionPage>
   void initState() {
     super.initState();
     _initializeData(widget.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');
-      }
+    Bus.instance.on<CollectionsUpdatedEvent>().listen((event) async {
+      final collection = (await CollectionService.instance.getCollections())
+          .where(
+            (c) => c.id == widget.collection.id,
+          )
+          .first;
+      await _initializeData(collection);
     });
-
-    collectionViewType = getCollectionViewType(
-      _collection,
-      Configuration.instance.getUserID()!,
-    );
-
-    showFAB = collectionViewType == CollectionViewType.ownedCollection ||
-        collectionViewType == CollectionViewType.hiddenOwnedCollection ||
-        collectionViewType == CollectionViewType.quickLink;
   }
 
   Future<void> _initializeData(Collection collection) async {
@@ -163,48 +112,6 @@ 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(
@@ -232,14 +139,6 @@ class _CollectionPageState extends UploaderPageState<CollectionPage>
       actions: [
         buildSearchAction(),
         ...buildSearchActions(),
-        IconButton(
-          icon: Icon(
-            Icons.adaptive.share,
-          ),
-          onPressed: () async {
-            await _shareCollection();
-          },
-        ),
         _buildMenuButton(),
       ],
     );
@@ -256,53 +155,33 @@ class _CollectionPageState extends UploaderPageState<CollectionPage>
           case 'delete':
             _deleteCollection();
             break;
-          case 'leave_collection':
-            _leaveCollection();
-            break;
         }
       },
       itemBuilder: (BuildContext context) {
         return [
-          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: '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: '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),
-                ],
-              ),
+          ),
+          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),
+                ),
+              ],
             ),
+          ),
         ];
       },
     );
@@ -387,12 +266,10 @@ class _CollectionPageState extends UploaderPageState<CollectionPage>
   }
 
   Widget _buildFAB() {
-    return showFAB
-        ? FloatingActionButton(
-            onPressed: addFile,
-            tooltip: context.l10n.addFiles,
-            child: const Icon(Icons.add),
-          )
-        : const SizedBox.shrink();
+    return FloatingActionButton(
+      onPressed: addFile,
+      tooltip: context.l10n.addFiles,
+      child: const Icon(Icons.add),
+    );
   }
 }

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,8 +15,6 @@ 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';
@@ -26,6 +24,7 @@ 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 {
@@ -51,13 +50,7 @@ class _HomePageState extends UploaderPageState<HomePage>
   List<Collection> _filteredCollections = [];
   List<EnteFile> _recentFiles = [];
   List<EnteFile> _filteredFiles = [];
-  List<Collection> outgoingCollections = [];
-  List<Collection> incomingCollections = [];
-  List<Collection> quickLinks = [];
-  Map<int, int> _outgoingCollectionFileCounts = {};
-  Map<int, int> _incomingCollectionFileCounts = {};
-  Map<int, int> _homeCollectionFileCounts = {};
-
+  Map<int, int> _collectionFileCounts = {};
   String? _error;
   final _logger = Logger('HomePage');
   StreamSubscription? _mediaStreamSubscription;
@@ -95,17 +88,7 @@ class _HomePageState extends UploaderPageState<HomePage>
   }
 
   List<Collection> get _displayedCollections {
-    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();
-    }
+    final collections = isSearchActive ? _filteredCollections : _collections;
     return _filterOutUncategorized(collections);
   }
 
@@ -285,16 +268,10 @@ 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;
       });
 
@@ -514,26 +491,10 @@ class _HomePageState extends UploaderPageState<HomePage>
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                ..._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,
-                  ),
+                _buildCollectionsHeader(),
+                const SizedBox(height: 24),
+                _buildCollectionsGrid(),
+                const SizedBox(height: 24),
                 _buildRecentsSection(),
               ],
             ),
@@ -596,6 +557,105 @@ 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,
@@ -730,79 +790,22 @@ class _HomePageState extends UploaderPageState<HomePage>
   }
 
   Future<void> _loadCollectionFileCounts() async {
-    final mainCounts = <int, int>{};
-    final outgoingCounts = <int, int>{};
-    final incomingCounts = <int, int>{};
+    final counts = <int, int>{};
 
-    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;
-        }
-      }),
-    ]);
+    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;
+      }
+    }
 
     if (mounted) {
       setState(() {
-        _homeCollectionFileCounts = mainCounts;
-        _outgoingCollectionFileCounts = outgoingCounts;
-        _incomingCollectionFileCounts = incomingCounts;
+        _collectionFileCounts = counts;
       });
     }
   }
-
-  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,7 +4,6 @@ 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";
@@ -12,7 +11,6 @@ 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";
@@ -137,35 +135,6 @@ 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.isDeviceSupported()) {
+          if (await LockScreenSettings.instance.shouldShowLockScreen()) {
             final bool result = await requestAuthentication(
               context,
               context.l10n.authToChangeLockscreenSetting,
@@ -137,17 +137,19 @@ class _SecuritySectionWidgetState extends State<SecuritySectionWidget> {
               );
             }
           } else {
-            await showErrorDialog(
-              context,
-              context.l10n.noSystemLockFound,
-              context.l10n.toEnableAppLockPleaseSetupDevicePasscodeOrScreen,
+            await Navigator.of(context).push(
+              MaterialPageRoute(
+                builder: (BuildContext context) {
+                  return const LockScreenOptions();
+                },
+              ),
             );
           }
         },
       ),
       sectionOptionSpacing,
     ]);
-
+    
     return Column(
       children: children,
     );

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

@@ -1,471 +0,0 @@
-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

@@ -1,310 +0,0 @@
-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

@@ -1,104 +0,0 @@
-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

@@ -1,188 +0,0 @@
-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

@@ -1,353 +0,0 @@
-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

@@ -1,79 +0,0 @@
-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

@@ -1,145 +0,0 @@
-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

@@ -1,168 +0,0 @@
-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

@@ -1,404 +0,0 @@
-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

@@ -1,227 +0,0 @@
-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,24 +1,10 @@
-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/configuration.dart";
+import 'package:locker/services/collections/models/collection.dart';
 import 'package:locker/utils/snack_bar_utils.dart';
 import 'package:logging/logging.dart';
 
@@ -171,336 +157,4 @@ 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: "direct main"
+    dependency: transitive
     description:
       name: bip39
       sha256: de1ee27ebe7d96b84bb3a04a4132a0a3007dcdd5ad27dd14aa87a29d97c45edc
@@ -146,7 +146,7 @@ packages:
     source: hosted
     version: "0.3.4+2"
   crypto:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: crypto
       sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
@@ -202,7 +202,7 @@ packages:
     source: hosted
     version: "2.1.1"
   dotted_border:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: dotted_border
       sha256: "99b091ec6891ba0c5331fdc2b502993c7c108f898995739a73c6845d71dad70c"
@@ -254,13 +254,6 @@ 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:
@@ -282,13 +275,6 @@ 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:
@@ -569,14 +555,6 @@ 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
@@ -628,7 +606,7 @@ packages:
     source: hosted
     version: "0.15.6"
   http:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: http
       sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b"
@@ -660,7 +638,7 @@ packages:
     source: hosted
     version: "4.5.4"
   intl:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: intl
       sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
@@ -955,14 +933,6 @@ 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:
@@ -1321,7 +1291,7 @@ packages:
     source: hosted
     version: "1.4.1"
   styled_text:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: styled_text
       sha256: fd624172cf629751b4f171dd0ecf9acf02a06df3f8a81bb56c0caa4f1df706c3
@@ -1361,7 +1331,7 @@ packages:
     source: hosted
     version: "0.5.0"
   tuple:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: tuple
       sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151
@@ -1464,30 +1434,6 @@ 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:
@@ -1578,4 +1524,4 @@ packages:
     version: "3.1.3"
 sdks:
   dart: ">=3.8.0 <4.0.0"
-  flutter: ">=3.29.0"
+  flutter: ">=3.27.0"

mobile/apps/locker/pubspec.yaml

@@ -8,11 +8,8 @@ environment:
 
 dependencies:
   adaptive_theme: ^3.6.0
-  bip39: ^1.0.6
   collection: ^1.18.0
-  crypto: ^3.0.6
-  dio: ^5.8.0+1 
-  dotted_border: ^3.1.0
+  dio: ^5.8.0+1
   email_validator: ^3.0.0
   ente_accounts:
     path: ../../packages/accounts
@@ -25,23 +22,19 @@ 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
@@ -53,9 +46,8 @@ dependencies:
       url: https://github.com/eaceto/flutter_local_authentication
       ref: 1ac346a04592a05fd75acccf2e01fa3c7e955d96
   flutter_localizations:
-    sdk: flutter 
-  flutter_svg: ^2.2.1
-  intl: ^0.20.2
+    sdk: flutter
+  http: ^1.4.0
   io: ^1.0.5
   listen_sharing_intent: ^1.9.2
   logging: ^1.3.0
@@ -64,12 +56,12 @@ dependencies:
   path: ^1.9.0
   path_provider: ^2.1.5
   shared_preferences: ^2.5.3
-  sqflite: ^2.4.1 
+  sqflite: ^2.4.1
+  styled_text: ^8.1.0
   tray_manager: ^0.5.0
-  tuple: ^2.0.2
   url_launcher: ^6.3.2
-  uuid: ^4.5.1 
-  window_manager: ^0.5.1
+  uuid: ^4.5.1
+  window_manager: ^0.5.0
 
 dev_dependencies:
   flutter_launcher_icons: ^0.14.3
@@ -83,7 +75,6 @@ flutter:
 
   assets:
     - assets/
-    - assets/icons/
 
   fonts:
     - family: Inter

mobile/apps/locker/pubspec_overrides.yaml

@@ -1,4 +1,4 @@
-# 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
+# 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
@@ -8,16 +8,12 @@ dependency_overrides:
     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:

mobile/apps/photos/CLAUDE.md

@@ -2,207 +2,66 @@
 
 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. Format Dart code
-dart format .
-
-# 2. 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
+### Prerequisites
+- Flutter v3.32.8
+- Rust (for Flutter Rust Bridge)
+- Flutter Rust Bridge: `cargo install flutter_rust_bridge_codegen`
 
-# Run Photos app specifically
-melos run:photos:apk
+### Development
+- **Run development build**: `flutter run -t lib/main.dart --flavor independent`
+- **Alternative with env file**: `./run.sh` (uses .env file for configuration)
+- **Generate Rust bindings**: `flutter_rust_bridge_codegen generate`
 
-# Build Photos APK
-melos build:photos:apk
+### Build Commands
+- **Build APK**: `flutter build apk --release --flavor independent`
+- **Build iOS**: `flutter build ios`
+- **iOS setup**: `cd ios && pod install && cd ..`
 
-# Clean Photos app
-melos clean:photos
-```
+### Testing
+- **Run all tests**: `flutter test`
+- **Run specific test**: `flutter test test/path/to/test_file.dart`
+- **Integration tests**: `flutter test integration_test/`
+- **Performance tests**: Use scripts in `scripts/` directory
 
-### Direct Flutter Commands
-```bash
-# Development run with environment variables
-./run.sh                                    # Uses .env file with --flavor dev
+### Code Generation
+- **Generate localization**: Automatically runs with flutter (see l10n.yaml)
+- **Generate launcher icons**: `dart run flutter_launcher_icons`
+- **Generate splash screen**: `dart run flutter_native_splash:create`
 
-# Development run without env file
-flutter run -t lib/main.dart --flavor independent
+## Architecture
 
-# Build release APK
-flutter build apk --release --flavor independent
+### Core Services Structure
+The app follows a service-oriented architecture with dependency injection via `service_locator.dart`:
 
-# iOS build
-cd ios && pod install && cd ..
-flutter build ios
-```
+- **Authentication**: `services/account/` - handles user authentication, billing, passkeys
+- **Sync Services**: `services/sync/` - local and remote file synchronization
+- **Machine Learning**: `services/machine_learning/` - face detection, semantic search, ML models
+- **Collections**: `services/collections_service.dart` - manages photo albums and folders
+- **File Management**: `services/files_service.dart`, `utils/file_uploader.dart`
 
-### Code Quality
-```bash
-# Static analysis and linting
-flutter analyze .
+### Data Layer
+- **Databases**: SQLite with migrations via `sqflite_migration`
+  - `db/files_db.dart` - main file storage
+  - `db/collections_db.dart` - collections and albums
+  - `db/ml/` - ML-related data (embeddings, face data)
+- **Models**: `models/` directory contains data models with freezed for immutables
 
-# Run tests
-flutter test
-```
+### UI Architecture
+- **State Management**: Event-based architecture using `event_bus`
+- **Navigation**: Standard Flutter navigation with named routes
+- **Theming**: Custom theme system in `theme/` and `ente_theme_data.dart`
+- **Main screens**: Located in `ui/` with feature-specific subdirectories
 
-## Architecture Overview
+### Key Features Implementation
+- **End-to-end encryption**: Uses `ente_crypto` plugin with libsodium
+- **Photo upload**: Background upload via `workmanager` and custom uploader
+- **Video playback**: Multiple players (media_kit, video_player, chewie)
+- **Image editing**: `pro_image_editor` and custom video editor
+- **Home widgets**: iOS and Android widgets in `ios/EnteWidget/` and via `home_widget` package
 
-### 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 `dart format .` and `flutter analyze` with zero issues**
-- Run `dart format .` first to format all Dart code
-- 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 both commands pass 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
+### Platform-Specific Code
+- **Android**: Flavors configured in `android/app/build.gradle`
+- **iOS**: Widget extensions in `ios/EnteWidget/`
+- **Rust integration**: FFI bridge in `rust/` directory

mobile/apps/photos/docs/FACES_THROUGH_TIME_DESIGN_V2.md

@@ -0,0 +1,430 @@
+# Faces Through Time - Feature Design Document (Final MVP)
+
+## Executive Summary
+
+"Faces Through Time" is a delightful slideshow feature that automatically displays a person's face photos chronologically across all the years, creating a visual journey of how they've grown and changed. The feature includes simple sharing capabilities to help spread the joy and potentially grow the product organically.
+
+## Core Requirements
+
+### Eligibility Criteria
+
+- **Minimum time span**: 7 consecutive years of photos
+- **Photos per year**: At least 4 faces per year
+- **Face quality**: Minimum face score of 0.85
+- **Age requirement**: All photos must be from after the person turned 5 years old
+- **Total faces**: Minimum 28 faces meeting above criteria
+
+### Display Requirements
+
+- **Faces per year**: Exactly 4 (using quantile selection)
+- **Display duration**: 2 seconds per face
+- **Format**: Single face at a time, full screen
+- **Padding**: Standard 40% padding (use existing face crop logic)
+
+## User Experience Flow
+
+### 1. Progressive Discovery
+
+When user navigates to `PeoplePage`:
+
+```
+1. Background eligibility check (instant, non-blocking)
+2. If eligible → Check if already viewed
+3. If not viewed → Start face selection & thumbnail generation
+4. Generate thumbnails (max 4 concurrent)
+5. When ready → Show banner at top of page
+6. User taps banner → Opens slideshow, mark as viewed
+```
+
+### 2. Banner & Menu Logic
+
+**First Time (Not Viewed)**:
+
+- Show eye-catching banner at top of `PeoplePage`
+- Text: "How [Name] grew over the years"
+- Appears only when all thumbnails are ready
+
+**After First View**:
+
+- No banner shown
+- Add menu option in top-right overflow menu
+- Menu text: "Show face timeline"
+- Clicking menu item opens slideshow directly
+
+### 3. Slideshow Page
+
+**Layout**:
+
+- Full-screen face thumbnail display
+- Age display OR relative time below face:
+  - With DOB (age > 5): "Age 7 years 2 months"
+  - With DOB (current year): "6 months ago"
+  - Without DOB: "8 years ago"
+- Minimal UI overlay
+- Auto-advance every 2 seconds
+
+**Interaction Controls**:
+
+- **Tap center**: Pause/Resume
+- **Tap and hold**: Pause (release to resume)
+- **Tap left side**: Previous face
+- **Tap right side**: Next face
+- **Close button**: Top-left corner
+- **Share button**: Top-right corner
+
+## Face Selection Algorithm
+
+### Simple Quantile Selection
+
+For each eligible year:
+
+1. Get all faces with score ≥ 0.85
+2. Filter out faces where person age ≤ 4 years (if DOB available)
+3. Sort faces by timestamp
+4. Select faces at positions:
+   - 1st percentile (earliest)
+   - 25th percentile
+   - 50th percentile (median)
+   - 75th percentile
+
+This ensures even distribution across the year without complex logic.
+
+## Sharing Feature (MVP)
+
+### Share Flow
+
+1. User taps share button in slideshow
+2. Generate temporary video file:
+   - 1 second per face (faster than slideshow)
+   - Include age/year text overlay
+   - Add subtle Ente watermark
+   - Resolution: 720p (balance quality/size)
+3. Open system share sheet
+4. Clean up temp file after sharing
+
+### Video Generation
+
+```dart
+// Pseudocode for video generation
+final frames = timeline.entries.map((entry) => {
+  'image': faceThumbnail,
+  'text': entry.ageText ?? entry.relativeTimeText,
+  'duration': 1000, // 1 second
+});
+final videoPath = await generateVideo(frames, watermark: true);
+Share.shareFiles([videoPath]);
+```
+
+### Privacy Considerations
+
+- Strip all metadata from video
+- Don't include person's name in video
+- Watermark: "Created with Ente Photos"
+- Temporary file deleted after share
+
+## Technical Implementation
+
+### Caching Strategy
+
+**Cache Structure** (JSON file):
+
+```json
+{
+  "personId": "person_123",
+  "generatedAt": "2024-01-15T10:30:00Z",
+  "faceIds": ["face_1", "face_2", ..., "face_28"],
+  "hasBeenViewed": true,
+  "version": 1
+}
+```
+
+**Cache Implementation** (Similar to `similar_images_service.dart`):
+
+```dart
+Future<String> _getCachePath(String personId) async {
+  final dir = await getApplicationSupportDirectory();
+  return "${dir.path}/cache/faces_timeline_${personId}.json";
+}
+
+Future<void> _cacheTimeline(FaceTimeline timeline) async {
+  final cachePath = await _getCachePath(timeline.personId);
+  await writeToJsonFile(cachePath, timeline.toJson());
+}
+```
+
+**Cache Rules**:
+
+- Cache persists for 1 year
+- Only invalidate if older than 1 year
+- One cache file per person
+- No limit on number of cached persons
+
+### Thumbnail Generation
+
+**Batch Processing**:
+
+```dart
+// Generate thumbnails in batches of 4
+for (int i = 0; i < faceIds.length; i += 4) {
+  final batch = faceIds.skip(i).take(4).toList();
+  final thumbnails = await Future.wait(
+    batch.map((faceId) => generateFaceThumbnail(faceId))
+  );
+  // Store thumbnails
+}
+```
+
+**Use Existing Methods**:
+
+```dart
+// Use standard face cropping from face_thumbnail_cache.dart
+final cropMap = await getCachedFaceCrops(
+  file,
+  faces,
+  useFullFile: true,  // Always use full file for quality
+  useTempCache: false, // Use persistent cache
+);
+```
+
+### View State Tracking
+
+**Storage**:
+
+```dart
+// Simple key-value storage for viewed state
+final viewedKey = "faces_timeline_viewed_${personId}";
+final hasViewed = prefs.getBool(viewedKey) ?? false;
+if (!hasViewed) {
+  // Show banner
+}
+// After viewing:
+await prefs.setBool(viewedKey, true);
+```
+
+## Age Filtering Logic
+
+### When DOB is Available
+
+```dart
+bool isEligibleFace(Face face, DateTime? dob, DateTime photoTime) {
+  if (dob == null) return true;
+
+  final ageAtPhoto = photoTime.difference(dob);
+  final yearsOld = ageAtPhoto.inDays / 365.25;
+
+  // Exclude photos where person was 4 or younger
+  return yearsOld > 4.0;
+}
+```
+
+### Eligibility Check Update
+
+Must have 7 consecutive years where ALL photos are:
+
+- After person turned 5 (if DOB known)
+- Meeting quality threshold (score ≥ 0.85)
+
+## Data Flow Summary
+
+```
+PeoplePage Load
+    ↓
+Check Eligibility (with age filter)
+    ↓
+Check if Viewed
+    ├─→ Not Viewed: Show banner when ready
+    └─→ Viewed: Add menu option
+    ↓
+User Interaction
+    ↓
+Load/Generate Timeline
+    ↓
+Show Slideshow
+    ↓
+Optional: Share as Video
+```
+
+## Implementation Components
+
+### New Files Required
+
+1. **Service**: `faces_through_time_service.dart`
+
+   - Eligibility checking
+   - Face selection logic
+   - Cache management
+
+2. **UI**: `faces_through_time_page.dart`
+
+   - Slideshow display
+   - Auto-advance logic
+   - Age/time display
+
+3. **Widget**: `faces_timeline_banner.dart`
+   - Banner component for PeoplePage
+   - Loading state management
+
+### Database Queries Needed
+
+```dart
+// Get person's photo time span
+Future<int> getPersonPhotoYearSpan(String personId);
+
+// Get high-quality faces with timestamps
+Future<List<FaceWithTimestamp>> getPersonHighQualityFaces(
+  String personId,
+  double minScore,
+);
+```
+
+### Integration Points
+
+1. **PeoplePage** (`people_page.dart`):
+
+   - Add `FacesThroughTimeService` initialization
+   - Add banner widget in header section
+   - Trigger background processing on page load
+
+2. **Face Quality Check**:
+
+   - Use existing `face.score` field
+   - Filter with score >= 0.85
+
+3. **Thumbnail Generation**:
+   - Use existing `getCachedFaceCrops` with `useFullFile: true`
+   - Leverage existing cache system
+
+## Performance Optimizations
+
+### Concurrent Limits
+
+- Max 4 thumbnail generations at once
+- Sequential batch processing
+- Total generation time: ~7-10 seconds for 28 faces
+
+### Memory Management
+
+- Load 5 thumbnails ahead (current + 4)
+- Release thumbnails >5 positions behind
+- Peak memory: ~15MB (5 thumbnails × 3MB)
+
+### Background Processing
+
+- All computation done in background
+- No UI blocking
+- Silent failure (just log errors)
+
+## Edge Cases Handled
+
+### Age-Related
+
+- Person with DOB but some photos before age 5: Filter them out
+- Person without DOB: Use all photos
+- Calculating age: Use precise date math
+
+### UI States
+
+- Banner dismissed accidentally: Access via menu
+- Slideshow interrupted: Resume from beginning
+- Share cancelled: Clean up temp files
+
+### Data Issues
+
+- Missing thumbnails: Skip that face
+- Corrupted cache: Regenerate
+- Face selection fails: Don't show feature
+
+## Success Metrics
+
+### Primary Goals
+
+- Users express delight and share with others
+- Organic growth through shared timelines
+- High completion rate (>80%)
+
+### Tracking (Anonymous)
+
+- Feature discovery rate
+- View completion percentage
+- Share button usage
+- Video shares completed
+
+## Final Specifications
+
+### Constants
+
+```dart
+const kMinYearSpan = 7;
+const kPhotosPerYear = 4;
+const kMinFaceScore = 0.85;
+const kMinAge = 5.0; // years
+const kSlideshowInterval = 2000; // ms
+const kVideoFrameDuration = 1000; // ms
+const kMaxConcurrentThumbnails = 4;
+const kCacheValidityDays = 365;
+const kThumbnailPadding = 0.4; // 40% standard
+```
+
+### Text Strings
+
+```dart
+// Banner
+"How ${person.name} grew over the years"
+
+// Menu option
+"Show face timeline"
+
+// Age display (with DOB)
+"Age ${years} years${months > 0 ? ' ${months} months' : ''}"
+
+// Relative time (without DOB)
+"${years} years ago"
+"${months} months ago"
+"Recently"
+
+// Share watermark
+"Created with Ente Photos"
+```
+
+## Implementation Checklist
+
+### Core Features
+
+- [ ] Eligibility check with age filtering
+- [ ] Quantile-based face selection
+- [ ] JSON caching system
+- [ ] Batch thumbnail generation
+- [ ] View state tracking
+- [ ] Banner display logic
+- [ ] Menu option for viewed timelines
+
+### Slideshow UI
+
+- [ ] Auto-advance timer (2 seconds)
+- [ ] Tap to pause/resume
+- [ ] Tap sides for navigation
+- [ ] Age/time display
+- [ ] Close button
+
+### Sharing Feature
+
+- [ ] Video generation from thumbnails
+- [ ] Text overlay on frames
+- [ ] Watermark addition
+- [ ] System share sheet integration
+- [ ] Temp file cleanup
+
+## Questions Resolved
+
+1. **Face selection**: Quantile approach (1st, 25th, 50th, 75th) ✓
+2. **Banner behavior**: Show once until viewed ✓
+3. **Controls**: Tap to pause, sides to navigate ✓
+4. **Age filtering**: Exclude ≤4 years old ✓
+5. **Face cropping**: Use standard padding ✓
+6. **Cache duration**: 1 year ✓
+7. **Loading**: No indicators, silent generation ✓
+8. **Sharing**: Simple video export ✓
+
+## Ready for Implementation
+
+This design is now complete and ready for implementation. The MVP balances simplicity with user delight, includes viral sharing potential, and leverages existing infrastructure efficiently.

mobile/apps/photos/docs/FACES_THROUGH_TIME_PROGRESS.md

@@ -0,0 +1,58 @@
+# Faces Through Time - Implementation Progress
+
+## Implementation Checklist
+
+### Phase 1: Database & Models
+- [x] Create FaceTimeline model class
+- [x] Create FaceTimelineEntry model class
+- [x] Add getPersonFileIds query to MLDataDB
+- [x] Add getPersonFacesWithScores query to MLDataDB
+- [ ] Test database queries
+
+### Phase 2: Core Service
+- [x] Create FacesThroughTimeService class
+- [x] Implement eligibility checking logic
+- [x] Implement quantile-based face selection
+- [x] Implement JSON caching mechanism
+- [x] Add view state tracking with SharedPreferences
+
+### Phase 3: Thumbnail Generation
+- [ ] Integrate with existing face thumbnail cache
+- [ ] Implement batch processing (4 at a time)
+- [ ] Add memory management for thumbnails
+- [ ] Test thumbnail generation
+
+### Phase 4: UI Components
+- [x] Create FacesTimelineBanner widget
+- [x] Create FacesThroughTimePage (slideshow)
+- [x] Implement auto-advance timer (2 seconds)
+- [x] Add tap controls (pause/resume/navigate)
+- [x] Add age/time display logic
+
+### Phase 5: Integration
+- [x] Create FacesTimelineReadyEvent
+- [x] Integrate with PeoplePage
+- [x] Add banner display logic
+- [ ] Add menu option for viewed timelines
+- [x] Test end-to-end flow
+
+### Phase 6: Video Generation
+- [ ] Create FacesThroughTimeVideoService
+- [ ] Implement FFmpeg video generation
+- [ ] Add text overlays for age/time
+- [ ] Add Ente watermark
+- [ ] Integrate with system share sheet
+
+### Phase 7: Testing & Polish
+- [ ] Test eligibility with various photo counts
+- [ ] Verify age filtering (exclude ≤4 years)
+- [ ] Test video generation and sharing
+- [ ] Performance optimization
+- [ ] Error handling for edge cases
+
+## Current Status
+Starting implementation...
+
+## Notes
+- Following design doc: FACES_THROUGH_TIME_DESIGN_V2.md
+- Following implementation guide: FACES_THROUGH_TIME_IMPLEMENTATION_COMPLETE.md

mobile/apps/photos/ios/Podfile.lock

@@ -312,7 +312,7 @@ DEPENDENCIES:
   - workmanager (from `.symlinks/plugins/workmanager/ios`)
 
 SPEC REPOS:
-  https://github.com/ente-io/ffmpeg-kit-custom-repo-ios.git:
+  https://github.com/ente-io/ffmpeg-kit-custom-repo-ios:
     - ffmpeg_kit_custom
   trunk:
     - Firebase
@@ -457,85 +457,85 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/workmanager/ios"
 
 SPEC CHECKSUMS:
-  app_links: f3e17e4ee5e357b39d8b95290a9b2c299fca71c6
-  battery_info: b6c551049266af31556b93c9d9b9452cfec0219f
-  connectivity_plus: 2a701ffec2c0ae28a48cf7540e279787e77c447d
-  cupertino_http: 947a233f40cfea55167a49f2facc18434ea117ba
-  dart_ui_isolate: d5bcda83ca4b04f129d70eb90110b7a567aece14
-  device_info_plus: bf2e3232933866d73fe290f2942f2156cdd10342
-  emoji_picker_flutter: fe2e6151c5b548e975d546e6eeb567daf0962a58
+  app_links: 76b66b60cc809390ca1ad69bfd66b998d2387ac7
+  battery_info: 83f3aae7be2fccefab1d2bf06b8aa96f11c8bcdd
+  connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
+  cupertino_http: 94ac07f5ff090b8effa6c5e2c47871d48ab7c86c
+  dart_ui_isolate: 46f6714abe6891313267153ef6f9748d8ecfcab1
+  device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
+  emoji_picker_flutter: ed468d9746c21711e66b2788880519a9de5de211
   ffmpeg_kit_custom: 682b4f2f1ff1f8abae5a92f6c3540f2441d5be99
-  ffmpeg_kit_flutter: 9dce4803991478c78c6fb9f972703301101095fe
-  file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808
+  ffmpeg_kit_flutter: 915b345acc97d4142e8a9a8549d177ff10f043f5
+  file_saver: 6cdbcddd690cb02b0c1a0c225b37cd805c2bf8b6
   Firebase: d99ac19b909cd2c548339c2241ecd0d1599ab02e
-  firebase_core: cf4d42a8ac915e51c0c2dc103442f3036d941a2d
-  firebase_messaging: fee490327c1aae28a0da1e65fca856547deca493
+  firebase_core: ece862f94b2bc72ee0edbeec7ab5c7cb09fe1ab5
+  firebase_messaging: e1a5fae495603115be1d0183bc849da748734e2b
   FirebaseCore: efb3893e5b94f32b86e331e3bd6dadf18b66568e
   FirebaseCoreInternal: 9afa45b1159304c963da48addb78275ef701c6b4
   FirebaseInstallations: 317270fec08a5d418fdbc8429282238cab3ac843
   FirebaseMessaging: 3b26e2cee503815e01c3701236b020aa9b576f09
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_email_sender: e03bdda7637bcd3539bfe718fddd980e9508efaa
-  flutter_image_compress_common: ec1d45c362c9d30a3f6a0426c297f47c52007e3e
-  flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
-  flutter_local_notifications: ff50f8405aaa0ccdc7dcfb9022ca192e8ad9688f
-  flutter_native_splash: df59bb2e1421aa0282cb2e95618af4dcb0c56c29
-  flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
-  flutter_sodium: a00383520fc689c688b66fd3092984174712493e
-  flutter_timezone: ac3da59ac941ff1c98a2e1f0293420e020120282
-  fluttertoast: 21eecd6935e7064cc1fcb733a4c5a428f3f24f0f
+  flutter_email_sender: aa1e9772696691d02cd91fea829856c11efb8e58
+  flutter_image_compress_common: 1697a328fd72bfb335507c6bca1a65fa5ad87df1
+  flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
+  flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb
+  flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
+  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
+  flutter_sodium: 7e4621538491834eba53bd524547854bcbbd6987
+  flutter_timezone: 7c838e17ffd4645d261e87037e5bebf6d38fe544
+  fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
-  home_widget: 0434835a4c9a75704264feff6be17ea40e0f0d57
-  in_app_purchase_storekit: a1ce04056e23eecc666b086040239da7619cd783
-  integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
-  launcher_icon_switcher: 8e0ad2131a20c51c1dd939896ee32e70cd845b37
+  home_widget: f169fc41fd807b4d46ab6615dc44d62adbf9f64f
+  in_app_purchase_storekit: d1a48cb0f8b29dbf5f85f782f5dd79b21b90a5e6
+  integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
+  launcher_icon_switcher: 84c218d233505aa7d8655d8fa61a3ba802c022da
   libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
-  local_auth_ios: 5046a18c018dd973247a0564496c8898dbb5adf9
+  local_auth_ios: f7a1841beef3151d140a967c2e46f30637cdf451
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
-  maps_launcher: 2e5b6a2d664ec6c27f82ffa81b74228d770ab203
-  media_extension: 6618f07abd762cdbfaadf1b0c56a287e820f0c84
-  media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
-  media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
-  motion_sensors: 03f55b7c637a7e365a0b5f9697a449f9059d5d91
-  motionphoto: 8b65ce50c7d7ff3c767534fc3768b2eed9ac24e4
-  move_to_background: cd3091014529ec7829e342ad2d75c0a11f4378a5
+  maps_launcher: edf829809ba9e894d70e569bab11c16352dedb45
+  media_extension: 671e2567880d96c95c65c9a82ccceed8f2e309fd
+  media_kit_libs_ios_video: 5a18affdb97d1f5d466dc79988b13eff6c5e2854
+  media_kit_video: 1746e198cb697d1ffb734b1d05ec429d1fcd1474
+  motion_sensors: 741e702c17467b9569a92165dda8d4d88c6167f1
+  motionphoto: 23e2aeb5c6380112f69468d71f970fa7438e5ed1
+  move_to_background: 7e3467dd2a1d1013e98c9c1cb93fd53cd7ef9d84
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
-  native_video_player: 29ab24a926804ac8c4a57eb6d744c7d927c2bc3e
-  objective_c: 77e887b5ba1827970907e10e832eec1683f3431d
-  onnxruntime: e7c2ae44385191eaad5ae64c935a72debaddc997
+  native_video_player: 6809dec117e8997161dbfb42a6f90d6df71a504d
+  objective_c: 89e720c30d716b036faf9c9684022048eee1eee2
+  onnxruntime: f9b296392c96c42882be020a59dbeac6310d81b2
   onnxruntime-c: a909204639a1f035f575127ac406f781ac797c9c
   onnxruntime-objc: b6fab0f1787aa6f7190c2013f03037df4718bd8b
-  open_mail_app: 70273c53f768beefdafbe310c3d9086e4da3cb02
+  open_mail_app: 7314a609e88eed22d53671279e189af7a0ab0f11
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
-  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
-  photo_manager: 81954a1bf804b6e882d0453b3b6bc7fad7b47d3d
-  privacy_screen: 1a131c052ceb3c3659934b003b0d397c2381a24e
+  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
+  photo_manager: 1d80ae07a89a67dfbcae95953a1e5a24af7c3e62
+  privacy_screen: 3159a541f5d3a31bea916cfd4e58f9dc722b3fd4
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  receive_sharing_intent: 79c848f5b045674ad60b9fea3bafea59962ad2c1
-  rive_common: 4743dbfd2911c99066547a3c6454681e0fa907df
-  rust_lib_photos: 8813b31af48ff02ca75520cbc81a363a13d51a84
+  receive_sharing_intent: 222384f00ffe7e952bbfabaa9e3967cb87e5fe00
+  rive_common: dd421daaf9ae69f0125aa761dd96abd278399952
+  rust_lib_photos: 04d3901908d2972192944083310b65abf410774c
   SDWebImage: f29024626962457f3470184232766516dee8dfea
   SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
   Sentry: da60d980b197a46db0b35ea12cb8f39af48d8854
-  sentry_flutter: 2df8b0aab7e4aba81261c230cbea31c82a62dd1b
-  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
+  sentry_flutter: 27892878729f42701297c628eb90e7c6529f3684
+  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
   sqlite3: 1d85290c3321153511f6e900ede7a1608718bbd5
-  sqlite3_flutter_libs: 2c48c4ee7217fd653251975e43412250d5bcbbe2
-  system_info_plus: 5393c8da281d899950d751713575fbf91c7709aa
-  thermal: a9261044101ae8f532fa29cab4e8270b51b3f55c
-  ua_client_hints: aeabd123262c087f0ce151ef96fa3ab77bfc8b38
-  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
-  vibration: 7d883d141656a1c1a6d8d238616b2042a51a1241
-  video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
-  video_thumbnail: c4e2a3c539e247d4de13cd545344fd2d26ffafd1
-  volume_controller: 2e3de73d6e7e81a0067310d17fb70f2f86d71ac7
-  wakelock_plus: 76957ab028e12bfa4e66813c99e46637f367fc7e
-  workmanager: 05afacf221f5086e18450250dce57f59bb23e6b0
+  sqlite3_flutter_libs: e7fc8c9ea2200ff3271f08f127842131746b70e2
+  system_info_plus: 555ce7047fbbf29154726db942ae785c29211740
+  thermal: d4c48be750d1ddbab36b0e2dcb2471531bc8df41
+  ua_client_hints: 92fe0d139619b73ec9fcb46cc7e079a26178f586
+  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
+  vibration: 8e2f50fc35bb736f9eecb7dd9f7047fbb6a6e888
+  video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
+  video_thumbnail: b637e0ad5f588ca9945f6e2c927f73a69a661140
+  volume_controller: 3657a1f65bedb98fa41ff7dc5793537919f31b12
+  wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556
+  workmanager: b89e4e4445d8b57ee2fdbf1c3925696ebe5b8990
 
 PODFILE CHECKSUM: cce2cd3351d3488dca65b151118552b680e23635
 

mobile/apps/photos/ios/ci_scripts/ci_post_clone.sh

@@ -1,45 +0,0 @@
-#!/bin/sh
-
-# ci_post_clone.sh
-# This script runs after the repository is cloned
-
-set -e
-
-echo "🚀 Starting post-clone setup..."
-
-# Navigate to the Flutter project root
-cd ../../  # Adjust path based on your structure
-
-# Install Flutter
-echo "📦 Installing Flutter..."
-FLUTTER_VERSION="3.32.8"
-git clone https://github.com/flutter/flutter.git --branch $FLUTTER_VERSION --depth 1 $HOME/flutter
-export PATH="$PATH:$HOME/flutter/bin"
-
-# Verify Flutter installation
-flutter --version
-flutter doctor -v
-
-# Install Rust (required for Flutter Rust Bridge)
-echo "🦀 Installing Rust..."
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-source $HOME/.cargo/env
-export PATH="$HOME/.cargo/bin:$PATH"
-
-# Install Flutter Rust Bridge
-echo "🌉 Installing Flutter Rust Bridge..."
-cargo install flutter_rust_bridge_codegen
-
-# Generate Rust bindings
-echo "⚙️ Generating Rust bindings..."
-flutter_rust_bridge_codegen generate
-
-# Get Flutter dependencies
-echo "📚 Getting Flutter dependencies..."
-flutter pub get
-
-# Generate iOS podfile if needed
-cd ios
-pod install --repo-update
-
-echo "✅ Post-clone setup completed!"

mobile/apps/photos/ios/ci_scripts/ci_pre_xcodebuild.sh

@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# ci_pre_xcodebuild.sh
-# This script runs before xcodebuild
-
-set -e
-
-echo "🔧 Pre-build setup starting..."
-
-# Set up environment
-export PATH="$PATH:$HOME/flutter/bin"
-export PATH="$HOME/.cargo/bin:$PATH"
-source $HOME/.cargo/env || true
-
-# Navigate to Flutter project root
-cd ../../../
-
-# Build Flutter iOS framework
-echo "🏗️ Building Flutter framework..."
-flutter build ios-framework --no-debug --no-profile
-
-# Run any code generation if needed
-flutter pub run build_runner build --delete-conflicting-outputs || true
-
-echo "✅ Pre-build setup completed!"

mobile/apps/photos/ios/xcode-cloud.json

@@ -1,10 +0,0 @@
-{
-  "configurations": [
-    {
-      "name": "Release Build",
-      "scheme": "Runner",
-      "archive_configuration": "Release",
-      "destination": "generic/platform=iOS"
-    }
-  ]
-}

mobile/apps/photos/lib/db/ml/clip_vector_db.dart

@@ -39,26 +39,10 @@ class ClipVectorDB {
     final documentsDirectory = await getApplicationDocumentsDirectory();
     final String dbPath = join(documentsDirectory.path, _databaseName);
     _logger.info("Opening vectorDB access: DB path " + dbPath);
-    late VectorDb vectorDB;
-    try {
-      vectorDB = VectorDb(
-        filePath: dbPath,
-        dimensions: _embeddingDimension,
-      );
-    } catch (e, s) {
-      _logger.severe("Could not open VectorDB at path $dbPath", e, s);
-      _logger.severe("Deleting the index file and trying again");
-      await deleteIndexFile();
-      try {
-        vectorDB = VectorDb(
-          filePath: dbPath,
-          dimensions: _embeddingDimension,
-        );
-      } catch (e, s) {
-        _logger.severe("Still can't open VectorDB at path $dbPath", e, s);
-        rethrow;
-      }
-    }
+    final vectorDB = VectorDb(
+      filePath: dbPath,
+      dimensions: _embeddingDimension,
+    );
     final stats = await getIndexStats(vectorDB);
     _logger.info("VectorDB connection opened with stats: ${stats.toString()}");
 

mobile/apps/photos/lib/db/ml/db.dart

@@ -1505,4 +1505,52 @@ class MLDataDB with SqlDbBase implements IMLDataDB<int> {
     final List<Object?> params = [personOrClusterID];
     await db.execute(sql, params);
   }
+
+  // Faces Through Time feature queries
+  // Note: These methods need to be used in conjunction with FilesDB
+  // to get creation_time information, as that's stored in a different database
+  Future<List<int>> getPersonFileIds(String personId) async {
+    final db = await instance.asyncDB;
+    final result = await db.getAll(
+      '''
+        SELECT DISTINCT fc.$fileIDColumn
+        FROM $facesTable fc
+        JOIN $faceClustersTable fcluster ON fc.$faceIDColumn = fcluster.$faceIDColumn
+        JOIN $clusterPersonTable cp ON fcluster.$clusterIDColumn = cp.$clusterIDColumn
+        WHERE cp.$personIdColumn = ?
+      ''',
+      [personId],
+    );
+    return result.map((row) => row[fileIDColumn] as int).toList();
+  }
+
+  Future<List<Map<String, dynamic>>> getPersonFacesWithScores(
+    String personId,
+    double minScore,
+  ) async {
+    final db = await instance.asyncDB;
+    final results = await db.getAll(
+      '''
+        SELECT 
+          fc.$faceIDColumn as faceId,
+          fc.$fileIDColumn as fileId,
+          fc.$faceScore as score,
+          fc.$faceBlur as blur
+        FROM $facesTable fc
+        JOIN $faceClustersTable fcluster ON fc.$faceIDColumn = fcluster.$faceIDColumn
+        JOIN $clusterPersonTable cp ON fcluster.$clusterIDColumn = cp.$clusterIDColumn
+        WHERE cp.$personIdColumn = ? AND fc.$faceScore >= ?
+      ''',
+      [personId, minScore],
+    );
+    
+    return results.map((row) {
+      return {
+        'faceId': row['faceId'],
+        'fileId': row['fileId'],
+        'score': row['score'],
+        'blur': row['blur'],
+      };
+    }).toList();
+  }
 }

mobile/apps/photos/lib/ente_theme_data.dart

@@ -228,7 +228,7 @@ extension CustomColorScheme on ColorScheme {
   Color get videoPlayerPrimaryColor => brightness == Brightness.light
       ? const Color.fromRGBO(0, 179, 60, 1)
       : const Color.fromRGBO(1, 222, 77, 1);
-
+      
   Color get videoPlayerBorderColor => brightness == Brightness.light
       ? const Color(0xFF424242)
       : const Color(0xFFFFFFFF);

mobile/apps/photos/lib/events/create_new_album_event.dart

@@ -5,4 +5,4 @@ class CreateNewAlbumEvent extends Event {
   final Collection collection;
 
   CreateNewAlbumEvent(this.collection);
-}
+}

mobile/apps/photos/lib/events/faces_timeline_ready_event.dart

@@ -0,0 +1,5 @@
+class FacesTimelineReadyEvent {
+  final String personId;
+
+  FacesTimelineReadyEvent(this.personId);
+}

mobile/apps/photos/lib/l10n/intl_de.arb

@@ -1927,8 +1927,8 @@
   "hoorayyyy": "Hurraaaa!",
   "nothingToTidyUpHere": "Hier gibt es nichts zu bereinigen",
   "cLTitle1": "Ähnliche Bilder",
-  "cLDesc1": "Wir führen ein neues ML-basiertes System ein, um ähnliche Bilder zu erkennen, mit dem du deine Bibliothek bereinigen kannst. Verfügbar unter Einstellungen -> Sicherung -> Speicherplatz freigeben",
-  "cLTitle2": "Video-Streaming-Verbesserungen",
+  "cLDesc1": "Wir führen ein neues ML-basiertes System ein, um ähnliche Bilder zu erkennen, mit dem du deine Bibliothek bereinigen kannst. Verfügbar unter Einstellungen->Sicherung->Speicherplatz freigeben",
+  "cLTitle2": "Manuelle Video-Stream-Generierung",
   "cLDesc2": "Du kannst jetzt die Stream-Generierung für Videos direkt aus der App manuell auslösen. Wir haben auch einen neuen Video-Streaming-Einstellungsbildschirm hinzugefügt, der dir zeigt, welcher Prozentsatz deiner Videos für das Streaming verarbeitet wurde",
   "cLTitle3": "Leistungsverbesserungen",
   "cLDesc3": "Mehrere Verbesserungen im Hintergrund, einschließlich besserer Cache-Nutzung und einer flüssigeren Scroll-Erfahrung"

mobile/apps/photos/lib/l10n/intl_en.arb

@@ -1932,10 +1932,10 @@
   "hoorayyyy": "Hoorayyyy!",
   "nothingToTidyUpHere": "Nothing to tidy up here",
   "deletingDash": "Deleting - ",
-  "cLTitle1": "Similar images",
-  "cLDesc1": "We are introducing a new ML-based system to detect similar images, using which you can cleanup your library. Available in Settings -> Backup -> Free up space",
-  "cLTitle2": "Video streaming enhancements",
+  "cLTitle1": "Similar Images",
+  "cLDesc1": "We are introducing a new ML-based system to detect similar images, using which you can cleanup your library. Available in Settings->Backup->Free Up Space",
+  "cLTitle2": "Manual video stream generation",
   "cLDesc2": "You can now manually trigger stream generation for videos directly from the app. We have also added a new video streaming settings screen which will show you what percentage of your videos have been processed for streaming",
-  "cLTitle3": "Performance improvements",
+  "cLTitle3": "Performance Improvements",
   "cLDesc3": "Multiple under the hood improvements, including better cache usage and a smoother scroll experience"
 }

mobile/apps/photos/lib/l10n/intl_es.arb

@@ -1926,10 +1926,10 @@
   "related": "Relacionado",
   "hoorayyyy": "¡Hurraaaa!",
   "nothingToTidyUpHere": "Nada que limpiar aquí",
-  "cLTitle1": "Imágenes similares",
-  "cLDesc1": "Estamos introduciendo un nuevo sistema basado en ML para detectar imágenes similares, con el cual puedes limpiar tu biblioteca. Disponible en Configuración -> Copia de seguridad -> Liberar espacio",
-  "cLTitle2": "Mejoras de transmisión de video",
+  "cLTitle1": "Imágenes Similares",
+  "cLDesc1": "Estamos introduciendo un nuevo sistema basado en ML para detectar imágenes similares, con el cual puedes limpiar tu biblioteca. Disponible en Configuración->Copia de Seguridad->Liberar Espacio",
+  "cLTitle2": "Generación manual de transmisión de video",
   "cLDesc2": "Ahora puedes activar manualmente la generación de transmisión para videos directamente desde la aplicación. También hemos agregado una nueva pantalla de configuración de transmisión de video que te mostrará qué porcentaje de tus videos han sido procesados para transmisión",
-  "cLTitle3": "Mejoras de rendimiento",
+  "cLTitle3": "Mejoras de Rendimiento",
   "cLDesc3": "Múltiples mejoras internas, incluyendo mejor uso de caché y una experiencia de desplazamiento más fluida"
 }

mobile/apps/photos/lib/l10n/intl_fr.arb

@@ -1918,10 +1918,10 @@
   "related": "Liés",
   "hoorayyyy": "Houraaa !",
   "nothingToTidyUpHere": "Rien à nettoyer ici",
-  "cLTitle1": "Images similaires",
-  "cLDesc1": "Nous introduisons un nouveau système basé sur l'IA pour détecter les images similaires, avec lequel vous pouvez nettoyer votre bibliothèque. Disponible dans Paramètres -> Sauvegarde -> Libérer de l'espace",
-  "cLTitle2": "Améliorations de la diffusion vidéo",
-  "cLDesc2": "Vous pouvez maintenant déclencher manuellement la génération de flux pour les vidéos directement depuis l'application. Nous avons également ajouté un nouvel écran de paramètres de diffusion vidéo qui vous montrera quel pourcentage de vos vidéos ont été traitées pour la diffusion",
-  "cLTitle3": "Améliorations des performances",
+  "cLTitle1": "Images Similaires",
+  "cLDesc1": "Nous introduisons un nouveau système basé sur l'IA pour détecter les images similaires, avec lequel vous pouvez nettoyer votre bibliothèque. Disponible dans Paramètres->Sauvegarde->Libérer de l'espace",
+  "cLTitle2": "Génération manuelle de flux vidéo",
+  "cLDesc2": "Vous pouvez maintenant déclencher manuellement la génération de flux pour les vidéos directement depuis l'application. Nous avons également ajouté un nouvel écran de paramètres de streaming vidéo qui vous montrera quel pourcentage de vos vidéos ont été traitées pour le streaming",
+  "cLTitle3": "Améliorations de performance",
   "cLDesc3": "Plusieurs améliorations internes, incluant une meilleure utilisation du cache et une expérience de défilement plus fluide"
 }

mobile/apps/photos/lib/l10n/intl_it.arb

@@ -1746,10 +1746,10 @@
   "receiveRemindersOnBirthdays": "Ricevi promemoria quando è il compleanno di qualcuno. Toccare la notifica ti porterà alle foto della persona che compie gli anni.",
   "happyBirthday": "Buon compleanno! 🥳",
   "birthdays": "Compleanni",
-  "cLTitle1": "Immagini simili",
-  "cLDesc1": "Stiamo introducendo un nuovo sistema basato su ML per rilevare immagini simili, con il quale puoi pulire la tua libreria. Disponibile in Impostazioni -> Backup -> Libera spazio",
-  "cLTitle2": "Miglioramenti streaming video",
+  "cLTitle1": "Immagini Simili",
+  "cLDesc1": "Stiamo introducendo un nuovo sistema basato su ML per rilevare immagini simili, con il quale puoi pulire la tua libreria. Disponibile in Impostazioni->Backup->Libera Spazio",
+  "cLTitle2": "Generazione manuale stream video",
   "cLDesc2": "Ora puoi attivare manualmente la generazione di stream per i video direttamente dall'app. Abbiamo anche aggiunto una nuova schermata delle impostazioni di streaming video che ti mostrerà quale percentuale dei tuoi video è stata elaborata per lo streaming",
-  "cLTitle3": "Miglioramenti delle prestazioni",
+  "cLTitle3": "Miglioramenti delle Prestazioni",
   "cLDesc3": "Multipli miglioramenti interni, incluso un miglior utilizzo della cache e un'esperienza di scorrimento più fluida"
 }

mobile/apps/photos/lib/l10n/intl_ja.arb

@@ -1667,9 +1667,9 @@
   "food": "料理を楽しむ",
   "pets": "毛むくじゃらな仲間たち",
   "cLTitle1": "類似画像",
-  "cLDesc1": "類似画像を検出する新しいML基盤システムを導入し、ライブラリをクリーンアップできます。設定 -> バックアップ -> 容量を空ける で利用可能",
-  "cLTitle2": "動画ストリーミングの強化",
-  "cLDesc2": "アプリから直接、動画のストリーム生成を手動でトリガーできるようになりました。また、動画のうち何パーセントがストリーミング用に処理されたかを表示する新しい動画ストリーミング設定画面も追加しました",
+  "cLDesc1": "類似画像を検出する新しいML基盤システムを導入し、ライブラリをクリーンアップできます。設定->バックアップ->容量を空けるで利用可能",
+  "cLTitle2": "手動ビデオストリーム生成",
+  "cLDesc2": "アプリから直接、ビデオのストリーム生成を手動でトリガーできるようになりました。また、ビデオのうち何パーセントがストリーミング用に処理されたかを表示する新しいビデオストリーミング設定画面も追加しました",
   "cLTitle3": "パフォーマンスの改善",
   "cLDesc3": "より良いキャッシュ使用とよりスムーズなスクロール体験を含む、複数の内部改善"
 }

mobile/apps/photos/lib/l10n/intl_nl.arb

@@ -1773,10 +1773,10 @@
   "areYouSureYouWantToMergeThem": "Weet je zeker dat je ze wilt samenvoegen?",
   "allUnnamedGroupsWillBeMergedIntoTheSelectedPerson": "Alle naamloze groepen worden samengevoegd met de geselecteerde persoon. Dit kan nog steeds ongedaan worden gemaakt vanuit het geschiedenisoverzicht van de persoon.",
   "yesIgnore": "Ja, negeer",
-  "cLTitle1": "Vergelijkbare afbeeldingen",
-  "cLDesc1": "We introduceren een nieuw ML-gebaseerd systeem om vergelijkbare afbeeldingen te detecteren, waarmee je je bibliotheek kunt opschonen. Beschikbaar in Instellingen -> Backup -> Ruimte vrijmaken",
-  "cLTitle2": "Video streaming verbeteringen",
+  "cLTitle1": "Vergelijkbare Afbeeldingen",
+  "cLDesc1": "We introduceren een nieuw ML-gebaseerd systeem om vergelijkbare afbeeldingen te detecteren, waarmee je je bibliotheek kunt opschonen. Beschikbaar in Instellingen->Backup->Ruimte vrijmaken",
+  "cLTitle2": "Handmatige video stream generatie",
   "cLDesc2": "Je kunt nu handmatig stream generatie voor video's activeren direct vanuit de app. We hebben ook een nieuw video streaming instellingenscherm toegevoegd dat toont welk percentage van je video's is verwerkt voor streaming",
-  "cLTitle3": "Prestatieverbeteringen",
+  "cLTitle3": "Prestatie Verbeteringen",
   "cLDesc3": "Meerdere verbeteringen onder de motorkap, inclusief beter cache gebruik en een vloeiendere scroll ervaring"
 }

mobile/apps/photos/lib/l10n/intl_no.arb

@@ -1737,10 +1737,10 @@
   "memoriesWidgetDesc": "Velg typen minner du ønsker å se på din hjemskjerm.",
   "smartMemories": "Smarte minner",
   "pastYearsMemories": "Tidligere års minner",
-  "cLTitle1": "Lignende bilder",
-  "cLDesc1": "Vi introduserer et nytt ML-basert system for å oppdage lignende bilder, som du kan bruke til å rydde opp i biblioteket ditt. Tilgjengelig i Innstillinger -> Sikkerhetskopi -> Frigjør plass",
-  "cLTitle2": "Video streaming forbedringer",
+  "cLTitle1": "Lignende Bilder",
+  "cLDesc1": "Vi introduserer et nytt ML-basert system for å oppdage lignende bilder, som du kan bruke til å rydde opp i biblioteket ditt. Tilgjengelig i Innstillinger->Sikkerhetskopi->Frigjør plass",
+  "cLTitle2": "Manuell video stream generering",
   "cLDesc2": "Du kan nå manuelt utløse stream generering for videoer direkte fra appen. Vi har også lagt til en ny video streaming innstillinger skjerm som viser deg hvor mange prosent av videoene dine som er behandlet for streaming",
-  "cLTitle3": "Ytelsesforbedringer",
+  "cLTitle3": "Ytelsesforbedringar",
   "cLDesc3": "Flere forbedringer under panseret, inkludert bedre cache bruk og en jevnere rullingsopplevelse"
 }

mobile/apps/photos/lib/l10n/intl_pl.arb

@@ -1820,10 +1820,10 @@
       }
     }
   },
-  "cLTitle1": "Podobne obrazy",
+  "cLTitle1": "Podobne Obrazy",
   "cLDesc1": "Wprowadzamy nowy system oparty na ML do wykrywania podobnych obrazów, za pomocą którego możesz posprzątać swoją bibliotekę. Dostępne w Ustawienia->Kopia zapasowa->Zwolnij miejsce",
-  "cLTitle2": "Ulepszenia streamingu wideo",
+  "cLTitle2": "Ręczne generowanie strumienia wideo",
   "cLDesc2": "Możesz teraz ręcznie wyzwolić generowanie strumienia dla filmów bezpośrednio z aplikacji. Dodaliśmy również nowy ekran ustawień streamingu wideo, który pokaże ci, jaki procent twoich filmów zostało przetworzonych do streamingu",
-  "cLTitle3": "Ulepszenia wydajności",
+  "cLTitle3": "Ulepszenia Wydajności",
   "cLDesc3": "Liczne ulepszenia pod maską, w tym lepsze wykorzystanie pamięci podręcznej i płynniejsze przewijanie"
 }

mobile/apps/photos/lib/l10n/intl_pt_BR.arb

@@ -1820,10 +1820,10 @@
       }
     }
   },
-  "cLTitle1": "Imagens similares",
-  "cLDesc1": "Estamos introduzindo um novo sistema baseado em ML para detectar imagens similares, com o qual você pode limpar sua biblioteca. Disponível em Configurações -> Backup -> Liberar espaço",
-  "cLTitle2": "Melhorias do streaming de vídeo",
+  "cLTitle1": "Imagens Similares",
+  "cLDesc1": "Estamos introduzindo um novo sistema baseado em ML para detectar imagens similares, com o qual você pode limpar sua biblioteca. Disponível em Configurações->Backup->Liberar Espaço",
+  "cLTitle2": "Geração manual de stream de vídeo",
   "cLDesc2": "Agora você pode acionar manualmente a geração de stream para vídeos diretamente do aplicativo. Também adicionamos uma nova tela de configurações de streaming de vídeo que mostrará qual porcentagem dos seus vídeos foram processados para streaming",
-  "cLTitle3": "Melhorias de desempenho",
+  "cLTitle3": "Melhorias de Performance",
   "cLDesc3": "Múltiplas melhorias internas, incluindo melhor uso de cache e uma experiência de rolagem mais suave"
 }

mobile/apps/photos/lib/l10n/intl_pt_PT.arb

@@ -1820,10 +1820,10 @@
       }
     }
   },
-  "cLTitle1": "Imagens similares",
-  "cLDesc1": "Estamos a introduzir um novo sistema baseado em ML para detectar imagens similares, com o qual pode limpar a sua biblioteca. Disponível em Definições -> Cópia de segurança -> Libertar espaço",
-  "cLTitle2": "Melhorias do streaming de vídeo",
+  "cLTitle1": "Imagens Similares",
+  "cLDesc1": "Estamos a introduzir um novo sistema baseado em ML para detectar imagens similares, com o qual pode limpar a sua biblioteca. Disponível em Definições->Cópia de Segurança->Libertar Espaço",
+  "cLTitle2": "Geração manual de stream de vídeo",
   "cLDesc2": "Agora pode accionar manualmente a geração de stream para vídeos directamente da aplicação. Também adicionámos um novo ecrã de definições de streaming de vídeo que mostrará que percentagem dos seus vídeos foram processados para streaming",
-  "cLTitle3": "Melhorias de desempenho",
+  "cLTitle3": "Melhorias de Performance",
   "cLDesc3": "Múltiplas melhorias internas, incluindo melhor uso de cache e uma experiência de deslocação mais suave"
 }

mobile/apps/photos/lib/l10n/intl_ro.arb

@@ -1522,9 +1522,9 @@
   "joinAlbumSubtext": "pentru a vedea și a adăuga fotografii",
   "joinAlbumSubtextViewer": "pentru a adăuga la albumele distribuite",
   "join": "Alăturare",
-  "cLTitle1": "Imagini similare",
+  "cLTitle1": "Imagini Similare",
   "cLDesc1": "Introducem un nou sistem bazat pe ML pentru detectarea imaginilor similare, cu care vă puteți curăța biblioteca. Disponibil în Setări->Backup->Eliberați Spațiu",
-  "cLTitle2": "Îmbunătățiri streaming video",
+  "cLTitle2": "Generarea manuală a fluxului video",
   "cLDesc2": "Acum puteți declanșa manual generarea fluxului pentru videoclipuri direct din aplicație. Am adăugat, de asemenea, un nou ecran de setări pentru streaming video care vă va arăta ce procent din videoclipurile dvs. au fost procesate pentru streaming",
   "cLTitle3": "Îmbunătățiri de Performanță",
   "cLDesc3": "Multiple îmbunătățiri în fundal, inclusiv o utilizare mai bună a cache-ului și o experiență de defilare mai fluidă"

mobile/apps/photos/lib/l10n/intl_ru.arb

@@ -1786,10 +1786,10 @@
   "day": "День",
   "filter": "Фильтр",
   "font": "Шрифт",
-  "cLTitle1": "Похожие изображения",
+  "cLTitle1": "Похожие Изображения",
   "cLDesc1": "Мы внедряем новую систему на основе ML для обнаружения похожих изображений, с помощью которой вы можете очистить свою библиотеку. Доступно в Настройки->Резервная копия->Освободить место",
-  "cLTitle2": "Улучшения видео стриминга",
+  "cLTitle2": "Ручная генерация видео потока",
   "cLDesc2": "Теперь вы можете вручную запустить генерацию потока для видео прямо из приложения. Мы также добавили новый экран настроек видео стриминга, который покажет вам, какой процент ваших видео был обработан для стриминга",
-  "cLTitle3": "Улучшения производительности",
+  "cLTitle3": "Улучшения Производительности",
   "cLDesc3": "Множественные улучшения под капотом, включая лучшее использование кэша и более плавную прокрутку"
 }

mobile/apps/photos/lib/l10n/intl_tr.arb

@@ -1777,9 +1777,9 @@
   "different": "Farklı",
   "sameperson": "Aynı kişi mi?",
   "indexingPausedStatusDescription": "Dizin oluşturma duraklatıldı. Cihaz hazır olduğunda otomatik olarak devam edecektir. Cihaz, pil seviyesi, pil sağlığı ve termal durumu sağlıklı bir aralıkta olduğunda hazır kabul edilir.",
-  "cLTitle1": "Benzer görüntüler",
-  "cLDesc1": "Benzer görüntüleri tespit etmek için yeni bir ML tabanlı sistem tanıtıyoruz, bununla kütüphanenizi temizleyebilirsiniz. Ayarlar -> Yedekleme -> Alan boşalt kısmından ulaşabilirsiniz",
-  "cLTitle2": "Video akış geliştirmeleri",
+  "cLTitle1": "Benzer Görüntüler",
+  "cLDesc1": "Benzer görüntüleri tespit etmek için yeni bir ML tabanlı sistem tanıtıyoruz, bununla kütüphanenizi temizleyebilirsiniz. Ayarlar->Yedekleme->Alan Boşalt kısmından ulaşabilirsiniz",
+  "cLTitle2": "Manuel video akış oluşturma",
   "cLDesc2": "Artık doğrudan uygulamadan videolar için akış oluşturmayı manuel olarak tetikleyebilirsiniz. Ayrıca videolarınızın yüzde kaçının akış için işlendiğini gösteren yeni bir video akış ayarları ekranı da ekledik",
   "cLTitle3": "Performans İyileştirmeleri",
   "cLDesc3": "Daha iyi önbellek kullanımı ve daha pürüzsüz kaydırma deneyimi dahil olmak üzere perde arkasında birçok iyileştirme"

mobile/apps/photos/lib/l10n/intl_uk.arb

@@ -1510,10 +1510,10 @@
   "legacyInvite": "{email} запросив вас стати довіреною особою",
   "authToManageLegacy": "Авторизуйтесь, щоби керувати довіреними контактами",
   "useDifferentPlayerInfo": "Виникли проблеми з відтворенням цього відео? Натисніть і утримуйте тут, щоб спробувати інший плеєр.",
-  "cLTitle1": "Схожі зображення",
+  "cLTitle1": "Схожі Зображення",
   "cLDesc1": "Ми впроваджуємо нову систему на основі ML для виявлення схожих зображень, за допомогою якої ви можете очистити свою бібліотеку. Доступно в Налаштування->Резервна копія->Звільнити місце",
-  "cLTitle2": "Покращення відео стрімінгу",
+  "cLTitle2": "Ручна генерація відео потоку",
   "cLDesc2": "Тепер ви можете вручну запустити генерацію потоку для відео прямо з додатку. Ми також додали новий екран налаштувань відео стрімінгу, який покаже вам, який відсоток ваших відео було оброблено для стрімінгу",
-  "cLTitle3": "Покращення продуктивності",
+  "cLTitle3": "Покращення Продуктивності",
   "cLDesc3": "Численні покращення під капотом, включаючи краще використання кешу та більш плавну прокрутку"
 }

mobile/apps/photos/lib/l10n/intl_vi.arb

@@ -1932,9 +1932,9 @@
   "hoorayyyy": "Hoorayyyy!",
   "nothingToTidyUpHere": "Ở đây đã ngon lành rồi",
   "deletingDash": "Đang xóa - ",
-  "cLTitle1": "Hình ảnh tương tự",
-  "cLDesc1": "Chúng tôi đang giới thiệu một hệ thống dựa trên ML mới để phát hiện hình ảnh tương tự, bạn có thể dùng để dọn dẹp thư viện của mình. Có sẵn trong Cài đặt -> Sao lưu -> Giải phóng dung lượng",
-  "cLTitle2": "Cải thiện streaming video",
+  "cLTitle1": "Hình Ảnh Tương Tự",
+  "cLDesc1": "Chúng tôi đang giới thiệu một hệ thống dựa trên ML mới để phát hiện hình ảnh tương tự, bạn có thể dùng để dọn dẹp thư viện của mình. Có sẵn trong Cài đặt->Sao lưu->Giải phóng Dung lượng",
+  "cLTitle2": "Tạo luồng video thủ công",
   "cLDesc2": "Bây giờ bạn có thể kích hoạt tạo luồng cho video trực tiếp từ ứng dụng. Chúng tôi cũng đã thêm màn hình cài đặt phát trực tuyến video mới sẽ cho bạn biết bao nhiêu phần trăm video của bạn đã được xử lý để phát trực tuyến",
   "cLTitle3": "Cải Thiện Hiệu Suất",
   "cLDesc3": "Nhiều cải thiện bên trong, bao gồm sử dụng bộ nhớ đệm tốt hơn và trải nghiệm cuộn mượt mà hơn"

mobile/apps/photos/lib/l10n/intl_zh.arb

@@ -1927,8 +1927,8 @@
   "hoorayyyy": "耶～～！",
   "nothingToTidyUpHere": "这里没什么可清理的",
   "cLTitle1": "相似图像",
-  "cLDesc1": "我们正在推出一个基于机器学习的新系统来检测相似图像，您可以用它来清理您的图库。在 设置 -> 备份 -> 释放空间 中可用",
-  "cLTitle2": "视频流媒体增强",
+  "cLDesc1": "我们正在推出一个基于机器学习的新系统来检测相似图像，您可以用它来清理您的图库。在 设置->备份->释放空间 中可用",
+  "cLTitle2": "手动视频流生成",
   "cLDesc2": "您现在可以直接从应用程序手动触发视频的流生成。我们还添加了一个新的视频流设置屏幕，它将显示您的视频中有百分之几已被处理用于流媒体播放",
   "cLTitle3": "性能改进",
   "cLDesc3": "多个底层改进，包括更好的缓存使用和更流畅的滚动体验"

mobile/apps/photos/lib/models/faces_through_time/face_timeline.dart

@@ -0,0 +1,44 @@
+import 'package:photos/models/faces_through_time/face_timeline_entry.dart';
+
+class FaceTimeline {
+  final String personId;
+  final List<FaceTimelineEntry> entries;
+  final DateTime generatedAt;
+  final bool hasBeenViewed;
+  final int version;
+
+  FaceTimeline({
+    required this.personId,
+    required this.entries,
+    required this.generatedAt,
+    this.hasBeenViewed = false,
+    this.version = 1,
+  });
+
+  Map<String, dynamic> toJson() => {
+        'personId': personId,
+        'generatedAt': generatedAt.toIso8601String(),
+        'faceIds': entries.map((e) => e.faceId).toList(),
+        'hasBeenViewed': hasBeenViewed,
+        'version': version,
+      };
+
+  factory FaceTimeline.fromJson(Map<String, dynamic> json) {
+    return FaceTimeline(
+      personId: json['personId'],
+      entries: (json['faceIds'] as List)
+          .map((id) => FaceTimelineEntry(faceId: id))
+          .toList(),
+      generatedAt: DateTime.parse(json['generatedAt']),
+      hasBeenViewed: json['hasBeenViewed'] ?? false,
+      version: json['version'] ?? 1,
+    );
+  }
+
+  bool get isValid {
+    final age = DateTime.now().difference(generatedAt);
+    return age.inDays < 365; // Cache valid for 1 year
+  }
+
+  int get totalFaces => entries.length;
+}

mobile/apps/photos/lib/models/faces_through_time/face_timeline_entry.dart

@@ -0,0 +1,44 @@
+import 'dart:typed_data';
+
+class FaceTimelineEntry {
+  final String faceId;
+  final int fileId;
+  final DateTime timestamp;
+  final String? ageText;
+  final String? relativeTimeText;
+  Uint8List? thumbnail;
+
+  FaceTimelineEntry({
+    required this.faceId,
+    this.fileId = 0,
+    DateTime? timestamp,
+    this.ageText,
+    this.relativeTimeText,
+    this.thumbnail,
+  }) : timestamp = timestamp ?? DateTime.now();
+
+  String get displayText => ageText ?? relativeTimeText ?? '';
+
+  bool get hasThumbnail => thumbnail != null;
+
+  // For JSON serialization
+  Map<String, dynamic> toJson() => {
+        'faceId': faceId,
+        'fileId': fileId,
+        'timestamp': timestamp.toIso8601String(),
+        'ageText': ageText,
+        'relativeTimeText': relativeTimeText,
+      };
+
+  factory FaceTimelineEntry.fromJson(Map<String, dynamic> json) {
+    return FaceTimelineEntry(
+      faceId: json['faceId'],
+      fileId: json['fileId'] ?? 0,
+      timestamp: json['timestamp'] != null
+          ? DateTime.parse(json['timestamp'])
+          : DateTime.now(),
+      ageText: json['ageText'],
+      relativeTimeText: json['relativeTimeText'],
+    );
+  }
+}

mobile/apps/photos/lib/models/search/search_types.dart

@@ -14,7 +14,6 @@ import "package:photos/models/collection/collection_items.dart";
 import "package:photos/models/search/search_result.dart";
 import "package:photos/models/typedefs.dart";
 import "package:photos/services/collections_service.dart";
-import "package:photos/services/machine_learning/face_ml/face_filtering/face_filtering_constants.dart";
 import "package:photos/services/search_service.dart";
 import "package:photos/ui/viewer/gallery/collection_page.dart";
 import "package:photos/ui/viewer/location/add_location_sheet.dart";
@@ -221,12 +220,7 @@ extension SectionTypeExtensions on SectionType {
   }) {
     switch (this) {
       case SectionType.face:
-        return SearchService.instance.getAllFace(
-          limit,
-          minClusterSize: limit == null
-              ? kMinimumClusterSizeAllFaces
-              : kMinimumClusterSizeSearchResult,
-        );
+        return SearchService.instance.getAllFace(limit);
       case SectionType.magic:
         return SearchService.instance.getMagicSectionResults(context!);
       case SectionType.location:

mobile/apps/photos/lib/services/date_parse_service.dart

@@ -110,7 +110,7 @@ class DateParseService {
 
     result = _parseStructuredFormats(lowerInput);
     if (!result.isEmpty) return result;
-
+ 
     final normalized = _normalizeDateString(lowerInput);
     result = _parseTokenizedDate(normalized);
 
@@ -203,7 +203,7 @@ class DateParseService {
       }
       return PartialDate.empty;
     }
-
+ 
     match = _standardFormatRegex.firstMatch(cleanInput);
     if (match != null) {
       final p1 = int.parse(match.group(1)!);

mobile/apps/photos/lib/services/faces_through_time_service.dart

@@ -0,0 +1,299 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:logging/logging.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:photos/core/event_bus.dart';
+import 'package:photos/db/files_db.dart';
+import 'package:photos/db/ml/db.dart';
+import 'package:photos/events/faces_timeline_ready_event.dart';
+import 'package:photos/models/faces_through_time/face_timeline.dart';
+import 'package:photos/models/faces_through_time/face_timeline_entry.dart';
+import 'package:photos/models/file/file.dart';
+import 'package:photos/services/machine_learning/face_ml/person/person_service.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class FacesThroughTimeService {
+  static final _logger = Logger('FacesThroughTimeService');
+  static const _minYearSpan = 7;
+  static const _photosPerYear = 4;
+  static const _minFaceScore = 0.85;
+
+  static FacesThroughTimeService? _instance;
+  factory FacesThroughTimeService() =>
+      _instance ??= FacesThroughTimeService._();
+  FacesThroughTimeService._();
+
+  Future<bool> isEligible(String personId) async {
+    try {
+      // Get all file IDs for this person
+      final fileIds = await MLDataDB.instance.getPersonFileIds(personId);
+      if (fileIds.isEmpty) return false;
+
+      // Get file creation times from FilesDB
+      final files = await FilesDB.instance.getFilesFromIDs(fileIds);
+      if (files.isEmpty) return false;
+
+      // Group files by year
+      final filesByYear = <int, List<EnteFile>>{};
+      for (final file in files) {
+        if (file.creationTime == null) continue;
+        final year =
+            DateTime.fromMillisecondsSinceEpoch(file.creationTime!).year;
+        filesByYear.putIfAbsent(year, () => []).add(file);
+      }
+
+      // Check if we have enough years with enough photos
+      final years = filesByYear.keys.toList()..sort();
+      if (years.isEmpty) return false;
+
+      // Check for consecutive years with enough photos
+      int consecutiveYears = 0;
+      int maxConsecutive = 0;
+
+      for (int i = 0; i < years.length; i++) {
+        if (filesByYear[years[i]]!.length >= _photosPerYear) {
+          if (i == 0 || years[i] == years[i - 1] + 1) {
+            consecutiveYears++;
+            maxConsecutive = consecutiveYears > maxConsecutive
+                ? consecutiveYears
+                : maxConsecutive;
+          } else {
+            consecutiveYears = 1;
+          }
+        } else {
+          consecutiveYears = 0;
+        }
+      }
+
+      return maxConsecutive >= _minYearSpan;
+    } catch (e) {
+      _logger.severe('Error checking eligibility', e);
+      return false;
+    }
+  }
+
+  Future<bool> hasBeenViewed(String personId) async {
+    final prefs = await SharedPreferences.getInstance();
+    return prefs.getBool('faces_timeline_viewed_$personId') ?? false;
+  }
+
+  Future<void> markAsViewed(String personId) async {
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.setBool('faces_timeline_viewed_$personId', true);
+  }
+
+  Future<FaceTimeline?> checkAndPrepareTimeline(String personId) async {
+    if (!await isEligible(personId)) return null;
+
+    // Check cache
+    final cached = await _loadFromCache(personId);
+    if (cached != null && cached.isValid) {
+      return cached;
+    }
+
+    // Generate new timeline
+    final timeline = await _generateTimeline(personId);
+    if (timeline != null) {
+      await _saveToCache(timeline);
+      // Note: Thumbnail generation will be done asynchronously
+      unawaited(_generateThumbnailsAsync(timeline));
+
+      // Notify UI when ready
+      Bus.instance.fire(FacesTimelineReadyEvent(personId));
+    }
+
+    return timeline;
+  }
+
+  Future<FaceTimeline?> getTimeline(String personId) async {
+    // First check cache
+    final cached = await _loadFromCache(personId);
+    if (cached != null && cached.isValid) {
+      return cached;
+    }
+
+    // Generate if not cached
+    return await _generateTimeline(personId);
+  }
+
+  Future<FaceTimeline?> _generateTimeline(String personId) async {
+    try {
+      // Get high quality faces
+      final faces = await MLDataDB.instance
+          .getPersonFacesWithScores(personId, _minFaceScore);
+      if (faces.isEmpty) return null;
+
+      // Get file IDs
+      final fileIds = faces.map((f) => f['fileId'] as int).toSet().toList();
+
+      // Get files with creation times
+      final files = await FilesDB.instance.getFilesFromIDs(fileIds);
+      final fileMap = Map.fromEntries(
+        files.map((f) => MapEntry(f.uploadedFileID ?? f.generatedID!, f)),
+      );
+
+      // Get person info
+      final person = await PersonService.instance.getPerson(personId);
+
+      // Group faces by year
+      final facesByYear = <int, List<Map<String, dynamic>>>{};
+      for (final face in faces) {
+        final file = fileMap[face['fileId']];
+        if (file == null || file.creationTime == null) continue;
+
+        final timestamp =
+            DateTime.fromMillisecondsSinceEpoch(file.creationTime!);
+        final year = timestamp.year;
+
+        // Apply age filter if DOB available
+        if (person?.data.birthDate != null) {
+          final dob = DateTime.parse(person!.data.birthDate!);
+          final age = timestamp.difference(dob).inDays / 365.25;
+          if (age <= 4.0) continue;
+        }
+
+        face['timestamp'] = timestamp;
+        face['file'] = file;
+        facesByYear.putIfAbsent(year, () => []).add(face);
+      }
+
+      // Select faces using quantile approach
+      final selectedEntries = <FaceTimelineEntry>[];
+      for (final year in facesByYear.keys.toList()..sort()) {
+        final yearFaces = facesByYear[year]!;
+        if (yearFaces.length < _photosPerYear) continue;
+
+        // Sort by timestamp
+        yearFaces.sort(
+          (a, b) => (a['timestamp'] as DateTime)
+              .compareTo(b['timestamp'] as DateTime),
+        );
+
+        // Select at 1st, 25th, 50th, 75th percentiles
+        final indices = [
+          0,
+          (yearFaces.length * 0.25).floor(),
+          (yearFaces.length * 0.50).floor(),
+          (yearFaces.length * 0.75).floor(),
+        ];
+
+        for (final idx in indices) {
+          final face = yearFaces[idx];
+          final timestamp = face['timestamp'] as DateTime;
+
+          selectedEntries.add(
+            FaceTimelineEntry(
+              faceId: face['faceId'] as String,
+              fileId: face['fileId'] as int,
+              timestamp: timestamp,
+              ageText: _calculateAgeText(
+                timestamp,
+                person?.data.birthDate != null
+                    ? DateTime.parse(person!.data.birthDate!)
+                    : null,
+              ),
+              relativeTimeText: _calculateRelativeTime(timestamp),
+            ),
+          );
+        }
+      }
+
+      if (selectedEntries.length < 28) return null;
+
+      return FaceTimeline(
+        personId: personId,
+        entries: selectedEntries,
+        generatedAt: DateTime.now(),
+      );
+    } catch (e) {
+      _logger.severe('Error generating timeline', e);
+      return null;
+    }
+  }
+
+  Future<void> _generateThumbnailsAsync(FaceTimeline timeline) async {
+    // This will be implemented once we understand the face thumbnail system better
+    _logger.info('Thumbnail generation for timeline will be implemented');
+  }
+
+  String? _calculateAgeText(DateTime photoTime, DateTime? dob) {
+    if (dob == null) return null;
+
+    final diff = photoTime.difference(dob);
+    final years = (diff.inDays / 365.25).floor();
+    final months = ((diff.inDays % 365.25) / 30).floor();
+
+    if (photoTime.year == DateTime.now().year) {
+      // Current year - show relative time
+      final monthsAgo = DateTime.now().difference(photoTime).inDays ~/ 30;
+      if (monthsAgo == 0) return 'Recently';
+      return '$monthsAgo months ago';
+    }
+
+    if (months > 0) {
+      return 'Age $years years $months months';
+    }
+    return 'Age $years years';
+  }
+
+  String _calculateRelativeTime(DateTime timestamp) {
+    final now = DateTime.now();
+    final diff = now.difference(timestamp);
+
+    if (diff.inDays < 30) return 'Recently';
+    if (diff.inDays < 365) {
+      final months = (diff.inDays / 30).floor();
+      return '$months months ago';
+    }
+
+    final years = (diff.inDays / 365.25).floor();
+    return '$years years ago';
+  }
+
+  Future<String> _getCachePath(String personId) async {
+    final dir = await getApplicationSupportDirectory();
+    final cacheDir = Directory('${dir.path}/cache');
+    if (!await cacheDir.exists()) {
+      await cacheDir.create(recursive: true);
+    }
+    return '${cacheDir.path}/faces_timeline_$personId.json';
+  }
+
+  Future<FaceTimeline?> _loadFromCache(String personId) async {
+    try {
+      final path = await _getCachePath(personId);
+      final file = File(path);
+      if (!await file.exists()) return null;
+
+      final json = jsonDecode(await file.readAsString());
+      return FaceTimeline.fromJson(json);
+    } catch (e) {
+      _logger.warning('Failed to load cache', e);
+      return null;
+    }
+  }
+
+  Future<void> _saveToCache(FaceTimeline timeline) async {
+    try {
+      final path = await _getCachePath(timeline.personId);
+      final file = File(path);
+      await file.writeAsString(jsonEncode(timeline.toJson()));
+    } catch (e) {
+      _logger.warning('Failed to save cache', e);
+    }
+  }
+
+  Future<void> clearCache(String personId) async {
+    try {
+      final path = await _getCachePath(personId);
+      final file = File(path);
+      if (await file.exists()) {
+        await file.delete();
+      }
+    } catch (e) {
+      _logger.warning('Failed to clear cache', e);
+    }
+  }
+}

mobile/apps/photos/lib/services/faces_through_time_video_service.dart

@@ -0,0 +1,24 @@
+import 'dart:async';
+
+import 'package:logging/logging.dart';
+import 'package:photos/models/faces_through_time/face_timeline_entry.dart';
+import 'package:share_plus/share_plus.dart';
+
+class FacesThroughTimeVideoService {
+  static final _logger = Logger('FacesThroughTimeVideoService');
+
+  Future<void> generateAndShareVideo(
+    List<FaceTimelineEntry> entries,
+  ) async {
+    // TODO: Implement video generation using FFmpeg
+    // For now, just show a placeholder message
+    _logger.info('Video generation will be implemented with FFmpeg');
+    
+    // Temporary: Share a text message instead
+    await SharePlus.instance.share(
+      ShareParams(
+        text: 'Check out this amazing face timeline! (Video generation coming soon)',
+      ),
+    );
+  }
+}

mobile/apps/photos/lib/services/search_service.dart

@@ -46,6 +46,7 @@ import 'package:photos/services/collections_service.dart';
 import "package:photos/services/date_parse_service.dart";
 import "package:photos/services/filter/db_filters.dart";
 import "package:photos/services/location_service.dart";
+import "package:photos/services/machine_learning/face_ml/face_filtering/face_filtering_constants.dart";
 import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
 import 'package:photos/services/machine_learning/semantic_search/semantic_search_service.dart';
 import "package:photos/services/memories_cache_service.dart";
@@ -724,7 +725,7 @@ class SearchService {
 
   Future<List<GenericSearchResult>> getAllFace(
     int? limit, {
-    required int minClusterSize,
+    int minClusterSize = kMinimumClusterSizeSearchResult,
   }) async {
     try {
       debugPrint("getting faces");
@@ -893,7 +894,13 @@ class SearchService {
           ),
         );
       }
-      if (facesResult.isEmpty) return [];
+      if (facesResult.isEmpty) {
+        if (kMinimumClusterSizeAllFaces < minClusterSize) {
+          return getAllFace(limit, minClusterSize: kMinimumClusterSizeAllFaces);
+        } else {
+          return [];
+        }
+      }
       if (limit != null) {
         return facesResult.sublist(0, min(limit, facesResult.length));
       } else {

mobile/apps/photos/lib/services/update_service.dart

@@ -14,7 +14,7 @@ import 'package:url_launcher/url_launcher_string.dart';
 class UpdateService {
   static const kUpdateAvailableShownTimeKey = "update_available_shown_time_key";
   static const changeLogVersionKey = "update_change_log_key";
-  static const currentChangeLogVersion = 36;
+  static const currentChangeLogVersion = 32;
 
   LatestVersionInfo? _latestVersion;
   final _logger = Logger("UpdateService");

mobile/apps/photos/lib/ui/account/password_entry_page.dart

@@ -344,8 +344,7 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
                         const EdgeInsets.symmetric(horizontal: 20, vertical: 8),
                     child: Text(
                       AppLocalizations.of(context).passwordStrength(
-                        passwordStrengthValue: passwordStrengthText,
-                      ),
+                          passwordStrengthValue: passwordStrengthText,),
                       style: TextStyle(
                         color: passwordStrengthColor,
                       ),

mobile/apps/photos/lib/ui/notification/update/change_log_page.dart

@@ -77,7 +77,7 @@ class _ChangeLogPageState extends State<ChangeLogPage> {
                     ButtonWidget(
                       buttonType: ButtonType.trailingIconSecondary,
                       buttonSize: ButtonSize.large,
-                      labelText: AppLocalizations.of(context).rateUs,
+                      labelText: AppLocalizations.of(context).rateTheApp,
                       icon: Icons.favorite_rounded,
                       iconColor: enteColorScheme.primary500,
                       onTap: () async {
@@ -113,6 +113,7 @@ class _ChangeLogPageState extends State<ChangeLogPage> {
         context.l10n.cLDesc3,
       ),
     ]);
+
     return Container(
       padding: const EdgeInsets.only(left: 16),
       child: Scrollbar(

mobile/apps/photos/lib/ui/settings/developer_settings_widget.dart

@@ -14,8 +14,7 @@ class DeveloperSettingsWidget extends StatelessWidget {
         padding: const EdgeInsets.only(bottom: 20),
         child: Text(
           AppLocalizations.of(context).customEndpoint(
-            endpoint: "${endpointURI.host}:${endpointURI.port}",
-          ),
+              endpoint: "${endpointURI.host}:${endpointURI.port}",),
           style: Theme.of(context).textTheme.bodySmall,
         ),
       );

mobile/apps/photos/lib/ui/settings/storage_card_widget.dart

@@ -283,9 +283,7 @@ class _StorageCardWidgetState extends State<StorageCardWidget> {
                       : const SizedBox.shrink(),
                   Text(
                     AppLocalizations.of(context).availableStorageSpace(
-                      freeAmount: freeSpace,
-                      storageUnit: freeSpaceUnit,
-                    ),
+                        freeAmount: freeSpace, storageUnit: freeSpaceUnit,),
                     style: getEnteTextTheme(context)
                         .mini
                         .copyWith(color: textFaintDark),

mobile/apps/photos/lib/ui/sharing/verify_identity_dialog.dart

@@ -180,8 +180,7 @@ class _VerifyIdentifyDialogState extends State<VerifyIdentifyDialog> {
                         .shareMyVerificationID(verificationID: verificationID)
                     : AppLocalizations.of(context)
                         .shareTextConfirmOthersVerificationID(
-                        verificationID: verificationID,
-                      ),
+                            verificationID: verificationID,),
               );
             },
             child: Container(

mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_page.dart

@@ -366,8 +366,7 @@ class _ImageEditorPageState extends State<ImageEditorPage> {
                               margin: const EdgeInsets.only(bottom: 24),
                               decoration: BoxDecoration(
                                 color: isHovered
-                                    ? colorScheme.warning400
-                                        .withValues(alpha: 0.8)
+                                    ? colorScheme.warning400.withValues(alpha: 0.8)
                                     : Colors.white,
                                 shape: BoxShape.circle,
                               ),

mobile/apps/photos/lib/ui/tools/free_space_page.dart

@@ -54,9 +54,7 @@ class _FreeSpacePageState extends State<FreeSpacePage> {
         ? AppLocalizations.of(context)
             .filesBackedUpInAlbum(count: count, formattedNumber: formattedCount)
         : AppLocalizations.of(context).filesBackedUpFromDevice(
-            count: count,
-            formattedNumber: formattedCount,
-          );
+            count: count, formattedNumber: formattedCount,);
     final informationTextStyle = TextStyle(
       fontSize: 14,
       height: 1.3,
@@ -123,9 +121,7 @@ class _FreeSpacePageState extends State<FreeSpacePage> {
               Expanded(
                 child: Text(
                   AppLocalizations.of(context).freeUpSpaceSaving(
-                    count: count,
-                    formattedSize: formatBytes(status.size),
-                  ),
+                      count: count, formattedSize: formatBytes(status.size),),
                   style: informationTextStyle,
                 ),
               ),