lib/BottomNavBar.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:persistent_bottom_nav_bar_v2/persistent_bottom_nav_bar_v2.dart';
 
+// Import the pages
+import 'HomePage.dart';
 import 'HistoricalRecord.dart';
 import 'KnowledgePage.dart';
 import 'MessagePage.dart';

lib/HomePage.dart

@@ -1,6 +1,10 @@
 // import 'dart:html';
 
 import 'package:flutter/material.dart';
+import 'package:topic/HistoricalRecord.dart';
+import 'package:topic/PersonalInfo.dart';
+import 'package:topic/KnowledgePage.dart';
+import 'package:topic/MessagePage.dart';
 import 'package:topic/TryPage.dart';
 import 'package:webview_flutter/webview_flutter.dart';
 

lib/KnowledgePage.dart

@@ -1,5 +1,12 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
+import 'package:topic/main.dart';
 import 'package:topic/HomePage.dart';
+import 'package:topic/HistoricalRecord.dart';
+import 'package:topic/PersonalInfo.dart';
+import 'package:topic/MessagePage.dart';
+
+import 'BottomNavBar.dart';
 /*void main() {
   runApp(MaterialApp(
     home: KnowledgePage(),

lib/MessagePage.dart

@@ -1,6 +1,12 @@
 import 'package:flutter/material.dart';
+import 'package:topic/HomePage.dart';
+import 'package:topic/HistoricalRecord.dart';
+import 'package:topic/PersonalInfo.dart';
+import 'package:topic/KnowledgePage.dart';
 import 'package:mysql_client/mysql_client.dart';
 
+import 'BottomNavBar.dart';
+
 class MessagePage extends StatefulWidget {
   final String email; // 接收來自上個頁面的 email
 

lib/PersonalInfo.dart

@@ -1,9 +1,16 @@
 import 'package:flutter/material.dart';
-import 'package:mysql_client/mysql_client.dart';
+import 'package:flutter/rendering.dart';
 import 'package:persistent_bottom_nav_bar_v2/persistent_bottom_nav_bar_v2.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:topic/BottomNavBar.dart';
 import 'package:topic/NoSwipeBackRoute.dart';
 import 'package:topic/main.dart';
+import 'package:topic/HomePage.dart';
+import 'package:topic/HistoricalRecord.dart';
+import 'package:topic/KnowledgePage.dart';
+import 'package:topic/MessagePage.dart';
+import 'package:mysql_client/mysql_client.dart';
+import 'package:http/http.dart' as http;
 /*void main() {
   runApp(MaterialApp(
     home: PersonalInfo(),

lib/RegisterPage.dart

@@ -23,7 +23,6 @@ class _RegisterPageState extends State<RegisterPage> {
   final TextEditingController _passwordController = TextEditingController();
   final TextEditingController _codeController = TextEditingController();
 
-  bool _passwordNotVisible = true;
   bool _isButtonEnabled = true;
   int _seconds = 60;
   Timer? _timer;
@@ -229,21 +228,9 @@ class _RegisterPageState extends State<RegisterPage> {
                     decoration: InputDecoration(
                       border: OutlineInputBorder(),
                       prefixIcon: Icon(Icons.lock_outlined),
-                      suffixIcon: IconButton(
-                        icon: Icon(_passwordNotVisible
-                            ? Icons.visibility
-                            : Icons.visibility_off),
-                        onPressed: () {
-                          setState(
-                                () {
-                              _passwordNotVisible = !_passwordNotVisible;
-                            },
-                          );
-                        },
-                      ),
                       labelText: '密碼',
                     ),
-                    obscureText: _passwordNotVisible,
+                    obscureText: true,
                   ),
                   SizedBox(height: 20),
                   Row(

lib/main.dart

@@ -72,7 +72,6 @@ class _LoginPageState extends State<LoginPage> {
     debugPaintSizeEnabled=false;
     //by use PopScope and disable can Pop avoid android user pop back by back button
     return PopScope(
-      canPop: false,
       child: Scaffold(
         //appBar: AppBar(
           //title: Text('Demo'),
@@ -187,6 +186,7 @@ class _LoginPageState extends State<LoginPage> {
           ),
         ),
       ),
+      canPop: false,
     );
   }
   void loginBtn() async {