diff --git a/lib/new-ui/widgets/coins_page/cards/cards_view.dart b/lib/new-ui/widgets/coins_page/cards/cards_view.dart index 2c36d635a..427660b90 100644 --- a/lib/new-ui/widgets/coins_page/cards/cards_view.dart +++ b/lib/new-ui/widgets/coins_page/cards/cards_view.dart @@ -10,6 +10,7 @@ import 'package:cake_wallet/new-ui/pages/send_page.dart'; import 'package:cake_wallet/routes.dart'; import 'package:cake_wallet/utils/feature_flag.dart'; import 'package:cake_wallet/utils/payment_request.dart'; +import 'package:cake_wallet/utils/responsive_layout_util.dart'; import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart'; import 'package:cake_wallet/view_model/monero_account_list/monero_account_list_view_model.dart'; import 'package:cw_core/card_design.dart'; @@ -72,8 +73,6 @@ class _CardsViewState extends State { final top = baseTop - (howFarBehind * overlapAmount); - final double cardWidth = MediaQuery.of(context).size.width * 0.878; - final double effectiveCardWidth = min(cardWidth, 768); final left = (parentWidth - effectiveCardWidth) / 2.0; @@ -228,9 +227,9 @@ class _CardsViewState extends State { } } + double get effectiveCardWidth => min(MediaQuery.of(context).size.width * 0.878, responsiveLayoutUtil.shouldRenderMobileUI ? 768 : 512); + double _getBoxHeight(int numCards, double overlapAmount) { - final double cardWidth = MediaQuery.of(context).size.width * 0.878; - final double effectiveCardWidth = min(cardWidth, 768); return /* height of initial card */ (2 / 3.2) * (effectiveCardWidth) + diff --git a/lib/new-ui/widgets/receive_page/receive_qr_code.dart b/lib/new-ui/widgets/receive_page/receive_qr_code.dart index e6f4ba5d1..6ff9eaf58 100644 --- a/lib/new-ui/widgets/receive_page/receive_qr_code.dart +++ b/lib/new-ui/widgets/receive_page/receive_qr_code.dart @@ -1,3 +1,5 @@ +import 'dart:math'; + import 'package:cake_wallet/di.dart'; import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/src/widgets/cake_image_widget.dart'; @@ -29,7 +31,7 @@ class ReceiveQrCode extends StatelessWidget { @override Widget build(BuildContext context) { final double targetY = largeQrMode ? largeQrModeBottomPadding+50 : 0; - final double resolvedSize = MediaQuery.of(context).size.width * 0.5; + final double resolvedSize = min(MediaQuery.of(context).size.width, MediaQuery.of(context).size.height) * 0.5; final double resolvedScale = largeQrMode ? 1.7 : 1; return Stack(