diff --git a/lib/login_screen_1.dart b/lib/login_screen_1.dart index 1d3e746..cfc7873 100644 --- a/lib/login_screen_1.dart +++ b/lib/login_screen_1.dart @@ -42,11 +42,17 @@ class LoginScreen1 extends StatelessWidget { children: [ Text( "DEMO", - style: TextStyle(fontSize: 50.0, fontWeight: FontWeight.bold, color: this.primaryColor), + style: TextStyle( + fontSize: 50.0, + fontWeight: FontWeight.bold, + color: this.primaryColor), ), Text( "Login Screen 1", - style: TextStyle(fontSize: 20.0, fontWeight: FontWeight.bold, color: this.primaryColor), + style: TextStyle( + fontSize: 20.0, + fontWeight: FontWeight.bold, + color: this.primaryColor), ), ], ), @@ -68,11 +74,13 @@ class LoginScreen1 extends StatelessWidget { ), borderRadius: BorderRadius.circular(20.0), ), - margin: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 20.0), + margin: const EdgeInsets.symmetric( + vertical: 10.0, horizontal: 20.0), child: Row( children: [ new Padding( - padding: EdgeInsets.symmetric(vertical: 10.0, horizontal: 15.0), + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 15.0), child: Icon( Icons.person_outline, color: Colors.grey, @@ -111,11 +119,13 @@ class LoginScreen1 extends StatelessWidget { ), borderRadius: BorderRadius.circular(20.0), ), - margin: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 20.0), + margin: const EdgeInsets.symmetric( + vertical: 10.0, horizontal: 20.0), child: Row( children: [ new Padding( - padding: EdgeInsets.symmetric(vertical: 10.0, horizontal: 15.0), + padding: EdgeInsets.symmetric( + vertical: 10.0, horizontal: 15.0), child: Icon( Icons.lock_open, color: Colors.grey, @@ -146,7 +156,8 @@ class LoginScreen1 extends StatelessWidget { children: [ new Expanded( child: FlatButton( - shape: new RoundedRectangleBorder(borderRadius: new BorderRadius.circular(30.0)), + shape: new RoundedRectangleBorder( + borderRadius: new BorderRadius.circular(30.0)), splashColor: this.primaryColor, color: this.primaryColor, child: new Row( @@ -166,7 +177,9 @@ class LoginScreen1 extends StatelessWidget { child: new Container( padding: const EdgeInsets.all(5.0), child: FlatButton( - shape: new RoundedRectangleBorder(borderRadius: new BorderRadius.circular(28.0)), + shape: new RoundedRectangleBorder( + borderRadius: + new BorderRadius.circular(28.0)), splashColor: Colors.white, color: Colors.white, child: Icon( @@ -192,7 +205,8 @@ class LoginScreen1 extends StatelessWidget { children: [ new Expanded( child: FlatButton( - shape: new RoundedRectangleBorder(borderRadius: new BorderRadius.circular(30.0)), + shape: new RoundedRectangleBorder( + borderRadius: new BorderRadius.circular(30.0)), splashColor: Color(0xFF3B5998), color: Color(0xff3B5998), child: new Row( @@ -212,11 +226,14 @@ class LoginScreen1 extends StatelessWidget { child: new Container( padding: const EdgeInsets.all(5.0), child: FlatButton( - shape: new RoundedRectangleBorder(borderRadius: new BorderRadius.circular(28.0)), + shape: new RoundedRectangleBorder( + borderRadius: + new BorderRadius.circular(28.0)), splashColor: Colors.white, color: Colors.white, child: Icon( - const IconData(0xea90, fontFamily: 'icomoon'), + const IconData(0xea90, + fontFamily: 'icomoon'), color: Color(0xff3b5998), ), onPressed: () => {}, @@ -238,7 +255,8 @@ class LoginScreen1 extends StatelessWidget { children: [ new Expanded( child: FlatButton( - shape: new RoundedRectangleBorder(borderRadius: new BorderRadius.circular(30.0)), + shape: new RoundedRectangleBorder( + borderRadius: new BorderRadius.circular(30.0)), color: Colors.transparent, child: Container( padding: const EdgeInsets.only(left: 20.0), diff --git a/lib/login_screen_2.dart b/lib/login_screen_2.dart index 06e62bc..baca7fb 100644 --- a/lib/login_screen_2.dart +++ b/lib/login_screen_2.dart @@ -24,9 +24,14 @@ class LoginScreen2 extends StatelessWidget { decoration: new BoxDecoration( gradient: new LinearGradient( begin: Alignment.centerLeft, - end: new Alignment(1.0, 0.0), // 10% of the width, so there are ten blinds. - colors: [this.backgroundColor1!, this.backgroundColor2!], // whitish to gray - tileMode: TileMode.repeated, // repeats the gradient over the canvas + end: new Alignment( + 1.0, 0.0), // 10% of the width, so there are ten blinds. + colors: [ + this.backgroundColor1!, + this.backgroundColor2! + ], // whitish to gray + tileMode: + TileMode.repeated, // repeats the gradient over the canvas ), ), height: MediaQuery.of(context).size.height, @@ -78,7 +83,10 @@ class LoginScreen2 extends StatelessWidget { alignment: Alignment.center, decoration: BoxDecoration( border: Border( - bottom: BorderSide(color: this.foregroundColor!, width: 0.5, style: BorderStyle.solid), + bottom: BorderSide( + color: this.foregroundColor!, + width: 0.5, + style: BorderStyle.solid), ), ), padding: const EdgeInsets.only(left: 0.0, right: 10.0), @@ -87,7 +95,8 @@ class LoginScreen2 extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ new Padding( - padding: EdgeInsets.only(top: 10.0, bottom: 10.0, right: 00.0), + padding: + EdgeInsets.only(top: 10.0, bottom: 10.0, right: 00.0), child: Icon( Icons.alternate_email, color: this.foregroundColor, @@ -108,11 +117,15 @@ class LoginScreen2 extends StatelessWidget { ), new Container( width: MediaQuery.of(context).size.width, - margin: const EdgeInsets.only(left: 40.0, right: 40.0, top: 10.0), + margin: + const EdgeInsets.only(left: 40.0, right: 40.0, top: 10.0), alignment: Alignment.center, decoration: BoxDecoration( border: Border( - bottom: BorderSide(color: this.foregroundColor!, width: 0.5, style: BorderStyle.solid), + bottom: BorderSide( + color: this.foregroundColor!, + width: 0.5, + style: BorderStyle.solid), ), ), padding: const EdgeInsets.only(left: 0.0, right: 10.0), @@ -121,7 +134,8 @@ class LoginScreen2 extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ new Padding( - padding: EdgeInsets.only(top: 10.0, bottom: 10.0, right: 00.0), + padding: + EdgeInsets.only(top: 10.0, bottom: 10.0, right: 00.0), child: Icon( Icons.lock_open, color: this.foregroundColor, @@ -143,13 +157,15 @@ class LoginScreen2 extends StatelessWidget { ), new Container( width: MediaQuery.of(context).size.width, - margin: const EdgeInsets.only(left: 40.0, right: 40.0, top: 30.0), + margin: + const EdgeInsets.only(left: 40.0, right: 40.0, top: 30.0), alignment: Alignment.center, child: new Row( children: [ new Expanded( child: new FlatButton( - padding: const EdgeInsets.symmetric(vertical: 20.0, horizontal: 20.0), + padding: const EdgeInsets.symmetric( + vertical: 20.0, horizontal: 20.0), color: this.highlightColor, onPressed: () => {}, child: Text( @@ -163,18 +179,21 @@ class LoginScreen2 extends StatelessWidget { ), new Container( width: MediaQuery.of(context).size.width, - margin: const EdgeInsets.only(left: 40.0, right: 40.0, top: 10.0), + margin: + const EdgeInsets.only(left: 40.0, right: 40.0, top: 10.0), alignment: Alignment.center, child: new Row( children: [ new Expanded( child: new FlatButton( - padding: const EdgeInsets.symmetric(vertical: 20.0, horizontal: 20.0), + padding: const EdgeInsets.symmetric( + vertical: 20.0, horizontal: 20.0), color: Colors.transparent, onPressed: () => {}, child: Text( "Forgot your password?", - style: TextStyle(color: this.foregroundColor!.withOpacity(0.5)), + style: TextStyle( + color: this.foregroundColor!.withOpacity(0.5)), ), ), ), @@ -186,18 +205,21 @@ class LoginScreen2 extends StatelessWidget { ), new Container( width: MediaQuery.of(context).size.width, - margin: const EdgeInsets.only(left: 40.0, right: 40.0, top: 10.0, bottom: 20.0), + margin: const EdgeInsets.only( + left: 40.0, right: 40.0, top: 10.0, bottom: 20.0), alignment: Alignment.center, child: new Row( children: [ new Expanded( child: new FlatButton( - padding: const EdgeInsets.symmetric(vertical: 20.0, horizontal: 20.0), + padding: const EdgeInsets.symmetric( + vertical: 20.0, horizontal: 20.0), color: Colors.transparent, onPressed: () => {}, child: Text( "Don't have an account? Create One", - style: TextStyle(color: this.foregroundColor!.withOpacity(0.5)), + style: TextStyle( + color: this.foregroundColor!.withOpacity(0.5)), ), ), ), diff --git a/lib/login_screen_3.dart b/lib/login_screen_3.dart index 8a3a38f..916aadf 100644 --- a/lib/login_screen_3.dart +++ b/lib/login_screen_3.dart @@ -1,4 +1,51 @@ -import 'package:flutter/material.dart'; +import 'package:flutter/material.dart' + show + Alignment, + AlwaysScrollableScrollPhysics, + AssetImage, + Axis, + BlendMode, + Border, + BorderRadius, + BorderSide, + BorderStyle, + BoxDecoration, + BoxFit, + BuildContext, + Center, + Color, + ColorFilter, + Colors, + Column, + Container, + CrossAxisAlignment, + Curves, + DecorationImage, + Divider, + EdgeInsets, + Expanded, + FontWeight, + Icon, + IconData, + Icons, + InputBorder, + InputDecoration, + MainAxisAlignment, + MediaQuery, + Padding, + PageController, + PageView, + RoundedRectangleBorder, + Row, + SingleChildScrollView, + State, + StatefulWidget, + Text, + TextAlign, + TextField, + TextStyle, + TickerProviderStateMixin, + Widget; class LoginScreen3 extends StatefulWidget { @override @@ -7,7 +54,6 @@ class LoginScreen3 extends StatefulWidget { class _LoginScreen3State extends State with TickerProviderStateMixin { - //The code is commented because instead of manual scrolling with animation, //Now PageView is being used @@ -478,14 +524,14 @@ class _LoginScreen3State extends State children: [ new Expanded( child: new FlatButton( - onPressed: ()=>{}, + onPressed: () => {}, padding: EdgeInsets.only( top: 20.0, bottom: 20.0, ), child: new Row( mainAxisAlignment: - MainAxisAlignment.spaceEvenly, + MainAxisAlignment.spaceEvenly, children: [ Icon( const IconData(0xea90, @@ -532,14 +578,14 @@ class _LoginScreen3State extends State children: [ new Expanded( child: new FlatButton( - onPressed: ()=>{}, + onPressed: () => {}, padding: EdgeInsets.only( top: 20.0, bottom: 20.0, ), child: new Row( mainAxisAlignment: - MainAxisAlignment.spaceEvenly, + MainAxisAlignment.spaceEvenly, children: [ Icon( const IconData(0xea88, @@ -648,11 +694,9 @@ class _LoginScreen3State extends State ], ), ), - Divider( height: 24.0, ), - new Row( children: [ new Expanded( @@ -837,7 +881,8 @@ class _LoginScreen3State extends State ); } - PageController _controller = new PageController(initialPage: 1, viewportFraction: 1.0); + PageController _controller = + new PageController(initialPage: 1, viewportFraction: 1.0); @override Widget build(BuildContext context) { diff --git a/lib/login_screen_4.dart b/lib/login_screen_4.dart index 8576636..ce2fd45 100644 --- a/lib/login_screen_4.dart +++ b/lib/login_screen_4.dart @@ -62,7 +62,9 @@ class _LoginScreen4State extends State { ), Container( padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5), - decoration: BoxDecoration(color: widget.secondaryColor, border: Border.all(color: Colors.blue)), + decoration: BoxDecoration( + color: widget.secondaryColor, + border: Border.all(color: Colors.blue)), child: TextFormField( controller: _emailController, style: TextStyle(color: Colors.white), @@ -84,7 +86,9 @@ class _LoginScreen4State extends State { SizedBox(height: 20), Container( padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5), - decoration: BoxDecoration(color: widget.secondaryColor, border: Border.all(color: Colors.blue)), + decoration: BoxDecoration( + color: widget.secondaryColor, + border: Border.all(color: Colors.blue)), child: TextFormField( focusNode: myFocusNode, controller: _passwordController, @@ -109,7 +113,8 @@ class _LoginScreen4State extends State { height: 50, onPressed: () {}, color: widget.logoGreen, - child: Text('Login', style: TextStyle(color: Colors.white, fontSize: 16)), + child: Text('Login', + style: TextStyle(color: Colors.white, fontSize: 16)), textColor: Colors.white, ), SizedBox(height: 20), @@ -122,7 +127,8 @@ class _LoginScreen4State extends State { child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - Text('Sign In using Google', style: TextStyle(color: Colors.white, fontSize: 16)), + Text('Sign In using Google', + style: TextStyle(color: Colors.white, fontSize: 16)), ], ), textColor: Colors.white, @@ -135,7 +141,12 @@ class _LoginScreen4State extends State { children: [ GestureDetector( onTap: () {}, - child: Text('Sign Up?', textAlign: TextAlign.center, style: TextStyle(color: Colors.white, fontSize: 20, fontWeight: FontWeight.bold)), + child: Text('Sign Up?', + textAlign: TextAlign.center, + style: TextStyle( + color: Colors.white, + fontSize: 20, + fontWeight: FontWeight.bold)), ), ], ), diff --git a/lib/login_screen_5.dart b/lib/login_screen_5.dart index 3f0480d..9c080b1 100644 --- a/lib/login_screen_5.dart +++ b/lib/login_screen_5.dart @@ -29,7 +29,9 @@ class _LoginScreen5State extends State { width: double.infinity, height: MediaQuery.of(context).size.height, decoration: BoxDecoration( - image: DecorationImage(image: AssetImage('assets/images/signin_page_background.png'), fit: BoxFit.fill), + image: DecorationImage( + image: AssetImage('assets/images/signin_page_background.png'), + fit: BoxFit.fill), ), ), Container( @@ -48,7 +50,10 @@ class _LoginScreen5State extends State { children: [ Text( "Welcome Back", - style: TextStyle(fontSize: 17, color: Color.fromRGBO(147, 148, 184, 1), fontWeight: FontWeight.bold), + style: TextStyle( + fontSize: 17, + color: Color.fromRGBO(147, 148, 184, 1), + fontWeight: FontWeight.bold), ), SizedBox(height: 30), Container( @@ -57,7 +62,9 @@ class _LoginScreen5State extends State { controller: emailController, cursorColor: Colors.white, decoration: InputDecoration( - enabledBorder: UnderlineInputBorder(borderSide: BorderSide(color: Color.fromRGBO(90, 90, 90, 1))), + enabledBorder: UnderlineInputBorder( + borderSide: BorderSide( + color: Color.fromRGBO(90, 90, 90, 1))), icon: Icon( Icons.email, color: Colors.white, @@ -100,7 +107,8 @@ class _LoginScreen5State extends State { backgroundColor: MaterialStateProperty.all( Color.fromRGBO(255, 87, 34, 1), ), - shape: MaterialStateProperty.all( + shape: + MaterialStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(30), ), @@ -109,7 +117,8 @@ class _LoginScreen5State extends State { onPressed: widget.onLoginClick, child: Text( "Log in", - style: TextStyle(fontSize: 17, fontWeight: FontWeight.bold), + style: TextStyle( + fontSize: 17, fontWeight: FontWeight.bold), ), ), ), @@ -122,7 +131,8 @@ class _LoginScreen5State extends State { // backgroundColor: MaterialStateProperty.all( // Colors.transparent, // ), - shape: MaterialStateProperty.all( + shape: + MaterialStateProperty.all( RoundedRectangleBorder( borderRadius: BorderRadius.circular(30), ), @@ -152,10 +162,13 @@ class _LoginScreen5State extends State { ), child: Column( children: [ - IconButton(icon: Icon(Icons.keyboard_arrow_up), onPressed: widget.navigatePage), + IconButton( + icon: Icon(Icons.keyboard_arrow_up), + onPressed: widget.navigatePage), Text( "Sign up", - style: TextStyle(fontSize: 17, fontWeight: FontWeight.bold), + style: TextStyle( + fontSize: 17, fontWeight: FontWeight.bold), ), ], ), diff --git a/lib/login_screen_6.dart b/lib/login_screen_6.dart index 2b57450..84d36ae 100644 --- a/lib/login_screen_6.dart +++ b/lib/login_screen_6.dart @@ -25,7 +25,8 @@ class _LoginScreen6State extends State { width: MediaQuery.of(context).size.width, decoration: BoxDecoration( image: DecorationImage( - image: AssetImage("assets/images/background_image_one_signin.png"), + image: AssetImage( + "assets/images/background_image_one_signin.png"), fit: BoxFit.fill, ), ), @@ -37,20 +38,27 @@ class _LoginScreen6State extends State { margin: EdgeInsets.only(left: 40, right: 8, top: 155), child: Text( "Welcome\nBack", - style: TextStyle(color: Colors.white, fontSize: 30, fontWeight: FontWeight.bold), + style: TextStyle( + color: Colors.white, + fontSize: 30, + fontWeight: FontWeight.bold), ), ), Padding( padding: const EdgeInsets.all(15.0), child: Container( - margin: EdgeInsets.only(left: 30, right: 30, top: MediaQuery.of(context).size.height * 0.24), + margin: EdgeInsets.only( + left: 30, + right: 30, + top: MediaQuery.of(context).size.height * 0.24), width: double.infinity, child: TextField( controller: emailController, style: TextStyle(color: Color.fromRGBO(41, 41, 41, 1)), decoration: InputDecoration( hintText: "Email", - hintStyle: TextStyle(color: Color.fromRGBO(121, 121, 121, 1)), + hintStyle: + TextStyle(color: Color.fromRGBO(121, 121, 121, 1)), ), keyboardType: TextInputType.emailAddress, ), @@ -66,7 +74,8 @@ class _LoginScreen6State extends State { style: TextStyle(color: Color.fromRGBO(41, 41, 41, 1)), decoration: InputDecoration( hintText: "Password", - hintStyle: TextStyle(color: Color.fromRGBO(121, 121, 121, 1)), + hintStyle: + TextStyle(color: Color.fromRGBO(121, 121, 121, 1)), ), keyboardType: TextInputType.emailAddress, obscureText: true, diff --git a/pubspec.lock b/pubspec.lock index c8baac6..bc8645e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.5.0" + version: "2.9.0" boolean_selector: dependency: transitive description: @@ -21,28 +21,21 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" + version: "1.2.1" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" cupertino_icons: dependency: "direct main" description: @@ -56,7 +49,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -73,21 +66,28 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10" + version: "0.12.12" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.5" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.8.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.2" sky_engine: dependency: transitive description: flutter @@ -99,7 +99,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.9.0" stack_trace: dependency: transitive description: @@ -120,34 +120,27 @@ packages: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.19" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0" + version: "0.4.12" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.2" sdks: - dart: ">=2.12.0 <3.0.0" + dart: ">=2.17.0-0 <3.0.0"