Merge pull request #116 from cake-tech/CAKE-104-add-description-for-exchange-provider-picker

Cake 104 add description for exchange provider picker
2024-09-29 09:51:10 +00:00 · 2020-10-06 14:42:05 +03:00 · 2020-10-06 14:42:05 +03:00 · 961e4203f1
commit 961e4203f1
parent 7aacfb55fa 17fa8bcf92
15 changed files with 84 additions and 12 deletions
--- a/lib/generated/i18n.dart
+++ b/lib/generated/i18n.dart
@ -123,6 +123,7 @@ class S implements WidgetsLocalizations {
  String get paste => "Paste";
  String get payment_id => "Payment ID: ";
  String get pending => " (pending)";
+  String get picker_description => "To choose ChangeNOW  or MorphToken, please change your trading pair first";
  String get pin_is_incorrect => "PIN is incorrect";
  String get placeholder_contacts => "Your contacts will be displayed here";
  String get placeholder_transactions => "Your transactions will be displayed here";
@ -711,6 +712,8 @@ class $de extends S {
  @override
  String get wallet_list_load_wallet => "Wallet einlegen";
  @override
+  String get picker_description => "Um ChangeNOW oder MorphToken zu wählen, ändern Sie bitte zuerst Ihr Handelspaar";
+  @override
  String get sending => "Senden";
  @override
  String get restore_restore_wallet => "Wallet wiederherstellen";
@ -1353,6 +1356,8 @@ class $hi extends S {
  @override
  String get wallet_list_load_wallet => "वॉलेट लोड करें";
  @override
+  String get picker_description => "ChangeNOW या MorphToken चुनने के लिए, कृपया अपनी ट्रेडिंग जोड़ी को पहले बदलें";
+  @override
  String get sending => "भेजना";
  @override
  String get restore_restore_wallet => "वॉलेट को पुनर्स्थापित करें";
@ -1995,6 +2000,8 @@ class $ru extends S {
  @override
  String get wallet_list_load_wallet => "Загрузка кошелька";
  @override
+  String get picker_description => "Чтобы выбрать ChangeNOW или MorphToken, сначала смените пару для обмена";
+  @override
  String get sending => "Отправка";
  @override
  String get restore_restore_wallet => "Восстановить кошелёк";
@ -2637,6 +2644,8 @@ class $ko extends S {
  @override
  String get wallet_list_load_wallet => "지갑로드";
  @override
+  String get picker_description => "ChangeNOW 또는 MorphToken을 선택하려면 먼저 거래 쌍을 변경하십시오.";
+  @override
  String get sending => "배상";
  @override
  String get restore_restore_wallet => "월렛 복원";
@ -3279,6 +3288,8 @@ class $pt extends S {
  @override
  String get wallet_list_load_wallet => "Abrir carteira";
  @override
+  String get picker_description => "Para escolher ChangeNOW ou MorphToken, altere primeiro o seu par de negociação";
+  @override
  String get sending => "Enviando";
  @override
  String get restore_restore_wallet => "Restaurar carteira";
@ -3921,6 +3932,8 @@ class $uk extends S {
  @override
  String get wallet_list_load_wallet => "Завантаження гаманця";
  @override
+  String get picker_description => "Щоб вибрати ChangeNOW або MorphToken, спочатку змініть пару для обміну";
+  @override
  String get sending => "Відправлення";
  @override
  String get restore_restore_wallet => "Відновити гаманець";
@ -4563,6 +4576,8 @@ class $ja extends S {
  @override
  String get wallet_list_load_wallet => "ウォレットをロード";
  @override
+  String get picker_description => "ChangeNOWまたはMorphTokenを選択するには、最初にトレーディングペアを変更してください";
+  @override
  String get sending => "送信";
  @override
  String get restore_restore_wallet => "ウォレットを復元";
@ -5209,6 +5224,8 @@ class $pl extends S {
  @override
  String get wallet_list_load_wallet => "Załaduj portfel";
  @override
+  String get picker_description => "Aby wybrać ChangeNOW lub MorphToken, najpierw zmień swoją parę handlową";
+  @override
  String get sending => "Wysyłanie";
  @override
  String get restore_restore_wallet => "Przywróć portfel";
@ -5851,6 +5868,8 @@ class $es extends S {
  @override
  String get wallet_list_load_wallet => "Billetera de carga";
  @override
+  String get picker_description => "Para elegir ChangeNOW o MorphToken, primero cambie su par comercial";
+  @override
  String get sending => "Enviando";
  @override
  String get restore_restore_wallet => "Recuperar Cartera";
@ -6493,6 +6512,8 @@ class $nl extends S {
  @override
  String get wallet_list_load_wallet => "Portemonnee laden";
  @override
+  String get picker_description => "Om ChangeNOW of MorphToken te kiezen, moet u eerst uw handelspaar wijzigen";
+  @override
  String get sending => "Bezig met verzenden";
  @override
  String get restore_restore_wallet => "Portemonnee herstellen";
@ -7135,6 +7156,8 @@ class $zh extends S {
  @override
  String get wallet_list_load_wallet => "装入钱包";
  @override
+  String get picker_description => "要選擇ChangeNOW或MorphToken，請先更改您的交易對";
+  @override
  String get sending => "正在发送";
  @override
  String get restore_restore_wallet => "恢复钱包";
--- a/lib/src/screens/exchange/widgets/present_provider_picker.dart
+++ b/lib/src/screens/exchange/widgets/present_provider_picker.dart
@ -58,11 +58,13 @@ class PresentProviderPicker extends StatelessWidget {
    final items = exchangeViewModel.providersForCurrentPair();
    final selectedItem = items.indexOf(exchangeViewModel.provider);
    final images = <Image>[];
+    String description;

    for (var provider in items) {
      switch (provider.description) {
        case ExchangeProviderDescription.xmrto:
          images.add(Image.asset('assets/images/xmr_btc.png'));
+          description = S.of(context).picker_description;
          break;
        case ExchangeProviderDescription.changeNow:
          images.add(Image.asset('assets/images/change_now.png'));
@ -79,6 +81,7 @@ class PresentProviderPicker extends StatelessWidget {
            images: images,
            selectedAtIndex: selectedItem,
            title: S.of(context).change_exchange_provider,
+            description: description,
            onItemSelected: (ExchangeProvider provider) =>
                exchangeViewModel.changeProvider(provider: provider)),
        context: context);
--- a/lib/src/widgets/picker.dart
+++ b/lib/src/widgets/picker.dart
@ -12,6 +12,7 @@ class Picker<Item extends Object> extends StatefulWidget {
    @required this.items,
    this.images,
    @required this.title,
+    this.description,
    @required this.onItemSelected,
    this.mainAxisAlignment = MainAxisAlignment.start,
    this.isAlwaysShowScrollThumb = false
@ -21,6 +22,7 @@ class Picker<Item extends Object> extends StatefulWidget {
  final List<Item> items;
  final List<Image> images;
  final String title;
+  final String description;
  final Function(Item) onItemSelected;
  final MainAxisAlignment mainAxisAlignment;
  final bool isAlwaysShowScrollThumb;
@ -145,6 +147,26 @@ class PickerState<Item> extends State<Picker> {
                                  );
                                },
                              ),
+                              ((widget.description != null)
+                                  &&(widget.description.isNotEmpty))
+                              ? Positioned(
+                                bottom: 24,
+                                left: 24,
+                                right: 24,
+                                child: Text(
+                                  widget.description,
+                                  textAlign: TextAlign.center,
+                                  style: TextStyle(
+                                    fontSize: 12,
+                                    fontWeight: FontWeight.w500,
+                                    fontFamily: 'Poppins',
+                                    decoration: TextDecoration.none,
+                                    color: Theme.of(context).primaryTextTheme
+                                        .title.color
+                                  ),
+                                )
+                              )
+                              : Offstage(),
                              widget.isAlwaysShowScrollThumb
                                  ? CakeScrollbar(
                                  backgroundHeight: backgroundHeight,
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@ -389,5 +389,7 @@

  "template" : "Vorlage",
  "confirm_delete_template" : "Diese Aktion löscht diese Vorlage. Möchten Sie fortfahren?",
-  "confirm_delete_wallet" : "Diese Aktion löscht diese Brieftasche. Möchten Sie fortfahren?"
+  "confirm_delete_wallet" : "Diese Aktion löscht diese Brieftasche. Möchten Sie fortfahren?",
+
+  "picker_description" : "Um ChangeNOW oder MorphToken zu wählen, ändern Sie bitte zuerst Ihr Handelspaar"
 }
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@ -389,5 +389,7 @@

  "template" : "Template",
  "confirm_delete_template" : "This action will delete this template. Do you wish to continue?",
-  "confirm_delete_wallet" : "This action will delete this wallet. Do you wish to continue?"
+  "confirm_delete_wallet" : "This action will delete this wallet. Do you wish to continue?",
+
+  "picker_description" : "To choose ChangeNOW  or MorphToken, please change your trading pair first"
 }
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@ -389,5 +389,7 @@

  "template" : "Plantilla",
  "confirm_delete_template" : "Esta acción eliminará esta plantilla. ¿Desea continuar?",
-  "confirm_delete_wallet" : "Esta acción eliminará esta billetera. ¿Desea continuar?"
+  "confirm_delete_wallet" : "Esta acción eliminará esta billetera. ¿Desea continuar?",
+
+  "picker_description" : "Para elegir ChangeNOW o MorphToken, primero cambie su par comercial"
 }
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@ -389,5 +389,7 @@

  "template" : "खाका",
  "confirm_delete_template" : "यह क्रिया इस टेम्पलेट को हटा देगी। क्या आप जारी रखना चाहते हैं?",
-  "confirm_delete_wallet" : "यह क्रिया इस वॉलेट को हटा देगी। क्या आप जारी रखना चाहते हैं?"
+  "confirm_delete_wallet" : "यह क्रिया इस वॉलेट को हटा देगी। क्या आप जारी रखना चाहते हैं?",
+
+  "picker_description" : "ChangeNOW या MorphToken चुनने के लिए, कृपया अपनी ट्रेडिंग जोड़ी को पहले बदलें"
 }
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@ -389,5 +389,7 @@

  "template" : "テンプレート",
  "confirm_delete_template" : "この操作により、このテンプレートが削除されます。 続行しますか？",
-  "confirm_delete_wallet" : "このアクションにより、このウォレットが削除されます。 続行しますか？"
+  "confirm_delete_wallet" : "このアクションにより、このウォレットが削除されます。 続行しますか？",
+
+  "picker_description" : "ChangeNOWまたはMorphTokenを選択するには、最初にトレーディングペアを変更してください"
 }
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@ -389,5 +389,7 @@

  "template" : "주형",
  "confirm_delete_template" : "이 작업은이 템플릿을 삭제합니다. 계속 하시겠습니까?",
-  "confirm_delete_wallet" : "이 작업은이 지갑을 삭제합니다. 계속 하시겠습니까?"
+  "confirm_delete_wallet" : "이 작업은이 지갑을 삭제합니다. 계속 하시겠습니까?",
+
+  "picker_description" : "ChangeNOW 또는 MorphToken을 선택하려면 먼저 거래 쌍을 변경하십시오."
 }
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@ -389,5 +389,7 @@

  "template" : "Sjabloon",
  "confirm_delete_template" : "Met deze actie wordt deze sjabloon verwijderd. Wilt u doorgaan?",
-  "confirm_delete_wallet" : "Met deze actie wordt deze portemonnee verwijderd. Wilt u doorgaan?"
+  "confirm_delete_wallet" : "Met deze actie wordt deze portemonnee verwijderd. Wilt u doorgaan?",
+
+  "picker_description" : "Om ChangeNOW of MorphToken te kiezen, moet u eerst uw handelspaar wijzigen"
 }
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@ -389,5 +389,7 @@

  "template" : "Szablon",
  "confirm_delete_template" : "Ta czynność usunie ten szablon. Czy chcesz kontynuować?",
-  "confirm_delete_wallet" : "Ta czynność usunie ten portfel. Czy chcesz kontynuować?"
+  "confirm_delete_wallet" : "Ta czynność usunie ten portfel. Czy chcesz kontynuować?",
+
+  "picker_description" : "Aby wybrać ChangeNOW lub MorphToken, najpierw zmień swoją parę handlową"
 }
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@ -389,5 +389,7 @@

  "template" : "Modelo",
  "confirm_delete_template" : "Esta ação excluirá este modelo. Você deseja continuar?",
-  "confirm_delete_wallet" : "Esta ação excluirá esta carteira. Você deseja continuar?"
+  "confirm_delete_wallet" : "Esta ação excluirá esta carteira. Você deseja continuar?",
+
+  "picker_description" : "Para escolher ChangeNOW ou MorphToken, altere primeiro o seu par de negociação"
 }
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@ -389,5 +389,7 @@

  "template" : "Шаблон",
  "confirm_delete_template" : "Это действие удалит шаблон. Вы хотите продолжить?",
-  "confirm_delete_wallet" : "Это действие удалит кошелек. Вы хотите продолжить?"
+  "confirm_delete_wallet" : "Это действие удалит кошелек. Вы хотите продолжить?",
+
+  "picker_description" : "Чтобы выбрать ChangeNOW или MorphToken, сначала смените пару для обмена"
 }
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@ -389,5 +389,7 @@

  "template" : "Шаблон",
  "confirm_delete_template" : "Ця дія видалить шаблон. Ви хочете продовжити?",
-  "confirm_delete_wallet" : "Ця дія видалить гаманець. Ви хочете продовжити?"
+  "confirm_delete_wallet" : "Ця дія видалить гаманець. Ви хочете продовжити?",
+
+  "picker_description" : "Щоб вибрати ChangeNOW або MorphToken, спочатку змініть пару для обміну"
 }
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@ -389,5 +389,7 @@

  "template" : "模板",
  "confirm_delete_template" : "此操作將刪除此模板。 你想繼續嗎？",
-  "confirm_delete_wallet" : "此操作將刪除此錢包。 你想繼續嗎？"
+  "confirm_delete_wallet" : "此操作將刪除此錢包。 你想繼續嗎？",
+
+  "picker_description" : "要選擇ChangeNOW或MorphToken，請先更改您的交易對"
 }