diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index e741c00..c3dff60 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.thefinalproject">
+    <uses-permission android:name="android.permission.INTERNET" />
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index db77bb4..1f10ab6 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 17987b7..3523b2a 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 09d4391..c95ecc2 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index d5f1c8d..7688a33 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 4d6372e..64f9e9f 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/assets/111111111.png b/assets/111111111.png
new file mode 100644
index 0000000..66a2718
Binary files /dev/null and b/assets/111111111.png differ
diff --git a/assets/Logo.png b/assets/Logo.png
new file mode 100644
index 0000000..9aa8d1d
Binary files /dev/null and b/assets/Logo.png differ
diff --git a/lib/All_Screens.dart b/lib/All_Screens.dart
new file mode 100644
index 0000000..8c21286
--- /dev/null
+++ b/lib/All_Screens.dart
@@ -0,0 +1,74 @@
+import 'package:thefinalproject/Custom_Widgets.dart';
+
+
+class AllScreens extends StatefulWidget {
+  @override
+  _AllScreensState createState() => _AllScreensState();
+}
+
+class _AllScreensState extends State<AllScreens> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: SafeArea(
+        child: Center(
+          child: Padding(padding: EdgeInsets.symmetric(vertical: 100),
+            child: Column(
+              children: [
+                FlatButton(onPressed: (){
+                  Navigator.of(context).push(
+                      MaterialPageRoute(
+                          builder: (_) => SignInscreen()));
+                }, child: Text('SignInScreen'),color: Colors.redAccent,),
+
+
+                FlatButton(onPressed: (){
+                  Navigator.of(context).push(
+                      MaterialPageRoute(
+                          builder: (_) => Signup()));
+                }, child: Text('Signup'),color: Colors.redAccent,),
+
+
+                FlatButton(onPressed: (){
+                  Navigator.of(context).push(
+                      MaterialPageRoute(
+                          builder: (_) => Settings()));
+                }, child: Text('Settings'),color: Colors.redAccent,),
+
+
+                FlatButton(onPressed: (){
+                  Navigator.of(context).push(
+                      MaterialPageRoute(
+                          builder: (_) => About()));
+                }, child: Text('About'),color: Colors.redAccent,),
+
+
+                FlatButton(onPressed: (){
+                  Navigator.of(context).push(
+                      MaterialPageRoute(
+                          builder: (_) => Splash()));
+                }, child: Text('SplashScreen'),color: Colors.redAccent,),
+
+
+                FlatButton(onPressed: (){
+                  Navigator.of(context).push(
+                      MaterialPageRoute(
+                          builder: (_) => Products()));
+                }, child: Text('AllProducts'),color: Colors.redAccent,),
+
+
+                FlatButton(onPressed: (){
+                  Navigator.of(context).push(
+                      MaterialPageRoute(
+                          builder: (_) => ChangePassword()));
+                }, child: Text('ChangePassword'),color: Colors.redAccent,),
+
+
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/Custom_Widgets.dart b/lib/Custom_Widgets.dart
new file mode 100644
index 0000000..be1c6c5
--- /dev/null
+++ b/lib/Custom_Widgets.dart
@@ -0,0 +1,19 @@
+export 'package:flutter/material.dart';
+export 'package:thefinalproject/src/Screens/About.dart';
+export 'package:thefinalproject/src/Screens/Auth/Confirmation.dart';
+export 'package:thefinalproject/src/Screens/Auth/Change_Password.dart';
+export 'dart:async';
+export 'package:flutter/material.dart';
+export 'package:pin_code_fields/pin_code_fields.dart';
+export 'package:thefinalproject/src/Screens/Auth/Register.dart';
+export 'package:thefinalproject/src/Screens/Auth/sign_in_screen.dart';
+export 'package:thefinalproject/src/Screens/Settings/Settings.dart';
+export 'package:thefinalproject/src/Screens/Shop/Category.dart';
+export 'package:thefinalproject/src/Screens/splash_screen.dart';
+export 'package:flutter/services.dart';
+export 'Drawer.dart';
+export 'package:thefinalproject/All_Screens.dart';
+export 'package:country_icons/country_icons.dart';
+export 'package:thefinalproject/constants.dart';
+export 'package:thefinalproject/mylisttile.dart';
+export 'package:thefinalproject/src/Screens/Auth/ForgotPassword.dart';
diff --git a/lib/Drawer.dart b/lib/Drawer.dart
index 034f778..3d6f880 100644
--- a/lib/Drawer.dart
+++ b/lib/Drawer.dart
@@ -1,8 +1,4 @@
-import 'package:flutter/material.dart';
-import 'package:thefinalproject/src/Screens/Auth/sign_in_screen.dart';
-import 'package:thefinalproject/src/Screens/Settings/Settings.dart';
-import 'package:thefinalproject/mylisttile.dart';
-import 'package:thefinalproject/src/Screens/About.dart';
+import 'package:thefinalproject/Custom_Widgets.dart';
 
 class SideBar extends StatefulWidget {
   @override
@@ -34,13 +30,11 @@ class _SideBarState extends State<SideBar> {
                   icon: Icon(
                     Icons.settings,
                     color: Colors.redAccent,
-
                   ),
                 ),
                 text: 'Settings',
                 onTap: () {
-                  print("onclick");
-                  Navigator.of(context).pushReplacement(
+                  Navigator.of(context).push(
                     MaterialPageRoute(
                       builder: (context) => Settings(),
                     ),
@@ -77,17 +71,20 @@ class _SideBarState extends State<SideBar> {
                 text: 'My Activities',
                 onTap: () {},
               ),
-              GestureDetector(
-                child: MyListTile(
-                  myicon: IconButton(
-                    icon: Icon(
-                      Icons.info,
-                      color: Colors.redAccent,
-                    ),
+              MyListTile(
+                myicon: IconButton(
+                  icon: Icon(
+                    Icons.info,
+                    color: Colors.redAccent,
                   ),
-                  text: 'About',
-
                 ),
+                text: 'About',
+                onTap: (){
+                  Navigator.of(context).push(MaterialPageRoute(
+                    builder: (_) => About(),
+                  ));
+                },
+
               ),
               Padding(
                 padding: EdgeInsets.only(top: h * 0.19),
diff --git a/lib/constants.dart b/lib/constants.dart
index 82d0669..5e92cd3 100644
--- a/lib/constants.dart
+++ b/lib/constants.dart
@@ -1,4 +1,4 @@
 import 'package:flutter/material.dart';
 const kAppbarSizeText=TextStyle(fontSize: 20,fontWeight: FontWeight.bold,color: Colors.white,);
 const kCardTextStyle=TextStyle(fontSize: 15,color: Colors.black,);
-const kTextFlagStyle=TextStyle(fontSize: 23,fontWeight: FontWeight.bold,letterSpacing: 2.5);
\ No newline at end of file
+const kTextFlagStyle=TextStyle(fontSize: 23,fontWeight: FontWeight.bold,);
\ No newline at end of file
diff --git a/lib/main.dart b/lib/main.dart
index c928f6a..6d318d8 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,17 +1,6 @@
-import 'package:flutter/material.dart';
-import 'package:thefinalproject/src/Screens/About.dart';
-import 'package:thefinalproject/src/Screens/Auth/Confirmation.dart';
-import 'package:thefinalproject/src/Screens/Auth/Forget_password.dart';
-import 'dart:async';
-import 'package:flutter/material.dart';
-import 'package:pin_code_fields/pin_code_fields.dart';
-import 'package:thefinalproject/src/Screens/Auth/Register.dart';
-import 'package:thefinalproject/src/Screens/Auth/sign_in_screen.dart';
-import 'package:thefinalproject/src/Screens/Settings/Settings.dart';
-import 'package:thefinalproject/src/Screens/Shop/Category.dart';
-import 'package:thefinalproject/src/Screens/splash_screen.dart';
-import 'package:flutter/services.dart';
-import 'Drawer.dart';
+import 'package:thefinalproject/Custom_Widgets.dart';
+
+
 void main() {
   SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
     statusBarColor: Color(0xffff4d4d),
@@ -22,7 +11,7 @@ void main() {
     DeviceOrientation.portraitUp,
     DeviceOrientation.portraitDown,
   ]).then(
-    (val) {
+        (val) {
       runApp(Shop());
     },
   );
@@ -33,456 +22,9 @@ class Shop extends StatelessWidget {
   Widget build(BuildContext context) {
     return MaterialApp(
       routes: {
-        '/': (context) => Products(),
+        '/': (context) => AllScreens(),
       },
       debugShowCheckedModeBanner: false,
-
-    );
-  }
-}
-
-// class MyApp extends StatelessWidget {
-//   // This widget is the root of your application.
-//   @override
-//   Widget build(BuildContext context) {
-//     return MaterialApp(
-//       title: 'Flutter Demo',
-//       theme: ThemeData(
-//         primarySwatch: Colors.blue,
-//       ),
-//       home: PinCodeVerificationScreen(
-//           "+8801376221100"), // a random number, please don't call xD
-//     );
-//   }
-// }
-//
-// class PinCodeVerificationScreen extends StatefulWidget {
-//   final String phoneNumber;
-//
-//   PinCodeVerificationScreen(this.phoneNumber);
-//
-//   @override
-//   _PinCodeVerificationScreenState createState() =>
-//       _PinCodeVerificationScreenState();
-// }
-//
-// class _PinCodeVerificationScreenState extends State<PinCodeVerificationScreen> {
-//   var onTapRecognizer;
-//
-//   TextEditingController textEditingController = TextEditingController();
-//   // ..text = "123456";
-//
-//   StreamController<ErrorAnimationType> errorController;
-//
-//   bool hasError = false;
-//   String currentText = "";
-//   final GlobalKey<ScaffoldState> scaffoldKey = GlobalKey<ScaffoldState>();
-//   final formKey = GlobalKey<FormState>();
-//
-//   @override
-//   void initState() {
-//     onTapRecognizer = TapGestureRecognizer()
-//       ..onTap = () {
-//         Navigator.pop(context);
-//       };
-//     errorController = StreamController<ErrorAnimationType>();
-//     super.initState();
-//   }
-//
-//   @override
-//   void dispose() {
-//     errorController.close();
-//
-//     super.dispose();
-//   }
-//
-//   @override
-//   Widget build(BuildContext context) {
-//     return Scaffold(
-//       backgroundColor: Colors.blue.shade50,
-//       key: scaffoldKey,
-//       body: GestureDetector(
-//         onTap: () {},
-//         child: Container(
-//           height: MediaQuery.of(context).size.height,
-//           width: MediaQuery.of(context).size.width,
-//           child: ListView(
-//             children: <Widget>[
-//               SizedBox(height: 30),
-//               // Container(
-//               //   height: MediaQuery.of(context).size.height / 3,
-//               //   child: FlareActor(
-//               //     "assets/otp.flr",
-//               //     animation: "otp",
-//               //     fit: BoxFit.fitHeight,
-//               //     alignment: Alignment.center,
-//               //   ),
-//               // ),
-//               SizedBox(height: 8),
-//               Padding(
-//                 padding: const EdgeInsets.symmetric(vertical: 8.0),
-//                 child: Text(
-//                   'Phone Number Verification',
-//                   style: TextStyle(fontWeight: FontWeight.bold, fontSize: 22),
-//                   textAlign: TextAlign.center,
-//                 ),
-//               ),
-//               Padding(
-//                 padding:
-//                 const EdgeInsets.symmetric(horizontal: 30.0, vertical: 8),
-//                 child: RichText(
-//                   text: TextSpan(
-//                       text: "Enter the code sent to ",
-//                       children: [
-//                         TextSpan(
-//                             text: widget.phoneNumber,
-//                             style: TextStyle(
-//                                 color: Colors.black,
-//                                 fontWeight: FontWeight.bold,
-//                                 fontSize: 15)),
-//                       ],
-//                       style: TextStyle(color: Colors.black54, fontSize: 15)),
-//                   textAlign: TextAlign.center,
-//                 ),
-//               ),
-//               SizedBox(
-//                 height: 20,
-//               ),
-//               Form(
-//                 key: formKey,
-//                 child: Padding(
-//                     padding: const EdgeInsets.symmetric(
-//                         vertical: 8.0, horizontal: 30),
-//                     child: PinCodeTextField(
-//                       appContext: context,
-//                       pastedTextStyle: TextStyle(
-//                         color: Colors.green.shade600,
-//                         fontWeight: FontWeight.bold,
-//                       ),
-//                       length: 6,
-//                       obscureText: false,
-//                       obscuringCharacter: '*',
-//                       animationType: AnimationType.fade,
-//                       validator: (v) {
-//                         if (v.length < 3) {
-//                           return "I'm from validator";
-//                         } else {
-//                           return null;
-//                         }
-//                       },
-//                       pinTheme: PinTheme(
-//                         shape: PinCodeFieldShape.box,
-//                         borderRadius: BorderRadius.circular(5),
-//                         fieldHeight: 60,
-//                         fieldWidth: 50,
-//                         activeFillColor:
-//                         hasError ? Colors.orange : Colors.white,
-//                       ),
-//                       cursorColor: Colors.black,
-//                       animationDuration: Duration(milliseconds: 300),
-//                       textStyle: TextStyle(fontSize: 20, height: 1.6),
-//                       backgroundColor: Colors.blue.shade50,
-//                       enableActiveFill: true,
-//                       errorAnimationController: errorController,
-//                       controller: textEditingController,
-//                       keyboardType: TextInputType.number,
-//                       boxShadows: [
-//                         BoxShadow(
-//                           offset: Offset(0, 1),
-//                           color: Colors.black12,
-//                           blurRadius: 10,
-//                         )
-//                       ],
-//                       onCompleted: (v) {
-//                         print("Completed");
-//                       },
-//                       // onTap: () {
-//                       //   print("Pressed");
-//                       // },
-//                       onChanged: (value) {
-//                         print(value);
-//                         setState(() {
-//                           currentText = value;
-//                         });
-//                       },
-//                       beforeTextPaste: (text) {
-//                         print("Allowing to paste $text");
-//                         //if you return true then it will show the paste confirmation dialog. Otherwise if false, then nothing will happen.
-//                         //but you can show anything you want here, like your pop up saying wrong paste format or etc
-//                         return true;
-//                       },
-//                     )),
-//               ),
-//               Padding(
-//                 padding: const EdgeInsets.symmetric(horizontal: 30.0),
-//                 child: Text(
-//                   hasError ? "*Please fill up all the cells properly" : "",
-//                   style: TextStyle(
-//                       color: Colors.red,
-//                       fontSize: 12,
-//                       fontWeight: FontWeight.w400),
-//                 ),
-//               ),
-//               SizedBox(
-//                 height: 20,
-//               ),
-//               RichText(
-//                 textAlign: TextAlign.center,
-//                 text: TextSpan(
-//                     text: "Didn't receive the code? ",
-//                     style: TextStyle(color: Colors.black54, fontSize: 15),
-//                     children: [
-//                       TextSpan(
-//                           text: " RESEND",
-//                           recognizer: onTapRecognizer,
-//                           style: TextStyle(
-//                               color: Color(0xFF91D3B3),
-//                               fontWeight: FontWeight.bold,
-//                               fontSize: 16))
-//                     ]),
-//               ),
-//               SizedBox(
-//                 height: 14,
-//               ),
-//               Container(
-//                 margin:
-//                 const EdgeInsets.symmetric(vertical: 16.0, horizontal: 30),
-//                 child: ButtonTheme(
-//                   height: 50,
-//                   child: FlatButton(
-//                     onPressed: () {
-//                       formKey.currentState.validate();
-//                       // conditions for validating
-//                       if (currentText.length != 6 || currentText != "towtow") {
-//                         errorController.add(ErrorAnimationType
-//                             .shake); // Triggering error shake animation
-//                         setState(() {
-//                           hasError = true;
-//                         });
-//                       } else {
-//                         setState(() {
-//                           hasError = false;
-//                           scaffoldKey.currentState.showSnackBar(SnackBar(
-//                             content: Text("Aye!!"),
-//                             duration: Duration(seconds: 2),
-//                           ));
-//                         });
-//                       }
-//                     },
-//                     child: Center(
-//                         child: Text(
-//                           "VERIFY".toUpperCase(),
-//                           style: TextStyle(
-//                               color: Colors.white,
-//                               fontSize: 18,
-//                               fontWeight: FontWeight.bold),
-//                         )),
-//                   ),
-//                 ),
-//                 decoration: BoxDecoration(
-//                     color: Colors.green.shade300,
-//                     borderRadius: BorderRadius.circular(5),
-//                     boxShadow: [
-//                       BoxShadow(
-//                           color: Colors.green.shade200,
-//                           offset: Offset(1, -2),
-//                           blurRadius: 5),
-//                       BoxShadow(
-//                           color: Colors.green.shade200,
-//                           offset: Offset(-1, 2),
-//                           blurRadius: 5)
-//                     ]),
-//               ),
-//               SizedBox(
-//                 height: 16,
-//               ),
-//               Row(
-//                 mainAxisAlignment: MainAxisAlignment.center,
-//                 children: <Widget>[
-//                   FlatButton(
-//                     child: Text("Clear"),
-//                     onPressed: () {
-//                       textEditingController.clear();
-//                     },
-//                   ),
-//                   FlatButton(
-//                     child: Text("Set Text"),
-//                     onPressed: () {
-//                       textEditingController.text = "123456";
-//                     },
-//                   ),
-//                 ],
-//               )
-//             ],
-//           ),
-//         ),
-//       ),
-//     );
-//   }
-// }
-/*
-import "package:flutter/material.dart";
-
-void main() {
-  runApp(new ControlleApp());
-}
-
-class ControlleApp extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    return new MaterialApp(
-      title: "My App",
-      home: new HomePage(),
     );
   }
 }
-
-class HomePage extends StatefulWidget {
-  @override
-  HomePageState createState() => new HomePageState();
-}
-
-class HomePageState extends State<HomePage> {
-  bool visibilityTag = false;
-  bool visibilityObs = false;
-
-  void _changed(bool visibility, String field) {
-    setState(() {
-      if (field == "tag"){
-        visibilityTag = visibility;
-      }
-      if (field == "obs"){
-        visibilityObs = visibility;
-      }
-    });
-  }
-
-  @override
-  Widget build(BuildContext context){
-    return new Scaffold(
-        appBar: new AppBar(backgroundColor: new Color(0xFF26C6DA)),
-        body: new ListView(
-          children: <Widget>[
-            new Container(
-              margin: new EdgeInsets.all(20.0),
-              child: new FlutterLogo(size: 100.0),
-            ),
-            new Container(
-                margin: new EdgeInsets.only(left: 16.0, right: 16.0),
-                child: new Column(
-                  children: <Widget>[
-                    visibilityObs ? new Row(
-                      crossAxisAlignment: CrossAxisAlignment.end,
-                      children: <Widget>[
-                        new Expanded(
-                          flex: 11,
-                          child: new TextField(
-                            maxLines: 1,
-                            style: Theme.of(context).textTheme.title,
-                            decoration: new InputDecoration(
-                                labelText: "Observation",
-                                isDense: true
-                            ),
-                          ),
-                        ),
-                        new Expanded(
-                          flex: 1,
-                          child: new IconButton(
-                            color: Colors.grey[400],
-                            icon: const Icon(Icons.cancel, size: 22.0,),
-                            onPressed: () {
-                              _changed(false, "obs");
-                            },
-                          ),
-                        ),
-                      ],
-                    ) : new Container(),
-
-                    visibilityTag ? new Row(
-                      crossAxisAlignment: CrossAxisAlignment.end,
-                      children: <Widget>[
-                        new Expanded(
-                          flex: 11,
-                          child: new TextField(
-                            maxLines: 1,
-                            style: Theme.of(context).textTheme.title,
-                            decoration: new InputDecoration(
-                                labelText: "Tags",
-                                isDense: true
-                            ),
-                          ),
-                        ),
-                        new Expanded(
-                          flex: 1,
-                          child: new IconButton(
-                            color: Colors.grey[400],
-                            icon: const Icon(Icons.cancel, size: 22.0,),
-                            onPressed: () {
-                              _changed(false, "tag");
-                            },
-                          ),
-                        ),
-                      ],
-                    ) : new Container(),
-                  ],
-                )
-            ),
-            new Row(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: <Widget>[
-                new InkWell(
-                    onTap: () {
-                      visibilityObs ? null : _changed(true, "obs");
-                    },
-                    child: new Container(
-                      margin: new EdgeInsets.only(top: 16.0),
-                      child: new Column(
-                        children: <Widget>[
-                          new Icon(Icons.comment, color: visibilityObs ? Colors.grey[400] : Colors.grey[600]),
-                          new Container(
-                            margin: const EdgeInsets.only(top: 8.0),
-                            child: new Text(
-                              "Observation",
-                              style: new TextStyle(
-                                fontSize: 12.0,
-                                fontWeight: FontWeight.w400,
-                                color: visibilityObs ? Colors.grey[400] : Colors.grey[600],
-                              ),
-                            ),
-                          ),
-                        ],
-                      ),
-                    )
-                ),
-                new SizedBox(width: 24.0),
-                new InkWell(
-                    onTap: () {
-                      visibilityTag ? null : _changed(true, "tag");
-                    },
-                    child: new Container(
-                      margin: new EdgeInsets.only(top: 16.0),
-                      child: new Column(
-                        children: <Widget>[
-                          new Icon(Icons.local_offer, color: visibilityTag ? Colors.grey[400] : Colors.grey[600]),
-                          new Container(
-                            margin: const EdgeInsets.only(top: 8.0),
-                            child: new Text(
-                              "Tags",
-                              style: new TextStyle(
-                                fontSize: 12.0,
-                                fontWeight: FontWeight.w400,
-                                color: visibilityTag ? Colors.grey[400] : Colors.grey[600],
-                              ),
-                            ),
-                          ),
-                        ],
-                      ),
-                    )
-                ),
-              ],
-            )
-          ],
-        )
-    );
-  }
-}*/
diff --git a/lib/mylisttile.dart b/lib/mylisttile.dart
index 0cef26f..714cfb7 100644
--- a/lib/mylisttile.dart
+++ b/lib/mylisttile.dart
@@ -1,11 +1,10 @@
 import 'package:flutter/material.dart';
 
-
 class MyListTile extends StatelessWidget {
   final Widget myicon;
   final String text;
   final Function onTap;
-  const MyListTile({Key key, this.myicon,this.text,this.onTap});
+  const MyListTile({this.myicon,this.text,this.onTap});
    @override
    Widget build(BuildContext context) {
      return InkWell(
diff --git a/lib/src/Model/AllProducts.dart b/lib/src/Model/AllProducts.dart
deleted file mode 100644
index 3689cbe..0000000
--- a/lib/src/Model/AllProducts.dart
+++ /dev/null
@@ -1,68 +0,0 @@
-// To parse this JSON data, do
-//
-//     final welcome = welcomeFromJson(jsonString);
-
-import 'dart:convert';
-
-List<Welcome> welcomeFromJson(String str) => List<Welcome>.from(json.decode(str).map((x) => Welcome.fromJson(x)));
-
-String welcomeToJson(List<Welcome> data) => json.encode(List<dynamic>.from(data.map((x) => x.toJson())));
-
-class Welcome {
-  Welcome({
-    this.id,
-    this.title,
-    this.price,
-    this.description,
-    this.category,
-    this.image,
-  });
-
-  int id;
-  String title;
-  double price;
-  String description;
-  Category category;
-  String image;
-
-  factory Welcome.fromJson(Map<String, dynamic> json) => Welcome(
-    id: json["id"],
-    title: json["title"],
-    price: json["price"].toDouble(),
-    description: json["description"],
-    category: categoryValues.map[json["category"]],
-    image: json["image"],
-  );
-
-  Map<String, dynamic> toJson() => {
-    "id": id,
-    "title": title,
-    "price": price,
-    "description": description,
-    "category": categoryValues.reverse[category],
-    "image": image,
-  };
-}
-
-enum Category { MEN_CLOTHING, JEWELERY, ELECTRONICS, WOMEN_CLOTHING }
-
-final categoryValues = EnumValues({
-  "electronics": Category.ELECTRONICS,
-  "jewelery": Category.JEWELERY,
-  "men clothing": Category.MEN_CLOTHING,
-  "women clothing": Category.WOMEN_CLOTHING
-});
-
-class EnumValues<T> {
-  Map<String, T> map;
-  Map<T, String> reverseMap;
-
-  EnumValues(this.map);
-
-  Map<T, String> get reverse {
-    if (reverseMap == null) {
-      reverseMap = map.map((k, v) => new MapEntry(v, k));
-    }
-    return reverseMap;
-  }
-}
diff --git a/lib/src/Screens/About.dart b/lib/src/Screens/About.dart
index 77a8d6a..60d870f 100644
--- a/lib/src/Screens/About.dart
+++ b/lib/src/Screens/About.dart
@@ -1,70 +1,93 @@
-import 'package:thefinalproject/constants.dart';
-import 'package:flutter/material.dart';
-
-import '../../constants.dart';
+import 'package:thefinalproject/Custom_Widgets.dart';
 
 class About extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
+    var h = MediaQuery.of(context).size.height;
+    var w = MediaQuery.of(context).size.width;
     return Scaffold(
-        appBar: AppBar(backgroundColor: Color(0xffff4d4d),
-          title: Text(
-            "About",
-            style: TextStyle(color: Colors.white),
-          ),
+      appBar: AppBar(
+        backgroundColor: Color(0xffff4d4d),
+        title: Text(
+          "About",
+          style: TextStyle(color: Colors.white),
         ),
-        body: Column(
-          children: [
-            Card(
-              margin: EdgeInsets.all(10),
-              child: Column(
-                children: [
-                  Padding(
-                    padding:  EdgeInsets.all(15),
-                    child: Row(
-                      children: [
-                        CircleAvatar(backgroundColor: Colors.redAccent,radius: 30,),
-                        Padding(
-                          padding: EdgeInsets.only(left: 10),
-                          child: Text("User",style: kCardTextStyle,),
-                        ),
-                      ],
+      ),
+      body: SingleChildScrollView(
+        child: SafeArea(
+          child: Column(
+            children: [
+              Card(
+                margin:
+                    EdgeInsets.symmetric(horizontal: w * 0.03, vertical: h * 0.02),
+                child: Column(
+                  children: [
+                    Padding(
+                      padding: EdgeInsets.symmetric(
+                          horizontal: w * 0.03, vertical: h * 0.02),
+                      child: Row(
+                        children: [
+                          CircleAvatar(
+                            backgroundColor: Colors.redAccent,
+                            radius: 30,
+                          ),
+                          Padding(
+                            padding: EdgeInsets.only(left: w * 0.04),
+                            child: Text(
+                              "User",
+                              style: TextStyle(fontSize: 20),
+                            ),
+                          ),
+                        ],
+                      ),
                     ),
-                  ),
-                  Padding(
-                    padding:  EdgeInsets.all(15),
-                    child: Row(
-                      children: [
-                       IconButton(icon: Icon(Icons.info), onPressed: (){}),
-
-                        Padding(
-                          padding: EdgeInsets.only(left: 10),
-                          child: Column(
-                            children: [
-                              Text("khraa",style: kCardTextStyle,),
-                              Text("khraa",style: kCardTextStyle,),
-                            ],
-                          )
-                        ),
-                      ],
+                    Padding(
+                      padding: EdgeInsets.symmetric(
+                          horizontal: w * 0.04, vertical: h * 0.02),
+                      child: Row(
+                        children: [
+                          IconButton(icon: Icon(Icons.info), onPressed: () {}),
+                          Padding(
+                            padding: EdgeInsets.only(left: w * 0.06),
+                            child: Column(
+                              children: [
+                                Text(
+                                  "Version",
+                                  style: kCardTextStyle,
+                                ),
+                                Text(
+                                  "1.0",
+                                  style: TextStyle(color: Colors.grey),
+                                ),
+                              ],
+                            ),
+                          ),
+                        ],
+                      ),
                     ),
-                  ),
-                  Padding(
-                    padding:  EdgeInsets.all(15),
-                    child: Row(
-                      children: [
-                       IconButton(icon: Icon(Icons.share), onPressed: (){}),
-                        Padding(
-                          padding: EdgeInsets.only(left: 10),
-                          child: Text("khraa",style: kCardTextStyle,),
-                        ),
-                      ],
+                    Padding(
+                      padding: EdgeInsets.symmetric(
+                          horizontal: w * 0.04, vertical: h * 0.02),
+                      child: Row(
+                        children: [
+                          IconButton(icon: Icon(Icons.share), onPressed: () {}),
+                          Padding(
+                            padding: EdgeInsets.only(left: w * 0.06),
+                            child: Text(
+                              "Share This App",
+                              style: kCardTextStyle,
+                            ),
+                          ),
+                        ],
+                      ),
                     ),
-                  ),
-                ],
-              ),
-            )
-          ],
-        ));
+                  ],
+                ),
+              )
+            ],
+          ),
+        ),
+      ),
+    );
   }
 }
diff --git a/lib/src/Screens/Auth/Forget_password.dart b/lib/src/Screens/Auth/Change_Password.dart
similarity index 73%
rename from lib/src/Screens/Auth/Forget_password.dart
rename to lib/src/Screens/Auth/Change_Password.dart
index c62750f..973fd8e 100644
--- a/lib/src/Screens/Auth/Forget_password.dart
+++ b/lib/src/Screens/Auth/Change_Password.dart
@@ -1,13 +1,13 @@
-import 'package:flutter/material.dart';
-
-class ForgotPassword extends StatefulWidget {
+import 'package:thefinalproject/Custom_Widgets.dart';
+class ChangePassword extends StatefulWidget {
   @override
-  _ForgotPasswordState createState() => _ForgotPasswordState();
+  _ChangePasswordState createState() => _ChangePasswordState();
 }
 
-class _ForgotPasswordState extends State<ForgotPassword> {
+class _ChangePasswordState extends State<ChangePassword> {
   bool isSeen = true;
   bool isSeen2 = true;
+  bool isSeen3 = true;
 
   @override
   Widget build(BuildContext context) {
@@ -28,7 +28,7 @@ class _ForgotPasswordState extends State<ForgotPassword> {
                       height: h * 0.55,
                       decoration: BoxDecoration(
                         image: DecorationImage(
-                            image: AssetImage("assets/4.png"),
+                            image: AssetImage("assets/111111111.png"),
                             fit: BoxFit.cover),
                       ),
                     ),
@@ -49,12 +49,43 @@ class _ForgotPasswordState extends State<ForgotPassword> {
                             Padding(
                               padding: EdgeInsets.symmetric(vertical: h * 0.02),
                               child: Text(
-                                'Forget Password',
+                                'Change Password',
                                 style: TextStyle(
                                     color: Colors.black,
                                     fontSize: 32,
                                     fontWeight: FontWeight.bold),
                               ),
+                            ),SizedBox(height: h*0.02,),
+                            TextFormField(
+                              obscureText: isSeen3,
+                              decoration: InputDecoration(
+                                focusedBorder: UnderlineInputBorder(
+                                  borderSide: BorderSide(
+                                    color: Color(0xffff4d4d),
+                                  ),
+                                ),
+                                prefixIcon: Icon(
+                                  Icons.lock,
+                                  color: Color(0xffff4d4d),
+                                ),
+                                hintText: 'Old Password',
+                                suffixIcon: InkWell(
+                                  onTap: () {
+                                    setState(() {
+                                      isSeen3 = !isSeen3;
+                                    });
+                                  },
+                                  child: isSeen3
+                                      ? Icon(
+                                    Icons.visibility_off,
+                                    color: Color(0xffff4d4d),
+                                  )
+                                      : Icon(
+                                    Icons.remove_red_eye,
+                                    color: Color(0xffff4d4d),
+                                  ),
+                                ),
+                              ),
                             ),
                             TextFormField(
                               obscureText: isSeen,
@@ -100,7 +131,7 @@ class _ForgotPasswordState extends State<ForgotPassword> {
                                   Icons.lock,
                                   color: Color(0xffff4d4d),
                                 ),
-                                hintText: 'Confirm Password',
+                                hintText: 'Confirm New Password',
                                 suffixIcon: InkWell(
                                   onTap: () {
                                     setState(() {
@@ -129,7 +160,7 @@ class _ForgotPasswordState extends State<ForgotPassword> {
                         height: w * 0.15,
                         width: w * 0.15,
                         decoration: BoxDecoration(
-                            color: Color(0xffcccccc), shape: BoxShape.circle),
+                            color: Color(0xffff4d4d), shape: BoxShape.circle),
                         child: Icon(
                           Icons.arrow_forward_outlined,
                           color: Colors.white,
diff --git a/lib/src/Screens/Auth/ForgotPassword.dart b/lib/src/Screens/Auth/ForgotPassword.dart
new file mode 100644
index 0000000..fe95d06
--- /dev/null
+++ b/lib/src/Screens/Auth/ForgotPassword.dart
@@ -0,0 +1,180 @@
+import 'package:thefinalproject/Custom_Widgets.dart';
+
+class ForgotPassword extends StatefulWidget {
+  @override
+  _ForgotPasswordState createState() => _ForgotPasswordState();
+}
+
+class _ForgotPasswordState extends State<ForgotPassword> {
+  bool isSeen = true;
+  bool isSeen2 = true;
+  bool isSeen3 = true;
+
+  @override
+  Widget build(BuildContext context) {
+    var h = MediaQuery.of(context).size.height;
+    var w = MediaQuery.of(context).size.width;
+    return Scaffold(
+      body: SafeArea(
+        child: SingleChildScrollView(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Container(
+                height: h,
+                width: w,
+                child: Stack(
+                  children: [
+                    Container(
+                      height: h * 0.55,
+                      decoration: BoxDecoration(
+                        image: DecorationImage(
+                            image: AssetImage("assets/4.png"),
+                            fit: BoxFit.cover),
+                      ),
+                    ),
+                    Align(
+                      alignment: Alignment.bottomCenter,
+                      child: Container(
+                        padding: EdgeInsets.only(left: w * 0.1, right: w * 0.1),
+                        height: h * 0.5,
+                        width: w,
+                        decoration: BoxDecoration(
+                            color: Colors.white,
+                            borderRadius: BorderRadius.only(
+                                topLeft: Radius.circular(24),
+                                topRight: Radius.circular(24))),
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Padding(
+                              padding: EdgeInsets.symmetric(vertical: h * 0.02),
+                              child: Text(
+                                'Change Password',
+                                style: TextStyle(
+                                    color: Colors.black,
+                                    fontSize: 32,
+                                    fontWeight: FontWeight.bold),
+                              ),
+                            ),SizedBox(height: h*0.02,),
+                            TextFormField(
+                              obscureText: isSeen3,
+                              decoration: InputDecoration(
+                                focusedBorder: UnderlineInputBorder(
+                                  borderSide: BorderSide(
+                                    color: Color(0xffff4d4d),
+                                  ),
+                                ),
+                                prefixIcon: Icon(
+                                  Icons.lock,
+                                  color: Color(0xffff4d4d),
+                                ),
+                                hintText: 'Old Password',
+                                suffixIcon: InkWell(
+                                  onTap: () {
+                                    setState(() {
+                                      isSeen3 = !isSeen3;
+                                    });
+                                  },
+                                  child: isSeen3
+                                      ? Icon(
+                                    Icons.visibility_off,
+                                    color: Color(0xffff4d4d),
+                                  )
+                                      : Icon(
+                                    Icons.remove_red_eye,
+                                    color: Color(0xffff4d4d),
+                                  ),
+                                ),
+                              ),
+                            ),
+                            TextFormField(
+                              obscureText: isSeen,
+                              decoration: InputDecoration(
+                                focusedBorder: UnderlineInputBorder(
+                                  borderSide: BorderSide(
+                                    color: Color(0xffff4d4d),
+                                  ),
+                                ),
+                                prefixIcon: Icon(
+                                  Icons.lock,
+                                  color: Color(0xffff4d4d),
+                                ),
+                                hintText: 'New Password',
+                                suffixIcon: InkWell(
+                                  onTap: () {
+                                    setState(() {
+                                      isSeen = !isSeen;
+                                    });
+                                  },
+                                  child: isSeen
+                                      ? Icon(
+                                    Icons.visibility_off,
+                                    color: Color(0xffff4d4d),
+                                  )
+                                      : Icon(
+                                    Icons.remove_red_eye,
+                                    color: Color(0xffff4d4d),
+                                  ),
+                                ),
+                              ),
+                            ),
+                            SizedBox(height: h * 0.02),
+                            TextFormField(
+                              obscureText: isSeen2,
+                              decoration: InputDecoration(
+                                focusedBorder: UnderlineInputBorder(
+                                  borderSide: BorderSide(
+                                    color: Color(0xffff4d4d),
+                                  ),
+                                ),
+                                prefixIcon: Icon(
+                                  Icons.lock,
+                                  color: Color(0xffff4d4d),
+                                ),
+                                hintText: 'Confirm New Password',
+                                suffixIcon: InkWell(
+                                  onTap: () {
+                                    setState(() {
+                                      isSeen2 = !isSeen2;
+                                    });
+                                  },
+                                  child: isSeen2
+                                      ? Icon(
+                                    Icons.visibility_off,
+                                    color: Color(0xffff4d4d),
+                                  )
+                                      : Icon(
+                                    Icons.remove_red_eye,
+                                    color: Color(0xffff4d4d),
+                                  ),
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                    ),
+                    Align(
+                      alignment: Alignment.centerRight,
+                      child: Container(
+                        height: w * 0.15,
+                        width: w * 0.15,
+                        decoration: BoxDecoration(
+                            color: Color(0xffcccccc), shape: BoxShape.circle),
+                        child: Icon(
+                          Icons.arrow_forward_outlined,
+                          color: Colors.white,
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/src/Screens/Auth/Register.dart b/lib/src/Screens/Auth/Register.dart
index a4d6294..25d7568 100644
--- a/lib/src/Screens/Auth/Register.dart
+++ b/lib/src/Screens/Auth/Register.dart
@@ -1,14 +1,12 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:thefinalproject/src/Screens/Auth/sign_in_screen.dart';
+import 'package:thefinalproject/Custom_Widgets.dart';
 class Signup extends StatefulWidget {
   @override
   _SignupState createState() => _SignupState();
 }
 
 class _SignupState extends State<Signup> {
-  bool isSeen = true;
-  bool isSeen2 = true;
+  bool isSeen = false;
+  bool isSeen2 = false;
 
   @override
   Widget build(BuildContext context) {
@@ -85,11 +83,11 @@ class _SignupState extends State<Signup> {
                                 },
                                 child: isSeen
                                     ? Icon(
-                                        Icons.remove_red_eye,
+                                        Icons.visibility_off,
                                         color: Color(0xffff4d4d),
                                       )
                                     : Icon(
-                                        Icons.visibility_off,
+                                        Icons.remove_red_eye,
                                         color: Color(0xffff4d4d),
                                       )),
                           ),
@@ -114,11 +112,11 @@ class _SignupState extends State<Signup> {
                               },
                               child: isSeen2
                                   ? Icon(
-                                      Icons.remove_red_eye,
+                                      Icons.visibility_off,
                                       color: Color(0xffff4d4d),
                                     )
                                   : Icon(
-                                      Icons.visibility_off,
+                                      Icons.remove_red_eye,
                                       color: Color(0xffff4d4d),
                                     ),
                             ),
diff --git a/lib/src/Screens/Auth/sign_in_screen.dart b/lib/src/Screens/Auth/sign_in_screen.dart
index 02bc6cb..acc0e32 100644
--- a/lib/src/Screens/Auth/sign_in_screen.dart
+++ b/lib/src/Screens/Auth/sign_in_screen.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
-import 'Forget_password.dart';
-import 'Register.dart';
+import 'package:thefinalproject/Custom_Widgets.dart';
 
 class SignInscreen extends StatefulWidget {
   @override
diff --git a/lib/src/Screens/Settings/Settings.dart b/lib/src/Screens/Settings/Settings.dart
index 6a0b8ec..39310ba 100644
--- a/lib/src/Screens/Settings/Settings.dart
+++ b/lib/src/Screens/Settings/Settings.dart
@@ -1,7 +1,4 @@
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:country_icons/country_icons.dart';
-import 'package:thefinalproject/constants.dart';
+import 'package:thefinalproject/Custom_Widgets.dart';
 
 class Settings extends StatefulWidget {
   @override
@@ -31,269 +28,293 @@ class _SettingsState extends State<Settings> {
     setState(() {
       if (field == "Lang") {
         visibilityLang = visibility;
+        visibilityTheme = false;
+        iconTheme = false;
       }
       if (field == "Theme") {
         visibilityTheme = visibility;
+        visibilityLang = false;
+        iconLang = false;
       }
     });
   }
 
   @override
   Widget build(BuildContext context) {
+    var h = MediaQuery.of(context).size.height;
+    var w = MediaQuery.of(context).size.width;
     return Scaffold(
       backgroundColor: Colors.grey[300],
-      body: SafeArea(
-        child: Center(
-          child: Column(
-            // mainAxisSize: MainAxisSize.min,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Padding(
-                padding: EdgeInsets.only(top: 50, left: 10, bottom: 10),
-                child: Text(
-                  'General Settings',
-                  style: TextStyle(fontSize: 25),
+      body: SingleChildScrollView(
+        child: SafeArea(
+          child: Center(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Padding(
+                  padding: EdgeInsets.only(
+                      top: h * 0.1, left: w * 0.03, bottom: h * 0.01),
+                  child: Text(
+                    'General Settings',
+                    style: TextStyle(fontSize: 25),
+                  ),
                 ),
-              ),
-              Container(
-                margin: EdgeInsets.only(bottom: 2, left: 10, right: 10),
-                decoration: BoxDecoration(color: Colors.white),
-                child: Column(
-                  children: [
-                    Column(
-                      children: [
-                        FlatButton(
-                          materialTapTargetSize:
-                              MaterialTapTargetSize.shrinkWrap,
-                          color: Colors.white,
-                          onPressed: () {},
-                          child: InkWell(
-                            onTap: () {
-                              iconLang = !iconLang;
-                              visibilityTheme
-                                  ? _changed(false, "Theme")
-                                  : _changed(true, "Theme");
-                            },
-                            child: Row(
-                              children: [
-                                Padding(
-                                  padding: EdgeInsets.only(right: 10),
-                                  child: Icon(Icons.language),
-                                ),
-                                Expanded(
-                                  child: InkWell(
-                                    onTap: () {
-                                      iconLang = !iconLang;
-                                      visibilityLang
-                                          ? _changed(false, "Lang")
-                                          : _changed(true, "Lang");
-                                    },
-                                    child: Row(
-                                      mainAxisAlignment:
-                                          MainAxisAlignment.spaceBetween,
-                                      children: [
-                                        Align(
-                                          alignment: Alignment.centerLeft,
-                                          child: Text(
-                                            'Change Language',
-                                            style: TextStyle(fontSize: 17),
+                Container(
+                  margin: EdgeInsets.only(left: w * 0.03, right: w * 0.03),
+                  decoration: BoxDecoration(color: Colors.white),
+                  child: Column(
+                    children: [
+                      Column(
+                        children: [
+                          FlatButton(
+                            materialTapTargetSize:
+                                MaterialTapTargetSize.shrinkWrap,
+                            color: Colors.white,
+                            onPressed: () {},
+                            child: InkWell(
+                              onTap: () {
+                                iconLang = !iconLang;
+                                visibilityTheme
+                                    ? _changed(false, "Theme")
+                                    : _changed(true, "Theme");
+                              },
+                              child: Row(
+                                children: [
+                                  Padding(
+                                    padding: EdgeInsets.only(right: w * 0.02),
+                                    child: Icon(Icons.language),
+                                  ),
+                                  Expanded(
+                                    child: InkWell(
+                                      onTap: () {
+                                        iconLang = !iconLang;
+                                        visibilityLang
+                                            ? _changed(false, "Lang")
+                                            : _changed(true, "Lang");
+                                      },
+                                      child: Row(
+                                        mainAxisAlignment:
+                                            MainAxisAlignment.spaceBetween,
+                                        children: [
+                                          Align(
+                                            alignment: Alignment.centerLeft,
+                                            child: Text(
+                                              'Change Language',
+                                              style: TextStyle(fontSize: 17),
+                                            ),
                                           ),
-                                        ),
-                                        IconButton(
-                                          alignment: Alignment.centerRight,
-                                          onPressed: () {
-                                            iconLang = !iconLang;
-                                            visibilityLang
-                                                ? _changed(false, "Lang")
-                                                : _changed(true, "Lang");
-                                          },
-                                          icon: Icon(iconLang
-                                              ? Icons.keyboard_arrow_down
-                                              : Icons.keyboard_arrow_right),
-                                        ),
-                                      ],
+                                          IconButton(
+                                            alignment: Alignment.centerRight,
+                                            onPressed: () {
+                                              iconLang = !iconLang;
+                                              visibilityLang
+                                                  ? _changed(false, "Lang")
+                                                  : _changed(true, "Lang");
+                                            },
+                                            icon: Icon(iconLang
+                                                ? Icons.keyboard_arrow_down
+                                                : Icons.keyboard_arrow_right),
+                                          ),
+                                        ],
+                                      ),
                                     ),
                                   ),
-                                ),
-                              ],
+                                ],
+                              ),
                             ),
                           ),
-                        ),
-                        visibilityLang
-                            ? Container(
-                                child: Column(
-                                  children: [
-                                    Divider(
-                                      thickness: 1.5,
-                                      height: 0,
-                                    ),
-                                    Column(
-                                      children: [
-                                        Row(
+                          visibilityLang
+                              ? Container(
+                                  child: Column(
+                                    children: [
+                                      Divider(
+                                        indent: 30.0,
+                                        endIndent: 30.0,
+                                        thickness: 1.5,
+                                        height: 0,
+                                      ),
+                                      Padding(
+                                        padding:
+                                            EdgeInsets.only(top: h*0.02),
+                                        child: Column(
                                           children: [
-                                            SizedBox(
-                                              width: 20,
-                                            ),
-                                            CircleAvatar(
-                                              backgroundImage: AssetImage(
-                                                "assets/download.png",
-                                              ),
-                                              radius: 17,
-                                            ),
-                                            SizedBox(
-                                              width: 20,
-                                            ),
-                                            Text(
-                                              "data",
-                                              style: kTextFlagStyle,
-                                            ),
+                                            Row(
+                                              children: [
+                                                SizedBox(
+                                                  width: 20,
+                                                ),
+                                                CircleAvatar(
+                                                  backgroundImage: AssetImage(
+                                                    "assets/download.png",
+                                                  ),
+                                                  radius: 10,
+                                                ),
+                                                SizedBox(
+                                                  width: 10,
+                                                ),
+                                                Text(
+                                                  "Arabic",
+                                                  style: TextStyle(fontSize: 15),
+                                                ),
+                                              ],
+                                            )
                                           ],
-                                        )
-                                      ],
-                                    ),
-                                    Row(
-                                      mainAxisAlignment:
-                                          MainAxisAlignment.center,
-                                      children: [
-                                        FlatButton(
-                                          onPressed: () {},
-                                          child: Text("Change"),
-                                          splashColor: Colors.grey,
-                                        ),
-                                        FlatButton(
-                                          onPressed: () {},
-                                          child: Text("Cancel"),
-                                          splashColor: Colors.grey,
                                         ),
-                                      ],
-                                    ),
-                                  ],
-                                ),
-                              )
-                            : Container(),
-                      ],
-                    ),
-                    Divider(
-                      thickness: 1.5,
-                      height: 0,
-                      endIndent: 30.0,
-                      indent: 30.0,
-                    ),
-                    Column(
-                      children: [
-                        FlatButton(
-                          materialTapTargetSize:
-                              MaterialTapTargetSize.shrinkWrap,
-                          color: Colors.white,
-                          onPressed: () {},
-                          child: InkWell(
-                            onTap: () {
-                              iconTheme = !iconTheme;
-                              visibilityTheme
-                                  ? _changed(false, "Theme")
-                                  : _changed(true, "Theme");
-                            },
-                            child: Row(
-                              children: [
-                                Padding(
-                                  padding: EdgeInsets.only(right: 10),
-                                  child: Icon(Icons.color_lens),
-                                ),
-                                Expanded(
-                                  child: InkWell(
-                                    onTap: () {
-                                      iconTheme = !iconTheme;
-                                      visibilityTheme
-                                          ? _changed(false, "Theme")
-                                          : _changed(true, "Theme");
-                                    },
-                                    child: Row(
-                                      mainAxisAlignment:
-                                          MainAxisAlignment.spaceBetween,
-                                      children: [
-                                        Align(
-                                          alignment: Alignment.centerLeft,
-                                          child: Text(
-                                            'Change Theme',
-                                            style: TextStyle(fontSize: 17),
+                                      ),
+                                      Row(
+                                        mainAxisAlignment:
+                                            MainAxisAlignment.center,
+                                        children: [
+                                          FlatButton(
+                                            onPressed: () {},
+                                            child: Text("Change"),
+                                            splashColor: Colors.grey,
                                           ),
-                                        ),
-                                        IconButton(
-                                          alignment: Alignment.centerRight,
-                                          onPressed: () {
-                                            iconTheme = !iconTheme;
-                                            visibilityTheme
-                                                ? _changed(false, "Theme")
-                                                : _changed(true, "Theme");
-                                          },
-                                          icon: Icon(iconTheme
-                                              ? Icons.keyboard_arrow_down
-                                              : Icons.keyboard_arrow_right),
-                                        ),
-                                      ],
+                                          FlatButton(
+                                            onPressed: () {
+                                              iconLang = !iconLang;
+                                              visibilityLang = !visibilityLang;
+                                              setState(() {
+                                                // here i used set state so when i press cancel it will hide the visibility bar
+                                              });
+                                            },
+                                            child: Text("Cancel"),
+                                            splashColor: Colors.grey,
+                                          ),
+                                        ],
+                                      ),
+                                    ],
+                                  ),
+                                )
+                              : Container(),
+                        ],
+                      ),
+                      Divider(
+                        thickness: 1.5,
+                        height: 0,
+                        endIndent: 30.0,
+                        indent: 30.0,
+                      ),
+                      Column(
+                        children: [
+                          FlatButton(
+                            materialTapTargetSize:
+                                MaterialTapTargetSize.shrinkWrap,
+                            color: Colors.white,
+                            onPressed: () {},
+                            child: InkWell(
+                              onTap: () {
+                                iconTheme = !iconTheme;
+                                visibilityTheme
+                                    ? _changed(false, "Theme")
+                                    : _changed(true, "Theme");
+                              },
+                              child: Row(
+                                children: [
+                                  Padding(
+                                    padding: EdgeInsets.only(right: w * 0.02),
+                                    child: Icon(Icons.color_lens),
+                                  ),
+                                  Expanded(
+                                    child: InkWell(
+                                      onTap: () {
+                                        iconTheme = !iconTheme;
+                                        visibilityTheme
+                                            ? _changed(false, "Theme")
+                                            : _changed(true, "Theme");
+                                      },
+                                      child: Row(
+                                        mainAxisAlignment:
+                                            MainAxisAlignment.spaceBetween,
+                                        children: [
+                                          Align(
+                                            alignment: Alignment.centerLeft,
+                                            child: Text(
+                                              'Change Theme',
+                                              style: TextStyle(fontSize: 17),
+                                            ),
+                                          ),
+                                          IconButton(
+                                            alignment: Alignment.centerRight,
+                                            onPressed: () {
+                                              iconTheme = !iconTheme;
+                                              visibilityTheme
+                                                  ? _changed(false, "Theme")
+                                                  : _changed(true, "Theme");
+                                            },
+                                            icon: Icon(iconTheme
+                                                ? Icons.keyboard_arrow_down
+                                                : Icons.keyboard_arrow_right),
+                                          ),
+                                        ],
+                                      ),
                                     ),
                                   ),
-                                ),
-                              ],
+                                ],
+                              ),
                             ),
                           ),
-                        ),
-                        visibilityTheme
-                            ? Container(
-                                child: Column(
-                                  children: [
-                                    Divider(
-                                      thickness: 1.5,
-                                      height: 0,
-                                    ),
-                                    RadioListTile(
-                                      value: 1,
-                                      groupValue: selectedRadioTile,
-                                      title: Text("Light"),
-                                      onChanged: (val) {
-                                        setSelectedRadioTile(val);
-                                      },
-                                      activeColor: Colors.grey,
-                                      selected:
-                                          selectedRadioTile == 1 ? true : false,
-                                    ),
-                                    RadioListTile(
-                                      value: 2,
-                                      groupValue: selectedRadioTile,
-                                      title: Text("Dark"),
-                                      onChanged: (val) {
-                                        setSelectedRadioTile(val);
-                                      },
-                                      activeColor: Colors.black,
-                                      selected:
-                                          selectedRadioTile == 2 ? true : false,
-                                    ),
-                                    Row(
-                                      mainAxisAlignment:
-                                          MainAxisAlignment.center,
-                                      children: [
-                                        FlatButton(
-                                          onPressed: () {},
-                                          child: Text("Change"),
-                                          splashColor: Colors.grey,
-                                        ),
-                                        FlatButton(
-                                          onPressed: () {},
-                                          child: Text("Cancel"),
-                                          splashColor: Colors.grey,
-                                        ),
-                                      ],
-                                    ),
-                                  ],
-                                ),
-                              )
-                            : Container(),
-                      ],
-                    ),
-                  ],
+                          visibilityTheme
+                              ? Container(
+                                  child: Column(
+                                    children: [
+                                      Divider(
+                                        thickness: 1.5,
+                                        height: 0,
+                                      ),
+                                      RadioListTile(
+                                        value: 1,
+                                        groupValue: selectedRadioTile,
+                                        title: Text("Light"),
+                                        onChanged: (val) {
+                                          setSelectedRadioTile(val);
+                                        },
+                                        activeColor: Colors.black,
+                                        selected:
+                                            selectedRadioTile == 1 ? true : false,
+                                      ),
+                                      RadioListTile(
+                                        value: 2,
+                                        groupValue: selectedRadioTile,
+                                        title: Text("Dark"),
+                                        onChanged: (val) {
+                                          setSelectedRadioTile(val);
+                                        },
+                                        activeColor: Colors.black,
+                                        selected:
+                                            selectedRadioTile == 2 ? true : false,
+                                      ),
+                                      Row(
+                                        mainAxisAlignment:
+                                            MainAxisAlignment.center,
+                                        children: [
+                                          FlatButton(
+                                            onPressed: () {},
+                                            child: Text("Change"),
+                                            splashColor: Colors.grey,
+                                          ),
+                                          FlatButton(
+                                            onPressed: () {
+                                              iconTheme = !iconTheme;
+                                              visibilityTheme = !visibilityTheme;
+                                              setState(() {});
+                                            },
+                                            child: Text("Cancel"),
+                                            splashColor: Colors.grey,
+                                          ),
+                                        ],
+                                      ),
+                                    ],
+                                  ),
+                                )
+                              : Container(),
+                        ],
+                      ),
+                    ],
+                  ),
                 ),
-              ),
-            ],
+              ],
+            ),
           ),
         ),
       ),
diff --git a/lib/src/Screens/Shop/Category.dart b/lib/src/Screens/Shop/Category.dart
index 39e468f..7dee35d 100644
--- a/lib/src/Screens/Shop/Category.dart
+++ b/lib/src/Screens/Shop/Category.dart
@@ -1,12 +1,9 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/material.dart';
-import 'package:thefinalproject/Drawer.dart';
+import 'package:thefinalproject/Custom_Widgets.dart';
 
 class Products extends StatefulWidget {
   @override
   _ProductsState createState() => _ProductsState();
 }
-
 class _ProductsState extends State<Products> with SingleTickerProviderStateMixin{
   TabController tabController;
   @override
@@ -18,20 +15,21 @@ class _ProductsState extends State<Products> with SingleTickerProviderStateMixin
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
+        backgroundColor: Colors.redAccent,
         title: Text('Products By Categories'),
         bottom: TabBar(
           tabs: [
             Tab(
-              text: 'gfnbfgb',
+              text: '1',
             ),
             Tab(
-              text: 'fg nfbg fb',
+              text: '2',
             ),
             Tab(
-              text: 'gb gdf',
+              text: '3',
             ),
             Tab(
-              text: 'dfbg',
+              text: '4',
             ),
           ],
           controller: tabController,
diff --git a/lib/src/Screens/splash_screen.dart b/lib/src/Screens/splash_screen.dart
index 6055119..28eee1a 100644
--- a/lib/src/Screens/splash_screen.dart
+++ b/lib/src/Screens/splash_screen.dart
@@ -1,12 +1,10 @@
-import 'package:flutter/material.dart';
-import 'package:thefinalproject/src/Screens/Auth/sign_in_screen.dart';
-
-class Spalsh extends StatefulWidget {
+import 'package:thefinalproject/Custom_Widgets.dart';
+class Splash extends StatefulWidget {
   @override
-  _SpalshState createState() => _SpalshState();
+  _SplashState createState() => _SplashState();
 }
 
-class _SpalshState extends State<Spalsh> {
+class _SplashState extends State<Splash> {
   @override
   void initState() {
     // here to make the splash screen only show for specific amount of time
@@ -15,7 +13,6 @@ class _SpalshState extends State<Spalsh> {
       Navigator.of(context).push(MaterialPageRoute(
         builder: (_) => SignInscreen(),
       ));
-      //setState(() {});            why when i  comment both of those it still works
     });
     //super.initState();
   }
@@ -25,7 +22,7 @@ class _SpalshState extends State<Spalsh> {
     var h = MediaQuery.of(context).size.height;
     var w = MediaQuery.of(context).size.width;
     return Scaffold(
-      backgroundColor: Colors.white,
+      backgroundColor: Colors.redAccent[50],
       body: SafeArea(
         child: SingleChildScrollView(
           child: Column(
@@ -33,36 +30,48 @@ class _SpalshState extends State<Spalsh> {
               SizedBox(
                 height: h * 0.1,
               ),
+              // Container(
+              //   height: h * 0.1,
+              //   child: Text(
+              //     'E-Commerce\n',
+              //     style: TextStyle(
+              //         color: Color(0xffff4d4d),
+              //         fontSize: 35,
+              //         fontWeight: FontWeight.bold),
+              //   ),
+              //   alignment: Alignment.center,
+              // ),
               Container(
-                height: h * 0.1,
-                child: Text(
-                  'E-Commerce\n',
-                  style: TextStyle(
-                      color: Color(0xffff4d4d),
-                      fontSize: 35,
-                      fontWeight: FontWeight.bold),
+                height: h * 0.25,
+                child: Column(
+                  children: [
+                    Text(
+                      "Welcome to Our App \n ",
+                      style: TextStyle(color: Colors.grey[600], fontSize: 25),
+                    ),
+                    Text(
+                      "Let's Shop",
+                      style: TextStyle(
+                        color: Color(0xffff4d4d),
+                        fontSize: 25,
+                      ),
+                    ),
+                  ],
                 ),
-                alignment: Alignment.center,
               ),
-              Container(
-                  height: h * 0.15,
-                  child: RichText(
-                    text: TextSpan(
-                      text: "Welcome to Our App , ",
-                      style: TextStyle(color: Colors.grey[600], fontSize: 20),
-                      children: [
-                        TextSpan(
-                            text: "Let's Shop",
-                            style: TextStyle(color: Color(0xffff4d4d))),
-                      ],
-                    ),
-                  )),
-              Container(
-                width: 240.0,
-                height: h * 0.3,
-                decoration: BoxDecoration(
-                    image: DecorationImage(image: AssetImage("assets/1.png"))),
+              Card(
+                color: Colors.transparent,
+                child: CircleAvatar(
+                  backgroundImage: AssetImage("assets/Logo.png"),
+                  radius: 80,
+                ),
               ),
+              // Container(
+              //   width: 240.0,
+              //   height: h * 0.3,
+              //   decoration: BoxDecoration(
+              //       image: DecorationImage(image: )),
+              // ),
               SizedBox(
                 height: h * 0.2,
               ),
diff --git a/lib/src/models/category.dart b/lib/src/models/category.dart
new file mode 100644
index 0000000..e69de29
diff --git a/lib/src/models/product.dart b/lib/src/models/product.dart
new file mode 100644
index 0000000..0346c09
--- /dev/null
+++ b/lib/src/models/product.dart
@@ -0,0 +1,78 @@
+import 'package:flutter/foundation.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+part 'product.g.dart';
+
+@JsonSerializable()
+class first {
+
+  factory first.fromJson(Map<String, dynamic> json) => _$firstFromJson(json);
+  Map<String, dynamic> toJson(instance) => _$firstToJson(this);
+  int id;
+  String title;
+  double price;
+
+  //<editor-fold desc="Data Methods" defaultstate="collapsed">
+
+  first({
+    @required this.id,
+    @required this.title,
+    @required this.price,
+    @required this.description,
+    @required this.category,
+    @required this.image,
+  });
+
+  first copyWith({
+    int id,
+    String title,
+    double price,
+    String description,
+    String category,
+    String image,
+  }) {
+    return new first(
+      id: id ?? this.id,
+      title: title ?? this.title,
+      price: price ?? this.price,
+      description: description ?? this.description,
+      category: category ?? this.category,
+      image: image ?? this.image,
+    );
+  }
+
+  @override
+  String toString() {
+    return 'first{id: $id, title: $title, price: $price, description: $description, category: $category, image: $image}';
+  }
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is first &&
+          runtimeType == other.runtimeType &&
+          id == other.id &&
+          title == other.title &&
+          price == other.price &&
+          description == other.description &&
+          category == other.category &&
+          image == other.image);
+
+  @override
+  int get hashCode =>
+      id.hashCode ^
+      title.hashCode ^
+      price.hashCode ^
+      description.hashCode ^
+      category.hashCode ^
+      image.hashCode;
+
+  //</editor-fold>
+
+  String description;
+  String category;
+  String image;
+}
+
+
+
diff --git a/lib/src/models/product.g.dart b/lib/src/models/product.g.dart
new file mode 100644
index 0000000..8282fef
--- /dev/null
+++ b/lib/src/models/product.g.dart
@@ -0,0 +1,27 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'product.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+first _$firstFromJson(Map<String, dynamic> json) {
+  return first(
+    id: json['id'] as int,
+    title: json['title'] as String,
+    price: (json['price'] as num)?.toDouble(),
+    description: json['description'] as String,
+    category: json['category'] as String,
+    image: json['image'] as String,
+  );
+}
+
+Map<String, dynamic> _$firstToJson(first instance) => <String, dynamic>{
+      'id': instance.id,
+      'title': instance.title,
+      'price': instance.price,
+      'description': instance.description,
+      'category': instance.category,
+      'image': instance.image,
+    };
diff --git a/pubspec.lock b/pubspec.lock
index 81223c1..e1fb614 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1,6 +1,27 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  _fe_analyzer_shared:
+    dependency: transitive
+    description:
+      name: _fe_analyzer_shared
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "14.0.0"
+  analyzer:
+    dependency: transitive
+    description:
+      name: analyzer
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.41.2"
+  args:
+    dependency: transitive
+    description:
+      name: args
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.6.0"
   async:
     dependency: transitive
     description:
@@ -15,6 +36,62 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0-nullsafety.1"
+  build:
+    dependency: transitive
+    description:
+      name: build
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.6.2"
+  build_config:
+    dependency: transitive
+    description:
+      name: build_config
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.4.5"
+  build_daemon:
+    dependency: transitive
+    description:
+      name: build_daemon
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.7"
+  build_resolvers:
+    dependency: transitive
+    description:
+      name: build_resolvers
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.5.3"
+  build_runner:
+    dependency: "direct dev"
+    description:
+      name: build_runner
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.11.1"
+  build_runner_core:
+    dependency: transitive
+    description:
+      name: build_runner_core
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "6.1.7"
+  built_collection:
+    dependency: transitive
+    description:
+      name: built_collection
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "4.3.2"
+  built_value:
+    dependency: transitive
+    description:
+      name: built_value
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "7.1.0"
   characters:
     dependency: transitive
     description:
@@ -29,6 +106,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0-nullsafety.1"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.4"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.0"
   clock:
     dependency: transitive
     description:
@@ -36,6 +127,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0-nullsafety.1"
+  code_builder:
+    dependency: transitive
+    description:
+      name: code_builder
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.7.0"
   collection:
     dependency: transitive
     description:
@@ -43,6 +141,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.15.0-nullsafety.3"
+  convert:
+    dependency: transitive
+    description:
+      name: convert
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
   country_icons:
     dependency: "direct main"
     description:
@@ -50,6 +155,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.1"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.5"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -57,6 +169,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.0"
+  dart_style:
+    dependency: transitive
+    description:
+      name: dart_style
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.3.12"
+  dio:
+    dependency: "direct main"
+    description:
+      name: dio
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.10"
   fake_async:
     dependency: transitive
     description:
@@ -64,6 +190,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0-nullsafety.1"
+  file:
+    dependency: transitive
+    description:
+      name: file
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "5.2.1"
+  fixnum:
+    dependency: transitive
+    description:
+      name: fixnum
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.10.11"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -74,6 +214,76 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  glob:
+    dependency: transitive
+    description:
+      name: glob
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.2.0"
+  graphs:
+    dependency: transitive
+    description:
+      name: graphs
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.0"
+  http_multi_server:
+    dependency: transitive
+    description:
+      name: http_multi_server
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.0"
+  http_parser:
+    dependency: transitive
+    description:
+      name: http_parser
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.1.4"
+  intl:
+    dependency: transitive
+    description:
+      name: intl
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.16.1"
+  io:
+    dependency: transitive
+    description:
+      name: io
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.5"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.6.2"
+  json_annotation:
+    dependency: transitive
+    description:
+      name: json_annotation
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.1.1"
+  json_serializable:
+    dependency: "direct dev"
+    description:
+      name: json_serializable
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.5.1"
+  logging:
+    dependency: transitive
+    description:
+      name: logging
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.11.4"
   matcher:
     dependency: transitive
     description:
@@ -88,6 +298,34 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.0-nullsafety.3"
+  mime:
+    dependency: transitive
+    description:
+      name: mime
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.9.7"
+  node_interop:
+    dependency: transitive
+    description:
+      name: node_interop
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.2.1"
+  node_io:
+    dependency: transitive
+    description:
+      name: node_io
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.2.0"
+  package_config:
+    dependency: transitive
+    description:
+      name: package_config
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.9.3"
   path:
     dependency: transitive
     description:
@@ -95,6 +333,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.0-nullsafety.1"
+  pedantic:
+    dependency: transitive
+    description:
+      name: pedantic
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.9.2"
   pin_code_fields:
     dependency: "direct main"
     description:
@@ -102,11 +347,60 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "6.1.0"
+  pool:
+    dependency: transitive
+    description:
+      name: pool
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.4.0"
+  pub_semver:
+    dependency: transitive
+    description:
+      name: pub_semver
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.4.4"
+  pubspec_parse:
+    dependency: transitive
+    description:
+      name: pubspec_parse
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.8"
+  quiver:
+    dependency: transitive
+    description:
+      name: quiver
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.5"
+  shelf:
+    dependency: transitive
+    description:
+      name: shelf
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.7.9"
+  shelf_web_socket:
+    dependency: transitive
+    description:
+      name: shelf_web_socket
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.4+1"
   sky_engine:
     dependency: transitive
     description: flutter
     source: sdk
     version: "0.0.99"
+  source_gen:
+    dependency: transitive
+    description:
+      name: source_gen
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.9.10+3"
   source_span:
     dependency: transitive
     description:
@@ -128,6 +422,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0-nullsafety.1"
+  stream_transform:
+    dependency: transitive
+    description:
+      name: stream_transform
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.2.0"
   string_scanner:
     dependency: transitive
     description:
@@ -149,6 +450,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.19-nullsafety.2"
+  timing:
+    dependency: transitive
+    description:
+      name: timing
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.1+3"
   typed_data:
     dependency: transitive
     description:
@@ -163,6 +471,27 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0-nullsafety.3"
+  watcher:
+    dependency: transitive
+    description:
+      name: watcher
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.9.7+15"
+  web_socket_channel:
+    dependency: transitive
+    description:
+      name: web_socket_channel
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.2.0"
+  yaml:
+    dependency: transitive
+    description:
+      name: yaml
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.1"
 sdks:
-  dart: ">=2.10.0-110 <2.11.0"
+  dart: ">=2.10.0 <2.11.0"
   flutter: ">=1.22.0 <2.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index d5a7780..877156d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -24,6 +24,8 @@ dependencies:
   country_icons: ^1.1.1
   flutter:
     sdk: flutter
+  dio: ^3.0.10
+
 
 
   # The following adds the Cupertino Icons font to your application.
@@ -34,6 +36,11 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  build_runner: ^1.0.7
+  json_serializable: ^3.5.1
+
+
+
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
diff --git a/test/test_test.dart b/test/test_test.dart
new file mode 100644
index 0000000..e16e8d4
--- /dev/null
+++ b/test/test_test.dart
@@ -0,0 +1,44 @@
+// import 'package:dio/dio.dart';
+// import 'package:flutter_test/flutter_test.dart';
+// import 'package:thefinalproject/src/models/product.dart';
+// import 'package:thefinalproject/src/models/products.dart';
+//
+// void main() {
+//   test('asfsd', () async {
+//     final dio  = Dio();
+//     final response =  await dio.get('https://fakestoreapi.herokuapp.com/products');
+//     //print(response);
+//     final List<Product> products =  (response.data as List).map((e) => Product.fromJson(e)).toList();
+//      print(products.first.category);
+//   });
+// }
+//
+
+// import 'package:dio/dio.dart';
+// import 'package:flutter_test/flutter_test.dart';
+// import 'package:thefinalproject/Custom_Widgets.dart';
+//
+// void main(){
+//   test('asdfsa', () async{
+//     final dio = Dio();
+//     final response = await dio.get('https://fakestoreapi.herokuapp.com/products');
+//     print(response.data.toString());
+//
+//   });
+// }
+
+import 'package:dio/dio.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main(){
+  test('sdfds', () async{
+    final dio = Dio();
+    final response = await dio.get('https://fakestoreapi.herokuapp.com/products');
+   // print(response.data.toString());
+  //  print(response.headers.toString());
+    print(response.statusMessage.toString());
+    print(response.data.toString());
+    return response;
+
+  });
+}