From 90d53c9f6e1393c827176e4fbaac32f036489b3c Mon Sep 17 00:00:00 2001 From: OleksandrSobol Date: Wed, 2 Jun 2021 16:52:58 +0300 Subject: [PATCH] CAKE-306 | fixed MoonPay icon for buy_list_item.dart and order_row.dart --- assets/images/moonpay-icon.png | Bin 2015 -> 1381 bytes lib/buy/get_buy_provider_icon.dart | 14 ++++++++--- lib/di.dart | 12 ++++++--- lib/src/screens/buy/pre_order_page.dart | 2 +- .../screens/buy/widgets/buy_list_item.dart | 23 ++++++++---------- .../screens/dashboard/widgets/order_row.dart | 9 ++++++- lib/store/settings_store.dart | 12 ++++++--- 7 files changed, 47 insertions(+), 25 deletions(-) diff --git a/assets/images/moonpay-icon.png b/assets/images/moonpay-icon.png index 1fbc2b6fc67fbb9ceab8b7134328fe7416db7980..3c0260108f3a8593b1d87f89a552499980d5ea2d 100644 GIT binary patch delta 873 zcmV-v1D5>X59JCWiBL{Q4GJ0x0000DNk~Le0000Y0000a2nGNE0PG&<-;p7a2}l3{ z0096107#L$9V#NA0{{d700031001Na0001f06F&n000SaNLh0L01FcU01FcV0GgZ_ zvjPEU0e=GKNklf7d&~_OT?3?cMpOW z6?_4Gg`7nZ6kkAzkw8$6t6W|g!wimUMIVn619)Ta= zH`oOCl7U?fhmJ*`9kAITD$QINVFS$(;B}pB7v~% z!f0YfU|>$i_gPol^}f#5Y@@d?q6W75$i}5~L#J2*z0j;@F zQ?A-gfRi|d{T9Tc`@Lh39m`7w^G3#V%;Gx_4w*mnQ+4IYOF-xe^l|VBNVL`EqG7^* z;%0o0@2C}>j#6uP1G(7OXe$6b2NIDOR)2ok!X+=jSh>RKa$iyt5Z_zn+}2ME@!O`5 zD=LUi?n1Z)&W-?@JyT)%FPp#ixO!YkhnJiAt|}Kf)lZFmF+hZ1AD_iOZOM{XW9wq& zc`o2Q5>M3G9^muN`Y?`zz#l+9Kdkm$Q4T$Cl2Rt(0Zz!rqiD}jS7RV&-6B1nyML0O z!z3yb@msM<@EXv3+h!%Ci1~>9MUIq|iO}4k%U1||W5G@?l`Ee29bMwYtn0)e?JkI* za7xe@flJd9)z`T8=Z-#x&WIg)l#>?%!%mUlfn`^6JquD2ue)U=l5hBUD+g?2webv)nssbF5dzK^lH6$%s|$W@s| zSZk{0hVdnLq$-Ju;`i8p^Ea}J*x2`9@4z1>{+vv34X26#0000 zN8*2?+uK{7X=7tUw6wH{*RNlTu&^-E)YK#v7k?Ku3esQC_@Tf|PEHCU;>X+DTLc6I z==R9S2qSR7TQWTxNibv>25oI^QCwUcMMOl9zrR0y|NfmY78)8#PEJm=yu3`GK7AtN z*^pQ$9v>g)9%&U?TU*1TBm=G8zLF7MRzP`@Bp#dl`(#gco(2!OD5K!>u&6@{La&oeek)nA^OH0N4 z{JhqA7u3g(A2pxl!ltICSVo7vGV{T~0W~)_Q&(3PZ-MBQp})dadOmCC5ice}6x>kzbsho&OjNl)>4hPk&NsYAVTe zKr=HlJcpUp4J4`7)>e+F!^1{7uIhJlz~$gBps2Ek!>+E z;}c%cb#`_};o;%b-Q7(xIkL2^IW!<_mo3I8;JC+nd3i~`zP{XtqsNSl+1XjNvJZIWcM=Gcw?8GJk*Yb}2zKp{I^3%b%Q_n2K_gDFIXN-(*nwkqSVz7H-7H z#}m%4zZLG*Fr(f9ArFBRKyFyPjH03jiZ{S(51;5X2P>^v|qKrdguw6FX?frPL`nE?g$X;1WFBIv=H zDE~-cFuA$8G&VNICxM#7%<>P4d<6=ExJ%)tiE|E7h)GfBC<0J*Rw3!3AcIfhmReq3 z&KHHCpdh=pO6kPvHDUWe(lSE&6xYO(k^efu6-Y*;2o4U`#ecpmD?~y<0vGkNT-E&T z?d?Kd09lvP$qhSR_W*%kDZt$ff1jwrAHdXuA|3_3YO7y)eG;-B*V8Ipy2FkSy=79V zrn~!%twLhMJqpF#^z=06EHD=o6i{AX9@paX>Z21Md80& diff --git a/lib/buy/get_buy_provider_icon.dart b/lib/buy/get_buy_provider_icon.dart index bbd599e24..f284b6f04 100644 --- a/lib/buy/get_buy_provider_icon.dart +++ b/lib/buy/get_buy_provider_icon.dart @@ -1,18 +1,24 @@ import 'package:flutter/material.dart'; import 'package:cake_wallet/buy/buy_provider_description.dart'; -Image getBuyProviderIcon(BuyProviderDescription providerDescription) { +Image getBuyProviderIcon(BuyProviderDescription providerDescription, + {bool isWhiteIconColor = false}) { + final _wyreIcon = Image.asset('assets/images/wyre-icon.png', width: 36, height: 36); - final _moonPayIcon = - Image.asset('assets/images/moonpay-icon.png', width: 36, height: 34); + final _moonPayWhiteIcon = + Image.asset('assets/images/moonpay-icon.png', color: Colors.white, + width: 36, height: 34); + final _moonPayBlackIcon = + Image.asset('assets/images/moonpay-icon.png', color: Colors.black, + width: 36, height: 34); if (providerDescription != null) { switch (providerDescription) { case BuyProviderDescription.wyre: return _wyreIcon; case BuyProviderDescription.moonPay: - return _moonPayIcon; + return isWhiteIconColor ? _moonPayWhiteIcon : _moonPayBlackIcon; default: return null; } diff --git a/lib/di.dart b/lib/di.dart index c00cb129e..58523c474 100644 --- a/lib/di.dart +++ b/lib/di.dart @@ -155,9 +155,15 @@ Future setup( (secrets.wyreApiKey?.isNotEmpty ?? false) && (secrets.wyreAccountId?.isNotEmpty ?? false); - final locale = await Devicelocale.currentLocale; - final deviceCountryCode = locale.split('_').last; - final isMoonPayEnabled = await MoonPayBuyProvider.onEnabled(deviceCountryCode); + var isMoonPayEnabled = false; + try { + final locale = await Devicelocale.currentLocale; + final deviceCountryCode = locale.split('_').last; + isMoonPayEnabled = await MoonPayBuyProvider.onEnabled(deviceCountryCode); + } catch (e) { + isMoonPayEnabled = false; + print(e.toString()); + } final settingsStore = await SettingsStoreBase.load( nodeSource: _nodeSource, isBitcoinBuyEnabled: isBitcoinBuyEnabled, diff --git a/lib/src/screens/buy/pre_order_page.dart b/lib/src/screens/buy/pre_order_page.dart index ebda2dc8a..cf6cca586 100644 --- a/lib/src/screens/buy/pre_order_page.dart +++ b/lib/src/screens/buy/pre_order_page.dart @@ -114,7 +114,7 @@ class PreOrderPage extends BasePage { padding: EdgeInsets.only(top: 100, bottom: 65), child: Center( child: Container( - width: 185, + width: 210, child: BaseTextFormField( focusNode: _amountFocus, controller: _amountController, diff --git a/lib/src/screens/buy/widgets/buy_list_item.dart b/lib/src/screens/buy/widgets/buy_list_item.dart index 7c18893a6..97eb88ec6 100644 --- a/lib/src/screens/buy/widgets/buy_list_item.dart +++ b/lib/src/screens/buy/widgets/buy_list_item.dart @@ -26,25 +26,22 @@ class BuyListItem extends StatelessWidget { @override Widget build(BuildContext context) { - final providerIcon = getBuyProviderIcon(provider.description); + final isSelected = selectedProvider?.description == provider.description; - final backgroundColor = selectedProvider != null - ? selectedProvider.description == provider.description + final providerIcon = getBuyProviderIcon(provider.description, + isWhiteIconColor: isSelected); + + final backgroundColor = isSelected ? Palette.greyBlueCraiola - : Palette.shadowWhite - : Palette.shadowWhite; + : Palette.shadowWhite; - final primaryTextColor = selectedProvider != null - ? selectedProvider.description == provider.description + final primaryTextColor = isSelected ? Colors.white - : Palette.darkGray - : Palette.darkGray; + : Palette.darkGray; - final secondaryTextColor = selectedProvider != null - ? selectedProvider.description == provider.description + final secondaryTextColor = isSelected ? Colors.white - : Palette.darkBlueCraiola - : Palette.darkBlueCraiola; + : Palette.darkBlueCraiola; return GestureDetector( onTap: () => onTap?.call(), diff --git a/lib/src/screens/dashboard/widgets/order_row.dart b/lib/src/screens/dashboard/widgets/order_row.dart index 56a69122e..9a7a61525 100644 --- a/lib/src/screens/dashboard/widgets/order_row.dart +++ b/lib/src/screens/dashboard/widgets/order_row.dart @@ -1,6 +1,9 @@ import 'package:cake_wallet/buy/buy_provider_description.dart'; import 'package:cake_wallet/buy/get_buy_provider_icon.dart'; +import 'package:cake_wallet/themes/theme_base.dart'; import 'package:flutter/material.dart'; +import 'package:cake_wallet/di.dart'; +import 'package:cake_wallet/store/settings_store.dart'; class OrderRow extends StatelessWidget { OrderRow({ @@ -19,7 +22,11 @@ class OrderRow extends StatelessWidget { @override Widget build(BuildContext context) { - final providerIcon = getBuyProviderIcon(provider); + final currentTheme = getIt.get().currentTheme; + final isWhiteIconColor = currentTheme.type != ThemeType.light; + + final providerIcon = getBuyProviderIcon(provider, + isWhiteIconColor: isWhiteIconColor); return InkWell( onTap: onTap, diff --git a/lib/store/settings_store.dart b/lib/store/settings_store.dart index 2b26b2dd8..be71b9f2c 100644 --- a/lib/store/settings_store.dart +++ b/lib/store/settings_store.dart @@ -253,9 +253,15 @@ abstract class SettingsStoreBase with Store { (secrets.wyreApiKey?.isNotEmpty ?? false) && (secrets.wyreAccountId?.isNotEmpty ?? false); - final locale = await Devicelocale.currentLocale; - final deviceCountryCode = locale.split('_').last; - final isMoonPayEnabled = await MoonPayBuyProvider.onEnabled(deviceCountryCode); + var isMoonPayEnabled = false; + try { + final locale = await Devicelocale.currentLocale; + final deviceCountryCode = locale.split('_').last; + isMoonPayEnabled = await MoonPayBuyProvider.onEnabled(deviceCountryCode); + } catch (e) { + isMoonPayEnabled = false; + print(e.toString()); + } final settings = await SettingsStoreBase.load( nodeSource: nodeSource,