Fix release signing and unify "+" upload with the share-intent path

- Release builds now sign with a dedicated keystore (local
  android/key.properties or CI secrets, both gitignored) instead of each
  machine's own debug key, so a downloaded release APK can actually
  update a previous install instead of failing with "App not installed"
  (mismatched signature).
- The Files tab's "+" -> "Upload File" now goes through the same
  ShareUploadView destination picker and background foreground-service
  upload as receiving a file via Android's "Share to..." sheet, instead
  of a separate blocking in-app-only upload path. Removed the
  now-unused ServerProvider/NextcloudService.uploadFileFromPath.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

.claude/context/architecture.md

@@ -10,12 +10,12 @@ lib/
                        # SavedAccount, AppTab, ...)
   providers/           # ServerProvider — the single app-wide ChangeNotifier
   services/             # network/IO: NextcloudService, LoginFlowService,
-                         # AccountStore
+                         # AccountStore, AppLockService
   theme/                 # AppTheme (Material 3 ThemeData)
   views/                  # one screen each (FilesView, PhotosView, TrashView,
                            # SharesView, RecentView, ActivityView, SearchView,
                            # AccountView, LoginView, FileViewerScreen,
-                           # ShareUploadView)
+                           # ShareUploadView, LockScreenView)
   widgets/                 # reusable pieces shared across views
     details/                # the file-details bottom sheet and its tabs
 ```
@@ -54,9 +54,23 @@ There is exactly one `ChangeNotifier`: [`ServerProvider`](../../lib/providers/se
 - UI settings that persist across launches — split into **global** (theme
   mode, seed color, dynamic-color toggle, bottom-bar opacity/blur,
   tap-tab-to-scroll-top, seek bar style, tab order/visibility/default, swipe
-  actions) and **per-account** (grid/list view, favorites-only, show-hidden,
+  actions, login lock — see below) and **per-account** (grid/list view,
-  storage scope, Photos sort, Files' per-folder sort map, cache policy) — see
+  favorites-only, show-hidden, storage scope, Photos sort, Files'
-  `server.md` for exactly which is which and why
+  per-folder sort map, cache policy) — see `server.md` for exactly which is
+  which and why
+- **Login lock** (`loginLockEnabled`/`lockAccountSwitching`/
+  `lockHiddenFiles`/`needsUnlock`): an app-wide PIN/biometric gate via
+  `AppLockService` (a thin wrapper over `local_auth` — this app never
+  stores or hashes a PIN itself, it delegates entirely to whatever
+  credential the OS already has configured). `needsUnlock` is
+  `loginLockEnabled && !_isUnlocked`, where `_isUnlocked` is transient
+  (never persisted) and reset to `false` on every backgrounding
+  (`didChangeAppLifecycleState`, `AppLifecycleState.paused`) so the lock has
+  real value rather than only firing once per cold start. `switchAccount`/
+  `cycleToNextAccount`/`cycleToPreviousAccount` and *enabling* (not
+  disabling) `showHiddenFiles`/`showHiddenPhotos` each call the shared
+  `_passGate` helper, which no-ops unless both `loginLockEnabled` and the
+  relevant per-feature toggle are on.
 
 New **global** state belongs on `ServerProvider` as a private field + getter
 + a method that mutates it, calls `notifyListeners()`, and persists via
@@ -70,7 +84,7 @@ split.
 
 There's no separate repository/data layer: views call `ServerProvider`
 methods directly, which call `NextcloudService`/`LoginFlowService`/
-`AccountStore`.
+`AccountStore`/`AppLockService`.
 
 ## Navigation / screen flow
 
@@ -85,26 +99,97 @@ state, no named routes:
   Flow v2) — `isLoggedIn` is only ever false here or after the last saved
   account is removed; switching between multiple saved accounts never
   routes through this screen (see `server.md`)
+- else `provider.needsUnlock` → `LockScreenView` (login lock — see above)
 - else `MainShellView`
 
-`MainShellView` is a bottom-nav `IndexedStack` over up to 6 tabs — Files,
+`MainShellView` is a bottom-nav `IndexedStack` over up to 7 tabs — Files,
-Photos, Activity, Trash, Shares, Recent — user-configurable (order,
+Photos, Favorites, Activity, Trash, Shares, Recent — user-configurable
-visibility up to `maxVisibleTabs`, default tab) via `AppTab`/`ServerProvider`
+(order, visibility up to `maxVisibleTabs`, default tab) via
-and rendered through `buildAppTabView` (`widgets/app_tab_view_builder.dart`).
+`AppTab`/`ServerProvider` and rendered through `buildAppTabView`
+(`widgets/app_tab_view_builder.dart`). `maxVisibleTabs` (5) is less than the
+total tab count, and `ServerProvider._enforceMaxVisibleTabs` already
+auto-hides overflow on load (fresh install, or - as when Favorites was
+added - an existing saved tab order from before a new tab existed), so
+adding a tab to the `AppTab` enum needs no extra migration.
 Each tab keeps its own `ScrollController` (survives tab switches via
 `IndexedStack`'s built-but-hidden trees) and tapping the already-active tab
 scrolls it back to top (`tapTabToScrollTop` setting). `MainShellView` also
-owns the app's share-intent listener (`receive_sharing_intent`): both
+owns the app's share-intent listener (`ShareIntentService`, backed by
-`getInitialMedia()` (cold start via another app's "Share to...") and
+hand-rolled native handling in `MainActivity.kt` - see `server.md` for why
-`getMediaStream()` (already running) push `ShareUploadView`.
+this isn't the `receive_sharing_intent` plugin): both `getInitialShare()`
+(cold start via another app's "Share to...") and `onNewShare` (already
+running) push `ShareUploadView`. `FilesView`'s own "+" → "Upload File"
+(`_pickAndUploadFile`) reaches the exact same `ShareUploadView` screen
+through the same `SharedFileRef`-based path (wrapping `file_picker`'s
+result `Uri`s instead of a share intent's) rather than a separate
+in-app-only upload, so both entry points get the same destination picker
+and the same durable background-service upload. It similarly owns the pick-intent listener
+(`PickIntentService` - see `server.md` for the full "being picked by
+another app" story) that feeds `ServerProvider.pickRequest`; while
+`isPicking`, the visible tab list is overridden to just Files and Photos
+regardless of the user's own hidden/reordered tab settings, since those
+are the only two views that know how to handle a picking-mode tap and the
+only two that make sense as external "choose a file" sources.
+`MainShellView` also fires a one-time notification-permission prompt on
+its first mount (`_maybeRequestNotificationPermission`, gated by a plain
+`shared_preferences` flag so it only ever asks once, not on every
+launch): a plain-language `AlertDialog` explaining why Noo wants it
+(upload/download progress notifications - see `ShareUploadService.kt`/
+`DownloadService.kt`) before the OS's own `permission_handler`-driven
+`Permission.notification.request()`, since the bare system prompt gives
+no context on its own.
 
-Five of the six tabs (all but Files) plus each tab's own controls share
+`FloatingBottomNavBar` (`widgets/floating_bottom_bar.dart`) wraps its
+pill's item row in a horizontal `SingleChildScrollView` rather than a
+plain `Row`, so a wide selected-item label plus several icon-only tabs
+scrolls instead of overflowing on narrower screens.
+
+All six tabs, plus `ShareUploadView` (the share-to-upload destination
+picker, pushed rather than a tab - see below), share
 [`SyncedHeaderScaffold`](../../lib/widgets/synced_header_scaffold.dart) — a
 `CustomScrollView` with a pull-down "sync status" header (Google
 Photos-style) and a classic Material refresh spinner shown during a
-pull-triggered sync. `SearchView`, `AccountView` (Settings), the
+pull-triggered sync. `ShareUploadView` mirrors the Files tab's own
-file-details sheet, the share sheet, and `ShareUploadView` (the
+controls-row/breadcrumbs sticky header almost exactly, so arriving via
-share-to-upload destination picker) are pushed on top via
+another app's "Share to..." sheet still lands on the same top chrome
+instead of a plain `AppBar` - its `actions` are `[ProfileAvatarButton()]`
+only (no `MoreTabsButton`: there's nowhere useful for it to go mid-upload,
+since jumping to another tab would abandon the destination picker);
+backing out is the system back gesture/button, not a bespoke close icon in
+the app bar. Its bottom action - "Upload to
+{folder}" - and the uploading-file-name summary above it (single line,
+auto-scrolling via `MarqueeTitle` if it doesn't fit) live together in one
+rounded-top, elevated `Material` bar as `bottomNavigationBar`, reading as a
+sheet peeking up from the bottom edge rather than a plain flat bar.
+[`MarqueeTitle`](../../lib/widgets/marquee_title.dart) (`package:marquee`) is
+shared with `FileViewerScreen`'s title - falls back to a plain ellipsized
+`Text` when the content already fits, so short text never marquees.
+
+The Move/Copy destination picker
+([`MoveCopyDestinationPicker`](../../lib/views/move_copy_destination_picker.dart),
+pushed from Files/Photos' selection toolbar - see `server.md` for the
+backend side) visually mirrors `ShareUploadView`'s browser the same way,
+but is a deliberately different case for state: it does **not** reuse
+`ServerProvider`'s shared `currentFolderPath`/`pathStack`/`items`, and
+owns its own local navigation state instead, fetching through the
+stateless `ServerProvider.fetchFolderListing`/`applyFilesDisplayPrefs`
+pair. `ShareUploadView` can get away with hijacking the shared state
+because it always resets to root on entry and pops all the way to the
+app's root route on completion - fine for a cold share-intent launch with
+no prior browsing session to preserve. The Move/Copy picker is pushed
+*while the user is actively browsing a specific Files-tab folder*, so
+reusing the shared state would strand that folder's `pathStack` under it;
+its local state means popping back always lands the user exactly where
+they were, untouched.
+`SearchView`, `AccountView` (Settings), the file-details sheet, and the
+share sheet are pushed on top via
 `Navigator`/`showModalBottomSheet`/`showGradualBottomSheet` rather than
 being tabs. `ProfileAvatarButton` (top-right on every tab) opens Settings on
 tap and cycles between saved accounts on a vertical swipe.
+
+Files and Photos (the two tabs with multi-select) pass their selection
+toolbar into `SyncedHeaderScaffold`'s `selectionBar` param rather than
+rendering it as a second sliver app bar inside their own content: while
+non-null, it fully takes over the pinned top bar in place of the
+sync-status chip/`actions`/pull-to-reveal quota panel, so selecting reads
+as replacing the whole top chrome rather than adding a strip beneath it.

.claude/context/server.md

@@ -9,12 +9,32 @@ via [`LoginFlowService`](../../lib/services/login_flow_service.dart):
 1. `LoginFlowService.initiate(serverUrl)` POSTs to
    `{server}/index.php/login/v2`, gets back a browser login URL + a poll
    endpoint/token.
-2. The app opens the login URL in a Chrome Custom Tab (`url_launcher`,
+2. The app opens the login URL for the user to authenticate/authorize in
-   `LaunchMode.inAppBrowserView` — real Chrome, so saved passwords/autofill
+   [`LoginWebViewView`](../../lib/views/login_webview_view.dart), a normal
-   work, unlike Flutter's own embedded web view); the user authenticates and
+   screen this app owns (`package:webview_flutter`) - pushed by `LoginView`
-   authorizes there. There's no way to close the tab automatically on
+   the moment `loginFlowStatus` flips to `awaitingBrowser`, for every login
-   success (Login Flow v2 never redirects back into the app, and a Custom
+   (first account or an additional one), not just add-account. This used
-   Tab belongs to Chrome's own task) — the user switches back manually.
+   to be split: first login went through a Chrome Custom Tab
+   (`url_launcher`, `LaunchMode.inAppBrowserView`) for Chrome's own
+   autofill, and only add-account used the embedded WebView, specifically
+   to avoid a Custom Tab silently reusing Chrome's existing session for a
+   different account. But a Custom Tab has real costs even for the first
+   login - no way to close it automatically on success (the user has to
+   switch back manually), and it's a separate task outside this app's own
+   navigation entirely - so both paths now use the same owned screen.
+   `url_launcher` is no longer a dependency. The cost is no
+   Chrome-autofill (Android's own system Autofill framework, e.g. a
+   password manager, may still work in the WebView; Chrome's own
+   saved-password autofill specifically cannot, since that's Chrome-only).
+   `LoginWebViewView` also clears cookies (`WebViewCookieManager().
+   clearCookies()`) before every load, not just once - Android's WebView
+   `CookieManager` is a single store shared/persisted across every WebView
+   instance in the app process, not scoped per-controller, so without this
+   a second/"Add Account" login silently reuses whichever account's
+   Nextcloud session cookie is already there instead of prompting for
+   credentials (the same class of bug the Custom-Tab-reuse issue above
+   was, just recurring one layer down once everything moved to the owned
+   WebView).
 3. `ServerProvider` polls `LoginFlowService.poll(pollEndpoint, token)` every
    2 seconds (`Timer.periodic`, see `_pollTimer`/`_pollTimeoutTimer` in
    `server_provider.dart`) until it gets a 200 with `server`/`loginName`/
@@ -56,25 +76,175 @@ rather than needing a rewrite for multi-account support.
 - **Everything else** (shares, activity, trash, favorites, quota, user info,
   file versions) goes through Nextcloud's OCS APIs (`/ocs/v2.php/...`), JSON
   in, with the `OCS-APIRequest: true` header required on every OCS call.
+  *Toggling* a favorite is OCS; *listing* every favorite (`fetchFavorites`,
+  for the Favorites tab) is WebDAV instead - the same `SEARCH` mechanism
+  `fetchAllMedia`/`fetchRecentFiles` use, filtered by `oc:favorite` instead
+  of mimetype/date. Favorites is a real tab
+  (`views/favorites_view.dart`/`ServerProvider.favoriteItems`/
+  `fetchAllFavorites`/`_allFavorites`), not a filter toggle scoped to
+  whatever folder the Files tab happens to be browsing (that's what it
+  used to be - see the note below on why that didn't work). It shares
+  Files' own sort/hidden/storage-scope/grid-list display prefs
+  (`applyFilesDisplayPrefs`, also used by the Move/Copy destination
+  picker) rather than a separate parallel settings dimension. Tapping a
+  favorited folder switches to the Files tab, navigated there
+  (`navigateToAbsoluteFolder` + `requestTab`); a favorited file opens
+  directly from the Favorites tab itself. `deleteItem`/`renameItem`/move/
+  copy all re-sync `_allFavorites` afterward via `_syncFavoritesIfLoaded`
+  (only once Favorites has actually been opened this session, tracked by
+  `_favoritesEverFetched`, so those actions don't pay for an extra request
+  on every edit for an account that's never visited the tab) since none of
+  them know how to patch `_allFavorites` in place the way
+  `toggleItemFavorite` does (added/removed/updated by id, right inline).
+  **Note**: this used to be a "favorites-only" filter toggle on the Files
+  tab's controls row instead of its own tab, filtering the currently
+  browsed folder's `_items`. That had two real bugs in sequence: first,
+  the filter dropped every non-favorited item *including folders*, so a
+  non-favorited folder (containing a favorited item nested inside)
+  vanished from the listing entirely, with no way to navigate into it;
+  fixing that by exempting folders from the filter was itself wrong,
+  because the actual intent was for favorites-only to show every
+  favorited item *account-wide*, not just direct children of whatever
+  folder was open - a strict filter over the wrong scope. Converting it to
+  a real tab, backed by an account-wide fetch, was the actual fix; keep
+  favorites account-wide rather than reintroducing a current-folder-scoped
+  filter.
 - Auth header is HTTP Basic (`username:appPassword`, base64), built in
   `_headers`/exposed as `authHeaders` for widgets that need to hit URLs
   directly (e.g. `Image.network(url, headers: service.authHeaders)` for
   thumbnails/previews).
-- Downloads stream through `Dio` (`downloadToFile`) for progress callbacks;
+- `NextcloudService.downloadToFile` (`Dio`, progress callbacks) is still
-  small in-app previews (text/PDF) use `fetchBytes` via `package:http`.
+  used for small in-app-only downloads: text/PDF previews (`fetchBytes` via
+  `package:http`) and "open externally" (`FileViewerScreen._downloadToTemp`
+  streams to the app's own cache dir so `open_file` can hand it to another
+  app). Explicitly saving a file **to the device** - the "Download" action
+  in Files/Photos' selection toolbar and the media viewer's download button
+  - instead hands off to `DownloadService.kt`, an Android foreground
+  service, the same way "Share to Noo" hands its upload off to
+  `ShareUploadService.kt` (see that section below) rather than downloading
+  in Dart and prompting `file_saver` per file: a real Service survives the
+  app being closed mid-download, with one cancellable notification for the
+  whole batch. `DownloadService.kt` re-implements a plain WebDAV GET in
+  Kotlin for the same reason `ShareUploadService.kt`'s PUT does - keep
+  `NextcloudService.downloadToFile` in sync manually if download semantics
+  change - and writes straight into the device's public Downloads
+  collection via `MediaStore.Downloads` (API 29+; a background Service
+  can't prompt `file_saver`'s SAF picker the way the Flutter/Activity side
+  can, so this is the direct equivalent) with a legacy
+  `Environment.DIRECTORY_DOWNLOADS` file-write fallback pre-Android-10.
+  Folders are filtered out client-side before handing off (no recursive/
+  zip download support); `DetailsVersionsTab`'s version-restore download
+  and `ShareSheet`'s "Share file directly" (native OS share, not saved to
+  Downloads) keep using `downloadToFile` directly instead, since both need
+  the bytes in-app rather than saved to Downloads.
+- **Move/Copy** (`moveItem`/`copyItem(itemPath, destFolderPath, {overwrite,
+  newName})`) share one private `_moveOrCopy` helper with `renameItem`
+  (itself just a same-folder MOVE) - WebDAV `MOVE`/`COPY` are the same
+  request shape, just a different verb, and both are recursive by default
+  for a folder ("collection"), so no extra `Depth` header is needed. They
+  return the raw HTTP status rather than a bool: `412 Precondition Failed`
+  is WebDAV's standard signal for "something's already there" when
+  `Overwrite: F`, which is exactly the conflict `ServerProvider.moveItems`/
+  `copyItems` need to detect without a separate existence-check request
+  per item. `ServerProvider` attempts every item in the batch first,
+  collects conflicts into `MoveCopyResult.conflicts`
+  (`models/move_copy_result.dart`), and only then shows one summary
+  (`MoveCopyConflictSheet`) instead of prompting per conflict as they're
+  hit; resolving picks overwrite/keep-both (auto-renamed via
+  `_nextAvailableName` against a fresh listing of the destination, fetched
+  once up front, not per item)/skip per item via `resolveConflicts`. The
+  destination-picker screen behind this
+  (`views/move_copy_destination_picker.dart`) is covered in
+  `architecture.md`, including why it can't reuse the Files tab's shared
+  navigation state the way `ShareUploadView` does.
 - **Uploads** (`uploadFileFromPath(folderPath, fileName, localFilePath,
   {onProgress})`) stream the local file via `Dio().put()` with an explicit
   `Content-Length` and `onSendProgress`, mirroring the download path. The
   `ServerProvider` wrapper always uploads into `_currentFolderPath` — the
   share-to-upload flow (`ShareUploadView`) gets a caller-chosen destination
   by navigating there first (`navigateToAbsoluteFolder`), then uploading.
-- **Receiving a shared file from another app**: `receive_sharing_intent`
+- **Receiving a shared file from another app**: hand-rolled in
-  (Android `ACTION_SEND`/`ACTION_SEND_MULTIPLE`, `android:launchMode`
+  `MainActivity.kt` (Android `ACTION_SEND`/`ACTION_SEND_MULTIPLE`,
-  `singleTask` in the manifest so a second share while running hits
+  `android:launchMode` `singleTask` in the manifest so a second share while
-  `onNewIntent` instead of spawning a new instance). `MainShellView` listens
+  running hits `onNewIntent` instead of spawning a new instance) plus
-  via `getInitialMedia()`/`getMediaStream()` and pushes `ShareUploadView`,
+  [`ShareIntentService`](../../lib/services/share_intent_service.dart) on
-  which reuses the same `uploadFileFromPath` path after the user picks a
+  the Dart side - not the `receive_sharing_intent` plugin, which this used
-  destination folder.
+  to be. That plugin resolves a shared `content://` Uri by synchronously
+  copying the *entire* file into the cache dir on the main thread during
+  activity startup; for a large file that blocks long enough that Android
+  kills the newly-launched activity for failing to draw a first frame,
+  dropping the user straight back to the home screen with no error and no
+  Dart code ever running. `MainActivity.kt`'s doc comment has the full
+  story. The fix: `getInitialShare`/`onNewShare` only ever query cheap Uri
+  metadata (name/size/mime, not content) so `ShareUploadView`'s destination
+  picker - which mirrors the Files tab's own controls/filters/listing,
+  reusing the same `ServerProvider` fields and `widgets/item_icon.dart` -
+  always appears instantly regardless of file size.
+- **Uploading a shared file**: once the user picks a destination in
+  `ShareUploadView`, [`UploadService`](../../lib/services/upload_service.dart)
+  hands the whole batch off to `ShareUploadService.kt`, an Android
+  foreground service, rather than uploading from Dart in that screen. This
+  is deliberate, not just an implementation detail: the point is that
+  closing the app right after confirming a destination doesn't interrupt
+  the upload, the same guarantee a real file-manager app's upload
+  notification gives you - a plain Dart `Future` (even one kept alive by a
+  singleton service class) stops running once the Flutter engine/Activity
+  are gone, only an actual Android `Service` survives that. The service
+  re-implements the WebDAV PUT itself in Kotlin (`HttpURLConnection`, no
+  new HTTP dependency) since it can't reach the Dart-side `NextcloudService`/
+  Dio from a separate process lifecycle - `UploadService.startUpload` passes
+  everything the Kotlin side needs (the pre-built `Authorization` header
+  from `NextcloudService.authHeaders`, not the raw password) as Intent
+  extras, a one-way handoff with no channel back to Dart afterward. Keep
+  the two upload implementations in sync manually if upload semantics
+  change. Progress/cancellation is entirely notification-driven (one
+  ongoing, updatable notification for the whole batch; its Cancel action
+  re-delivers an Intent to the same running service instance, which an
+  `AtomicBoolean` the copy/upload loops poll) - there's no plumbing back to
+  the Dart UI, by design, since the app may not even be running.
+
+## Being picked by other apps (photo/file picker)
+
+Noo can also be launched *by* another app as a `GET_CONTENT` picker (e.g.
+Google Drive/Instagram's "choose a file" flow), the reverse direction of
+"Share to Noo" above - hand-rolled the same way, not a plugin.
+
+- `MainActivity.kt` matches `ACTION_GET_CONTENT` (`OPENABLE`, any
+  mimeType - a single `*/*` filter, since Android matches it against
+  whatever the caller actually requested) alongside its existing
+  `ACTION_SEND`/`SEND_MULTIPLE` filters, and exposes the caller's requested
+  mimeType/multi-select flag/app label via the
+  `dev.ayushya.noo/pick_intent` method+event channel pair
+  ([`PickIntentService`](../../lib/services/pick_intent_service.dart)/
+  [`PickRequest`](../../lib/models/pick_request.dart)) - same
+  cold-start-vs-already-running split as the share-intent channels.
+- `ServerProvider.pickRequest`/`isPicking` drive picking mode app-wide once
+  `MainShellView` learns about a request at startup or via
+  `onNewPickRequest`. While picking, `MainShellView` restricts the visible
+  bottom-nav tabs to just Files and Photos (see `architecture.md`) -
+  `FilesView`/`PhotosView` route taps through
+  `itemMatchesPickFilter`/`confirmPick` instead of their normal
+  open/select behavior (folders still navigate; a mime-mismatched file is
+  rejected with a snackbar; matching files toggle-select or immediately
+  confirm depending on `PickRequest.allowMultiple`).
+- `ServerProvider.confirmPick` downloads the selected item(s) to a
+  `picker/` scratch subfolder in the app's cache dir (`downloadToFile`,
+  same as any other download) - each item into its own `picker/<item.id>/`
+  subfolder, keeping the on-disk filename as plain `item.name` rather than
+  prefixing it with the id to dodge collisions between same-named items;
+  the caller reads that on-disk name back as the display name, so
+  prefixing it there was a real bug (Drive showing e.g. `163332_photo.jpg`
+  instead of `photo.jpg`) - then hands the local paths to
+  `PickIntentService.finishPick`, which calls back into
+  `MainActivity.kt.finishPick`: it wraps each file in a `content://` Uri
+  via this app's own `FileProvider` (`${applicationId}.picker.fileprovider`,
+  scoped to just that cache subfolder - see `android/app/src/main/res/xml/
+  file_paths.xml`) and returns it to the caller via `setResult`. Single
+  file uses `setDataAndType` (never `.data =`/`.type =` as two separate
+  calls - each one silently nulls out the other field on a plain
+  `Intent`); multiple files use `ClipData`. `cancelPick` mirrors this for
+  backing out (system back while picking, or a picked-item mismatch) with
+  `RESULT_CANCELED` instead.
 
 ## Multi-account storage & session persistence
 
@@ -121,9 +291,53 @@ account is *currently* live (see `architecture.md`).
   its credentials and refetch everything. This is a full teardown-and-reload
   every time — there is deliberately no simultaneous multi-account state or
   background sync; only one account's content is ever live.
-- `logout()` is just `removeAccount(activeAccountId)` — with other accounts
+- **`logout()` vs `removeAccount()`** are deliberately different actions,
-  saved it falls back to one of them instead of ending the session;
+  both funneling into a shared `_deactivateSession()` helper for the
-  `isLoggedIn` only ever becomes `false` when the *last* account is removed.
+  teardown/pointer-clearing part:
+  - `logout()` ends the active session but keeps the account itself fully
+    intact (password, prefs, its entry in `accounts` all untouched) —
+    always lands on `LoginView` even if other accounts are saved (it does
+    *not* fall back to one of them the way `removeAccount` does). This
+    exists so `LoginView` can offer a "Continue as ..." one-tap resume list
+    (`_SavedAccountsSection` in `login_view.dart`) with no Login Flow v2
+    needed - logging out must never be mistaken for forgetting an account.
+  - `removeAccount(id)` deletes everything for that account (secure-storage
+    password, namespaced prefs, its `accounts` entry) and, only if it was
+    the active one, falls back to another saved account or - if none
+    remain - calls the same `_deactivateSession()`. This is the only path
+    (besides `logout()`) that can set `isLoggedIn` false, and the only one
+    that's actually destructive/irreversible - UI call sites (`AccountView`)
+    gate it behind a confirmation dialog; `logout()` doesn't need one.
+  - Any UI code that calls either and might have ended the session should
+    check `!provider.isLoggedIn` afterward and `Navigator.popUntil((r) =>
+    r.isFirst)` if so — otherwise a screen pushed on top (Settings) is left
+    stranded over a root route that's silently swapped to `LoginView`
+    underneath it. Don't pop unconditionally — removing a *non-active*
+    account, or one that fell back to another, keeps the user logged in and
+    Settings should just stay open.
+
+## App lock (login lock)
+
+An orthogonal, app-wide security layer on top of the Nextcloud
+login/session above — not account credentials, just a gate on *using* the
+app. [`AppLockService`](../../lib/services/app_lock_service.dart) wraps
+`local_auth`; this app never implements its own PIN entry/storage/hashing —
+`authenticate()` always delegates to whatever the OS already has configured
+(biometric, or device PIN/pattern/password as fallback, via
+`biometricOnly: false`). Never build a custom in-app PIN screen for this —
+extend `AppLockService`/the `ServerProvider` gates described in
+`architecture.md` instead.
+
+**Android native requirements** (both already done, keep them if you touch
+these files): `MainActivity.kt` must extend `FlutterFragmentActivity`, not
+the default `FlutterActivity` — `local_auth`'s Android implementation hosts
+its prompt via a Fragment and silently fails to build/crashes without it.
+`AndroidManifest.xml` needs `<uses-permission
+android:name="android.permission.USE_BIOMETRIC"/>` (also declared by the
+plugin's own manifest via merge, but kept explicit here too).
+`android/app/build.gradle.kts` floors `minSdk` at 24 (`local_auth_android`'s
+own requirement) via `maxOf(24, flutter.minSdkVersion)` rather than trusting
+Flutter's own default to already be high enough.
 
 `isRestoringSession` still gates the splash screen until the above resolves
 — see `standards.md` for why widget tests must mock both storage channels

.claude/context/standards.md

@@ -66,6 +66,38 @@ class/method already makes obvious.
   of failing fast. See `test/widget_test.dart` for the reference setup.
 - Run with `flutter test`.
 
+## Local install/deploy
+
+Never use `flutter install` to push a build to a test device — it always
+does a full **uninstall-then-install** (prints "Uninstalling old
+version..."), and Android deletes all app data (SharedPreferences, secure
+storage — every saved account/preference) on uninstall. This wipes the app
+clean on every single deploy, which looks like an account/settings-loss bug
+but is actually just the install method.
+
+Instead, build then install with `adb`'s replace flag, which updates the
+APK in place and preserves app data:
+
+```bash
+flutter build apk --release
+adb install -r build/app/outputs/flutter-apk/app-release.apk
+```
+
+This only preserves data if the new APK's signature matches what's already
+on the device. `android/app/build.gradle.kts` picks a release signing key
+in this order: a local `android/key.properties` (gitignored — points at a
+gitignored keystore file, e.g. `android/app/release-keystore.jks`), then
+CI env vars (`RELEASE_KEYSTORE_PATH`/`_PASSWORD`, `RELEASE_KEY_ALIAS`/
+`_PASSWORD`, set by `.gitea/workflows/build.yml` from repo secrets), then
+falls back to the debug key if neither is configured. As long as the same
+dedicated release keystore backs both `key.properties` locally and the
+Gitea secrets, local release builds and CI-built release APKs share one
+signature, so `adb install -r` works cleanly either way. A local checkout
+with no `key.properties` set up falls back to the (per-machine, ungitted)
+debug key, which won't match a CI-signed APK — installing one over the
+other still forces a full uninstall, since there's no way around Android's
+signature check from the tooling side.
+
 ## Dependencies
 
 Networking is deliberately split: `package:http` for simple JSON/XML

.claude/context/styling.md

@@ -36,6 +36,20 @@ widgets. Key points:
 
 ## Reusable chrome
 
+- [`getItemIcon`/`getIconColor`/`ItemThumbnail`](../../lib/widgets/item_icon.dart)
+  — the icon/color/thumbnail treatment for a file or folder, shared by any
+  screen that lists `NextcloudItem`s the way the Files tab does (currently
+  `files_view.dart` and `share_upload_view.dart`'s destination picker).
+  Extend this rather than re-deriving per-type icons/colors at a new call
+  site.
+- [`DetailsHeader`](../../lib/widgets/details/details_sheet.dart) — the
+  icon-box/name/meta row every per-item bottom sheet opens on
+  (`DetailsSheet`, the media viewer's collapsed peek state, and
+  `ShareSheet`). Takes a `padding` override for callers whose own scroll
+  view already applies horizontal insets (`ShareSheet`'s `ListView`), so it
+  doesn't get doubled up. Reuse this instead of a bare title `Text` for any
+  new per-item sheet - a plain title reads as under-designed next to the
+  other sheets (a real instance: `ShareSheet` used to be just that).
 - [`FrostedGlassContainer`](../../lib/widgets/frosted_glass_container.dart) —
   the blurred/translucent pill background shared by all floating chrome
   (bottom nav bar, media-viewer top/bottom bars and video transport
@@ -81,3 +95,10 @@ widgets. Key points:
   exception, since those colors are content-identity cues, not theme).
 - Use `colorScheme.surfaceContainer*`/`onSurfaceVariant` tokens for
   elevation/secondary text rather than manual opacity on black/white.
+- **Anywhere the app shows its own icon in-app** (splash, lock screen,
+  login screen) uses `assets/icon/app_icon_monochrome.png` — a plain white
+  silhouette on transparent, tinted via `ColorFiltered(colorFilter:
+  ColorFilter.mode(colorScheme.onSurface, BlendMode.srcIn), ...)` so it
+  reads correctly in both light and dark mode. Never the full-color
+  `app_icon.png`/adaptive-icon assets for in-app UI — those are for the
+  launcher icon only (`flutter_launcher_icons` in `pubspec.yaml`).

.gitea/workflows/build.yml

@@ -43,8 +43,22 @@ jobs:
       - name: Analyze
         run: flutter analyze
 
+      - name: Decode release keystore
+        # Keeps every release build - regardless of which runner built it -
+        # signed with the same key, so downloaded updates install cleanly
+        # over a previous release instead of failing with "App not
+        # installed" (mismatched signature). See android/app/build.gradle.kts.
+        run: echo "$RELEASE_KEYSTORE_BASE64" | base64 -d > "${{ runner.temp }}/release-keystore.jks"
+        env:
+          RELEASE_KEYSTORE_BASE64: ${{ secrets.RELEASE_KEYSTORE_BASE64 }}
+
       - name: Build release APK
         run: flutter build apk --release
+        env:
+          RELEASE_KEYSTORE_PATH: ${{ runner.temp }}/release-keystore.jks
+          RELEASE_KEYSTORE_PASSWORD: ${{ secrets.RELEASE_KEYSTORE_PASSWORD }}
+          RELEASE_KEY_ALIAS: ${{ secrets.RELEASE_KEY_ALIAS }}
+          RELEASE_KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }}
 
       - name: Rename APK to Noo-<version>.apk
         run: |

android/.gitignore

@@ -4,6 +4,7 @@ gradle-wrapper.jar
 /gradlew
 /gradlew.bat
 /local.properties
+/build/
 GeneratedPluginRegistrant.java
 .cxx/
 
@@ -12,3 +13,4 @@ GeneratedPluginRegistrant.java
 key.properties
 **/*.keystore
 **/*.jks
+RELEASE_SIGNING_SECRETS.txt

android/app/build.gradle.kts

@@ -1,9 +1,35 @@
+import java.util.Properties
+
 plugins {
     id("com.android.application")
     // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
     id("dev.flutter.flutter-gradle-plugin")
 }
 
+// Release signing: prefer a local android/key.properties (gitignored, for
+// a developer machine that has the release keystore), then CI env vars
+// (set by .gitea/workflows/build.yml from repo secrets), then null - which
+// falls back to debug signing below so an unconfigured checkout still
+// builds/runs fine, same as before this existed.
+val releaseKeystoreProperties = Properties().apply {
+    val propsFile = rootProject.file("key.properties")
+    if (propsFile.exists()) propsFile.inputStream().use { load(it) }
+}
+
+fun releaseSigningValue(propertyKey: String, envKey: String): String? =
+    releaseKeystoreProperties.getProperty(propertyKey) ?: System.getenv(envKey)
+
+val releaseStoreFile = releaseSigningValue("storeFile", "RELEASE_KEYSTORE_PATH")
+val releaseStorePassword = releaseSigningValue("storePassword", "RELEASE_KEYSTORE_PASSWORD")
+val releaseKeyAlias = releaseSigningValue("keyAlias", "RELEASE_KEY_ALIAS")
+val releaseKeyPassword = releaseSigningValue("keyPassword", "RELEASE_KEY_PASSWORD")
+val hasReleaseSigning = listOf(
+    releaseStoreFile,
+    releaseStorePassword,
+    releaseKeyAlias,
+    releaseKeyPassword,
+).all { !it.isNullOrBlank() }
+
 android {
     namespace = "dev.ayushya.noo"
     compileSdk = flutter.compileSdkVersion
@@ -27,11 +53,27 @@ android {
         versionName = flutter.versionName
     }
 
+    signingConfigs {
+        if (hasReleaseSigning) {
+            create("release") {
+                storeFile = file(releaseStoreFile!!)
+                storePassword = releaseStorePassword
+                keyAlias = releaseKeyAlias
+                keyPassword = releaseKeyPassword
+            }
+        }
+    }
+
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
+            // Falls back to the debug keystore (so an unconfigured
-            // Signing with the debug keys for now, so `flutter run --release` works.
+            // checkout can still `flutter run --release`) when no release
-            signingConfig = signingConfigs.getByName("debug")
+            // signing config is available - see the comment above.
+            signingConfig = if (hasReleaseSigning) {
+                signingConfigs.getByName("release")
+            } else {
+                signingConfigs.getByName("debug")
+            }
         }
     }
 }

android/app/src/main/AndroidManifest.xml

@@ -2,6 +2,19 @@
     <uses-permission android:name="android.permission.INTERNET"/>
     <!-- For local_auth's biometric app-lock (Settings > Security). -->
     <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
+    <!-- For ShareUploadService/DownloadService, which keep a "Share to Noo"
+         upload/download going (and cancellable from its notification) even
+         if the app is fully closed - see each service's own doc comment. -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <!-- DownloadService's pre-Android-10 fallback only (MediaStore.Downloads
+         needs no runtime permission on API 29+, which is what targetSdk
+         actually enforces) - capped with maxSdkVersion so it's not even
+         requested on newer devices. -->
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28"/>
     <application
         android:label="Noo"
         android:name="${applicationName}"
@@ -31,7 +44,8 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
             <!-- Lets other apps' share sheets ("Share to...") send a file here
-                 to be uploaded, via receive_sharing_intent. -->
+                 to be uploaded - handled by MainActivity.kt directly, not a
+                 plugin (see its doc comment for why). -->
             <intent-filter>
                 <action android:name="android.intent.action.SEND"/>
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -42,7 +56,38 @@
                 <category android:name="android.intent.category.DEFAULT"/>
                 <data android:mimeType="*/*"/>
             </intent-filter>
+            <!-- Lets Noo be picked as a source ("Google Photos", "Files", ...)
+                 from another app's own file/photo picker chooser - handled by
+                 MainActivity.kt/PickIntentService, not a plugin. A single
+                 "*/*" filter matches any mimeType the caller requests
+                 (image/*, video/*, or a generic file pick). -->
+            <intent-filter>
+                <action android:name="android.intent.action.GET_CONTENT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.OPENABLE"/>
+                <data android:mimeType="*/*"/>
+            </intent-filter>
         </activity>
+        <service
+            android:name=".ShareUploadService"
+            android:exported="false"
+            android:foregroundServiceType="dataSync"/>
+        <service
+            android:name=".DownloadService"
+            android:exported="false"
+            android:foregroundServiceType="dataSync"/>
+        <!-- Hands back the file(s) a caller picked via the GET_CONTENT filter
+             above - only the app's own cache/picker/ subfolder is exposed,
+             see file_paths.xml. -->
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.picker.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths"/>
+        </provider>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data
@@ -59,12 +104,6 @@
             <action android:name="android.intent.action.PROCESS_TEXT"/>
             <data android:mimeType="text/plain"/>
         </intent>
-        <!-- Needed so url_launcher can find a browser for Nextcloud Login Flow v2. -->
-        <intent>
-            <action android:name="android.intent.action.VIEW"/>
-            <category android:name="android.intent.category.BROWSABLE"/>
-            <data android:scheme="https"/>
-        </intent>
         <!-- Needed so open_file can find apps to open downloaded files. -->
         <intent>
             <action android:name="android.intent.action.VIEW"/>

android/app/src/main/kotlin/dev/ayushya/noo/DownloadService.kt

@@ -0,0 +1,307 @@
+package dev.ayushya.noo
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.app.Service
+import android.content.ContentValues
+import android.content.Context
+import android.content.Intent
+import android.content.pm.ServiceInfo
+import android.net.Uri
+import android.os.Build
+import android.os.Environment
+import android.os.IBinder
+import android.provider.MediaStore
+import androidx.core.app.NotificationCompat
+import androidx.core.app.ServiceCompat
+import org.json.JSONArray
+import java.io.File
+import java.net.HttpURLConnection
+import java.net.URL
+import java.util.concurrent.atomic.AtomicBoolean
+
+/**
+ * Foreground service that downloads one or more files over WebDAV straight
+ * into the device's public Downloads folder, independent of MainActivity/
+ * the Flutter engine being alive - the download counterpart of
+ * ShareUploadService.kt (see its doc comment for the full rationale: only
+ * a real Android Service survives the app being closed mid-transfer, the
+ * same guarantee a real file-manager app's download notification gives
+ * you). Re-implements a plain WebDAV GET here in Kotlin for the same
+ * reason uploads do - keep NextcloudService.downloadToFile in sync if
+ * download semantics change.
+ *
+ * Started via the `dev.ayushya.noo/download_service` MethodChannel
+ * (MainActivity.kt). Shows one persistent, cancellable notification for
+ * the whole batch, same UX as ShareUploadService's.
+ */
+class DownloadService : Service() {
+    companion object {
+        const val ACTION_CANCEL = "dev.ayushya.noo.action.CANCEL_DOWNLOAD"
+        const val EXTRA_FILES = "files" // JSON array of {path, name, mimeType, size}
+        const val EXTRA_SERVER_URL = "serverUrl"
+        const val EXTRA_USERNAME = "username"
+        const val EXTRA_AUTH_HEADER = "authHeader"
+
+        private const val CHANNEL_ID = "file_downloads"
+        private const val NOTIFICATION_ID = 4301
+    }
+
+    private val cancelled = AtomicBoolean(false)
+    private var downloadThread: Thread? = null
+
+    private data class DownloadFile(
+        val path: String,
+        val name: String,
+        val mimeType: String?,
+        val size: Long?,
+    )
+
+    override fun onBind(intent: Intent?): IBinder? = null
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        if (intent?.action == ACTION_CANCEL) {
+            cancelled.set(true)
+            return START_NOT_STICKY
+        }
+
+        val filesJson = intent?.getStringExtra(EXTRA_FILES)
+        val serverUrl = intent?.getStringExtra(EXTRA_SERVER_URL)
+        val username = intent?.getStringExtra(EXTRA_USERNAME)
+        val authHeader = intent?.getStringExtra(EXTRA_AUTH_HEADER)
+        if (filesJson == null || serverUrl == null || username == null || authHeader == null) {
+            stopSelf()
+            return START_NOT_STICKY
+        }
+
+        createNotificationChannel()
+        ServiceCompat.startForeground(
+            this,
+            NOTIFICATION_ID,
+            buildProgressNotification("Preparing to download…", null, indeterminate = true),
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
+            } else {
+                0
+            },
+        )
+
+        // A second batch arriving mid-download is dropped rather than
+        // queued - same tradeoff ShareUploadService makes, rare in
+        // practice and not worth a real queue for.
+        if (downloadThread == null) {
+            val files = parseFiles(filesJson)
+            downloadThread = Thread {
+                runDownloads(files, serverUrl, username, authHeader)
+            }.also { it.start() }
+        }
+
+        return START_NOT_STICKY
+    }
+
+    private fun parseFiles(json: String): List<DownloadFile> {
+        val arr = JSONArray(json)
+        return (0 until arr.length()).map { i ->
+            val obj = arr.getJSONObject(i)
+            DownloadFile(
+                path = obj.getString("path"),
+                name = obj.getString("name"),
+                mimeType = if (obj.isNull("mimeType")) null else obj.getString("mimeType"),
+                size = if (obj.isNull("size")) null else obj.getLong("size"),
+            )
+        }
+    }
+
+    private fun runDownloads(
+        files: List<DownloadFile>,
+        serverUrl: String,
+        username: String,
+        authHeader: String,
+    ) {
+        var succeeded = 0
+        var failed = 0
+        val cleanServer = serverUrl.trimEnd('/')
+
+        for ((index, file) in files.withIndex()) {
+            if (cancelled.get()) break
+            val label = if (files.size == 1) file.name else "${file.name} (${index + 1}/${files.size})"
+            try {
+                var cleanPath = file.path.trim()
+                if (!cleanPath.startsWith("/")) cleanPath = "/$cleanPath"
+                val encodedPath = cleanPath.split("/").joinToString("/") { Uri.encode(it) }
+                val url = URL("$cleanServer/remote.php/dav/files/$username$encodedPath")
+                val ok = downloadFile(file, url, authHeader) { received, total ->
+                    notify(
+                        buildProgressNotification(
+                            "Downloading $label…",
+                            progressFraction(received, total),
+                            indeterminate = total == null,
+                        ),
+                    )
+                }
+                if (ok) succeeded++ else failed++
+            } catch (e: Exception) {
+                failed++
+            }
+        }
+
+        val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        val finalText = when {
+            cancelled.get() -> "Download cancelled"
+            failed == 0 && files.size == 1 -> "Downloaded ${files.first().name}"
+            failed == 0 -> "Downloaded $succeeded of ${files.size} files"
+            else -> "Downloaded $succeeded of ${files.size} files - $failed failed"
+        }
+        manager.notify(NOTIFICATION_ID, buildFinalNotification(finalText))
+
+        stopForeground(STOP_FOREGROUND_DETACH)
+        stopSelf()
+    }
+
+    private fun progressFraction(received: Long, total: Long?): Float? {
+        if (total == null || total <= 0) return null
+        return (received.toFloat() / total.toFloat()).coerceIn(0f, 1f)
+    }
+
+    /// Streams the GET response straight into the public Downloads
+    /// collection via MediaStore (API 29+) - scoped storage means a
+    /// background Service can't prompt a SAF picker the way `file_saver`
+    /// does from the Flutter/Activity side, so this writes directly to the
+    /// Downloads collection instead, same place a browser download lands.
+    /// Pre-Q devices fall back to the legacy public Downloads directory.
+    private fun downloadFile(
+        file: DownloadFile,
+        url: URL,
+        authHeader: String,
+        onProgress: (Long, Long?) -> Unit,
+    ): Boolean {
+        val connection = url.openConnection() as HttpURLConnection
+        return try {
+            connection.requestMethod = "GET"
+            connection.setRequestProperty("Authorization", authHeader)
+            connection.setRequestProperty("OCS-APIRequest", "true")
+            connection.connectTimeout = 15000
+            connection.readTimeout = 30000
+            connection.connect()
+
+            if (connection.responseCode !in 200..299) return false
+
+            val total = file.size ?: connection.contentLengthLong.takeIf { it > 0 }
+            val mimeType = file.mimeType ?: "application/octet-stream"
+            val outputUri = createDownloadsEntry(file.name, mimeType) ?: return false
+
+            val stream = contentResolver.openOutputStream(outputUri) ?: return false
+            stream.use { output ->
+                connection.inputStream.use { input ->
+                    val buffer = ByteArray(256 * 1024)
+                    var received = 0L
+                    var lastEmit = 0L
+                    while (!cancelled.get()) {
+                        val read = input.read(buffer)
+                        if (read == -1) break
+                        output.write(buffer, 0, read)
+                        received += read
+                        val now = System.currentTimeMillis()
+                        if (now - lastEmit >= 200) {
+                            lastEmit = now
+                            onProgress(received, total)
+                        }
+                    }
+                }
+            }
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                val values = ContentValues().apply { put(MediaStore.Downloads.IS_PENDING, 0) }
+                contentResolver.update(outputUri, values, null, null)
+            }
+
+            if (cancelled.get()) {
+                contentResolver.delete(outputUri, null, null)
+                false
+            } else {
+                true
+            }
+        } catch (e: Exception) {
+            false
+        } finally {
+            connection.disconnect()
+        }
+    }
+
+    private fun createDownloadsEntry(name: String, mimeType: String): Uri? {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            val values = ContentValues().apply {
+                put(MediaStore.Downloads.DISPLAY_NAME, name)
+                put(MediaStore.Downloads.MIME_TYPE, mimeType)
+                put(MediaStore.Downloads.IS_PENDING, 1)
+            }
+            contentResolver.insert(MediaStore.Downloads.EXTERNAL_CONTENT_URI, values)
+        } else {
+            @Suppress("DEPRECATION")
+            val downloadsDir =
+                Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)
+            if (!downloadsDir.exists()) downloadsDir.mkdirs()
+            Uri.fromFile(File(downloadsDir, name))
+        }
+    }
+
+    private fun notify(notification: Notification) {
+        val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        manager.notify(NOTIFICATION_ID, notification)
+    }
+
+    private fun createNotificationChannel() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val channel = NotificationChannel(
+                CHANNEL_ID,
+                "File downloads",
+                NotificationManager.IMPORTANCE_LOW,
+            ).apply { description = "Progress for files downloaded from Noo" }
+            val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            manager.createNotificationChannel(channel)
+        }
+    }
+
+    private fun buildProgressNotification(
+        text: String,
+        progress: Float?,
+        indeterminate: Boolean,
+    ): Notification {
+        val cancelIntent = Intent(this, DownloadService::class.java).apply { action = ACTION_CANCEL }
+        val cancelPendingIntent = PendingIntent.getService(
+            this,
+            0,
+            cancelIntent,
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
+        )
+        val builder = NotificationCompat.Builder(this, CHANNEL_ID)
+            .setSmallIcon(android.R.drawable.stat_sys_download)
+            .setContentTitle("Downloading from Noo")
+            .setContentText(text)
+            .setOnlyAlertOnce(true)
+            .setOngoing(true)
+            .addAction(android.R.drawable.ic_menu_close_clear_cancel, "Cancel", cancelPendingIntent)
+        when {
+            indeterminate -> builder.setProgress(100, 0, true)
+            progress != null -> builder.setProgress(100, (progress * 100).toInt(), false)
+        }
+        return builder.build()
+    }
+
+    private fun buildFinalNotification(text: String): Notification {
+        return NotificationCompat.Builder(this, CHANNEL_ID)
+            .setSmallIcon(android.R.drawable.stat_sys_download_done)
+            .setContentTitle("Noo")
+            .setContentText(text)
+            .setOngoing(false)
+            .setAutoCancel(true)
+            .build()
+    }
+
+    override fun onDestroy() {
+        cancelled.set(true)
+        super.onDestroy()
+    }
+}

android/app/src/main/kotlin/dev/ayushya/noo/MainActivity.kt

@@ -1,8 +1,333 @@
 package dev.ayushya.noo
 
+import android.Manifest
+import android.content.ClipData
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Build
+import android.os.Handler
+import android.os.Looper
+import android.provider.OpenableColumns
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import androidx.core.content.FileProvider
 import io.flutter.embedding.android.FlutterFragmentActivity
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.plugin.common.EventChannel
+import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.MethodChannel
+import java.io.File
 
 // FlutterFragmentActivity (not the default FlutterActivity) is required by
 // local_auth's Android implementation, which hosts its biometric/device
 // credential prompt via a Fragment.
-class MainActivity : FlutterFragmentActivity()
+//
+// Also hand-rolls "Share to Noo" intent handling instead of using the
+// receive_sharing_intent plugin: that plugin resolves a shared content:// URI
+// by synchronously copying the *entire* file into the app's cache dir on the
+// main thread, during activity startup, before Flutter has even drawn its
+// first frame - fine for a photo, but for a large video/archive it blocks
+// long enough that Android decides this newly-launched activity failed to
+// render and kills it (silently back to the home screen - no crash, no
+// Dart-side error, since Dart never got a chance to run). Other file-manager
+// apps show their destination picker instantly regardless of file size
+// because they defer touching the file's actual bytes until the user picks
+// a destination - `getInitialShare`/`onNewShare` only ever query cheap Uri
+// metadata (name/size/mime, not content). The actual copy+upload then runs
+// in ShareUploadService (see its own doc comment), not here, so it survives
+// the app being closed right after the user confirms a destination.
+class MainActivity : FlutterFragmentActivity() {
+    private val shareIntentChannelName = "dev.ayushya.noo/share_intent"
+    private val newShareChannelName = "dev.ayushya.noo/share_intent/new"
+    private val uploadServiceChannelName = "dev.ayushya.noo/upload_service"
+    private val downloadServiceChannelName = "dev.ayushya.noo/download_service"
+    private val pickIntentChannelName = "dev.ayushya.noo/pick_intent"
+    private val newPickChannelName = "dev.ayushya.noo/pick_intent/new"
+    private val notificationPermissionRequestCode = 4202
+    // Lazy, not a field initializer - `packageName` reads through the
+    // Activity's base Context, which isn't attached yet while this class's
+    // fields are being constructed (crashes with an NPE if evaluated then).
+    private val pickerFileProviderAuthority by lazy { "$packageName.picker.fileprovider" }
+
+    private val mainHandler = Handler(Looper.getMainLooper())
+    private var newShareSink: EventChannel.EventSink? = null
+    private var newPickSink: EventChannel.EventSink? = null
+
+    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
+        super.configureFlutterEngine(flutterEngine)
+
+        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, shareIntentChannelName)
+            .setMethodCallHandler { call, result ->
+                when (call.method) {
+                    "getInitialShare" -> result.success(extractShareMetadata(intent))
+                    else -> result.notImplemented()
+                }
+            }
+
+        EventChannel(flutterEngine.dartExecutor.binaryMessenger, newShareChannelName)
+            .setStreamHandler(object : EventChannel.StreamHandler {
+                override fun onListen(arguments: Any?, events: EventChannel.EventSink) {
+                    newShareSink = events
+                }
+                override fun onCancel(arguments: Any?) {
+                    newShareSink = null
+                }
+            })
+
+        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, uploadServiceChannelName)
+            .setMethodCallHandler { call, result ->
+                when (call.method) {
+                    "startUpload" -> {
+                        startUploadService(call, result)
+                    }
+                    else -> result.notImplemented()
+                }
+            }
+
+        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, downloadServiceChannelName)
+            .setMethodCallHandler { call, result ->
+                when (call.method) {
+                    "startDownload" -> {
+                        startDownloadService(call, result)
+                    }
+                    else -> result.notImplemented()
+                }
+            }
+
+        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, pickIntentChannelName)
+            .setMethodCallHandler { call, result ->
+                when (call.method) {
+                    "getPickRequest" -> result.success(extractPickRequest(intent))
+                    "finishPick" -> finishPick(call, result)
+                    "cancelPick" -> cancelPick(result)
+                    else -> result.notImplemented()
+                }
+            }
+
+        EventChannel(flutterEngine.dartExecutor.binaryMessenger, newPickChannelName)
+            .setStreamHandler(object : EventChannel.StreamHandler {
+                override fun onListen(arguments: Any?, events: EventChannel.EventSink) {
+                    newPickSink = events
+                }
+                override fun onCancel(arguments: Any?) {
+                    newPickSink = null
+                }
+            })
+    }
+
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        setIntent(intent)
+        val shared = extractShareMetadata(intent)
+        if (shared.isNotEmpty()) {
+            mainHandler.post { newShareSink?.success(shared) }
+        }
+        val pickRequest = extractPickRequest(intent)
+        if (pickRequest != null) {
+            mainHandler.post { newPickSink?.success(pickRequest) }
+        }
+    }
+
+    /// Cheap Uri metadata only (display name / size / mime type) via a
+    /// single ContentResolver query - never reads the file's actual bytes,
+    /// so this is fast regardless of how large the shared file is.
+    private fun extractShareMetadata(intent: Intent): List<Map<String, Any?>> {
+        val uris: List<Uri> = when (intent.action) {
+            Intent.ACTION_SEND -> listOfNotNull(intentStreamUri(intent))
+            Intent.ACTION_SEND_MULTIPLE -> intentStreamUris(intent)
+            else -> emptyList()
+        }
+        return uris.map { uriMetadata(it) }
+    }
+
+    @Suppress("DEPRECATION")
+    private fun intentStreamUri(intent: Intent): Uri? {
+        return if (Build.VERSION.SDK_INT >= 33) {
+            intent.getParcelableExtra(Intent.EXTRA_STREAM, Uri::class.java)
+        } else {
+            intent.getParcelableExtra(Intent.EXTRA_STREAM)
+        }
+    }
+
+    @Suppress("DEPRECATION")
+    private fun intentStreamUris(intent: Intent): List<Uri> {
+        val list = if (Build.VERSION.SDK_INT >= 33) {
+            intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM, Uri::class.java)
+        } else {
+            intent.getParcelableArrayListExtra<Uri>(Intent.EXTRA_STREAM)
+        }
+        return list ?: emptyList()
+    }
+
+    private fun uriMetadata(uri: Uri): Map<String, Any?> {
+        var name = uri.lastPathSegment ?: "shared_file"
+        var size: Long? = null
+        try {
+            contentResolver.query(
+                uri,
+                arrayOf(OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE),
+                null,
+                null,
+                null,
+            )?.use { cursor ->
+                if (cursor.moveToFirst()) {
+                    val nameIdx = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
+                    if (nameIdx >= 0) cursor.getString(nameIdx)?.let { name = it }
+                    val sizeIdx = cursor.getColumnIndex(OpenableColumns.SIZE)
+                    if (sizeIdx >= 0 && !cursor.isNull(sizeIdx)) size = cursor.getLong(sizeIdx)
+                }
+            }
+        } catch (_: Exception) {
+            // Fall back to the Uri-derived name / unknown size below.
+        }
+        val mimeType = contentResolver.getType(uri)
+        return mapOf("uri" to uri.toString(), "name" to name, "mimeType" to mimeType, "size" to size)
+    }
+
+    /// Starts ShareUploadService with everything it needs to run entirely on
+    /// its own (see its doc comment) - the Intent extras are the full
+    /// contract between this call and that service, kept in sync manually
+    /// since they cross the Kotlin/Dart boundary as loosely-typed args.
+    private fun startUploadService(call: MethodCall, result: MethodChannel.Result) {
+        val filesJson = call.argument<String>("files")
+        val serverUrl = call.argument<String>("serverUrl")
+        val username = call.argument<String>("username")
+        val authHeader = call.argument<String>("authHeader")
+        val remoteFolder = call.argument<String>("remoteFolder")
+        if (filesJson == null || serverUrl == null || username == null ||
+            authHeader == null || remoteFolder == null
+        ) {
+            result.error("bad_args", "Missing required upload arguments", null)
+            return
+        }
+
+        if (Build.VERSION.SDK_INT >= 33 &&
+            ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) !=
+            PackageManager.PERMISSION_GRANTED
+        ) {
+            // Fire-and-forget: the service works fine even if this is denied,
+            // it just won't be able to show progress/cancel in a notification.
+            ActivityCompat.requestPermissions(
+                this,
+                arrayOf(Manifest.permission.POST_NOTIFICATIONS),
+                notificationPermissionRequestCode,
+            )
+        }
+
+        val serviceIntent = Intent(this, ShareUploadService::class.java).apply {
+            putExtra(ShareUploadService.EXTRA_FILES, filesJson)
+            putExtra(ShareUploadService.EXTRA_SERVER_URL, serverUrl)
+            putExtra(ShareUploadService.EXTRA_USERNAME, username)
+            putExtra(ShareUploadService.EXTRA_AUTH_HEADER, authHeader)
+            putExtra(ShareUploadService.EXTRA_REMOTE_FOLDER, remoteFolder)
+        }
+        ContextCompat.startForegroundService(this, serviceIntent)
+        result.success(null)
+    }
+
+    /// Starts DownloadService with everything it needs to run entirely on
+    /// its own (see its doc comment) - same contract shape as
+    /// [startUploadService], kept in sync manually for the same reason.
+    private fun startDownloadService(call: MethodCall, result: MethodChannel.Result) {
+        val filesJson = call.argument<String>("files")
+        val serverUrl = call.argument<String>("serverUrl")
+        val username = call.argument<String>("username")
+        val authHeader = call.argument<String>("authHeader")
+        if (filesJson == null || serverUrl == null || username == null || authHeader == null) {
+            result.error("bad_args", "Missing required download arguments", null)
+            return
+        }
+
+        if (Build.VERSION.SDK_INT >= 33 &&
+            ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) !=
+            PackageManager.PERMISSION_GRANTED
+        ) {
+            // Fire-and-forget: the service works fine even if this is denied,
+            // it just won't be able to show progress/cancel in a notification.
+            ActivityCompat.requestPermissions(
+                this,
+                arrayOf(Manifest.permission.POST_NOTIFICATIONS),
+                notificationPermissionRequestCode,
+            )
+        }
+
+        val serviceIntent = Intent(this, DownloadService::class.java).apply {
+            putExtra(DownloadService.EXTRA_FILES, filesJson)
+            putExtra(DownloadService.EXTRA_SERVER_URL, serverUrl)
+            putExtra(DownloadService.EXTRA_USERNAME, username)
+            putExtra(DownloadService.EXTRA_AUTH_HEADER, authHeader)
+        }
+        ContextCompat.startForegroundService(this, serviceIntent)
+        result.success(null)
+    }
+
+    /// Non-null only when this Activity was launched (or re-delivered a new
+    /// Intent) as another app's GET_CONTENT picker - the mimeType filter and
+    /// multi-select flag the caller asked for, plus a best-effort display
+    /// name for the calling app to show in the "picking mode" banner.
+    private fun extractPickRequest(intent: Intent): Map<String, Any?>? {
+        if (intent.action != Intent.ACTION_GET_CONTENT) return null
+        val mimeType = intent.type ?: "*/*"
+        val allowMultiple = intent.getBooleanExtra(Intent.EXTRA_ALLOW_MULTIPLE, false)
+        val callerPackage = callingPackage
+        val callerLabel = callerPackage?.let {
+            try {
+                val appInfo = packageManager.getApplicationInfo(it, 0)
+                packageManager.getApplicationLabel(appInfo).toString()
+            } catch (_: PackageManager.NameNotFoundException) {
+                it
+            }
+        }
+        return mapOf(
+            "mimeType" to mimeType,
+            "allowMultiple" to allowMultiple,
+            "callerLabel" to callerLabel,
+        )
+    }
+
+    /// Hands the already-downloaded local files (see PickIntentService/
+    /// ServerProvider.confirmPick - this Activity never touches the
+    /// Nextcloud server itself) back to the caller as content:// Uris
+    /// through this app's own FileProvider, then closes the picker.
+    private fun finishPick(call: MethodCall, result: MethodChannel.Result) {
+        val paths = call.argument<List<String>>("paths")
+        val mimeTypes = call.argument<List<String>>("mimeTypes") ?: emptyList()
+        if (paths.isNullOrEmpty()) {
+            result.error("no_files", "No files to return to the caller", null)
+            return
+        }
+
+        val uris = paths.map { path ->
+            FileProvider.getUriForFile(this, pickerFileProviderAuthority, File(path))
+        }
+        val resultIntent = Intent().apply {
+            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+        }
+        // `Intent.setData()` and `.setType()` each silently null out the
+        // other field if called separately (Android framework behavior) -
+        // `setDataAndType` is the only way to have both survive on the same
+        // Intent, which every GET_CONTENT caller expects for `data`.
+        val firstMimeType = mimeTypes.getOrNull(0) ?: "*/*"
+        if (uris.size == 1) {
+            resultIntent.setDataAndType(uris[0], firstMimeType)
+        } else {
+            val clipMimeTypes = mimeTypes.ifEmpty { listOf("*/*") }.toTypedArray()
+            val clipData = ClipData("Noo picked files", clipMimeTypes, ClipData.Item(uris[0]))
+            for (i in 1 until uris.size) clipData.addItem(ClipData.Item(uris[i]))
+            resultIntent.clipData = clipData
+            // Some callers only read `data` even for a multi-item pick, so
+            // this still points at the first file as a fallback.
+            resultIntent.setDataAndType(uris[0], firstMimeType)
+        }
+        setResult(RESULT_OK, resultIntent)
+        result.success(null)
+        finish()
+    }
+
+    private fun cancelPick(result: MethodChannel.Result) {
+        setResult(RESULT_CANCELED)
+        result.success(null)
+        finish()
+    }
+}

android/app/src/main/kotlin/dev/ayushya/noo/ShareUploadService.kt

@@ -0,0 +1,314 @@
+package dev.ayushya.noo
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.content.pm.ServiceInfo
+import android.net.Uri
+import android.os.Build
+import android.os.IBinder
+import androidx.core.app.NotificationCompat
+import androidx.core.app.ServiceCompat
+import org.json.JSONArray
+import java.io.File
+import java.io.FileOutputStream
+import java.net.HttpURLConnection
+import java.net.URL
+import java.util.concurrent.atomic.AtomicBoolean
+
+/**
+ * Foreground service that prepares (copies from a content:// Uri) and
+ * uploads one or more "Share to Noo" files over WebDAV, independent of
+ * MainActivity/the Flutter engine being alive - the whole point is that
+ * closing the app right after confirming a destination in ShareUploadView
+ * doesn't interrupt the upload, the same way a file-manager app's own
+ * upload notification survives the app being closed.
+ *
+ * Re-implements a plain WebDAV PUT here in Kotlin (HttpURLConnection, no
+ * new HTTP dependency) rather than reusing NextcloudService/Dio from Dart,
+ * since a Dart isolate doesn't keep running once the Flutter engine/
+ * Activity are gone - only a real Android Service does. This does mean the
+ * PUT request itself is duplicated logic (see NextcloudService.
+ * uploadFileFromPath); keep both in sync if the upload semantics change.
+ *
+ * Started via the `dev.ayushya.noo/upload_service` MethodChannel
+ * (MainActivity.kt) with credentials/destination passed as Intent extras -
+ * never has an Activity in the loop after that. Shows one persistent,
+ * cancellable notification for the whole batch; the Cancel action re-enters
+ * this same running service instance with [ACTION_CANCEL], which the
+ * copy/upload loops poll.
+ */
+class ShareUploadService : Service() {
+    companion object {
+        const val ACTION_CANCEL = "dev.ayushya.noo.action.CANCEL_UPLOAD"
+        const val EXTRA_FILES = "files" // JSON array of {uri, name, size}
+        const val EXTRA_SERVER_URL = "serverUrl"
+        const val EXTRA_USERNAME = "username"
+        const val EXTRA_AUTH_HEADER = "authHeader"
+        const val EXTRA_REMOTE_FOLDER = "remoteFolder"
+
+        private const val CHANNEL_ID = "share_upload"
+        private const val NOTIFICATION_ID = 4201
+    }
+
+    private val cancelled = AtomicBoolean(false)
+    private var uploadThread: Thread? = null
+
+    private data class ShareFile(val uri: String, val name: String, val size: Long?)
+
+    override fun onBind(intent: Intent?): IBinder? = null
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        if (intent?.action == ACTION_CANCEL) {
+            cancelled.set(true)
+            return START_NOT_STICKY
+        }
+
+        val filesJson = intent?.getStringExtra(EXTRA_FILES)
+        val serverUrl = intent?.getStringExtra(EXTRA_SERVER_URL)
+        val username = intent?.getStringExtra(EXTRA_USERNAME)
+        val authHeader = intent?.getStringExtra(EXTRA_AUTH_HEADER)
+        val remoteFolder = intent?.getStringExtra(EXTRA_REMOTE_FOLDER)
+        if (filesJson == null || serverUrl == null || username == null ||
+            authHeader == null || remoteFolder == null
+        ) {
+            stopSelf()
+            return START_NOT_STICKY
+        }
+
+        createNotificationChannel()
+        ServiceCompat.startForeground(
+            this,
+            NOTIFICATION_ID,
+            buildProgressNotification("Preparing to upload…", null, indeterminate = true),
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
+            } else {
+                0
+            },
+        )
+
+        // A second share arriving mid-upload is dropped rather than queued -
+        // rare in practice (sharing again before the first batch finishes),
+        // not worth a real queue for.
+        if (uploadThread == null) {
+            val files = parseFiles(filesJson)
+            uploadThread = Thread {
+                runUploads(files, serverUrl, username, authHeader, remoteFolder)
+            }.also { it.start() }
+        }
+
+        return START_NOT_STICKY
+    }
+
+    private fun parseFiles(json: String): List<ShareFile> {
+        val arr = JSONArray(json)
+        return (0 until arr.length()).map { i ->
+            val obj = arr.getJSONObject(i)
+            ShareFile(
+                uri = obj.getString("uri"),
+                name = obj.getString("name"),
+                size = if (obj.isNull("size")) null else obj.getLong("size"),
+            )
+        }
+    }
+
+    private fun runUploads(
+        files: List<ShareFile>,
+        serverUrl: String,
+        username: String,
+        authHeader: String,
+        remoteFolder: String,
+    ) {
+        var succeeded = 0
+        var failed = 0
+        val cleanServer = serverUrl.trimEnd('/')
+        var cleanFolder = remoteFolder.trim()
+        if (!cleanFolder.startsWith("/")) cleanFolder = "/$cleanFolder"
+        if (!cleanFolder.endsWith("/")) cleanFolder = "$cleanFolder/"
+
+        for ((index, file) in files.withIndex()) {
+            if (cancelled.get()) break
+            val label = if (files.size == 1) file.name else "${file.name} (${index + 1}/${files.size})"
+            var tempFile: File? = null
+            try {
+                notify(buildProgressNotification("Preparing $label…", null, indeterminate = true))
+                tempFile = materialize(file) { sent, total ->
+                    notify(
+                        buildProgressNotification(
+                            "Preparing $label…",
+                            progressFraction(sent, total),
+                            indeterminate = total == null,
+                        ),
+                    )
+                }
+                if (cancelled.get()) break
+
+                val encodedName = Uri.encode(file.name)
+                val url = URL("$cleanServer/remote.php/dav/files/$username$cleanFolder$encodedName")
+                val ok = uploadFile(tempFile, url, authHeader) { sent, total ->
+                    notify(
+                        buildProgressNotification(
+                            "Uploading $label…",
+                            progressFraction(sent, total),
+                            indeterminate = false,
+                        ),
+                    )
+                }
+                if (ok) succeeded++ else failed++
+            } catch (e: Exception) {
+                failed++
+            } finally {
+                tempFile?.delete()
+            }
+        }
+
+        val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        val finalText = when {
+            cancelled.get() -> "Upload cancelled"
+            failed == 0 && files.size == 1 -> "Uploaded ${files.first().name}"
+            failed == 0 -> "Uploaded $succeeded of ${files.size} files"
+            else -> "Uploaded $succeeded of ${files.size} files - $failed failed"
+        }
+        manager.notify(NOTIFICATION_ID, buildFinalNotification(finalText))
+
+        stopForeground(STOP_FOREGROUND_DETACH)
+        stopSelf()
+    }
+
+    private fun progressFraction(sent: Long, total: Long?): Float? {
+        if (total == null || total <= 0) return null
+        return (sent.toFloat() / total.toFloat()).coerceIn(0f, 1f)
+    }
+
+    private fun materialize(file: ShareFile, onProgress: (Long, Long?) -> Unit): File {
+        val uri = Uri.parse(file.uri)
+        val target = File(cacheDir, "share_upload_${System.currentTimeMillis()}_${file.name}")
+        contentResolver.openInputStream(uri)?.use { input ->
+            FileOutputStream(target).use { output ->
+                val buffer = ByteArray(256 * 1024)
+                var sent = 0L
+                var lastEmit = 0L
+                while (!cancelled.get()) {
+                    val read = input.read(buffer)
+                    if (read == -1) break
+                    output.write(buffer, 0, read)
+                    sent += read
+                    val now = System.currentTimeMillis()
+                    if (now - lastEmit >= 200) {
+                        lastEmit = now
+                        onProgress(sent, file.size)
+                    }
+                }
+            }
+        } ?: throw IllegalStateException("Could not open ${file.uri}")
+        return target
+    }
+
+    private fun uploadFile(
+        file: File,
+        url: URL,
+        authHeader: String,
+        onProgress: (Long, Long) -> Unit,
+    ): Boolean {
+        val length = file.length()
+        val connection = url.openConnection() as HttpURLConnection
+        return try {
+            connection.requestMethod = "PUT"
+            connection.doOutput = true
+            connection.setFixedLengthStreamingMode(length)
+            connection.setRequestProperty("Authorization", authHeader)
+            connection.setRequestProperty("OCS-APIRequest", "true")
+            connection.setRequestProperty("Content-Type", "application/octet-stream")
+            connection.connectTimeout = 15000
+            connection.readTimeout = 30000
+
+            connection.outputStream.use { output ->
+                file.inputStream().use { input ->
+                    val buffer = ByteArray(256 * 1024)
+                    var sent = 0L
+                    var lastEmit = 0L
+                    while (!cancelled.get()) {
+                        val read = input.read(buffer)
+                        if (read == -1) break
+                        output.write(buffer, 0, read)
+                        sent += read
+                        val now = System.currentTimeMillis()
+                        if (now - lastEmit >= 200) {
+                            lastEmit = now
+                            onProgress(sent, length)
+                        }
+                    }
+                }
+            }
+            if (cancelled.get()) {
+                false
+            } else {
+                val code = connection.responseCode
+                code == 201 || code == 204 || code == 200
+            }
+        } catch (e: Exception) {
+            false
+        } finally {
+            connection.disconnect()
+        }
+    }
+
+    private fun notify(notification: Notification) {
+        val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        manager.notify(NOTIFICATION_ID, notification)
+    }
+
+    private fun createNotificationChannel() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val channel = NotificationChannel(
+                CHANNEL_ID,
+                "File uploads",
+                NotificationManager.IMPORTANCE_LOW,
+            ).apply { description = "Progress for files shared to Noo" }
+            val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            manager.createNotificationChannel(channel)
+        }
+    }
+
+    private fun buildProgressNotification(text: String, progress: Float?, indeterminate: Boolean): Notification {
+        val cancelIntent = Intent(this, ShareUploadService::class.java).apply { action = ACTION_CANCEL }
+        val cancelPendingIntent = PendingIntent.getService(
+            this,
+            0,
+            cancelIntent,
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
+        )
+        val builder = NotificationCompat.Builder(this, CHANNEL_ID)
+            .setSmallIcon(android.R.drawable.stat_sys_upload)
+            .setContentTitle("Uploading to Noo")
+            .setContentText(text)
+            .setOnlyAlertOnce(true)
+            .setOngoing(true)
+            .addAction(android.R.drawable.ic_menu_close_clear_cancel, "Cancel", cancelPendingIntent)
+        when {
+            indeterminate -> builder.setProgress(100, 0, true)
+            progress != null -> builder.setProgress(100, (progress * 100).toInt(), false)
+        }
+        return builder.build()
+    }
+
+    private fun buildFinalNotification(text: String): Notification {
+        return NotificationCompat.Builder(this, CHANNEL_ID)
+            .setSmallIcon(android.R.drawable.stat_sys_upload_done)
+            .setContentTitle("Noo")
+            .setContentText(text)
+            .setOngoing(false)
+            .setAutoCancel(true)
+            .build()
+    }
+
+    override fun onDestroy() {
+        cancelled.set(true)
+        super.onDestroy()
+    }
+}

android/app/src/main/res/xml/file_paths.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Exposes only the app's own "picker" cache subfolder as content:// Uris -
+     used to hand a file back to another app that launched Noo as a
+     GET_CONTENT picker (see PickIntentService/MainActivity.kt). -->
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <cache-path name="picker" path="picker/" />
+</paths>

android/build.gradle.kts

@@ -19,21 +19,6 @@ subprojects {
     project.evaluationDependsOn(":app")
 }
 
-// receive_sharing_intent declares Java 11 for its Java sources but leaves
-// its Kotlin compilation to default to whatever JDK runs the build - with
-// JDK 17 that mismatch (Java 11 vs Kotlin 17) fails with "Inconsistent JVM
-// Target Compatibility". Pin just this plugin's Kotlin target down to match
-// its own declared Java target, rather than touching every subproject.
-project(":receive_sharing_intent") {
-    afterEvaluate {
-        tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-            compilerOptions {
-                jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
-            }
-        }
-    }
-}
-
 tasks.register<Delete>("clean") {
     delete(rootProject.layout.buildDirectory)
 }

lib/main.dart

@@ -1,10 +1,14 @@
 import 'dart:async';
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:flutter/material.dart';
+import 'package:permission_handler/permission_handler.dart';
 import 'package:provider/provider.dart';
-import 'package:receive_sharing_intent/receive_sharing_intent.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 import 'models/app_tab.dart';
+import 'models/pick_request.dart';
 import 'providers/server_provider.dart';
+import 'services/pick_intent_service.dart';
+import 'services/share_intent_service.dart';
 import 'theme/app_theme.dart';
 import 'views/lock_screen_view.dart';
 import 'views/login_view.dart';
@@ -112,7 +116,8 @@ class MainShellView extends StatefulWidget {
 class _MainShellViewState extends State<MainShellView> {
   late AppTab _currentTab;
   late final Map<AppTab, ScrollController> _scrollControllers;
-  StreamSubscription<List<SharedMediaFile>>? _shareSub;
+  StreamSubscription<List<SharedFileRef>>? _shareSub;
+  StreamSubscription<PickRequest>? _pickSub;
 
   @override
   void initState() {
@@ -126,29 +131,80 @@ class _MainShellViewState extends State<MainShellView> {
     _currentTab = context.read<ServerProvider>().defaultTab;
 
     // Handles both a cold start via another app's "Share to..." sheet
-    // (getInitialMedia) and a share arriving while the app is already
+    // (getInitialShare) and a share arriving while the app is already
-    // running (getMediaStream) - the plugin guarantees the stream doesn't
+    // running (onNewShare). See MainActivity.kt's doc comment for why this
-    // re-emit whatever getInitialMedia already returned.
+    // is hand-rolled instead of the receive_sharing_intent plugin - in
-    ReceiveSharingIntent.instance.getInitialMedia().then(_handleSharedFiles);
+    // short, this only ever fetches cheap Uri metadata here, never a
-    _shareSub = ReceiveSharingIntent.instance.getMediaStream().listen(
+    // file's actual bytes, so a large shared file can't block startup.
-      _handleSharedFiles,
+    ShareIntentService.getInitialShare().then(_handleSharedFiles);
+    _shareSub = ShareIntentService.onNewShare.listen(_handleSharedFiles);
+
+    // Same cold-start-vs-already-running split as the share intent above:
+    // another app may have launched Noo as its GET_CONTENT picker.
+    PickIntentService.getPickRequest().then((request) {
+      if (request != null && mounted) {
+        context.read<ServerProvider>().setPickRequest(request);
+      }
+    });
+    _pickSub = PickIntentService.onNewPickRequest.listen((request) {
+      if (mounted) context.read<ServerProvider>().setPickRequest(request);
+    });
+
+    WidgetsBinding.instance.addPostFrameCallback(
+      (_) => _maybeRequestNotificationPermission(),
     );
   }
 
-  void _handleSharedFiles(List<SharedMediaFile> files) {
+  static const _prefNotificationPermissionAsked =
-    final uploadable = files
+      'notification_permission_asked';
-        .where(
+
-          (f) =>
+  // Asked once, on the app's first launch after login, rather than every
-              f.type != SharedMediaType.text && f.type != SharedMediaType.url,
+  // time this shell mounts - a plain-language reason shown before the OS
-        )
+  // prompt (which just says "Noo would like to send you notifications"
-        .toList();
+  // with no context) so the system dialog doesn't feel unexplained, since
-    if (uploadable.isEmpty) return;
+  // it's what shows upload/download progress for background transfers.
-    ReceiveSharingIntent.instance.reset();
+  Future<void> _maybeRequestNotificationPermission() async {
+    final prefs = await SharedPreferences.getInstance();
+    if (prefs.getBool(_prefNotificationPermissionAsked) ?? false) return;
+    await prefs.setBool(_prefNotificationPermissionAsked, true);
+
+    final status = await Permission.notification.status;
+    if (status.isGranted || status.isPermanentlyDenied) return;
+    if (!mounted) return;
+
+    final shouldRequest = await showDialog<bool>(
+      context: context,
+      barrierDismissible: false,
+      builder: (context) => AlertDialog(
+        title: const Text('Allow notifications?'),
+        content: const Text(
+          'Noo shows upload and download progress as a notification, so '
+          'you can track transfers that keep running in the background.',
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(false),
+            child: const Text('Not now'),
+          ),
+          FilledButton(
+            onPressed: () => Navigator.of(context).pop(true),
+            child: const Text('Allow'),
+          ),
+        ],
+      ),
+    );
+    if (shouldRequest == true) {
+      await Permission.notification.request();
+    }
+  }
+
+  void _handleSharedFiles(List<SharedFileRef> files) {
+    if (files.isEmpty) return;
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (!mounted) return;
-      Navigator.of(context).push(
+      Navigator.of(
-        MaterialPageRoute(builder: (_) => ShareUploadView(files: uploadable)),
+        context,
-      );
+      ).push(MaterialPageRoute(builder: (_) => ShareUploadView(files: files)));
     });
   }
 
@@ -158,6 +214,7 @@ class _MainShellViewState extends State<MainShellView> {
       c.dispose();
     }
     _shareSub?.cancel();
+    _pickSub?.cancel();
     super.dispose();
   }
 
@@ -176,7 +233,16 @@ class _MainShellViewState extends State<MainShellView> {
       );
     }
 
-    final visible = provider.visibleTabs;
+    final pickRequest = provider.pickRequest;
+    // While acting as another app's picker, only Files and Photos make
+    // sense as browsable sources - Trash/Shares/Activity/Recent aren't
+    // real "pick a file from here" destinations, and only these two tabs'
+    // views even know how to handle picking-mode taps. This overrides the
+    // user's own hidden/reordered tab settings rather than respecting
+    // them, since picking is a separate mode from normal browsing.
+    final visible = pickRequest != null
+        ? [AppTab.files, AppTab.photos]
+        : provider.visibleTabs;
     final selectedTab = visible.contains(_currentTab)
         ? _currentTab
         : (visible.isNotEmpty ? visible.first : AppTab.files);
@@ -188,7 +254,15 @@ class _MainShellViewState extends State<MainShellView> {
         .map((tab) => FloatingNavItem(label: tab.label, icon: tab.icon))
         .toList();
 
-    return Scaffold(
+    return PopScope(
+      // While picking, system back cancels the pick (and tells the caller
+      // nothing was chosen) instead of exiting the app from under it -
+      // there's no Navigator route to pop at this, the root screen.
+      canPop: pickRequest == null,
+      onPopInvokedWithResult: (didPop, result) {
+        if (!didPop && pickRequest != null) provider.cancelPick();
+      },
+      child: Scaffold(
         body: Stack(
           children: [
             IndexedStack(
@@ -197,6 +271,7 @@ class _MainShellViewState extends State<MainShellView> {
                   .map((tab) => buildAppTabView(tab, _scrollControllers[tab]!))
                   .toList(),
             ),
+            if (provider.isDownloadingForPick) const _PickingProgressOverlay(),
             // Each tab now renders its own sticky selection toolbar inline
             // (right under its sort/filter row) instead of this shell
             // swapping in a shared floating bar - the bottom nav stays put
@@ -233,6 +308,38 @@ class _MainShellViewState extends State<MainShellView> {
             ),
           ],
         ),
+      ),
+    );
+  }
+}
+
+/// Blocks interaction while the selected file(s) download to a local cache
+/// folder before being handed back to the caller (see
+/// `ServerProvider.confirmPick`) - can take a moment for a large file/video.
+class _PickingProgressOverlay extends StatelessWidget {
+  const _PickingProgressOverlay();
+
+  @override
+  Widget build(BuildContext context) {
+    return Positioned.fill(
+      child: ColoredBox(
+        color: Colors.black.withValues(alpha: 0.35),
+        child: const Center(
+          child: Card(
+            child: Padding(
+              padding: EdgeInsets.all(24),
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  CircularProgressIndicator(),
+                  SizedBox(height: 16),
+                  Text('Preparing file...'),
+                ],
+              ),
+            ),
+          ),
+        ),
+      ),
     );
   }
 }

lib/models/app_tab.dart

@@ -4,7 +4,7 @@ import 'package:material_symbols_icons/symbols.dart';
 /// Every destination the bottom nav bar can show. Order here is only the
 /// fallback default — actual order/visibility/default-tab are user
 /// configurable and persisted in [ServerProvider].
-enum AppTab { files, photos, activity, trash, shares, recent }
+enum AppTab { files, photos, favorites, activity, trash, shares, recent }
 
 /// At most this many tabs may be visible in the bottom nav bar at once —
 /// the rest are reachable through the "more" dropdown instead.
@@ -17,6 +17,8 @@ extension AppTabInfo on AppTab {
         return 'Files';
       case AppTab.photos:
         return 'Photos';
+      case AppTab.favorites:
+        return 'Favorites';
       case AppTab.activity:
         return 'Activity';
       case AppTab.trash:
@@ -34,6 +36,8 @@ extension AppTabInfo on AppTab {
         return Icons.folder_rounded;
       case AppTab.photos:
         return Icons.photo_library_rounded;
+      case AppTab.favorites:
+        return Icons.favorite_rounded;
       case AppTab.activity:
         return Icons.electric_bolt_rounded;
       case AppTab.trash:

lib/models/move_copy_result.dart

@@ -0,0 +1,33 @@
+import 'nextcloud_item.dart';
+
+/// A resolution choice for one conflicting item in a Move/Copy batch -
+/// keyed by `item.id` in [ConflictChoice] maps passed to
+/// `ServerProvider.resolveConflicts`.
+enum ConflictChoice { overwrite, keepBoth, skip }
+
+/// One item that couldn't be moved/copied because something with the same
+/// name already exists at the destination (a WebDAV 412 response).
+class MoveCopyConflict {
+  final NextcloudItem item;
+
+  const MoveCopyConflict(this.item);
+}
+
+/// Outcome of a Move/Copy batch (an initial attempt via
+/// `ServerProvider.moveItems`/`copyItems`, or a follow-up
+/// `resolveConflicts` call). [blockedReason] is set instead of attempting
+/// anything at all when the destination itself is invalid (e.g. moving a
+/// folder into its own subfolder).
+class MoveCopyResult {
+  final int succeeded;
+  final List<MoveCopyConflict> conflicts;
+  final int failed;
+  final String? blockedReason;
+
+  const MoveCopyResult({
+    this.succeeded = 0,
+    this.conflicts = const [],
+    this.failed = 0,
+    this.blockedReason,
+  });
+}

lib/models/pick_request.dart

@@ -0,0 +1,34 @@
+/// Another app asking Noo (via Android's GET_CONTENT chooser) to pick a
+/// file/photo and hand it back - see `PickIntentService`/`MainActivity.kt`.
+class PickRequest {
+  final String mimeType;
+  final bool allowMultiple;
+  final String? callerLabel;
+
+  const PickRequest({
+    required this.mimeType,
+    required this.allowMultiple,
+    this.callerLabel,
+  });
+
+  factory PickRequest.fromMap(Map<dynamic, dynamic> map) {
+    return PickRequest(
+      mimeType: map['mimeType'] as String? ?? '*/*',
+      allowMultiple: map['allowMultiple'] as bool? ?? false,
+      callerLabel: map['callerLabel'] as String?,
+    );
+  }
+
+  /// Whether an item's mime type satisfies this request's filter (which may
+  /// be a wildcard like `image/*` or the catch-all `*/*`).
+  bool matches(String? itemMimeType) {
+    if (mimeType == '*/*') return true;
+    if (itemMimeType == null) return false;
+    if (mimeType.endsWith('/*')) {
+      return itemMimeType.startsWith(
+        mimeType.substring(0, mimeType.length - 1),
+      );
+    }
+    return itemMimeType == mimeType;
+  }
+}

lib/models/selection_action.dart

@@ -6,13 +6,11 @@ import 'package:flutter/material.dart';
 class SelectionAction {
   final IconData icon;
   final String label;
-  final Color? color;
   final VoidCallback onTap;
 
   const SelectionAction({
     required this.icon,
     required this.label,
     required this.onTap,
-    this.color,
   });
 }

lib/providers/server_provider.dart

@@ -1,19 +1,24 @@
 import 'dart:async';
 import 'dart:convert';
+import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
+import 'package:path/path.dart' as p;
+import 'package:path_provider/path_provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:url_launcher/url_launcher.dart';
 import '../models/app_tab.dart';
+import '../models/move_copy_result.dart';
 import '../models/nextcloud_file_version.dart';
 import '../models/nextcloud_item.dart';
 import '../models/nextcloud_share.dart';
 import '../models/nextcloud_sharee.dart';
+import '../models/pick_request.dart';
 import '../models/saved_account.dart';
 import '../services/account_store.dart';
 import '../services/app_lock_service.dart';
 import '../services/login_flow_service.dart';
 import '../services/nextcloud_service.dart';
+import '../services/pick_intent_service.dart';
 import '../theme/app_theme.dart';
 
 enum LoginFlowStatus { idle, initiating, awaitingBrowser, error }
@@ -28,6 +33,10 @@ enum StorageScope { cloud, external }
 /// in Settings.
 enum SwipeAction { none, favorite, delete, share }
 
+/// The Files tab's files/folders/both filter — independent of and applied
+/// after [StorageScope]/favorites/hidden filtering.
+enum FilesTypeFilter { all, filesOnly, foldersOnly }
+
 /// How aggressively the Files tab's folder listings (not thumbnails/file
 /// content - just the list of names/sizes/dates) are reused across
 /// navigation instead of refetched from the server every time.
@@ -67,9 +76,9 @@ class ServerProvider extends ChangeNotifier with WidgetsBindingObserver {
   static const _prefBottomBarOpacity = 'ui_bottom_bar_opacity';
   static const _prefBottomBarBlur = 'ui_bottom_bar_blur';
   static const _prefGridView = 'ui_grid_view';
-  static const _prefShowFavoritesOnlyFiles = 'ui_show_favorites_only';
   static const _prefShowFavoritesOnlyPhotos = 'ui_show_favorites_only_photos';
   static const _prefStorageScope = 'ui_storage_scope';
+  static const _prefFilesTypeFilter = 'ui_files_type_filter';
   static const _prefShowHiddenFiles = 'ui_show_hidden';
   static const _prefShowHiddenPhotos = 'ui_show_hidden_photos';
   static const _prefSortField = 'ui_sort_field';
@@ -136,11 +145,17 @@ class ServerProvider extends ChangeNotifier with WidgetsBindingObserver {
   // (e.g. a search result landing on Files) - consumed and cleared by
   // MainShellView the next time it builds, not a persisted preference.
   AppTab? _requestedTab;
+
+  // Non-null while the app is acting as another app's GET_CONTENT picker
+  // (see PickIntentService/MainActivity.kt) - set at startup/onNewPickRequest
+  // in MainShellView, cleared once the pick is confirmed or cancelled.
+  PickRequest? _pickRequest;
+  bool _isDownloadingForPick = false;
   List<String> _pathStack = ['/'];
   bool _isGridView = false;
-  bool _showFavoritesOnlyFiles = false;
   bool _showFavoritesOnlyPhotos = false;
   StorageScope _storageScope = StorageScope.cloud;
+  FilesTypeFilter _filesTypeFilter = FilesTypeFilter.all;
   bool _showHiddenFiles = false;
   bool _showHiddenPhotos = false;
   // Photos tab sort - a single global setting (Photos has no folder concept,
@@ -182,6 +197,26 @@ class ServerProvider extends ChangeNotifier with WidgetsBindingObserver {
   bool _isMediaLoading = false;
   String? _mediaErrorMessage;
 
+  // All-account favorites (the Favorites tab) - same idea as [_allMedia]:
+  // a strict filter (only favorited items) but an account-wide *scope*, so
+  // a favorited item several folders deep still shows up regardless of
+  // whether its parent folders are themselves favorited - which is exactly
+  // why this is its own tab (and its own fetch/loading state, kept
+  // separate from Files' own [_isLoading]/[_errorMessage] since both tabs
+  // are simultaneously mounted in MainShellView's IndexedStack and would
+  // otherwise bleed loading/error state into each other) rather than a
+  // filter toggle scoped to whatever folder the Files tab happens to be
+  // browsing.
+  List<NextcloudItem> _allFavorites = [];
+  bool _isFavoritesLoading = false;
+  String? _favoritesErrorMessage;
+  // True once fetchAllFavorites has run at least once (i.e. the Favorites
+  // tab has been visited) - delete/rename/move/copy re-sync [_allFavorites]
+  // afterward, but only when it's actually been loaded, so those actions
+  // don't pay for an extra network round-trip on every Files/Photos edit
+  // for an account that's never opened the Favorites tab this session.
+  bool _favoritesEverFetched = false;
+
   // Trash state — kept separate from the regular folder-loading/error state
   // above so a trash-fetch failure can't bleed a stale error into Files.
   List<NextcloudItem> _trashItems = [];
@@ -291,6 +326,77 @@ class ServerProvider extends ChangeNotifier with WidgetsBindingObserver {
   String get currentFolderPath => _currentFolderPath;
   AppTab? get requestedTab => _requestedTab;
 
+  PickRequest? get pickRequest => _pickRequest;
+  bool get isPicking => _pickRequest != null;
+  bool get isDownloadingForPick => _isDownloadingForPick;
+
+  /// Whether [item] can be handed back to the app that's currently picking
+  /// - always true for folders (still browsable), mime-filtered for files.
+  bool itemMatchesPickFilter(NextcloudItem item) {
+    if (item.isFolder) return true;
+    final request = _pickRequest;
+    return request == null || request.matches(item.mimeType);
+  }
+
+  /// Called once (from MainShellView) as soon as a pick request is known -
+  /// either the cold-start request or one that arrived via onNewPickRequest
+  /// while already running.
+  void setPickRequest(PickRequest request) {
+    _pickRequest = request;
+    notifyListeners();
+  }
+
+  /// Downloads each selected item to a scratch cache folder, then hands the
+  /// local paths back to the caller through PickIntentService, which closes
+  /// the picker Activity on success. Left in [_pickRequest] (i.e. picking
+  /// mode stays visually active) if the download fails partway, so the user
+  /// can see the error and retry rather than the screen finishing under
+  /// them with nothing returned to the caller.
+  Future<bool> confirmPick(List<NextcloudItem> items) async {
+    final service = _service;
+    if (_pickRequest == null || service == null || items.isEmpty) {
+      return false;
+    }
+    _isDownloadingForPick = true;
+    notifyListeners();
+    try {
+      final tempDir = await getTemporaryDirectory();
+      final pickDir = Directory(p.join(tempDir.path, 'picker'));
+      final localPaths = <String>[];
+      final mimeTypes = <String>[];
+      for (final item in items) {
+        // Each item gets its own subfolder (keyed by id, not smashed into
+        // the filename) so two different items can share a plain file
+        // name without colliding, while the file on disk - and therefore
+        // the display name the caller sees via the content:// Uri
+        // MainActivity.kt hands back - stays exactly `item.name`.
+        final itemDir = Directory(p.join(pickDir.path, item.id));
+        await itemDir.create(recursive: true);
+        final localPath = p.join(itemDir.path, item.name);
+        await service.downloadToFile(item.path, localPath);
+        localPaths.add(localPath);
+        mimeTypes.add(item.mimeType ?? 'application/octet-stream');
+      }
+      await PickIntentService.finishPick(localPaths, mimeTypes);
+      _pickRequest = null;
+      return true;
+    } catch (_) {
+      return false;
+    } finally {
+      _isDownloadingForPick = false;
+      notifyListeners();
+    }
+  }
+
+  /// Backs out of picking mode entirely, telling the caller nothing was
+  /// picked and closing the picker Activity.
+  Future<void> cancelPick() async {
+    if (_pickRequest == null) return;
+    _pickRequest = null;
+    notifyListeners();
+    await PickIntentService.cancelPick();
+  }
+
   /// Asks the shell to switch its active bottom-nav tab to [tab] - e.g. so
   /// tapping a search result lands the user on the Files tab even if they
   /// opened search from somewhere else.
@@ -306,9 +412,9 @@ class ServerProvider extends ChangeNotifier with WidgetsBindingObserver {
 
   List<String> get pathStack => _pathStack;
   bool get isGridView => _isGridView;
-  bool get showFavoritesOnlyFiles => _showFavoritesOnlyFiles;
   bool get showFavoritesOnlyPhotos => _showFavoritesOnlyPhotos;
   StorageScope get storageScope => _storageScope;
+  FilesTypeFilter get filesTypeFilter => _filesTypeFilter;
   bool get showHiddenFiles => _showHiddenFiles;
   bool get showHiddenPhotos => _showHiddenPhotos;
   FileSortField get photosSortField => _photosSortField;
@@ -358,10 +464,11 @@ class ServerProvider extends ChangeNotifier with WidgetsBindingObserver {
         .any((segment) => segment.startsWith('.'));
   }
 
-  /// Applies the shared favorites-only/hidden-files/storage-scope toggles,
+  /// Applies the shared favorites-only/hidden-files/storage-scope toggles.
-  /// used by both [items] and [photoItems]. `showFavoritesOnly`/`showHidden`
+  /// `showFavoritesOnly` is effectively Photos-only now (`items`/
-  /// are passed in separately since Files and Photos each have their own
+  /// `favoriteItems` both always pass `false` - see their own doc
-  /// independent favorites-only and hidden-files toggles.
+  /// comments for why); kept as a parameter here since `photoItems` still
+  /// has its own independent favorites-only toggle.
   List<NextcloudItem> _applyCommonFilters(
     List<NextcloudItem> source, {
     required bool showFavoritesOnly,
@@ -384,12 +491,41 @@ class ServerProvider extends ChangeNotifier with WidgetsBindingObserver {
     return filtered;
   }
 
-  List<NextcloudItem> get items {
+  List<NextcloudItem> get items => applyFilesDisplayPrefs(_items);
-    final filtered = _applyCommonFilters(
+
-      _items,
+  /// The Favorites tab's content - every favorited item account-wide (see
-      showFavoritesOnly: _showFavoritesOnlyFiles,
+  /// `fetchAllFavorites`), run through the exact same hidden/type-filter/
+  /// sort/storage-scope display prefs as the Files tab (deliberately
+  /// shared rather than a separate parallel settings dimension, the same
+  /// way the Move/Copy destination picker reuses them). No favorites
+  /// filter needed here - the source list is already all-favorites.
+  List<NextcloudItem> get favoriteItems =>
+      applyFilesDisplayPrefs(_allFavorites);
+
+  /// Applies the Files tab's current sort/filter display prefs (hidden,
+  /// type filter, storage scope, sort field/direction) to an arbitrary raw
+  /// item list - factored out of the [items] getter so both the Favorites
+  /// tab ([favoriteItems]) and the Move/Copy destination picker (which
+  /// fetches its own listings via [fetchFolderListing] rather than reading
+  /// [items] itself - see that method's doc comment) can render with the
+  /// exact same controls/behavior as the Files tab without duplicating
+  /// this logic.
+  List<NextcloudItem> applyFilesDisplayPrefs(List<NextcloudItem> rawItems) {
+    var filtered = _applyCommonFilters(
+      rawItems,
+      // Files itself no longer filters by favorite - that's the dedicated
+      // Favorites tab's job now (see `favoriteItems`/`fetchAllFavorites`).
+      showFavoritesOnly: false,
       showHidden: _showHiddenFiles,
     );
+    switch (_filesTypeFilter) {
+      case FilesTypeFilter.all:
+        break;
+      case FilesTypeFilter.filesOnly:
+        filtered = filtered.where((i) => !i.isFolder).toList();
+      case FilesTypeFilter.foldersOnly:
+        filtered = filtered.where((i) => i.isFolder).toList();
+    }
 
     final field = filesSortField;
     final folders = filtered.where((i) => i.isFolder).toList()
@@ -415,6 +551,8 @@ class ServerProvider extends ChangeNotifier with WidgetsBindingObserver {
 
   bool get isMediaLoading => _isMediaLoading;
   String? get mediaErrorMessage => _mediaErrorMessage;
+  bool get isFavoritesLoading => _isFavoritesLoading;
+  String? get favoritesErrorMessage => _favoritesErrorMessage;
 
   NextcloudUserQuota? get quota => _quota;
   List<NextcloudActivity> get activities => _activities;
@@ -562,9 +700,9 @@ class ServerProvider extends ChangeNotifier with WidgetsBindingObserver {
 
     if (accountId == null) {
       _isGridView = false;
-      _showFavoritesOnlyFiles = false;
       _showFavoritesOnlyPhotos = false;
       _storageScope = StorageScope.cloud;
+      _filesTypeFilter = FilesTypeFilter.all;
       _showHiddenFiles = false;
       _showHiddenPhotos = false;
       _photosSortField = FileSortField.name;
@@ -577,8 +715,6 @@ class ServerProvider extends ChangeNotifier with WidgetsBindingObserver {
     String k(String base) => _accountStore.accountPrefKey(accountId, base);
 
     _isGridView = prefs.getBool(k(_prefGridView)) ?? false;
-    _showFavoritesOnlyFiles =
-        prefs.getBool(k(_prefShowFavoritesOnlyFiles)) ?? false;
     _showFavoritesOnlyPhotos =
         prefs.getBool(k(_prefShowFavoritesOnlyPhotos)) ?? false;
 
@@ -588,6 +724,12 @@ class ServerProvider extends ChangeNotifier with WidgetsBindingObserver {
       orElse: () => StorageScope.cloud,
     );
 
+    final filesTypeFilterName = prefs.getString(k(_prefFilesTypeFilter));
+    _filesTypeFilter = FilesTypeFilter.values.firstWhere(
+      (f) => f.name == filesTypeFilterName,
+      orElse: () => FilesTypeFilter.all,
+    );
+
     _showHiddenFiles = prefs.getBool(k(_prefShowHiddenFiles)) ?? false;
     _showHiddenPhotos = prefs.getBool(k(_prefShowHiddenPhotos)) ?? false;
 
@@ -669,10 +811,18 @@ class ServerProvider extends ChangeNotifier with WidgetsBindingObserver {
     } catch (e) {
       if (gen != _sessionGeneration) return false;
       _errorMessage = e.toString().replaceAll('Exception: ', '');
-      // The stored app password for this account no longer works - drop it
+      // Only drop the stored password on an actual auth rejection (401) -
-      // so it doesn't keep silently failing on every future restore/switch.
+      // NextcloudService.testConnection also throws for network-level
+      // failures (DNS, timeout, unreachable host), and those are transient:
+      // deleting a still-valid password on a dropped connection would
+      // permanently log the account out with no way back in short of
+      // Login Flow v2 again, since _activeAccountId is never cleared and
+      // switchAccount() no-ops when asked to "switch" to the account
+      // that's already (nominally) active.
+      if (_errorMessage?.contains('401') == true) {
         await _accountStore.deletePassword(account.id);
       }
+    }
 
     if (gen != _sessionGeneration) return false;
     _isLoggedIn = false;
@@ -683,13 +833,26 @@ class ServerProvider extends ChangeNotifier with WidgetsBindingObserver {
   }
 
   /// Starts Nextcloud Login Flow v2: asks the server for a one-time login
-  /// URL, opens it in the system browser, then polls until the user
+  /// URL, then polls until the user authorizes (in LoginWebViewView, pushed
-  /// authorizes and the server hands back a scoped app password. The app
+  /// by LoginView once loginFlowStatus flips to awaitingBrowser below) and
-  /// never sees the user's real password. [addAccount] only marks the
+  /// the server hands back a scoped app password. The app never sees the
-  /// flow as "add another account" for [isAddAccountFlow] - the pushed Add
+  /// user's real password. [addAccount] only marks the flow as "add
-  /// Account screen reads that to decide when to pop itself; this method's
+  /// another account" for [isAddAccountFlow] - the pushed Add Account
-  /// own persistence behavior on success ([_completeLoginFlow]) is the same
+  /// screen reads that to decide when to pop itself; this method's own
-  /// either way (create-or-refresh the resulting account, then activate it).
+  /// persistence behavior on success ([_completeLoginFlow]) is the same
+  /// either way (create-or-refresh the resulting account, then activate
+  /// it).
+  ///
+  /// Every login - first account or an additional one - goes through
+  /// LoginWebViewView (`package:webview_flutter`), a screen this app owns,
+  /// rather than a Chrome Custom Tab. That used to only be true for
+  /// add-account, specifically to avoid a Custom Tab silently reusing
+  /// Chrome's existing session for a different account; but a Custom Tab
+  /// has real costs even for the first login - no way to close it
+  /// automatically on success (the user has to switch back manually), and
+  /// it's a separate task outside this app's own navigation entirely. The
+  /// only thing it bought over a plain WebView was Chrome's own
+  /// autofill/saved-password support, which isn't worth those tradeoffs.
   Future<void> startLoginFlow(
     String serverUrl, {
     bool addAccount = false,
@@ -702,23 +865,6 @@ class ServerProvider extends ChangeNotifier with WidgetsBindingObserver {
     try {
       final init = await LoginFlowService.initiate(serverUrl);
       _pendingLoginUrl = init.loginUrl;
-
-      // Chrome Custom Tabs (inAppBrowserView): real Chrome, so the saved
-      // passwords/autofill service works normally, unlike Flutter's own
-      // embedded web view. The tradeoff is that - like Login Flow v2's
-      // grant page itself, which never redirects back into the app on its
-      // own (unlike the old nc:// Flow v1) - a Custom Tab belongs to
-      // Chrome's own task, not ours, so we have no way to close it
-      // automatically once polling below detects success; the user has to
-      // switch back manually, same as with the external browser.
-      final opened = await launchUrl(
-        init.loginUrl,
-        mode: LaunchMode.inAppBrowserView,
-      );
-      if (!opened) {
-        throw Exception('Could not open the browser for login.');
-      }
-
       _loginFlowStatus = LoginFlowStatus.awaitingBrowser;
       notifyListeners();
 
@@ -768,12 +914,6 @@ class ServerProvider extends ChangeNotifier with WidgetsBindingObserver {
     }
   }
 
-  Future<void> reopenLoginBrowser() async {
-    if (_pendingLoginUrl != null) {
-      await launchUrl(_pendingLoginUrl!, mode: LaunchMode.inAppBrowserView);
-    }
-  }
-
   void cancelLoginFlow({String? errorMessage}) {
     _pollTimer?.cancel();
     _pollTimeoutTimer?.cancel();
@@ -897,15 +1037,24 @@ class ServerProvider extends ChangeNotifier with WidgetsBindingObserver {
     unawaited(fetchRecent());
   }
 
-  /// Switches to an already-saved account. No-op if it's already active or
+  /// Switches to an already-saved account. No-op (returns true) if it's
-  /// unknown. Gated behind login lock when [lockAccountSwitching] is on.
+  /// already active and logged in; no-op (returns false) if unknown - but
-  Future<void> switchAccount(String accountId) async {
+  /// if [accountId] is nominally "active" while [isLoggedIn] is false (a
-    if (accountId == _activeAccountId) return;
+  /// session-restore that failed, e.g. transient network trouble at cold
-    if (!_accounts.any((a) => a.id == accountId)) return;
+  /// start), this still retries rather than no-op, since that's exactly the
+  /// case LoginView's "Continue as" tile exists to recover from. Gated
+  /// behind login lock when [lockAccountSwitching] is on. Returns whether
+  /// the account ended up logged in, so callers (LoginView's saved-account
+  /// tile) can surface a failure - e.g. a stored app password that no
+  /// longer works and needs the account removed/re-added.
+  Future<bool> switchAccount(String accountId) async {
+    if (accountId == _activeAccountId && _isLoggedIn) return true;
+    if (!_accounts.any((a) => a.id == accountId)) return false;
     if (!await _passGate(_lockAccountSwitching, 'Unlock to switch accounts')) {
-      return;
+      return false;
     }
     await _activateAccount(accountId);
+    return _isLoggedIn;
   }
 
   Future<SavedAccount?> _cycleAccount(int direction) async {
@@ -1086,6 +1235,48 @@ class ServerProvider extends ChangeNotifier with WidgetsBindingObserver {
     }
   }
 
+  /// Loads every favorited item across the whole account for the Favorites
+  /// tab - see [_allFavorites]'s doc comment for why this is a separate
+  /// account-wide fetch rather than a filter over the currently browsed
+  /// folder's [_items].
+  Future<void> fetchAllFavorites() async {
+    if (!_isLoggedIn || _service == null) return;
+    final gen = _sessionGeneration;
+    _favoritesEverFetched = true;
+
+    _isFavoritesLoading = true;
+    _favoritesErrorMessage = null;
+    notifyListeners();
+
+    try {
+      final favorites = await _service!.fetchFavorites();
+      if (gen != _sessionGeneration) return;
+      _allFavorites = favorites;
+      debugPrint('[ServerProvider] Loaded ${_allFavorites.length} favorites');
+    } catch (e) {
+      if (gen != _sessionGeneration) return;
+      debugPrint('[ServerProvider] Error fetching favorites: $e');
+      _favoritesErrorMessage = e.toString().replaceAll('Exception: ', '');
+    } finally {
+      if (gen == _sessionGeneration) {
+        _isFavoritesLoading = false;
+        notifyListeners();
+      }
+    }
+  }
+
+  /// Re-syncs [_allFavorites] after a delete/rename/move/copy elsewhere in
+  /// the app (Files, Photos, or Favorites itself) - those operations don't
+  /// know how to patch [_allFavorites] in place (a move changes an item's
+  /// path; WebDAV COPY's handling of custom properties like `oc:favorite`
+  /// isn't reliable enough to assume the copy is still favorited), so this
+  /// just refetches - but only if Favorites has actually been loaded this
+  /// session, so an account that never opens that tab doesn't pay for an
+  /// extra request on every edit.
+  Future<void> _syncFavoritesIfLoaded() {
+    return _favoritesEverFetched ? fetchAllFavorites() : Future.value();
+  }
+
   Future<void> navigateToFolder(String path) async {
     _pathStack.add(path);
     await _navigateTo(path);
@@ -1174,15 +1365,6 @@ class ServerProvider extends ChangeNotifier with WidgetsBindingObserver {
     _persistAccountPref(_prefGridView, (p, key) => p.setBool(key, value));
   }
 
-  void toggleFavoritesFilterFiles() {
-    _showFavoritesOnlyFiles = !_showFavoritesOnlyFiles;
-    notifyListeners();
-    _persistAccountPref(
-      _prefShowFavoritesOnlyFiles,
-      (p, key) => p.setBool(key, _showFavoritesOnlyFiles),
-    );
-  }
-
   void toggleFavoritesFilterPhotos() {
     _showFavoritesOnlyPhotos = !_showFavoritesOnlyPhotos;
     notifyListeners();
@@ -1202,6 +1384,16 @@ class ServerProvider extends ChangeNotifier with WidgetsBindingObserver {
     );
   }
 
+  void setFilesTypeFilter(FilesTypeFilter filter) {
+    if (_filesTypeFilter == filter) return;
+    _filesTypeFilter = filter;
+    notifyListeners();
+    _persistAccountPref(
+      _prefFilesTypeFilter,
+      (p, key) => p.setString(key, filter.name),
+    );
+  }
+
   /// Only *enabling* hidden-files visibility is gated - hiding them again
   /// never exposes anything, so that direction is always allowed instantly.
   Future<void> toggleShowHiddenFiles() async {
@@ -1382,30 +1574,13 @@ class ServerProvider extends ChangeNotifier with WidgetsBindingObserver {
     _startCacheRefreshTimerIfNeeded();
   }
 
-  Future<bool> uploadFileFromPath(
-    String name,
-    String localFilePath, {
-    void Function(int sent, int total)? onProgress,
-  }) async {
-    if (_service == null) return false;
-    final success = await _service!.uploadFileFromPath(
-      _currentFolderPath,
-      name,
-      localFilePath,
-      onProgress: onProgress,
-    );
-    if (success) {
-      await refreshData();
-    }
-    return success;
-  }
-
   Future<bool> deleteItem(String itemPath) async {
     if (_service == null) return false;
     final success = await _service!.deleteItem(itemPath);
     if (success) {
       _allMedia = _allMedia.where((i) => i.path != itemPath).toList();
       await refreshData();
+      await _syncFavoritesIfLoaded();
     }
     return success;
   }
@@ -1415,10 +1590,178 @@ class ServerProvider extends ChangeNotifier with WidgetsBindingObserver {
     final success = await _service!.renameItem(item.path, newName);
     if (success) {
       await refreshData();
+      await _syncFavoritesIfLoaded();
     }
     return success;
   }
 
+  /// A destination-picker-only fetch: the current folder listing state
+  /// (`items`/`currentFolderPath`/`pathStack`/`_directoryCache`) belongs to
+  /// whichever tab is actively browsing (Files), so the Move/Copy
+  /// destination picker deliberately doesn't touch any of it - it fetches
+  /// listings for its own local navigation state through this instead,
+  /// mirroring `searchFiles`'s identical stateless-pass-through shape.
+  Future<List<NextcloudItem>> fetchFolderListing(String path) {
+    return _service?.fetchDirectory(path) ?? Future.value([]);
+  }
+
+  /// True if [destFolderPath] is [folderPath] itself or one of its own
+  /// descendants - moving/copying a folder into itself (or a subfolder of
+  /// itself) is nonsensical and rejected client-side rather than left to
+  /// the server to (maybe) reject.
+  bool _isSelfOrDescendant(String destFolderPath, String folderPath) {
+    final dest = destFolderPath.endsWith('/')
+        ? destFolderPath
+        : '$destFolderPath/';
+    final folder = folderPath.endsWith('/') ? folderPath : '$folderPath/';
+    return dest == folder || dest.startsWith(folder);
+  }
+
+  Future<MoveCopyResult> _moveOrCopyItems(
+    List<NextcloudItem> items,
+    String destFolderPath, {
+    required bool copy,
+  }) async {
+    if (_service == null || items.isEmpty) return const MoveCopyResult();
+    for (final item in items) {
+      if (item.isFolder && _isSelfOrDescendant(destFolderPath, item.path)) {
+        return const MoveCopyResult(
+          blockedReason:
+              "Can't move a folder into itself or one of its own subfolders",
+        );
+      }
+    }
+
+    var succeeded = 0;
+    var failed = 0;
+    final conflicts = <MoveCopyConflict>[];
+    for (final item in items) {
+      final status = copy
+          ? await _service!.copyItem(item.path, destFolderPath)
+          : await _service!.moveItem(item.path, destFolderPath);
+      if (status == 201 || status == 204) {
+        succeeded++;
+      } else if (status == 412) {
+        conflicts.add(MoveCopyConflict(item));
+      } else {
+        failed++;
+      }
+    }
+    if (succeeded > 0) {
+      _directoryCache.clear();
+      await refreshData();
+      await _syncFavoritesIfLoaded();
+    }
+    return MoveCopyResult(
+      succeeded: succeeded,
+      conflicts: conflicts,
+      failed: failed,
+    );
+  }
+
+  /// Moves every item in [items] into [destFolderPath], keeping each
+  /// item's own filename. Items that would collide with something already
+  /// there come back in [MoveCopyResult.conflicts] rather than failing
+  /// outright - resolve those with [resolveConflicts].
+  Future<MoveCopyResult> moveItems(
+    List<NextcloudItem> items,
+    String destFolderPath,
+  ) {
+    return _moveOrCopyItems(items, destFolderPath, copy: false);
+  }
+
+  /// Same as [moveItems] but duplicates rather than relocates.
+  Future<MoveCopyResult> copyItems(
+    List<NextcloudItem> items,
+    String destFolderPath,
+  ) {
+    return _moveOrCopyItems(items, destFolderPath, copy: true);
+  }
+
+  /// Finds the first `name (n).ext` not already in [existing] - `existing`
+  /// is mutated as names are claimed, so a batch of "keep both" resolutions
+  /// never picks the same generated name twice.
+  String _nextAvailableName(String name, Set<String> existing) {
+    if (!existing.contains(name)) return name;
+    final dotIndex = name.lastIndexOf('.');
+    final hasExtension = dotIndex > 0 && dotIndex < name.length - 1;
+    final base = hasExtension ? name.substring(0, dotIndex) : name;
+    final ext = hasExtension ? name.substring(dotIndex) : '';
+    var n = 2;
+    while (existing.contains('$base ($n)$ext')) {
+      n++;
+    }
+    return '$base ($n)$ext';
+  }
+
+  /// Resolves a previous [moveItems]/[copyItems] call's conflicts per
+  /// [choices] (keyed by `item.id`): overwrite the existing item, keep
+  /// both (renamed against a fresh listing of [destFolderPath] so two
+  /// "keep both" picks in the same batch can't collide with each other),
+  /// or skip (left untouched at the source).
+  Future<MoveCopyResult> resolveConflicts(
+    List<MoveCopyConflict> conflicts,
+    String destFolderPath, {
+    required bool copy,
+    required Map<String, ConflictChoice> choices,
+  }) async {
+    if (_service == null || conflicts.isEmpty) return const MoveCopyResult();
+
+    final needsKeepBoth = conflicts.any(
+      (c) => choices[c.item.id] == ConflictChoice.keepBoth,
+    );
+    final existingNames = needsKeepBoth
+        ? (await fetchFolderListing(destFolderPath)).map((i) => i.name).toSet()
+        : <String>{};
+
+    var succeeded = 0;
+    var failed = 0;
+    for (final conflict in conflicts) {
+      final choice = choices[conflict.item.id] ?? ConflictChoice.skip;
+      if (choice == ConflictChoice.skip) continue;
+
+      final int status;
+      if (choice == ConflictChoice.overwrite) {
+        status = copy
+            ? await _service!.copyItem(
+                conflict.item.path,
+                destFolderPath,
+                overwrite: true,
+              )
+            : await _service!.moveItem(
+                conflict.item.path,
+                destFolderPath,
+                overwrite: true,
+              );
+      } else {
+        final newName = _nextAvailableName(conflict.item.name, existingNames);
+        existingNames.add(newName);
+        status = copy
+            ? await _service!.copyItem(
+                conflict.item.path,
+                destFolderPath,
+                newName: newName,
+              )
+            : await _service!.moveItem(
+                conflict.item.path,
+                destFolderPath,
+                newName: newName,
+              );
+      }
+      if (status == 201 || status == 204) {
+        succeeded++;
+      } else {
+        failed++;
+      }
+    }
+    if (succeeded > 0) {
+      _directoryCache.clear();
+      await refreshData();
+      await _syncFavoritesIfLoaded();
+    }
+    return MoveCopyResult(succeeded: succeeded, failed: failed);
+  }
+
   Future<void> fetchTrash() async {
     if (!_isLoggedIn || _service == null) return;
     final gen = _sessionGeneration;
@@ -1553,6 +1896,21 @@ class ServerProvider extends ChangeNotifier with WidgetsBindingObserver {
       if (index != -1) _items[index] = updated;
       final mediaIndex = _allMedia.indexWhere((i) => i.id == item.id);
       if (mediaIndex != -1) _allMedia[mediaIndex] = updated;
+      // Keeps the Favorites tab's own list in sync in place (cheap enough
+      // not to need a full refetch, unlike delete/rename/move/copy - see
+      // `_syncFavoritesIfLoaded`) - added if newly favorited, removed if
+      // un-favorited, since [_allFavorites] should only ever hold
+      // favorited items.
+      final favIndex = _allFavorites.indexWhere((i) => i.id == item.id);
+      if (updated.isFavorite) {
+        if (favIndex != -1) {
+          _allFavorites[favIndex] = updated;
+        } else {
+          _allFavorites = [..._allFavorites, updated];
+        }
+      } else if (favIndex != -1) {
+        _allFavorites = [..._allFavorites]..removeAt(favIndex);
+      }
       notifyListeners();
     }
   }

lib/services/account_store.dart

@@ -27,7 +27,6 @@ class AccountStore {
   /// by account switching.
   static const perAccountPrefKeys = [
     'ui_grid_view',
-    'ui_show_favorites_only',
     'ui_show_favorites_only_photos',
     'ui_storage_scope',
     'ui_show_hidden',
@@ -35,6 +34,7 @@ class AccountStore {
     'ui_sort_field',
     'ui_sort_ascending',
     'ui_folder_sort',
+    'ui_files_type_filter',
     'ui_cache_policy',
     'ui_cache_interval_minutes',
   ];

lib/services/download_service.dart

@@ -0,0 +1,52 @@
+import 'dart:convert';
+import 'package:flutter/services.dart';
+import '../models/nextcloud_item.dart';
+import '../providers/server_provider.dart';
+
+/// Hands a download off to `DownloadService.kt`'s Android foreground
+/// service - the download counterpart of `UploadService`/
+/// `ShareUploadService.kt` (see that pair's doc comments for why this
+/// isn't done in Dart/Dio: only a real Android Service survives the
+/// Flutter engine/Activity being gone, the same guarantee a real
+/// file-manager app's download notification gives you). Saves straight
+/// into the device's public Downloads folder with one cancellable
+/// progress notification for the whole batch, instead of the old
+/// download-to-app-cache-then-`file_saver`-prompt flow.
+class DownloadService {
+  static const _channel = MethodChannel('dev.ayushya.noo/download_service');
+
+  /// Starts downloading [items]. Fire-and-forget from Dart's perspective -
+  /// once this returns, the service owns the rest and reports
+  /// progress/completion/cancellation through its own notification, not
+  /// back to the app.
+  static Future<void> startDownload(
+    ServerProvider provider,
+    List<NextcloudItem> items,
+  ) async {
+    final service = provider.service;
+    final authHeader = service?.authHeaders['Authorization'];
+    if (service == null || authHeader == null) {
+      throw Exception('Not logged in.');
+    }
+
+    final filesJson = jsonEncode(
+      items
+          .map(
+            (i) => {
+              'path': i.path,
+              'name': i.name,
+              'mimeType': i.mimeType,
+              'size': i.size,
+            },
+          )
+          .toList(),
+    );
+
+    await _channel.invokeMethod('startDownload', {
+      'files': filesJson,
+      'serverUrl': provider.serverUrl,
+      'username': provider.username,
+      'authHeader': authHeader,
+    });
+  }
+}

lib/services/nextcloud_service.dart

@@ -699,6 +699,170 @@ class NextcloudService {
     return results;
   }
 
+  /// Finds every favorited file/folder anywhere in the account (not just
+  /// the currently browsed folder) via the same WebDAV SEARCH-REPORT
+  /// mechanism as [fetchAllMedia], filtered by `oc:favorite` instead of
+  /// mimetype. Used by the Files tab's favorites-only toggle: filtering
+  /// should still be strict (only favorited items), but the *scope* is the
+  /// whole account, not whatever folder happens to be open - otherwise a
+  /// favorited item nested a few folders down would never show up just
+  /// because its parent folders aren't favorited themselves.
+  Future<List<NextcloudItem>> fetchFavorites() async {
+    final url = '$_cleanServerUrl/remote.php/dav/';
+    debugPrint('[Nextcloud DAV] SEARCH for favorites from $url');
+
+    final body =
+        '''<?xml version="1.0" encoding="utf-8" ?>
+<d:searchrequest xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns" xmlns:nc="http://nextcloud.org/ns">
+  <d:basicsearch>
+    <d:select>
+      <d:prop>
+        <d:displayname/>
+        <d:getcontentlength/>
+        <d:getlastmodified/>
+        <d:creationdate/>
+        <d:getcontenttype/>
+        <d:resourcetype/>
+        <oc:favorite/>
+        <oc:fileid/>
+        <nc:mount-type/>
+      </d:prop>
+    </d:select>
+    <d:from>
+      <d:scope>
+        <d:href>/files/$username</d:href>
+        <d:depth>infinity</d:depth>
+      </d:scope>
+    </d:from>
+    <d:where>
+      <d:eq>
+        <d:prop><oc:favorite/></d:prop>
+        <d:literal>1</d:literal>
+      </d:eq>
+    </d:where>
+    <d:orderby>
+      <d:order>
+        <d:prop><d:displayname/></d:prop>
+        <d:ascending/>
+      </d:order>
+    </d:orderby>
+  </d:basicsearch>
+</d:searchrequest>''';
+
+    final request = http.Request('SEARCH', Uri.parse(url))
+      ..headers.addAll({..._headers, 'Content-Type': 'text/xml'})
+      ..body = body;
+
+    final streamed = await http.Client().send(request);
+    final responseBody = await streamed.stream.bytesToString();
+    debugPrint(
+      '[Nextcloud DAV] Favorites SEARCH status: ${streamed.statusCode}, bytes: ${responseBody.length}',
+    );
+
+    if (streamed.statusCode != 207 && streamed.statusCode != 200) {
+      throw Exception('Failed to load favorites. HTTP ${streamed.statusCode}');
+    }
+
+    final document = xml.XmlDocument.parse(responseBody);
+    final responses = document.findLocalDescendants('response');
+
+    final results = <NextcloudItem>[];
+    for (var res in responses) {
+      final hrefNode =
+          res.findLocalChildren('href').firstOrNull ??
+          res.findLocalDescendants('href').firstOrNull;
+      final href = hrefNode?.innerText ?? '';
+      if (href.isEmpty) continue;
+
+      final props = res.findLocalDescendants('prop');
+      if (props.isEmpty) continue;
+
+      bool isCollection = false;
+      String? sizeStr;
+      String? lastModStr;
+      String? createdStr;
+      String? mimeType;
+      String? fileId;
+      String? mountType;
+
+      for (var prop in props) {
+        if (!isCollection) {
+          final resTypeNode = prop
+              .findLocalChildren('resourcetype')
+              .firstOrNull;
+          if (resTypeNode != null &&
+              resTypeNode.findLocalChildren('collection').isNotEmpty) {
+            isCollection = true;
+          }
+        }
+        sizeStr ??= prop
+            .findLocalChildren('getcontentlength')
+            .firstOrNull
+            ?.innerText;
+        lastModStr ??= prop
+            .findLocalChildren('getlastmodified')
+            .firstOrNull
+            ?.innerText;
+        createdStr ??= prop
+            .findLocalChildren('creationdate')
+            .firstOrNull
+            ?.innerText;
+        mimeType ??= prop
+            .findLocalChildren('getcontenttype')
+            .firstOrNull
+            ?.innerText;
+        fileId ??= prop.findLocalChildren('fileid').firstOrNull?.innerText;
+        mountType ??= prop
+            .findLocalChildren('mount-type')
+            .firstOrNull
+            ?.innerText;
+      }
+
+      var decodedHref = Uri.decodeFull(href);
+      if (decodedHref.endsWith('/') && decodedHref.length > 1) {
+        decodedHref = decodedHref.substring(0, decodedHref.length - 1);
+      }
+      final name = decodedHref.split('/').where((s) => s.isNotEmpty).last;
+      if (name.isEmpty) continue;
+
+      // Strip the DAV root prefix so `path` matches what fetchDirectory produces.
+      final marker = '/files/$username';
+      final markerIndex = decodedHref.indexOf(marker);
+      final itemPath = markerIndex >= 0
+          ? decodedHref.substring(markerIndex + marker.length)
+          : decodedHref;
+      if (itemPath.isEmpty) continue;
+
+      final size = int.tryParse(sizeStr ?? '0') ?? 0;
+      final lastMod = _parseDavDate(lastModStr) ?? DateTime.now();
+      final created = _parseDavDate(createdStr);
+      final itemType = NextcloudItem.deduceType(name, isCollection, mimeType);
+      final validId = (fileId != null && fileId.isNotEmpty) ? fileId : name;
+
+      results.add(
+        NextcloudItem(
+          id: validId,
+          name: name,
+          path: itemPath,
+          type: itemType,
+          size: size,
+          lastModified: lastMod,
+          dateCreated: created,
+          isFavorite: true,
+          mimeType: mimeType,
+          previewUrl:
+              '$_cleanServerUrl/core/preview?fileId=$validId&x=500&y=500',
+          mountType: mountType,
+        ),
+      );
+    }
+
+    debugPrint(
+      '[Nextcloud DAV] Favorites SEARCH found ${results.length} items',
+    );
+    return results;
+  }
+
   /// Finds recently modified files across the whole account (folders
   /// excluded), newest first — same SEARCH-REPORT mechanism as
   /// [fetchAllMedia], just without the image/video mimetype filter.
@@ -939,44 +1103,6 @@ class NextcloudService {
     return [];
   }
 
-  /// Uploads a file from disk, streaming it so large files don't need to be
-  /// buffered fully in memory, with progress reporting.
-  Future<bool> uploadFileFromPath(
-    String folderPath,
-    String fileName,
-    String localFilePath, {
-    void Function(int sent, int total)? onProgress,
-  }) async {
-    var cleanPath = folderPath.trim();
-    if (!cleanPath.startsWith('/')) cleanPath = '/$cleanPath';
-    if (!cleanPath.endsWith('/')) cleanPath = '$cleanPath/';
-
-    final url =
-        '$_cleanServerUrl/remote.php/dav/files/$username$cleanPath$fileName';
-    debugPrint('[Nextcloud DAV] Streaming upload to $url');
-
-    final file = File(localFilePath);
-    final length = await file.length();
-    final dio = Dio();
-
-    final response = await dio.put<void>(
-      url,
-      data: file.openRead(),
-      options: Options(
-        headers: {..._headers, Headers.contentLengthHeader: length},
-        contentType: 'application/octet-stream',
-      ),
-      onSendProgress: onProgress,
-    );
-
-    debugPrint(
-      '[Nextcloud DAV] Streaming upload status: ${response.statusCode}',
-    );
-    return response.statusCode == 201 ||
-        response.statusCode == 204 ||
-        response.statusCode == 200;
-  }
-
   Future<bool> deleteItem(String itemPath) async {
     var cleanPath = itemPath.trim();
     if (!cleanPath.startsWith('/')) cleanPath = '/$cleanPath';
@@ -989,6 +1115,43 @@ class NextcloudService {
     return response.statusCode == 204 || response.statusCode == 200;
   }
 
+  /// Shared MOVE/COPY request - WebDAV COPY is the same shape as the MOVE
+  /// [renameItem] uses, just a different verb and a caller-controlled
+  /// `Overwrite` rather than always forced off. Returns the raw HTTP status
+  /// rather than a bool so callers can tell a conflict (412 - only
+  /// possible when `overwrite` is false) apart from any other failure
+  /// without a separate existence-check request per item.
+  Future<int> _moveOrCopy(
+    String sourcePath,
+    String destPath, {
+    required bool copy,
+    required bool overwrite,
+  }) async {
+    var cleanSource = sourcePath.trim();
+    if (!cleanSource.startsWith('/')) cleanSource = '/$cleanSource';
+    var cleanDest = destPath.trim();
+    if (!cleanDest.startsWith('/')) cleanDest = '/$cleanDest';
+
+    final sourceUrl =
+        '$_cleanServerUrl/remote.php/dav/files/$username$cleanSource';
+    final destUrl = '$_cleanServerUrl/remote.php/dav/files/$username$cleanDest';
+    debugPrint(
+      '[Nextcloud DAV] ${copy ? 'Copying' : 'Moving'} $sourceUrl -> $destUrl',
+    );
+
+    final request = http.Request(copy ? 'COPY' : 'MOVE', Uri.parse(sourceUrl))
+      ..headers.addAll({
+        ..._headers,
+        'Destination': Uri.encodeFull(destUrl),
+        'Overwrite': overwrite ? 'T' : 'F',
+      });
+    final response = await http.Client().send(request);
+    debugPrint(
+      '[Nextcloud DAV] ${copy ? 'Copy' : 'Move'} status: ${response.statusCode}',
+    );
+    return response.statusCode;
+  }
+
   /// Renames (or moves within the same folder) an item via WebDAV MOVE.
   Future<bool> renameItem(String itemPath, String newName) async {
     var cleanPath = itemPath.trim();
@@ -997,20 +1160,75 @@ class NextcloudService {
     final segments = cleanPath.split('/')..removeLast();
     final destPath = '${segments.join('/')}/$newName';
 
-    final sourceUrl =
+    final status = await _moveOrCopy(
-        '$_cleanServerUrl/remote.php/dav/files/$username$cleanPath';
+      cleanPath,
-    final destUrl = '$_cleanServerUrl/remote.php/dav/files/$username$destPath';
+      destPath,
-    debugPrint('[Nextcloud DAV] Renaming $sourceUrl -> $destUrl');
+      copy: false,
+      overwrite: false,
+    );
+    return status == 201 || status == 204;
+  }
 
-    final request = http.Request('MOVE', Uri.parse(sourceUrl))
+  Future<int> _moveOrCopyToFolder(
-      ..headers.addAll({
+    String itemPath,
-        ..._headers,
+    String destFolderPath, {
-        'Destination': Uri.encodeFull(destUrl),
+    required bool copy,
-        'Overwrite': 'F',
+    required bool overwrite,
-      });
+    String? newName,
-    final response = await http.Client().send(request);
+  }) {
-    debugPrint('[Nextcloud DAV] Rename status: ${response.statusCode}');
+    var cleanPath = itemPath.trim();
-    return response.statusCode == 201 || response.statusCode == 204;
+    if (!cleanPath.startsWith('/')) cleanPath = '/$cleanPath';
+    final name = newName ?? cleanPath.split('/').last;
+
+    var cleanDestFolder = destFolderPath.trim();
+    if (!cleanDestFolder.startsWith('/')) cleanDestFolder = '/$cleanDestFolder';
+    if (cleanDestFolder.endsWith('/') && cleanDestFolder != '/') {
+      cleanDestFolder = cleanDestFolder.substring(
+        0,
+        cleanDestFolder.length - 1,
+      );
+    }
+    final destPath = cleanDestFolder == '/'
+        ? '/$name'
+        : '$cleanDestFolder/$name';
+    return _moveOrCopy(cleanPath, destPath, copy: copy, overwrite: overwrite);
+  }
+
+  /// Moves [itemPath] into [destFolderPath], keeping its current filename
+  /// unless [newName] is given (used to resolve a "keep both" conflict
+  /// with a renamed destination). Returns the raw HTTP status - 201/204
+  /// success, 412 means an item with the same name already exists there
+  /// ([overwrite] was false).
+  Future<int> moveItem(
+    String itemPath,
+    String destFolderPath, {
+    bool overwrite = false,
+    String? newName,
+  }) {
+    return _moveOrCopyToFolder(
+      itemPath,
+      destFolderPath,
+      copy: false,
+      overwrite: overwrite,
+      newName: newName,
+    );
+  }
+
+  /// Same as [moveItem] but duplicates the item instead of relocating it -
+  /// WebDAV COPY, recursive for folders by default just like MOVE.
+  Future<int> copyItem(
+    String itemPath,
+    String destFolderPath, {
+    bool overwrite = false,
+    String? newName,
+  }) {
+    return _moveOrCopyToFolder(
+      itemPath,
+      destFolderPath,
+      copy: true,
+      overwrite: overwrite,
+      newName: newName,
+    );
   }
 
   Future<bool> createFolder(String parentPath, String folderName) async {

lib/services/pick_intent_service.dart

@@ -0,0 +1,47 @@
+import 'package:flutter/services.dart';
+import '../models/pick_request.dart';
+
+/// Talks to `MainActivity.kt`'s hand-rolled GET_CONTENT picker handling
+/// (mirrors `ShareIntentService`'s split between a cold-start check and a
+/// stream for an intent arriving while the app is already running - the
+/// same `singleTask` launch mode applies here).
+class PickIntentService {
+  static const _methodChannel = MethodChannel('dev.ayushya.noo/pick_intent');
+  static const _newPickChannel = EventChannel(
+    'dev.ayushya.noo/pick_intent/new',
+  );
+
+  /// Non-null if the app was launched cold as another app's file/photo
+  /// picker.
+  static Future<PickRequest?> getPickRequest() async {
+    final result = await _methodChannel.invokeMethod<Map<dynamic, dynamic>>(
+      'getPickRequest',
+    );
+    return result == null ? null : PickRequest.fromMap(result);
+  }
+
+  /// Emits whenever the app is asked to act as a picker while already
+  /// running.
+  static Stream<PickRequest> get onNewPickRequest {
+    return _newPickChannel.receiveBroadcastStream().map(
+      (event) => PickRequest.fromMap(event as Map<dynamic, dynamic>),
+    );
+  }
+
+  /// Hands the already-downloaded local files back to the caller and closes
+  /// the picker. [mimeTypes] is parallel to [localPaths].
+  static Future<void> finishPick(
+    List<String> localPaths,
+    List<String> mimeTypes,
+  ) {
+    return _methodChannel.invokeMethod('finishPick', {
+      'paths': localPaths,
+      'mimeTypes': mimeTypes,
+    });
+  }
+
+  /// Backs out of picking mode with no result, closing the picker.
+  static Future<void> cancelPick() {
+    return _methodChannel.invokeMethod('cancelPick');
+  }
+}

lib/services/share_intent_service.dart

@@ -0,0 +1,61 @@
+import 'package:flutter/services.dart';
+
+/// A file shared to Noo from another app's "Share to..." sheet, before its
+/// bytes have been touched - just the `content://` Uri and whatever cheap
+/// metadata Android will hand over without reading the file itself.
+class SharedFileRef {
+  final String uri;
+  final String name;
+  final String? mimeType;
+  final int? size;
+
+  const SharedFileRef({
+    required this.uri,
+    required this.name,
+    this.mimeType,
+    this.size,
+  });
+
+  factory SharedFileRef.fromMap(Map<dynamic, dynamic> map) {
+    return SharedFileRef(
+      uri: map['uri'] as String,
+      name: map['name'] as String? ?? 'shared_file',
+      mimeType: map['mimeType'] as String?,
+      size: (map['size'] as num?)?.toInt(),
+    );
+  }
+}
+
+/// Talks to `MainActivity.kt`'s hand-rolled share-intent handling (see its
+/// doc comment for why this isn't the receive_sharing_intent plugin): it
+/// only ever exposes cheap Uri metadata up front. Actually reading a shared
+/// file's bytes - preparing and uploading it - is [UploadService]'s job
+/// (`ShareUploadService.kt`'s Android foreground service), not this one.
+class ShareIntentService {
+  static const _methodChannel = MethodChannel('dev.ayushya.noo/share_intent');
+  static const _newShareChannel = EventChannel(
+    'dev.ayushya.noo/share_intent/new',
+  );
+
+  /// Whatever was shared to launch the app cold (empty if it was launched
+  /// normally, not via a share).
+  static Future<List<SharedFileRef>> getInitialShare() async {
+    final result = await _methodChannel.invokeMethod<List<dynamic>>(
+      'getInitialShare',
+    );
+    return (result ?? [])
+        .cast<Map<dynamic, dynamic>>()
+        .map(SharedFileRef.fromMap)
+        .toList();
+  }
+
+  /// Emits whenever another share arrives while the app is already running.
+  static Stream<List<SharedFileRef>> get onNewShare {
+    return _newShareChannel.receiveBroadcastStream().map((event) {
+      return (event as List<dynamic>)
+          .cast<Map<dynamic, dynamic>>()
+          .map(SharedFileRef.fromMap)
+          .toList();
+    });
+  }
+}

lib/services/upload_service.dart

@@ -0,0 +1,42 @@
+import 'dart:convert';
+import 'package:flutter/services.dart';
+import '../providers/server_provider.dart';
+import 'share_intent_service.dart';
+
+/// Hands a "Share to Noo" upload off to `ShareUploadService.kt`'s Android
+/// foreground service, which does the actual prepare+upload entirely on its
+/// own from there - including surviving the app being closed - with a
+/// single cancellable progress notification for the whole batch. See that
+/// service's doc comment for why this isn't done in Dart/Dio: a Dart
+/// isolate doesn't keep running once the Flutter engine is gone, only a
+/// real Android Service does.
+class UploadService {
+  static const _channel = MethodChannel('dev.ayushya.noo/upload_service');
+
+  /// Starts uploading [files] into the active account's current folder.
+  /// Fire-and-forget from Dart's perspective - once this returns, the
+  /// service owns the rest and reports progress/completion/cancellation
+  /// through its own notification, not back to the app.
+  static Future<void> startUpload(
+    ServerProvider provider,
+    List<SharedFileRef> files,
+  ) async {
+    final service = provider.service;
+    final authHeader = service?.authHeaders['Authorization'];
+    if (service == null || authHeader == null) {
+      throw Exception('Not logged in.');
+    }
+
+    final filesJson = jsonEncode(
+      files.map((f) => {'uri': f.uri, 'name': f.name, 'size': f.size}).toList(),
+    );
+
+    await _channel.invokeMethod('startUpload', {
+      'files': filesJson,
+      'serverUrl': provider.serverUrl,
+      'username': provider.username,
+      'authHeader': authHeader,
+      'remoteFolder': provider.currentFolderPath,
+    });
+  }
+}

lib/views/account_view.dart

@@ -80,30 +80,6 @@ class AccountView extends StatelessWidget {
                   const SizedBox(height: 16),
                   const Divider(height: 1),
                   const SizedBox(height: 16),
-                  Row(
-                    children: [
-                      Icon(
-                        Icons.public_rounded,
-                        size: 18,
-                        color: colorScheme.onSurfaceVariant,
-                      ),
-                      const SizedBox(width: 8),
-                      Expanded(
-                        child: Text(
-                          Uri.tryParse(provider.serverUrl)?.host ??
-                              provider.serverUrl,
-                          maxLines: 1,
-                          overflow: TextOverflow.ellipsis,
-                          style: theme.textTheme.bodyMedium?.copyWith(
-                            color: colorScheme.onSurfaceVariant,
-                          ),
-                        ),
-                      ),
-                    ],
-                  ),
-                  const SizedBox(height: 16),
-                  const Divider(height: 1),
-                  const SizedBox(height: 16),
                   Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
@@ -137,9 +113,22 @@ class AccountView extends StatelessWidget {
                     ),
                   ),
                   const SizedBox(height: 8),
-                  Align(
+                  Row(
-                    alignment: Alignment.centerRight,
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Expanded(
                         child: Text(
+                          Uri.tryParse(provider.serverUrl)?.host ??
+                              provider.serverUrl,
+                          maxLines: 1,
+                          overflow: TextOverflow.ellipsis,
+                          style: theme.textTheme.bodySmall?.copyWith(
+                            color: colorScheme.onSurfaceVariant,
+                            fontSize: 11,
+                          ),
+                        ),
+                      ),
+                      Text(
                         quota != null
                             ? (quota.totalBytes > 0
                                   ? '${(quota.usagePercentage * 100).toStringAsFixed(1)}% used'
@@ -150,6 +139,7 @@ class AccountView extends StatelessWidget {
                           fontSize: 11,
                         ),
                       ),
+                    ],
                   ),
                   if (quota != null && quota.groups.isNotEmpty) ...[
                     const SizedBox(height: 16),
@@ -188,9 +178,11 @@ class AccountView extends StatelessWidget {
                   const Divider(height: 1),
                   const SizedBox(height: 16),
                   Row(
+                    mainAxisAlignment: MainAxisAlignment.end,
                     children: [
-                      Expanded(
+                      IconButton(
-                        child: OutlinedButton(
+                        icon: const Icon(Icons.refresh_rounded),
+                        tooltip: 'Refresh cached data',
                         onPressed: () async {
                           await provider.refreshData();
                           if (context.mounted) {
@@ -202,48 +194,19 @@ class AccountView extends StatelessWidget {
                             );
                           }
                         },
-                          style: OutlinedButton.styleFrom(
-                            padding: const EdgeInsets.symmetric(vertical: 12),
                       ),
-                          child: const Text(
+                      IconButton(
-                            'Refresh Cache',
+                        icon: const Icon(Icons.logout_rounded),
-                            textAlign: TextAlign.center,
+                        tooltip: 'Logout',
-                            style: TextStyle(fontSize: 13),
+                        color: Colors.orange.shade700,
-                          ),
-                        ),
-                      ),
-                      const SizedBox(width: 8),
-                      Expanded(
-                        child: FilledButton(
                         onPressed: () => _handleLogout(context, provider),
-                          style: FilledButton.styleFrom(
-                            backgroundColor: colorScheme.errorContainer,
-                            foregroundColor: colorScheme.onErrorContainer,
-                            padding: const EdgeInsets.symmetric(vertical: 12),
                       ),
-                          child: const Text(
+                      IconButton(
-                            'Logout',
+                        icon: const Icon(Icons.delete_outline_rounded),
-                            textAlign: TextAlign.center,
+                        tooltip: 'Remove account',
-                            style: TextStyle(fontSize: 13),
+                        color: colorScheme.error,
-                          ),
-                        ),
-                      ),
-                      const SizedBox(width: 8),
-                      Expanded(
-                        child: FilledButton(
                         onPressed: () =>
                             _confirmRemoveActive(context, provider),
-                          style: FilledButton.styleFrom(
-                            backgroundColor: colorScheme.error,
-                            foregroundColor: colorScheme.onError,
-                            padding: const EdgeInsets.symmetric(vertical: 12),
-                          ),
-                          child: const Text(
-                            'Remove',
-                            textAlign: TextAlign.center,
-                            style: TextStyle(fontSize: 13),
-                          ),
-                        ),
                       ),
                     ],
                   ),

lib/views/favorites_view.dart

@@ -0,0 +1,804 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:intl/intl.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:provider/provider.dart';
+import 'package:share_plus/share_plus.dart';
+import '../models/app_tab.dart';
+import '../models/nextcloud_item.dart';
+import '../models/selection_action.dart';
+import '../providers/server_provider.dart';
+import '../services/download_service.dart';
+import '../widgets/details/details_sheet.dart';
+import '../widgets/item_icon.dart';
+import '../widgets/more_tabs_button.dart';
+import '../widgets/profile_avatar_button.dart';
+import '../widgets/segmented_icon_toggle.dart';
+import '../widgets/selectable_thumbnail.dart';
+import '../widgets/share_sheet.dart';
+import '../widgets/sort_menu_button.dart';
+import '../widgets/sticky_header_delegate.dart';
+import '../widgets/synced_header_scaffold.dart';
+import 'file_viewer_screen.dart';
+import 'move_copy_destination_picker.dart';
+
+/// Every favorited file/folder across the whole account, account-wide - a
+/// real tab rather than a filter toggle scoped to whatever folder the
+/// Files tab happens to be browsing (see `ServerProvider.fetchAllFavorites`
+/// for why: a favorited item several folders deep needs to show up
+/// regardless of whether its parent folders are themselves favorited,
+/// which a current-folder-only filter can never do, and a flat account-
+/// wide list also means the breadcrumb-vs-content mismatch a filter
+/// toggle had - the trail showing wherever Files was last browsing while
+/// the content showed something else entirely - simply can't happen).
+/// Shares Files' own sort/hidden/storage-scope/grid-list display prefs
+/// (via `ServerProvider.applyFilesDisplayPrefs`) rather than a separate
+/// parallel settings dimension.
+class FavoritesView extends StatefulWidget {
+  final ScrollController scrollController;
+
+  const FavoritesView({super.key, required this.scrollController});
+
+  @override
+  State<FavoritesView> createState() => _FavoritesViewState();
+}
+
+class _FavoritesViewState extends State<FavoritesView>
+    with SingleTickerProviderStateMixin {
+  bool _requested = false;
+  final Set<String> _selectedIds = {};
+  final ScrollController _selectionActionsScrollController = ScrollController();
+  final List<AnimationController> _scrollHintControllers = [];
+
+  bool get _isSelecting => _selectedIds.isNotEmpty;
+
+  void _toggleSelection(NextcloudItem item) {
+    HapticFeedback.selectionClick();
+    final enteringSelection = _selectedIds.isEmpty;
+    setState(() {
+      if (!_selectedIds.remove(item.id)) _selectedIds.add(item.id);
+    });
+    if (enteringSelection && _isSelecting) {
+      WidgetsBinding.instance.addPostFrameCallback(
+        (_) => _playScrollHint(_selectionActionsScrollController),
+      );
+    }
+  }
+
+  void _clearSelection() {
+    setState(_selectedIds.clear);
+  }
+
+  /// Mirrors `FilesView`/`PhotosView`'s identical scroll-hint - see their
+  /// doc comment: nudges the selection actions row right and back, once,
+  /// the first time a selection starts. No-ops if there's nothing to
+  /// scroll (row already fits).
+  Future<void> _playScrollHint(ScrollController scrollController) async {
+    await Future.delayed(const Duration(milliseconds: 500));
+    if (!mounted || !scrollController.hasClients) return;
+    final maxExtent = scrollController.position.maxScrollExtent;
+    if (maxExtent <= 0) return;
+    final double peak = maxExtent < 36 ? maxExtent : 36;
+    final controller = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 900),
+    );
+    _scrollHintControllers.add(controller);
+    final hint = TweenSequence<double>([
+      TweenSequenceItem(
+        tween: Tween(
+          begin: 0.0,
+          end: peak,
+        ).chain(CurveTween(curve: Curves.easeInOutSine)),
+        weight: 50,
+      ),
+      TweenSequenceItem(
+        tween: Tween(
+          begin: peak,
+          end: 0.0,
+        ).chain(CurveTween(curve: Curves.easeInOutSine)),
+        weight: 50,
+      ),
+    ]).animate(controller);
+    void onTick() {
+      if (scrollController.hasClients) {
+        scrollController.jumpTo(hint.value);
+      }
+    }
+
+    hint.addListener(onTick);
+    await controller.forward();
+    hint.removeListener(onTick);
+    _scrollHintControllers.remove(controller);
+    controller.dispose();
+  }
+
+  @override
+  void dispose() {
+    for (final controller in _scrollHintControllers) {
+      controller.dispose();
+    }
+    _selectionActionsScrollController.dispose();
+    super.dispose();
+  }
+
+  /// A favorited folder switches to the Files tab, navigated there; a
+  /// favorited file just opens directly from here, like Files/Photos do -
+  /// no need to reposition Files first since dismissing the viewer lands
+  /// back on this tab either way.
+  void _openFavorite(
+    BuildContext context,
+    ServerProvider provider,
+    NextcloudItem item,
+    List<NextcloudItem> siblings,
+  ) {
+    if (item.isFolder) {
+      provider.navigateToAbsoluteFolder(item.path);
+      provider.requestTab(AppTab.files);
+    } else {
+      Navigator.push(
+        context,
+        FileViewerScreen.route(item: item, siblings: siblings),
+      );
+    }
+  }
+
+  /// The bulk actions shown in the sticky selection toolbar for the
+  /// currently-selected items - same set Files/Photos offer.
+  List<SelectionAction> _buildSelectionActions(
+    ServerProvider provider,
+    List<NextcloudItem> selected,
+  ) {
+    return [
+      SelectionAction(
+        icon: Icons.favorite_border_rounded,
+        label: 'Remove from favorites',
+        onTap: () => _unfavoriteSelected(provider, selected),
+      ),
+      SelectionAction(
+        icon: Icons.share_rounded,
+        label: 'Share',
+        onTap: () => selected.length == 1
+            ? ShareSheet.show(context, selected.single)
+            : _shareSelected(context, provider, selected),
+      ),
+      SelectionAction(
+        icon: Icons.download_rounded,
+        label: 'Download',
+        onTap: () => _downloadSelected(context, provider, selected),
+      ),
+      SelectionAction(
+        icon: Icons.delete_outline_rounded,
+        label: 'Delete',
+        onTap: () => _confirmDeleteSelected(context, provider, selected),
+      ),
+      SelectionAction(
+        icon: Icons.copy_rounded,
+        label: 'Copy',
+        onTap: () => _moveOrCopySelected(provider, selected, copy: true),
+      ),
+      SelectionAction(
+        icon: Icons.drive_file_move_rounded,
+        label: 'Move',
+        onTap: () => _moveOrCopySelected(provider, selected, copy: false),
+      ),
+      if (selected.length == 1)
+        SelectionAction(
+          icon: Icons.info_outline_rounded,
+          label: 'Details',
+          onTap: () => DetailsSheet.show(context, selected.single),
+        ),
+    ];
+  }
+
+  Future<void> _unfavoriteSelected(
+    ServerProvider provider,
+    List<NextcloudItem> items,
+  ) async {
+    for (final item in items) {
+      await provider.toggleItemFavorite(item);
+    }
+    _clearSelection();
+  }
+
+  Future<void> _shareSelected(
+    BuildContext context,
+    ServerProvider provider,
+    List<NextcloudItem> items,
+  ) async {
+    final messenger = ScaffoldMessenger.of(context);
+    messenger.showSnackBar(
+      const SnackBar(
+        content: Text('Creating share link(s)…'),
+        behavior: SnackBarBehavior.floating,
+      ),
+    );
+
+    final lines = <String>[];
+    for (final item in items) {
+      final link = await provider.createShareLink(item);
+      if (link != null) {
+        lines.add(items.length > 1 ? '${item.name}: $link' : link);
+      }
+    }
+
+    if (!mounted) return;
+    messenger.hideCurrentSnackBar();
+    _clearSelection();
+    if (lines.isEmpty) {
+      messenger.showSnackBar(
+        const SnackBar(
+          content: Text('Could not create share link(s)'),
+          behavior: SnackBarBehavior.floating,
+        ),
+      );
+      return;
+    }
+
+    try {
+      await SharePlus.instance.share(ShareParams(text: lines.join('\n')));
+    } catch (_) {
+      if (!mounted) return;
+      messenger.showSnackBar(
+        const SnackBar(
+          content: Text('Could not open the share sheet'),
+          behavior: SnackBarBehavior.floating,
+        ),
+      );
+    }
+  }
+
+  /// Hands the whole batch off to `DownloadService.kt` - see
+  /// `FilesView._downloadSelected`'s identical doc comment for why.
+  Future<void> _downloadSelected(
+    BuildContext context,
+    ServerProvider provider,
+    List<NextcloudItem> items,
+  ) async {
+    final files = items.where((i) => !i.isFolder).toList();
+    _clearSelection();
+    if (files.isEmpty) return;
+
+    final messenger = ScaffoldMessenger.of(context);
+    try {
+      await DownloadService.startDownload(provider, files);
+      messenger.showSnackBar(
+        SnackBar(
+          content: Text(
+            files.length == 1
+                ? 'Downloading ${files.first.name} - see the notification for progress'
+                : 'Downloading ${files.length} files - see the notification for progress',
+          ),
+          behavior: SnackBarBehavior.floating,
+        ),
+      );
+    } catch (e) {
+      messenger.showSnackBar(
+        SnackBar(
+          content: Text('Could not start download: $e'),
+          behavior: SnackBarBehavior.floating,
+        ),
+      );
+    }
+  }
+
+  Future<void> _confirmDeleteSelected(
+    BuildContext context,
+    ServerProvider provider,
+    List<NextcloudItem> items,
+  ) async {
+    final confirmed = await showDialog<bool>(
+      context: context,
+      builder: (dialogContext) {
+        return AlertDialog(
+          title: const Text('Delete Items'),
+          content: Text(
+            'Delete ${items.length} item(s) from the server? This cannot be undone.',
+          ),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.pop(dialogContext, false),
+              child: const Text('Cancel'),
+            ),
+            FilledButton(
+              style: FilledButton.styleFrom(
+                backgroundColor: Theme.of(dialogContext).colorScheme.error,
+              ),
+              onPressed: () => Navigator.pop(dialogContext, true),
+              child: const Text('Delete'),
+            ),
+          ],
+        );
+      },
+    );
+    if (confirmed != true || !context.mounted) return;
+
+    final messenger = ScaffoldMessenger.of(context);
+    var succeeded = 0;
+    for (final item in items) {
+      final success = await provider.deleteItem(item.path);
+      if (success) succeeded++;
+    }
+
+    _clearSelection();
+    messenger.showSnackBar(
+      SnackBar(
+        content: Text('Deleted $succeeded of ${items.length} item(s)'),
+        behavior: SnackBarBehavior.floating,
+      ),
+    );
+  }
+
+  Future<void> _moveOrCopySelected(
+    ServerProvider provider,
+    List<NextcloudItem> items, {
+    required bool copy,
+  }) async {
+    final result = await MoveCopyDestinationPicker.show(
+      context,
+      items,
+      copy: copy,
+    );
+    if (!mounted || result == null) return;
+    _clearSelection();
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: Text(
+          '${copy ? 'Copied' : 'Moved'} ${result.succeeded} of ${items.length} item(s)',
+        ),
+        behavior: SnackBarBehavior.floating,
+      ),
+    );
+  }
+
+  Widget _buildControlsRow(ServerProvider provider) {
+    return SizedBox(
+      height: 44,
+      child: SingleChildScrollView(
+        scrollDirection: Axis.horizontal,
+        child: Row(
+          children: [
+            IconButton(
+              icon: Icon(
+                provider.filesSortAscending
+                    ? Icons.arrow_upward_rounded
+                    : Icons.arrow_downward_rounded,
+                size: 20,
+              ),
+              visualDensity: VisualDensity.compact,
+              tooltip: provider.filesSortAscending ? 'Ascending' : 'Descending',
+              onPressed: provider.toggleFilesSortOrder,
+            ),
+            SizedBox(
+              width: 130,
+              child: SortMenuButton(
+                field: provider.filesSortField,
+                onChanged: provider.setFilesSortField,
+              ),
+            ),
+            ToggleIconButton(
+              icon: provider.showHiddenFiles
+                  ? Icons.visibility_rounded
+                  : Icons.visibility_off_rounded,
+              isSelected: provider.showHiddenFiles,
+              onTap: () => provider.toggleShowHiddenFiles(),
+              tooltip: 'Show hidden files',
+            ),
+            const SizedBox(width: 4),
+            SegmentedIconGroup(
+              children: [
+                ToggleIconButton(
+                  icon: Symbols.circles_rounded,
+                  isSelected: provider.storageScope == StorageScope.cloud,
+                  onTap: () => provider.setStorageScope(StorageScope.cloud),
+                  tooltip: 'Cloud storage',
+                ),
+                ToggleIconButton(
+                  icon: Symbols.hard_drive_rounded,
+                  isSelected: provider.storageScope == StorageScope.external,
+                  onTap: () => provider.setStorageScope(StorageScope.external),
+                  tooltip: 'External storage',
+                ),
+              ],
+            ),
+            const SizedBox(width: 8),
+            SegmentedIconGroup(
+              children: [
+                ToggleIconButton(
+                  icon: Icons.view_list_rounded,
+                  isSelected: !provider.isGridView,
+                  onTap: () => provider.setGridView(false),
+                  tooltip: 'List view',
+                ),
+                ToggleIconButton(
+                  icon: Icons.grid_view_rounded,
+                  isSelected: provider.isGridView,
+                  onTap: () => provider.setGridView(true),
+                  tooltip: 'Grid view',
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildListTile(
+    BuildContext context,
+    NextcloudItem item,
+    ServerProvider provider,
+    List<NextcloudItem> siblings,
+  ) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    final isSelected = _selectedIds.contains(item.id);
+
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 8),
+      child: ClipRRect(
+        borderRadius: BorderRadius.circular(16),
+        child: Material(
+          color: isSelected
+              ? colorScheme.primaryContainer.withValues(alpha: 0.5)
+              : colorScheme.surfaceContainerLow,
+          child: InkWell(
+            onTap: () {
+              if (_isSelecting) {
+                _toggleSelection(item);
+              } else {
+                _openFavorite(context, provider, item, siblings);
+              }
+            },
+            onLongPress: () => _toggleSelection(item),
+            child: Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+              child: Row(
+                children: [
+                  SelectableThumbnail(
+                    isSelected: isSelected,
+                    size: 44,
+                    checkmarkSize: 24,
+                    child: ItemThumbnail(
+                      item: item,
+                      provider: provider,
+                      size: 44,
+                      borderRadius: 12,
+                      iconSize: 22,
+                    ),
+                  ),
+                  const SizedBox(width: 14),
+                  Expanded(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          item.name,
+                          style: theme.textTheme.titleMedium?.copyWith(
+                            fontWeight: FontWeight.w600,
+                            fontSize: 14,
+                          ),
+                        ),
+                        const SizedBox(height: 2),
+                        Text(
+                          item.isFolder
+                              ? 'Folder'
+                              : '${formatBytes(item.size)} • ${DateFormat.yMMMd().format(item.lastModified)}',
+                          style: theme.textTheme.bodySmall?.copyWith(
+                            color: colorScheme.onSurfaceVariant,
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildGridCard(
+    BuildContext context,
+    NextcloudItem item,
+    ServerProvider provider,
+    List<NextcloudItem> siblings,
+  ) {
+    final theme = Theme.of(context);
+    final isSelected = _selectedIds.contains(item.id);
+    final isMedia =
+        (item.type == NextcloudItemType.image ||
+            item.type == NextcloudItemType.video) &&
+        item.previewUrl != null;
+    final iconColor = getIconColor(context, item.type);
+
+    return ClipRRect(
+      borderRadius: BorderRadius.circular(20),
+      child: Material(
+        color: theme.colorScheme.surfaceContainerLow,
+        child: InkWell(
+          onTap: () {
+            if (_isSelecting) {
+              _toggleSelection(item);
+            } else {
+              _openFavorite(context, provider, item, siblings);
+            }
+          },
+          onLongPress: () => _toggleSelection(item),
+          child: SelectableThumbnail(
+            isSelected: isSelected,
+            checkmarkSize: 32,
+            child: isMedia
+                ? Image.network(
+                    item.previewUrl!,
+                    headers: provider.service?.authHeaders,
+                    fit: BoxFit.cover,
+                    filterQuality: FilterQuality.low,
+                    gaplessPlayback: true,
+                    errorBuilder: (ctx, err, stack) => Container(
+                      color: theme.colorScheme.secondaryContainer,
+                      child: Icon(
+                        getItemIcon(item.type),
+                        color: theme.colorScheme.onSecondaryContainer,
+                        size: 32,
+                      ),
+                    ),
+                  )
+                : Padding(
+                    padding: const EdgeInsets.all(14),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Container(
+                          width: 40,
+                          height: 40,
+                          decoration: BoxDecoration(
+                            color: iconColor.withValues(alpha: 0.12),
+                            borderRadius: BorderRadius.circular(12),
+                          ),
+                          child: Icon(
+                            getItemIcon(item.type),
+                            color: iconColor,
+                            size: 24,
+                          ),
+                        ),
+                        Text(
+                          item.name,
+                          maxLines: 2,
+                          overflow: TextOverflow.ellipsis,
+                          style: theme.textTheme.titleMedium?.copyWith(
+                            fontWeight: FontWeight.w600,
+                            fontSize: 13,
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    final provider = context.watch<ServerProvider>();
+
+    if (!_requested) {
+      _requested = true;
+      WidgetsBinding.instance.addPostFrameCallback(
+        (_) => provider.fetchAllFavorites(),
+      );
+    }
+
+    final favorites = provider.favoriteItems;
+    final siblings = favorites.where((i) => !i.isFolder).toList();
+    final selectedItems = favorites
+        .where((i) => _selectedIds.contains(i.id))
+        .toList();
+
+    final contentSlivers = <Widget>[
+      SliverPersistentHeader(
+        pinned: !_isSelecting,
+        delegate: StickyHeaderDelegate(
+          height: 60,
+          child: Padding(
+            padding: const EdgeInsets.fromLTRB(16, 16, 16, 0),
+            child: _buildControlsRow(provider),
+          ),
+        ),
+      ),
+      const SliverToBoxAdapter(child: SizedBox(height: 8)),
+      if (provider.isFavoritesLoading && favorites.isEmpty)
+        const SliverFillRemaining(
+          hasScrollBody: false,
+          child: Center(child: CircularProgressIndicator()),
+        )
+      else if (provider.favoritesErrorMessage != null)
+        SliverFillRemaining(
+          hasScrollBody: false,
+          child: Center(
+            child: Padding(
+              padding: const EdgeInsets.all(24),
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Icon(
+                    Icons.error_outline_rounded,
+                    size: 64,
+                    color: colorScheme.error,
+                  ),
+                  const SizedBox(height: 16),
+                  Text(
+                    'Could not load favorites',
+                    style: theme.textTheme.titleLarge?.copyWith(
+                      color: colorScheme.error,
+                      fontWeight: FontWeight.bold,
+                    ),
+                  ),
+                  const SizedBox(height: 8),
+                  Text(
+                    provider.favoritesErrorMessage!,
+                    textAlign: TextAlign.center,
+                    style: theme.textTheme.bodyMedium?.copyWith(
+                      color: colorScheme.onSurfaceVariant,
+                    ),
+                  ),
+                  const SizedBox(height: 20),
+                  FilledButton.icon(
+                    onPressed: provider.fetchAllFavorites,
+                    icon: const Icon(Icons.refresh_rounded),
+                    label: const Text('Retry'),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        )
+      else if (favorites.isEmpty)
+        SliverFillRemaining(
+          hasScrollBody: false,
+          child: Center(
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                Icon(
+                  Icons.favorite_border_rounded,
+                  size: 64,
+                  color: colorScheme.outlineVariant,
+                ),
+                const SizedBox(height: 12),
+                Text(
+                  'No favorites yet',
+                  style: theme.textTheme.titleMedium?.copyWith(
+                    color: colorScheme.onSurfaceVariant,
+                  ),
+                ),
+              ],
+            ),
+          ),
+        )
+      else if (provider.isGridView)
+        SliverPadding(
+          padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 8),
+          sliver: SliverGrid(
+            gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+              crossAxisCount: 2,
+              childAspectRatio: 1.1,
+              crossAxisSpacing: 12,
+              mainAxisSpacing: 12,
+            ),
+            delegate: SliverChildBuilderDelegate((context, index) {
+              return _buildGridCard(
+                context,
+                favorites[index],
+                provider,
+                siblings,
+              );
+            }, childCount: favorites.length),
+          ),
+        )
+      else
+        SliverPadding(
+          padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 8),
+          sliver: SliverList(
+            delegate: SliverChildBuilderDelegate((context, index) {
+              return _buildListTile(
+                context,
+                favorites[index],
+                provider,
+                siblings,
+              );
+            }, childCount: favorites.length),
+          ),
+        ),
+      const SliverToBoxAdapter(child: SizedBox(height: 100)),
+      const SliverFillRemaining(hasScrollBody: false, child: SizedBox()),
+    ];
+
+    return PopScope(
+      canPop: !_isSelecting,
+      onPopInvokedWithResult: (didPop, result) {
+        if (!didPop && _isSelecting) _clearSelection();
+      },
+      child: SyncedHeaderScaffold(
+        scrollController: widget.scrollController,
+        provider: provider,
+        actions: const [MoreTabsButton(), ProfileAvatarButton()],
+        onRefresh: provider.fetchAllFavorites,
+        selectionBar: _isSelecting
+            ? _buildSelectionBar(context, theme, provider, selectedItems)
+            : null,
+        contentSlivers: contentSlivers,
+      ),
+    );
+  }
+
+  /// Replaces the top bar entirely while selecting (see
+  /// `SyncedHeaderScaffold.selectionBar`) - mirrors Files/Photos' identical
+  /// selection bar.
+  Widget _buildSelectionBar(
+    BuildContext context,
+    ThemeData theme,
+    ServerProvider provider,
+    List<NextcloudItem> selectedItems,
+  ) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      child: Row(
+        children: [
+          SizedBox(
+            width: MediaQuery.of(context).size.width * 0.5,
+            child: Align(
+              alignment: Alignment.centerLeft,
+              child: Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  IconButton(
+                    icon: const Icon(Icons.close_rounded, size: 20),
+                    tooltip: 'Cancel selection',
+                    onPressed: _clearSelection,
+                    visualDensity: VisualDensity.compact,
+                  ),
+                  const SizedBox(width: 8),
+                  Text(
+                    '${selectedItems.length} selected',
+                    style: theme.textTheme.titleSmall?.copyWith(
+                      fontWeight: FontWeight.w700,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+          Expanded(
+            child: SingleChildScrollView(
+              controller: _selectionActionsScrollController,
+              scrollDirection: Axis.horizontal,
+              child: Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  for (final action in _buildSelectionActions(
+                    provider,
+                    selectedItems,
+                  ))
+                    IconButton(
+                      icon: Icon(action.icon, size: 20),
+                      tooltip: action.label,
+                      onPressed: action.onTap,
+                      visualDensity: VisualDensity.compact,
+                    ),
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/views/file_viewer_screen.dart

@@ -1,9 +1,7 @@
 import 'dart:convert';
 import 'dart:math' as math;
 import 'dart:typed_data';
-import 'package:file_saver/file_saver.dart';
 import 'package:flutter/material.dart';
-import 'package:marquee/marquee.dart';
 import 'package:open_file/open_file.dart';
 import 'package:path/path.dart' as p;
 import 'package:path_provider/path_provider.dart';
@@ -12,8 +10,10 @@ import 'package:provider/provider.dart';
 import 'package:video_player/video_player.dart';
 import '../models/nextcloud_item.dart';
 import '../providers/server_provider.dart';
+import '../services/download_service.dart';
 import '../widgets/details/details_sheet.dart';
 import '../widgets/frosted_glass_container.dart';
+import '../widgets/marquee_title.dart';
 import '../widgets/seek_bar_painter.dart';
 import '../widgets/share_sheet.dart';
 
@@ -189,21 +189,22 @@ class _FileViewerScreenState extends State<FileViewerScreen> {
     }
   }
 
+  /// Hands off to `DownloadService.kt` (see its doc comment) rather than
+  /// downloading in Dart then prompting `file_saver` - same reasoning as
+  /// `UploadService`/`ShareUploadService.kt` on the upload side: a real
+  /// Android Service survives the app being closed mid-download, and one
+  /// notification covers progress/cancel instead of blocking this screen.
   Future<void> _downloadToDevice(ServerProvider provider) async {
     final item = _currentItem;
-    setState(() => _isBusy = true);
     try {
-      final tempPath = await _downloadToTemp(provider, item);
+      await DownloadService.startDownload(provider, [item]);
-      final ext = p.extension(item.name).replaceFirst('.', '');
-      final baseName = p.basenameWithoutExtension(item.name);
-      await FileSaver.instance.saveFile(
-        name: baseName,
-        filePath: tempPath,
-        ext: ext,
-      );
       if (mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text('Saved ${item.name} to Downloads')),
+          SnackBar(
+            content: Text(
+              'Downloading ${item.name} - see the notification for progress',
+            ),
+          ),
         );
       }
     } catch (e) {
@@ -212,8 +213,6 @@ class _FileViewerScreenState extends State<FileViewerScreen> {
           context,
         ).showSnackBar(SnackBar(content: Text('Download failed: $e')));
       }
-    } finally {
-      if (mounted) setState(() => _isBusy = false);
     }
   }
 
@@ -339,7 +338,7 @@ class _FileViewerScreenState extends State<FileViewerScreen> {
                             ),
                             const SizedBox(width: 4),
                             Expanded(
-                              child: _MarqueeTitle(
+                              child: MarqueeTitle(
                                 text: _currentItem.name,
                                 style: Theme.of(context).textTheme.titleSmall
                                     ?.copyWith(
@@ -562,53 +561,6 @@ class _ActionIconButton extends StatelessWidget {
   }
 }
 
-/// The media viewer's title: a plain, single-line ellipsized [Text] for
-/// names that fit, or an auto-scrolling [Marquee] for names too long for
-/// the available width - measured once via [TextPainter] rather than
-/// always marqueeing, so a short filename just sits still like normal.
-class _MarqueeTitle extends StatelessWidget {
-  final String text;
-  final TextStyle? style;
-
-  const _MarqueeTitle({required this.text, required this.style});
-
-  @override
-  Widget build(BuildContext context) {
-    return LayoutBuilder(
-      builder: (context, constraints) {
-        final painter = TextPainter(
-          text: TextSpan(text: text, style: style),
-          maxLines: 1,
-          textDirection: Directionality.of(context),
-        )..layout(maxWidth: double.infinity);
-
-        if (painter.width <= constraints.maxWidth) {
-          return Text(
-            text,
-            maxLines: 1,
-            overflow: TextOverflow.ellipsis,
-            style: style,
-          );
-        }
-
-        return SizedBox(
-          height: painter.height,
-          child: Marquee(
-            text: text,
-            style: style,
-            blankSpace: 48,
-            velocity: 30,
-            startPadding: 0,
-            pauseAfterRound: const Duration(seconds: 1),
-            fadingEdgeStartFraction: 0.1,
-            fadingEdgeEndFraction: 0.15,
-          ),
-        );
-      },
-    );
-  }
-}
-
 class _ImagePreview extends StatefulWidget {
   final String url;
   final Map<String, String> headers;

lib/views/files_view.dart

@@ -1,18 +1,18 @@
 import 'package:file_picker/file_picker.dart';
-import 'package:file_saver/file_saver.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:intl/intl.dart';
 import 'package:material_symbols_icons/symbols.dart';
-import 'package:path/path.dart' as p;
-import 'package:path_provider/path_provider.dart';
 import 'package:provider/provider.dart';
 import 'package:share_plus/share_plus.dart';
 import '../models/nextcloud_item.dart';
 import '../models/selection_action.dart';
 import '../providers/server_provider.dart';
+import '../services/download_service.dart';
+import '../services/share_intent_service.dart';
 import '../widgets/breadcrumbs.dart';
 import '../widgets/details/details_sheet.dart';
+import '../widgets/item_icon.dart';
 import '../widgets/more_tabs_button.dart';
 import '../widgets/profile_avatar_button.dart';
 import '../widgets/segmented_icon_toggle.dart';
@@ -23,6 +23,8 @@ import '../widgets/sticky_header_delegate.dart';
 import '../widgets/swipeable_item.dart';
 import '../widgets/synced_header_scaffold.dart';
 import 'file_viewer_screen.dart';
+import 'move_copy_destination_picker.dart';
+import 'share_upload_view.dart';
 
 class FilesView extends StatefulWidget {
   final ScrollController scrollController;
@@ -33,158 +35,212 @@ class FilesView extends StatefulWidget {
   State<FilesView> createState() => _FilesViewState();
 }
 
-IconData _getItemIcon(NextcloudItemType type) {
+/// Slides+fades its child in on first build. Give it a [Key] that changes
-  switch (type) {
+/// whenever the folder changes (folder path + item id) so Flutter discards
-    case NextcloudItemType.folder:
+/// and remounts the Element instead of just updating it in place - that's
-      return Icons.folder_rounded;
+/// what makes the whole visible list replay the animation on every folder
-    case NextcloudItemType.image:
+/// navigation, not just newly-appearing rows.
-      return Icons.image_rounded;
+class _FolderEnterAnimation extends StatefulWidget {
-    case NextcloudItemType.video:
+  final Widget child;
-      return Icons.movie_rounded;
+  final bool fromRight;
-    case NextcloudItemType.audio:
+  final int index;
-      return Icons.audiotrack_rounded;
-    case NextcloudItemType.document:
-      return Icons.description_rounded;
-    case NextcloudItemType.archive:
-      return Icons.folder_zip_rounded;
-    case NextcloudItemType.file:
-      return Icons.insert_drive_file_rounded;
-  }
-}
 
-Color _getIconColor(BuildContext context, NextcloudItemType type) {
+  const _FolderEnterAnimation({
-  final colorScheme = Theme.of(context).colorScheme;
+    super.key,
-  switch (type) {
+    required this.child,
-    case NextcloudItemType.folder:
+    required this.fromRight,
-      return colorScheme.primary;
+    required this.index,
-    case NextcloudItemType.image:
-      return Colors.amber.shade700;
-    case NextcloudItemType.video:
-      return Colors.deepOrange.shade600;
-    case NextcloudItemType.audio:
-      return Colors.purple.shade600;
-    case NextcloudItemType.document:
-      return Colors.blue.shade700;
-    case NextcloudItemType.archive:
-      return Colors.teal.shade700;
-    case NextcloudItemType.file:
-      return colorScheme.outline;
-  }
-}
-
-/// A file/folder's icon badge — for images and videos this shows an actual
-/// thumbnail (falling back to the plain icon on error or if there's no
-/// preview URL yet), matching the real-content treatment already used in
-/// the Photos tab.
-class _ItemThumbnail extends StatelessWidget {
-  final NextcloudItem item;
-  final ServerProvider provider;
-  final double size;
-  final double borderRadius;
-  final double iconSize;
-
-  const _ItemThumbnail({
-    required this.item,
-    required this.provider,
-    required this.size,
-    required this.borderRadius,
-    required this.iconSize,
   });
 
   @override
-  Widget build(BuildContext context) {
+  State<_FolderEnterAnimation> createState() => _FolderEnterAnimationState();
-    final iconColor = _getIconColor(context, item.type);
+}
-    final isMedia =
-        item.type == NextcloudItemType.image ||
-        item.type == NextcloudItemType.video;
-    // Decode straight to the size this thumbnail is actually painted at —
-    // the server hands back a 500x500 preview regardless, and decoding that
-    // in full for a ~40dp tile (times however many are on screen while
-    // scrolling) is a real source of jank.
-    final cachePixels = (size * MediaQuery.of(context).devicePixelRatio)
-        .round();
 
-    return Container(
+class _FolderEnterAnimationState extends State<_FolderEnterAnimation>
-      width: size,
+    with SingleTickerProviderStateMixin {
-      height: size,
+  late final AnimationController _controller;
-      clipBehavior: Clip.antiAlias,
+  late final Animation<double> _opacity;
-      decoration: BoxDecoration(
+  late final Animation<Offset> _offset;
-        color: iconColor.withValues(alpha: 0.12),
+
-        borderRadius: BorderRadius.circular(borderRadius),
+  @override
-      ),
+  void initState() {
-      child: isMedia && item.previewUrl != null
+    super.initState();
-          ? Stack(
+    _controller = AnimationController(
-              fit: StackFit.expand,
+      vsync: this,
-              children: [
+      duration: const Duration(milliseconds: 260),
-                Image.network(
-                  item.previewUrl!,
-                  headers: provider.service?.authHeaders,
-                  fit: BoxFit.cover,
-                  cacheWidth: cachePixels,
-                  cacheHeight: cachePixels,
-                  filterQuality: FilterQuality.low,
-                  gaplessPlayback: true,
-                  loadingBuilder: (context, child, progress) {
-                    if (progress == null) return child;
-                    return Center(
-                      child: Icon(
-                        _getItemIcon(item.type),
-                        color: iconColor,
-                        size: iconSize,
-                      ),
     );
-                  },
+    _opacity = CurvedAnimation(parent: _controller, curve: Curves.easeOut);
-                  errorBuilder: (context, error, stack) => Center(
+    _offset = Tween<Offset>(
-                    child: Icon(
+      begin: Offset(widget.fromRight ? 0.12 : -0.12, 0),
-                      _getItemIcon(item.type),
+      end: Offset.zero,
-                      color: iconColor,
+    ).animate(CurvedAnimation(parent: _controller, curve: Curves.easeOutCubic));
-                      size: iconSize,
+    // Staggered slightly by position so the list reads as sliding in as a
-                    ),
+    // group rather than every row popping in simultaneously; capped so a
-                  ),
+    // long list doesn't visibly trickle in for seconds.
-                ),
+    final delay = Duration(milliseconds: (widget.index * 12).clamp(0, 150));
-                if (item.type == NextcloudItemType.video)
+    Future.delayed(delay, () {
-                  const Center(
+      if (mounted) _controller.forward();
-                    child: Icon(
+    });
-                      Icons.play_circle_fill_rounded,
+  }
-                      color: Colors.white,
+
-                      size: 18,
+  @override
-                    ),
+  void dispose() {
-                  ),
+    _controller.dispose();
-              ],
+    super.dispose();
-            )
+  }
-          : Center(
+
-              child: Icon(
+  @override
-                _getItemIcon(item.type),
+  Widget build(BuildContext context) {
-                color: iconColor,
+    return FadeTransition(
-                size: iconSize,
+      opacity: _opacity,
-              ),
+      child: SlideTransition(position: _offset, child: widget.child),
-            ),
     );
   }
 }
 
-class _FilesViewState extends State<FilesView> {
+class _FilesViewState extends State<FilesView>
+    with SingleTickerProviderStateMixin {
   final Set<String> _selectedIds = {};
+  int _lastPathDepth = 1;
+  final ScrollController _controlsScrollController = ScrollController();
+  final ScrollController _selectionActionsScrollController = ScrollController();
+  final List<AnimationController> _scrollHintControllers = [];
 
   bool get _isSelecting => _selectedIds.isNotEmpty;
 
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback(
+      (_) => _playScrollHint(_controlsScrollController),
+    );
+  }
+
+  /// A one-shot hint that a horizontally-scrollable row actually scrolls:
+  /// nudges it a little to the right and back, once - a motion cue instead
+  /// of a persistent widget (a chevron badge, an edge fade) sitting on top
+  /// of the actual controls the whole time. Shared by the controls row
+  /// (played once it first appears) and the selection actions row (played
+  /// the first time a selection starts, see `_toggleSelection`). No-ops if
+  /// there's nothing to scroll (row already fits).
+  Future<void> _playScrollHint(ScrollController scrollController) async {
+    // The delay lets the row's first frame (and its actual layout/max
+    // scroll extent) settle before nudging it, and reads more like a
+    // deliberate hint than something that happens to fire on load.
+    await Future.delayed(const Duration(milliseconds: 500));
+    if (!mounted || !scrollController.hasClients) return;
+    final maxExtent = scrollController.position.maxScrollExtent;
+    if (maxExtent <= 0) return;
+    final double peak = maxExtent < 36 ? maxExtent : 36;
+    // Driven as a single controller (rather than two chained animateTo
+    // calls) with mirrored ease-in-out halves, so the motion decelerates
+    // smoothly into the peak and back out instead of visibly changing
+    // pace where the two legs meet.
+    final controller = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 900),
+    );
+    _scrollHintControllers.add(controller);
+    final hint = TweenSequence<double>([
+      TweenSequenceItem(
+        tween: Tween(
+          begin: 0.0,
+          end: peak,
+        ).chain(CurveTween(curve: Curves.easeInOutSine)),
+        weight: 50,
+      ),
+      TweenSequenceItem(
+        tween: Tween(
+          begin: peak,
+          end: 0.0,
+        ).chain(CurveTween(curve: Curves.easeInOutSine)),
+        weight: 50,
+      ),
+    ]).animate(controller);
+    void onTick() {
+      if (scrollController.hasClients) {
+        scrollController.jumpTo(hint.value);
+      }
+    }
+
+    hint.addListener(onTick);
+    await controller.forward();
+    hint.removeListener(onTick);
+    _scrollHintControllers.remove(controller);
+    controller.dispose();
+  }
+
+  @override
+  void dispose() {
+    for (final controller in _scrollHintControllers) {
+      controller.dispose();
+    }
+    _controlsScrollController.dispose();
+    _selectionActionsScrollController.dispose();
+    super.dispose();
+  }
+
   void _toggleSelection(NextcloudItem item) {
     HapticFeedback.selectionClick();
+    final enteringSelection = _selectedIds.isEmpty;
     setState(() {
       if (!_selectedIds.remove(item.id)) _selectedIds.add(item.id);
     });
+    if (enteringSelection && _isSelecting) {
+      WidgetsBinding.instance.addPostFrameCallback(
+        (_) => _playScrollHint(_selectionActionsScrollController),
+      );
+    }
   }
 
   void _clearSelection() {
     setState(_selectedIds.clear);
   }
 
+  /// Routes a tap on an item while Noo is acting as another app's picker:
+  /// folders are still browsable, a matching file either toggles selection
+  /// (multi-select requests) or immediately finishes the pick, and a
+  /// non-matching file (wrong mime type for the caller) is rejected.
+  void _handlePickTap(
+    BuildContext context,
+    ServerProvider provider,
+    NextcloudItem item,
+  ) {
+    if (item.isFolder) {
+      provider.navigateToFolder(item.path);
+      return;
+    }
+    if (!provider.itemMatchesPickFilter(item)) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(
+          content: Text("This app can't accept this file type"),
+          behavior: SnackBarBehavior.floating,
+        ),
+      );
+      return;
+    }
+    if (provider.pickRequest!.allowMultiple) {
+      _toggleSelection(item);
+    } else {
+      provider.confirmPick([item]);
+    }
+  }
+
   /// The bulk actions shown in the sticky selection toolbar for the
   /// currently-selected items.
   List<SelectionAction> _buildSelectionActions(
     ServerProvider provider,
     List<NextcloudItem> selected,
   ) {
+    if (provider.isPicking) {
+      return [
+        SelectionAction(
+          icon: Icons.check_rounded,
+          label: 'Use ${selected.length} item(s)',
+          onTap: () => provider.confirmPick(selected),
+        ),
+      ];
+    }
     return [
       SelectionAction(
         icon: selected.every((i) => i.isFavorite)
@@ -193,7 +249,6 @@ class _FilesViewState extends State<FilesView> {
         label: selected.every((i) => i.isFavorite)
             ? 'Remove from favorites'
             : 'Favorite',
-        color: Colors.red.shade400,
         onTap: () => _favoriteSelected(provider, selected),
       ),
       SelectionAction(
@@ -211,9 +266,18 @@ class _FilesViewState extends State<FilesView> {
       SelectionAction(
         icon: Icons.delete_outline_rounded,
         label: 'Delete',
-        color: Theme.of(context).colorScheme.error,
         onTap: () => _confirmDeleteSelected(context, provider, selected),
       ),
+      SelectionAction(
+        icon: Icons.copy_rounded,
+        label: 'Copy',
+        onTap: () => _moveOrCopySelected(provider, selected, copy: true),
+      ),
+      SelectionAction(
+        icon: Icons.drive_file_move_rounded,
+        label: 'Move',
+        onTap: () => _moveOrCopySelected(provider, selected, copy: false),
+      ),
       if (selected.length == 1)
         SelectionAction(
           icon: Icons.drive_file_rename_outline_rounded,
@@ -331,6 +395,10 @@ class _FilesViewState extends State<FilesView> {
     final colorScheme = theme.colorScheme;
     final provider = context.watch<ServerProvider>();
 
+    final pathDepth = provider.pathStack.length;
+    final navigatingDeeper = pathDepth > _lastPathDepth;
+    _lastPathDepth = pathDepth;
+
     final hasBreadcrumbs = provider.pathStack.length > 1;
     final selectedItems = provider.items
         .where((i) => _selectedIds.contains(i.id))
@@ -346,6 +414,18 @@ class _FilesViewState extends State<FilesView> {
         children: [
           SizedBox(
             height: 44,
+            // No persistent hint widget here - instead, a one-shot nudge
+            // (see _playControlsScrollHint, triggered from initState) just
+            // scrolls this row a little to the right and back, once, right
+            // after it first appears. Two static attempts before this -
+            // fading the controls' own opacity via ShaderMask, then a
+            // chevron badge overlaid on the edge - both add a
+            // permanent element competing with the actual controls; a
+            // motion cue that plays once and gets out of the way reads
+            // just as clearly without that cost.
+            child: SingleChildScrollView(
+              controller: _controlsScrollController,
+              scrollDirection: Axis.horizontal,
               child: Row(
                 children: [
                   IconButton(
@@ -361,21 +441,16 @@ class _FilesViewState extends State<FilesView> {
                         : 'Descending',
                     onPressed: provider.toggleFilesSortOrder,
                   ),
-                Expanded(
+                  // A plain width, not Expanded - this row scrolls
+                  // horizontally now, which gives every control unbounded
+                  // width to lay out in, so a flex child would throw.
+                  SizedBox(
+                    width: 130,
                     child: SortMenuButton(
                       field: provider.filesSortField,
                       onChanged: provider.setFilesSortField,
                     ),
                   ),
-                ToggleIconButton(
-                  icon: provider.showFavoritesOnlyFiles
-                      ? Icons.favorite_rounded
-                      : Icons.favorite_border_rounded,
-                  isSelected: provider.showFavoritesOnlyFiles,
-                  onTap: provider.toggleFavoritesFilterFiles,
-                  tooltip: 'Favorites only',
-                ),
-                const SizedBox(width: 4),
                   ToggleIconButton(
                     icon: provider.showHiddenFiles
                         ? Icons.visibility_rounded
@@ -390,7 +465,8 @@ class _FilesViewState extends State<FilesView> {
                       ToggleIconButton(
                         icon: Symbols.circles_rounded,
                         isSelected: provider.storageScope == StorageScope.cloud,
-                      onTap: () => provider.setStorageScope(StorageScope.cloud),
+                        onTap: () =>
+                            provider.setStorageScope(StorageScope.cloud),
                         tooltip: 'Cloud storage',
                       ),
                       ToggleIconButton(
@@ -404,6 +480,39 @@ class _FilesViewState extends State<FilesView> {
                     ],
                   ),
                   const SizedBox(width: 8),
+                  SegmentedIconGroup(
+                    children: [
+                      ToggleIconButton(
+                        icon: Icons.select_all_rounded,
+                        isSelected:
+                            provider.filesTypeFilter == FilesTypeFilter.all,
+                        onTap: () =>
+                            provider.setFilesTypeFilter(FilesTypeFilter.all),
+                        tooltip: 'Files & folders',
+                      ),
+                      ToggleIconButton(
+                        icon: Icons.insert_drive_file_outlined,
+                        isSelected:
+                            provider.filesTypeFilter ==
+                            FilesTypeFilter.filesOnly,
+                        onTap: () => provider.setFilesTypeFilter(
+                          FilesTypeFilter.filesOnly,
+                        ),
+                        tooltip: 'Files only',
+                      ),
+                      ToggleIconButton(
+                        icon: Icons.folder_outlined,
+                        isSelected:
+                            provider.filesTypeFilter ==
+                            FilesTypeFilter.foldersOnly,
+                        onTap: () => provider.setFilesTypeFilter(
+                          FilesTypeFilter.foldersOnly,
+                        ),
+                        tooltip: 'Folders only',
+                      ),
+                    ],
+                  ),
+                  const SizedBox(width: 8),
                   SegmentedIconGroup(
                     children: [
                       ToggleIconButton(
@@ -423,6 +532,7 @@ class _FilesViewState extends State<FilesView> {
                 ],
               ),
             ),
+          ),
           if (hasBreadcrumbs) ...[
             const SizedBox(height: 10),
             SizedBox(
@@ -438,8 +548,9 @@ class _FilesViewState extends State<FilesView> {
     );
 
     final List<Widget> contentSlivers = [
-      // Sticky while browsing; once selecting, the toolbar below takes over
+      // Sticky while browsing; once selecting, the selection bar takes over
-      // the pinned slot and this is free to scroll away.
+      // the very top of the screen instead (see `selectionBar` below), so
+      // this is free to scroll away rather than staying pinned under it.
       SliverPersistentHeader(
         pinned: !_isSelecting,
         delegate: StickyHeaderDelegate(
@@ -447,56 +558,6 @@ class _FilesViewState extends State<FilesView> {
           child: controlsRow,
         ),
       ),
-      if (_isSelecting)
-        SliverAppBar(
-          pinned: true,
-          // This isn't the scroll view's topmost sliver - the Synced
-          // header above it already reserves status-bar space, so leaving
-          // this at its default `primary: true` double-reserves it too,
-          // showing up as a big empty gap above the toolbar.
-          primary: false,
-          automaticallyImplyLeading: false,
-          toolbarHeight: 48,
-          // No leading/actions slots - everything lives in `title`, wrapped
-          // in the exact same 16px horizontal Padding as the controls row
-          // above it, so the two rows' content lines up edge-to-edge
-          // instead of relying on SliverAppBar's own leadingWidth/actions
-          // insets (which don't match the controls row's).
-          titleSpacing: 0,
-          title: Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 16),
-            child: Row(
-              children: [
-                IconButton(
-                  icon: const Icon(Icons.close_rounded, size: 20),
-                  tooltip: 'Cancel selection',
-                  onPressed: _clearSelection,
-                  visualDensity: VisualDensity.compact,
-                ),
-                const SizedBox(width: 8),
-                Expanded(
-                  child: Text(
-                    '${selectedItems.length} selected',
-                    style: theme.textTheme.titleSmall?.copyWith(
-                      fontWeight: FontWeight.w700,
-                    ),
-                  ),
-                ),
-                for (final action in _buildSelectionActions(
-                  provider,
-                  selectedItems,
-                ))
-                  IconButton(
-                    icon: Icon(action.icon, size: 20, color: action.color),
-                    tooltip: action.label,
-                    onPressed: action.onTap,
-                    visualDensity: VisualDensity.compact,
-                  ),
-              ],
-            ),
-          ),
-        ),
-
       // Files List / Grid
       if (provider.isLoading)
         const SliverFillRemaining(
@@ -580,7 +641,12 @@ class _FilesViewState extends State<FilesView> {
             ),
             delegate: SliverChildBuilderDelegate((context, index) {
               final item = provider.items[index];
-              return _buildGridCard(context, item, provider);
+              return _FolderEnterAnimation(
+                key: ValueKey('${provider.currentFolderPath}::${item.id}'),
+                index: index,
+                fromRight: navigatingDeeper,
+                child: _buildGridCard(context, item, provider),
+              );
             }, childCount: provider.items.length),
           ),
         )
@@ -591,7 +657,12 @@ class _FilesViewState extends State<FilesView> {
           sliver: SliverList(
             delegate: SliverChildBuilderDelegate((context, index) {
               final item = provider.items[index];
-              return _buildListTile(context, item, provider);
+              return _FolderEnterAnimation(
+                key: ValueKey('${provider.currentFolderPath}::${item.id}'),
+                index: index,
+                fromRight: navigatingDeeper,
+                child: _buildListTile(context, item, provider),
+              );
             }, childCount: provider.items.length),
           ),
         ),
@@ -628,11 +699,81 @@ class _FilesViewState extends State<FilesView> {
           const MoreTabsButton(),
           const ProfileAvatarButton(),
         ],
+        selectionBar: _isSelecting
+            ? _buildSelectionBar(context, theme, provider, selectedItems)
+            : null,
         contentSlivers: contentSlivers,
       ),
     );
   }
 
+  /// Replaces the top bar entirely while selecting (see
+  /// `SyncedHeaderScaffold.selectionBar`) - a close button, the "N
+  /// selected" count, and the horizontally-scrollable bulk actions.
+  Widget _buildSelectionBar(
+    BuildContext context,
+    ThemeData theme,
+    ServerProvider provider,
+    List<NextcloudItem> selectedItems,
+  ) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      child: Row(
+        children: [
+          SizedBox(
+            width: MediaQuery.of(context).size.width * 0.5,
+            child: Align(
+              alignment: Alignment.centerLeft,
+              child: Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  IconButton(
+                    icon: const Icon(Icons.close_rounded, size: 20),
+                    tooltip: 'Cancel selection',
+                    onPressed: _clearSelection,
+                    visualDensity: VisualDensity.compact,
+                  ),
+                  const SizedBox(width: 8),
+                  Text(
+                    '${selectedItems.length} selected',
+                    style: theme.textTheme.titleSmall?.copyWith(
+                      fontWeight: FontWeight.w700,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+          Expanded(
+            child: SingleChildScrollView(
+              controller: _selectionActionsScrollController,
+              scrollDirection: Axis.horizontal,
+              // Left-aligned (not anchored to the trailing edge) so the
+              // first action's left edge sits at a fixed spot - lining up
+              // with the controls row's own first icon directly below it -
+              // regardless of how many actions there are.
+              child: Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  for (final action in _buildSelectionActions(
+                    provider,
+                    selectedItems,
+                  ))
+                    IconButton(
+                      icon: Icon(action.icon, size: 20),
+                      tooltip: action.label,
+                      onPressed: action.onTap,
+                      visualDensity: VisualDensity.compact,
+                    ),
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
   Future<void> _favoriteSelected(
     ServerProvider provider,
     List<NextcloudItem> items,
@@ -646,46 +787,42 @@ class _FilesViewState extends State<FilesView> {
     _clearSelection();
   }
 
+  /// Hands the whole batch off to `DownloadService.kt` (see its doc
+  /// comment) rather than downloading each item in Dart then prompting
+  /// `file_saver` per file - same reasoning as `UploadService`/
+  /// `ShareUploadService.kt` on the upload side: a real Android Service
+  /// survives the app being closed mid-download, with one cancellable
+  /// notification for the whole selection instead of blocking here.
   Future<void> _downloadSelected(
     BuildContext context,
     ServerProvider provider,
     List<NextcloudItem> items,
   ) async {
-    final messenger = ScaffoldMessenger.of(context);
+    final files = items.where((i) => !i.isFolder).toList();
-    messenger.showSnackBar(
-      SnackBar(
-        content: Text('Downloading ${items.length} item(s)...'),
-        behavior: SnackBarBehavior.floating,
-      ),
-    );
-
-    var succeeded = 0;
-    for (final item in items) {
-      if (item.isFolder) continue;
-      try {
-        final tempDir = await getTemporaryDirectory();
-        final tempPath = p.join(tempDir.path, item.name);
-        await provider.service!.downloadToFile(item.path, tempPath);
-        final ext = p.extension(item.name).replaceFirst('.', '');
-        final baseName = p.basenameWithoutExtension(item.name);
-        await FileSaver.instance.saveFile(
-          name: baseName,
-          filePath: tempPath,
-          ext: ext,
-        );
-        succeeded++;
-      } catch (_) {
-        // Reported in the summary snackbar below.
-      }
-    }
-
     _clearSelection();
+    if (files.isEmpty) return;
+
+    final messenger = ScaffoldMessenger.of(context);
+    try {
+      await DownloadService.startDownload(provider, files);
       messenger.showSnackBar(
         SnackBar(
-        content: Text('Downloaded $succeeded of ${items.length} item(s)'),
+          content: Text(
+            files.length == 1
+                ? 'Downloading ${files.first.name} - see the notification for progress'
+                : 'Downloading ${files.length} files - see the notification for progress',
+          ),
           behavior: SnackBarBehavior.floating,
         ),
       );
+    } catch (e) {
+      messenger.showSnackBar(
+        SnackBar(
+          content: Text('Could not start download: $e'),
+          behavior: SnackBarBehavior.floating,
+        ),
+      );
+    }
   }
 
   Future<void> _confirmDeleteSelected(
@@ -735,6 +872,28 @@ class _FilesViewState extends State<FilesView> {
     );
   }
 
+  Future<void> _moveOrCopySelected(
+    ServerProvider provider,
+    List<NextcloudItem> items, {
+    required bool copy,
+  }) async {
+    final result = await MoveCopyDestinationPicker.show(
+      context,
+      items,
+      copy: copy,
+    );
+    if (!mounted || result == null) return;
+    _clearSelection();
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: Text(
+          '${copy ? 'Copied' : 'Moved'} ${result.succeeded} of ${items.length} item(s)',
+        ),
+        behavior: SnackBarBehavior.floating,
+      ),
+    );
+  }
+
   Widget _buildListTile(
     BuildContext context,
     NextcloudItem item,
@@ -754,7 +913,9 @@ class _FilesViewState extends State<FilesView> {
           : colorScheme.surfaceContainerLow,
       child: InkWell(
         onTap: () {
-          if (_isSelecting) {
+          if (provider.isPicking) {
+            _handlePickTap(context, provider, item);
+          } else if (_isSelecting) {
             _toggleSelection(item);
           } else if (item.isFolder) {
             provider.navigateToFolder(item.path);
@@ -762,7 +923,9 @@ class _FilesViewState extends State<FilesView> {
             _openFile(context, item, provider);
           }
         },
-        onLongPress: () => _toggleSelection(item),
+        onLongPress: provider.isPicking && !provider.pickRequest!.allowMultiple
+            ? null
+            : () => _toggleSelection(item),
         child: Padding(
           padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
           child: Row(
@@ -771,7 +934,7 @@ class _FilesViewState extends State<FilesView> {
                 isSelected: isSelected,
                 size: 44,
                 checkmarkSize: 24,
-                child: _ItemThumbnail(
+                child: ItemThumbnail(
                   item: item,
                   provider: provider,
                   size: 44,
@@ -809,7 +972,7 @@ class _FilesViewState extends State<FilesView> {
       ),
     );
 
-    final content = _isSelecting
+    final content = _isSelecting || provider.isPicking
         ? card
         : SwipeableItem(
             itemKey: ValueKey('file-${item.id}'),
@@ -860,7 +1023,9 @@ class _FilesViewState extends State<FilesView> {
       clipBehavior: Clip.antiAlias,
       child: InkWell(
         onTap: () {
-          if (_isSelecting) {
+          if (provider.isPicking) {
+            _handlePickTap(context, provider, item);
+          } else if (_isSelecting) {
             _toggleSelection(item);
           } else if (item.isFolder) {
             provider.navigateToFolder(item.path);
@@ -868,7 +1033,9 @@ class _FilesViewState extends State<FilesView> {
             _openFile(context, item, provider);
           }
         },
-        onLongPress: () => _toggleSelection(item),
+        onLongPress: provider.isPicking && !provider.pickRequest!.allowMultiple
+            ? null
+            : () => _toggleSelection(item),
         child: SelectableThumbnail(
           isSelected: isSelected,
           checkmarkSize: 32,
@@ -966,7 +1133,7 @@ class _FilesViewState extends State<FilesView> {
   Widget _buildPlainGridContent(BuildContext context, NextcloudItem item) {
     final theme = Theme.of(context);
     final colorScheme = theme.colorScheme;
-    final iconColor = _getIconColor(context, item.type);
+    final iconColor = getIconColor(context, item.type);
 
     return Padding(
       padding: const EdgeInsets.all(14),
@@ -981,7 +1148,7 @@ class _FilesViewState extends State<FilesView> {
               color: iconColor.withValues(alpha: 0.12),
               borderRadius: BorderRadius.circular(12),
             ),
-            child: Icon(_getItemIcon(item.type), color: iconColor, size: 24),
+            child: Icon(getItemIcon(item.type), color: iconColor, size: 24),
           ),
           Column(
             crossAxisAlignment: CrossAxisAlignment.start,
@@ -1042,7 +1209,7 @@ class _FilesViewState extends State<FilesView> {
                   title: const Text('Upload File'),
                   onTap: () {
                     Navigator.pop(sheetContext);
-                    _pickAndUploadFile(context, provider);
+                    _pickAndUploadFile(context);
                   },
                 ),
                 ListTile(
@@ -1109,58 +1276,27 @@ class _FilesViewState extends State<FilesView> {
     );
   }
 
-  Future<void> _pickAndUploadFile(
+  // Mirrors `main.dart`'s `_handleSharedFiles` exactly, so picking a file
-    BuildContext context,
+  // via "+" lands on the same destination-picker screen and background
-    ServerProvider provider,
+  // foreground-service upload as receiving one via Android's "Share
-  ) async {
+  // to..." sheet does, rather than a separate in-app-only upload path.
-    final result = await FilePicker.pickFiles();
+  Future<void> _pickAndUploadFile(BuildContext context) async {
-    if (result.isEmpty) return;
+    final picked = await FilePicker.pickFiles();
-    final picked = result.first;
+    if (picked.isEmpty) return;
-    if (picked.path == null) return;
+    final files = picked
-
+        .where((f) => f.path != null)
-    final progress = ValueNotifier<double?>(0);
+        .map(
-    if (!context.mounted) return;
+          (f) => SharedFileRef(
-
+            uri: Uri.file(f.path!).toString(),
-    showDialog(
+            name: f.name,
-      context: context,
+            size: f.lengthSync(),
-      barrierDismissible: false,
-      builder: (dialogContext) {
-        return AlertDialog(
-          title: Text('Uploading ${picked.name}'),
-          content: ValueListenableBuilder<double?>(
-            valueListenable: progress,
-            builder: (context, value, _) =>
-                LinearProgressIndicator(value: value),
           ),
-        );
+        )
-      },
+        .toList();
-    );
+    if (files.isEmpty || !context.mounted) return;
 
-    bool success = false;
+    Navigator.of(
-    try {
+      context,
-      success = await provider.uploadFileFromPath(
+    ).push(MaterialPageRoute(builder: (_) => ShareUploadView(files: files)));
-        picked.name,
-        picked.path!,
-        onProgress: (sent, total) {
-          if (total > 0) progress.value = sent / total;
-        },
-      );
-    } catch (_) {
-      success = false;
-    }
-
-    if (context.mounted) {
-      Navigator.pop(context); // close progress dialog
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(
-          content: Text(
-            success
-                ? 'Uploaded ${picked.name} to Nextcloud'
-                : 'Failed to upload ${picked.name}',
-          ),
-          behavior: SnackBarBehavior.floating,
-        ),
-      );
-    }
   }
 }

lib/views/login_view.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import '../models/saved_account.dart';
 import '../providers/server_provider.dart';
+import 'login_webview_view.dart';
 
 class LoginView extends StatefulWidget {
   /// True when this is pushed from Settings ("Add account") on top of an
@@ -21,6 +22,7 @@ class _LoginViewState extends State<LoginView> {
   final _urlController = TextEditingController();
   String? _originalActiveAccountId;
   bool _popped = false;
+  bool _webViewPushed = false;
 
   @override
   void initState() {
@@ -45,6 +47,60 @@ class _LoginViewState extends State<LoginView> {
     );
   }
 
+  /// Resumes a saved account with one tap (see [ServerProvider.switchAccount]).
+  /// That can fail silently from the account's own perspective - most often
+  /// a stored app password that no longer works (revoked server-side, or
+  /// left over from before a since-fixed bug that deleted it too eagerly on
+  /// a plain network hiccup) - so this surfaces that as a SnackBar with a
+  /// silently failing every time - a delete button on the row itself (see
+  /// [_SavedAccountRow]) is the way out.
+  Future<void> _continueAsAccount(SavedAccount account) async {
+    final provider = context.read<ServerProvider>();
+    final success = await provider.switchAccount(account.id);
+    if (success || !mounted) return;
+    ScaffoldMessenger.of(context)
+      ..hideCurrentSnackBar()
+      ..showSnackBar(
+        SnackBar(
+          content: Text("Couldn't sign in as ${account.username}"),
+          behavior: SnackBarBehavior.floating,
+        ),
+      );
+  }
+
+  /// Mirrors AccountView's `_AccountsCard._confirmRemove` - same
+  /// destructive-action gate, just reached from the login screen instead of
+  /// Settings.
+  Future<void> _confirmRemoveAccount(SavedAccount account) async {
+    final host = Uri.tryParse(account.serverUrl)?.host ?? account.serverUrl;
+    final confirmed = await showDialog<bool>(
+      context: context,
+      builder: (dialogContext) {
+        return AlertDialog(
+          title: const Text('Remove Account'),
+          content: Text(
+            'Remove ${account.username} ($host)? You can add it again later.',
+          ),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.pop(dialogContext, false),
+              child: const Text('Cancel'),
+            ),
+            FilledButton(
+              style: FilledButton.styleFrom(
+                backgroundColor: Theme.of(dialogContext).colorScheme.error,
+              ),
+              onPressed: () => Navigator.pop(dialogContext, true),
+              child: const Text('Remove'),
+            ),
+          ],
+        );
+      },
+    );
+    if (confirmed != true || !mounted) return;
+    await context.read<ServerProvider>().removeAccount(account.id);
+  }
+
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
@@ -67,6 +123,37 @@ class _LoginViewState extends State<LoginView> {
       });
     }
 
+    // Every login (first account or an additional one) shows its login
+    // page in LoginWebViewView, a real screen this app owns - see
+    // ServerProvider.startLoginFlow's doc comment for why. Push it the
+    // moment there's a URL to show; _webViewPushed resets once that route
+    // pops (cancelled or done) so a retry after cancelling pushes it again.
+    if (!_webViewPushed &&
+        isAwaitingBrowser &&
+        provider.pendingLoginUrl != null) {
+      _webViewPushed = true;
+      final url = provider.pendingLoginUrl!;
+      WidgetsBinding.instance.addPostFrameCallback((_) async {
+        if (!mounted) return;
+        // A plain MaterialPageRoute's animated slide/fade transition can
+        // leave this screen fully black after popping back off of it - a
+        // known Android WebView-as-PlatformView compositing issue with the
+        // Impeller renderer (the platform view's surface isn't always torn
+        // down in sync with an animated route transition). An instant,
+        // non-animated route sidesteps it entirely; the close (X) button
+        // already reads like a immediate action, not something that needs
+        // a slide, so no UX is lost.
+        await Navigator.of(context).push(
+          PageRouteBuilder(
+            pageBuilder: (_, _, _) => LoginWebViewView(url: url),
+            transitionDuration: Duration.zero,
+            reverseTransitionDuration: Duration.zero,
+          ),
+        );
+        _webViewPushed = false;
+      });
+    }
+
     final body = Scaffold(
       appBar: widget.isAddingAccount
           ? AppBar(title: const Text('Add Account'))
@@ -78,12 +165,7 @@ class _LoginViewState extends State<LoginView> {
             padding: const EdgeInsets.symmetric(horizontal: 28, vertical: 24),
             child: ConstrainedBox(
               constraints: const BoxConstraints(maxWidth: 440),
-              child: isAwaitingBrowser
+              child: Column(
-                  ? _WaitingForBrowser(
-                      onCancel: () => provider.cancelLoginFlow(),
-                      onReopenBrowser: provider.reopenLoginBrowser,
-                    )
-                  : Column(
                 mainAxisSize: MainAxisSize.min,
                 children: [
                   // A logout keeps the account saved rather than
@@ -94,17 +176,15 @@ class _LoginViewState extends State<LoginView> {
                       provider.accounts.isNotEmpty) ...[
                     _SavedAccountsSection(
                       accounts: provider.accounts,
-                            onSelect: (account) =>
+                      onSelect: (account) => _continueAsAccount(account),
-                                provider.switchAccount(account.id),
+                      onRemove: (account) => _confirmRemoveAccount(account),
                     ),
                     const SizedBox(height: 28),
                     Row(
                       children: [
                         const Expanded(child: Divider()),
                         Padding(
-                                padding: const EdgeInsets.symmetric(
+                          padding: const EdgeInsets.symmetric(horizontal: 12),
-                                  horizontal: 12,
-                                ),
                           child: Text(
                             'or',
                             style: theme.textTheme.bodySmall?.copyWith(
@@ -120,7 +200,8 @@ class _LoginViewState extends State<LoginView> {
                   _ServerForm(
                     formKey: _formKey,
                     urlController: _urlController,
-                          isLoading: isInitiating || provider.isLoading,
+                    isLoading:
+                        isInitiating || provider.isLoading || isAwaitingBrowser,
                     errorMessage:
                         provider.loginFlowStatus == LoginFlowStatus.error
                         ? provider.errorMessage
@@ -140,7 +221,7 @@ class _LoginViewState extends State<LoginView> {
     if (!widget.isAddingAccount) return body;
 
     // Backing out mid-flow (system back/swipe-back, not just the explicit
-    // Cancel button in _WaitingForBrowser) should cancel the pending login
+    // Cancel button in LoginWebViewView) should cancel the pending login
     // flow rather than leaving its poll timer running after this screen is
     // gone - this view could never be popped before "add account" existed,
     // so that case wasn't reachable until now.
@@ -182,10 +263,18 @@ class _ServerForm extends StatelessWidget {
         crossAxisAlignment: CrossAxisAlignment.stretch,
         children: [
           Center(
-            child: ClipRRect(
+            // Same monochrome-tinted treatment as the splash/lock screens
-              borderRadius: BorderRadius.circular(20),
+            // (see main.dart's _SplashView) - the asset is a plain white
+            // silhouette on transparent, meant to be recolored rather than
+            // shown as-is. Used everywhere the app shows its own icon
+            // in-app, rather than the full-color launcher icon.
+            child: ColorFiltered(
+              colorFilter: ColorFilter.mode(
+                Theme.of(context).colorScheme.onSurface,
+                BlendMode.srcIn,
+              ),
               child: Image.asset(
-                'assets/icon/app_icon.png',
+                'assets/icon/app_icon_monochrome.png',
                 width: 80,
                 height: 80,
               ),
@@ -289,7 +378,7 @@ class _ServerForm extends StatelessWidget {
           ),
           const SizedBox(height: 24),
           Text(
-            "You'll finish signing in through your browser. This app never sees your password.",
+            "You'll finish signing in on the page that opens. This app never sees your password.",
             textAlign: TextAlign.center,
             style: theme.textTheme.bodySmall?.copyWith(
               color: colorScheme.onSurfaceVariant,
@@ -307,8 +396,13 @@ class _ServerForm extends StatelessWidget {
 class _SavedAccountsSection extends StatelessWidget {
   final List<SavedAccount> accounts;
   final ValueChanged<SavedAccount> onSelect;
+  final ValueChanged<SavedAccount> onRemove;
 
-  const _SavedAccountsSection({required this.accounts, required this.onSelect});
+  const _SavedAccountsSection({
+    required this.accounts,
+    required this.onSelect,
+    required this.onRemove,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -336,6 +430,7 @@ class _SavedAccountsSection extends StatelessWidget {
                 _SavedAccountRow(
                   account: account,
                   onTap: () => onSelect(account),
+                  onRemove: () => onRemove(account),
                 ),
                 if (account != accounts.last)
                   const Divider(height: 1, indent: 16, endIndent: 16),
@@ -351,8 +446,13 @@ class _SavedAccountsSection extends StatelessWidget {
 class _SavedAccountRow extends StatelessWidget {
   final SavedAccount account;
   final VoidCallback onTap;
+  final VoidCallback onRemove;
 
-  const _SavedAccountRow({required this.account, required this.onTap});
+  const _SavedAccountRow({
+    required this.account,
+    required this.onTap,
+    required this.onRemove,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -375,55 +475,13 @@ class _SavedAccountRow extends StatelessWidget {
       ),
       title: Text(account.username),
       subtitle: Text(host),
-      trailing: const Icon(Icons.chevron_right_rounded),
+      trailing: IconButton(
+        icon: const Icon(Icons.close_rounded),
+        tooltip: 'Remove account',
+        visualDensity: VisualDensity.compact,
+        onPressed: onRemove,
+      ),
       onTap: onTap,
     );
   }
 }
-
-class _WaitingForBrowser extends StatelessWidget {
-  final VoidCallback onCancel;
-  final VoidCallback onReopenBrowser;
-
-  const _WaitingForBrowser({
-    required this.onCancel,
-    required this.onReopenBrowser,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-    final colorScheme = theme.colorScheme;
-
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        CircularProgressIndicator(color: colorScheme.primary),
-        const SizedBox(height: 28),
-        Text(
-          'Waiting for you to sign in',
-          textAlign: TextAlign.center,
-          style: theme.textTheme.titleLarge?.copyWith(
-            fontWeight: FontWeight.w700,
-          ),
-        ),
-        const SizedBox(height: 8),
-        Text(
-          'Complete the login in the browser window that just opened, then come back here.',
-          textAlign: TextAlign.center,
-          style: theme.textTheme.bodyMedium?.copyWith(
-            color: colorScheme.onSurfaceVariant,
-          ),
-        ),
-        const SizedBox(height: 32),
-        OutlinedButton.icon(
-          onPressed: onReopenBrowser,
-          icon: const Icon(Icons.open_in_browser_rounded),
-          label: const Text('Reopen browser'),
-        ),
-        const SizedBox(height: 12),
-        TextButton(onPressed: onCancel, child: const Text('Cancel')),
-      ],
-    );
-  }
-}

lib/views/login_webview_view.dart

@@ -0,0 +1,101 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:webview_flutter/webview_flutter.dart';
+import '../providers/server_provider.dart';
+
+/// Every Login Flow v2 page - first login or an additional account -
+/// rendered in Flutter's own WebView rather than a Chrome Custom Tab or
+/// url_launcher's `LaunchMode.inAppWebView`. The latter hosts a bare native
+/// WebView Activity with no chrome of its own: no close button, and on at
+/// least some devices it draws edge-to-edge and hides the status bar with
+/// no way back short of the OS back gesture. A normal Scaffold/AppBar here
+/// gets the status bar/safe-area handling and a close button for free,
+/// exactly like every other screen in the app - and unlike a Custom Tab,
+/// this screen can close itself automatically once login succeeds.
+///
+/// See ServerProvider.startLoginFlow's doc comment for the full rationale.
+class LoginWebViewView extends StatefulWidget {
+  final Uri url;
+
+  const LoginWebViewView({super.key, required this.url});
+
+  @override
+  State<LoginWebViewView> createState() => _LoginWebViewViewState();
+}
+
+class _LoginWebViewViewState extends State<LoginWebViewView> {
+  late final WebViewController _controller;
+  bool _pageLoading = true;
+  bool _popped = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = WebViewController()
+      ..setJavaScriptMode(JavaScriptMode.unrestricted)
+      ..setNavigationDelegate(
+        NavigationDelegate(
+          onPageStarted: (_) {
+            if (mounted) setState(() => _pageLoading = true);
+          },
+          onPageFinished: (_) {
+            if (mounted) setState(() => _pageLoading = false);
+          },
+        ),
+      );
+    // Android's WebView CookieManager is a single store shared/persisted
+    // across every WebView instance in the app, not scoped to this
+    // controller - without clearing it first, "Add Account" (or logging
+    // back in as a different user on the same server) would silently land
+    // on whichever account's Nextcloud session cookie is already there
+    // instead of prompting for credentials, defeating the point of
+    // starting a fresh Login Flow v2 at all.
+    WebViewCookieManager().clearCookies().then((_) {
+      if (mounted) _controller.loadRequest(widget.url);
+    });
+  }
+
+  void _cancel() {
+    context.read<ServerProvider>().cancelLoginFlow();
+    Navigator.of(context).pop();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final provider = context.watch<ServerProvider>();
+
+    // The login flow finished (success or error) or was cancelled
+    // elsewhere - close this screen automatically rather than leaving it
+    // sitting open over a flow that's no longer awaiting the browser.
+    if (!_popped &&
+        provider.loginFlowStatus != LoginFlowStatus.awaitingBrowser) {
+      _popped = true;
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (mounted) Navigator.of(context).pop();
+      });
+    }
+
+    return PopScope(
+      canPop: false,
+      onPopInvokedWithResult: (didPop, _) {
+        if (!didPop) _cancel();
+      },
+      child: Scaffold(
+        appBar: AppBar(
+          title: const Text('Sign in'),
+          leading: IconButton(
+            icon: const Icon(Icons.close_rounded),
+            tooltip: 'Cancel',
+            onPressed: _cancel,
+          ),
+        ),
+        body: Stack(
+          children: [
+            WebViewWidget(controller: _controller),
+            if (_pageLoading) const LinearProgressIndicator(),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/views/move_copy_destination_picker.dart

@@ -0,0 +1,528 @@
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:provider/provider.dart';
+import '../models/move_copy_result.dart';
+import '../models/nextcloud_item.dart';
+import '../providers/server_provider.dart';
+import '../widgets/breadcrumbs.dart';
+import '../widgets/item_icon.dart';
+import '../widgets/more_tabs_button.dart';
+import '../widgets/move_copy_conflict_sheet.dart';
+import '../widgets/profile_avatar_button.dart';
+import '../widgets/segmented_icon_toggle.dart';
+import '../widgets/sort_menu_button.dart';
+import '../widgets/sticky_header_delegate.dart';
+import '../widgets/synced_header_scaffold.dart';
+
+/// Destination-folder browser for moving/copying [items] (a multi-select
+/// batch from Files or Photos). Visually mirrors `ShareUploadView`'s
+/// browser (same chrome/controls/listing), but deliberately does **not**
+/// reuse `ServerProvider`'s shared `currentFolderPath`/`pathStack`/`items`
+/// navigation state the way that screen does - this is pushed mid-browsing
+/// session (the user was already looking at a specific Files-tab folder
+/// when they selected items and tapped Move/Copy), so clobbering that
+/// shared state here would strand the Files tab in whatever folder this
+/// picker last visited. Instead it owns its own local navigation state and
+/// fetches through `ServerProvider.fetchFolderListing`, a stateless
+/// pass-through that never touches shared fields - `ShareUploadView` gets
+/// away with the shared state precisely because it always resets to root
+/// and pops all the way to the app root afterward (a cold share-intent
+/// launch has no prior browsing session to preserve); that doesn't hold
+/// here.
+class MoveCopyDestinationPicker extends StatefulWidget {
+  final List<NextcloudItem> items;
+  final bool copy;
+
+  const MoveCopyDestinationPicker({
+    super.key,
+    required this.items,
+    required this.copy,
+  });
+
+  /// Pushes the picker and returns the final [MoveCopyResult] (already
+  /// including any conflict resolution), or null if the user backed out
+  /// without confirming.
+  static Future<MoveCopyResult?> show(
+    BuildContext context,
+    List<NextcloudItem> items, {
+    required bool copy,
+  }) {
+    return Navigator.of(context).push<MoveCopyResult>(
+      MaterialPageRoute(
+        builder: (_) => MoveCopyDestinationPicker(items: items, copy: copy),
+      ),
+    );
+  }
+
+  @override
+  State<MoveCopyDestinationPicker> createState() =>
+      _MoveCopyDestinationPickerState();
+}
+
+class _MoveCopyDestinationPickerState extends State<MoveCopyDestinationPicker> {
+  final ScrollController _scrollController = ScrollController();
+  List<String> _pathStack = const ['/'];
+  List<NextcloudItem> _rawItems = [];
+  bool _isLoading = true;
+  bool _isSubmitting = false;
+
+  String get _currentPath => _pathStack.last;
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) => _fetch(_currentPath));
+  }
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _fetch(String path) async {
+    setState(() => _isLoading = true);
+    final raw = await context.read<ServerProvider>().fetchFolderListing(path);
+    if (!mounted) return;
+    setState(() {
+      _rawItems = raw;
+      _isLoading = false;
+    });
+  }
+
+  void _navigateToFolder(String path) {
+    setState(() => _pathStack = [..._pathStack, path]);
+    _fetch(path);
+  }
+
+  void _navigateToPathIndex(int index) {
+    if (index < 0 || index >= _pathStack.length - 1) return;
+    setState(() => _pathStack = _pathStack.sublist(0, index + 1));
+    _fetch(_currentPath);
+  }
+
+  bool _navigateUp() {
+    if (_pathStack.length <= 1) return false;
+    setState(() => _pathStack = _pathStack.sublist(0, _pathStack.length - 1));
+    _fetch(_currentPath);
+    return true;
+  }
+
+  /// Client-side mirror of `ServerProvider`'s own authoritative check (see
+  /// `_isSelfOrDescendant`) - just for disabling the confirm button with an
+  /// explanation up front instead of letting the request round-trip and
+  /// fail.
+  bool _destinationIsInvalid() {
+    final dest = _currentPath.endsWith('/') ? _currentPath : '$_currentPath/';
+    for (final item in widget.items) {
+      if (!item.isFolder) continue;
+      final folder = item.path.endsWith('/') ? item.path : '${item.path}/';
+      if (dest == folder || dest.startsWith(folder)) return true;
+    }
+    return false;
+  }
+
+  Future<void> _confirm(ServerProvider provider) async {
+    setState(() => _isSubmitting = true);
+    final result = widget.copy
+        ? await provider.copyItems(widget.items, _currentPath)
+        : await provider.moveItems(widget.items, _currentPath);
+    if (!mounted) return;
+
+    if (result.blockedReason != null) {
+      setState(() => _isSubmitting = false);
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text(result.blockedReason!),
+          behavior: SnackBarBehavior.floating,
+        ),
+      );
+      return;
+    }
+
+    var succeeded = result.succeeded;
+    var failed = result.failed;
+
+    if (result.conflicts.isNotEmpty) {
+      final choices = await MoveCopyConflictSheet.show(
+        context,
+        result.conflicts,
+      );
+      if (!mounted) return;
+      if (choices != null) {
+        final resolved = await provider.resolveConflicts(
+          result.conflicts,
+          _currentPath,
+          copy: widget.copy,
+          choices: choices,
+        );
+        succeeded += resolved.succeeded;
+        failed += resolved.failed;
+      }
+      // A dismissed sheet (choices == null) leaves those conflicts
+      // untouched at the source - same outcome as explicitly skipping
+      // every one, just without a network round-trip to get there.
+    }
+
+    if (!mounted) return;
+    Navigator.of(
+      context,
+    ).pop(MoveCopyResult(succeeded: succeeded, failed: failed));
+  }
+
+  Widget _buildControlsRow(ServerProvider provider) {
+    return SizedBox(
+      height: 44,
+      child: SingleChildScrollView(
+        scrollDirection: Axis.horizontal,
+        child: Row(
+          children: [
+            IconButton(
+              icon: Icon(
+                provider.filesSortAscending
+                    ? Icons.arrow_upward_rounded
+                    : Icons.arrow_downward_rounded,
+                size: 20,
+              ),
+              visualDensity: VisualDensity.compact,
+              tooltip: provider.filesSortAscending ? 'Ascending' : 'Descending',
+              onPressed: provider.toggleFilesSortOrder,
+            ),
+            SizedBox(
+              width: 130,
+              child: SortMenuButton(
+                field: provider.filesSortField,
+                onChanged: provider.setFilesSortField,
+              ),
+            ),
+            ToggleIconButton(
+              icon: provider.showHiddenFiles
+                  ? Icons.visibility_rounded
+                  : Icons.visibility_off_rounded,
+              isSelected: provider.showHiddenFiles,
+              onTap: () => provider.toggleShowHiddenFiles(),
+              tooltip: 'Show hidden files',
+            ),
+            const SizedBox(width: 4),
+            SegmentedIconGroup(
+              children: [
+                ToggleIconButton(
+                  icon: Symbols.circles_rounded,
+                  isSelected: provider.storageScope == StorageScope.cloud,
+                  onTap: () => provider.setStorageScope(StorageScope.cloud),
+                  tooltip: 'Cloud storage',
+                ),
+                ToggleIconButton(
+                  icon: Symbols.hard_drive_rounded,
+                  isSelected: provider.storageScope == StorageScope.external,
+                  onTap: () => provider.setStorageScope(StorageScope.external),
+                  tooltip: 'External storage',
+                ),
+              ],
+            ),
+            const SizedBox(width: 8),
+            SegmentedIconGroup(
+              children: [
+                ToggleIconButton(
+                  icon: Icons.view_list_rounded,
+                  isSelected: !provider.isGridView,
+                  onTap: () => provider.setGridView(false),
+                  tooltip: 'List view',
+                ),
+                ToggleIconButton(
+                  icon: Icons.grid_view_rounded,
+                  isSelected: provider.isGridView,
+                  onTap: () => provider.setGridView(true),
+                  tooltip: 'Grid view',
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  // Only folders are valid Move/Copy destinations - files still show (so
+  // the listing matches what the Files tab itself would show for this
+  // folder) but are visually dimmed and inert, same treatment as
+  // ShareUploadView's own destination browser.
+  Widget _buildListTile(NextcloudItem item, ServerProvider provider) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    final isFolder = item.isFolder;
+
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 8),
+      child: ClipRRect(
+        borderRadius: BorderRadius.circular(16),
+        child: Opacity(
+          opacity: isFolder ? 1 : 0.5,
+          child: Material(
+            color: colorScheme.surfaceContainerLow,
+            child: InkWell(
+              onTap: isFolder ? () => _navigateToFolder(item.path) : null,
+              child: Padding(
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 16,
+                  vertical: 12,
+                ),
+                child: Row(
+                  children: [
+                    ItemThumbnail(
+                      item: item,
+                      provider: provider,
+                      size: 44,
+                      borderRadius: 12,
+                      iconSize: 22,
+                    ),
+                    const SizedBox(width: 14),
+                    Expanded(
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Text(
+                            item.name,
+                            style: theme.textTheme.titleMedium?.copyWith(
+                              fontWeight: FontWeight.w600,
+                              fontSize: 14,
+                            ),
+                          ),
+                          const SizedBox(height: 2),
+                          Text(
+                            isFolder
+                                ? 'Folder'
+                                : '${formatBytes(item.size)} • ${DateFormat.yMMMd().format(item.lastModified)}',
+                            style: theme.textTheme.bodySmall?.copyWith(
+                              color: colorScheme.onSurfaceVariant,
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                    if (isFolder) const Icon(Icons.chevron_right_rounded),
+                  ],
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildGridCard(NextcloudItem item, ServerProvider provider) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    final isFolder = item.isFolder;
+    final iconColor = getIconColor(context, item.type);
+
+    return Opacity(
+      opacity: isFolder ? 1 : 0.5,
+      child: Material(
+        color: colorScheme.surfaceContainerLow,
+        borderRadius: BorderRadius.circular(20),
+        clipBehavior: Clip.antiAlias,
+        child: InkWell(
+          onTap: isFolder ? () => _navigateToFolder(item.path) : null,
+          child: Padding(
+            padding: const EdgeInsets.all(14),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Container(
+                  width: 40,
+                  height: 40,
+                  decoration: BoxDecoration(
+                    color: iconColor.withValues(alpha: 0.12),
+                    borderRadius: BorderRadius.circular(12),
+                  ),
+                  child: Icon(
+                    getItemIcon(item.type),
+                    color: iconColor,
+                    size: 24,
+                  ),
+                ),
+                Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      item.name,
+                      maxLines: 2,
+                      overflow: TextOverflow.ellipsis,
+                      style: theme.textTheme.titleMedium?.copyWith(
+                        fontWeight: FontWeight.w600,
+                        fontSize: 13,
+                      ),
+                    ),
+                    const SizedBox(height: 2),
+                    Text(
+                      isFolder ? 'Folder' : formatBytes(item.size),
+                      style: theme.textTheme.bodySmall?.copyWith(
+                        color: colorScheme.onSurfaceVariant,
+                        fontSize: 11,
+                      ),
+                    ),
+                  ],
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    final provider = context.watch<ServerProvider>();
+    final hasBreadcrumbs = _pathStack.length > 1;
+    final currentLabel = _currentPath == '/'
+        ? 'Home'
+        : _currentPath.split('/').where((s) => s.isNotEmpty).last;
+    final items = provider.applyFilesDisplayPrefs(_rawItems);
+    final invalidDestination = _destinationIsInvalid();
+
+    final controlsColumn = Padding(
+      padding: const EdgeInsets.fromLTRB(16, 16, 16, 12),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          _buildControlsRow(provider),
+          if (hasBreadcrumbs) ...[
+            const SizedBox(height: 10),
+            SizedBox(
+              height: 32,
+              child: Breadcrumbs(
+                pathStack: _pathStack,
+                onTap: _navigateToPathIndex,
+              ),
+            ),
+          ],
+        ],
+      ),
+    );
+
+    final contentSlivers = <Widget>[
+      SliverPersistentHeader(
+        pinned: true,
+        delegate: StickyHeaderDelegate(
+          height: hasBreadcrumbs ? 114 : 72,
+          child: controlsColumn,
+        ),
+      ),
+      if (_isLoading)
+        const SliverFillRemaining(
+          hasScrollBody: false,
+          child: Center(child: CircularProgressIndicator()),
+        )
+      else if (items.isEmpty)
+        SliverFillRemaining(
+          hasScrollBody: false,
+          child: Center(
+            child: Text(
+              'Folder is empty',
+              style: TextStyle(color: colorScheme.onSurfaceVariant),
+            ),
+          ),
+        )
+      else if (provider.isGridView)
+        SliverPadding(
+          padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 8),
+          sliver: SliverGrid(
+            gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+              crossAxisCount: 2,
+              childAspectRatio: 1.1,
+              crossAxisSpacing: 12,
+              mainAxisSpacing: 12,
+            ),
+            delegate: SliverChildBuilderDelegate((context, index) {
+              return _buildGridCard(items[index], provider);
+            }, childCount: items.length),
+          ),
+        )
+      else
+        SliverPadding(
+          padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 8),
+          sliver: SliverList(
+            delegate: SliverChildBuilderDelegate((context, index) {
+              return _buildListTile(items[index], provider);
+            }, childCount: items.length),
+          ),
+        ),
+      const SliverToBoxAdapter(child: SizedBox(height: 24)),
+    ];
+
+    return PopScope(
+      canPop: _pathStack.length <= 1,
+      onPopInvokedWithResult: (didPop, result) {
+        if (!didPop) _navigateUp();
+      },
+      child: Scaffold(
+        body: SyncedHeaderScaffold(
+          scrollController: _scrollController,
+          provider: provider,
+          actions: const [MoreTabsButton(), ProfileAvatarButton()],
+          contentSlivers: contentSlivers,
+        ),
+        bottomNavigationBar: Material(
+          color: colorScheme.surfaceContainerHigh,
+          elevation: 8,
+          shape: const RoundedRectangleBorder(
+            borderRadius: BorderRadius.vertical(top: Radius.circular(24)),
+          ),
+          clipBehavior: Clip.antiAlias,
+          child: SafeArea(
+            top: false,
+            child: Padding(
+              padding: const EdgeInsets.fromLTRB(20, 16, 20, 16),
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  if (invalidDestination) ...[
+                    Text(
+                      "Can't ${widget.copy ? 'copy' : 'move'} a folder into "
+                      "itself or one of its own subfolders",
+                      style: theme.textTheme.bodySmall?.copyWith(
+                        color: colorScheme.error,
+                      ),
+                    ),
+                    const SizedBox(height: 8),
+                  ],
+                  SizedBox(
+                    width: double.infinity,
+                    child: FilledButton.icon(
+                      onPressed: invalidDestination || _isSubmitting
+                          ? null
+                          : () => _confirm(provider),
+                      icon: _isSubmitting
+                          ? const SizedBox(
+                              width: 18,
+                              height: 18,
+                              child: CircularProgressIndicator(strokeWidth: 2),
+                            )
+                          : Icon(
+                              widget.copy
+                                  ? Icons.copy_rounded
+                                  : Icons.drive_file_move_rounded,
+                            ),
+                      label: Text(
+                        '${widget.copy ? 'Copy' : 'Move'} ${widget.items.length} '
+                        'item(s) to $currentLabel',
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/views/photos_view.dart

@@ -1,14 +1,12 @@
-import 'package:file_saver/file_saver.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:material_symbols_icons/symbols.dart';
-import 'package:path/path.dart' as p;
-import 'package:path_provider/path_provider.dart';
 import 'package:provider/provider.dart';
 import 'package:share_plus/share_plus.dart';
 import '../models/nextcloud_item.dart';
 import '../models/selection_action.dart';
 import '../providers/server_provider.dart';
+import '../services/download_service.dart';
 import '../widgets/details/details_sheet.dart';
 import '../widgets/more_tabs_button.dart';
 import '../widgets/profile_avatar_button.dart';
@@ -19,6 +17,7 @@ import '../widgets/sort_menu_button.dart';
 import '../widgets/sticky_header_delegate.dart';
 import '../widgets/synced_header_scaffold.dart';
 import 'file_viewer_screen.dart';
+import 'move_copy_destination_picker.dart';
 
 class PhotosView extends StatefulWidget {
   final ScrollController scrollController;
@@ -29,29 +28,123 @@ class PhotosView extends StatefulWidget {
   State<PhotosView> createState() => _PhotosViewState();
 }
 
-class _PhotosViewState extends State<PhotosView> {
+class _PhotosViewState extends State<PhotosView>
+    with SingleTickerProviderStateMixin {
   bool _requested = false;
   final Set<String> _selectedIds = {};
+  final ScrollController _selectionActionsScrollController = ScrollController();
+  final List<AnimationController> _scrollHintControllers = [];
 
   bool get _isSelecting => _selectedIds.isNotEmpty;
 
   void _toggleSelection(NextcloudItem item) {
     HapticFeedback.selectionClick();
+    final enteringSelection = _selectedIds.isEmpty;
     setState(() {
       if (!_selectedIds.remove(item.id)) _selectedIds.add(item.id);
     });
+    if (enteringSelection && _isSelecting) {
+      WidgetsBinding.instance.addPostFrameCallback(
+        (_) => _playScrollHint(_selectionActionsScrollController),
+      );
+    }
   }
 
   void _clearSelection() {
     setState(_selectedIds.clear);
   }
 
+  /// A one-shot hint that the selection actions row actually scrolls -
+  /// mirrors `FilesView`'s identical controls-row hint (see its doc
+  /// comment): nudges it right and back, once, the first time a selection
+  /// starts. No-ops if there's nothing to scroll (row already fits).
+  Future<void> _playScrollHint(ScrollController scrollController) async {
+    await Future.delayed(const Duration(milliseconds: 500));
+    if (!mounted || !scrollController.hasClients) return;
+    final maxExtent = scrollController.position.maxScrollExtent;
+    if (maxExtent <= 0) return;
+    final double peak = maxExtent < 36 ? maxExtent : 36;
+    final controller = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 900),
+    );
+    _scrollHintControllers.add(controller);
+    final hint = TweenSequence<double>([
+      TweenSequenceItem(
+        tween: Tween(
+          begin: 0.0,
+          end: peak,
+        ).chain(CurveTween(curve: Curves.easeInOutSine)),
+        weight: 50,
+      ),
+      TweenSequenceItem(
+        tween: Tween(
+          begin: peak,
+          end: 0.0,
+        ).chain(CurveTween(curve: Curves.easeInOutSine)),
+        weight: 50,
+      ),
+    ]).animate(controller);
+    void onTick() {
+      if (scrollController.hasClients) {
+        scrollController.jumpTo(hint.value);
+      }
+    }
+
+    hint.addListener(onTick);
+    await controller.forward();
+    hint.removeListener(onTick);
+    _scrollHintControllers.remove(controller);
+    controller.dispose();
+  }
+
+  @override
+  void dispose() {
+    for (final controller in _scrollHintControllers) {
+      controller.dispose();
+    }
+    _selectionActionsScrollController.dispose();
+    super.dispose();
+  }
+
+  /// Mirrors `FilesView._handlePickTap` - Photos has no folders, so this is
+  /// just the matching/toggle/immediate-confirm branch.
+  void _handlePickTap(
+    BuildContext context,
+    ServerProvider provider,
+    NextcloudItem item,
+  ) {
+    if (!provider.itemMatchesPickFilter(item)) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(
+          content: Text("This app can't accept this file type"),
+          behavior: SnackBarBehavior.floating,
+        ),
+      );
+      return;
+    }
+    if (provider.pickRequest!.allowMultiple) {
+      _toggleSelection(item);
+    } else {
+      provider.confirmPick([item]);
+    }
+  }
+
   /// The bulk actions shown in the sticky selection toolbar for the
   /// currently-selected items.
   List<SelectionAction> _buildSelectionActions(
     ServerProvider provider,
     List<NextcloudItem> selected,
   ) {
+    if (provider.isPicking) {
+      return [
+        SelectionAction(
+          icon: Icons.check_rounded,
+          label: 'Use ${selected.length} item(s)',
+          onTap: () => provider.confirmPick(selected),
+        ),
+      ];
+    }
     return [
       SelectionAction(
         icon: selected.every((i) => i.isFavorite)
@@ -60,7 +153,6 @@ class _PhotosViewState extends State<PhotosView> {
         label: selected.every((i) => i.isFavorite)
             ? 'Remove from favorites'
             : 'Favorite',
-        color: Colors.red.shade400,
         onTap: () => _favoriteSelected(provider, selected),
       ),
       SelectionAction(
@@ -78,9 +170,18 @@ class _PhotosViewState extends State<PhotosView> {
       SelectionAction(
         icon: Icons.delete_outline_rounded,
         label: 'Delete',
-        color: Theme.of(context).colorScheme.error,
         onTap: () => _confirmDeleteSelected(context, provider, selected),
       ),
+      SelectionAction(
+        icon: Icons.copy_rounded,
+        label: 'Copy',
+        onTap: () => _moveOrCopySelected(provider, selected, copy: true),
+      ),
+      SelectionAction(
+        icon: Icons.drive_file_move_rounded,
+        label: 'Move',
+        onTap: () => _moveOrCopySelected(provider, selected, copy: false),
+      ),
       if (selected.length == 1)
         SelectionAction(
           icon: Icons.info_outline_rounded,
@@ -173,61 +274,13 @@ class _PhotosViewState extends State<PhotosView> {
     );
 
     final List<Widget> contentSlivers = [
-      // Sticky while browsing; once selecting, the toolbar below takes over
+      // Sticky while browsing; once selecting, the selection bar takes over
-      // the pinned slot and this is free to scroll away.
+      // the very top of the screen instead (see `selectionBar` below), so
+      // this is free to scroll away rather than staying pinned under it.
       SliverPersistentHeader(
         pinned: !_isSelecting,
         delegate: StickyHeaderDelegate(height: 60, child: controlsRow),
       ),
-      if (_isSelecting)
-        SliverAppBar(
-          pinned: true,
-          // This isn't the scroll view's topmost sliver - the Synced
-          // header above it already reserves status-bar space, so leaving
-          // this at its default `primary: true` double-reserves it too,
-          // showing up as a big empty gap above the toolbar.
-          primary: false,
-          automaticallyImplyLeading: false,
-          toolbarHeight: 48,
-          // No leading/actions slots - everything lives in `title`, wrapped
-          // in the exact same 16px horizontal Padding as the controls row
-          // above it, so the two rows' content lines up edge-to-edge
-          // instead of relying on SliverAppBar's own leadingWidth/actions
-          // insets (which don't match the controls row's).
-          titleSpacing: 0,
-          title: Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 16),
-            child: Row(
-              children: [
-                IconButton(
-                  icon: const Icon(Icons.close_rounded, size: 20),
-                  tooltip: 'Cancel selection',
-                  onPressed: _clearSelection,
-                  visualDensity: VisualDensity.compact,
-                ),
-                const SizedBox(width: 8),
-                Expanded(
-                  child: Text(
-                    '${selectedItems.length} selected',
-                    style: theme.textTheme.titleSmall?.copyWith(
-                      fontWeight: FontWeight.w700,
-                    ),
-                  ),
-                ),
-                for (final action in _buildSelectionActions(
-                  provider,
-                  selectedItems,
-                ))
-                  IconButton(
-                    icon: Icon(action.icon, size: 20, color: action.color),
-                    tooltip: action.label,
-                    onPressed: action.onTap,
-                    visualDensity: VisualDensity.compact,
-                  ),
-              ],
-            ),
-          ),
-        ),
       const SliverToBoxAdapter(child: SizedBox(height: 8)),
 
       if (provider.isMediaLoading && photos.isEmpty)
@@ -335,11 +388,81 @@ class _PhotosViewState extends State<PhotosView> {
         provider: provider,
         actions: const [MoreTabsButton(), ProfileAvatarButton()],
         onRefresh: provider.fetchAllMedia,
+        selectionBar: _isSelecting
+            ? _buildSelectionBar(context, theme, provider, selectedItems)
+            : null,
         contentSlivers: contentSlivers,
       ),
     );
   }
 
+  /// Replaces the top bar entirely while selecting (see
+  /// `SyncedHeaderScaffold.selectionBar`) - a close button, the "N
+  /// selected" count, and the horizontally-scrollable bulk actions.
+  Widget _buildSelectionBar(
+    BuildContext context,
+    ThemeData theme,
+    ServerProvider provider,
+    List<NextcloudItem> selectedItems,
+  ) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      child: Row(
+        children: [
+          SizedBox(
+            width: MediaQuery.of(context).size.width * 0.5,
+            child: Align(
+              alignment: Alignment.centerLeft,
+              child: Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  IconButton(
+                    icon: const Icon(Icons.close_rounded, size: 20),
+                    tooltip: 'Cancel selection',
+                    onPressed: _clearSelection,
+                    visualDensity: VisualDensity.compact,
+                  ),
+                  const SizedBox(width: 8),
+                  Text(
+                    '${selectedItems.length} selected',
+                    style: theme.textTheme.titleSmall?.copyWith(
+                      fontWeight: FontWeight.w700,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+          Expanded(
+            child: SingleChildScrollView(
+              controller: _selectionActionsScrollController,
+              scrollDirection: Axis.horizontal,
+              // Left-aligned (not anchored to the trailing edge) so the
+              // first action's left edge sits at a fixed spot - lining up
+              // with the controls row's own first icon directly below it -
+              // regardless of how many actions there are.
+              child: Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  for (final action in _buildSelectionActions(
+                    provider,
+                    selectedItems,
+                  ))
+                    IconButton(
+                      icon: Icon(action.icon, size: 20),
+                      tooltip: action.label,
+                      onPressed: action.onTap,
+                      visualDensity: VisualDensity.compact,
+                    ),
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
   Widget _buildPhotoTile(
     BuildContext context,
     NextcloudItem photo,
@@ -353,13 +476,17 @@ class _PhotosViewState extends State<PhotosView> {
     // floating rounded corner mid-drag (see the same fix in files_view).
     final tile = GestureDetector(
       onTap: () {
-        if (_isSelecting) {
+        if (provider.isPicking) {
+          _handlePickTap(context, provider, photo);
+        } else if (_isSelecting) {
           _toggleSelection(photo);
         } else {
           _openLightbox(context, photo, provider);
         }
       },
-      onLongPress: () => _toggleSelection(photo),
+      onLongPress: provider.isPicking && !provider.pickRequest!.allowMultiple
+          ? null
+          : () => _toggleSelection(photo),
       child: ColoredBox(
         color: colorScheme.surfaceContainerHigh,
         child: SelectableThumbnail(
@@ -515,45 +642,35 @@ class _PhotosViewState extends State<PhotosView> {
     }
   }
 
+  /// Hands the whole batch off to `DownloadService.kt` - see
+  /// `FilesView._downloadSelected`'s identical doc comment for why.
   Future<void> _downloadSelected(
     BuildContext context,
     ServerProvider provider,
     List<NextcloudItem> items,
   ) async {
-    final messenger = ScaffoldMessenger.of(context);
-    messenger.showSnackBar(
-      SnackBar(
-        content: Text('Downloading ${items.length} item(s)...'),
-        behavior: SnackBarBehavior.floating,
-      ),
-    );
-
-    var succeeded = 0;
-    for (final item in items) {
-      try {
-        final tempDir = await getTemporaryDirectory();
-        final tempPath = p.join(tempDir.path, item.name);
-        await provider.service!.downloadToFile(item.path, tempPath);
-        final ext = p.extension(item.name).replaceFirst('.', '');
-        final baseName = p.basenameWithoutExtension(item.name);
-        await FileSaver.instance.saveFile(
-          name: baseName,
-          filePath: tempPath,
-          ext: ext,
-        );
-        succeeded++;
-      } catch (_) {
-        // Reported in the summary snackbar below.
-      }
-    }
-
     _clearSelection();
+    final messenger = ScaffoldMessenger.of(context);
+    try {
+      await DownloadService.startDownload(provider, items);
       messenger.showSnackBar(
         SnackBar(
-        content: Text('Downloaded $succeeded of ${items.length} item(s)'),
+          content: Text(
+            items.length == 1
+                ? 'Downloading ${items.first.name} - see the notification for progress'
+                : 'Downloading ${items.length} files - see the notification for progress',
+          ),
           behavior: SnackBarBehavior.floating,
         ),
       );
+    } catch (e) {
+      messenger.showSnackBar(
+        SnackBar(
+          content: Text('Could not start download: $e'),
+          behavior: SnackBarBehavior.floating,
+        ),
+      );
+    }
   }
 
   Future<void> _confirmDeleteSelected(
@@ -602,4 +719,26 @@ class _PhotosViewState extends State<PhotosView> {
       ),
     );
   }
+
+  Future<void> _moveOrCopySelected(
+    ServerProvider provider,
+    List<NextcloudItem> items, {
+    required bool copy,
+  }) async {
+    final result = await MoveCopyDestinationPicker.show(
+      context,
+      items,
+      copy: copy,
+    );
+    if (!mounted || result == null) return;
+    _clearSelection();
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: Text(
+          '${copy ? 'Copied' : 'Moved'} ${result.succeeded} of ${items.length} item(s)',
+        ),
+        behavior: SnackBarBehavior.floating,
+      ),
+    );
+  }
 }

lib/views/share_upload_view.dart

@@ -1,17 +1,32 @@
 import 'package:flutter/material.dart';
-import 'package:path/path.dart' as p;
+import 'package:intl/intl.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import 'package:provider/provider.dart';
-import 'package:receive_sharing_intent/receive_sharing_intent.dart';
 import '../models/app_tab.dart';
+import '../models/nextcloud_item.dart';
 import '../providers/server_provider.dart';
+import '../services/share_intent_service.dart';
+import '../services/upload_service.dart';
 import '../widgets/breadcrumbs.dart';
+import '../widgets/item_icon.dart';
+import '../widgets/marquee_title.dart';
+import '../widgets/profile_avatar_button.dart';
+import '../widgets/segmented_icon_toggle.dart';
+import '../widgets/sort_menu_button.dart';
+import '../widgets/sticky_header_delegate.dart';
+import '../widgets/synced_header_scaffold.dart';
 
 /// Shown when another app shares one or more files to Noo (Android's
-/// "Share to..." sheet). Lets the user browse to a destination folder, then
+/// "Share to..." sheet). Lets the user browse to a destination folder,
-/// uploads every shared file into it via the same WebDAV upload path as the
+/// mirroring the Files tab's own controls/filters/listing so this feels
-/// Files tab's own "Upload File" action.
+/// like the same browser rather than a stripped-down picker, then hands the
+/// actual prepare+upload off to [UploadService] - a real Android foreground
+/// service (see `ShareUploadService.kt`'s doc comment), not something this
+/// screen or even the app needs to stay open for. [files] only ever carry
+/// cheap Uri metadata (see [ShareIntentService]'s doc comment); that
+/// service is the only thing that ever reads their actual bytes.
 class ShareUploadView extends StatefulWidget {
-  final List<SharedMediaFile> files;
+  final List<SharedFileRef> files;
 
   const ShareUploadView({super.key, required this.files});
 
@@ -20,9 +35,7 @@ class ShareUploadView extends StatefulWidget {
 }
 
 class _ShareUploadViewState extends State<ShareUploadView> {
-  bool _uploading = false;
+  final ScrollController _scrollController = ScrollController();
-  int _currentFileIndex = 0;
-  double? _currentFileProgress;
 
   @override
   void initState() {
@@ -34,47 +47,281 @@ class _ShareUploadViewState extends State<ShareUploadView> {
     });
   }
 
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
+
   Future<void> _uploadHere(ServerProvider provider) async {
-    setState(() => _uploading = true);
+    final messenger = ScaffoldMessenger.of(context);
-
+    final navigator = Navigator.of(context);
-    var anyFailed = false;
+    try {
-    for (var i = 0; i < widget.files.length; i++) {
+      await UploadService.startUpload(provider, widget.files);
-      final file = widget.files[i];
+    } catch (e) {
-      setState(() {
+      messenger.showSnackBar(
-        _currentFileIndex = i;
+        SnackBar(
-        _currentFileProgress = 0;
+          content: Text('Could not start upload: $e'),
-      });
+          behavior: SnackBarBehavior.floating,
-      final name = p.basename(file.path);
+        ),
-      final success = await provider.uploadFileFromPath(
-        name,
-        file.path,
-        onProgress: (sent, total) {
-          if (total > 0 && mounted) {
-            setState(() => _currentFileProgress = sent / total);
-          }
-        },
       );
-      if (!success) anyFailed = true;
+      return;
     }
 
-    if (!mounted) return;
-
     provider.requestTab(AppTab.files);
-    Navigator.of(context).popUntil((route) => route.isFirst);
+    navigator.popUntil((route) => route.isFirst);
-    ScaffoldMessenger.of(context).showSnackBar(
+    messenger.showSnackBar(
       SnackBar(
         content: Text(
-          anyFailed
+          widget.files.length == 1
-              ? 'Some files failed to upload'
+              ? 'Uploading ${widget.files.first.name} - see the notification for progress'
-              : widget.files.length == 1
+              : 'Uploading ${widget.files.length} files - see the notification for progress',
-              ? 'Uploaded ${p.basename(widget.files.first.path)}'
-              : 'Uploaded ${widget.files.length} files',
         ),
         behavior: SnackBarBehavior.floating,
       ),
     );
   }
 
+  Widget _buildControlsRow(ServerProvider provider) {
+    return SizedBox(
+      height: 44,
+      child: SingleChildScrollView(
+        scrollDirection: Axis.horizontal,
+        child: Row(
+          children: [
+            IconButton(
+              icon: Icon(
+                provider.filesSortAscending
+                    ? Icons.arrow_upward_rounded
+                    : Icons.arrow_downward_rounded,
+                size: 20,
+              ),
+              visualDensity: VisualDensity.compact,
+              tooltip: provider.filesSortAscending ? 'Ascending' : 'Descending',
+              onPressed: provider.toggleFilesSortOrder,
+            ),
+            SizedBox(
+              width: 130,
+              child: SortMenuButton(
+                field: provider.filesSortField,
+                onChanged: provider.setFilesSortField,
+              ),
+            ),
+            ToggleIconButton(
+              icon: provider.showHiddenFiles
+                  ? Icons.visibility_rounded
+                  : Icons.visibility_off_rounded,
+              isSelected: provider.showHiddenFiles,
+              onTap: () => provider.toggleShowHiddenFiles(),
+              tooltip: 'Show hidden files',
+            ),
+            const SizedBox(width: 4),
+            SegmentedIconGroup(
+              children: [
+                ToggleIconButton(
+                  icon: Symbols.circles_rounded,
+                  isSelected: provider.storageScope == StorageScope.cloud,
+                  onTap: () => provider.setStorageScope(StorageScope.cloud),
+                  tooltip: 'Cloud storage',
+                ),
+                ToggleIconButton(
+                  icon: Symbols.hard_drive_rounded,
+                  isSelected: provider.storageScope == StorageScope.external,
+                  onTap: () => provider.setStorageScope(StorageScope.external),
+                  tooltip: 'External storage',
+                ),
+              ],
+            ),
+            const SizedBox(width: 8),
+            SegmentedIconGroup(
+              children: [
+                ToggleIconButton(
+                  icon: Icons.select_all_rounded,
+                  isSelected: provider.filesTypeFilter == FilesTypeFilter.all,
+                  onTap: () => provider.setFilesTypeFilter(FilesTypeFilter.all),
+                  tooltip: 'Files & folders',
+                ),
+                ToggleIconButton(
+                  icon: Icons.insert_drive_file_outlined,
+                  isSelected:
+                      provider.filesTypeFilter == FilesTypeFilter.filesOnly,
+                  onTap: () =>
+                      provider.setFilesTypeFilter(FilesTypeFilter.filesOnly),
+                  tooltip: 'Files only',
+                ),
+                ToggleIconButton(
+                  icon: Icons.folder_outlined,
+                  isSelected:
+                      provider.filesTypeFilter == FilesTypeFilter.foldersOnly,
+                  onTap: () =>
+                      provider.setFilesTypeFilter(FilesTypeFilter.foldersOnly),
+                  tooltip: 'Folders only',
+                ),
+              ],
+            ),
+            const SizedBox(width: 8),
+            SegmentedIconGroup(
+              children: [
+                ToggleIconButton(
+                  icon: Icons.view_list_rounded,
+                  isSelected: !provider.isGridView,
+                  onTap: () => provider.setGridView(false),
+                  tooltip: 'List view',
+                ),
+                ToggleIconButton(
+                  icon: Icons.grid_view_rounded,
+                  isSelected: provider.isGridView,
+                  onTap: () => provider.setGridView(true),
+                  tooltip: 'Grid view',
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  // Only folders are valid upload destinations - files still show (so the
+  // listing matches what the Files tab itself would show for this folder)
+  // but are visually dimmed and inert rather than hidden outright.
+  Widget _buildListTile(
+    BuildContext context,
+    NextcloudItem item,
+    ServerProvider provider,
+  ) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    final isFolder = item.isFolder;
+
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 8),
+      child: ClipRRect(
+        borderRadius: BorderRadius.circular(16),
+        child: Opacity(
+          opacity: isFolder ? 1 : 0.5,
+          child: Material(
+            color: colorScheme.surfaceContainerLow,
+            child: InkWell(
+              onTap: isFolder
+                  ? () => provider.navigateToFolder(item.path)
+                  : null,
+              child: Padding(
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 16,
+                  vertical: 12,
+                ),
+                child: Row(
+                  children: [
+                    ItemThumbnail(
+                      item: item,
+                      provider: provider,
+                      size: 44,
+                      borderRadius: 12,
+                      iconSize: 22,
+                    ),
+                    const SizedBox(width: 14),
+                    Expanded(
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Text(
+                            item.name,
+                            style: theme.textTheme.titleMedium?.copyWith(
+                              fontWeight: FontWeight.w600,
+                              fontSize: 14,
+                            ),
+                          ),
+                          const SizedBox(height: 2),
+                          Text(
+                            isFolder
+                                ? 'Folder'
+                                : '${formatBytes(item.size)} • ${DateFormat.yMMMd().format(item.lastModified)}',
+                            style: theme.textTheme.bodySmall?.copyWith(
+                              color: colorScheme.onSurfaceVariant,
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                    if (isFolder) const Icon(Icons.chevron_right_rounded),
+                  ],
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildGridCard(
+    BuildContext context,
+    NextcloudItem item,
+    ServerProvider provider,
+  ) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    final isFolder = item.isFolder;
+    final iconColor = getIconColor(context, item.type);
+
+    return Opacity(
+      opacity: isFolder ? 1 : 0.5,
+      child: Material(
+        color: colorScheme.surfaceContainerLow,
+        borderRadius: BorderRadius.circular(20),
+        clipBehavior: Clip.antiAlias,
+        child: InkWell(
+          onTap: isFolder ? () => provider.navigateToFolder(item.path) : null,
+          child: Padding(
+            padding: const EdgeInsets.all(14),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Container(
+                  width: 40,
+                  height: 40,
+                  decoration: BoxDecoration(
+                    color: iconColor.withValues(alpha: 0.12),
+                    borderRadius: BorderRadius.circular(12),
+                  ),
+                  child: Icon(
+                    getItemIcon(item.type),
+                    color: iconColor,
+                    size: 24,
+                  ),
+                ),
+                Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      item.name,
+                      maxLines: 2,
+                      overflow: TextOverflow.ellipsis,
+                      style: theme.textTheme.titleMedium?.copyWith(
+                        fontWeight: FontWeight.w600,
+                        fontSize: 13,
+                      ),
+                    ),
+                    const SizedBox(height: 2),
+                    Text(
+                      isFolder ? 'Folder' : formatBytes(item.size),
+                      style: theme.textTheme.bodySmall?.copyWith(
+                        color: colorScheme.onSurfaceVariant,
+                        fontSize: 11,
+                      ),
+                    ),
+                  ],
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
@@ -85,93 +332,177 @@ class _ShareUploadViewState extends State<ShareUploadView> {
     final currentLabel = currentPath == '/'
         ? 'Home'
         : currentPath.split('/').where((s) => s.isNotEmpty).last;
-    final folders = provider.items.where((i) => i.isFolder).toList();
+    final items = provider.items;
 
-    return Scaffold(
+    // Mirrors FilesView's own controls-row + breadcrumbs sticky header
-      appBar: AppBar(
+    // exactly (padding, heights) so this reads as the same browser, just
-        title: Text(
+    // reached from a share intent instead of the Files tab.
-          widget.files.length == 1
+    final controlsColumn = Padding(
-              ? 'Upload ${p.basename(widget.files.first.path)}'
+      padding: const EdgeInsets.fromLTRB(16, 16, 16, 12),
-              : 'Upload ${widget.files.length} files',
-        ),
-      ),
-      body: _uploading
-          ? Center(
-              child: Padding(
-                padding: const EdgeInsets.all(32),
       child: Column(
-                  mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-                    CircularProgressIndicator(
+          _buildControlsRow(provider),
-                      value: _currentFileProgress,
+          if (hasBreadcrumbs) ...[
-                      color: colorScheme.primary,
+            const SizedBox(height: 10),
-                    ),
+            SizedBox(
-                    const SizedBox(height: 20),
+              height: 32,
-                    Text(
-                      widget.files.length == 1
-                          ? 'Uploading ${p.basename(widget.files[_currentFileIndex].path)}…'
-                          : 'Uploading ${_currentFileIndex + 1} of ${widget.files.length}…',
-                      textAlign: TextAlign.center,
-                      style: theme.textTheme.bodyMedium?.copyWith(
-                        color: colorScheme.onSurfaceVariant,
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            )
-          : Column(
-              children: [
-                if (hasBreadcrumbs)
-                  Padding(
-                    padding: const EdgeInsets.fromLTRB(16, 12, 16, 4),
               child: Breadcrumbs(
                 pathStack: provider.pathStack,
                 onTap: (index) => provider.navigateToPathIndex(index),
               ),
             ),
-                Expanded(
+          ],
-                  child: provider.isLoading
+        ],
-                      ? const Center(child: CircularProgressIndicator())
+      ),
-                      : folders.isEmpty
+    );
-                      ? Center(
+
+    final contentSlivers = <Widget>[
+      SliverPersistentHeader(
+        pinned: true,
+        delegate: StickyHeaderDelegate(
+          height: hasBreadcrumbs ? 114 : 72,
+          child: controlsColumn,
+        ),
+      ),
+      if (provider.isLoading)
+        const SliverFillRemaining(
+          hasScrollBody: false,
+          child: Center(child: CircularProgressIndicator()),
+        )
+      else if (items.isEmpty)
+        SliverFillRemaining(
+          hasScrollBody: false,
+          child: Center(
             child: Text(
-                            'No subfolders here',
+              'Folder is empty',
-                            style: TextStyle(
+              style: TextStyle(color: colorScheme.onSurfaceVariant),
-                              color: colorScheme.onSurfaceVariant,
             ),
           ),
         )
-                      : ListView.builder(
+      else if (provider.isGridView)
-                          itemCount: folders.length,
+        SliverPadding(
-                          itemBuilder: (context, index) {
+          padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 8),
-                            final folder = folders[index];
+          sliver: SliverGrid(
-                            return ListTile(
+            gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-                              leading: Icon(
+              crossAxisCount: 2,
-                                Icons.folder_rounded,
+              childAspectRatio: 1.1,
-                                color: colorScheme.primary,
+              crossAxisSpacing: 12,
+              mainAxisSpacing: 12,
+            ),
+            delegate: SliverChildBuilderDelegate((context, index) {
+              return _buildGridCard(context, items[index], provider);
+            }, childCount: items.length),
+          ),
+        )
+      else
+        SliverPadding(
+          padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 8),
+          sliver: SliverList(
+            delegate: SliverChildBuilderDelegate((context, index) {
+              return _buildListTile(context, items[index], provider);
+            }, childCount: items.length),
+          ),
+        ),
+      // So the last row isn't hidden behind the bottom "Upload to..." bar.
+      const SliverToBoxAdapter(child: SizedBox(height: 24)),
+    ];
+
+    return Scaffold(
+      body: SyncedHeaderScaffold(
+        scrollController: _scrollController,
+        provider: provider,
+        // Same trailing actions as every other tab except "More tabs" -
+        // there's nowhere useful for it to go while mid-upload (jumping to
+        // Trash/Shares/etc. would abandon this destination picker), so the
+        // top chrome is identical to every other tab minus that one entry.
+        // Backing out is still the system back gesture/button, same as any
+        // other pushed screen.
+        actions: const [ProfileAvatarButton()],
+        contentSlivers: contentSlivers,
+      ),
+      // A rounded-top, elevated bar "peeking" up from the bottom edge - the
+      // uploading-file summary (marqueed if it doesn't fit on one line)
+      // sits directly above the destination button, both inside the one
+      // sheet, rather than the summary living up in the scrolling content
+      // far away from the action it describes.
+      bottomNavigationBar: Material(
+        color: colorScheme.surfaceContainerHigh,
+        elevation: 8,
+        shape: const RoundedRectangleBorder(
+          borderRadius: BorderRadius.vertical(top: Radius.circular(24)),
+        ),
+        clipBehavior: Clip.antiAlias,
+        child: SafeArea(
+          top: false,
+          child: Padding(
+            padding: const EdgeInsets.fromLTRB(20, 16, 20, 16),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                // Same pill/chip look and exact same duller background
+                // color as the filter toggles' shared background
+                // (SegmentedIconGroup's `surfaceContainerHigh`), so it reads
+                // as part of the same visual language rather than a new
+                // accent color. Sized to the text itself (like a real chip)
+                // up to the row's available width - MarqueeTitle needs a
+                // concrete (not just loose) width to know whether/how far
+                // to scroll, so this measures the text once up front rather
+                // than leaving the chip unconstrained.
+                LayoutBuilder(
+                  builder: (context, constraints) {
+                    final uploadingText = widget.files.length == 1
+                        ? 'Uploading ${widget.files.first.name}'
+                        : 'Uploading ${widget.files.length} files';
+                    final chipTextStyle = theme.textTheme.titleSmall?.copyWith(
+                      color: colorScheme.onSurfaceVariant,
+                      fontWeight: FontWeight.w700,
+                    );
+                    const horizontalPadding = 28.0;
+                    final painter = TextPainter(
+                      text: TextSpan(text: uploadingText, style: chipTextStyle),
+                      maxLines: 1,
+                      textDirection: Directionality.of(context),
+                    )..layout(maxWidth: double.infinity);
+                    final chipWidth = (painter.width + horizontalPadding).clamp(
+                      0.0,
+                      constraints.maxWidth,
+                    );
+
+                    return Container(
+                      width: chipWidth,
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: 14,
+                        vertical: 8,
+                      ),
+                      decoration: BoxDecoration(
+                        color: colorScheme.surfaceContainerHigh,
+                        borderRadius: BorderRadius.circular(20),
+                      ),
+                      child: SizedBox(
+                        height: 20,
+                        child: MarqueeTitle(
+                          text: uploadingText,
+                          style: chipTextStyle,
+                        ),
                       ),
-                              title: Text(folder.name),
-                              trailing: const Icon(Icons.chevron_right_rounded),
-                              onTap: () =>
-                                  provider.navigateToFolder(folder.path),
                     );
                   },
                 ),
-                ),
+                const SizedBox(height: 12),
-              ],
+                SizedBox(
-            ),
+                  width: double.infinity,
-      bottomNavigationBar: _uploading
-          ? null
-          : SafeArea(
-              child: Padding(
-                padding: const EdgeInsets.all(16),
                   child: FilledButton.icon(
                     onPressed: () => _uploadHere(provider),
                     icon: const Icon(Icons.upload_rounded),
                     label: Text('Upload to $currentLabel'),
                   ),
                 ),
+              ],
+            ),
+          ),
+        ),
       ),
     );
   }

lib/widgets/app_tab_view_builder.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import '../models/app_tab.dart';
 import '../views/activity_view.dart';
+import '../views/favorites_view.dart';
 import '../views/files_view.dart';
 import '../views/photos_view.dart';
 import '../views/recent_view.dart';
@@ -16,6 +17,8 @@ Widget buildAppTabView(AppTab tab, ScrollController controller) {
       return FilesView(scrollController: controller);
     case AppTab.photos:
       return PhotosView(scrollController: controller);
+    case AppTab.favorites:
+      return FavoritesView(scrollController: controller);
     case AppTab.activity:
       return ActivityView(scrollController: controller);
     case AppTab.trash:

lib/widgets/details/details_sheet.dart

@@ -51,11 +51,24 @@ class DetailsSheet extends StatelessWidget {
       child: Column(
         children: [
           DetailsHeader(item: item),
+          // Icon size matches the bottom nav bar's own tab icons
+          // (FloatingBottomNavBar) rather than TabBar's oversized default,
+          // so a "tabs" affordance reads the same size everywhere in the
+          // app.
           const TabBar(
             tabs: [
-              Tab(icon: Icon(Icons.info_outline_rounded), text: 'Info'),
+              Tab(
-              Tab(icon: Icon(Icons.history_rounded), text: 'Versions'),
+                icon: Icon(Icons.info_outline_rounded, size: 22),
-              Tab(icon: Icon(Icons.electric_bolt_rounded), text: 'Activity'),
+                text: 'Info',
+              ),
+              Tab(
+                icon: Icon(Icons.history_rounded, size: 22),
+                text: 'Versions',
+              ),
+              Tab(
+                icon: Icon(Icons.electric_bolt_rounded, size: 22),
+                text: 'Activity',
+              ),
             ],
           ),
           Expanded(
@@ -73,13 +86,25 @@ class DetailsSheet extends StatelessWidget {
   }
 }
 
-/// Icon/name/size/date row shared by [DetailsSheet] and the media viewer's
+/// Icon/name/size/date row shared by [DetailsSheet], the media viewer's
 /// collapsed "peek" state (which shows just this, before the user drags the
-/// sheet open far enough to reveal the tabs).
+/// sheet open far enough to reveal the tabs), and [ShareSheet]'s own title
+/// (so every per-item bottom sheet opens on the same header instead of
+/// [ShareSheet] alone using a bare title `Text`).
 class DetailsHeader extends StatelessWidget {
   final NextcloudItem item;
 
-  const DetailsHeader({super.key, required this.item});
+  /// Defaults to this widget's own standalone inset ([DetailsSheet]); a
+  /// caller whose surrounding scroll view already applies horizontal
+  /// padding (e.g. [ShareSheet]'s `ListView`) should pass a padding with
+  /// zero left/right to avoid doubling it up.
+  final EdgeInsetsGeometry padding;
+
+  const DetailsHeader({
+    super.key,
+    required this.item,
+    this.padding = const EdgeInsets.fromLTRB(20, 12, 20, 8),
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -87,7 +112,7 @@ class DetailsHeader extends StatelessWidget {
     final colorScheme = theme.colorScheme;
 
     return Padding(
-      padding: const EdgeInsets.fromLTRB(20, 12, 20, 8),
+      padding: padding,
       child: Row(
         children: [
           Container(

lib/widgets/floating_bottom_bar.dart

@@ -61,6 +61,14 @@ class FloatingBottomNavBar extends StatelessWidget {
       blurSigma: blurSigma,
       child: Padding(
         padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 6),
+        // The selected item's label expands the pill, and with enough
+        // tabs visible that can outgrow the available width (the
+        // ConstrainedBox above caps it at 480, but the screen itself may
+        // be narrower) - wrapped in a scroll view rather than a plain Row
+        // so it degrades to a swipe instead of overflowing/clipping.
+        child: SingleChildScrollView(
+          scrollDirection: Axis.horizontal,
+          physics: const BouncingScrollPhysics(),
           child: Row(
             mainAxisSize: MainAxisSize.min,
             children: List.generate(items.length, (index) {
@@ -80,7 +88,9 @@ class FloatingBottomNavBar extends StatelessWidget {
                     vertical: 12,
                   ),
                   decoration: BoxDecoration(
-                  color: isSelected ? colorScheme.primary : Colors.transparent,
+                    color: isSelected
+                        ? colorScheme.primary
+                        : Colors.transparent,
                     borderRadius: BorderRadius.circular(26),
                   ),
                   child: Row(
@@ -114,6 +124,7 @@ class FloatingBottomNavBar extends StatelessWidget {
             }),
           ),
         ),
+      ),
     );
   }
 

lib/widgets/item_icon.dart

@@ -0,0 +1,138 @@
+import 'package:flutter/material.dart';
+import '../models/nextcloud_item.dart';
+import '../providers/server_provider.dart';
+
+/// The icon/color/thumbnail treatment for a file or folder, shared by any
+/// screen that lists [NextcloudItem]s the same way the Files tab does (see
+/// `files_view.dart`, and `share_upload_view.dart`'s destination picker).
+
+IconData getItemIcon(NextcloudItemType type) {
+  switch (type) {
+    case NextcloudItemType.folder:
+      return Icons.folder_rounded;
+    case NextcloudItemType.image:
+      return Icons.image_rounded;
+    case NextcloudItemType.video:
+      return Icons.movie_rounded;
+    case NextcloudItemType.audio:
+      return Icons.audiotrack_rounded;
+    case NextcloudItemType.document:
+      return Icons.description_rounded;
+    case NextcloudItemType.archive:
+      return Icons.folder_zip_rounded;
+    case NextcloudItemType.file:
+      return Icons.insert_drive_file_rounded;
+  }
+}
+
+Color getIconColor(BuildContext context, NextcloudItemType type) {
+  final colorScheme = Theme.of(context).colorScheme;
+  switch (type) {
+    case NextcloudItemType.folder:
+      return colorScheme.primary;
+    case NextcloudItemType.image:
+      return Colors.amber.shade700;
+    case NextcloudItemType.video:
+      return Colors.deepOrange.shade600;
+    case NextcloudItemType.audio:
+      return Colors.purple.shade600;
+    case NextcloudItemType.document:
+      return Colors.blue.shade700;
+    case NextcloudItemType.archive:
+      return Colors.teal.shade700;
+    case NextcloudItemType.file:
+      return colorScheme.outline;
+  }
+}
+
+/// A file/folder's icon badge — for images and videos this shows an actual
+/// thumbnail (falling back to the plain icon on error or if there's no
+/// preview URL yet), matching the real-content treatment already used in
+/// the Photos tab.
+class ItemThumbnail extends StatelessWidget {
+  final NextcloudItem item;
+  final ServerProvider provider;
+  final double size;
+  final double borderRadius;
+  final double iconSize;
+
+  const ItemThumbnail({
+    super.key,
+    required this.item,
+    required this.provider,
+    required this.size,
+    required this.borderRadius,
+    required this.iconSize,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final iconColor = getIconColor(context, item.type);
+    final isMedia =
+        item.type == NextcloudItemType.image ||
+        item.type == NextcloudItemType.video;
+    // Decode straight to the size this thumbnail is actually painted at —
+    // the server hands back a 500x500 preview regardless, and decoding that
+    // in full for a ~40dp tile (times however many are on screen while
+    // scrolling) is a real source of jank.
+    final cachePixels = (size * MediaQuery.of(context).devicePixelRatio)
+        .round();
+
+    return Container(
+      width: size,
+      height: size,
+      clipBehavior: Clip.antiAlias,
+      decoration: BoxDecoration(
+        color: iconColor.withValues(alpha: 0.12),
+        borderRadius: BorderRadius.circular(borderRadius),
+      ),
+      child: isMedia && item.previewUrl != null
+          ? Stack(
+              fit: StackFit.expand,
+              children: [
+                Image.network(
+                  item.previewUrl!,
+                  headers: provider.service?.authHeaders,
+                  fit: BoxFit.cover,
+                  cacheWidth: cachePixels,
+                  cacheHeight: cachePixels,
+                  filterQuality: FilterQuality.low,
+                  gaplessPlayback: true,
+                  loadingBuilder: (context, child, progress) {
+                    if (progress == null) return child;
+                    return Center(
+                      child: Icon(
+                        getItemIcon(item.type),
+                        color: iconColor,
+                        size: iconSize,
+                      ),
+                    );
+                  },
+                  errorBuilder: (context, error, stack) => Center(
+                    child: Icon(
+                      getItemIcon(item.type),
+                      color: iconColor,
+                      size: iconSize,
+                    ),
+                  ),
+                ),
+                if (item.type == NextcloudItemType.video)
+                  const Center(
+                    child: Icon(
+                      Icons.play_circle_fill_rounded,
+                      color: Colors.white,
+                      size: 18,
+                    ),
+                  ),
+              ],
+            )
+          : Center(
+              child: Icon(
+                getItemIcon(item.type),
+                color: iconColor,
+                size: iconSize,
+              ),
+            ),
+    );
+  }
+}

lib/widgets/marquee_title.dart

@@ -0,0 +1,49 @@
+import 'package:flutter/material.dart';
+import 'package:marquee/marquee.dart';
+
+/// A plain, single-line ellipsized [Text] for content that fits, or an
+/// auto-scrolling [Marquee] for text too long for the available width -
+/// measured once via [TextPainter] rather than always marqueeing, so short
+/// text just sits still like normal.
+class MarqueeTitle extends StatelessWidget {
+  final String text;
+  final TextStyle? style;
+
+  const MarqueeTitle({super.key, required this.text, required this.style});
+
+  @override
+  Widget build(BuildContext context) {
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        final painter = TextPainter(
+          text: TextSpan(text: text, style: style),
+          maxLines: 1,
+          textDirection: Directionality.of(context),
+        )..layout(maxWidth: double.infinity);
+
+        if (painter.width <= constraints.maxWidth) {
+          return Text(
+            text,
+            maxLines: 1,
+            overflow: TextOverflow.ellipsis,
+            style: style,
+          );
+        }
+
+        return SizedBox(
+          height: painter.height,
+          child: Marquee(
+            text: text,
+            style: style,
+            blankSpace: 48,
+            velocity: 30,
+            startPadding: 0,
+            pauseAfterRound: const Duration(seconds: 1),
+            fadingEdgeStartFraction: 0.1,
+            fadingEdgeEndFraction: 0.15,
+          ),
+        );
+      },
+    );
+  }
+}

lib/widgets/more_tabs_button.dart

@@ -15,6 +15,13 @@ class MoreTabsButton extends StatelessWidget {
   Widget build(BuildContext context) {
     final provider = context.watch<ServerProvider>();
 
+    // While picking (another app's GET_CONTENT request), MainShellView
+    // already restricts the bottom nav to Files/Photos - this button would
+    // otherwise be the one remaining way to reach a tab that isn't a valid
+    // pick source (Trash, Shares, ...), so it hides entirely rather than
+    // just disabling.
+    if (provider.isPicking) return const SizedBox.shrink();
+
     return PopupMenuButton<AppTab>(
       icon: const Icon(Icons.apps_rounded),
       tooltip: 'More tabs',

lib/widgets/move_copy_conflict_sheet.dart

@@ -0,0 +1,172 @@
+import 'package:flutter/material.dart';
+import '../models/move_copy_result.dart';
+import 'gradual_bottom_sheet.dart';
+
+/// Shown after a Move/Copy batch comes back with `MoveCopyResult.conflicts`
+/// non-empty (an item with the same name already exists at the
+/// destination) - summarizes every conflict at once rather than prompting
+/// per item as they're hit, and lets the user resolve them all the same
+/// way (overwrite/keep both) or open a per-item breakdown. Returns the
+/// `ConflictChoice` map `ServerProvider.resolveConflicts` expects, or null
+/// if dismissed without choosing.
+class MoveCopyConflictSheet extends StatefulWidget {
+  final List<MoveCopyConflict> conflicts;
+  final ScrollController? scrollController;
+
+  const MoveCopyConflictSheet({
+    super.key,
+    required this.conflicts,
+    this.scrollController,
+  });
+
+  static Future<Map<String, ConflictChoice>?> show(
+    BuildContext context,
+    List<MoveCopyConflict> conflicts,
+  ) {
+    return showGradualBottomSheet<Map<String, ConflictChoice>>(
+      context,
+      builder: (context, scrollController) => MoveCopyConflictSheet(
+        conflicts: conflicts,
+        scrollController: scrollController,
+      ),
+    );
+  }
+
+  @override
+  State<MoveCopyConflictSheet> createState() => _MoveCopyConflictSheetState();
+}
+
+class _MoveCopyConflictSheetState extends State<MoveCopyConflictSheet> {
+  bool _decidingPerItem = false;
+  late final Map<String, ConflictChoice> _perItemChoices = {
+    for (final conflict in widget.conflicts)
+      conflict.item.id: ConflictChoice.keepBoth,
+  };
+
+  void _resolveAll(ConflictChoice choice) {
+    Navigator.pop(context, {
+      for (final conflict in widget.conflicts) conflict.item.id: choice,
+    });
+  }
+
+  void _confirmPerItem() {
+    Navigator.pop(context, _perItemChoices);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+    final count = widget.conflicts.length;
+
+    return ListView(
+      controller: widget.scrollController,
+      padding: const EdgeInsets.fromLTRB(20, 12, 20, 24),
+      children: [
+        Text(
+          count == 1
+              ? '1 item already exists at the destination'
+              : '$count items already exist at the destination',
+          style: theme.textTheme.titleMedium?.copyWith(
+            fontWeight: FontWeight.w700,
+          ),
+        ),
+        const SizedBox(height: 4),
+        Text(
+          'Choose how to handle the conflicts.',
+          style: theme.textTheme.bodySmall?.copyWith(
+            color: colorScheme.onSurfaceVariant,
+          ),
+        ),
+        const SizedBox(height: 16),
+        if (!_decidingPerItem) ...[
+          FilledButton(
+            onPressed: () => _resolveAll(ConflictChoice.overwrite),
+            child: const Text('Overwrite all'),
+          ),
+          const SizedBox(height: 8),
+          FilledButton.tonal(
+            onPressed: () => _resolveAll(ConflictChoice.keepBoth),
+            child: const Text('Keep both (rename)'),
+          ),
+          const SizedBox(height: 8),
+          OutlinedButton(
+            onPressed: () => setState(() => _decidingPerItem = true),
+            child: const Text('Decide per item'),
+          ),
+          const SizedBox(height: 16),
+          const Divider(),
+          const SizedBox(height: 8),
+        ],
+        for (final conflict in widget.conflicts)
+          Padding(
+            padding: const EdgeInsets.symmetric(vertical: 8),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Row(
+                  children: [
+                    Icon(
+                      conflict.item.isFolder
+                          ? Icons.folder_rounded
+                          : Icons.insert_drive_file_rounded,
+                      color: colorScheme.onSurfaceVariant,
+                      size: 20,
+                    ),
+                    const SizedBox(width: 10),
+                    Expanded(
+                      child: Text(
+                        conflict.item.name,
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                        style: theme.textTheme.bodyMedium?.copyWith(
+                          fontWeight: FontWeight.w600,
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+                if (_decidingPerItem) ...[
+                  const SizedBox(height: 6),
+                  SizedBox(
+                    width: double.infinity,
+                    child: SegmentedButton<ConflictChoice>(
+                      segments: const [
+                        ButtonSegment(
+                          value: ConflictChoice.overwrite,
+                          label: Text('Overwrite'),
+                        ),
+                        ButtonSegment(
+                          value: ConflictChoice.keepBoth,
+                          label: Text('Keep both'),
+                        ),
+                        ButtonSegment(
+                          value: ConflictChoice.skip,
+                          label: Text('Skip'),
+                        ),
+                      ],
+                      selected: {_perItemChoices[conflict.item.id]!},
+                      showSelectedIcon: false,
+                      onSelectionChanged: (selection) => setState(() {
+                        _perItemChoices[conflict.item.id] = selection.first;
+                      }),
+                    ),
+                  ),
+                ],
+              ],
+            ),
+          ),
+        if (_decidingPerItem) ...[
+          const SizedBox(height: 8),
+          SizedBox(
+            width: double.infinity,
+            child: FilledButton(
+              onPressed: _confirmPerItem,
+              child: const Text('Confirm'),
+            ),
+          ),
+        ],
+      ],
+    );
+  }
+}

lib/widgets/share_sheet.dart

@@ -1,10 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:path/path.dart' as p;
+import 'package:path_provider/path_provider.dart';
 import 'package:provider/provider.dart';
+import 'package:share_plus/share_plus.dart';
 import '../models/nextcloud_item.dart';
 import '../models/nextcloud_share.dart';
 import '../models/nextcloud_sharee.dart';
 import '../providers/server_provider.dart';
+import 'details/details_sheet.dart' show DetailsHeader;
 import 'gradual_bottom_sheet.dart';
 
 IconData _shareTypeIcon(ShareType type) {
@@ -66,6 +70,8 @@ class _ShareSheetState extends State<ShareSheet> {
   List<NextcloudShare> _inherited = [];
   List<NextcloudSharee> _searchResults = [];
   bool _isSearching = false;
+  bool _isAddingEmail = false;
+  bool _isSharingFile = false;
   final _searchController = TextEditingController();
   final _emailController = TextEditingController();
 
@@ -140,6 +146,7 @@ class _ShareSheetState extends State<ShareSheet> {
   Future<void> _addEmailShare() async {
     final email = _emailController.text.trim();
     if (email.isEmpty) return;
+    setState(() => _isAddingEmail = true);
     final provider = context.read<ServerProvider>();
     final messenger = ScaffoldMessenger.of(context);
     final share = await provider.createShare(
@@ -149,6 +156,7 @@ class _ShareSheetState extends State<ShareSheet> {
     );
     if (!mounted) return;
     if (share == null) {
+      setState(() => _isAddingEmail = false);
       messenger.showSnackBar(
         const SnackBar(
           content: Text('Could not create email share'),
@@ -160,6 +168,7 @@ class _ShareSheetState extends State<ShareSheet> {
     setState(() {
       _shares = [..._shares, share];
       _emailController.clear();
+      _isAddingEmail = false;
     });
     messenger.showSnackBar(
       SnackBar(
@@ -216,13 +225,51 @@ class _ShareSheetState extends State<ShareSheet> {
     );
   }
 
+  /// Downloads the item to a scratch file and hands it to Android's native
+  /// "Share to..." sheet (`share_plus`) - a completely different action
+  /// from the rest of this sheet (which shares *within* Nextcloud, via
+  /// users/links) and the only one here that reads the file's actual
+  /// bytes.
+  Future<void> _shareFileDirectly() async {
+    final provider = context.read<ServerProvider>();
+    if (provider.service == null) return;
+    setState(() => _isSharingFile = true);
+    final messenger = ScaffoldMessenger.of(context);
+    try {
+      final tempDir = await getTemporaryDirectory();
+      final tempPath = p.join(tempDir.path, widget.item.name);
+      await provider.service!.downloadToFile(widget.item.path, tempPath);
+      if (!mounted) return;
+      await SharePlus.instance.share(
+        ShareParams(
+          files: [XFile(tempPath)],
+          fileNameOverrides: [widget.item.name],
+        ),
+      );
+    } catch (_) {
+      if (mounted) {
+        messenger.showSnackBar(
+          const SnackBar(
+            content: Text('Could not share the file'),
+            behavior: SnackBarBehavior.floating,
+          ),
+        );
+      }
+    } finally {
+      if (mounted) setState(() => _isSharingFile = false);
+    }
+  }
+
   Widget _sectionHeader(String label) {
-    final colorScheme = Theme.of(context).colorScheme;
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
     return Row(
       children: [
         Text(
           label,
-          style: const TextStyle(fontWeight: FontWeight.w700, fontSize: 15),
+          style: theme.textTheme.titleSmall?.copyWith(
+            fontWeight: FontWeight.w700,
+          ),
         ),
         const SizedBox(width: 6),
         Icon(
@@ -301,27 +348,52 @@ class _ShareSheetState extends State<ShareSheet> {
 
     return ListView(
       controller: widget.scrollController,
-      padding: const EdgeInsets.fromLTRB(20, 12, 20, 24),
+      padding: const EdgeInsets.fromLTRB(20, 0, 20, 24),
       children: [
-        Text(
+        // Same icon/name/meta header as DetailsSheet, so this and its
-          widget.item.name,
+        // sibling per-item bottom sheet open on identical chrome - just a
-          maxLines: 1,
+        // bare title `Text` here read as under-designed by comparison.
-          overflow: TextOverflow.ellipsis,
+        DetailsHeader(
-          style: theme.textTheme.titleMedium?.copyWith(
+          item: widget.item,
-            fontWeight: FontWeight.w700,
+          padding: const EdgeInsets.only(top: 12, bottom: 8),
         ),
+        if (!widget.item.isFolder) ...[
+          const SizedBox(height: 4),
+          ListTile(
+            contentPadding: EdgeInsets.zero,
+            leading: _isSharingFile
+                ? const Padding(
+                    padding: EdgeInsets.all(12),
+                    child: SizedBox(
+                      width: 20,
+                      height: 20,
+                      child: CircularProgressIndicator(strokeWidth: 2),
                     ),
-        const SizedBox(height: 16),
+                  )
+                : const Icon(Icons.ios_share_rounded),
+            title: const Text('Share file directly'),
+            subtitle: const Text('Send the file itself via another app'),
+            onTap: _isSharingFile ? null : _shareFileDirectly,
+          ),
+          const SizedBox(height: 12),
+          const Divider(),
+        ],
+        const SizedBox(height: 12),
         _sectionHeader('Internal shares'),
         const SizedBox(height: 8),
         TextField(
           controller: _searchController,
           decoration: InputDecoration(
+            isDense: true,
+            contentPadding: const EdgeInsets.symmetric(
+              horizontal: 16,
+              vertical: 12,
+            ),
             hintText: 'Type names or teams',
             prefixIcon: const Icon(Icons.search_rounded),
             suffixIcon: _isSearching
                 ? const Padding(
-                    padding: EdgeInsets.all(14),
+                    padding: EdgeInsets.all(12),
                     child: SizedBox(
                       width: 16,
                       height: 16,
@@ -378,9 +450,25 @@ class _ShareSheetState extends State<ShareSheet> {
         TextField(
           controller: _emailController,
           keyboardType: TextInputType.emailAddress,
+          enabled: !_isAddingEmail,
           decoration: InputDecoration(
+            isDense: true,
+            contentPadding: const EdgeInsets.symmetric(
+              horizontal: 16,
+              vertical: 12,
+            ),
             hintText: 'Type an email',
-            prefixIcon: const Icon(Icons.email_outlined),
+            prefixIcon: const Icon(Icons.email_rounded),
+            suffixIcon: _isAddingEmail
+                ? const Padding(
+                    padding: EdgeInsets.all(12),
+                    child: SizedBox(
+                      width: 16,
+                      height: 16,
+                      child: CircularProgressIndicator(strokeWidth: 2),
+                    ),
+                  )
+                : null,
             border: OutlineInputBorder(borderRadius: BorderRadius.circular(16)),
             filled: true,
             fillColor: colorScheme.surfaceContainerLow,

lib/widgets/synced_header_scaffold.dart

@@ -41,6 +41,15 @@ class SyncedHeaderScaffold extends StatefulWidget {
   /// `provider.fetchTrash` for a tab backed by different data.
   final Future<void> Function()? onRefresh;
 
+  /// When non-null (a tab is mid-selection), this takes over the pinned top
+  /// bar entirely - replacing the sync-status chip, [actions], and the
+  /// pull-to-reveal quota panel - instead of appearing as a second app bar
+  /// further down in [contentSlivers]. Selection is a modal-ish state (you
+  /// came here to act on specific items), so it reads better as the one
+  /// thing at the very top than as a strip sandwiched under the normal
+  /// chrome.
+  final Widget? selectionBar;
+
   const SyncedHeaderScaffold({
     super.key,
     required this.scrollController,
@@ -48,6 +57,7 @@ class SyncedHeaderScaffold extends StatefulWidget {
     required this.actions,
     required this.contentSlivers,
     this.onRefresh,
+    this.selectionBar,
   });
 
   @override
@@ -175,17 +185,27 @@ class _SyncedHeaderScaffoldState extends State<SyncedHeaderScaffold> {
               slivers: [
                 SliverAppBar(
                   pinned: true,
-                  stretch: true,
+                  stretch: widget.selectionBar == null,
-                  expandedHeight: _headerLocked ? 190 : kToolbarHeight,
+                  expandedHeight: widget.selectionBar != null
+                      ? kToolbarHeight
+                      : (_headerLocked ? 190 : kToolbarHeight),
                   collapsedHeight: kToolbarHeight,
                   backgroundColor: colorScheme.surfaceContainer,
                   surfaceTintColor: colorScheme.surfaceContainer,
                   scrolledUnderElevation: 0,
                   automaticallyImplyLeading: false,
-                  leadingWidth: _headerLocked ? 56 : 160,
+                  leadingWidth: widget.selectionBar != null
-                  leading: leadingWidget,
+                      ? 0
-                  actions: widget.actions,
+                      : (_headerLocked ? 56 : 160),
-                  flexibleSpace: FlexibleSpaceBar(
+                  leading: widget.selectionBar != null ? null : leadingWidget,
+                  titleSpacing: widget.selectionBar != null ? 0 : null,
+                  title: widget.selectionBar,
+                  actions: widget.selectionBar != null
+                      ? const []
+                      : widget.actions,
+                  flexibleSpace: widget.selectionBar != null
+                      ? null
+                      : FlexibleSpaceBar(
                           background: _SyncedStretchPanel(
                             provider: provider,
                             forceVisible: _headerLocked,

pubspec.lock

@@ -712,6 +712,54 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.11.0"
+  permission_handler:
+    dependency: "direct main"
+    description:
+      name: permission_handler
+      sha256: "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849"
+      url: "https://pub.dev"
+    source: hosted
+    version: "11.4.0"
+  permission_handler_android:
+    dependency: transitive
+    description:
+      name: permission_handler_android
+      sha256: d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc
+      url: "https://pub.dev"
+    source: hosted
+    version: "12.1.0"
+  permission_handler_apple:
+    dependency: transitive
+    description:
+      name: permission_handler_apple
+      sha256: f49cb15a064ea9d974fc7fbb302099353b7b170d07284e86e264561579e5bcf8
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.6.1"
+  permission_handler_html:
+    dependency: transitive
+    description:
+      name: permission_handler_html
+      sha256: "6ea98b3f17f60d3b527f2647ed2ab4dc0f6bfe25b22cb1c363f5d8f62252f6ac"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.4+1"
+  permission_handler_platform_interface:
+    dependency: transitive
+    description:
+      name: permission_handler_platform_interface
+      sha256: ed86a61c190258fdd65de395ea0632822e3415c1faec38eae0c31b479c28a531
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.4.1"
+  permission_handler_windows:
+    dependency: transitive
+    description:
+      name: permission_handler_windows
+      sha256: caeae01858a0a7d2df67a445ac98e1ad95e55a0e77c73044f4e9b1c8c2289cbd
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.2"
   petitparser:
     dependency: transitive
     description:
@@ -768,14 +816,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.2.1"
-  receive_sharing_intent:
-    dependency: "direct main"
-    description:
-      name: receive_sharing_intent
-      sha256: ec76056e4d258ad708e76d85591d933678625318e411564dcb9059048ca3a593
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.8.1"
   record_use:
     dependency: transitive
     description:
@@ -933,30 +973,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
-  url_launcher:
-    dependency: "direct main"
-    description:
-      name: url_launcher
-      sha256: f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.3.2"
-  url_launcher_android:
-    dependency: transitive
-    description:
-      name: url_launcher_android
-      sha256: "611e87fb320b70d1dd721dc46af89c98aceccea9b31fde49e084591414e0c610"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.3.33"
-  url_launcher_ios:
-    dependency: transitive
-    description:
-      name: url_launcher_ios
-      sha256: "8faa1aab294f1ab4040b43660c887b0418d5fa4f0cffef76a484e6aa1092eb4a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.4.2"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -965,14 +981,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.2.3"
-  url_launcher_macos:
-    dependency: transitive
-    description:
-      name: url_launcher_macos
-      sha256: "5e835a3b869c2d70325349c81c5a45c28e20791265b67b2669da6b08c5cd5201"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.2.6"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -1069,6 +1077,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
+  webview_flutter:
+    dependency: "direct main"
+    description:
+      name: webview_flutter
+      sha256: d53e1ccf5516f25017e3c9d44c39034db352d20fa34fe200674270242c2c5111
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.14.1"
+  webview_flutter_android:
+    dependency: transitive
+    description:
+      name: webview_flutter_android
+      sha256: "4de8b3d1ff4ebe1bdb42e68a5e4f809194a3cb0117a8f495f590004f00da3964"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.14.1"
+  webview_flutter_platform_interface:
+    dependency: transitive
+    description:
+      name: webview_flutter_platform_interface
+      sha256: "1221c1b12f5278791042f2ec2841743784cf25c5a644e23d6680e5d718824f04"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.15.1"
+  webview_flutter_wkwebview:
+    dependency: transitive
+    description:
+      name: webview_flutter_wkwebview
+      sha256: fe359c7fac1002124b5b9e2ba3a41906bbb9b2d029ccb4a0067404d8f3704730
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.26.1"
   win32:
     dependency: transitive
     description:

pubspec.yaml

@@ -42,7 +42,6 @@ dependencies:
   intl: ^0.19.0
   path: ^1.9.0
   flutter_secure_storage: ^11.1.1
-  url_launcher: ^6.3.1
   dio: ^5.11.1
   path_provider: ^2.1.5
   open_file: ^3.5.10
@@ -53,9 +52,10 @@ dependencies:
   share_plus: ^13.3.0
   material_symbols_icons: ^4.2960.0
   shared_preferences: ^2.5.5
-  receive_sharing_intent: ^1.8.1
   marquee: ^2.3.0
   local_auth: ^2.3.0
+  webview_flutter: ^4.14.1
+  permission_handler: ^11.3.1
 
 dev_dependencies:
   flutter_test:

windows/flutter/generated_plugin_registrant.cc

@@ -11,6 +11,7 @@
 #include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
 #include <local_auth_windows/local_auth_plugin.h>
 #include <pdfx/pdfx_plugin.h>
+#include <permission_handler_windows/permission_handler_windows_plugin.h>
 #include <share_plus/share_plus_windows_plugin_c_api.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 
@@ -25,6 +26,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("LocalAuthPlugin"));
   PdfxPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("PdfxPlugin"));
+  PermissionHandlerWindowsPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
   SharePlusWindowsPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi"));
   UrlLauncherWindowsRegisterWithRegistrar(

windows/flutter/generated_plugins.cmake

@@ -8,6 +8,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
   flutter_secure_storage_windows
   local_auth_windows
   pdfx
+  permission_handler_windows
   share_plus
   url_launcher_windows
 )