Skip to content

Puzzle Dashboard Improvements #2690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
veloce merged 6 commits into from
Mar 2, 2026
Merged

Puzzle Dashboard Improvements #2690

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c51b969
Align the logic of showing strengths and areas of improvement with th…
r3econ Feb 28, 2026
0d305b7
Change the order of stats in the strengths and weaknesses to align wi…
r3econ Feb 28, 2026
226f10e
Remove not needed comments
r3econ Feb 28, 2026
01de2d1
Hide performance section when there is nothing to show (no items)
r3econ Feb 28, 2026
571af0d
Fix formatting
r3econ Feb 28, 2026
98d5466
Remove not needed code
r3econ Feb 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 34 additions & 12 deletions lib/src/view/puzzle/dashboard_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,8 @@ class _PerformanceSection extends StatelessWidget {

@override
Widget build(BuildContext context) {
final themes = metric.sort(dashboard.themes);
final themes = metric.sort(dashboard.themes, dashboard);
if (themes.isEmpty) return const SizedBox.shrink();
return ListSection(
header: Column(
crossAxisAlignment: CrossAxisAlignment.start,
Expand All @@ -204,9 +205,9 @@ class _PerformanceSection extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(metric.title(context.l10n)), // #4: logic on enum
Text(metric.title(context.l10n)),
Text(
metric.subtitle(context.l10n), // #4: logic on enum
metric.subtitle(context.l10n),
style: Styles.subtitle.copyWith(
color: textShade(context, Styles.subtitleOpacity),
),
Expand Down Expand Up @@ -293,14 +294,35 @@ enum Metric {

static const _itemsToShow = 3;

List<PuzzleDashboardData> sort(IList<PuzzleDashboardData> themes) => switch (this) {
strength =>
themes
.sortedByCompare((e) => e.performance, (a, b) => b.compareTo(a))
.take(_itemsToShow)
.toList(),
improvementArea => themes.sortedBy((e) => e.performance).take(_itemsToShow).toList(),
};
List<PuzzleDashboardData> sort(IList<PuzzleDashboardData> themes, PuzzleDashboard dashboard) {
// Themes are filtered to those with enough plays (nb > global.nb / 40),
// then sorted ascending by performance. Improvement areas are taken from
// the bottom (lowest performance), strengths from the top (highest performance).
final minNb = dashboard.global.nb / 40;

final all = themes.where((e) => e.nb > minNb).sortedByCompare((e) => e.performance, (a, b) {
final perfCmp = a.compareTo(b);
return perfCmp;
}).toList();

return switch (this) {
strength =>
all
.where((e) => e.firstWins >= 3 && e.performance > dashboard.global.performance)
.toList()
.reversed
.take(_itemsToShow)
.toList(),
improvementArea =>
all
.where((e) {
final failed = e.nb - e.firstWins; // fixed + unfixed = nb - firstWins
return failed >= 3 && e.performance < dashboard.global.performance;
})
.take(_itemsToShow)
.toList(),
};
}

String title(AppLocalizations l10n) => switch (this) {
strength => l10n.puzzleStrengths,
Expand Down Expand Up @@ -377,7 +399,6 @@ class PuzzleThemeRow extends ConsumerWidget {
),
StatCardRow([
StatCard(context.l10n.performance, value: data.performance.toString()),
StatCard(context.l10n.puzzleSolved.capitalize(), value: '$solvePercentage%'),
StatCard(
context.l10n
.puzzleNbPlayed(data.nb)
Expand All @@ -386,6 +407,7 @@ class PuzzleThemeRow extends ConsumerWidget {
.capitalize(),
value: data.nb.toString().localizeNumbers(),
),
StatCard(context.l10n.puzzleSolved.capitalize(), value: '$solvePercentage%'),
]),
],
),
Expand Down