validate subgame

lib/super.dart

@@ -13,8 +13,6 @@ 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,
@@ -46,15 +44,9 @@ class _SuperGameState extends State<SuperGame> {
 
   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;
 
@@ -76,14 +68,11 @@ class _SuperGameState extends State<SuperGame> {
         return;
       }
 
+      nextPlay = subGameEnded(i) ? -1 : i;
       setState(() {
         data[subGame][i] = turn;
         _validateSubGame(subGame);
-        _validateGame();
-        nextPlay = subGameEnded(i) ? -1 : i;
-        if (!gameEnded()) {
         _swapTurn();
-        }
       });
       Navigator.pop(context);
     };
@@ -159,27 +148,6 @@ class _SuperGameState extends State<SuperGame> {
     }
   }
 
-  void _gameEndedReminder() {
-    ScaffoldMessenger.of(context)
-      ..clearSnackBars()
-      ..showSnackBar(
-        SnackBar(
-          content: Text("${Util.stateText(winner)} already won the game"),
-        ),
-      );
-  }
-
-  void _cellOnTapCallback(int index) {
-    if (subGameEnded(index)) {
-      endedSubGameNotification(index);
-      return;
-    } else if (gameEnded()) {
-      _gameEndedReminder();
-      return;
-    }
-    _showSubGameDialog(index);
-  }
-
   @override
   Widget build(BuildContext context) {
     Iterable.generate(subGameWinners.length)
@@ -191,15 +159,15 @@ class _SuperGameState extends State<SuperGame> {
         const Spacer(flex: 5),
         Center(
           child: Text(
-            gameEnded()
-                ? "${Util.stateText(winner)} Wins"
-                : "${Util.stateText(turn)}'s Turn",
+            "${Util.stateText(turn)}'s Turn",
             style: const TextStyle(fontSize: 25),
           ),
         ),
         const Spacer(flex: 1),
         GameHash(
-            cellOnTapCallback: _cellOnTapCallback,
+            cellOnTapCallback: (i) => subGameEnded(i)
+                ? endedSubGameNotification(i)
+                : _showSubGameDialog(i),
             children: Iterable.generate(data.length)
                 .map(
                   (i) => DecoratedBox(

lib/util.dart

@@ -30,7 +30,7 @@ class Util {
       "${index % 3}, ${(index / 3).floor()}";
 
   static Iterable<TTCState> getRow(int index, List<TTCState> data) =>
-      data.getRange(index * 3, index * 3 + 3);
+      data.getRange(index, index + 3);
   static Iterable<TTCState> getCol(int index, List<TTCState> data) => [
         data[index],
         data[index + 3],
@@ -40,7 +40,7 @@ class Util {
     if (index == 0) {
       return [data[0], data[4], data[8]];
     }
-    return [data[2], data[4], data[6]];
+    return [data[3], data[4], data[6]];
   }
 
   static TTCState checkRow(Iterable<TTCState> row) =>

todo

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