Skip to content

Coordinate trainer adjustements #1041

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 6 commits into from
Oct 11, 2024
Merged

Coordinate trainer adjustements #1041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
461e119
some styles changes, show score at the end of game and more consisten…
julien4215 Sep 19, 2024
5800b74
move orientation to coordinate training controller state and randomiz…
julien4215 Sep 24, 2024
fb9be8f
fix state update
julien4215 Sep 24, 2024
4564cde
merge upstream and rework of the layout
julien4215 Oct 7, 2024
4307f4a
swap text
julien4215 Oct 7, 2024
3bdd4bf
refactor and remove new training button
julien4215 Oct 8, 2024
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
4 changes: 2 additions & 2 deletions lib/src/model/common/game.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import 'package:lichess_mobile/l10n/l10n.dart';

/// Represents the choice of a side as a player: white, black or random.
enum SideChoice {
random,
white,
random,
black;

String label(AppLocalizations l10n) => switch (this) {
SideChoice.random => l10n.randomColor,
SideChoice.white => l10n.white,
SideChoice.random => l10n.randomColor,
SideChoice.black => l10n.black,
};
}
38 changes: 33 additions & 5 deletions lib/src/model/coordinate_training/coordinate_training_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import 'dart:math';

import 'package:dartchess/dartchess.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:lichess_mobile/src/model/common/game.dart';
import 'package:lichess_mobile/src/model/coordinate_training/coordinate_training_preferences.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';

part 'coordinate_training_controller.freezed.dart';
Expand All @@ -23,7 +25,12 @@ class CoordinateTrainingController extends _$CoordinateTrainingController {
ref.onDispose(() {
_updateTimer?.cancel();
});
return const CoordinateTrainingState();
final sideChoice = ref.watch(
coordinateTrainingPreferencesProvider.select((value) => value.sideChoice),
);
return CoordinateTrainingState(
orientation: _getOrientation(sideChoice),
);
}

void startTraining(Duration? timeLimit) {
Expand Down Expand Up @@ -53,15 +60,34 @@ class CoordinateTrainingController extends _$CoordinateTrainingController {

void _finishTraining() {
// TODO save score in local storage here (and display high score and/or average score in UI)

stopTraining();
final orientation = _getOrientation(
ref.read(coordinateTrainingPreferencesProvider).sideChoice,
);
_updateTimer?.cancel();
state = CoordinateTrainingState(
lastGuess: state.lastGuess,
lastScore: state.score,
orientation: orientation,
);
}

void stopTraining() {
void abortTraining() {
final orientation = _getOrientation(
ref.read(coordinateTrainingPreferencesProvider).sideChoice,
);
_updateTimer?.cancel();
state = const CoordinateTrainingState();
state = CoordinateTrainingState(orientation: orientation);
}

Side _getOrientation(SideChoice choice) => switch (choice) {
SideChoice.white => Side.white,
SideChoice.black => Side.black,
SideChoice.random => _randomSide(),
};

/// Generate a random side
Side _randomSide() => Side.values[Random().nextInt(Side.values.length)];

/// Generate a random square that is not the same as the [previous] square
Square _randomCoord({Square? previous}) {
while (true) {
Expand Down Expand Up @@ -100,6 +126,8 @@ class CoordinateTrainingState with _$CoordinateTrainingState {
@Default(null) Duration? timeLimit,
@Default(null) Duration? elapsed,
@Default(null) Guess? lastGuess,
required Side orientation,
@Default(null) int? lastScore,
}) = _CoordinateTrainingState;

bool get trainingActive => elapsed != null;
Expand Down
Loading