Compare commits

..

No commits in common. "astoica/firebase-classic" and "main" have entirely different histories.

6 changed files with 88 additions and 71 deletions

5
.gitignore vendored
View File

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

View File

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

View File

@ -19,9 +19,6 @@ pluginManagement {
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
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
}

View File

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

View File

@ -13,16 +13,47 @@ class SuperGame extends StatefulWidget {
class _SuperGameState extends State<SuperGame> {
TTCState turn = TTCState.x;
List<List<TTCState>> data = Util.emptyBoardSuper;
TTCState subGameWinner(int index) => Util.checkWin(data[index]);
List<TTCState> get subGameWinners => data.map(Util.checkWin).toList();
bool subGameEnded(int i) => subGameWinner(i) != TTCState.empty;
TTCState get winner => Util.checkWin(subGameWinners);
TTCState winner = TTCState.empty;
bool gameEnded() => winner != TTCState.empty;
List<TTCState> subGameWinners = [
TTCState.empty,
TTCState.empty,
TTCState.empty,
TTCState.empty,
TTCState.empty,
TTCState.empty,
TTCState.empty,
TTCState.empty,
TTCState.empty,
];
bool subGameEnded(int i) => subGameWinners[i] != TTCState.empty;
int nextPlay = -1;
void _swapTurn() => turn = Util.nextTurn(turn);
void _swapTurn() {
switch (turn) {
case TTCState.x:
turn = TTCState.o;
break;
case TTCState.o:
turn = TTCState.x;
break;
default:
turn = TTCState.x;
}
}
TTCState _validateSubGame(int index) {
subGameWinners[index] = Util.checkWin(data[index]);
print("validated $index");
return subGameWinners[index];
}
TTCState _validateGame() {
winner = Util.checkWin(subGameWinners);
return winner;
}
bool _checkValidChoice(List<TTCState> game, int index) =>
game[index] == TTCState.empty;
@ -47,6 +78,8 @@ class _SuperGameState extends State<SuperGame> {
setState(() {
data[subGame][i] = turn;
_validateSubGame(subGame);
_validateGame();
nextPlay = subGameEnded(i) ? -1 : i;
if (!gameEnded()) {
_swapTurn();
@ -99,7 +132,7 @@ class _SuperGameState extends State<SuperGame> {
..clearSnackBars()
..showSnackBar(
SnackBar(
content: Text("${Util.stateText(subGameWinner(index))}"
content: Text("${Util.stateText(subGameWinners[index])}"
" already won the game at "
"[${Util.cellAddress(index)}]"),
),
@ -147,50 +180,47 @@ class _SuperGameState extends State<SuperGame> {
_showSubGameDialog(index);
}
Widget _turnText() => Text(
gameEnded()
? "${Util.stateText(winner)} Wins"
: "${Util.stateText(turn)}'s Turn",
style: const TextStyle(fontSize: 25),
);
Widget _subGmaeWidget(int i) {
if (subGameEnded(i)) {
return Text(
subGameWinner(i).name.toUpperCase(),
style: const TextStyle(fontSize: 40),
);
}
return TTCGame(turn: turn, data: data[i]);
}
List<Widget> _generateCells() => Iterable.generate(data.length)
.map(
(i) => DecoratedBox(
decoration: BoxDecoration(
color: nextPlay == i ? Colors.lightGreenAccent : null,
),
child: Padding(
padding: const EdgeInsets.all(15),
child: _subGmaeWidget(i),
),
),
)
.toList();
@override
Widget build(BuildContext context) {
Iterable.generate(subGameWinners.length)
.map((i) => subGameEnded(i))
.forEach(print);
return Column(
children: [
const Spacer(flex: 5),
Center(
child: _turnText(),
child: Text(
gameEnded()
? "${Util.stateText(winner)} Wins"
: "${Util.stateText(turn)}'s Turn",
style: const TextStyle(fontSize: 25),
),
),
const Spacer(flex: 1),
GameHash(
cellOnTapCallback: _cellOnTapCallback,
children: _generateCells(),
),
cellOnTapCallback: _cellOnTapCallback,
children: Iterable.generate(data.length)
.map(
(i) => DecoratedBox(
decoration: BoxDecoration(
color: nextPlay == i ? Colors.lightGreenAccent : null,
),
child: Padding(
padding: const EdgeInsets.all(15),
child: !subGameEnded(i)
? TTCGame(
turn: turn,
data: data[i],
)
: Text(
subGameWinners[i].name.toUpperCase(),
style: const TextStyle(fontSize: 40),
),
),
),
)
.toList()),
const Spacer(flex: 5),
],
);

View File

@ -25,18 +25,6 @@ class Util {
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 cellAddress(int index) =>
"${index % 3}, ${(index / 3).floor()}";