优化代码

lib/GamePage.dart

@@ -5,14 +5,17 @@ import 'package:flutter/material.dart';
 import 'package:gobang/ai/Ai.dart';
 import 'package:gobang/bridge/ChessShape.dart';
 import 'package:gobang/factory/ThemeFactory.dart';
-import 'package:gobang/factory/UserTheme.dart';
+import 'package:gobang/factory/BlueTheme.dart';
 import 'package:gobang/flyweight/Chess.dart';
 import 'package:gobang/flyweight/ChessFlyweightFactory.dart';
-import 'package:gobang/memorandum/Originator.dart';
+import 'package:gobang/memorandum/Checkerboard.dart';
 import 'package:gobang/state/UserContext.dart';
 import 'package:gobang/utils/TipsDialog.dart';
 import 'package:gobang/viewModel/GameViewModel.dart';
 
+import 'bridge/CircleShape.dart';
+import 'factory/BlackThemeFactory.dart';
+import 'factory/BlueThemeFactory.dart';
 import 'flyweight/Position.dart';
 
 var width = 0.0;
@@ -26,12 +29,12 @@ class GamePage extends StatefulWidget {
 class GamePageState extends State<GamePage> {
   ThemeFactory? _themeFactory;
   GameViewModel _viewModel = GameViewModel.getInstance();
-  Originator _originator = Originator.getInstance();
-  Icon lightOn = Icon(Icons.lightbulb,color: Colors.amberAccent);
+  Checkerboard _originator = Checkerboard.getInstance();
+  Icon lightOn = Icon(Icons.lightbulb, color: Colors.amberAccent);
   Icon lightOff = Icon(Icons.lightbulb_outline_rounded);
   Icon circle = Icon(Icons.circle_outlined);
   Icon rect = Icon(Icons.crop_square);
-  Icon? currentLight,currentShape;
+  Icon? currentLight, currentShape;
 
   @override
   void initState() {
@@ -50,63 +53,13 @@ class GamePageState extends State<GamePage> {
         backgroundColor: _themeFactory!.getTheme().getThemeColor(),
         title: Text("南瓜五子棋"),
         actions: [
-          IconButton(
-              onPressed: () {
-                if (_viewModel.undo()) {
-                  _originator.undo();
-                  Ai.getInstance().init();
-                  for (Position po in _originator.state) {
-                    Ai.getInstance().addChessman(po.dx ~/ (width / 15),
-                        po.dy ~/ (width / 15), po.chess is WhiteChess ? 1 : -1);
-                  }
-                  setState(() {});
-                } else {
-                  TipsDialog.show(context, "提示", "现阶段不能悔棋");
-                }
-              },
-              icon: Icon(Icons.undo)),
-          IconButton(
-              onPressed: () {
-                if(_viewModel.surrender()) {
-                  TipsDialog.showByChoose(
-                      context, "提示", "是否要投降并重新开局？", "是", "否", (value) {
-                    if (value) {
-                      setState(() {
-                        ChessPainter._position = null;
-                        _originator.clean();
-                        _viewModel.reset();
-                        Ai.getInstance().init();
-                      });
-                    }
-                    Navigator.pop(context);
-                  });
-                }else{
-                  TipsDialog.show(context, "提示", "现阶段不能投降");
-                }
-              },
-              icon: Icon(Icons.sports_handball)),
-          IconButton(
-              onPressed: () {
-                TipsDialog.showByChoose(context, "提示", "是否重新开局？","是","否",(value){
-                  if(value){
-                    setState(() {
-                      ChessPainter._position = null;
-                      _originator.clean();
-                      _viewModel.reset();
-                      Ai.getInstance().init();
-                    });
-                  }
-                  Navigator.pop(context);
-                });
-              },
-              icon: Icon(Icons.restart_alt)),
           IconButton(
               onPressed: () {
                 setState(() {
-                  if(_themeFactory is BlackThemeFactory){
+                  if (_themeFactory is BlackThemeFactory) {
                     currentLight = lightOn;
                     _themeFactory = BlueThemeFactory();
-                  }else{
+                  } else {
                     currentLight = lightOff;
                     _themeFactory = BlackThemeFactory();
                   }
@@ -116,7 +69,7 @@ class GamePageState extends State<GamePage> {
           IconButton(
               onPressed: () {
                 setState(() {
-                  if(currentShape == circle){
+                  if (currentShape == circle) {
                     currentShape = rect;
                   } else {
                     currentShape = circle;
@@ -130,13 +83,13 @@ class GamePageState extends State<GamePage> {
         decoration: new BoxDecoration(
             gradient: new LinearGradient(
                 colors: [
-                  _themeFactory!.getTheme().getThemeColor(),
-                  Colors.white,
-                ],
+              _themeFactory!.getTheme().getThemeColor(),
+              Colors.white,
+            ],
                 stops: [
-                  0.0,
-                  1
-                ],
+              0.0,
+              1
+            ],
                 begin: FractionalOffset.topCenter,
                 end: FractionalOffset.bottomCenter,
                 tileMode: TileMode.repeated)),
@@ -148,9 +101,12 @@ class GamePageState extends State<GamePage> {
                   crossAxisAlignment: CrossAxisAlignment.center,
                   mainAxisSize: MainAxisSize.max,
                   children: <Widget>[
-                    Padding (
-                      padding: EdgeInsets.only(top:14,bottom: 30),
-                      child: Text(_viewModel.state,style: TextStyle(color: Colors.white),),
+                    Padding(
+                      padding: EdgeInsets.only(top: 14, bottom: 30),
+                      child: Text(
+                        _viewModel.state,
+                        style: TextStyle(color: Colors.white),
+                      ),
                     ),
                     GestureDetector(
                         onTapDown: (topDownDetails) {
@@ -172,7 +128,76 @@ class GamePageState extends State<GamePage> {
                               painter: ChessPainter(turnAi),
                             )
                           ],
-                        ))
+                        )),
+                    Padding(
+                      padding: const EdgeInsets.only(top: 16.0),
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          IconButton(
+                              onPressed: () {
+                                if (_viewModel.undo()) {
+                                  _originator.undo();
+                                  Ai.getInstance().init();
+                                  for (Position po in _originator.state) {
+                                    Ai.getInstance().addChessman(
+                                        po.dx ~/ (width / 15),
+                                        po.dy ~/ (width / 15),
+                                        po.chess is WhiteChess ? 1 : -1);
+                                  }
+                                  setState(() {});
+                                } else {
+                                  TipsDialog.show(context, "提示", "现阶段不能悔棋");
+                                }
+                              },
+                              icon: Icon(Icons.undo)),
+                          IconButton(
+                              onPressed: () {
+                                if (_viewModel.surrender()) {
+                                  TipsDialog.showByChoose(
+                                      context, "提示", "是否要投降并重新开局？", "是", "否",
+                                      (value) {
+                                    if (value) {
+                                      setState(() {
+                                        ChessPainter._position = null;
+                                        _originator.clean();
+                                        _viewModel.reset();
+                                        Ai.getInstance().init();
+                                      });
+                                    }
+                                    Navigator.pop(context);
+                                  });
+                                } else {
+                                  TipsDialog.show(context, "提示", "现阶段不能投降");
+                                }
+                              },
+                              icon: Icon(
+                                Icons.sports_handball,
+                                color: Colors.deepPurple,
+                              )),
+                          IconButton(
+                              onPressed: () {
+                                TipsDialog.showByChoose(
+                                    context, "提示", "是否重新开局？", "是", "否",
+                                    (value) {
+                                  if (value) {
+                                    setState(() {
+                                      ChessPainter._position = null;
+                                      _originator.clean();
+                                      _viewModel.reset();
+                                      Ai.getInstance().init();
+                                    });
+                                  }
+                                  Navigator.pop(context);
+                                });
+                              },
+                              icon: Icon(
+                                Icons.restart_alt,
+                                color: Colors.indigo,
+                              )),
+                        ],
+                      ),
+                    ),
                   ]),
             ),
           ],
@@ -213,7 +238,7 @@ class ChessPainter extends CustomPainter {
   static int _state = 0;
   static Position? _position;
   final Function _function;
-  Originator _originator = Originator.getInstance();
+  Checkerboard _originator = Checkerboard.getInstance();
 
   ChessPainter(Function f) : _function = f;
 

lib/bridge/ChessShape.dart

@@ -2,16 +2,8 @@ abstract class ChessShape{
   int? _shape;
 
   int get shape => _shape!;
-}
 
-class CircleShape extends ChessShape{
-  CircleShape(){
-    _shape = 1;
-  }
-}
-
-class RectShape extends ChessShape{
-  RectShape(){
-    _shape = 2;
+  set shape(int value) {
+    _shape = value;
   }
 }

lib/bridge/CircleShape.dart

@@ -0,0 +1,7 @@
+import 'ChessShape.dart';
+
+class CircleShape extends ChessShape{
+  CircleShape(){
+    shape = 1;
+  }
+}

lib/bridge/RectShape.dart

@@ -0,0 +1,7 @@
+import 'ChessShape.dart';
+
+class RectShape extends ChessShape{
+  RectShape(){
+    shape = 2;
+  }
+}

lib/factory/BlackTheme.dart

@@ -0,0 +1,10 @@
+import 'package:flutter/material.dart';
+
+import 'Theme.dart' as t;
+
+class BlackTheme extends t.Theme{
+  @override
+  Color getThemeColor() {
+    return Colors.black;
+  }
+}

lib/factory/BlackThemeFactory.dart

@@ -0,0 +1,10 @@
+import 'BlackTheme.dart';
+import 'Theme.dart';
+import 'ThemeFactory.dart';
+
+class BlackThemeFactory extends ThemeFactory{
+  @override
+  Theme getTheme() {
+    return new BlackTheme();
+  }
+}

lib/factory/BlueTheme.dart

@@ -0,0 +1,12 @@
+import 'dart:ui';
+
+import 'package:flutter/material.dart';
+
+import 'Theme.dart' as t;
+
+class BlueTheme extends t.Theme{
+  @override
+  Color getThemeColor() {
+    return Colors.blue;
+  }
+}

lib/factory/BlueThemeFactory.dart

@@ -0,0 +1,10 @@
+import 'BlueTheme.dart';
+import 'Theme.dart';
+import 'ThemeFactory.dart';
+
+class BlueThemeFactory extends ThemeFactory{
+  @override
+  Theme getTheme() {
+    return new BlueTheme();
+  }
+}

lib/factory/ThemeFactory.dart

@@ -1,28 +1,5 @@
-import 'package:gobang/factory/UserTheme.dart';
-
 import 'Theme.dart';
 
-abstract class ThemeFactory{
+abstract class ThemeFactory {
   Theme getTheme();
 }
-
-class YellowThemeFactory extends ThemeFactory{
-  @override
-  Theme getTheme() {
-    return new YellowTheme();
-  }
-}
-
-class BlueThemeFactory extends ThemeFactory{
-  @override
-  Theme getTheme() {
-    return new BlueTheme();
-  }
-}
-
-class BlackThemeFactory extends ThemeFactory{
-  @override
-  Theme getTheme() {
-    return new BlackTheme();
-  }
-}

lib/factory/UserTheme.dart

@@ -1,26 +0,0 @@
-import 'dart:ui';
-
-import 'package:flutter/material.dart';
-
-import 'Theme.dart' as t;
-
-class YellowTheme extends t.Theme{
-  @override
-  Color getThemeColor() {
-    return Colors.amberAccent;
-  }
-}
-
-class BlueTheme extends t.Theme{
-  @override
-  Color getThemeColor() {
-    return Colors.blue;
-  }
-}
-
-class BlackTheme extends t.Theme{
-  @override
-  Color getThemeColor() {
-    return Colors.black;
-  }
-}

lib/memorandum/CareTaker.dart

@@ -3,8 +3,8 @@ import 'Memo.dart';
 class CareTaker{
   List<Memo> mementoList = [];
 
-  void add(Memo state){
-    mementoList.add(state);
+  void add(Memo memo) {
+    mementoList.add(memo);
     if (mementoList.length > 10) {
       mementoList.removeRange(0, 1);
     }
@@ -14,7 +14,7 @@ class CareTaker{
     return mementoList[index];
   }
 
-  Memo getLast(){
+  Memo getLast() {
     Memo memo = mementoList[mementoList.length-3];
     mementoList.removeLast();
     mementoList.removeLast();

lib/memorandum/Originator.dart → lib/memorandum/Checkerboard.dart

@@ -4,15 +4,15 @@ import 'package:gobang/memorandum/CareTaker.dart';
 
 import 'Memo.dart';
 
-class Originator {
+class Checkerboard {
 
-  Originator._();
+  Checkerboard._();
 
-  static Originator? _originator;
+  static Checkerboard? _originator;
 
   static getInstance(){
     if(_originator == null){
-      _originator = Originator._();
+      _originator = Checkerboard._();
     }
     return _originator;
   }

lib/state/State.dart

@@ -4,9 +4,9 @@ abstract class State {
   int _step = 0;
 
   int get step => _step;
-  int _rect = 0;
+  int _reg = 0;
 
-  int get rect => _rect;
+  int get reg => _reg;
   UserContext _userContext;
 
   State(UserContext userContext):_userContext = userContext;
@@ -43,7 +43,7 @@ class StartState extends State {
   play() {
     super.play();
     if(_step >= 4) {
-      _userContext.setState(MidState(_userContext).._step = _step.._rect = _rect);
+      _userContext.setState(MidState(_userContext).._step = _step.._reg = _reg);
     }
   }
 
@@ -54,17 +54,17 @@ class MidState extends State {
   MidState(UserContext userContext) : super(userContext);
 
   @override
-  int get _rect{
-    return super._rect;
+  int get _reg{
+    return super._reg;
   }
 
   // 悔棋只能悔棋三次
   @override
   bool regretChess(){
-    _rect++;
-    if(_rect == 3) {
+    _reg++;
+    if(_reg == 3) {
       print('切换到白热化阶段');
-      _userContext.setState(EndState(_userContext).._step = _step.._rect = _rect);
+      _userContext.setState(EndState(_userContext).._step = _step.._reg = _reg);
     }
     return true;
   }

lib/viewModel/GameViewModel.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:gobang/bridge/ChessShape.dart';
+import 'package:gobang/bridge/CircleShape.dart';
+import 'package:gobang/bridge/RectShape.dart';
 import 'package:gobang/flyweight/Chess.dart';
 import 'package:gobang/flyweight/ChessFlyweightFactory.dart';
 import 'package:gobang/state/State.dart';
@@ -40,7 +42,7 @@ class GameViewModel {
     if(_userContext.state is StartState){
       return "热身阶段,不能悔棋，不能投降";
     } else if(_userContext.state is MidState) {
-      return "入神阶段,可以悔棋且剩余${3 - _userContext.state.rect}次，可以投降";
+      return "入神阶段,可以悔棋且剩余${3 - _userContext.state.reg}次，可以投降";
     } else if(_userContext.state is EndState) {
       return "白热化阶段,悔棋次数已用完，但可以投降";
     }