4 Commits

Author SHA1 Message Date
69a038c84f added firestore to project 2025-01-03 14:38:14 -05:00
ed7ca12753 pre-firebase cleanup 2025-01-03 14:37:11 -05:00
fedfbb3dbc game validation logic bugfix 2024-12-29 23:56:42 -05:00
ef96a6623e supergame ui 2024-12-29 23:56:07 -05:00
7 changed files with 138 additions and 99 deletions

5
.gitignore vendored
View File

@@ -41,3 +41,8 @@ app.*.map.json
/android/app/debug /android/app/debug
/android/app/profile /android/app/profile
/android/app/release /android/app/release
# Firebase
lib/firebase_options.dart
android/app/google-services.json
firebase.json

View File

@@ -1,5 +1,8 @@
plugins { plugins {
id "com.android.application" id "com.android.application"
// START: FlutterFire Configuration
id 'com.google.gms.google-services'
// END: FlutterFire Configuration
id "kotlin-android" id "kotlin-android"
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
id "dev.flutter.flutter-gradle-plugin" id "dev.flutter.flutter-gradle-plugin"

View File

@@ -19,6 +19,9 @@ pluginManagement {
plugins { plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0" id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "8.1.0" apply false id "com.android.application" version "8.1.0" apply false
// START: FlutterFire Configuration
id "com.google.gms.google-services" version "4.3.15" apply false
// END: FlutterFire Configuration
id "org.jetbrains.kotlin.android" version "1.8.22" apply false id "org.jetbrains.kotlin.android" version "1.8.22" apply false
} }

View File

@@ -23,8 +23,8 @@ class _ClassicGameState extends State<ClassicGame> {
TTCState.empty, TTCState.empty,
TTCState.empty, TTCState.empty,
]; ];
bool ended = false; TTCState get winner => Util.checkWin(data);
TTCState? winner; bool get ended => winner != TTCState.empty;
String get turnText => switch (turn) { String get turnText => switch (turn) {
TTCState.empty => "", TTCState.empty => "",
@@ -32,13 +32,7 @@ class _ClassicGameState extends State<ClassicGame> {
TTCState.o => "O", TTCState.o => "O",
}; };
void _nextTurn() { void _nextTurn() => turn = Util.nextTurn(turn);
turn = switch (turn) {
TTCState.x => TTCState.o,
TTCState.o => TTCState.x,
_ => TTCState.x
};
}
Widget _invalidChoiceAlert(TTCState existingValue) { Widget _invalidChoiceAlert(TTCState existingValue) {
return Dialog( return Dialog(
@@ -52,7 +46,7 @@ class _ClassicGameState extends State<ClassicGame> {
"INVALID CHOICE", "INVALID CHOICE",
style: TextStyle(fontWeight: FontWeight.bold), style: TextStyle(fontWeight: FontWeight.bold),
), ),
Text("${existingValue.name.toUpperCase()} already claimed that"), Text("${Util.stateText(existingValue)} already claimed that"),
ElevatedButton( ElevatedButton(
onPressed: () => Navigator.pop(context), onPressed: () => Navigator.pop(context),
child: const Text("Ok")), child: const Text("Ok")),
@@ -80,10 +74,6 @@ class _ClassicGameState extends State<ClassicGame> {
setState(() { setState(() {
data[index] = turn; data[index] = turn;
winner = Util.checkWin(data);
if (winner != null && winner != TTCState.empty) {
ended = true;
}
_nextTurn(); _nextTurn();
}); });
} }
@@ -103,7 +93,7 @@ class _ClassicGameState extends State<ClassicGame> {
"GAME OVER", "GAME OVER",
style: TextStyle(fontWeight: FontWeight.bold), style: TextStyle(fontWeight: FontWeight.bold),
), ),
Text("${winner?.name.toUpperCase()} has already won"), Text("${Util.stateText(winner)} has already won"),
ElevatedButton( ElevatedButton(
onPressed: () => Navigator.pop(context), onPressed: () => Navigator.pop(context),
child: const Text("Ok")), child: const Text("Ok")),
@@ -122,7 +112,7 @@ class _ClassicGameState extends State<ClassicGame> {
const Spacer(flex: 5), const Spacer(flex: 5),
Center( Center(
child: Text( child: Text(
!ended ? "$turnText's turn" : "${winner?.name.toUpperCase()} wins", !ended ? "$turnText's turn" : "${Util.stateText(winner)} wins",
style: const TextStyle(fontSize: 30, fontWeight: FontWeight.bold), style: const TextStyle(fontSize: 30, fontWeight: FontWeight.bold),
)), )),
const Spacer(flex: 1), const Spacer(flex: 1),

View File

@@ -13,47 +13,49 @@ class SuperGame extends StatefulWidget {
class _SuperGameState extends State<SuperGame> { class _SuperGameState extends State<SuperGame> {
TTCState turn = TTCState.x; TTCState turn = TTCState.x;
List<List<TTCState>> data = Util.emptyBoardSuper; List<List<TTCState>> data = Util.emptyBoardSuper;
List<bool> subGameEnded = [
false,
false,
false,
false,
false,
false,
false,
false,
false,
];
List<TTCState> subGameWinners = [ TTCState subGameWinner(int index) => Util.checkWin(data[index]);
TTCState.empty, List<TTCState> get subGameWinners => data.map(Util.checkWin).toList();
TTCState.empty, bool subGameEnded(int i) => subGameWinner(i) != TTCState.empty;
TTCState.empty, TTCState get winner => Util.checkWin(subGameWinners);
TTCState.empty, bool gameEnded() => winner != TTCState.empty;
TTCState.empty,
TTCState.empty,
TTCState.empty,
TTCState.empty,
TTCState.empty,
];
int nextPlay = -1; int nextPlay = -1;
void _swapTurn() { void _swapTurn() => turn = Util.nextTurn(turn);
switch (turn) {
case TTCState.x:
turn = TTCState.o;
break;
case TTCState.o:
turn = TTCState.x;
break;
default:
turn = TTCState.x;
}
}
bool _checkValidChoice(List<TTCState> game, int index) => bool _checkValidChoice(List<TTCState> game, int index) =>
game[index] == TTCState.empty; game[index] == TTCState.empty;
void Function(int) subGameCellOnTapCallback(int subGame) {
return (int i) {
if (!_checkValidChoice(data[subGame], i)) {
showDialog(
context: context,
builder: (context) => AlertDialog(
content: Text("${data[subGame][i].name.toUpperCase()}"
" already claimed "
"[${i % 3}, ${(i / 3).floor()}]"),
actions: [
ElevatedButton(
onPressed: () => Navigator.pop(context),
child: const Text("Close"))
],
));
return;
}
setState(() {
data[subGame][i] = turn;
nextPlay = subGameEnded(i) ? -1 : i;
if (!gameEnded()) {
_swapTurn();
}
});
Navigator.pop(context);
};
}
Widget _subGameDialog(int subGame) { Widget _subGameDialog(int subGame) {
return Dialog( return Dialog(
child: Padding( child: Padding(
@@ -70,31 +72,7 @@ class _SuperGameState extends State<SuperGame> {
), ),
TTCGame( TTCGame(
turn: turn, turn: turn,
cellOnTapCallback: (int i) { cellOnTapCallback: subGameCellOnTapCallback(subGame),
if (!_checkValidChoice(data[subGame], i)) {
showDialog(
context: context,
builder: (context) => AlertDialog(
content:
Text("${data[subGame][i].name.toUpperCase()}"
" already claimed "
"[${i % 3}, ${(i / 3).floor()}]"),
actions: [
ElevatedButton(
onPressed: () => Navigator.pop(context),
child: const Text("Close"))
],
));
return;
}
nextPlay = i;
setState(() {
data[subGame][i] = turn;
_swapTurn();
});
Navigator.pop(context);
},
data: data[subGame], data: data[subGame],
), ),
Padding( Padding(
@@ -116,6 +94,18 @@ class _SuperGameState extends State<SuperGame> {
); );
} }
void endedSubGameNotification(int index) {
ScaffoldMessenger.of(context)
..clearSnackBars()
..showSnackBar(
SnackBar(
content: Text("${Util.stateText(subGameWinner(index))}"
" already won the game at "
"[${Util.cellAddress(index)}]"),
),
);
}
void _showSubGameDialog(int i) { void _showSubGameDialog(int i) {
if (nextPlay == i || nextPlay == -1) { if (nextPlay == i || nextPlay == -1) {
showDialog( showDialog(
@@ -136,21 +126,45 @@ class _SuperGameState extends State<SuperGame> {
} }
} }
@override void _gameEndedReminder() {
Widget build(BuildContext context) { ScaffoldMessenger.of(context)
return Column( ..clearSnackBars()
children: [ ..showSnackBar(
const Spacer(flex: 5), SnackBar(
Center( content: Text("${Util.stateText(winner)} already won the game"),
child: Text( ),
"${Util.stateText(turn)}'s Turn", );
}
void _cellOnTapCallback(int index) {
if (subGameEnded(index)) {
endedSubGameNotification(index);
return;
} else if (gameEnded()) {
_gameEndedReminder();
return;
}
_showSubGameDialog(index);
}
Widget _turnText() => Text(
gameEnded()
? "${Util.stateText(winner)} Wins"
: "${Util.stateText(turn)}'s Turn",
style: const TextStyle(fontSize: 25), style: const TextStyle(fontSize: 25),
), );
),
const Spacer(flex: 1), Widget _subGmaeWidget(int i) {
GameHash( if (subGameEnded(i)) {
cellOnTapCallback: _showSubGameDialog, return Text(
children: Iterable.generate(data.length) subGameWinner(i).name.toUpperCase(),
style: const TextStyle(fontSize: 40),
);
}
return TTCGame(turn: turn, data: data[i]);
}
List<Widget> _generateCells() => Iterable.generate(data.length)
.map( .map(
(i) => DecoratedBox( (i) => DecoratedBox(
decoration: BoxDecoration( decoration: BoxDecoration(
@@ -158,14 +172,25 @@ class _SuperGameState extends State<SuperGame> {
), ),
child: Padding( child: Padding(
padding: const EdgeInsets.all(15), padding: const EdgeInsets.all(15),
child: TTCGame( child: _subGmaeWidget(i),
turn: turn,
data: data[i],
),
), ),
), ),
) )
.toList()), .toList();
@override
Widget build(BuildContext context) {
return Column(
children: [
const Spacer(flex: 5),
Center(
child: _turnText(),
),
const Spacer(flex: 1),
GameHash(
cellOnTapCallback: _cellOnTapCallback,
children: _generateCells(),
),
const Spacer(flex: 5), const Spacer(flex: 5),
], ],
); );

View File

@@ -25,10 +25,24 @@ class Util {
emptyBoardClassic, emptyBoardClassic,
]; ];
static TTCState nextTurn(TTCState currentPlayer,
{TTCState defaultState = TTCState.x}) {
switch (currentPlayer) {
case TTCState.x:
return TTCState.o;
case TTCState.o:
return TTCState.x;
default:
return defaultState;
}
}
static String stateText(TTCState state) => state.name.toUpperCase(); static String stateText(TTCState state) => state.name.toUpperCase();
static String cellAddress(int index) =>
"${index % 3}, ${(index / 3).floor()}";
static Iterable<TTCState> getRow(int index, List<TTCState> data) => static Iterable<TTCState> getRow(int index, List<TTCState> data) =>
data.getRange(index, index + 3); data.getRange(index * 3, index * 3 + 3);
static Iterable<TTCState> getCol(int index, List<TTCState> data) => [ static Iterable<TTCState> getCol(int index, List<TTCState> data) => [
data[index], data[index],
data[index + 3], data[index + 3],
@@ -38,7 +52,7 @@ class Util {
if (index == 0) { if (index == 0) {
return [data[0], data[4], data[8]]; return [data[0], data[4], data[8]];
} }
return [data[3], data[4], data[6]]; return [data[2], data[4], data[6]];
} }
static TTCState checkRow(Iterable<TTCState> row) => static TTCState checkRow(Iterable<TTCState> row) =>

1
todo
View File

@@ -1,2 +1 @@
- ui for super game
- firebase for multiplayer game - firebase for multiplayer game