From d708925098c43875ad439901f61eb4b5ebc6407b Mon Sep 17 00:00:00 2001 From: OleksandrSobol Date: Mon, 8 Feb 2021 20:28:42 +0200 Subject: [PATCH] CAKE-266 | added a frame for qr code on qr_widget.dart and exchange_trade_page.dart --- .../exchange_trade/exchange_trade_page.dart | 15 +++++++++++---- lib/src/screens/receive/widgets/qr_widget.dart | 14 +++++++++----- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/lib/src/screens/exchange_trade/exchange_trade_page.dart b/lib/src/screens/exchange_trade/exchange_trade_page.dart index d71a0ee2e..5dd558d23 100644 --- a/lib/src/screens/exchange_trade/exchange_trade_page.dart +++ b/lib/src/screens/exchange_trade/exchange_trade_page.dart @@ -146,14 +146,21 @@ class ExchangeTradeState extends State { aspectRatio: 1.0, child: Container( padding: EdgeInsets.all(5), - color: Colors.white, + decoration: BoxDecoration( + border: Border.all( + color: Theme.of(context) + .accentTextTheme + .subtitle + .color + ) + ), child: QrImage( data: trade.inputAddress ?? fetchingLabel, - backgroundColor: Colors.white, - /*foregroundColor: Theme.of(context) + backgroundColor: Colors.transparent, + foregroundColor: Theme.of(context) .accentTextTheme .subtitle - .color,*/ + .color, ), )))), Spacer(flex: 3) diff --git a/lib/src/screens/receive/widgets/qr_widget.dart b/lib/src/screens/receive/widgets/qr_widget.dart index c9e9f7883..b479378ed 100644 --- a/lib/src/screens/receive/widgets/qr_widget.dart +++ b/lib/src/screens/receive/widgets/qr_widget.dart @@ -46,13 +46,17 @@ class QRWidget extends StatelessWidget { aspectRatio: 1.0, child: Container( padding: EdgeInsets.all(5), - color: Colors.white, + decoration: BoxDecoration( + border: Border.all( + color: Theme.of(context).accentTextTheme. + display3.backgroundColor + ) + ), child: QrImage( data: addressListViewModel.uri.toString(), - //backgroundColor: Colors.transparent, - backgroundColor: Colors.white, - /*foregroundColor: Theme.of(context).accentTextTheme. - display3.backgroundColor,*/ + backgroundColor: Colors.transparent, + foregroundColor: Theme.of(context).accentTextTheme. + display3.backgroundColor, ), ))))), Spacer(flex: 3)