Skip to content
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

Jump to bottom

Non visual game screen #31

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
+383 −75
Draft

Non visual game screen #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eaa0d42
Start wip on non visual ui
370417 Jan 18, 2023
decdb94
Improve regexp legibility
370417 Jan 18, 2023
46a2128
Add non visual game board to game screen
370417 Jan 18, 2023
9d7b2b2
Implement m (possible moves) nvui command
370417 Jan 23, 2023
4fc5204
Refactor to simplify nvui command handling
370417 Jan 23, 2023
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
168 changes: 93 additions & 75 deletions lib/src/features/game/ui/board/playable_game_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import 'package:lichess_mobile/src/common/lichess_icons.dart';
import 'package:lichess_mobile/src/utils/chessground_compat.dart';
import 'package:lichess_mobile/src/utils/async_value.dart';
import 'package:lichess_mobile/src/widgets/game_board_layout.dart';
import 'package:lichess_mobile/src/widgets/non_visual_game_board.dart';
import 'package:lichess_mobile/src/widgets/platform.dart';
import 'package:lichess_mobile/src/widgets/feedback.dart';
import 'package:lichess_mobile/src/widgets/player.dart';
Expand Down Expand Up @@ -169,88 +170,105 @@ class _BoardBody extends ConsumerWidget {
final isBoardTurned = ref.watch(isBoardTurnedProvider);
final isReplaying =
gameState != null && positionCursor < gameState.positionIndex;
final mediaQuery = MediaQuery.of(context);

return gameClockStream.when(
data: (clock) {
final black = Player(
key: const ValueKey('black-player'),
name: game.black.name,
rating: game.black.rating,
title: game.black.title,
active: gameState != null &&
gameState.status == GameStatus.started &&
gameState.position.fullmoves > 1 &&
gameState.position.turn == Side.black,
clock: clock.blackTime,
);
final white = Player(
key: const ValueKey('white-player'),
name: game.white.name,
rating: game.white.rating,
title: game.white.title,
active: gameState != null &&
gameState.status == GameStatus.started &&
gameState.position.fullmoves > 1 &&
gameState.position.turn == Side.white,
clock: clock.whiteTime,
);
final topPlayer = game.orientation == Side.white ? black : white;
final bottomPlayer = game.orientation == Side.white ? white : black;
if (mediaQuery.accessibleNavigation) {
return NonVisualGameBoard(
gameState: gameState,
onMove: (Move move) =>
ref.read(gameStateProvider.notifier).onUserMove(game.id, move),
);
} else {
final black = Player(
key: const ValueKey('black-player'),
name: game.black.name,
rating: game.black.rating,
title: game.black.title,
active: gameState != null &&
gameState.status == GameStatus.started &&
gameState.position.fullmoves > 1 &&
gameState.position.turn == Side.black,
clock: clock.blackTime,
);
final white = Player(
key: const ValueKey('white-player'),
name: game.white.name,
rating: game.white.rating,
title: game.white.title,
active: gameState != null &&
gameState.status == GameStatus.started &&
gameState.position.fullmoves > 1 &&
gameState.position.turn == Side.white,
clock: clock.whiteTime,
);
final topPlayer = game.orientation == Side.white ? black : white;
final bottomPlayer = game.orientation == Side.white ? white : black;

return GameBoardLayout(
boardData: cg.BoardData(
interactableSide:
gameState == null || !gameState.playing || isReplaying
? cg.InteractableSide.none
: game.orientation == Side.white
? cg.InteractableSide.white
: cg.InteractableSide.black,
orientation:
(isBoardTurned ? game.orientation.opposite : game.orientation)
.cg,
fen: gameState?.positions[positionCursor].fen ?? game.initialFen,
validMoves: gameState?.validMoves,
lastMove: gameState != null && gameState.gameOver
? positionCursor > 0
? gameState.moveAtPly(positionCursor - 1)?.cg
: null
: gameState?.lastMove?.cg,
sideToMove: gameState?.position.turn.cg ?? game.orientation.cg,
onMove: (cg.Move move, {bool? isPremove}) => ref
.read(gameStateProvider.notifier)
.onUserMove(game.id, Move.fromUci(move.uci)!),
),
topPlayer: topPlayer,
bottomPlayer: bottomPlayer,
moves: gameState?.sanMoves,
currentMoveIndex: positionCursor,
);
return GameBoardLayout(
boardData: cg.BoardData(
interactableSide:
gameState == null || !gameState.playing || isReplaying
? cg.InteractableSide.none
: game.orientation == Side.white
? cg.InteractableSide.white
: cg.InteractableSide.black,
orientation:
(isBoardTurned ? game.orientation.opposite : game.orientation)
.cg,
fen: gameState?.positions[positionCursor].fen ?? game.initialFen,
validMoves: gameState?.validMoves,
lastMove: gameState != null && gameState.gameOver
? positionCursor > 0
? gameState.moveAtPly(positionCursor - 1)?.cg
: null
: gameState?.lastMove?.cg,
sideToMove: gameState?.position.turn.cg ?? game.orientation.cg,
onMove: (cg.Move move, {bool? isPremove}) => ref
.read(gameStateProvider.notifier)
.onUserMove(game.id, Move.fromUci(move.uci)!),
),
topPlayer: topPlayer,
bottomPlayer: bottomPlayer,
moves: gameState?.sanMoves,
currentMoveIndex: positionCursor,
);
}
},
loading: () {
final player = Player(
name: game.player.name,
rating: game.player.rating,
title: game.player.title,
active: false,
clock: Duration.zero,
);
final opponent = Player(
name: game.opponent.name,
rating: game.opponent.rating,
title: game.opponent.title,
active: false,
clock: Duration.zero,
);
if (mediaQuery.accessibleNavigation) {
return NonVisualGameBoard(
gameState: null,
onMove: (move) {},
isLoading: true,
);
} else {
final player = Player(
name: game.player.name,
rating: game.player.rating,
title: game.player.title,
active: false,
clock: Duration.zero,
);
final opponent = Player(
name: game.opponent.name,
rating: game.opponent.rating,
title: game.opponent.title,
active: false,
clock: Duration.zero,
);

return GameBoardLayout(
topPlayer: opponent,
bottomPlayer: player,
boardData: cg.BoardData(
interactableSide: cg.InteractableSide.none,
orientation: game.orientation.cg,
fen: game.initialFen,
),
);
return GameBoardLayout(
topPlayer: opponent,
bottomPlayer: player,
boardData: cg.BoardData(
interactableSide: cg.InteractableSide.none,
orientation: game.orientation.cg,
fen: game.initialFen,
),
);
}
},
error: (err, stackTrace) {
debugPrint(
Expand Down
Loading