Pear-Trading/LocalSpend-Tracker
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

forgot to stage all the changes...

Browse source
This commit is contained in:
Felix 2019-08-12 15:18:01 +01:00
parent cb75f1ff87
commit 3060a6d1f9
6 changed files with 65 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

36
lib/pages/login_page.dart
View file

@ -109,12 +109,13 @@ class LoginPageState extends State<LoginPage> {
body: Container(
decoration: new BoxDecoration(
gradient: new LinearGradient(
colors: [Colors.white, Colors.blue[50]],
colors: [Colors.blue[50], Colors.white],
stops: [0,1],
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
),
), child: Container(
),
child: Container(
margin: EdgeInsets.fromLTRB(60,30,60,0),
child: Column(
children: <Widget>[
@ -178,19 +179,6 @@ class LoginPageState extends State<LoginPage> {
child : Material(
child: new Container(
child : InkWell(
onTap: () => login( _emailController.text, _passwordController.text),
child: new Container(
width: 100,
height: 50,
child: new Center(
child: new Text(
'GO', style: new TextStyle(fontSize: 18, color: Colors.white),),
),
),
splashColor: Colors.lightBlueAccent,
),
decoration: new BoxDecoration(
border: new Border.all(color : Colors.transparent, width: 2),
borderRadius: BorderRadius.all(Radius.circular(2)),
@ -204,6 +192,24 @@ class LoginPageState extends State<LoginPage> {
end: Alignment.bottomRight,
),
),
child : Material(
type: MaterialType.transparency,
child : InkWell(
onTap: () => login( _emailController.text, _passwordController.text),
child: new Container(
width: 100,
height: 50,
child: new Center(
child: new Text(
'GO', style: new TextStyle(fontSize: 18, color: Colors.white),),
),
),
),
),
),
),
),

16
lib/pages/receipt_page_2.dart
View file

@ -439,14 +439,6 @@ class ReceiptPage2State extends State<ReceiptPage2> {
child: RaisedButton(
onPressed: () {
try {
/*
DateTime.now(),
new TextEditingController(),
new Organisation(null, null, null, null, null),
"None",
false,
"Uncategorised",
*/
if (transaction.amount.text == "" || transaction.organisation.name == null) {
showDialog(
context: context,
@ -459,10 +451,10 @@ class ReceiptPage2State extends State<ReceiptPage2> {
_submitReceipt(transaction);
} else {
showDialog(
context: context,
builder: (BuildContext context) {
return _invalidDialog(context);
}
context: context,
builder: (BuildContext context) {
return _invalidDialog(context);
}
);
}
}