Merge remote-tracking branch 'origin/form_validation'

# Conflicts: # lib/auth/signin.dart
Furqankhanzada · Oct 21, 2019 · 5444b4c · 5444b4c
2 parents b68e8b7 + 481ea31
commit 5444b4c
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 14 deletions.
diff --git a/lib/auth/signin.dart b/lib/auth/signin.dart
@@ -27,13 +27,25 @@ class _SignInState extends State<SignIn> {
               Padding(
                 padding: const EdgeInsets.only(bottom: 12.0),
                 child: TextFormField(
+                  validator: (value) {
+                    if (value.isEmpty) {
+                      return 'Please Enter Email or Username';
+                    }
+                    return null;
+                  },
                   decoration: InputDecoration(
                     hintText: 'Enter Username Or Email',
                     labelText: 'Email',
                   ),
                 ),
               ),
               TextFormField(
+                validator: (value) {
+                  if (value.isEmpty) {
+                    return 'Please Enter Password';
+                  }
+                  return null;
+                },
                 decoration: InputDecoration(
                   hintText: 'Enter Password',
                   labelText: 'Password',
@@ -45,19 +57,15 @@ class _SignInState extends State<SignIn> {
                 child: SizedBox(
                   width: double.infinity,
                   height: 50,
-                  child: Consumer<AuthBlock>(
-                    builder: (context, auth, child) {
-                      return RaisedButton(
-                        color: Colors.deepOrange,
-                        textColor: Colors.white,
-                        child: Text(auth.loading ? 'Loading...' : 'Sign In'),
-                        onPressed: () {
-                          auth.loading = true;
-                          final t = Timer(Duration(seconds: 3), () {
-                            auth.loading = false;
-                          });
-                        },
-                      );
+                  child: RaisedButton(
+                    color: Colors.deepOrange,
+                    textColor: Colors.white,
+                    child: Text('Sign In'),
+                    onPressed: (){
+                      if (_formKey.currentState.validate()) {
+                        // If the form is valid, display a snackbar. In the real world,
+                        // you'd often call a server or save the information in a database.
+                      }
                     },
                   ),
                 ),

diff --git a/lib/auth/signup.dart b/lib/auth/signup.dart
@@ -21,6 +21,12 @@ class _SignUpState extends State<SignUp> {
               Padding(
                 padding: const EdgeInsets.only(bottom: 12.0),
                 child: TextFormField(
+                  validator: (value) {
+                    if (value.isEmpty) {
+                      return 'Please Enter Username';
+                    }
+                    return null;
+                  },
                   decoration: InputDecoration(
                     hintText: 'Enter Username',
                     labelText: 'Username',
@@ -30,6 +36,12 @@ class _SignUpState extends State<SignUp> {
               Padding(
                 padding: const EdgeInsets.only(bottom: 12.0),
                 child: TextFormField(
+                  validator: (value) {
+                    if (value.isEmpty) {
+                      return 'Please Enter Email Address';
+                    }
+                    return null;
+                  },
                   decoration: InputDecoration(
                     hintText: 'Enter Email',
                     labelText: 'Email',
@@ -39,6 +51,12 @@ class _SignUpState extends State<SignUp> {
               Padding(
                 padding: const EdgeInsets.only(bottom: 12.0),
                 child: TextFormField(
+                    validator: (value) {
+                      if (value.isEmpty) {
+                        return 'Please Enter Password';
+                      }
+                      return null;
+                    },
                   decoration: InputDecoration(
                     hintText: 'Enter Password',
                     labelText: 'Password',
@@ -47,6 +65,12 @@ class _SignUpState extends State<SignUp> {
                 ),
               ),
               TextFormField(
+                validator: (value) {
+                  if (value.isEmpty) {
+                    return 'Please Enter Confirm Password';
+                  }
+                  return null;
+                },
                 decoration: InputDecoration(
                   hintText: 'Enter Same Password',
                   labelText: 'Confirm Password',
@@ -63,7 +87,10 @@ class _SignUpState extends State<SignUp> {
                     textColor: Colors.white,
                     child: Text('Sign Up'),
                     onPressed: (){
-
+                      if (_formKey.currentState.validate()) {
+                        // If the form is valid, display a snackbar. In the real world,
+                        // you'd often call a server or save the information in a database.
+                      }
                     },
                   ),
                 ),