mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2025-01-09 20:39:35 +00:00
Merge branch 'ionia' of github.com:cake-tech/cake_wallet into ionia
This commit is contained in:
commit
100bb0f256
15 changed files with 35 additions and 23 deletions
|
@ -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/typography.dart';
|
||||||
import 'package:cake_wallet/utils/show_pop_up.dart';
|
import 'package:cake_wallet/utils/show_pop_up.dart';
|
||||||
import 'package:cake_wallet/view_model/ionia/ionia_auth_view_model.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:flutter/material.dart';
|
||||||
import 'package:cake_wallet/generated/i18n.dart';
|
import 'package:cake_wallet/generated/i18n.dart';
|
||||||
import 'package:flutter_mobx/flutter_mobx.dart';
|
import 'package:flutter_mobx/flutter_mobx.dart';
|
||||||
import 'package:mobx/mobx.dart';
|
import 'package:mobx/mobx.dart';
|
||||||
|
import 'package:url_launcher/url_launcher.dart';
|
||||||
|
|
||||||
class IoniaCreateAccountPage extends BasePage {
|
class IoniaCreateAccountPage extends BasePage {
|
||||||
IoniaCreateAccountPage(this._authViewModel)
|
IoniaCreateAccountPage(this._authViewModel)
|
||||||
|
@ -30,6 +32,9 @@ class IoniaCreateAccountPage extends BasePage {
|
||||||
final FocusNode _emailFocus;
|
final FocusNode _emailFocus;
|
||||||
final TextEditingController _emailController;
|
final TextEditingController _emailController;
|
||||||
|
|
||||||
|
static const privacyPolicyUrl = 'https://ionia.docsend.com/view/jaqsmbq9w7dzvnqf';
|
||||||
|
static const termsAndConditionsUrl = 'https://ionia.docsend.com/view/hi9awnwxr6mqgiqj';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget middle(BuildContext context) {
|
Widget middle(BuildContext context) {
|
||||||
return Text(
|
return Text(
|
||||||
|
@ -102,6 +107,10 @@ class IoniaCreateAccountPage extends BasePage {
|
||||||
color: Theme.of(context).accentTextTheme.body2.color,
|
color: Theme.of(context).accentTextTheme.body2.color,
|
||||||
fontWeight: FontWeight.w700,
|
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).and} '),
|
||||||
TextSpan(
|
TextSpan(
|
||||||
|
@ -110,7 +119,10 @@ class IoniaCreateAccountPage extends BasePage {
|
||||||
color: Theme.of(context).accentTextTheme.body2.color,
|
color: Theme.of(context).accentTextTheme.body2.color,
|
||||||
fontWeight: FontWeight.w700,
|
fontWeight: FontWeight.w700,
|
||||||
),
|
),
|
||||||
),
|
recognizer: TapGestureRecognizer()
|
||||||
|
..onTap = () async {
|
||||||
|
if (await canLaunch(privacyPolicyUrl)) await launch(privacyPolicyUrl);
|
||||||
|
}),
|
||||||
TextSpan(text: ' ${S.of(context).by_cake_pay}'),
|
TextSpan(text: ' ${S.of(context).by_cake_pay}'),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
|
|
@ -591,7 +591,7 @@
|
||||||
"you_pay": "U betaalt",
|
"you_pay": "U betaalt",
|
||||||
"tip": "Tip:",
|
"tip": "Tip:",
|
||||||
"custom": "aangepast",
|
"custom": "aangepast",
|
||||||
"by_cake_pay": "door CakePay",
|
"by_cake_pay": "door Cake Pay",
|
||||||
"expires": "Verloopt",
|
"expires": "Verloopt",
|
||||||
"mm": "MM",
|
"mm": "MM",
|
||||||
"yy": "JJ",
|
"yy": "JJ",
|
||||||
|
|
|
@ -244,7 +244,7 @@
|
||||||
"settings_only_transactions" : "Only transactions",
|
"settings_only_transactions" : "Only transactions",
|
||||||
"settings_none" : "None",
|
"settings_none" : "None",
|
||||||
"settings_support" : "Support",
|
"settings_support" : "Support",
|
||||||
"settings_terms_and_conditions" : "Terms and conditions",
|
"settings_terms_and_conditions" : "Terms and Conditions",
|
||||||
"pin_is_incorrect" : "PIN is incorrect",
|
"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!",
|
"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?",
|
"already_have_account": "Already have an account?",
|
||||||
"create_account": "Create Account",
|
"create_account": "Create Account",
|
||||||
"privacy_policy": "Privacy policy",
|
"privacy_policy": "Privacy Policy",
|
||||||
"welcome_to_cakepay": "Welcome to Cake Pay!",
|
"welcome_to_cakepay": "Welcome to Cake Pay!",
|
||||||
"sign_up": "Sign Up",
|
"sign_up": "Sign Up",
|
||||||
"forgot_password": "Forgot Password",
|
"forgot_password": "Forgot Password",
|
||||||
|
@ -591,7 +591,7 @@
|
||||||
"you_pay": "You pay",
|
"you_pay": "You pay",
|
||||||
"tip": "Tip:",
|
"tip": "Tip:",
|
||||||
"custom": "custom",
|
"custom": "custom",
|
||||||
"by_cake_pay": "by CakePay",
|
"by_cake_pay": "by Cake Pay",
|
||||||
"expires": "Expires",
|
"expires": "Expires",
|
||||||
"mm": "MM",
|
"mm": "MM",
|
||||||
"yy": "YY",
|
"yy": "YY",
|
||||||
|
|
|
@ -591,7 +591,7 @@
|
||||||
"you_pay": "Tú pagas",
|
"you_pay": "Tú pagas",
|
||||||
"tip": "Consejo:",
|
"tip": "Consejo:",
|
||||||
"personalizado": "personalizado",
|
"personalizado": "personalizado",
|
||||||
"by_cake_pay": "por CakePay",
|
"by_cake_pay": "por Cake Pay",
|
||||||
"expires": "Caduca",
|
"expires": "Caduca",
|
||||||
"mm": "mm",
|
"mm": "mm",
|
||||||
"yy": "YY",
|
"yy": "YY",
|
||||||
|
|
|
@ -242,7 +242,7 @@
|
||||||
"settings_only_transactions" : "Seulement les transactions",
|
"settings_only_transactions" : "Seulement les transactions",
|
||||||
"settings_none" : "Rien",
|
"settings_none" : "Rien",
|
||||||
"settings_support" : "Support",
|
"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",
|
"pin_is_incorrect" : "Le code PIN est incorrect",
|
||||||
|
|
||||||
|
|
||||||
|
@ -589,7 +589,7 @@
|
||||||
"you_pay": "Vous payez",
|
"you_pay": "Vous payez",
|
||||||
"tip": "Astuce :",
|
"tip": "Astuce :",
|
||||||
"custom": "personnalisé",
|
"custom": "personnalisé",
|
||||||
"by_cake_pay": "par CakePay",
|
"by_cake_pay": "par Cake Pay",
|
||||||
"expire": "Expire",
|
"expire": "Expire",
|
||||||
"mm": "MM",
|
"mm": "MM",
|
||||||
"yy": "AA",
|
"yy": "AA",
|
||||||
|
|
|
@ -591,7 +591,7 @@
|
||||||
"you_pay": "Vi plaćate",
|
"you_pay": "Vi plaćate",
|
||||||
"tip": "Savjet:",
|
"tip": "Savjet:",
|
||||||
"custom": "prilagođeno",
|
"custom": "prilagođeno",
|
||||||
"by_cake_pay": "od CakePaya",
|
"by_cake_pay": "od Cake Paya",
|
||||||
"expires": "Ističe",
|
"expires": "Ističe",
|
||||||
"mm": "MM",
|
"mm": "MM",
|
||||||
"yy": "GG",
|
"yy": "GG",
|
||||||
|
|
|
@ -591,7 +591,7 @@
|
||||||
"you_pay": "Tu paghi",
|
"you_pay": "Tu paghi",
|
||||||
"tip": "Suggerimento:",
|
"tip": "Suggerimento:",
|
||||||
"custom": "personalizzato",
|
"custom": "personalizzato",
|
||||||
"by_cake_pay": "da CakePay",
|
"by_cake_pay": "da Cake Pay",
|
||||||
"expires": "Scade",
|
"expires": "Scade",
|
||||||
"mm": "mm",
|
"mm": "mm",
|
||||||
"yy": "YY",
|
"yy": "YY",
|
||||||
|
|
|
@ -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",
|
"expires": "Expires",
|
||||||
"mm": "んん",
|
"mm": "んん",
|
||||||
"yy": "YY",
|
"yy": "YY",
|
||||||
|
|
|
@ -591,7 +591,7 @@
|
||||||
"you_pay": "당신이 지불합니다",
|
"you_pay": "당신이 지불합니다",
|
||||||
"tip": "팁:",
|
"tip": "팁:",
|
||||||
"custom": "커스텀",
|
"custom": "커스텀",
|
||||||
"by_cake_pay": "CakePay로",
|
"by_cake_pay": "Cake Pay로",
|
||||||
"expires": "만료",
|
"expires": "만료",
|
||||||
"mm": "mm",
|
"mm": "mm",
|
||||||
"YY": "YY",
|
"YY": "YY",
|
||||||
|
|
|
@ -591,7 +591,7 @@
|
||||||
"you_pay": "Sie bezahlen",
|
"you_pay": "Sie bezahlen",
|
||||||
"tip": "Hinweis:",
|
"tip": "Hinweis:",
|
||||||
"custom": "benutzerdefiniert",
|
"custom": "benutzerdefiniert",
|
||||||
"by_cake_pay": "von CakePay",
|
"by_cake_pay": "von Cake Pay",
|
||||||
"expires": "Läuft ab",
|
"expires": "Läuft ab",
|
||||||
"mm": "MM",
|
"mm": "MM",
|
||||||
"yy": "YY",
|
"yy": "YY",
|
||||||
|
|
|
@ -594,7 +594,7 @@
|
||||||
"you_pay": "Płacisz",
|
"you_pay": "Płacisz",
|
||||||
"tip": "wskazówka:",
|
"tip": "wskazówka:",
|
||||||
"custom": "niestandardowy",
|
"custom": "niestandardowy",
|
||||||
"by_cake_pay": "przez CakePay",
|
"by_cake_pay": "przez Cake Pay",
|
||||||
"expires": "Wygasa",
|
"expires": "Wygasa",
|
||||||
"mm": "MM",
|
"mm": "MM",
|
||||||
"yy": "RR",
|
"yy": "RR",
|
||||||
|
|
|
@ -591,7 +591,7 @@
|
||||||
"you_pay": "Você paga",
|
"you_pay": "Você paga",
|
||||||
"tip": "Dica:",
|
"tip": "Dica:",
|
||||||
"custom": "personalizado",
|
"custom": "personalizado",
|
||||||
"by_cake_pay": "por CakePay",
|
"by_cake_pay": "por Cake Pay",
|
||||||
"expires": "Expira",
|
"expires": "Expira",
|
||||||
"mm": "MM",
|
"mm": "MM",
|
||||||
"yy": "aa",
|
"yy": "aa",
|
||||||
|
|
|
@ -591,7 +591,7 @@
|
||||||
"you_pay": "Вы платите",
|
"you_pay": "Вы платите",
|
||||||
"tip": "Совет:",
|
"tip": "Совет:",
|
||||||
"custom": "обычай",
|
"custom": "обычай",
|
||||||
"by_cake_pay": "от CakePay",
|
"by_cake_pay": "от Cake Pay",
|
||||||
"expires": "Истекает",
|
"expires": "Истекает",
|
||||||
"mm": "ММ",
|
"mm": "ММ",
|
||||||
"yy": "ГГ",
|
"yy": "ГГ",
|
||||||
|
|
|
@ -590,7 +590,7 @@
|
||||||
"you_pay": "Ви платите",
|
"you_pay": "Ви платите",
|
||||||
"tip": "Порада:",
|
"tip": "Порада:",
|
||||||
"custom": "на замовлення",
|
"custom": "на замовлення",
|
||||||
"by_cake_pay": "від CakePay",
|
"by_cake_pay": "від Cake Pay",
|
||||||
"expires": "Закінчується",
|
"expires": "Закінчується",
|
||||||
"mm": "MM",
|
"mm": "MM",
|
||||||
"yy": "YY",
|
"yy": "YY",
|
||||||
|
|
|
@ -589,7 +589,7 @@
|
||||||
"you_pay": "你付钱",
|
"you_pay": "你付钱",
|
||||||
"tip": "提示:",
|
"tip": "提示:",
|
||||||
"custom": "自定义",
|
"custom": "自定义",
|
||||||
"by_cake_pay": "通过 CakePay",
|
"by_cake_pay": "通过 Cake Pay",
|
||||||
"expires": "过期",
|
"expires": "过期",
|
||||||
"mm": "毫米",
|
"mm": "毫米",
|
||||||
"yy": "YY",
|
"yy": "YY",
|
||||||
|
|
Loading…
Reference in a new issue