diff --git a/lib/account.dart b/lib/account.dart index ff4ac1767..144c69374 100644 --- a/lib/account.dart +++ b/lib/account.dart @@ -389,8 +389,11 @@ class _AccountPageState extends State } _onReceive() async { - await showDialog(context: context, builder: (context) => - AlertDialog(title: Text(S.of(context).receivePayment), content: PaymentURIPage(_address()))); + await showDialog(context: context, + barrierColor: Colors.black, + barrierDismissible: false, + builder: (context) => + Dialog(child: PaymentURIPage(_address()))); } _unconfirmedStyle() { diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index 599447ada..912d8602f 100644 --- a/lib/generated/intl/messages_en.dart +++ b/lib/generated/intl/messages_en.dart @@ -179,7 +179,7 @@ class MessageLookup extends MessageLookupByLibrary { "qty": MessageLookupByLibrary.simpleMessage("Qty"), "realized": MessageLookupByLibrary.simpleMessage("Realized"), "receivePayment": - MessageLookupByLibrary.simpleMessage("Receive a payment"), + MessageLookupByLibrary.simpleMessage("Receive Payment"), "rescan": MessageLookupByLibrary.simpleMessage("Rescan"), "rescanRequested": MessageLookupByLibrary.simpleMessage("Rescan Requested..."), diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index 15ea991dc..625fccd76 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -1432,10 +1432,10 @@ class S { ); } - /// `Receive a payment` + /// `Receive Payment` String get receivePayment { return Intl.message( - 'Receive a payment', + 'Receive Payment', name: 'receivePayment', desc: '', args: [], diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index b9d6e8e91..dceda1088 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -137,6 +137,6 @@ "purple": "Purple", "noRecipient": "No Recipient", "addARecipientAndItWillShowHere": "Add a recipient and it will show here", - "receivePayment": "Receive a payment", + "receivePayment": "Receive Payment", "amountTooHigh": "Amount too high" } diff --git a/lib/payment_uri.dart b/lib/payment_uri.dart index 01e3cd02b..7022a04bb 100644 --- a/lib/payment_uri.dart +++ b/lib/payment_uri.dart @@ -31,12 +31,13 @@ class PaymentURIState extends State { Widget build(BuildContext context) { final qrSize = getScreenSize(context) / 1.5; - return Container( - width: double.maxFinite, - child: Form( - key: _formKey, + return Form( + key: _formKey, + child: SingleChildScrollView(child: Padding(padding: EdgeInsets.all(8), child: Column(mainAxisAlignment: MainAxisAlignment.center, children: [ + Text(S.of(context).receivePayment, style: Theme.of(context).textTheme.headline5), + Padding(padding: EdgeInsets.all(8)), QrImage( data: qrText, size: qrSize, backgroundColor: Colors.white), Padding(padding: EdgeInsets.all(8)), @@ -62,7 +63,7 @@ class PaymentURIState extends State { onPressed: _ok, ), ]), - ]))); + ])))); } String? _checkAmount(String? vs) { diff --git a/pubspec.yaml b/pubspec.yaml index 1dbb27d6d..88ca293d9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.0.10+150 +version: 1.0.10+151 environment: sdk: ">=2.12.0 <3.0.0" diff --git a/pubspec.yaml.tpl b/pubspec.yaml.tpl index c64131336..438095be3 100644 --- a/pubspec.yaml.tpl +++ b/pubspec.yaml.tpl @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.0.10+150 +version: 1.0.10+151 environment: sdk: ">=2.12.0 <3.0.0"