mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2024-12-23 03:59:23 +00:00
Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
d20d7f9097
1 changed files with 85 additions and 80 deletions
|
@ -158,91 +158,96 @@ class ExchangeCardState extends State<ExchangeCard> {
|
||||||
),
|
),
|
||||||
Padding(
|
Padding(
|
||||||
padding: EdgeInsets.only(top: 20),
|
padding: EdgeInsets.only(top: 20),
|
||||||
child: Stack(
|
child: Row(
|
||||||
children: <Widget>[
|
children: [
|
||||||
BaseTextFormField(
|
Container(
|
||||||
focusNode: widget.amountFocusNode,
|
padding: EdgeInsets.only(right: 8),
|
||||||
controller: amountController,
|
height: 32,
|
||||||
enabled: _isAmountEditable,
|
color: widget.currencyButtonColor,
|
||||||
textAlign: TextAlign.left,
|
child: InkWell(
|
||||||
keyboardType: TextInputType.numberWithOptions(
|
onTap: () => _presentPicker(context),
|
||||||
signed: false, decimal: true),
|
child: Row(
|
||||||
inputFormatters: [
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
FilteringTextInputFormatter.deny(RegExp('[\\-|\\ ]'))
|
mainAxisSize: MainAxisSize.min,
|
||||||
],
|
children: <Widget>[
|
||||||
hintText: '0.0000',
|
Padding(
|
||||||
borderColor: widget.borderColor,
|
padding: EdgeInsets.only(right: 5),
|
||||||
textStyle: TextStyle(
|
child: widget.imageArrow,
|
||||||
fontSize: 16,
|
),
|
||||||
fontWeight: FontWeight.w600,
|
Text(_selectedCurrency.toString() + ':',
|
||||||
color: Colors.white),
|
style: TextStyle(
|
||||||
placeholderTextStyle: TextStyle(
|
fontWeight: FontWeight.w600,
|
||||||
fontSize: 16,
|
fontSize: 16,
|
||||||
fontWeight: FontWeight.w600,
|
color: Colors.white))
|
||||||
color: Theme.of(context)
|
]),
|
||||||
.accentTextTheme
|
|
||||||
.display4
|
|
||||||
.decorationColor),
|
|
||||||
validator: _isAmountEditable
|
|
||||||
? widget.currencyValueValidator
|
|
||||||
: null),
|
|
||||||
Positioned(
|
|
||||||
top: 8,
|
|
||||||
right: 0,
|
|
||||||
child: Container(
|
|
||||||
height: 32,
|
|
||||||
padding: EdgeInsets.only(left: 10),
|
|
||||||
color: widget.currencyButtonColor,
|
|
||||||
child: InkWell(
|
|
||||||
onTap: () => _presentPicker(context),
|
|
||||||
child: Row(
|
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
||||||
mainAxisSize: MainAxisSize.min,
|
|
||||||
children: <Widget>[
|
|
||||||
Text(_selectedCurrency.toString(),
|
|
||||||
style: TextStyle(
|
|
||||||
fontWeight: FontWeight.w600,
|
|
||||||
fontSize: 16,
|
|
||||||
color: Colors.white)),
|
|
||||||
Padding(
|
|
||||||
padding: EdgeInsets.only(left: 5),
|
|
||||||
child: widget.imageArrow,
|
|
||||||
)
|
|
||||||
]),
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
if (widget.hasAllAmount)
|
Expanded(
|
||||||
Positioned(
|
child: Row(
|
||||||
top: 5,
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
right: 55,
|
children: [
|
||||||
child: Container(
|
Flexible(
|
||||||
height: 32,
|
child: BaseTextFormField(
|
||||||
width: 32,
|
focusNode: widget.amountFocusNode,
|
||||||
margin: EdgeInsets.only(left: 14, top: 4, bottom: 10),
|
controller: amountController,
|
||||||
decoration: BoxDecoration(
|
enabled: _isAmountEditable,
|
||||||
color: Theme.of(context)
|
textAlign: TextAlign.left,
|
||||||
.primaryTextTheme
|
keyboardType: TextInputType.numberWithOptions(
|
||||||
.display1
|
signed: false, decimal: true),
|
||||||
.color,
|
inputFormatters: [
|
||||||
borderRadius: BorderRadius.all(Radius.circular(6))),
|
FilteringTextInputFormatter.deny(
|
||||||
child: InkWell(
|
RegExp('[\\-|\\ ]'))
|
||||||
onTap: () => widget.allAmount?.call(),
|
],
|
||||||
child: Center(
|
hintText: '0.0000',
|
||||||
child: Text(S.of(context).all,
|
borderColor: Colors.transparent,
|
||||||
textAlign: TextAlign.center,
|
//widget.borderColor,
|
||||||
style: TextStyle(
|
textStyle: TextStyle(
|
||||||
fontSize: 12,
|
fontSize: 16,
|
||||||
fontWeight: FontWeight.bold,
|
fontWeight: FontWeight.w600,
|
||||||
color: Theme.of(context)
|
color: Colors.white),
|
||||||
.primaryTextTheme
|
placeholderTextStyle: TextStyle(
|
||||||
.display1
|
fontSize: 16,
|
||||||
.decorationColor)),
|
fontWeight: FontWeight.w600,
|
||||||
|
color: Theme.of(context)
|
||||||
|
.accentTextTheme
|
||||||
|
.display4
|
||||||
|
.decorationColor),
|
||||||
|
validator: _isAmountEditable
|
||||||
|
? widget.currencyValueValidator
|
||||||
|
: null),
|
||||||
|
),
|
||||||
|
if (widget.hasAllAmount)
|
||||||
|
Container(
|
||||||
|
height: 32,
|
||||||
|
width: 32,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: Theme.of(context)
|
||||||
|
.primaryTextTheme
|
||||||
|
.display1
|
||||||
|
.color,
|
||||||
|
borderRadius:
|
||||||
|
BorderRadius.all(Radius.circular(6))),
|
||||||
|
child: InkWell(
|
||||||
|
onTap: () => widget.allAmount?.call(),
|
||||||
|
child: Center(
|
||||||
|
child: Text(S.of(context).all,
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 12,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
color: Theme.of(context)
|
||||||
|
.primaryTextTheme
|
||||||
|
.display1
|
||||||
|
.decorationColor)),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
)
|
||||||
))
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
)),
|
)),
|
||||||
|
Divider(height: 1),
|
||||||
Padding(
|
Padding(
|
||||||
padding: EdgeInsets.only(top: 5),
|
padding: EdgeInsets.only(top: 5),
|
||||||
child: Container(
|
child: Container(
|
||||||
|
|
Loading…
Reference in a new issue