。。。。

spadekmit · Mar 23, 2019 · 687c143 · 687c143
1 parent e2e2c78
commit 687c143
Show file tree

Hide file tree

Showing 4 changed files with 94 additions and 82 deletions.
diff --git a/lib/src/language/ChineseCupertinoLocalizations.dart b/lib/src/language/ChineseCupertinoLocalizations.dart
@@ -13,7 +13,6 @@ class ChineseCupertinoLocalizations implements CupertinoLocalizations {
 
   Future init() async {
     ml = await materialDelegate.load(local);
-    print(ml.pasteButtonLabel);
   }
 
   @override

diff --git a/lib/src/view/route/dataRoute.dart b/lib/src/view/route/dataRoute.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:xiaoming/src/command/matrix.dart';
 import 'package:xiaoming/src/data/appData.dart';
 import 'package:xiaoming/src/language/xiaomingLocalizations.dart';
-import 'package:xiaoming/src/view/widget/DeleteButton.dart';
+import 'package:xiaoming/src/view/widget/myButtons.dart';
 
 ///保存的数据与方法界面
 class DataRoute extends StatefulWidget {
@@ -262,8 +262,6 @@ class _DataRouteState extends State<DataRoute> {
         ),
       )
     };
-    print('w = ${MediaQuery.of(context).size.width}');
-    print('h = ${MediaQuery.of(context).size.height}');
     ///保存的数据界面布局
     return CupertinoPageScaffold(
       navigationBar: CupertinoNavigationBar(

diff --git a/lib/src/view/route/helpRoute.dart b/lib/src/view/route/helpRoute.dart
@@ -6,56 +6,65 @@ import 'package:xiaoming/src/view/route/helpDetailRoute.dart';
 ///帮助界面
 class HelpView extends StatefulWidget {
   HelpView({Key key}) : super(key: key);
+
   @override
   _HelpViewState createState() => _HelpViewState();
 }
 
 ///控制帮助界面的状态
 class _HelpViewState extends State<HelpView> {
-
-  Card _buildCard(String text, int index){
-    return Card(
-      elevation: 0.0,
-      margin: EdgeInsets.zero,
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: <Widget>[
-              Container(
-                padding: const EdgeInsets.only(left: 20.0),
-                child: Text(text),
-              ),
-              CupertinoButton(
-                child: Icon(CupertinoIcons.forward),
-                onPressed: () {
-                  Navigator.of(context).push(
-                    CupertinoPageRoute(
-                      builder: (BuildContext context) {
-                        return HelpDetailRoute(index);
-                      }
-                    )
-                  );
-                },
-              ),
-            ],
-          ),
+  Widget _buildCard(String text, int index) {
+    return GestureDetector(
+      onTap: () {
+        Navigator.of(context)
+            .push(CupertinoPageRoute(builder: (BuildContext context) {
+          return HelpDetailRoute(index);
+        }));
+      },
+      child: Card(
+        elevation: 0.0,
+        margin: EdgeInsets.zero,
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: <Widget>[
+            Container(
+              padding: const EdgeInsets.only(left: 20.0),
+              child: Text(text),
+            ),
+            CupertinoButton(
+                onPressed: () {},
+                child: Icon(CupertinoIcons.forward)
+            ),
+          ],
+        ),
+      ),
     );
   }
-  
+
   @override
   Widget build(BuildContext context) {
-
     final lists = ListView(
       children: <Widget>[
         _buildCard(XiaomingLocalizations.of(context).helpTab1, 1),
-        const Divider(height: 1.0,),
+        const Divider(
+          height: 1.0,
+        ),
         _buildCard(XiaomingLocalizations.of(context).helpTab2, 2),
-        const Divider(height: 1.0,),
+        const Divider(
+          height: 1.0,
+        ),
         _buildCard(XiaomingLocalizations.of(context).helpTab3, 3),
-        const Divider(height: 1.0,),
+        const Divider(
+          height: 1.0,
+        ),
         _buildCard(XiaomingLocalizations.of(context).helpTab4, 4),
-        const Divider(height: 1.0,),
+        const Divider(
+          height: 1.0,
+        ),
         _buildCard(XiaomingLocalizations.of(context).helpTab5, 5),
-        const Divider(height: 1.0,),
+        const Divider(
+          height: 1.0,
+        ),
         _buildCard(XiaomingLocalizations.of(context).helpTab6, 6),
       ],
     );

diff --git a/lib/src/view/route/mainRoute.dart b/lib/src/view/route/mainRoute.dart
@@ -6,11 +6,11 @@ import 'package:xiaoming/src/data/appData.dart';
 import 'package:xiaoming/src/data/settingData.dart';
 import 'package:xiaoming/src/language/ChineseCupertinoLocalizations.dart';
 import 'package:xiaoming/src/language/xiaomingLocalizations.dart';
-import 'package:xiaoming/src/view/route/newHelpRoute.dart';
+import 'package:xiaoming/src/view/route/helpRoute.dart';
 import 'package:xiaoming/src/view/widget/myTextView.dart';
 import 'package:xiaoming/src/view/route/dataRoute.dart';
 import 'package:keyboard_visibility/keyboard_visibility.dart';
-import 'package:xiaoming/src/view/widget/DeleteButton.dart';
+import 'package:xiaoming/src/view/widget/myButtons.dart';
 
 ///FlutterApp入口
 class MyApp extends StatelessWidget {
@@ -120,56 +120,60 @@ class TextScreenState extends State<TextScreen> with TickerProviderStateMixin {
     UserData.language = Localizations.localeOf(context).languageCode;
     tabHeight = MediaQuery.of(context).padding.bottom; //初始化底部导航栏高度
 
+    ///删除所有交互命令
+    void _deleteAllMessage(){
+      showDialog(
+          context: context,
+          builder: (BuildContext context) {
+            return CupertinoAlertDialog(
+              title:
+              Text(XiaomingLocalizations.of(context).deleteAllMessage),
+              actions: <Widget>[
+                CupertinoDialogAction(
+                  isDestructiveAction: true,
+                  child: Text(XiaomingLocalizations.of(context).delete),
+                  onPressed: () {
+                    setState(() {
+                      UserData.strs.clear();
+                      _texts.clear();
+                    });
+                    UserData.deleteAllMessage();
+                    Navigator.of(context, rootNavigator: true).pop();
+                  },
+                ),
+                CupertinoDialogAction(
+                  child: Text(XiaomingLocalizations.of(context).cancel),
+                  onPressed: () =>
+                      Navigator.of(context, rootNavigator: true).pop(),
+                )
+              ],
+            );
+          });
+    }
+
+    final helpButton = CupertinoButton(
+      padding: EdgeInsets.zero,
+      child: Semantics(
+        label: 'Help',
+        child: const Icon(CupertinoIcons.book),
+      ),
+      onPressed: () {
+        Navigator.of(context)
+            .push(CupertinoPageRoute(builder: (BuildContext context) {
+          return HelpView();
+        }));
+      },
+    );
+
     ///Home界面导航栏，包含帮助按钮和删除按钮
     final Widget trailingBar = Row(
       mainAxisSize: MainAxisSize.min,
       children: <Widget>[
-        CupertinoButton(
-          padding: EdgeInsets.zero,
-          child: Semantics(
-            label: 'Help',
-            child: const Icon(CupertinoIcons.book),
-          ),
-          onPressed: () {
-            Navigator.of(context)
-                .push(CupertinoPageRoute(builder: (BuildContext context) {
-              return HelpView();
-            }));
-          },
-        ),
+        helpButton,
         const SizedBox(
           width: 8.0,
         ),
-        DeleteButton(0, () {
-          Navigator.of(context, rootNavigator: true);
-          showDialog(
-              context: context,
-              builder: (BuildContext context) {
-                return CupertinoAlertDialog(
-                  title:
-                      Text(XiaomingLocalizations.of(context).deleteAllMessage),
-                  actions: <Widget>[
-                    CupertinoDialogAction(
-                      isDestructiveAction: true,
-                      child: Text(XiaomingLocalizations.of(context).delete),
-                      onPressed: () {
-                        setState(() {
-                          UserData.strs.clear();
-                          _texts.clear();
-                        });
-                        UserData.deleteAllMessage();
-                        Navigator.of(context, rootNavigator: true).pop();
-                      },
-                    ),
-                    CupertinoDialogAction(
-                      child: Text(XiaomingLocalizations.of(context).cancel),
-                      onPressed: () =>
-                          Navigator.of(context, rootNavigator: true).pop(),
-                    )
-                  ],
-                );
-              });
-        }),
+        DeleteButton(0, _deleteAllMessage),
       ],
     );
 
@@ -442,6 +446,8 @@ class TextScreenState extends State<TextScreen> with TickerProviderStateMixin {
     }
   }
 
+
+
   ///退出该路由时释放动画资源
   @override
   void dispose() {