From c83de7af6fbf5b5d6d7d4d7a53df16d7a65d0689 Mon Sep 17 00:00:00 2001 From: Oleksandr Sobol Date: Tue, 3 Mar 2020 17:18:50 +0200 Subject: [PATCH] CWA-175 | added image to the new wallet page, changed font size of picker, changed size of picker's border, fixed ukrainian and russian translate of "seed" --- lib/generated/i18n.dart | 4 ++-- lib/src/screens/new_wallet/new_wallet_page.dart | 7 ++++++- lib/src/screens/seed_language/seed_language_page.dart | 2 +- .../seed_language/widgets/seed_language_picker.dart | 8 ++++---- res/values/strings_ru.arb | 2 +- res/values/strings_uk.arb | 2 +- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart index e10897aca..00449be01 100644 --- a/lib/generated/i18n.dart +++ b/lib/generated/i18n.dart @@ -1528,7 +1528,7 @@ class $ru extends S { @override String get restore_title_from_keys => "Восстановить с помощью ключей"; @override - String get seed_language_choose => "Пожалуйста, выберите язык семян"; + String get seed_language_choose => "Пожалуйста, выберите язык мнемонической фразы"; @override String get wallet_keys => "Ключи кошелька"; @override @@ -3232,7 +3232,7 @@ class $uk extends S { @override String get restore_title_from_keys => "Відновити за допомогою ключів"; @override - String get seed_language_choose => "Будь ласка, виберіть мову насіння"; + String get seed_language_choose => "Будь ласка, виберіть мову мнемонічної фрази"; @override String get wallet_keys => "Ключі гаманця"; @override diff --git a/lib/src/screens/new_wallet/new_wallet_page.dart b/lib/src/screens/new_wallet/new_wallet_page.dart index d38bfb83b..87c995b43 100644 --- a/lib/src/screens/new_wallet/new_wallet_page.dart +++ b/lib/src/screens/new_wallet/new_wallet_page.dart @@ -73,6 +73,11 @@ 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( @@ -103,7 +108,7 @@ class _WalletNameFormState extends State { child: Text( S.of(context).seed_language_choose, textAlign: TextAlign.center, - style: TextStyle(fontSize: 19.0), + style: TextStyle(fontSize: 16.0), ), ), Padding(padding: EdgeInsets.only(left: 20, right: 20, bottom: 20), diff --git a/lib/src/screens/seed_language/seed_language_page.dart b/lib/src/screens/seed_language/seed_language_page.dart index a40a0a612..8316c2188 100644 --- a/lib/src/screens/seed_language/seed_language_page.dart +++ b/lib/src/screens/seed_language/seed_language_page.dart @@ -27,7 +27,7 @@ class SeedLanguage extends BasePage { Text( S.of(context).seed_language_choose, textAlign: TextAlign.center, - style: TextStyle(fontSize: 19.0), + style: TextStyle(fontSize: 16.0), ), SizedBox( height: 20.0, diff --git a/lib/src/screens/seed_language/widgets/seed_language_picker.dart b/lib/src/screens/seed_language/widgets/seed_language_picker.dart index 46011e110..6d077637d 100644 --- a/lib/src/screens/seed_language/widgets/seed_language_picker.dart +++ b/lib/src/screens/seed_language/widgets/seed_language_picker.dart @@ -26,17 +26,17 @@ class SeedLanguagePicker extends StatelessWidget { builder: (_) => InkWell( onTap: () => _setSeedLanguage(context), child: Container( - padding: EdgeInsets.all(10.0), - width: double.infinity, + padding: EdgeInsets.all(8.0), + //width: double.infinity, decoration: BoxDecoration( border: Border.all( color: Theme.of(context).dividerTheme.color ), - borderRadius: BorderRadius.circular(10.0) + borderRadius: BorderRadius.circular(8.0) ), child: Text(seedLocales[seedLanguages.indexOf(seedLanguageStore.selectedSeedLanguage)], textAlign: TextAlign.center, - style: TextStyle(fontSize: 19.0, color: Palette.lightBlue), + style: TextStyle(fontSize: 16.0, color: Palette.lightBlue), ), ), )); diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb index 33d53887e..a33f77326 100644 --- a/res/values/strings_ru.arb +++ b/res/values/strings_ru.arb @@ -157,7 +157,7 @@ "copy" : "Скопировать", - "seed_language_choose" : "Пожалуйста, выберите язык семян", + "seed_language_choose" : "Пожалуйста, выберите язык мнемонической фразы", "seed_language_next" : "Продолжить", "seed_language_english" : "Английский", "seed_language_chinese" : "Китайский", diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb index 22e02f0ac..e2a9059a2 100644 --- a/res/values/strings_uk.arb +++ b/res/values/strings_uk.arb @@ -157,7 +157,7 @@ "copy" : "Скопіювати", - "seed_language_choose" : "Будь ласка, виберіть мову насіння", + "seed_language_choose" : "Будь ласка, виберіть мову мнемонічної фрази", "seed_language_next" : "Продовжити", "seed_language_english" : "Англійська", "seed_language_chinese" : "Китайська",