From c23c6482bb3fda7669b76f3838ed11230dee226f Mon Sep 17 00:00:00 2001 From: Godwin Asuquo <41484542+godilite@users.noreply.github.com> Date: Wed, 20 Jul 2022 16:01:49 +0300 Subject: [PATCH] Fix signup page (#419) --- .../ionia/auth/ionia_create_account_page.dart | 24 ++++++++++++++----- res/values/strings_de.arb | 2 +- res/values/strings_en.arb | 6 ++--- res/values/strings_es.arb | 2 +- res/values/strings_fr.arb | 4 ++-- res/values/strings_hr.arb | 2 +- res/values/strings_it.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 +- 15 files changed, 35 insertions(+), 23 deletions(-) diff --git a/lib/src/screens/ionia/auth/ionia_create_account_page.dart b/lib/src/screens/ionia/auth/ionia_create_account_page.dart index 3466df5d5..0b613d0a4 100644 --- a/lib/src/screens/ionia/auth/ionia_create_account_page.dart +++ b/lib/src/screens/ionia/auth/ionia_create_account_page.dart @@ -9,10 +9,12 @@ import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart'; import 'package:cake_wallet/typography.dart'; import 'package:cake_wallet/utils/show_pop_up.dart'; import 'package:cake_wallet/view_model/ionia/ionia_auth_view_model.dart'; +import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:cake_wallet/generated/i18n.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:mobx/mobx.dart'; +import 'package:url_launcher/url_launcher.dart'; class IoniaCreateAccountPage extends BasePage { IoniaCreateAccountPage(this._authViewModel) @@ -30,6 +32,9 @@ class IoniaCreateAccountPage extends BasePage { final FocusNode _emailFocus; final TextEditingController _emailController; + static const privacyPolicyUrl = 'https://ionia.docsend.com/view/jaqsmbq9w7dzvnqf'; + static const termsAndConditionsUrl = 'https://ionia.docsend.com/view/hi9awnwxr6mqgiqj'; + @override Widget middle(BuildContext context) { return Text( @@ -102,15 +107,22 @@ class IoniaCreateAccountPage extends BasePage { color: Theme.of(context).accentTextTheme.body2.color, fontWeight: FontWeight.w700, ), + recognizer: TapGestureRecognizer() + ..onTap = () async { + if (await canLaunch(termsAndConditionsUrl)) await launch(termsAndConditionsUrl); + }, ), TextSpan(text: ' ${S.of(context).and} '), TextSpan( - text: S.of(context).privacy_policy, - style: TextStyle( - color: Theme.of(context).accentTextTheme.body2.color, - fontWeight: FontWeight.w700, - ), - ), + text: S.of(context).privacy_policy, + style: TextStyle( + color: Theme.of(context).accentTextTheme.body2.color, + fontWeight: FontWeight.w700, + ), + recognizer: TapGestureRecognizer() + ..onTap = () async { + if (await canLaunch(privacyPolicyUrl)) await launch(privacyPolicyUrl); + }), TextSpan(text: ' ${S.of(context).by_cake_pay}'), ], ), diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb index 27b76e115..e8e043af4 100644 --- a/res/values/strings_de.arb +++ b/res/values/strings_de.arb @@ -591,7 +591,7 @@ "you_pay": "U betaalt", "tip": "Tip:", "custom": "aangepast", - "by_cake_pay": "door CakePay", + "by_cake_pay": "door Cake Pay", "expires": "Verloopt", "mm": "MM", "yy": "JJ", diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb index 1d71d4a5a..fa81ce8c3 100644 --- a/res/values/strings_en.arb +++ b/res/values/strings_en.arb @@ -244,7 +244,7 @@ "settings_only_transactions" : "Only transactions", "settings_none" : "None", "settings_support" : "Support", - "settings_terms_and_conditions" : "Terms and conditions", + "settings_terms_and_conditions" : "Terms and Conditions", "pin_is_incorrect" : "PIN is incorrect", @@ -538,7 +538,7 @@ "cake_pay_account_note": "Make an account to see the available cards. Some are even available at a discount!", "already_have_account": "Already have an account?", "create_account": "Create Account", - "privacy_policy": "Privacy policy", + "privacy_policy": "Privacy Policy", "welcome_to_cakepay": "Welcome to Cake Pay!", "sign_up": "Sign Up", "forgot_password": "Forgot Password", @@ -591,7 +591,7 @@ "you_pay": "You pay", "tip": "Tip:", "custom": "custom", - "by_cake_pay": "by CakePay", + "by_cake_pay": "by Cake Pay", "expires": "Expires", "mm": "MM", "yy": "YY", diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb index 935c4c83a..cc34236ef 100644 --- a/res/values/strings_es.arb +++ b/res/values/strings_es.arb @@ -591,7 +591,7 @@ "you_pay": "Tú pagas", "tip": "Consejo:", "personalizado": "personalizado", - "by_cake_pay": "por CakePay", + "by_cake_pay": "por Cake Pay", "expires": "Caduca", "mm": "mm", "yy": "YY", diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb index dce0f0741..4758478da 100644 --- a/res/values/strings_fr.arb +++ b/res/values/strings_fr.arb @@ -242,7 +242,7 @@ "settings_only_transactions" : "Seulement les transactions", "settings_none" : "Rien", "settings_support" : "Support", - "settings_terms_and_conditions" : "Termes et conditions", + "settings_terms_and_conditions" : "Termes et Conditions", "pin_is_incorrect" : "Le code PIN est incorrect", @@ -589,7 +589,7 @@ "you_pay": "Vous payez", "tip": "Astuce :", "custom": "personnalisé", - "by_cake_pay": "par CakePay", + "by_cake_pay": "par Cake Pay", "expire": "Expire", "mm": "MM", "yy": "AA", diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb index cbdb1a8ad..2d06d88ab 100644 --- a/res/values/strings_hr.arb +++ b/res/values/strings_hr.arb @@ -591,7 +591,7 @@ "you_pay": "Vi plaćate", "tip": "Savjet:", "custom": "prilagođeno", - "by_cake_pay": "od CakePaya", + "by_cake_pay": "od Cake Paya", "expires": "Ističe", "mm": "MM", "yy": "GG", diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb index bfb99ce18..133f2113b 100644 --- a/res/values/strings_it.arb +++ b/res/values/strings_it.arb @@ -591,7 +591,7 @@ "you_pay": "Tu paghi", "tip": "Suggerimento:", "custom": "personalizzato", - "by_cake_pay": "da CakePay", + "by_cake_pay": "da Cake Pay", "expires": "Scade", "mm": "mm", "yy": "YY", diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb index b9cef6505..262113673 100644 --- a/res/values/strings_ja.arb +++ b/res/values/strings_ja.arb @@ -591,7 +591,7 @@ "you_pay": "あなたが支払う", "tip": "ヒント: ", "custom": "カスタム", - "by_cake_pay": "by CakePay", + "by_cake_pay": "by Cake Pay", "expires": "Expires", "mm": "んん", "yy": "YY", diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb index 623f10fc5..165584f29 100644 --- a/res/values/strings_ko.arb +++ b/res/values/strings_ko.arb @@ -591,7 +591,7 @@ "you_pay": "당신이 지불합니다", "tip": "팁:", "custom": "커스텀", - "by_cake_pay": "CakePay로", + "by_cake_pay": "Cake Pay로", "expires": "만료", "mm": "mm", "YY": "YY", diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb index 4a56da196..ca9654917 100644 --- a/res/values/strings_nl.arb +++ b/res/values/strings_nl.arb @@ -591,7 +591,7 @@ "you_pay": "Sie bezahlen", "tip": "Hinweis:", "custom": "benutzerdefiniert", - "by_cake_pay": "von CakePay", + "by_cake_pay": "von Cake Pay", "expires": "Läuft ab", "mm": "MM", "yy": "YY", diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb index 3754335c1..5bfe763c7 100644 --- a/res/values/strings_pl.arb +++ b/res/values/strings_pl.arb @@ -594,7 +594,7 @@ "you_pay": "Płacisz", "tip": "wskazówka:", "custom": "niestandardowy", - "by_cake_pay": "przez CakePay", + "by_cake_pay": "przez Cake Pay", "expires": "Wygasa", "mm": "MM", "yy": "RR", diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb index bc9cdf74d..016346df3 100644 --- a/res/values/strings_pt.arb +++ b/res/values/strings_pt.arb @@ -591,7 +591,7 @@ "you_pay": "Você paga", "tip": "Dica:", "custom": "personalizado", - "by_cake_pay": "por CakePay", + "by_cake_pay": "por Cake Pay", "expires": "Expira", "mm": "MM", "yy": "aa", diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb index 752e21eeb..964a94511 100644 --- a/res/values/strings_ru.arb +++ b/res/values/strings_ru.arb @@ -591,7 +591,7 @@ "you_pay": "Вы платите", "tip": "Совет:", "custom": "обычай", - "by_cake_pay": "от CakePay", + "by_cake_pay": "от Cake Pay", "expires": "Истекает", "mm": "ММ", "yy": "ГГ", diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb index 84b9e6b26..e0a7f6820 100644 --- a/res/values/strings_uk.arb +++ b/res/values/strings_uk.arb @@ -590,7 +590,7 @@ "you_pay": "Ви платите", "tip": "Порада:", "custom": "на замовлення", - "by_cake_pay": "від CakePay", + "by_cake_pay": "від Cake Pay", "expires": "Закінчується", "mm": "MM", "yy": "YY", diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb index e673b9896..678874329 100644 --- a/res/values/strings_zh.arb +++ b/res/values/strings_zh.arb @@ -589,7 +589,7 @@ "you_pay": "你付钱", "tip": "提示:", "custom": "自定义", - "by_cake_pay": "通过 CakePay", + "by_cake_pay": "通过 Cake Pay", "expires": "过期", "mm": "毫米", "yy": "YY",