Author SHA1 Message Date
ayushya 3a4d6142e7 Update README.md 2026-10-01 19:46:19 -04:00
ayushyaandClaude Code 5136ea2eb3 Prepare repository for public release
Add PolyForm Shield license, contributing and security docs, PR and commit
templates; rewrite README; ignore local Claude and signing files.

Co-Authored-By: Claude Code <noreply@anthropic.com>
2026-10-01 19:45:17 -04:00
ayushyaandClaude Code d938df6aee Auto-publish Release-* builds to the Play internal track
Co-Authored-By: Claude Code <noreply@anthropic.com>
2026-10-01 18:48:21 -04:00
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
Co-Authored-By: Claude Code <noreply@anthropic.com>
2026-10-01 18:41:51 -04:00
31 changed files with 1140 additions and 133 deletions
+8
View File
@@ -803,3 +803,11 @@ Flutter's own default to already be high enough.
rather than relying on this async path throwing naturally. 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`). - `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.
+2 -2
View File
@@ -137,8 +137,8 @@ existing split instead.
`.gitea/workflows/release.yml` (on `Release-*` tags) first checks the tag `.gitea/workflows/release.yml` (on `Release-*` tags) first checks the tag
equals `Release-<pubspec version>`, builds the signed `.aab`, attaches it to a equals `Release-<pubspec version>`, builds the signed `.aab`, attaches it to a
Gitea release, then uploads it with `r0adkll/upload-google-play` to the Gitea release, then uploads it with `r0adkll/upload-google-play` to the
`internal` track as a **draft** (promote in Play Console, or edit `internal` track with `status: completed`, so it rolls out to internal
`track`/`status` in the workflow). Requires the `PLAY_SERVICE_ACCOUNT_JSON` testers automatically (promote to other tracks in Play Console). Requires the `PLAY_SERVICE_ACCOUNT_JSON`
repo secret (service account with release permissions; the app's first repo secret (service account with release permissions; the app's first
release must be uploaded manually). Play rejects a repeated `versionCode`, so 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 bump the `+N` in `pubspec.yaml` for every tag - re-tagging the same version
+26 -1
View File
@@ -198,6 +198,27 @@ blocks are noted where they matter:
bars and video transport controls (its other former user, the floating bars and video transport controls (its other former user, the floating
bottom nav bar, is gone - see below). Reuse this for any new floating bottom nav bar, is gone - see below). Reuse this for any new floating
overlay instead of building a new blur/shadow combo. 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 - `SettingsController.bottomBarOpacity`/`bottomBarBlur` and
`lib/widgets/floating_bottom_bar.dart`/`media_grid_tile.dart`/ `lib/widgets/floating_bottom_bar.dart`/`media_grid_tile.dart`/
`swipeable_item.dart`/`sync_status_badge.dart`/`selectable_thumbnail.dart` `swipeable_item.dart`/`sync_status_badge.dart`/`selectable_thumbnail.dart`
@@ -232,7 +253,11 @@ blocks are noted where they matter:
`ShellAvatarButton`'s new `onTap`/`label` overrides (`shell_common.dart`) - `ShellAvatarButton`'s new `onTap`/`label` overrides (`shell_common.dart`) -
a caller passing a custom `onTap` *must* also pass a matching `label`, or 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 the tooltip/semantics still say "Accounts" for a button that no longer
opens the account switcher. `showAvatarMenu` is this app's first use of 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` + `showGeneralDialog` directly (`barrierColor: Colors.transparent` +
`barrierDismissible: true` for a non-dimming click-outside-to-close menu, `barrierDismissible: true` for a non-dimming click-outside-to-close menu,
not a modal flow) - there's no existing anchored-popup primitive here not a modal flow) - there's no existing anchored-popup primitive here
+4 -4
View File
@@ -89,9 +89,9 @@ jobs:
with: with:
files: ${{ env.AAB_PATH }} files: ${{ env.AAB_PATH }}
- name: Upload to Google Play (internal track, draft) - name: Upload to Google Play (internal track, auto-publish)
# Stages the build only; promote it in Play Console, or change # Rolls the build out to internal testers automatically
# `status` to "completed" (and/or `track`) to roll out automatically. # (`status: completed`); promote it to other tracks in Play Console.
# Needs the PLAY_SERVICE_ACCOUNT_JSON repo secret, and the app's # Needs the PLAY_SERVICE_ACCOUNT_JSON repo secret, and the app's
# first release must already have been uploaded by hand. # first release must already have been uploaded by hand.
uses: r0adkll/upload-google-play@v1 uses: r0adkll/upload-google-play@v1
@@ -101,5 +101,5 @@ jobs:
releaseFiles: ${{ env.AAB_PATH }} releaseFiles: ${{ env.AAB_PATH }}
releaseName: ${{ env.VERSION }} releaseName: ${{ env.VERSION }}
track: internal track: internal
status: draft status: completed
whatsNewDirectory: distribution/whatsnew whatsNewDirectory: distribution/whatsnew
+27
View File
@@ -0,0 +1,27 @@
## Summary
<!-- What does this change, and why? Link the issue it closes, e.g. "Closes #123". -->
## Changes
-
## Screenshots / recordings
<!-- Required for UI changes: before/after, light + dark, phone + tablet width where relevant. Delete if not applicable. -->
## Testing
<!-- How did you verify this? Device/emulator and OS version for anything platform-specific. -->
- [ ] `flutter analyze` is clean
- [ ] `flutter test` passes
- [ ] Tried it on a device or emulator (UI / platform changes)
- [ ] Tested against a real Nextcloud server (server / sync changes)
## Checklist
- [ ] New or changed behavior has tests where practical
- [ ] Docs in `.claude/context/` updated if architecture, server integration, styling, or standards changed
- [ ] No secrets, server URLs, credentials, or personal data in code, tests, or screenshots
- [ ] Commits follow the commit message template (`.gitmessage`)
+11
View File
@@ -45,3 +45,14 @@ app.*.map.json
/android/app/profile /android/app/profile
/android/app/release /android/app/release
# Local Claude Code state
.claude/worktrees/
.claude/settings.local.json
.claude/scheduled_tasks.lock
# Signing / secrets (never commit)
*.keystore
*.jks
key.properties
.env
.env.*
+17
View File
@@ -0,0 +1,17 @@
# <Summary: imperative, sentence case, no trailing period, <= 72 chars>
#
# Why is this change needed? What does it do? Wrap lines at 72 chars.
# Explain the "why"; the diff already shows the "what".
#
# Examples of good summaries:
# Fix PDF zoom not returning to fit-width
# Add Upload button size setting
# Bump to 1.0.2+5
#
# Closes #<issue>
#
# Trailers (keep the ones that apply):
# Co-Authored-By: Name <email>
# ----------------------------------------------------------------------
# Lines starting with '#' are ignored. Enable this template once with:
# git config commit.template .gitmessage
+66
View File
@@ -0,0 +1,66 @@
# Contributing to Noo
Thanks for your interest in improving Noo. Bug reports, ideas, and pull
requests are welcome.
## Before you start
- For anything bigger than a small fix, open an issue first so we can agree on
the approach before you spend time on it.
- Read [`CLAUDE.md`](CLAUDE.md) and the topic files in
[`.claude/context/`](.claude/context): architecture, server integration,
styling, and code standards. They apply to human and AI contributors alike.
- Never include real server URLs, usernames, app passwords, or personal files
in issues, tests, or screenshots.
## Setup
```bash
flutter pub get
flutter run
```
You need a Nextcloud server to sign in to. A throwaway local instance is best
for testing anything destructive (delete, move, trash).
## Making a change
1. Branch from `main`.
2. Keep the change focused; unrelated cleanup belongs in its own PR.
3. Run the checks:
```bash
flutter analyze
flutter test
```
4. Format only the files you touched (`dart format <files>`), not the whole
tree.
5. If you changed architecture, server integration, styling conventions, or
standards, update the matching file in `.claude/context/` in the same PR.
6. Open a pull request and fill in the template.
## Commit messages
Use the repository's template so history stays consistent:
```bash
git config commit.template .gitmessage
```
Write an imperative, sentence-case summary of 72 characters or fewer, then a
blank line and a short explanation of *why* when it isn't obvious.
## License of contributions
Noo is licensed under the [PolyForm Shield License 1.0.0](LICENSE). By
submitting a contribution you confirm that you wrote it (or have the right to
submit it), and you license it to the maintainer and everyone who receives the
project under those same terms. You also grant the maintainer the right to
relicense the project, including your contribution, in the future.
## Security
Please do not file security problems as public issues. Email
[hello@ayushya.dev](mailto:hello@ayushya.dev) with the details and I'll
respond as soon as I can.
+91
View File
@@ -0,0 +1,91 @@
Required Notice: Copyright (c) 2026 Ayushya (https://ayushya.dev)
# PolyForm Shield License 1.0.0
<https://polyformproject.org/licenses/shield/1.0.0>
## Acceptance
In order to get any license under these terms, you must agree to them as both strict obligations and conditions to all your licenses.
## Copyright License
The licensor grants you a copyright license for the software to do everything you might do with the software that would otherwise infringe the licensor's copyright in it for any permitted purpose. However, you may only distribute the software according to [Distribution License](#distribution-license) and make changes or new works based on the software according to [Changes and New Works License](#changes-and-new-works-license).
## Distribution License
The licensor grants you an additional copyright license to distribute copies of the software. Your license to distribute covers distributing the software with changes and new works permitted by [Changes and New Works License](#changes-and-new-works-license).
## Notices
You must ensure that anyone who gets a copy of any part of the software from you also gets a copy of these terms or the URL for them above, as well as copies of any plain-text lines beginning with `Required Notice:` that the licensor provided with the software. For example:
> Required Notice: Copyright Yoyodyne, Inc. (http://example.com)
## Changes and New Works License
The licensor grants you an additional copyright license to make changes and new works based on the software for any permitted purpose.
## Patent License
The licensor grants you a patent license for the software that covers patent claims the licensor can license, or becomes able to license, that you would infringe by using the software.
## Noncompete
Any purpose is a permitted purpose, except for providing any product that competes with the software or any product the licensor or any of its affiliates provides using the software.
## Competition
Goods and services compete even when they provide functionality through different kinds of interfaces or for different technical platforms. Applications can compete with services, libraries with plugins, frameworks with development tools, and so on, even if they're written in different programming languages or for different computer architectures. Goods and services compete even when provided free of charge. If you market a product as a practical substitute for the software or another product, it definitely competes.
## New Products
If you are using the software to provide a product that does not compete, but the licensor or any of its affiliates brings your product into competition by providing a new version of the software or another product using the software, you may continue using versions of the software available under these terms beforehand to provide your competing product, but not any later versions.
## Discontinued Products
You may begin using the software to compete with a product or service that the licensor or any of its affiliates has stopped providing, unless the licensor includes a plain-text line beginning with `Licensor Line of Business:` with the software that mentions that line of business. For example:
> Licensor Line of Business: YoyodyneCMS Content Management System (http://example.com/cms)
## Sales of Business
If the licensor or any of its affiliates sells a line of business developing the software or using the software to provide a product, the buyer can also enforce [Noncompete](#noncompete) for that product.
## Fair Use
You may have "fair use" rights for the software under the law. These terms do not limit them.
## No Other Rights
These terms do not allow you to sublicense or transfer any of your licenses to anyone else, or prevent the licensor from granting licenses to anyone else. These terms do not imply any other licenses.
## Patent Defense
If you make any written claim that the software infringes or contributes to infringement of any patent, your patent license for the software granted under these terms ends immediately. If your company makes such a claim, your patent license ends immediately for work on behalf of your company.
## Violations
The first time you are notified in writing that you have violated any of these terms, or done anything with the software not covered by your licenses, your licenses can nonetheless continue if you come into full compliance with these terms, and take practical steps to correct past violations, within 32 days of receiving notice. Otherwise, all your licenses end immediately.
## No Liability
***As far as the law allows, the software comes as is, without any warranty or condition, and the licensor will not be liable to you for any damages arising out of these terms or the use or nature of the software, under any kind of legal claim.***
## Definitions
The **licensor** is the individual or entity offering these terms, and the **software** is the software the licensor makes available under these terms.
A **product** can be a good or service, or a combination of them.
**You** refers to the individual or entity agreeing to these terms.
**Your company** is any legal entity, sole proprietorship, or other kind of organization that you work for, plus all its affiliates.
**Affiliates** means the other organizations than an organization has control over, is under the control of, or is under common control with.
**Control** means ownership of substantially all the assets of an entity, or the power to direct its management and policies by vote, contract, or otherwise. Control can be direct or indirect.
**Your licenses** are all the licenses granted to you for the software under these terms.
**Use** means anything you do with the software requiring one of your licenses.
+67 -32
View File
@@ -1,36 +1,46 @@
# Noo # Noo
A fast, native [Nextcloud](https://nextcloud.com) client built with Flutter A fast, native [Nextcloud](https://nextcloud.com) client built with Flutter
and Material You. and Material 3.
Noo gives you a clean, modern way to browse and manage the files on your own Noo is a clean, modern way to browse and manage the files on your own
Nextcloud server — files, photos, shares, activity, and trash, all in one Nextcloud server: files, photos, shares, activity, and trash in one app,
app, themed to match your device. themed to match your device and laid out for both phones and tablets.
Website: <https://noo.ayushya.dev>
> Noo is an independent, unofficial client. It is not affiliated with or
> endorsed by Nextcloud GmbH.
## Features ## Features
- **Files** — browse, upload, move, rename, delete, and favorite files and - **Files**: browse, upload, move, copy, rename, delete, and favorite files
folders; sort and filter per folder and folders; sort and filter per folder; list or grid view
- **Photos** — a dedicated media gallery with a full-screen viewer for images - **Photos**: a media gallery with a full-screen viewer for images and video
and video - **Viewer**: images, video, PDF (pinch to zoom), Markdown and text, with a
- **Activity** — a feed of what's changed on your server pull-up details panel (info, activity, sharing)
- **Shares** — see and manage what you've shared and what's shared with you - **Shares, Recent, Favorites, Activity, Trash**: see and manage what you
- **Trash** — restore or permanently delete recently removed items have shared, what changed, and what you deleted
- **Material You theming** — dynamic color on supported devices, five - **Search** across your server
built-in accent colors, light/dark/AMOLED - **Offline and sync**: keep files available offline and sync chosen folders
- **Secure sign-in** — authenticates via Nextcloud's Login Flow v2: you sign in the background
in through your browser, and Noo never sees or stores your password, - **Multiple accounts**: switch between saved accounts from the avatar menu
only a scoped app token - **App lock**: optionally require device authentication to open the app,
switch accounts, or reveal hidden files
## Screenshots - **Share to Noo**: upload from any app's share sheet
- **Make it yours**: Material You dynamic color, five accent colors,
_Coming soon._ light/dark/AMOLED, attached or floating bottom bar, hamburger or avatar
navigation, adjustable upload button, and a tablet layout with a sidebar
- **Secure sign-in**: authenticates through Nextcloud's Login Flow v2. You
sign in through your browser, and Noo never sees or stores your password,
only a scoped app password
## Getting started ## Getting started
Prerequisites: Prerequisites:
- [Flutter](https://docs.flutter.dev/get-started/install) (SDK `^3.12.2`) - [Flutter](https://docs.flutter.dev/get-started/install) (SDK `^3.12.2`)
- An Android device or emulator, an iOS device, or Windows
- A Nextcloud server with Login Flow v2 enabled (on by default since - A Nextcloud server with Login Flow v2 enabled (on by default since
Nextcloud 15) Nextcloud 15)
@@ -39,38 +49,63 @@ flutter pub get
flutter run flutter run
``` ```
On first launch, enter your server's address — Noo opens your browser to On first launch, enter your server's address. Noo opens your browser to
finish signing in. finish signing in.
## Supported platforms
Android, iOS, and Windows.
## Building ## Building
```bash ```bash
flutter build apk # Android flutter build apk # Android (debug-signed unless you configure a key)
flutter build ios # iOS flutter build ios # iOS
flutter build windows # Windows flutter build windows # Windows
``` ```
Release builds read signing details from `android/key.properties` or from
`RELEASE_KEYSTORE_*` environment variables (see `android/app/build.gradle.kts`).
Neither the keystore nor `key.properties` is, or should ever be, committed.
Without them, release builds fall back to debug signing.
## Tech stack ## Tech stack
Flutter with Material 3, [`provider`](https://pub.dev/packages/provider) for Flutter with Material 3, [`provider`](https://pub.dev/packages/provider) for
state management, and `http`/`dio` talking directly to Nextcloud's WebDAV state management, and `http`/`dio` talking directly to Nextcloud's WebDAV and
and OCS APIs — no bundled Nextcloud SDK. OCS APIs, with no bundled Nextcloud SDK. Android has native workers for
transfers and background sync.
## Contributing ## Contributing
Project context for contributors (human or AI) lives in Contributions are welcome. Please read [`CONTRIBUTING.md`](CONTRIBUTING.md)
[`CLAUDE.md`](CLAUDE.md) and `.claude/context/` — architecture, the server first. In short:
integration, styling conventions, and code standards.
```bash ```bash
flutter test # run tests flutter test # run tests
flutter analyze # static analysis / lints flutter analyze # static analysis / lints
``` ```
Architecture, server integration, styling conventions, and code standards are
documented in [`CLAUDE.md`](CLAUDE.md) and `.claude/context/`, written for
both human and AI contributors.
## Privacy
Noo talks only to the Nextcloud server you point it at. It has no analytics
and no third-party tracking. Read the full [privacy policy](https://noo.ayushya.dev/privacy).
## Acknowledgements
Typefaces [Instrument Sans](https://fonts.google.com/specimen/Instrument+Sans)
and [Schibsted Grotesk](https://fonts.google.com/specimen/Schibsted+Grotesk)
are bundled under the SIL Open Font License, and icons are from
[Lucide](https://lucide.dev). Those keep their own licenses; the license
below covers Noo's own code and assets.
## License ## License
Not yet licensed for redistribution — license TBD. Noo is source-available under the
[PolyForm Shield License 1.0.0](LICENSE). In plain terms: you may read, build,
run, and modify the code, and contribute changes back, but you may not use it
to make a product or service that competes with Noo. Please do not republish
it as your own app.
Contributions are welcome under the terms in
[`CONTRIBUTING.md`](CONTRIBUTING.md).
+8
View File
@@ -0,0 +1,8 @@
# Security policy
If you find a security problem in Noo, please email
[hello@ayushya.dev](mailto:hello@ayushya.dev) instead of opening a public
issue. Include steps to reproduce and the version (`pubspec.yaml`). I'll
acknowledge reports as soon as I can and credit you in the fix if you'd like.
Never include real server URLs, credentials, or personal files in a report.
+9 -1
View File
@@ -520,6 +520,10 @@ class _MainShellViewState extends State<MainShellView> {
drawerScrimColor: colors.scrim, drawerScrimColor: colors.scrim,
// The top bar itself no longer lives here - see `tabStack` above. // The top bar itself no longer lives here - see `tabStack` above.
drawer: pickRequest == null ? const AppDrawer() : null, 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 // Floating needs the body to draw behind the bar's own transparent
// margin (see NooBottomBarStyle's doc comment) instead of stopping // margin (see NooBottomBarStyle's doc comment) instead of stopping
// short of it like attached does. // short of it like attached does.
@@ -532,7 +536,11 @@ class _MainShellViewState extends State<MainShellView> {
floatingActionButton: floatingActionButton:
pickRequest == null && navStyle == NooNavStyle.android pickRequest == null && navStyle == NooNavStyle.android
? NooFab( ? NooFab(
collapsed: !canUpload, collapsed: switch (settings.fabStyle) {
FabStyle.auto => !canUpload,
FabStyle.mini => true,
FabStyle.expanded => false,
},
barStyle: bottomBarStyle, barStyle: bottomBarStyle,
onTap: () => showCreateMenu(context), onTap: () => showCreateMenu(context),
) )
+16
View File
@@ -39,4 +39,20 @@ class NextcloudShare {
}); });
bool get isFolder => itemType == NextcloudItemType.folder; 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,
);
} }
+15 -4
View File
@@ -101,6 +101,7 @@ class FilesController extends ChangeNotifier
NextcloudUserQuota? _quota; NextcloudUserQuota? _quota;
List<NextcloudActivity> _activities = []; List<NextcloudActivity> _activities = [];
bool _isLoading = false; bool _isLoading = false;
bool _activating = false;
String? _errorMessage; String? _errorMessage;
FilesController(this.session) { FilesController(this.session) {
@@ -147,7 +148,10 @@ class FilesController extends ChangeNotifier
CachePolicy get cachePolicy => _cachePolicy; CachePolicy get cachePolicy => _cachePolicy;
int get cacheIntervalMinutes => _cacheIntervalMinutes; int get cacheIntervalMinutes => _cacheIntervalMinutes;
@override @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 @override
String? get errorMessage => _errorMessage; String? get errorMessage => _errorMessage;
NextcloudUserQuota? get quota => _quota; NextcloudUserQuota? get quota => _quota;
@@ -360,9 +364,16 @@ class FilesController extends ChangeNotifier
} }
Future<void> _onAccountActivated() async { Future<void> _onAccountActivated() async {
await _restoreDisplayPrefs(); _activating = true;
_startCacheRefreshTimerIfNeeded(); notifyListeners();
await refreshData(); try {
await _restoreDisplayPrefs();
_startCacheRefreshTimerIfNeeded();
await refreshData();
} finally {
_activating = false;
notifyListeners();
}
} }
@override @override
+17 -3
View File
@@ -168,9 +168,9 @@ class ItemOperations {
(c) => choices[c.item.id] == ConflictChoice.keepBoth, (c) => choices[c.item.id] == ConflictChoice.keepBoth,
); );
final existingNames = needsKeepBoth final existingNames = needsKeepBoth
? (await files.fetchFolderListing(destFolderPath)) ? (await files.fetchFolderListing(
.map((i) => i.name) destFolderPath,
.toSet() )).map((i) => i.name).toSet()
: <String>{}; : <String>{};
var succeeded = 0; 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 /// Deletes a share (from the file-details/Share sheet, not the Shares
/// tab itself - see `SharesController.deleteShare` for that one, which /// tab itself - see `SharesController.deleteShare` for that one, which
/// additionally patches the tab's own list). /// additionally patches the tab's own list).
+23
View File
@@ -9,6 +9,11 @@ import '../widgets/noo/nav/noo_nav_style.dart';
/// in Settings. /// in Settings.
enum SwipeAction { none, favorite, delete, share } 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 /// Thumb/track presets for the video player's seek bar, matching the four
/// combinations offered by other Material You media players: a Material 3 /// combinations offered by other Material You media players: a Material 3
/// slider-style thumb ([classic]), an animated travelling wave with a round /// slider-style thumb ([classic]), an animated travelling wave with a round
@@ -31,6 +36,7 @@ class SettingsController extends ChangeNotifier {
static const _prefDefaultTab = 'ui_default_tab'; static const _prefDefaultTab = 'ui_default_tab';
static const _prefSwipeLeftAction = 'ui_swipe_left_action'; static const _prefSwipeLeftAction = 'ui_swipe_left_action';
static const _prefSwipeRightAction = 'ui_swipe_right_action'; static const _prefSwipeRightAction = 'ui_swipe_right_action';
static const _prefFabStyle = 'ui_fab_style';
static const _prefBottomBarStyle = 'ui_bottom_bar_style'; static const _prefBottomBarStyle = 'ui_bottom_bar_style';
static const _prefNavMenuStyle = 'ui_nav_menu_style'; static const _prefNavMenuStyle = 'ui_nav_menu_style';
static const _prefSearchInBottomBar = 'ui_search_in_bottom_bar'; static const _prefSearchInBottomBar = 'ui_search_in_bottom_bar';
@@ -61,6 +67,7 @@ class SettingsController extends ChangeNotifier {
SwipeAction _swipeLeftAction = SwipeAction.delete; SwipeAction _swipeLeftAction = SwipeAction.delete;
SwipeAction _swipeRightAction = SwipeAction.favorite; SwipeAction _swipeRightAction = SwipeAction.favorite;
FabStyle _fabStyle = FabStyle.auto;
// A one-shot request for the shell to switch its active bottom-nav tab // 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 // (e.g. a search result landing on Files) - consumed and cleared by
@@ -121,6 +128,7 @@ class SettingsController extends ChangeNotifier {
SwipeAction get swipeLeftAction => _swipeLeftAction; SwipeAction get swipeLeftAction => _swipeLeftAction;
SwipeAction get swipeRightAction => _swipeRightAction; SwipeAction get swipeRightAction => _swipeRightAction;
FabStyle get fabStyle => _fabStyle;
Future<void> _load() async { Future<void> _load() async {
try { try {
@@ -242,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(); notifyListeners();
} catch (e) { } catch (e) {
debugPrint('[SettingsController] Preference restore failed: $e'); debugPrint('[SettingsController] Preference restore failed: $e');
@@ -404,4 +420,11 @@ class SettingsController extends ChangeNotifier {
notifyListeners(); notifyListeners();
_prefsFuture.then((p) => p.setString(_prefSwipeRightAction, action.name)); _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));
}
} }
+16
View File
@@ -1538,6 +1538,22 @@ class NextcloudService {
return response.statusCode == 200; 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}) { NextcloudShare _shareFromJson(Map raw, {required bool sharedWithMe}) {
final path = (raw['path'] ?? '/').toString(); final path = (raw['path'] ?? '/').toString();
final segments = path.split('/').where((s) => s.isNotEmpty).toList(); final segments = path.split('/').where((s) => s.isNotEmpty).toList();
+86 -23
View File
@@ -21,6 +21,7 @@ import '../widgets/noo/overlays/noo_overlay_header.dart';
import '../widgets/noo/overlays/noo_sheet.dart'; import '../widgets/noo/overlays/noo_sheet.dart';
import '../widgets/share_sheet.dart'; import '../widgets/share_sheet.dart';
import '../widgets/viewer/media_action_bar.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_image_preview.dart';
import '../widgets/viewer/media_pdf_preview.dart'; import '../widgets/viewer/media_pdf_preview.dart';
import '../widgets/viewer/media_text_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. /// also drag the gallery to the next item.
bool _isZoomed = false; 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]; NextcloudItem get _currentItem => _mediaItems[_currentIndex];
bool get _isOffline => widget.localPathResolver != null; bool get _isOffline => widget.localPathResolver != null;
@@ -394,13 +432,25 @@ class _FileViewerScreenState extends State<FileViewerScreen> {
backgroundColor: stageColor, backgroundColor: stageColor,
body: GestureDetector( body: GestureDetector(
behavior: HitTestBehavior.opaque, 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( child: Stack(
children: [ children: [
Positioned.fill( Positioned.fill(
child: Container( child: Listener(
color: stageColor, onPointerDown: _onPointerDown,
child: _buildBody(context, session), onPointerUp: _onPointerUp,
onPointerCancel: _onPointerCancel,
child: Container(
color: stageColor,
child: _buildBody(context, session),
),
), ),
), ),
if (_downloadProgress != null) if (_downloadProgress != null)
@@ -522,25 +572,35 @@ class _FileViewerScreenState extends State<FileViewerScreen> {
offset: _controlsVisible ? Offset.zero : const Offset(0, 1.4), offset: _controlsVisible ? Offset.zero : const Offset(0, 1.4),
child: IgnorePointer( child: IgnorePointer(
ignoring: !_controlsVisible, ignoring: !_controlsVisible,
child: MediaActionBar( child: MediaDetailsPanel(
isFavorite: _currentItem.isFavorite, key: _panelKey,
isBusy: _isBusy, item: _currentItem,
// Favorite/delete/download-to-device all need a live builder: (context, handle, below) => MediaActionBar(
// server - hidden rather than shown-and-failing while onDetails: NooLayout.isDesktop(context)
// browsing an already-local file from the Offline tab. ? _openDetails
showServerActions: !_isOffline, : null,
transportControls: handle: NooLayout.isDesktop(context) ? null : handle,
_isSwipeable && below: NooLayout.isDesktop(context) ? null : below,
_currentItem.type == NextcloudItemType.video && isFavorite: _currentItem.isFavorite,
_videoController != null isBusy: _isBusy,
? VideoTransportControls(controller: _videoController!) // Favorite/delete/download-to-device all need a live
: null, // server - hidden rather than shown-and-failing while
onShare: () => ShareSheet.show(context, _currentItem), // browsing an already-local file from the Offline tab.
onFavorite: () => _toggleFavorite(ops), showServerActions: !_isOffline,
onDelete: () => _deleteCurrentItem(ops), transportControls:
onOpenExternally: () => _openExternally(session), _isSwipeable &&
onDownload: () => _downloadToDevice(session), _currentItem.type == NextcloudItemType.video &&
onDetails: () => DetailsSheet.show(context, _currentItem), _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: default:
if (_isPdf) { if (_isPdf) {
return MediaPdfPreview( return MediaPdfPreview(
topInset: _controlsVisible
? MediaQuery.paddingOf(context).top + 60
: 0,
item: widget.item, item: widget.item,
session: session, session: session,
localPathResolver: widget.localPathResolver, localPathResolver: widget.localPathResolver,
+184 -2
View File
@@ -7,6 +7,7 @@ import '../providers/settings_controller.dart';
import '../providers/trash_controller.dart'; import '../providers/trash_controller.dart';
import '../theme/design_tokens.dart'; import '../theme/design_tokens.dart';
import 'noo/core/noo_avatar.dart'; import 'noo/core/noo_avatar.dart';
import '../views/login_view.dart';
import 'noo/core/noo_badge.dart'; import 'noo/core/noo_badge.dart';
import 'noo/lists/noo_settings_row.dart'; import 'noo/lists/noo_settings_row.dart';
import 'shell/shell_common.dart'; import 'shell/shell_common.dart';
@@ -43,9 +44,16 @@ Future<void> showAvatarMenu(BuildContext context) {
); );
} }
class _AvatarMenuContent extends StatelessWidget { class _AvatarMenuContent extends StatefulWidget {
const _AvatarMenuContent(); const _AvatarMenuContent();
@override
State<_AvatarMenuContent> createState() => _AvatarMenuContentState();
}
class _AvatarMenuContentState extends State<_AvatarMenuContent> {
bool _expanded = false;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final colors = context.nooColors; final colors = context.nooColors;
@@ -124,7 +132,7 @@ class _AvatarMenuContent extends StatelessWidget {
// header reads as a continuation of the button that // header reads as a continuation of the button that
// opened it rather than a disconnected card. // opened it rather than a disconnected card.
InkWell( InkWell(
onTap: closeAndOpenSettings, onTap: () => setState(() => _expanded = !_expanded),
child: Padding( child: Padding(
padding: const EdgeInsets.all(NooSpace.md), padding: const EdgeInsets.all(NooSpace.md),
child: Row( child: Row(
@@ -161,10 +169,87 @@ class _AvatarMenuContent extends StatelessWidget {
current: true, current: true,
size: 40, 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) ...[ if (hiddenTabs.isNotEmpty) ...[
Divider(height: 1, color: colors.line), Divider(height: 1, color: colors.line),
for (final tab in hiddenTabs) for (final tab in hiddenTabs)
@@ -201,3 +286,100 @@ class _AvatarMenuContent extends StatelessWidget {
); );
} }
} }
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),
),
),
],
),
),
),
);
}
}
+7 -7
View File
@@ -54,7 +54,7 @@ enum _DetailsTab { info, versions, activity }
/// and the "open externally" flow for unsupported file types. /// and the "open externally" flow for unsupported file types.
/// ///
/// Only used directly on mobile (bundles its own [NooOverlayHeader]); the /// 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`. /// which renders the header itself via `leading`/`title`/`subtitle`.
class DetailsSheet extends StatelessWidget { class DetailsSheet extends StatelessWidget {
final NextcloudItem item; final NextcloudItem item;
@@ -68,7 +68,7 @@ class DetailsSheet extends StatelessWidget {
leading: detailsFileTile(item), leading: detailsFileTile(item),
title: item.name, title: item.name,
subtitle: detailsMetaLine(item), subtitle: detailsMetaLine(item),
children: [_DetailsBody(item: item)], children: [DetailsBody(item: item)],
); );
} }
return showNooSheet(context, children: [DetailsSheet(item: item)]); return showNooSheet(context, children: [DetailsSheet(item: item)]);
@@ -86,7 +86,7 @@ class DetailsSheet extends StatelessWidget {
onClose: () => Navigator.pop(context), onClose: () => Navigator.pop(context),
), ),
const SizedBox(height: NooSpace.lg), 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 /// guard), so switching tabs via a bare `switch` on the selected type would
/// tear down and rebuild whichever tab isn't showing, discarding its /// tear down and rebuild whichever tab isn't showing, discarding its
/// fetched data and re-requesting it every time the user switched back. /// fetched data and re-requesting it every time the user switched back.
class _DetailsBody extends StatefulWidget { class DetailsBody extends StatefulWidget {
final NextcloudItem item; final NextcloudItem item;
const _DetailsBody({required this.item}); const DetailsBody({super.key, required this.item});
@override @override
State<_DetailsBody> createState() => _DetailsBodyState(); State<DetailsBody> createState() => _DetailsBodyState();
} }
class _DetailsBodyState extends State<_DetailsBody> { class _DetailsBodyState extends State<DetailsBody> {
_DetailsTab _tab = _DetailsTab.info; _DetailsTab _tab = _DetailsTab.info;
@override @override
+7 -2
View File
@@ -17,6 +17,9 @@ class FrostedGlassContainer extends StatelessWidget {
final Widget child; final Widget child;
final double borderRadius; 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 /// Blur sigma for the backdrop filter. Defaults to a fixed value; pass an
/// explicit value (e.g. from user settings) to make it adjustable. /// explicit value (e.g. from user settings) to make it adjustable.
final double blurSigma; final double blurSigma;
@@ -35,6 +38,7 @@ class FrostedGlassContainer extends StatelessWidget {
super.key, super.key,
required this.child, required this.child,
this.borderRadius = 0, this.borderRadius = 0,
this.radius,
this.blurSigma = 20, this.blurSigma = 20,
this.opacity = 0.8, this.opacity = 0.8,
this.color, this.color,
@@ -42,15 +46,16 @@ class FrostedGlassContainer extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final shape = radius ?? BorderRadius.circular(borderRadius);
final tint = color ?? context.nooColors.surface; final tint = color ?? context.nooColors.surface;
return ClipRRect( return ClipRRect(
borderRadius: BorderRadius.circular(borderRadius), borderRadius: shape,
child: BackdropFilter( child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: blurSigma, sigmaY: blurSigma), filter: ImageFilter.blur(sigmaX: blurSigma, sigmaY: blurSigma),
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: tint.withValues(alpha: opacity), color: tint.withValues(alpha: opacity),
borderRadius: BorderRadius.circular(borderRadius), borderRadius: shape,
), ),
child: child, child: child,
), ),
@@ -22,6 +22,9 @@ class NooGroupedList extends StatefulWidget {
final String? aside; final String? aside;
final List<Widget> children; final List<Widget> children;
final Widget? footer; final Widget? footer;
/// Shown between [label] and the card (e.g. a `NooInfoNote`).
final Widget? notice;
final bool collapsible; final bool collapsible;
final bool initiallyExpanded; final bool initiallyExpanded;
@@ -31,6 +34,7 @@ class NooGroupedList extends StatefulWidget {
this.aside, this.aside,
required this.children, required this.children,
this.footer, this.footer,
this.notice,
this.collapsible = false, this.collapsible = false,
this.initiallyExpanded = true, this.initiallyExpanded = true,
}); });
@@ -58,6 +62,10 @@ class _NooGroupedListState extends State<NooGroupedList> {
), ),
const SizedBox(height: 8), const SizedBox(height: 8),
], ],
if (widget.notice != null) ...[
widget.notice!,
const SizedBox(height: NooSpace.md),
],
AnimatedCrossFade( AnimatedCrossFade(
duration: NooMotion.fast, duration: NooMotion.fast,
sizeCurve: NooMotion.ease, sizeCurve: NooMotion.ease,
+34 -5
View File
@@ -34,7 +34,10 @@ class NooShareSection extends StatelessWidget {
Row( Row(
children: [ children: [
Expanded( Expanded(
child: Text(title, style: NooText.sectionTitle.copyWith(color: colors.fg1)), child: Text(
title,
style: NooText.sectionTitle.copyWith(color: colors.fg1),
),
), ),
?trailing, ?trailing,
], ],
@@ -60,10 +63,13 @@ class NooPersonAccessRow extends StatelessWidget {
final String name; final String name;
final String? subtitle; final String? subtitle;
final bool owner; final bool owner;
/// Pill label for non-owners, e.g. "Can edit" / "Can view". /// Pill label for non-owners, e.g. "Can edit" / "Can view".
final String permission; final String permission;
final VoidCallback? onPermissionTap; final VoidCallback? onPermissionTap;
final bool permissionLoading;
final String ownerLabel; final String ownerLabel;
/// Replaces the owner label / permission pill (e.g. a plain search result). /// Replaces the owner label / permission pill (e.g. a plain search result).
final Widget? trailing; final Widget? trailing;
@@ -75,6 +81,7 @@ class NooPersonAccessRow extends StatelessWidget {
this.owner = false, this.owner = false,
this.permission = 'Can edit', this.permission = 'Can edit',
this.onPermissionTap, this.onPermissionTap,
this.permissionLoading = false,
this.ownerLabel = 'Owner', this.ownerLabel = 'Owner',
this.trailing, this.trailing,
}); });
@@ -121,7 +128,11 @@ class NooPersonAccessRow extends StatelessWidget {
else if (owner) else if (owner)
Text(ownerLabel, style: NooText.label.copyWith(color: colors.fg3)) Text(ownerLabel, style: NooText.label.copyWith(color: colors.fg3))
else else
NooPermissionPill(label: permission, onTap: onPermissionTap), NooPermissionPill(
label: permission,
onTap: onPermissionTap,
loading: permissionLoading,
),
], ],
), ),
); );
@@ -133,8 +144,14 @@ class NooPersonAccessRow extends StatelessWidget {
class NooPermissionPill extends StatelessWidget { class NooPermissionPill extends StatelessWidget {
final String label; final String label;
final VoidCallback? onTap; 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 @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@@ -152,9 +169,21 @@ class NooPermissionPill extends StatelessWidget {
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ 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), 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),
], ],
), ),
), ),
+5
View File
@@ -64,6 +64,10 @@ class _NooSheetBody extends StatefulWidget {
class _NooSheetBodyState extends State<_NooSheetBody> { class _NooSheetBodyState extends State<_NooSheetBody> {
bool _needsPeek = false; 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) { void _handleOverflow(ScrollMetrics metrics) {
if (_needsPeek || metrics.maxScrollExtent <= 0) return; if (_needsPeek || metrics.maxScrollExtent <= 0) return;
// `ScrollMetricsNotification` is dispatched mid-layout; deferring avoids // `ScrollMetricsNotification` is dispatched mid-layout; deferring avoids
@@ -84,6 +88,7 @@ class _NooSheetBodyState extends State<_NooSheetBody> {
controller: scrollController, controller: scrollController,
padding: const EdgeInsets.fromLTRB(20, 10, 20, 20), padding: const EdgeInsets.fromLTRB(20, 10, 20, 20),
child: Column( child: Column(
key: _contentKey,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
Container( Container(
@@ -69,6 +69,13 @@ class SettingsAppearanceSection extends StatelessWidget {
], ],
), ),
const SizedBox(height: NooSpace.xl), 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( SettingsSection(
title: 'Advanced appearance', title: 'Advanced appearance',
children: [ children: [
@@ -293,6 +300,64 @@ class _NavMenuStyleRow extends StatelessWidget {
} }
} }
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 /// 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 /// "Accent color" row - a wallpaper icon when following the OS's dynamic
/// color instead of a fixed swatch. /// color instead of a fixed swatch.
+2 -17
View File
@@ -33,27 +33,12 @@ class SettingsSection extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final colors = context.nooColors; final colors = context.nooColors;
if (!NooLayout.isDesktop(context)) { if (!NooLayout.isDesktop(context)) {
final list = NooGroupedList( return NooGroupedList(
label: title, label: title,
notice: notice != null ? NooInfoNote(message: notice!) : null,
footer: subtitle != null ? Text(subtitle!) : null, footer: subtitle != null ? Text(subtitle!) : null,
// Not collapsible: each mobile Settings section now renders on its
// own pushed screen (see `account_view.dart`'s doc comment for the
// menu-then-pushed-screen pattern), so there's no long single-scroll
// page left to collapse sections *within* - an earlier design had
// every section inline in one column and made them individually
// collapsible for exactly that reason; that's gone now that each
// one is already isolated on its own screen.
children: children, children: children,
); );
if (notice == null) return list;
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
NooInfoNote(message: notice!),
const SizedBox(height: NooSpace.md),
list,
],
);
} }
return Container( return Container(
decoration: BoxDecoration( decoration: BoxDecoration(
+104 -17
View File
@@ -19,6 +19,7 @@ import 'noo/core/noo_avatar.dart';
import 'noo/core/noo_button.dart'; import 'noo/core/noo_button.dart';
import 'noo/core/noo_chip.dart'; import 'noo/core/noo_chip.dart';
import 'noo/core/noo_toggle.dart'; import 'noo/core/noo_toggle.dart';
import 'noo/lists/noo_grouped_list.dart';
import 'noo/lists/noo_settings_row.dart'; import 'noo/lists/noo_settings_row.dart';
import 'noo/media/noo_photo_tile.dart'; import 'noo/media/noo_photo_tile.dart';
import 'noo/noo_layout.dart'; import 'noo/noo_layout.dart';
@@ -98,6 +99,8 @@ class _ShareSheetState extends State<ShareSheet> {
bool _isSearching = false; bool _isSearching = false;
bool _isAddingPerson = false; bool _isAddingPerson = false;
bool _isTogglingLink = false; bool _isTogglingLink = false;
String? _pendingShareeKey;
final Set<String> _updatingShareIds = {};
bool _isSharingFile = false; bool _isSharingFile = false;
bool _showInherited = false; bool _showInherited = false;
final _peopleController = TextEditingController(); final _peopleController = TextEditingController();
@@ -183,15 +186,20 @@ class _ShareSheetState extends State<ShareSheet> {
} }
} }
String _shareeKey(NextcloudSharee s) => '${s.shareTypeValue}:${s.shareWith}';
Future<void> _addSharee(NextcloudSharee sharee) async { Future<void> _addSharee(NextcloudSharee sharee) async {
if (_pendingShareeKey != null) return;
final ops = context.read<ItemOperations>(); final ops = context.read<ItemOperations>();
final messenger = ScaffoldMessenger.of(context); final messenger = ScaffoldMessenger.of(context);
setState(() => _pendingShareeKey = _shareeKey(sharee));
final share = await ops.createShare( final share = await ops.createShare(
path: widget.item.path, path: widget.item.path,
shareType: sharee.shareTypeValue, shareType: sharee.shareTypeValue,
shareWith: sharee.shareWith, shareWith: sharee.shareWith,
); );
if (!mounted) return; if (!mounted) return;
setState(() => _pendingShareeKey = null);
if (share == null) { if (share == null) {
messenger.showSnackBar( messenger.showSnackBar(
const SnackBar( const SnackBar(
@@ -353,36 +361,93 @@ class _ShareSheetState extends State<ShareSheet> {
} }
} }
/// A small popup with the one action the compact [NooPersonAccessRow] /// Permission menu for a person row: Can view / Can edit, then removing
/// permission pill has no room for - removing that person's access. There's /// access. Keeps the reshare bit (16) as it was.
/// no permission-update endpoint on [ItemOperations] yet, so the pill
/// itself is read-only (see the rebuild report).
void _openPersonMenu(NextcloudShare share) { void _openPersonMenu(NextcloudShare share) {
final label = share.sharedWithDisplayName ?? 'Shared'; final label = share.sharedWithDisplayName ?? 'Shared';
final canEdit = (share.permissions & 2) != 0;
void remove() { void remove() {
Navigator.pop(context); Navigator.pop(context);
_removeShare(share); _removeShare(share);
} }
final row = NooSettingsRow( void choose(bool edit) {
icon: LucideIcons.userMinus, Navigator.pop(context);
label: const Text('Remove access'), _setPermission(share, edit);
danger: true, }
onTap: remove,
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)) { if (NooLayout.isDesktop(context)) {
showNooDialog(context, title: label, children: [row]); showNooDialog(
context,
title: label,
children: [Column(children: rows)],
);
} else { } else {
showNooSheet( showNooSheet(
context, context,
children: [ children: [
NooOverlayHeader(title: label, onClose: () => Navigator.pop(context)), 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( Widget _peopleSection(
NooColors colors, NooColors colors,
SessionController session, SessionController session,
@@ -416,7 +481,7 @@ class _ShareSheetState extends State<ShareSheet> {
for (final sharee in _searchResults) for (final sharee in _searchResults)
InkWell( InkWell(
borderRadius: BorderRadius.circular(NooRadii.input), borderRadius: BorderRadius.circular(NooRadii.input),
onTap: () => _addSharee(sharee), onTap: _pendingShareeKey == null ? () => _addSharee(sharee) : null,
child: NooPersonAccessRow( child: NooPersonAccessRow(
avatar: NooAvatar( avatar: NooAvatar(
initials: _initial(sharee.label), initials: _initial(sharee.label),
@@ -427,7 +492,13 @@ class _ShareSheetState extends State<ShareSheet> {
), ),
name: sharee.label, name: sharee.label,
subtitle: sharee.subtitle, subtitle: sharee.subtitle,
trailing: const SizedBox.shrink(), trailing: _pendingShareeKey == _shareeKey(sharee)
? const SizedBox(
width: 20,
height: 20,
child: CircularProgressIndicator(strokeWidth: 2),
)
: const SizedBox.shrink(),
), ),
), ),
if (_searchResults.isNotEmpty) if (_searchResults.isNotEmpty)
@@ -463,7 +534,10 @@ class _ShareSheetState extends State<ShareSheet> {
? 'Invited by email' ? 'Invited by email'
: null), : null),
permission: (share.permissions & 2) != 0 ? 'Can edit' : 'Can view', 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) ...[ if (_inherited.isNotEmpty) ...[
const SizedBox(height: NooSpace.xs), const SizedBox(height: NooSpace.xs),
@@ -625,9 +699,22 @@ class _ShareSheetState extends State<ShareSheet> {
const SizedBox(height: 22), const SizedBox(height: 22),
NooShareSection( NooShareSection(
title: 'Share link', title: 'Share link',
trailing: NooToggle( trailing: Row(
checked: hasLink, mainAxisSize: MainAxisSize.min,
onChanged: _isTogglingLink ? null : _toggleLink, 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 caption: hasLink
? null ? null
+17 -8
View File
@@ -22,9 +22,14 @@ class MediaActionBar extends StatelessWidget {
final VoidCallback onDelete; final VoidCallback onDelete;
final VoidCallback onOpenExternally; final VoidCallback onOpenExternally;
final VoidCallback onDownload; final VoidCallback onDownload;
final VoidCallback onDetails; final VoidCallback? onDetails;
final Widget? handle;
final Widget? below;
const MediaActionBar({ const MediaActionBar({
this.onDetails,
this.handle,
this.below,
super.key, super.key,
required this.isFavorite, required this.isFavorite,
required this.isBusy, required this.isBusy,
@@ -35,7 +40,6 @@ class MediaActionBar extends StatelessWidget {
required this.onDelete, required this.onDelete,
required this.onOpenExternally, required this.onOpenExternally,
required this.onDownload, required this.onDownload,
required this.onDetails,
}); });
@override @override
@@ -48,11 +52,15 @@ class MediaActionBar extends StatelessWidget {
// short and leaving that strip unstyled - only the actual row content // short and leaving that strip unstyled - only the actual row content
// needs padding up and away from the gesture area. // needs padding up and away from the gesture area.
return FrostedGlassContainer( return FrostedGlassContainer(
radius: const BorderRadius.vertical(
top: Radius.circular(NooRadii.sheetTop),
),
child: SafeArea( child: SafeArea(
top: false, top: false,
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
?handle,
if (transportControls != null) ...[ if (transportControls != null) ...[
transportControls!, transportControls!,
Divider(height: 1, color: colors.fg1.withValues(alpha: 0.14)), Divider(height: 1, color: colors.fg1.withValues(alpha: 0.14)),
@@ -94,17 +102,18 @@ class MediaActionBar extends StatelessWidget {
ViewerIconButton( ViewerIconButton(
icon: LucideIcons.trash2, icon: LucideIcons.trash2,
tooltip: 'Delete', tooltip: 'Delete',
color: colors.danger,
onTap: isBusy ? null : onDelete, onTap: isBusy ? null : onDelete,
), ),
ViewerIconButton( if (onDetails != null)
icon: LucideIcons.info, ViewerIconButton(
tooltip: 'Details', icon: LucideIcons.info,
onTap: onDetails, tooltip: 'Details',
), onTap: onDetails,
),
], ],
), ),
), ),
?below,
], ],
), ),
), ),
+133
View File
@@ -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),
);
}
}
+63 -3
View File
@@ -17,8 +17,12 @@ class MediaPdfPreview extends StatefulWidget {
/// `FileViewerScreen.localPathResolver`'s doc comment. /// `FileViewerScreen.localPathResolver`'s doc comment.
final Future<String?> Function(NextcloudItem item)? localPathResolver; 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({ const MediaPdfPreview({
super.key, super.key,
this.topInset = 0,
required this.item, required this.item,
required this.session, required this.session,
this.localPathResolver, this.localPathResolver,
@@ -29,8 +33,14 @@ class MediaPdfPreview extends StatefulWidget {
} }
class _MediaPdfPreviewState extends State<MediaPdfPreview> { 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; PdfControllerPinch? _controller;
String? _error; String? _error;
List<Size> _pageSizes = const [];
int _pageCount = 0;
@override @override
void initState() { void initState() {
@@ -55,9 +65,21 @@ class _MediaPdfPreviewState extends State<MediaPdfPreview> {
await widget.session.service!.fetchBytes(widget.item.path), 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(() { setState(() {
_controller = PdfControllerPinch(document: PdfDocument.openData(bytes)); _pageSizes = sizes;
_pageCount = document.pagesCount;
_controller = PdfControllerPinch(document: Future.value(document));
}); });
} catch (e) { } catch (e) {
if (mounted) setState(() => _error = e.toString()); 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 // without ever pinching to zoom. There's no way to override that
// margin from here - it isn't an exposed parameter - so this avoids // margin from here - it isn't an exposed parameter - so this avoids
// the branch that sets it instead of fighting it. // 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!),
);
},
),
);
} }
} }
+2 -2
View File
@@ -1,5 +1,5 @@
name: noo name: noo
description: "A new Flutter project." description: "Noo - a fast, native Nextcloud client built with Flutter."
# The following line prevents the package from being accidentally published to # The following line prevents the package from being accidentally published to
# pub.dev using `flutter pub publish`. This is preferred for private packages. # pub.dev using `flutter pub publish`. This is preferred for private packages.
publish_to: 'none' # Remove this line if you wish to publish to pub.dev publish_to: 'none' # Remove this line if you wish to publish to pub.dev
@@ -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 # 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 # 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. # of the product and file versions while build-number is used as the build suffix.
version: 1.0.1+4 version: 1.0.2+5
environment: environment:
sdk: ^3.12.2 sdk: ^3.12.2