coloring wip

.gitignore

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

android/app/build.gradle

@@ -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"

android/settings.gradle

@@ -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
 }
 

lib/classic.dart

@@ -23,8 +23,8 @@ class _ClassicGameState extends State<ClassicGame> {
     TTCState.empty,
     TTCState.empty,
   ];
-  TTCState get winner => Util.checkWin(data);
+  bool ended = false;
-  bool get ended => winner != TTCState.empty;
+  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,47 +13,42 @@ class SuperGame extends StatefulWidget {
 class _SuperGameState extends State<SuperGame> {
   TTCState turn = TTCState.x;
   List<List<TTCState>> data = Util.emptyBoardSuper;
+  List<bool> subGameEnded = [
+    false,
+    false,
+    false,
+    false,
+    false,
+    false,
+    false,
+    false,
+    false,
+  ];
 
-  TTCState subGameWinner(int index) => Util.checkWin(data[index]);
+  List<TTCState> subGameWinners = [
-  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,
+    TTCState.empty,
+  ];
   int nextPlay = -1;
 
-  void _swapTurn() => turn = Util.nextTurn(turn);
+  void _swapTurn() {
-
+    switch (turn) {
-  bool _checkValidChoice(List<TTCState> game, int index) =>
+      case TTCState.x:
-      game[index] == TTCState.empty;
+        turn = TTCState.o;
-
+        break;
-  void Function(int) subGameCellOnTapCallback(int subGame) {
+      case TTCState.o:
-    return (int i) {
+        turn = TTCState.x;
-      if (!_checkValidChoice(data[subGame], i)) {
+        break;
-        showDialog(
+      default:
-            context: context,
+        turn = TTCState.x;
-            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) {
@@ -63,30 +58,31 @@ class _SuperGameState extends State<SuperGame> {
         child: Column(
           mainAxisSize: MainAxisSize.min,
           children: [
-            Padding(
+            Text(
-              padding: const EdgeInsets.only(bottom: 5),
+              "${Util.stateText(turn)} select cell",
-              child: Text(
+              style: const TextStyle(fontWeight: FontWeight.bold),
-                "${Util.stateText(turn)} select cell",
-                style: const TextStyle(fontWeight: FontWeight.bold),
-              ),
             ),
             TTCGame(
               turn: turn,
-              cellOnTapCallback: subGameCellOnTapCallback(subGame),
+              cellOnTapCallback: (int i) {
+                nextPlay = i;
+                setState(() {
+                  data[subGame][i] = turn;
+                  _swapTurn();
+                });
+                Navigator.pop(context);
+              },
               data: data[subGame],
             ),
-            Padding(
+            Row(
-              padding: const EdgeInsets.only(top: 5),
+              mainAxisAlignment: MainAxisAlignment.end,
-              child: Row(
+              children: [
-                mainAxisAlignment: MainAxisAlignment.end,
+                ElevatedButton(
-                children: [
+                    onPressed: () {
-                  ElevatedButton(
+                      Navigator.pop(context);
-                      onPressed: () {
+                    },
-                        Navigator.pop(context);
+                    child: const Text("Close"))
-                      },
+              ],
-                      child: const Text("Close"))
-                ],
-              ),
             ),
           ],
         ),
@@ -94,18 +90,6 @@ 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) {
     if (nextPlay == i || nextPlay == -1) {
       showDialog(
@@ -126,71 +110,36 @@ 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);
-  }
-
-  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) {
     return Column(
       children: [
         const Spacer(flex: 5),
         Center(
-          child: _turnText(),
+          child: Text(
+            "${Util.stateText(turn)}'s Turn",
+            style: const TextStyle(fontSize: 25),
+          ),
         ),
         const Spacer(flex: 1),
         GameHash(
-          cellOnTapCallback: _cellOnTapCallback,
+            cellOnTapCallback: _showSubGameDialog,
-          children: _generateCells(),
+            children: Iterable.generate(data.length)
-        ),
+                .map(
+                  (i) => DecoratedBox(
+                    decoration: BoxDecoration(
+                      color: nextPlay == i ? Colors.lightGreenAccent : null,
+                    ),
+                    child: Padding(
+                      padding: const EdgeInsets.all(15),
+                      child: TTCGame(
+                        turn: turn,
+                        data: data[i],
+                      ),
+                    ),
+                  ),
+                )
+                .toList()),
         const Spacer(flex: 5),
       ],
     );

lib/util.dart

@@ -25,24 +25,10 @@ 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()}";
 
   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],
@@ -52,7 +38,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