From d2e8c3d2282f4112c4119566b50de2a58616a411 Mon Sep 17 00:00:00 2001 From: Oleksandr Sobol Date: Mon, 1 Jun 2020 19:26:53 +0300 Subject: [PATCH] CWA-218 | made editable address fields on exchange an exchange template pages; changed "Switch to 6-digit PIN" to "Use 6-digit PIN"; removed "Buy" button; made send and exchange button more transparent in the light mode --- lib/generated/i18n.dart | 24 +++++++++---------- .../dashboard/widgets/button_header.dart | 8 ------- lib/src/stores/exchange/exchange_store.dart | 18 +++++++------- lib/themes.dart | 2 +- res/values/strings_de.arb | 2 +- res/values/strings_en.arb | 2 +- res/values/strings_es.arb | 2 +- res/values/strings_hi.arb | 2 +- res/values/strings_ja.arb | 2 +- res/values/strings_ko.arb | 2 +- res/values/strings_nl.arb | 2 +- res/values/strings_pl.arb | 2 +- res/values/strings_pt.arb | 2 +- res/values/strings_ru.arb | 2 +- res/values/strings_uk.arb | 2 +- res/values/strings_zh.arb | 2 +- 16 files changed, 35 insertions(+), 41 deletions(-) diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart index 56fac72e2..e8ced3277 100644 --- a/lib/generated/i18n.dart +++ b/lib/generated/i18n.dart @@ -272,7 +272,7 @@ class S implements WidgetsLocalizations { String get transaction_sent => "Transaction sent!"; String get transactions => "Transactions"; String get transactions_by_date => "Transactions by date"; - String get use => "Switch to "; + String get use => "Use "; String get view_key_private => "View key (private)"; String get view_key_public => "View key (public)"; String get wallet_keys => "Wallet keys"; @@ -746,7 +746,7 @@ class $de extends S { @override String get restore_from_seed_placeholder => "Bitte geben Sie hier Ihren Code ein"; @override - String get use => "Wechseln zu "; + String get use => "Verwenden Sie "; @override String get trade_details_state => "Zustand"; @override @@ -1362,7 +1362,7 @@ class $hi extends S { @override String get restore_from_seed_placeholder => "कृपया अपना कोड वाक्यांश यहां दर्ज करें या पेस्ट करें"; @override - String get use => "पर स्विच "; + String get use => "उपयोग "; @override String get trade_details_state => "राज्य"; @override @@ -1978,7 +1978,7 @@ class $ru extends S { @override String get restore_from_seed_placeholder => "Введите или вставьте мнемоническую фразу вашего кошелька"; @override - String get use => "Переключиться на "; + String get use => "Использовать "; @override String get trade_details_state => "Статус"; @override @@ -2594,7 +2594,7 @@ class $ko extends S { @override String get restore_from_seed_placeholder => "여기에 코드 문구를 입력하거나 붙여 넣으십시오."; @override - String get use => "로 전환 "; + String get use => "사용하다 "; @override String get trade_details_state => "상태"; @override @@ -3210,7 +3210,7 @@ class $pt extends S { @override String get restore_from_seed_placeholder => "Digite ou cole sua frase de código aqui"; @override - String get use => "Trocar para PIN de "; + String get use => "Use PIN de "; @override String get trade_details_state => "Status"; @override @@ -3826,7 +3826,7 @@ class $uk extends S { @override String get restore_from_seed_placeholder => "Введіть або вставте мнемонічну фразу вашого гаманця"; @override - String get use => "Переключитися на "; + String get use => "Використати "; @override String get trade_details_state => "Статус"; @override @@ -4442,7 +4442,7 @@ class $ja extends S { @override String get restore_from_seed_placeholder => "ここにコードフレーズを入力または貼り付けてください"; @override - String get use => "切り替える "; + String get use => "使用する "; @override String get trade_details_state => "状態"; @override @@ -5062,7 +5062,7 @@ class $pl extends S { @override String get restore_from_seed_placeholder => "Wpisz lub wklej tutaj swoją frazę kodową"; @override - String get use => "Przełącz na "; + String get use => "Używać "; @override String get trade_details_state => "Stan"; @override @@ -5678,7 +5678,7 @@ class $es extends S { @override String get restore_from_seed_placeholder => "Ingrese o pegue su frase de código aquí"; @override - String get use => "Cambiar a "; + String get use => "Utilizar a "; @override String get trade_details_state => "Estado"; @override @@ -6294,7 +6294,7 @@ class $nl extends S { @override String get restore_from_seed_placeholder => "Voer hier uw codefrase in of plak deze"; @override - String get use => "Overschakelen naar "; + String get use => "Gebruik "; @override String get trade_details_state => "Staat"; @override @@ -6910,7 +6910,7 @@ class $zh extends S { @override String get restore_from_seed_placeholder => "请在此处输入或粘贴您的代码短语"; @override - String get use => "切換到 "; + String get use => "採用 "; @override String get trade_details_state => "条件"; @override diff --git a/lib/src/screens/dashboard/widgets/button_header.dart b/lib/src/screens/dashboard/widgets/button_header.dart index 50b579ef4..b620e9e14 100644 --- a/lib/src/screens/dashboard/widgets/button_header.dart +++ b/lib/src/screens/dashboard/widgets/button_header.dart @@ -62,14 +62,6 @@ class ButtonHeader extends SliverPersistentHeaderDelegate { route: Routes.exchange ) ), - Flexible( - child: actionButton( - context: context, - image: buyImage, - title: S.of(context).buy, - route: '' - ) - ) ], ), ), diff --git a/lib/src/stores/exchange/exchange_store.dart b/lib/src/stores/exchange/exchange_store.dart index 9ac6ef05c..fe7a32f16 100644 --- a/lib/src/stores/exchange/exchange_store.dart +++ b/lib/src/stores/exchange/exchange_store.dart @@ -33,8 +33,10 @@ abstract class ExchangeStoreBase with Store { provider = initialProvider; depositCurrency = initialDepositCurrency; receiveCurrency = initialReceiveCurrency; - isDepositAddressEnabled = !(depositCurrency == walletStore.type); - isReceiveAddressEnabled = !(receiveCurrency == walletStore.type); + /*isDepositAddressEnabled = !(depositCurrency == walletStore.type); + isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);*/ + isDepositAddressEnabled = true; + isReceiveAddressEnabled = true; depositAmount = ''; receiveAmount = ''; depositAddress = ''; @@ -107,16 +109,16 @@ abstract class ExchangeStoreBase with Store { void changeDepositCurrency({CryptoCurrency currency}) { depositCurrency = currency; _onPairChange(); - isDepositAddressEnabled = !(depositCurrency == walletStore.type); - isReceiveAddressEnabled = !(receiveCurrency == walletStore.type); + /*isDepositAddressEnabled = !(depositCurrency == walletStore.type); + isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);*/ } @action void changeReceiveCurrency({CryptoCurrency currency}) { receiveCurrency = currency; _onPairChange(); - isDepositAddressEnabled = !(depositCurrency == walletStore.type); - isReceiveAddressEnabled = !(receiveCurrency == walletStore.type); + /*isDepositAddressEnabled = !(depositCurrency == walletStore.type); + isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);*/ } @action @@ -240,8 +242,8 @@ abstract class ExchangeStoreBase with Store { receiveCurrency = CryptoCurrency.btc; depositAddress = depositCurrency == walletStore.type ? walletStore.address : ''; receiveAddress = receiveCurrency == walletStore.type ? walletStore.address : ''; - isDepositAddressEnabled = !(depositCurrency == walletStore.type); - isReceiveAddressEnabled = !(receiveCurrency == walletStore.type); + /*isDepositAddressEnabled = !(depositCurrency == walletStore.type); + isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);*/ _onPairChange(); } diff --git a/lib/themes.dart b/lib/themes.dart index b51f311a8..71776a516 100644 --- a/lib/themes.dart +++ b/lib/themes.dart @@ -28,7 +28,7 @@ class Themes { color: Palette.lavender // address field in the wallet card ), subhead: TextStyle( - color: Colors.white // send, exchange, buy buttons on dashboard page + color: Colors.white.withOpacity(0.5) // send, exchange, buy buttons on dashboard page ), headline: TextStyle( color: Palette.lightBlueGrey // historyPanelText diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb index 147a49dba..67b950f3f 100644 --- a/res/values/strings_de.arb +++ b/res/values/strings_de.arb @@ -130,7 +130,7 @@ "add_new_node" : "Neuen Knoten hinzufügen", - "use" : "Wechseln zu ", + "use" : "Verwenden Sie ", "digit_pin" : "-stelliger PIN", diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb index bbd4dd53e..1331b2590 100644 --- a/res/values/strings_en.arb +++ b/res/values/strings_en.arb @@ -130,7 +130,7 @@ "add_new_node" : "Add new node", - "use" : "Switch to ", + "use" : "Use ", "digit_pin" : "-digit PIN", diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb index c36c2bb4b..ad98663f5 100644 --- a/res/values/strings_es.arb +++ b/res/values/strings_es.arb @@ -130,7 +130,7 @@ "add_new_node" : "Agregar nuevo nodo", - "use" : "Cambiar a ", + "use" : "Utilizar a ", "digit_pin" : "-dígito PIN", diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb index 3ed5edec7..26120d830 100644 --- a/res/values/strings_hi.arb +++ b/res/values/strings_hi.arb @@ -130,7 +130,7 @@ "add_new_node" : "नया नोड जोड़ें", - "use" : "पर स्विच ", + "use" : "उपयोग ", "digit_pin" : "-अंक पिन", diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb index f11766e4f..235bd492a 100644 --- a/res/values/strings_ja.arb +++ b/res/values/strings_ja.arb @@ -130,7 +130,7 @@ "add_new_node" : "新しいノードを追加", - "use" : "切り替える ", + "use" : "使用する ", "digit_pin" : "桁ピン", diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb index cb559ccf4..f897addfb 100644 --- a/res/values/strings_ko.arb +++ b/res/values/strings_ko.arb @@ -130,7 +130,7 @@ "add_new_node" : "새 노드 추가", - "use" : "로 전환 ", + "use" : "사용하다 ", "digit_pin" : "숫자 PIN", diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb index 346365ee8..eecb0ba7f 100644 --- a/res/values/strings_nl.arb +++ b/res/values/strings_nl.arb @@ -130,7 +130,7 @@ "add_new_node" : "Voeg een nieuw knooppunt toe", - "use" : "Overschakelen naar ", + "use" : "Gebruik ", "digit_pin" : "-cijferige PIN", diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb index 9ba148c0a..66d2b69bb 100644 --- a/res/values/strings_pl.arb +++ b/res/values/strings_pl.arb @@ -130,7 +130,7 @@ "add_new_node" : "Dodaj nowy węzeł", - "use" : "Przełącz na ", + "use" : "Używać ", "digit_pin" : "-znak PIN", diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb index f2aa35201..9e8ac9a0a 100644 --- a/res/values/strings_pt.arb +++ b/res/values/strings_pt.arb @@ -130,7 +130,7 @@ "add_new_node" : "Adicionar novo nó", - "use" : "Trocar para PIN de ", + "use" : "Use PIN de ", "digit_pin" : "dígitos", diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb index b8833ff7a..73f5637c3 100644 --- a/res/values/strings_ru.arb +++ b/res/values/strings_ru.arb @@ -130,7 +130,7 @@ "add_new_node" : "Добавить новую ноду", - "use" : "Переключиться на ", + "use" : "Использовать ", "digit_pin" : "-значный PIN", diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb index f420442da..04fec4432 100644 --- a/res/values/strings_uk.arb +++ b/res/values/strings_uk.arb @@ -130,7 +130,7 @@ "add_new_node" : "Додати новий вузол", - "use" : "Переключитися на ", + "use" : "Використати ", "digit_pin" : "-значний PIN", diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb index 00f9c1ce9..f82ba4d13 100644 --- a/res/values/strings_zh.arb +++ b/res/values/strings_zh.arb @@ -130,7 +130,7 @@ "add_new_node" : "添加新節點", - "use" : "切換到 ", + "use" : "採用 ", "digit_pin" : "数字别针",