20240322 update

neko0xff · Mar 22, 2024 · 6b5233a · 6b5233a
1 parent 26815f4
commit 6b5233a
Show file tree

Hide file tree

Showing 31 changed files with 128 additions and 136 deletions.
diff --git a/src/demo/viewapp_master/lib/pages/btn/ctr/modeChoose.dart b/src/demo/viewapp_master/lib/pages/btn/ctr/modeChoose.dart
@@ -66,7 +66,7 @@ class btnGoBack extends StatelessWidget {
         Navigator.push(
             context, MaterialPageRoute(builder: (context) => AccountData()));
       },
-      child: const Text('Go Back'),
+      child: const Text('回上頁'),
       style: ElevatedButton.styleFrom(minimumSize: const Size(100, 80)),
     );
   }

diff --git a/src/demo/viewapp_master/lib/pages/btn/ctr/switchCtr.dart b/src/demo/viewapp_master/lib/pages/btn/ctr/switchCtr.dart
@@ -33,7 +33,7 @@ class ControlPage extends StatelessWidget {
       mainAxisAlignment: MainAxisAlignment.center,
       children: <Widget>[
         SizedBox(height: 10.0),
-        Text("Switch Control",
+        Text("開關控制",
             style: TextStyle(fontSize: 30, fontWeight: FontWeight.bold)),
         SizedBox(height: 10.0),
         Text("Switch01",
@@ -67,7 +67,7 @@ class btnGoBack extends StatelessWidget {
         Navigator.push(
             context, MaterialPageRoute(builder: (context) => Control()));
       },
-      child: const Text('Go Back'),
+      child: const Text('回上頁'),
       style: ElevatedButton.styleFrom(minimumSize: const Size(100, 80)),
     );
   }

diff --git a/src/demo/viewapp_master/lib/pages/btn/ctr/valueCtr.dart b/src/demo/viewapp_master/lib/pages/btn/ctr/valueCtr.dart
@@ -66,7 +66,7 @@ class btnGoBack extends StatelessWidget {
         Navigator.push(
             context, MaterialPageRoute(builder: (context) => Control()));
       },
-      child: const Text('Go Back'),
+      child: const Text('回上頁'),
       style: ElevatedButton.styleFrom(minimumSize: const Size(100, 80)),
     );
   }

diff --git a/src/demo/viewapp_master/lib/pages/btn/table/aqiTable.dart b/src/demo/viewapp_master/lib/pages/btn/table/aqiTable.dart
@@ -99,7 +99,7 @@ class btnGoBack extends StatelessWidget {
         Navigator.push(
             context, MaterialPageRoute(builder: (context) => NewsData()));
       },
-      child: const Text('Go Back'),
+      child: const Text('回上頁'),
       style: ElevatedButton.styleFrom(minimumSize: const Size(100, 80)),
     );
   }

diff --git a/src/demo/viewapp_master/lib/pages/btn/table/cfootTable.dart b/src/demo/viewapp_master/lib/pages/btn/table/cfootTable.dart
@@ -99,7 +99,7 @@ class btnGoBack extends StatelessWidget {
         Navigator.push(
             context, MaterialPageRoute(builder: (context) => NewsData()));
       },
-      child: const Text('Go Back'),
+      child: const Text('回上頁'),
       style: ElevatedButton.styleFrom(minimumSize: const Size(100, 80)),
     );
   }

diff --git a/src/demo/viewapp_master/lib/pages/btn/table/modeTable.dart b/src/demo/viewapp_master/lib/pages/btn/table/modeTable.dart
@@ -101,7 +101,7 @@ class btnGoBack extends StatelessWidget {
         Navigator.push(
             context, MaterialPageRoute(builder: (context) => AccountData()));
       },
-      child: const Text('Go Back'),
+      child: const Text('回上頁'),
       style: ElevatedButton.styleFrom(minimumSize: const Size(100, 80)),
     );
   }

diff --git a/src/demo/viewapp_master/lib/pages/btn/view/Cfoot_api.dart b/src/demo/viewapp_master/lib/pages/btn/view/Cfoot_api.dart
@@ -56,7 +56,7 @@ class DataAQI extends StatelessWidget {
                 mainAxisSize: MainAxisSize.min,
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
-                  Text("碳排放(自動)",
+                  Text("碳排放",
                       style: TextStyle(fontSize: 30, fontWeight: FontWeight.bold)),
                   SizedBox(width: 10),
                 ]),
@@ -174,7 +174,7 @@ class btnGoBack extends StatelessWidget {
             context, MaterialPageRoute(builder: (context) => const NewsData()));
       },
       style: ElevatedButton.styleFrom(minimumSize: const Size(100, 80)),
-      child: const Text('Go Back'),
+      child: const Text('回上頁'),
     );
   }
 }
diff --git a/src/demo/viewapp_master/lib/pages/btn/view/barchartView.dart b/src/demo/viewapp_master/lib/pages/btn/view/barchartView.dart
@@ -66,7 +66,7 @@ class btnGoBack extends StatelessWidget {
               context, MaterialPageRoute(builder: (context) => ViewData()));
         },
         // ignore: sort_child_properties_last
-        child: const Text('Go Back'),
+        child: const Text('回上頁'),
         style: ElevatedButton.styleFrom(minimumSize: const Size(100, 80)));
   }
 }
diff --git a/src/demo/viewapp_master/lib/pages/btn/view/customValueView.dart b/src/demo/viewapp_master/lib/pages/btn/view/customValueView.dart
@@ -92,7 +92,7 @@ class btnGoBack extends StatelessWidget {
         Navigator.push(
             context, MaterialPageRoute(builder: (context) => AccountData()));
       },
-      child: const Text('Go Back'),
+      child: const Text('回上頁'),
       style: ElevatedButton.styleFrom(minimumSize: const Size(100, 80)),
     );
   }

diff --git a/src/demo/viewapp_master/lib/pages/btn/view/linechartView.dart b/src/demo/viewapp_master/lib/pages/btn/view/linechartView.dart
@@ -90,7 +90,7 @@ class btnGoBack extends StatelessWidget {
           Navigator.push(
               context, MaterialPageRoute(builder: (context) => ViewData()));
         },
-        child: const Text('Go Back'),
+        child: const Text('回上頁'),
         style: ElevatedButton.styleFrom(minimumSize: const Size(100, 80)));
   }
 }
diff --git a/src/demo/viewapp_master/lib/pages/btn/view/tableView.dart b/src/demo/viewapp_master/lib/pages/btn/view/tableView.dart
@@ -70,7 +70,7 @@ class btn1 extends StatelessWidget {
               MaterialPageRoute(builder: (context) => CreatePDFViewPage()));
         },
         style: ElevatedButton.styleFrom(minimumSize: const Size(100, 80)),
-        child: Text('Create a PDF'));
+        child: Text('建立PDF檔'));
   }
 }
 
@@ -96,7 +96,7 @@ class btnGoBack extends StatelessWidget {
             context, MaterialPageRoute(builder: (context) => ViewData()));
       },
       style: ElevatedButton.styleFrom(minimumSize: const Size(100, 80)),
-      child: const Text('Go Back'),
+      child: const Text('回上頁'),
     );
   }
 }
diff --git a/src/demo/viewapp_master/lib/pages/btn/view/userlistView.dart b/src/demo/viewapp_master/lib/pages/btn/view/userlistView.dart
@@ -93,7 +93,7 @@ class btnGoBack extends StatelessWidget {
         Navigator.push(
             context, MaterialPageRoute(builder: (context) => AccountData()));
       },
-      child: const Text('Go Back'),
+      child: const Text('回上頁'),
       style: ElevatedButton.styleFrom(minimumSize: const Size(100, 80)),
     );
   }

diff --git a/src/demo/viewapp_master/lib/pages/btn/view/usermailView.dart b/src/demo/viewapp_master/lib/pages/btn/view/usermailView.dart
@@ -93,7 +93,7 @@ class btnGoBack extends StatelessWidget {
         Navigator.push(
             context, MaterialPageRoute(builder: (context) => AccountData()));
       },
-      child: const Text('Go Back'),
+      child: const Text('回上頁'),
       style: ElevatedButton.styleFrom(minimumSize: const Size(100, 80)),
     );
   }

diff --git a/src/demo/viewapp_master/lib/pages/out/control.dart b/src/demo/viewapp_master/lib/pages/out/control.dart
@@ -58,7 +58,7 @@ class btn1 extends StatelessWidget {
               MaterialPageRoute(builder: (context) => switchCtrPage()));
         },
         style: ElevatedButton.styleFrom(minimumSize: const Size(150, 100)),
-        child: Text('Switch'));
+        child: Text('開關控制'));
   }
 }
 
@@ -73,6 +73,6 @@ class btn2 extends StatelessWidget {
               context, MaterialPageRoute(builder: (context) => valueCtrPage()));
         },
         style: ElevatedButton.styleFrom(minimumSize: const Size(150, 100)),
-        child: Text('User\nCustom\nValue', textAlign: TextAlign.center));
+        child: Text('使用者\n自訂值', textAlign: TextAlign.center));
   }
 }
diff --git a/src/demo/viewapp_master/lib/pages/out/news.dart b/src/demo/viewapp_master/lib/pages/out/news.dart
@@ -120,7 +120,7 @@ class btn3 extends StatelessWidget {
           Navigator.push(
               context, MaterialPageRoute(builder: (context) => CfootPage_api()));
         },
-        child: Text('碳排放\n自動', textAlign: TextAlign.center));
+        child: Text('碳排放', textAlign: TextAlign.center));
   }
 }
 

diff --git a/src/demo/viewapp_master/lib/pages/out/view.dart b/src/demo/viewapp_master/lib/pages/out/view.dart
@@ -64,7 +64,7 @@ class btn1 extends StatelessWidget {
               MaterialPageRoute(builder: (context) => tableViewPage()));
         },
         style: ElevatedButton.styleFrom(minimumSize: const Size(150, 100)),
-        child: Text('Table', textAlign: TextAlign.center));
+        child: Text('表格', textAlign: TextAlign.center));
   }
 }
 
@@ -79,7 +79,7 @@ class btn2 extends StatelessWidget {
               MaterialPageRoute(builder: (context) => barchartViewPage()));
         },
         style: ElevatedButton.styleFrom(minimumSize: const Size(150, 100)),
-        child: Text('Bar\nChart', textAlign: TextAlign.center));
+        child: Text('長條圖', textAlign: TextAlign.center));
   }
 }
 
@@ -94,6 +94,6 @@ class btn3 extends StatelessWidget {
               MaterialPageRoute(builder: (context) => linecartViewPage()));
         },
         style: ElevatedButton.styleFrom(minimumSize: const Size(150, 100)),
-        child: Text('Line\nChart', textAlign: TextAlign.center));
+        child: Text('折線圖', textAlign: TextAlign.center));
   }
 }
diff --git a/src/demo/viewapp_master/lib/pages/widget/switch01ctr.dart b/src/demo/viewapp_master/lib/pages/widget/switch01ctr.dart
@@ -3,6 +3,9 @@ import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
 import 'package:viewapp_master/modules/PreferencesUtil.dart';
 
+var Color_active = Colors.green;
+var Color_inactive = Colors.blue;
+
 class Switch01ctr extends StatefulWidget {
   const Switch01ctr({super.key});
 
@@ -132,11 +135,11 @@ class Fan1ctr extends StatelessWidget {
         const SizedBox(width: 10),
         Switch(
           value: switchSelectedFan1,
-          activeColor: Colors.blue,
+          activeColor: Color_active,
           onChanged: onChanged,
           overlayColor: overlayColor,
           thumbColor: const MaterialStatePropertyAll<Color>(Colors.black),
-          inactiveTrackColor: Colors.green,
+          inactiveTrackColor: Color_inactive,
         ),
       ],
     );
@@ -183,11 +186,11 @@ class Fan2ctr extends StatelessWidget {
         const SizedBox(width: 10),
         Switch(
           value: switchSelectedFan2,
-          activeColor: Colors.blue,
+          activeColor: Color_active,
           onChanged: onChanged,
           overlayColor: overlayColor,
           thumbColor: const MaterialStatePropertyAll<Color>(Colors.black),
-          inactiveTrackColor: Colors.green,
+          inactiveTrackColor: Color_inactive,
         ),
       ],
     );

diff --git a/src/demo/viewapp_user/lib/pages/btn/ctr/switchCtr.dart b/src/demo/viewapp_user/lib/pages/btn/ctr/switchCtr.dart
@@ -29,23 +29,23 @@ class ControlPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return SingleChildScrollView(
         child: Column(
-      mainAxisSize: MainAxisSize.min,
-      mainAxisAlignment: MainAxisAlignment.center,
-      children: <Widget>[
-        SizedBox(height: 10.0),
-        Text("Switch Control",
-            style: TextStyle(fontSize: 30, fontWeight: FontWeight.bold)),
-        SizedBox(height: 10.0),
-        Text("Switch01",
-            style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold)),
-        SizedBox(height: 10.0),
-        Control1(),
-        SizedBox(height: 10.0),
-        btnGoBack(),
-        SizedBox(height: 5.0),
-        wallpaperLogin(),
-      ],
-    ));
+          mainAxisSize: MainAxisSize.min,
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: <Widget>[
+            SizedBox(height: 10.0),
+            Text("開關控制",
+                style: TextStyle(fontSize: 30, fontWeight: FontWeight.bold)),
+            SizedBox(height: 10.0),
+            Text("Switch01",
+                style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold)),
+            SizedBox(height: 10.0),
+            Control1(),
+            SizedBox(height: 10.0),
+            btnGoBack(),
+            SizedBox(height: 5.0),
+            wallpaperLogin(),
+          ],
+        ));
   }
 }
 
@@ -67,7 +67,7 @@ class btnGoBack extends StatelessWidget {
         Navigator.push(
             context, MaterialPageRoute(builder: (context) => Control()));
       },
-      child: const Text('Go Back'),
+      child: const Text('回上頁'),
       style: ElevatedButton.styleFrom(minimumSize: const Size(100, 80)),
     );
   }

diff --git a/src/demo/viewapp_user/lib/pages/btn/ctr/valueCtr.dart b/src/demo/viewapp_user/lib/pages/btn/ctr/valueCtr.dart
@@ -66,7 +66,7 @@ class btnGoBack extends StatelessWidget {
         Navigator.push(
             context, MaterialPageRoute(builder: (context) => Control()));
       },
-      child: const Text('Go Back'),
+      child: const Text('回上頁'),
       style: ElevatedButton.styleFrom(minimumSize: const Size(100, 80)),
     );
   }

diff --git a/src/demo/viewapp_user/lib/pages/btn/table/aqiTable.dart b/src/demo/viewapp_user/lib/pages/btn/table/aqiTable.dart
@@ -99,7 +99,7 @@ class btnGoBack extends StatelessWidget {
         Navigator.push(
             context, MaterialPageRoute(builder: (context) => NewsData()));
       },
-      child: const Text('Go Back'),
+      child: const Text('回上頁'),
       style: ElevatedButton.styleFrom(minimumSize: const Size(100, 80)),
     );
   }

diff --git a/src/demo/viewapp_user/lib/pages/btn/table/cfootTable.dart b/src/demo/viewapp_user/lib/pages/btn/table/cfootTable.dart
@@ -99,7 +99,7 @@ class btnGoBack extends StatelessWidget {
         Navigator.push(
             context, MaterialPageRoute(builder: (context) => NewsData()));
       },
-      child: const Text('Go Back'),
+      child: const Text('回上頁'),
       style: ElevatedButton.styleFrom(minimumSize: const Size(100, 80)),
     );
   }

diff --git a/src/demo/viewapp_user/lib/pages/btn/view/Cfoot.dart b/src/demo/viewapp_user/lib/pages/btn/view/Cfoot.dart
@@ -64,7 +64,7 @@ class DataAQI extends StatelessWidget {
             Row(
                 mainAxisSize: MainAxisSize.min,
                 mainAxisAlignment: MainAxisAlignment.center,
-                children: [ btn1(),SizedBox(width: 10), btn2() ]),
+                children: [ btn5(),SizedBox(width: 10), btn4() ]),
             SizedBox(height: 10),
             Row(
                 mainAxisSize: MainAxisSize.min,
@@ -74,12 +74,12 @@ class DataAQI extends StatelessWidget {
             Row(
                 mainAxisSize: MainAxisSize.min,
                 mainAxisAlignment: MainAxisAlignment.center,
-                children: [ btn4() ]),
+                children: [ btn1() ]),
             SizedBox(height: 10),
             Row(
                 mainAxisSize: MainAxisSize.min,
                 mainAxisAlignment: MainAxisAlignment.center,
-                children: [ btn5() ]),
+                children: [ btn2() ]),
             SizedBox(height: 10),
             btnGoBack(),
           ],

diff --git a/src/demo/viewapp_user/lib/pages/btn/view/barchartView.dart b/src/demo/viewapp_user/lib/pages/btn/view/barchartView.dart
@@ -66,7 +66,7 @@ class btnGoBack extends StatelessWidget {
               context, MaterialPageRoute(builder: (context) => ViewData()));
         },
         // ignore: sort_child_properties_last
-        child: const Text('Go Back'),
+        child: const Text('回上一頁'),
         style: ElevatedButton.styleFrom(minimumSize: const Size(100, 80)));
   }
 }
diff --git a/src/demo/viewapp_user/lib/pages/btn/view/linechartView.dart b/src/demo/viewapp_user/lib/pages/btn/view/linechartView.dart
@@ -90,7 +90,7 @@ class btnGoBack extends StatelessWidget {
           Navigator.push(
               context, MaterialPageRoute(builder: (context) => ViewData()));
         },
-        child: const Text('Go Back'),
+        child: const Text('回上頁'),
         style: ElevatedButton.styleFrom(minimumSize: const Size(100, 80)));
   }
 }
diff --git a/src/demo/viewapp_user/lib/pages/btn/view/tableView.dart b/src/demo/viewapp_user/lib/pages/btn/view/tableView.dart
@@ -63,7 +63,7 @@ class btn1 extends StatelessWidget {
               MaterialPageRoute(builder: (context) => CreatePDFViewPage()));
         },
         style: ElevatedButton.styleFrom(minimumSize: const Size(100, 80)),
-        child: Text('Create a PDF'));
+        child: Text('建立PDF檔'));
   }
 }
 
@@ -89,7 +89,7 @@ class btnGoBack extends StatelessWidget {
             context, MaterialPageRoute(builder: (context) => ViewData()));
       },
       style: ElevatedButton.styleFrom(minimumSize: const Size(100, 80)),
-      child: const Text('Go Back'),
+      child: const Text('回上頁'),
     );
   }
 }