Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed deprecation issues #45

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed deprecation issues #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 59 additions & 19 deletions lib/login_screen_1.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,10 +145,18 @@ class LoginScreen1 extends StatelessWidget {
child: new Row(
children: <Widget>[
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: <Widget>[
new Padding(
Expand All @@ -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,
Expand All @@ -191,10 +207,18 @@ class LoginScreen1 extends StatelessWidget {
child: new Row(
children: <Widget>[
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: <Widget>[
new Padding(
Expand All @@ -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),
Expand All @@ -237,9 +269,17 @@ class LoginScreen1 extends StatelessWidget {
child: new Row(
children: <Widget>[
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,
Expand Down
36 changes: 27 additions & 9 deletions lib/login_screen_2.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,15 @@ class LoginScreen2 extends StatelessWidget {
child: new Row(
children: <Widget>[
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",
Expand All @@ -168,9 +174,15 @@ class LoginScreen2 extends StatelessWidget {
child: new Row(
children: <Widget>[
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?",
Expand All @@ -191,9 +203,15 @@ class LoginScreen2 extends StatelessWidget {
child: new Row(
children: <Widget>[
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",
Expand Down
111 changes: 75 additions & 36 deletions lib/login_screen_3.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,17 @@ class _LoginScreen3State extends State<LoginScreen3>
child: new Row(
children: <Widget>[
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(
Expand Down Expand Up @@ -207,11 +213,18 @@ class _LoginScreen3State extends State<LoginScreen3>
child: new Row(
children: <Widget>[
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,
Expand Down Expand Up @@ -373,7 +386,7 @@ class _LoginScreen3State extends State<LoginScreen3>
children: <Widget>[
Padding(
padding: const EdgeInsets.only(right: 20.0),
child: new FlatButton(
child: new TextButton(
child: new Text(
"Forgot Password?",
style: TextStyle(
Expand All @@ -395,11 +408,17 @@ class _LoginScreen3State extends State<LoginScreen3>
child: new Row(
children: <Widget>[
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(
Expand Down Expand Up @@ -466,22 +485,29 @@ class _LoginScreen3State extends State<LoginScreen3>
child: new Row(
children: <Widget>[
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: <Widget>[
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:
Expand Down Expand Up @@ -520,22 +546,29 @@ class _LoginScreen3State extends State<LoginScreen3>
child: new Row(
children: <Widget>[
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: <Widget>[
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:
Expand Down Expand Up @@ -760,7 +793,7 @@ class _LoginScreen3State extends State<LoginScreen3>
children: <Widget>[
Padding(
padding: const EdgeInsets.only(right: 20.0),
child: new FlatButton(
child: new TextButton(
child: new Text(
"Already have an account?",
style: TextStyle(
Expand All @@ -782,11 +815,17 @@ class _LoginScreen3State extends State<LoginScreen3>
child: new Row(
children: <Widget>[
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(
Expand Down
Loading