Merge branch 'master' of http://103.44.149.204/qorridi/medapp_eksad into develop

lib/auth/forget_password.dart

@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
 import 'package:form_field_validator/form_field_validator.dart';
+import 'package:google_fonts/google_fonts.dart';
 import 'package:http/http.dart' as http;
 import 'package:medapp_eksad/firebase/showSnackbar_Alertdialog.dart';
 import 'package:medapp_eksad/widget/button_color.dart';
@@ -27,6 +28,7 @@ class _ForgotPasswordState extends State<ForgotPassword> {
 
   @override
   Widget build(BuildContext context) {
+    var screenSize = MediaQuery.of(context).size;
     return Stack(
       children: [
         Container(
@@ -45,38 +47,64 @@ class _ForgotPasswordState extends State<ForgotPassword> {
         ),
         Center(
             child: AlertDialog(
-          title: Text('Receive an email \nto reset your password.',textAlign: TextAlign.center,),
-          content: Form(
-            key: formKey,
-            child: TextFormField(
-              textAlign: TextAlign.start,
-              controller: emailController,
-              textInputAction: TextInputAction.done,
-              autovalidateMode: AutovalidateMode.onUserInteraction,
-              validator: (email) => email != null && EmailValidator(errorText: 'Enter a valid email').isValid(email)
-              ? "Enter a valid email"
-                  :null
-              ,
-              decoration: InputDecoration(
-                labelText: "Enter your email address",
-                hintStyle: const TextStyle(),
-                border: OutlineInputBorder(
-                    borderRadius: BorderRadius.circular(5.0)),
-              ),
-              // onChanged: (value) => email = value,
+          title: Text('Reset Password',textAlign: TextAlign.center,),
+          content: Container(
+            width: screenSize.width*0.25,
+            height: screenSize.height*0.3,
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.spaceAround,
+              children: [
+                Form(
+                  key: formKey,
+                  child: TextFormField(
+                    textAlign: TextAlign.start,
+                    controller: emailController,
+                    textInputAction: TextInputAction.done,
+                    //autovalidateMode: AutovalidateMode.onUserInteraction,
+
+                    decoration: InputDecoration(
+                      labelText: "Enter your email address",
+                      hintStyle: const TextStyle(),
+                      border: OutlineInputBorder(
+                          borderRadius: BorderRadius.circular(5.0)),
+                    ),
+                    validator: (value) {
+                      if (value == null || value.isEmpty) {
+                        return 'Please enter your email address';
+                      }
+                      return null;
+                    },
+                    // onChanged: (value) => email = value,
+                  ),
+                ),
+                Container
+                  (height: screenSize.height*0.1,
+                  child: Text('We will send you an email with'
+                    ' a link to reset your password, please enter the email'
+                    ' associated with your account above.',style: GoogleFonts.poppins(fontSize: 12),),),
+                Container(
+                  width: screenSize.width*0.31,
+                  height: screenSize.height*0.065,
+                  child: ElevatedButton(
+                    onPressed: () async {
+
+                      if (formKey.currentState!.validate()) {
+                        await resetPassword();
+                        return;
+                      }
+
+                    },
+                    //   resetPassword();
+                    //   //Navigator.pushNamed(context, 'dashboard');
+                    // },
+                    child: const Text('Send'),),
+                )
+              ],
             ),
           ),
-          actions: <Widget>[
-            TextButton(
-              onPressed: () {
-                resetPassword();
-                //Navigator.pushNamed(context, 'dashboard');
-              },
-              child: const Text('Send'),
 
-            ),
-          ],
-        )),
+        ),
+        ),
       ],
     );
   }
@@ -90,7 +118,7 @@ class _ForgotPasswordState extends State<ForgotPassword> {
       
     } on FirebaseAuthException catch (e){
       print(e);
-      showSnackBar(context, e.message.toString());
+      showSnackBarError(context, e.message!);
       Navigator.of(context).pop();
     }
   }

lib/homepage.dart

@@ -63,7 +63,7 @@ class _HomePageState extends State<HomePage> {
                 const Home3(),
                 const Home4(),
                 ContactUs2(),
-                const Footer(),
+                Footer(),
               ],
             ),
     );

lib/screen/about_us.dart

@@ -63,7 +63,7 @@ class _AboutUsState extends State<AboutUs> {
           const Home3(),
           const Home4(),
           ContactUs2(),
-          const Footer(),
+          Footer(),
         ],
       ),
     );

lib/screen_user/home_user.dart

@@ -63,7 +63,7 @@ class _HomePageUserState extends State<HomePageUser> {
           const Home3(),
           const Home4(),
           ContactUs2(),
-          const Footer(),
+          Footer(),
         ],
       ),
     );