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

第4章の修正 #11

Merged
merged 2 commits into from
Oct 21, 2023
+105 −63
Merged

第4章の修正 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c1ced7
feat: ロジックを最新版に変更
okaryo Oct 9, 2023
5801d77
modify: StateNotifierProviderを、最初のProviderとしては適切なStateProviderに書き換え
okaryo Oct 9, 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
9 changes: 9 additions & 0 deletions lib/model/players.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
class Players {
final String playerX;
final String playerO;

Players({
required this.playerX,
required this.playerO,
});
}
74 changes: 59 additions & 15 deletions lib/model/tic_tac_toe.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,68 @@
import 'package:tic_tac_toe_handson/model/players.dart';

class TicTacToe {
final List<List<String>> board;
final Players players;
final String currentPlayer;

factory TicTacToe.start() {
return TicTacToe._([
['', '', ''],
['', '', ''],
['', '', ''],
], 'X');
factory TicTacToe.start({
playerX = 'X',
playerO = 'O',
}) {
final players = Players(
playerX: playerX,
playerO: playerO,
);

return TicTacToe(
[
['', '', ''],
['', '', ''],
['', '', ''],
],
players,
players.playerX,
);
}

TicTacToe._(this.board, this.currentPlayer);
TicTacToe(this.board, this.players, this.currentPlayer);

factory TicTacToe.fromJson(Map<String, dynamic> json) {
final flatBoard = List<String>.from(json['board']);

return TicTacToe(
[
List<String>.from(flatBoard.sublist(0, 3)),
List<String>.from(flatBoard.sublist(3, 6)),
List<String>.from(flatBoard.sublist(6, 9)),
],
Players(
playerX: json['players']['playerX'],
playerO: json['players']['playerO'],
),
json['currentPlayer'],
);
}

Map<String, dynamic> toJson() {
return {
// Firestoreではネストした配列を扱えないため、1次元配列に変換する
'board': [...board[0], ...board[1], ...board[2]],
'players': {
'playerX': players.playerX,
'playerO': players.playerO,
},
'currentPlayer': currentPlayer,
};
}

TicTacToe placeMark(int row, int col) {
if (board[row][col].isEmpty) {
final newBoard = List.of(board);
newBoard[row][col] = currentPlayer;
String nextPlayer = currentPlayer == 'X' ? 'O' : 'X';
newBoard[row][col] = currentPlayer == players.playerX ? 'X' : 'O';
String nextPlayer = currentPlayer == players.playerX ? players.playerO : players.playerX;

return TicTacToe._(newBoard, nextPlayer);
return TicTacToe(newBoard, players, nextPlayer);
}
return this;
}
Expand All @@ -27,20 +71,20 @@ class TicTacToe {
for (int i = 0; i < 3; i++) {
// row = i における横の判定
if (board[i][0] == board[i][1] && board[i][1] == board[i][2] && board[i][0].isNotEmpty) {
return board[i][0];
return board[i][0] == 'X' ? players.playerX : players.playerO;
}
// col = i における縦の判定
if (board[0][i] == board[1][i] && board[1][i] == board[2][i] && board[0][i].isNotEmpty) {
return board[0][i];
return board[0][i] == 'X' ? players.playerX : players.playerO;
}
}
// 左上から右下への斜めの判定
if (board[0][0] == board[1][1] && board[1][1] == board[2][2] && board[0][0].isNotEmpty) {
return board[0][0];
return board[0][0] == 'X' ? players.playerX : players.playerO;
}
// 右上から左下への斜めの判定
if (board[0][2] == board[1][1] && board[1][1] == board[2][0] && board[0][2].isNotEmpty) {
return board[0][2];
return board[0][2] == 'X' ? players.playerX : players.playerO;
}
return '';
}
Expand All @@ -50,6 +94,6 @@ class TicTacToe {
}

TicTacToe resetBoard() {
return TicTacToe.start();
return TicTacToe.start(playerX: players.playerX, playerO: players.playerO);
}
}
16 changes: 2 additions & 14 deletions lib/provider/tic_tac_toe_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,6 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:tic_tac_toe_handson/model/tic_tac_toe.dart';

final ticTacToeProvider = StateNotifierProvider.autoDispose<TicTacToeProvider, TicTacToe>((ref) {
return TicTacToeProvider();
final ticTacToeProvider = StateProvider.autoDispose<TicTacToe>((ref) {
return TicTacToe.start();
});

class TicTacToeProvider extends StateNotifier<TicTacToe> {
TicTacToeProvider() : super(TicTacToe.start());

placeMark(int row, int col) {
state = state.placeMark(row, col);
}

resetBoard() {
state = state.resetBoard();
}
}
7 changes: 4 additions & 3 deletions lib/view/board.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ class Board extends ConsumerWidget {

return Padding(
padding: const EdgeInsets.all(16),
child: SingleChildScrollView(child: Column(
child: SingleChildScrollView(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expand All @@ -38,7 +39,7 @@ class Board extends ConsumerWidget {
onTap: () {
final winner = ticTacToe.getWinner();
if (mark.isEmpty && winner.isEmpty) {
ref.read(ticTacToeProvider.notifier).placeMark(row, col);
ref.read(ticTacToeProvider.notifier).state = ticTacToe.placeMark(row, col);
}
},
child: Container(
Expand All @@ -60,7 +61,7 @@ class Board extends ConsumerWidget {
width: double.infinity,
child: ElevatedButton(
onPressed: () {
ref.read(ticTacToeProvider.notifier).resetBoard();
ref.read(ticTacToeProvider.notifier).state = ticTacToe.resetBoard();
},
child: const Text('ゲームをリセット'),
),
Expand Down
22 changes: 11 additions & 11 deletions test/place_mark_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_test/flutter_test.dart';

import 'package:tic_tac_toe_handson/model/tic_tac_toe.dart';
import 'package:tic_tac_toe_handson/provider/tic_tac_toe_provider.dart';

void main() {
late TicTacToeProvider target;
late StateController<TicTacToe> target;

setUp(() {
final container = ProviderContainer();
Expand All @@ -17,7 +17,7 @@ void main() {
['', '', ''],
['', '', ''],
]);
target.placeMark(0, 0);
target.state = target.state.placeMark(0, 0);
expect(target.state.board, [
['X', '', ''],
['', '', ''],
Expand All @@ -31,7 +31,7 @@ void main() {
['', '', ''],
['', '', ''],
]);
target.placeMark(0, 1);
target.state = target.state.placeMark(0, 1);
expect(target.state.board, [
['', 'X', ''],
['', '', ''],
Expand All @@ -45,7 +45,7 @@ void main() {
['', '', ''],
['', '', ''],
]);
target.placeMark(0, 2);
target.state = target.state.placeMark(0, 2);
expect(target.state.board, [
['', '', 'X'],
['', '', ''],
Expand All @@ -59,7 +59,7 @@ void main() {
['', '', ''],
['', '', ''],
]);
target.placeMark(1, 0);
target.state = target.state.placeMark(1, 0);
expect(target.state.board, [
['', '', ''],
['X', '', ''],
Expand All @@ -73,7 +73,7 @@ void main() {
['', '', ''],
['', '', ''],
]);
target.placeMark(1, 1);
target.state = target.state.placeMark(1, 1);
expect(target.state.board, [
['', '', ''],
['', 'X', ''],
Expand All @@ -87,7 +87,7 @@ void main() {
['', '', ''],
['', '', ''],
]);
target.placeMark(1, 2);
target.state = target.state.placeMark(1, 2);
expect(target.state.board, [
['', '', ''],
['', '', 'X'],
Expand All @@ -101,7 +101,7 @@ void main() {
['', '', ''],
['', '', ''],
]);
target.placeMark(2, 0);
target.state = target.state.placeMark(2, 0);
expect(target.state.board, [
['', '', ''],
['', '', ''],
Expand All @@ -115,7 +115,7 @@ void main() {
['', '', ''],
['', '', ''],
]);
target.placeMark(2, 1);
target.state = target.state.placeMark(2, 1);
expect(target.state.board, [
['', '', ''],
['', '', ''],
Expand All @@ -129,7 +129,7 @@ void main() {
['', '', ''],
['', '', ''],
]);
target.placeMark(2, 2);
target.state = target.state.placeMark(2, 2);
expect(target.state.board, [
['', '', ''],
['', '', ''],
Expand Down
Loading
Loading