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

Code is updated to run with flutter 3.27.2 #60

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

Code is updated to run with flutter 3.27.2 #60

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
167 changes: 104 additions & 63 deletions .idea/workspace.xml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions lib/buttons/simple_round_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions lib/buttons/simple_round_icon_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ class SimpleRoundIconButton extends StatelessWidget {
children: <Widget>[
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: <Widget>[
Expand All @@ -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)),
Expand Down Expand Up @@ -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)),
Expand Down
21 changes: 10 additions & 11 deletions lib/buttons/simple_round_only_icon_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand All @@ -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(
Expand All @@ -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,
Expand Down Expand Up @@ -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)),
Expand Down
61 changes: 39 additions & 22 deletions lib/login_screen_1.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';

class LoginScreen1 extends StatelessWidget {
Expand Down Expand Up @@ -42,11 +41,17 @@ class LoginScreen1 extends StatelessWidget {
children: <Widget>[
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),
),
],
),
Expand All @@ -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: <Widget>[
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,
Expand All @@ -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(
Expand All @@ -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: <Widget>[
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,
Expand All @@ -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(
Expand All @@ -145,8 +154,9 @@ class LoginScreen1 extends StatelessWidget {
child: new Row(
children: <Widget>[
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(
Expand All @@ -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(
Expand All @@ -191,8 +203,9 @@ class LoginScreen1 extends StatelessWidget {
child: new Row(
children: <Widget>[
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(
Expand All @@ -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: () => {},
Expand All @@ -237,8 +253,9 @@ class LoginScreen1 extends StatelessWidget {
child: new Row(
children: <Widget>[
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),
Expand Down
Loading