From d4033bd0182dbdd0117cdca4058b9724993efd19 Mon Sep 17 00:00:00 2001
From: JingChiang <ltesr125124015@gmail.com>
Date: Tue, 3 Sep 2024 15:10:23 +0800
Subject: [PATCH] style: optimize import and code style

---
 lib/BottomNavBar.dart  | 2 --
 lib/HomePage.dart      | 4 ----
 lib/KnowledgePage.dart | 7 -------
 lib/MessagePage.dart   | 6 ------
 lib/PersonalInfo.dart  | 9 +--------
 lib/main.dart          | 2 +-
 6 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/lib/BottomNavBar.dart b/lib/BottomNavBar.dart
index 4881227..a1c78c1 100644
--- a/lib/BottomNavBar.dart
+++ b/lib/BottomNavBar.dart
@@ -1,8 +1,6 @@
 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';
diff --git a/lib/HomePage.dart b/lib/HomePage.dart
index 623fb5f..a34d08f 100644
--- a/lib/HomePage.dart
+++ b/lib/HomePage.dart
@@ -1,10 +1,6 @@
 // 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';
 
diff --git a/lib/KnowledgePage.dart b/lib/KnowledgePage.dart
index 08da142..7b9c6dd 100644
--- a/lib/KnowledgePage.dart
+++ b/lib/KnowledgePage.dart
@@ -1,12 +1,5 @@
 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(),
diff --git a/lib/MessagePage.dart b/lib/MessagePage.dart
index 4f53d2b..8b5943f 100644
--- a/lib/MessagePage.dart
+++ b/lib/MessagePage.dart
@@ -1,12 +1,6 @@
 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
 
diff --git a/lib/PersonalInfo.dart b/lib/PersonalInfo.dart
index b45ed14..0a3cc08 100644
--- a/lib/PersonalInfo.dart
+++ b/lib/PersonalInfo.dart
@@ -1,16 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
+import 'package:mysql_client/mysql_client.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(),
diff --git a/lib/main.dart b/lib/main.dart
index 2907ff4..75accbc 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -72,6 +72,7 @@ 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'),
@@ -186,7 +187,6 @@ class _LoginPageState extends State<LoginPage> {
           ),
         ),
       ),
-      canPop: false,
     );
   }
   void loginBtn() async {