Skip to content

fix #293, make three lines puzzle session #1923

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
merged 1 commit into from
Jun 27, 2025
Merged

fix #293, make three lines puzzle session #1923

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
119 changes: 58 additions & 61 deletions lib/src/view/puzzle/puzzle_session_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,72 +60,69 @@ class PuzzleSessionWidgetState extends ConsumerState<PuzzleSessionWidget> {
(a) => a.id == puzzleState.puzzle.puzzle.id,
);

final orientation = MediaQuery.orientationOf(context);
final remainingSpace = estimateHeightMinusBoardFromContext(context);
final estimatedTableHeight = remainingSpace / 2;
const estimatedRatingWidgetHeight = 33.0;
final estimatedWidgetHeight = estimatedTableHeight - estimatedRatingWidgetHeight;
final maxHeight = orientation == Orientation.portrait
? estimatedWidgetHeight >= 60
? 60.0
: 26.0
: 94.0;

return Padding(
padding: const EdgeInsets.symmetric(vertical: 5.0),
child: OrientationBuilder(
builder: (context, orientation) {
final remainingSpace = estimateHeightMinusBoardFromContext(context);
final estimatedTableHeight = remainingSpace / 2;
const estimatedRatingWidgetHeight = 33.0;
final estimatedWidgetHeight = estimatedTableHeight - estimatedRatingWidgetHeight;
final maxHeight = orientation == Orientation.portrait
? estimatedWidgetHeight >= 60
? 60.0
: 26.0
: 60.0;

return ConstrainedBox(
constraints: BoxConstraints(minHeight: 26.0, maxHeight: maxHeight),
child: SingleChildScrollView(
physics: const NeverScrollableScrollPhysics(),
child: Wrap(
spacing: 8,
runSpacing: 8,
verticalDirection: VerticalDirection.up,
children: [
for (final attempt in session.attempts)
_SessionItem(
isCurrent: attempt.id == puzzleState.puzzle.puzzle.id,
isLoading: loadingPuzzleId == attempt.id,
brightness: brightness,
attempt: attempt,
onTap: puzzleState.puzzle.puzzle.id != attempt.id && loadingPuzzleId == null
? (id) async {
final provider = puzzleProvider(id);
child: ConstrainedBox(
constraints: BoxConstraints(minHeight: 26.0, maxHeight: maxHeight),
child: SingleChildScrollView(
physics: const NeverScrollableScrollPhysics(),
child: Wrap(
spacing: 8,
runSpacing: 8,
verticalDirection: VerticalDirection.up,
children: [
for (final attempt in session.attempts)
_SessionItem(
isCurrent: attempt.id == puzzleState.puzzle.puzzle.id,
isLoading: loadingPuzzleId == attempt.id,
brightness: brightness,
attempt: attempt,
onTap: puzzleState.puzzle.puzzle.id != attempt.id && loadingPuzzleId == null
? (id) async {
final provider = puzzleProvider(id);
setState(() {
loadingPuzzleId = id;
});
try {
final puzzle = await ref.read(provider.future);
final nextContext = PuzzleContext(
userId: widget.initialPuzzleContext.userId,
angle: widget.initialPuzzleContext.angle,
puzzle: puzzle,
);

ref.read(widget.ctrlProvider.notifier).onLoadPuzzle(nextContext);
} finally {
if (mounted) {
setState(() {
loadingPuzzleId = id;
loadingPuzzleId = null;
});
try {
final puzzle = await ref.read(provider.future);
final nextContext = PuzzleContext(
userId: widget.initialPuzzleContext.userId,
angle: widget.initialPuzzleContext.angle,
puzzle: puzzle,
);

ref.read(widget.ctrlProvider.notifier).onLoadPuzzle(nextContext);
} finally {
if (mounted) {
setState(() {
loadingPuzzleId = null;
});
}
}
}
: null,
),
if (puzzleState.mode == PuzzleMode.view || currentAttempt == null)
_SessionItem(
isCurrent: currentAttempt == null,
isLoading: false,
brightness: brightness,
key: lastAttemptKey,
),
],
),
),
);
},
}
}
: null,
),
if (puzzleState.mode == PuzzleMode.view || currentAttempt == null)
_SessionItem(
isCurrent: currentAttempt == null,
isLoading: false,
brightness: brightness,
key: lastAttemptKey,
),
],
),
),
),
);
}
Expand Down