Merge pull request #101 from cake-tech/CAKE-302-balance-displaying-bug

CAKE-302 | wrapped Text widgets by Expanded and Row widgets in the ba…
This commit is contained in:
mezzazon 2021-03-29 21:22:32 +03:00 committed by GitHub
commit b7935664a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,3 @@
import 'package:cake_wallet/entities/crypto_currency.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart'; import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:flutter_mobx/flutter_mobx.dart';
@ -33,16 +32,23 @@ class BalancePage extends StatelessWidget {
}), }),
SizedBox(height: 10), SizedBox(height: 10),
Observer(builder: (_) { Observer(builder: (_) {
return Text( return Row(
'${dashboardViewModel.balanceViewModel.availableBalanceLabel} (${dashboardViewModel.balanceViewModel.availableFiatBalance.toString()})', children: [
style: TextStyle( Expanded(
fontSize: 12, child: Text(
fontWeight: FontWeight.w600, '${dashboardViewModel.balanceViewModel.availableBalanceLabel} (${dashboardViewModel.balanceViewModel.availableFiatBalance.toString()})',
color: Theme.of(context) textAlign: TextAlign.center,
.accentTextTheme style: TextStyle(
.display2 fontSize: 12,
.backgroundColor, fontWeight: FontWeight.w600,
height: 1), color: Theme.of(context)
.accentTextTheme
.display2
.backgroundColor,
height: 1),
)
)
],
); );
}), }),
SizedBox(height: 10), SizedBox(height: 10),
@ -62,16 +68,23 @@ class BalancePage extends StatelessWidget {
}), }),
SizedBox(height: 10), SizedBox(height: 10),
Observer(builder: (_) { Observer(builder: (_) {
return Text( return Row(
'${dashboardViewModel.balanceViewModel.additionalBalanceLabel} (${dashboardViewModel.balanceViewModel.additionalFiatBalance.toString()})', children: [
style: TextStyle( Expanded(
fontSize: 12, child: Text(
fontWeight: FontWeight.w600, '${dashboardViewModel.balanceViewModel.additionalBalanceLabel} (${dashboardViewModel.balanceViewModel.additionalFiatBalance.toString()})',
color: Theme.of(context) textAlign: TextAlign.center,
.accentTextTheme style: TextStyle(
.display2 fontSize: 12,
.backgroundColor, fontWeight: FontWeight.w600,
height: 1), color: Theme.of(context)
.accentTextTheme
.display2
.backgroundColor,
height: 1),
)
)
],
); );
}), }),
SizedBox(height: 10), SizedBox(height: 10),