From 41dd48e80c7e667cfa8f77892fcd564ea510efbe Mon Sep 17 00:00:00 2001 From: Oleksandr Sobol Date: Mon, 2 Mar 2020 20:11:27 +0200 Subject: [PATCH] CWA-175 | created seed language picker, added seed language picker to the new wallet page, added decoration to seed language button, translated seed languages --- lib/generated/i18n.dart | 184 ++++++++++++++++++ lib/router.dart | 2 +- .../screens/new_wallet/new_wallet_page.dart | 16 +- .../seed_language/seed_language_page.dart | 23 +-- .../widgets/seed_language_picker.dart | 55 ++++++ .../screens/wallet_list/wallet_list_page.dart | 7 +- .../seed_language/seed_language_store.dart | 3 +- res/values/strings_de.arb | 8 + res/values/strings_en.arb | 8 + res/values/strings_es.arb | 8 + res/values/strings_hi.arb | 8 + res/values/strings_ja.arb | 8 + res/values/strings_ko.arb | 8 + res/values/strings_nl.arb | 8 + res/values/strings_pl.arb | 8 + res/values/strings_pt.arb | 8 + res/values/strings_ru.arb | 8 + res/values/strings_uk.arb | 8 + res/values/strings_zh.arb | 8 + 19 files changed, 351 insertions(+), 35 deletions(-) create mode 100644 lib/src/screens/seed_language/widgets/seed_language_picker.dart diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart index ef7f2e962..e10897aca 100644 --- a/lib/generated/i18n.dart +++ b/lib/generated/i18n.dart @@ -144,8 +144,16 @@ class S implements WidgetsLocalizations { String get restore_wallet_restore_description => "Wallet restore description"; String get save => "Save"; String get saved_the_trade_id => "I've saved the trade ID"; + String get seed_language_chinese => "Chinese"; String get seed_language_choose => "Please choose seed language"; + String get seed_language_dutch => "Dutch"; + String get seed_language_english => "English"; + String get seed_language_german => "German"; + String get seed_language_japanese => "Japanese"; String get seed_language_next => "Next"; + String get seed_language_portuguese => "Portuguese"; + String get seed_language_russian => "Russian"; + String get seed_language_spanish => "Spanish"; String get seed_share => "Share seed"; String get seed_title => "Seed"; String get send => "Send"; @@ -354,6 +362,8 @@ class $de extends S { @override String get wallet_list_create_new_wallet => "Neue Wallet erstellen"; @override + String get seed_language_portuguese => "Portugiesisch"; + @override String get setup_pin => "PIN einrichten"; @override String get transaction_details_recipient_address => "Empfängeradresse"; @@ -416,8 +426,12 @@ class $de extends S { @override String get trade_details_provider => "Anbieter"; @override + String get seed_language_japanese => "Japanisch"; + @override String get you_will_send => "Du wirst senden"; @override + String get seed_language_german => "Deutsche"; + @override String get create_new => "Erstelle neu"; @override String get trade_details_fetching => "Holen"; @@ -430,6 +444,8 @@ class $de extends S { @override String get wallet_restoration_store_incorrect_seed_length => "Falsche Samenlänge"; @override + String get seed_language_spanish => "Spanisch"; + @override String get contact => "Kontakt"; @override String get openalias_alert_title => "XMR-Empfänger erkannt"; @@ -522,6 +538,8 @@ class $de extends S { @override String get widgets_restore_from_blockheight => "Aus Blockhöhe wiederherstellen"; @override + String get seed_language_chinese => "Chinesisch"; + @override String get new_subaddress_label_name => "Markenname"; @override String get trade_not_found => "Handel nicht gefunden."; @@ -600,6 +618,8 @@ class $de extends S { @override String get save => "speichern"; @override + String get seed_language_english => "Englisch"; + @override String get login => "Einloggen"; @override String get wallet_list_load_wallet => "Wallet einlegen"; @@ -608,6 +628,8 @@ class $de extends S { @override String get restore_restore_wallet => "Wallet wiederherstellen"; @override + String get seed_language_dutch => "Niederländisch"; + @override String get restore_description_from_seed_keys => "Holen Sie sich Ihr Wallet von Seed / Schlüsseln zurück, die Sie an einem sicheren Ort aufbewahrt haben"; @override String get copy => "Kopieren"; @@ -662,6 +684,8 @@ class $de extends S { @override String get trade_details_state => "Zustand"; @override + String get seed_language_russian => "Russisch"; + @override String get spend_key_private => "Schlüssel ausgeben (geheim)"; @override String get settings_only_trades => "Nur Trades"; @@ -906,6 +930,8 @@ class $hi extends S { @override String get wallet_list_create_new_wallet => "नया बटुआ बनाएँ"; @override + String get seed_language_portuguese => "पुर्तगाली"; + @override String get setup_pin => "पिन सेट करें"; @override String get transaction_details_recipient_address => "प्राप्तकर्ता का पता"; @@ -968,8 +994,12 @@ class $hi extends S { @override String get trade_details_provider => "प्रदाता"; @override + String get seed_language_japanese => "जापानी"; + @override String get you_will_send => "तुम भेजोगे"; @override + String get seed_language_german => "जर्मन"; + @override String get create_new => "नया बनाओ"; @override String get trade_details_fetching => "ला रहा है"; @@ -982,6 +1012,8 @@ class $hi extends S { @override String get wallet_restoration_store_incorrect_seed_length => "गलत बीज की लंबाई"; @override + String get seed_language_spanish => "स्पेनिश"; + @override String get contact => "संपर्क करें"; @override String get openalias_alert_title => "XMR प्राप्तकर्ता का पता लगाया"; @@ -1074,6 +1106,8 @@ class $hi extends S { @override String get widgets_restore_from_blockheight => "ब्लॉकचेन से पुनर्स्थापित करें"; @override + String get seed_language_chinese => "चीनी"; + @override String get new_subaddress_label_name => "लेबल का नाम"; @override String get trade_not_found => "व्यापार नहीं मिला"; @@ -1152,6 +1186,8 @@ class $hi extends S { @override String get save => "बचाना"; @override + String get seed_language_english => "अंग्रेज़ी"; + @override String get login => "लॉग इन करें"; @override String get wallet_list_load_wallet => "वॉलेट लोड करें"; @@ -1160,6 +1196,8 @@ class $hi extends S { @override String get restore_restore_wallet => "वॉलेट को पुनर्स्थापित करें"; @override + String get seed_language_dutch => "डच"; + @override String get restore_description_from_seed_keys => "अपने बटुए को बीज से वापस लें/वे कुंजियाँ जिन्हें आपने सुरक्षित स्थान पर सहेजा है"; @override String get copy => "प्रतिलिपि"; @@ -1214,6 +1252,8 @@ class $hi extends S { @override String get trade_details_state => "राज्य"; @override + String get seed_language_russian => "रूसी"; + @override String get spend_key_private => "खर्च करना (निजी)"; @override String get settings_only_trades => "केवल ट्रेड करता है"; @@ -1458,6 +1498,8 @@ class $ru extends S { @override String get wallet_list_create_new_wallet => "Создать новый кошелёк"; @override + String get seed_language_portuguese => "Португальский"; + @override String get setup_pin => "Настроить PIN"; @override String get transaction_details_recipient_address => "Адрес получателя"; @@ -1520,8 +1562,12 @@ class $ru extends S { @override String get trade_details_provider => "Провайдер"; @override + String get seed_language_japanese => "Японский"; + @override String get you_will_send => "Вы отправите"; @override + String get seed_language_german => "Немецкий"; + @override String get create_new => "Создать новый"; @override String get trade_details_fetching => "Получение"; @@ -1534,6 +1580,8 @@ class $ru extends S { @override String get wallet_restoration_store_incorrect_seed_length => "Неверная длина мнемонической фразы"; @override + String get seed_language_spanish => "Испанский"; + @override String get contact => "Контакт"; @override String get openalias_alert_title => "Получатель XMR обнаружен"; @@ -1626,6 +1674,8 @@ class $ru extends S { @override String get widgets_restore_from_blockheight => "Восстановить на высоте блока"; @override + String get seed_language_chinese => "Китайский"; + @override String get new_subaddress_label_name => "Имя"; @override String get trade_not_found => "Trade not found."; @@ -1704,6 +1754,8 @@ class $ru extends S { @override String get save => "Сохранить"; @override + String get seed_language_english => "Английский"; + @override String get login => "Логин"; @override String get wallet_list_load_wallet => "Загрузка кошелька"; @@ -1712,6 +1764,8 @@ class $ru extends S { @override String get restore_restore_wallet => "Восстановить кошелёк"; @override + String get seed_language_dutch => "Нидерландский"; + @override String get restore_description_from_seed_keys => "Вы можете восстановить кошелёк из мнемонической фразы/ключей, которые вы сохранили ранее"; @override String get copy => "Скопировать"; @@ -1766,6 +1820,8 @@ class $ru extends S { @override String get trade_details_state => "Статус"; @override + String get seed_language_russian => "Русский"; + @override String get spend_key_private => "Приватный ключ траты"; @override String get settings_only_trades => "Сделки"; @@ -2010,6 +2066,8 @@ class $ko extends S { @override String get wallet_list_create_new_wallet => "새 월렛 만들기"; @override + String get seed_language_portuguese => "포르투갈 인"; + @override String get setup_pin => "설정 PIN"; @override String get transaction_details_recipient_address => "받는 사람 주소"; @@ -2072,8 +2130,12 @@ class $ko extends S { @override String get trade_details_provider => "공급자"; @override + String get seed_language_japanese => "일본어"; + @override String get you_will_send => "보내드립니다"; @override + String get seed_language_german => "독일 사람"; + @override String get create_new => "새로 만들기"; @override String get trade_details_fetching => "가져 오는 중"; @@ -2086,6 +2148,8 @@ class $ko extends S { @override String get wallet_restoration_store_incorrect_seed_length => "시드 길이가 잘못되었습니다"; @override + String get seed_language_spanish => "스페인의"; + @override String get contact => "접촉"; @override String get openalias_alert_title => "XMR 수신자 감지"; @@ -2178,6 +2242,8 @@ class $ko extends S { @override String get widgets_restore_from_blockheight => "블록 높이에서 복원"; @override + String get seed_language_chinese => "중국말"; + @override String get new_subaddress_label_name => "라벨 이름"; @override String get trade_not_found => "거래를 찾을 수 없습니다."; @@ -2256,6 +2322,8 @@ class $ko extends S { @override String get save => "구하다"; @override + String get seed_language_english => "영어"; + @override String get login => "로그인"; @override String get wallet_list_load_wallet => "지갑로드"; @@ -2264,6 +2332,8 @@ class $ko extends S { @override String get restore_restore_wallet => "월렛 복원"; @override + String get seed_language_dutch => "네덜란드 사람"; + @override String get restore_description_from_seed_keys => "안전한 장소에 저장 한 종자 / 키로 지갑을 되 찾으십시오."; @override String get copy => "부"; @@ -2318,6 +2388,8 @@ class $ko extends S { @override String get trade_details_state => "상태"; @override + String get seed_language_russian => "러시아인"; + @override String get spend_key_private => "지출 키 (은밀한)"; @override String get settings_only_trades => "거래 만"; @@ -2562,6 +2634,8 @@ class $pt extends S { @override String get wallet_list_create_new_wallet => "Criar nova carteira"; @override + String get seed_language_portuguese => "Português"; + @override String get setup_pin => "Configurar PIN"; @override String get transaction_details_recipient_address => "Endereço do destinatário"; @@ -2624,8 +2698,12 @@ class $pt extends S { @override String get trade_details_provider => "Provedor"; @override + String get seed_language_japanese => "Japonês"; + @override String get you_will_send => "Você enviará"; @override + String get seed_language_german => "Alemã"; + @override String get create_new => "Criar carteira"; @override String get trade_details_fetching => "Buscando"; @@ -2638,6 +2716,8 @@ class $pt extends S { @override String get wallet_restoration_store_incorrect_seed_length => "Comprimento de semente incorreto"; @override + String get seed_language_spanish => "Espanhola"; + @override String get contact => "Contato"; @override String get openalias_alert_title => "Destinatário XMR detectado"; @@ -2730,6 +2810,8 @@ class $pt extends S { @override String get widgets_restore_from_blockheight => "Restaurar a partir de altura do bloco"; @override + String get seed_language_chinese => "Chinesa"; + @override String get new_subaddress_label_name => "Nome"; @override String get trade_not_found => "Troca não encontrada."; @@ -2808,6 +2890,8 @@ class $pt extends S { @override String get save => "Salvar"; @override + String get seed_language_english => "Inglesa"; + @override String get login => "Login"; @override String get wallet_list_load_wallet => "Abrir carteira"; @@ -2816,6 +2900,8 @@ class $pt extends S { @override String get restore_restore_wallet => "Restaurar carteira"; @override + String get seed_language_dutch => "Holandesa"; + @override String get restore_description_from_seed_keys => "Restaure a sua carteira a partir de sementes/chaves que você salvou em um local seguro"; @override String get copy => "Copiar"; @@ -2870,6 +2956,8 @@ class $pt extends S { @override String get trade_details_state => "Status"; @override + String get seed_language_russian => "Russa"; + @override String get spend_key_private => "Chave de gastos (privada)"; @override String get settings_only_trades => "Somente trocas"; @@ -3114,6 +3202,8 @@ class $uk extends S { @override String get wallet_list_create_new_wallet => "Створити новий гаманець"; @override + String get seed_language_portuguese => "Португальська"; + @override String get setup_pin => "Встановити PIN"; @override String get transaction_details_recipient_address => "Адреса отримувача"; @@ -3176,8 +3266,12 @@ class $uk extends S { @override String get trade_details_provider => "Провайдер"; @override + String get seed_language_japanese => "Японська"; + @override String get you_will_send => "Ви відправите"; @override + String get seed_language_german => "Німецька"; + @override String get create_new => "Створити новий"; @override String get trade_details_fetching => "Отримання"; @@ -3190,6 +3284,8 @@ class $uk extends S { @override String get wallet_restoration_store_incorrect_seed_length => "Невірна довжина мнемонічної фрази"; @override + String get seed_language_spanish => "Іспанська"; + @override String get contact => "Контакт"; @override String get openalias_alert_title => "Отримувача XMR виявлено"; @@ -3282,6 +3378,8 @@ class $uk extends S { @override String get widgets_restore_from_blockheight => "Відновити на висоті блоку"; @override + String get seed_language_chinese => "Китайська"; + @override String get new_subaddress_label_name => "Ім'я"; @override String get trade_not_found => "Операція не знайдена."; @@ -3360,6 +3458,8 @@ class $uk extends S { @override String get save => "Зберегти"; @override + String get seed_language_english => "Англійська"; + @override String get login => "Логін"; @override String get wallet_list_load_wallet => "Завантаження гаманця"; @@ -3368,6 +3468,8 @@ class $uk extends S { @override String get restore_restore_wallet => "Відновити гаманець"; @override + String get seed_language_dutch => "Голландська"; + @override String get restore_description_from_seed_keys => "Ви можете відновити гаманець з мнемонічної фрази/ключів, які ви зберегли раніше"; @override String get copy => "Скопіювати"; @@ -3422,6 +3524,8 @@ class $uk extends S { @override String get trade_details_state => "Статус"; @override + String get seed_language_russian => "Російська"; + @override String get spend_key_private => "Приватний ключ витрати"; @override String get settings_only_trades => "Операції"; @@ -3666,6 +3770,8 @@ class $ja extends S { @override String get wallet_list_create_new_wallet => "新しいウォレットを作成"; @override + String get seed_language_portuguese => "ポルトガル語"; + @override String get setup_pin => "PINのセットアップ"; @override String get transaction_details_recipient_address => "受取人の住所"; @@ -3728,8 +3834,12 @@ class $ja extends S { @override String get trade_details_provider => "プロバイダー"; @override + String get seed_language_japanese => "日本語"; + @override String get you_will_send => "送ります"; @override + String get seed_language_german => "ドイツ人"; + @override String get create_new => "新しく作る"; @override String get trade_details_fetching => "フェッチング"; @@ -3742,6 +3852,8 @@ class $ja extends S { @override String get wallet_restoration_store_incorrect_seed_length => "誤ったシード長s"; @override + String get seed_language_spanish => "スペイン語"; + @override String get contact => "接触"; @override String get openalias_alert_title => "XMR受信者が検出されました"; @@ -3834,6 +3946,8 @@ class $ja extends S { @override String get widgets_restore_from_blockheight => "ブロックの高さから復元"; @override + String get seed_language_chinese => "中国語"; + @override String get new_subaddress_label_name => "ラベル名"; @override String get trade_not_found => "取引が見つかりません"; @@ -3912,6 +4026,8 @@ class $ja extends S { @override String get save => "セーブ"; @override + String get seed_language_english => "英語"; + @override String get login => "ログイン"; @override String get wallet_list_load_wallet => "ウォレットをロード"; @@ -3920,6 +4036,8 @@ class $ja extends S { @override String get restore_restore_wallet => "ウォレットを復元"; @override + String get seed_language_dutch => "オランダの"; + @override String get restore_description_from_seed_keys => "安全な場所に保存したシード/キーから財布を取り戻す"; @override String get copy => "コピー"; @@ -3974,6 +4092,8 @@ class $ja extends S { @override String get trade_details_state => "状態"; @override + String get seed_language_russian => "ロシア"; + @override String get spend_key_private => "キーを使う (プライベート)"; @override String get settings_only_trades => "取引のみ"; @@ -4222,6 +4342,8 @@ class $pl extends S { @override String get wallet_list_create_new_wallet => "Utwórz nowy portfel"; @override + String get seed_language_portuguese => "Portugalski"; + @override String get setup_pin => "Ustaw PIN"; @override String get transaction_details_recipient_address => "Adres odbiorcy"; @@ -4284,8 +4406,12 @@ class $pl extends S { @override String get trade_details_provider => "Dostawca"; @override + String get seed_language_japanese => "Japoński"; + @override String get you_will_send => "Wyślesz"; @override + String get seed_language_german => "Niemiecki"; + @override String get create_new => "Tworzyć nowe"; @override String get trade_details_fetching => "Ujmujący"; @@ -4298,6 +4424,8 @@ class $pl extends S { @override String get wallet_restoration_store_incorrect_seed_length => "Nieprawidłowa długość nasion"; @override + String get seed_language_spanish => "Hiszpański"; + @override String get contact => "Kontakt"; @override String get openalias_alert_title => "Wykryto odbiorcę XMR"; @@ -4390,6 +4518,8 @@ class $pl extends S { @override String get widgets_restore_from_blockheight => "Przywróć z wysokości bloku"; @override + String get seed_language_chinese => "Chiński"; + @override String get new_subaddress_label_name => "Nazwa etykiety"; @override String get trade_not_found => "Nie znaleziono handlu."; @@ -4468,6 +4598,8 @@ class $pl extends S { @override String get save => "Zapisać"; @override + String get seed_language_english => "Angielski"; + @override String get login => "Zaloguj Się"; @override String get wallet_list_load_wallet => "Załaduj portfel"; @@ -4476,6 +4608,8 @@ class $pl extends S { @override String get restore_restore_wallet => "Przywróć portfel"; @override + String get seed_language_dutch => "Holenderski"; + @override String get restore_description_from_seed_keys => "Odzyskaj swój portfel z nasion / kluczy, które zapisałeś w bezpiecznym miejscu"; @override String get copy => "Kopiuj"; @@ -4530,6 +4664,8 @@ class $pl extends S { @override String get trade_details_state => "Stan"; @override + String get seed_language_russian => "Rosyjski"; + @override String get spend_key_private => "Wydaj klucz (prywatny)"; @override String get settings_only_trades => "Tylko transakcje"; @@ -4774,6 +4910,8 @@ class $es extends S { @override String get wallet_list_create_new_wallet => "Crear nueva billetera"; @override + String get seed_language_portuguese => "Portugués"; + @override String get setup_pin => "PIN de configuración"; @override String get transaction_details_recipient_address => "Dirección del receptor"; @@ -4836,8 +4974,12 @@ class $es extends S { @override String get trade_details_provider => "Proveedor"; @override + String get seed_language_japanese => "Japonés"; + @override String get you_will_send => "Enviarás"; @override + String get seed_language_german => "Alemán"; + @override String get create_new => "Crear nuevo"; @override String get trade_details_fetching => "Cargando"; @@ -4850,6 +4992,8 @@ class $es extends S { @override String get wallet_restoration_store_incorrect_seed_length => "Longitud de semilla incorrecta"; @override + String get seed_language_spanish => "Español"; + @override String get contact => "Contacto"; @override String get openalias_alert_title => "Destinatario XMR detectado"; @@ -4942,6 +5086,8 @@ class $es extends S { @override String get widgets_restore_from_blockheight => "Restaurar desde blockheight"; @override + String get seed_language_chinese => "Chino"; + @override String get new_subaddress_label_name => "Nombre de etiqueta"; @override String get trade_not_found => "Comercio no encontrado."; @@ -5020,6 +5166,8 @@ class $es extends S { @override String get save => "Salvar"; @override + String get seed_language_english => "Inglés"; + @override String get login => "Iniciar sesión"; @override String get wallet_list_load_wallet => "Billetera de carga"; @@ -5028,6 +5176,8 @@ class $es extends S { @override String get restore_restore_wallet => "Recuperar Cartera"; @override + String get seed_language_dutch => "Holandés"; + @override String get restore_description_from_seed_keys => "Recupere su billetera de las semillas/claves que ha guardado en un lugar seguro"; @override String get copy => "Dupdo"; @@ -5082,6 +5232,8 @@ class $es extends S { @override String get trade_details_state => "Estado"; @override + String get seed_language_russian => "Ruso"; + @override String get spend_key_private => "Spend clave (privado)"; @override String get settings_only_trades => "Solo comercia"; @@ -5326,6 +5478,8 @@ class $nl extends S { @override String get wallet_list_create_new_wallet => "Maak een nieuwe portemonnee"; @override + String get seed_language_portuguese => "Portugees"; + @override String get setup_pin => "PIN instellen"; @override String get transaction_details_recipient_address => "Adres van de ontvanger"; @@ -5388,8 +5542,12 @@ class $nl extends S { @override String get trade_details_provider => "Leverancier"; @override + String get seed_language_japanese => "Japans"; + @override String get you_will_send => "Je zal versturen"; @override + String get seed_language_german => "Duitse"; + @override String get create_new => "Maak nieuw"; @override String get trade_details_fetching => "Ophalen"; @@ -5402,6 +5560,8 @@ class $nl extends S { @override String get wallet_restoration_store_incorrect_seed_length => "Onjuiste zaadlengte"; @override + String get seed_language_spanish => "Spaans"; + @override String get contact => "Contact"; @override String get openalias_alert_title => "XMR-ontvanger gedetecteerd"; @@ -5494,6 +5654,8 @@ class $nl extends S { @override String get widgets_restore_from_blockheight => "Herstel vanaf blockheight"; @override + String get seed_language_chinese => "Chinese"; + @override String get new_subaddress_label_name => "Label naam"; @override String get trade_not_found => "Handel niet gevonden."; @@ -5572,6 +5734,8 @@ class $nl extends S { @override String get save => "Opslaan"; @override + String get seed_language_english => "Engels"; + @override String get login => "Log in"; @override String get wallet_list_load_wallet => "Portemonnee laden"; @@ -5580,6 +5744,8 @@ class $nl extends S { @override String get restore_restore_wallet => "Portemonnee herstellen"; @override + String get seed_language_dutch => "Nederlands"; + @override String get restore_description_from_seed_keys => "Ontvang uw portemonnee terug uit seed / keys die u hebt opgeslagen op een veilige plaats"; @override String get copy => "Kopiëren"; @@ -5634,6 +5800,8 @@ class $nl extends S { @override String get trade_details_state => "Staat"; @override + String get seed_language_russian => "Russisch"; + @override String get spend_key_private => "Sleutel uitgeven (privaat)"; @override String get settings_only_trades => "Alleen handel"; @@ -5878,6 +6046,8 @@ class $zh extends S { @override String get wallet_list_create_new_wallet => "创建新钱包"; @override + String get seed_language_portuguese => "葡萄牙語"; + @override String get setup_pin => "设定PIN码"; @override String get transaction_details_recipient_address => "收件人地址"; @@ -5940,8 +6110,12 @@ class $zh extends S { @override String get trade_details_provider => "提供者"; @override + String get seed_language_japanese => "日本"; + @override String get you_will_send => "您将发送"; @override + String get seed_language_german => "德語"; + @override String get create_new => "创建新的"; @override String get trade_details_fetching => "正在取得"; @@ -5954,6 +6128,8 @@ class $zh extends S { @override String get wallet_restoration_store_incorrect_seed_length => "种子长度错误"; @override + String get seed_language_spanish => "西班牙文"; + @override String get contact => "联系"; @override String get openalias_alert_title => "檢測到XMR收件人"; @@ -6046,6 +6222,8 @@ class $zh extends S { @override String get widgets_restore_from_blockheight => "从块高还原"; @override + String get seed_language_chinese => "中文"; + @override String get new_subaddress_label_name => "标签名称"; @override String get trade_not_found => "找不到交易."; @@ -6124,6 +6302,8 @@ class $zh extends S { @override String get save => "保存"; @override + String get seed_language_english => "英語"; + @override String get login => "登录"; @override String get wallet_list_load_wallet => "装入钱包"; @@ -6132,6 +6312,8 @@ class $zh extends S { @override String get restore_restore_wallet => "恢复钱包"; @override + String get seed_language_dutch => "荷蘭人"; + @override String get restore_description_from_seed_keys => "从保存到安全地方的种子/钥匙取回钱包"; @override String get copy => "复制"; @@ -6186,6 +6368,8 @@ class $zh extends S { @override String get trade_details_state => "条件"; @override + String get seed_language_russian => "俄語"; + @override String get spend_key_private => "支出金钥 (私人的)"; @override String get settings_only_trades => "只交易"; diff --git a/lib/router.dart b/lib/router.dart index a9f35f255..d3d6c74ca 100644 --- a/lib/router.dart +++ b/lib/router.dart @@ -117,7 +117,7 @@ class Router { sharedPreferences: sharedPreferences)), child: SetupPinCodePage( onPinCodeSetup: (context, _) => - Navigator.pushNamed(context, Routes.seedLanguage)))); + Navigator.pushNamed(context, Routes.newWallet)))); case Routes.newWallet: return CupertinoPageRoute( diff --git a/lib/src/screens/new_wallet/new_wallet_page.dart b/lib/src/screens/new_wallet/new_wallet_page.dart index b62c76929..d38bfb83b 100644 --- a/lib/src/screens/new_wallet/new_wallet_page.dart +++ b/lib/src/screens/new_wallet/new_wallet_page.dart @@ -14,6 +14,7 @@ import 'package:cake_wallet/src/widgets/primary_button.dart'; import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart'; import 'package:cake_wallet/palette.dart'; import 'package:cake_wallet/src/stores/seed_language/seed_language_store.dart'; +import 'package:cake_wallet/src/screens/seed_language/widgets/seed_language_picker.dart'; class NewWalletPage extends BasePage { NewWalletPage( @@ -72,11 +73,6 @@ class _WalletNameFormState extends State { return ScrollableWithBottomSection( content: Column(children: [ - Padding( - padding: EdgeInsets.only(bottom: 10), - child: Image.asset('assets/images/bitmap.png', - height: 224, width: 400), - ), Padding( padding: EdgeInsets.only(left: 20, right: 20, bottom: 20), child: Form( @@ -102,6 +98,16 @@ class _WalletNameFormState extends State { return walletCreationStore.errorMessage; }, )), + ), + Padding(padding: EdgeInsets.only(bottom: 20), + child: Text( + S.of(context).seed_language_choose, + textAlign: TextAlign.center, + style: TextStyle(fontSize: 19.0), + ), + ), + Padding(padding: EdgeInsets.only(left: 20, right: 20, bottom: 20), + child: SeedLanguagePicker(), ) ]), bottomSection: Observer( diff --git a/lib/src/screens/seed_language/seed_language_page.dart b/lib/src/screens/seed_language/seed_language_page.dart index c91e9fa24..a40a0a612 100644 --- a/lib/src/screens/seed_language/seed_language_page.dart +++ b/lib/src/screens/seed_language/seed_language_page.dart @@ -1,13 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; -import 'package:cake_wallet/palette.dart'; import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/src/widgets/primary_button.dart'; import 'package:cake_wallet/src/screens/base_page.dart'; -import 'package:flutter_mobx/flutter_mobx.dart'; +import 'package:cake_wallet/src/screens/seed_language/widgets/seed_language_picker.dart'; import 'package:provider/provider.dart'; import 'package:cake_wallet/src/stores/seed_language/seed_language_store.dart'; -import 'package:cake_wallet/src/widgets/present_picker.dart'; class SeedLanguage extends BasePage { final imageSeed = Image.asset('assets/images/seedIco.png'); @@ -34,14 +32,7 @@ class SeedLanguage extends BasePage { SizedBox( height: 20.0, ), - Observer( - builder: (_) => InkWell( - onTap: () => _setSeedLanguage(context), - child: Text(seedLanguageStore.selectedSeedLanguage, - textAlign: TextAlign.center, - style: TextStyle(fontSize: 19.0, color: Palette.lightBlue), - ), - )), + SeedLanguagePicker(), ], ), ), @@ -58,14 +49,4 @@ class SeedLanguage extends BasePage { ), ); } - - Future _setSeedLanguage(BuildContext context) async { - final seedLanguageStore = Provider.of(context); - final selectedSeedLanguage = - await presentPicker(context, seedLanguages); - - if (selectedSeedLanguage != null) { - seedLanguageStore.setSelectedSeedLanguage(selectedSeedLanguage); - } - } } diff --git a/lib/src/screens/seed_language/widgets/seed_language_picker.dart b/lib/src/screens/seed_language/widgets/seed_language_picker.dart new file mode 100644 index 000000000..46011e110 --- /dev/null +++ b/lib/src/screens/seed_language/widgets/seed_language_picker.dart @@ -0,0 +1,55 @@ +import 'package:flutter/material.dart'; +import 'package:cake_wallet/palette.dart'; +import 'package:flutter_mobx/flutter_mobx.dart'; +import 'package:provider/provider.dart'; +import 'package:cake_wallet/src/stores/seed_language/seed_language_store.dart'; +import 'package:cake_wallet/src/widgets/present_picker.dart'; +import 'package:cake_wallet/generated/i18n.dart'; + +class SeedLanguagePicker extends StatelessWidget { + List seedLocales = [ + S.current.seed_language_english, + S.current.seed_language_chinese, + S.current.seed_language_dutch, + S.current.seed_language_german, + S.current.seed_language_japanese, + S.current.seed_language_portuguese, + S.current.seed_language_russian, + S.current.seed_language_spanish + ]; + + @override + Widget build(BuildContext context) { + final seedLanguageStore = Provider.of(context); + + return Observer( + builder: (_) => InkWell( + onTap: () => _setSeedLanguage(context), + child: Container( + padding: EdgeInsets.all(10.0), + width: double.infinity, + decoration: BoxDecoration( + border: Border.all( + color: Theme.of(context).dividerTheme.color + ), + borderRadius: BorderRadius.circular(10.0) + ), + child: Text(seedLocales[seedLanguages.indexOf(seedLanguageStore.selectedSeedLanguage)], + textAlign: TextAlign.center, + style: TextStyle(fontSize: 19.0, color: Palette.lightBlue), + ), + ), + )); + } + + Future _setSeedLanguage(BuildContext context) async { + final seedLanguageStore = Provider.of(context); + String selectedSeedLanguage = + await presentPicker(context, seedLocales); + + if (selectedSeedLanguage != null) { + selectedSeedLanguage = seedLanguages[seedLocales.indexOf(selectedSeedLanguage)]; + seedLanguageStore.setSelectedSeedLanguage(selectedSeedLanguage); + } + } +} \ No newline at end of file diff --git a/lib/src/screens/wallet_list/wallet_list_page.dart b/lib/src/screens/wallet_list/wallet_list_page.dart index eafbddf98..da41eb8de 100644 --- a/lib/src/screens/wallet_list/wallet_list_page.dart +++ b/lib/src/screens/wallet_list/wallet_list_page.dart @@ -12,7 +12,6 @@ import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart'; import 'package:cake_wallet/src/stores/wallet_list/wallet_list_store.dart'; import 'package:cake_wallet/src/screens/wallet_list/wallet_menu.dart'; import 'package:cake_wallet/src/widgets/picker.dart'; -import 'package:cake_wallet/src/stores/seed_language/seed_language_store.dart'; class WalletListPage extends BasePage { @override @@ -55,7 +54,6 @@ class WalletListBodyState extends State { @override Widget build(BuildContext context) { _walletListStore = Provider.of(context); - final seedLanguageStore = Provider.of(context); return ScrollableWithBottomSection( content: Container( @@ -102,10 +100,7 @@ class WalletListBodyState extends State { ), bottomSection: Column(children: [ PrimaryIconButton( - onPressed: () { - seedLanguageStore.setCurrentRoute(Routes.newWallet); - Navigator.of(context).pushNamed(Routes.seedLanguage); - }, + onPressed: () => Navigator.of(context).pushNamed(Routes.newWallet), iconData: Icons.add, color: Theme.of(context).primaryTextTheme.button.backgroundColor, borderColor: diff --git a/lib/src/stores/seed_language/seed_language_store.dart b/lib/src/stores/seed_language/seed_language_store.dart index c6d5fbcd4..efd304fa0 100644 --- a/lib/src/stores/seed_language/seed_language_store.dart +++ b/lib/src/stores/seed_language/seed_language_store.dart @@ -1,5 +1,4 @@ import 'package:mobx/mobx.dart'; -import 'package:cake_wallet/routes.dart'; part 'seed_language_store.g.dart'; @@ -19,7 +18,7 @@ class SeedLanguageStore = SeedLanguageStoreBase with _$SeedLanguageStore; abstract class SeedLanguageStoreBase with Store { SeedLanguageStoreBase() { selectedSeedLanguage = seedLanguages[0]; - currentRoute = Routes.newWallet; + currentRoute = ''; } @observable diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb index 108b1054d..d6fcf2ba5 100644 --- a/res/values/strings_de.arb +++ b/res/values/strings_de.arb @@ -159,6 +159,14 @@ "seed_language_choose" : "Bitte wählen Sie die Ausgangssprache", "seed_language_next" : "Nächster", + "seed_language_english" : "Englisch", + "seed_language_chinese" : "Chinesisch", + "seed_language_dutch" : "Niederländisch", + "seed_language_german" : "Deutsche", + "seed_language_japanese" : "Japanisch", + "seed_language_portuguese" : "Portugiesisch", + "seed_language_russian" : "Russisch", + "seed_language_spanish" : "Spanisch", "send_title" : "Senden Sie Monero", diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb index ab72ebb72..743490643 100644 --- a/res/values/strings_en.arb +++ b/res/values/strings_en.arb @@ -159,6 +159,14 @@ "seed_language_choose" : "Please choose seed language", "seed_language_next" : "Next", + "seed_language_english" : "English", + "seed_language_chinese" : "Chinese", + "seed_language_dutch" : "Dutch", + "seed_language_german" : "German", + "seed_language_japanese" : "Japanese", + "seed_language_portuguese" : "Portuguese", + "seed_language_russian" : "Russian", + "seed_language_spanish" : "Spanish", "send_title" : "Send Monero", diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb index 4a0a8a607..698e3aef7 100644 --- a/res/values/strings_es.arb +++ b/res/values/strings_es.arb @@ -159,6 +159,14 @@ "seed_language_choose" : "Por favor elija el idioma semilla", "seed_language_next" : "Próximo", + "seed_language_english" : "Inglés", + "seed_language_chinese" : "Chino", + "seed_language_dutch" : "Holandés", + "seed_language_german" : "Alemán", + "seed_language_japanese" : "Japonés", + "seed_language_portuguese" : "Portugués", + "seed_language_russian" : "Ruso", + "seed_language_spanish" : "Español", "send_title" : "Enviar Monero", diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb index 1148fb35d..6899fb70d 100644 --- a/res/values/strings_hi.arb +++ b/res/values/strings_hi.arb @@ -159,6 +159,14 @@ "seed_language_choose" : "कृपया बीज भाषा चुनें", "seed_language_next" : "आगामी", + "seed_language_english" : "अंग्रेज़ी", + "seed_language_chinese" : "चीनी", + "seed_language_dutch" : "डच", + "seed_language_german" : "जर्मन", + "seed_language_japanese" : "जापानी", + "seed_language_portuguese" : "पुर्तगाली", + "seed_language_russian" : "रूसी", + "seed_language_spanish" : "स्पेनिश", "send_title" : "संदेश Monero", diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb index 21a0be9cf..777315df6 100644 --- a/res/values/strings_ja.arb +++ b/res/values/strings_ja.arb @@ -159,6 +159,14 @@ "seed_language_choose" : "シード言語を選択してください", "seed_language_next" : "次", + "seed_language_english" : "英語", + "seed_language_chinese" : "中国語", + "seed_language_dutch" : "オランダの", + "seed_language_german" : "ドイツ人", + "seed_language_japanese" : "日本語", + "seed_language_portuguese" : "ポルトガル語", + "seed_language_russian" : "ロシア", + "seed_language_spanish" : "スペイン語", "send_title" : "Moneroを送信", diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb index 37d52c0db..8355dfae9 100644 --- a/res/values/strings_ko.arb +++ b/res/values/strings_ko.arb @@ -159,6 +159,14 @@ "seed_language_choose" : "종자 언어를 선택하십시오", "seed_language_next" : "다음 것", + "seed_language_english" : "영어", + "seed_language_chinese" : "중국말", + "seed_language_dutch" : "네덜란드 사람", + "seed_language_german" : "독일 사람", + "seed_language_japanese" : "일본어", + "seed_language_portuguese" : "포르투갈 인", + "seed_language_russian" : "러시아인", + "seed_language_spanish" : "스페인의", "send_title" : "모네로 보내기", diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb index 8f467daa1..88ce9fb9f 100644 --- a/res/values/strings_nl.arb +++ b/res/values/strings_nl.arb @@ -159,6 +159,14 @@ "seed_language_choose" : "Kies een starttaal", "seed_language_next" : "Volgende", + "seed_language_english" : "Engels", + "seed_language_chinese" : "Chinese", + "seed_language_dutch" : "Nederlands", + "seed_language_german" : "Duitse", + "seed_language_japanese" : "Japans", + "seed_language_portuguese" : "Portugees", + "seed_language_russian" : "Russisch", + "seed_language_spanish" : "Spaans", "send_title" : "Stuur Monero", diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb index 29d3e9858..b2e5b7c54 100644 --- a/res/values/strings_pl.arb +++ b/res/values/strings_pl.arb @@ -159,6 +159,14 @@ "seed_language_choose" : "Proszę wybrać język początkowy", "seed_language_next" : "Kolejny", + "seed_language_english" : "Angielski", + "seed_language_chinese" : "Chiński", + "seed_language_dutch" : "Holenderski", + "seed_language_german" : "Niemiecki", + "seed_language_japanese" : "Japoński", + "seed_language_portuguese" : "Portugalski", + "seed_language_russian" : "Rosyjski", + "seed_language_spanish" : "Hiszpański", "send_title" : "Wyślij Monero", diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb index 6c376cb21..5a019e630 100644 --- a/res/values/strings_pt.arb +++ b/res/values/strings_pt.arb @@ -159,6 +159,14 @@ "seed_language_choose" : "Por favor, escolha o idioma da semente", "seed_language_next" : "Próximo", + "seed_language_english" : "Inglesa", + "seed_language_chinese" : "Chinesa", + "seed_language_dutch" : "Holandesa", + "seed_language_german" : "Alemã", + "seed_language_japanese" : "Japonês", + "seed_language_portuguese" : "Português", + "seed_language_russian" : "Russa", + "seed_language_spanish" : "Espanhola", "send_title" : "Enviar Monero", diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb index f092e713d..33d53887e 100644 --- a/res/values/strings_ru.arb +++ b/res/values/strings_ru.arb @@ -159,6 +159,14 @@ "seed_language_choose" : "Пожалуйста, выберите язык семян", "seed_language_next" : "Продолжить", + "seed_language_english" : "Английский", + "seed_language_chinese" : "Китайский", + "seed_language_dutch" : "Нидерландский", + "seed_language_german" : "Немецкий", + "seed_language_japanese" : "Японский", + "seed_language_portuguese" : "Португальский", + "seed_language_russian" : "Русский", + "seed_language_spanish" : "Испанский", "send_title" : "Отправить Monero", diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb index adf506e51..22e02f0ac 100644 --- a/res/values/strings_uk.arb +++ b/res/values/strings_uk.arb @@ -159,6 +159,14 @@ "seed_language_choose" : "Будь ласка, виберіть мову насіння", "seed_language_next" : "Продовжити", + "seed_language_english" : "Англійська", + "seed_language_chinese" : "Китайська", + "seed_language_dutch" : "Голландська", + "seed_language_german" : "Німецька", + "seed_language_japanese" : "Японська", + "seed_language_portuguese" : "Португальська", + "seed_language_russian" : "Російська", + "seed_language_spanish" : "Іспанська", "send_title" : "Відправити Monero", diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb index ebe86b34a..5fa06cae4 100644 --- a/res/values/strings_zh.arb +++ b/res/values/strings_zh.arb @@ -159,6 +159,14 @@ "seed_language_choose" : "請選擇種子語言", "seed_language_next" : "下一个", + "seed_language_english" : "英語", + "seed_language_chinese" : "中文", + "seed_language_dutch" : "荷蘭人", + "seed_language_german" : "德語", + "seed_language_japanese" : "日本", + "seed_language_portuguese" : "葡萄牙語", + "seed_language_russian" : "俄語", + "seed_language_spanish" : "西班牙文", "send_title" : "发送门罗币",