diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e6a7fec..49049a8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,6 +3,9 @@
+
+
+
@@ -11,15 +14,26 @@
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
@@ -38,6 +52,21 @@
+ {
+ "lastFilter": {
+ "state": "OPEN",
+ "assignee": "Arghya-1121"
+ }
+}
+ {
+ "selectedUrlAndAccountId": {
+ "url": "https://github.com/samarthagarwal/FlutterScreens.git",
+ "accountId": "b03e4cfd-f7f0-4a13-bf74-379c1f736e52"
+ }
+}
+ {
+ "associatedIndex": 4
+}
@@ -47,18 +76,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
+ {
+ "keyToString": {
+ "Flutter.main.dart.executor": "Run",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "RunOnceActivity.cidr.known.project.marker": "true",
+ "RunOnceActivity.readMode.enableVisualFormatting": "true",
+ "cf.first.check.clang-format": "false",
+ "cidr.known.project.marker": "true",
+ "com.android.tools.idea.streaming.zoom.toolbar.visible": "false",
+ "dart.analysis.tool.window.visible": "false",
+ "git-widget-placeholder": "master",
+ "io.flutter.reload.alreadyRun": "true",
+ "last_opened_file_path": "/home/arghya/Desktop/Flutter/samples/FlutterScreens",
+ "settings.editor.selected.configurable": "flutter.settings",
+ "show.migrate.to.gradle.popup": "false"
+ }
+}
@@ -70,51 +104,39 @@
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
+
@@ -124,6 +146,8 @@
+
+
@@ -131,14 +155,21 @@
+
+
-
+
+
+
+
+
+
@@ -149,24 +180,27 @@
+
+
+
-
+
+
+
-
-
-
+
@@ -176,6 +210,8 @@
+
+
@@ -183,14 +219,21 @@
+
+
-
+
+
+
+
+
+
@@ -212,6 +255,13 @@
+
+
+
+
+
+
+
@@ -221,7 +271,17 @@
+
+
+
+
+
+
+
+
+
+
@@ -323,7 +383,6 @@
-
@@ -333,22 +392,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/lib/buttons/simple_round_button.dart b/lib/buttons/simple_round_button.dart
index ec54e84..af55ffe 100644
--- a/lib/buttons/simple_round_button.dart
+++ b/lib/buttons/simple_round_button.dart
@@ -17,10 +17,10 @@ class SimpleRoundButton extends StatelessWidget {
new Expanded(
child: TextButton(
style: ButtonStyle(
- shape: MaterialStateProperty.all(RoundedRectangleBorder(
+ shape: WidgetStateProperty.all(RoundedRectangleBorder(
borderRadius: new BorderRadius.circular(30.0))),
- overlayColor: MaterialStateProperty.all(this.backgroundColor),
- backgroundColor: MaterialStateProperty.all(this.backgroundColor),
+ overlayColor: WidgetStateProperty.all(this.backgroundColor),
+ backgroundColor: WidgetStateProperty.all(this.backgroundColor),
),
child: new Row(
mainAxisAlignment: MainAxisAlignment.center,
diff --git a/lib/buttons/simple_round_icon_button.dart b/lib/buttons/simple_round_icon_button.dart
index 535b9e3..898a729 100644
--- a/lib/buttons/simple_round_icon_button.dart
+++ b/lib/buttons/simple_round_icon_button.dart
@@ -32,11 +32,11 @@ class SimpleRoundIconButton extends StatelessWidget {
children: [
TextButton(
style: ButtonStyle(
- shape: MaterialStateProperty.all(RoundedRectangleBorder(
+ shape: WidgetStateProperty.all(RoundedRectangleBorder(
borderRadius: new BorderRadius.circular(30.0))),
- overlayColor: MaterialStateProperty.all(this.backgroundColor),
+ overlayColor: WidgetStateProperty.all(this.backgroundColor),
backgroundColor:
- MaterialStateProperty.all(this.backgroundColor),
+ WidgetStateProperty.all(this.backgroundColor),
),
child: new Row(
children: [
@@ -45,7 +45,7 @@ class SimpleRoundIconButton extends StatelessWidget {
offset: Offset(-10.0, 0.0),
child: new Container(
padding: const EdgeInsets.all(5.0),
- child: FlatButton(
+ child: MaterialButton(
shape: new RoundedRectangleBorder(
borderRadius:
new BorderRadius.circular(28.0)),
@@ -78,7 +78,7 @@ class SimpleRoundIconButton extends StatelessWidget {
offset: Offset(10.0, 0.0),
child: new Container(
padding: const EdgeInsets.all(5.0),
- child: FlatButton(
+ child: MaterialButton(
shape: new RoundedRectangleBorder(
borderRadius:
new BorderRadius.circular(28.0)),
diff --git a/lib/buttons/simple_round_only_icon_button.dart b/lib/buttons/simple_round_only_icon_button.dart
index 11e6dd3..3908ce5 100644
--- a/lib/buttons/simple_round_only_icon_button.dart
+++ b/lib/buttons/simple_round_only_icon_button.dart
@@ -38,12 +38,11 @@ class SimpleRoundOnlyIconButton extends StatelessWidget {
new Expanded(
child: TextButton(
style: ButtonStyle(
- shape: MaterialStateProperty.all(RoundedRectangleBorder(
+ shape: WidgetStateProperty.all(RoundedRectangleBorder(
borderRadius: new BorderRadius.circular(30.0))),
- overlayColor:
- MaterialStateProperty.all(this.backgroundColor),
+ overlayColor: WidgetStateProperty.all(this.backgroundColor),
backgroundColor:
- MaterialStateProperty.all(this.backgroundColor),
+ WidgetStateProperty.all(this.backgroundColor),
),
child: new Row(
mainAxisAlignment: getMainAxisAlignment(),
@@ -59,15 +58,15 @@ class SimpleRoundOnlyIconButton extends StatelessWidget {
bottom: 10.0),
child: TextButton(
style: ButtonStyle(
- shape: MaterialStateProperty.all(
+ shape: WidgetStateProperty.all(
RoundedRectangleBorder(
borderRadius:
BorderRadius.circular(28.0),
),
),
- overlayColor: MaterialStateProperty.all(
+ overlayColor: WidgetStateProperty.all(
backgroundColor),
- backgroundColor: MaterialStateProperty.all(
+ backgroundColor: WidgetStateProperty.all(
backgroundColor),
),
child: Icon(
@@ -92,16 +91,16 @@ class SimpleRoundOnlyIconButton extends StatelessWidget {
bottom: 10.0),
child: TextButton(
style: ButtonStyle(
- shape: MaterialStateProperty.all(
+ shape: WidgetStateProperty.all(
RoundedRectangleBorder(
borderRadius:
BorderRadius.circular(28.0),
),
),
overlayColor:
- MaterialStateProperty.all(Colors.white),
+ WidgetStateProperty.all(Colors.white),
backgroundColor:
- MaterialStateProperty.all(Colors.white),
+ WidgetStateProperty.all(Colors.white),
),
child: Icon(
icon!.icon,
@@ -129,7 +128,7 @@ class SimpleRoundOnlyIconButton extends StatelessWidget {
right: 5.0,
top: 10.0,
bottom: 10.0),
- child: FlatButton(
+ child: MaterialButton(
shape: new RoundedRectangleBorder(
borderRadius:
new BorderRadius.circular(28.0)),
diff --git a/lib/login_screen_1.dart b/lib/login_screen_1.dart
index 1d3e746..06bbe2b 100644
--- a/lib/login_screen_1.dart
+++ b/lib/login_screen_1.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
class LoginScreen1 extends StatelessWidget {
@@ -42,11 +41,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),
),
],
),
@@ -63,16 +68,18 @@ class LoginScreen1 extends StatelessWidget {
Container(
decoration: BoxDecoration(
border: Border.all(
- color: Colors.grey.withOpacity(0.5),
+ color: Colors.grey.withValues(alpha: 0.5),
width: 1.0,
),
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,
@@ -81,7 +88,7 @@ class LoginScreen1 extends StatelessWidget {
Container(
height: 30.0,
width: 1.0,
- color: Colors.grey.withOpacity(0.5),
+ color: Colors.grey.withValues(alpha: 0.5),
margin: const EdgeInsets.only(left: 00.0, right: 10.0),
),
new Expanded(
@@ -106,16 +113,18 @@ class LoginScreen1 extends StatelessWidget {
Container(
decoration: BoxDecoration(
border: Border.all(
- color: Colors.grey.withOpacity(0.5),
+ color: Colors.grey.withValues(alpha: 0.5),
width: 1.0,
),
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,
@@ -124,7 +133,7 @@ class LoginScreen1 extends StatelessWidget {
Container(
height: 30.0,
width: 1.0,
- color: Colors.grey.withOpacity(0.5),
+ color: Colors.grey.withValues(alpha: 0.5),
margin: const EdgeInsets.only(left: 00.0, right: 10.0),
),
new Expanded(
@@ -145,8 +154,9 @@ class LoginScreen1 extends StatelessWidget {
child: new Row(
children: [
new Expanded(
- child: FlatButton(
- shape: new RoundedRectangleBorder(borderRadius: new BorderRadius.circular(30.0)),
+ child: MaterialButton(
+ shape: new RoundedRectangleBorder(
+ borderRadius: new BorderRadius.circular(30.0)),
splashColor: this.primaryColor,
color: this.primaryColor,
child: new Row(
@@ -165,8 +175,10 @@ 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)),
+ child: MaterialButton(
+ shape: new RoundedRectangleBorder(
+ borderRadius:
+ new BorderRadius.circular(28.0)),
splashColor: Colors.white,
color: Colors.white,
child: Icon(
@@ -191,8 +203,9 @@ class LoginScreen1 extends StatelessWidget {
child: new Row(
children: [
new Expanded(
- child: FlatButton(
- shape: new RoundedRectangleBorder(borderRadius: new BorderRadius.circular(30.0)),
+ child: MaterialButton(
+ shape: new RoundedRectangleBorder(
+ borderRadius: new BorderRadius.circular(30.0)),
splashColor: Color(0xFF3B5998),
color: Color(0xff3B5998),
child: new Row(
@@ -211,12 +224,15 @@ 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)),
+ child: MaterialButton(
+ 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: () => {},
@@ -237,8 +253,9 @@ class LoginScreen1 extends StatelessWidget {
child: new Row(
children: [
new Expanded(
- child: FlatButton(
- shape: new RoundedRectangleBorder(borderRadius: new BorderRadius.circular(30.0)),
+ child: MaterialButton(
+ 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..5f85a55 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),
+ child: new MaterialButton(
+ padding: const EdgeInsets.symmetric(
+ vertical: 20.0, horizontal: 20.0),
color: this.highlightColor,
onPressed: () => {},
child: Text(
@@ -163,18 +179,22 @@ 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),
+ child: new MaterialButton(
+ 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!.withValues(alpha: 0.5)),
),
),
),
@@ -186,18 +206,22 @@ 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),
+ child: new MaterialButton(
+ 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!.withValues(alpha: 0.5)),
),
),
),
diff --git a/lib/login_screen_3.dart b/lib/login_screen_3.dart
index 8a3a38f..7eb2de6 100644
--- a/lib/login_screen_3.dart
+++ b/lib/login_screen_3.dart
@@ -7,7 +7,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
@@ -123,7 +122,7 @@ class _LoginScreen3State extends State
color: Colors.redAccent,
image: DecorationImage(
colorFilter: new ColorFilter.mode(
- Colors.black.withOpacity(0.1), BlendMode.dstATop),
+ Colors.black.withValues(alpha: 0.1), BlendMode.dstATop),
image: AssetImage('assets/images/mountains.jpg'),
fit: BoxFit.cover,
),
@@ -169,11 +168,12 @@ class _LoginScreen3State extends State
child: new Row(
children: [
new Expanded(
- child: new OutlineButton(
+ child: new MaterialButton(
shape: new RoundedRectangleBorder(
- borderRadius: new BorderRadius.circular(30.0)),
+ borderRadius: new BorderRadius.circular(30.0),
+ side: BorderSide(color: Colors.white),
+ ),
color: Colors.redAccent,
- highlightedBorderColor: Colors.white,
onPressed: () => gotoSignup(),
child: new Container(
padding: const EdgeInsets.symmetric(
@@ -207,7 +207,7 @@ class _LoginScreen3State extends State
child: new Row(
children: [
new Expanded(
- child: new FlatButton(
+ child: new MaterialButton(
shape: new RoundedRectangleBorder(
borderRadius: new BorderRadius.circular(30.0)),
color: Colors.white,
@@ -249,7 +249,7 @@ class _LoginScreen3State extends State
color: Colors.white,
image: DecorationImage(
colorFilter: new ColorFilter.mode(
- Colors.black.withOpacity(0.05), BlendMode.dstATop),
+ Colors.black.withValues(alpha: 0.05), BlendMode.dstATop),
image: AssetImage('assets/images/mountains.jpg'),
fit: BoxFit.cover,
),
@@ -373,7 +373,7 @@ class _LoginScreen3State extends State
children: [
Padding(
padding: const EdgeInsets.only(right: 20.0),
- child: new FlatButton(
+ child: new MaterialButton(
child: new Text(
"Forgot Password?",
style: TextStyle(
@@ -395,7 +395,7 @@ class _LoginScreen3State extends State
child: new Row(
children: [
new Expanded(
- child: new FlatButton(
+ child: new MaterialButton(
shape: new RoundedRectangleBorder(
borderRadius: new BorderRadius.circular(30.0),
),
@@ -466,7 +466,7 @@ class _LoginScreen3State extends State
child: new Row(
children: [
new Expanded(
- child: new FlatButton(
+ child: new MaterialButton(
shape: new RoundedRectangleBorder(
borderRadius: new BorderRadius.circular(30.0),
),
@@ -477,15 +477,15 @@ class _LoginScreen3State extends State
mainAxisAlignment: MainAxisAlignment.center,
children: [
new Expanded(
- child: new FlatButton(
- onPressed: ()=>{},
+ child: new MaterialButton(
+ onPressed: () => {},
padding: EdgeInsets.only(
top: 20.0,
bottom: 20.0,
),
child: new Row(
mainAxisAlignment:
- MainAxisAlignment.spaceEvenly,
+ MainAxisAlignment.spaceEvenly,
children: [
Icon(
const IconData(0xea90,
@@ -520,7 +520,7 @@ class _LoginScreen3State extends State
child: new Row(
children: [
new Expanded(
- child: new FlatButton(
+ child: new MaterialButton(
shape: new RoundedRectangleBorder(
borderRadius: new BorderRadius.circular(30.0),
),
@@ -531,15 +531,15 @@ class _LoginScreen3State extends State
mainAxisAlignment: MainAxisAlignment.center,
children: [
new Expanded(
- child: new FlatButton(
- onPressed: ()=>{},
+ child: new MaterialButton(
+ onPressed: () => {},
padding: EdgeInsets.only(
top: 20.0,
bottom: 20.0,
),
child: new Row(
mainAxisAlignment:
- MainAxisAlignment.spaceEvenly,
+ MainAxisAlignment.spaceEvenly,
children: [
Icon(
const IconData(0xea88,
@@ -583,7 +583,7 @@ class _LoginScreen3State extends State
color: Colors.white,
image: DecorationImage(
colorFilter: new ColorFilter.mode(
- Colors.black.withOpacity(0.05), BlendMode.dstATop),
+ Colors.black.withValues(alpha: 0.05), BlendMode.dstATop),
image: AssetImage('assets/images/mountains.jpg'),
fit: BoxFit.cover,
),
@@ -648,11 +648,9 @@ class _LoginScreen3State extends State
],
),
),
-
Divider(
height: 24.0,
),
-
new Row(
children: [
new Expanded(
@@ -760,7 +758,7 @@ class _LoginScreen3State extends State
children: [
Padding(
padding: const EdgeInsets.only(right: 20.0),
- child: new FlatButton(
+ child: new MaterialButton(
child: new Text(
"Already have an account?",
style: TextStyle(
@@ -782,7 +780,7 @@ class _LoginScreen3State extends State
child: new Row(
children: [
new Expanded(
- child: new FlatButton(
+ child: new MaterialButton(
shape: new RoundedRectangleBorder(
borderRadius: new BorderRadius.circular(30.0),
),
@@ -837,7 +835,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_5.dart b/lib/login_screen_5.dart
index 3f0480d..1662d3f 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,
@@ -97,10 +104,10 @@ class _LoginScreen5State extends State {
margin: EdgeInsets.only(top: 40, left: 30, right: 30),
child: ElevatedButton(
style: ButtonStyle(
- backgroundColor: MaterialStateProperty.all(
+ backgroundColor: WidgetStateProperty.all(
Color.fromRGBO(255, 87, 34, 1),
),
- shape: MaterialStateProperty.all(
+ shape: WidgetStateProperty.all(
RoundedRectangleBorder(
borderRadius: BorderRadius.circular(30),
),
@@ -109,7 +116,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 +130,7 @@ class _LoginScreen5State extends State {
// backgroundColor: MaterialStateProperty.all(
// Colors.transparent,
// ),
- shape: MaterialStateProperty.all(
+ shape: WidgetStateProperty.all(
RoundedRectangleBorder(
borderRadius: BorderRadius.circular(30),
),
@@ -152,10 +160,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/main.dart b/lib/main.dart
index d35d344..bac4355 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,6 +1,5 @@
import 'package:flutter/material.dart';
-
-import 'login_screen_1.dart';
+import 'package:flutter_login_screens/login_screen_3.dart';
void main() => runApp(new MyApp());
@@ -28,7 +27,7 @@ class _MyHomePageState extends State {
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Colors.white,
- body: LoginScreen1(),
+ body: LoginScreen3(),
);
}
diff --git a/pubspec.lock b/pubspec.lock
index c8baac6..0d5142c 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,58 +5,58 @@ packages:
dependency: transitive
description:
name: async
- url: "https://pub.dartlang.org"
+ sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+ url: "https://pub.dev"
source: hosted
- version: "2.5.0"
+ version: "2.11.0"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
- url: "https://pub.dartlang.org"
+ sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+ url: "https://pub.dev"
source: hosted
- version: "2.1.0"
+ version: "2.1.1"
characters:
dependency: transitive
description:
name: characters
- url: "https://pub.dartlang.org"
+ sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+ url: "https://pub.dev"
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.3.0"
clock:
dependency: transitive
description:
name: clock
- url: "https://pub.dartlang.org"
+ sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+ url: "https://pub.dev"
source: hosted
- version: "1.1.0"
+ version: "1.1.1"
collection:
dependency: transitive
description:
name: collection
- url: "https://pub.dartlang.org"
+ sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
+ url: "https://pub.dev"
source: hosted
- version: "1.15.0"
+ version: "1.19.0"
cupertino_icons:
dependency: "direct main"
description:
name: cupertino_icons
- url: "https://pub.dartlang.org"
+ sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
+ url: "https://pub.dev"
source: hosted
- version: "0.1.2"
+ version: "1.0.8"
fake_async:
dependency: transitive
description:
name: fake_async
- url: "https://pub.dartlang.org"
+ sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+ url: "https://pub.dev"
source: hosted
- version: "1.2.0"
+ version: "1.3.1"
flutter:
dependency: "direct main"
description: flutter
@@ -67,87 +67,131 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
+ leak_tracker:
+ dependency: transitive
+ description:
+ name: leak_tracker
+ sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
+ url: "https://pub.dev"
+ source: hosted
+ version: "10.0.7"
+ leak_tracker_flutter_testing:
+ dependency: transitive
+ description:
+ name: leak_tracker_flutter_testing
+ sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.0.8"
+ leak_tracker_testing:
+ dependency: transitive
+ description:
+ name: leak_tracker_testing
+ sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.0.1"
matcher:
dependency: transitive
description:
name: matcher
- url: "https://pub.dartlang.org"
+ sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
+ url: "https://pub.dev"
source: hosted
- version: "0.12.10"
+ version: "0.12.16+1"
+ material_color_utilities:
+ dependency: transitive
+ description:
+ name: material_color_utilities
+ sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+ url: "https://pub.dev"
+ source: hosted
+ version: "0.11.1"
meta:
dependency: transitive
description:
name: meta
- url: "https://pub.dartlang.org"
+ sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
+ url: "https://pub.dev"
source: hosted
- version: "1.3.0"
+ version: "1.15.0"
path:
dependency: transitive
description:
name: path
- url: "https://pub.dartlang.org"
+ sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
+ url: "https://pub.dev"
source: hosted
- version: "1.8.0"
+ version: "1.9.0"
sky_engine:
dependency: transitive
description: flutter
source: sdk
- version: "0.0.99"
+ version: "0.0.0"
source_span:
dependency: transitive
description:
name: source_span
- url: "https://pub.dartlang.org"
+ sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+ url: "https://pub.dev"
source: hosted
- version: "1.8.0"
+ version: "1.10.0"
stack_trace:
dependency: transitive
description:
name: stack_trace
- url: "https://pub.dartlang.org"
+ sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
+ url: "https://pub.dev"
source: hosted
- version: "1.10.0"
+ version: "1.12.0"
stream_channel:
dependency: transitive
description:
name: stream_channel
- url: "https://pub.dartlang.org"
+ sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+ url: "https://pub.dev"
source: hosted
- version: "2.1.0"
+ version: "2.1.2"
string_scanner:
dependency: transitive
description:
name: string_scanner
- url: "https://pub.dartlang.org"
+ sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
+ url: "https://pub.dev"
source: hosted
- version: "1.1.0"
+ version: "1.3.0"
term_glyph:
dependency: transitive
description:
name: term_glyph
- url: "https://pub.dartlang.org"
+ sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+ url: "https://pub.dev"
source: hosted
- version: "1.2.0"
+ version: "1.2.1"
test_api:
dependency: transitive
description:
name: test_api
- url: "https://pub.dartlang.org"
+ sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
+ url: "https://pub.dev"
source: hosted
- version: "0.2.19"
- typed_data:
+ version: "0.7.3"
+ vector_math:
dependency: transitive
description:
- name: typed_data
- url: "https://pub.dartlang.org"
+ name: vector_math
+ sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+ url: "https://pub.dev"
source: hosted
- version: "1.3.0"
- vector_math:
+ version: "2.1.4"
+ vm_service:
dependency: transitive
description:
- name: vector_math
- url: "https://pub.dartlang.org"
+ name: vm_service
+ sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
+ url: "https://pub.dev"
source: hosted
- version: "2.1.0"
+ version: "14.3.0"
sdks:
- dart: ">=2.12.0 <3.0.0"
+ dart: ">=3.4.0 <4.0.0"
+ flutter: ">=3.18.0-18.0.pre.54"
diff --git a/pubspec.yaml b/pubspec.yaml
index 6e3e476..fec74ba 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -9,7 +9,7 @@ dependencies:
# The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons.
- cupertino_icons: ^0.1.2
+ cupertino_icons: ">=0.0.0 <1.1.0"
dev_dependencies:
flutter_test:
diff --git a/test/widget_test.dart b/test/widget_test.dart
index 813de75..f03eda5 100644
--- a/test/widget_test.dart
+++ b/test/widget_test.dart
@@ -6,10 +6,9 @@
// tree, read text, and verify that the values of widget properties are correct.
import 'package:flutter/material.dart';
+import 'package:flutter_login_screens/main.dart';
import 'package:flutter_test/flutter_test.dart';
-import 'package:flutter_screens/main.dart';
-
void main() {
testWidgets('Counter increments smoke test', (WidgetTester tester) async {
// Build our app and trigger a frame.