lib/classic.dart

@@ -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),

lib/super.dart

@@ -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)}]"),
         ),
@@ -149,6 +182,10 @@ class _SuperGameState extends State<SuperGame> {
 
   @override
   Widget build(BuildContext context) {
+    Iterable.generate(subGameWinners.length)
+        .map((i) => subGameEnded(i))
+        .forEach(print);
+
     return Column(
       children: [
         const Spacer(flex: 5),
@@ -177,7 +214,7 @@ class _SuperGameState extends State<SuperGame> {
                               data: data[i],
                             )
                           : Text(
-                              subGameWinner(i).name.toUpperCase(),
+                              subGameWinners[i].name.toUpperCase(),
                               style: const TextStyle(fontSize: 40),
                             ),
                     ),

lib/util.dart

@@ -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()}";