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

animation, tooltips, ui sizing fixed

This commit is contained in:
Felix 2019-08-19 12:36:12 +01:00
parent abbd0a7170
commit 68a33c53e9
2 changed files with 371 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/common/widgets/organisations_dialog.dart
View File

@ -106,7 +106,9 @@ class FindOrganisations {
builder: (BuildContext context) {
return StatefulBuilder(
builder: (context, setState) {
return SimpleDialog(
return AnimatedContainer(
duration: Duration(seconds: 1),
child : SimpleDialog(
children: <Widget>[
Column(
children: [
@ -222,6 +224,7 @@ class FindOrganisations {
// cancel and ok buttons
],
),
);
},
);

33
lib/pages/receipt_page_2.dart
View File

@ -158,6 +158,8 @@ class ReceiptPage2State extends State<ReceiptPage2> {
Container(
padding: EdgeInsets.fromLTRB(25,15,15.0,0.0),
child: Tooltip(
message: "Date and time of transaction",
child: Row(
children: <Widget> [
Container(
@ -213,10 +215,13 @@ class ReceiptPage2State extends State<ReceiptPage2> {
),
],
),
),
), // Date/Time picker
Container(
padding: EdgeInsets.fromLTRB(25,15,15.0,0.0),
child: Tooltip(
message: "Transaction payee",
child: Row(
children: <Widget> [
Container(
@ -236,15 +241,15 @@ class ReceiptPage2State extends State<ReceiptPage2> {
height: 32.0,
child: RaisedButton(
onPressed: () {
// var popupListView = new PopupListView();
// var dialog = popupListView.dialog(context, optionsList, "Choose Organization");
// var popupListView = new PopupListView();
// var dialog = popupListView.dialog(context, optionsList, "Choose Organization");
var organisations = new FindOrganisations();
var orgDialog = organisations.dialog(context);
orgDialog.then((organisation) {
try {
organisation.name.length;
transaction.organisation = organisation;
// debugPrint(organisation.name);
// debugPrint(organisation.name);
setState(() {});
} catch(_) {
debugPrint("No organisation chosen.");
@ -265,10 +270,13 @@ class ReceiptPage2State extends State<ReceiptPage2> {
),
],
),
),
), // Organisation picker
Container(
padding: EdgeInsets.fromLTRB(25,15,15.0,0.0),
child: Tooltip(
message: "Transaction recrudescence",
child: Row(
children: <Widget> [
Container(
@ -317,6 +325,7 @@ class ReceiptPage2State extends State<ReceiptPage2> {
),
],
),
),
), // Recurring picker
Container(
@ -338,6 +347,8 @@ class ReceiptPage2State extends State<ReceiptPage2> {
Container(
padding: const EdgeInsets.fromLTRB(0, 0, 0, 0),
height: 32.0,
child: Tooltip(
message: "Category of transaction",
child: RaisedButton(
onPressed: () {
showModalBottomSheet(
@ -367,12 +378,15 @@ class ReceiptPage2State extends State<ReceiptPage2> {
color: Colors.blue,
),
),
),
],
),
), // Category picker
Container(
padding: EdgeInsets.fromLTRB(25,15,15.0,0.0),
child: Tooltip(
message: "Essential or not",
child: Row(
children: <Widget> [
Container(
@ -398,10 +412,13 @@ class ReceiptPage2State extends State<ReceiptPage2> {
),
],
),
),
), // Essential
Container(
padding: EdgeInsets.fromLTRB(25,15,15.0,0.0),
child: Tooltip(
message: "Transaction amount",
child: Row(
children: <Widget> [
Container(
@ -431,10 +448,13 @@ class ReceiptPage2State extends State<ReceiptPage2> {
),
],
),
),
), // Amount picker
Padding(
padding: EdgeInsets.fromLTRB(20.0, 20.0, 20.0, 0.0),
child: Tooltip(
message: "Submit receipt",
child: Container(
height: 65.0,
child: RaisedButton(
@ -469,14 +489,17 @@ class ReceiptPage2State extends State<ReceiptPage2> {
);
}
},
child: Text("GO",
key: Key("goButton"),
style:
TextStyle(color: Colors.white, fontSize: 22.0)),
TextStyle(color: Colors.white, fontSize: 22.0),
),
color: Colors.blue,
),
),
),
),
],
),
);