代码优化

lib/main.dart

@@ -20,7 +20,7 @@ class MyApp extends StatelessWidget {
       value: AuthService().user,
       initialData: null,
 
-      child: MaterialApp(
+      child: const MaterialApp(
         //remove Debug Banner for all
         debugShowCheckedModeBanner: false,
         title: 'PutraGo',

lib/screens/driver/driverHome/driverFinishOrder.dart

@@ -20,7 +20,7 @@ class driverFinishOrder extends StatelessWidget {
               width: 140,
             ),
 
-            Text(
+            const Text(
               'Order is finished',
               style: TextStyle(
                 fontFamily: 'Poppins',
@@ -29,8 +29,8 @@ class driverFinishOrder extends StatelessWidget {
                 color: Colors.green, // Adjust color as needed
               ),
             ),
-            SizedBox(height: 10),
-            Text(
+            const SizedBox(height: 10),
+            const Text(
               'You did a really good job!',
               style: TextStyle(
                 fontFamily: 'Poppins',
@@ -39,7 +39,7 @@ class driverFinishOrder extends StatelessWidget {
                 color: Colors.green, // Adjust color as needed
               ),
             ),
-            SizedBox(height: 70),
+            const SizedBox(height: 70),
 
             Align(
               alignment: Alignment.center,
@@ -49,7 +49,7 @@ class driverFinishOrder extends StatelessWidget {
                 height: 65,
                 decoration: BoxDecoration(
                   borderRadius: BorderRadius.circular(10),
-                  color: Color.fromRGBO(119, 97, 255, 1.0),
+                  color: const Color.fromRGBO(119, 97, 255, 1.0),
                 ),
                 child: TextButton(
                   onPressed: () {
@@ -59,7 +59,7 @@ class driverFinishOrder extends StatelessWidget {
                       MaterialPageRoute(builder: (context) => driverSelectOrder()),
                     );
                   },
-                  child: Text(
+                  child: const Text(
                     'Back to main page',
                     style: TextStyle(
                       fontFamily: 'Poppins',
@@ -72,7 +72,7 @@ class driverFinishOrder extends StatelessWidget {
               ),
             ),
 
-            SizedBox(height: 10),
+            const SizedBox(height: 10),
           ],
         ),
       ),

lib/screens/driver/driverHome/driverOrderCancelled.dart

@@ -13,7 +13,7 @@ class driverOrderCancelled extends StatelessWidget {
           crossAxisAlignment: CrossAxisAlignment.center,
           children: [
 
-            Text(
+            const Text(
               'Opps..',
               style: TextStyle(
                 fontFamily: 'Poppins',
@@ -23,9 +23,9 @@ class driverOrderCancelled extends StatelessWidget {
               ),
             ),
 
-            SizedBox(height: 10),
+            const SizedBox(height: 10),
 
-            Text(
+            const Text(
               'Your customer cancelled this order',
               style: TextStyle(
                 fontFamily: 'Poppins',
@@ -34,7 +34,7 @@ class driverOrderCancelled extends StatelessWidget {
                 color: Colors.black, // Adjust color as needed
               ),
             ),
-            SizedBox(height: 70),
+            const SizedBox(height: 70),
 
             Align(
               alignment: Alignment.center,
@@ -44,7 +44,7 @@ class driverOrderCancelled extends StatelessWidget {
                 height: 65,
                 decoration: BoxDecoration(
                   borderRadius: BorderRadius.circular(10),
-                  color: Color.fromRGBO(119, 97, 255, 1.0),
+                  color: const Color.fromRGBO(119, 97, 255, 1.0),
                 ),
                 child: TextButton(
                   onPressed: () {
@@ -54,7 +54,7 @@ class driverOrderCancelled extends StatelessWidget {
                       MaterialPageRoute(builder: (context) => driverMain()),
                     );
                   },
-                  child: Text(
+                  child: const Text(
                     'Back to main page',
                     style: TextStyle(
                       fontFamily: 'Poppins',
@@ -67,7 +67,7 @@ class driverOrderCancelled extends StatelessWidget {
               ),
             ),
 
-            SizedBox(height: 10),
+            const SizedBox(height: 10),
           ],
         ),
       ),

lib/screens/driver/driverHome/driverPickup.dart

@@ -18,24 +18,24 @@ class driverPickup extends StatelessWidget {
           mainAxisAlignment: MainAxisAlignment.center,
           children: <Widget>[
 
-            SizedBox(height: 20),
+            const SizedBox(height: 20),
             Image.asset(
               'assets/images/successImage.png',
               height: 140,
               width: 140,
             ),
 
-            SizedBox(height: 5),
-            Text(
+            const SizedBox(height: 5),
+            const Text(
               'This order successfully created!',
               style:
                   TextStyle(color: Colors.green, fontWeight: FontWeight.bold),
             ),
             // Your checkmark image will be placed here
-            Card(
-              margin: const EdgeInsets.symmetric(vertical: 20.0),
+            const Card(
+              margin: EdgeInsets.symmetric(vertical: 20.0),
               child: Padding(
-                padding: const EdgeInsets.all(16.0),
+                padding: EdgeInsets.all(16.0),
                 child: Column(
                   children: <Widget>[
                     Row(
@@ -77,7 +77,7 @@ class driverPickup extends StatelessWidget {
             ),
             ElevatedButton(
               style: ElevatedButton.styleFrom(
-                primary:Color.fromRGBO(119, 97, 255, 1.0) , // background
+                backgroundColor: const Color.fromRGBO(119, 97, 255, 1.0) , // background
                 onPrimary: Colors.white, // foreground
               ),
               onPressed: () {
@@ -86,13 +86,13 @@ class driverPickup extends StatelessWidget {
                   MaterialPageRoute(builder: (context) => driverFinishOrder()),
                 );
               },
-              child: Text('Finish Ride'),
+              child: const Text('Finish Ride'),
             ),
 
-            SizedBox(height: 10),
+            const SizedBox(height: 10),
             ElevatedButton(
               style: ElevatedButton.styleFrom(
-                primary:Color.fromRGBO(255, 120, 116, 1) , // background
+                backgroundColor: const Color.fromRGBO(255, 120, 116, 1) , // background
                 onPrimary: Colors.white, // foreground
               ),
               onPressed: () {
@@ -101,7 +101,7 @@ class driverPickup extends StatelessWidget {
                   MaterialPageRoute(builder: (context) => driverSelectOrder()),
                 );
               },
-              child: Text('Cancel'),
+              child: const Text('Cancel'),
             ),
 
           ],

lib/screens/driver/driverHome/driverSelectOrder.dart

@@ -10,7 +10,7 @@ class driverSelectOrder extends StatelessWidget {
     return Scaffold(
       appBar: AppBar(
         leading: IconButton(
-          icon: Icon(
+          icon: const Icon(
             Icons.chevron_left,
             size: 36,
           ),
@@ -21,10 +21,10 @@ class driverSelectOrder extends StatelessWidget {
             );
           },
         ),
-        title: Text('Select Your Order'),
+        title: const Text('Select Your Order'),
         actions: [
           IconButton(
-            icon: Icon(Icons.logout),
+            icon: const Icon(Icons.logout),
             onPressed: () {
 
             },
@@ -38,7 +38,7 @@ class driverSelectOrder extends StatelessWidget {
           // Here pull data from a database
           final order = orders[index];
           return Card(
-            margin: EdgeInsets.all(8.0),
+            margin: const EdgeInsets.all(8.0),
             child: Padding(
               padding: const EdgeInsets.all(12.0),
               child: Column(
@@ -48,21 +48,21 @@ class driverSelectOrder extends StatelessWidget {
                     children: <Widget>[
                       Text(
                         '${order.time} ', // Replace with variable for time and day
-                        style: TextStyle(
+                        style: const TextStyle(
                           fontWeight: FontWeight.bold,
                           fontSize: 18,
                         ),
                       ),
                       Text(
                         'Price: RM ${order.price}', // Replace with variable for price
-                        style: TextStyle(
+                        style: const TextStyle(
                           fontWeight: FontWeight.bold,
                           fontSize: 16,
                         ),
                       ),
                     ],
                   ),
-                  SizedBox(height: 10),
+                  const SizedBox(height: 10),
                   Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: <Widget>[
@@ -72,7 +72,7 @@ class driverSelectOrder extends StatelessWidget {
                           'Start: ${order.start}'), // Replace with variable for start point
                     ],
                   ),
-                  SizedBox(height: 10),
+                  const SizedBox(height: 10),
                   Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: <Widget>[
@@ -80,7 +80,7 @@ class driverSelectOrder extends StatelessWidget {
                           'Pax: ${order.pax}'), // Replace with boolean variable
                     ],
                   ),
-                  SizedBox(height: 10),
+                  const SizedBox(height: 10),
                   ElevatedButton(
                     onPressed: () {
                       // Handle accept action
@@ -89,13 +89,13 @@ class driverSelectOrder extends StatelessWidget {
                         MaterialPageRoute(builder: (context) => driverPickup()),
                       );
                     },
-                    child: Text(
+                    child: const Text(
                       'Accept',
                       style: TextStyle(color: Colors.white),
                     ),
                     style: ElevatedButton.styleFrom(
                       primary:
-                          Color.fromRGBO(119, 97, 255, 1.0), // Background color
+                          const Color.fromRGBO(119, 97, 255, 1.0), // Background color
                     ),
                   ),
                 ],

lib/screens/driver/driverLogin.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import '../../../services/auth.dart';
-import '../passenger/userHome/userCustomizedOrder.dart';
 import 'driverHome/driverSelectOrder.dart';
 import 'driverMain.dart';
 
@@ -27,7 +26,7 @@ class _userLoginState extends State<driverLogin> {
         backgroundColor: Colors.white,
         appBar: AppBar(
           leading: IconButton(
-            icon: Icon(
+            icon: const Icon(
               Icons.chevron_left,
               size: 36,
             ),
@@ -50,7 +49,7 @@ class _userLoginState extends State<driverLogin> {
                   crossAxisAlignment: CrossAxisAlignment.center,
                   children: [
                     // Title: Login
-                    Align(
+                    const Align(
                       alignment: Alignment.centerLeft,
                       child: Text(
                         "Driver Login",
@@ -64,7 +63,7 @@ class _userLoginState extends State<driverLogin> {
                     ),
 
                     // Input student email
-                    SizedBox(height: 10),
+                    const SizedBox(height: 10),
                     Container(
                       width: 334,
                       height: 52,
@@ -72,14 +71,14 @@ class _userLoginState extends State<driverLogin> {
                         borderRadius: BorderRadius.circular(8),
                         color: Colors.white,
                         border: Border.all(
-                          color: Color.fromRGBO(165, 165, 165, 1),
+                          color: const Color.fromRGBO(165, 165, 165, 1),
                           width: 1,
                         ),
                       ),
                       child: Padding(
                         padding: const EdgeInsets.symmetric(horizontal: 10.0),
                         child: TextFormField(
-                          decoration: InputDecoration(
+                          decoration: const InputDecoration(
                             hintText: "UPM Email",
                             hintStyle: TextStyle(
                               fontFamily: 'Poppins',
@@ -88,7 +87,7 @@ class _userLoginState extends State<driverLogin> {
                             ),
                             border: InputBorder.none,
                           ),
-                          style: TextStyle(
+                          style: const TextStyle(
                             fontFamily: 'Poppins',
                             fontSize: 20,
                             color: Colors.black, // input  text color
@@ -102,7 +101,7 @@ class _userLoginState extends State<driverLogin> {
                     ),
 
                     // Input Password
-                    SizedBox(height: 10),
+                    const SizedBox(height: 10),
                     Container(
                       width: 334,
                       height: 52,
@@ -110,14 +109,14 @@ class _userLoginState extends State<driverLogin> {
                         borderRadius: BorderRadius.circular(8),
                         color: Colors.white,
                         border: Border.all(
-                          color: Color.fromRGBO(165, 165, 165, 1),
+                          color: const Color.fromRGBO(165, 165, 165, 1),
                           width: 1,
                         ),
                       ),
                       child: Padding(
                         padding: const EdgeInsets.symmetric(horizontal: 10.0),
                         child: TextFormField(
-                          decoration: InputDecoration(
+                          decoration: const InputDecoration(
                             hintText: "Password",
                             hintStyle: TextStyle(
                               fontFamily: 'Poppins',
@@ -126,7 +125,7 @@ class _userLoginState extends State<driverLogin> {
                             ),
                             border: InputBorder.none,
                           ),
-                          style: TextStyle(
+                          style: const TextStyle(
                             fontFamily: 'Poppins',
                             fontSize: 20,
                             color: Colors.black, // input  text color
@@ -142,13 +141,13 @@ class _userLoginState extends State<driverLogin> {
                     ),
 
                     //Check the Auth
-                    SizedBox(height: 20),
+                    const SizedBox(height: 20),
                     Container(
                       width: 334,
                       height: 65,
                       decoration: BoxDecoration(
                         borderRadius: BorderRadius.circular(10),
-                        color: Color.fromRGBO(119, 97, 255, 1.0),
+                        color: const Color.fromRGBO(119, 97, 255, 1.0),
                       ),
                       child: TextButton(
                         onPressed: () async {
@@ -171,7 +170,7 @@ class _userLoginState extends State<driverLogin> {
                           //   }
                           // }
                         },
-                        child: Text(
+                        child: const Text(
                           'Continue',
                           style: TextStyle(
                             fontFamily: 'Poppins',
@@ -185,7 +184,7 @@ class _userLoginState extends State<driverLogin> {
 
 
                     // Forget Password little button
-                    SizedBox(height: 10),
+                    const SizedBox(height: 10),
                     TextButton(
                       onPressed: () {
                         // Navigator.push(
@@ -194,7 +193,7 @@ class _userLoginState extends State<driverLogin> {
                         // );
 
                       },
-                      child: Text(
+                      child: const Text(
                         'Forgot password',
                         style: TextStyle(
                           fontFamily: 'Poppins',

lib/screens/driver/driverMain.dart

@@ -19,13 +19,13 @@ class _driverMainState extends State<driverMain> {
           children: [
 
             Padding(
-              padding: EdgeInsets.all(16.0),
+              padding: const EdgeInsets.all(16.0),
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.center,
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
-                  SizedBox(height: 20),
-                  Align(
+                  const SizedBox(height: 20),
+                  const Align(
                     alignment: Alignment.centerLeft,
                     child: Text(
                       'Make daily trips',
@@ -37,8 +37,8 @@ class _driverMainState extends State<driverMain> {
                       ),
                     ),
                   ),
-                  SizedBox(height: 0),
-                  Align(
+                  const SizedBox(height: 0),
+                  const Align(
                     alignment: Alignment.centerLeft,
                     child: Text(
                       'Maximize earnings',
@@ -49,20 +49,20 @@ class _driverMainState extends State<driverMain> {
                       ),
                     ),
                   ),
-                  SizedBox(height: 70),
+                  const SizedBox(height: 70),
                   Image.asset(
                     'assets/images/putrago.png',
                     height: 70,
                   ),
 
                   //Go to Login page
-                  SizedBox(height: 70),
+                  const SizedBox(height: 70),
                   Container(
                     width: 334,
                     height: 65,
                     decoration: BoxDecoration(
                       borderRadius: BorderRadius.circular(10),
-                      color: Color.fromRGBO(119, 97, 255, 1.0),
+                      color: const Color.fromRGBO(119, 97, 255, 1.0),
                     ),
                     child: TextButton(
                       onPressed: () {
@@ -71,7 +71,7 @@ class _driverMainState extends State<driverMain> {
                           MaterialPageRoute(builder: (context) => driverLogin()),
                         );
                       },
-                      child: Text(
+                      child: const Text(
                         'Login',
                         style: TextStyle(
                           fontFamily: 'Poppins',
@@ -84,7 +84,7 @@ class _driverMainState extends State<driverMain> {
                   ),
 
                   //Go to register page
-                  SizedBox(height: 10),
+                  const SizedBox(height: 10),
                   Container(
                     width: 334,
                     height: 65,
@@ -101,7 +101,7 @@ class _driverMainState extends State<driverMain> {
                           MaterialPageRoute(builder: (context) => driverRegister()),
                         );
                       },
-                      child: Text(
+                      child: const Text(
                         'Register',
                         style: TextStyle(
                           fontFamily: 'Poppins',
@@ -113,8 +113,8 @@ class _driverMainState extends State<driverMain> {
                     ),
                   ),
 
-                  SizedBox(height: 20),
-                  Text(
+                  const SizedBox(height: 20),
+                  const Text(
                     'or',
                     style: TextStyle(
                       fontFamily: 'Poppins',
@@ -124,7 +124,7 @@ class _driverMainState extends State<driverMain> {
                     ),
                   ),
 
-                  SizedBox(height: 20),
+                  const SizedBox(height: 20),
                   TextButton(
                     onPressed: () {
                       // Handle login as a driver button press
@@ -133,7 +133,7 @@ class _driverMainState extends State<driverMain> {
                         MaterialPageRoute(builder: (context) => userMain()),
                       );
                     },
-                    child: Text(
+                    child: const Text(
                       'Login as a User',
                       style: TextStyle(
                         fontFamily: 'Poppins',

lib/screens/driver/driverRegister.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:putra_go/screens/passenger/authenticate/userRegisterSuccess.dart';
 
 import 'driverMain.dart';
 import 'driverResisterSuccess.dart';
@@ -30,7 +29,7 @@ class _userRegisterState extends State<driverRegister> {
         backgroundColor: Colors.white,
         appBar: AppBar(
           leading: IconButton(
-            icon: Icon(
+            icon: const Icon(
               Icons.chevron_left,
               size: 36,
             ),
@@ -53,7 +52,7 @@ class _userRegisterState extends State<driverRegister> {
                   mainAxisAlignment: MainAxisAlignment.start, // Align at the top
                   crossAxisAlignment: CrossAxisAlignment.center,
                   children: [
-                    Align(
+                    const Align(
                       alignment: Alignment.centerLeft,
                       child: Text(
                         "Register as a Driver..",
@@ -67,7 +66,7 @@ class _userRegisterState extends State<driverRegister> {
                     ),
 
                     // Input name
-                    SizedBox(height: 10),
+                    const SizedBox(height: 10),
                     Container(
                       width: 334,
                       height: 52,
@@ -75,14 +74,14 @@ class _userRegisterState extends State<driverRegister> {
                         borderRadius: BorderRadius.circular(8),
                         color: Colors.white,
                         border: Border.all(
-                          color: Color.fromRGBO(165, 165, 165, 1),
+                          color: const Color.fromRGBO(165, 165, 165, 1),
                           width: 1,
                         ),
                       ),
                       child: Padding(
                         padding: const EdgeInsets.symmetric(horizontal: 10.0),
                         child: TextFormField(
-                          decoration: InputDecoration(
+                          decoration: const InputDecoration(
                             hintText: "Name",
                             hintStyle: TextStyle(
                               fontFamily: 'Poppins',
@@ -91,7 +90,7 @@ class _userRegisterState extends State<driverRegister> {
                             ),
                             border: InputBorder.none,
                           ),
-                          style: TextStyle(
+                          style: const TextStyle(
                             fontFamily: 'Poppins',
                             fontSize: 20,
                             color: Colors.black, // input  text color
@@ -105,7 +104,7 @@ class _userRegisterState extends State<driverRegister> {
                     ),
 
                     // Input UPM email
-                    SizedBox(height: 10),
+                    const SizedBox(height: 10),
                     Container(
                       width: 334,
                       height: 52,
@@ -113,14 +112,14 @@ class _userRegisterState extends State<driverRegister> {
                         borderRadius: BorderRadius.circular(8),
                         color: Colors.white,
                         border: Border.all(
-                          color: Color.fromRGBO(165, 165, 165, 1),
+                          color: const Color.fromRGBO(165, 165, 165, 1),
                           width: 1,
                         ),
                       ),
                       child: Padding(
                         padding: const EdgeInsets.symmetric(horizontal: 10.0),
                         child: TextFormField(
-                          decoration: InputDecoration(
+                          decoration: const InputDecoration(
                             hintText: "UPM email",
                             hintStyle: TextStyle(
                               fontFamily: 'Poppins',
@@ -129,7 +128,7 @@ class _userRegisterState extends State<driverRegister> {
                             ),
                             border: InputBorder.none,
                           ),
-                          style: TextStyle(
+                          style: const TextStyle(
                             fontFamily: 'Poppins',
                             fontSize: 20,
                             color: Colors.black, // input  text color
@@ -145,7 +144,7 @@ class _userRegisterState extends State<driverRegister> {
                     ),
 
                     // Input Phone Number
-                    SizedBox(height: 10),
+                    const SizedBox(height: 10),
                     Container(
                       width: 334,
                       height: 52,
@@ -153,14 +152,14 @@ class _userRegisterState extends State<driverRegister> {
                         borderRadius: BorderRadius.circular(8),
                         color: Colors.white,
                         border: Border.all(
-                          color: Color.fromRGBO(165, 165, 165, 1),
+                          color: const Color.fromRGBO(165, 165, 165, 1),
                           width: 1,
                         ),
                       ),
                       child: Padding(
                         padding: const EdgeInsets.symmetric(horizontal: 10.0),
                         child: TextFormField(
-                          decoration: InputDecoration(
+                          decoration: const InputDecoration(
                             hintText: "Phone Number (11-, not 011-)",
                             hintStyle: TextStyle(
                               fontFamily: 'Poppins',
@@ -169,7 +168,7 @@ class _userRegisterState extends State<driverRegister> {
                             ),
                             border: InputBorder.none,
                           ),
-                          style: TextStyle(
+                          style: const TextStyle(
                             fontFamily: 'Poppins',
                             fontSize: 20,
                             color: Colors.black, // input  text color
@@ -185,7 +184,7 @@ class _userRegisterState extends State<driverRegister> {
                     ),
 
                     // Input IC number
-                    SizedBox(height: 10),
+                    const SizedBox(height: 10),
                     Container(
                       width: 334,
                       height: 52,
@@ -193,14 +192,14 @@ class _userRegisterState extends State<driverRegister> {
                         borderRadius: BorderRadius.circular(8),
                         color: Colors.white,
                         border: Border.all(
-                          color: Color.fromRGBO(165, 165, 165, 1),
+                          color: const Color.fromRGBO(165, 165, 165, 1),
                           width: 1,
                         ),
                       ),
                       child: Padding(
                         padding: const EdgeInsets.symmetric(horizontal: 10.0),
                         child: TextFormField(
-                          decoration: InputDecoration(
+                          decoration: const InputDecoration(
                             hintText: "IC Number / Passort Number",
                             hintStyle: TextStyle(
                               fontFamily: 'Poppins',
@@ -209,13 +208,13 @@ class _userRegisterState extends State<driverRegister> {
                             ),
                             border: InputBorder.none,
                           ),
-                          style: TextStyle(
+                          style: const TextStyle(
                             fontFamily: 'Poppins',
                             fontSize: 20,
                             color: Colors.black, // input  text color
                           ),
                           validator: (val) =>
-                          val!.length != 12 || val!.length != 9 ? 'Enter a valid IC/Passport Number' : null,
+                          val!.length != 12 || val.length != 9 ? 'Enter a valid IC/Passport Number' : null,
                           obscureText: false,
                           onChanged: (val) {
                             setState(() => icNumber = val);
@@ -225,7 +224,7 @@ class _userRegisterState extends State<driverRegister> {
                     ),
 
                     // Input CarID
-                    SizedBox(height: 10),
+                    const SizedBox(height: 10),
                     Container(
                       width: 334,
                       height: 52,
@@ -233,14 +232,14 @@ class _userRegisterState extends State<driverRegister> {
                         borderRadius: BorderRadius.circular(8),
                         color: Colors.white,
                         border: Border.all(
-                          color: Color.fromRGBO(165, 165, 165, 1),
+                          color: const Color.fromRGBO(165, 165, 165, 1),
                           width: 1,
                         ),
                       ),
                       child: Padding(
                         padding: const EdgeInsets.symmetric(horizontal: 10.0),
                         child: TextFormField(
-                          decoration: InputDecoration(
+                          decoration: const InputDecoration(
                             hintText: "Car ID (Plate Number)",
                             hintStyle: TextStyle(
                               fontFamily: 'Poppins',
@@ -249,7 +248,7 @@ class _userRegisterState extends State<driverRegister> {
                             ),
                             border: InputBorder.none,
                           ),
-                          style: TextStyle(
+                          style: const TextStyle(
                             fontFamily: 'Poppins',
                             fontSize: 20,
                             color: Colors.black, // input  text color
@@ -263,7 +262,7 @@ class _userRegisterState extends State<driverRegister> {
                     ),
 
                     // Input Car Brand
-                    SizedBox(height: 10),
+                    const SizedBox(height: 10),
                     Container(
                       width: 334,
                       height: 52,
@@ -271,14 +270,14 @@ class _userRegisterState extends State<driverRegister> {
                         borderRadius: BorderRadius.circular(8),
                         color: Colors.white,
                         border: Border.all(
-                          color: Color.fromRGBO(165, 165, 165, 1),
+                          color: const Color.fromRGBO(165, 165, 165, 1),
                           width: 1,
                         ),
                       ),
                       child: Padding(
                         padding: const EdgeInsets.symmetric(horizontal: 10.0),
                         child: TextFormField(
-                          decoration: InputDecoration(
+                          decoration: const InputDecoration(
                             hintText: "Car Brand",
                             hintStyle: TextStyle(
                               fontFamily: 'Poppins',
@@ -287,7 +286,7 @@ class _userRegisterState extends State<driverRegister> {
                             ),
                             border: InputBorder.none,
                           ),
-                          style: TextStyle(
+                          style: const TextStyle(
                             fontFamily: 'Poppins',
                             fontSize: 20,
                             color: Colors.black, // input  text color
@@ -301,7 +300,7 @@ class _userRegisterState extends State<driverRegister> {
                     ),
 
                     // Input Car Color
-                    SizedBox(height: 10),
+                    const SizedBox(height: 10),
                     Container(
                       width: 334,
                       height: 52,
@@ -309,14 +308,14 @@ class _userRegisterState extends State<driverRegister> {
                         borderRadius: BorderRadius.circular(8),
                         color: Colors.white,
                         border: Border.all(
-                          color: Color.fromRGBO(165, 165, 165, 1),
+                          color: const Color.fromRGBO(165, 165, 165, 1),
                           width: 1,
                         ),
                       ),
                       child: Padding(
                         padding: const EdgeInsets.symmetric(horizontal: 10.0),
                         child: TextFormField(
-                          decoration: InputDecoration(
+                          decoration: const InputDecoration(
                             hintText: "Car Color",
                             hintStyle: TextStyle(
                               fontFamily: 'Poppins',
@@ -325,7 +324,7 @@ class _userRegisterState extends State<driverRegister> {
                             ),
                             border: InputBorder.none,
                           ),
-                          style: TextStyle(
+                          style: const TextStyle(
                             fontFamily: 'Poppins',
                             fontSize: 20,
                             color: Colors.black, // input  text color
@@ -340,7 +339,7 @@ class _userRegisterState extends State<driverRegister> {
 
 
                     // Input Password
-                    SizedBox(height: 10),
+                    const SizedBox(height: 10),
                     Container(
                       width: 334,
                       height: 52,
@@ -348,14 +347,14 @@ class _userRegisterState extends State<driverRegister> {
                         borderRadius: BorderRadius.circular(8),
                         color: Colors.white,
                         border: Border.all(
-                          color: Color.fromRGBO(165, 165, 165, 1),
+                          color: const Color.fromRGBO(165, 165, 165, 1),
                           width: 1,
                         ),
                       ),
                       child: Padding(
                         padding: const EdgeInsets.symmetric(horizontal: 10.0),
                         child: TextFormField(
-                          decoration: InputDecoration(
+                          decoration: const InputDecoration(
                             hintText: "Password",
                             hintStyle: TextStyle(
                               fontFamily: 'Poppins',
@@ -364,7 +363,7 @@ class _userRegisterState extends State<driverRegister> {
                             ),
                             border: InputBorder.none,
                           ),
-                          style: TextStyle(
+                          style: const TextStyle(
                             fontFamily: 'Poppins',
                             fontSize: 20,
                             color: Colors.black, // input  text color
@@ -380,7 +379,7 @@ class _userRegisterState extends State<driverRegister> {
                     ),
 
                     // Check Password
-                    SizedBox(height: 10),
+                    const SizedBox(height: 10),
                     Container(
                       width: 334,
                       height: 52,
@@ -388,14 +387,14 @@ class _userRegisterState extends State<driverRegister> {
                         borderRadius: BorderRadius.circular(8),
                         color: Colors.white,
                         border: Border.all(
-                          color: Color.fromRGBO(165, 165, 165, 1),
+                          color: const Color.fromRGBO(165, 165, 165, 1),
                           width: 1,
                         ),
                       ),
                       child: Padding(
                         padding: const EdgeInsets.symmetric(horizontal: 10.0),
                         child: TextFormField(
-                          decoration: InputDecoration(
+                          decoration: const InputDecoration(
                             hintText: "Password again",
                             hintStyle: TextStyle(
                               fontFamily: 'Poppins',
@@ -404,7 +403,7 @@ class _userRegisterState extends State<driverRegister> {
                             ),
                             border: InputBorder.none,
                           ),
-                          style: TextStyle(
+                          style: const TextStyle(
                             fontFamily: 'Poppins',
                             fontSize: 20,
                             color: Colors.black, // input  text color
@@ -417,13 +416,13 @@ class _userRegisterState extends State<driverRegister> {
                     ),
 
                     // Continue Button
-                    SizedBox(height: 20),
+                    const SizedBox(height: 20),
                     Container(
                       width: 334,
                       height: 65,
                       decoration: BoxDecoration(
                         borderRadius: BorderRadius.circular(10),
-                        color: Color.fromRGBO(119, 97, 255, 1.0),
+                        color: const Color.fromRGBO(119, 97, 255, 1.0),
                       ),
                       child: TextButton(
                         onPressed: () {
@@ -433,7 +432,7 @@ class _userRegisterState extends State<driverRegister> {
                             MaterialPageRoute(builder: (context) => driverRegisterSuccess()),
                           );
                         },
-                        child: Text(
+                        child: const Text(
                           'Continue',
                           style: TextStyle(
                             fontFamily: 'Poppins',
@@ -444,7 +443,7 @@ class _userRegisterState extends State<driverRegister> {
                         ),
                       ),
                     ),
-                    SizedBox(height: 10),
+                    const SizedBox(height: 10),
                   ],
                 ),
               ),

lib/screens/driver/driverResisterSuccess.dart

@@ -21,7 +21,7 @@ class driverRegisterSuccess extends StatelessWidget {
               width: 140,
             ),
 
-            Text(
+            const Text(
               'Your account is successfully registered',
               style: TextStyle(
                 fontFamily: 'Poppins',
@@ -30,7 +30,7 @@ class driverRegisterSuccess extends StatelessWidget {
                 color: Colors.green, // Adjust color as needed
               ),
             ),
-            SizedBox(height: 70),
+            const SizedBox(height: 70),
 
             Align(
               alignment: Alignment.center,
@@ -40,7 +40,7 @@ class driverRegisterSuccess extends StatelessWidget {
                 height: 65,
                 decoration: BoxDecoration(
                   borderRadius: BorderRadius.circular(10),
-                  color: Color.fromRGBO(119, 97, 255, 1.0),
+                  color: const Color.fromRGBO(119, 97, 255, 1.0),
                 ),
                 child: TextButton(
                   onPressed: () {
@@ -50,7 +50,7 @@ class driverRegisterSuccess extends StatelessWidget {
                       MaterialPageRoute(builder: (context) => driverLogin()),
                     );
                   },
-                  child: Text(
+                  child: const Text(
                     'Back to driver login',
                     style: TextStyle(
                       fontFamily: 'Poppins',
@@ -63,7 +63,7 @@ class driverRegisterSuccess extends StatelessWidget {
               ),
             ),
 
-            SizedBox(height: 10),
+            const SizedBox(height: 10),
           ],
         ),
       ),

lib/screens/passenger/authenticate/authenticate.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:putra_go/screens/passenger/authenticate/userLogin.dart';
-import 'package:putra_go/screens/passenger/authenticate/userRegister.dart';
 
 class Authenticate extends StatefulWidget {
   @override

lib/screens/passenger/authenticate/userLogin.dart

@@ -28,14 +28,14 @@ class _userLoginState extends State<userLogin> {
         leading:
         //back to previous page
         IconButton(
-          icon: Icon(
+          icon: const Icon(
             Icons.chevron_left,
             size: 36,
           ),
           onPressed: () {
             Navigator.push(
               context,
-              MaterialPageRoute(builder: (context) => userMain()),
+              MaterialPageRoute(builder: (context) => const userMain()),
             );
           },
         ),
@@ -52,7 +52,7 @@ class _userLoginState extends State<userLogin> {
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
                   // Title: Login
-                  Align(
+                  const Align(
                     alignment: Alignment.centerLeft,
                     child: Text(
                       "Login",
@@ -66,7 +66,7 @@ class _userLoginState extends State<userLogin> {
                   ),
 
                   // Input student email
-                  SizedBox(height: 10),
+                  const SizedBox(height: 10),
                   Container(
                     width: 334,
                     height: 52,
@@ -74,14 +74,14 @@ class _userLoginState extends State<userLogin> {
                       borderRadius: BorderRadius.circular(8),
                       color: Colors.white,
                       border: Border.all(
-                        color: Color.fromRGBO(165, 165, 165, 1),
+                        color: const Color.fromRGBO(165, 165, 165, 1),
                         width: 1,
                       ),
                     ),
                     child: Padding(
                       padding: const EdgeInsets.symmetric(horizontal: 10.0),
                       child: TextFormField(
-                        decoration: InputDecoration(
+                        decoration: const InputDecoration(
                           hintText: "UPM Email",
                           hintStyle: TextStyle(
                             fontFamily: 'Poppins',
@@ -90,7 +90,7 @@ class _userLoginState extends State<userLogin> {
                           ),
                           border: InputBorder.none,
                         ),
-                        style: TextStyle(
+                        style: const TextStyle(
                           fontFamily: 'Poppins',
                           fontSize: 20,
                           color: Colors.black, // input  text color
@@ -104,7 +104,7 @@ class _userLoginState extends State<userLogin> {
                   ),
 
                   // Input Password
-                  SizedBox(height: 10),
+                  const SizedBox(height: 10),
                   Container(
                     width: 334,
                     height: 52,
@@ -112,14 +112,14 @@ class _userLoginState extends State<userLogin> {
                       borderRadius: BorderRadius.circular(8),
                       color: Colors.white,
                       border: Border.all(
-                        color: Color.fromRGBO(165, 165, 165, 1),
+                        color: const Color.fromRGBO(165, 165, 165, 1),
                         width: 1,
                       ),
                     ),
                     child: Padding(
                       padding: const EdgeInsets.symmetric(horizontal: 10.0),
                       child: TextFormField(
-                        decoration: InputDecoration(
+                        decoration: const InputDecoration(
                           hintText: "Password",
                           hintStyle: TextStyle(
                             fontFamily: 'Poppins',
@@ -128,7 +128,7 @@ class _userLoginState extends State<userLogin> {
                           ),
                           border: InputBorder.none,
                         ),
-                        style: TextStyle(
+                        style: const TextStyle(
                           fontFamily: 'Poppins',
                           fontSize: 20,
                           color: Colors.black, // input  text color
@@ -144,13 +144,13 @@ class _userLoginState extends State<userLogin> {
                   ),
 
                   // Login
-                  SizedBox(height: 20),
+                  const SizedBox(height: 20),
                   Container(
                     width: 334,
                     height: 65,
                     decoration: BoxDecoration(
                       borderRadius: BorderRadius.circular(10),
-                      color: Color.fromRGBO(119, 97, 255, 1.0),
+                      color: const Color.fromRGBO(119, 97, 255, 1.0),
                     ),
                     child: TextButton(
                       onPressed: () async {
@@ -174,7 +174,7 @@ class _userLoginState extends State<userLogin> {
                         //   }
                         // }
                       },
-                      child: Text(
+                      child: const Text(
                         'Continue',
                         style: TextStyle(
                           fontFamily: 'Poppins',
@@ -187,12 +187,12 @@ class _userLoginState extends State<userLogin> {
                   ),
 
                   // Forget Password little button
-                  SizedBox(height: 10),
+                  const SizedBox(height: 10),
                   TextButton(
                     onPressed: () {
                       // Handle forgot password button press
                     },
-                    child: Text(
+                    child: const Text(
                       'Forgot password',
                       style: TextStyle(
                         fontFamily: 'Poppins',

lib/screens/passenger/authenticate/userRegister.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:putra_go/screens/passenger/authenticate/userRegisterSuccess.dart';
 
 import '../../../services/auth.dart';
 
@@ -32,7 +31,7 @@ class _userRegisterState extends State<userRegister> {
       backgroundColor: Colors.white,
       appBar: AppBar(
         leading: IconButton(
-          icon: Icon(
+          icon: const Icon(
             Icons.chevron_left,
             size: 36,
           ),
@@ -53,7 +52,7 @@ class _userRegisterState extends State<userRegister> {
                 mainAxisAlignment: MainAxisAlignment.start, // Align at the top
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
-                  Align(
+                  const Align(
                     alignment: Alignment.centerLeft,
                     child: Text(
                       "Register",
@@ -67,7 +66,7 @@ class _userRegisterState extends State<userRegister> {
                   ),
 
                   // Input name
-                  SizedBox(height: 10),
+                  const SizedBox(height: 10),
                   Container(
                     width: 334,
                     height: 52,
@@ -75,7 +74,7 @@ class _userRegisterState extends State<userRegister> {
                       borderRadius: BorderRadius.circular(8),
                       color: Colors.white,
                       border: Border.all(
-                        color: Color.fromRGBO(165, 165, 165, 1),
+                        color: const Color.fromRGBO(165, 165, 165, 1),
                         width: 1,
                       ),
                     ),
@@ -83,7 +82,7 @@ class _userRegisterState extends State<userRegister> {
                       padding: const EdgeInsets.symmetric(horizontal: 20.0),
                       child:
                       TextFormField(
-                        decoration: InputDecoration(
+                        decoration: const InputDecoration(
                           hintText: "Name",
                           hintStyle: TextStyle(
                             fontFamily: 'Poppins',
@@ -92,7 +91,7 @@ class _userRegisterState extends State<userRegister> {
                           ),
                           border: InputBorder.none,
                         ),
-                        style: TextStyle(
+                        style: const TextStyle(
                           fontFamily: 'Poppins',
                           // fontSize: 20,
                           color: Colors.black, // input  text color
@@ -106,7 +105,7 @@ class _userRegisterState extends State<userRegister> {
                   ),
 
                   // Input UPM email
-                  SizedBox(height: 20),
+                  const SizedBox(height: 20),
                   Container(
                     width: 334,
                     height: 52,
@@ -114,14 +113,14 @@ class _userRegisterState extends State<userRegister> {
                       borderRadius: BorderRadius.circular(8),
                       color: Colors.white,
                       border: Border.all(
-                        color: Color.fromRGBO(165, 165, 165, 1),
+                        color: const Color.fromRGBO(165, 165, 165, 1),
                         width: 1,
                       ),
                     ),
                     child: Padding(
                       padding: const EdgeInsets.symmetric(horizontal: 10.0),
                       child: TextFormField(
-                        decoration: InputDecoration(
+                        decoration: const InputDecoration(
                           hintText: "UPM email",
                           hintStyle: TextStyle(
                             fontFamily: 'Poppins',
@@ -130,7 +129,7 @@ class _userRegisterState extends State<userRegister> {
                           ),
                           border: InputBorder.none,
                         ),
-                        style: TextStyle(
+                        style: const TextStyle(
                           fontFamily: 'Poppins',
                           // fontSize: 20,
                           color: Colors.black, // input  text color
@@ -146,7 +145,7 @@ class _userRegisterState extends State<userRegister> {
                   ),
 
                   // Input Phone Number
-                  SizedBox(height: 20),
+                  const SizedBox(height: 20),
                   Container(
                     width: 334,
                     height: 52,
@@ -154,14 +153,14 @@ class _userRegisterState extends State<userRegister> {
                       borderRadius: BorderRadius.circular(8),
                       color: Colors.white,
                       border: Border.all(
-                        color: Color.fromRGBO(165, 165, 165, 1),
+                        color: const Color.fromRGBO(165, 165, 165, 1),
                         width: 1,
                       ),
                     ),
                     child: Padding(
                       padding: const EdgeInsets.symmetric(horizontal: 10.0),
                       child: TextFormField(
-                        decoration: InputDecoration(
+                        decoration: const InputDecoration(
                           hintText: "Phone Number (11-, not 011-)",
                           hintStyle: TextStyle(
                             fontFamily: 'Poppins',
@@ -170,7 +169,7 @@ class _userRegisterState extends State<userRegister> {
                           ),
                           border: InputBorder.none,
                         ),
-                        style: TextStyle(
+                        style: const TextStyle(
                           fontFamily: 'Poppins',
                           // fontSize: 20,
                           color: Colors.black, // input  text color
@@ -186,7 +185,7 @@ class _userRegisterState extends State<userRegister> {
                   ),
 
                   // Input IC number
-                  SizedBox(height: 20),
+                  const SizedBox(height: 20),
                   Container(
                     width: 334,
                     height: 52,
@@ -194,14 +193,14 @@ class _userRegisterState extends State<userRegister> {
                       borderRadius: BorderRadius.circular(8),
                       color: Colors.white,
                       border: Border.all(
-                        color: Color.fromRGBO(165, 165, 165, 1),
+                        color: const Color.fromRGBO(165, 165, 165, 1),
                         width: 1,
                       ),
                     ),
                     child: Padding(
                       padding: const EdgeInsets.symmetric(horizontal: 10.0),
                       child: TextFormField(
-                        decoration: InputDecoration(
+                        decoration: const InputDecoration(
                           hintText: "IC Number / Passort Number",
                           hintStyle: TextStyle(
                             fontFamily: 'Poppins',
@@ -210,7 +209,7 @@ class _userRegisterState extends State<userRegister> {
                           ),
                           border: InputBorder.none,
                         ),
-                        style: TextStyle(
+                        style: const TextStyle(
                           fontFamily: 'Poppins',
                           // fontSize: 20,
                           color: Colors.black, // input  text color
@@ -226,7 +225,7 @@ class _userRegisterState extends State<userRegister> {
                   ),
 
                   // Input Password
-                  SizedBox(height: 20),
+                  const SizedBox(height: 20),
                   Container(
                     width: 334,
                     height: 52,
@@ -234,14 +233,14 @@ class _userRegisterState extends State<userRegister> {
                       borderRadius: BorderRadius.circular(8),
                       color: Colors.white,
                       border: Border.all(
-                        color: Color.fromRGBO(165, 165, 165, 1),
+                        color: const Color.fromRGBO(165, 165, 165, 1),
                         width: 1,
                       ),
                     ),
                     child: Padding(
                       padding: const EdgeInsets.symmetric(horizontal: 10.0),
                       child: TextFormField(
-                        decoration: InputDecoration(
+                        decoration: const InputDecoration(
                           hintText: "Password",
                           hintStyle: TextStyle(
                             fontFamily: 'Poppins',
@@ -250,7 +249,7 @@ class _userRegisterState extends State<userRegister> {
                           ),
                           border: InputBorder.none,
                         ),
-                        style: TextStyle(
+                        style: const TextStyle(
                           fontFamily: 'Poppins',
                           // fontSize: 20,
                           color: Colors.black, // input  text color
@@ -266,7 +265,7 @@ class _userRegisterState extends State<userRegister> {
                   ),
 
                   // Check Password
-                  SizedBox(height: 20),
+                  const SizedBox(height: 20),
                   Container(
                     width: 334,
                     height: 52,
@@ -274,14 +273,14 @@ class _userRegisterState extends State<userRegister> {
                       borderRadius: BorderRadius.circular(8),
                       color: Colors.white,
                       border: Border.all(
-                        color: Color.fromRGBO(165, 165, 165, 1),
+                        color: const Color.fromRGBO(165, 165, 165, 1),
                         width: 1,
                       ),
                     ),
                     child: Padding(
                       padding: const EdgeInsets.symmetric(horizontal: 10.0),
                       child: TextFormField(
-                        decoration: InputDecoration(
+                        decoration: const InputDecoration(
                           hintText: "Password again",
                           hintStyle: TextStyle(
                             fontFamily: 'Poppins',
@@ -290,7 +289,7 @@ class _userRegisterState extends State<userRegister> {
                           ),
                           border: InputBorder.none,
                         ),
-                        style: TextStyle(
+                        style: const TextStyle(
                           fontFamily: 'Poppins',
                           // fontSize: 20,
                           color: Colors.black, // input  text color
@@ -303,13 +302,13 @@ class _userRegisterState extends State<userRegister> {
                   ),
 
                   // Register
-                  SizedBox(height: 30),
+                  const SizedBox(height: 30),
                   Container(
                     width: 334,
                     height: 65,
                     decoration: BoxDecoration(
                       borderRadius: BorderRadius.circular(10),
-                      color: Color.fromRGBO(119, 97, 255, 1.0),
+                      color: const Color.fromRGBO(119, 97, 255, 1.0),
                     ),
                     child: TextButton(
                       onPressed: () async {
@@ -337,7 +336,7 @@ class _userRegisterState extends State<userRegister> {
                         //   MaterialPageRoute(builder: (context) => userRegisterSuccess()),
                         // );
                       },
-                      child: Text(
+                      child: const Text(
                         'Register',
                         style: TextStyle(
                           fontFamily: 'Poppins',
@@ -349,13 +348,13 @@ class _userRegisterState extends State<userRegister> {
                     ),
                   ),
 
-                  SizedBox(height: 20),
+                  const SizedBox(height: 20),
                 ],
               ),
             ),
             Text(
               error,
-              style: TextStyle(color: Colors.red, fontSize: 14.0),
+              style: const TextStyle(color: Colors.red, fontSize: 14.0),
             ),
 
           ],

lib/screens/passenger/authenticate/userRegisterSuccess.dart

@@ -19,7 +19,7 @@ class userRegisterSuccess extends StatelessWidget {
               width: 140,
             ),
             
-            Text(
+            const Text(
               'Your account is successfully registered',
               style: TextStyle(
                 fontFamily: 'Poppins',
@@ -28,7 +28,7 @@ class userRegisterSuccess extends StatelessWidget {
                 color: Colors.green, // Adjust color as needed
               ),
             ),
-            SizedBox(height: 70),
+            const SizedBox(height: 70),
 
         Align(
           alignment: Alignment.center,
@@ -38,7 +38,7 @@ class userRegisterSuccess extends StatelessWidget {
             height: 65,
             decoration: BoxDecoration(
               borderRadius: BorderRadius.circular(10),
-              color: Color.fromRGBO(119, 97, 255, 1.0),
+              color: const Color.fromRGBO(119, 97, 255, 1.0),
             ),
             child: TextButton(
               onPressed: () {
@@ -48,7 +48,7 @@ class userRegisterSuccess extends StatelessWidget {
                   MaterialPageRoute(builder: (context) => userLogin()),
                 );
               },
-              child: Text(
+              child: const Text(
                 'Back to user login',
                 style: TextStyle(
                   fontFamily: 'Poppins',
@@ -61,7 +61,7 @@ class userRegisterSuccess extends StatelessWidget {
           ),
           ),
 
-            SizedBox(height: 10),
+            const SizedBox(height: 10),
           ],
         ),
       ),

lib/screens/passenger/userHome/userCustomizedOrder.dart

@@ -62,7 +62,7 @@ class _CustomOrderPageState extends State<userCustomizedOrder> {
       //Title
       appBar: AppBar(
         leading: IconButton(
-          icon: Icon(
+          icon: const Icon(
             Icons.chevron_left,
             size: 36,
           ),
@@ -77,8 +77,8 @@ class _CustomOrderPageState extends State<userCustomizedOrder> {
         //Logout button
         actions: <Widget>[
           TextButton.icon(
-            icon: Icon(Icons.person),
-            label: Text('Logout'),
+            icon: const Icon(Icons.person),
+            label: const Text('Logout'),
             style: TextButton.styleFrom(
               foregroundColor: Colors.black, // text color
             ),
@@ -102,7 +102,7 @@ class _CustomOrderPageState extends State<userCustomizedOrder> {
                 child: Column(
                   mainAxisSize: MainAxisSize.min,
                   children: [
-                    Align(
+                    const Align(
                       alignment: Alignment.center,
                       child: Text(
                         "Customized your order",
@@ -115,11 +115,11 @@ class _CustomOrderPageState extends State<userCustomizedOrder> {
                       ),
                     ),
 
-                    SizedBox(height: 14),
+                    const SizedBox(height: 14),
                     Container(
                       width: 334,
                       height: 52,
-                      padding: EdgeInsets.symmetric(horizontal: 12),
+                      padding: const EdgeInsets.symmetric(horizontal: 12),
                       decoration: BoxDecoration(
                         borderRadius: BorderRadius.circular(8),
                         border: Border.all(color: Colors.grey),
@@ -131,9 +131,9 @@ class _CustomOrderPageState extends State<userCustomizedOrder> {
                             borderRadius: BorderRadius.circular(8),
                             borderSide: BorderSide.none,
                           ),
-                          contentPadding: EdgeInsets.fromLTRB(10, 0, 0, 0),
+                          contentPadding: const EdgeInsets.fromLTRB(10, 0, 0, 0),
                         ),
-                        hint: Text('Select your route'),
+                        hint: const Text('Select your route'),
                         onChanged: (newValue) {
                           setState(() {
                             selectedRoute = newValue;
@@ -142,35 +142,35 @@ class _CustomOrderPageState extends State<userCustomizedOrder> {
                         },
                         items: routes.map((number) {
                           return DropdownMenuItem(
-                            child: Text('$number'),
                             value: number,
+                            child: Text(number),
                           );
                         }).toList(),
                       ),
                     ),
 
-                    SizedBox(height: 20),
+                    const SizedBox(height: 20),
                     Container(
                       width: 334,
                       height: 52,
                       decoration: BoxDecoration(
                         borderRadius: BorderRadius.circular(8),
                         border: Border.all(
-                          color: Color.fromRGBO(165, 165, 165, 1),
+                          color: const Color.fromRGBO(165, 165, 165, 1),
                           width: 1,
                         ),
                       ),
                       child: Padding(
                         padding: const EdgeInsets.symmetric(horizontal: 10.0),
                         child:   TextFormField(
-                          decoration: InputDecoration(
+                          decoration: const InputDecoration(
                             hintText: "   Type your start location",
                             hintStyle: TextStyle(
                               fontFamily: 'Poppins',
                             ),
                             border: InputBorder.none,
                           ),
-                          style: TextStyle(
+                          style: const TextStyle(
                             fontFamily: 'Poppins',
                             // fontSize: 20,
                             color: Colors.black, // input  text color
@@ -183,14 +183,14 @@ class _CustomOrderPageState extends State<userCustomizedOrder> {
                       ),
                     ),
 
-                    SizedBox(height: 20),
+                    const SizedBox(height: 20),
                     Container(
                       width: 334,
                       height: 50,
                       decoration: BoxDecoration(
                         borderRadius: BorderRadius.circular(8),
                         border: Border.all(
-                          color: Color.fromRGBO(165, 165, 165, 1),
+                          color: const Color.fromRGBO(165, 165, 165, 1),
                           width: 1,
                         ),
                       ),
@@ -207,11 +207,11 @@ class _CustomOrderPageState extends State<userCustomizedOrder> {
                       ),
                     ),
 
-                    SizedBox(height: 20),
+                    const SizedBox(height: 20),
                     Container(
                       width: 334, // Set the width to 334
                       height: 52, // Set the height to 52
-                      padding: EdgeInsets.symmetric(horizontal: 12), // You can adjust the horizontal padding if needed
+                      padding: const EdgeInsets.symmetric(horizontal: 12), // You can adjust the horizontal padding if needed
                       decoration: BoxDecoration(
                         borderRadius: BorderRadius.circular(8), // Adjust the border radius if needed
                         border: Border.all(color: Colors.grey), // Add a border with a grey color
@@ -223,9 +223,9 @@ class _CustomOrderPageState extends State<userCustomizedOrder> {
                             borderRadius: BorderRadius.circular(8), // Match the border radius with the Container
                             borderSide: BorderSide.none, // Use a transparent border side to hide the underline
                           ),
-                          contentPadding: EdgeInsets.fromLTRB(11, 0, 0, 0), // Adjust the content padding to center the dropdown value and hint
+                          contentPadding: const EdgeInsets.fromLTRB(11, 0, 0, 0), // Adjust the content padding to center the dropdown value and hint
                         ),
-                        hint: Text('Pax (how may persons)'),
+                        hint: const Text('Pax (how may persons)'),
                         onChanged: (newValue) {
                           setState(() {
                             selectedPax = newValue;
@@ -234,8 +234,8 @@ class _CustomOrderPageState extends State<userCustomizedOrder> {
                         },
                         items: paxNumbers.map((number) {
                           return DropdownMenuItem(
-                            child: Text('$number'),
                             value: number,
+                            child: Text('$number'),
                           );
                         }).toList(),
                       ),
@@ -275,13 +275,13 @@ class _CustomOrderPageState extends State<userCustomizedOrder> {
                     //   }).toList(),
                     // ),
 
-                    SizedBox(height: 30),
+                    const SizedBox(height: 30),
                     Container(
                       width: 334,
                       height: 65,
                       decoration: BoxDecoration(
                         borderRadius: BorderRadius.circular(10),
-                        color: Color.fromRGBO(119, 97, 255, 1.0),
+                        color: const Color.fromRGBO(119, 97, 255, 1.0),
                       ),
                       child: TextButton(
                         onPressed: () async {
@@ -290,7 +290,7 @@ class _CustomOrderPageState extends State<userCustomizedOrder> {
                             MaterialPageRoute(builder: (context) => userMatchingDriver()),
                           );
                         },
-                        child: Text(
+                        child: const Text(
                           'Countinue',
                           style: TextStyle(
                             fontFamily: 'Poppins',

lib/screens/passenger/userHome/userMatchingDriver.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:putra_go/screens/passenger/userHome/userCustomizedOrder.dart';
 
-import '../../driver/driverLogin.dart';
 
 
 class userMatchingDriver extends StatelessWidget {
@@ -16,7 +15,7 @@ class userMatchingDriver extends StatelessWidget {
           crossAxisAlignment: CrossAxisAlignment.center,
           children: [
 
-            Text(
+            const Text(
               'Looking for driver to accept..',
               style: TextStyle(
                 fontFamily: 'Poppins',
@@ -26,7 +25,7 @@ class userMatchingDriver extends StatelessWidget {
               ),
             ),
 
-            Text(
+            const Text(
               'Do no worry,',
               style: TextStyle(
                 fontFamily: 'Poppins',
@@ -36,7 +35,7 @@ class userMatchingDriver extends StatelessWidget {
               ),
             ),
 
-            Text(
+            const Text(
               'It needs some time~',
               style: TextStyle(
                 fontFamily: 'Poppins',
@@ -46,14 +45,14 @@ class userMatchingDriver extends StatelessWidget {
               ),
             ),
 
-            SizedBox(height: 10),
+            const SizedBox(height: 10),
             Image.asset(
               'assets/images/matchingLogo.png',
               height: 170,
               width: 170,
             ),
 
-            SizedBox(height: 40),
+            const SizedBox(height: 40),
             Align(
               alignment: Alignment.center,
               child:
@@ -62,7 +61,7 @@ class userMatchingDriver extends StatelessWidget {
                 height: 65,
                 decoration: BoxDecoration(
                   borderRadius: BorderRadius.circular(10),
-                  color: Color.fromRGBO(255, 120, 116, 1),
+                  color: const Color.fromRGBO(255, 120, 116, 1),
                 ),
                 child: TextButton(
                   onPressed: () {
@@ -71,7 +70,7 @@ class userMatchingDriver extends StatelessWidget {
                       MaterialPageRoute(builder: (context) => userCustomizedOrder()),
                     );
                   },
-                  child: Text(
+                  child: const Text(
                     'Cancle this order',
                     style: TextStyle(
                       fontFamily: 'Poppins',
@@ -84,7 +83,7 @@ class userMatchingDriver extends StatelessWidget {
               ),
             ),
 
-            SizedBox(height: 10),
+            const SizedBox(height: 10),
           ],
         ),
       ),

lib/screens/passenger/userHome/userOrderCancelled.dart

@@ -2,6 +2,8 @@ import 'package:flutter/material.dart';
 import '../userMain.dart';
 
 class userOrderCancelled extends StatelessWidget {
+  const userOrderCancelled({Key? key}) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -13,7 +15,7 @@ class userOrderCancelled extends StatelessWidget {
           crossAxisAlignment: CrossAxisAlignment.center,
           children: [
 
-            Text(
+            const Text(
               'Opps..',
               style: TextStyle(
                 fontFamily: 'Poppins',
@@ -23,9 +25,9 @@ class userOrderCancelled extends StatelessWidget {
               ),
             ),
 
-            SizedBox(height: 10),
+            const SizedBox(height: 10),
 
-            Text(
+            const Text(
               'Your driver cancelled this order',
               style: TextStyle(
                 fontFamily: 'Poppins',
@@ -34,7 +36,7 @@ class userOrderCancelled extends StatelessWidget {
                 color: Colors.black, // Adjust color as needed
               ),
             ),
-            SizedBox(height: 70),
+            const SizedBox(height: 70),
 
             Align(
               alignment: Alignment.center,
@@ -44,7 +46,7 @@ class userOrderCancelled extends StatelessWidget {
                 height: 65,
                 decoration: BoxDecoration(
                   borderRadius: BorderRadius.circular(10),
-                  color: Color.fromRGBO(119, 97, 255, 1.0),
+                  color: const Color.fromRGBO(119, 97, 255, 1.0),
                 ),
                 child: TextButton(
                   onPressed: () {
@@ -54,7 +56,7 @@ class userOrderCancelled extends StatelessWidget {
                       MaterialPageRoute(builder: (context) => userMain()),
                     );
                   },
-                  child: Text(
+                  child: const Text(
                     'Back to main page',
                     style: TextStyle(
                       fontFamily: 'Poppins',
@@ -67,7 +69,7 @@ class userOrderCancelled extends StatelessWidget {
               ),
             ),
 
-            SizedBox(height: 10),
+            const SizedBox(height: 10),
           ],
         ),
       ),

lib/screens/passenger/userMain.dart

@@ -4,6 +4,8 @@ import 'authenticate/userLogin.dart';
 import 'authenticate/userRegister.dart';
 
 class userMain extends StatelessWidget {
+  const userMain({Key? key}) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -14,13 +16,13 @@ class userMain extends StatelessWidget {
           children: <Widget>[
 
             Padding(
-              padding: EdgeInsets.all(16.0),
+              padding: const EdgeInsets.all(16.0),
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.center,
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
-                  SizedBox(height: 20),
-                  Align(
+                  const SizedBox(height: 20),
+                  const Align(
                     alignment: Alignment.centerLeft,
                     child: Text(
                       'Share the ride',
@@ -32,8 +34,8 @@ class userMain extends StatelessWidget {
                       ),
                     ),
                   ),
-                  SizedBox(height: 0),
-                  Align(
+                  const SizedBox(height: 0),
+                  const Align(
                     alignment: Alignment.centerLeft,
                     child: Text(
                       'Split the fare',
@@ -44,18 +46,18 @@ class userMain extends StatelessWidget {
                       ),
                     ),
                   ),
-                  SizedBox(height: 70),
+                  const SizedBox(height: 70),
                   Image.asset(
                     'assets/images/putrago.png',
                     height: 70,
                   ),
-                  SizedBox(height: 70),
+                  const SizedBox(height: 70),
                   Container(
                     width: 334,
                     height: 65,
                     decoration: BoxDecoration(
                       borderRadius: BorderRadius.circular(10),
-                      color: Color.fromRGBO(119, 97, 255, 1.0),
+                      color: const Color.fromRGBO(119, 97, 255, 1.0),
                     ),
                     child: TextButton(
                       onPressed: () {
@@ -65,7 +67,7 @@ class userMain extends StatelessWidget {
                           MaterialPageRoute(builder: (context) => userLogin()),
                         );
                       },
-                      child: Text(
+                      child: const Text(
                         'Login',
                         style: TextStyle(
                           fontFamily: 'Poppins',
@@ -78,7 +80,7 @@ class userMain extends StatelessWidget {
                   ),
 
                   //Go to user register page
-                  SizedBox(height: 10),
+                  const SizedBox(height: 10),
                   Container(
                     width: 334,
                     height: 65,
@@ -95,7 +97,7 @@ class userMain extends StatelessWidget {
                           MaterialPageRoute(builder: (context) => userRegister()),
                         );
                       },
-                      child: Text(
+                      child: const Text(
                         'Register',
                         style: TextStyle(
                           fontFamily: 'Poppins',
@@ -108,8 +110,8 @@ class userMain extends StatelessWidget {
                   ),
 
 
-                  SizedBox(height: 20),
-                  Text(
+                  const SizedBox(height: 20),
+                  const Text(
                     'or',
                     style: TextStyle(
                       fontFamily: 'Poppins',
@@ -118,7 +120,7 @@ class userMain extends StatelessWidget {
                       color: Color.fromRGBO(165, 165, 165, 1),
                     ),
                   ),
-                  SizedBox(height: 20),
+                  const SizedBox(height: 20),
                   TextButton(
                     onPressed: () {
                       // Handle login as a user button press
@@ -126,7 +128,7 @@ class userMain extends StatelessWidget {
                         MaterialPageRoute(builder: (context) => driverMain()),
                       );
                     },
-                    child: Text(
+                    child: const Text(
                       'Login as a Driver',
                       style: TextStyle(
                         fontFamily: 'Poppins',

lib/screens/userWapper.dart

@@ -6,6 +6,8 @@ import 'package:putra_go/screens/passenger/userHome/userCustomizedOrder.dart';
 import '../models/user.dart';
 
 class userWapper extends StatelessWidget {
+  const userWapper({Key? key}) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
 

lib/shared/loading.dart

@@ -6,7 +6,7 @@ class Loading extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       color: Colors.brown[100],
-      child: Center(
+      child: const Center(
         child: SpinKitChasingDots(
           color: Colors.brown,
           size: 50.0,