signup screen

lib/common/settings.dart

@@ -8,7 +8,7 @@ import 'package:fluttertoast/fluttertoast.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:supplier_new/common/preloader.dart';
 
-const Color primaryColor = Color(0XFF1D7AFC);
+const Color primaryColor = Color(0XFF8270DB);
 const Color secondaryColor = Color(0XFFBFE0ED);
 const Color greyColor = Color(0XFF7E7F80);
 
@@ -37,7 +37,7 @@ InputDecoration textFormFieldDecoration(IconData icon,var text){
           width: 1,    )),
     focusedBorder: OutlineInputBorder(
       borderRadius: BorderRadius.circular(4.0),
-      borderSide: BorderSide(color: Color(0XFF1D7AFC),width: 2,),
+      borderSide: BorderSide(color: Color(0XFF8270DB),width: 2,),
     ),
 
     enabledBorder: OutlineInputBorder(

lib/login/login.dart

@@ -34,50 +34,10 @@ class _LoginState extends State<Login> {
     super.initState();
   }
 
-  Future<bool> onWillPop() async {
-    final shouldPop = await showDialog<bool>(context: context, builder: (context) {
-      return AlertDialog(
-        title: const Text('Do you want to exit app?',
-            style: TextStyle(
-              color: primaryColor,
-              fontSize: 20,
-            )),
-        actionsAlignment: MainAxisAlignment.spaceBetween,
-        actions: [
-          TextButton(
-            onPressed: () {
-              SystemNavigator.pop();
-            },
-            child: const Text('Yes',
-                style: TextStyle(
-                  color: primaryColor,
-                  fontSize: 20,
-                )),
-          ),
-          TextButton(
-            onPressed: () {
-              Navigator.of(context).pop(false);
-            },
-            child: const Text('No',
-                style: TextStyle(
-                  color: primaryColor,
-                  fontSize: 20,
-                )),
-          ),
-        ],
-      );
-    },
-    );
-    return shouldPop!;
-  }
-
   @override
   Widget build(BuildContext context) {
-    String lastInputValue="";
 
-    return WillPopScope(
-      onWillPop: () async => onWillPop(),
-      child: Scaffold(
+    return Scaffold(
         backgroundColor: Colors.white,
         body: Stack(
           children: <Widget>[
@@ -112,8 +72,8 @@ class _LoginState extends State<Login> {
                                 textCapitalization: TextCapitalization.sentences,
                                 maxLength: 10,
                                 decoration: textFormFieldDecoration(Icons.phone,'Mobile Number'),
-                                  style:fontTextStyle(14,Color(0XFF101214),FontWeight.w400),
-                                  cursorColor: Color(0XFF1D7AFC),
+                                style:fontTextStyle(14,Color(0XFF2A2A2A),FontWeight.w400),
+                                cursorColor: Color(0XFF8270DB),
 
                                 //TextStyle(color: Colors.black,fontWeight: FontWeight.bold),
                               ),
@@ -122,7 +82,7 @@ class _LoginState extends State<Login> {
 
                             Container(
                               child: TextFormField(
-                                  cursorColor:Color(0XFF1D7AFC),
+                                cursorColor:Color(0XFF8270DB),
                                 obscureText: isObscureText,
                                 obscuringCharacter: '*',
                                 controller: passwordController,
@@ -138,7 +98,7 @@ class _LoginState extends State<Login> {
                                         width: 1,    )),
                                   focusedBorder: OutlineInputBorder(
                                     borderRadius: BorderRadius.circular(4.0),
-                                      borderSide: BorderSide(color: Color(0XFF1D7AFC),width: 2,),
+                                    borderSide: BorderSide(color: Color(0XFF8270DB),width: 2,),
                                   ),
                                   enabledBorder: OutlineInputBorder(
                                     borderRadius: BorderRadius.circular(4.0),
@@ -161,7 +121,7 @@ class _LoginState extends State<Login> {
                                   ),
 
                                 ),
-                                  style:  fontTextStyle(14,Color(0XFF101214),FontWeight.w400),
+                                style:  fontTextStyle(14,Color(0XFF2A2A2A),FontWeight.w400),
 
                               ),
                             ),
@@ -261,7 +221,6 @@ class _LoginState extends State<Login> {
             ),
           ],
         )
-      ),
     );
   }
 }

lib/login/login_signup_screen.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:supplier_new/common/settings.dart';
 import 'package:supplier_new/login/login.dart';
-import 'package:supplier_new/login/signup.dart';
+import 'package:supplier_new/signup/signup.dart';
 
 class LoginSignUpScreen extends StatefulWidget {
   const LoginSignUpScreen({super.key});
@@ -13,8 +13,7 @@ class LoginSignUpScreen extends StatefulWidget {
 class _LoginSignUpScreenState extends State<LoginSignUpScreen> {
   @override
   Widget build(BuildContext context) {
-    return SafeArea(
-      child: Scaffold(
+    return Scaffold(
         body: Padding(
           padding: EdgeInsets.all(24),
           child: Column(
@@ -96,7 +95,6 @@ class _LoginSignUpScreenState extends State<LoginSignUpScreen> {
             ],
           ),
         )
-      ),
     );
   }
 }

lib/login/starting_screen.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:supplier_new/common/settings.dart';
 import 'package:supplier_new/login/login_signup_screen.dart';
 
@@ -12,8 +13,8 @@ class StartingScreen extends StatefulWidget {
 class _StartingScreenState extends State<StartingScreen> {
   @override
   Widget build(BuildContext context) {
-    return SafeArea(
-      child: Scaffold(
+
+    return Scaffold(
         body: Padding(
           padding: EdgeInsets.all(24),
           child: Column(
@@ -83,7 +84,6 @@ class _StartingScreenState extends State<StartingScreen> {
               )
             ],
           ),
-      )),
-    );
+        ));
   }
 }

lib/signup/signup.dart

@@ -88,9 +88,10 @@ class _SignUpState extends State<SignUp> {
               child: Row(
                 children: [
                   Image.asset(
-                    'images/Maps.png',
+                    'images/maps.png',
                     width: 20,
                     height: 20,
+                    color: primaryColor,
                   ),
                   const SizedBox(width: 8),
                   Text(