diff --git a/lib/login_screen_1.dart b/lib/login_screen_1.dart index 1d3e746..8368361 100644 --- a/lib/login_screen_1.dart +++ b/lib/login_screen_1.dart @@ -145,10 +145,18 @@ class LoginScreen1 extends StatelessWidget { child: new Row( children: [ new Expanded( - child: FlatButton( - shape: new RoundedRectangleBorder(borderRadius: new BorderRadius.circular(30.0)), - splashColor: this.primaryColor, - color: this.primaryColor, + child: new TextButton( + style: new ButtonStyle( + shape: MaterialStateProperty.all( + new RoundedRectangleBorder( + borderRadius: new BorderRadius.circular(30.0), + ), + ), + splashFactory: InkSplash.splashFactory, + backgroundColor: MaterialStateProperty.all( + this.primaryColor, + ) + ), child: new Row( children: [ new Padding( @@ -165,10 +173,18 @@ class LoginScreen1 extends StatelessWidget { offset: Offset(15.0, 0.0), child: new Container( padding: const EdgeInsets.all(5.0), - child: FlatButton( - shape: new RoundedRectangleBorder(borderRadius: new BorderRadius.circular(28.0)), - splashColor: Colors.white, - color: Colors.white, + child: TextButton( + style: new ButtonStyle( + shape: MaterialStateProperty.all( + new RoundedRectangleBorder( + borderRadius: new BorderRadius.circular(28.0), + ), + ), + splashFactory: InkSplash.splashFactory, + backgroundColor: MaterialStateProperty.all( + Colors.white, + ) + ), child: Icon( Icons.arrow_forward, color: this.primaryColor, @@ -191,10 +207,18 @@ class LoginScreen1 extends StatelessWidget { child: new Row( children: [ new Expanded( - child: FlatButton( - shape: new RoundedRectangleBorder(borderRadius: new BorderRadius.circular(30.0)), - splashColor: Color(0xFF3B5998), - color: Color(0xff3B5998), + child: TextButton( + style: new ButtonStyle( + shape: MaterialStateProperty.all( + new RoundedRectangleBorder( + borderRadius: new BorderRadius.circular(30.0), + ), + ), + splashFactory: InkSplash.splashFactory, + backgroundColor: MaterialStateProperty.all( + Color(0xFF3B5998), + ) + ), child: new Row( children: [ new Padding( @@ -211,10 +235,18 @@ class LoginScreen1 extends StatelessWidget { offset: Offset(15.0, 0.0), child: new Container( padding: const EdgeInsets.all(5.0), - child: FlatButton( - shape: new RoundedRectangleBorder(borderRadius: new BorderRadius.circular(28.0)), - splashColor: Colors.white, - color: Colors.white, + child: TextButton( + style: new ButtonStyle( + shape: MaterialStateProperty.all( + new RoundedRectangleBorder( + borderRadius: new BorderRadius.circular(28.0), + ), + ), + splashFactory: InkSplash.splashFactory, + backgroundColor: MaterialStateProperty.all( + Colors.white, + ) + ), child: Icon( const IconData(0xea90, fontFamily: 'icomoon'), color: Color(0xff3b5998), @@ -237,9 +269,17 @@ class LoginScreen1 extends StatelessWidget { child: new Row( children: [ new Expanded( - child: FlatButton( - shape: new RoundedRectangleBorder(borderRadius: new BorderRadius.circular(30.0)), - color: Colors.transparent, + child: TextButton( + style: new ButtonStyle( + shape: MaterialStateProperty.all( + new RoundedRectangleBorder( + borderRadius: new BorderRadius.circular(30.0), + ), + ), + backgroundColor: MaterialStateProperty.all( + Colors.transparent, + ) + ), child: Container( padding: const EdgeInsets.only(left: 20.0), alignment: Alignment.center, diff --git a/lib/login_screen_2.dart b/lib/login_screen_2.dart index 06e62bc..ac96106 100644 --- a/lib/login_screen_2.dart +++ b/lib/login_screen_2.dart @@ -148,9 +148,15 @@ class LoginScreen2 extends StatelessWidget { child: new Row( children: [ new Expanded( - child: new FlatButton( - padding: const EdgeInsets.symmetric(vertical: 20.0, horizontal: 20.0), - color: this.highlightColor, + child: new TextButton( + style: new ButtonStyle( + padding: MaterialStateProperty.all( + new EdgeInsets.symmetric(vertical: 20.0, horizontal: 20.0), + ), + backgroundColor: MaterialStateProperty.all( + this.highlightColor, + ) + ), onPressed: () => {}, child: Text( "Log In", @@ -168,9 +174,15 @@ class LoginScreen2 extends StatelessWidget { child: new Row( children: [ new Expanded( - child: new FlatButton( - padding: const EdgeInsets.symmetric(vertical: 20.0, horizontal: 20.0), - color: Colors.transparent, + child: new TextButton( + style: new ButtonStyle( + padding: MaterialStateProperty.all( + new EdgeInsets.symmetric(vertical: 20.0, horizontal: 20.0), + ), + backgroundColor: MaterialStateProperty.all( + Colors.transparent, + ) + ), onPressed: () => {}, child: Text( "Forgot your password?", @@ -191,9 +203,15 @@ class LoginScreen2 extends StatelessWidget { child: new Row( children: [ new Expanded( - child: new FlatButton( - padding: const EdgeInsets.symmetric(vertical: 20.0, horizontal: 20.0), - color: Colors.transparent, + child: new TextButton( + style: new ButtonStyle( + padding: MaterialStateProperty.all( + new EdgeInsets.symmetric(vertical: 20.0, horizontal: 20.0), + ), + backgroundColor: MaterialStateProperty.all( + Colors.transparent, + ) + ), onPressed: () => {}, child: Text( "Don't have an account? Create One", diff --git a/lib/login_screen_3.dart b/lib/login_screen_3.dart index 8a3a38f..960d4e1 100644 --- a/lib/login_screen_3.dart +++ b/lib/login_screen_3.dart @@ -169,11 +169,17 @@ class _LoginScreen3State extends State child: new Row( children: [ new Expanded( - child: new OutlineButton( - shape: new RoundedRectangleBorder( - borderRadius: new BorderRadius.circular(30.0)), - color: Colors.redAccent, - highlightedBorderColor: Colors.white, + child: new OutlinedButton( + style: new ButtonStyle( + shape: MaterialStateProperty.all( + new RoundedRectangleBorder( + borderRadius: new BorderRadius.circular(30.0), + ), + ), + backgroundColor: MaterialStateProperty.all( + Colors.redAccent, + ), + ), onPressed: () => gotoSignup(), child: new Container( padding: const EdgeInsets.symmetric( @@ -207,11 +213,18 @@ class _LoginScreen3State extends State child: new Row( children: [ new Expanded( - child: new FlatButton( - shape: new RoundedRectangleBorder( - borderRadius: new BorderRadius.circular(30.0)), - color: Colors.white, - onPressed: () => gotoLogin(), + child: new TextButton( + style: new ButtonStyle( + shape: MaterialStateProperty.all( + new RoundedRectangleBorder( + borderRadius: new BorderRadius.circular(30.0), + ), + ), + backgroundColor: MaterialStateProperty.all( + Colors.redAccent, + ) + ), + onPressed: () => {}, child: new Container( padding: const EdgeInsets.symmetric( vertical: 20.0, @@ -373,7 +386,7 @@ class _LoginScreen3State extends State children: [ Padding( padding: const EdgeInsets.only(right: 20.0), - child: new FlatButton( + child: new TextButton( child: new Text( "Forgot Password?", style: TextStyle( @@ -395,11 +408,17 @@ class _LoginScreen3State extends State child: new Row( children: [ new Expanded( - child: new FlatButton( - shape: new RoundedRectangleBorder( - borderRadius: new BorderRadius.circular(30.0), + child: new TextButton( + style: new ButtonStyle( + shape: MaterialStateProperty.all( + new RoundedRectangleBorder( + borderRadius: new BorderRadius.circular(30.0), + ), + ), + backgroundColor: MaterialStateProperty.all( + Colors.redAccent, + ) ), - color: Colors.redAccent, onPressed: () => {}, child: new Container( padding: const EdgeInsets.symmetric( @@ -466,22 +485,29 @@ class _LoginScreen3State extends State child: new Row( children: [ new Expanded( - child: new FlatButton( - shape: new RoundedRectangleBorder( - borderRadius: new BorderRadius.circular(30.0), + child: new TextButton( + style: new ButtonStyle( + shape: MaterialStateProperty.all( + new RoundedRectangleBorder( + borderRadius: new BorderRadius.circular(30.0), + ), + ), + backgroundColor: MaterialStateProperty.all( + new Color(0Xff3B5998), + ), ), - color: Color(0Xff3B5998), onPressed: () => {}, child: new Container( child: new Row( mainAxisAlignment: MainAxisAlignment.center, children: [ new Expanded( - child: new FlatButton( + child: new TextButton( onPressed: ()=>{}, - padding: EdgeInsets.only( - top: 20.0, - bottom: 20.0, + style: new ButtonStyle( + padding: MaterialStateProperty.all( + new EdgeInsets.symmetric(vertical: 20) + ), ), child: new Row( mainAxisAlignment: @@ -520,22 +546,29 @@ class _LoginScreen3State extends State child: new Row( children: [ new Expanded( - child: new FlatButton( - shape: new RoundedRectangleBorder( - borderRadius: new BorderRadius.circular(30.0), + child: new TextButton( + style: new ButtonStyle( + shape: MaterialStateProperty.all( + new RoundedRectangleBorder( + borderRadius: new BorderRadius.circular(30.0), + ), + ), + backgroundColor: MaterialStateProperty.all( + new Color(0Xffdb3236), + ), ), - color: Color(0Xffdb3236), onPressed: () => {}, child: new Container( child: new Row( mainAxisAlignment: MainAxisAlignment.center, children: [ new Expanded( - child: new FlatButton( + child: new TextButton( onPressed: ()=>{}, - padding: EdgeInsets.only( - top: 20.0, - bottom: 20.0, + style: new ButtonStyle( + padding: MaterialStateProperty.all( + new EdgeInsets.symmetric(vertical: 20) + ), ), child: new Row( mainAxisAlignment: @@ -760,7 +793,7 @@ class _LoginScreen3State extends State children: [ Padding( padding: const EdgeInsets.only(right: 20.0), - child: new FlatButton( + child: new TextButton( child: new Text( "Already have an account?", style: TextStyle( @@ -782,11 +815,17 @@ class _LoginScreen3State extends State child: new Row( children: [ new Expanded( - child: new FlatButton( - shape: new RoundedRectangleBorder( - borderRadius: new BorderRadius.circular(30.0), + child: new TextButton( + style: new ButtonStyle( + shape: MaterialStateProperty.all( + new RoundedRectangleBorder( + borderRadius: new BorderRadius.circular(30.0), + ), + ), + backgroundColor: MaterialStateProperty.all( + Colors.redAccent, + ), ), - color: Colors.redAccent, onPressed: () => {}, child: new Container( padding: const EdgeInsets.symmetric( diff --git a/pubspec.lock b/pubspec.lock index c8baac6..03c8537 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.8.2" boolean_selector: dependency: transitive description: @@ -21,14 +21,14 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" clock: dependency: transitive description: @@ -42,7 +42,7 @@ packages: 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 +56,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" flutter: dependency: "direct main" description: flutter @@ -73,21 +73,28 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10" + version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.4" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" sky_engine: dependency: transitive description: flutter @@ -99,7 +106,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.2" stack_trace: dependency: transitive description: @@ -134,20 +141,13 @@ packages: 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.9" 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"