Merge pull request #9 from nhandrew/part12

Part12
nhandrew · May 2, 2020 · cdacdf3 · cdacdf3
2 parents ab7ce11 + b06400a
commit cdacdf3
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 23 deletions.
diff --git a/lib/src/screens/login.dart b/lib/src/screens/login.dart
@@ -1,15 +1,12 @@
 import 'package:farmers_market/src/styles/base.dart';
-import 'package:farmers_market/src/styles/buttons.dart';
 import 'package:farmers_market/src/styles/text.dart';
-import 'package:farmers_market/src/styles/textfields.dart';
 import 'package:farmers_market/src/widgets/button.dart';
 import 'package:farmers_market/src/widgets/social_button.dart';
 import 'package:farmers_market/src/widgets/textfield.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'dart:io';
-import '../styles/colors.dart';
 
 class Login extends StatelessWidget {
   @override
@@ -57,13 +54,16 @@ class Login extends StatelessWidget {
           obscureText: true,
         ),
         AppButton(buttonText: 'Login',buttonType: ButtonType.LightBlue,),
+        SizedBox(height: 6.0,),
         Center(child: Text('Or',style: TextStyles.suggestion),),
+        SizedBox(height: 6.0,),
         Padding(
           padding: BaseStyles.listPadding,
           child: Row(
             mainAxisAlignment: MainAxisAlignment.center,
             children: <Widget>[
               AppSocialButton(socialType: SocialType.Facebook,),
+              SizedBox(width:15.0),
               AppSocialButton(socialType: SocialType.Google),
           ],),
         ),

diff --git a/lib/src/screens/signup.dart b/lib/src/screens/signup.dart
@@ -1,4 +1,10 @@
+import 'package:farmers_market/src/styles/base.dart';
+import 'package:farmers_market/src/styles/text.dart';
+import 'package:farmers_market/src/widgets/button.dart';
+import 'package:farmers_market/src/widgets/social_button.dart';
+import 'package:farmers_market/src/widgets/textfield.dart';
 import 'package:flutter/cupertino.dart';
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'dart:io';
 
@@ -16,14 +22,68 @@ class Signup extends StatelessWidget{
     }
   }
 
-  Widget pageBody(BuildContext context){
-    return Center(child: (Platform.isIOS) 
-    ? CupertinoButton(child: Text('Login'),onPressed: (){
-      Navigator.pushReplacementNamed(context, '/login');
-    },)
-    : RaisedButton(child: Text('Login'), onPressed: (){
-      Navigator.pushReplacementNamed(context, '/login');
-    },)
-      );
+  Widget pageBody(BuildContext context) {
+    return ListView(
+      padding: EdgeInsets.all(0.0),
+      children: <Widget>[
+        Container(
+          height: MediaQuery.of(context).size.height * .2,
+          decoration: BoxDecoration(
+              image: DecorationImage(
+                  image: AssetImage('assets/images/top_bg.png'),
+                  fit: BoxFit.fill)),
+        ),
+        Container(
+          height: 200.0,
+          decoration: BoxDecoration(
+            image: DecorationImage(image: AssetImage('assets/images/logo.png')),
+          ),
+        ),
+        AppTextField(  
+          isIOS: Platform.isIOS,
+          hintText: 'Email',
+          cupertinoIcon: CupertinoIcons.mail_solid,
+          materialIcon: Icons.email,
+          textInputType: TextInputType.emailAddress,
+        ),
+        AppTextField( 
+          isIOS: Platform.isIOS,
+          hintText: 'Password',
+          cupertinoIcon: IconData(0xf4c9,fontFamily: CupertinoIcons.iconFont, fontPackage: CupertinoIcons.iconFontPackage),
+          materialIcon: Icons.lock,
+          obscureText: true,
+        ),
+        AppButton(buttonText: 'Signup',buttonType: ButtonType.LightBlue,),
+        Center(child: Text('Or',style: TextStyles.suggestion),),
+        Padding(
+          padding: BaseStyles.listPadding,
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: <Widget>[
+              AppSocialButton(socialType: SocialType.Facebook,),
+              AppSocialButton(socialType: SocialType.Google),
+          ],),
+        ),
+        Padding( 
+          padding: BaseStyles.listPadding,
+          child: RichText( 
+            textAlign: TextAlign.center,
+            text: TextSpan(  
+              text: 'Already Have an Account? ',
+              style: TextStyles.body, 
+              children: [ 
+                TextSpan(  
+                  text: 'Login',
+                  style: TextStyles.link,
+                  recognizer: TapGestureRecognizer()
+                      ..onTap = () => Navigator.pushNamed(context, '/login')
+                )
+              ]
+            )
+          ),
+        )
+      ],
+    );
   }
+
 }
diff --git a/lib/src/widgets/social_button.dart b/lib/src/widgets/social_button.dart
@@ -33,18 +33,15 @@ class AppSocialButton extends StatelessWidget {
         break;
     }
 
-    return Padding(
-      padding: BaseStyles.listPadding,
-      child: Container(
+    return Container(
         height: ButtonStyles.buttonHeight,
         width: ButtonStyles.buttonHeight,
         decoration: BoxDecoration(
             color: buttonColor,
             borderRadius: BorderRadius.circular(BaseStyles.borderRadius),
             boxShadow: BaseStyles.boxShadow),
         child: Icon(icon, color: iconColor),
-      ),
-    );
+      );
   }
 }
 

diff --git a/lib/src/widgets/textfield.dart b/lib/src/widgets/textfield.dart
@@ -15,8 +15,8 @@ class AppTextField extends StatelessWidget{
     @required this.hintText,
     @required this.cupertinoIcon,
     @required this.materialIcon,
-    this.textInputType,
-    this.obscureText
+    this.textInputType = TextInputType.text,
+    this.obscureText = false
   });
 
   @override
@@ -25,7 +25,7 @@ class AppTextField extends StatelessWidget{
       return Padding(
         padding: EdgeInsets.symmetric(horizontal: TextFieldStyles.textBoxHorizontal, vertical: TextFieldStyles.textBoxVertical),
         child: CupertinoTextField(  
-          keyboardType: (textInputType != null) ? textInputType : TextInputType.text,
+          keyboardType: textInputType,
           padding: EdgeInsets.all(12.0),
           placeholder: hintText,
           placeholderStyle: TextFieldStyles.placeholder,
@@ -34,19 +34,19 @@ class AppTextField extends StatelessWidget{
           cursorColor: TextFieldStyles.cursorColor,
           decoration: TextFieldStyles.cupertinoDecoration,
           prefix: TextFieldStyles.iconPrefix(cupertinoIcon),
-          obscureText: (obscureText != null) ? obscureText : false,
+          obscureText: obscureText,
         ),
       );
     } else {
       return Padding(
         padding: EdgeInsets.symmetric(horizontal: TextFieldStyles.textBoxHorizontal, vertical: TextFieldStyles.textBoxVertical),
         child: TextField(  
-          keyboardType: (textInputType != null) ? textInputType : TextInputType.text,
+          keyboardType: textInputType,
           cursorColor: TextFieldStyles.cursorColor,
           style:TextFieldStyles.text,
           textAlign: TextFieldStyles.textAlign,
           decoration: TextFieldStyles.materialDecoration(hintText, materialIcon),
-          obscureText: (obscureText != null) ? obscureText : false,
+          obscureText: obscureText,
         ),
       );
     }