diff --git a/.vscode/launch.json b/.vscode/launch.json index 8985a2d..b9684c9 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,5 +10,11 @@ "request": "launch", "program": "lib/main.dart" }, + { + "name": "Flutter: Run all Tests", + "type": "dart", + "request": "launch", + "program": "./test/testCommand.dart" + } ] } \ No newline at end of file diff --git a/lib/src/command/matrix.dart b/lib/src/command/matrix.dart index be6310b..997a72e 100644 --- a/lib/src/command/matrix.dart +++ b/lib/src/command/matrix.dart @@ -15,9 +15,11 @@ class MatrixUtil { buffer.write(' '); buffer.write(d.toStringAsFixed(SettingData.fixedNum.round()) + ' '); } - buffer.write("\n"); + buffer.write("\n\n"); } - return buffer.toString(); + var result = buffer.toString(); + result = result.substring(0,result.length - 2); + return result; } ///矩阵复制 @@ -248,7 +250,7 @@ class MatrixUtil { static List> upperTriangular(List> list) { //(n-1)!*2n (n-1)!n var newlist = copyMatrix(list); //拷贝出一个新矩阵 - var divisor = new List(list.length); //记录对角线下的每一行的倍数 + var divisor = new List(list.length); //用于记录对角线下的每一行的倍数 for (int i = 0; i < newlist.length; i++) { if (newlist[i][i] == 0) { //如果该对角线上的元素为零,将最近的不为零的一行换上来 diff --git a/lib/src/view/route/equationRoute.dart b/lib/src/view/route/equationRoute.dart index df11533..46b0e96 100644 --- a/lib/src/view/route/equationRoute.dart +++ b/lib/src/view/route/equationRoute.dart @@ -16,9 +16,7 @@ class EquationRoute extends StatefulWidget { class _EquationRouteState extends State with TickerProviderStateMixin { final TextEditingController _lineQuasController = TextEditingController(); - final TextEditingController _varController = TextEditingController(); final FocusNode _lineQuasFocusNode = new FocusNode(); - final FocusNode _varFocusNode = new FocusNode(); AnimationController controller; Animation animation; String result = ''; @@ -41,35 +39,29 @@ class _EquationRouteState extends State mainAxisAlignment: MainAxisAlignment.center, children: [ Text(XiaomingLocalizations.of(context).equationTip), - SizedBox(height: 50.0,), - Container( - padding: const EdgeInsets.symmetric(vertical: 20.0, horizontal: 40.0), - child: CupertinoTextField( - clearButtonMode: OverlayVisibilityMode.editing, - focusNode: _lineQuasFocusNode, - controller: _lineQuasController, - textCapitalization: TextCapitalization.words, - decoration: BoxDecoration( - border: Border( - bottom: - BorderSide(width: 0.0, color: CupertinoColors.black)), - ), - placeholder: 'Equation', - ), + SizedBox( + height: 50.0, ), Container( - padding: EdgeInsets.symmetric(vertical: 20.0, horizontal: 40.0), - child: CupertinoTextField( - clearButtonMode: OverlayVisibilityMode.editing, - focusNode: _varFocusNode, - controller: _varController, - textCapitalization: TextCapitalization.words, - decoration: BoxDecoration( - border: Border( - bottom: - BorderSide(width: 0.0, color: CupertinoColors.black)), + padding: + const EdgeInsets.symmetric(vertical: 20.0, horizontal: 40.0), + child: Card( + elevation: 0.0, + child: Container( + padding: const EdgeInsets.all(10.0), + child: CupertinoTextField( + clearButtonMode: OverlayVisibilityMode.editing, + focusNode: _lineQuasFocusNode, + controller: _lineQuasController, + textCapitalization: TextCapitalization.words, + decoration: BoxDecoration( + border: Border( + bottom: + BorderSide(width: 0.0, color: CupertinoColors.black)), + ), + placeholder: 'Equation', + ), ), - placeholder: 'Parameter', ), ), Container( @@ -130,6 +122,7 @@ class _EquationRouteState extends State color: CupertinoColors.black, ), child: CupertinoPageScaffold( + backgroundColor: CupertinoColors.lightBackgroundGray, navigationBar: CupertinoNavigationBar( trailing: buildTrailingBar([ CupertinoButton( @@ -162,7 +155,6 @@ class _EquationRouteState extends State behavior: HitTestBehavior.translucent, onTap: () { _lineQuasFocusNode.unfocus(); - _varFocusNode.unfocus(); }, child: SingleChildScrollView( child: Container( @@ -178,20 +170,12 @@ class _EquationRouteState extends State void _handleLineEquation() { _lineQuasFocusNode.unfocus(); - _varFocusNode.unfocus(); if (_lineQuasController.text.length != 0) { - if (_varController.text.length != 0) { - EquationsUtil handle = EquationsUtil.getInstance(); - var re = handle.handleEquation( - _lineQuasController.text); - setState(() { - result = re; - }); - } else { - setState(() { - result = XiaomingLocalizations.of(context).variableNotEmpty; - }); - } + EquationsUtil handle = EquationsUtil.getInstance(); + var re = handle.handleEquation(_lineQuasController.text); + setState(() { + result = re; + }); } else { setState(() { result = XiaomingLocalizations.of(context).equationNotEmpty; diff --git a/lib/src/view/route/homeRoute.dart b/lib/src/view/route/homeRoute.dart index 27e667f..06bcab1 100644 --- a/lib/src/view/route/homeRoute.dart +++ b/lib/src/view/route/homeRoute.dart @@ -90,10 +90,10 @@ class HomeRouteState extends State with TickerProviderStateMixin { height: _buttonsIsVisible ? 1.0 : 0.0, color: _buttonsIsVisible ? Colors.black : null, ), - new Container( - decoration: new BoxDecoration( - color: Theme.of(context).cardColor, - ), + AnimatedSize( + vsync: this, + curve: Curves.ease, + duration: Duration(milliseconds: 500), child: Container( height: _buttonsIsVisible ? 200.0 : 0.0, child: buildButtons(_handleTextButton), diff --git a/lib/src/view/widget/myButtons.dart b/lib/src/view/widget/myButtons.dart index 0433c75..38ee883 100644 --- a/lib/src/view/widget/myButtons.dart +++ b/lib/src/view/widget/myButtons.dart @@ -83,6 +83,10 @@ class _SettingSheetState extends State { onPressed(); }, child: const Text("Delete All Message"), + ), + CupertinoActionSheetAction( + onPressed: () {}, + child: Text('Language: ${Localizations.localeOf(context).languageCode == 'zh' ? 'Chinese' : 'English'}'), ) ], cancelButton: CupertinoActionSheetAction( diff --git a/test/testCommand.dart b/test/testCommand.dart index a86e765..6904e4a 100644 --- a/test/testCommand.dart +++ b/test/testCommand.dart @@ -6,7 +6,7 @@ import 'package:xiaoming/src/data/appData.dart'; void main() { final ud = new UserData(); - + test('testEquation', () { var instance = EquationsUtil.getInstance(); print(instance.handleEquation('1,-2,1'));