fix(studyset): the material's tools fold into the menu rather than cutting the tabs off
Where the row beside the material's tabs ran short, Browse, the filter
and the menu kept their room and the tabs were cut off ("Fil…"). The
tools now fold one by one, from the widest to the narrowest that leaves
the tabs their whole width: Browse loses its words first, then the
filter goes into the ⋮ menu, then Browse does too, as the studyset's own
actions fold into icons. A row of its own (CollapsingRow) measures the
tabs and each way of showing the tools and shows the first that fits.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01MMm7usAo6q9ZZRoPkWjoxi
Signed-off-by: Tizian 「ティツィアーン」 <raisondetredev@pm.me>
This commit is contained in:
parent
cf6d58aae7
commit
468810c6f4
GPG key ID:
07F6FCF405488B64
6 changed files with 353 additions and 119 deletions
|
|
@ -97,8 +97,8 @@ A spaced-repetition learning app: studysets of flashcards, reviewed on an FSRS s
|
|||
- **Material comes from `package:material_ui`** (Cupertino from `package:cupertino_ui`), never from `package:flutter/material.dart`, which Flutter deprecates from its November 2026 release on. Packages still on the SDK's copy get the app's theme and localizations through `MaterialUiCompatibilityBridge` in `MaterialApp.builder`; remove it once they have moved.
|
||||
- **Navigation is `go_router`**: the routes in `lib/src/app/app_router.dart`, their paths in `core/router/route_paths.dart`. Four tabs (Home, Library, Explore, Profile) are the branches of a `StatefulShellRoute`, each keeping its own stack of screens alive while another tab shows (`tabsContainer`, go_router's indexed stack plus `TabVisibility`, which a screen depends on to stop something once its tab is hidden); `AppShell` shows them as a navigation rail from 600 dp on and as a navigation bar below (Material 3 Expressive's shorter one, 64 dp, set in the theme: Flutter's Material library has none yet), floating above the bottom edge (`FloatingNavigationBar`): the tab screens run on beneath it (the shell's `extendBody`), every list ending with room for it (the body's bottom padding) and floating buttons lifted by `FloatingNavigationBar.coverOf`, with the background of the screen in view around it in between (`ScreenTint`); it steps aside inside a studyset (its screen, notes, paths and dictionary: `RoutePaths.isInsideStudyset`), whose own bar at the bottom takes its place, leaving a strip as high as the system's bar (decided 2026-10-11, as Material 3 puts toolbars below the top level and Vaia does), and choosing the open tab again returns to its first screen. A tab's own screens are routes nested in its branch, reached with `context.go` (a studyset's screen in the library), and **the screens behind a studyset are its path** (decided 2026-10-11; `feature/studyset/widget/studyset_navigation.dart`): a topic, at any depth, opens with the screens of the levels between pushed beneath it (`openStudysetWithin`; the same route, keyed by id and named by its location, so several stack), the path's steps and the levels a long press on back lists go up by popping to that page (`goUpTo`), and a studyset opened from elsewhere gets its levels beneath it (`openStudyset`). So back, Android's predictive back, iOS's swipe from the edge and the path all lead one level up. Below expanded windows the topics open in a sheet from the end of the path's line, never a drawer, whose swipe from the edge is iOS's way back. A studyset's notes and learning paths (working through one, writing it, writing a step) are routes of the Library branch too, so the tabs stay beside them. What needs the whole window (studying, a card, a PDF, settings) is a top-level route over the tabs, reached with `context.push`. Explore lists what is published (see *Explore and copies*).
|
||||
- **Routes carry ids, never objects.** A screen finds its item in the repository's live list with `FoundById` (`core/widget/`): a spinner until the list arrives, then the item, or a screen saying it no longer exists (deleted on another device, or an old link). A screen that deletes its item closes, and keeps showing the item while it goes. Why: every location can be built from its path alone, and no screen goes on showing something that has gone.
|
||||
- **The look is one theme** (`core/theme/`): `appTheme(brightness)` with hand-written light and dark colour schemes around the brand's cobalt and copper; `Theme.of(context).extras` (`ThemeExtras`) for the colours Material has no role for (states, the four FSRS ratings, a starred star); `PaletteColor` for the 20 colours a person can give content; snack bars floating above the navigation bar as Material 3 places them, in its inverse colours (dark in the light theme), lined up with the floating bar, 560 wide and centred from medium windows on (`FittedSnackBars`, decided 2026-10-12; Flutter's default is Material 2's fixed bar across the foot); `TopGradient` for a colour washing down from the top of every tab's first screen, Settings and Connect Claude (cobalt) and of every screen of a studyset (its colour, own or inherited, which `_inStudyset` in the router hands down as `ScreenColor`): the studyset, studying it, its cards, writing them, its notes, paths and dictionary; behind a clear app bar, in dark mode a deep shade (42 % of the colour over black), in light mode a tint, held to WCAG AA for the theme's text. From medium windows on, a `TintFrame` takes the colour of the screen in view (`ScreenTint`, claimed by the `TopGradient` whose tab shows and whose route is on top), fading out by 60 % of the height: the rail sits on it, transparent, and the screen is a rounded panel inset beside it, its own wash half as strong; screens over the tabs (studying, the card browser and composer, Settings) sit in the same frame without the rail (`FramedScreen`). As Vaia does, decided 2026-10-10. The PDF reader and the reading timeline stay plain. `theme_test.dart` holds text to WCAG AA contrast (4.5:1) on each palette colour and on the dark theme's primary colour and surface. **Fonts are bundled, never fetched** (`core/theme/app_fonts.dart`, `assets/fonts/ATTRIBUTION.md`): Noto Sans is the app's font on every device (Latin, Greek with polytonic, Cyrillic); Noto Sans JP, SC, TC and KR fill in Japanese, Chinese and Korean, Japanese first unless a studyset's language puts its own first (`StudysetLanguageScope`, which every studyset route wraps its screen in through `_inStudyset`; Han characters take the first listed font's shapes); each is one variable font holding every weight, and their OFL licences join the licence list. Scripts none covers (Arabic, Hebrew, Thai, …) fall back to the device's own fonts. A studyset's languages (`frontLanguage`, `backLanguage`, BCP 47) are given together or inherited together from the nearest studyset above (`languagesOf`). Never add `google_fonts` or anything else that downloads fonts. Layouts follow Material 3's window-size classes (`context.windowSize`, `core/layout/`), and running text stays within `readableContentMaxWidth`. Icons are Lucide (`lucide_icons_flutter`), except a starred star and the marks of a choice not yet checked (filled box and circle), which need the fill Lucide lacks; the Material icons left in older screens go when those are restyled. Shared widgets are in `core/widget/` (`SectionCard`, `AppLoadingIndicator`, `confirmDestructiveAction`, `FoundById`, `TitleWithKicker`, `ContentCountsLine`, `showUndoSnackBar`, `ScrollHidingFab`, `PaletteColorPicker`, `CountStepper`, `RequiredFieldLabel` and `FieldInfoButton`, `ReorderToggle`, `ReorderGrip`, `liftWhileDragged`, `LaunchScreen` (what shows while the app opens: the kingfisher, "Halkyon" over "Learn"), `SliverCentered` and `EmptyListMessage` (what an empty list shows: icon, "No … yet", and which menus add some), and the sheets below).
|
||||
- **A studyset's content is in three parts** (`feature/studyset/widget/studyset_parts.dart`, decided 2026-10-12, as Vaia has it): Material (its flashcards, notes and files in tabs, each saying how many it holds, each list whole with its tools at the end of the tabs' row; decided 2026-10-12 after a trial of sections one below the other, the first three of each behind Show all, as Vaia stacks them: the lists run to hundreds of cards, and tabs are Material 3's way within a part; the tab is kept as the studyset's part, while the material shows, and opened for the first time it opens on a tab with something in it), Progress (always, nothing yet where nothing was studied, so the switch never changes as reviews are read, decided 2026-10-12: how much is learnt, what is due today, the study time this week from the reviews' durations, each at most `Review.maxStudyTime`, `StudysetActivityCubit`) and Study plan (the paths finished, Next up, the paths). `StudysetPartSwitch` chooses between them in the header: below expanded windows in a line of its own under the title, from there on in the path's line, which the topics leave free there, centred above the material's column (at the line's end where that column is narrower than the switch; the path folds before it); it ticks as the navigation bar does. **A studyset opens on the part it was left on, on this device** (`StudysetTabs`, `studyset_tabs.json` in the person's folder, read as their data opens, decided 2026-10-11; a tab kept before the parts counts as its part); opened there for the first time, on the study plan while a path is unfinished, else on the material, showing that it loads until it knows rather than one part and then another. Material added or imported shows in its part (`ContentTabCubit`).
|
||||
- **The look is one theme** (`core/theme/`): `appTheme(brightness)` with hand-written light and dark colour schemes around the brand's cobalt and copper; `Theme.of(context).extras` (`ThemeExtras`) for the colours Material has no role for (states, the four FSRS ratings, a starred star); `PaletteColor` for the 20 colours a person can give content; snack bars floating above the navigation bar as Material 3 places them, in its inverse colours (dark in the light theme), lined up with the floating bar, 560 wide and centred from medium windows on (`FittedSnackBars`, decided 2026-10-12; Flutter's default is Material 2's fixed bar across the foot); `TopGradient` for a colour washing down from the top of every tab's first screen, Settings and Connect Claude (cobalt) and of every screen of a studyset (its colour, own or inherited, which `_inStudyset` in the router hands down as `ScreenColor`): the studyset, studying it, its cards, writing them, its notes, paths and dictionary; behind a clear app bar, in dark mode a deep shade (42 % of the colour over black), in light mode a tint, held to WCAG AA for the theme's text. From medium windows on, a `TintFrame` takes the colour of the screen in view (`ScreenTint`, claimed by the `TopGradient` whose tab shows and whose route is on top), fading out by 60 % of the height: the rail sits on it, transparent, and the screen is a rounded panel inset beside it, its own wash half as strong; screens over the tabs (studying, the card browser and composer, Settings) sit in the same frame without the rail (`FramedScreen`). As Vaia does, decided 2026-10-10. The PDF reader and the reading timeline stay plain. `theme_test.dart` holds text to WCAG AA contrast (4.5:1) on each palette colour and on the dark theme's primary colour and surface. **Fonts are bundled, never fetched** (`core/theme/app_fonts.dart`, `assets/fonts/ATTRIBUTION.md`): Noto Sans is the app's font on every device (Latin, Greek with polytonic, Cyrillic); Noto Sans JP, SC, TC and KR fill in Japanese, Chinese and Korean, Japanese first unless a studyset's language puts its own first (`StudysetLanguageScope`, which every studyset route wraps its screen in through `_inStudyset`; Han characters take the first listed font's shapes); each is one variable font holding every weight, and their OFL licences join the licence list. Scripts none covers (Arabic, Hebrew, Thai, …) fall back to the device's own fonts. A studyset's languages (`frontLanguage`, `backLanguage`, BCP 47) are given together or inherited together from the nearest studyset above (`languagesOf`). Never add `google_fonts` or anything else that downloads fonts. Layouts follow Material 3's window-size classes (`context.windowSize`, `core/layout/`), and running text stays within `readableContentMaxWidth`. Icons are Lucide (`lucide_icons_flutter`), except a starred star and the marks of a choice not yet checked (filled box and circle), which need the fill Lucide lacks; the Material icons left in older screens go when those are restyled. Shared widgets are in `core/widget/` (`SectionCard`, `AppLoadingIndicator`, `confirmDestructiveAction`, `FoundById`, `TitleWithKicker`, `ContentCountsLine`, `showUndoSnackBar`, `ScrollHidingFab`, `PaletteColorPicker`, `CountStepper`, `RequiredFieldLabel` and `FieldInfoButton`, `ReorderToggle`, `ReorderGrip`, `CollapsingRow`, `liftWhileDragged`, `LaunchScreen` (what shows while the app opens: the kingfisher, "Halkyon" over "Learn"), `SliverCentered` and `EmptyListMessage` (what an empty list shows: icon, "No … yet", and which menus add some), and the sheets below).
|
||||
- **A studyset's content is in three parts** (`feature/studyset/widget/studyset_parts.dart`, decided 2026-10-12, as Vaia has it): Material (its flashcards, notes and files in tabs, each saying how many it holds, each list whole with its tools at the end of the tabs' row, which fold one by one where room runs short rather than cutting the tabs off (`CollapsingRow`: Browse's words first, then the filter into the ⋮ menu, then Browse; as the studyset's own actions fold into icons); decided 2026-10-12 after a trial of sections one below the other, the first three of each behind Show all, as Vaia stacks them: the lists run to hundreds of cards, and tabs are Material 3's way within a part; the tab is kept as the studyset's part, while the material shows, and opened for the first time it opens on a tab with something in it), Progress (always, nothing yet where nothing was studied, so the switch never changes as reviews are read, decided 2026-10-12: how much is learnt, what is due today, the study time this week from the reviews' durations, each at most `Review.maxStudyTime`, `StudysetActivityCubit`) and Study plan (the paths finished, Next up, the paths). `StudysetPartSwitch` chooses between them in the header: below expanded windows in a line of its own under the title, from there on in the path's line, which the topics leave free there, centred above the material's column (at the line's end where that column is narrower than the switch; the path folds before it); it ticks as the navigation bar does. **A studyset opens on the part it was left on, on this device** (`StudysetTabs`, `studyset_tabs.json` in the person's folder, read as their data opens, decided 2026-10-11; a tab kept before the parts counts as its part); opened there for the first time, on the study plan while a path is unfinished, else on the material, showing that it loads until it knows rather than one part and then another. Material added or imported shows in its part (`ContentTabCubit`).
|
||||
- **Statistics** (`feature/statistics/`, decided 2026-10-12, as Vaia has them): the Profile tab's second tab, for anonymous people too. The time studied in all, per day (every day from the first studied to today counted) and the most in one day, and by days, weeks or months (ten, ten, twelve bars) the study time and the ratings, as bars the app draws itself (`BarChart`, no chart package); a tap on a bar says what it holds. Computed on the device from every review (`studyStatistics`, `StatisticsCubit`), every rating counted, crammed ones too, a fresh start not, and **a review counts as at most a minute of study** (`Review.maxStudyTime`, as Anki does by default: a card left on the screen over lunch isn't an hour of study; stored durations stay as they were), here and in a studyset's Progress. What waits in Recently deleted counts nowhere, here or on Home.
|
||||
- **Lists that can grow long are built as they scroll into view**: a studyset's parts are `CustomScrollView`s holding each list's slivers (`SliverList`, `SliverReorderableList`), and what a list says in place of its rows sits in a `SliverCentered`. Never a `shrinkWrap` list inside another scrolling view: that builds every row at once, and 1,000 cards then froze the window for seconds, long enough for the desktop to offer to kill the app. Rows are put in another order in a Reorder mode (`ReorderToggle` beside the list; a `ReorderGrip` in place of each row's options; positions from `core/sync/fractional_position.dart`), never with Flutter's default drag handles, which on the desktop lie over a row's trailing end, its … button. Flashcards have no Reorder (decided 2026-10-08): they keep the order they were created or imported in, which new cards and cramming follow, and sub-studysets put lessons in order; no one drags a card among a thousand. **The card browser** (`feature/card/widget/card_browser_screen.dart`, decided 2026-10-09: the older design, gaps filled) opens from Browse in the flashcards' section, over the tabs (`/studysets/:id/flashcards`, `?subtree=1` with everything inside): grid or detail (one card beside the list, which follows it; on a phone above a strip), as last left per studyset on the device (`DeviceSettings.detailedBrowsers`); search over front, back, reading, meanings, hints, explanation and tag names (katakana as hiragana, romaji finding kana; `card_browser.dart`); sort (own order, newest, oldest, A–Z by reading, due first); a filter sheet (kind, one tag, state: new, learning, due, buried, reported); and choosing cards (a toggle; shift-click or long-press for a range) to move (`showCardMoveSheet`), tag, untag, start afresh or delete with Undo. It reads every card of the studysets, as lists do (schedules from the review repository's cache).
|
||||
- **Forms and pickers open as sheets**: `showAdaptiveSheet` with a `SheetScaffold` (title and close button on top, the body scrolling with a scrollbar, always shown on the desktop, and Material 3's lines under the title and above the footer while some of the body lies beyond them, the action pinned below) shows a bottom sheet below expanded windows and a dialog from there on. A sheet that asks before discarding changes (a `PopScope`) passes `swipeable: false`: a bottom sheet swiped away closes without asking its `PopScope` (Flutter issue 152120, open with v3.47). A sheet offering an Undo passes `hasSnackBars: true`, so its snack bars show on it rather than behind its barrier. A sheet running something that mustn't be cut off (an import) is `busy` meanwhile: its close button is greyed and back does nothing; it is shown with `swipeable: false`, since a swipe closes a bottom sheet regardless. A screen whose blocs import (a studyset's PDFs and paths) greys its back button and path likewise, as leaving would close them; an import of paths shows the study plan at once, how far it has come above the paths (`PathImportProgress`). A picker that changes something outside it reports every change as it happens (`onChanged`) rather than as its result, since a sheet swiped away has none. What needs the whole window to be written or picked (a studyset's description, a step's feedback, a map question's region: `editRichText`, `pickRegion`, decided 2026-10-12) is a field in the form (`ChevronField`: the value, a chevron) opening a full-window route with Save in its app bar, where nothing scrolls around a map, so the wheel alone zooms it; a country's own map (Japan's prefectures) is offered there only once the country, or a region within it, is picked.
|
||||
|
|
|
|||
175
halkyon_learn_flutter/lib/src/core/widget/collapsing_row.dart
Normal file
175
halkyon_learn_flutter/lib/src/core/widget/collapsing_row.dart
Normal file
|
|
@ -0,0 +1,175 @@
|
|||
import 'dart:math' as math;
|
||||
|
||||
import 'package:flutter/rendering.dart';
|
||||
import 'package:material_ui/material_ui.dart';
|
||||
|
||||
/// A row of `leading` (tabs, a title) and, at its end, the first of
|
||||
/// `levels` that leaves `leading` all the width it would take: the levels
|
||||
/// are the same tools from the widest (every button with its label) to
|
||||
/// the narrowest (all of them in a ⋮ menu), so where room runs short the
|
||||
/// tools fold one by one rather than cutting `leading` off. `leading`
|
||||
/// takes what the level chosen leaves, its natural width at most; the
|
||||
/// level stands at the row's end. Only the level chosen shows; the others
|
||||
/// are kept, unseen and untouchable, so their state stays.
|
||||
// Not const: its children are a list made of the leading child and the
|
||||
// levels.
|
||||
// ignore: prefer_const_constructors_in_immutables
|
||||
class CollapsingRow({
|
||||
required Widget leading,
|
||||
required List<Widget> levels,
|
||||
super.key,
|
||||
}) extends MultiChildRenderObjectWidget {
|
||||
this
|
||||
: assert(levels.isNotEmpty, 'There is always a level to choose'),
|
||||
super(children: [leading, ...levels]);
|
||||
|
||||
@override
|
||||
RenderObject createRenderObject(BuildContext context) =>
|
||||
RenderCollapsingRow();
|
||||
}
|
||||
|
||||
/// Lays out a [CollapsingRow]: its first child the leading one, the rest
|
||||
/// the levels, widest first.
|
||||
class RenderCollapsingRow()
|
||||
extends RenderBox
|
||||
with
|
||||
ContainerRenderObjectMixin<RenderBox, _RowParentData>,
|
||||
RenderBoxContainerDefaultsMixin<RenderBox, _RowParentData> {
|
||||
/// The level shown, by its index among the levels.
|
||||
@visibleForTesting
|
||||
int chosen = 0;
|
||||
|
||||
@override
|
||||
void setupParentData(RenderBox child) {
|
||||
if (child.parentData is! _RowParentData) {
|
||||
child.parentData = _RowParentData();
|
||||
}
|
||||
}
|
||||
|
||||
List<RenderBox> get _children => getChildrenAsList();
|
||||
|
||||
RenderBox get _leading => _children.first;
|
||||
|
||||
List<RenderBox> get _levels => _children.sublist(1);
|
||||
|
||||
/// The widest level leaving the leading child its natural width in
|
||||
/// [width]; the narrowest when none does.
|
||||
int _choose(double width) {
|
||||
final need = _leading.getMaxIntrinsicWidth(double.infinity);
|
||||
final levels = _levels;
|
||||
for (final (index, level) in levels.indexed) {
|
||||
if (need + level.getMaxIntrinsicWidth(double.infinity) <= width) {
|
||||
return index;
|
||||
}
|
||||
}
|
||||
return levels.length - 1;
|
||||
}
|
||||
|
||||
@override
|
||||
double computeMinIntrinsicWidth(double height) =>
|
||||
_levels.last.getMinIntrinsicWidth(height);
|
||||
|
||||
@override
|
||||
double computeMaxIntrinsicWidth(double height) =>
|
||||
_leading.getMaxIntrinsicWidth(height) +
|
||||
_levels.first.getMaxIntrinsicWidth(height);
|
||||
|
||||
@override
|
||||
double computeMinIntrinsicHeight(double width) => _children.fold(
|
||||
0,
|
||||
(most, child) => math.max(most, child.getMinIntrinsicHeight(width)),
|
||||
);
|
||||
|
||||
@override
|
||||
double computeMaxIntrinsicHeight(double width) => _children.fold(
|
||||
0,
|
||||
(most, child) => math.max(most, child.getMaxIntrinsicHeight(width)),
|
||||
);
|
||||
|
||||
@override
|
||||
Size computeDryLayout(BoxConstraints constraints) {
|
||||
final width = constraints.maxWidth;
|
||||
final level = _levels[_choose(width)].getDryLayout(
|
||||
BoxConstraints(maxHeight: constraints.maxHeight),
|
||||
);
|
||||
final leading = _leading.getDryLayout(
|
||||
BoxConstraints(
|
||||
maxWidth: math.max(0, width - level.width),
|
||||
maxHeight: constraints.maxHeight,
|
||||
),
|
||||
);
|
||||
return constraints.constrain(
|
||||
Size(width, math.max(level.height, leading.height)),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
void performLayout() {
|
||||
final width = constraints.maxWidth;
|
||||
chosen = _choose(width);
|
||||
final levels = _levels;
|
||||
for (final (index, level) in levels.indexed) {
|
||||
level.layout(
|
||||
index == chosen
|
||||
? BoxConstraints(maxHeight: constraints.maxHeight)
|
||||
: BoxConstraints.tight(Size.zero),
|
||||
parentUsesSize: true,
|
||||
);
|
||||
}
|
||||
final level = levels[chosen];
|
||||
final leading = _leading
|
||||
..layout(
|
||||
BoxConstraints(
|
||||
maxWidth: math.max(0, width - level.size.width),
|
||||
maxHeight: constraints.maxHeight,
|
||||
),
|
||||
parentUsesSize: true,
|
||||
);
|
||||
size = constraints.constrain(
|
||||
Size(width, math.max(level.size.height, leading.size.height)),
|
||||
);
|
||||
(leading.parentData! as _RowParentData).offset = Offset(
|
||||
0,
|
||||
(size.height - leading.size.height) / 2,
|
||||
);
|
||||
(level.parentData! as _RowParentData).offset = Offset(
|
||||
size.width - level.size.width,
|
||||
(size.height - level.size.height) / 2,
|
||||
);
|
||||
}
|
||||
|
||||
/// The children that show: the leading one and the level chosen.
|
||||
Iterable<RenderBox> get _shown => [_leading, _levels[chosen]];
|
||||
|
||||
@override
|
||||
void paint(PaintingContext context, Offset offset) {
|
||||
for (final child in _shown) {
|
||||
context.paintChild(
|
||||
child,
|
||||
(child.parentData! as _RowParentData).offset + offset,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
bool hitTestChildren(BoxHitTestResult result, {required Offset position}) {
|
||||
for (final child in _shown.toList().reversed) {
|
||||
final offset = (child.parentData! as _RowParentData).offset;
|
||||
if (result.addWithPaintOffset(
|
||||
offset: offset,
|
||||
position: position,
|
||||
hitTest: (result, transformed) =>
|
||||
child.hitTest(result, position: transformed),
|
||||
)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@override
|
||||
void visitChildrenForSemantics(RenderObjectVisitor visitor) =>
|
||||
_shown.forEach(visitor);
|
||||
}
|
||||
|
||||
class _RowParentData() extends ContainerBoxParentData<RenderBox>;
|
||||
|
|
@ -113,9 +113,19 @@ class const SliverCardList({
|
|||
);
|
||||
}
|
||||
|
||||
/// Beside the cards: narrowing them to a tag, and managing the tags; from
|
||||
/// the [CardListScope] above, once there are cards.
|
||||
class const CardListToolbar({super.key}) extends StatelessWidget {
|
||||
/// Beside the cards: Browse ([onBrowse]), narrowing them to a tag, and a
|
||||
/// menu managing the tags; from the [CardListScope] above, once there are
|
||||
/// cards. Where room runs short they fold into the menu one by one, as far
|
||||
/// as [folded] says: 0 all in the row, Browse with its label; 1 Browse an
|
||||
/// icon; 2 the filter in the menu; 3 Browse in the menu too.
|
||||
class const CardListToolbar({
|
||||
required final VoidCallback onBrowse,
|
||||
final int folded = 0,
|
||||
super.key,
|
||||
}) extends StatelessWidget {
|
||||
/// How far the tools fold at most.
|
||||
static const mostFolded = 3;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final state = context.watch<CardListBloc>().state;
|
||||
|
|
@ -124,32 +134,59 @@ class const CardListToolbar({super.key}) extends StatelessWidget {
|
|||
}
|
||||
final l10n = AppLocalizations.of(context);
|
||||
final theme = Theme.of(context);
|
||||
// Tinted while it narrows the list.
|
||||
final filterColor = state.filter == null ? null : theme.colorScheme.primary;
|
||||
Future<void> filter() async {
|
||||
final bloc = context.read<CardListBloc>();
|
||||
final chosen = await showAdaptiveSheet<({String? tagId})>(
|
||||
context,
|
||||
builder: (context) =>
|
||||
_FilterSheet(tags: state.tagsInUse, tagId: state.filter?.id),
|
||||
);
|
||||
if (chosen != null) {
|
||||
bloc.add(CardListEventTagFilterChanged(chosen.tagId));
|
||||
}
|
||||
}
|
||||
|
||||
return Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
IconButton(
|
||||
tooltip: l10n.cardFilterTooltip,
|
||||
icon: Icon(
|
||||
LucideIcons.listFilter,
|
||||
// Tinted while it narrows the list.
|
||||
color: state.filter == null ? null : theme.colorScheme.primary,
|
||||
if (folded == 0)
|
||||
TextButton.icon(
|
||||
onPressed: onBrowse,
|
||||
icon: const Icon(LucideIcons.layoutGrid, size: 18),
|
||||
label: Text(l10n.cardBrowserBrowse),
|
||||
)
|
||||
else if (folded < mostFolded)
|
||||
IconButton(
|
||||
onPressed: onBrowse,
|
||||
icon: const Icon(LucideIcons.layoutGrid),
|
||||
tooltip: l10n.cardBrowserBrowseTooltip,
|
||||
),
|
||||
if (folded < 2)
|
||||
IconButton(
|
||||
tooltip: l10n.cardFilterTooltip,
|
||||
icon: Icon(LucideIcons.listFilter, color: filterColor),
|
||||
onPressed: filter,
|
||||
),
|
||||
onPressed: () async {
|
||||
final bloc = context.read<CardListBloc>();
|
||||
final chosen = await showAdaptiveSheet<({String? tagId})>(
|
||||
context,
|
||||
builder: (context) => _FilterSheet(
|
||||
tags: state.tagsInUse,
|
||||
tagId: state.filter?.id,
|
||||
),
|
||||
);
|
||||
if (chosen != null) {
|
||||
bloc.add(CardListEventTagFilterChanged(chosen.tagId));
|
||||
}
|
||||
},
|
||||
),
|
||||
MenuAnchor(
|
||||
menuChildren: [
|
||||
if (folded >= mostFolded)
|
||||
MenuItemButton(
|
||||
leadingIcon: const Icon(LucideIcons.layoutGrid, size: 18),
|
||||
onPressed: onBrowse,
|
||||
child: Text(l10n.cardBrowserBrowse),
|
||||
),
|
||||
if (folded >= 2)
|
||||
MenuItemButton(
|
||||
leadingIcon: Icon(
|
||||
LucideIcons.listFilter,
|
||||
size: 18,
|
||||
color: filterColor,
|
||||
),
|
||||
onPressed: filter,
|
||||
child: Text(l10n.cardFilterTooltip),
|
||||
),
|
||||
MenuItemButton(
|
||||
leadingIcon: const Icon(LucideIcons.tags, size: 18),
|
||||
onPressed: () => showManageTagsSheet(context),
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ import 'package:halkyon_learn_flutter/src/core/sync/bloc/sync_status_bloc.dart';
|
|||
import 'package:halkyon_learn_flutter/src/core/sync/widget/sync_and_wait.dart';
|
||||
import 'package:halkyon_learn_flutter/src/core/theme/theme_extras.dart';
|
||||
import 'package:halkyon_learn_flutter/src/core/widget/app_loading_indicator.dart';
|
||||
import 'package:halkyon_learn_flutter/src/core/widget/collapsing_row.dart';
|
||||
import 'package:halkyon_learn_flutter/src/core/widget/reorder_toggle.dart';
|
||||
import 'package:halkyon_learn_flutter/src/feature/card/bloc/card_list_bloc.dart';
|
||||
import 'package:halkyon_learn_flutter/src/feature/card/widget/card_list.dart';
|
||||
|
|
@ -257,6 +258,18 @@ class _MaterialPartState()
|
|||
super.dispose();
|
||||
}
|
||||
|
||||
/// Opens the card browser on the flashcards, with those of the studysets
|
||||
/// inside it where it has any, as the rail lists them.
|
||||
void _browse(BuildContext context) => context.push(
|
||||
RoutePaths.cardBrowser(
|
||||
widget.studysetId,
|
||||
subtree: switch (context.read<StudysetListBloc>().state) {
|
||||
StudysetListStateLoaded(:final studysets) => studysets.isNotEmpty,
|
||||
_ => false,
|
||||
},
|
||||
),
|
||||
);
|
||||
|
||||
/// The tab shown tapped again goes back to its top.
|
||||
void _tapped(int index) {
|
||||
if (index == _controller.index && widget.scroll.hasClients) {
|
||||
|
|
@ -313,43 +326,47 @@ class _MaterialPartState()
|
|||
final fileCount = files.loaded ? files.rows.length : null;
|
||||
_settleOnContent(cards: cardCount, notes: noteCount, files: fileCount);
|
||||
const sidePadding = EdgeInsets.fromLTRB(12, 8, 12, 0);
|
||||
void reorderFiles() {
|
||||
if (!_reorderingFiles) {
|
||||
// What is dragged is the person's own order, whatever the files
|
||||
// were sorted by.
|
||||
context.read<PdfListBloc>().add(
|
||||
const PdfListEventSorted(PdfSort.custom),
|
||||
);
|
||||
}
|
||||
setState(() => _reorderingFiles = !_reorderingFiles);
|
||||
}
|
||||
|
||||
// The tab's tools from the widest to the narrowest, the first leaving
|
||||
// the tabs their whole width shown (CollapsingRow).
|
||||
final tools = switch (_shown) {
|
||||
StudysetTab.flashcards => [
|
||||
BrowseCardsButton(
|
||||
studysetId: widget.studysetId,
|
||||
labelled: widget.labelled,
|
||||
),
|
||||
if (cards case CardListStateLoaded(cards: [_, ...]))
|
||||
const CardListToolbar(),
|
||||
for (var folded = 0; folded <= CardListToolbar.mostFolded; folded++)
|
||||
CardListToolbar(
|
||||
onBrowse: () => _browse(context),
|
||||
folded: folded,
|
||||
),
|
||||
],
|
||||
StudysetTab.notes => [
|
||||
if (notes.notes.length >= 2 || _reorderingNotes)
|
||||
StudysetTab.notes when notes.notes.length >= 2 || _reorderingNotes => [
|
||||
for (final labelled in [true, false])
|
||||
ReorderToggle(
|
||||
reordering: _reorderingNotes,
|
||||
labelled: widget.labelled,
|
||||
labelled: labelled,
|
||||
tooltip: l10n.studysetReorderNotes,
|
||||
onToggle: () =>
|
||||
setState(() => _reorderingNotes = !_reorderingNotes),
|
||||
),
|
||||
],
|
||||
_ => [
|
||||
if (files.rows.length >= 2 || _reorderingFiles)
|
||||
StudysetTab.files when files.rows.length >= 2 || _reorderingFiles => [
|
||||
for (final labelled in [true, false])
|
||||
ReorderToggle(
|
||||
reordering: _reorderingFiles,
|
||||
labelled: widget.labelled,
|
||||
labelled: labelled,
|
||||
tooltip: l10n.studysetReorderFiles,
|
||||
onToggle: () {
|
||||
if (!_reorderingFiles) {
|
||||
// What is dragged is the person's own order, whatever the
|
||||
// files were sorted by.
|
||||
context.read<PdfListBloc>().add(
|
||||
const PdfListEventSorted(PdfSort.custom),
|
||||
);
|
||||
}
|
||||
setState(() => _reorderingFiles = !_reorderingFiles);
|
||||
},
|
||||
onToggle: reorderFiles,
|
||||
),
|
||||
],
|
||||
_ => const [SizedBox.shrink()],
|
||||
};
|
||||
final body = !_settled
|
||||
? const _SliverSectionLoading()
|
||||
|
|
@ -425,26 +442,27 @@ class _MaterialPartState()
|
|||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(right: 8),
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: TabBar(
|
||||
controller: _controller,
|
||||
onTap: _tapped,
|
||||
isScrollable: true,
|
||||
tabAlignment: TabAlignment.start,
|
||||
indicatorSize: TabBarIndicatorSize.label,
|
||||
// The line below runs the whole width instead.
|
||||
dividerColor: Colors.transparent,
|
||||
tabs: [
|
||||
_TabLabel(l10n.studysetTabFlashcards, cardCount),
|
||||
_TabLabel(l10n.studysetTabNotes, noteCount),
|
||||
_TabLabel(l10n.studysetTabFiles, fileCount),
|
||||
],
|
||||
),
|
||||
),
|
||||
...tools,
|
||||
],
|
||||
// The tabs keep their whole width; the tools fold where room
|
||||
// runs short.
|
||||
child: CollapsingRow(
|
||||
leading: TabBar(
|
||||
controller: _controller,
|
||||
onTap: _tapped,
|
||||
isScrollable: true,
|
||||
tabAlignment: TabAlignment.start,
|
||||
indicatorSize: TabBarIndicatorSize.label,
|
||||
// Closer than Material's 16 a side, so the three tabs with
|
||||
// their counts fit a narrow phone beside the menu.
|
||||
labelPadding: const EdgeInsets.symmetric(horizontal: 12),
|
||||
// The line below runs the whole width instead.
|
||||
dividerColor: Colors.transparent,
|
||||
tabs: [
|
||||
_TabLabel(l10n.studysetTabFlashcards, cardCount),
|
||||
_TabLabel(l10n.studysetTabNotes, noteCount),
|
||||
_TabLabel(l10n.studysetTabFiles, fileCount),
|
||||
],
|
||||
),
|
||||
levels: tools,
|
||||
),
|
||||
),
|
||||
const Divider(height: 1),
|
||||
|
|
@ -558,50 +576,6 @@ class const _SliverEmptySection({
|
|||
}
|
||||
}
|
||||
|
||||
/// Browse beside the flashcards, while there are cards: opens the card
|
||||
/// browser of the studyset [studysetId], over everything inside it too
|
||||
/// when there is something. [labelled] says Browse, else an icon alone.
|
||||
class const BrowseCardsButton({
|
||||
required final String studysetId,
|
||||
required final bool labelled,
|
||||
super.key,
|
||||
}) extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final hasCards = context.select<CardListBloc, bool>(
|
||||
(bloc) => switch (bloc.state) {
|
||||
CardListStateLoaded(:final cards) => cards.isNotEmpty,
|
||||
_ => false,
|
||||
},
|
||||
);
|
||||
if (!hasCards) {
|
||||
return const SizedBox.shrink();
|
||||
}
|
||||
final l10n = AppLocalizations.of(context);
|
||||
void open() => context.push(
|
||||
RoutePaths.cardBrowser(
|
||||
studysetId,
|
||||
// The rail's list: the studysets inside this one.
|
||||
subtree: switch (context.read<StudysetListBloc>().state) {
|
||||
StudysetListStateLoaded(:final studysets) => studysets.isNotEmpty,
|
||||
_ => false,
|
||||
},
|
||||
),
|
||||
);
|
||||
return labelled
|
||||
? TextButton.icon(
|
||||
onPressed: open,
|
||||
icon: const Icon(LucideIcons.layoutGrid, size: 18),
|
||||
label: Text(l10n.cardBrowserBrowse),
|
||||
)
|
||||
: IconButton(
|
||||
onPressed: open,
|
||||
icon: const Icon(LucideIcons.layoutGrid),
|
||||
tooltip: l10n.cardBrowserBrowseTooltip,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// The studyset [studysetId]'s progress, with everything inside it: how much
|
||||
/// is learnt, what is due today, and how long it was studied this week;
|
||||
/// nothing yet where nothing was studied.
|
||||
|
|
|
|||
|
|
@ -1534,6 +1534,50 @@ void main() {
|
|||
expect(find.text('Show all'), findsNothing);
|
||||
});
|
||||
|
||||
testWidgets("the material's tools fold into the menu one by one rather "
|
||||
'than cutting the tabs off: Browse loses its words first', (
|
||||
tester,
|
||||
) async {
|
||||
stored('japanese', 'Japanese');
|
||||
await card('japanese', '猫');
|
||||
final seen = <String>{};
|
||||
for (final width in <double>[360, 420, 600, 760, 860, 1000, 1200, 1600]) {
|
||||
await showApp(
|
||||
tester,
|
||||
location: RoutePaths.studyset('japanese'),
|
||||
width: width,
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
await openPart(tester, 'Material');
|
||||
final tabs = tester.getRect(find.byType(TabBar));
|
||||
final files = tester.getRect(find.widgetWithText(Tab, 'Files'));
|
||||
// What shows: the levels folded away are there, but unseen.
|
||||
bool shows(Finder finder) => finder.hitTestable().evaluate().isNotEmpty;
|
||||
final level = [
|
||||
if (shows(find.text('Browse'))) 'words',
|
||||
if (shows(find.byTooltip('Browse flashcards'))) 'icon',
|
||||
if (shows(find.byTooltip('Filter'))) 'filter',
|
||||
].join('+');
|
||||
seen.add(level);
|
||||
// The tabs are cut only once everything is folded away (the test's
|
||||
// font is wider than the app's, so narrower windows get there).
|
||||
if (files.right > tabs.right) {
|
||||
expect(level, isEmpty, reason: '$width');
|
||||
}
|
||||
if (level.isEmpty) {
|
||||
// Browse in the menu.
|
||||
await tester.tap(find.byTooltip('More').hitTestable());
|
||||
await tester.pumpAndSettle();
|
||||
expect(find.text('Browse').hitTestable(), findsOneWidget);
|
||||
await tester.sendKeyEvent(LogicalKeyboardKey.escape);
|
||||
await tester.pumpAndSettle();
|
||||
}
|
||||
}
|
||||
// The widest windows show the words, the narrowest folds them away.
|
||||
expect(seen, contains('words+filter'));
|
||||
expect(seen, contains(''));
|
||||
});
|
||||
|
||||
testWidgets('tapping the open part again goes back to its top', (
|
||||
tester,
|
||||
) async {
|
||||
|
|
@ -1714,11 +1758,13 @@ void main() {
|
|||
)
|
||||
.first,
|
||||
);
|
||||
// Browse, then the filter and the menu, the last at the edge.
|
||||
expect(
|
||||
tester.getRect(find.byType(CardListToolbar)).right,
|
||||
greaterThan(material.right - 16),
|
||||
);
|
||||
// Browse, then the filter and the menu, the last at the edge: the
|
||||
// tools as they show, the folded ways of showing them unseen.
|
||||
final shown = [
|
||||
for (final toolbar in find.byType(CardListToolbar).evaluate())
|
||||
tester.getRect(find.byElementPredicate((each) => each == toolbar)),
|
||||
].where((rect) => rect.width > 0).single;
|
||||
expect(shown.right, greaterThan(material.right - 16));
|
||||
});
|
||||
|
||||
testWidgets('Progress is always there, nothing yet before anything is '
|
||||
|
|
|
|||
|
|
@ -98,7 +98,9 @@ void main() {
|
|||
|
||||
/// Opens the tags sheet from the card list's menu.
|
||||
Future<void> manageTags(WidgetTester tester) async {
|
||||
await tester.tap(find.byTooltip('More'));
|
||||
// The menu as it shows; the folded ways of showing the tools are there
|
||||
// too, unseen.
|
||||
await tester.tap(find.byTooltip('More').hitTestable());
|
||||
await tester.pumpAndSettle();
|
||||
await tester.tap(find.text('Manage tags'));
|
||||
// A menu item acts once the menu has closed, a frame later.
|
||||
|
|
@ -241,7 +243,7 @@ void main() {
|
|||
await tags.create('unused');
|
||||
await showList(tester);
|
||||
|
||||
await tester.tap(find.byTooltip('Filter'));
|
||||
await tester.tap(find.byTooltip('Filter').hitTestable());
|
||||
await tester.pumpAndSettle();
|
||||
expect(chip<ChoiceChip>('unused'), findsNothing);
|
||||
await tester.tap(chip<ChoiceChip>('verb'));
|
||||
|
|
@ -252,7 +254,7 @@ void main() {
|
|||
expect(find.text('食べる'), findsOneWidget);
|
||||
expect(find.text('猫'), findsNothing);
|
||||
|
||||
await tester.tap(find.byTooltip('Filter'));
|
||||
await tester.tap(find.byTooltip('Filter').hitTestable());
|
||||
await tester.pumpAndSettle();
|
||||
await tester.tap(find.text('Clear all'));
|
||||
await tester.pump();
|
||||
|
|
|
|||
Loading…
Reference in a new issue