animation, tooltips, ui sizing fixed
This commit is contained in:
parent
abbd0a7170
commit
68a33c53e9
2 changed files with 371 additions and 345 deletions
|
@ -106,7 +106,9 @@ class FindOrganisations {
|
||||||
builder: (BuildContext context) {
|
builder: (BuildContext context) {
|
||||||
return StatefulBuilder(
|
return StatefulBuilder(
|
||||||
builder: (context, setState) {
|
builder: (context, setState) {
|
||||||
return SimpleDialog(
|
return AnimatedContainer(
|
||||||
|
duration: Duration(seconds: 1),
|
||||||
|
child : SimpleDialog(
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
Column(
|
Column(
|
||||||
children: [
|
children: [
|
||||||
|
@ -222,6 +224,7 @@ class FindOrganisations {
|
||||||
// cancel and ok buttons
|
// cancel and ok buttons
|
||||||
|
|
||||||
],
|
],
|
||||||
|
),
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
|
@ -158,6 +158,8 @@ class ReceiptPage2State extends State<ReceiptPage2> {
|
||||||
|
|
||||||
Container(
|
Container(
|
||||||
padding: EdgeInsets.fromLTRB(25,15,15.0,0.0),
|
padding: EdgeInsets.fromLTRB(25,15,15.0,0.0),
|
||||||
|
child: Tooltip(
|
||||||
|
message: "Date and time of transaction",
|
||||||
child: Row(
|
child: Row(
|
||||||
children: <Widget> [
|
children: <Widget> [
|
||||||
Container(
|
Container(
|
||||||
|
@ -213,10 +215,13 @@ class ReceiptPage2State extends State<ReceiptPage2> {
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
),
|
||||||
), // Date/Time picker
|
), // Date/Time picker
|
||||||
|
|
||||||
Container(
|
Container(
|
||||||
padding: EdgeInsets.fromLTRB(25,15,15.0,0.0),
|
padding: EdgeInsets.fromLTRB(25,15,15.0,0.0),
|
||||||
|
child: Tooltip(
|
||||||
|
message: "Transaction payee",
|
||||||
child: Row(
|
child: Row(
|
||||||
children: <Widget> [
|
children: <Widget> [
|
||||||
Container(
|
Container(
|
||||||
|
@ -236,15 +241,15 @@ class ReceiptPage2State extends State<ReceiptPage2> {
|
||||||
height: 32.0,
|
height: 32.0,
|
||||||
child: RaisedButton(
|
child: RaisedButton(
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
// var popupListView = new PopupListView();
|
// var popupListView = new PopupListView();
|
||||||
// var dialog = popupListView.dialog(context, optionsList, "Choose Organization");
|
// var dialog = popupListView.dialog(context, optionsList, "Choose Organization");
|
||||||
var organisations = new FindOrganisations();
|
var organisations = new FindOrganisations();
|
||||||
var orgDialog = organisations.dialog(context);
|
var orgDialog = organisations.dialog(context);
|
||||||
orgDialog.then((organisation) {
|
orgDialog.then((organisation) {
|
||||||
try {
|
try {
|
||||||
organisation.name.length;
|
organisation.name.length;
|
||||||
transaction.organisation = organisation;
|
transaction.organisation = organisation;
|
||||||
// debugPrint(organisation.name);
|
// debugPrint(organisation.name);
|
||||||
setState(() {});
|
setState(() {});
|
||||||
} catch(_) {
|
} catch(_) {
|
||||||
debugPrint("No organisation chosen.");
|
debugPrint("No organisation chosen.");
|
||||||
|
@ -265,10 +270,13 @@ class ReceiptPage2State extends State<ReceiptPage2> {
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
),
|
||||||
), // Organisation picker
|
), // Organisation picker
|
||||||
|
|
||||||
Container(
|
Container(
|
||||||
padding: EdgeInsets.fromLTRB(25,15,15.0,0.0),
|
padding: EdgeInsets.fromLTRB(25,15,15.0,0.0),
|
||||||
|
child: Tooltip(
|
||||||
|
message: "Transaction recrudescence",
|
||||||
child: Row(
|
child: Row(
|
||||||
children: <Widget> [
|
children: <Widget> [
|
||||||
Container(
|
Container(
|
||||||
|
@ -317,6 +325,7 @@ class ReceiptPage2State extends State<ReceiptPage2> {
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
),
|
||||||
), // Recurring picker
|
), // Recurring picker
|
||||||
|
|
||||||
Container(
|
Container(
|
||||||
|
@ -338,6 +347,8 @@ class ReceiptPage2State extends State<ReceiptPage2> {
|
||||||
Container(
|
Container(
|
||||||
padding: const EdgeInsets.fromLTRB(0, 0, 0, 0),
|
padding: const EdgeInsets.fromLTRB(0, 0, 0, 0),
|
||||||
height: 32.0,
|
height: 32.0,
|
||||||
|
child: Tooltip(
|
||||||
|
message: "Category of transaction",
|
||||||
child: RaisedButton(
|
child: RaisedButton(
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
showModalBottomSheet(
|
showModalBottomSheet(
|
||||||
|
@ -367,12 +378,15 @@ class ReceiptPage2State extends State<ReceiptPage2> {
|
||||||
color: Colors.blue,
|
color: Colors.blue,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
), // Category picker
|
), // Category picker
|
||||||
|
|
||||||
Container(
|
Container(
|
||||||
padding: EdgeInsets.fromLTRB(25,15,15.0,0.0),
|
padding: EdgeInsets.fromLTRB(25,15,15.0,0.0),
|
||||||
|
child: Tooltip(
|
||||||
|
message: "Essential or not",
|
||||||
child: Row(
|
child: Row(
|
||||||
children: <Widget> [
|
children: <Widget> [
|
||||||
Container(
|
Container(
|
||||||
|
@ -398,10 +412,13 @@ class ReceiptPage2State extends State<ReceiptPage2> {
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
),
|
||||||
), // Essential
|
), // Essential
|
||||||
|
|
||||||
Container(
|
Container(
|
||||||
padding: EdgeInsets.fromLTRB(25,15,15.0,0.0),
|
padding: EdgeInsets.fromLTRB(25,15,15.0,0.0),
|
||||||
|
child: Tooltip(
|
||||||
|
message: "Transaction amount",
|
||||||
child: Row(
|
child: Row(
|
||||||
children: <Widget> [
|
children: <Widget> [
|
||||||
Container(
|
Container(
|
||||||
|
@ -431,10 +448,13 @@ class ReceiptPage2State extends State<ReceiptPage2> {
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
),
|
||||||
), // Amount picker
|
), // Amount picker
|
||||||
|
|
||||||
Padding(
|
Padding(
|
||||||
padding: EdgeInsets.fromLTRB(20.0, 20.0, 20.0, 0.0),
|
padding: EdgeInsets.fromLTRB(20.0, 20.0, 20.0, 0.0),
|
||||||
|
child: Tooltip(
|
||||||
|
message: "Submit receipt",
|
||||||
child: Container(
|
child: Container(
|
||||||
height: 65.0,
|
height: 65.0,
|
||||||
child: RaisedButton(
|
child: RaisedButton(
|
||||||
|
@ -469,14 +489,17 @@ class ReceiptPage2State extends State<ReceiptPage2> {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
child: Text("GO",
|
child: Text("GO",
|
||||||
key: Key("goButton"),
|
|
||||||
style:
|
style:
|
||||||
TextStyle(color: Colors.white, fontSize: 22.0)),
|
TextStyle(color: Colors.white, fontSize: 22.0),
|
||||||
|
),
|
||||||
color: Colors.blue,
|
color: Colors.blue,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
Reference in a new issue