From e742badcc837f3629181dc619b3cc251519d95b4 Mon Sep 17 00:00:00 2001 From: Felix Date: Mon, 5 Aug 2019 12:11:40 +0100 Subject: [PATCH] 'amount' button it doesn't actually function yet, but it looks pretty! --- ios/Podfile.lock | 4 +-- ios/Runner.xcodeproj/project.pbxproj | 8 ++--- lib/pages/more_page.dart | 2 +- lib/pages/receipt_page_2.dart | 46 ++++++++++++++++++++++++++-- 4 files changed, 50 insertions(+), 10 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index a4e1203..8132310 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -6,13 +6,13 @@ PODS: - Flutter DEPENDENCIES: - - Flutter (from `.symlinks/flutter/ios`) + - Flutter (from `.symlinks/flutter/ios-profile`) - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) - url_launcher (from `.symlinks/plugins/url_launcher/ios`) EXTERNAL SOURCES: Flutter: - :path: ".symlinks/flutter/ios" + :path: ".symlinks/flutter/ios-profile" shared_preferences: :path: ".symlinks/plugins/shared_preferences/ios" url_launcher: diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index a83a4d3..a0f8e33 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -281,7 +281,7 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework", + "${PODS_ROOT}/../.symlinks/flutter/ios-profile/Flutter.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( @@ -380,7 +380,7 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = G78D5X4L92; @@ -509,7 +509,7 @@ baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = G78D5X4L92; @@ -536,7 +536,7 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; DEVELOPMENT_TEAM = G78D5X4L92; diff --git a/lib/pages/more_page.dart b/lib/pages/more_page.dart index d05a0a3..ae9405b 100644 --- a/lib/pages/more_page.dart +++ b/lib/pages/more_page.dart @@ -100,7 +100,7 @@ class MorePageState extends State { applicationName: "Local Spend Tracker", children: [ Text("Pear Trading is a commerce company designed to register and monitor money circulating in the local economy."), - Text("\nContact at test@example.com or +44(0)1524 64544"), + Text("\nContact at test@example.com or +44 01524 64544"), Padding( padding: EdgeInsets.fromLTRB(0,20,0,0), diff --git a/lib/pages/receipt_page_2.dart b/lib/pages/receipt_page_2.dart index 61ba0da..ad8757c 100644 --- a/lib/pages/receipt_page_2.dart +++ b/lib/pages/receipt_page_2.dart @@ -12,6 +12,7 @@ class ReceiptPage2 extends StatefulWidget { class ReceiptPage2State extends State { DateTime _transactionDate = DateTime.now(); + double _transactionAmount = 0; @override Widget build(BuildContext context) { @@ -34,6 +35,7 @@ class ReceiptPage2State extends State { children: [ // each CHILD has its own horizontal padding because if the listView has padding, Android's end-of-scroll animation // doesn't fit the screen properly and looks weird + Container( padding: const EdgeInsets.fromLTRB(15, 17, 0, 0), child : Text( @@ -44,7 +46,7 @@ class ReceiptPage2State extends State { fontWeight: FontWeight.bold, ), ), - ), + ), // "Receipt Details" title Container( padding: EdgeInsets.fromLTRB(25,15,15.0,0.0), @@ -100,11 +102,49 @@ class ReceiptPage2State extends State { ), ], ), - ), + ), // Date/Time picker + + Container( + padding: EdgeInsets.fromLTRB(25,15,15.0,0.0), + child: Row( + children: [ + Text( + "Amount", + style: TextStyle( + fontSize: 18, + color: Colors.black, + fontWeight: FontWeight.bold, + ), + ), + + Container( + padding: const EdgeInsets.fromLTRB(36, 0, 0, 0), + height: 32.0, + child: RaisedButton( + onPressed: () { + showModalBottomSheet( + context: context, + builder: (BuildContext builder) { + return Container( + height: MediaQuery.of(context).copyWith().size.height / 3, + ); + }); + },// onPressed: () => showDatePicker(context: context, initialDate: _transactionDate, firstDate: null, lastDate: _transactionDate), + child: Text( + _transactionAmount == null + ? 'None set.' + : "£" + _transactionAmount.toString() + "0", + style : TextStyle(color: Colors.white, fontSize: 18.0), + ), + color: Colors.blue, + ), + ), + ], + ), + ), // Date/Time picker ], ), - ); } } \ No newline at end of file