Ten fixes: controls-row alignment, banners, shares, viewer bounds
- FilesControlsRow (and Photos' own controls row) wrapped its Row in a SingleChildScrollView, which gives a child unbounded width - silently breaking the trailing Spacer (a flex child needs bounded width) and leaving the List/Grid toggle sitting right after the filter chip instead of pinned to the row's right edge, "not enough controls to fill the row" or not. Removed the scroll wrapper (two chips and an icon toggle never need it) and the dead scroll-hint plumbing that went with it in files_view.dart. - Photos' All/Photos/Videos chips moved into the filter sheet as a full-width segmented control (matching Settings' Theme control), instead of their own row of chips competing for space with the sort and filter chips. - Settings' Theme row: the System/Light/Dark segmented control now sits on its own row below the label instead of squeezed into a trailing slot beside it, where three icon+label segments were too cramped to read comfortably - same shape as the sort sheet's Ascending/Descending control. - NooBanner (Trash's "Empty trash") and NooSummaryCard (Offline's "Sync now") both move their action onto its own row below the description text instead of squeezed onto the same line, where a longer caption had no room to share with it. - SharesController now caches each scope (with you / by you, which also covers links) after its first fetch instead of re-fetching on every single switch, including switching straight back to a scope already loaded seconds ago. - Shares' per-row overflow menu jumped straight to the unshare confirmation with no menu at all - a link share had no way to copy its own URL short of opening the full Share sheet. It's a real menu now: "Copy link" (link shares only) plus remove/unshare. - Settings gained a trailing jump rail on mobile (one small icon per section) so a specific section can be reached in one tap instead of scrolling the whole list by hand; desktop's 2-column grid doesn't need one. - The media viewer's PageView now disables its own left/right swipe while the current photo is zoomed in, so panning around it doesn't also swipe to the next item. - The PDF preview no longer sets minScale below 1.0: pdfx's PdfViewPinch hard-codes an *infinite* pan boundary whenever minScale < 1 (not an exposed parameter, so there's no way to override it), which let a page be panned arbitrarily far off-screen without ever zooming.
This commit is contained in:
+121
-26
@@ -1,4 +1,5 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:lucide_icons_flutter/lucide_icons.dart';
|
||||
import '../theme/design_tokens.dart';
|
||||
import '../widgets/noo/nav/noo_top_bar.dart';
|
||||
import '../widgets/noo/nav/noo_toolbar.dart';
|
||||
@@ -13,27 +14,35 @@ import '../widgets/settings/settings_security.dart';
|
||||
import '../widgets/settings/settings_swipe.dart';
|
||||
import '../widgets/settings/settings_tabs.dart';
|
||||
|
||||
/// One entry in [AccountView._sections] - [icon] and [label] are only used
|
||||
/// by [_SectionJumpRail]'s tap targets, not shown next to the section
|
||||
/// itself (each section already titles itself).
|
||||
typedef _Section = (String label, IconData icon, Widget child);
|
||||
|
||||
/// 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; a 2-column grid of cards on desktop - see each
|
||||
/// mobile, with a trailing jump rail (see [_SectionJumpRail]) since the
|
||||
/// list runs long enough that finding a specific section by scrolling
|
||||
/// alone is slow; a 2-column grid of cards on desktop, wide enough to see
|
||||
/// most sections without scrolling, so it doesn't get one. 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 const _sections = <_Section>[
|
||||
('Account', LucideIcons.circleUser, SettingsAccountCard()),
|
||||
('Accounts', LucideIcons.users, SettingsAccountsSection()),
|
||||
('Security', LucideIcons.shield, SettingsSecuritySection()),
|
||||
('File sync', LucideIcons.folderSync, SettingsFileSyncSection()),
|
||||
('Files cache', LucideIcons.hardDrive, SettingsFilesCacheSection()),
|
||||
('Appearance', LucideIcons.sunMoon, SettingsAppearanceSection()),
|
||||
('Tabs', LucideIcons.layoutGrid, SettingsTabsSection()),
|
||||
('Action bar', LucideIcons.slidersHorizontal, SettingsActionBarSection()),
|
||||
('Swipe', LucideIcons.moveHorizontal, SettingsSwipeSection()),
|
||||
];
|
||||
|
||||
@override
|
||||
@@ -53,37 +62,123 @@ class AccountView extends StatelessWidget {
|
||||
body: SafeArea(
|
||||
top: false,
|
||||
child: desktop
|
||||
? _DesktopGrid(sections: _sections)
|
||||
? _DesktopGrid(sections: [for (final s in _sections) s.$3])
|
||||
: _MobileList(sections: _sections),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _MobileList extends StatelessWidget {
|
||||
final List<Widget> sections;
|
||||
/// A stable per-section identity, shared between the [KeyedSubtree] each
|
||||
/// section is wrapped in and [_SectionJumpRail]'s lookup - [GlobalObjectKey]
|
||||
/// compares by [String] equality, not instance identity, so building a new
|
||||
/// one from the same label on each side still resolves to the same key.
|
||||
GlobalKey _sectionKey(String label) => GlobalObjectKey(label);
|
||||
|
||||
class _MobileList extends StatefulWidget {
|
||||
final List<_Section> sections;
|
||||
const _MobileList({required this.sections});
|
||||
|
||||
@override
|
||||
State<_MobileList> createState() => _MobileListState();
|
||||
}
|
||||
|
||||
class _MobileListState extends State<_MobileList> {
|
||||
final _scrollController = ScrollController();
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_scrollController.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
void _jumpTo(String label) {
|
||||
final target = _sectionKey(label).currentContext;
|
||||
if (target == null) return;
|
||||
Scrollable.ensureVisible(
|
||||
target,
|
||||
duration: NooMotion.slow,
|
||||
curve: NooMotion.ease,
|
||||
alignment: 0.05,
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return ListView(
|
||||
padding: const EdgeInsets.fromLTRB(
|
||||
NooSpace.sm,
|
||||
NooSpace.sm,
|
||||
NooSpace.sm,
|
||||
NooSpace.xxl,
|
||||
),
|
||||
physics: const BouncingScrollPhysics(),
|
||||
return Stack(
|
||||
children: [
|
||||
for (final section in sections) ...[
|
||||
section,
|
||||
const SizedBox(height: NooSpace.xl),
|
||||
],
|
||||
ListView(
|
||||
controller: _scrollController,
|
||||
padding: const EdgeInsets.fromLTRB(
|
||||
NooSpace.sm,
|
||||
NooSpace.sm,
|
||||
NooSpace.xxl,
|
||||
NooSpace.xxl,
|
||||
),
|
||||
physics: const BouncingScrollPhysics(),
|
||||
children: [
|
||||
for (final (label, _, child) in widget.sections) ...[
|
||||
KeyedSubtree(key: _sectionKey(label), child: child),
|
||||
const SizedBox(height: NooSpace.xl),
|
||||
],
|
||||
],
|
||||
),
|
||||
Positioned(
|
||||
top: 0,
|
||||
bottom: 0,
|
||||
right: 2,
|
||||
child: _SectionJumpRail(sections: widget.sections, onTap: _jumpTo),
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// A vertical rail of small per-section icons pinned to the trailing edge,
|
||||
/// sitting where the scrollbar would otherwise be - tapping one jumps
|
||||
/// straight to that section instead of scrolling the whole (fairly long)
|
||||
/// Settings list by hand. Each icon is a generous 32px tap target even
|
||||
/// though the rail itself is slim, so this stays usable one-handed.
|
||||
class _SectionJumpRail extends StatelessWidget {
|
||||
final List<_Section> sections;
|
||||
final ValueChanged<String> onTap;
|
||||
|
||||
const _SectionJumpRail({required this.sections, required this.onTap});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final colors = context.nooColors;
|
||||
return Center(
|
||||
child: Container(
|
||||
padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 2),
|
||||
decoration: BoxDecoration(
|
||||
color: colors.surface,
|
||||
borderRadius: BorderRadius.circular(NooRadii.pill),
|
||||
border: Border.all(color: colors.line),
|
||||
),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
for (final (label, icon, _) in sections)
|
||||
Semantics(
|
||||
button: true,
|
||||
label: 'Jump to $label',
|
||||
child: InkResponse(
|
||||
onTap: () => onTap(label),
|
||||
radius: 18,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(6),
|
||||
child: Icon(icon, size: 16, color: colors.fg3),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// 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
|
||||
|
||||
Reference in New Issue
Block a user