cleanup of super game rendering

lib/classic.dart

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

lib/super.dart

@@ -13,47 +13,16 @@ class SuperGame extends StatefulWidget {
 class _SuperGameState extends State<SuperGame> {
   TTCState turn = TTCState.x;
   List<List<TTCState>> data = Util.emptyBoardSuper;
-  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;
+  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);
+  bool gameEnded() => winner != TTCState.empty;
 
   int nextPlay = -1;
 
-  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;
-  }
+  void _swapTurn() => turn = Util.nextTurn(turn);
 
   bool _checkValidChoice(List<TTCState> game, int index) =>
       game[index] == TTCState.empty;
@@ -78,8 +47,6 @@ class _SuperGameState extends State<SuperGame> {
 
       setState(() {
         data[subGame][i] = turn;
-        _validateSubGame(subGame);
-        _validateGame();
         nextPlay = subGameEnded(i) ? -1 : i;
         if (!gameEnded()) {
           _swapTurn();
@@ -132,7 +99,7 @@ class _SuperGameState extends State<SuperGame> {
       ..clearSnackBars()
       ..showSnackBar(
         SnackBar(
-          content: Text("${Util.stateText(subGameWinners[index])}"
+          content: Text("${Util.stateText(subGameWinner(index))}"
               " already won the game at "
               "[${Util.cellAddress(index)}]"),
         ),
@@ -182,10 +149,6 @@ 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),
@@ -214,7 +177,7 @@ class _SuperGameState extends State<SuperGame> {
                               data: data[i],
                             )
                           : Text(
-                              subGameWinners[i].name.toUpperCase(),
+                              subGameWinner(i).name.toUpperCase(),
                               style: const TextStyle(fontSize: 40),
                             ),
                     ),

lib/util.dart

@@ -25,6 +25,18 @@ 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()}";