Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ Harmonize the format of monetary #198

Merged
merged 1 commit into from
May 27, 2024
Merged

✨ Harmonize the format of monetary #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions lib/ui/views/farm_deposit/layouts/components/farm_deposit_textfield_amount.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@ class _FarmDepositToken1AmountState extends ConsumerState<FarmDepositAmount> {
void _updateAmountTextController() {
final farmDeposit = ref.read(FarmDepositFormProvider.farmDepositForm);
tokenAmountController = TextEditingController();
tokenAmountController.value =
aedappfm.AmountTextInputFormatter(precision: 8).formatEditUpdate(
tokenAmountController.value = aedappfm.AmountTextInputFormatter(
precision: 8,
thousandsSeparator: ',',
useUnifyDecimalSeparator: false,
).formatEditUpdate(
TextEditingValue.empty,
TextEditingValue(
text: farmDeposit.amount == 0
Expand Down Expand Up @@ -120,7 +123,7 @@ class _FarmDepositToken1AmountState extends ConsumerState<FarmDepositAmount> {
controller: tokenAmountController,
onChanged: (text) async {
farmDepositNotifier.setAmount(
double.tryParse(text.replaceAll(' ', '')) ?? 0,
double.tryParse(text.replaceAll(',', '')) ?? 0,
);
},
focusNode: tokenAmountFocusNode,
Expand All @@ -130,7 +133,11 @@ class _FarmDepositToken1AmountState extends ConsumerState<FarmDepositAmount> {
decimal: true,
),
inputFormatters: <TextInputFormatter>[
aedappfm.AmountTextInputFormatter(precision: 8),
aedappfm.AmountTextInputFormatter(
precision: 8,
thousandsSeparator: ',',
useUnifyDecimalSeparator: false,
),
LengthLimitingTextInputFormatter(
farmDeposit.lpTokenBalance
.formatNumber(
Expand Down
15 changes: 11 additions & 4 deletions lib/ui/views/farm_withdraw/layouts/components/farm_withdraw_textfield_amount.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@ class _FarmWithdrawToken1AmountState extends ConsumerState<FarmWithdrawAmount> {
void _updateAmountTextController() {
final farmWithdraw = ref.read(FarmWithdrawFormProvider.farmWithdrawForm);
tokenAmountController = TextEditingController();
tokenAmountController.value =
aedappfm.AmountTextInputFormatter(precision: 8).formatEditUpdate(
tokenAmountController.value = aedappfm.AmountTextInputFormatter(
precision: 8,
thousandsSeparator: ',',
useUnifyDecimalSeparator: false,
).formatEditUpdate(
TextEditingValue.empty,
TextEditingValue(
text: farmWithdraw.amount == 0
Expand Down Expand Up @@ -123,7 +126,7 @@ class _FarmWithdrawToken1AmountState extends ConsumerState<FarmWithdrawAmount> {
onChanged: (text) async {
farmWithdrawNotifier.setAmount(
context,
double.tryParse(text.replaceAll(' ', '')) ?? 0,
double.tryParse(text.replaceAll(',', '')) ?? 0,
);
},
focusNode: tokenAmountFocusNode,
Expand All @@ -133,7 +136,11 @@ class _FarmWithdrawToken1AmountState extends ConsumerState<FarmWithdrawAmount> {
decimal: true,
),
inputFormatters: <TextInputFormatter>[
aedappfm.AmountTextInputFormatter(precision: 8),
aedappfm.AmountTextInputFormatter(
precision: 8,
thousandsSeparator: ',',
useUnifyDecimalSeparator: false,
),
LengthLimitingTextInputFormatter(10),
],
decoration: const InputDecoration(
Expand Down
28 changes: 9 additions & 19 deletions lib/ui/views/liquidity_add/layouts/components/liquidity_add_confirm_infos.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,33 +59,23 @@ class LiquidityAddConfirmInfos extends ConsumerWidget {
children: [
Row(
children: [
SelectableText(
liquidityAdd.token1Amount.formatNumber(precision: 8),
style: AppTextStyles.bodyLargeSecondaryColor(context),
),
Tooltip(
message: liquidityAdd.token1!.symbol,
child: Text.rich(
TextSpan(
children: [
TextSpan(
text: liquidityAdd.token1Amount
.formatNumber(precision: 8),
style: AppTextStyles.bodyLargeSecondaryColor(
context,
),
),
TextSpan(
text:
' ${liquidityAdd.token1!.symbol.reduceSymbol()}',
style: AppTextStyles.bodyLarge(context),
),
],
),
child: SelectableText(
' ${liquidityAdd.token1!.symbol.reduceSymbol()}',
style: AppTextStyles.bodyLarge(context),
),
),
],
),
Tooltip(
message: liquidityAdd.token1!.symbol,
child: SelectableText(
'${liquidityAdd.token1minAmount.formatNumber()} ${liquidityAdd.token1!.symbol.reduceSymbol()}',
'+${liquidityAdd.token1minAmount.formatNumber()} ${liquidityAdd.token1!.symbol.reduceSymbol()}',
style: AppTextStyles.bodyLarge(context),
),
),
Expand All @@ -97,7 +87,7 @@ class LiquidityAddConfirmInfos extends ConsumerWidget {
Row(
children: [
SelectableText(
'${liquidityAdd.token2Amount}',
liquidityAdd.token2Amount.formatNumber(precision: 8),
style: AppTextStyles.bodyLargeSecondaryColor(context),
),
Tooltip(
Expand Down
25 changes: 18 additions & 7 deletions lib/ui/views/liquidity_add/layouts/components/liquidity_add_textfield_token_1_amount.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,11 @@ class _LiquidityAddToken1AmountState
void _updateAmountTextController() {
final liquidityAdd = ref.read(LiquidityAddFormProvider.liquidityAddForm);
tokenAmountController = TextEditingController();
tokenAmountController.value =
aedappfm.AmountTextInputFormatter(precision: 8).formatEditUpdate(
tokenAmountController.value = aedappfm.AmountTextInputFormatter(
precision: 8,
thousandsSeparator: ',',
useUnifyDecimalSeparator: false,
).formatEditUpdate(
TextEditingValue.empty,
TextEditingValue(
text: liquidityAdd.token1Amount == 0
Expand Down Expand Up @@ -139,7 +142,7 @@ class _LiquidityAddToken1AmountState
await liquidityAddNotifier.setToken1Amount(
context,
double.tryParse(
text.replaceAll(' ', ''),
text.replaceAll(',', ''),
) ??
0,
);
Expand All @@ -157,6 +160,8 @@ class _LiquidityAddToken1AmountState
inputFormatters: <TextInputFormatter>[
aedappfm.AmountTextInputFormatter(
precision: 8,
thousandsSeparator: ',',
useUnifyDecimalSeparator: false,
),
LengthLimitingTextInputFormatter(
liquidityAdd.token1Balance
Expand Down Expand Up @@ -198,8 +203,11 @@ class _LiquidityAddToken1AmountState
balanceAmount: liquidityAdd.token1Balance,
onTap: () async {
tokenAmountController.value =
aedappfm.AmountTextInputFormatter(precision: 8)
.formatEditUpdate(
aedappfm.AmountTextInputFormatter(
precision: 8,
thousandsSeparator: ',',
useUnifyDecimalSeparator: false,
).formatEditUpdate(
TextEditingValue.empty,
TextEditingValue(
text: (Decimal.parse(
Expand Down Expand Up @@ -228,8 +236,11 @@ class _LiquidityAddToken1AmountState
balanceAmount: liquidityAdd.token1Balance,
onTap: () async {
tokenAmountController.value =
aedappfm.AmountTextInputFormatter(precision: 8)
.formatEditUpdate(
aedappfm.AmountTextInputFormatter(
precision: 8,
thousandsSeparator: ',',
useUnifyDecimalSeparator: false,
).formatEditUpdate(
TextEditingValue.empty,
TextEditingValue(
text: liquidityAdd.token1Balance.toString(),
Expand Down
25 changes: 18 additions & 7 deletions lib/ui/views/liquidity_add/layouts/components/liquidity_add_textfield_token_2_amount.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,11 @@ class _LiquidityAddToken2AmountState
void _updateAmountTextController() {
final liquidityAdd = ref.read(LiquidityAddFormProvider.liquidityAddForm);
tokenAmountController = TextEditingController();
tokenAmountController.value =
aedappfm.AmountTextInputFormatter(precision: 8).formatEditUpdate(
tokenAmountController.value = aedappfm.AmountTextInputFormatter(
precision: 8,
thousandsSeparator: ',',
useUnifyDecimalSeparator: false,
).formatEditUpdate(
TextEditingValue.empty,
TextEditingValue(
text: liquidityAdd.token2Amount == 0
Expand Down Expand Up @@ -140,7 +143,7 @@ class _LiquidityAddToken2AmountState
await liquidityAddNotifier.setToken2Amount(
context,
double.tryParse(
text.replaceAll(' ', ''),
text.replaceAll(',', ''),
) ??
0,
);
Expand All @@ -158,6 +161,8 @@ class _LiquidityAddToken2AmountState
inputFormatters: <TextInputFormatter>[
aedappfm.AmountTextInputFormatter(
precision: 8,
thousandsSeparator: ',',
useUnifyDecimalSeparator: false,
),
LengthLimitingTextInputFormatter(
liquidityAdd.token2Balance
Expand Down Expand Up @@ -199,8 +204,11 @@ class _LiquidityAddToken2AmountState
balanceAmount: liquidityAdd.token2Balance,
onTap: () async {
tokenAmountController.value =
aedappfm.AmountTextInputFormatter(precision: 8)
.formatEditUpdate(
aedappfm.AmountTextInputFormatter(
precision: 8,
thousandsSeparator: ',',
useUnifyDecimalSeparator: false,
).formatEditUpdate(
TextEditingValue.empty,
TextEditingValue(
text: (Decimal.parse(
Expand Down Expand Up @@ -229,8 +237,11 @@ class _LiquidityAddToken2AmountState
balanceAmount: liquidityAdd.token2Balance,
onTap: () async {
tokenAmountController.value =
aedappfm.AmountTextInputFormatter(precision: 8)
.formatEditUpdate(
aedappfm.AmountTextInputFormatter(
precision: 8,
thousandsSeparator: ',',
useUnifyDecimalSeparator: false,
).formatEditUpdate(
TextEditingValue.empty,
TextEditingValue(
text: liquidityAdd.token2Balance.toString(),
Expand Down
15 changes: 11 additions & 4 deletions ...views/liquidity_remove/layouts/components/liquidity_remove_textfield_lp_token_amount.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@ class _LiquidityRemoveLPTokenAmountState
final liquidityRemove =
ref.read(LiquidityRemoveFormProvider.liquidityRemoveForm);
tokenAmountController = TextEditingController();
tokenAmountController.value =
aedappfm.AmountTextInputFormatter(precision: 8).formatEditUpdate(
tokenAmountController.value = aedappfm.AmountTextInputFormatter(
precision: 8,
thousandsSeparator: ',',
useUnifyDecimalSeparator: false,
).formatEditUpdate(
TextEditingValue.empty,
TextEditingValue(
text: liquidityRemove.lpTokenAmount == 0
Expand Down Expand Up @@ -123,7 +126,7 @@ class _LiquidityRemoveLPTokenAmountState
controller: tokenAmountController,
onChanged: (text) async {
await liquidityRemoveNotifier.setLPTokenAmount(
double.tryParse(text.replaceAll(' ', '')) ?? 0,
double.tryParse(text.replaceAll(',', '')) ?? 0,
);
},
focusNode: tokenAmountFocusNode,
Expand All @@ -133,7 +136,11 @@ class _LiquidityRemoveLPTokenAmountState
decimal: true,
),
inputFormatters: <TextInputFormatter>[
aedappfm.AmountTextInputFormatter(precision: 8),
aedappfm.AmountTextInputFormatter(
precision: 8,
thousandsSeparator: ',',
useUnifyDecimalSeparator: false,
),
LengthLimitingTextInputFormatter(10),
],
decoration: const InputDecoration(
Expand Down
11 changes: 8 additions & 3 deletions lib/ui/views/pool_add/layouts/components/pool_add_textfield_token_1_amount.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,11 @@ class _PoolAddToken1AmountState extends ConsumerState<PoolAddToken1Amount> {
void _updateAmountTextController() {
final poolAdd = ref.read(PoolAddFormProvider.poolAddForm);
tokenAmountController = TextEditingController();
tokenAmountController.value =
aedappfm.AmountTextInputFormatter(precision: 8).formatEditUpdate(
tokenAmountController.value = aedappfm.AmountTextInputFormatter(
precision: 8,
thousandsSeparator: ',',
useUnifyDecimalSeparator: false,
).formatEditUpdate(
TextEditingValue.empty,
TextEditingValue(
text: poolAdd.token1Amount == 0
Expand Down Expand Up @@ -130,7 +133,7 @@ class _PoolAddToken1AmountState extends ConsumerState<PoolAddToken1Amount> {
poolAddNotifier.setToken1Amount(
context,
double.tryParse(
text.replaceAll(' ', ''),
text.replaceAll(',', ''),
) ??
0,
);
Expand All @@ -152,6 +155,8 @@ class _PoolAddToken1AmountState extends ConsumerState<PoolAddToken1Amount> {
inputFormatters: <TextInputFormatter>[
aedappfm.AmountTextInputFormatter(
precision: 8,
thousandsSeparator: ',',
useUnifyDecimalSeparator: false,
),
],
decoration: const InputDecoration(
Expand Down
11 changes: 8 additions & 3 deletions lib/ui/views/pool_add/layouts/components/pool_add_textfield_token_2_amount.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,11 @@ class _PoolAddToken2AmountState extends ConsumerState<PoolAddToken2Amount> {
void _updateAmountTextController() {
final poolAdd = ref.read(PoolAddFormProvider.poolAddForm);
tokenAmountController = TextEditingController();
tokenAmountController.value =
aedappfm.AmountTextInputFormatter(precision: 8).formatEditUpdate(
tokenAmountController.value = aedappfm.AmountTextInputFormatter(
precision: 8,
thousandsSeparator: ',',
useUnifyDecimalSeparator: false,
).formatEditUpdate(
TextEditingValue.empty,
TextEditingValue(
text: poolAdd.token2Amount == 0
Expand Down Expand Up @@ -130,7 +133,7 @@ class _PoolAddToken2AmountState extends ConsumerState<PoolAddToken2Amount> {
poolAddNotifier.setToken2Amount(
context,
double.tryParse(
text.replaceAll(' ', ''),
text.replaceAll(',', ''),
) ??
0,
);
Expand All @@ -152,6 +155,8 @@ class _PoolAddToken2AmountState extends ConsumerState<PoolAddToken2Amount> {
inputFormatters: <TextInputFormatter>[
aedappfm.AmountTextInputFormatter(
precision: 8,
thousandsSeparator: ',',
useUnifyDecimalSeparator: false,
),
],
decoration: const InputDecoration(
Expand Down
Loading
Loading