fix: try to initialize the db and access it correctly

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

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

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

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

.github/workflows/mobile-release.yml

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

.github/workflows/web-deploy-one.yml

@@ -29,8 +29,6 @@ jobs:
         steps:
             - name: Checkout code
               uses: actions/checkout@v4
-              with:
-                  persist-credentials: false
 
             - name: Setup node and enable yarn caching
               uses: actions/setup-node@v4
@@ -40,7 +38,7 @@ jobs:
                   cache-dependency-path: "web/yarn.lock"
 
             - name: Install dependencies
-              run: yarn install --frozen-lockfile
+              run: yarn install
 
             - name: Build ${{ inputs.app }}
               run: yarn build:${{ inputs.app }}

.github/workflows/web-deploy-preview.yml

@@ -29,8 +29,6 @@ jobs:
         steps:
             - name: Checkout code
               uses: actions/checkout@v4
-              with:
-                  persist-credentials: false
 
             - name: Setup node and enable yarn caching
               uses: actions/setup-node@v4
@@ -40,7 +38,7 @@ jobs:
                   cache-dependency-path: "web/yarn.lock"
 
             - name: Install dependencies
-              run: yarn install --frozen-lockfile
+              run: yarn install
 
             - name: Build ${{ inputs.app }}
               run: yarn build:${{ inputs.app }}

.github/workflows/web-deploy-staging.yml

@@ -37,7 +37,6 @@ jobs:
               uses: actions/checkout@v4
               with:
                   ref: ${{ steps.select-branch.outputs.branch }}
-                  persist-credentials: false
 
             - name: Setup node and enable yarn caching
               uses: actions/setup-node@v4
@@ -47,7 +46,7 @@ jobs:
                   cache-dependency-path: "web/yarn.lock"
 
             - name: Install dependencies
-              run: yarn install --frozen-lockfile
+              run: yarn install
 
             - name: Build photos
               run: yarn build:photos

.github/workflows/web-deploy.yml

@@ -33,8 +33,6 @@ jobs:
         steps:
             - name: Checkout code
               uses: actions/checkout@v4
-              with:
-                  persist-credentials: false
 
             - name: Setup node and enable yarn caching
               uses: actions/setup-node@v4
@@ -44,15 +42,7 @@ jobs:
                   cache-dependency-path: "web/yarn.lock"
 
             - name: Install dependencies
-              run: yarn install --frozen-lockfile
-
-            - name: Audit dependencies
-              run: |
-                  yarn audit --level critical || exit_code=$?
-                  if [[ $exit_code -ge 16 ]]; then
-                      echo "::error::Yarn audit found critical issues"
-                      exit 1
-                  fi
+              run: yarn install
 
             - name: Build photos
               run: yarn build:photos

.github/workflows/web-lint.yml

@@ -24,8 +24,6 @@ jobs:
         steps:
             - name: Checkout code
               uses: actions/checkout@v4
-              with:
-                  persist-credentials: false
 
             - name: Setup node and enable yarn caching
               uses: actions/setup-node@v4
@@ -34,14 +32,6 @@ jobs:
                   cache: "yarn"
                   cache-dependency-path: "web/yarn.lock"
 
-            - run: yarn install --frozen-lockfile
+            - run: yarn install
 
             - run: yarn lint
-
-            - name: Audit dependencies
-              run: |
-                  yarn audit --level critical || exit_code=$?
-                  if [[ $exit_code -ge 16 ]]; then
-                      echo "::error::Yarn audit found critical issues"
-                      exit 1
-                  fi

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

docs/docs/self-hosting/administration/reverse-proxy.md

@@ -89,7 +89,7 @@ cast.ente.yourdomain.tld {
 Reload Caddy for changes to take effect.
 
 ```shell
-sudo systemctl reload caddy
+sudo systemctl caddy reload
 ```
 
 ## Step 4: Verify the setup

infra/experiments/logs-viewer/README.md

@@ -1,167 +0,0 @@
-# Ente Log Viewer
-
-A web-based log viewer for analyzing Ente application logs. This tool provides similar functionality to the mobile log viewer, allowing you to upload, filter, and analyze log files from customer support requests.
-
-## Features
-
-### 📁 File Upload
-- Drag and drop ZIP files containing log files
-- Automatic extraction and parsing of log files
-- Support for daily log files format (YYYY-M-D.log)
-
-### 🔍 Search and Filtering
-- **Text Search**: Search through log messages, logger names, and error content
-- **Logger Filtering**: Use `logger:ServiceName` syntax to filter by specific loggers
-- **Wildcard Support**: Use `logger:Auth*` to match all loggers starting with "Auth"
-- **Level Filtering**: Filter by log levels (SEVERE, WARNING, INFO, etc.)
-- **Process Filtering**: Filter by foreground/background processes
-- **Timeline Filtering**: Filter by date/time ranges
-
-### 📊 Analytics
-- Logger statistics showing most active components
-- Log level distribution charts
-- Click-to-filter from analytics charts
-
-### 🎨 UI Features
-- **Color-coded log levels**: Red for SEVERE, orange for WARNING, etc.
-- **Process indicators**: Visual distinction between foreground and background processes
-- **Active filter chips**: Visual indication of applied filters with easy removal
-- **Log detail view**: Click any log entry for detailed information
-- **Sort options**: Sort by newest first or oldest first
-- **Responsive design**: Works on desktop and mobile devices
-
-### 📤 Export
-- Export filtered logs as text files
-- Copy individual log entries to clipboard
-- Maintain original formatting and error details
-
-## Usage
-
-### Starting the Application
-
-1. **Local Development**:
-   ```bash
-   cd infra/experiments/logs-viewer
-   python3 -m http.server 8080
-   ```
-   Open http://localhost:8080 in your browser
-
-2. **Upload Log Files**:
-   - Drag and drop a ZIP file containing `.log` files
-   - Or click "Choose ZIP File" to browse for files
-
-### Log Format Support
-
-The viewer understands the Ente log format as generated by `super_logging.dart`:
-
-```
-[process] [loggerName] [LEVEL] [timestamp] message
-```
-
-**Examples**:
-- `[bg] [SyncService] [INFO] [2025-08-24 01:36:03.677678] Syncing started`
-- `[CollectionsService] [WARNING] [2025-08-24 01:36:04.123456] Connection failed`
-
-**Multi-line Error Support**:
-- Automatically parses `⤷` error detail lines
-- Extracts stack traces and error IDs
-- Handles inline error messages and exceptions
-
-### Filtering Examples
-
-- **Search by text**: `connection failed`
-- **Filter by logger**: `logger:SyncService`
-- **Multiple loggers**: `logger:Sync* logger:Collection*`
-- **Combined search**: `logger:Auth* login failed`
-
-### Keyboard Shortcuts
-
-- **Search**: Click search bar or start typing
-- **Clear search**: Click X button or clear the input
-- **Sort toggle**: Click sort arrow button
-- **Filter dialog**: Click filter button
-
-## Technical Details
-
-### Supported Log Levels
-- **SHOUT**: Purple - Highest priority
-- **SEVERE**: Red - Errors and exceptions
-- **WARNING**: Orange - Warning conditions
-- **INFO**: Blue - Informational messages
-- **CONFIG**: Green - Configuration messages
-- **FINE/FINER/FINEST**: Gray - Debug messages
-
-### Process Types
-- **Foreground**: Main app processes
-- **Background (bg)**: Background tasks
-- **Firebase Background (fbg)**: Firebase-related background processes
-
-### Performance
-- Lazy loading: Only renders visible log entries
-- Efficient filtering: Client-side filtering with optimized algorithms
-- Memory management: Handles large log files (tested with 100k+ entries)
-
-## Sample Log Files
-
-For testing, you can use any ZIP file containing `.log` files from Ente mobile app logs.
-
-## Development
-
-### File Structure
-```
-logs-viewer/
-├── index.html          # Main HTML structure
-├── styles.css          # CSS styling
-├── script.js           # JavaScript logic
-├── README.md           # This documentation
-└── references/         # UI reference screenshots
-```
-
-### Key JavaScript Classes
-- `LogViewer`: Main application class
-- Log parsing logic in `parseLogFile()` and `parseLogLine()`
-- Filter management in `applyCurrentFilter()`
-- UI rendering in `renderLogs()` and `createLogEntryHTML()`
-
-### Adding Features
-1. **New Filter Types**: Extend `currentFilter` object and `matchesFilter()` method
-2. **New Log Formats**: Update parsing patterns in `parseLogLine()`
-3. **UI Components**: Add HTML elements and CSS classes, wire up in `initializeEventListeners()`
-
-## Troubleshooting
-
-### Common Issues
-
-1. **ZIP file not loading**:
-   - Ensure ZIP contains `.log` files
-   - Check browser console for errors
-   - Try a smaller file first
-
-2. **Logs not parsing correctly**:
-   - Check log format matches expected pattern
-   - Look for console warnings about parsing failures
-   - Verify timestamp format is correct
-
-3. **Performance issues with large files**:
-   - The viewer handles pagination (100 logs at a time)
-   - Use filters to reduce the dataset
-   - Close other browser tabs to free memory
-
-4. **Search not working**:
-   - Check for typos in logger names
-   - Use wildcard syntax: `logger:Service*`
-   - Search is case-insensitive for message content
-
-### Browser Compatibility
-- **Recommended**: Chrome 80+, Firefox 75+, Safari 13+
-- **Required**: ES6 support, Fetch API, File API
-- **Dependencies**: JSZip library for ZIP file handling
-
-## Future Enhancements
-
-- Real-time log streaming
-- Advanced regex search
-- Log correlation and grouping
-- Performance metrics dashboard
-- Dark theme support
-- Export to JSON/CSV formats

infra/experiments/logs-viewer/ente-theme.css

@@ -1,110 +0,0 @@
-/* Ente Theme Variables based on web/packages/base/components/utils/theme.ts */
-:root {
-    /* Light theme colors */
-    --ente-color-accent-photos: #1db954;
-    --ente-color-accent-auth: #9610d6;
-    --ente-color-accent-locker: #5ba8ff;
-    
-    /* Background colors */
-    --ente-background-default: #fff;
-    --ente-background-paper: #fff;
-    --ente-background-paper2: #fbfbfb;
-    --ente-background-search: #f3f3f3;
-    
-    /* Text colors */
-    --ente-text-base: #000;
-    --ente-text-muted: rgba(0, 0, 0, 0.60);
-    --ente-text-faint: rgba(0, 0, 0, 0.50);
-    
-    /* Fill colors */
-    --ente-fill-base: #000;
-    --ente-fill-muted: rgba(0, 0, 0, 0.12);
-    --ente-fill-faint: rgba(0, 0, 0, 0.04);
-    --ente-fill-faint-hover: rgba(0, 0, 0, 0.08);
-    --ente-fill-fainter: rgba(0, 0, 0, 0.02);
-    
-    /* Stroke colors */
-    --ente-stroke-base: #000;
-    --ente-stroke-muted: rgba(0, 0, 0, 0.24);
-    --ente-stroke-faint: rgba(0, 0, 0, 0.12);
-    --ente-stroke-fainter: rgba(0, 0, 0, 0.06);
-    
-    /* Shadow */
-    --ente-shadow-paper: 0px 0px 10px rgba(0, 0, 0, 0.25);
-    --ente-shadow-menu: 0px 0px 6px rgba(0, 0, 0, 0.16), 0px 3px 6px rgba(0, 0, 0, 0.12);
-    --ente-shadow-button: 0px 4px 4px rgba(0, 0, 0, 0.25);
-    
-    /* Fixed colors */
-    --ente-success: #1db954;
-    --ente-warning: #ffc107;
-    --ente-danger: #ea3f3f;
-    --ente-danger-dark: #f53434;
-    --ente-danger-light: #ff6565;
-    
-    /* Secondary colors */
-    --ente-secondary-main: #f5f5f5;
-    --ente-secondary-hover: #e9e9e9;
-    
-    /* Action colors */
-    --ente-action-hover: rgba(0, 0, 0, 0.08);
-    --ente-action-disabled: rgba(0, 0, 0, 0.50);
-    
-    /* Typography */
-    --ente-font-family: "Inter Variable", sans-serif;
-    --ente-font-weight-regular: 500;
-    --ente-font-weight-medium: 600;
-    --ente-font-weight-bold: 700;
-    
-    /* Border radius */
-    --ente-border-radius: 8px;
-    --ente-border-radius-small: 4px;
-    
-    /* Spacing */
-    --ente-spacing-xs: 4px;
-    --ente-spacing-sm: 8px;
-    --ente-spacing-md: 12px;
-    --ente-spacing-lg: 16px;
-    --ente-spacing-xl: 24px;
-}
-
-/* Dark theme */
-@media (prefers-color-scheme: dark) {
-    :root {
-        /* Background colors */
-        --ente-background-default: #000;
-        --ente-background-paper: #1b1b1b;
-        --ente-background-paper2: #252525;
-        --ente-background-search: #1b1b1b;
-        
-        /* Text colors */
-        --ente-text-base: #fff;
-        --ente-text-muted: rgba(255, 255, 255, 0.70);
-        --ente-text-faint: rgba(255, 255, 255, 0.50);
-        
-        /* Fill colors */
-        --ente-fill-base: #fff;
-        --ente-fill-muted: rgba(255, 255, 255, 0.16);
-        --ente-fill-faint: rgba(255, 255, 255, 0.12);
-        --ente-fill-faint-hover: rgba(255, 255, 255, 0.16);
-        --ente-fill-fainter: rgba(255, 255, 255, 0.05);
-        
-        /* Stroke colors */
-        --ente-stroke-base: #fff;
-        --ente-stroke-muted: rgba(255, 255, 255, 0.24);
-        --ente-stroke-faint: rgba(255, 255, 255, 0.16);
-        --ente-stroke-fainter: rgba(255, 255, 255, 0.12);
-        
-        /* Shadow */
-        --ente-shadow-paper: 0px 2px 12px rgba(0, 0, 0, 0.75);
-        --ente-shadow-menu: 0px 0px 6px rgba(0, 0, 0, 0.50), 0px 3px 6px rgba(0, 0, 0, 0.25);
-        --ente-shadow-button: 0px 4px 4px rgba(0, 0, 0, 0.75);
-        
-        /* Secondary colors */
-        --ente-secondary-main: #2b2b2b;
-        --ente-secondary-hover: #373737;
-        
-        /* Action colors */
-        --ente-action-hover: rgba(255, 255, 255, 0.16);
-        --ente-action-disabled: rgba(255, 255, 255, 0.50);
-    }
-}

infra/experiments/logs-viewer/index.html

@@ -1,218 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Ente Log Viewer</title>
-    
-    <!-- Material-UI CSS -->
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" />
-    <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mui/material@latest/dist/index.css" />
-    
-    <!-- Ente theme -->
-    <link rel="stylesheet" href="ente-theme.css">
-    
-    <!-- Custom styles -->
-    <link rel="stylesheet" href="styles.css">
-</head>
-<body>
-    <div class="app">
-        <!-- Header -->
-        <header class="header">
-            <div class="header-content">
-                <h1>📋 Ente Log Viewer</h1>
-                <div class="header-actions">
-                    <button id="filter-btn" class="mui-icon-btn" title="Filter logs">
-                        <span class="material-icons">filter_list</span>
-                        <span class="filter-count" id="filter-count" style="display: none;"></span>
-                    </button>
-                    <button id="sort-btn" class="mui-icon-btn" title="Sort order">
-                        <span class="material-icons">arrow_downward</span>
-                    </button>
-                    <div class="dropdown">
-                        <button class="mui-icon-btn dropdown-toggle" title="More actions">
-                            <span class="material-icons">more_vert</span>
-                        </button>
-                        <div class="dropdown-menu mui-menu">
-                            <button id="analytics-btn" class="dropdown-item mui-menu-item">
-                                <span class="material-icons">analytics</span>
-                                <span>Analytics</span>
-                            </button>
-                            <button id="export-btn" class="dropdown-item mui-menu-item">
-                                <span class="material-icons">download</span>
-                                <span>Export Logs</span>
-                            </button>
-                            <button id="clear-btn" class="dropdown-item mui-menu-item danger">
-                                <span class="material-icons">delete</span>
-                                <span>Clear Logs</span>
-                            </button>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </header>
-
-        <!-- Upload Section -->
-        <div class="upload-section" id="upload-section">
-            <div class="upload-area" id="upload-area">
-                <div class="upload-content">
-                    <div class="upload-icon">📁</div>
-                    <h2>Upload Log Files</h2>
-                    <p>Drag and drop a zip file containing log files, or click to browse</p>
-                    <input type="file" id="file-input" accept=".zip" hidden>
-                    <button id="browse-btn" class="primary-btn">Choose ZIP File</button>
-                </div>
-            </div>
-        </div>
-
-        <!-- Main Content -->
-        <div class="main-content" id="main-content" style="display: none;">
-            <!-- Search Bar -->
-            <div class="search-section">
-                <div class="search-bar mui-search-container">
-                    <div class="mui-textfield">
-                        <input type="text" id="search-input" placeholder="Search logs... (try 'logger:SyncService' or text search)" class="mui-input" />
-                        <span class="mui-search-icon material-icons">search</span>
-                        <button id="clear-search" class="mui-clear-btn" style="display: none;">
-                            <span class="material-icons">clear</span>
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Timeline Filter -->
-            <div class="timeline-section" id="timeline-section" style="display: none;">
-                <div class="timeline-header">
-                    <span class="material-icons">timeline</span>
-                    <span>Timeline Filter</span>
-                    <button id="timeline-toggle" class="mui-icon-btn timeline-btn">
-                        <span class="material-icons">timeline</span>
-                    </button>
-                </div>
-                <div class="timeline-controls" id="timeline-controls" style="display: none;">
-                    <div class="timeline-range">
-                        <div class="mui-textfield">
-                            <input type="datetime-local" id="start-time" class="mui-input" />
-                        </div>
-                        <span class="range-separator">to</span>
-                        <div class="mui-textfield">
-                            <input type="datetime-local" id="end-time" class="mui-input" />
-                        </div>
-                        <button id="reset-timeline" class="mui-button secondary">
-                            <span class="material-icons">refresh</span>
-                            <span>Reset</span>
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Active Filters -->
-            <div class="active-filters" id="active-filters" style="display: none;">
-                <div class="filter-chips" id="filter-chips"></div>
-            </div>
-
-            <!-- Log Stats -->
-            <div class="log-stats" id="log-stats">
-                <span id="log-count">0 logs loaded</span>
-                <span id="filtered-count"></span>
-            </div>
-
-            <!-- Log List -->
-            <div class="log-list-container">
-                <div class="log-list" id="log-list">
-                    <!-- Log entries will be populated here -->
-                </div>
-                <div class="loading" id="loading" style="display: none;">Loading...</div>
-                <div class="load-more" id="load-more" style="display: none;">
-                    <button class="secondary-btn">Load More</button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- Filter Dialog -->
-    <div class="dialog-overlay" id="filter-dialog" style="display: none;">
-        <div class="dialog">
-            <div class="dialog-header">
-                <h2>Filter Logs</h2>
-                <button class="close-btn" id="close-filter">✕</button>
-            </div>
-            <div class="dialog-content">
-                <!-- Log Levels -->
-                <div class="filter-section">
-                    <h3>Log Levels</h3>
-                    <div class="level-chips" id="level-chips">
-                        <!-- Level chips will be populated here -->
-                    </div>
-                </div>
-
-                <!-- Process -->
-                <div class="filter-section">
-                    <h3>Process</h3>
-                    <div class="process-list" id="process-list">
-                        <!-- Process checkboxes will be populated here -->
-                    </div>
-                </div>
-
-                <!-- Loggers -->
-                <div class="filter-section">
-                    <h3>Loggers</h3>
-                    <div class="logger-list" id="logger-list">
-                        <!-- Logger checkboxes will be populated here -->
-                    </div>
-                </div>
-            </div>
-            <div class="dialog-actions">
-                <button id="clear-filters" class="secondary-btn">Clear All</button>
-                <button id="cancel-filter" class="secondary-btn">Cancel</button>
-                <button id="apply-filters" class="primary-btn">Apply</button>
-            </div>
-        </div>
-    </div>
-
-    <!-- Analytics Dialog -->
-    <div class="dialog-overlay" id="analytics-dialog" style="display: none;">
-        <div class="dialog">
-            <div class="dialog-header">
-                <h2>Logger Analytics</h2>
-                <button class="close-btn" id="close-analytics">✕</button>
-            </div>
-            <div class="dialog-content">
-                <div id="analytics-content">
-                    <!-- Analytics charts will be populated here -->
-                </div>
-            </div>
-            <div class="dialog-actions">
-                <button id="close-analytics-btn" class="secondary-btn">Close</button>
-            </div>
-        </div>
-    </div>
-
-    <!-- Log Detail Dialog -->
-    <div class="dialog-overlay" id="detail-dialog" style="display: none;">
-        <div class="dialog large">
-            <div class="dialog-header">
-                <h2>Log Details</h2>
-                <button class="close-btn" id="close-detail">✕</button>
-            </div>
-            <div class="dialog-content">
-                <div id="detail-content">
-                    <!-- Log details will be populated here -->
-                </div>
-            </div>
-            <div class="dialog-actions">
-                <button id="copy-log" class="secondary-btn">Copy</button>
-                <button id="close-detail-btn" class="secondary-btn">Close</button>
-            </div>
-        </div>
-    </div>
-
-    <!-- Material-UI JavaScript -->
-    <script src="https://unpkg.com/react@18/umd/react.production.min.js"></script>
-    <script src="https://unpkg.com/react-dom@18/umd/react-dom.production.min.js"></script>
-    <script src="https://unpkg.com/@mui/material@latest/umd/material-ui.production.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
-    <script src="script.js"></script>
-</body>
-</html>

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

@@ -1236,12 +1236,6 @@
       "title": "Parqet",
       "slug": "parqet"
     },
-    {
-      "title": "Parallels",
-      "slug": "parallels",
-      "hex": "#E61E25",
-      "altNames": ["Parallels Desktop", "Parallels VM"]
-    },
     {
       "title": "Parsec"
     },

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

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

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

@@ -382,8 +382,7 @@ class _HomePageState extends State<HomePage> {
     final bool shouldShowLockScreen =
         await LockScreenSettings.instance.shouldShowLockScreen();
     if (shouldShowLockScreen) {
-      // Manual lock: do not auto-prompt Touch ID; wait for user tap
-      await AppLock.of(context)!.showManualLockScreen();
+      await AppLock.of(context)!.showLockScreen();
     } else {
       await showDialogWidget(
         context: context,

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/app.dart

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

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

@@ -1 +0,0 @@
-CLAUDE.md

mobile/apps/photos/CLAUDE.md

@@ -1,213 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude, Codex, and any other agent 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
-
-# Run Photos app specifically
-melos run:photos:apk
-
-# Build Photos APK
-melos build:photos:apk
-
-# Clean Photos app
-melos clean:photos
-```
-
-### Direct Flutter Commands
-```bash
-# Development run with environment variables
-./run.sh                                    # Uses .env file with --flavor dev
-
-# Development run without env file
-flutter run -t lib/main.dart --flavor independent
-
-# Build release APK
-flutter build apk --release --flavor independent
-
-# iOS build
-cd ios && pod install && cd ..
-flutter build ios
-```
-
-### Code Quality
-```bash
-# Static analysis and linting
-flutter analyze .
-
-# Run tests
-flutter test
-```
-
-## Architecture Overview
-
-### Service-Oriented Architecture
-The app uses a service layer pattern with 28+ specialized services:
-- **collections_service.dart**: Album and collection management
-- **search_service.dart**: Search functionality with ML support
-- **smart_memories_service.dart**: AI-powered memory curation
-- **sync_service.dart**: Local/remote synchronization
-- **Machine Learning Services**: Face recognition, semantic search, similar images
-
-### Key Patterns
-- **Service Locator**: Dependency injection via `lib/service_locator.dart`
-- **Event Bus**: Loose coupling via `lib/core/event_bus.dart`
-- **Repository Pattern**: Database abstraction in `lib/db/`
-- **Rust Integration**: Performance-critical operations via Flutter Rust Bridge
-
-### Security Architecture
-- End-to-end encryption with `ente_crypto` package
-- BIP39 mnemonic-based key generation (24 words)
-- Secure storage using platform-specific implementations
-- App lock and privacy screen features
-
-## Project Structure
-
-```
-lib/
-├── core/           # Configuration, constants, networking
-├── services/       # Business logic (28+ services)
-├── ui/            # UI components (18 subdirectories)
-├── models/        # Data models (17 subdirectories)
-├── db/            # SQLite database layer
-├── utils/         # Utilities and helpers
-├── gateways/      # API gateway interfaces
-├── events/        # Event system
-├── l10n/          # Localization files (intl_*.arb)
-└── generated/     # Auto-generated code including localizations
-```
-
-## Localization (Flutter)
-
-- Add new strings to `lib/l10n/intl_en.arb` (English base file)
-- Use `AppLocalizations` to access localized strings in code
-- Example: `AppLocalizations.of(context).yourStringKey`
-- Run code generation after adding new strings: `flutter pub get`
-- Translations managed via Crowdin for other languages
-
-## Key Dependencies
-
-- **Flutter 3.32.8** with Dart SDK >=3.3.0 <4.0.0
-- **Media**: `photo_manager`, `video_editor`, `ffmpeg_kit_flutter`
-- **Storage**: `sqlite_async`, `flutter_secure_storage`
-- **ML/AI**: Custom ONNX runtime, `ml_linalg`
-- **Rust**: Flutter Rust Bridge for performance
-
-## Development Setup Requirements
-
-1. Install Flutter v3.32.8 and Rust
-2. Install Flutter Rust Bridge: `cargo install flutter_rust_bridge_codegen`
-3. Generate Rust bindings: `flutter_rust_bridge_codegen generate`
-4. Update submodules: `git submodule update --init --recursive`
-5. Enable git hooks: `git config core.hooksPath hooks`
-
-## Critical Coding Requirements
-
-### 1. Code Quality - MANDATORY
-**Every code change MUST pass `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
-
-### 5. Database Methods - BEST PRACTICE
-**Prioritize readability in database methods**
-- For small result sets (e.g., 1-2 stale entries), prefer filtering in Dart for cleaner, more readable code
-- For large datasets, use SQL WHERE clauses for performance - they're much more efficient in SQLite
-
-## 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/ente-photos-instructions.md

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

@@ -135,17 +135,6 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity-alias>
-        <activity-alias
-            android:name="${applicationId}.IconDuckyHuggingE"
-            android:icon="@mipmap/icon_ducky_hugging_e"
-            android:enabled="false"
-            android:exported="true"
-            android:targetActivity=".MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity-alias>
 
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->

mobile/apps/photos/android/app/src/main/res/mipmap-anydpi-v26/icon_ducky_hugging_e.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@color/ic_launcher_background"/>
-  <foreground android:drawable="@drawable/ic_ducky_hugging_e_launcher_foreground"/>
-</adaptive-icon>

mobile/apps/photos/assets/ducky_cleaning_static.svg

@@ -1,52 +0,0 @@
-<svg width="198" height="150" viewBox="0 0 198 150" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path opacity="0.2" d="M103.208 1.51891C70.0589 1.51891 17.0832 -6.28475 9.02179 30.1961C0.957739 66.6797 0.325369 122.498 30.8944 124.356C61.4634 126.213 136.678 126.856 160.318 124.356C183.957 121.855 185.312 83.2462 185.312 57.3881C185.312 31.53 174.179 -0.973365 123.125 0.817466C107.034 1.38341 103.21 1.51891 103.21 1.51891H103.208Z" fill="white"/>
-<path d="M141.928 142.014C168.856 142.014 190.684 139.1 190.684 135.504C190.684 131.909 168.856 128.995 141.928 128.995C115.001 128.995 93.1719 131.909 93.1719 135.504C93.1719 139.1 115.001 142.014 141.928 142.014Z" fill="#343434"/>
-<path d="M67.2538 149.392C104.397 149.392 134.508 145.779 134.508 141.321C134.508 136.864 104.397 133.251 67.2538 133.251C30.1105 133.251 0 136.864 0 141.321C0 145.779 30.1105 149.392 67.2538 149.392Z" fill="#343434"/>
-<path d="M111.039 120.086C101.394 128.801 101.925 135.497 113.988 136.559C126.051 137.622 134.713 135.151 131.923 127.605C129.159 120.086 111.039 120.086 111.039 120.086Z" fill="#FF814A"/>
-<path d="M118.989 137.665C117.408 137.665 115.71 137.585 113.909 137.428C108.141 136.921 104.71 135.165 103.722 132.21C102.595 128.852 104.923 124.436 110.452 119.438C110.612 119.294 110.822 119.212 111.037 119.212C111.802 119.212 129.801 119.305 132.739 127.303C133.675 129.829 133.483 131.982 132.173 133.698C130.186 136.299 125.584 137.662 118.989 137.662V137.665ZM111.369 120.963C106.642 125.299 104.514 129.088 105.375 131.657C106.113 133.86 109.118 135.258 114.063 135.691C122.635 136.445 128.733 135.335 130.789 132.643C131.727 131.416 131.828 129.869 131.105 127.908C128.778 121.574 113.803 121.011 111.372 120.963H111.369Z" fill="#1C1C1C"/>
-<path d="M157.878 120.086C167.523 128.801 166.992 135.497 154.929 136.559C142.866 137.622 134.204 135.151 136.994 127.605C139.757 120.086 157.878 120.086 157.878 120.086Z" fill="#FF814A"/>
-<path d="M149.927 137.665C143.332 137.665 138.73 136.302 136.743 133.701C135.433 131.984 135.241 129.832 136.177 127.303C139.115 119.305 157.114 119.215 157.879 119.215C158.094 119.215 158.304 119.295 158.464 119.441C163.993 124.436 166.321 128.852 165.194 132.213C164.203 135.168 160.775 136.921 155.007 137.431C153.205 137.591 151.508 137.668 149.927 137.668V137.665ZM157.547 120.963C155.116 121.011 140.141 121.574 137.813 127.906C137.088 129.867 137.192 131.416 138.13 132.641C140.186 135.332 146.281 136.446 154.855 135.688C159.8 135.253 162.803 133.858 163.544 131.655C164.405 129.088 162.277 125.297 157.55 120.961L157.547 120.963Z" fill="#1C1C1C"/>
-<path d="M100.616 46.8054C80.2899 35.6035 65.3176 38.7095 71.7396 52.8316L100.616 46.8054Z" fill="#F4D93B"/>
-<path d="M71.743 53.7029C71.4108 53.7029 71.0946 53.5142 70.9485 53.1927C68.0231 46.7628 69.6599 43.3299 71.5463 41.5842C76.3981 37.0912 87.9747 38.8422 101.039 46.0427C101.462 46.2739 101.616 46.8053 101.382 47.2277C101.148 47.6502 100.619 47.8016 100.197 47.5705C86.1015 39.8014 76.2466 39.6101 72.7314 42.8649C70.077 45.3227 71.1611 49.4463 72.5374 52.4727C72.7367 52.9111 72.5427 53.4292 72.1043 53.6285C71.9874 53.6816 71.8652 53.7082 71.743 53.7082V53.7029Z" fill="#232323"/>
-<path d="M174.283 115.362C168.265 123.375 156.484 129.659 133.976 129.659C131.848 129.659 129.815 129.604 127.876 129.495C123.46 129.247 119.517 128.729 116.001 127.985C101.956 125.015 94.7002 118.444 91.084 111.161C86.2907 101.506 87.8929 90.6011 88.5518 85.1861C89.6146 76.4552 90.7253 70.2882 91.7456 64.4747C92.0059 62.9814 92.261 61.5147 92.5081 60.0321C93.1299 56.3043 93.903 52.8635 94.8117 49.6883C101.154 27.4916 114.091 18.3488 127.926 16.3932C129.93 16.1089 131.952 15.9761 133.976 15.9761C138.254 15.9761 142.59 16.5022 146.775 17.7696C160.206 21.8375 172.086 33.5469 175.444 60.0321C176.372 67.3389 178.069 74.2153 179.403 85.1861C180.161 91.4062 182.161 104.867 174.283 115.362Z" fill="#F4D93B"/>
-<path d="M129.171 17.7694C129.171 17.7694 107.25 19.5257 97.8895 49.7174L95.2936 51.1947L94.8047 49.6882C101.147 27.4914 114.084 18.3486 127.919 16.3931L129.171 17.7694Z" fill="white"/>
-<path d="M174.284 115.362C175.424 110.515 177.432 104.298 176.872 97.9079C174.932 75.8546 175.277 30.1539 144.047 18.8191L146.776 17.7695C160.207 21.8374 172.086 33.5469 175.445 60.0321C176.372 67.3389 178.07 74.2152 179.404 85.1861C180.161 91.4062 182.162 104.867 174.284 115.362Z" fill="white"/>
-<path d="M121.074 101.628C120.253 107.898 118.297 117.926 116.001 127.986C101.956 125.015 94.7002 118.444 91.084 111.161C86.2907 101.506 87.8929 90.6013 88.5518 85.1863C89.6146 76.4553 90.7253 70.2884 91.7456 64.4748L94.368 54.9733C137.813 54.333 124.794 73.1978 121.074 101.628Z" fill="#E2B639"/>
-<path d="M133.974 130.53C115.279 130.53 101.954 126.178 94.3657 117.596C84.9758 106.973 86.7453 92.6493 87.5956 85.7676L87.6806 85.0795C88.685 76.8215 89.7132 70.9734 90.707 65.3166C91.0338 63.454 91.342 61.6951 91.6449 59.8883C94.2674 44.1561 99.7674 32.343 107.996 24.7784C114.979 18.3564 123.72 15.1016 133.974 15.1016C144.227 15.1016 153.445 18.205 160.382 24.3214C168.906 31.8381 174.265 43.816 176.306 59.9228C176.707 63.0953 177.267 66.2518 177.863 69.5944C178.636 73.9492 179.513 78.8833 180.264 85.0795L180.349 85.7676C181.2 92.652 182.972 106.973 173.579 117.596C165.994 126.178 152.666 130.53 133.971 130.53H133.974ZM133.974 16.8472C124.172 16.8472 115.829 19.948 109.176 26.0644C101.242 33.3606 95.9227 44.8363 93.364 60.1779C93.0611 61.9926 92.7529 63.7542 92.4234 65.6195C91.4323 71.2523 90.4094 77.0792 89.4103 85.292L89.3253 85.9855C88.5069 92.6148 86.8011 106.41 95.6703 116.446C102.911 124.637 115.797 128.79 133.971 128.79C152.145 128.79 165.032 124.637 172.272 116.446C181.141 106.41 179.438 92.6148 178.617 85.9855L178.532 85.2947C177.785 79.1437 176.914 74.2335 176.143 69.9026C175.546 66.5388 174.982 63.361 174.573 60.146C170.035 24.3613 149.988 16.8499 133.971 16.8499L133.974 16.8472Z" fill="#1C1C1C"/>
-<path d="M135.676 20.3044L126.961 19.5631C127.338 17.4136 127.864 15.5564 128.483 13.994C131.411 6.59157 136.401 5.82901 137.307 12.1208C137.307 12.1208 140.036 6.16113 147.21 7.88022C149.187 8.35583 150.143 9.60198 150.228 11.1324C150.454 15.1312 144.726 21.0776 135.676 20.3044Z" fill="#F4D93B"/>
-<path d="M150.229 11.1324C147.761 9.91816 140.659 9.25922 138.754 11.2706C136.508 13.6406 137.282 12.0863 136.928 11.244C136.575 10.3991 130.108 11.0235 127.969 18.3914L128.484 13.994C131.412 6.59157 136.402 5.82901 137.308 12.1208C137.308 12.1208 140.037 6.16113 147.211 7.88022C149.188 8.35583 150.144 9.60198 150.229 11.1324Z" fill="white"/>
-<path d="M126.453 19.475C126.299 15.4656 128.345 9.79818 131.853 7.54768C133.524 6.48222 135.604 6.64961 136.824 8.29697C137.621 9.36243 137.95 10.768 138.043 12.0115L136.619 11.8069C136.725 11.581 136.816 11.4216 136.922 11.2409C138.968 7.76025 142.871 6.13681 146.796 6.95251C152.516 7.97281 151.823 13.4516 148.488 16.7782C146.277 19.0287 143.31 20.4236 140.225 20.8966C138.692 21.1251 137.129 21.1011 135.623 20.8514C135.32 20.8009 135.115 20.5166 135.166 20.2137C135.211 19.9427 135.445 19.7514 135.71 19.7487C137.156 19.7434 138.58 19.6371 139.967 19.3714C142.704 18.8586 145.371 17.6523 147.308 15.641C148.873 14.0547 150.592 10.8185 148.26 9.20301C147.771 8.86557 147.075 8.67958 146.487 8.56533C145.812 8.43779 145.13 8.37136 144.457 8.38996C141.747 8.40591 139.242 10.0665 137.982 12.4286C137.663 13.0769 136.678 12.9255 136.558 12.224C136.21 10.6936 135.341 8.16146 133.375 9.0861C129.985 11.0231 128.956 16.2149 127.45 19.6478C127.253 20.1606 126.461 20.025 126.451 19.4724L126.453 19.475Z" fill="#1C1C1C"/>
-<path d="M121.04 44.7142C127.356 40.8907 130.499 40.6516 136.932 44.8629C138.415 45.8407 137.939 47.3233 136.634 47.8574C133.52 49.1036 124.715 49.1912 121.216 48.0062C119.614 47.4429 119.319 45.7823 121.038 44.7142H121.04Z" fill="#FF814A"/>
-<path d="M120.694 44.1455C122.944 42.8516 125.41 41.5815 128.054 41.2759C130.761 40.9624 133.434 42.0545 135.708 43.3405C136.096 43.545 136.466 43.7762 136.838 43.9994C137.263 44.2545 137.698 44.4989 138.031 44.9054C139.064 46.048 138.522 47.7644 137.22 48.4313C136.078 48.984 134.784 49.2045 133.546 49.3905C129.626 49.8581 125.622 49.9166 121.764 48.976C121.345 48.8352 120.744 48.6917 120.367 48.4286C118.541 47.2941 118.956 45.11 120.694 44.1455ZM121.39 45.2827C120.51 45.8274 120.205 46.8052 121.334 47.233C123.162 47.7963 125.115 47.8574 127.068 47.9504C129.967 48.0035 132.908 47.9902 135.738 47.3286C135.868 47.2808 136.378 47.1453 136.495 47.0736C137.446 46.5714 137.202 45.7982 136.365 45.3173C135.929 45.033 135.491 44.7248 135.044 44.4644C132.937 43.1731 130.636 42.1288 128.16 42.3706C125.67 42.6576 123.502 43.9675 121.387 45.2827H121.39Z" fill="#232323"/>
-<path d="M111.373 54.4653L109.935 65.7577L100.806 137.407C100.806 142.152 83.2321 146 61.5535 146C60.5518 146 59.5607 145.992 58.5776 145.976C44.0969 145.737 31.8108 143.781 25.9601 141.036C23.6112 139.934 22.3013 138.703 22.3013 137.407L11.7344 54.4653H111.373Z" fill="#9F9DA8"/>
-<path d="M109.936 65.7583L100.806 137.408C100.806 142.153 83.2326 146 61.554 146C60.5523 146 59.5612 145.992 58.5781 145.976C58.703 88.4253 69.0175 62.1793 109.936 65.7583Z" fill="#8A8899"/>
-<path d="M25.9601 141.036C23.6112 139.934 22.3013 138.703 22.3013 137.407L11.7344 54.4653H12.5766L15.5126 57.4545L25.9601 141.036Z" fill="white"/>
-<path d="M61.5596 146.871C51.0139 146.871 41.0899 145.97 33.6183 144.334C25.5915 142.577 21.4944 140.266 21.4359 137.468L10.8743 54.5742C10.8424 54.3244 10.9194 54.0747 11.0842 53.8887C11.2489 53.7027 11.488 53.5938 11.7378 53.5938H111.376C111.626 53.5938 111.865 53.7027 112.03 53.8887C112.194 54.0747 112.271 54.3271 112.24 54.5742L101.678 137.468C101.619 140.268 97.5223 142.577 89.4955 144.334C82.0213 145.97 72.1 146.871 61.5542 146.871H61.5596ZM12.7315 55.3368L23.1736 137.298C23.1789 137.335 23.1816 137.372 23.1816 137.407C23.1816 137.885 23.7023 140.377 33.993 142.63C41.3476 144.241 51.1387 145.125 61.5622 145.125C71.9857 145.125 81.7768 144.238 89.1314 142.63C99.4221 140.377 99.9429 137.885 99.9429 137.407C99.9429 137.37 99.9429 137.332 99.9508 137.298L110.393 55.3368H12.7342H12.7315Z" fill="#1C1C1C"/>
-<path d="M111.373 54.4654C111.373 57.6273 101.868 60.3986 87.6135 61.9396C80.0331 62.7606 71.1081 63.2336 61.5535 63.2336C47.0169 63.2336 33.9364 62.1389 24.8282 60.3906C16.6977 58.8283 11.7344 56.7505 11.7344 54.4654C11.7344 51.2451 21.5919 48.4313 36.2826 46.9062C43.6903 46.1383 52.3283 45.6973 61.5535 45.6973C69.3014 45.6973 76.6374 46.0081 83.1763 46.5634C99.8597 47.9796 111.373 50.9847 111.373 54.4654Z" fill="#232323"/>
-<path d="M61.5578 64.1055C47.5792 64.1055 34.1321 63.064 24.6677 61.2466C15.509 59.4876 10.8672 57.2052 10.8672 54.4658C10.8672 52.4306 13.2824 50.7141 18.2511 49.2156C22.5979 47.9057 28.8021 46.8057 36.1966 46.0404C43.8567 45.246 52.6249 44.8262 61.5578 44.8262C69.1622 44.8262 76.461 45.1184 83.255 45.695C91.6273 46.4071 98.7215 47.5151 103.767 48.8994C109.475 50.467 112.251 52.2871 112.251 54.4658C112.251 56.4692 109.913 58.1618 105.101 59.6444C100.903 60.9383 94.8901 62.0304 87.7135 62.8062C79.8673 63.6565 70.8228 64.1055 61.5605 64.1055H61.5578ZM61.5578 46.5692C52.686 46.5692 43.979 46.9863 36.3772 47.7728C17.5788 49.7257 12.6102 53.0045 12.6102 54.4658C12.6102 55.7067 15.8544 57.7791 24.9972 59.5354C34.3579 61.3316 47.6829 62.3625 61.5578 62.3625C70.7591 62.3625 79.7371 61.9161 87.5249 61.0738C105.704 59.1077 110.505 55.8927 110.505 54.4658C110.505 52.574 103.209 49.1385 83.1062 47.4327C76.3627 46.8588 69.1117 46.5692 61.5578 46.5692Z" fill="#232323"/>
-<path d="M65.278 73.9174C50.4545 73.9174 32.1025 71.7679 12.7567 64.3973C12.483 64.2937 12.3449 63.9855 12.4485 63.7118C12.5521 63.4381 12.8603 63.3 13.134 63.4036C39.8503 73.5826 64.6696 73.7288 80.7844 72.0575C98.257 70.2454 109.555 65.9676 109.666 65.9251C109.94 65.8188 110.248 65.957 110.352 66.2306C110.458 66.5043 110.32 66.8125 110.046 66.9162C109.932 66.9587 98.5333 71.279 80.9305 73.1097C76.3578 73.5853 71.0836 73.9147 65.2727 73.9147L65.278 73.9174Z" fill="#1C1C1C"/>
-<path d="M59.9036 138.648C48.4173 138.648 34.9515 137.13 21.3981 132.231C21.1217 132.13 20.9782 131.827 21.0792 131.551C21.1802 131.274 21.4831 131.131 21.7594 131.232C42.2317 138.632 62.5234 138.241 75.9413 136.61C90.4965 134.84 100.33 131.269 100.428 131.232C100.705 131.131 101.01 131.272 101.111 131.548C101.212 131.824 101.071 132.13 100.795 132.231C100.697 132.268 90.7702 135.874 76.1008 137.662C71.4351 138.23 65.943 138.65 59.9036 138.65V138.648Z" fill="#1C1C1C"/>
-<path d="M28.3625 125.363C27.1482 125.363 26.1093 124.443 25.9844 123.208L21.34 76.6222C21.2098 75.3069 22.1689 74.1352 23.4815 74.005C24.7941 73.8748 25.9658 74.834 26.0987 76.1466L30.7432 122.732C30.8733 124.047 29.9142 125.219 28.6016 125.349C28.5219 125.357 28.4422 125.363 28.3625 125.363Z" fill="#232323"/>
-<path d="M43.4128 127.828C42.1215 127.828 41.056 126.797 41.0242 125.498L39.8524 80.3419C39.8179 79.0214 40.8594 77.924 42.1799 77.8895C43.4952 77.855 44.5978 78.8965 44.6324 80.2171L45.8041 125.373C45.8387 126.694 44.7971 127.791 43.4766 127.826C43.4553 127.826 43.4341 127.826 43.4128 127.826V127.828Z" fill="#232323"/>
-<path d="M60.6807 128.995C60.6807 128.995 60.6568 128.995 60.6435 128.995C59.323 128.976 58.2681 127.89 58.2894 126.569L58.9643 81.4077C58.9829 80.0872 60.0749 79.0297 61.3901 79.0536C62.7107 79.0722 63.7655 80.1589 63.7442 81.4795L63.0694 126.641C63.0508 127.948 61.9826 128.998 60.678 128.998L60.6807 128.995Z" fill="#232323"/>
-<path d="M93.2992 125.362C93.2195 125.362 93.1398 125.36 93.0601 125.349C91.7449 125.219 90.7857 124.047 90.9185 122.732L95.563 76.1465C95.6932 74.8313 96.8676 73.8721 98.1802 74.005C99.4954 74.1352 100.455 75.3069 100.322 76.6221L95.6773 123.208C95.5551 124.441 94.5135 125.362 93.2992 125.362Z" fill="#232323"/>
-<path d="M78.2515 127.828C78.2303 127.828 78.209 127.828 78.1877 127.828C76.8672 127.794 75.8257 126.696 75.8602 125.376L77.0319 80.2199C77.0665 78.9206 78.1293 77.8896 79.4206 77.8896C79.4419 77.8896 79.4631 77.8896 79.4844 77.8896C80.8049 77.9242 81.8465 79.0215 81.8119 80.3421L80.6402 125.498C80.6056 126.797 79.5428 127.828 78.2515 127.828Z" fill="#232323"/>
-<path d="M92.3543 60.3824L87.6115 61.9394C80.031 62.7605 71.1061 63.2334 61.5514 63.2334C49.0342 63.2334 37.5984 62.423 28.8462 61.0786C27.4353 60.8633 26.0908 60.6322 24.8261 60.3904L24.7969 60.3824C24.7969 60.3824 24.7995 60.3718 24.7995 60.3665C25.7587 55.1507 30.815 50.5116 36.2805 46.906C40.9622 43.8186 45.9414 41.4963 48.8987 40.2316C50.5381 39.5301 51.5584 39.1528 51.5584 39.1528L74.5708 41.313C78.0409 42.7265 80.8733 44.5731 83.1743 46.5633C90.3801 52.7833 92.3543 60.3824 92.3543 60.3824Z" fill="#20D34F"/>
-<path d="M50.7588 41.2815C50.7588 41.2815 31.785 53.0202 28.8411 61.0789C28.6816 61.52 28.5674 61.9478 28.5089 62.3623L24.6562 61.2463L24.821 60.3907L24.7944 60.3668C25.7536 55.1511 30.8099 50.5119 36.2754 46.9064C40.9571 43.8189 45.9363 41.4967 48.8936 40.2319L50.7588 41.2815Z" fill="white"/>
-<path d="M61.5571 64.1048C47.5785 64.1048 34.1313 63.0633 24.667 61.2459C24.6457 61.2406 24.6245 61.2379 24.6032 61.2326L24.574 61.2246C24.1356 61.1077 23.8619 60.672 23.9443 60.2256C24.7999 55.5306 28.7907 50.8038 35.8052 46.1779C43.0828 41.3794 51.1814 38.3636 51.2611 38.3344C51.3833 38.2892 51.5135 38.2733 51.6437 38.2839L74.6562 40.4441C74.7412 40.4521 74.8236 40.4733 74.9033 40.5052C78.1687 41.8364 81.1446 43.6511 83.7485 45.9043C91.0765 52.228 93.1198 59.843 93.2022 60.1645C93.3191 60.6109 93.0667 61.0679 92.6309 61.2113L87.8881 62.7684C87.8297 62.787 87.7712 62.8002 87.7101 62.8056C79.8639 63.6558 70.8194 64.1048 61.5571 64.1048ZM25.8547 59.6942C35.1622 61.392 48.1019 62.3618 61.5597 62.3618C70.7264 62.3618 79.67 61.9208 87.4338 61.0838L91.2705 59.8244C90.5584 57.7705 88.191 52.0393 82.6113 47.2248C80.1828 45.1231 77.4088 43.4253 74.3665 42.1711L51.6836 40.0429C50.456 40.5132 43.2715 43.3482 36.7671 47.6366C30.6054 51.7019 26.9388 55.7538 25.8547 59.6968V59.6942Z" fill="#232323"/>
-<path d="M73.0661 37.8245L52.6549 36.9291C52.2006 36.201 51.8684 35.5527 51.6399 34.9762C49.8704 30.4938 54.2491 30.2865 54.2491 30.2865C55.676 24.7387 60.1185 25.8094 63.469 27.5764C65.7354 28.772 67.5023 30.2865 67.5023 30.2865C79.2251 24.4411 73.0661 37.8245 73.0661 37.8245Z" fill="#20D34F"/>
-<path d="M65.7886 29.5904C65.5229 29.5319 56.7547 27.5631 55.5272 31.9764C55.5272 31.9764 53.0535 32.545 53.9834 36.6209L51.6399 34.9762C49.8704 30.4938 54.2491 30.2865 54.2491 30.2865C55.676 24.7387 60.1185 25.8094 63.469 27.5764L65.7886 29.5904Z" fill="white"/>
-<path d="M73.0599 38.696C73.0599 38.696 73.0334 38.696 73.0227 38.696L52.6115 37.8006C52.3245 37.7873 52.0615 37.6358 51.91 37.3914C50.353 34.8991 49.9545 32.8877 50.725 31.4158C51.3972 30.1298 52.755 29.6701 53.5601 29.5054C54.227 27.3904 55.4093 26.0539 57.0833 25.5251C60.9253 24.3135 66.0746 28.0413 67.6183 29.2583C70.9768 27.672 73.2459 27.5152 74.5479 28.7747C75.6479 29.8428 75.8418 31.7957 75.1218 34.5829C74.6302 36.4907 73.8836 38.1194 73.8517 38.1885C73.7082 38.4994 73.4 38.696 73.0599 38.696ZM53.1535 36.0788L72.5019 36.9264C73.5249 34.4899 74.3751 31.0358 73.3336 30.0261C72.6082 29.322 70.6234 29.702 67.8867 31.065C67.5732 31.2218 67.1959 31.174 66.9302 30.9481C65.336 29.5851 60.5533 26.2558 57.604 27.1884C56.3845 27.5737 55.5608 28.6578 55.0852 30.5044C54.9895 30.8737 54.6654 31.1394 54.2828 31.158C54.2721 31.158 52.7683 31.2563 52.2634 32.2315C51.8489 33.0312 52.1651 34.389 53.1509 36.0788H53.1535Z" fill="#232323"/>
-<path d="M74.6803 37.9618L51.0823 36.4317C49.9841 36.3605 49.036 37.1931 48.9648 38.2913C48.8936 39.3896 49.7262 40.3376 50.8244 40.4089L74.4224 41.939C75.5206 42.0102 76.4687 41.1776 76.5399 40.0794C76.6111 38.9811 75.7785 38.033 74.6803 37.9618Z" fill="#9F9DA8"/>
-<path d="M74.5503 42.8173C74.4866 42.8173 74.4254 42.8173 74.3617 42.812L50.7647 41.2816C50.0021 41.2311 49.3033 40.8883 48.7985 40.3144C48.2937 39.7405 48.0439 39.0019 48.0917 38.2393C48.1422 37.4767 48.485 36.7779 49.0589 36.2731C49.6355 35.7683 50.3715 35.5185 51.134 35.5663L74.731 37.0968C75.4936 37.1473 76.1924 37.49 76.6972 38.0639C77.202 38.6378 77.4518 39.3765 77.404 40.1391C77.3535 40.9016 77.0107 41.6004 76.4368 42.1053C75.9107 42.5676 75.2465 42.8173 74.5503 42.8173ZM74.4733 41.0717C74.7735 41.0903 75.0605 40.992 75.2863 40.7953C75.5122 40.5987 75.645 40.3251 75.6663 40.0248C75.6849 39.7246 75.5866 39.4376 75.3899 39.2118C75.1933 38.9859 74.9197 38.8531 74.6194 38.8318L51.0224 37.3014C50.7222 37.2828 50.4352 37.3811 50.2094 37.5777C49.9835 37.7743 49.8507 38.048 49.8294 38.3482C49.8108 38.6485 49.9091 38.9354 50.1057 39.1613C50.3024 39.3871 50.576 39.52 50.8763 39.5412L74.4733 41.0717Z" fill="#232323"/>
-<path d="M111.235 40.3833C111.062 40.3833 110.889 40.3541 110.719 40.2877C109.964 40.0034 109.582 39.1584 109.869 38.4038C111.349 34.4874 114.266 33.3449 116.506 33.5813C119.158 33.863 121.299 35.9673 121.714 38.7014C121.836 39.4985 121.286 40.2452 120.489 40.3647C119.692 40.4843 118.945 39.9369 118.826 39.1398C118.61 37.7183 117.532 36.6289 116.201 36.4881C114.705 36.3287 113.36 37.4314 112.606 39.4374C112.385 40.022 111.83 40.3833 111.237 40.3833H111.235Z" fill="#1C1C1C"/>
-<path d="M147.634 40.3833C147.044 40.3833 146.489 40.022 146.266 39.4374C145.509 37.434 144.164 36.3314 142.671 36.4881C141.34 36.6289 140.261 37.7183 140.046 39.1398C139.924 39.9369 139.18 40.4869 138.383 40.3647C137.585 40.2425 137.035 39.4985 137.158 38.7014C137.572 35.9673 139.714 33.863 142.365 33.5813C144.603 33.3449 147.523 34.4874 149.003 38.4038C149.287 39.1584 148.907 40.0034 148.152 40.2877C147.982 40.3514 147.807 40.3833 147.637 40.3833H147.634Z" fill="#1C1C1C"/>
-<path d="M193.199 114.384C187.58 108.953 173.386 102.09 156.054 96.898C138.723 91.7061 123.094 89.6337 115.415 91.0791L111.839 90.0083L110.51 93.9938C108.879 99.4381 126.625 109.561 150.148 116.61C173.67 123.657 194.06 124.959 195.692 119.515L197.02 115.529L193.197 114.384H193.199Z" fill="#B7B6BF"/>
-<path d="M184.999 123.75C183.675 123.75 182.344 123.699 181.072 123.617C172.404 123.064 161.333 120.872 149.897 117.445C138.458 114.017 128.006 109.761 120.462 105.456C114.891 102.278 108.498 97.6658 109.672 93.7414C109.672 93.7334 109.677 93.7255 109.68 93.7148L111.009 89.7293C111.157 89.2829 111.633 89.0332 112.085 89.1687L115.459 90.181C123.571 88.7462 139.55 91.0419 156.3 96.061C173.047 101.077 187.658 107.948 193.645 113.605L197.266 114.689C197.492 114.756 197.681 114.913 197.79 115.122C197.898 115.332 197.917 115.577 197.843 115.8L196.517 119.775C195.563 122.908 190.326 123.744 184.993 123.744L184.999 123.75ZM111.341 94.2569C110.605 96.7784 116.014 100.913 121.328 103.944C128.76 108.185 139.083 112.386 150.399 115.776C161.715 119.166 172.646 121.332 181.186 121.877C187.3 122.267 194.102 121.786 194.859 119.265C194.859 119.257 194.864 119.249 194.867 119.238L195.911 116.106L192.951 115.218C192.818 115.178 192.696 115.106 192.595 115.011C186.893 109.503 172.455 102.722 155.806 97.7323C139.157 92.745 123.369 90.468 115.579 91.9346C115.443 91.9612 115.302 91.9532 115.167 91.9134L112.401 91.0844L111.343 94.2542L111.341 94.2569Z" fill="#232323"/>
-<path d="M197.02 115.529C195.981 119.004 187.295 119.73 175.033 117.968C168.085 116.972 159.984 115.173 151.476 112.625C127.956 105.578 110.207 95.4524 111.838 90.0082C113.47 84.5639 133.86 85.8659 157.382 92.9123C164.179 94.9502 170.492 97.2432 175.997 99.6053C189.543 105.422 198.181 111.66 197.02 115.529Z" fill="#9F9DA8"/>
-<path d="M197.017 115.529C195.979 119.004 187.293 119.73 175.031 117.968C175.326 117.979 175.636 117.995 175.961 118.011C200.565 119.249 197.589 109.599 173.492 99.4966L175.995 99.6055C189.541 105.422 198.179 111.66 197.017 115.529Z" fill="white"/>
-<path d="M186.335 119.764C185.011 119.764 183.68 119.714 182.408 119.631C173.74 119.078 162.668 116.886 151.233 113.459C139.794 110.031 129.342 105.775 121.798 101.47C116.226 98.2926 109.834 93.68 111.008 89.7556C112.182 85.8338 120.063 85.4964 126.461 85.9029C135.128 86.4556 146.2 88.6476 157.636 92.0752C178.688 98.383 199.939 108.833 197.858 115.776C196.917 118.919 191.67 119.761 186.332 119.761L186.335 119.764ZM122.696 87.5264C117.783 87.5264 113.282 88.2358 112.677 90.2578C111.922 92.7793 117.34 96.9216 122.659 99.9559C130.091 104.197 140.413 108.397 151.73 111.788C163.043 115.178 173.977 117.343 182.516 117.888C188.63 118.279 195.432 117.798 196.189 115.276C196.944 112.755 191.526 108.612 186.207 105.578C178.775 101.338 168.453 97.1368 157.137 93.7465C145.82 90.3561 134.887 88.1906 126.35 87.6459C125.141 87.5689 123.905 87.5264 122.696 87.5264Z" fill="#232323"/>
-<path d="M164.6 106.976C164.412 106.976 164.22 106.949 164.029 106.894C162.974 106.58 162.374 105.469 162.69 104.415C163.928 100.264 161.157 98.4788 154.99 95.6544C154.06 95.2293 153.098 94.7882 152.203 94.3339C149.086 92.7503 146.803 92.2773 145.228 92.8964C143.897 93.4172 142.791 94.8467 141.941 97.1423C141.558 98.1732 140.413 98.702 139.38 98.3194C138.349 97.9368 137.82 96.7916 138.203 95.758C139.465 92.3491 141.341 90.1358 143.777 89.1846C147.369 87.779 151.339 89.4237 154.009 90.7814C154.833 91.1986 155.715 91.6051 156.65 92.0329C161.808 94.395 168.87 97.6312 166.508 105.554C166.25 106.418 165.458 106.979 164.6 106.979V106.976Z" fill="#232323"/>
-<path d="M153.389 70.5537C139.259 91.3847 144.509 114.857 171.688 90.1492L153.389 70.5537Z" fill="#F4D93B"/>
-<path d="M152.855 101.628C150.517 101.628 148.944 100.804 147.929 99.922C145.285 97.629 144.331 93.2529 145.243 87.6014C146.144 82.0243 148.779 75.7962 152.667 70.0624C152.938 69.6638 153.48 69.5602 153.878 69.8312C154.277 70.1022 154.38 70.6443 154.109 71.0428C150.36 76.5694 147.823 82.5477 146.962 87.8804C146.162 92.841 146.93 96.7495 149.069 98.6067C150.918 100.212 156.766 102.534 171.098 89.5065C171.454 89.1823 172.007 89.2089 172.328 89.5649C172.653 89.921 172.626 90.4736 172.27 90.7978C162.957 99.263 156.811 101.63 152.852 101.63L152.855 101.628Z" fill="#232323"/>
-</svg>

mobile/apps/photos/fastlane/metadata/android/es/full_description.txt

@@ -1,4 +1,4 @@
-ente es una aplicación simple para hacer copias de seguridad y compartir tus fotos y vídeos.
+ente es una aplicación simple para hacer copias de seguridad y compartir tus fotos y videos.
 
 Si has estado buscando una alternativa a Google Photos que sea amigable con la privacidad, has llegado al lugar correcto. Con Ente, se almacenan cifradas de extremo a extremo (e2ee). Esto significa que solo tú puedes verlas.
 

mobile/apps/photos/fastlane/metadata/android/id/full_description.txt

@@ -6,23 +6,23 @@ Kami menyediakan app untuk Android, iOS, web, serta desktop, dan fotomu akan ter
 
 ente juga dapat memudahkan kamu untuk membagikan album ke orang tersayang, meski mereka tidak punya akun ente. Kamu dapat membagikan link berbagi publik, di mana mereka bisa melihat album kamu dan berkolaborasi dengan menambahkan foto, tanpa akun atau app.
 
-Data terenkripsi kamu tersimpan di 3 lokasi berbeda, termasuk di salah satu tempat pengungsian di Paris. Kami menanggapi keturunan anda dengan serius dan memudahkan untuk memastikan kenangan anda tetap ada setelah anda.
+Data terenkripsi kamu tersimpan di 3 lokasi berbeda, termasuk di salah satu tempat pengungsian di Paris. We take posterity seriously and make it easy to ensure that your memories outlive you.
 
 Kami ingin membuat app foto yang paling aman sepanjang masa–jadi, bergabunglah dengan kami!
 
 FITUR
 - Pencadangan kualitas asli, karena setiap piksel berarti
 - Paket keluarga, sehingga kamu bisa bagikan kuota penyimpananmu dengan keluarga
-- Album kolaboratif, sehingga anda dapat mengumpulkan foto bersama setelah sebuah perjalanan
-- Folder bersama, jika anda ingin pasangan anda menikmati hasil jepretan "Kamera" anda
+- Collaborative albums, so you can pool together photos after a trip
+- Shared folders, in case you want your partner to enjoy your "Camera" clicks
 - Link album, yang bisa dilindungi dengan sandi
 Kemampuan untuk membebaskan kapasitas, dengan menghilangkan files yang sudah di back-up dengan aman
-- Dukungan manusia, karena anda layak mendapatkannya
-- Deskripsi, sehingga anda dapat memberi keterangan pada memori anda dan menemukannya dengan mudah
+- Human support, because you're worth it
+- Descriptions, so you can caption your memories and find them easily
 - Editor gambar, untuk menyempurnakan fotomu
-- Favoritkan, sembunyikan, dan kenang kembali memori anda, karena itu sangat berharga
+- Favorite, hide and relive your memories, for they are precious
 - Pengimporan mudah dari Google, Apple, hard drive-mu, dan lainnya
-- Tema gelap, karena foto anda terlihat bagus di dalamnya
+- Dark theme, because your photos look good in it
 - Autentikasi dua atau tiga faktor dan autentikasi biometrik
 - dan BANYAK LAGI!
 

mobile/apps/photos/fastlane/metadata/ios/id/description.txt

@@ -6,20 +6,20 @@ Kami menyediakan app untuk semua platform, dan fotomu akan tersinkron di semua p
 
 Ente juga memudahkan kamu untuk membagikan album ke kerabatmu. Kamu bisa membagikannya secara langsung ke pengguna Ente lain, terenkripsi ujung ke ujung; atau dengan link yang dapat dilihat publik.
 
-Data terenkripsi kamu tersimpan di berbagai lokasi, termasuk di salah satu tempat pengungsian di Paris. Kami menanggapi keturunan anda dengan serius dan memudahkan untuk memastikan kenangan anda tetap ada setelah anda.
+Data terenkripsi kamu tersimpan di berbagai lokasi, termasuk di salah satu tempat pengungsian di Paris. We take posterity seriously and make it easy to ensure that your memories outlive you.
 
 Kami ingin membuat app foto yang paling aman sepanjang masa–jadi, bergabunglah dengan kami!
 
 FITUR
 - Pencadangan kualitas asli, karena setiap piksel berarti
 - Paket keluarga, sehingga kamu bisa bagikan kuota penyimpananmu dengan keluarga
-- Folder bersama, jika anda ingin pasangan anda menikmati hasil jepretan "Kamera" anda
+- Shared folders, in case you want your partner to enjoy your "Camera" clicks
 - Link album, yang bisa dilindungi dengan sandi dan diatur waktu kedaluwarsanya
-- Kemampuan untuk mengosongkan ruang, dengan menghapus file yang telah dicadangkan dengan aman
+- Ability to free up space, by removing files that have been safely backed up
 - Editor gambar, untuk menyempurnakan fotomu
-Favoritkan, sembunyikan, dan kenang kembali memori anda, karena itu sangat berharga
-Impor sekali klik dari semua penyedia penyimpanan utama
-Tema gelap, karena foto anda terlihat bagus di dalamnya
+- Favorite, hide and relive your memories, for they are precious
+- One-click import from all major storage providers
+- Dark theme, because your photos look good in it
 - Autentikasi dua atau tiga faktor dan autentikasi biometrik
 - dan BANYAK LAGI!
 
@@ -27,7 +27,7 @@ HARGA
 Kami tidak menyediakan paket yang gratis seumur hidup, karena penting bagi kami untuk tetap berdiri dan bertahan hingga masa depan. Namun, kami menyediakan paket yang terjangkau, yang bisa kamu bagikan dengan keluargamu. Kamu bisa menemukan informasi lebih lanjut di ente.io.
 
 DUKUNGAN
-Kami bangga dapat menawarkan dukungan manusia. Jika kamu adalah pelanggan berbayar, kamu bisa menghubungi team@ente.io dan menunggu balasan dari tim kami dalam 24 jam.
+We take pride in offering human support. Jika kamu adalah pelanggan berbayar, kamu bisa menghubungi team@ente.io dan menunggu balasan dari tim kami dalam 24 jam.
 
 KETENTUAN
 https://ente.io/terms

mobile/apps/photos/fastlane/metadata/playstore/id/full_description.txt

@@ -6,20 +6,20 @@ Kami menyediakan app untuk Android, iOS, Web, serta Desktop, dan fotomu akan ter
 
 Ente juga memudahkan kamu untuk membagikan album ke kerabatmu. Kamu bisa membagikannya secara langsung ke pengguna Ente lain, terenkripsi ujung ke ujung; atau dengan link yang dapat dilihat publik.
 
-Data terenkripsi kamu tersimpan di berbagai lokasi, termasuk di salah satu tempat pengungsian di Paris. Kami menanggapi keturunan anda dengan serius dan memudahkan untuk memastikan kenangan anda tetap ada setelah anda.
+Data terenkripsi kamu tersimpan di berbagai lokasi, termasuk di salah satu tempat pengungsian di Paris. We take posterity seriously and make it easy to ensure that your memories outlive you.
 
 Kami ingin membuat app foto yang paling aman sepanjang masa–jadi, bergabunglah dengan kami!
 
 ✨ FITUR
 -    Pencadangan kualitas asli, karena setiap piksel berarti
 -    Paket keluarga, sehingga kamu bisa bagikan kuota penyimpananmu dengan keluarga
-- Folder bersama, jika anda ingin pasangan anda menikmati hasil jepretan "Kamera" anda
+-    Shared folders, in case you want your partner to enjoy your "Camera" clicks
 -    Link album, yang bisa dilindungi dengan sandi dan diatur waktu kedaluwarsanya
-- Kemampuan untuk mengosongkan ruang, dengan menghapus file yang telah dicadangkan dengan aman
+-    Ability to free up space, by removing files that have been safely backed up
 -    Editor gambar, untuk menyempurnakan fotomu
-- Favoritkan, sembunyikan, dan kenang kembali memori anda, karena itu sangat berharga
+-    Favorite, hide and relive your memories, for they are precious
 -    Pengimporan mudah dari Google, Apple, hard drive-mu, dan lainnya
-- Tema gelap, karena foto anda terlihat bagus di dalamnya
+-    Dark theme, because your photos look good in it
 -    Autentikasi dua atau tiga faktor dan autentikasi biometrik
 -    dan BANYAK LAGI!
 
@@ -27,4 +27,4 @@ Kami ingin membuat app foto yang paling aman sepanjang masa–jadi, bergabunglah
 Kami tidak menyediakan paket yang gratis seumur hidup, karena penting bagi kami untuk tetap berdiri dan bertahan hingga masa depan. Namun, kami menyediakan paket yang terjangkau, yang bisa kamu bagikan dengan keluargamu. Kamu bisa menemukan informasi lebih lanjut di ente.io.
 
 🙋 DUKUNGAN
-Kami bangga dapat menawarkan dukungan manusia. Jika kamu adalah pelanggan berbayar, kamu bisa menghubungi team@ente.io dan menunggu balasan dari tim kami dalam 24 jam.
+We take pride in offering human support. Jika kamu adalah pelanggan berbayar, kamu bisa menghubungi team@ente.io dan menunggu balasan dari tim kami dalam 24 jam.

mobile/apps/photos/ios/Podfile.lock

@@ -181,8 +181,6 @@ PODS:
   - PromisesObjC (2.4.0)
   - receive_sharing_intent (1.8.1):
     - Flutter
-  - rive_common (0.0.1):
-    - Flutter
   - rust_lib_photos (0.0.1):
     - Flutter
   - SDWebImage (5.21.1):
@@ -293,7 +291,6 @@ DEPENDENCIES:
   - photo_manager (from `.symlinks/plugins/photo_manager/ios`)
   - privacy_screen (from `.symlinks/plugins/privacy_screen/ios`)
   - receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/ios`)
-  - rive_common (from `.symlinks/plugins/rive_common/ios`)
   - rust_lib_photos (from `.symlinks/plugins/rust_lib_photos/ios`)
   - sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
@@ -312,7 +309,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
@@ -421,8 +418,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/privacy_screen/ios"
   receive_sharing_intent:
     :path: ".symlinks/plugins/receive_sharing_intent/ios"
-  rive_common:
-    :path: ".symlinks/plugins/rive_common/ios"
   rust_lib_photos:
     :path: ".symlinks/plugins/rust_lib_photos/ios"
   sentry_flutter:
@@ -457,85 +452,84 @@ 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
+  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/Runner.xcodeproj/project.pbxproj

@@ -565,7 +565,6 @@
 				"${BUILT_PRODUCTS_DIR}/photo_manager/photo_manager.framework",
 				"${BUILT_PRODUCTS_DIR}/privacy_screen/privacy_screen.framework",
 				"${BUILT_PRODUCTS_DIR}/receive_sharing_intent/receive_sharing_intent.framework",
-				"${BUILT_PRODUCTS_DIR}/rive_common/rive_common.framework",
 				"${BUILT_PRODUCTS_DIR}/rust_lib_photos/rust_lib_photos.framework",
 				"${BUILT_PRODUCTS_DIR}/sentry_flutter/sentry_flutter.framework",
 				"${BUILT_PRODUCTS_DIR}/share_plus/share_plus.framework",
@@ -663,7 +662,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/photo_manager.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/privacy_screen.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/receive_sharing_intent.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/rive_common.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/rust_lib_photos.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sentry_flutter.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/share_plus.framework",

mobile/apps/photos/ios/Runner/Assets.xcassets/IconDuckyHuggingE.appiconset/Contents.json

@@ -1,38 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "IconDuckyHuggingEAny.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "IconDuckyHuggingEDark.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "tinted"
-        }
-      ],
-      "filename" : "IconDuckyHuggingETinted.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

mobile/apps/photos/lib/app.dart

@@ -142,7 +142,7 @@ class _EnteAppState extends State<EnteApp> with WidgetsBindingObserver {
             debugShowCheckedModeBanner: false,
             builder: EasyLoading.init(),
             locale: locale,
-            supportedLocales: appSupportedLocales,
+            supportedLocales: AppLocalizations.supportedLocales,
             localeListResolutionCallback: localResolutionCallBack,
             localizationsDelegates: const [
               ...AppLocalizations.localizationsDelegates,
@@ -164,7 +164,7 @@ class _EnteAppState extends State<EnteApp> with WidgetsBindingObserver {
           debugShowCheckedModeBanner: false,
           builder: EasyLoading.init(),
           locale: locale,
-          supportedLocales: appSupportedLocales,
+          supportedLocales: AppLocalizations.supportedLocales,
           localeListResolutionCallback: localResolutionCallBack,
           localizationsDelegates: const [
             ...AppLocalizations.localizationsDelegates,

mobile/apps/photos/lib/core/configuration.dart

@@ -28,7 +28,6 @@ import 'package:photos/services/favorites_service.dart';
 import "package:photos/services/home_widget_service.dart";
 import 'package:photos/services/ignored_files_service.dart';
 import "package:photos/services/machine_learning/face_ml/person/person_service.dart";
-import "package:photos/services/machine_learning/similar_images_service.dart";
 import 'package:photos/services/search_service.dart';
 import 'package:photos/services/sync/sync_service.dart';
 import 'package:photos/utils/file_uploader.dart';
@@ -197,7 +196,6 @@ class Configuration {
     await CollectionsDB.instance.clearTable();
     await MemoriesDB.instance.clearTable();
     await MLDataDB.instance.clearTable();
-    await SimilarImagesService.instance.clearCache();
 
     await UploadLocksDB.instance.clearTable();
     await IgnoredFilesService.instance.reset();

mobile/apps/photos/lib/core/error-reporting/super_logging.dart

@@ -5,10 +5,9 @@ import 'dart:io';
 
 import "package:dio/dio.dart";
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 import 'package:http/http.dart' as http;
 import 'package:intl/intl.dart';
-import 'package:log_viewer/log_viewer.dart';
 import 'package:logging/logging.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:path/path.dart';
@@ -189,15 +188,6 @@ class SuperLogging {
     Logger.root.level = kDebugMode ? Level.ALL : Level.INFO;
     Logger.root.onRecord.listen(onLogRecord);
 
-    if (_preferences.getBool("enable_db_logging") ?? kDebugMode) {
-      try {
-        await LogViewer.initialize(prefix: appConfig.prefix);
-        $.info("Log viewer initialized successfully");
-      } catch (e) {
-        $.warning("Failed to initialize log viewer: $e");
-      }
-    }
-
     if (isFDroidClient) {
       assert(
         sentryIsEnabled == false,
@@ -465,15 +455,4 @@ class SuperLogging {
     final pkgName = (await PackageInfo.fromPlatform()).packageName;
     return pkgName.startsWith("io.ente.photos.fdroid");
   }
-
-  /// Show the log viewer page
-  /// This is the main integration point for accessing the log viewer
-  static void showLogViewer(BuildContext context) {
-    Navigator.push(
-      context,
-      MaterialPageRoute(
-        builder: (context) => const LogViewerPage(),
-      ),
-    );
-  }
 }

mobile/apps/photos/lib/core/exceptions.dart

@@ -1,13 +0,0 @@
-// Common runtime exceptions that can occur during normal app operation.
-// These are recoverable conditions that should be caught and handled.
-
-class WidgetUnmountedException implements Exception {
-  final String? message;
-
-  WidgetUnmountedException([this.message]);
-
-  @override
-  String toString() => message != null
-      ? 'WidgetUnmountedException: $message'
-      : 'WidgetUnmountedException';
-}

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

@@ -1,4 +1,3 @@
-import "dart:io" show File;
 import "dart:typed_data" show Float32List;
 
 import "package:flutter_rust_bridge/flutter_rust_bridge.dart" show Uint64List;
@@ -13,8 +12,8 @@ import "package:shared_preferences/shared_preferences.dart";
 class ClipVectorDB {
   static final Logger _logger = Logger("ClipVectorDB");
 
-  static const _databaseName = "ente.ml.vectordb.clip.usearch";
-  static const _kMigrationKey = "clip_vectordb_migration";
+  static const _databaseName = "ente.ml.vectordb.clip";
+  static const _kMigrationKey = "clip_vector_migration";
 
   static final BigInt _embeddingDimension = BigInt.from(512);
 
@@ -37,28 +36,13 @@ class ClipVectorDB {
 
   Future<VectorDb> _initVectorDB() async {
     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 String databaseDirectory =
+        join(documentsDirectory.path, _databaseName);
+    _logger.info("Opening vectorDB access: DB path " + databaseDirectory);
+    final vectorDB = VectorDb(
+      filePath: databaseDirectory,
+      dimensions: _embeddingDimension,
+    );
     final stats = await getIndexStats(vectorDB);
     _logger.info("VectorDB connection opened with stats: ${stats.toString()}");
 
@@ -157,6 +141,17 @@ class ClipVectorDB {
     }
   }
 
+  Future<void> deleteIndex() async {
+    final db = await _vectorDB;
+    try {
+      await db.deleteIndex();
+      _vectorDbFuture = null;
+    } catch (e, s) {
+      _logger.severe("Error deleting index", e, s);
+      rethrow;
+    }
+  }
+
   Future<VectorDbStats> getIndexStats([VectorDb? db]) async {
     db ??= await _vectorDB;
     try {
@@ -283,40 +278,6 @@ class ClipVectorDB {
       rethrow;
     }
   }
-
-  Future<void> deleteIndex() async {
-    final db = await _vectorDB;
-    try {
-      await db.deleteIndex();
-      _vectorDbFuture = null;
-    } catch (e, s) {
-      _logger.severe("Error deleting index", e, s);
-      rethrow;
-    }
-  }
-
-  Future<void> deleteIndexFile({bool undoMigration = false}) async {
-    try {
-      final documentsDirectory = await getApplicationDocumentsDirectory();
-      final String dbPath = join(documentsDirectory.path, _databaseName);
-      _logger.info("Delete index file: DB path " + dbPath);
-      final file = File(dbPath);
-      if (await file.exists()) {
-        await file.delete();
-      }
-      _logger.info("Deleted index file on disk");
-      _vectorDbFuture = null;
-      if (undoMigration) {
-        final prefs = await SharedPreferences.getInstance();
-        await prefs.setBool(_kMigrationKey, false);
-        _migrationDone = false;
-        _logger.info("Undid migration flag");
-      }
-    } catch (e, s) {
-      _logger.severe("Error deleting index file on disk", e, s);
-      rethrow;
-    }
-  }
 }
 
 class VectorDbStats {