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.

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

Update Balance screen #605

Merged
merged 1 commit into from
Jul 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
112 changes: 46 additions & 66 deletions lib/routes/home/widgets/dashboard/balance_text.dart
Original file line number Diff line number Diff line change
@@ -1,86 +1,66 @@
import 'package:breez_translations/breez_translations_locales.dart';
import 'package:c_breez/bloc/account/account_bloc.dart';
import 'package:c_breez/bloc/account/account_state.dart';
import 'package:c_breez/bloc/currency/currency_bloc.dart';
import 'package:c_breez/bloc/currency/currency_state.dart';
import 'package:c_breez/bloc/user_profile/user_profile_bloc.dart';
import 'package:c_breez/bloc/user_profile/user_profile_state.dart';
import 'package:c_breez/theme/theme_provider.dart' as theme;
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';

class BalanceText extends StatelessWidget {
final double offset;
class BalanceText extends StatefulWidget {
final UserProfileState userProfileState;
final CurrencyState currencyState;
final AccountState accountState;
final double offsetFactor;

const BalanceText(
this.offset, {
const BalanceText({
Key? key,
required this.userProfileState,
required this.currencyState,
required this.accountState,
required this.offsetFactor,
}) : super(key: key);

@override
Widget build(BuildContext context) {
return BlocBuilder<CurrencyBloc, CurrencyState>(
builder: (context, currencyState) {
return BlocBuilder<AccountBloc, AccountState>(
builder: (context, accountState) {
return BlocBuilder<UserProfileBloc, UserProfileState>(
builder: (context, userProfileState) {
return userProfileState.profileSettings.hideBalance
? _balanceHide(context)
: _balanceRichText(context, currencyState, accountState);
},
);
},
);
},
);
}

Widget _balanceHide(BuildContext context) {
final themeData = Theme.of(context);
final texts = context.texts();
State<BalanceText> createState() => _BalanceTextState();
}

return Text(
texts.wallet_dashboard_balance_hide,
style: theme.balanceAmountTextStyle.copyWith(
color: themeData.colorScheme.onSecondary,
fontSize: startSize - (startSize - endSize) * offset,
),
);
}
class _BalanceTextState extends State<BalanceText> {
double get startSize => theme.balanceAmountTextStyle.fontSize!;
double get endSize => startSize - 8.0;

Widget _balanceRichText(
BuildContext context,
CurrencyState currencyState,
AccountState accountState,
) {
@override
Widget build(BuildContext context) {
final texts = context.texts();
final themeData = Theme.of(context);

return RichText(
text: TextSpan(
style: theme.balanceAmountTextStyle.copyWith(
color: themeData.colorScheme.onSecondary,
fontSize: startSize - (startSize - endSize) * offset,
),
text: currencyState.bitcoinCurrency.format(
accountState.balance,
removeTrailingZeros: true,
includeDisplayName: false,
),
children: [
TextSpan(
text: " ${currencyState.bitcoinCurrency.displayName}",
style: theme.balanceCurrencyTextStyle.copyWith(
return widget.userProfileState.profileSettings.hideBalance
? Text(
texts.wallet_dashboard_balance_hide,
style: theme.balanceAmountTextStyle.copyWith(
color: themeData.colorScheme.onSecondary,
fontSize: startSize * 0.6 - (startSize * 0.6 - endSize) * offset,
fontSize: startSize - (startSize - endSize) * widget.offsetFactor,
),
)
: RichText(
text: TextSpan(
style: theme.balanceAmountTextStyle.copyWith(
color: themeData.colorScheme.onSecondary,
fontSize: startSize - (startSize - endSize) * widget.offsetFactor,
),
text: widget.currencyState.bitcoinCurrency.format(
widget.accountState.balance,
removeTrailingZeros: true,
includeDisplayName: false,
),
children: [
TextSpan(
text: " ${widget.currencyState.bitcoinCurrency.displayName}",
style: theme.balanceCurrencyTextStyle.copyWith(
color: themeData.colorScheme.onSecondary,
fontSize: startSize * 0.6 - (startSize * 0.6 - endSize) * widget.offsetFactor,
),
),
],
),
),
],
),
);
);
}

double get startSize => theme.balanceAmountTextStyle.fontSize!;

double get endSize => startSize - 8.0;
}
98 changes: 98 additions & 0 deletions lib/routes/home/widgets/dashboard/fiat_balance_text.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
import 'dart:math';

import 'package:c_breez/bloc/account/account_state.dart';
import 'package:c_breez/bloc/currency/currency_bloc.dart';
import 'package:c_breez/bloc/currency/currency_state.dart';
import 'package:c_breez/theme/theme_provider.dart' as theme;
import 'package:c_breez/utils/fiat_conversion.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';

class FiatBalanceText extends StatefulWidget {
final CurrencyState currencyState;
final AccountState accountState;
final double offsetFactor;

const FiatBalanceText({
Key? key,
required this.currencyState,
required this.accountState,
required this.offsetFactor,
}) : super(key: key);

@override
State<FiatBalanceText> createState() => _FiatBalanceTextState();
}

class _FiatBalanceTextState extends State<FiatBalanceText> {
@override
Widget build(BuildContext context) {
final themeData = Theme.of(context);

return TextButton(
style: ButtonStyle(
overlayColor: MaterialStateProperty.resolveWith<Color?>((states) {
if (states.contains(MaterialState.focused)) {
return themeData.customData.paymentListBgColor;
}
if (states.contains(MaterialState.hovered)) {
return themeData.customData.paymentListBgColor;
}
return null;
}),
),
onPressed: () {
final newFiatConversion = nextValidFiatConversion(
widget.currencyState,
widget.accountState,
);
if (newFiatConversion != null) {
context.read<CurrencyBloc>().setFiatId(
newFiatConversion.currencyData.id,
);
}
},
child: Text(
widget.currencyState.fiatConversion()?.format(widget.accountState.balance) ?? "",
style: theme.balanceFiatConversionTextStyle.copyWith(
color: themeData.colorScheme.onSecondary.withOpacity(
pow(1.00 - widget.offsetFactor, 2).toDouble(),
),
),
),
);
}

FiatConversion? nextValidFiatConversion(
CurrencyState currencyState,
AccountState accountState,
) {
final currencies = currencyState.preferredCurrencies;
final currentIndex = currencies.indexOf(currencyState.fiatId);
for (var i = 1; i < currencies.length; i++) {
final nextIndex = (i + currentIndex) % currencies.length;
if (isAboveMinAmount(currencyState, accountState)) {
final conversion = currencyState.fiatById(currencies[nextIndex]);
final exchangeRate = currencyState.fiatExchangeRate;
if (conversion != null && exchangeRate != null) {
return FiatConversion(conversion, exchangeRate);
}
}
}
return null;
}

bool isAboveMinAmount(
CurrencyState currencyState,
AccountState accountState,
) {
final fiatConversion = currencyState.fiatConversion();
if (fiatConversion == null) return false;

double fiatValue = fiatConversion.satToFiat(accountState.balance);
int fractionSize = fiatConversion.currencyData.info.fractionSize;
double minimumAmount = 1 / (pow(10, fractionSize));

return fiatValue > minimumAmount;
}
}
Loading
Loading