Media viewer details panel, Upload FAB size setting, PDF zoom/viewport fixes, avatar menu account switcher; bump to 1.0.2+5

Co-Authored-By: Claude Code <noreply@anthropic.com>
Tablet layout polish: tablet-only sidebar layout, floating toolbar, Settings submenus, info notes, adaptive grids; bump to 1.0.1+4
2026-10-01 18:41:51 -04:00 · 2026-10-01 17:08:22 -04:00 · 2026-10-01 16:18:45 -04:00 · 2026-10-01 14:50:07 -04:00 · 2026-10-01 10:18:21 -04:00 · 2026-10-01 10:13:33 -04:00
82 changed files with 3944 additions and 1767 deletions
@@ -275,7 +275,9 @@ bare system prompt gives no context on its own.

 `MainShellView` builds its chrome from the Noo nav kit
 (`widgets/noo/nav/`) and switches between two layouts on
-`NooLayout.isDesktop`:
+`NooLayout.isDesktop` (width >= 900dp *and* shortest side >= 600dp, so a
+phone in landscape keeps the mobile layout and only tablet-class windows get
+the sidebar):

 - **Mobile:** `AppTopBar` (`widgets/app_top_bar.dart`) wraps `NooTopBar`
  for *every* tab (previously only Files had shell-level top chrome, with
@@ -284,12 +286,34 @@ bare system prompt gives no context on its own.
  other tab has a create/upload flow), and the account avatar; Android
  gets a compact title row with `search`/avatar actions, relying on an
  extended `NooFab` ("Upload", Files/Photos only) instead of a top-bar
-  icon for upload. `BottomNavBar` (`widgets/bottom_nav_bar.dart`) adapts
-  the pinned `AppTab`s onto `NooBottomBar`. `AppDrawer`
+  icon for upload. Rather than one shared instance in `Scaffold.appBar`,
+  `MainShellView` builds a separate `AppTopBar` per tab (labelled for that
+  tab) and each tab plants its own as the first sliver in its own
+  `CustomScrollView` (`topBarSliver` in `widgets/tabs/tab_state_slivers.dart`,
+  wrapping it in the framework's `SliverFloatingHeader`) instead of passing
+  it to `Scaffold.appBar` - see that file's doc comment for why (Material's
+  native "floating" app bar behavior, tied to that tab's own
+  `ScrollController`: scrolls away as the list scrolls down and reappears
+  the moment the drag reverses, not only once scrolled back to the top).
+  `topBar` is null (no top bar rendered) on desktop and while picking,
+  matching `Scaffold.appBar`'s old `pickRequest == null` guard - see
+  `buildAppTabView`'s doc comment. It sits above each tab's own pinned
+  in-content header (the sort/filter controls row, or Files/Photos'
+  selection bar - see below); the two float/scroll independently - each
+  tab also wraps its whole `CustomScrollView` in `SafeArea(top: true,
+  bottom: false, ...)` so that pinned header stays clear of the status bar
+  once the floating top bar above it fully collapses (see
+  `topBarSliver`'s own doc comment for why that reservation can't live
+  inside the top bar itself). `BottomNavBar` (`widgets/bottom_nav_bar.dart`)
+  adapts the pinned `AppTab`s onto `NooBottomBar`. `AppDrawer`
  (`widgets/app_drawer.dart`) builds a `NooDrawer`: account block, storage
  meter, a "More" list of the hidden tabs, Settings, and an "Edit tabs"
  link (opens Settings - there's no in-page anchor to scroll to its Tabs
-  section yet).
+  section yet). `SettingsController.navMenuStyle` (Settings → Appearance →
+  "Navigation menu") offers an alternative to the hamburger/drawer pair:
+  the avatar button opens `showAvatarMenu` (`widgets/avatar_menu.dart`)
+  instead, a dropdown holding the same hidden-tabs + Settings content -
+  see `styling.md`'s Gotchas for the wiring.
 - **Desktop:** a `NooSidebar` (account card, pinned tabs, divider,
  remaining tabs, storage meter, Settings) sits beside a `NooToolbar`
  (tab title, search, an "Upload" action on Files/Photos) over the same
@@ -109,10 +109,18 @@ Use **Lucide** (pinned to `lucide-static@0.460.0`) at a 1.8 stroke. Sizes are 14
 - An extended pill: 56px tall, accent fill, labelled "Upload".
 - Sits 16px from the right and bottom edges of the content area.
 - Stays mounted on every tab; it's only the extended label that's tied to
-  Files/Photos. Elsewhere it collapses to an icon-only 56px circle (still
-  tappable - it always targets the Files tab's current folder), animating
-  the width/label change rather than the button popping fully in/out as
-  the Scaffold's default FAB transition would on every tab switch.
+  Files/Photos. Elsewhere it collapses to an icon-only 56px circle or
+  rounded square (see below) - still tappable, it always targets the Files
+  tab's current folder - animating the width/label change rather than the
+  button popping fully in/out as the Scaffold's default FAB transition
+  would on every tab switch.
+- Corner radius follows the bottom bar style (Settings → Appearance):
+  fully round (`pill`, 999) when the bar is floating, matching that mode's
+  other already-rounder elements (the bar itself at 28px, its search
+  satellite a full circle); a rounded square (`card`, 20) when the bar is
+  attached, to suit that mode's flatter, edge-to-edge corners. Same radius
+  whether the FAB is collapsed to a circle/square or expanded to the full
+  pill shape.

 **Chip**
 - A pill, 32–34px tall, 12px horizontal padding, Label 13–14.
@@ -162,6 +170,7 @@ Use **Lucide** (pinned to `lucide-static@0.460.0`) at a 1.8 stroke. Sizes are 14
 **Swipe action**
 - The row slides and uncovers a 96px action block. Delete is white on danger-fill; Favorite is white on accent.
 - The block has a 20px icon above a 12/600 label.
+- Releasing past half the block snaps it open; dragging further still (past 1.8× the block's width, a haptic tick marks the crossing and the icon bumps up 15%) arms the action, and releasing while armed fires it immediately - one swipe-through gesture instead of open-then-tap. The block grows to fill however far it's dragged, so there's never a gap behind it.
 - Swipe actions are set in Settings → Swipe on a file.

 **Selection action bar** (Files, Photos, Favorites - anywhere with
@@ -271,9 +280,13 @@ Mobile always has **5 pinned tabs in the bottom bar**. The rest go in the drawer
 | Element | iOS | Android |
 |---|---|---|
 | Status bar | 54px, Dynamic Island | 40px |
-| Top bar | 44px row: `menu` on the left; `plus` and avatar on the right (all accent-text). Then a 34px large title, then the search field. | 64px: `menu`, 22px title, `search`, avatar |
+| Top bar | 44px row: `menu` on the left; `plus` and avatar on the right (all accent-text). Then a 34px large title, then the search field. | 64px: `menu`, 22px title, avatar - see "Search" below for what replaces `search` there, and "Navigation menu" for `menu` |
 | Bottom bar | Surface fill, 1px top line. Icon 24 above a 10px label. Active: accent-text. Idle: fg-3. 34px home indicator below. | Surface fill, 80px. Icon 24 above a 12px label (label space is always reserved, just invisible when idle, so nothing shifts on selection). The active icon sits inside a 56×32 accent-soft pill that slides between tabs as one shared indicator, rather than popping in/out per tab. 20px gesture bar below. |
-| Upload | `plus` in the nav bar | Extended FAB |
+| Bottom bar - floating (Settings → Appearance → "Bottom bar", both platforms) | Same content, inset 16px from both side edges and clear of the bottom safe area instead of edge to edge, radius 28 (the sheet-top/drawer-edge radius) rather than square corners. Product UI otherwise stays flat (see 1.4), but this is the one other place - besides desktop dialogs - that gets the app's one shadow: a 1px `line` border plus the dialog shadow, since a bar that's genuinely floating above scrolling content needs to read as elevated. Row height drops (iOS 50, same as attached; Android 64 vs 80) to suit. Android's idle tabs drop their reserved label space in this mode - the icon just centers in the button and renders a touch bigger (25 vs 24px) - rather than sitting high with a gap held open under it. `Scaffold.extendBody: true` while floating, so the body scrolls behind the bar's transparent margin instead of stopping short of it - which means every tab's scrollable list has to pad its own bottom enough to clear the bar's footprint, since nothing does that for it automatically once the body draws behind the bar. The Android FAB stays fully round in this mode (see "Upload" below), consistent with the bar's own rounder shape. |
+| Bottom bar - "Search in bottom bar" (Settings → Appearance, either bar style) | Adds a Search entry that's never highlighted (tapping it pushes Search, same as the top bar's own search action, which this replaces so there's only one entry point on screen) - the row's last item when attached (same styling as a real tab, just permanently idle), or its own separate, always fully round satellite circle beside the bar when floating. Costs one regular tab: `SettingsController.maxVisibleTabs` drops from 5 to 4 while this is on. |
+| Search (top bar, when not in the bottom bar) | A real inline search field (`NooSearchField`, non-editable launcher) below the large title | A search-field-styled launcher takes the title's own flexible slot instead of a bare `search` icon beside it - no second row to put it under the way iOS has |
+| Navigation menu (Settings → Appearance → "Navigation menu", both platforms) | `drawer` (default): the `menu` icon opens the left `Drawer` (hidden tabs + Settings), unchanged. `avatarMenu`: no `menu` icon at all - the avatar button opens a dropdown instead (`showAvatarMenu`), anchored under the top bar, full width minus the same 16px gutter every content row uses, with the same hidden-tabs + Settings content the drawer holds (not its storage bar - this is a quick menu, not the drawer's full account summary). The avatar sits in the exact same (right-end) position either way, and the dropdown's own header repeats it there too, so the open menu reads as having grown out of the button that opened it. Not a mandatory replacement: this halves the top-corner surface a thumb has to reach (from `menu` + avatar down to avatar alone) without costing any permanent screen width the way an earlier side-rail exploration would have. |
+| Upload | `plus` in the nav bar | Extended FAB - fully round (pill) when the bottom bar is floating, rounded square (`card` radius) when it's attached |
 | Overflow icon | `ellipsis` | `ellipsis-vertical` |
 | Settings | Pushed screen with a "‹ Files" back button and a large title. No bottom bar. | Pushed screen with a back arrow and a title. No bottom bar. |
 | Biometric label | "Lock with Face ID" | "Lock with fingerprint" |
@@ -356,15 +369,23 @@ Sidebar items are 38px tall with radius 12, an 18px icon and a 14/500 label. The
     slots, the rest sit behind "More". See §2 "Selection action bar".
  9. Swipe on a file

-  Mobile uses one column of grouped lists, each individually collapsible
-  (tap its label, expanded by default - `NooGroupedList`'s `collapsible`
-  param) so the full list can be collapsed down instead of needing a
-  separate way to navigate it; an earlier version had a trailing jump rail
-  (one small icon per section, pinned where the scrollbar would sit)
-  instead, dropped for adding a second, redundant navigation method without
-  shortening the page. Desktop uses a 2-column grid of cards with a 1px
-  line and radius 20, wide enough to see most sections without scrolling,
-  so it gets neither.
+  Mobile is a two-level menu, the way native iOS/Android Settings apps
+  work: the account card stays pinned at the top of a single top-level
+  list, and every other section (2-9 above) becomes one tappable
+  `NooSettingsRow` - icon, title, chevron - in a `NooGroupedList` below it.
+  Tapping a row pushes a new screen (`NooTopBar`/`NooTopBarBack`) holding
+  just that section's own content full-screen, so no page is ever more
+  than one category deep and no section needs to be individually
+  collapsible any more. Two earlier designs were tried and dropped: a
+  trailing jump rail (one small icon per section, pinned where the
+  scrollbar would sit), and - after that - one long column of every
+  section inline, each individually collapsible (`NooGroupedList`'s
+  `collapsible` param) so the page could at least be collapsed down. Both
+  scrolled the *same* page to or past an anchor; a genuinely separate
+  pushed screen per category removes the scroll-depth problem outright
+  instead of just working around it. Desktop is unchanged: a 2-column grid
+  of cards with a 1px line and radius 20, wide enough to see most sections
+  without scrolling, so it gets neither a menu nor collapsing.
 - **Share sheet / dialog:** sections in this order:
  1. Header: file tile, name, size · folder, and close.
  2. **Share with people:** an input ("Name, email or group"), then the people with access. The owner comes first; the others each have a permission pill ("Can edit ▾").
@@ -801,3 +801,13 @@ 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
 rather than relying on this async path throwing naturally.
+
+- `putBytes(path, bytes)` does a WebDAV `PUT` to overwrite a file; used by the text/markdown editor (`MediaTextPreview`).
+
+## Changing a share's permissions
+
+`NextcloudService.updateSharePermissions` does `PUT
+/ocs/v2.php/apps/files_sharing/api/v1/shares/{id}` with a `permissions`
+bitmask (1 read, 2 update, 4 create, 8 delete, 16 reshare). The share
+sheet's per-person pill opens a menu with Can view (1) / Can edit (3 for
+files, 15 for folders), keeping the existing reshare bit, plus Remove access.
@@ -90,32 +90,6 @@ class/method already makes obvious.
  `Align`).
 - Run with `flutter test`.

-## Play Store screenshots
-
-`bash tool/screenshots.sh` (Git Bash is fine on Windows) regenerates the store
-listing screenshots **without any real data**: it runs the real, unmodified app
-against a throwaway Docker Nextcloud (`tool/demo_server/`) seeded with invented
-content, on a wiped 1080x1920 emulator with a demo-mode status bar, and drives
-it with `integration_test/store_screenshots_test.dart` (host-side driver:
-`test_driver/integration_test.dart`, which saves `adb screencap` images).
-Output lands in `store_listing/screenshots/` (gitignored) after
-`tool/finalize_screenshots.py` flattens alpha and checks Play's size/aspect
-limits (each side 320-3840 px, long side at most 2x the short side - a stock
-1080x2400 phone screen is 2.22:1 and would be rejected).
-
- The test logs in by writing the demo user's account/app password into
-  storage via `AccountStore` before calling `main()`, so it skips the browser
-  login flow; it also fixes the theme (light, non-dynamic colour), the visible
-  tabs and the first-run notification prompt so shots are reproducible.
- It finds things by tab icon (`AppTab.icon` inside `FloatingBottomNavBar`),
-  tooltips, the `ValueKey('files')`/`ValueKey('offline')` on the two
-  `FilesView`s, and the fake content's names (defined in
-  `tool/demo_server/seed.py`) - keep those in sync if you rename either side.
- `flutter test` only runs `test/`, so this never runs as part of the normal
-  suite; `integration_test` is a dev-only dependency.
- Always review the images before uploading - see
-  `tool/demo_server/README.md` for the known places real data could appear.
-
 ## Local install/deploy

 Never use `flutter install` to push a build to a test device — it always
@@ -157,3 +131,16 @@ Networking is deliberately split: `package:http` for simple JSON/XML
 request-response calls, `package:dio` only where streaming/progress is
 needed (downloads). Don't introduce a third HTTP client — extend the
 existing split instead.
+
+## Play Store upload (CI)
+
+`.gitea/workflows/release.yml` (on `Release-*` tags) first checks the tag
+equals `Release-<pubspec version>`, builds the signed `.aab`, attaches it to a
+Gitea release, then uploads it with `r0adkll/upload-google-play` to the
+`internal` track as a **draft** (promote in Play Console, or edit
+`track`/`status` in the workflow). Requires the `PLAY_SERVICE_ACCOUNT_JSON`
+repo secret (service account with release permissions; the app's first
+release must be uploaded manually). Play rejects a repeated `versionCode`, so
+bump the `+N` in `pubspec.yaml` for every tag - re-tagging the same version
+will fail the upload. Release notes come from
+`distribution/whatsnew/whatsnew-en-US` (max 500 chars) - update per release.
@@ -30,10 +30,12 @@ widgets. Key points:
  OS-provided `ColorScheme` wins over the seed color — always thread both
  `dynamicScheme` and `useDynamicColor` through when adding a theme knob.
 - **Font**: Inter via `google_fonts`, applied through
-  `GoogleFonts.interTextTheme(...)`. In tests, set
-  `GoogleFonts.config.allowRuntimeFetching = false` in `setUpAll` — without
-  it, the font-fetch call to Google's CDN can stall `pumpAndSettle`
-  indefinitely (see `standards.md`).
+  `GoogleFonts.interTextTheme(...)`. Font files ship in
+  `assets/google_fonts/` (Instrument Sans, Schibsted Grotesk) and
+  `main()` sets `GoogleFonts.config.allowRuntimeFetching = false`, so the
+  app never contacts Google (the privacy policy on the website relies on
+  this — keep it true; add new weights as bundled files). Tests set the
+  same flag in `setUpAll` (see `standards.md`).
 - **Cards**: flat (`elevation: 0`), 20px rounded corners,
  `surfaceContainerLow`.
 - **App bars**: flat, not centered, `surface` background.
@@ -78,10 +80,10 @@ Catalog:
 | Folder | Components |
 |---|---|
 | `core/` | `NooButton`, `NooFab`, `NooChip`, `NooSegmentedControl`, `NooToggle`, `NooSearchField`, `NooAvatar`, `NooBadge`, `NooProgressBar` |
-| `lists/` | `NooGroupedList`, `NooSettingsRow`, `NooTabOrderRow`, `NooBanner`, `NooSummaryCard`, `NooSelectionBar` |
+| `lists/` | `NooGroupedList`, `NooSettingsRow`, `NooTabOrderRow`, `NooBanner`, `NooInfoNote` (tinted info callout; `SettingsSection(notice:)`), `NooSummaryCard`, `NooSelectionBar` |
 | `files/` | `NooFileKind` (spec §1.2 tiles; `NooFileKind.from(name:, mimeType:, isDirectory:)`), `NooFileTile`, `NooStatusIcon`/`NooSyncStatus`, `NooFileRow` (mobile 64px), `NooFileTableHeader`/`NooFileTableRow` (desktop), `NooSwipeAction` |
 | `media/` | `NooGridCard`, `NooPhotoTile` (video badge, selection), `NooPhotoGroupHeader`/`NooPhotoGrid` (sliver, or `.box`), `NooActivityItem`, `NooStatCard` |
-| `nav/` | `NooBottomBar`, `NooTopBar` (a `PreferredSizeWidget`) with `NooTopBarButton`/`NooTopBarBack`, `NooDrawer` with its `Account`/`Storage`/`Item`/`Link` parts, `NooSidebar` with `NooSidebarItem`/`Divider`/`Account`/`Storage`, `NooToolbar` |
+| `nav/` | `NooBottomBar`, `NooTopBar` (a `PreferredSizeWidget`) with `NooTopBarButton`/`NooTopBarBack`, `NooDrawer` with its `Account`/`Storage`/`Item`/`Link` parts, `NooSidebar` with `NooSidebarItem`/`Divider`/`Account`/`Storage`, `NooToolbar` (floating rounded card with margin; `NooToolbar.outerHeight` for `appBar` sizing) |
 | `overlays/` | `showNooSheet`, `showNooDialog`/`NooDialog`, `NooOverlayHeader`, `NooTextField`, and the share parts `NooShareSection`, `NooPersonAccessRow`, `NooPermissionPill` |

 Gotchas:
@@ -90,10 +92,16 @@ Gotchas:
 - `NooGroupedList` draws dividers by showing `line` through 1px gaps, so each
  child must paint its own surface (`NooSettingsRow` and `NooTabOrderRow`
  do). Its `collapsible`/`initiallyExpanded` params (off by default) make
-  `label` a tap target that shows/hides the card - `SettingsSection` is the
-  only caller that opts in, for Settings' mobile sections.
- `NooSwipeAction` only reveals its action. The user has to tap the block to
-  trigger it; a full swipe never deletes.
+  `label` a tap target that shows/hides the card - no current caller opts
+  in (Settings' mobile sections used to, when every section rendered
+  inline in one long column; now each section is its own pushed screen -
+  see `account_view.dart`'s doc comment - so there's nothing left to
+  collapse). The params stay on the component itself since it's otherwise
+  generic.
+- `NooSwipeAction` reveals its action on a normal swipe (tap the block to
+  trigger it) but also fires it directly if the drag goes far enough (past
+  1.8x the block's width) before release - a full swipe-through does delete
+  in one gesture, it's not tap-only anymore.
 - Window chrome (macOS traffic lights, the Windows 40px title bar) isn't
  built yet. `NooSidebar.windowControls` is the slot for it.
 - Always read colors through `context.nooColors`, never
@@ -137,6 +145,12 @@ blocks are noted where they matter:
  `lib/widgets/tabs/` (`tab_state_slivers.dart`, `tab_day_groups.dart`,
  `tab_location.dart`) — the loading/error/empty-state slivers and
  day/month grouping helpers shared by Recent/Activity/Trash/Shares.
+  `tab_state_slivers.dart` also has `topBarSliver`, which every regular
+  tab's view uses to plant its own `AppTopBar` instance as the first sliver
+  in its `CustomScrollView` (a thin wrapper around the framework's
+  `SliverFloatingHeader`) instead of the shell passing one shared instance
+  to `Scaffold.appBar` - see its doc comment and `architecture.md`'s
+  "Mobile" bullet for why.
  `lib/widgets/settings/` — Settings' 8 section widgets plus
  `settings_section.dart`'s `SettingsSection`/`showSettingsPicker` and
  `settings_dialogs.dart`'s `confirmRemoveAccount`.
@@ -184,6 +198,27 @@ blocks are noted where they matter:
  bars and video transport controls (its other former user, the floating
  bottom nav bar, is gone - see below). Reuse this for any new floating
  overlay instead of building a new blur/shadow combo.
+- Upload FAB size: `SettingsController.fabStyle` (`FabStyle.auto/mini/expanded`,
+  Settings > Appearance > "Upload button") drives `NooFab.collapsed` in
+  `main.dart` - auto collapses off Files/Photos, mini always icon-only,
+  expanded always labelled. Phone/Android layout only.
+- PDF viewer (`media_pdf_preview.dart`): pdfx's InteractiveViewer won't zoom
+  out past `viewport.height / doc.height`, so for short documents (<= 3
+  pages, measured up front) the full-size `PdfViewPinch` is wrapped in a
+  `MediaQuery` with extra bottom padding (pdfx's child is a `SafeArea`) so
+  the boundary height reaches the viewport and fit-width stays reachable
+  after pinch-zooming, without shrinking the canvas. `topInset` (status bar
+  + top bar height, 0 when the controls are hidden) animates the viewport
+  below the overlaid top bar.
+- `NooGroupedList.notice`: optional widget (e.g. `NooInfoNote`) rendered
+  under the label, above the card; `SettingsSection` uses it for its
+  `notice` on phones.
+- [`MediaDetailsPanel`](../../lib/widgets/viewer/media_details_panel.dart) —
+  the media viewer's bottom bar as a draggable panel (mobile/phone only;
+  tablet-class still uses the `DetailsSheet` dialog). Dragging the bar, the
+  Details button, or swiping up on swipeable media (raw `Listener` in
+  `file_viewer_screen.dart`) grows it upward so the action row rides on top
+  of the details; tapping the media collapses it.
 - `SettingsController.bottomBarOpacity`/`bottomBarBlur` and
  `lib/widgets/floating_bottom_bar.dart`/`media_grid_tile.dart`/
  `swipeable_item.dart`/`sync_status_badge.dart`/`selectable_thumbnail.dart`
@@ -191,7 +226,69 @@ blocks are noted where they matter:
  opacity/blur knob - flat surfaces per the design system), grid tiles are
  `NooGridCard`, swipe actions are `NooSwipeAction`, and per-item sync
  status is `NooFileRow`/`NooFileTableRow`'s built-in `NooStatusIcon` list
-  instead of a corner badge.
+  instead of a corner badge. `NooBottomBar` later gained its own, unrelated
+  `NooBottomBarStyle.floating` (Settings → Appearance → "Bottom bar") -
+  don't confuse the two: this one is still non-blurred, just inset with a
+  `line` border and `nooDialogShadow` (the app's one other shadow user - see
+  that constant's doc comment) instead of edge to edge (no opacity/blur knob
+  either). The host `Scaffold` needs `extendBody: true` while it's active
+  (`main.dart` already wires this off `SettingsController.bottomBarStyle`),
+  which also means every tab's own scrollable list has to reserve enough
+  bottom padding to clear the bar - nothing does that automatically once the
+  body draws behind it. Use `bottomBarClearance(context)`
+  (`tab_state_slivers.dart`) for that rather than a flat `100`; it already
+  accounts for both bar styles.
+  Settings' separate "Search in bottom bar" toggle
+  (`SettingsController.searchInBottomBar`) adds a never-highlighted Search
+  entry to either bar style (`NooBottomBar`'s `searchDestination`/
+  `onSearchTap`) and lowers `SettingsController.maxVisibleTabs` by one -
+  use that getter, not `defaultMaxVisibleTabs` from `models/app_tab.dart`,
+  anywhere that needs the *current* cap on regular tabs.
+- `SettingsController.navMenuStyle` (`NooNavMenuStyle.drawer`/`avatarMenu`,
+  Settings → Appearance → "Navigation menu") picks what opens hidden tabs +
+  Settings on mobile: the original hamburger-opens-`AppDrawer` pattern, or
+  the avatar button opens [`showAvatarMenu`](../../lib/widgets/avatar_menu.dart)
+  instead. Wired through `AppTopBar`→`NooTopBar.onMenu` (null in `avatarMenu`
+  mode - no menu icon renders at all, see `NooTopBar`'s `lead` logic) and
+  `ShellAvatarButton`'s new `onTap`/`label` overrides (`shell_common.dart`) -
+  a caller passing a custom `onTap` *must* also pass a matching `label`, or
+  the tooltip/semantics still say "Accounts" for a button that no longer
+  opens the account switcher. In `avatarMenu` mode `main.dart` also sets
+  `Scaffold.drawerEnableOpenDragGesture: false` so the edge swipe can't open
+  the drawer. The menu header has a chevron that expands an account section
+  (other saved accounts to switch to, "Add Account", "Manage Accounts")
+  above the hidden tabs/Settings. `showAvatarMenu` is this app's first use of
+  `showGeneralDialog` directly (`barrierColor: Colors.transparent` +
+  `barrierDismissible: true` for a non-dimming click-outside-to-close menu,
+  not a modal flow) - there's no existing anchored-popup primitive here
+  (`PopupMenuButton`'s own width doesn't stretch to a full content column),
+  so don't reach for `showNooSheet`/`showNooDialog` for something shaped
+  like this. It's positioned just past the status bar (`SafeArea`'s own
+  inset, not the top bar's full height on top of that) so it covers the
+  top bar - including the tab title - rather than sitting below it, and
+  its card carries two stacked `boxShadow`s rather than just
+  `nooDialogShadow` alone: that one shadow's blur is wide and soft enough
+  to read as basically invisible on a small card over a dark theme's
+  near-black `bg` (a dark, diffuse shadow needs real density close to the
+  edge to be visible against an already-dark backdrop), so a second,
+  tighter, more opaque contact shadow underneath it gives real elevation
+  in both themes. The card's border can go missing wherever an opaque row
+  sits against it too (every corner but the header's, which has no
+  full-bleed fill of its own) if a `Container` combines `border` with its
+  own `clipBehavior` - that paints the border as part of the *outer*
+  decoration, then the clipped child on top right up to the same boundary,
+  with no gap for the border's own stroke to show through. Fixed the same
+  way any bordered-and-clipped `Container` should be: no `clipBehavior` on
+  the bordered `Container` itself, and a 1px-inset `ClipRRect` (radius
+  reduced by that same 1px) around the filled, clipped content instead, so
+  it never paints over the border. Also added
+  `NooTopBar.androidTitleTrailing`: Android has no large title to put a
+  second search row under the way iOS's `search:` slot does, so an inline
+  search bar (`AppTopBar` passes a plain `ShellSearchLauncher()` when
+  search isn't in the bottom bar) sits to the title's own right in that
+  flexible slot - `Flexible`, not `Expanded`, so the title still shrinks/
+  ellipsizes if there's truly no room but doesn't claim more than it needs
+  otherwise - instead of the title being replaced by it.
 - [`SyncedHeaderScaffold`](../../lib/widgets/synced_header_scaffold.dart) —
  the pull-to-sync `CustomScrollView` header with the persistent sync-status
  chip and pull-to-refresh gesture/spinner. Every screen (including
@@ -254,3 +351,27 @@ blocks are noted where they matter:
  generator step. `assets/icon/app_icon_monochrome.png` is deliberately a
  tightly-cropped glyph (unlike the launcher's safe-zone-padded monochrome
  layer), so it renders at a sensible size at 72-80px.
+
+## Text/markdown viewer
+
+`MediaTextPreview` is an editable monospace `TextField` padded clear of the status bar, top bar and action bar; a Save button appears when dirty (read-only for offline copies). `NooPersonAccessRow.trailing` replaces the owner label/permission pill (used by share-search results). Sheets whose close button lives in `showNooSheet` children must pop via a `Builder` context, not the caller's.
+
+`showNooSheet` insets its body by the keyboard (`viewInsets.bottom`) so focused fields stay visible; the body's widget structure must not change when the keyboard opens, or the sheet content is rebuilt and loses focus.
+
+Markdown files (`.md`/`.markdown`) in `MediaTextPreview` open rendered via `flutter_markdown_plus` (`Markdown`, styled from Noo tokens in `_markdownStyle`), with a top-right Edit/Preview toggle (hidden for read-only offline copies). Other text files go straight to the editor.
+
+`ShareSheet`: focusing the people search field does not scroll; once the user types, `_revealPeopleSection` animates the "Share with people" section (keyed by `_peopleKey` on the `NooShareSection`, not the inner column) to just below the sheet's top edge with a small gap.
+
+## Desktop/tablet layout notes
+
+- The desktop branch in `main.dart` is wrapped in `SafeArea` so tablets keep
+  system bars clear of the sidebar; the sidebar has no divider between pinned
+  and hidden tabs.
+- Desktop Settings is the same two-level menu as mobile (centered 640px column, back button in the floating toolbar); the
+  pushed category screens render the desktop card layout.
+- Settings that don't apply in wide-tablet (Appearance nav options,
+  Swipe on a file) show a `NooInfoNote` via `SettingsSection.notice`.
+- Mobile-layout grids (Files, Favorites, move/copy picker, share upload,
+  Photos) take their column count from `NooLayout.gridColumns` (min tile
+  width, never below the phone count), so a tablet in portrait gets more
+  columns rather than a few huge tiles.
@@ -39,6 +39,16 @@ jobs:
          # platform/build-tools versions it actually needs on its own.
          packages: "platform-tools"

+      - name: Check tag matches pubspec version
+        # Play rejects a repeated versionCode and a mismatched tag would
+        # publish the wrong version name, so fail fast before building.
+        run: |
+          VERSION=$(grep '^version:' pubspec.yaml | sed 's/version: //' | cut -d'+' -f1)
+          if [ "${GITHUB_REF_NAME}" != "Release-${VERSION}" ]; then
+            echo "Tag ${GITHUB_REF_NAME} does not match pubspec version ${VERSION}" >&2
+            exit 1
+          fi
+
      - name: Install dependencies
        run: flutter pub get

@@ -67,6 +77,7 @@ jobs:
          mkdir -p release
          cp build/app/outputs/bundle/release/app-release.aab "release/Noo-${VERSION}.aab"
          echo "AAB_PATH=release/Noo-${VERSION}.aab" >> "$GITHUB_ENV"
+          echo "VERSION=${VERSION}" >> "$GITHUB_ENV"

      - name: Publish Gitea release with App Bundle attached
        # Gitea-native release action (not GitHub's) - authenticates and
@@ -78,26 +89,17 @@ jobs:
        with:
          files: ${{ env.AAB_PATH }}

-      - name: Decode Play Console service account key
-        # Skipped (rather than failing the whole run) until the secret is
-        # set up - see tool/upload_play_bundle.py's doc comment for what
-        # that setup involves and its one hard prerequisite: Google won't
-        # accept API calls for an app that's never had a single manual
-        # upload through the Play Console web UI.
-        if: ${{ secrets.GOOGLE_PLAY_SERVICE_ACCOUNT_JSON_BASE64 != '' }}
-        run: echo "$SERVICE_ACCOUNT_JSON_BASE64" | base64 -d > "${{ runner.temp }}/play-service-account.json"
-        env:
-          SERVICE_ACCOUNT_JSON_BASE64: ${{ secrets.GOOGLE_PLAY_SERVICE_ACCOUNT_JSON_BASE64 }}
-
-      - name: Upload App Bundle to Play Console library
-        # Deliberately doesn't touch any release track - see
-        # tool/upload_play_bundle.py. Uploaded bundles show up under
-        # Release > App bundle explorer in Play Console, ready to promote
-        # to a track by hand whenever it's actually time to ship.
-        if: ${{ secrets.GOOGLE_PLAY_SERVICE_ACCOUNT_JSON_BASE64 != '' }}
-        run: |
-          pip install --quiet google-api-python-client google-auth
-          python3 tool/upload_play_bundle.py "${{ env.AAB_PATH }}"
-        env:
-          GOOGLE_PLAY_PACKAGE_NAME: dev.ayushya.noo
-          GOOGLE_PLAY_SERVICE_ACCOUNT_JSON_PATH: ${{ runner.temp }}/play-service-account.json
+      - name: Upload to Google Play (internal track, draft)
+        # Stages the build only; promote it in Play Console, or change
+        # `status` to "completed" (and/or `track`) to roll out automatically.
+        # Needs the PLAY_SERVICE_ACCOUNT_JSON repo secret, and the app's
+        # first release must already have been uploaded by hand.
+        uses: r0adkll/upload-google-play@v1
+        with:
+          serviceAccountJsonPlainText: ${{ secrets.PLAY_SERVICE_ACCOUNT_JSON }}
+          packageName: dev.ayushya.noo
+          releaseFiles: ${{ env.AAB_PATH }}
+          releaseName: ${{ env.VERSION }}
+          track: internal
+          status: draft
+          whatsNewDirectory: distribution/whatsnew
@@ -45,6 +45,3 @@ app.*.map.json
 /android/app/profile
 /android/app/release

-# Play Store screenshot tooling (tool/screenshots.sh)
-/store_listing/screenshots/
-/tool/demo_server/.venv/
@@ -0,0 +1 @@
+Improved tablet layout: sidebar navigation, floating title bars, and adaptive grids. Long-press selection and Settings submenus now work on tablets.
@@ -1,325 +0,0 @@
-// Drives the real app through its tabs and states against the fake-data demo
-// server and captures the Play Store screenshots. Not part of the normal test
-// suite (`flutter test` only runs `test/`) - run it through
-// `tool/screenshots.sh`, which starts the demo server, an emulator and the
-// driver in `test_driver/integration_test.dart` that saves the images.
-//
-// The app starts already logged in: the demo user's credentials are written
-// straight into storage before `main()` runs, so Login Flow v2's browser
-// step is skipped.
-import 'dart:io';
-
-import 'package:flutter/material.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:integration_test/integration_test.dart';
-import 'package:noo/main.dart' as app;
-import 'package:noo/models/app_tab.dart';
-import 'package:noo/models/saved_account.dart';
-import 'package:noo/providers/files_controller.dart';
-import 'package:noo/providers/settings_controller.dart';
-import 'package:noo/providers/sync_status_controller.dart';
-import 'package:noo/services/account_store.dart';
-import 'package:noo/theme/design_tokens.dart';
-import 'package:noo/widgets/bottom_nav_bar.dart';
-import 'package:provider/provider.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-const _serverUrl = String.fromEnvironment(
-  'DEMO_SERVER_URL',
-  defaultValue: 'http://localhost',
-);
-const _username = String.fromEnvironment('DEMO_USERNAME', defaultValue: 'Alex');
-const _appPassword = String.fromEnvironment('DEMO_APP_PASSWORD');
-
-void main() {
-  final binding = IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-
-  testWidgets(
-    'Play Store screenshots',
-    (tester) async {
-      expect(
-        _appPassword,
-        isNotEmpty,
-        reason: 'Pass the demo user\'s app password via '
-            '--dart-define=DEMO_APP_PASSWORD=... (tool/screenshots.sh does).',
-      );
-      await _seedLoggedInStorage();
-
-      app.main();
-      await tester.pump();
-      await _pumpUntil(tester, find.byType(app.MainShellView));
-
-      // Android only: required before `takeScreenshot()` can capture
-      // anything at all.
-      if (Platform.isAndroid) await binding.convertFlutterSurfaceToImage();
-
-      Future<void> shoot(String name) async {
-        // Let scroll/transition animations and image fades finish first.
-        await tester.pump(const Duration(seconds: 1));
-        await binding.takeScreenshot(name);
-      }
-
-      // ---- 01 Files (list) ------------------------------------------------
-      final filesTab = find.byKey(const ValueKey('files'));
-      await _pumpUntil(
-        tester,
-        find.descendant(of: filesTab, matching: find.text('Documents')),
-      );
-      await shoot('01_Files');
-
-      // ---- 02 Files (grid, inside a folder of photos) --------------------
-      final files = _read<FilesController>(tester);
-      await files.navigateToAbsoluteFolder('/Trips');
-      await _pumpUntil(
-        tester,
-        find.descendant(of: filesTab, matching: find.text('Lake sunrise.jpg')),
-      );
-      // The controls row scrolls horizontally and doesn't fit every control
-      // on a narrow screen, so "Grid view" can start off past the clipped
-      // edge - not just off the *current* tab (which `.hitTestable()` alone
-      // would handle), but off the *visible part of this tab's own row*.
-      // `_tapInTab` scrolls it into view first.
-      await _tapInTab(tester, filesTab, find.byTooltip('Grid view'));
-      await tester.pump(const Duration(seconds: 4)); // thumbnails
-      await shoot('02_Files_Grid');
-
-      // ---- 07 File viewer -------------------------------------------------
-      await _tapInTab(tester, filesTab, find.text('Lake sunrise.jpg'));
-      await tester.pump(const Duration(seconds: 4));
-      await shoot('07_Viewer');
-      tester.state<NavigatorState>(find.byType(Navigator).first).pop();
-      await tester.pump(const Duration(seconds: 1));
-
-      // Back to the root folder, list view.
-      await _tapInTab(tester, filesTab, find.byTooltip('List view'));
-      await files.navigateToAbsoluteFolder('/');
-      await tester.pump(const Duration(seconds: 2));
-
-      // ---- 03 Photos ------------------------------------------------------
-      await _goToTab(tester, AppTab.photos);
-      await tester.pump(const Duration(seconds: 5)); // grid + thumbnails
-      await shoot('03_Photos');
-
-      // ---- 04 Favorites ---------------------------------------------------
-      await _goToTab(tester, AppTab.favorites);
-      await _pumpUntil(tester, find.text('Project brief.pdf'));
-      await shoot('04_Favorites');
-
-      // ---- 05 Activity ----------------------------------------------------
-      await _goToTab(tester, AppTab.activity);
-      await tester.pump(const Duration(seconds: 3));
-      await shoot('05_Activity');
-
-      // ---- 06 Shares ------------------------------------------------------
-      await _goToTab(tester, AppTab.shares);
-      await tester.pump(const Duration(seconds: 3));
-      await shoot('06_Shares');
-
-      // ---- 08 Sync status panel ------------------------------------------
-      // Sync two folders to the device; the header chip flips to "Synced"
-      // once the native worker has finished, and tapping it opens the panel.
-      await _goToTab(tester, AppTab.files);
-      await _read<SyncStatusController>(
-        tester,
-      ).addSyncedPaths({'/Documents': true, '/Trips': true});
-      await _pumpUntil(tester, find.text('Synced'), timeout: 180);
-      await _tapInTab(tester, filesTab, find.text('Synced'));
-      await tester.pump(const Duration(seconds: 1));
-      await shoot('08_Sync_Status');
-      await _tapInTab(tester, filesTab, find.byTooltip('Collapse'));
-
-      // ---- 09 Offline -----------------------------------------------------
-      _setVisibleTabs(tester, [
-        AppTab.files,
-        AppTab.photos,
-        AppTab.favorites,
-        AppTab.shares,
-        AppTab.offline,
-      ]);
-      await tester.pump(const Duration(milliseconds: 500));
-      await _goToTab(tester, AppTab.offline);
-      await _pumpUntil(
-        tester,
-        find.descendant(
-          of: find.byKey(const ValueKey('offline')),
-          matching: find.text('Documents'),
-        ),
-        timeout: 120,
-      );
-      await shoot('09_Offline');
-
-      // ---- 10/11 Settings -------------------------------------------------
-      await _tap(tester, find.byTooltip('Settings').hitTestable().first);
-      await _pumpUntil(tester, find.text('Accounts'));
-      await shoot('10_Settings');
-      // Wait for it, rather than assuming it's already built - ensureVisible
-      // itself has no retry/timeout, so on any transient delay (e.g. still
-      // mid-route-transition) it fails immediately instead of giving the
-      // frame a moment to catch up.
-      await _pumpUntil(tester, find.text('Files Cache'));
-      await tester.ensureVisible(find.text('Files Cache'));
-      await tester.pump(const Duration(milliseconds: 300));
-      await shoot('11_Settings_Sync');
-      tester.state<NavigatorState>(find.byType(Navigator).first).pop();
-      await tester.pump(const Duration(seconds: 1));
-
-      // ---- 12/13 Dark theme -------------------------------------------------
-      final settings = _read<SettingsController>(tester);
-      settings.setThemeMode(ThemeMode.dark);
-      await _goToTab(tester, AppTab.files);
-      await tester.pump(const Duration(seconds: 2));
-      await shoot('12_Files_Dark');
-      await _goToTab(tester, AppTab.photos);
-      await tester.pump(const Duration(seconds: 3));
-      await shoot('13_Photos_Dark');
-
-      // ---- 14/15 Dark theme, AMOLED (pure black) -----------------------------
-      settings.setAmoledDark(true);
-      await tester.pump(const Duration(seconds: 1));
-      await _goToTab(tester, AppTab.files);
-      await tester.pump(const Duration(seconds: 2));
-      await shoot('14_Files_Dark_Amoled');
-      await _goToTab(tester, AppTab.photos);
-      await tester.pump(const Duration(seconds: 3));
-      await shoot('15_Photos_Dark_Amoled');
-    },
-    timeout: const Timeout(Duration(minutes: 15)),
-  );
-}
-
-/// Starts from empty storage, then writes exactly one saved account (the
-/// demo user, with the app password from `--dart-define`) and the settings
-/// that make screenshots reproducible: light theme, a fixed brand colour
-/// (dynamic colour would pick up the emulator's wallpaper), five bottom-nav
-/// tabs, and no first-run notification prompt.
-Future<void> _seedLoggedInStorage() async {
-  await const FlutterSecureStorage().deleteAll();
-  final prefs = await SharedPreferences.getInstance();
-  await prefs.clear();
-
-  final store = AccountStore();
-  final account = SavedAccount(
-    id: SavedAccount.makeId(_serverUrl, _username),
-    serverUrl: _serverUrl,
-    username: _username,
-  );
-  await store.saveAccounts(prefs, [account]);
-  await store.saveActiveAccountId(prefs, account.id);
-  await store.writePassword(account.id, _appPassword);
-
-  await prefs.setBool('notification_permission_asked', true);
-  await prefs.setString('ui_theme_mode', ThemeMode.light.name);
-  await prefs.setBool('ui_use_dynamic_color', false);
-  await prefs.setStringList('ui_tab_order', [
-    for (final t in AppTab.values) t.name,
-  ]);
-  await prefs.setStringList('ui_hidden_tabs', [
-    AppTab.trash.name,
-    AppTab.recent.name,
-    AppTab.offline.name,
-  ]);
-}
-
-T _read<T>(WidgetTester tester) => Provider.of<T>(
-  tester.element(find.byType(app.MainShellView)),
-  listen: false,
-);
-
-Future<void> _tap(WidgetTester tester, Finder finder) async {
-  await tester.tap(finder);
-  await tester.pump(const Duration(milliseconds: 600));
-}
-
-/// Taps the one widget matching [matching] inside [tab] (e.g. `filesTab`) -
-/// for chrome that's duplicated across tabs (`IndexedStack` keeps every
-/// visible tab's widget tree mounted, not just the active one) and/or can be
-/// scrolled out of its own row's clipped viewport (the controls row,
-/// `FilesControlsRow`, doesn't fit every control on a narrow screen).
-/// Scoping to [tab] picks the right one of several identical matches;
-/// `ensureVisible` scrolls it into view before tapping, which plain
-/// `.hitTestable()` can't distinguish from "on the wrong tab" - both look
-/// like "zero hit-testable matches" and throw the same unhelpful
-/// `Bad state: No element`.
-Future<void> _tapInTab(WidgetTester tester, Finder tab, Finder matching) async {
-  final target = find.descendant(of: tab, matching: matching).first;
-  await tester.ensureVisible(target);
-  await tester.pump(const Duration(milliseconds: 300));
-  await tester.tap(target, warnIfMissed: false);
-  await tester.pump(const Duration(milliseconds: 600));
-}
-
-Future<void> _goToTab(WidgetTester tester, AppTab tab) async {
-  // Only one bottom nav bar exists (outside the IndexedStack), so no
-  // cross-tab duplicate to worry about - but it can itself overflow a
-  // narrow screen, so still scroll the target into view rather than relying
-  // on hitTestable() alone (see `_tapInTab`'s doc comment).
-  final target = find
-      .descendant(
-        of: find.byType(BottomNavBar),
-        matching: find.byIcon(tab.icon),
-      )
-      .first;
-  await tester.ensureVisible(target);
-  await tester.pump(const Duration(milliseconds: 300));
-  await tester.tap(target, warnIfMissed: false);
-  await tester.pump(const Duration(milliseconds: 600));
-
-  // Confirm the tap actually landed, rather than trusting it silently - a
-  // scroll-imprecise tap (see above) that misses its target doesn't throw,
-  // it just does nothing, which would otherwise leave every later
-  // screenshot quietly showing whatever tab was already selected instead of
-  // failing loudly. Every destination shows its label all the time now (see
-  // `BottomNavBar`'s doc comment), so label presence can't signal selection
-  // - the icon's color can: it's `accentText` only for the active tab.
-  await _pumpUntilTrue(tester, () {
-    if (target.evaluate().isEmpty) return false;
-    final icon = tester.widget<Icon>(target);
-    final colors = tester.element(target).nooColors;
-    return icon.color == colors.accentText;
-  }, timeout: 10);
-}
-
-/// Shows exactly [tabs] in the bottom nav (hiding the rest first, so the
-/// five-tab cap is never hit).
-void _setVisibleTabs(WidgetTester tester, List<AppTab> tabs) {
-  final settings = _read<SettingsController>(tester);
-  for (final tab in AppTab.values) {
-    if (!tabs.contains(tab)) settings.setTabHidden(tab, true);
-  }
-  for (final tab in tabs) {
-    settings.setTabHidden(tab, false);
-  }
-}
-
-/// Waits (in real time - this is a live binding, and the app is talking to a
-/// real server) until [finder] matches something.
-Future<void> _pumpUntil(
-  WidgetTester tester,
-  Finder finder, {
-  int timeout = 60,
-}) async {
-  final deadline = DateTime.now().add(Duration(seconds: timeout));
-  while (finder.evaluate().isEmpty) {
-    if (DateTime.now().isAfter(deadline)) {
-      throw TestFailure('Timed out after ${timeout}s waiting for $finder');
-    }
-    await tester.pump(const Duration(milliseconds: 250));
-  }
-}
-
-/// Like [_pumpUntil], but for a condition that isn't just "does a finder
-/// match something" (e.g. a widget property).
-Future<void> _pumpUntilTrue(
-  WidgetTester tester,
-  bool Function() predicate, {
-  int timeout = 60,
-}) async {
-  final deadline = DateTime.now().add(Duration(seconds: timeout));
-  while (!predicate()) {
-    if (DateTime.now().isAfter(deadline)) {
-      throw TestFailure('Timed out after ${timeout}s waiting for condition');
-    }
-    await tester.pump(const Duration(milliseconds: 250));
-  }
-}
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
 import 'package:lucide_icons_flutter/lucide_icons.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:provider/provider.dart';
@@ -44,6 +45,8 @@ import 'widgets/shell/shell_common.dart';

 void main() {
  WidgetsFlutterBinding.ensureInitialized();
+  // Fonts ship in assets/google_fonts; never fetch them from Google at runtime.
+  GoogleFonts.config.allowRuntimeFetching = false;
  runApp(
    MultiProvider(
      // Split out of the former single `ServerProvider` god object - see
@@ -381,15 +384,52 @@ class _MainShellViewState extends State<MainShellView> {
    String? trashBadge(AppTab tab) =>
        tab == AppTab.trash && trashCount > 0 ? '$trashCount' : null;

+    final isDesktop = NooLayout.isDesktop(context);
+    final navStyle = NooLayout.navStyle(context);
+    // Picking/offline already override the tab set itself (see pinnedTabs
+    // above) - Search doesn't belong in either: there's nothing to search
+    // for a file-picking flow, and Search needs the network Offline mode
+    // doesn't have.
+    final showBottomBarSearch = !overrideActive && settings.searchInBottomBar;
+
    // Each tab renders its own sticky selection toolbar inline (right under
    // its sort/filter row) instead of the shell swapping in a shared one,
    // so the nav chrome stays put and usable regardless of selection state.
+    //
+    // Each tab also builds its own [AppTopBar] (labelled for that tab, not
+    // just whichever is currently selected) and plants it as that tab's own
+    // first sliver - see `buildAppTabView`'s doc comment and `topBarSliver`
+    // in `tabs/tab_state_slivers.dart` - instead of one shared instance
+    // living in `Scaffold.appBar`. That's what gives each tab's top bar
+    // Material's native floating-away-on-scroll-down/reappear-on-scroll-up
+    // behavior, tied to that tab's own `ScrollController`: a fixed
+    // `Scaffold.appBar` can't do that (no per-tab scroll signal reaches
+    // it), and a shared single instance can't show 7 different tab labels
+    // at once now that every tab keeps its own independent scroll state.
+    // Null on desktop (which shows `NooToolbar` instead - embedding it here
+    // too, since `tabStack` is shared by both layouts below, would double
+    // up the top chrome there) and while picking (no top bar at all, same
+    // as this screen's old `Scaffold.appBar: pickRequest == null ? ... :
+    // null`).
    final tabStack = Stack(
      children: [
        IndexedStack(
          index: selectedIndex,
          children: displayTabs
-              .map((tab) => buildAppTabView(tab, _scrollControllers[tab]!))
+              .map(
+                (tab) => buildAppTabView(
+                  tab,
+                  _scrollControllers[tab]!,
+                  topBar: isDesktop || pickRequest != null
+                      ? null
+                      : AppTopBar(
+                          style: navStyle,
+                          tab: tab,
+                          searchInBottomBar: showBottomBarSearch,
+                          navMenuStyle: settings.navMenuStyle,
+                        ),
+                ),
+              )
              .toList(),
        ),
        if (pick.isDownloadingForPick) const _PickingProgressOverlay(),
@@ -401,84 +441,93 @@ class _MainShellViewState extends State<MainShellView> {
        (selectedTab == AppTab.files || selectedTab == AppTab.photos);

    Widget scaffold;
-    if (NooLayout.isDesktop(context)) {
+    if (isDesktop) {
      scaffold = Scaffold(
        backgroundColor: colors.bg,
-        body: Row(
-          children: [
-            NooSidebar(
-              account: NooSidebarAccount(
-                avatar: NooAvatar(
-                  initials: accountInitial(session.username),
-                  current: true,
-                  size: 32,
+        // Tablets keep the system bars, so inset for them (desktop's
+        // insets are zero).
+        body: SafeArea(
+          child: Row(
+            children: [
+              NooSidebar(
+                account: NooSidebarAccount(
+                  avatar: NooAvatar(
+                    initials: accountInitial(session.username),
+                    current: true,
+                    size: 32,
+                  ),
+                  name: session.username,
+                  subtitle: serverHost(session.serverUrl),
+                  onTap: () => showAccountSwitcher(context),
                ),
-                name: session.username,
-                subtitle: serverHost(session.serverUrl),
-                onTap: () => showAccountSwitcher(context),
-              ),
-              items: [
-                for (final tab in pinnedTabs)
-                  NooSidebarItem(
-                    icon: tab.icon,
-                    label: tab.label,
-                    count: trashBadge(tab),
-                    selected: tab == selectedTab,
-                    onTap: () => selectTab(tab),
-                  ),
-                if (hiddenTabs.isNotEmpty) const NooSidebarDivider(),
-                for (final tab in hiddenTabs)
-                  NooSidebarItem(
-                    icon: tab.icon,
-                    label: tab.label,
-                    count: trashBadge(tab),
-                    selected: tab == selectedTab,
-                    onTap: () => selectTab(tab),
-                  ),
-              ],
-              storage: NooSidebarStorage(
-                value: quotaFraction(quota),
-                detail: quotaDetail(quota),
-              ),
-              settings: NooSidebarItem(
-                icon: LucideIcons.settings,
-                label: 'Settings',
-                onTap: () => openSettings(context),
-              ),
-            ),
-            Expanded(
-              child: Column(
-                children: [
-                  NooToolbar(
-                    title: selectedTab.label,
-                    search: const ShellSearchLauncher(onSurface: true),
-                    actions: [
-                      if (canUpload)
-                        NooButton(
-                          icon: LucideIcons.upload,
-                          onTap: () => showCreateMenu(context),
-                          child: const Text('Upload'),
-                        ),
-                    ],
-                  ),
-                  Expanded(
-                    child: ColoredBox(color: colors.surface, child: tabStack),
-                  ),
+                items: [
+                  for (final tab in pinnedTabs)
+                    NooSidebarItem(
+                      icon: tab.icon,
+                      label: tab.label,
+                      count: trashBadge(tab),
+                      selected: tab == selectedTab,
+                      onTap: () => selectTab(tab),
+                    ),
+                  for (final tab in hiddenTabs)
+                    NooSidebarItem(
+                      icon: tab.icon,
+                      label: tab.label,
+                      count: trashBadge(tab),
+                      selected: tab == selectedTab,
+                      onTap: () => selectTab(tab),
+                    ),
                ],
+                storage: NooSidebarStorage(
+                  value: quotaFraction(quota),
+                  detail: quotaDetail(quota),
+                ),
+                settings: NooSidebarItem(
+                  icon: LucideIcons.settings,
+                  label: 'Settings',
+                  onTap: () => openSettings(context),
+                ),
              ),
-            ),
-          ],
+              Expanded(
+                child: Column(
+                  children: [
+                    NooToolbar(
+                      title: selectedTab.label,
+                      search: const ShellSearchLauncher(onSurface: true),
+                      actions: [
+                        if (canUpload)
+                          NooButton(
+                            icon: LucideIcons.upload,
+                            onTap: () => showCreateMenu(context),
+                            child: const Text('Upload'),
+                          ),
+                      ],
+                    ),
+                    Expanded(
+                      child: ColoredBox(color: colors.surface, child: tabStack),
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
        ),
      );
    } else {
-      final navStyle = NooLayout.navStyle(context);
+      final bottomBarStyle = settings.bottomBarStyle;
      scaffold = Scaffold(
        backgroundColor: colors.bg,
        drawerScrimColor: colors.scrim,
-        appBar: pickRequest == null
-            ? AppTopBar(style: navStyle, tab: selectedTab)
-            : null,
+        // The top bar itself no longer lives here - see `tabStack` above.
        drawer: pickRequest == null ? const AppDrawer() : null,
+        // The avatar menu replaces the drawer, so the edge swipe must not
+        // open it either.
+        drawerEnableOpenDragGesture:
+            settings.navMenuStyle == NooNavMenuStyle.drawer,
+        // Floating needs the body to draw behind the bar's own transparent
+        // margin (see NooBottomBarStyle's doc comment) instead of stopping
+        // short of it like attached does.
+        extendBody: bottomBarStyle == NooBottomBarStyle.floating,
        // Android-only extended Upload FAB - iOS uses the top bar's `plus`
        // instead (see AppTopBar). Stays mounted across every tab (picking
        // aside) and collapses to an icon-only circle off Files/Photos,
@@ -487,15 +536,22 @@ class _MainShellViewState extends State<MainShellView> {
        floatingActionButton:
            pickRequest == null && navStyle == NooNavStyle.android
            ? NooFab(
-                collapsed: !canUpload,
+                collapsed: switch (settings.fabStyle) {
+                  FabStyle.auto => !canUpload,
+                  FabStyle.mini => true,
+                  FabStyle.expanded => false,
+                },
+                barStyle: bottomBarStyle,
                onTap: () => showCreateMenu(context),
              )
            : null,
        body: tabStack,
        bottomNavigationBar: BottomNavBar(
          style: navStyle,
+          barStyle: bottomBarStyle,
          tabs: pinnedTabs,
          selectedIndex: pinnedIndex,
+          onSearchTap: showBottomBarSearch ? () => openSearch(context) : null,
          onDestinationSelected: (index) {
            final tappedTab = pinnedTabs[index];
            if (tappedTab == _currentTab) {
@@ -16,8 +16,13 @@ enum AppTab {
 }

 /// At most this many tabs may be visible in the bottom nav bar at once —
-/// the rest are reachable through the "more" dropdown instead.
-const int maxVisibleTabs = 5;
+/// the rest are reachable through the "more" dropdown instead. The
+/// effective cap a screen should actually use is
+/// [SettingsController.maxVisibleTabs], not this directly - it's one
+/// lower than this while `searchInBottomBar` is on, since Search then
+/// takes the freed-up slot itself rather than competing with the user's
+/// own reorderable tabs for one of these.
+const int defaultMaxVisibleTabs = 5;

 extension AppTabInfo on AppTab {
  String get label {
@@ -39,4 +39,20 @@ class NextcloudShare {
  });

  bool get isFolder => itemType == NextcloudItemType.folder;
+
+  NextcloudShare withPermissions(int permissions) => NextcloudShare(
+    id: id,
+    path: path,
+    name: name,
+    itemType: itemType,
+    shareType: shareType,
+    ownerDisplayName: ownerDisplayName,
+    sharedWithDisplayName: sharedWithDisplayName,
+    sharedAt: sharedAt,
+    sharedWithMe: sharedWithMe,
+    url: url,
+    permissions: permissions,
+    token: token,
+    expireDate: expireDate,
+  );
 }
@@ -101,6 +101,7 @@ class FilesController extends ChangeNotifier
  NextcloudUserQuota? _quota;
  List<NextcloudActivity> _activities = [];
  bool _isLoading = false;
+  bool _activating = false;
  String? _errorMessage;

  FilesController(this.session) {
@@ -147,7 +148,10 @@ class FilesController extends ChangeNotifier
  CachePolicy get cachePolicy => _cachePolicy;
  int get cacheIntervalMinutes => _cacheIntervalMinutes;
  @override
-  bool get isLoading => _isLoading;
+  // Also true while a freshly activated account is still restoring prefs
+  // and while the session verifies it, so a switch shows a spinner instead
+  // of briefly flashing the empty-folder message.
+  bool get isLoading => _isLoading || _activating || session.isLoading;
  @override
  String? get errorMessage => _errorMessage;
  NextcloudUserQuota? get quota => _quota;
@@ -360,9 +364,16 @@ class FilesController extends ChangeNotifier
  }

  Future<void> _onAccountActivated() async {
-    await _restoreDisplayPrefs();
-    _startCacheRefreshTimerIfNeeded();
-    await refreshData();
+    _activating = true;
+    notifyListeners();
+    try {
+      await _restoreDisplayPrefs();
+      _startCacheRefreshTimerIfNeeded();
+      await refreshData();
+    } finally {
+      _activating = false;
+      notifyListeners();
+    }
  }

  @override
@@ -168,9 +168,9 @@ class ItemOperations {
      (c) => choices[c.item.id] == ConflictChoice.keepBoth,
    );
    final existingNames = needsKeepBoth
-        ? (await files.fetchFolderListing(destFolderPath))
-              .map((i) => i.name)
-              .toSet()
+        ? (await files.fetchFolderListing(
+            destFolderPath,
+          )).map((i) => i.name).toSet()
        : <String>{};

    var succeeded = 0;
@@ -303,6 +303,20 @@ class ItemOperations {
    }
  }

+  Future<bool> updateSharePermissions(
+    NextcloudShare share,
+    int permissions,
+  ) async {
+    final service = session.service;
+    if (service == null) return false;
+    try {
+      return await service.updateSharePermissions(share.id, permissions);
+    } catch (e) {
+      debugPrint('[ItemOperations] updateSharePermissions failed: $e');
+      return false;
+    }
+  }
+
  /// Deletes a share (from the file-details/Share sheet, not the Shares
  /// tab itself - see `SharesController.deleteShare` for that one, which
  /// additionally patches the tab's own list).
@@ -3,11 +3,17 @@ import 'package:shared_preferences/shared_preferences.dart';
 import '../models/app_tab.dart';
 import '../models/selection_action.dart';
 import '../theme/app_theme.dart';
+import '../widgets/noo/nav/noo_nav_style.dart';

 /// What swiping a Files list-view item left/right does, user-configurable
 /// in Settings.
 enum SwipeAction { none, favorite, delete, share }

+/// How the Android Upload FAB is sized: [auto] expands on Files/Photos and
+/// shrinks to an icon elsewhere, [mini] is always icon-only, [expanded]
+/// always shows the label.
+enum FabStyle { auto, mini, expanded }
+
 /// Thumb/track presets for the video player's seek bar, matching the four
 /// combinations offered by other Material You media players: a Material 3
 /// slider-style thumb ([classic]), an animated travelling wave with a round
@@ -30,6 +36,10 @@ class SettingsController extends ChangeNotifier {
  static const _prefDefaultTab = 'ui_default_tab';
  static const _prefSwipeLeftAction = 'ui_swipe_left_action';
  static const _prefSwipeRightAction = 'ui_swipe_right_action';
+  static const _prefFabStyle = 'ui_fab_style';
+  static const _prefBottomBarStyle = 'ui_bottom_bar_style';
+  static const _prefNavMenuStyle = 'ui_nav_menu_style';
+  static const _prefSearchInBottomBar = 'ui_search_in_bottom_bar';
  static const _prefAmoledDark = 'ui_amoled_dark';
  static const _prefMediaProgressBarStyle = 'ui_media_progress_bar_style';
  static const _prefTapTabToScrollTop = 'ui_tap_tab_to_scroll_top';
@@ -39,6 +49,9 @@ class SettingsController extends ChangeNotifier {

  Color _seedColor = AppTheme.defaultAccent;
  ThemeMode _themeMode = ThemeMode.system;
+  NooBottomBarStyle _bottomBarStyle = NooBottomBarStyle.attached;
+  NooNavMenuStyle _navMenuStyle = NooNavMenuStyle.drawer;
+  bool _searchInBottomBar = false;
  bool _useDynamicColor = true;
  bool _amoledDark = false;
  MediaProgressBarStyle _mediaProgressBarStyle = MediaProgressBarStyle.wavy;
@@ -54,6 +67,7 @@ class SettingsController extends ChangeNotifier {

  SwipeAction _swipeLeftAction = SwipeAction.delete;
  SwipeAction _swipeRightAction = SwipeAction.favorite;
+  FabStyle _fabStyle = FabStyle.auto;

  // A one-shot request for the shell to switch its active bottom-nav tab
  // (e.g. a search result landing on Files) - consumed and cleared by
@@ -80,11 +94,22 @@ class SettingsController extends ChangeNotifier {

  Color get seedColor => _seedColor;
  ThemeMode get themeMode => _themeMode;
+  NooBottomBarStyle get bottomBarStyle => _bottomBarStyle;
+  NooNavMenuStyle get navMenuStyle => _navMenuStyle;
+  bool get searchInBottomBar => _searchInBottomBar;
  bool get useDynamicColor => _useDynamicColor;
  bool get amoledDark => _amoledDark;
  MediaProgressBarStyle get mediaProgressBarStyle => _mediaProgressBarStyle;
  bool get tapTabToScrollTop => _tapTabToScrollTop;

+  /// The cap a screen should actually enforce for the *regular*, user-
+  /// reorderable tabs - one below [defaultMaxVisibleTabs] while
+  /// [searchInBottomBar] is on, since Search then takes that freed-up slot
+  /// itself (the row's last tab when attached, its own satellite circle
+  /// when floating - see `NooBottomBar`) rather than counting against it.
+  int get maxVisibleTabs =>
+      defaultMaxVisibleTabs - (_searchInBottomBar ? 1 : 0);
+
  /// Every tab in the user's configured order, including hidden ones — used
  /// by the reorder/visibility settings UI.
  List<AppTab> get tabOrder => _tabOrder;
@@ -103,6 +128,7 @@ class SettingsController extends ChangeNotifier {

  SwipeAction get swipeLeftAction => _swipeLeftAction;
  SwipeAction get swipeRightAction => _swipeRightAction;
+  FabStyle get fabStyle => _fabStyle;

  Future<void> _load() async {
    try {
@@ -115,6 +141,22 @@ class SettingsController extends ChangeNotifier {
          orElse: () => ThemeMode.system,
        );
      }
+      final bottomBarStyleName = prefs.getString(_prefBottomBarStyle);
+      if (bottomBarStyleName != null) {
+        _bottomBarStyle = NooBottomBarStyle.values.firstWhere(
+          (s) => s.name == bottomBarStyleName,
+          orElse: () => _bottomBarStyle,
+        );
+      }
+      final navMenuStyleName = prefs.getString(_prefNavMenuStyle);
+      if (navMenuStyleName != null) {
+        _navMenuStyle = NooNavMenuStyle.values.firstWhere(
+          (s) => s.name == navMenuStyleName,
+          orElse: () => _navMenuStyle,
+        );
+      }
+      _searchInBottomBar =
+          prefs.getBool(_prefSearchInBottomBar) ?? _searchInBottomBar;
      _useDynamicColor =
          prefs.getBool(_prefUseDynamicColor) ?? _useDynamicColor;
      _amoledDark = prefs.getBool(_prefAmoledDark) ?? _amoledDark;
@@ -208,6 +250,14 @@ class SettingsController extends ChangeNotifier {
        );
      }

+      final fabName = prefs.getString(_prefFabStyle);
+      if (fabName != null) {
+        _fabStyle = FabStyle.values.firstWhere(
+          (f) => f.name == fabName,
+          orElse: () => _fabStyle,
+        );
+      }
+
      notifyListeners();
    } catch (e) {
      debugPrint('[SettingsController] Preference restore failed: $e');
@@ -256,6 +306,32 @@ class SettingsController extends ChangeNotifier {
    _prefsFuture.then((p) => p.setString(_prefThemeMode, mode.name));
  }

+  void setBottomBarStyle(NooBottomBarStyle style) {
+    if (_bottomBarStyle == style) return;
+    _bottomBarStyle = style;
+    notifyListeners();
+    _prefsFuture.then((p) => p.setString(_prefBottomBarStyle, style.name));
+  }
+
+  void setNavMenuStyle(NooNavMenuStyle style) {
+    if (_navMenuStyle == style) return;
+    _navMenuStyle = style;
+    notifyListeners();
+    _prefsFuture.then((p) => p.setString(_prefNavMenuStyle, style.name));
+  }
+
+  /// Turning this on lowers [maxVisibleTabs] by one, so re-enforces the cap
+  /// immediately in case the user already has a full 5 regular tabs pinned
+  /// - same cleanup [_enforceMaxVisibleTabs] already does for a fresh
+  /// install/an app update adding a new tab.
+  void setSearchInBottomBar(bool value) {
+    if (_searchInBottomBar == value) return;
+    _searchInBottomBar = value;
+    if (value) _enforceMaxVisibleTabs();
+    notifyListeners();
+    _prefsFuture.then((p) => p.setBool(_prefSearchInBottomBar, value));
+  }
+
  void setTabOrder(List<AppTab> order) {
    _tabOrder = order;
    notifyListeners();
@@ -344,4 +420,11 @@ class SettingsController extends ChangeNotifier {
    notifyListeners();
    _prefsFuture.then((p) => p.setString(_prefSwipeRightAction, action.name));
  }
+
+  void setFabStyle(FabStyle style) {
+    if (_fabStyle == style) return;
+    _fabStyle = style;
+    notifyListeners();
+    _prefsFuture.then((p) => p.setString(_prefFabStyle, style.name));
+  }
 }
@@ -147,6 +147,19 @@ class NextcloudService {
    return response.bodyBytes;
  }

+  /// Overwrites the file at [itemPath] with [bytes] (WebDAV PUT) - used by
+  /// the in-app text editor. Returns whether the server accepted it.
+  Future<bool> putBytes(String itemPath, List<int> bytes) async {
+    final response = await http.put(
+      Uri.parse(fileUrl(itemPath)),
+      headers: _headers,
+      body: bytes,
+    );
+    return response.statusCode == 200 ||
+        response.statusCode == 201 ||
+        response.statusCode == 204;
+  }
+
  Future<bool> testConnection() async {
    try {
      final davPath = '$_cleanServerUrl/remote.php/dav/files/$username/';
@@ -1525,6 +1538,22 @@ class NextcloudService {
    return response.statusCode == 200;
  }

+  /// Changes a share's permission bitmask (1 read, 2 update, 4 create,
+  /// 8 delete, 16 reshare).
+  Future<bool> updateSharePermissions(String shareId, int permissions) async {
+    final url =
+        '$_cleanServerUrl/ocs/v2.php/apps/files_sharing/api/v1/shares/$shareId?format=json';
+    debugPrint('[Nextcloud OCS] Updating share $shareId permissions');
+
+    final response = await http.put(
+      Uri.parse(url),
+      headers: _headers,
+      body: {'permissions': '$permissions'},
+    );
+    debugPrint('[Nextcloud OCS] Update share status: ${response.statusCode}');
+    return response.statusCode == 200;
+  }
+
  NextcloudShare _shareFromJson(Map raw, {required bool sharedWithMe}) {
    final path = (raw['path'] ?? '/').toString();
    final segments = path.split('/').where((s) => s.isNotEmpty).toList();
@@ -356,8 +356,9 @@ class NooMotion {
 }

 /// The one shadow the design system allows, from `tokens/spacing.css`'s
-/// `--shadow-dialog` - desktop dialogs only. Nothing else in the app should
-/// use a `BoxShadow`.
+/// `--shadow-dialog` - desktop dialogs, and [NooBottomBarStyle.floating]'s
+/// bar/search satellite (the only other thing in the app that's genuinely
+/// floating above other content). Nothing else should use a `BoxShadow`.
 const nooDialogShadow = BoxShadow(
  color: Color(0x241E002F), // rgba(30,0,47,.14)
  blurRadius: 48,
@@ -1,5 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:lucide_icons_flutter/lucide_icons.dart';
 import '../theme/design_tokens.dart';
+import '../widgets/noo/lists/noo_grouped_list.dart';
+import '../widgets/noo/lists/noo_settings_row.dart';
 import '../widgets/noo/nav/noo_top_bar.dart';
 import '../widgets/noo/nav/noo_toolbar.dart';
 import '../widgets/noo/noo_layout.dart';
@@ -15,31 +18,73 @@ import '../widgets/settings/settings_tabs.dart';

 /// Settings, pushed on top of the shell (DESIGN_SYSTEM.md 4's 9-section
 /// order: account card, accounts, security, file sync, files cache,
-/// appearance, tabs, action bar, swipe on a file). One column of
-/// [SettingsSection]s (and [SettingsActionBarSection], which has no option
-/// rows of its own to put in one - just the reorder list) on mobile, each
-/// individually collapsible (expanded by default, tap its label to
-/// collapse - see `SettingsSection`/`NooGroupedList`'s `collapsible` param)
-/// so a long Settings screen can be collapsed down rather than needing a
-/// separate jump rail (an earlier version had one; it added a second,
-/// redundant way to navigate on top of plain scrolling and still didn't
-/// shorten the page). Desktop uses a 2-column grid of cards instead, wide
-/// enough to see most sections without scrolling, so it gets neither. See
-/// each `widgets/settings/*.dart` file for a section's own content and any
-/// setting that had to be slotted in or grouped under "Advanced appearance".
+/// appearance, tabs, action bar, swipe on a file).
+///
+/// Every layout (including wide tablet, in a centered 640px column) is
+/// a two-level menu, the way native iOS/Android Settings apps
+/// work: [SettingsAccountCard] (the account summary, not a settings picker)
+/// stays pinned at the top of a single top-level list ([_MobileMenu]), and
+/// every other section becomes one tappable [NooSettingsRow] - icon, title,
+/// chevron - in a [NooGroupedList] below it. Tapping a row pushes a new
+/// [_SettingsCategoryScreen] with its own [NooTopBar]/[NooTopBarBack],
+/// containing just that section's content full-screen. This replaces an
+/// earlier design where every section rendered inline in one long
+/// collapsible-sections column (`_MobileList`, since removed) - and before
+/// that, a trailing jump rail (an even earlier version) that scrolled that
+/// *same* page to an anchor. Both were rejected: the jump rail added a
+/// second, redundant way to navigate on top of plain scrolling without
+/// shortening the page, and the collapsible-sections column still left a
+/// long page to scroll past even collapsed. A genuinely separate pushed
+/// screen per category removes the scroll-depth problem outright, so
+/// neither a jump rail nor per-section collapsing is needed any more - see
+/// [SettingsSection]'s doc comment for how that reflects in its mobile
+/// layout. See each `widgets/settings/*.dart` file for a section's own
+/// content and any setting that had to be slotted in or grouped under
+/// "Advanced appearance".
 class AccountView extends StatelessWidget {
  const AccountView({super.key});

-  static const _sections = <Widget>[
-    SettingsAccountCard(),
-    SettingsAccountsSection(),
-    SettingsSecuritySection(),
-    SettingsFileSyncSection(),
-    SettingsFilesCacheSection(),
-    SettingsAppearanceSection(),
-    SettingsTabsSection(),
-    SettingsActionBarSection(),
-    SettingsSwipeSection(),
+  static final _categories = <_SettingsCategory>[
+    _SettingsCategory(
+      title: 'Accounts',
+      icon: LucideIcons.users,
+      builder: (_) => const SettingsAccountsSection(),
+    ),
+    _SettingsCategory(
+      title: 'Security',
+      icon: LucideIcons.lock,
+      builder: (_) => const SettingsSecuritySection(),
+    ),
+    _SettingsCategory(
+      title: 'File sync',
+      icon: LucideIcons.cloud,
+      builder: (_) => const SettingsFileSyncSection(),
+    ),
+    _SettingsCategory(
+      title: 'Files cache',
+      icon: LucideIcons.database,
+      builder: (_) => const SettingsFilesCacheSection(),
+    ),
+    _SettingsCategory(
+      title: 'Appearance',
+      icon: LucideIcons.sunMoon,
+      builder: (_) => const SettingsAppearanceSection(),
+    ),
+    _SettingsCategory(
+      title: 'Tabs',
+      icon: LucideIcons.layoutGrid,
+      builder: (_) => const SettingsTabsSection(),
+    ),
+    _SettingsCategory(
+      title: 'Action bar',
+      icon: LucideIcons.slidersHorizontal,
+      builder: (_) => const SettingsActionBarSection(),
+    ),
+    _SettingsCategory(
+      title: 'Swipe on a file',
+      icon: LucideIcons.chevronsLeftRight,
+      builder: (_) => const SettingsSwipeSection(),
+    ),
  ];

  @override
@@ -50,7 +95,7 @@ class AccountView extends StatelessWidget {
    return Scaffold(
      backgroundColor: colors.bg,
      appBar: desktop
-          ? const NooToolbar(title: 'Settings')
+          ? _desktopBar(context, 'Settings')
          : NooTopBar(
              style: NooLayout.navStyle(context),
              title: 'Settings',
@@ -59,19 +104,55 @@ class AccountView extends StatelessWidget {
      body: SafeArea(
        top: false,
        child: desktop
-            ? _DesktopGrid(sections: _sections)
-            : _MobileList(sections: _sections),
+            ? Center(
+                child: ConstrainedBox(
+                  constraints: const BoxConstraints(maxWidth: 640),
+                  child: _MobileMenu(categories: _categories),
+                ),
+              )
+            : _MobileMenu(categories: _categories),
      ),
    );
  }
 }

-class _MobileList extends StatelessWidget {
-  final List<Widget> sections;
-  const _MobileList({required this.sections});
+/// One row of [AccountView]'s mobile top-level menu: a title, a leading
+/// icon (reused from that section's own first/most-representative row, so
+/// the menu icon and the content the user lands on agree), and a builder
+/// for the section content shown on [_SettingsCategoryScreen].
+class _SettingsCategory {
+  final String title;
+  final IconData icon;
+  final WidgetBuilder builder;
+
+  _SettingsCategory({
+    required this.title,
+    required this.icon,
+    required this.builder,
+  });
+}
+
+/// The mobile top-level Settings list: [SettingsAccountCard] pinned above a
+/// single [NooGroupedList] of category rows, one per [AccountView._categories]
+/// entry - the menu half of the menu-then-pushed-screen pattern described on
+/// [AccountView]'s own doc comment.
+class _MobileMenu extends StatelessWidget {
+  final List<_SettingsCategory> categories;
+  const _MobileMenu({required this.categories});
+
+  void _open(BuildContext context, _SettingsCategory category) {
+    Navigator.push(
+      context,
+      MaterialPageRoute(
+        builder: (_) => _SettingsCategoryScreen(category: category),
+      ),
+    );
+  }

  @override
  Widget build(BuildContext context) {
+    final colors = context.nooColors;
+
    return ListView(
      padding: const EdgeInsets.fromLTRB(
        NooSpace.sm,
@@ -81,62 +162,96 @@ class _MobileList extends StatelessWidget {
      ),
      physics: const BouncingScrollPhysics(),
      children: [
-        for (final section in sections) ...[
-          section,
-          const SizedBox(height: NooSpace.xl),
-        ],
+        const SettingsAccountCard(),
+        const SizedBox(height: NooSpace.xl),
+        NooGroupedList(
+          children: [
+            for (final category in categories)
+              NooSettingsRow(
+                icon: category.icon,
+                label: Text(category.title),
+                trailing: Icon(
+                  LucideIcons.chevronRight,
+                  size: 18,
+                  color: colors.fg3,
+                ),
+                onTap: () => _open(context, category),
+              ),
+          ],
+        ),
      ],
    );
  }
 }

-/// Splits the sections between two columns rather than a strict grid, since
-/// each card's content height varies a lot (the tab reorder list and the
-/// accounts list can both run much taller than, say, Security) - a fixed
-/// grid would either clip content or leave large gaps.
-class _DesktopGrid extends StatelessWidget {
-  final List<Widget> sections;
-  const _DesktopGrid({required this.sections});
+/// A pushed, single-category Settings screen: [NooTopBar] titled with the
+/// category, a back button, and just that section's own content - the
+/// pushed half of [AccountView]'s mobile menu-then-screen pattern. Always
+/// built in a mobile-width context (desktop never opens this screen; it
+/// shows every section inline in its own grid instead), so the section
+/// widgets inside render their normal mobile layout unchanged.
+class _SettingsCategoryScreen extends StatelessWidget {
+  final _SettingsCategory category;
+  const _SettingsCategoryScreen({required this.category});

  @override
  Widget build(BuildContext context) {
-    final left = <Widget>[];
-    final right = <Widget>[];
-    for (var i = 0; i < sections.length; i++) {
-      (i.isEven ? left : right).add(sections[i]);
-    }
+    final colors = context.nooColors;
+    final desktop = NooLayout.isDesktop(context);

-    return SingleChildScrollView(
-      padding: const EdgeInsets.all(NooSpace.xl),
-      child: ConstrainedBox(
-        constraints: const BoxConstraints(maxWidth: 1040),
-        child: Row(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Expanded(child: _Column(children: left)),
-            const SizedBox(width: NooSpace.xl),
-            Expanded(child: _Column(children: right)),
-          ],
+    return Scaffold(
+      backgroundColor: colors.bg,
+      appBar: desktop
+          ? _desktopBar(context, category.title)
+          : NooTopBar(
+              style: NooLayout.navStyle(context),
+              title: category.title,
+              leading: const NooTopBarBack(),
+            ),
+      body: SafeArea(
+        top: false,
+        child: Center(
+          child: ConstrainedBox(
+            constraints: BoxConstraints(
+              maxWidth: desktop ? 640 : double.infinity,
+            ),
+            child: ListView(
+              padding: const EdgeInsets.fromLTRB(
+                NooSpace.sm,
+                NooSpace.sm,
+                NooSpace.sm,
+                NooSpace.xxl,
+              ),
+              physics: const BouncingScrollPhysics(),
+              children: [category.builder(context)],
+            ),
+          ),
        ),
      ),
    );
  }
 }

-class _Column extends StatelessWidget {
-  final List<Widget> children;
-  const _Column({required this.children});
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        for (final child in children) ...[
-          child,
-          const SizedBox(height: NooSpace.xl),
-        ],
-      ],
-    );
-  }
+PreferredSizeWidget _desktopBar(BuildContext context, String title) {
+  final top = MediaQuery.paddingOf(context).top;
+  return PreferredSize(
+    preferredSize: Size.fromHeight(NooToolbar.outerHeight + top),
+    child: Padding(
+      padding: EdgeInsets.only(top: top),
+      child: NooToolbar(
+        titleWidget: Row(
+          mainAxisSize: MainAxisSize.min,
+          spacing: NooSpace.sm,
+          children: [
+            IconButton(
+              icon: const Icon(LucideIcons.arrowLeft),
+              tooltip: 'Back',
+              onPressed: () => Navigator.maybePop(context),
+            ),
+            Text(title),
+          ],
+        ),
+      ),
+    ),
+  );
 }
@@ -29,7 +29,11 @@ import '../widgets/tabs/tab_state_slivers.dart';
 class ActivityView extends StatelessWidget {
  final ScrollController scrollController;

-  const ActivityView({super.key, required this.scrollController});
+  /// This tab's own shell top bar, planted as its first sliver - see
+  /// `buildAppTabView`'s doc comment. Null on desktop and while picking.
+  final PreferredSizeWidget? topBar;
+
+  const ActivityView({super.key, required this.scrollController, this.topBar});

  @override
  Widget build(BuildContext context) {
@@ -90,17 +94,25 @@ class ActivityView extends StatelessWidget {
    }

    final List<Widget> contentSlivers = [
+      if (topBar != null) topBarSliver(topBar!),
      const SliverToBoxAdapter(child: SizedBox(height: NooSpace.md)),
      feed,
-      ...tabBottomInsetSlivers,
+      ...tabBottomInsetSlivers(context),
    ];

-    final scrollView = CustomScrollView(
-      controller: scrollController,
-      // See files_view.dart's identical fix - without this, pull-to-
-      // refresh can't be triggered on an empty or single-item feed.
-      physics: const AlwaysScrollableScrollPhysics(),
-      slivers: contentSlivers,
+    // See files_view.dart's identical fix - without this, the sticky
+    // controls row rides up under the status bar once the floating top bar
+    // above it fully collapses.
+    final scrollView = SafeArea(
+      top: true,
+      bottom: false,
+      child: CustomScrollView(
+        controller: scrollController,
+        // See files_view.dart's identical fix - without this, pull-to-
+        // refresh can't be triggered on an empty or single-item feed.
+        physics: const AlwaysScrollableScrollPhysics(),
+        slivers: contentSlivers,
+      ),
    );

    return ColoredBox(
@@ -29,6 +29,7 @@ import '../widgets/noo/overlays/noo_sheet.dart';
 import '../widgets/noo/core/noo_button.dart';
 import '../widgets/share_sheet.dart';
 import '../widgets/sticky_header_delegate.dart';
+import '../widgets/tabs/tab_state_slivers.dart';
 import '../widgets/synced_header_scaffold.dart' show formatBytes;
 import 'file_viewer_screen.dart';
 import 'move_copy_destination_picker.dart';
@@ -50,7 +51,11 @@ import 'move_copy_destination_picker.dart';
 class FavoritesView extends StatefulWidget {
  final ScrollController scrollController;

-  const FavoritesView({super.key, required this.scrollController});
+  /// This tab's own shell top bar, planted as its first sliver - see
+  /// `buildAppTabView`'s doc comment. Null on desktop and while picking.
+  final PreferredSizeWidget? topBar;
+
+  const FavoritesView({super.key, required this.scrollController, this.topBar});

  @override
  State<FavoritesView> createState() => _FavoritesViewState();
@@ -507,6 +512,7 @@ class _FavoritesViewState extends State<FavoritesView> {
    );

    final contentSlivers = <Widget>[
+      if (widget.topBar != null) topBarSliver(widget.topBar!),
      SliverPersistentHeader(
        pinned: !_isSelecting,
        delegate: StickyHeaderDelegate(
@@ -580,7 +586,9 @@ class _FavoritesViewState extends State<FavoritesView> {
          ),
          sliver: SliverGrid(
            gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-              crossAxisCount: isDesktop ? 5 : 2,
+              crossAxisCount: isDesktop
+                  ? 5
+                  : NooLayout.gridColumns(context, phone: 2, minTile: 180),
              crossAxisSpacing: isDesktop ? 16 : 10,
              mainAxisSpacing: isDesktop ? 16 : 10,
              childAspectRatio: isDesktop ? 0.92 : 0.85,
@@ -638,7 +646,7 @@ class _FavoritesViewState extends State<FavoritesView> {
            }, childCount: favorites.length),
          ),
        ),
-      const SliverToBoxAdapter(child: SizedBox(height: 100)),
+      SliverToBoxAdapter(child: SizedBox(height: bottomBarClearance(context))),
    ];

    return PopScope(
@@ -652,12 +660,19 @@ class _FavoritesViewState extends State<FavoritesView> {
          color: colors.accent,
          backgroundColor: colors.surface,
          onRefresh: favoritesController.fetchAll,
-          child: CustomScrollView(
-            controller: widget.scrollController,
-            // See files_view.dart's identical fix - without this, pull-to-
-            // refresh can't be triggered on an empty or single-item list.
-            physics: const AlwaysScrollableScrollPhysics(),
-            slivers: contentSlivers,
+          // See files_view.dart's identical fix - without this, the sticky
+          // controls row rides up under the status bar once the floating
+          // top bar above it fully collapses.
+          child: SafeArea(
+            top: true,
+            bottom: false,
+            child: CustomScrollView(
+              controller: widget.scrollController,
+              // See files_view.dart's identical fix - without this, pull-to-
+              // refresh can't be triggered on an empty or single-item list.
+              physics: const AlwaysScrollableScrollPhysics(),
+              slivers: contentSlivers,
+            ),
          ),
        ),
      ),
@@ -21,6 +21,7 @@ import '../widgets/noo/overlays/noo_overlay_header.dart';
 import '../widgets/noo/overlays/noo_sheet.dart';
 import '../widgets/share_sheet.dart';
 import '../widgets/viewer/media_action_bar.dart';
+import '../widgets/viewer/media_details_panel.dart';
 import '../widgets/viewer/media_image_preview.dart';
 import '../widgets/viewer/media_pdf_preview.dart';
 import '../widgets/viewer/media_text_preview.dart';
@@ -154,6 +155,43 @@ class _FileViewerScreenState extends State<FileViewerScreen> {
  /// also drag the gallery to the next item.
  bool _isZoomed = false;

+  final Map<int, Offset> _pointerStart = {};
+  bool _multiTouch = false;
+
+  void _onPointerDown(PointerDownEvent e) {
+    if (_pointerStart.isNotEmpty) _multiTouch = true;
+    _pointerStart[e.pointer] = e.position;
+  }
+
+  // Raw pointer events rather than a drag recognizer, so this never competes
+  // with the PageView / InteractiveViewer gestures in the arena.
+  void _onPointerUp(PointerUpEvent e) {
+    final start = _pointerStart.remove(e.pointer);
+    final wasMulti = _multiTouch;
+    if (_pointerStart.isEmpty) _multiTouch = false;
+    if (start == null || wasMulti || _isZoomed || !_isSwipeable) return;
+    final delta = e.position - start;
+    if (delta.dy < -80 && delta.dy.abs() > delta.dx.abs() * 1.5) {
+      _openDetails();
+    }
+  }
+
+  final _panelKey = GlobalKey<MediaDetailsPanelState>();
+
+  void _openDetails() {
+    if (NooLayout.isDesktop(context)) {
+      DetailsSheet.show(context, _currentItem);
+      return;
+    }
+    setState(() => _controlsVisible = true);
+    _panelKey.currentState?.expand();
+  }
+
+  void _onPointerCancel(PointerCancelEvent e) {
+    _pointerStart.remove(e.pointer);
+    if (_pointerStart.isEmpty) _multiTouch = false;
+  }
+
  NextcloudItem get _currentItem => _mediaItems[_currentIndex];

  bool get _isOffline => widget.localPathResolver != null;
@@ -394,13 +432,25 @@ class _FileViewerScreenState extends State<FileViewerScreen> {
      backgroundColor: stageColor,
      body: GestureDetector(
        behavior: HitTestBehavior.opaque,
-        onTap: () => setState(() => _controlsVisible = !_controlsVisible),
+        onTap: () {
+          final panel = _panelKey.currentState;
+          if (panel != null && panel.isExpanded) {
+            panel.collapse();
+            return;
+          }
+          setState(() => _controlsVisible = !_controlsVisible);
+        },
        child: Stack(
          children: [
            Positioned.fill(
-              child: Container(
-                color: stageColor,
-                child: _buildBody(context, session),
+              child: Listener(
+                onPointerDown: _onPointerDown,
+                onPointerUp: _onPointerUp,
+                onPointerCancel: _onPointerCancel,
+                child: Container(
+                  color: stageColor,
+                  child: _buildBody(context, session),
+                ),
              ),
            ),
            if (_downloadProgress != null)
@@ -522,25 +572,35 @@ class _FileViewerScreenState extends State<FileViewerScreen> {
                offset: _controlsVisible ? Offset.zero : const Offset(0, 1.4),
                child: IgnorePointer(
                  ignoring: !_controlsVisible,
-                  child: MediaActionBar(
-                    isFavorite: _currentItem.isFavorite,
-                    isBusy: _isBusy,
-                    // Favorite/delete/download-to-device all need a live
-                    // server - hidden rather than shown-and-failing while
-                    // browsing an already-local file from the Offline tab.
-                    showServerActions: !_isOffline,
-                    transportControls:
-                        _isSwipeable &&
-                            _currentItem.type == NextcloudItemType.video &&
-                            _videoController != null
-                        ? VideoTransportControls(controller: _videoController!)
-                        : null,
-                    onShare: () => ShareSheet.show(context, _currentItem),
-                    onFavorite: () => _toggleFavorite(ops),
-                    onDelete: () => _deleteCurrentItem(ops),
-                    onOpenExternally: () => _openExternally(session),
-                    onDownload: () => _downloadToDevice(session),
-                    onDetails: () => DetailsSheet.show(context, _currentItem),
+                  child: MediaDetailsPanel(
+                    key: _panelKey,
+                    item: _currentItem,
+                    builder: (context, handle, below) => MediaActionBar(
+                      onDetails: NooLayout.isDesktop(context)
+                          ? _openDetails
+                          : null,
+                      handle: NooLayout.isDesktop(context) ? null : handle,
+                      below: NooLayout.isDesktop(context) ? null : below,
+                      isFavorite: _currentItem.isFavorite,
+                      isBusy: _isBusy,
+                      // Favorite/delete/download-to-device all need a live
+                      // server - hidden rather than shown-and-failing while
+                      // browsing an already-local file from the Offline tab.
+                      showServerActions: !_isOffline,
+                      transportControls:
+                          _isSwipeable &&
+                              _currentItem.type == NextcloudItemType.video &&
+                              _videoController != null
+                          ? VideoTransportControls(
+                              controller: _videoController!,
+                            )
+                          : null,
+                      onShare: () => ShareSheet.show(context, _currentItem),
+                      onFavorite: () => _toggleFavorite(ops),
+                      onDelete: () => _deleteCurrentItem(ops),
+                      onOpenExternally: () => _openExternally(session),
+                      onDownload: () => _downloadToDevice(session),
+                    ),
                  ),
                ),
              ),
@@ -659,6 +719,9 @@ class _FileViewerScreenState extends State<FileViewerScreen> {
      default:
        if (_isPdf) {
          return MediaPdfPreview(
+            topInset: _controlsVisible
+                ? MediaQuery.paddingOf(context).top + 60
+                : 0,
            item: widget.item,
            session: session,
            localPathResolver: widget.localPathResolver,
@@ -39,10 +39,12 @@ import '../widgets/noo/lists/noo_selection_bar.dart';
 import '../widgets/noo/lists/noo_settings_row.dart';
 import '../widgets/noo/lists/noo_summary_card.dart';
 import '../widgets/noo/media/noo_grid_card.dart';
+import '../widgets/noo/nav/noo_bottom_bar.dart';
 import '../widgets/noo/noo_layout.dart';
 import '../widgets/noo/overlays/noo_sheet.dart';
 import '../widgets/share_sheet.dart';
 import '../widgets/sticky_header_delegate.dart';
+import '../widgets/tabs/tab_state_slivers.dart';
 import '../widgets/synced_header_scaffold.dart' show formatBytes;
 import 'file_viewer_screen.dart';
 import 'move_copy_destination_picker.dart';
@@ -59,10 +61,15 @@ class FilesView extends StatefulWidget {
  final ScrollController scrollController;
  final bool offline;

+  /// This tab's own shell top bar, planted as its first sliver - see
+  /// `buildAppTabView`'s doc comment. Null on desktop and while picking.
+  final PreferredSizeWidget? topBar;
+
  const FilesView({
    super.key,
    required this.scrollController,
    this.offline = false,
+    this.topBar,
  });

  @override
@@ -653,6 +660,7 @@ class _FilesViewState extends State<FilesView> {
          );

    final List<Widget> contentSlivers = [
+      if (widget.topBar != null) topBarSliver(widget.topBar!),
      // Pinned in both states - while browsing this is the controls row
      // (+ breadcrumbs), while selecting it's the selection bar (see
      // `topRow` above): either way it's the one thing that always stays
@@ -746,7 +754,9 @@ class _FilesViewState extends State<FilesView> {
          ),
          sliver: SliverGrid(
            gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-              crossAxisCount: isDesktop ? 5 : 2,
+              crossAxisCount: isDesktop
+                  ? 5
+                  : NooLayout.gridColumns(context, phone: 2, minTile: 180),
              childAspectRatio: isDesktop ? 1.05 : 0.92,
              crossAxisSpacing: isDesktop ? 16 : 10,
              mainAxisSpacing: isDesktop ? 16 : 10,
@@ -815,6 +825,15 @@ class _FilesViewState extends State<FilesView> {
            }, childCount: browser.items.length),
          ),
        ),
+      // List/grid/table above only pad NooSpace.lg at the bottom - plenty
+      // once Scaffold shrinks the body above an attached bar, but floating
+      // draws the body behind the bar instead, so it needs the bar's own
+      // footprint added on top or the last row ends up under it.
+      if (context.watch<SettingsController>().bottomBarStyle ==
+          NooBottomBarStyle.floating)
+        SliverToBoxAdapter(
+          child: SizedBox(height: bottomBarClearance(context)),
+        ),
    ];

    return PopScope(
@@ -836,14 +855,30 @@ class _FilesViewState extends State<FilesView> {
            unawaited(sync.syncOnPull());
            return browser.reload();
          },
-          child: CustomScrollView(
-            controller: widget.scrollController,
-            // Pull-to-refresh needs a scroll physics that allows dragging
-            // past the edge even when content doesn't fill the viewport -
-            // an empty or single-item list otherwise can't be pulled at all
-            // under the platform default physics.
-            physics: const AlwaysScrollableScrollPhysics(),
-            slivers: contentSlivers,
+          // `topBarSliver`'s floating header can collapse all the way to
+          // zero height (fully scrolled away), at which point the sticky
+          // controls row right below it in `contentSlivers` would otherwise
+          // ride up underneath the status bar instead of stopping below it
+          // - the floating top bar used to be the only thing reserving that
+          // space (via its own internal `SafeArea`), and that reservation
+          // disappears along with it once it's fully hidden. Wrapping the
+          // whole scroll view keeps the inset outside the scrolling region
+          // entirely, so it's never implicated in the floating header's own
+          // collapse/reveal math - safe to apply unconditionally, since
+          // desktop's `MediaQuery.padding.top` is 0 anyway (no topBar / no
+          // status bar there).
+          child: SafeArea(
+            top: true,
+            bottom: false,
+            child: CustomScrollView(
+              controller: widget.scrollController,
+              // Pull-to-refresh needs a scroll physics that allows dragging
+              // past the edge even when content doesn't fill the viewport -
+              // an empty or single-item list otherwise can't be pulled at
+              // all under the platform default physics.
+              physics: const AlwaysScrollableScrollPhysics(),
+              slivers: contentSlivers,
+            ),
          ),
        ),
      ),
@@ -1290,6 +1325,9 @@ class _FilesViewState extends State<FilesView> {
      selected: isSelected,
      thumbnail: _rowThumbnail(context, item, session, NooFileTileSize.desktop),
      onTap: () => _handleItemTap(context, item, picking: picking),
+      onLongPress: _offline || (picking && !pick.pickRequest!.allowMultiple)
+          ? null
+          : () => _toggleSelection(item),
      onMore: !_isSelecting && !picking
          ? () => _showItemActions(context, item)
          : null,
@@ -284,7 +284,9 @@ class _MoveCopyDestinationPickerState extends State<MoveCopyDestinationPicker> {
          padding: EdgeInsets.symmetric(horizontal: gutter),
          sliver: SliverGrid(
            gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-              crossAxisCount: desktop ? 5 : 2,
+              crossAxisCount: desktop
+                  ? 5
+                  : NooLayout.gridColumns(context, phone: 2, minTile: 180),
              childAspectRatio: desktop ? 1.05 : 0.92,
              crossAxisSpacing: desktop ? 16 : 10,
              mainAxisSpacing: desktop ? 16 : 10,
@@ -30,6 +30,7 @@ import '../widgets/noo/overlays/noo_sheet.dart';
 import '../widgets/share_sheet.dart';
 import '../widgets/sort_menu_button.dart' show sortFieldLabel;
 import '../widgets/sticky_header_delegate.dart';
+import '../widgets/tabs/tab_state_slivers.dart';
 import 'file_viewer_screen.dart';
 import 'move_copy_destination_picker.dart';

@@ -53,7 +54,11 @@ class _MonthGroup {
 class PhotosView extends StatefulWidget {
  final ScrollController scrollController;

-  const PhotosView({super.key, required this.scrollController});
+  /// This tab's own shell top bar, planted as its first sliver - see
+  /// `buildAppTabView`'s doc comment. Null on desktop and while picking.
+  final PreferredSizeWidget? topBar;
+
+  const PhotosView({super.key, required this.scrollController, this.topBar});

  @override
  State<PhotosView> createState() => _PhotosViewState();
@@ -239,6 +244,7 @@ class _PhotosViewState extends State<PhotosView> {
    );

    final List<Widget> contentSlivers = [
+      if (widget.topBar != null) topBarSliver(widget.topBar!),
      // Sticky while browsing; once selecting, the selection bar takes over
      // the same slot instead.
      SliverPersistentHeader(
@@ -336,7 +342,11 @@ class _PhotosViewState extends State<PhotosView> {
            itemCount: group.items.length,
            columns: isDesktop
                ? NooPhotoGrid.desktopColumns
-                : NooPhotoGrid.mobileColumns,
+                : NooLayout.gridColumns(
+                    context,
+                    phone: NooPhotoGrid.mobileColumns,
+                    minTile: 130,
+                  ),
            gap: isDesktop ? NooPhotoGrid.desktopGap : NooPhotoGrid.mobileGap,
            padding: EdgeInsets.symmetric(
              horizontal: isDesktop ? NooLayout.gutter(context) : 0,
@@ -346,9 +356,10 @@ class _PhotosViewState extends State<PhotosView> {
          ),
        ],

-      // Fixed clearance so the last row isn't hidden behind the floating
-      // nav bar, regardless of grid length.
-      const SliverToBoxAdapter(child: SizedBox(height: 100)),
+      // Clearance so the last row isn't hidden behind the nav bar,
+      // regardless of grid length - see `bottomBarClearance`'s own doc
+      // comment for why this has to be dynamic rather than a flat 100.
+      SliverToBoxAdapter(child: SizedBox(height: bottomBarClearance(context))),
    ];

    return PopScope(
@@ -362,12 +373,19 @@ class _PhotosViewState extends State<PhotosView> {
          color: colors.accent,
          backgroundColor: colors.surface,
          onRefresh: photosController.fetchAllMedia,
-          child: CustomScrollView(
-            controller: widget.scrollController,
-            // See files_view.dart's identical fix - without this, pull-to-
-            // refresh can't be triggered on an empty or single-item list.
-            physics: const AlwaysScrollableScrollPhysics(),
-            slivers: contentSlivers,
+          // See files_view.dart's identical fix - without this, the sticky
+          // controls row rides up under the status bar once the floating
+          // top bar above it fully collapses.
+          child: SafeArea(
+            top: true,
+            bottom: false,
+            child: CustomScrollView(
+              controller: widget.scrollController,
+              // See files_view.dart's identical fix - without this, pull-to-
+              // refresh can't be triggered on an empty or single-item list.
+              physics: const AlwaysScrollableScrollPhysics(),
+              slivers: contentSlivers,
+            ),
          ),
        ),
      ),
@@ -27,7 +27,11 @@ import 'file_viewer_screen.dart';
 class RecentView extends StatefulWidget {
  final ScrollController scrollController;

-  const RecentView({super.key, required this.scrollController});
+  /// This tab's own shell top bar, planted as its first sliver - see
+  /// `buildAppTabView`'s doc comment. Null on desktop and while picking.
+  final PreferredSizeWidget? topBar;
+
+  const RecentView({super.key, required this.scrollController, this.topBar});

  @override
  State<RecentView> createState() => _RecentViewState();
@@ -54,6 +58,7 @@ class _RecentViewState extends State<RecentView> {
    );

    final List<Widget> contentSlivers = [
+      if (widget.topBar != null) topBarSliver(widget.topBar!),
      const SliverToBoxAdapter(child: SizedBox(height: NooSpace.md)),
      if (recent.isLoading && items.isEmpty)
        tabLoadingSliver
@@ -74,7 +79,7 @@ class _RecentViewState extends State<RecentView> {
        _buildDesktopTable(context, groups)
      else
        _buildMobileGroups(context, groups),
-      ...tabBottomInsetSlivers,
+      ...tabBottomInsetSlivers(context),
    ];

    return ColoredBox(
@@ -83,12 +88,19 @@ class _RecentViewState extends State<RecentView> {
        color: colors.accent,
        backgroundColor: colors.surface,
        onRefresh: recent.fetchAll,
-        child: CustomScrollView(
-          controller: widget.scrollController,
-          // See files_view.dart's identical fix - without this, pull-to-
-          // refresh can't be triggered on an empty or single-item list.
-          physics: const AlwaysScrollableScrollPhysics(),
-          slivers: contentSlivers,
+        // See files_view.dart's identical fix - without this, the sticky
+        // controls row rides up under the status bar once the floating top
+        // bar above it fully collapses.
+        child: SafeArea(
+          top: true,
+          bottom: false,
+          child: CustomScrollView(
+            controller: widget.scrollController,
+            // See files_view.dart's identical fix - without this, pull-to-
+            // refresh can't be triggered on an empty or single-item list.
+            physics: const AlwaysScrollableScrollPhysics(),
+            slivers: contentSlivers,
+          ),
        ),
      ),
    );
@@ -209,7 +209,9 @@ class _ShareUploadViewState extends State<ShareUploadView> {
          padding: EdgeInsets.symmetric(horizontal: gutter),
          sliver: SliverGrid(
            gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-              crossAxisCount: desktop ? 5 : 2,
+              crossAxisCount: desktop
+                  ? 5
+                  : NooLayout.gridColumns(context, phone: 2, minTile: 180),
              childAspectRatio: desktop ? 1.05 : 0.92,
              crossAxisSpacing: desktop ? 16 : 10,
              mainAxisSpacing: desktop ? 16 : 10,
@@ -53,7 +53,11 @@ String _permissionLabel(int permissions) {
 class SharesView extends StatefulWidget {
  final ScrollController scrollController;

-  const SharesView({super.key, required this.scrollController});
+  /// This tab's own shell top bar, planted as its first sliver - see
+  /// `buildAppTabView`'s doc comment. Null on desktop and while picking.
+  final PreferredSizeWidget? topBar;
+
+  const SharesView({super.key, required this.scrollController, this.topBar});

  @override
  State<SharesView> createState() => _SharesViewState();
@@ -81,6 +85,7 @@ class _SharesViewState extends State<SharesView> {
    final isDesktop = NooLayout.isDesktop(context);

    final List<Widget> contentSlivers = [
+      if (widget.topBar != null) topBarSliver(widget.topBar!),
      SliverPadding(
        padding: EdgeInsets.fromLTRB(
          NooLayout.gutter(context),
@@ -120,7 +125,7 @@ class _SharesViewState extends State<SharesView> {
        _buildDesktopTable(context, shares)
      else
        _buildMobileList(context, shares),
-      ...tabBottomInsetSlivers,
+      ...tabBottomInsetSlivers(context),
    ];

    return ColoredBox(
@@ -129,12 +134,19 @@ class _SharesViewState extends State<SharesView> {
        color: colors.accent,
        backgroundColor: colors.surface,
        onRefresh: sharesController.fetchAll,
-        child: CustomScrollView(
-          controller: widget.scrollController,
-          // See files_view.dart's identical fix - without this, pull-to-
-          // refresh can't be triggered on an empty or single-item list.
-          physics: const AlwaysScrollableScrollPhysics(),
-          slivers: contentSlivers,
+        // See files_view.dart's identical fix - without this, the sticky
+        // controls row rides up under the status bar once the floating top
+        // bar above it fully collapses.
+        child: SafeArea(
+          top: true,
+          bottom: false,
+          child: CustomScrollView(
+            controller: widget.scrollController,
+            // See files_view.dart's identical fix - without this, pull-to-
+            // refresh can't be triggered on an empty or single-item list.
+            physics: const AlwaysScrollableScrollPhysics(),
+            slivers: contentSlivers,
+          ),
        ),
      ),
    );
@@ -25,7 +25,11 @@ import '../widgets/tabs/tab_state_slivers.dart';
 class TrashView extends StatefulWidget {
  final ScrollController scrollController;

-  const TrashView({super.key, required this.scrollController});
+  /// This tab's own shell top bar, planted as its first sliver - see
+  /// `buildAppTabView`'s doc comment. Null on desktop and while picking.
+  final PreferredSizeWidget? topBar;
+
+  const TrashView({super.key, required this.scrollController, this.topBar});

  @override
  State<TrashView> createState() => _TrashViewState();
@@ -50,6 +54,7 @@ class _TrashViewState extends State<TrashView> {
    final isDesktop = NooLayout.isDesktop(context);

    final List<Widget> contentSlivers = [
+      if (widget.topBar != null) topBarSliver(widget.topBar!),
      SliverPadding(
        padding: EdgeInsets.fromLTRB(
          NooLayout.gutter(context),
@@ -89,7 +94,7 @@ class _TrashViewState extends State<TrashView> {
        _buildDesktopTable(context, trash)
      else
        _buildMobileList(context, trash),
-      ...tabBottomInsetSlivers,
+      ...tabBottomInsetSlivers(context),
    ];

    return ColoredBox(
@@ -98,12 +103,19 @@ class _TrashViewState extends State<TrashView> {
        color: colors.accent,
        backgroundColor: colors.surface,
        onRefresh: trashController.fetchAll,
-        child: CustomScrollView(
-          controller: widget.scrollController,
-          // See files_view.dart's identical fix - without this, pull-to-
-          // refresh can't be triggered on an empty or single-item list.
-          physics: const AlwaysScrollableScrollPhysics(),
-          slivers: contentSlivers,
+        // See files_view.dart's identical fix - without this, the sticky
+        // controls row rides up under the status bar once the floating top
+        // bar above it fully collapses.
+        child: SafeArea(
+          top: true,
+          bottom: false,
+          child: CustomScrollView(
+            controller: widget.scrollController,
+            // See files_view.dart's identical fix - without this, pull-to-
+            // refresh can't be triggered on an empty or single-item list.
+            physics: const AlwaysScrollableScrollPhysics(),
+            slivers: contentSlivers,
+          ),
        ),
      ),
    );
@@ -11,7 +11,20 @@ import '../views/trash_view.dart';
 /// Builds the view widget for a given [AppTab]. Shared by the main shell
 /// (for visible tabs) and the "more tabs" dropdown (for launching a tab
 /// that's currently hidden from the bottom nav bar).
-Widget buildAppTabView(AppTab tab, ScrollController controller) {
+///
+/// [topBar], when given, is that tab's own [AppTopBar] instance (built by
+/// the caller, which owns `NooLayout.navStyle`/pick-mode/search-in-bottom-
+/// bar state) - each view plants it as its own first sliver (see
+/// `topBarSliver` in `tabs/tab_state_slivers.dart`) so it scrolls away and
+/// reappears independently, tied to that tab's own `ScrollController`
+/// rather than living in the shared `Scaffold.appBar`. Null on desktop
+/// (which shows `NooToolbar` instead) and while picking (no top bar at
+/// all), matching `Scaffold.appBar`'s old `pickRequest == null` guard.
+Widget buildAppTabView(
+  AppTab tab,
+  ScrollController controller, {
+  PreferredSizeWidget? topBar,
+}) {
  switch (tab) {
    case AppTab.files:
      // Keyed so the Files and Offline tabs (same widget type) never share
@@ -19,24 +32,26 @@ Widget buildAppTabView(AppTab tab, ScrollController controller) {
      return FilesView(
        key: const ValueKey('files'),
        scrollController: controller,
+        topBar: topBar,
      );
    case AppTab.photos:
-      return PhotosView(scrollController: controller);
+      return PhotosView(scrollController: controller, topBar: topBar);
    case AppTab.favorites:
-      return FavoritesView(scrollController: controller);
+      return FavoritesView(scrollController: controller, topBar: topBar);
    case AppTab.activity:
-      return ActivityView(scrollController: controller);
+      return ActivityView(scrollController: controller, topBar: topBar);
    case AppTab.trash:
-      return TrashView(scrollController: controller);
+      return TrashView(scrollController: controller, topBar: topBar);
    case AppTab.shares:
-      return SharesView(scrollController: controller);
+      return SharesView(scrollController: controller, topBar: topBar);
    case AppTab.recent:
-      return RecentView(scrollController: controller);
+      return RecentView(scrollController: controller, topBar: topBar);
    case AppTab.offline:
      return FilesView(
        key: const ValueKey('offline'),
        scrollController: controller,
        offline: true,
+        topBar: topBar,
      );
  }
 }
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:lucide_icons_flutter/lucide_icons.dart';
 import '../models/app_tab.dart';
+import 'avatar_menu.dart';
 import 'create_menu.dart';
 import 'noo/nav/noo_top_bar.dart';
 import 'shell/shell_common.dart';
@@ -13,19 +14,40 @@ import 'shell/shell_common.dart';
 /// - iOS: `menu` leading, `plus` (Files only - no tab besides Files has a
 ///   create/upload flow) and the account avatar trailing, then the large
 ///   title, then an inline search field that opens [SearchView].
-/// - Android: `menu`, title, `search` and avatar actions. Upload has no
-///   top-bar icon here - it's the [NooFab] `MainShellView` shows instead.
+/// - Android: `menu`, title, avatar actions. Upload has no top-bar icon
+///   here - it's the [NooFab] `MainShellView` shows instead. When search
+///   isn't in the bottom bar, an inline search-field-styled launcher
+///   (`androidTitleTrailing`) sits to the title's own right, rather than a
+///   bare search icon over in `actions`.
 ///
 /// [style] is resolved by the caller (`NooLayout.navStyle`) rather than
 /// read from context here, since [preferredSize] is a plain getter with no
 /// BuildContext - the same reason [NooTopBar] itself takes it as a field.
+/// [searchInBottomBar] is [SettingsController.searchInBottomBar], passed in
+/// for the same reason: it hides this bar's own search field/icon so
+/// there's only ever one search entry point on screen once the bottom bar
+/// has taken it over. [navMenuStyle] is
+/// [SettingsController.navMenuStyle]: [NooNavMenuStyle.drawer] wires the
+/// `menu` icon to `Scaffold.of(context).openDrawer()` as before;
+/// [NooNavMenuStyle.avatarMenu] drops that icon (`onMenu: null`) and makes
+/// the avatar button open `showAvatarMenu` instead of the account
+/// switcher.
 class AppTopBar extends StatelessWidget implements PreferredSizeWidget {
  final NooNavStyle style;
  final AppTab tab;
+  final bool searchInBottomBar;
+  final NooNavMenuStyle navMenuStyle;

-  const AppTopBar({super.key, required this.style, required this.tab});
+  const AppTopBar({
+    super.key,
+    required this.style,
+    required this.tab,
+    this.searchInBottomBar = false,
+    this.navMenuStyle = NooNavMenuStyle.drawer,
+  });

  bool get _ios => style == NooNavStyle.ios;
+  bool get _showSearch => !searchInBottomBar;

  @override
  Size get preferredSize => NooTopBar(
@@ -34,7 +56,7 @@ class AppTopBar extends StatelessWidget implements PreferredSizeWidget {
    // A throwaway placeholder purely to make preferredSize's "is there a
    // search slot" check match what build() actually shows - never
    // inserted into the tree, so its content doesn't matter.
-    search: _ios ? const SizedBox.shrink() : null,
+    search: _ios && _showSearch ? const SizedBox.shrink() : null,
  ).preferredSize;

  @override
@@ -42,23 +64,33 @@ class AppTopBar extends StatelessWidget implements PreferredSizeWidget {
    return NooTopBar(
      style: style,
      title: tab.label,
-      onMenu: () => Scaffold.of(context).openDrawer(),
+      onMenu: navMenuStyle == NooNavMenuStyle.drawer
+          ? () => Scaffold.of(context).openDrawer()
+          : null,
+      // Android has no large title to put a second search row under the
+      // way iOS does (`search:` below) - an inline bar sits beside the
+      // title instead, rather than a plain search icon over in `actions`.
+      androidTitleTrailing: !_ios && _showSearch
+          ? const ShellSearchLauncher()
+          : null,
      actions: [
-        if (!_ios)
-          NooTopBarButton(
-            icon: LucideIcons.search,
-            tooltip: 'Search',
-            onTap: () => openSearch(context),
-          ),
        if (_ios && tab == AppTab.files)
          NooTopBarButton(
            icon: LucideIcons.plus,
            tooltip: 'Create',
            onTap: () => showCreateMenu(context),
          ),
-        ShellAvatarButton(hitBox: _ios ? 44 : 48),
+        ShellAvatarButton(
+          hitBox: _ios ? 44 : 48,
+          onTap: navMenuStyle == NooNavMenuStyle.avatarMenu
+              ? () => showAvatarMenu(context)
+              : null,
+          label: navMenuStyle == NooNavMenuStyle.avatarMenu
+              ? 'Menu'
+              : 'Accounts',
+        ),
      ],
-      search: _ios ? const ShellSearchLauncher(ios: true) : null,
+      search: _ios && _showSearch ? const ShellSearchLauncher(ios: true) : null,
    );
  }
 }
@@ -0,0 +1,385 @@
+import 'package:flutter/material.dart';
+import 'package:lucide_icons_flutter/lucide_icons.dart';
+import 'package:provider/provider.dart';
+import '../models/app_tab.dart';
+import '../providers/session_controller.dart';
+import '../providers/settings_controller.dart';
+import '../providers/trash_controller.dart';
+import '../theme/design_tokens.dart';
+import 'noo/core/noo_avatar.dart';
+import '../views/login_view.dart';
+import 'noo/core/noo_badge.dart';
+import 'noo/lists/noo_settings_row.dart';
+import 'shell/shell_common.dart';
+
+/// The dropdown [ShellAvatarButton] opens when
+/// [SettingsController.navMenuStyle] is [NooNavMenuStyle.avatarMenu] -
+/// everything [AppDrawer] holds beyond its storage bar (hidden tabs,
+/// Settings), reached from the avatar instead of a hamburger-triggered
+/// left `Drawer`. Built with `showGeneralDialog` rather than a `Drawer`/
+/// `showNooSheet`/`showNooDialog` - this needs a transparent (non-dimming)
+/// barrier and a card anchored under the top bar rather than a modal
+/// sheet/dialog, and there's no existing anchored-popup primitive in this
+/// app to reuse (`PopupMenuButton`'s own width doesn't stretch to the full
+/// content column the way this needs to).
+Future<void> showAvatarMenu(BuildContext context) {
+  return showGeneralDialog<void>(
+    context: context,
+    barrierColor: Colors.transparent,
+    barrierDismissible: true,
+    barrierLabel: 'Close menu',
+    transitionDuration: NooMotion.fast,
+    pageBuilder: (context, _, _) => const _AvatarMenuContent(),
+    transitionBuilder: (context, animation, _, child) => FadeTransition(
+      opacity: animation,
+      child: ScaleTransition(
+        alignment: Alignment.topRight,
+        scale: Tween<double>(
+          begin: 0.96,
+          end: 1,
+        ).animate(CurvedAnimation(parent: animation, curve: NooMotion.ease)),
+        child: child,
+      ),
+    ),
+  );
+}
+
+class _AvatarMenuContent extends StatefulWidget {
+  const _AvatarMenuContent();
+
+  @override
+  State<_AvatarMenuContent> createState() => _AvatarMenuContentState();
+}
+
+class _AvatarMenuContentState extends State<_AvatarMenuContent> {
+  bool _expanded = false;
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.nooColors;
+    final session = context.watch<SessionController>();
+    final settings = context.watch<SettingsController>();
+    final trashCount = context.watch<TrashController>().items.length;
+    final hiddenTabs = settings.tabOrder
+        .where((t) => settings.hiddenTabs.contains(t))
+        .toList();
+
+    void closeAndOpenSettings() {
+      Navigator.pop(context);
+      openSettings(context);
+    }
+
+    return Align(
+      alignment: Alignment.topCenter,
+      // Just the status-bar inset, not the top bar's own height on top of
+      // it - the card covers the top bar (title included) rather than
+      // sitting below it, so opening it reads as the avatar growing into
+      // this instead of a separate element appearing underneath the row
+      // it came from.
+      child: SafeArea(
+        bottom: false,
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: NooSpace.md),
+          child: SizedBox(
+            width: double.infinity,
+            child: Container(
+              // No `color`/`clipBehavior` here - a `Container` with both a
+              // `border` and `clipBehavior` set paints the border as part
+              // of its *outer* decoration, then paints its (clipped) child
+              // on top right up to that same boundary with no gap for the
+              // border's own stroke width to show through. An opaque child
+              // touching that edge - every row below has its own full-bleed
+              // `Material` fill - then paints straight over the inner half
+              // of the border, which read as the border going missing
+              // specifically wherever an opaque row sits (every corner but
+              // the two by the header, which has no opaque fill of its
+              // own). The 1px `Padding` + inset `ClipRRect` below keeps the
+              // clipped, filled content entirely inside the border's own
+              // stroke instead of racing it for the same pixels.
+              decoration: BoxDecoration(
+                border: Border.all(color: colors.line),
+                borderRadius: BorderRadius.circular(NooRadii.card),
+                // `nooDialogShadow` alone is a wide, soft, fairly faint
+                // shadow - built for a desktop dialog with plenty of room
+                // to fall off into. On a small card over a dark theme's
+                // near-black `bg`, that falloff is too gradual to read as
+                // elevation at all (a dark shadow needs real density close
+                // to the edge to be visible against an already-dark
+                // backdrop). A second, tighter, more opaque contact shadow
+                // underneath it gives an immediate value-step right at the
+                // card's edge in both themes, with the soft one still
+                // doing the wider ambient falloff on top.
+                boxShadow: const [
+                  BoxShadow(
+                    color: Color(0x40000000),
+                    blurRadius: 12,
+                    offset: Offset(0, 4),
+                  ),
+                  nooDialogShadow,
+                ],
+              ),
+              child: Padding(
+                padding: const EdgeInsets.all(1),
+                child: ClipRRect(
+                  borderRadius: BorderRadius.circular(NooRadii.card - 1),
+                  child: Material(
+                    color: colors.surface,
+                    child: Column(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        // Avatar on the right, name/host on the left - mirrors the
+                        // top bar's own right-aligned avatar exactly, so this
+                        // header reads as a continuation of the button that
+                        // opened it rather than a disconnected card.
+                        InkWell(
+                          onTap: () => setState(() => _expanded = !_expanded),
+                          child: Padding(
+                            padding: const EdgeInsets.all(NooSpace.md),
+                            child: Row(
+                              children: [
+                                Expanded(
+                                  child: Column(
+                                    crossAxisAlignment:
+                                        CrossAxisAlignment.start,
+                                    children: [
+                                      Text(
+                                        session.username,
+                                        maxLines: 1,
+                                        overflow: TextOverflow.ellipsis,
+                                        style: NooText.bodyL.copyWith(
+                                          fontWeight: FontWeight.w600,
+                                          color: colors.fg1,
+                                        ),
+                                      ),
+                                      const SizedBox(height: 2),
+                                      Text(
+                                        serverHost(session.serverUrl),
+                                        maxLines: 1,
+                                        overflow: TextOverflow.ellipsis,
+                                        style: NooText.meta.copyWith(
+                                          color: colors.fg3,
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                                const SizedBox(width: 12),
+                                NooAvatar(
+                                  initials: accountInitial(session.username),
+                                  current: true,
+                                  size: 40,
+                                ),
+                                const SizedBox(width: 8),
+                                Container(
+                                  width: 36,
+                                  height: 36,
+                                  decoration: BoxDecoration(
+                                    shape: BoxShape.circle,
+                                    color: colors.fg1.withValues(alpha: 0.08),
+                                  ),
+                                  child: Icon(
+                                    _expanded
+                                        ? LucideIcons.chevronUp
+                                        : LucideIcons.chevronDown,
+                                    size: 20,
+                                    color: colors.fg2,
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ),
+                        ),
+                        AnimatedSize(
+                          duration: NooMotion.fast,
+                          curve: NooMotion.ease,
+                          alignment: Alignment.topCenter,
+                          child: _expanded
+                              ? Column(
+                                  children: [
+                                    for (final account in session.accounts)
+                                      if (account.id != session.activeAccountId)
+                                        _OtherAccountRow(
+                                          name: account.username,
+                                          host: serverHost(account.serverUrl),
+                                          onTap: () {
+                                            Navigator.pop(context);
+                                            session.switchAccount(account.id);
+                                          },
+                                        ),
+                                    Padding(
+                                      padding: const EdgeInsets.fromLTRB(
+                                        NooSpace.md,
+                                        0,
+                                        NooSpace.md,
+                                        NooSpace.md,
+                                      ),
+                                      child: Row(
+                                        spacing: 8,
+                                        children: [
+                                          Expanded(
+                                            child: _AccountButton(
+                                              icon: LucideIcons.userPlus,
+                                              label: 'Add Account',
+                                              onTap: () {
+                                                final nav = Navigator.of(
+                                                  context,
+                                                );
+                                                nav.pop();
+                                                nav.push(
+                                                  MaterialPageRoute(
+                                                    builder: (_) =>
+                                                        const LoginView(
+                                                          isAddingAccount: true,
+                                                        ),
+                                                  ),
+                                                );
+                                              },
+                                            ),
+                                          ),
+                                          Expanded(
+                                            child: _AccountButton(
+                                              icon: LucideIcons.users,
+                                              label: 'Manage Accounts',
+                                              onTap: closeAndOpenSettings,
+                                            ),
+                                          ),
+                                        ],
+                                      ),
+                                    ),
+                                  ],
+                                )
+                              : const SizedBox(width: double.infinity),
+                        ),
+                        if (hiddenTabs.isNotEmpty) ...[
+                          Divider(height: 1, color: colors.line),
+                          for (final tab in hiddenTabs)
+                            NooSettingsRow(
+                              icon: tab.icon,
+                              label: Text(tab.label),
+                              trailing: tab == AppTab.trash && trashCount > 0
+                                  ? NooBadge(
+                                      tone: NooBadgeTone.accent,
+                                      child: Text('$trashCount'),
+                                    )
+                                  : null,
+                              onTap: () {
+                                Navigator.pop(context);
+                                settings.requestTab(tab);
+                              },
+                            ),
+                        ],
+                        Divider(height: 1, color: colors.line),
+                        NooSettingsRow(
+                          icon: LucideIcons.settings,
+                          label: const Text('Settings'),
+                          onTap: closeAndOpenSettings,
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _OtherAccountRow extends StatelessWidget {
+  final String name;
+  final String host;
+  final VoidCallback onTap;
+
+  const _OtherAccountRow({
+    required this.name,
+    required this.host,
+    required this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.nooColors;
+    return InkWell(
+      onTap: onTap,
+      child: Padding(
+        padding: const EdgeInsets.all(NooSpace.md),
+        child: Row(
+          children: [
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    name,
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: NooText.bodyL.copyWith(
+                      fontWeight: FontWeight.w600,
+                      color: colors.fg1,
+                    ),
+                  ),
+                  const SizedBox(height: 2),
+                  Text(
+                    host,
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: NooText.meta.copyWith(color: colors.fg3),
+                  ),
+                ],
+              ),
+            ),
+            const SizedBox(width: 12),
+            NooAvatar(initials: accountInitial(name), current: false, size: 40),
+            const SizedBox(width: 44),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _AccountButton extends StatelessWidget {
+  final IconData icon;
+  final String label;
+  final VoidCallback onTap;
+
+  const _AccountButton({
+    required this.icon,
+    required this.label,
+    required this.onTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.nooColors;
+    final radius = BorderRadius.circular(NooRadii.input);
+    return Material(
+      color: colors.bg,
+      borderRadius: radius,
+      child: InkWell(
+        borderRadius: radius,
+        onTap: onTap,
+        child: Padding(
+          padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 8),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            spacing: 6,
+            children: [
+              Icon(icon, size: 18, color: colors.fg2),
+              Flexible(
+                child: Text(
+                  label,
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                  style: NooText.body.copyWith(color: colors.fg1),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:lucide_icons_flutter/lucide_icons.dart';
 import '../models/app_tab.dart';
 import 'noo/nav/noo_bottom_bar.dart';

@@ -7,30 +8,44 @@ import 'noo/nav/noo_bottom_bar.dart';
 /// doesn't need to import `noo/nav` itself. [selectedIndex] may be -1 (no
 /// destination highlighted) when the shell is showing a tab opened from the
 /// drawer's "More" list that isn't one of the pinned [tabs].
+///
+/// [onSearchTap] (from Settings' "Search in bottom bar") adds the Search
+/// entry [NooBottomBar] itself knows how to place (row's last item when
+/// attached, its own satellite when floating) - null leaves the bar
+/// exactly as before.
 class BottomNavBar extends StatelessWidget {
  final NooNavStyle style;
+  final NooBottomBarStyle barStyle;
  final List<AppTab> tabs;
  final int selectedIndex;
  final ValueChanged<int> onDestinationSelected;
+  final VoidCallback? onSearchTap;

  const BottomNavBar({
    super.key,
    required this.style,
+    this.barStyle = NooBottomBarStyle.attached,
    required this.tabs,
    required this.selectedIndex,
    required this.onDestinationSelected,
+    this.onSearchTap,
  });

  @override
  Widget build(BuildContext context) {
    return NooBottomBar(
      style: style,
+      barStyle: barStyle,
      destinations: [
        for (final tab in tabs)
          NooNavDestination(icon: tab.icon, label: tab.label),
      ],
      selectedIndex: selectedIndex,
      onSelected: onDestinationSelected,
+      searchDestination: onSearchTap == null
+          ? null
+          : const NooNavDestination(icon: LucideIcons.search, label: 'Search'),
+      onSearchTap: onSearchTap,
    );
  }
 }
@@ -54,7 +54,7 @@ enum _DetailsTab { info, versions, activity }
 /// and the "open externally" flow for unsupported file types.
 ///
 /// Only used directly on mobile (bundles its own [NooOverlayHeader]); the
-/// desktop path in [show] passes [_DetailsBody] straight to [showNooDialog],
+/// desktop path in [show] passes [DetailsBody] straight to [showNooDialog],
 /// which renders the header itself via `leading`/`title`/`subtitle`.
 class DetailsSheet extends StatelessWidget {
  final NextcloudItem item;
@@ -68,7 +68,7 @@ class DetailsSheet extends StatelessWidget {
        leading: detailsFileTile(item),
        title: item.name,
        subtitle: detailsMetaLine(item),
-        children: [_DetailsBody(item: item)],
+        children: [DetailsBody(item: item)],
      );
    }
    return showNooSheet(context, children: [DetailsSheet(item: item)]);
@@ -86,7 +86,7 @@ class DetailsSheet extends StatelessWidget {
          onClose: () => Navigator.pop(context),
        ),
        const SizedBox(height: NooSpace.lg),
-        _DetailsBody(item: item),
+        DetailsBody(item: item),
      ],
    );
  }
@@ -102,16 +102,16 @@ class DetailsSheet extends StatelessWidget {
 /// guard), so switching tabs via a bare `switch` on the selected type would
 /// tear down and rebuild whichever tab isn't showing, discarding its
 /// fetched data and re-requesting it every time the user switched back.
-class _DetailsBody extends StatefulWidget {
+class DetailsBody extends StatefulWidget {
  final NextcloudItem item;

-  const _DetailsBody({required this.item});
+  const DetailsBody({super.key, required this.item});

  @override
-  State<_DetailsBody> createState() => _DetailsBodyState();
+  State<DetailsBody> createState() => _DetailsBodyState();
 }

-class _DetailsBodyState extends State<_DetailsBody> {
+class _DetailsBodyState extends State<DetailsBody> {
  _DetailsTab _tab = _DetailsTab.info;

  @override
@@ -17,6 +17,9 @@ class FrostedGlassContainer extends StatelessWidget {
  final Widget child;
  final double borderRadius;

+  /// Overrides [borderRadius] for non-uniform corners (e.g. top-only).
+  final BorderRadius? radius;
+
  /// Blur sigma for the backdrop filter. Defaults to a fixed value; pass an
  /// explicit value (e.g. from user settings) to make it adjustable.
  final double blurSigma;
@@ -35,6 +38,7 @@ class FrostedGlassContainer extends StatelessWidget {
    super.key,
    required this.child,
    this.borderRadius = 0,
+    this.radius,
    this.blurSigma = 20,
    this.opacity = 0.8,
    this.color,
@@ -42,15 +46,16 @@ class FrostedGlassContainer extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
+    final shape = radius ?? BorderRadius.circular(borderRadius);
    final tint = color ?? context.nooColors.surface;
    return ClipRRect(
-      borderRadius: BorderRadius.circular(borderRadius),
+      borderRadius: shape,
      child: BackdropFilter(
        filter: ImageFilter.blur(sigmaX: blurSigma, sigmaY: blurSigma),
        child: Container(
          decoration: BoxDecoration(
            color: tint.withValues(alpha: opacity),
-            borderRadius: BorderRadius.circular(borderRadius),
+            borderRadius: shape,
          ),
          child: child,
        ),
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:lucide_icons_flutter/lucide_icons.dart';
 import '../../../theme/design_tokens.dart';
+import '../nav/noo_nav_style.dart';

 /// Android-only extended Upload pill, bottom-right of Files and Photos (Noo
 /// Design System project, `components/core/FAB.jsx`). 56px tall, accent
@@ -10,11 +11,21 @@ import '../../../theme/design_tokens.dart';
 /// don't support upload, so the button stays in place and resizes as the
 /// user switches tabs instead of the Scaffold popping it fully in/out -
 /// the label's width animates away rather than the FAB disappearing.
+///
+/// [barStyle] shapes the corners to match the bottom bar it sits above
+/// (Settings > Appearance). With [NooBottomBarStyle.floating] the FAB stays
+/// fully round (`NooRadii.pill`) - consistent with that mode's other
+/// elements, which are already rounder (the bar itself at 28px, its search
+/// satellite a full circle). With [NooBottomBarStyle.attached] the FAB
+/// squares off to `NooRadii.card`, a rounded square that fits attached's
+/// flatter, edge-to-edge aesthetic; this applies whether [collapsed] or not,
+/// so the FAB keeps one consistent identity per bar style.
 class NooFab extends StatelessWidget {
  final String label;
  final IconData icon;
  final VoidCallback? onTap;
  final bool collapsed;
+  final NooBottomBarStyle barStyle;

  const NooFab({
    super.key,
@@ -22,17 +33,21 @@ class NooFab extends StatelessWidget {
    this.icon = LucideIcons.plus,
    this.onTap,
    this.collapsed = false,
+    required this.barStyle,
  });

  @override
  Widget build(BuildContext context) {
    final colors = context.nooColors;
+    final radius = BorderRadius.circular(
+      barStyle == NooBottomBarStyle.attached ? NooRadii.card : NooRadii.pill,
+    );
    return Material(
      color: colors.accent,
-      borderRadius: BorderRadius.circular(NooRadii.pill),
+      borderRadius: radius,
      child: InkWell(
        onTap: onTap,
-        borderRadius: BorderRadius.circular(NooRadii.pill),
+        borderRadius: radius,
        child: AnimatedContainer(
          duration: NooMotion.base,
          curve: NooMotion.ease,
@@ -154,6 +154,7 @@ class NooFileTableRow extends StatelessWidget {
  final VoidCallback? onTap;
  final VoidCallback? onDoubleTap;
  final VoidCallback? onSecondaryTap;
+  final VoidCallback? onLongPress;

  /// Overflow menu tap. The button is hidden when null.
  final VoidCallback? onMore;
@@ -171,6 +172,7 @@ class NooFileTableRow extends StatelessWidget {
    this.onTap,
    this.onDoubleTap,
    this.onSecondaryTap,
+    this.onLongPress,
    this.onMore,
  });

@@ -193,6 +195,7 @@ class NooFileTableRow extends StatelessWidget {
        onTap: onTap,
        onDoubleTap: onDoubleTap,
        onSecondaryTap: onSecondaryTap,
+        onLongPress: onLongPress,
        child: SizedBox(
          height: NooSizes.rowDesktop,
          child: _TableColumns(
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:lucide_icons_flutter/lucide_icons.dart';
 import '../../../theme/design_tokens.dart';

@@ -34,6 +35,13 @@ class NooSwipeActionSpec {
 /// springs shut - both on [NooMotion.base] / [NooMotion.ease], no bounce.
 /// Tapping the block fires the action and closes it; tapping the row while
 /// open just closes it.
+///
+/// Dragging further still - past [_kTriggerExtent] of the block's own
+/// width, the block growing to fill the extra reveal so there's no gap -
+/// arms the action (a [HapticFeedback.mediumImpact] marks the crossing);
+/// releasing while armed fires it immediately instead of just leaving it
+/// open, so a single swipe-through gesture can do the whole thing without a
+/// second tap.
 class NooSwipeAction extends StatefulWidget {
  final Widget child;

@@ -59,12 +67,24 @@ class NooSwipeAction extends StatefulWidget {

 class _NooSwipeActionState extends State<NooSwipeAction>
    with SingleTickerProviderStateMixin {
+  /// How far past the fully-revealed block (1.0) a drag has to go before
+  /// releasing fires the action outright rather than just snapping open -
+  /// "swipe through" in one gesture instead of open-then-tap.
+  static const double _kTriggerExtent = 1.8;
+
+  /// Hard ceiling on the controller's value - past [_kTriggerExtent] there's
+  /// nothing more for further drag to *do*, but a little extra travel still
+  /// gives the gesture room to keep moving under the finger instead of
+  /// hitting a dead stop right at the trigger point.
+  static const double _kMaxDrag = 2.4;
+
  /// -1 = end action fully revealed, 0 = closed, 1 = start action revealed
-  /// (in visual left/right terms after [_dir] is applied).
+  /// (in visual left/right terms after [_dir] is applied) - and on past
+  /// either bound up to [_kMaxDrag] while armed for [_kTriggerExtent].
  late final AnimationController _ctrl = AnimationController(
    vsync: this,
-    lowerBound: -1,
-    upperBound: 1,
+    lowerBound: -_kMaxDrag,
+    upperBound: _kMaxDrag,
    value: 0,
  );

@@ -85,13 +105,21 @@ class _NooSwipeActionState extends State<NooSwipeAction>
  void _onDragUpdate(DragUpdateDetails d) {
    // Positive = revealing the start action.
    final delta = d.primaryDelta! * _dir / NooSwipeAction.actionWidth;
-    final min = widget.endAction != null ? -1.0 : 0.0;
-    final max = widget.startAction != null ? 1.0 : 0.0;
-    _ctrl.value = (_ctrl.value + delta).clamp(min, max);
+    final min = widget.endAction != null ? -_kMaxDrag : 0.0;
+    final max = widget.startAction != null ? _kMaxDrag : 0.0;
+    final next = (_ctrl.value + delta).clamp(min, max);
+    final wasArmed = _ctrl.value.abs() >= _kTriggerExtent;
+    final nowArmed = next.abs() >= _kTriggerExtent;
+    if (nowArmed && !wasArmed) HapticFeedback.mediumImpact();
+    _ctrl.value = next;
  }

  void _onDragEnd(DragEndDetails d) {
    final v = _ctrl.value;
+    if (v.abs() >= _kTriggerExtent) {
+      _trigger(v > 0 ? widget.startAction! : widget.endAction!);
+      return;
+    }
    final velocity = d.primaryVelocity! * _dir;
    double target;
    if (velocity.abs() > 700) {
@@ -141,6 +169,13 @@ class _NooSwipeActionState extends State<NooSwipeAction>
                      child: _ActionBlock(
                        spec: showing,
                        colors: colors,
+                        // Grows past its own min width to fill the extra
+                        // reveal once dragged further than a plain "open"
+                        // - otherwise the row's translated edge would pull
+                        // away from the block and expose bare space behind
+                        // it.
+                        width: v.abs() * NooSwipeAction.actionWidth,
+                        armed: v.abs() >= _kTriggerExtent,
                        onTap: () => _trigger(showing),
                      ),
                    ),
@@ -196,11 +231,24 @@ class _OpenAwareChild extends AnimatedWidget {
 class _ActionBlock extends StatelessWidget {
  final NooSwipeActionSpec spec;
  final NooColors colors;
+
+  /// The block's own width - grows past [NooSwipeAction.actionWidth] once
+  /// dragged further than a plain reveal, so it always fills exactly what's
+  /// exposed behind the row.
+  final double width;
+
+  /// True once the drag has gone far enough that releasing now fires the
+  /// action - bumps the icon up a touch as a "you're past the point of no
+  /// return" cue, on top of the haptic tick that fired at the same moment.
+  final bool armed;
+
  final VoidCallback onTap;

  const _ActionBlock({
    required this.spec,
    required this.colors,
+    required this.width,
+    required this.armed,
    required this.onTap,
  });

@@ -216,13 +264,18 @@ class _ActionBlock extends StatelessWidget {
      behavior: HitTestBehavior.opaque,
      onTap: onTap,
      child: Container(
-        width: NooSwipeAction.actionWidth,
+        width: width.clamp(NooSwipeAction.actionWidth, double.infinity),
        color: bg,
        alignment: Alignment.center,
        child: Column(
          mainAxisSize: MainAxisSize.min,
          children: [
-            Icon(icon, size: 20, color: Colors.white),
+            AnimatedScale(
+              scale: armed ? 1.15 : 1,
+              duration: NooMotion.fast,
+              curve: NooMotion.ease,
+              child: Icon(icon, size: 20, color: Colors.white),
+            ),
            const SizedBox(height: 6),
            Text(
              label,
@@ -22,6 +22,9 @@ class NooGroupedList extends StatefulWidget {
  final String? aside;
  final List<Widget> children;
  final Widget? footer;
+
+  /// Shown between [label] and the card (e.g. a `NooInfoNote`).
+  final Widget? notice;
  final bool collapsible;
  final bool initiallyExpanded;

@@ -31,6 +34,7 @@ class NooGroupedList extends StatefulWidget {
    this.aside,
    required this.children,
    this.footer,
+    this.notice,
    this.collapsible = false,
    this.initiallyExpanded = true,
  });
@@ -58,6 +62,10 @@ class _NooGroupedListState extends State<NooGroupedList> {
          ),
          const SizedBox(height: 8),
        ],
+        if (widget.notice != null) ...[
+          widget.notice!,
+          const SizedBox(height: NooSpace.md),
+        ],
        AnimatedCrossFade(
          duration: NooMotion.fast,
          sizeCurve: NooMotion.ease,
@@ -0,0 +1,40 @@
+import 'package:flutter/material.dart';
+import 'package:lucide_icons_flutter/lucide_icons.dart';
+import '../../../theme/design_tokens.dart';
+
+/// Tinted info callout (info-soft fill, info icon) for a short notice that
+/// must be noticed immediately, unlike a muted footer/subtitle line.
+class NooInfoNote extends StatelessWidget {
+  final String message;
+
+  const NooInfoNote({super.key, required this.message});
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.nooColors;
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 12),
+      decoration: BoxDecoration(
+        color: colors.infoSoft,
+        borderRadius: BorderRadius.circular(NooRadii.input),
+        border: Border.all(color: colors.info.withValues(alpha: 0.35)),
+      ),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Padding(
+            padding: const EdgeInsets.only(top: 1),
+            child: Icon(LucideIcons.info, size: 18, color: colors.info),
+          ),
+          const SizedBox(width: 10),
+          Expanded(
+            child: Text(
+              message,
+              style: NooText.body.copyWith(color: colors.fg1, height: 1.35),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
@@ -5,8 +5,11 @@ import 'noo_nav_style.dart';
 export 'noo_nav_style.dart';

 /// Android indicator geometry, shared between the sliding pill and each
-/// item's own icon box so they line up exactly.
-const double _kAndroidPillTop = 14;
+/// item's own icon box so they line up exactly. Floating's own top offset
+/// is shorter than attached's - its row is 16px shorter overall (64 vs 80)
+/// and there's no edge-to-edge safe-area strip inside it eating into that.
+const double _kAttachedPillTop = 14;
+const double _kFloatingPillTop = 8;
 const double _kAndroidPillWidth = 56;
 const double _kAndroidPillHeight = 32;

@@ -23,29 +26,133 @@ const double _kAndroidPillHeight = 32;
 ///   56x32 accent-soft pill that slides between tabs as selection moves,
 ///   rather than popping in/out on the destination item itself.
 ///
-/// The home indicator / gesture bar area below the row comes from the
-/// bottom safe-area inset rather than a fixed 34/20px spacer, so it's
-/// right on every device. Meant for `Scaffold.bottomNavigationBar`.
+/// [barStyle] (user-configurable in Settings, Appearance) picks between
+/// that edge-to-edge [NooBottomBarStyle.attached] bar and
+/// [NooBottomBarStyle.floating] - inset 16px from both side edges, 28px
+/// corners, a 1px `line` border plus [nooDialogShadow] (the one shadow the
+/// rest of the app allows itself, see that constant's own doc comment) so
+/// it actually reads as floating above the content scrolling behind it.
+/// Floating's Android row is both shorter (64 vs 80) and drops its idle
+/// tabs' reserved label space - with no label to leave room for, an idle
+/// icon just centers in the whole button, rather than sitting high with a
+/// gap under it. The home indicator / gesture bar area below the row comes
+/// from the bottom safe-area inset rather than a fixed 34/20px spacer, so
+/// it's right on every device. Meant for `Scaffold.bottomNavigationBar` -
+/// the host `Scaffold` needs `extendBody: true` while floating, and a
+/// scrollable body needs enough trailing padding to clear the bar's own
+/// footprint ([NooBottomBar.rowHeight] + [NooBottomBar.floatingBottomMargin]
+/// + the bottom safe area) since nothing does that automatically once the
+/// body draws behind it - see `tab_state_slivers.dart`'s
+/// `bottomBarClearance`.
+///
+/// [searchDestination]/[onSearchTap] (set together, from Settings'
+/// "Search in bottom bar" - see `DESIGN_SYSTEM.md`'s floating bottom bar
+/// entry) add a Search entry that's never highlighted (tapping it pushes
+/// `SearchView`, it doesn't select anything) - the row's last item when
+/// attached, or its own satellite circle beside the bar when floating,
+/// always fully round regardless of the bar's own corner radius.
 class NooBottomBar extends StatelessWidget {
  final NooNavStyle style;
+  final NooBottomBarStyle barStyle;
  final List<NooNavDestination> destinations;
  final int selectedIndex;
  final ValueChanged<int> onSelected;
+  final NooNavDestination? searchDestination;
+  final VoidCallback? onSearchTap;

  const NooBottomBar({
    super.key,
    required this.style,
+    this.barStyle = NooBottomBarStyle.attached,
    required this.destinations,
    required this.selectedIndex,
    required this.onSelected,
+    this.searchDestination,
+    this.onSearchTap,
  });

+  /// The row height [build] draws for [style]/[barStyle] - exposed so a
+  /// scrollable body sharing the same `Scaffold` can reserve exactly this
+  /// much clearance (see the class doc comment) instead of guessing.
+  static double rowHeight(NooNavStyle style, NooBottomBarStyle barStyle) {
+    if (style == NooNavStyle.ios) return 50;
+    return barStyle == NooBottomBarStyle.floating ? 64 : 80;
+  }
+
+  /// Gap between the floating bar's bottom edge and the safe area below it
+  /// (itself inside the [SafeArea] that consumes the actual device inset).
+  static const double floatingBottomMargin = 12;
+
  @override
  Widget build(BuildContext context) {
    final colors = context.nooColors;
    final ios = style == NooNavStyle.ios;
+    final floating = barStyle == NooBottomBarStyle.floating;
+    final hasSearch = searchDestination != null && onSearchTap != null;
+    // Attached folds Search into the row itself (last item); floating
+    // gives it a separate satellite circle instead (built below), so the
+    // row builders only ever see it as a trailing item in the former case.
+    final rowSearch = hasSearch && !floating ? searchDestination : null;

-    final row = ios ? _buildIosRow() : _buildAndroidRow(colors);
+    final row = ios
+        ? _buildIosRow(trailingSearch: rowSearch)
+        : _buildAndroidRow(
+            colors,
+            floating: floating,
+            trailingSearch: rowSearch,
+          );
+    final barHeight = NooBottomBar.rowHeight(style, barStyle);
+
+    if (floating) {
+      final pill = Container(
+        height: barHeight,
+        clipBehavior: Clip.antiAlias,
+        decoration: BoxDecoration(
+          color: colors.surface,
+          border: Border.all(color: colors.line),
+          borderRadius: BorderRadius.circular(28),
+          boxShadow: const [nooDialogShadow],
+        ),
+        child: row,
+      );
+      return SafeArea(
+        top: false,
+        child: Padding(
+          padding: EdgeInsets.fromLTRB(
+            16,
+            0,
+            16,
+            NooBottomBar.floatingBottomMargin,
+          ),
+          child: hasSearch
+              // A fixed-height SizedBox, not just a Row with
+              // crossAxisAlignment.stretch - the bottomNavigationBar slot
+              // gives this widget a *loose* (unbounded-max) height
+              // constraint, and stretch on an unbounded cross axis blows up
+              // to fill the screen in profile/release (the assertion that
+              // would catch it in debug is stripped there) - the same
+              // silent-oversizing bug files_controls_row.dart hit earlier
+              // from a different cause. Both children already size
+              // themselves explicitly (pill's own `height`, the
+              // satellite's `size`), so stretch was never actually needed.
+              ? SizedBox(
+                  height: barHeight,
+                  child: Row(
+                    children: [
+                      Expanded(child: pill),
+                      const SizedBox(width: 8),
+                      _SearchSatellite(
+                        destination: searchDestination!,
+                        onTap: onSearchTap!,
+                        size: barHeight,
+                      ),
+                    ],
+                  ),
+                )
+              : pill,
+        ),
+      );
+    }

    return Container(
      decoration: BoxDecoration(
@@ -54,12 +161,12 @@ class NooBottomBar extends StatelessWidget {
      ),
      child: SafeArea(
        top: false,
-        child: SizedBox(height: ios ? 50 : 80, child: row),
+        child: SizedBox(height: barHeight, child: row),
      ),
    );
  }

-  Widget _buildIosRow() {
+  Widget _buildIosRow({NooNavDestination? trailingSearch}) {
    return Row(
      crossAxisAlignment: CrossAxisAlignment.stretch,
      children: [
@@ -71,20 +178,34 @@ class NooBottomBar extends StatelessWidget {
              onTap: () => onSelected(i),
            ),
          ),
+        if (trailingSearch != null)
+          Expanded(
+            child: _IosItem(
+              destination: trailingSearch,
+              selected: false,
+              onTap: onSearchTap!,
+            ),
+          ),
      ],
    );
  }

-  Widget _buildAndroidRow(NooColors colors) {
+  Widget _buildAndroidRow(
+    NooColors colors, {
+    required bool floating,
+    NooNavDestination? trailingSearch,
+  }) {
+    final pillTop = floating ? _kFloatingPillTop : _kAttachedPillTop;
+    final itemCount = destinations.length + (trailingSearch != null ? 1 : 0);
    return LayoutBuilder(
      builder: (context, constraints) {
-        final itemWidth = constraints.maxWidth / destinations.length;
+        final itemWidth = constraints.maxWidth / itemCount;
        return Stack(
          children: [
            AnimatedPositioned(
              duration: NooMotion.base,
              curve: NooMotion.ease,
-              top: _kAndroidPillTop,
+              top: pillTop,
              left:
                  itemWidth * selectedIndex +
                  (itemWidth - _kAndroidPillWidth) / 2,
@@ -105,9 +226,19 @@ class NooBottomBar extends StatelessWidget {
                    child: _AndroidItem(
                      destination: destinations[i],
                      selected: i == selectedIndex,
+                      floating: floating,
                      onTap: () => onSelected(i),
                    ),
                  ),
+                if (trailingSearch != null)
+                  Expanded(
+                    child: _AndroidItem(
+                      destination: trailingSearch,
+                      selected: false,
+                      floating: floating,
+                      onTap: onSearchTap!,
+                    ),
+                  ),
              ],
            ),
          ],
@@ -117,6 +248,46 @@ class NooBottomBar extends StatelessWidget {
  }
 }

+/// The floating bar's own Search entry point, next to the pill rather than
+/// inside it - always fully round (see [NooBottomBar]'s doc comment),
+/// same fill/border as the pill so the two still read as one family.
+class _SearchSatellite extends StatelessWidget {
+  final NooNavDestination destination;
+  final VoidCallback onTap;
+  final double size;
+
+  const _SearchSatellite({
+    required this.destination,
+    required this.onTap,
+    required this.size,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.nooColors;
+    return Semantics(
+      button: true,
+      label: destination.label,
+      child: GestureDetector(
+        behavior: HitTestBehavior.opaque,
+        onTap: onTap,
+        child: Container(
+          width: size,
+          height: size,
+          alignment: Alignment.center,
+          decoration: BoxDecoration(
+            color: colors.surface,
+            border: Border.all(color: colors.line),
+            shape: BoxShape.circle,
+            boxShadow: const [nooDialogShadow],
+          ),
+          child: Icon(destination.icon, size: 24, color: colors.fg1),
+        ),
+      ),
+    );
+  }
+}
+
 class _IosItem extends StatelessWidget {
  final NooNavDestination destination;
  final bool selected;
@@ -165,24 +336,69 @@ class _IosItem extends StatelessWidget {
 }

 /// Icon (over the shared sliding pill, drawn separately by [NooBottomBar])
-/// with its label always below it - the label's space is reserved
-/// whether or not it's showing (only its opacity changes), so the icon
-/// never shifts vertically as selection changes, and stays aligned with
-/// the pill's fixed [_kAndroidPillTop]/[_kAndroidPillHeight].
+/// with its label below it. Attached always reserves the label's space
+/// (just invisible when idle, per [_kAttachedPillTop]'s doc comment on
+/// [NooBottomBar]) so the icon never shifts vertically as selection
+/// changes. Floating drops that reserved space when idle instead: there's
+/// no label to leave room for, so the icon centers in the whole button and
+/// renders a touch bigger.
 class _AndroidItem extends StatelessWidget {
  final NooNavDestination destination;
  final bool selected;
+  final bool floating;
  final VoidCallback onTap;

  const _AndroidItem({
    required this.destination,
    required this.selected,
+    required this.floating,
    required this.onTap,
  });

  @override
  Widget build(BuildContext context) {
    final colors = context.nooColors;
+    final iconColor = selected ? colors.accentText : colors.fg2;
+
+    final Widget content;
+    if (floating && !selected) {
+      content = Center(
+        child: Icon(destination.icon, size: 25, color: iconColor),
+      );
+    } else {
+      content = Padding(
+        padding: EdgeInsets.only(
+          top: floating ? _kFloatingPillTop : _kAttachedPillTop,
+        ),
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.start,
+          children: [
+            SizedBox(
+              height: _kAndroidPillHeight,
+              child: Center(
+                child: Icon(destination.icon, size: 24, color: iconColor),
+              ),
+            ),
+            const SizedBox(height: 4),
+            AnimatedOpacity(
+              duration: NooMotion.base,
+              curve: NooMotion.ease,
+              opacity: selected ? 1 : 0,
+              child: Text(
+                destination.label,
+                maxLines: 1,
+                overflow: TextOverflow.ellipsis,
+                style: NooText.navLabelActive.copyWith(
+                  height: 1,
+                  color: colors.fg1,
+                ),
+              ),
+            ),
+          ],
+        ),
+      );
+    }
+
    return Semantics(
      button: true,
      selected: selected,
@@ -190,39 +406,7 @@ class _AndroidItem extends StatelessWidget {
      child: GestureDetector(
        behavior: HitTestBehavior.opaque,
        onTap: onTap,
-        child: Padding(
-          padding: const EdgeInsets.only(top: _kAndroidPillTop),
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.start,
-            children: [
-              SizedBox(
-                height: _kAndroidPillHeight,
-                child: Center(
-                  child: Icon(
-                    destination.icon,
-                    size: 24,
-                    color: selected ? colors.accentText : colors.fg2,
-                  ),
-                ),
-              ),
-              const SizedBox(height: 4),
-              AnimatedOpacity(
-                duration: NooMotion.base,
-                curve: NooMotion.ease,
-                opacity: selected ? 1 : 0,
-                child: Text(
-                  destination.label,
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                  style: NooText.navLabelActive.copyWith(
-                    height: 1,
-                    color: colors.fg1,
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ),
+        child: content,
      ),
    );
  }
@@ -17,6 +17,35 @@ enum NooNavStyle {
      };
 }

+/// How [NooBottomBar] sits on the screen - user-configurable in Settings
+/// (Appearance). [attached] is the original edge-to-edge bar with no
+/// side/bottom margin. [floating] insets it 16px from both side edges and
+/// clear of the bottom safe area, rounded (28px - the same radius the
+/// sheet top/drawer edge use) rather than square, with a 1px `line` border
+/// plus `nooDialogShadow` - product UI otherwise stays flat (DESIGN_SYSTEM.md
+/// 1.4), but a bar that's genuinely floating above scrolling content reads
+/// as attached without some elevation, so it borrows the one shadow the
+/// rest of the app allows itself rather than inventing a second one. The
+/// host `Scaffold` needs `extendBody: true` while floating, so its body
+/// scrolls behind the bar's transparent margin instead of stopping short of
+/// it like [attached] does - which also means that body needs its own
+/// trailing padding to clear the bar (see `NooBottomBar.rowHeight`).
+enum NooBottomBarStyle { attached, floating }
+
+/// Which widget opens the shell's navigation menu (hidden tabs + Settings)
+/// on mobile - user-configurable in Settings (Appearance), same precedent
+/// as [NooBottomBarStyle]. [drawer] is the original pattern: a `menu`
+/// icon, top-left of the top bar, opens a left-edge `Drawer`. [avatarMenu]
+/// drops that icon entirely and repurposes the avatar button - already
+/// sitting top-right, already a tap target every user already knows - as
+/// the one entry point instead, opening a dropdown anchored below it (see
+/// `showAvatarMenu` in `widgets/avatar_menu.dart`) rather than a drawer
+/// sliding from the opposite edge. Applies on both platforms, since
+/// [NooTopBar]'s `onMenu`/avatar wiring is shared chrome, not
+/// Android-specific - only [AppDrawer]'s left-`Drawer` convention is being
+/// offered an alternative, not anything platform-only.
+enum NooNavMenuStyle { drawer, avatarMenu }
+
 /// One destination in a [NooBottomBar]. Data-agnostic on purpose - the app
 /// maps its own tab model (e.g. `AppTab`) onto these.
@immutable
@@ -48,58 +48,68 @@ class NooToolbar extends StatelessWidget implements PreferredSizeWidget {
       );

  @override
-  Size get preferredSize => const Size.fromHeight(NooSizes.toolbar);
+  Size get preferredSize => const Size.fromHeight(outerHeight);
+
+  static const _margin = EdgeInsets.fromLTRB(12, 8, 12, 4);
+
+  /// Bar height plus the margin that makes it float.
+  static const double outerHeight = NooSizes.toolbar + 12;

  @override
  Widget build(BuildContext context) {
    final colors = context.nooColors;
    final titleStyle = NooText.title.copyWith(height: 1, color: colors.fg1);

-    return Material(
-      color: backgroundColor ?? colors.surface,
-      child: Container(
-        height: NooSizes.toolbar,
-        padding: const EdgeInsetsDirectional.only(start: 24, end: 20),
-        decoration: BoxDecoration(
-          border: Border(bottom: BorderSide(color: colors.line)),
+    return Padding(
+      padding: _margin,
+      child: Material(
+        color: backgroundColor ?? colors.surface,
+        clipBehavior: Clip.antiAlias,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(NooRadii.card),
+          side: BorderSide(color: colors.line),
        ),
-        child: Row(
-          spacing: 12,
-          children: [
-            if (showHistoryNav)
-              Padding(
-                padding: const EdgeInsetsDirectional.only(end: 4),
-                child: Row(
-                  mainAxisSize: MainAxisSize.min,
-                  spacing: 4,
-                  children: [
-                    _HistoryButton(
-                      icon: LucideIcons.chevronLeft,
-                      tooltip: 'Back',
-                      onTap: onBack,
-                    ),
-                    _HistoryButton(
-                      icon: LucideIcons.chevronRight,
-                      tooltip: 'Forward',
-                      onTap: onForward,
-                    ),
-                  ],
+        child: Container(
+          height: NooSizes.toolbar,
+          padding: const EdgeInsetsDirectional.only(start: 24, end: 20),
+          child: Row(
+            spacing: 12,
+            children: [
+              if (showHistoryNav)
+                Padding(
+                  padding: const EdgeInsetsDirectional.only(end: 4),
+                  child: Row(
+                    mainAxisSize: MainAxisSize.min,
+                    spacing: 4,
+                    children: [
+                      _HistoryButton(
+                        icon: LucideIcons.chevronLeft,
+                        tooltip: 'Back',
+                        onTap: onBack,
+                      ),
+                      _HistoryButton(
+                        icon: LucideIcons.chevronRight,
+                        tooltip: 'Forward',
+                        onTap: onForward,
+                      ),
+                    ],
+                  ),
+                ),
+              Expanded(
+                child: Align(
+                  alignment: AlignmentDirectional.centerStart,
+                  child: DefaultTextStyle(
+                    style: titleStyle,
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    child: titleWidget ?? Text(title ?? ''),
+                  ),
                ),
              ),
-            Expanded(
-              child: Align(
-                alignment: AlignmentDirectional.centerStart,
-                child: DefaultTextStyle(
-                  style: titleStyle,
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                  child: titleWidget ?? Text(title ?? ''),
-                ),
-              ),
-            ),
-            if (search != null) SizedBox(width: 260, child: search),
-            ...actions,
-          ],
+              if (search != null) SizedBox(width: 260, child: search),
+              ...actions,
+            ],
+          ),
        ),
      ),
    );
@@ -56,6 +56,16 @@ class NooTopBar extends StatelessWidget implements PreferredSizeWidget {
  /// iOS only: the search field shown below the large title.
  final Widget? search;

+  /// Android only: an extra widget (e.g. a search-field-styled launcher) in
+  /// the flexible middle slot, to the title's own right - [title] keeps
+  /// its natural (shrink-to-fit, ellipsized) width on the left, and this
+  /// takes whatever space is left rather than replacing it. iOS already has
+  /// a dedicated [search] slot below its large title for this; Android has
+  /// no large title to put a second row under, so a caller that wants an
+  /// inline search bar there puts it beside the title instead of adding a
+  /// row.
+  final Widget? androidTitleTrailing;
+
  /// Defaults to `bg` - the top bar sits on the screen background.
  final Color? backgroundColor;

@@ -67,6 +77,7 @@ class NooTopBar extends StatelessWidget implements PreferredSizeWidget {
    this.onMenu,
    this.actions = const [],
    this.search,
+    this.androidTitleTrailing,
    this.backgroundColor,
  });

@@ -98,7 +109,7 @@ class NooTopBar extends StatelessWidget implements PreferredSizeWidget {

    final Widget body = _ios
        ? _buildIos(colors, lead)
-        : _buildAndroid(colors, lead);
+        : _buildAndroid(context, colors, lead);

    return _NooTopBarScope(
      style: style,
@@ -166,7 +177,7 @@ class NooTopBar extends StatelessWidget implements PreferredSizeWidget {
    );
  }

-  Widget _buildAndroid(NooColors colors, Widget? lead) {
+  Widget _buildAndroid(BuildContext context, NooColors colors, Widget? lead) {
    return SizedBox(
      height: _androidRow,
      child: Padding(
@@ -178,14 +189,34 @@ class NooTopBar extends StatelessWidget implements PreferredSizeWidget {
          spacing: 4,
          children: [
            ?lead,
-            Expanded(
-              child: Text(
-                title,
-                maxLines: 1,
-                overflow: TextOverflow.ellipsis,
-                style: NooText.title.copyWith(height: 1, color: colors.fg1),
+            // The title is a non-flex child capped at 40% of the screen
+            // width (so it keeps its natural width but still ellipsizes),
+            // leaving the `Expanded` trailing widget all the remaining
+            // space. A `Flexible` title would instead split the free space
+            // 1:1 with it, since both default to flex 1.
+            if (androidTitleTrailing != null) ...[
+              ConstrainedBox(
+                constraints: BoxConstraints(
+                  maxWidth: MediaQuery.sizeOf(context).width * 0.4,
+                ),
+                child: Text(
+                  title,
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                  style: NooText.title.copyWith(height: 1, color: colors.fg1),
+                ),
+              ),
+              const SizedBox(width: NooSpace.md),
+              Expanded(child: androidTitleTrailing!),
+            ] else
+              Expanded(
+                child: Text(
+                  title,
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                  style: NooText.title.copyWith(height: 1, color: colors.fg1),
+                ),
              ),
-            ),
            ...actions,
          ],
        ),
@@ -11,8 +11,16 @@ class NooLayout {
  /// (table rows, 5-column grids, 8-column photos, 24px gutter).
  static const double desktopBreakpoint = 900;

-  static bool isDesktop(BuildContext context) =>
-      MediaQuery.sizeOf(context).width >= desktopBreakpoint;
+  /// Shortest window side that counts as a tablet-class window (the usual
+  /// 600dp rule). A phone in landscape is wide but short, so it stays on the
+  /// mobile layout.
+  static const double tabletShortestSide = 600;
+
+  static bool isDesktop(BuildContext context) {
+    final size = MediaQuery.sizeOf(context);
+    return size.width >= desktopBreakpoint &&
+        size.shortestSide >= tabletShortestSide;
+  }

  static NooNavStyle navStyle(BuildContext context) =>
      NooNavStyle.fromPlatform(Theme.of(context).platform);
@@ -24,4 +32,16 @@ class NooLayout {

  /// Horizontal content gutter: 12 on mobile (cards), 24 on desktop.
  static double gutter(BuildContext context) => isDesktop(context) ? 24 : 12;
+
+  /// Grid column count for [minTile]-wide tiles, never fewer than [phone]
+  /// (so phones keep their usual count while wide non-sidebar windows, e.g. a
+  /// tablet in portrait, get more instead of a few huge tiles).
+  static int gridColumns(
+    BuildContext context, {
+    required int phone,
+    required double minTile,
+  }) {
+    final width = MediaQuery.sizeOf(context).width;
+    return (width / minTile).floor().clamp(phone, 12);
+  }
 }
@@ -34,7 +34,10 @@ class NooShareSection extends StatelessWidget {
        Row(
          children: [
            Expanded(
-              child: Text(title, style: NooText.sectionTitle.copyWith(color: colors.fg1)),
+              child: Text(
+                title,
+                style: NooText.sectionTitle.copyWith(color: colors.fg1),
+              ),
            ),
            ?trailing,
          ],
@@ -60,11 +63,16 @@ class NooPersonAccessRow extends StatelessWidget {
  final String name;
  final String? subtitle;
  final bool owner;
+
  /// Pill label for non-owners, e.g. "Can edit" / "Can view".
  final String permission;
  final VoidCallback? onPermissionTap;
+  final bool permissionLoading;
  final String ownerLabel;

+  /// Replaces the owner label / permission pill (e.g. a plain search result).
+  final Widget? trailing;
+
  const NooPersonAccessRow({
    super.key,
    required this.avatar,
@@ -73,7 +81,9 @@ class NooPersonAccessRow extends StatelessWidget {
    this.owner = false,
    this.permission = 'Can edit',
    this.onPermissionTap,
+    this.permissionLoading = false,
    this.ownerLabel = 'Owner',
+    this.trailing,
  });

  @override
@@ -113,10 +123,16 @@ class NooPersonAccessRow extends StatelessWidget {
            ),
          ),
          const SizedBox(width: NooSpace.sm),
-          if (owner)
+          if (trailing != null)
+            trailing!
+          else if (owner)
            Text(ownerLabel, style: NooText.label.copyWith(color: colors.fg3))
          else
-            NooPermissionPill(label: permission, onTap: onPermissionTap),
+            NooPermissionPill(
+              label: permission,
+              onTap: onPermissionTap,
+              loading: permissionLoading,
+            ),
        ],
      ),
    );
@@ -128,8 +144,14 @@ class NooPersonAccessRow extends StatelessWidget {
 class NooPermissionPill extends StatelessWidget {
  final String label;
  final VoidCallback? onTap;
+  final bool loading;

-  const NooPermissionPill({super.key, required this.label, this.onTap});
+  const NooPermissionPill({
+    super.key,
+    required this.label,
+    this.onTap,
+    this.loading = false,
+  });

  @override
  Widget build(BuildContext context) {
@@ -147,9 +169,21 @@ class NooPermissionPill extends StatelessWidget {
        child: Row(
          mainAxisSize: MainAxisSize.min,
          children: [
-            Text(label, style: NooText.label.copyWith(height: 1, color: colors.fg1)),
+            Text(
+              label,
+              style: NooText.label.copyWith(height: 1, color: colors.fg1),
+            ),
            const SizedBox(width: NooSpace.xxs),
-            Icon(LucideIcons.chevronDown, size: 14, color: colors.fg2),
+            loading
+                ? SizedBox(
+                    width: 14,
+                    height: 14,
+                    child: CircularProgressIndicator(
+                      strokeWidth: 2,
+                      color: colors.fg2,
+                    ),
+                  )
+                : Icon(LucideIcons.chevronDown, size: 14, color: colors.fg2),
          ],
        ),
      ),
@@ -64,6 +64,10 @@ class _NooSheetBody extends StatefulWidget {
 class _NooSheetBodyState extends State<_NooSheetBody> {
  bool _needsPeek = false;

+  // Keeps the sheet's content (and its State) alive when the body swaps
+  // between the plain and draggable layouts, instead of rebuilding it.
+  final _contentKey = GlobalKey();
+
  void _handleOverflow(ScrollMetrics metrics) {
    if (_needsPeek || metrics.maxScrollExtent <= 0) return;
    // `ScrollMetricsNotification` is dispatched mid-layout; deferring avoids
@@ -84,6 +88,7 @@ class _NooSheetBodyState extends State<_NooSheetBody> {
        controller: scrollController,
        padding: const EdgeInsets.fromLTRB(20, 10, 20, 20),
        child: Column(
+          key: _contentKey,
          mainAxisSize: MainAxisSize.min,
          children: [
            Container(
@@ -106,40 +111,51 @@ class _NooSheetBodyState extends State<_NooSheetBody> {

  @override
  Widget build(BuildContext context) {
-    return SafeArea(
-      child: LayoutBuilder(
-        builder: (context, constraints) {
-          if (!_needsPeek) {
-            return ConstrainedBox(
-              constraints: BoxConstraints(
-                maxHeight: constraints.maxHeight * _kNooSheetPeekFraction,
-              ),
-              child: _buildScrollable(null),
-            );
-          }
-          return DraggableScrollableSheet(
-            initialChildSize: _kNooSheetPeekFraction,
-            minChildSize: _kNooSheetMinFraction,
-            maxChildSize: _kNooSheetMaxFraction,
-            expand: false,
-            builder: (context, scrollController) {
-              // Plain `DraggableScrollableSheet` doesn't dismiss the modal
-              // route on its own when dragged down to its floor - it just
-              // stops resizing there - so pop explicitly once it's been
-              // dragged (near) all the way down, matching a native
-              // peek sheet's swipe-to-dismiss.
-              return NotificationListener<DraggableScrollableNotification>(
-                onNotification: (notification) {
-                  if (notification.extent <= notification.minExtent + 0.01) {
-                    Navigator.of(context).maybePop();
-                  }
-                  return false;
-                },
-                child: _buildScrollable(scrollController),
+    // A modal bottom sheet doesn't avoid the keyboard itself, so a focused
+    // field would be covered. Inset by the keyboard and, while it's up, let
+    // the content use all the space above it.
+    final keyboard = MediaQuery.viewInsetsOf(context).bottom;
+    final keyboardUp = keyboard > 0;
+    return Padding(
+      padding: EdgeInsets.only(bottom: keyboard),
+      child: SafeArea(
+        bottom: !keyboardUp,
+        child: LayoutBuilder(
+          builder: (context, constraints) {
+            if (!_needsPeek) {
+              return ConstrainedBox(
+                constraints: BoxConstraints(
+                  maxHeight: keyboardUp
+                      ? constraints.maxHeight
+                      : constraints.maxHeight * _kNooSheetPeekFraction,
+                ),
+                child: _buildScrollable(null),
              );
-            },
-          );
-        },
+            }
+            return DraggableScrollableSheet(
+              initialChildSize: _kNooSheetPeekFraction,
+              minChildSize: _kNooSheetMinFraction,
+              maxChildSize: _kNooSheetMaxFraction,
+              expand: false,
+              builder: (context, scrollController) {
+                // Plain `DraggableScrollableSheet` doesn't dismiss the modal
+                // route on its own when dragged down to its floor - it just
+                // stops resizing there - so pop explicitly once it's been
+                // dragged (near) all the way down, matching a native
+                // peek sheet's swipe-to-dismiss.
+                return NotificationListener<DraggableScrollableNotification>(
+                  onNotification: (notification) {
+                    if (notification.extent <= notification.minExtent + 0.01) {
+                      Navigator.of(context).maybePop();
+                    }
+                    return false;
+                  },
+                  child: _buildScrollable(scrollController),
+                );
+              },
+            );
+          },
+        ),
      ),
    );
  }
@@ -7,6 +7,7 @@ import '../../theme/design_tokens.dart';
 import '../noo/core/noo_segmented_control.dart';
 import '../noo/core/noo_toggle.dart';
 import '../noo/lists/noo_settings_row.dart';
+import '../noo/nav/noo_nav_style.dart';
 import '../noo/noo_layout.dart';
 import '../noo/overlays/noo_dialog.dart';
 import '../noo/overlays/noo_sheet.dart';
@@ -47,7 +48,32 @@ class SettingsAppearanceSection extends StatelessWidget {
      children: [
        SettingsSection(
          title: 'Appearance',
-          children: [_ThemeRow(settings: settings)],
+          notice:
+              'Bottom bar style, menu style and search in bottom bar have no effect on wide tablets, which use a sidebar.',
+          children: [
+            _ThemeRow(settings: settings),
+            _BottomBarStyleRow(settings: settings),
+            _NavMenuStyleRow(settings: settings),
+            NooSettingsRow(
+              icon: LucideIcons.search,
+              label: const Text('Search in bottom bar'),
+              subtitle: const Text(
+                'Adds Search to the bottom bar and removes it from the top '
+                'bar - leaves room for one fewer regular tab',
+              ),
+              trailing: NooToggle(
+                checked: settings.searchInBottomBar,
+                onChanged: settings.setSearchInBottomBar,
+              ),
+            ),
+          ],
+        ),
+        const SizedBox(height: NooSpace.xl),
+        SettingsSection(
+          title: 'Upload button',
+          notice:
+              'Auto shows the label on Files and Photos and shrinks to an icon on other tabs. Mini and Expanded stay the same on every tab. Has no effect on wide tablets.',
+          children: [_FabStyleRow(settings: settings)],
        ),
        const SizedBox(height: NooSpace.xl),
        SettingsSection(
@@ -156,6 +182,182 @@ class _ThemeRow extends StatelessWidget {
  }
 }

+/// The "Bottom bar" row: same "label, then a full-width segmented control
+/// below it" shape as [_ThemeRow] right above it. Attached is the original
+/// edge-to-edge bar; floating insets it from both side/bottom edges with
+/// rounded corners - see [NooBottomBarStyle]'s own doc comment for the
+/// full visual rationale.
+class _BottomBarStyleRow extends StatelessWidget {
+  final SettingsController settings;
+
+  const _BottomBarStyleRow({required this.settings});
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.nooColors;
+    return Material(
+      color: colors.surface,
+      child: Padding(
+        padding: const EdgeInsets.symmetric(
+          horizontal: NooSpace.md,
+          vertical: 12,
+        ),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Icon(LucideIcons.panelBottom, size: 20, color: colors.fg2),
+                const SizedBox(width: 14),
+                Text(
+                  'Bottom bar',
+                  style: NooText.bodyL.copyWith(color: colors.fg1),
+                ),
+              ],
+            ),
+            const SizedBox(height: 12),
+            NooSegmentedControl<NooBottomBarStyle>(
+              fill: true,
+              value: settings.bottomBarStyle,
+              onChanged: settings.setBottomBarStyle,
+              options: const [
+                NooSegmentOption(
+                  value: NooBottomBarStyle.attached,
+                  icon: LucideIcons.panelBottom,
+                  label: 'Attached',
+                ),
+                NooSegmentOption(
+                  value: NooBottomBarStyle.floating,
+                  icon: LucideIcons.panelBottomOpen,
+                  label: 'Floating',
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+/// "Navigation menu" (Settings → Appearance): which widget opens hidden
+/// tabs + Settings - the original `menu` icon that opens a left `Drawer`,
+/// or the avatar button instead (opens `showAvatarMenu`, a dropdown
+/// anchored under it) - see [NooNavMenuStyle]'s own doc comment for the
+/// full reachability rationale (dropping the hamburger removes one of the
+/// two top-corner targets the shell asks a thumb to reach, rather than
+/// adding a third kind of chrome like a side rail would).
+class _NavMenuStyleRow extends StatelessWidget {
+  final SettingsController settings;
+
+  const _NavMenuStyleRow({required this.settings});
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.nooColors;
+    return Material(
+      color: colors.surface,
+      child: Padding(
+        padding: const EdgeInsets.symmetric(
+          horizontal: NooSpace.md,
+          vertical: 12,
+        ),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Icon(LucideIcons.panelLeft, size: 20, color: colors.fg2),
+                const SizedBox(width: 14),
+                Text(
+                  'Navigation menu',
+                  style: NooText.bodyL.copyWith(color: colors.fg1),
+                ),
+              ],
+            ),
+            const SizedBox(height: 12),
+            NooSegmentedControl<NooNavMenuStyle>(
+              fill: true,
+              value: settings.navMenuStyle,
+              onChanged: settings.setNavMenuStyle,
+              options: const [
+                NooSegmentOption(
+                  value: NooNavMenuStyle.drawer,
+                  icon: LucideIcons.menu,
+                  label: 'Hamburger',
+                ),
+                NooSegmentOption(
+                  value: NooNavMenuStyle.avatarMenu,
+                  icon: LucideIcons.userRound,
+                  label: 'Avatar',
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _FabStyleRow extends StatelessWidget {
+  final SettingsController settings;
+
+  const _FabStyleRow({required this.settings});
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.nooColors;
+    return Material(
+      color: colors.surface,
+      child: Padding(
+        padding: const EdgeInsets.symmetric(
+          horizontal: NooSpace.md,
+          vertical: 12,
+        ),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Icon(LucideIcons.circlePlus, size: 20, color: colors.fg2),
+                const SizedBox(width: 14),
+                Text(
+                  'Upload button size',
+                  style: NooText.bodyL.copyWith(color: colors.fg1),
+                ),
+              ],
+            ),
+            const SizedBox(height: 12),
+            NooSegmentedControl<FabStyle>(
+              fill: true,
+              value: settings.fabStyle,
+              onChanged: settings.setFabStyle,
+              options: const [
+                NooSegmentOption(
+                  value: FabStyle.auto,
+                  icon: LucideIcons.wandSparkles,
+                  label: 'Auto',
+                ),
+                NooSegmentOption(
+                  value: FabStyle.mini,
+                  icon: LucideIcons.minimize2,
+                  label: 'Mini',
+                ),
+                NooSegmentOption(
+                  value: FabStyle.expanded,
+                  icon: LucideIcons.maximize2,
+                  label: 'Expanded',
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
 /// The current accent-color choice, shown as a small filled circle in the
 /// "Accent color" row - a wallpaper icon when following the OS's dynamic
 /// color instead of a fixed swatch.
@@ -1,11 +1,12 @@
 import 'package:flutter/material.dart';
 import '../../theme/design_tokens.dart';
 import '../noo/lists/noo_grouped_list.dart';
+import '../noo/lists/noo_info_note.dart';
 import '../noo/noo_layout.dart';
 import '../noo/overlays/noo_dialog.dart';
 import '../noo/overlays/noo_sheet.dart';

-/// One block of Settings (DESIGN_SYSTEM.md 4's 8-part order): a
+/// One block of Settings (DESIGN_SYSTEM.md 4's 9-part order): a
 /// [NooGroupedList] on mobile (label above a radius-20 card), or a titled,
 /// bordered radius-20 card holding a flat row group on desktop
 /// ("Mobile uses one column of grouped lists. Desktop uses a 2-column grid
@@ -17,10 +18,14 @@ class SettingsSection extends StatelessWidget {
  final String? subtitle;
  final List<Widget> children;

+  /// Shown as a prominent [NooInfoNote] above the rows.
+  final String? notice;
+
  const SettingsSection({
    super.key,
    required this.title,
    this.subtitle,
+    this.notice,
    required this.children,
  });

@@ -30,12 +35,8 @@ class SettingsSection extends StatelessWidget {
    if (!NooLayout.isDesktop(context)) {
      return NooGroupedList(
        label: title,
+        notice: notice != null ? NooInfoNote(message: notice!) : null,
        footer: subtitle != null ? Text(subtitle!) : null,
-        // Every mobile Settings section is individually collapsible,
-        // expanded by default - replaces the old trailing jump rail (see
-        // `account_view.dart`'s doc comment) as the way to navigate a long
-        // Settings screen quickly.
-        collapsible: true,
        children: children,
      );
    }
@@ -55,6 +56,10 @@ class SettingsSection extends StatelessWidget {
            Text(subtitle!, style: NooText.meta.copyWith(color: colors.fg3)),
          ],
          const SizedBox(height: NooSpace.md),
+          if (notice != null) ...[
+            NooInfoNote(message: notice!),
+            const SizedBox(height: NooSpace.md),
+          ],
          FlatRowGroup(children: children),
        ],
      ),
@@ -37,7 +37,11 @@ class SettingsSwipeSection extends StatelessWidget {
          NooSettingsRow(
            label: Text(_swipeActionLabel(action)),
            trailing: action == current
-                ? Icon(LucideIcons.check, size: 18, color: context.nooColors.accentText)
+                ? Icon(
+                    LucideIcons.check,
+                    size: 18,
+                    color: context.nooColors.accentText,
+                  )
                : null,
            onTap: () {
              onChanged(action);
@@ -55,6 +59,7 @@ class SettingsSwipeSection extends StatelessWidget {
    return SettingsSection(
      title: 'Swipe on a file',
      subtitle: 'Choose what swiping a file left or right does in list view',
+      notice: 'Swipe actions have no effect on wide tablets.',
      children: [
        NooSettingsRow(
          icon: LucideIcons.chevronsRight,
@@ -11,7 +11,8 @@ import '../noo/noo_layout.dart';
 import 'settings_section.dart';

 /// Settings section 7: bottom-nav tab order, visibility (pinned = shown, up
-/// to [maxVisibleTabs]) and default tab.
+/// to [SettingsController.maxVisibleTabs] - one fewer while Appearance's
+/// "Search in bottom bar" is on) and default tab.
 class SettingsTabsSection extends StatelessWidget {
  const SettingsTabsSection({super.key});

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';
 import 'package:intl/intl.dart';
 import 'package:lucide_icons_flutter/lucide_icons.dart';
@@ -18,6 +19,7 @@ import 'noo/core/noo_avatar.dart';
 import 'noo/core/noo_button.dart';
 import 'noo/core/noo_chip.dart';
 import 'noo/core/noo_toggle.dart';
+import 'noo/lists/noo_grouped_list.dart';
 import 'noo/lists/noo_settings_row.dart';
 import 'noo/media/noo_photo_tile.dart';
 import 'noo/noo_layout.dart';
@@ -71,11 +73,13 @@ class ShareSheet extends StatefulWidget {
    return showNooSheet(
      context,
      children: [
-        NooOverlayHeader(
-          leading: detailsFileTile(item),
-          title: item.name,
-          subtitle: detailsMetaLine(item),
-          onClose: () => Navigator.pop(context),
+        Builder(
+          builder: (sheetContext) => NooOverlayHeader(
+            leading: detailsFileTile(item),
+            title: item.name,
+            subtitle: detailsMetaLine(item),
+            onClose: () => Navigator.of(sheetContext).pop(),
+          ),
        ),
        ShareSheet(item: item),
      ],
@@ -95,13 +99,42 @@ class _ShareSheetState extends State<ShareSheet> {
  bool _isSearching = false;
  bool _isAddingPerson = false;
  bool _isTogglingLink = false;
+  String? _pendingShareeKey;
+  final Set<String> _updatingShareIds = {};
  bool _isSharingFile = false;
  bool _showInherited = false;
  final _peopleController = TextEditingController();
  final _linkController = TextEditingController();
+  final _peopleFocus = FocusNode();
+  final _peopleKey = GlobalKey();
+
+  /// Once the user types, scrolls the sheet so the people field and its
+  /// results (under their title) sit near the top, leaving a little room under the sheet's
+  /// rounded top edge.
+  void _revealPeopleSection() {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) return;
+      final ctx = _peopleKey.currentContext;
+      final box = ctx?.findRenderObject();
+      if (ctx == null || box is! RenderBox) return;
+      final position = Scrollable.maybeOf(ctx)?.position;
+      final viewport = RenderAbstractViewport.maybeOf(box);
+      if (position == null || viewport == null) return;
+      final target = (viewport.getOffsetToReveal(box, 0).offset - 8).clamp(
+        position.minScrollExtent,
+        position.maxScrollExtent,
+      );
+      position.animateTo(
+        target,
+        duration: const Duration(milliseconds: 200),
+        curve: Curves.easeOut,
+      );
+    });
+  }

  @override
  void dispose() {
+    _peopleFocus.dispose();
    _peopleController.dispose();
    _linkController.dispose();
    super.dispose();
@@ -128,6 +161,7 @@ class _ShareSheetState extends State<ShareSheet> {
      return;
    }
    setState(() => _isSearching = true);
+    _revealPeopleSection();
    final ops = context.read<ItemOperations>();
    final results = await ops.searchSharees(trimmed);
    if (!mounted) return;
@@ -135,6 +169,7 @@ class _ShareSheetState extends State<ShareSheet> {
      _searchResults = results;
      _isSearching = false;
    });
+    _revealPeopleSection();
  }

  /// The single "Name, email or group" field: reuses whichever match is
@@ -151,15 +186,20 @@ class _ShareSheetState extends State<ShareSheet> {
    }
  }

+  String _shareeKey(NextcloudSharee s) => '${s.shareTypeValue}:${s.shareWith}';
+
  Future<void> _addSharee(NextcloudSharee sharee) async {
+    if (_pendingShareeKey != null) return;
    final ops = context.read<ItemOperations>();
    final messenger = ScaffoldMessenger.of(context);
+    setState(() => _pendingShareeKey = _shareeKey(sharee));
    final share = await ops.createShare(
      path: widget.item.path,
      shareType: sharee.shareTypeValue,
      shareWith: sharee.shareWith,
    );
    if (!mounted) return;
+    setState(() => _pendingShareeKey = null);
    if (share == null) {
      messenger.showSnackBar(
        const SnackBar(
@@ -321,36 +361,93 @@ class _ShareSheetState extends State<ShareSheet> {
    }
  }

-  /// A small popup with the one action the compact [NooPersonAccessRow]
-  /// permission pill has no room for - removing that person's access. There's
-  /// no permission-update endpoint on [ItemOperations] yet, so the pill
-  /// itself is read-only (see the rebuild report).
+  /// Permission menu for a person row: Can view / Can edit, then removing
+  /// access. Keeps the reshare bit (16) as it was.
  void _openPersonMenu(NextcloudShare share) {
    final label = share.sharedWithDisplayName ?? 'Shared';
+    final canEdit = (share.permissions & 2) != 0;
+
    void remove() {
      Navigator.pop(context);
      _removeShare(share);
    }

-    final row = NooSettingsRow(
-      icon: LucideIcons.userMinus,
-      label: const Text('Remove access'),
-      danger: true,
-      onTap: remove,
+    void choose(bool edit) {
+      Navigator.pop(context);
+      _setPermission(share, edit);
+    }
+
+    Widget check(bool on) => Icon(
+      LucideIcons.check,
+      size: 18,
+      color: on ? context.nooColors.accentText : Colors.transparent,
    );
+
+    final rows = <Widget>[
+      NooSettingsRow(
+        icon: LucideIcons.eye,
+        label: const Text('Can view'),
+        trailing: check(!canEdit),
+        onTap: () => choose(false),
+      ),
+      NooSettingsRow(
+        icon: LucideIcons.pencil,
+        label: const Text('Can edit'),
+        trailing: check(canEdit),
+        onTap: () => choose(true),
+      ),
+      NooSettingsRow(
+        icon: LucideIcons.userMinus,
+        label: const Text('Remove access'),
+        danger: true,
+        onTap: remove,
+      ),
+    ];
    if (NooLayout.isDesktop(context)) {
-      showNooDialog(context, title: label, children: [row]);
+      showNooDialog(
+        context,
+        title: label,
+        children: [Column(children: rows)],
+      );
    } else {
      showNooSheet(
        context,
        children: [
          NooOverlayHeader(title: label, onClose: () => Navigator.pop(context)),
-          row,
+          NooGroupedList(children: rows),
        ],
      );
    }
  }

+  Future<void> _setPermission(NextcloudShare share, bool edit) async {
+    if (((share.permissions & 2) != 0) == edit) return;
+    final ops = context.read<ItemOperations>();
+    final messenger = ScaffoldMessenger.of(context);
+    final reshare = share.permissions & 16;
+    final base = edit ? (share.isFolder ? 15 : 3) : 1;
+    final permissions = base | reshare;
+    setState(() => _updatingShareIds.add(share.id));
+    final ok = await ops.updateSharePermissions(share, permissions);
+    if (!mounted) return;
+    setState(() => _updatingShareIds.remove(share.id));
+    if (ok) {
+      setState(() {
+        _shares = [
+          for (final s in _shares)
+            s.id == share.id ? s.withPermissions(permissions) : s,
+        ];
+      });
+    } else {
+      messenger.showSnackBar(
+        const SnackBar(
+          content: Text('Could not change permission'),
+          behavior: SnackBarBehavior.floating,
+        ),
+      );
+    }
+  }
+
  Widget _peopleSection(
    NooColors colors,
    SessionController session,
@@ -364,6 +461,7 @@ class _ShareSheetState extends State<ShareSheet> {
          absorbing: _isAddingPerson,
          child: NooTextField(
            controller: _peopleController,
+            focusNode: _peopleFocus,
            leadingIcon: LucideIcons.search,
            placeholder: 'Name, email or group',
            onChanged: _search,
@@ -381,17 +479,40 @@ class _ShareSheetState extends State<ShareSheet> {
          ),
        ),
        for (final sharee in _searchResults)
-          NooSettingsRow(
-            icon: sharee.type == ShareeType.group
-                ? LucideIcons.users
-                : LucideIcons.user,
-            label: Text(sharee.label),
-            subtitle: sharee.subtitle != null ? Text(sharee.subtitle!) : null,
-            onTap: () => _addSharee(sharee),
+          InkWell(
+            borderRadius: BorderRadius.circular(NooRadii.input),
+            onTap: _pendingShareeKey == null ? () => _addSharee(sharee) : null,
+            child: NooPersonAccessRow(
+              avatar: NooAvatar(
+                initials: _initial(sharee.label),
+                color: NooPhotoTile.paletteColor(sharee.label.hashCode),
+                icon: sharee.type == ShareeType.group
+                    ? LucideIcons.users
+                    : null,
+              ),
+              name: sharee.label,
+              subtitle: sharee.subtitle,
+              trailing: _pendingShareeKey == _shareeKey(sharee)
+                  ? const SizedBox(
+                      width: 20,
+                      height: 20,
+                      child: CircularProgressIndicator(strokeWidth: 2),
+                    )
+                  : const SizedBox.shrink(),
+            ),
          ),
-        const SizedBox(height: NooSpace.xs),
+        if (_searchResults.isNotEmpty)
+          Padding(
+            padding: const EdgeInsets.symmetric(vertical: NooSpace.xs),
+            child: Divider(height: 1, thickness: 1, color: colors.line),
+          )
+        else
+          const SizedBox(height: NooSpace.xs),
        NooPersonAccessRow(
-          avatar: NooAvatar(initials: _initial(session.username), current: true),
+          avatar: NooAvatar(
+            initials: _initial(session.username),
+            current: true,
+          ),
          name: session.username,
          owner: true,
        ),
@@ -402,14 +523,21 @@ class _ShareSheetState extends State<ShareSheet> {
              color: NooPhotoTile.paletteColor(
                (share.sharedWithDisplayName ?? share.id).hashCode,
              ),
-              icon: share.shareType == ShareType.group ? LucideIcons.users : null,
+              icon: share.shareType == ShareType.group
+                  ? LucideIcons.users
+                  : null,
            ),
            name: share.sharedWithDisplayName ?? 'Shared',
            subtitle: share.shareType == ShareType.group
                ? 'Group'
-                : (share.shareType == ShareType.email ? 'Invited by email' : null),
+                : (share.shareType == ShareType.email
+                      ? 'Invited by email'
+                      : null),
            permission: (share.permissions & 2) != 0 ? 'Can edit' : 'Can view',
-            onPermissionTap: () => _openPersonMenu(share),
+            permissionLoading: _updatingShareIds.contains(share.id),
+            onPermissionTap: _updatingShareIds.contains(share.id)
+                ? null
+                : () => _openPersonMenu(share),
          ),
        if (_inherited.isNotEmpty) ...[
          const SizedBox(height: NooSpace.xs),
@@ -429,7 +557,9 @@ class _ShareSheetState extends State<ShareSheet> {
                    ),
                  ),
                  Icon(
-                    _showInherited ? LucideIcons.chevronUp : LucideIcons.chevronDown,
+                    _showInherited
+                        ? LucideIcons.chevronUp
+                        : LucideIcons.chevronDown,
                    size: 16,
                    color: colors.fg3,
                  ),
@@ -464,7 +594,10 @@ class _ShareSheetState extends State<ShareSheet> {
                  crossAxisAlignment: CrossAxisAlignment.start,
                  mainAxisSize: MainAxisSize.min,
                  children: [
-                    Text('Internal link', style: NooText.bodyL.copyWith(color: colors.fg1)),
+                    Text(
+                      'Internal link',
+                      style: NooText.bodyL.copyWith(color: colors.fg1),
+                    ),
                    Text(
                      'For people who already have access',
                      style: NooText.meta.copyWith(color: colors.fg3),
@@ -559,26 +692,43 @@ class _ShareSheetState extends State<ShareSheet> {
      crossAxisAlignment: CrossAxisAlignment.stretch,
      children: [
        NooShareSection(
+          key: _peopleKey,
          title: 'Share with people',
          child: _peopleSection(colors, session, peopleShares, internalLink),
        ),
        const SizedBox(height: 22),
        NooShareSection(
          title: 'Share link',
-          trailing: NooToggle(
-            checked: hasLink,
-            onChanged: _isTogglingLink ? null : _toggleLink,
+          trailing: Row(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              if (_isTogglingLink) ...[
+                const SizedBox(
+                  width: 18,
+                  height: 18,
+                  child: CircularProgressIndicator(strokeWidth: 2),
+                ),
+                const SizedBox(width: NooSpace.sm),
+              ],
+              NooToggle(
+                checked: hasLink,
+                onChanged: _isTogglingLink ? null : _toggleLink,
+              ),
+            ],
          ),
          caption: hasLink
              ? null
              : 'Anyone with the link can access this ${widget.item.isFolder ? 'folder' : 'file'}.',
-          child: hasLink ? _linkSection(publicLinkShares.first) : const SizedBox.shrink(),
+          child: hasLink
+              ? _linkSection(publicLinkShares.first)
+              : const SizedBox.shrink(),
        ),
        if (!widget.item.isFolder) ...[
          const SizedBox(height: 22),
          NooShareSection(
            title: 'Send file directly',
-            caption: "Link settings above don't apply - this sends the file's bytes directly.",
+            caption:
+                "Link settings above don't apply - this sends the file's bytes directly.",
            child: NooButton(
              variant: NooButtonVariant.outline,
              size: NooButtonSize.card,
@@ -212,13 +212,31 @@ class _AccountSwitchRow extends StatelessWidget {
 }

 /// The current user's avatar in the mobile top bar. Tap opens the accounts
-/// sheet ([showAccountSwitcher]); swiping up/down on it cycles to the
-/// next/previous saved account immediately, with no confirmation - a
-/// shortcut alongside the full switcher.
+/// sheet ([showAccountSwitcher]) by default - or [onTap], when the caller
+/// overrides it (`AppTopBar` does this for
+/// `SettingsController.navMenuStyle`'s `avatarMenu` option, which
+/// repurposes this same button to open `showAvatarMenu` instead; avoids
+/// this file importing `widgets/avatar_menu.dart`, which itself imports
+/// this file for `openSettings`/`accountInitial`/`serverHost`). Swiping
+/// up/down on it cycles to the next/previous saved account immediately,
+/// with no confirmation, regardless of [onTap] - a shortcut that stays
+/// available either way.
 class ShellAvatarButton extends StatelessWidget {
  final double hitBox;
+  final VoidCallback? onTap;

-  const ShellAvatarButton({super.key, this.hitBox = 48});
+  /// Describes whatever [onTap] actually does - defaults to "Accounts"
+  /// (the account switcher), but a caller overriding [onTap] should
+  /// override this too so the tooltip/semantics describe the real action
+  /// instead of a stale default.
+  final String label;
+
+  const ShellAvatarButton({
+    super.key,
+    this.hitBox = 48,
+    this.onTap,
+    this.label = 'Accounts',
+  });

  Future<void> _handleVerticalSwipe(
    BuildContext context,
@@ -246,17 +264,17 @@ class ShellAvatarButton extends StatelessWidget {
  Widget build(BuildContext context) {
    final session = context.watch<SessionController>();
    return Tooltip(
-      message: 'Accounts',
+      message: label,
      child: Semantics(
        button: true,
-        label: 'Accounts',
+        label: label,
        child: GestureDetector(
          onVerticalDragEnd: (details) =>
              _handleVerticalSwipe(context, details),
          child: SizedBox.square(
            dimension: hitBox,
            child: InkResponse(
-              onTap: () => showAccountSwitcher(context),
+              onTap: onTap ?? () => showAccountSwitcher(context),
              radius: hitBox / 2,
              child: Center(
                child: NooAvatar(
@@ -1,7 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:lucide_icons_flutter/lucide_icons.dart';
+import 'package:provider/provider.dart';
+import '../../providers/settings_controller.dart';
 import '../../theme/design_tokens.dart';
 import '../noo/core/noo_button.dart';
+import '../noo/nav/noo_bottom_bar.dart';
+import '../noo/noo_layout.dart';

 /// Shared loading/error/empty slivers for Recent/Activity/Trash/Shares (and
 /// any future tab shaped like them: a `CustomScrollView` over one flat
@@ -88,9 +92,72 @@ Widget tabEmptySliver(
  );
 }

+/// How much bottom padding a tab's scrollable list needs to clear
+/// [NooBottomBar] and not just butt up against it. [NooBottomBarStyle.
+/// attached] bars aren't drawn behind (no `Scaffold.extendBody`), so
+/// Scaffold already shrinks the body above them - this is then pure
+/// breathing room, not overlap prevention. [NooBottomBarStyle.floating]
+/// bars draw over an extended body instead, so nothing reserves space for
+/// them automatically: the clearance has to cover the bar's own footprint
+/// (see [NooBottomBar.rowHeight]/[NooBottomBar.floatingBottomMargin]) plus
+/// the safe-area inset below it, or the last row ends up hidden under it.
+double bottomBarClearance(BuildContext context) {
+  final settings = context.watch<SettingsController>();
+  if (settings.bottomBarStyle == NooBottomBarStyle.attached) return 100;
+  final barHeight = NooBottomBar.rowHeight(
+    NooLayout.navStyle(context),
+    NooBottomBarStyle.floating,
+  );
+  final safeBottom = MediaQuery.paddingOf(context).bottom;
+  return barHeight + NooBottomBar.floatingBottomMargin + safeBottom + 24;
+}
+
 /// Bottom padding sliver so the last row/card clears the bottom nav/FAB -
 /// same trailing pair every rebuilt tab list ends on.
-const List<Widget> tabBottomInsetSlivers = [
-  SliverToBoxAdapter(child: SizedBox(height: 100)),
-  SliverFillRemaining(hasScrollBody: false, child: SizedBox()),
+List<Widget> tabBottomInsetSlivers(BuildContext context) => [
+  SliverToBoxAdapter(child: SizedBox(height: bottomBarClearance(context))),
+  const SliverFillRemaining(hasScrollBody: false, child: SizedBox()),
 ];
+
+/// Wraps a tab's shell top bar ([AppTopBar], passed in as the generic
+/// [PreferredSizeWidget] it implements - this file can't import
+/// `app_top_bar.dart` without a cycle) as that tab's own first sliver,
+/// living inside its `CustomScrollView` instead of `Scaffold.appBar`. Gives
+/// it Material's native "floating app bar" behavior, via the framework's own
+/// [SliverFloatingHeader]: it scrolls away as the list scrolls down, and -
+/// unlike a plain `SliverToBoxAdapter`, which only reappears once scrolled
+/// all the way back to the top - reappears immediately on any upward
+/// scroll, following the finger while dragging and settling fully open or
+/// fully closed once the gesture ends.
+///
+/// [SliverFloatingHeader] sizes itself from [topBar]'s own natural layout
+/// (like `SliverToBoxAdapter`) rather than a fixed extent declared up
+/// front - so [topBar]'s own internal `SafeArea` (see `NooTopBar`'s doc
+/// comment) already accounts for the status-bar inset correctly while
+/// [topBar] itself is visible, with no extra height math needed here
+/// (unlike building this on the general-purpose `SliverPersistentHeader`
+/// would have required).
+///
+/// Sits above a tab's own pinned in-content header (built with
+/// [StickyHeaderDelegate] - the sort/filter controls row, or the selection
+/// bar that replaces it) - put this sliver first in `contentSlivers` so
+/// that header stays exactly where it already is, independent of whether
+/// [topBar] is currently shown or scrolled away.
+///
+/// That pinned header needs its OWN protection from the status bar too,
+/// though: [topBar]'s `SafeArea` only reserves space while [topBar] has
+/// some height to put it in - once it's fully collapsed (0 height, [topBar]
+/// scrolled all the way away), that reservation disappears with it, and
+/// the pinned header would ride up underneath the status bar instead of
+/// stopping below it (a real bug this shipped with once already - caught
+/// by `tab_state_slivers_test.dart`'s regression test for it). Every tab
+/// view wraps its whole `CustomScrollView` (this sliver, the pinned header,
+/// and everything else) in `SafeArea(top: true, bottom: false, ...)` to
+/// fix this - that reserves the inset outside the scrolling/collapsing
+/// region entirely, so it's never implicated in this sliver's own
+/// collapse math regardless of [topBar]'s current state. Flutter's
+/// `SafeArea` nesting means this doesn't double the inset: the outer one
+/// zeroes `MediaQuery.padding.top` for everything below it, so [topBar]'s
+/// own inner `SafeArea` sees nothing left to add.
+Widget topBarSliver(PreferredSizeWidget topBar) =>
+    SliverFloatingHeader(child: topBar);
@@ -22,9 +22,14 @@ class MediaActionBar extends StatelessWidget {
  final VoidCallback onDelete;
  final VoidCallback onOpenExternally;
  final VoidCallback onDownload;
-  final VoidCallback onDetails;
+  final VoidCallback? onDetails;
+  final Widget? handle;
+  final Widget? below;

  const MediaActionBar({
+    this.onDetails,
+    this.handle,
+    this.below,
    super.key,
    required this.isFavorite,
    required this.isBusy,
@@ -35,7 +40,6 @@ class MediaActionBar extends StatelessWidget {
    required this.onDelete,
    required this.onOpenExternally,
    required this.onDownload,
-    required this.onDetails,
  });

  @override
@@ -48,11 +52,15 @@ class MediaActionBar extends StatelessWidget {
    // short and leaving that strip unstyled - only the actual row content
    // needs padding up and away from the gesture area.
    return FrostedGlassContainer(
+      radius: const BorderRadius.vertical(
+        top: Radius.circular(NooRadii.sheetTop),
+      ),
      child: SafeArea(
        top: false,
        child: Column(
          mainAxisSize: MainAxisSize.min,
          children: [
+            ?handle,
            if (transportControls != null) ...[
              transportControls!,
              Divider(height: 1, color: colors.fg1.withValues(alpha: 0.14)),
@@ -94,17 +102,18 @@ class MediaActionBar extends StatelessWidget {
                    ViewerIconButton(
                      icon: LucideIcons.trash2,
                      tooltip: 'Delete',
-                      color: colors.danger,
                      onTap: isBusy ? null : onDelete,
                    ),
-                  ViewerIconButton(
-                    icon: LucideIcons.info,
-                    tooltip: 'Details',
-                    onTap: onDetails,
-                  ),
+                  if (onDetails != null)
+                    ViewerIconButton(
+                      icon: LucideIcons.info,
+                      tooltip: 'Details',
+                      onTap: onDetails,
+                    ),
                ],
              ),
            ),
+            ?below,
          ],
        ),
      ),
@@ -0,0 +1,133 @@
+import 'package:flutter/material.dart';
+import '../../models/nextcloud_item.dart';
+import '../../theme/design_tokens.dart';
+import '../details/details_sheet.dart';
+import '../noo/overlays/noo_overlay_header.dart';
+
+/// Builds the viewer's bottom bar with a drag [handle] on top and the
+/// expandable [below] details region underneath its action row.
+typedef MediaPanelBarBuilder =
+    Widget Function(BuildContext context, Widget handle, Widget below);
+
+/// The media viewer's bottom bar as a draggable panel: dragging it (or
+/// swiping up on the media, via [MediaDetailsPanelState.expand]) grows the
+/// panel upward so the action row rides on top of the file's details instead
+/// of the details covering it in a separate modal sheet.
+class MediaDetailsPanel extends StatefulWidget {
+  final NextcloudItem item;
+  final MediaPanelBarBuilder builder;
+
+  const MediaDetailsPanel({
+    super.key,
+    required this.item,
+    required this.builder,
+  });
+
+  @override
+  State<MediaDetailsPanel> createState() => MediaDetailsPanelState();
+}
+
+class MediaDetailsPanelState extends State<MediaDetailsPanel>
+    with SingleTickerProviderStateMixin {
+  late final AnimationController _c = AnimationController(
+    vsync: this,
+    duration: const Duration(milliseconds: 260),
+  );
+  double _maxHeight = 1;
+
+  bool get isExpanded => _c.value > 0.5;
+
+  void expand() => _c.animateTo(1, curve: Curves.easeOutCubic);
+  void collapse() => _c.animateTo(0, curve: Curves.easeOutCubic);
+  void toggle() => isExpanded ? collapse() : expand();
+
+  @override
+  void dispose() {
+    _c.dispose();
+    super.dispose();
+  }
+
+  void _onDragUpdate(DragUpdateDetails d) {
+    _c.value -= (d.primaryDelta ?? 0) / _maxHeight;
+  }
+
+  void _onDragEnd(DragEndDetails d) {
+    final v = d.primaryVelocity ?? 0;
+    if (v < -400) {
+      expand();
+    } else if (v > 400) {
+      collapse();
+    } else {
+      toggleToNearest();
+    }
+  }
+
+  void toggleToNearest() => _c.value > 0.5 ? expand() : collapse();
+
+  @override
+  Widget build(BuildContext context) {
+    final colors = context.nooColors;
+    _maxHeight = MediaQuery.sizeOf(context).height * 0.55;
+
+    final handle = Padding(
+      padding: const EdgeInsets.only(top: 8, bottom: 2),
+      child: Center(
+        child: Container(
+          width: 36,
+          height: 4,
+          decoration: BoxDecoration(
+            color: colors.fg3.withValues(alpha: 0.6),
+            borderRadius: BorderRadius.circular(2),
+          ),
+        ),
+      ),
+    );
+
+    final below = AnimatedBuilder(
+      animation: _c,
+      builder: (context, _) {
+        if (_c.value == 0) return const SizedBox.shrink();
+        return SizedBox(
+          height: _c.value * _maxHeight,
+          child: ClipRect(
+            child: OverflowBox(
+              alignment: Alignment.topCenter,
+              minHeight: 0,
+              maxHeight: _maxHeight,
+              child: SingleChildScrollView(
+                padding: const EdgeInsets.fromLTRB(
+                  NooSpace.lg,
+                  NooSpace.md,
+                  NooSpace.lg,
+                  NooSpace.lg,
+                ),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: [
+                    NooOverlayHeader(
+                      leading: detailsFileTile(widget.item),
+                      title: widget.item.name,
+                      subtitle: detailsMetaLine(widget.item),
+                      onClose: collapse,
+                    ),
+                    const SizedBox(height: NooSpace.lg),
+                    DetailsBody(
+                      key: ValueKey(widget.item.id),
+                      item: widget.item,
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+        );
+      },
+    );
+
+    return GestureDetector(
+      onVerticalDragUpdate: _onDragUpdate,
+      onVerticalDragEnd: _onDragEnd,
+      child: widget.builder(context, handle, below),
+    );
+  }
+}
@@ -17,8 +17,12 @@ class MediaPdfPreview extends StatefulWidget {
  /// `FileViewerScreen.localPathResolver`'s doc comment.
  final Future<String?> Function(NextcloudItem item)? localPathResolver;

+  /// Space reserved above the page for an overlaid top bar (0 when hidden).
+  final double topInset;
+
  const MediaPdfPreview({
    super.key,
+    this.topInset = 0,
    required this.item,
    required this.session,
    this.localPathResolver,
@@ -29,8 +33,14 @@ class MediaPdfPreview extends StatefulWidget {
 }

 class _MediaPdfPreviewState extends State<MediaPdfPreview> {
+  // Only the first few pages are measured; longer documents are assumed
+  // taller than any screen.
+  static const _sizedPages = 3;
+
  PdfControllerPinch? _controller;
  String? _error;
+  List<Size> _pageSizes = const [];
+  int _pageCount = 0;

  @override
  void initState() {
@@ -55,9 +65,21 @@ class _MediaPdfPreviewState extends State<MediaPdfPreview> {
          await widget.session.service!.fetchBytes(widget.item.path),
        );
      }
-      if (!mounted) return;
+      final document = await PdfDocument.openData(bytes);
+      final sizes = <Size>[];
+      for (var i = 1; i <= document.pagesCount && i <= _sizedPages; i++) {
+        // autoCloseAndroid closes the previous page itself; closing here too throws.
+        final page = await document.getPage(i, autoCloseAndroid: true);
+        sizes.add(Size(page.width, page.height));
+      }
+      if (!mounted) {
+        await document.close();
+        return;
+      }
      setState(() {
-        _controller = PdfControllerPinch(document: PdfDocument.openData(bytes));
+        _pageSizes = sizes;
+        _pageCount = document.pagesCount;
+        _controller = PdfControllerPinch(document: Future.value(document));
      });
    } catch (e) {
      if (mounted) setState(() => _error = e.toString());
@@ -91,6 +113,44 @@ class _MediaPdfPreviewState extends State<MediaPdfPreview> {
    // without ever pinching to zoom. There's no way to override that
    // margin from here - it isn't an exposed parameter - so this avoids
    // the branch that sets it instead of fighting it.
-    return PdfViewPinch(controller: _controller!);
+    //
+    // pdfx's InteractiveViewer also refuses to zoom out past
+    // `viewport.height / document.height`. When the whole document is
+    // shorter than the screen (e.g. a one-page PDF) that ratio is above 1, so
+    // after pinching in, fit-width (scale 1) becomes unreachable. PdfViewPinch
+    // wraps its content in a SafeArea, which counts MediaQuery padding toward
+    // that document height, so padding the bottom up to the viewport height
+    // keeps the ratio at or below 1 without shrinking the gesture area.
+    return AnimatedPadding(
+      duration: const Duration(milliseconds: 220),
+      curve: Curves.easeInOutCubic,
+      padding: EdgeInsets.only(top: widget.topInset),
+      child: LayoutBuilder(
+        builder: (context, constraints) {
+          final media = MediaQuery.of(context);
+          var padding = media.padding.copyWith(top: 0);
+          if (_pageSizes.isNotEmpty && _pageSizes.length == _pageCount) {
+            const pagePadding = 10.0; // PdfViewPinch's default `padding`
+            final maxWidth = _pageSizes.fold<double>(
+              0,
+              (m, s) => s.width > m ? s.width : m,
+            );
+            final ratio = (constraints.maxWidth - pagePadding * 2) / maxWidth;
+            final docHeight = _pageSizes.fold<double>(
+              pagePadding,
+              (h, s) => h + s.height * ratio + pagePadding,
+            );
+            final needed = constraints.maxHeight - docHeight;
+            if (needed > padding.bottom) {
+              padding = padding.copyWith(bottom: needed);
+            }
+          }
+          return MediaQuery(
+            data: media.copyWith(padding: padding),
+            child: PdfViewPinch(controller: _controller!),
+          );
+        },
+      ),
+    );
  }
 }
@@ -1,12 +1,25 @@
 import 'dart:convert';
 import 'dart:io';
 import 'package:flutter/material.dart';
+import 'package:flutter_markdown_plus/flutter_markdown_plus.dart';
+import 'package:lucide_icons_flutter/lucide_icons.dart';
 import '../../models/nextcloud_item.dart';
 import '../../providers/session_controller.dart';
 import '../../theme/design_tokens.dart';
+import '../noo/core/noo_button.dart';

-/// Plain monospace text-file preview for [FileViewerScreen]'s static (non-
-/// swipeable) preview path (`_textPreviewExtensions`).
+/// Space the viewer's floating top bar and bottom action bar cover, so the
+/// text sits clear of them (and the status bar) instead of scrolling
+/// underneath.
+const double _kTopBarClearance = 72;
+const double _kActionBarClearance = 112;
+
+/// Text/markdown file preview and editor for [FileViewerScreen]'s static
+/// (non-swipeable) path (`_textPreviewExtensions`). Content is always
+/// editable when online; a Save button appears once it has changed. Markdown
+/// files open rendered, with an Edit/Preview toggle. Opened
+/// from the Offline tab ([localPathResolver] set) it is read-only, since the
+/// local copy has no server to write back to.
 class MediaTextPreview extends StatefulWidget {
  final NextcloudItem item;
  final SessionController session;
@@ -28,15 +41,35 @@ class MediaTextPreview extends StatefulWidget {
 }

 class _MediaTextPreviewState extends State<MediaTextPreview> {
-  String? _content;
+  final _controller = TextEditingController();
+  String? _saved;
  String? _error;
+  bool _isSaving = false;
+  bool _editing = false;
+
+  bool get _isMarkdown {
+    final name = widget.item.name.toLowerCase();
+    return name.endsWith('.md') || name.endsWith('.markdown');
+  }
+
+  bool get _showRendered => _isMarkdown && !_editing;
+
+  bool get _readOnly => widget.localPathResolver != null;
+  bool get _dirty => _saved != null && _controller.text != _saved;

  @override
  void initState() {
    super.initState();
+    _controller.addListener(() => setState(() {}));
    _load();
  }

+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
  Future<void> _load() async {
    try {
      final List<int> bytes;
@@ -53,13 +86,39 @@ class _MediaTextPreviewState extends State<MediaTextPreview> {
        bytes = await widget.session.service!.fetchBytes(widget.item.path);
      }
      if (mounted) {
-        setState(() => _content = utf8.decode(bytes, allowMalformed: true));
+        final text = utf8.decode(bytes, allowMalformed: true);
+        _controller.text = text;
+        setState(() => _saved = text);
      }
    } catch (e) {
      if (mounted) setState(() => _error = e.toString());
    }
  }

+  Future<void> _save() async {
+    final messenger = ScaffoldMessenger.of(context);
+    final text = _controller.text;
+    setState(() => _isSaving = true);
+    var ok = false;
+    try {
+      ok = await widget.session.service!.putBytes(
+        widget.item.path,
+        utf8.encode(text),
+      );
+    } catch (_) {}
+    if (!mounted) return;
+    setState(() {
+      _isSaving = false;
+      if (ok) _saved = text;
+    });
+    messenger.showSnackBar(
+      SnackBar(
+        content: Text(ok ? 'Saved ${widget.item.name}' : 'Could not save file'),
+        behavior: SnackBarBehavior.floating,
+      ),
+    );
+  }
+
  @override
  Widget build(BuildContext context) {
    final colors = context.nooColors;
@@ -71,18 +130,103 @@ class _MediaTextPreviewState extends State<MediaTextPreview> {
        ),
      );
    }
-    if (_content == null) {
+    if (_saved == null) {
      return Center(child: CircularProgressIndicator(color: colors.accent));
    }
+    final safe = MediaQuery.paddingOf(context);
+    final style = NooText.mono.copyWith(color: colors.fg1, height: 1.5);
+    final padding = EdgeInsets.fromLTRB(
+      20,
+      safe.top + _kTopBarClearance,
+      20,
+      safe.bottom + _kActionBarClearance,
+    );
    return Container(
      color: colors.surface,
-      padding: const EdgeInsets.all(20),
-      child: SingleChildScrollView(
-        child: SelectableText(
-          _content!,
-          style: NooText.mono.copyWith(color: colors.fg1, height: 1.5),
-        ),
+      child: Stack(
+        children: [
+          Positioned.fill(
+            child: _showRendered
+                ? Markdown(
+                    data: _controller.text,
+                    padding: padding,
+                    selectable: true,
+                    styleSheet: _markdownStyle(context, colors),
+                    onTapLink: (_, href, _) {},
+                  )
+                : SingleChildScrollView(
+                    padding: padding,
+                    child: TextField(
+                      controller: _controller,
+                      readOnly: _readOnly,
+                      maxLines: null,
+                      keyboardType: TextInputType.multiline,
+                      style: style,
+                      cursorColor: colors.accentText,
+                      decoration: const InputDecoration(
+                        isDense: true,
+                        border: InputBorder.none,
+                        contentPadding: EdgeInsets.zero,
+                      ),
+                    ),
+                  ),
+          ),
+          if (_isMarkdown && !_readOnly)
+            Positioned(
+              right: 20,
+              top: safe.top + _kTopBarClearance - 8,
+              child: NooButton(
+                variant: NooButtonVariant.tonal,
+                size: NooButtonSize.compact,
+                icon: _editing ? LucideIcons.eye : LucideIcons.pencil,
+                onTap: () => setState(() => _editing = !_editing),
+                child: Text(_editing ? 'Preview' : 'Edit'),
+              ),
+            ),
+          if (_dirty)
+            Positioned(
+              right: 20,
+              bottom: safe.bottom + _kActionBarClearance,
+              child: NooButton(
+                size: NooButtonSize.card,
+                icon: LucideIcons.save,
+                disabled: _isSaving,
+                onTap: _isSaving ? null : _save,
+                child: Text(_isSaving ? 'Saving…' : 'Save'),
+              ),
+            ),
+        ],
      ),
    );
  }
 }
+
+MarkdownStyleSheet _markdownStyle(BuildContext context, NooColors colors) {
+  final body = NooText.body.copyWith(color: colors.fg1, height: 1.55);
+  TextStyle heading(double size) =>
+      NooText.title.copyWith(color: colors.fg1, fontSize: size, height: 1.25);
+  return MarkdownStyleSheet.fromTheme(Theme.of(context)).copyWith(
+    p: body,
+    h1: heading(26),
+    h2: heading(22),
+    h3: heading(19),
+    h4: heading(17),
+    listBullet: body,
+    a: body.copyWith(color: colors.accentText),
+    blockquote: body.copyWith(color: colors.fg2),
+    blockquoteDecoration: BoxDecoration(
+      border: Border(left: BorderSide(color: colors.line, width: 3)),
+    ),
+    code: NooText.mono.copyWith(
+      color: colors.fg1,
+      backgroundColor: colors.surface2,
+    ),
+    codeblockDecoration: BoxDecoration(
+      color: colors.surface2,
+      borderRadius: BorderRadius.circular(NooRadii.input),
+    ),
+    horizontalRuleDecoration: BoxDecoration(
+      border: Border(top: BorderSide(color: colors.line)),
+    ),
+  );
+}
@@ -254,11 +254,6 @@ packages:
    description: flutter
    source: sdk
    version: "0.0.0"
-  flutter_driver:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
  flutter_lints:
    dependency: "direct dev"
    description:
@@ -267,6 +262,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "6.0.0"
+  flutter_markdown_plus:
+    dependency: "direct main"
+    description:
+      name: flutter_markdown_plus
+      sha256: fce641d6c2106cc495de1cd603f97a4f9d615a97a64011928ded380dbdade935
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.12"
  flutter_plugin_android_lifecycle:
    dependency: transitive
    description:
@@ -333,11 +336,6 @@ packages:
    description: flutter
    source: sdk
    version: "0.0.0"
-  fuchsia_remote_debug_protocol:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
  google_fonts:
    dependency: "direct main"
    description:
@@ -378,11 +376,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "4.1.2"
-  integration_test:
-    dependency: "direct dev"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
  intl:
    dependency: "direct main"
    description:
@@ -503,6 +496,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "3.1.20"
+  markdown:
+    dependency: transitive
+    description:
+      name: markdown
+      sha256: ee85086ad7698b42522c6ad42fe195f1b9898e4d974a1af4576c1a3a176cada9
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.3.1"
  marquee:
    dependency: "direct main"
    description:
@@ -791,14 +792,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.1.8"
-  process:
-    dependency: transitive
-    description:
-      name: process
-      sha256: "4242ba3508d37e01808bdf71ad1d5bb93a8d671bf2e7450e6b1b353fb0808891"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.6"
  provider:
    dependency: "direct main"
    description:
@@ -932,14 +925,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.4.1"
-  sync_http:
-    dependency: transitive
-    description:
-      name: sync_http
-      sha256: "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.1"
  synchronized:
    dependency: transitive
    description:
@@ -1084,14 +1069,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.1.1"
-  webdriver:
-    dependency: transitive
-    description:
-      name: webdriver
-      sha256: "28b82ec894fed45dd71c23ba62d1af973ed97dd59a4f5790a4d38b0b13e5657e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.2.0"
  webview_flutter:
    dependency: "direct main"
    description:
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.0+1
+version: 1.0.2+5

 environment:
  sdk: ^3.12.2
@@ -58,16 +58,12 @@ dependencies:
  webview_flutter: ^4.14.1
  permission_handler: ^11.3.1
  connectivity_plus: ^6.1.5
+  flutter_markdown_plus: ^1.0.12

 dev_dependencies:
  flutter_test:
    sdk: flutter

-  # Drives tool/screenshots.sh (Play Store screenshots against a fake-data
-  # demo server) - dev only, never part of the release build.
-  integration_test:
-    sdk: flutter
-
  # The "flutter_lints" package below contains a set of recommended lints to
  # encourage good coding practices. The lint set provided by the package is
  # activated in the `analysis_options.yaml` file located at the root of your
@@ -89,6 +85,7 @@ flutter:
  assets:
    - assets/icon/app_icon.png
    - assets/icon/app_icon_monochrome.png
+    - assets/google_fonts/

  # To add assets to your application, add an assets section, like this:
  # assets:
@@ -0,0 +1,198 @@
+import 'dart:convert';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'package:provider/provider.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:noo/models/saved_account.dart';
+import 'package:noo/providers/connectivity_controller.dart';
+import 'package:noo/providers/files_controller.dart';
+import 'package:noo/providers/session_controller.dart';
+import 'package:noo/providers/settings_controller.dart';
+import 'package:noo/providers/sync_status_controller.dart';
+import 'package:noo/theme/app_theme.dart';
+import 'package:noo/views/account_view.dart';
+import 'package:noo/widgets/noo/nav/noo_top_bar.dart';
+
+/// Covers the mobile Settings navigation restructure: a top-level menu of
+/// category rows (`account_view.dart`'s `_MobileMenu`) that pushes a
+/// single-section screen per row, replacing the old design where every
+/// section rendered inline in one long scrolling column. This only covers
+/// the menu/push/back mechanics - each section's own content already has
+/// (or doesn't need) its own coverage elsewhere.
+void main() {
+  const secureStorageChannel = MethodChannel(
+    'plugins.it_nomads.com/flutter_secure_storage',
+  );
+  const connectivityChannel = MethodChannel(
+    'dev.fluttercommunity.plus/connectivity',
+  );
+  const connectivityStatusChannel = EventChannel(
+    'dev.fluttercommunity.plus/connectivity_status',
+  );
+
+  const accountId = 'server_example_com__alice';
+  const passwordKey = 'nc_app_password_$accountId';
+  const password = 'app-password';
+
+  setUpAll(() {
+    GoogleFonts.config.allowRuntimeFetching = false;
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(secureStorageChannel, (call) async {
+          if (call.method == 'readAll') {
+            return <String, String>{passwordKey: password};
+          }
+          if (call.method == 'read') {
+            final key = (call.arguments as Map)['key'] as String?;
+            return key == passwordKey ? password : null;
+          }
+          return null;
+        });
+    // Offline, like `session_controller_test.dart`'s setup: keeps
+    // SessionController in a provisional login (no real HTTP calls) and
+    // stops FilesController/SyncStatusController from starting their
+    // network-fetch/periodic-refresh machinery, which would otherwise
+    // leave timers pending forever in a test.
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(connectivityChannel, (call) async {
+          if (call.method == 'check') return <String>['none'];
+          return null;
+        });
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockStreamHandler(
+          connectivityStatusChannel,
+          MockStreamHandler.inline(onListen: (arguments, events) {}),
+        );
+  });
+
+  setUp(() {
+    SharedPreferences.setMockInitialValues({
+      'account_migration_v1_done': true,
+      'accounts_list': jsonEncode([
+        const SavedAccount(
+          id: accountId,
+          serverUrl: 'https://server.example.com',
+          username: 'alice',
+        ).toJson(),
+      ]),
+      'active_account_id': accountId,
+    });
+  });
+
+  Future<void> pumpSettings(WidgetTester tester) async {
+    await tester.binding.setSurfaceSize(const Size(400, 800));
+    addTearDown(() => tester.binding.setSurfaceSize(null));
+
+    await tester.pumpWidget(
+      MultiProvider(
+        providers: [
+          ChangeNotifierProvider(create: (_) => ConnectivityController()),
+          ChangeNotifierProvider(
+            create: (context) => SessionController(context.read()),
+          ),
+          ChangeNotifierProvider(create: (_) => SettingsController()),
+          ChangeNotifierProvider(
+            create: (context) => FilesController(context.read()),
+          ),
+          ChangeNotifierProvider(
+            create: (context) =>
+                SyncStatusController(context.read(), context.read()),
+          ),
+        ],
+        child: MaterialApp(
+          theme: AppTheme.light(AppTheme.defaultAccent, useDynamicColor: false),
+          home: const AccountView(),
+        ),
+      ),
+    );
+
+    // Not `pumpAndSettle`: once the saved account is ready,
+    // FilesController/SyncStatusController start their own periodic
+    // refresh timers, which `pumpAndSettle` would spin on forever. A
+    // bounded number of small pumps is enough to flush the async gaps in
+    // SessionController's prefs restore and the dependent controllers'
+    // one-shot account-ready reactions (mirrors
+    // `session_controller_test.dart`'s `pumpUntil` loop).
+    for (var i = 0; i < 30; i++) {
+      await tester.pump(const Duration(milliseconds: 10));
+    }
+  }
+
+  /// Advances exactly far enough to finish a push/pop transition
+  /// (`MaterialPageRoute`'s default is 300ms) without risking
+  /// `pumpAndSettle` picking up a pending periodic timer.
+  Future<void> settleNav(WidgetTester tester) async {
+    await tester.pump();
+    for (var i = 0; i < 10; i++) {
+      await tester.pump(const Duration(milliseconds: 50));
+    }
+  }
+
+  const categoryTitles = [
+    'Accounts',
+    'Security',
+    'File sync',
+    'Files cache',
+    'Appearance',
+    'Tabs',
+    'Action bar',
+    'Swipe on a file',
+  ];
+
+  testWidgets(
+    'shows a top-level menu of category rows, not every section inline',
+    (tester) async {
+      await pumpSettings(tester);
+
+      // The account card (pinned, not a category row of its own) ...
+      expect(find.text('alice'), findsOneWidget);
+      // ... plus exactly one row per section.
+      for (final title in categoryTitles) {
+        expect(find.text(title), findsOneWidget);
+      }
+      // A section's own content isn't rendered until its row is tapped -
+      // this is a menu, not the old all-sections-inline column.
+      expect(
+        find.text("Require this device's PIN or biometric to open Noo"),
+        findsNothing,
+      );
+    },
+  );
+
+  testWidgets(
+    'tapping a category row pushes just that section, with a way back',
+    (tester) async {
+      await pumpSettings(tester);
+
+      await tester.tap(find.text('Security'));
+      await settleNav(tester);
+
+      // Landed on a separate, pushed Security screen: its own content -
+      // not shown anywhere on the top-level menu - is now visible. (The
+      // menu screen below it may stay mounted per `PageRoute.maintainState`,
+      // so this checks for the pushed screen's content rather than the
+      // menu's absence.)
+      expect(
+        find.text("Require this device's PIN or biometric to open Noo"),
+        findsOneWidget,
+      );
+      // At least one `NooTopBarBack` now leads back - the pushed screen's
+      // own, on top of `AccountView`'s own (for returning to the shell).
+      expect(find.byType(NooTopBarBack), findsAtLeastNWidgets(1));
+
+      // Tapping the topmost back button pops the pushed screen back off,
+      // taking its content with it - unlike the underlying menu, a popped
+      // route is actually removed, so this absence check is meaningful.
+      await tester.tap(find.byType(NooTopBarBack).last);
+      await settleNav(tester);
+
+      expect(
+        find.text("Require this device's PIN or biometric to open Noo"),
+        findsNothing,
+      );
+      expect(find.text('Security'), findsOneWidget);
+      expect(find.text('alice'), findsOneWidget);
+    },
+  );
+}
@@ -0,0 +1,177 @@
+import 'dart:convert';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'package:lucide_icons_flutter/lucide_icons.dart';
+import 'package:provider/provider.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:noo/models/app_tab.dart';
+import 'package:noo/models/saved_account.dart';
+import 'package:noo/providers/connectivity_controller.dart';
+import 'package:noo/providers/files_controller.dart';
+import 'package:noo/providers/session_controller.dart';
+import 'package:noo/providers/settings_controller.dart';
+import 'package:noo/providers/sync_status_controller.dart';
+import 'package:noo/providers/trash_controller.dart';
+import 'package:noo/theme/app_theme.dart';
+import 'package:noo/widgets/app_top_bar.dart';
+import 'package:noo/widgets/noo/nav/noo_top_bar.dart';
+
+/// Covers `SettingsController.navMenuStyle`'s two options as wired through
+/// `AppTopBar`/`ShellAvatarButton`: [NooNavMenuStyle.drawer] (today's
+/// hamburger-opens-a-left-Drawer pattern, unchanged) vs
+/// [NooNavMenuStyle.avatarMenu] (no hamburger at all - the avatar opens
+/// `showAvatarMenu`'s dropdown instead of the account switcher).
+void main() {
+  const secureStorageChannel = MethodChannel(
+    'plugins.it_nomads.com/flutter_secure_storage',
+  );
+  const connectivityChannel = MethodChannel(
+    'dev.fluttercommunity.plus/connectivity',
+  );
+  const connectivityStatusChannel = EventChannel(
+    'dev.fluttercommunity.plus/connectivity_status',
+  );
+
+  const accountId = 'server_example_com__alice';
+  const passwordKey = 'nc_app_password_$accountId';
+  const password = 'app-password';
+
+  setUpAll(() {
+    GoogleFonts.config.allowRuntimeFetching = false;
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(secureStorageChannel, (call) async {
+          if (call.method == 'readAll') {
+            return <String, String>{passwordKey: password};
+          }
+          if (call.method == 'read') {
+            final key = (call.arguments as Map)['key'] as String?;
+            return key == passwordKey ? password : null;
+          }
+          return null;
+        });
+    // Offline, same as `account_view_test.dart`'s setup: keeps
+    // SessionController in a provisional login and stops
+    // FilesController/SyncStatusController/TrashController's network/timer
+    // machinery from hanging the test.
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(connectivityChannel, (call) async {
+          if (call.method == 'check') return <String>['none'];
+          return null;
+        });
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockStreamHandler(
+          connectivityStatusChannel,
+          MockStreamHandler.inline(onListen: (arguments, events) {}),
+        );
+  });
+
+  setUp(() {
+    SharedPreferences.setMockInitialValues({
+      'account_migration_v1_done': true,
+      'accounts_list': jsonEncode([
+        const SavedAccount(
+          id: accountId,
+          serverUrl: 'https://server.example.com',
+          username: 'alice',
+        ).toJson(),
+      ]),
+      'active_account_id': accountId,
+    });
+  });
+
+  Future<void> pumpTopBar(
+    WidgetTester tester, {
+    required NooNavMenuStyle navMenuStyle,
+  }) async {
+    await tester.binding.setSurfaceSize(const Size(400, 800));
+    addTearDown(() => tester.binding.setSurfaceSize(null));
+
+    await tester.pumpWidget(
+      MultiProvider(
+        providers: [
+          ChangeNotifierProvider(create: (_) => ConnectivityController()),
+          ChangeNotifierProvider(
+            create: (context) => SessionController(context.read()),
+          ),
+          ChangeNotifierProvider(create: (_) => SettingsController()),
+          ChangeNotifierProvider(
+            create: (context) => FilesController(context.read()),
+          ),
+          ChangeNotifierProvider(
+            create: (context) =>
+                SyncStatusController(context.read(), context.read()),
+          ),
+          ChangeNotifierProvider(
+            create: (context) => TrashController(context.read()),
+          ),
+        ],
+        child: MaterialApp(
+          theme: AppTheme.light(AppTheme.defaultAccent, useDynamicColor: false),
+          home: Scaffold(
+            drawer: const Drawer(child: Text('drawer open')),
+            appBar: AppTopBar(
+              style: NooNavStyle.android,
+              tab: AppTab.files,
+              navMenuStyle: navMenuStyle,
+            ),
+            body: const SizedBox(),
+          ),
+        ),
+      ),
+    );
+
+    // Not `pumpAndSettle` - the same reasoning as `account_view_test.dart`:
+    // the active account's dependent controllers start periodic
+    // timers/futures that would spin it forever.
+    for (var i = 0; i < 30; i++) {
+      await tester.pump(const Duration(milliseconds: 10));
+    }
+  }
+
+  testWidgets('avatarMenu style: no hamburger, avatar opens the dropdown', (
+    tester,
+  ) async {
+    await pumpTopBar(tester, navMenuStyle: NooNavMenuStyle.avatarMenu);
+
+    expect(find.byTooltip('Menu'), findsOneWidget);
+    expect(find.byIcon(LucideIcons.menu), findsNothing);
+
+    await tester.tap(find.byTooltip('Menu'));
+    await tester.pump();
+    await tester.pump(const Duration(milliseconds: 200));
+
+    // The dropdown's own header + Settings row - not the account
+    // switcher's "Add account"/"Manage accounts" rows.
+    expect(find.text('alice'), findsOneWidget);
+    expect(find.text('Settings'), findsOneWidget);
+    expect(find.text('Add account'), findsNothing);
+  });
+
+  testWidgets('drawer style (default): hamburger opens the real drawer', (
+    tester,
+  ) async {
+    await pumpTopBar(tester, navMenuStyle: NooNavMenuStyle.drawer);
+
+    expect(find.byTooltip('Menu'), findsOneWidget);
+    await tester.tap(find.byTooltip('Menu'));
+    await tester.pumpAndSettle();
+
+    expect(find.text('drawer open'), findsOneWidget);
+  });
+
+  testWidgets(
+    'drawer style (default): avatar still opens the account switcher',
+    (tester) async {
+      await pumpTopBar(tester, navMenuStyle: NooNavMenuStyle.drawer);
+
+      expect(find.byTooltip('Accounts'), findsOneWidget);
+      await tester.tap(find.byTooltip('Accounts'));
+      await tester.pump();
+      await tester.pump(const Duration(milliseconds: 200));
+
+      expect(find.text('Add account'), findsOneWidget);
+    },
+  );
+}
@@ -12,6 +12,7 @@ import 'package:noo/widgets/noo/core/noo_progress_bar.dart';
 import 'package:noo/widgets/noo/core/noo_search_field.dart';
 import 'package:noo/widgets/noo/core/noo_segmented_control.dart';
 import 'package:noo/widgets/noo/core/noo_toggle.dart';
+import 'package:noo/widgets/noo/nav/noo_nav_style.dart';

 import 'noo_test_utils.dart';

@@ -247,7 +248,11 @@ void main() {
  group('NooFab', () {
    testNooWidgets('shows label and fires onTap', (tester, theme, c) async {
      var taps = 0;
-      await pumpNoo(tester, NooFab(onTap: () => taps++), theme: theme);
+      await pumpNoo(
+        tester,
+        NooFab(barStyle: NooBottomBarStyle.floating, onTap: () => taps++),
+        theme: theme,
+      );
      expect(find.text('Upload'), findsOneWidget);
      expect(tester.getSize(find.byType(NooFab)).height, 56);
      expect(tester.getSize(find.byType(NooFab)).width, lessThan(200));
@@ -263,7 +268,11 @@ void main() {
      var taps = 0;
      await pumpNoo(
        tester,
-        NooFab(collapsed: true, onTap: () => taps++),
+        NooFab(
+          collapsed: true,
+          barStyle: NooBottomBarStyle.floating,
+          onTap: () => taps++,
+        ),
        theme: theme,
      );
      await tester.pumpAndSettle();
@@ -274,6 +283,44 @@ void main() {
      await tester.tap(find.byType(NooFab));
      expect(taps, 1);
    });
+
+    testNooWidgets('floating bar style stays fully round', (
+      tester,
+      theme,
+      c,
+    ) async {
+      await pumpNoo(
+        tester,
+        const NooFab(barStyle: NooBottomBarStyle.floating),
+        theme: theme,
+      );
+      final material = tester.widget<Material>(
+        find.descendant(
+          of: find.byType(NooFab),
+          matching: find.byType(Material),
+        ),
+      );
+      expect((material.borderRadius as BorderRadius).topLeft.x, NooRadii.pill);
+    });
+
+    testNooWidgets('attached bar style squares off to a rounded square', (
+      tester,
+      theme,
+      c,
+    ) async {
+      await pumpNoo(
+        tester,
+        const NooFab(barStyle: NooBottomBarStyle.attached),
+        theme: theme,
+      );
+      final material = tester.widget<Material>(
+        find.descendant(
+          of: find.byType(NooFab),
+          matching: find.byType(Material),
+        ),
+      );
+      expect((material.borderRadius as BorderRadius).topLeft.x, NooRadii.card);
+    });
  });

  group('NooProgressBar', () {
@@ -0,0 +1,106 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:noo/widgets/noo/files/noo_swipe_action.dart';
+
+import 'noo_test_utils.dart';
+
+void main() {
+  setUpNooTests();
+
+  group('NooSwipeAction', () {
+    testNooWidgets('a moderate swipe opens the action without triggering it', (
+      tester,
+      theme,
+      c,
+    ) async {
+      var triggered = 0;
+      await pumpNoo(
+        tester,
+        SizedBox(
+          width: 360,
+          height: 64,
+          child: NooSwipeAction(
+            endAction: NooSwipeActionSpec(
+              kind: NooSwipeActionKind.delete,
+              onTriggered: () => triggered++,
+            ),
+            child: const ColoredBox(
+              color: Colors.white,
+              child: SizedBox(width: 360, height: 64),
+            ),
+          ),
+        ),
+        theme: theme,
+      );
+      // Half the block's own width (96) is well past the "snap open"
+      // threshold but nowhere near the 1.8x trigger extent.
+      await tester.drag(find.byType(NooSwipeAction), const Offset(-60, 0));
+      await tester.pumpAndSettle();
+      expect(triggered, 0);
+      expect(find.text('Delete'), findsOneWidget);
+    });
+
+    testNooWidgets(
+      'swiping past the trigger extent fires the action on release - no '
+      'second tap needed',
+      (tester, theme, c) async {
+        var triggered = 0;
+        await pumpNoo(
+          tester,
+          SizedBox(
+            width: 360,
+            height: 64,
+            child: NooSwipeAction(
+              endAction: NooSwipeActionSpec(
+                kind: NooSwipeActionKind.delete,
+                onTriggered: () => triggered++,
+              ),
+              child: const ColoredBox(
+                color: Colors.white,
+                child: SizedBox(width: 360, height: 64),
+              ),
+            ),
+          ),
+          theme: theme,
+        );
+        // 300px of drag on a 96px-wide block clears the 1.8x (~173px)
+        // trigger extent well past the clamp ceiling.
+        await tester.drag(find.byType(NooSwipeAction), const Offset(-300, 0));
+        await tester.pump();
+        expect(triggered, 1);
+      },
+    );
+
+    testNooWidgets('tapping the revealed block still triggers the action too', (
+      tester,
+      theme,
+      c,
+    ) async {
+      var triggered = 0;
+      await pumpNoo(
+        tester,
+        SizedBox(
+          width: 360,
+          height: 64,
+          child: NooSwipeAction(
+            startAction: NooSwipeActionSpec(
+              kind: NooSwipeActionKind.favorite,
+              onTriggered: () => triggered++,
+            ),
+            child: const ColoredBox(
+              color: Colors.white,
+              child: SizedBox(width: 360, height: 64),
+            ),
+          ),
+        ),
+        theme: theme,
+      );
+      await tester.drag(find.byType(NooSwipeAction), const Offset(60, 0));
+      await tester.pumpAndSettle();
+      expect(triggered, 0);
+      await tester.tap(find.text('Favorite'));
+      await tester.pump();
+      expect(triggered, 1);
+    });
+  });
+}
@@ -137,5 +137,205 @@ void main() {
      final labelCenter = tester.getCenter(find.text('Photos'));
      expect(labelCenter.dy, greaterThan(iconCenter.dy));
    });
+
+    testNooWidgets('floating: inset, rounded, bordered - not edge to edge', (
+      tester,
+      theme,
+      c,
+    ) async {
+      await pumpNoo(
+        tester,
+        SizedBox(
+          width: 360,
+          height: 96,
+          child: NooBottomBar(
+            style: NooNavStyle.android,
+            barStyle: NooBottomBarStyle.floating,
+            destinations: _destinations,
+            selectedIndex: 0,
+            onSelected: (_) {},
+          ),
+        ),
+        theme: theme,
+      );
+      final pillFinder = find.descendant(
+        of: find.byType(NooBottomBar),
+        matching: find.byWidgetPredicate(
+          (w) => w is Container && w.decoration != null,
+        ),
+      );
+      final container = tester.widget<Container>(pillFinder);
+      final decoration = container.decoration as BoxDecoration;
+      expect(decoration.borderRadius, BorderRadius.circular(28));
+      expect(decoration.border, Border.all(color: c.line));
+      // Inset from both side edges of the bar's own host box, not flush
+      // against it - both rects are in the same (global) coordinate space,
+      // so comparing them directly still holds regardless of where
+      // `pumpNoo`'s own harness centers that host box on screen.
+      final hostRect = tester.getRect(find.byType(NooBottomBar));
+      final rect = tester.getRect(pillFinder);
+      expect(rect.left, greaterThan(hostRect.left));
+      expect(rect.right, lessThan(hostRect.right));
+    });
+
+    testNooWidgets(
+      'floating android: idle icon has no reserved label space and is '
+      'bigger than the active one',
+      (tester, theme, c) async {
+        await pumpNoo(
+          tester,
+          SizedBox(
+            width: 360,
+            height: 96,
+            child: NooBottomBar(
+              style: NooNavStyle.android,
+              barStyle: NooBottomBarStyle.floating,
+              destinations: _destinations,
+              selectedIndex: 0,
+              onSelected: (_) {},
+            ),
+          ),
+          theme: theme,
+        );
+        // Unlike attached, an idle floating tab has no label at all - not
+        // just an invisible one - so there's nothing to find here.
+        expect(find.text('Photos'), findsNothing);
+        expect(
+          find.ancestor(
+            of: find.byIcon(LucideIcons.images),
+            matching: find.byType(AnimatedOpacity),
+          ),
+          findsNothing,
+        );
+        final activeIcon = tester.widget<Icon>(find.byIcon(LucideIcons.folder));
+        final idleIcon = tester.widget<Icon>(find.byIcon(LucideIcons.images));
+        expect(idleIcon.size, greaterThan(activeIcon.size!));
+      },
+    );
+
+    testNooWidgets(
+      'attached: search is the row\'s last item and never highlights',
+      (tester, theme, c) async {
+        var searchTaps = 0;
+        var selected = 0;
+        await pumpNoo(
+          tester,
+          StatefulBuilder(
+            builder: (context, setState) => SizedBox(
+              width: 360,
+              height: 80,
+              child: NooBottomBar(
+                style: NooNavStyle.android,
+                destinations: _destinations,
+                selectedIndex: selected,
+                onSelected: (i) => setState(() => selected = i),
+                searchDestination: const NooNavDestination(
+                  icon: LucideIcons.search,
+                  label: 'Search',
+                ),
+                onSearchTap: () => searchTaps++,
+              ),
+            ),
+          ),
+          theme: theme,
+        );
+        expect(find.byIcon(LucideIcons.search), findsOneWidget);
+        final iconCenters = [
+          tester.getCenter(find.byIcon(LucideIcons.folder)),
+          tester.getCenter(find.byIcon(LucideIcons.images)),
+          tester.getCenter(find.byIcon(LucideIcons.star)),
+          tester.getCenter(find.byIcon(LucideIcons.search)),
+        ];
+        // Evenly spaced, search landing after every real destination.
+        for (var i = 1; i < iconCenters.length; i++) {
+          expect(iconCenters[i].dx, greaterThan(iconCenters[i - 1].dx));
+        }
+
+        await tester.tap(find.byIcon(LucideIcons.search));
+        await tester.pump();
+        expect(searchTaps, 1);
+        // Tapping search never selects it or moves the indicator.
+        expect(selected, 0);
+        expect(_indicator(tester, c), findsOneWidget);
+        final indicatorLeft = tester.getTopLeft(_indicator(tester, c)).dx;
+        expect(indicatorLeft, lessThan(iconCenters[3].dx));
+      },
+    );
+
+    testNooWidgets('floating: search is a separate round satellite', (
+      tester,
+      theme,
+      c,
+    ) async {
+      var searchTaps = 0;
+      await pumpNoo(
+        tester,
+        SizedBox(
+          width: 360,
+          height: 96,
+          child: NooBottomBar(
+            style: NooNavStyle.ios,
+            barStyle: NooBottomBarStyle.floating,
+            destinations: _destinations,
+            selectedIndex: 0,
+            onSelected: (_) {},
+            searchDestination: const NooNavDestination(
+              icon: LucideIcons.search,
+              label: 'Search',
+            ),
+            onSearchTap: () => searchTaps++,
+          ),
+        ),
+        theme: theme,
+      );
+      // Not part of the main pill - its own separately-tappable icon.
+      expect(find.text('Search'), findsNothing);
+      final satellite = tester.widget<Container>(
+        find.ancestor(
+          of: find.byIcon(LucideIcons.search),
+          matching: find.byType(Container),
+        ),
+      );
+      final decoration = satellite.decoration as BoxDecoration;
+      expect(decoration.shape, BoxShape.circle);
+
+      await tester.tap(find.byIcon(LucideIcons.search));
+      await tester.pump();
+      expect(searchTaps, 1);
+    });
+
+    testWidgets('floating with search sizes correctly in a real Scaffold '
+        '(regression: unbounded stretch used to fill the whole screen)', (
+      tester,
+    ) async {
+      // A bare SizedBox host (as the other tests use) gives this widget a
+      // bounded height, masking this exact bug - Scaffold.bottomNavigationBar
+      // gives its child a *loose*, unbounded-max height instead, which is
+      // what a Row with crossAxisAlignment.stretch blows up against in
+      // profile/release (the debug assertion that would catch it is
+      // stripped there). Only a real Scaffold reproduces that.
+      await tester.pumpWidget(
+        MaterialApp(
+          theme: nooTheme(Brightness.light),
+          home: Scaffold(
+            body: const SizedBox.expand(),
+            bottomNavigationBar: NooBottomBar(
+              style: NooNavStyle.android,
+              barStyle: NooBottomBarStyle.floating,
+              destinations: _destinations,
+              selectedIndex: 0,
+              onSelected: (_) {},
+              searchDestination: const NooNavDestination(
+                icon: LucideIcons.search,
+                label: 'Search',
+              ),
+              onSearchTap: () {},
+            ),
+          ),
+        ),
+      );
+      final size = tester.getSize(find.byType(NooBottomBar));
+      expect(size.height, lessThan(150));
+    });
  });
 }
@@ -0,0 +1,253 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:noo/widgets/tabs/tab_state_slivers.dart';
+
+import '../noo/noo_test_utils.dart';
+
+/// A minimal stand-in for `AppTopBar` - just needs to be a fixed-height
+/// [PreferredSizeWidget], same contract `topBarSliver` wraps in real tabs.
+class _FakeTopBar extends StatelessWidget implements PreferredSizeWidget {
+  const _FakeTopBar();
+
+  static const double height = 56;
+
+  @override
+  Size get preferredSize => const Size.fromHeight(height);
+
+  @override
+  Widget build(BuildContext context) => const SizedBox(
+    height: height,
+    child: ColoredBox(color: Colors.blue),
+  );
+}
+
+/// Matches the one sliver `topBarSliver` inserts, even once it's fully
+/// scrolled away - `find.byType`'s default `skipOffstage: true` treats a
+/// sliver with `geometry.visible == false` (paintExtent 0, exactly the
+/// "fully hidden" state part of this test exercises) as offstage and
+/// excludes it, which would otherwise make `tester.renderObject` throw
+/// instead of reporting the 0 this test expects. A function, not a
+/// top-level constant, so each call re-evaluates against whichever widget
+/// tree is currently pumped.
+Finder _header() => find.byType(SliverFloatingHeader, skipOffstage: false);
+
+/// A minimal stand-in for each tab's own pinned sort/filter row
+/// (`StickyHeaderDelegate`) - just needs to be a `SliverPersistentHeader`
+/// with `pinned: true` below `topBarSliver`, same contract every real tab
+/// view uses.
+class _FakeStickyHeader extends StatelessWidget {
+  const _FakeStickyHeader();
+
+  static const double height = 48;
+
+  @override
+  Widget build(BuildContext context) => const SizedBox(
+    height: height,
+    child: ColoredBox(color: Colors.red),
+  );
+}
+
+class _FakeStickyHeaderDelegate extends SliverPersistentHeaderDelegate {
+  @override
+  double get minExtent => _FakeStickyHeader.height;
+  @override
+  double get maxExtent => _FakeStickyHeader.height;
+  @override
+  Widget build(
+    BuildContext context,
+    double shrinkOffset,
+    bool overlapsContent,
+  ) => const _FakeStickyHeader();
+  @override
+  bool shouldRebuild(covariant SliverPersistentHeaderDelegate oldDelegate) =>
+      false;
+}
+
+Future<void> _pumpHost(WidgetTester tester, ScrollController controller) {
+  return tester.pumpWidget(
+    MaterialApp(
+      theme: nooTheme(Brightness.light),
+      home: Scaffold(
+        body: CustomScrollView(
+          controller: controller,
+          slivers: [
+            topBarSliver(const _FakeTopBar()),
+            SliverList(
+              delegate: SliverChildBuilderDelegate(
+                (context, index) =>
+                    SizedBox(height: 60, child: Text('Item $index')),
+                childCount: 40,
+              ),
+            ),
+          ],
+        ),
+      ),
+    ),
+  );
+}
+
+void main() {
+  setUpNooTests();
+
+  testWidgets(
+    'topBarSliver floats away scrolling down and reappears the moment the '
+    'drag reverses, not only once back at the top (Material floating app '
+    'bar behavior)',
+    (tester) async {
+      final controller = ScrollController();
+      addTearDown(controller.dispose);
+      await _pumpHost(tester, controller);
+
+      // The render object's own `geometry.paintExtent` is the ground truth
+      // for how much of the bar is actually visible - more reliable than
+      // inferring visibility from hit-testing/finding the child, which a
+      // floating header sliver keeps built regardless of paint extent.
+      double paintExtent() =>
+          tester.renderObject<RenderSliver>(_header()).geometry!.paintExtent;
+
+      // Fully visible before any scroll.
+      expect(paintExtent(), _FakeTopBar.height);
+      expect(controller.offset, 0);
+
+      // Drive one continuous drag by hand (rather than `tester.drag`, which
+      // only pumps once the whole gesture - including the final pointer-up
+      // - has already finished): the floating header's reveal-while-
+      // dragging behavior keys off the *live* scroll direction as reported
+      // mid-gesture, so this needs an intermediate pump while the pointer
+      // is still down to actually observe it.
+      final gesture = await tester.startGesture(const Offset(200, 300));
+
+      // Drag up (content scrolls down) well past the bar's own height, so
+      // it scrolls fully away, same as a plain `SliverToBoxAdapter` would.
+      await gesture.moveBy(const Offset(0, -200));
+      await tester.pump();
+
+      expect(paintExtent(), 0);
+      final scrolledOffset = controller.offset;
+      expect(
+        scrolledOffset,
+        greaterThan(_FakeTopBar.height),
+        reason: "the drag should have moved past the bar's own height",
+      );
+
+      // Reverse direction by a small amount, still mid-gesture and nowhere
+      // near the top of the list. A plain `SliverToBoxAdapter`, or a header
+      // that only reappears once back at the top, would stay fully hidden
+      // here. The floating bar should start reappearing immediately
+      // instead, following the drag.
+      await gesture.moveBy(const Offset(0, 40));
+      await tester.pump();
+
+      expect(controller.offset, lessThan(scrolledOffset));
+      expect(
+        controller.offset,
+        greaterThan(_FakeTopBar.height / 2),
+        reason: 'still far from the top of the list',
+      );
+      expect(
+        paintExtent(),
+        greaterThan(0),
+        reason:
+            'the bar should already be reappearing on the first upward '
+            'movement, without needing to reach the top',
+      );
+
+      await gesture.up();
+      await tester.pumpAndSettle();
+    },
+  );
+
+  testWidgets(
+    "topBarSliver sizes itself from the wrapped bar's own layout (e.g. its "
+    'SafeArea-padded height), not a value declared up front',
+    (tester) async {
+      final controller = ScrollController();
+      addTearDown(controller.dispose);
+      await _pumpHost(tester, controller);
+
+      expect(
+        tester.getSize(find.byType(_FakeTopBar)).height,
+        _FakeTopBar.height,
+      );
+    },
+  );
+
+  testWidgets(
+    'a pinned header below topBarSliver stays clear of the status bar once '
+    'the floating bar fully collapses (regression: it used to ride up '
+    'underneath the status bar once the only thing reserving that space '
+    "disappeared along with the bar's own height)",
+    (tester) async {
+      final controller = ScrollController();
+      addTearDown(controller.dispose);
+      const statusBarHeight = 40.0;
+
+      await tester.pumpWidget(
+        MediaQuery(
+          data: const MediaQueryData(
+            padding: EdgeInsets.only(top: statusBarHeight),
+          ),
+          child: MaterialApp(
+            theme: nooTheme(Brightness.light),
+            home: Scaffold(
+              // The fix under test: wrapping the scroll view (not just the
+              // top bar) in `SafeArea(top: true)` reserves the status-bar
+              // inset outside the scrolling/collapsing region entirely, so
+              // it's never implicated in `topBarSliver`'s own collapse math.
+              body: SafeArea(
+                top: true,
+                bottom: false,
+                child: CustomScrollView(
+                  controller: controller,
+                  slivers: [
+                    topBarSliver(const _FakeTopBar()),
+                    SliverPersistentHeader(
+                      pinned: true,
+                      delegate: _FakeStickyHeaderDelegate(),
+                    ),
+                    SliverList(
+                      delegate: SliverChildBuilderDelegate(
+                        (context, index) =>
+                            SizedBox(height: 60, child: Text('Item $index')),
+                        childCount: 40,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+        ),
+      );
+
+      // Fully visible before any scroll - right below the reserved inset.
+      expect(
+        tester.getTopLeft(find.byType(_FakeStickyHeader)).dy,
+        _FakeTopBar.height + statusBarHeight,
+      );
+
+      // Scroll well past the top bar's own height so it collapses fully.
+      final gesture = await tester.startGesture(const Offset(200, 300));
+      await gesture.moveBy(const Offset(0, -300));
+      await tester.pump();
+      await gesture.up();
+      await tester.pump();
+
+      expect(
+        tester.renderObject<RenderSliver>(_header()).geometry!.paintExtent,
+        0,
+        reason:
+            'the top bar should be fully collapsed for this check to '
+            'mean anything',
+      );
+      // The regression: without the fix, this would be 0 (or negative,
+      // scrolled up under the status bar) instead of sitting right at the
+      // reserved inset.
+      expect(
+        tester.getTopLeft(find.byType(_FakeStickyHeader)).dy,
+        statusBarHeight,
+      );
+    },
+  );
+}
@@ -1,33 +0,0 @@
-// Host-side driver for integration_test/store_screenshots_test.dart (run via
-// tool/screenshots.sh). Each time the test asks for a screenshot this saves
-// a PNG named after it into $SCREENSHOT_DIR.
-//
-// These bytes are the Flutter surface only (no OS status bar) - an earlier
-// version of this file tried to re-capture the screen with `adb exec-out
-// screencap` for a "real" screenshot including it, but on Android,
-// `onScreenshot` only fires once the whole test has finished (see
-// `IntegrationTestWidgetsFlutterBinding`/`integrationDriver`'s source: the
-// native platform channel hands screenshot bytes straight to `reportData`
-// with no round trip to the driver, and the driver's first `requestData`
-// call blocks until every `testWidgets` body in the file has returned) - so
-// every `adb screencap` call was capturing the same final frame, regardless
-// of which named screenshot it was meant to be. Saving these bytes directly
-// is what actually gives each name its own distinct image.
-import 'dart:io';
-
-import 'package:integration_test/integration_test_driver_extended.dart';
-
-Future<void> main() async {
-  final outDir = Directory(
-    Platform.environment['SCREENSHOT_DIR'] ?? 'store_listing/screenshots',
-  )..createSync(recursive: true);
-
-  await integrationDriver(
-    onScreenshot:
-        (String name, List<int> bytes, [Map<String, Object?>? args]) async {
-          File('${outDir.path}/$name.png').writeAsBytesSync(bytes);
-          stdout.writeln('saved $name.png');
-          return true;
-        },
-  );
-}
@@ -1,48 +0,0 @@
-# Demo server for Play Store screenshots
-
-`tool/screenshots.sh` takes the Play Store screenshots against a **throwaway
-Nextcloud that only contains fake data**, so nothing real can appear in them.
-This folder is that server:
-
- `docker-compose.yml` - a single Nextcloud container (SQLite, nothing
-  persisted; `docker compose down -v` wipes it).
- `seed.py` - creates the users and fills them with invented content: landscape
-  "photos" drawn with Pillow, tiny generated PDFs, made-up documents, favorites,
-  shares (to a second user and a public link), trash, a filler file for the
-  storage quota, and edits by a second user so the Activity feed has more than
-  one author. It ends by printing `APP_PASSWORD=...` - an app password for the
-  demo user, so the app can start logged in without the browser login step.
-
-## Running it
-
-Most of the time just run the whole pipeline from the repo root:
-
-```bash
-bash tool/screenshots.sh
-```
-
-(Git Bash is fine on Windows.) You need **Docker**, **Python 3**, **Flutter**
-and an **Android SDK** (`ANDROID_HOME`). Pillow and `requests` are installed
-into `tool/demo_server/.venv` automatically if your Python lacks them. The
-script installs the emulator and a system image through `sdkmanager` on first
-use. Options (`HEADLESS=1`, `DEMO_PORT`, `DEMO_HOST`, `KEEP_SERVER=1`,
-`ANDROID_SERIAL`, ...) are documented at the top of the script.
-
-To poke at the server yourself:
-
-```bash
-docker compose -f tool/demo_server/docker-compose.yml up -d
-python3 tool/demo_server/seed.py          # prints APP_PASSWORD=...
-# browse http://localhost  (Alex / alex-demo-pass, admin / demo-admin-password)
-docker compose -f tool/demo_server/docker-compose.yml down -v
-```
-
-`python3 tool/demo_server/seed.py --generate-only DIR` writes the generated
-files to `DIR` without any server - handy for previewing the fake content.
-
-## Before you upload
-
-Look at every image. The known places where real data could still show up:
-the server address and username (sync header panel, Settings > Accounts), the
-avatar initial, notification icons in the status bar, and anything left over
-from a previously used emulator profile (the script always wipes its own).
@@ -1,16 +0,0 @@
-# A throwaway Nextcloud that only ever holds fake data - the backend the Play
-# Store screenshots are taken against (see tool/screenshots.sh). Nothing is
-# persisted: `docker compose down -v` wipes it completely.
-services:
-  nextcloud:
-    image: ${NEXTCLOUD_IMAGE:-nextcloud:apache}
-    ports:
-      - "${DEMO_PORT:-80}:80"
-    environment:
-      # SQLite keeps this to a single container.
-      SQLITE_DATABASE: nextcloud
-      NEXTCLOUD_ADMIN_USER: admin
-      NEXTCLOUD_ADMIN_PASSWORD: demo-admin-password
-      # `localhost` is how the Android emulator reaches this server (via
-      # `adb reverse`); DEMO_HOST is the optional friendlier hostname.
-      NEXTCLOUD_TRUSTED_DOMAINS: "localhost 127.0.0.1 10.0.2.2 ${DEMO_HOST:-demo.example.com}"
@@ -1,2 +0,0 @@
-requests>=2.31
-Pillow>=10.0
@@ -1,348 +0,0 @@
-#!/usr/bin/env python3
-"""Fills a throwaway Nextcloud with fake data for the Play Store screenshots.
-
-Everything here is invented or procedurally generated (landscape "photos"
-drawn with Pillow, tiny hand-built PDFs, made-up names), so nothing real -
-and nothing with a licence or a face in it - can end up in a screenshot.
-
-  python3 seed.py                    seed http://localhost (DEMO_BASE_URL)
-  python3 seed.py --generate-only D  write the fake files under D, no server
-
-On success the LAST line printed to stdout is `APP_PASSWORD=<token>` - an app
-password for the demo user, which tool/screenshots.sh hands to the app so it
-can start logged in without going through the browser login flow. All
-progress output goes to stderr.
-"""
-import argparse
-import io
-import math
-import os
-import random
-import shutil
-import subprocess
-import sys
-import tempfile
-import time
-from urllib.parse import quote
-
-from PIL import Image, ImageDraw, ImageFilter
-
-BASE = os.environ.get("DEMO_BASE_URL", "http://localhost").rstrip("/")
-ADMIN = ("admin", os.environ.get("NEXTCLOUD_ADMIN_PASSWORD", "demo-admin-password"))
-FILLER_MB = int(os.environ.get("DEMO_FILLER_MB", "300"))
-
-# The account the screenshots are taken as, and a second user to share with.
-USERS = {
-    "Alex": ("alex-demo-pass", "Alex Morgan", "alex@example.com", "15 GB"),
-    "Sam": ("sam-demo-pass", "Sam Rivera", "sam@example.com", "5 GB"),
-}
-
-
-def log(message):
-    print(message, file=sys.stderr, flush=True)
-
-
-# --------------------------------------------------------------- content ---
-
-# (sky top, sky bottom, sun, far hills, mid hills, near hills)
-PALETTES = [
-    ((250, 176, 120), (255, 226, 170), (255, 250, 220), (152, 120, 150), (108, 90, 128), (62, 60, 96)),
-    ((70, 130, 200), (190, 225, 245), (255, 255, 240), (110, 150, 170), (70, 118, 130), (40, 84, 90)),
-    ((30, 40, 90), (240, 130, 110), (255, 220, 190), (90, 60, 110), (60, 44, 84), (30, 28, 56)),
-    ((110, 180, 190), (230, 245, 235), (255, 245, 200), (130, 180, 150), (84, 140, 110), (44, 98, 76)),
-    ((240, 150, 90), (255, 214, 150), (255, 240, 200), (200, 130, 90), (160, 96, 70), (110, 66, 56)),
-    ((20, 24, 60), (70, 60, 120), (240, 240, 255), (50, 50, 100), (34, 36, 80), (18, 20, 50)),
-    ((150, 200, 230), (245, 250, 255), (255, 255, 255), (170, 190, 210), (130, 156, 180), (90, 120, 150)),
-    ((200, 120, 160), (250, 200, 190), (255, 235, 210), (170, 100, 140), (126, 78, 116), (80, 54, 90)),
-]
-
-
-def _mix(a, b, t):
-    return tuple(int(a[i] + (b[i] - a[i]) * t) for i in range(3))
-
-
-def landscape(seed, size=(1600, 1067)):
-    """A soft, layered-hills landscape - reads as a photo at thumbnail size."""
-    rnd = random.Random(seed)
-    top, bottom, sun, far, mid, near = PALETTES[seed % len(PALETTES)]
-    w, h = size
-    img = Image.new("RGB", size)
-    draw = ImageDraw.Draw(img)
-    for y in range(h):
-        draw.line([(0, y), (w, y)], fill=_mix(top, bottom, min(1.0, y / (h * 0.75))))
-    sx, sy, sr = rnd.randint(w // 5, 4 * w // 5), rnd.randint(h // 6, h // 3), rnd.randint(h // 12, h // 7)
-    draw.ellipse([sx - sr, sy - sr, sx + sr, sy + sr], fill=sun)
-    for base, amp, color in ((0.62, 0.10, far), (0.72, 0.13, mid), (0.84, 0.10, near)):
-        phase = [rnd.uniform(0, math.tau) for _ in range(3)]
-        freq = [rnd.uniform(1.0, 2.0), rnd.uniform(2.5, 4.0), rnd.uniform(5.0, 8.0)]
-        weight = (1.0, 0.5, 0.2)
-        pts = [(0, h)]
-        for x in range(0, w + 8, 8):
-            v = sum(wt * math.sin(x / w * math.tau * f + p) for wt, f, p in zip(weight, freq, phase))
-            pts.append((x, int(h * base + h * amp * v / 1.7)))
-        pts.append((w, h))
-        draw.polygon(pts, fill=color)
-    img = img.filter(ImageFilter.GaussianBlur(0.8))
-    out = io.BytesIO()
-    img.save(out, "JPEG", quality=86)
-    return out.getvalue()
-
-
-def pdf(title, lines):
-    """A tiny but valid one-page PDF."""
-
-    def esc(s):
-        return s.replace("\\", "\\\\").replace("(", "\\(").replace(")", "\\)")
-
-    body = "BT /F1 26 Tf 72 720 Td (%s) Tj ET\n" % esc(title)
-    for i, line in enumerate(lines):
-        body += "BT /F1 12 Tf 72 %d Td (%s) Tj ET\n" % (680 - 20 * i, esc(line))
-    stream = body.encode("latin-1", "replace")
-    objs = [
-        b"<< /Type /Catalog /Pages 2 0 R >>",
-        b"<< /Type /Pages /Kids [3 0 R] /Count 1 >>",
-        b"<< /Type /Page /Parent 2 0 R /MediaBox [0 0 612 792] /Contents 4 0 R "
-        b"/Resources << /Font << /F1 5 0 R >> >> >>",
-        b"<< /Length %d >>\nstream\n" % len(stream) + stream + b"\nendstream",
-        b"<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica >>",
-    ]
-    out = bytearray(b"%PDF-1.4\n")
-    offsets = []
-    for i, obj in enumerate(objs, start=1):
-        offsets.append(len(out))
-        out += b"%d 0 obj\n" % i + obj + b"\nendobj\n"
-    xref = len(out)
-    out += b"xref\n0 %d\n0000000000 65535 f \n" % (len(objs) + 1)
-    for off in offsets:
-        out += b"%010d 00000 n \n" % off
-    out += b"trailer\n<< /Size %d /Root 1 0 R >>\nstartxref\n%d\n%%%%EOF\n" % (len(objs) + 1, xref)
-    return bytes(out)
-
-
-def text(body):
-    return body.strip().encode("utf-8") + b"\n"
-
-
-def video():
-    """A short test-pattern clip if ffmpeg is around, else None (skipped)."""
-    if not shutil.which("ffmpeg"):
-        return None
-    with tempfile.TemporaryDirectory() as tmp:
-        path = os.path.join(tmp, "clip.mp4")
-        result = subprocess.run(
-            ["ffmpeg", "-y", "-loglevel", "error", "-f", "lavfi", "-i", "testsrc2=duration=6:size=640x360:rate=24",
-             "-pix_fmt", "yuv420p", path],
-            capture_output=True,
-        )
-        if result.returncode != 0:
-            return None
-        with open(path, "rb") as f:
-            return f.read()
-
-
-def build_content():
-    """(path, bytes) for everything the demo user owns, plus what to favorite/delete."""
-    files = []
-
-    def add(path, data):
-        if data is not None:
-            files.append((path, data))
-
-    add("/Welcome.md", text("# Welcome\n\nYour files, everywhere you go."))
-    add("/Vacation ideas.txt", text("Lisbon\nKyoto\nPatagonia\nIceland in winter"))
-
-    add("/Documents/Project brief.pdf", pdf("Project brief", ["Goals for the quarter", "Milestones and owners", "Open questions"]))
-    add("/Documents/Quarterly report.pdf", pdf("Quarterly report", ["Revenue up 12 percent", "Churn down 3 percent", "Hiring plan"]))
-    add("/Documents/Meeting notes.md", text("# Meeting notes\n\n- Ship the beta on Friday\n- Review pricing\n- Book the offsite"))
-    add("/Documents/Budget 2026.xlsx", os.urandom(24_000))
-    add("/Documents/Contracts/Lease agreement.pdf", pdf("Lease agreement", ["Term: 12 months", "Rent due on the 1st"]))
-    add("/Documents/Contracts/NDA - template.pdf", pdf("Mutual NDA", ["Standard template"]))
-
-    trips = ["Lake sunrise", "Mountain pass", "Old town", "Beach day", "Desert road", "Forest trail", "City lights"]
-    for i, name in enumerate(trips):
-        add("/Trips/%s.jpg" % name, landscape(i + 1))
-    add("/Trips/Trip itinerary.pdf", pdf("Trip itinerary", ["Day 1  Arrive and settle in", "Day 2  Old town walk", "Day 3  Coast day trip"]))
-
-    for i in range(8):
-        add("/Photos/Summer 2026/IMG_%04d.jpg" % (2041 + i), landscape(20 + i))
-    add("/Photos/Summer 2026/Clip - hike.mp4", video())
-
-    add("/Recipes/Pasta al limone.md", text("# Pasta al limone\n\nSpaghetti, lemon, butter, parmesan, black pepper."))
-    add("/Recipes/Sourdough.md", text("# Sourdough\n\n500g flour, 350g water, 100g starter, 10g salt."))
-    add("/Recipes/Shopping list.txt", text("Lemons\nParmesan\nFlour\nCoffee beans"))
-
-    add("/Projects/Website redesign/Wireframes.pdf", pdf("Wireframes", ["Home", "Pricing", "Sign up"]))
-    add("/Projects/Website redesign/Design tokens.json", text('{"radius": 12, "primary": "#2a6b50"}'))
-    add("/Projects/Website redesign/notes.txt", text("Kickoff next Tuesday.\nCollect brand assets."))
-
-    favorites = ["/Trips/Lake sunrise.jpg", "/Trips/Mountain pass.jpg", "/Documents/Project brief.pdf", "/Recipes/Sourdough.md"]
-
-    # Created, then deleted - they end up in the Trash tab.
-    trashed = [
-        ("/Old draft.txt", text("Superseded draft.")),
-        ("/Screenshot 2026-03-14.jpg", landscape(40, (1080, 1920))),
-        ("/Receipts (old)/March.pdf", pdf("Receipt", ["March"])),
-    ]
-    return files, favorites, trashed
-
-
-# ---------------------------------------------------------------- server ---
-
-
-class ZeroStream:
-    """`size` zero bytes, streamed - a big filler file without holding it in memory."""
-
-    def __init__(self, size):
-        self.size, self.pos = size, 0
-
-    def __len__(self):
-        return self.size
-
-    def read(self, n=-1):
-        n = self.size - self.pos if n is None or n < 0 else min(n, self.size - self.pos)
-        self.pos += n
-        return b"\0" * n
-
-
-class Server:
-    def __init__(self):
-        import requests  # imported lazily so --generate-only needs no network libs
-
-        self.requests = requests
-
-    def _call(self, method, url, auth, **kw):
-        headers = kw.pop("headers", {})
-        headers.setdefault("OCS-APIRequest", "true")
-        return self.requests.request(method, url, auth=auth, headers=headers, timeout=600, **kw)
-
-    def wait_ready(self):
-        log("Waiting for Nextcloud to finish installing (first start takes a minute or two)...")
-        deadline = time.time() + 600
-        while time.time() < deadline:
-            try:
-                r = self.requests.get(BASE + "/status.php", timeout=5)
-                if r.ok and r.json().get("installed") and not r.json().get("maintenance"):
-                    return
-            except Exception:
-                pass
-            time.sleep(3)
-        sys.exit("Nextcloud did not become ready in time")
-
-    def ocs(self, method, path, auth, **kw):
-        r = self._call(method, BASE + path, auth, params={"format": "json"}, **kw)
-        try:
-            return r.json()["ocs"]
-        except Exception:
-            return {"meta": {"statuscode": r.status_code}, "data": {}}
-
-    def create_user(self, user, password, display, email, quota):
-        res = self.ocs(
-            "POST", "/ocs/v1.php/cloud/users", ADMIN,
-            data={"userid": user, "password": password, "displayName": display, "email": email, "quota": quota},
-        )
-        code = res["meta"]["statuscode"]
-        if code not in (100, 200, 102):  # 102 = already exists
-            sys.exit("Could not create user %s: %s" % (user, res))
-
-    def dav(self, method, user, path, **kw):
-        auth = (user, USERS[user][0])
-        url = "%s/remote.php/dav/files/%s%s" % (BASE, user, quote(path))
-        return self._call(method, url, auth, **kw)
-
-    def mkdirs(self, user, path):
-        built = ""
-        for part in [p for p in path.split("/") if p]:
-            built += "/" + part
-            self.dav("MKCOL", user, built)
-
-    def put(self, user, path, data):
-        parent = path.rsplit("/", 1)[0]
-        if parent:
-            self.mkdirs(user, parent)
-        r = self.dav("PUT", user, path, data=data)
-        if r.status_code not in (200, 201, 204):
-            sys.exit("PUT %s failed: %s %s" % (path, r.status_code, r.text[:200]))
-
-    def favorite(self, user, path):
-        body = (
-            '<?xml version="1.0"?><d:propertyupdate xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns">'
-            "<d:set><d:prop><oc:favorite>1</oc:favorite></d:prop></d:set></d:propertyupdate>"
-        )
-        self.dav("PROPPATCH", user, path, data=body, headers={"Content-Type": "application/xml"})
-
-    def delete(self, user, path):
-        self.dav("DELETE", user, path)
-
-    def share(self, user, path, share_type, share_with=None, permissions=31):
-        data = {"path": path, "shareType": share_type, "permissions": permissions}
-        if share_with:
-            data["shareWith"] = share_with
-        auth = (user, USERS[user][0])
-        self.ocs("POST", "/ocs/v2.php/apps/files_sharing/api/v1/shares", auth, data=data)
-
-    def app_password(self, user):
-        auth = (user, USERS[user][0])
-        res = self.ocs("GET", "/ocs/v2.php/core/getapppassword", auth)
-        token = (res.get("data") or {}).get("apppassword")
-        if not token:
-            sys.exit("Could not get an app password for %s: %s" % (user, res))
-        return token
-
-
-def seed_server():
-    server = Server()
-    server.wait_ready()
-
-    for user, (password, display, email, quota) in USERS.items():
-        log("Creating user %s" % user)
-        server.create_user(user, password, display, email, quota)
-
-    files, favorites, trashed = build_content()
-    log("Uploading %d files as Alex" % len(files))
-    for path, data in files:
-        server.put("Alex", path, data)
-    if FILLER_MB > 0:
-        log("Uploading a %d MB filler file so the storage quota isn't empty" % FILLER_MB)
-        server.put("Alex", "/Backups/Laptop backup.zip", ZeroStream(FILLER_MB * 1024 * 1024))
-
-    for path in favorites:
-        server.favorite("Alex", path)
-
-    log("Creating shares")
-    server.share("Alex", "/Trips", 0, "Sam", permissions=31)
-    server.share("Alex", "/Documents/Project brief.pdf", 3, permissions=1)
-    server.put("Sam", "/Team notes/Roadmap.md", text("# Roadmap\n\nQ3: beta. Q4: launch."))
-    server.put("Sam", "/Team notes/Standup.md", text("Daily standup at 9:30."))
-    server.share("Sam", "/Team notes", 0, "Alex", permissions=31)
-    # Sam edits inside the folder Alex shared - gives the Activity feed a second author.
-    server.put("Sam", "/Trips/Suggestions.txt", text("Add the coast road stop!"))
-
-    log("Filling the trash")
-    for path, data in trashed:
-        server.put("Alex", path, data)
-    for path, _ in trashed:
-        server.delete("Alex", path)
-    server.delete("Alex", "/Receipts (old)")
-
-    token = server.app_password("Alex")
-    print("APP_PASSWORD=" + token, flush=True)
-
-
-def generate_only(target):
-    files, favorites, trashed = build_content()
-    for path, data in files + trashed:
-        dest = os.path.join(target, "Alex" + path)
-        os.makedirs(os.path.dirname(dest), exist_ok=True)
-        with open(dest, "wb") as f:
-            f.write(data)
-    log("Wrote %d files under %s (favorites: %d)" % (len(files) + len(trashed), target, len(favorites)))
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter)
-    parser.add_argument("--generate-only", metavar="DIR", help="write the fake files locally instead of seeding a server")
-    args = parser.parse_args()
-    if args.generate_only:
-        generate_only(args.generate_only)
-    else:
-        seed_server()
@@ -1,43 +0,0 @@
-#!/usr/bin/env python3
-"""Makes captured screenshots Play Store ready and reports anything that isn't.
-
-Play wants JPEG or 24-bit PNG (no alpha), each side 320-3840 px, and the long
-side at most twice the short side. The captured PNGs are 32-bit RGBA, so this
-flattens them to RGB in place, then checks the dimensions.
-
-  python3 tool/finalize_screenshots.py store_listing/screenshots
-"""
-import sys
-from pathlib import Path
-
-from PIL import Image
-
-
-def main(directory):
-    files = sorted(Path(directory).glob("*.png"))
-    if not files:
-        sys.exit("No PNGs found in %s" % directory)
-
-    problems = 0
-    for path in files:
-        with Image.open(path) as im:
-            im.load()
-            rgb = Image.new("RGB", im.size, (255, 255, 255))
-            rgb.paste(im, mask=im.getchannel("A") if "A" in im.getbands() else None)
-        rgb.save(path, "PNG", optimize=True)
-
-        w, h = rgb.size
-        notes = []
-        if min(w, h) < 320 or max(w, h) > 3840:
-            notes.append("side outside 320-3840 px")
-        if max(w, h) > 2 * min(w, h):
-            notes.append("aspect ratio over 2:1")
-        problems += bool(notes)
-        print("%-32s %4dx%-4d %s" % (path.name, w, h, "; ".join(notes) or "ok"))
-
-    print("\n%d screenshots, %d with problems" % (len(files), problems))
-    sys.exit(1 if problems else 0)
-
-
-if __name__ == "__main__":
-    main(sys.argv[1] if len(sys.argv) > 1 else "store_listing/screenshots")
@@ -1,273 +0,0 @@
-#!/usr/bin/env bash
-# Generates the Play Store screenshots - without any real data.
-#
-# What it does, end to end:
-#   1. starts a throwaway Nextcloud in Docker and fills it with fake data
-#   2. creates + boots a clean Android emulator (1080x1920, demo-mode status bar)
-#   3. runs integration_test/store_screenshots_test.dart against it, which
-#      logs in as the fake user and walks through the app's tabs and states
-#   4. leaves flattened, size-checked PNGs in store_listing/screenshots/
-#
-# Works on Linux, macOS and Git Bash on Windows. Needs: docker, python3,
-# flutter, and an Android SDK (ANDROID_HOME / ANDROID_SDK_ROOT). See
-# tool/demo_server/README.md.
-#
-# Options (environment variables):
-#   SCREENSHOT_DIR   output directory            (store_listing/screenshots)
-#   ANDROID_SERIAL   use this already-running device instead of the emulator
-#   HEADLESS=1       run the emulator without a window
-#   DEMO_PORT        host port for the demo server (80; anything else shows
-#                    up as ":port" in the app's header)
-#   DEMO_HOST        show this hostname instead of "localhost" in the app,
-#                    e.g. cloud.example.com (best effort - edits the
-#                    emulator's hosts file, which needs a rootable image)
-#   KEEP_SERVER=1    leave the demo server running afterwards
-#   KEEP_EMULATOR=1  leave the emulator running afterwards
-#   SCREEN_W / SCREEN_H / SCREEN_DENSITY   emulator screen (1080 / 1920 / 440);
-#                    Play needs the long side <= 2x the short side
-set -euo pipefail
-
-cd "$(dirname "$0")/.."
-REPO_ROOT="$PWD"
-
-# Git Bash would otherwise rewrite device paths such as /system/etc/hosts.
-export MSYS_NO_PATHCONV=1
-
-AVD_NAME="${AVD_NAME:-noo_screenshots}"
-API_LEVEL="${SCREENSHOT_API:-36}"
-SYSTEM_IMAGE="system-images;android-${API_LEVEL};google_apis;x86_64"
-SCREEN_W="${SCREEN_W:-1080}"
-SCREEN_H="${SCREEN_H:-1920}"
-SCREEN_DENSITY="${SCREEN_DENSITY:-440}"
-OUT_DIR="${SCREENSHOT_DIR:-store_listing/screenshots}"
-DEMO_PORT="${DEMO_PORT:-80}"
-DEMO_HOST="${DEMO_HOST:-}"
-export DEMO_PORT DEMO_HOST
-
-log() { printf '\n==> %s\n' "$*" >&2; }
-die() { printf 'error: %s\n' "$*" >&2; exit 1; }
-
-# Two easy mistakes worth catching up front rather than as a confusing
-# "missing prerequisites" list.
-if [ "$(id -u)" = 0 ]; then
-  die "don't run this as root/with sudo - it would create root-owned files and use root's home for the emulator."
-fi
-if grep -qi microsoft /proc/version 2>/dev/null; then
-  die "this is WSL, which can't see your Windows Flutter/Android SDK (and can't run the emulator well). On Windows run it from Git Bash instead."
-fi
-
-# ---------------------------------------------------------------- tooling ---
-
-# Windows env vars hold C:\... paths; convert for bash.
-to_unix() { if command -v cygpath >/dev/null 2>&1; then cygpath -u "$1"; else printf '%s' "$1"; fi; }
-
-SDK_ROOT=""
-for candidate in "${ANDROID_HOME:-}" "${ANDROID_SDK_ROOT:-}" "$HOME/Android/Sdk" \
-  "$HOME/Library/Android/sdk" "${LOCALAPPDATA:-}/Android/Sdk"; do
-  if [ -n "$candidate" ] && [ -d "$(to_unix "$candidate")" ]; then
-    SDK_ROOT="$(to_unix "$candidate")"
-    break
-  fi
-done
-
-# Finds a tool by name on PATH or in the SDK, including Windows .bat/.exe.
-find_tool() {
-  local name="$1" dir ext
-  for ext in "" .bat .exe; do
-    if command -v "$name$ext" >/dev/null 2>&1; then command -v "$name$ext"; return 0; fi
-  done
-  for dir in "$SDK_ROOT/cmdline-tools/latest/bin" "$SDK_ROOT/platform-tools" "$SDK_ROOT/emulator"; do
-    for ext in "" .bat .exe; do
-      if [ -x "$dir/$name$ext" ]; then printf '%s' "$dir/$name$ext"; return 0; fi
-    done
-  done
-  return 1
-}
-
-missing=()
-require() { # <command> <how to get it>
-  command -v "$1" >/dev/null 2>&1 || missing+=("$1  -  $2")
-}
-require docker "install Docker (Desktop on Windows/macOS)"
-require flutter "install Flutter and put it on PATH"
-PY="$(command -v python3 || command -v python || true)"
-[ -n "$PY" ] || missing+=("python3  -  install Python 3")
-ADB="$(find_tool adb || true)"
-[ -n "$ADB" ] || missing+=("adb  -  install Android platform-tools (or set ANDROID_HOME)")
-if [ -z "${ANDROID_SERIAL:-}" ]; then
-  SDKMANAGER="$(find_tool sdkmanager || true)"
-  AVDMANAGER="$(find_tool avdmanager || true)"
-  [ -n "$SDKMANAGER" ] && [ -n "$AVDMANAGER" ] ||
-    missing+=("sdkmanager/avdmanager  -  install the Android cmdline-tools (or set ANDROID_HOME)")
-fi
-if [ "${#missing[@]}" -gt 0 ]; then
-  printf 'Missing prerequisites:\n' >&2
-  printf '  - %s\n' "${missing[@]}" >&2
-  exit 1
-fi
-
-if docker compose version >/dev/null 2>&1; then
-  DC=(docker compose)
-else
-  DC=(docker-compose)
-fi
-DC+=(-f tool/demo_server/docker-compose.yml)
-adb() { "$ADB" "$@"; }
-
-# Python with Pillow + requests: use the system one if it has them, else a
-# local virtualenv (tool/demo_server/.venv, gitignored).
-if ! "$PY" -c 'import PIL, requests' >/dev/null 2>&1; then
-  log "Setting up a Python virtualenv (Pillow, requests)"
-  "$PY" -m venv tool/demo_server/.venv
-  if [ -x tool/demo_server/.venv/bin/python ]; then
-    PY="$REPO_ROOT/tool/demo_server/.venv/bin/python"
-  else
-    PY="$REPO_ROOT/tool/demo_server/.venv/Scripts/python"
-  fi
-  "$PY" -m pip install -q -r tool/demo_server/requirements.txt
-fi
-
-# ---------------------------------------------------------------- cleanup ---
-
-STARTED_EMULATOR=0
-EMULATOR_PID=""
-cleanup() {
-  local code=$?
-  set +e
-  if [ -n "${SERIAL:-}" ]; then
-    adb -s "$SERIAL" shell am broadcast -a com.android.systemui.demo -e command exit >/dev/null 2>&1
-    adb -s "$SERIAL" reverse --remove-all >/dev/null 2>&1
-  fi
-  if [ "$STARTED_EMULATOR" = 1 ] && [ "${KEEP_EMULATOR:-0}" != 1 ]; then
-    adb -s "$SERIAL" emu kill >/dev/null 2>&1
-  fi
-  if [ "${KEEP_SERVER:-0}" != 1 ]; then
-    "${DC[@]}" down -v >/dev/null 2>&1
-  fi
-  exit "$code"
-}
-trap cleanup EXIT
-
-# ---------------------------------------------------------- demo server ---
-
-log "Starting a fresh demo Nextcloud (port $DEMO_PORT)"
-"${DC[@]}" down -v >/dev/null 2>&1 || true
-"${DC[@]}" up -d
-
-log "Seeding fake data"
-APP_PASSWORD="$(DEMO_BASE_URL="http://localhost:$DEMO_PORT" "$PY" tool/demo_server/seed.py | grep '^APP_PASSWORD=' | tail -n1 | cut -d= -f2-)"
-[ -n "$APP_PASSWORD" ] || die "the seed script did not return an app password"
-
-# ---------------------------------------------------------------- device ---
-
-if [ -n "${ANDROID_SERIAL:-}" ]; then
-  SERIAL="$ANDROID_SERIAL"
-  log "Using existing device $SERIAL"
-else
-  log "Preparing the emulator"
-  [ -n "$SDK_ROOT" ] || die "set ANDROID_HOME to your Android SDK"
-  EMULATOR="$(find_tool emulator || true)"
-  if [ -z "$EMULATOR" ] || ! [ -d "$SDK_ROOT/system-images/android-${API_LEVEL}/google_apis/x86_64" ]; then
-    log "Installing the emulator + system image (one-off, a few GB)"
-    yes | "$SDKMANAGER" --licenses >/dev/null 2>&1 || true
-    "$SDKMANAGER" "emulator" "platform-tools" "$SYSTEM_IMAGE"
-    EMULATOR="$(find_tool emulator)"
-  fi
-
-  # avdmanager also prints a harmless "Could not load devices from
-  # .../devices.xml" error for system images that ship no devices.xml, so its
-  # output is hidden and success is judged by whether the AVD exists.
-  echo no | "$AVDMANAGER" create avd --force -n "$AVD_NAME" -k "$SYSTEM_IMAGE" -d pixel_6 >/dev/null 2>&1 || true
-  AVD_DIR="$(to_unix "${ANDROID_AVD_HOME:-$HOME/.android/avd}")/$AVD_NAME.avd"
-  [ -d "$AVD_DIR" ] || die "could not find the AVD at $AVD_DIR (set ANDROID_AVD_HOME)"
-  set_ini() { # <key> <value>: replace or append in the AVD's config.ini
-    if grep -q "^$1=" "$AVD_DIR/config.ini"; then
-      sed -i.bak "s|^$1=.*|$1=$2|" "$AVD_DIR/config.ini" && rm -f "$AVD_DIR/config.ini.bak"
-    else
-      echo "$1=$2" >> "$AVD_DIR/config.ini"
-    fi
-  }
-  sed -i.bak '/^skin\.path=/d' "$AVD_DIR/config.ini" && rm -f "$AVD_DIR/config.ini.bak"
-  set_ini skin.name "${SCREEN_W}x${SCREEN_H}"
-  set_ini hw.lcd.width "$SCREEN_W"
-  set_ini hw.lcd.height "$SCREEN_H"
-  set_ini hw.lcd.density "$SCREEN_DENSITY"
-
-  log "Booting the emulator"
-  EMULATOR_FLAGS=(-avd "$AVD_NAME" -no-snapshot -wipe-data -no-audio -no-boot-anim -gpu swiftshader_indirect)
-  [ "${HEADLESS:-0}" = 1 ] && EMULATOR_FLAGS+=(-no-window)
-  "$EMULATOR" "${EMULATOR_FLAGS[@]}" >/tmp/noo_emulator.log 2>&1 &
-  EMULATOR_PID=$!
-  STARTED_EMULATOR=1
-
-  adb wait-for-device
-  for _ in $(seq 1 150); do
-    [ "$(adb shell getprop sys.boot_completed 2>/dev/null | tr -d '\r')" = 1 ] && break
-    sleep 2
-  done
-  [ "$(adb shell getprop sys.boot_completed 2>/dev/null | tr -d '\r')" = 1 ] || die "the emulator did not finish booting (see /tmp/noo_emulator.log)"
-  SERIAL="$(adb devices | awk '/^emulator-/{print $1; exit}')"
-fi
-export ANDROID_SERIAL="$SERIAL"
-
-log "Configuring the device"
-adb shell input keyevent 82 >/dev/null 2>&1 || true            # dismiss keyguard
-adb shell svc power stayon true >/dev/null 2>&1 || true        # never sleep mid-run
-
-# Make the demo server reachable from the device as localhost. Binding a port
-# below 1024 (the default 80) on the device needs root - the google_apis
-# emulator images allow `adb root` - otherwise fall back to a high device
-# port, which then shows up as ":8080" in the app.
-DEVICE_PORT="$DEMO_PORT"
-if [ "$DEMO_PORT" -lt 1024 ]; then
-  adb root >/dev/null 2>&1 || true
-  sleep 2
-  adb wait-for-device
-fi
-if ! adb reverse "tcp:$DEVICE_PORT" "tcp:$DEMO_PORT" >/dev/null 2>&1; then
-  DEVICE_PORT=8080
-  printf 'note: could not bind port %s on the device (no root); using %s instead\n' "$DEMO_PORT" "$DEVICE_PORT" >&2
-  adb reverse "tcp:$DEVICE_PORT" "tcp:$DEMO_PORT" || die "adb reverse failed"
-fi
-
-SERVER_HOST="localhost"
-if [ -n "$DEMO_HOST" ]; then
-  # Best effort: make DEMO_HOST resolve to the (reverse-forwarded) loopback.
-  if adb root >/dev/null 2>&1 && sleep 2 && adb remount >/dev/null 2>&1 &&
-    adb shell "echo '127.0.0.1 $DEMO_HOST' >> /system/etc/hosts" >/dev/null 2>&1; then
-    SERVER_HOST="$DEMO_HOST"
-  else
-    printf 'warning: could not edit the device hosts file; showing "localhost" instead of %s\n' "$DEMO_HOST" >&2
-  fi
-fi
-SERVER_URL="http://$SERVER_HOST"
-[ "$DEVICE_PORT" = 80 ] || SERVER_URL="$SERVER_URL:$DEVICE_PORT"
-
-# Clean status bar: 12:00, full battery, full Wi-Fi, no notification icons.
-adb shell settings put global sysui_demo_allowed 1
-demo() { adb shell am broadcast -a com.android.systemui.demo -e command "$@" >/dev/null; }
-demo enter
-demo clock -e hhmm 1200
-demo battery -e level 100 -e plugged false
-demo network -e wifi show -e level 4 -e fully true -e mobile hide
-demo notifications -e visible false
-
-# --------------------------------------------------------------- capture ---
-
-log "Capturing screenshots (this drives the app for a few minutes)"
-rm -rf "$OUT_DIR"
-mkdir -p "$OUT_DIR"
-SCREENSHOT_DIR="$OUT_DIR" flutter drive \
-  --driver=test_driver/integration_test.dart \
-  --target=integration_test/store_screenshots_test.dart \
-  -d "$SERIAL" \
-  --dart-define="DEMO_SERVER_URL=$SERVER_URL" \
-  --dart-define="DEMO_USERNAME=Alex" \
-  --dart-define="DEMO_APP_PASSWORD=$APP_PASSWORD"
-
-log "Making them Play Store ready"
-"$PY" tool/finalize_screenshots.py "$OUT_DIR"
-
-log "Done: $OUT_DIR"
-printf '\nBefore uploading, LOOK at every image for anything real: the server\n' >&2
-printf 'address/username in the header and Settings, notification icons, names.\n' >&2
@@ -1,58 +0,0 @@
-#!/usr/bin/env python3
-"""Uploads an .aab to the Play Console's app bundle library, without
-touching any release track.
-
-Play Console itself doesn't expose "just upload, don't release" as an
-action - every path through the UI attaches a bundle to a track. The Play
-Developer API does support it though: open an edit, upload the bundle,
-commit the edit, and stop there. The result shows up under Release > App
-bundle explorer and nowhere else - nothing goes out to testers or
-production until it's promoted to a track by hand, whenever that's wanted.
-
-Needs:
-  GOOGLE_PLAY_PACKAGE_NAME             e.g. dev.ayushya.noo
-  GOOGLE_PLAY_SERVICE_ACCOUNT_JSON_PATH  path to a service account key file
-
-The Play Developer API can't create an app's first release - Google
-requires at least one manual upload through the Play Console web UI (to
-any track) before it'll accept API calls for that app at all.
-
-  python3 tool/upload_play_bundle.py path/to/app-release.aab
-"""
-import os
-import sys
-
-from google.oauth2 import service_account
-from googleapiclient.discovery import build
-
-SCOPES = ["https://www.googleapis.com/auth/androidpublisher"]
-
-
-def main(bundle_path):
-    package_name = os.environ["GOOGLE_PLAY_PACKAGE_NAME"]
-    key_path = os.environ["GOOGLE_PLAY_SERVICE_ACCOUNT_JSON_PATH"]
-    creds = service_account.Credentials.from_service_account_file(
-        key_path, scopes=SCOPES
-    )
-    service = build("androidpublisher", "v3", credentials=creds)
-
-    edit_id = service.edits().insert(body={}, packageName=package_name).execute()["id"]
-
-    bundle = (
-        service.edits()
-        .bundles()
-        .upload(editId=edit_id, packageName=package_name, media_body=bundle_path)
-        .execute()
-    )
-    print("Uploaded versionCode %s" % bundle["versionCode"])
-
-    service.edits().commit(editId=edit_id, packageName=package_name).execute()
-    print(
-        "Committed - visible under Release > App bundle explorer in Play "
-        "Console. Not attached to any track, so nothing goes out to "
-        "testers or production until it's promoted by hand."
-    )
-
-
-if __name__ == "__main__":
-    main(sys.argv[1])
Author	SHA1	Message	Date
ayushyaandClaude Code	4611bc2142	Media viewer details panel, Upload FAB size setting, PDF zoom/viewport fixes, avatar menu account switcher; bump to 1.0.2+5 Build App Bundle / build (push) Successful in 6m2s Details Co-Authored-By: Claude Code <noreply@anthropic.com>	2026-10-01 18:41:51 -04:00
ayushyaandClaude Code	0b7df833f6	Tablet layout polish: tablet-only sidebar layout, floating toolbar, Settings submenus, info notes, adaptive grids; bump to 1.0.1+4 Build App Bundle / build (push) Successful in 6m0s Details Co-Authored-By: Claude Code <noreply@anthropic.com>	2026-10-01 17:08:22 -04:00
ayushyaandClaude Code	ed747a0407	Upload release AAB to Google Play internal track from CI Build App Bundle / build (push) Successful in 7m36s Details Co-Authored-By: Claude Code <noreply@anthropic.com>	2026-10-01 16:18:45 -04:00
ayushyaandClaude Code	9c9e57ec22	Set app version to 1.0.0+3; share sheet and markdown viewer polish; remove demo screenshot tooling Build App Bundle / build (push) Successful in 5m22s Details Co-Authored-By: Claude Code <noreply@anthropic.com>	2026-10-01 14:50:07 -04:00
ayushyaandClaude Code	8aa7015c3f	Set app version to 0.0.1+2 Build App Bundle / build (push) Successful in 5m38s Details Co-Authored-By: Claude Code <noreply@anthropic.com>	2026-10-01 10:18:21 -04:00
ayushya	88abca647d	Move Website source	2026-10-01 10:13:33 -04:00
ayushya	65b772d6e7	Merge pull request 'Set app version to 0.0.1' (#2 ) from noo-design-system-rebuild into main Reviewed-on: #2	2026-10-01 09:37:12 -04:00
ayushyaandClaude Code	8179bf9683	Set app version to 0.0.1 Build App Bundle / build (push) Successful in 5m21s Details Co-Authored-By: Claude Code <noreply@anthropic.com>	2026-10-01 09:35:45 -04:00
ayushya	af69e5e751	Merge pull request 'Noo design system rebuild' (#1 ) from noo-design-system-rebuild into main Build App Bundle / build (push) Successful in 5m45s Details Reviewed-on: #1	2026-10-01 09:23:57 -04:00
ayushyaandClaude Code	1a232fc71a	Drop Play Console upload from the Release workflow The Release-* workflow now only builds Noo-<version>.aab and attaches it to the Gitea release. The now-unused upload script is removed with it. Co-Authored-By: Claude Code <noreply@anthropic.com>	2026-10-01 09:14:26 -04:00
ayushyaandClaude Code	16aadda7b8	Make the top-bar search launcher fill the gap beside the tab title Build APK / build (push) Successful in 5m27s Details The title was a Flexible and the search an Expanded, so both defaulted to flex 1 and split the free space evenly. The title is now a non-flex child capped at 40% of the width, leaving the search all remaining space. Co-Authored-By: Claude Code <noreply@anthropic.com>	2026-10-01 07:44:33 -04:00
ayushyaandClaude Sonnet 5	fb4829d035	Fix avatar menu's missing border and put the tab title beside search Build APK / build (push) Successful in 5m36s Details - The avatar menu card's border was going missing wherever an opaque row sat against it (every corner but the header's) - a Container combining `border` with its own `clipBehavior` paints the border as part of the outer decoration, then the clipped child on top right up to the same boundary, with no gap for the border's stroke to show through. Fixed with the standard pattern: no clipBehavior on the bordered Container, a 1px-inset ClipRRect around the filled, clipped content instead. - NooTopBar.androidTitleTrailing (renamed from androidTitleReplacement) now sits beside the tab title instead of replacing it - the title keeps its natural width (Flexible, ellipsizing only if truly out of room) with the inline search bar taking the remaining space to its right, rather than the title disappearing whenever search moves into the top bar. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>	2026-10-01 02:16:30 -04:00
ayushyaandClaude Sonnet 5	9f47d0a3e3	Fix status-bar overlap on scroll, and reposition/elevate the avatar menu - Every tab now wraps its CustomScrollView in SafeArea(top: true) - the pinned sort/filter row was riding up underneath the status bar once the floating top bar above it fully collapsed, since that bar's own internal SafeArea only reserved the inset while it had some height left to put it in. Reserving it outside the scrolling region entirely fixes this regardless of the floating header's state. Caught live on device and backed by a new regression test. - The avatar menu now covers the top bar (title included) instead of sitting below it - positioned off just the status-bar inset rather than the top bar's full height on top of that. - The avatar menu's card now carries a second, tighter contact shadow alongside nooDialogShadow - that shadow alone was essentially invisible on a small card over a dark theme's near-black background. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>	2026-09-30 22:59:19 -04:00
ayushyaandClaude Sonnet 5	e6d96a6f9f	Add avatar-menu navigation style and inline Android search bar - New Settings > Appearance > "Navigation menu" toggle (SettingsController.navMenuStyle, NooNavMenuStyle.drawer/avatarMenu): the hamburger-opens-a-Drawer pattern stays the default, or the avatar button opens a full-width dropdown (showAvatarMenu) instead, holding the same hidden-tabs + Settings content the drawer does. Removes one of the two top-corner targets the shell asks a thumb to reach, with no permanent chrome added. - NooTopBar gains androidTitleReplacement so Android's top bar can swap its title for an inline search-field-styled launcher (ShellSearchLauncher) when search isn't in the bottom bar, instead of a bare search icon beside it. - ShellAvatarButton's onTap/label are now overridable so AppTopBar can repoint it per the new setting without this file depending on avatar_menu.dart (which already depends on it for shared helpers). Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>	2026-09-30 22:25:04 -04:00
ayushyaandClaude Sonnet 5	840ec4c301	Fix duplicate tab_state_slivers.dart import left over from the merge Both the bottom-clearance and the top-bar-sliver work independently added this import to files_view.dart and favorites_view.dart. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>	2026-09-30 16:32:15 -04:00
ayushyaandClaude Sonnet 5	aeea4847b4	Merge: make the shell top bar hide/reveal with scroll, per tab Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>	2026-09-30 16:31:11 -04:00
ayushyaandClaude Sonnet 5	43f36ed532	Merge: restructure mobile Settings into a two-level category menu Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>	2026-09-30 16:30:45 -04:00
ayushyaandClaude Sonnet 5	5e5acc3fc6	Polish floating bottom bar: elevation, height, overlap, and FAB shape - Give the floating bar and search satellite the app's one shadow (nooDialogShadow) plus a smaller, tighter height on both platforms. - Let every tab's scrollable list compute its own bottom clearance (bottomBarClearance) instead of a flat 100px, so the floating bar no longer overlaps the last row/card. - Square the Android upload FAB off to a rounded-square radius when the bottom bar is attached, keeping it fully round only when floating. - Let a swipe on a file row trigger its action directly once dragged past 1.8x the reveal width, instead of requiring a second tap. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>	2026-09-30 16:30:14 -04:00
ayushyaandClaude Sonnet 5	5dea9038f7	Make the shell top bar hide/reveal with scroll, per tab Each regular tab (Files/Photos/Favorites/Shares/Recent/Activity/Trash) now plants its own AppTopBar as the first sliver in its own CustomScrollView, via a new topBarSliver() helper (tab_state_slivers.dart) wrapping the framework's SliverFloatingHeader, instead of one shared instance living in Scaffold.appBar. This gives each tab's top bar Material's native floating-app-bar behavior - tied to that tab's own ScrollController - scrolling away as the list scrolls down and reappearing the moment the drag reverses, not only once scrolled all the way back to the top, which a single fixed Scaffold.appBar (or the "put it in a SliverToBoxAdapter" escape hatch NooTopBar's doc comment already mentioned) can't do. It sits above each tab's own pinned in-content sticky header (the sort/filter row, or the selection bar that replaces it), which keeps working unchanged underneath it. main.dart builds a separate, correctly-labelled AppTopBar per tab (rather than one for "whichever tab is selected") and passes it through buildAppTabView's new optional topBar parameter; it's null on desktop (which keeps its own NooToolbar) and while picking, matching the old Scaffold.appBar: pickRequest == null guard. SliverFloatingHeader sizes itself from the bar's own natural layout (like SliverToBoxAdapter) rather than a fixed extent declared up front, so NooTopBar's own internal SafeArea keeps handling the status-bar inset correctly with no extra height math needed on this side. Adds a widget test (test/widgets/tabs/tab_state_slivers_test.dart) driving a raw gesture mid-drag to verify the reveal-follows-finger behavior, since a single tester.drag() only pumps after the gesture - including release - has already finished, which doesn't exercise the live per-frame reveal this change depends on. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>	2026-09-30 16:28:36 -04:00
ayushyaandClaude Sonnet 5	a8b14b8744	Restructure mobile Settings into a two-level category menu On mobile, AccountView used to render all 9 Settings sections inline in one long, individually-collapsible column (_MobileList). Replace that with a native-style menu: the account card stays pinned at the top, and every other section becomes a NooSettingsRow in a NooGroupedList that pushes a dedicated screen (NooTopBar + NooTopBarBack) holding just that section's content. This removes the scroll-depth problem outright instead of working around it with per-section collapsing, so SettingsSection no longer needs NooGroupedList's collapsible mode on mobile. Desktop's 2-column grid is unchanged - it already shows every section at once. Audited every lib/widgets/settings/*.dart file for the reported "description and controls are flipped" row-layout bug: every row goes through NooSettingsRow directly, or - for the few hand-rolled rows (_SavedAccountRow, _ThemeRow/_BottomBarStyleRow, _CacheIntervalRow) - preserves its icon/description-then-control order (the stacked control-below-label shape used by _ThemeRow and _CacheIntervalRow is an intentional, spec'd variant, not a flip). Found no instance of the bug; no fix was needed. Updates DESIGN_SYSTEM.md's Settings recipe and styling.md's NooGroupedList notes to describe the new menu-then-pushed-screen pattern, and adds a widget test covering the category menu and the push/pop navigation. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>	2026-09-30 16:15:32 -04:00
ayushyaandClaude Sonnet 5	5f4caa2a3b	Fix floating bottom bar filling the screen when search is enabled Build APK / build (push) Successful in 5m40s Details The Row wrapping the pill + search satellite used crossAxisAlignment.stretch, but Scaffold.bottomNavigationBar gives its child a loose (unbounded-max) height constraint - stretch on an unbounded cross axis blows up to fill all available space in profile/release builds (the debug assertion that would catch it is stripped there), same class of bug files_controls_row.dart hit earlier from a different cause. Both children already sized themselves explicitly, so stretch was never actually needed - wrapping the Row in a fixed-height SizedBox instead fixes it. Added a regression test that reproduces this inside a real Scaffold (the bare SizedBox host the other tests use gives a bounded height and doesn't trigger it) - confirmed it fails without the fix (height 600, the full test viewport) and passes with it. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>	2026-09-29 22:59:52 -04:00
ayushyaandClaude Sonnet 5	4927416277	Add product website (deploy target: noo.ayushya.dev) A single-page, static site under website/ - no build step, no framework, just HTML/CSS/vanilla JS plus the two Google Fonts the app already uses. Colors, radii, type scale and motion timing are copied from lib/theme/design_tokens.dart so it reads as the same product as the app, not a separate marketing skin. Sections: hero with an exploded, parallaxing stack of the app's own UI pieces (file row, photo grid, accent swatches, a toggle, the floating bar) that drift apart on scroll and tilt toward the pointer; feature highlights; a Customize section with two live interactive demos (accent color, floating vs attached bottom bar); a privacy section covering Login Flow v2; and a closing CTA. GitHub/download links are placeholders (documented in website/README.md) until real release URLs exist. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>	2026-09-29 22:25:18 -04:00
ayushyaandClaude Sonnet 5	58312511c5	Add "Search in bottom bar" to Settings Build APK / build (push) Successful in 5m30s Details New Settings > Appearance toggle moves Search into the bottom bar and out of the top bar, so there's only one search entry point on screen. Tapping it pushes SearchView same as before - it's never highlighted, since it isn't a real destination. - Attached: Search becomes the row's last item, styled like any other tab but permanently idle. - Floating: Search gets its own separate, always fully round satellite circle beside the bar instead. Enabling it costs one regular tab: SettingsController.maxVisibleTabs is now a dynamic getter (defaultMaxVisibleTabs - 1 while the toggle is on) instead of the old flat constant, re-enforced immediately if the user already has all 5 slots filled - the same cleanup path used for a fresh install or an app update that added a new tab. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>	2026-09-29 22:19:13 -04:00
ayushyaandClaude Sonnet 5	a70be19f80	Add a floating bottom bar style, user-configurable in Settings Settings > Appearance > "Bottom bar" now switches between the original edge-to-edge bar and a floating one - inset 16px from both side edges and clear of the bottom safe area, 28px corners (the same radius the sheet top/drawer edge use), a 1px line border standing in for elevation instead of a shadow (product UI stays flat). Persisted via NooBottomBarStyle, defaulting to the existing attached behavior. On Android, floating's idle tabs drop their reserved label space - with no label to leave room for, the icon centers in the whole button and renders a touch bigger (27 vs 24px) instead of sitting high with a gap held open under it; the active tab's icon/pill/label position is unchanged. iOS's tab content is unchanged either way, only the container. main.dart sets Scaffold.extendBody while floating so the body scrolls behind the bar's transparent margin instead of stopping short of it, matching how the design canvas explored it. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>	2026-09-29 16:21:13 -04:00
				`@@ -0,0 +1 @@`
				`Improved tablet layout: sidebar navigation, floating title bars, and adaptive grids. Long-press selection and Settings submenus now work on tablets.`