From 96688636553421b6427a77ea782baeb1df2547ed Mon Sep 17 00:00:00 2001 From: Rafael Saes <76502841+saltrafael@users.noreply.github.com> Date: Wed, 24 May 2023 10:48:06 -0300 Subject: [PATCH 1/8] CW-320-validate-address-case (#934) * feat: allow all-lowercase OR all-uppercase ltc1 addresses (btc1 already working) * fix: ltc length --- lib/core/address_validator.dart | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/core/address_validator.dart b/lib/core/address_validator.dart index 57318254a..064efa11b 100644 --- a/lib/core/address_validator.dart +++ b/lib/core/address_validator.dart @@ -61,10 +61,11 @@ class AddressValidator extends TextValidator { case CryptoCurrency.dai: case CryptoCurrency.dash: case CryptoCurrency.eos: - case CryptoCurrency.ltc: case CryptoCurrency.bch: case CryptoCurrency.bnb: return '[0-9a-zA-Z]'; + case CryptoCurrency.ltc: + return '^(?!(ltc|LTC)1)[0-9a-zA-Z]*\$|(^LTC1[A-Z0-9]*\$)|(^ltc1[a-z0-9]*\$)'; case CryptoCurrency.hbar: return '[0-9a-zA-Z.]'; case CryptoCurrency.zaddr: @@ -119,7 +120,7 @@ class AddressValidator extends TextValidator { case CryptoCurrency.eth: return [42]; case CryptoCurrency.ltc: - return [34, 43]; + return [34, 43, 63]; case CryptoCurrency.nano: return [64, 65]; case CryptoCurrency.sc: From 53c55523c270dca20fc4e72f6d1102a80c34e715 Mon Sep 17 00:00:00 2001 From: Justin Ehrenhofer Date: Wed, 24 May 2023 11:02:28 -0500 Subject: [PATCH 2/8] Ionia don't->didn't (#941) --- lib/src/screens/ionia/auth/ionia_verify_otp_page.dart | 2 +- res/values/strings_ar.arb | 2 +- res/values/strings_bg.arb | 2 +- res/values/strings_cs.arb | 2 +- res/values/strings_de.arb | 2 +- res/values/strings_en.arb | 2 +- res/values/strings_es.arb | 2 +- res/values/strings_fr.arb | 2 +- res/values/strings_ha.arb | 2 +- res/values/strings_hi.arb | 2 +- res/values/strings_hr.arb | 2 +- res/values/strings_id.arb | 2 +- res/values/strings_it.arb | 2 +- res/values/strings_ja.arb | 2 +- res/values/strings_ko.arb | 2 +- res/values/strings_my.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_th.arb | 2 +- res/values/strings_tr.arb | 2 +- res/values/strings_uk.arb | 2 +- res/values/strings_ur.arb | 2 +- res/values/strings_zh.arb | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lib/src/screens/ionia/auth/ionia_verify_otp_page.dart b/lib/src/screens/ionia/auth/ionia_verify_otp_page.dart index e2123e164..b9829b1b5 100644 --- a/lib/src/screens/ionia/auth/ionia_verify_otp_page.dart +++ b/lib/src/screens/ionia/auth/ionia_verify_otp_page.dart @@ -93,7 +93,7 @@ class IoniaVerifyIoniaOtp extends BasePage { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - Text(S.of(context).dont_get_code), + Text(S.of(context).didnt_get_code), SizedBox(width: 20), InkWell( onTap: () => isSignIn diff --git a/res/values/strings_ar.arb b/res/values/strings_ar.arb index b33e93fad..15a91ba82 100644 --- a/res/values/strings_ar.arb +++ b/res/values/strings_ar.arb @@ -557,7 +557,7 @@ "purchase_gift_card":"شراء بطاقة هدايا", "verification":"تَحَقّق", "fill_code":"يرجى ملء رمز التحقق المرسل إلى بريدك الإلكتروني", - "dont_get_code":"لم تحصل على رمز؟", + "didnt_get_code":"لم تحصل على رمز؟", "resend_code":"الرجاء إعادة إرسالها", "debit_card":"بطاقة ائتمان", "cakepay_prepaid_card":"بطاقة ائتمان CakePay مسبقة الدفع", diff --git a/res/values/strings_bg.arb b/res/values/strings_bg.arb index 7f3195f98..d9934aed7 100644 --- a/res/values/strings_bg.arb +++ b/res/values/strings_bg.arb @@ -557,7 +557,7 @@ "purchase_gift_card": "Купуване на Gift Card", "verification": "Потвърждаване", "fill_code": "Моля, въведето кода за потвърждаване, изпратен на Вашия имейл", - "dont_get_code": "Не получихте код?", + "didnt_get_code": "Не получихте код?", "resend_code": "Повторно изпращане", "debit_card": "Дебитна карта", "cakepay_prepaid_card": "CakePay предплатена дебитна карта", diff --git a/res/values/strings_cs.arb b/res/values/strings_cs.arb index 389c03ce2..bf8916d64 100644 --- a/res/values/strings_cs.arb +++ b/res/values/strings_cs.arb @@ -557,7 +557,7 @@ "purchase_gift_card": "Objednat dárkovou kartu", "verification": "Ověření", "fill_code": "Prosím vyplňte ověřovací kód zaslaný na Váš e-mail", - "dont_get_code": "Nepřišel Vám kód?", + "didnt_get_code": "Nepřišel Vám kód?", "resend_code": "Prosím poslat znovu", "debit_card": "Debetní karta", "cakepay_prepaid_card": "CakePay předplacená debetní karta", diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb index fdd55b6e1..43be0ca0a 100644 --- a/res/values/strings_de.arb +++ b/res/values/strings_de.arb @@ -557,7 +557,7 @@ "purchase_gift_card": "Geschenkkarte kaufen", "verification": "Verifizierung", "fill_code": "Geben Sie den Bestätigungscode ein, den Sie per E-Mail erhalten haben", - "dont_get_code": "Kein Code?", + "didnt_get_code": "Kein Code?", "resend_code": "Bitte erneut senden", "debit_card": "Debitkarte", "cakepay_prepaid_card": "CakePay-Prepaid-Debitkarte", diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb index 98cb2eb3f..1092e3186 100644 --- a/res/values/strings_en.arb +++ b/res/values/strings_en.arb @@ -557,7 +557,7 @@ "purchase_gift_card": "Purchase Gift Card", "verification": "Verification", "fill_code": "Please fill in the verification code provided to your email", - "dont_get_code": "Don't get code?", + "didnt_get_code": "Didn't get code?", "resend_code": "Please resend it", "debit_card": "Debit Card", "cakepay_prepaid_card": "CakePay Prepaid Debit Card", diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb index f5799fb53..55f491efe 100644 --- a/res/values/strings_es.arb +++ b/res/values/strings_es.arb @@ -557,7 +557,7 @@ "purchase_gift_card": "Comprar tarjeta de regalo", "verification": "Verificación", "fill_code": "Por favor complete el código de verificación proporcionado a su correo electrónico", - "dont_get_code": "¿No obtienes el código?", + "didnt_get_code": "¿No recibiste el código?", "resend_code": "Por favor reenvíalo", "debit_card": "Tarjeta de Débito", "cakepay_prepaid_card": "Tarjeta de Débito Prepago CakePay", diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb index d29b5a39c..a26cbb216 100644 --- a/res/values/strings_fr.arb +++ b/res/values/strings_fr.arb @@ -556,7 +556,7 @@ "purchase_gift_card": "Acheter une carte-cadeau", "verification": "Vérification", "fill_code": "Veuillez remplir le code de vérification fourni sur votre e-mail", - "dont_get_code": "Vous ne recevez pas le code ?", + "didnt_get_code": "Vous n'avez pas reçu le code ?", "resend_code": "Veuillez le renvoyer", "debit_card": "Carte de débit", "cakepay_prepaid_card": "Carte de débit prépayée Cake Pay", diff --git a/res/values/strings_ha.arb b/res/values/strings_ha.arb index 53d166cdd..0e2c136ee 100644 --- a/res/values/strings_ha.arb +++ b/res/values/strings_ha.arb @@ -558,7 +558,7 @@ "purchase_gift_card": "Katin Kyautar Sayi", "verification": "tabbatar", "fill_code": "Da fatan za a cika lambar tabbatarwa da aka bayar zuwa imel ɗin ku", - "dont_get_code": "Ba a samun code?", + "didnt_get_code": "Ba a samun code?", "resend_code": "Da fatan za a sake aika shi", "debit_card": "Katin Zare kudi", "cakepay_prepaid_card": "Katin zare kudi na CakePay", diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb index 68b6f7a3e..21d9e3b5a 100644 --- a/res/values/strings_hi.arb +++ b/res/values/strings_hi.arb @@ -557,7 +557,7 @@ "purchase_gift_card": "गिफ्ट कार्ड खरीदें", "verification": "सत्यापन", "fill_code": "कृपया अपने ईमेल पर प्रदान किया गया सत्यापन कोड भरें", - "dont_get_code": "कोड नहीं मिला?", + "didnt_get_code": "कोड नहीं मिला?", "resend_code": "कृपया इसे फिर से भेजें", "debit_card": "डेबिट कार्ड", "cakepay_prepaid_card": "केकपे प्रीपेड डेबिट कार्ड", diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb index d5aa84ca8..4f2b85524 100644 --- a/res/values/strings_hr.arb +++ b/res/values/strings_hr.arb @@ -557,7 +557,7 @@ "purchase_gift_card": "Kupnja darovne kartice", "verification": "Potvrda", "fill_code": "Molimo vas da ispunite kontrolni kod koji ste dobili na svojoj e-pošti", - "dont_get_code": "Ne dobivate kod?", + "didnt_get_code": "Ne dobivate kod?", "resend_code": "Molimo da ga ponovno pošaljete", "debit_card": "Debitna kartica", "cakepay_prepaid_card": "CakePay unaprijed plaćena debitna kartica", diff --git a/res/values/strings_id.arb b/res/values/strings_id.arb index 1c4817775..932bca5d9 100644 --- a/res/values/strings_id.arb +++ b/res/values/strings_id.arb @@ -544,7 +544,7 @@ "purchase_gift_card": "Beli Kartu Hadiah", "verification": "Verifikasi", "fill_code": "Silakan isi kode verifikasi yang diterima di email Anda", - "dont_get_code": "Tidak mendapatkan kode?", + "didnt_get_code": "Tidak mendapatkan kode?", "resend_code": "Silakan kirim ulang", "debit_card": "Kartu Debit", "cakepay_prepaid_card": "Kartu Debit Prabayar CakePay", diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb index 966577b59..1ec0c93ad 100644 --- a/res/values/strings_it.arb +++ b/res/values/strings_it.arb @@ -557,7 +557,7 @@ "purchase_gift_card": "Acquista carta regalo", "verification": "Verifica", "fill_code": "Compila il codice di verifica fornito alla tua email", - "dont_get_code": "Non ricevi il codice?", + "didnt_get_code": "Non ricevi il codice?", "resend_code": "Per favore, invialo nuovamente", "debit_card": "Carta di debito", "cakepay_prepaid_card": "Carta di debito prepagata CakePay", diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb index 62085389e..44e5c443c 100644 --- a/res/values/strings_ja.arb +++ b/res/values/strings_ja.arb @@ -557,7 +557,7 @@ "purchase_gift_card": "ギフトカードを購入", "verification" : "検証", "fill_code": "メールアドレスに記載されている確認コードを入力してください", - "dont_get_code": "コードを取得しませんか？", + "didnt_get_code": "コードを取得しませんか？", "resend_code": "再送してください", "debit_card": "デビットカード", "cakepay_prepaid_card": "CakePayプリペイドデビットカード", diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb index 35bbd5765..91acfd7ae 100644 --- a/res/values/strings_ko.arb +++ b/res/values/strings_ko.arb @@ -557,7 +557,7 @@ "purchase_gift_card": "기프트 카드 구매", "verification": "검증", "fill_code": "이메일에 제공된 인증 코드를 입력하세요.", - "dont_get_code": "코드를 받지 못하셨습니까?", + "didnt_get_code": "코드를 받지 못하셨습니까?", "resend_code": "다시 보내주세요", "debit_card": "직불 카드", "cakepay_prepaid_card": "CakePay 선불 직불 카드", diff --git a/res/values/strings_my.arb b/res/values/strings_my.arb index ed594e665..796210d6a 100644 --- a/res/values/strings_my.arb +++ b/res/values/strings_my.arb @@ -557,7 +557,7 @@ "purchase_gift_card" : "လက်ဆောင်ကတ်ဝယ်ပါ။", "verification" : "စိစစ်ခြင်း။", "fill_code" : "သင့်အီးမေးလ်သို့ ပေးထားသည့် အတည်ပြုကုဒ်ကို ဖြည့်ပါ။", - "dont_get_code" : "ကုဒ်ကို မရဘူးလား?", + "didnt_get_code" : "ကုဒ်ကို မရဘူးလား?", "resend_code" : "ကျေးဇူးပြု၍ ပြန်ပို့ပါ။", "debit_card" : "ဒက်ဘစ်ကတ်", "cakepay_prepaid_card" : "CakePay ကြိုတင်ငွေဖြည့်ဒက်ဘစ်ကတ်", diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb index 266963125..a04fd4caf 100644 --- a/res/values/strings_nl.arb +++ b/res/values/strings_nl.arb @@ -557,7 +557,7 @@ "purchase_gift_card": "Cadeaubon kopen", "verification": "Verificatie", "fill_code": "Vul de verificatiecode in die u in uw e-mail hebt ontvangen", - "dont_get_code": "Geen code?", + "didnt_get_code": "Geen code?", "resend_code": "Stuur het alstublieft opnieuw", "debit_card": "Debetkaart", "cakepay_prepaid_card": "CakePay Prepaid Debetkaart", diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb index 88e26cfe0..c9656dcda 100644 --- a/res/values/strings_pl.arb +++ b/res/values/strings_pl.arb @@ -557,7 +557,7 @@ "purchase_gift_card": "Kup kartę podarunkową", "verification": "Weryfikacja", "fill_code": "Proszę wpisać kod weryfikacyjny który otrzymałeś w wiadomości e-mail", - "dont_get_code": "Nie dostałeś kodu?", + "didnt_get_code": "Nie dostałeś kodu?", "resend_code": "Wyślij go ponownie", "debit_card": "Karta debetowa", "cakepay_prepaid_card": "Przedpłacona karta debetowa CakePay", diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb index abfb54103..c265508b4 100644 --- a/res/values/strings_pt.arb +++ b/res/values/strings_pt.arb @@ -556,7 +556,7 @@ "purchase_gift_card": "Comprar vale-presente", "verification": "Verificação", "fill_code": "Por favor, preencha o código de verificação fornecido ao seu e-mail", - "dont_get_code": "Não recebeu o código?", + "didnt_get_code": "Não recebeu o código?", "resend_code": "Por favor, reenvie", "debit_card": "Cartão de débito", "cakepay_prepaid_card": "Cartão de débito pré-pago CakePay", diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb index 73e30b9f1..b38168bbc 100644 --- a/res/values/strings_ru.arb +++ b/res/values/strings_ru.arb @@ -557,7 +557,7 @@ "purchase_gift_card": "Купить подарочную карту", "verification": "Проверка", "fill_code": "Пожалуйста, введите код подтверждения, отправленный на вашу электронную почту", - "dont_get_code": "Не получить код?", + "didnt_get_code": "Не получить код?", "resend_code": "Пожалуйста, отправьте еще раз", "debit_card": "Дебетовая карта", "cakepay_prepaid_card": "Предоплаченная дебетовая карта CakePay", diff --git a/res/values/strings_th.arb b/res/values/strings_th.arb index 55e7562fe..0e384b890 100644 --- a/res/values/strings_th.arb +++ b/res/values/strings_th.arb @@ -555,7 +555,7 @@ "purchase_gift_card": "ซื้อบัตรของขวัญ", "verification": "การตรวจสอบ", "fill_code": "โปรดกรอกรหัสยืนยันที่ส่งไปยังอีเมลของคุณ", - "dont_get_code": "ไม่ได้รับรหัส?", + "didnt_get_code": "ไม่ได้รับรหัส?", "resend_code": "โปรดส่งอีกครั้ง", "debit_card": "บัตรเดบิต", "cakepay_prepaid_card": "บัตรเดบิตเติมเงินของ CakePay", diff --git a/res/values/strings_tr.arb b/res/values/strings_tr.arb index 857251f0f..50bd3ec4b 100644 --- a/res/values/strings_tr.arb +++ b/res/values/strings_tr.arb @@ -557,7 +557,7 @@ "purchase_gift_card": "Hediye Kartı Satın Al", "verification": "Doğrulama", "fill_code": "Lütfen e-postanıza gelen doğrulama kodunu girin", - "dont_get_code": "Kod gelmedi mi?", + "didnt_get_code": "Kod gelmedi mi?", "resend_code": "Lütfen tekrar gönder", "debit_card": "Ön ödemeli Kart", "cakepay_prepaid_card": "CakePay Ön Ödemeli Kart", diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb index 243802a0c..5bcffd8f7 100644 --- a/res/values/strings_uk.arb +++ b/res/values/strings_uk.arb @@ -556,7 +556,7 @@ "purchase_gift_card": "Придбати подарункову картку", "verification": "Перевірка", "fill_code": "Будь ласка, введіть код підтвердження, надісланий на вашу електронну адресу", - "dont_get_code": "Не отримуєте код?", + "didnt_get_code": "Не отримуєте код?", "resend_code": "Будь ласка, надішліть його повторно", "debit_card": "Дебетова картка", "cakepay_prepaid_card": "Передплачена дебетова картка CakePay", diff --git a/res/values/strings_ur.arb b/res/values/strings_ur.arb index 547de2a62..1bb6e56b4 100644 --- a/res/values/strings_ur.arb +++ b/res/values/strings_ur.arb @@ -559,7 +559,7 @@ "purchase_gift_card" : "گفٹ کارڈ خریدیں۔", "verification" : "تصدیق", "fill_code" : "براہ کرم اپنے ای میل پر فراہم کردہ تصدیقی کوڈ کو پُر کریں۔", - "dont_get_code" : "کوڈ نہیں ملتا؟", + "didnt_get_code" : "کوڈ نہیں ملتا؟", "resend_code" : "براہ کرم اسے دوبارہ بھیجیں۔", "debit_card" : "ڈیبٹ کارڈ", "cakepay_prepaid_card" : "Cake پے پری پیڈ ڈیبٹ کارڈ", diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb index 4d9e7ac4f..14300a732 100644 --- a/res/values/strings_zh.arb +++ b/res/values/strings_zh.arb @@ -556,7 +556,7 @@ "purchase_gift_card": "购买礼品卡", "verification": "验证", "fill_code": "请填写提供给您邮箱的验证码", - "dont_get_code": "没有获取代码？", + "didnt_get_code": "没有获取代码？", "resend_code": "请重新发送", "debit_card": "借记卡", "cakepay_prepaid_card": "CakePay 预付借记卡", From 18ba72400972cfc7b1430ee36904ff31190eb302 Mon Sep 17 00:00:00 2001 From: Serhii Date: Wed, 24 May 2023 19:12:42 +0300 Subject: [PATCH 3/8] CW-379-Investigate-trade-ID-status-updates (#930) * cancel Anonpay updateInvoice timer * Remove un-needed dependency injection of anonpayDetailsViewModel since it can be accessed via the parent class [skip ci] --------- Co-authored-by: OmarHatem --- .../anonpay_details/anonpay_details_page.dart | 44 +++++++++++++------ 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/lib/src/screens/anonpay_details/anonpay_details_page.dart b/lib/src/screens/anonpay_details/anonpay_details_page.dart index 14ebadc0e..7491bb7a3 100644 --- a/lib/src/screens/anonpay_details/anonpay_details_page.dart +++ b/lib/src/screens/anonpay_details/anonpay_details_page.dart @@ -20,13 +20,33 @@ class AnonpayDetailsPage extends BasePage { final AnonpayDetailsViewModel anonpayDetailsViewModel; @override - Widget body(BuildContext context) { + Widget body(BuildContext context) => AnonpayDetailsPageBody(anonpayDetailsViewModel); +} + +class AnonpayDetailsPageBody extends StatefulWidget { + AnonpayDetailsPageBody(this.anonpayDetailsViewModel); + + final AnonpayDetailsViewModel anonpayDetailsViewModel; + + @override + State createState() => _AnonpayDetailsPageBodyState(); +} + +class _AnonpayDetailsPageBodyState extends State { + @override + void dispose() { + super.dispose(); + widget.anonpayDetailsViewModel.timer?.cancel(); + } + + @override + Widget build(BuildContext context) { return SectionStandardList( context: context, sectionCount: 1, - itemCounter: (int _) => anonpayDetailsViewModel.items.length, + itemCounter: (int _) => widget.anonpayDetailsViewModel.items.length, itemBuilder: (_, __, index) { - final item = anonpayDetailsViewModel.items[index]; + final item = widget.anonpayDetailsViewModel.items[index]; if (item is DetailsListStatusItem) { return StandardListStatusRow(title: item.title, value: item.value); @@ -37,20 +57,18 @@ class AnonpayDetailsPage extends BasePage { id: item.id, create: item.createdAt, pair: item.pair, - currentTheme: anonpayDetailsViewModel.settingsStore.currentTheme.type, + currentTheme: widget.anonpayDetailsViewModel.settingsStore.currentTheme.type, onTap: item.onTap, ); } - return GestureDetector( - onTap: () { - Clipboard.setData(ClipboardData(text: item.value)); - showBar(context, S.of(context).transaction_details_copied(item.title)); - }, - child: ListRow(title: '${item.title}:', value: item.value), - ); - - + return GestureDetector( + onTap: () { + Clipboard.setData(ClipboardData(text: item.value)); + showBar(context, S.of(context).transaction_details_copied(item.title)); + }, + child: ListRow(title: '${item.title}:', value: item.value), + ); }); } } From c835059d139f39482bc3a1e3f06a0e509c417859 Mon Sep 17 00:00:00 2001 From: Serhii Date: Thu, 25 May 2023 00:00:54 +0300 Subject: [PATCH 4/8] CW-371-Restore-height-issue-with-QR-code-Wallet-incorrectly-assigns-today's-restore-height-to-legacy-wallets (#925) * fix height for legacy wallets * get height by first tx under singular seed --- cw_core/lib/get_height_by_date.dart | 2 + lib/view_model/wallet_keys_view_model.dart | 65 +++++++++++++++++----- 2 files changed, 52 insertions(+), 15 deletions(-) diff --git a/cw_core/lib/get_height_by_date.dart b/cw_core/lib/get_height_by_date.dart index 768a5534f..819990e0a 100644 --- a/cw_core/lib/get_height_by_date.dart +++ b/cw_core/lib/get_height_by_date.dart @@ -122,6 +122,8 @@ int getMoneroHeigthByDate({required DateTime date}) { } const havenDates = { + "2023-05": 1352995, + "2023-04": 1331460, "2023-03": 1309180, "2023-01": 1266810, "2022-12": 1244510, diff --git a/lib/view_model/wallet_keys_view_model.dart b/lib/view_model/wallet_keys_view_model.dart index 0a9ae60a7..d5a19832c 100644 --- a/lib/view_model/wallet_keys_view_model.dart +++ b/lib/view_model/wallet_keys_view_model.dart @@ -1,4 +1,6 @@ import 'package:cake_wallet/store/app_store.dart'; +import 'package:cw_core/transaction_direction.dart'; +import 'package:cw_core/transaction_info.dart'; import 'package:cw_core/wallet_type.dart'; import 'package:mobx/mobx.dart'; import 'package:cake_wallet/generated/i18n.dart'; @@ -19,12 +21,26 @@ abstract class WalletKeysViewModelBase with Store { ? S.current.wallet_seed : S.current.wallet_keys, _restoreHeight = _appStore.wallet!.walletInfo.restoreHeight, + _restoreHeightByTransactions = 0, items = ObservableList() { _populateItems(); reaction((_) => _appStore.wallet, (WalletBase? _wallet) { _populateItems(); }); + + if (_appStore.wallet!.type == WalletType.monero || _appStore.wallet!.type == WalletType.haven) { + final accountTransactions = _getWalletTransactions(_appStore.wallet!); + if (accountTransactions.isNotEmpty) { + final incomingAccountTransactions = + accountTransactions.where((tx) => tx.direction == TransactionDirection.incoming); + if (incomingAccountTransactions.isNotEmpty) { + incomingAccountTransactions.toList().sort((a, b) => a.date.compareTo(b.date)); + _restoreHeightByTransactions = _getRestoreHeightByTransactions( + _appStore.wallet!.type, incomingAccountTransactions.first.date); + } + } + } } final ObservableList items; @@ -35,6 +51,8 @@ abstract class WalletKeysViewModelBase with Store { final int _restoreHeight; + int _restoreHeightByTransactions; + void _populateItems() { items.clear(); @@ -78,7 +96,7 @@ abstract class WalletKeysViewModelBase with Store { } } - Future currentHeight() async { + Future _currentHeight() async { if (_appStore.wallet!.type == WalletType.haven) { return await haven!.getCurrentHeight(); } @@ -88,7 +106,6 @@ abstract class WalletKeysViewModelBase with Store { return null; } - String get _scheme { switch (_appStore.wallet!.type) { case WalletType.monero: @@ -105,14 +122,14 @@ abstract class WalletKeysViewModelBase with Store { } Future get restoreHeight async { - if (_restoreHeight != 0) { - return _restoreHeight.toString(); - } - final _currentHeight = await currentHeight(); - if (_currentHeight == null) { - return null; - } - return ((_currentHeight / 1000).floor() * 1000).toString(); + if (_restoreHeightByTransactions != 0) + return getRoundedRestoreHeight(_restoreHeightByTransactions); + if (_restoreHeight != 0) return _restoreHeight.toString(); + + final currentHeight = await _currentHeight(); + if (currentHeight == null) return null; + + return getRoundedRestoreHeight(currentHeight); } Future> get _queryParams async { @@ -123,10 +140,28 @@ abstract class WalletKeysViewModelBase with Store { }; } - Future get url async { - return Uri( - scheme: _scheme, - queryParameters: await _queryParams, - ); + Future get url async => Uri( + scheme: _scheme, + queryParameters: await _queryParams, + ); + + List _getWalletTransactions(WalletBase wallet) { + if (wallet.type == WalletType.monero) { + return monero!.getTransactionHistory(wallet).transactions.values.toList(); + } else if (wallet.type == WalletType.haven) { + return haven!.getTransactionHistory(wallet).transactions.values.toList(); + } + return []; } + + int _getRestoreHeightByTransactions(WalletType type, DateTime date) { + if (type == WalletType.monero) { + return monero!.getHeigthByDate(date: date); + } else if (type == WalletType.haven) { + return haven!.getHeightByDate(date: date); + } + return 0; + } + + String getRoundedRestoreHeight(int height) => ((height / 1000).floor() * 1000).toString(); } From baabc0a9153e69b6be27b71c2bcd2726a000a87e Mon Sep 17 00:00:00 2001 From: Rafael Saes <76502841+saltrafael@users.noreply.github.com> Date: Wed, 24 May 2023 20:19:51 -0300 Subject: [PATCH 5/8] Cw 373 theme refactoring in preparation to support additional themes (#933) * refactor(Theme): migrate accentColor - based on the specs at https://docs.flutter.dev/release/breaking-changes/theme-data-accent-properties#migration-guide. * refactor(Theme): all deprecated TextTheme styles * refactor(Theme): deprecated backgroundColor for colorScheme.background * refactor(Theme): deprecated buttonColor to use TextTheme backgroundColor instead * refactor(Theme): deprecated isAlwaysShown to use thumbVisibility instead --- lib/src/screens/auth/auth_page.dart | 2 +- lib/src/screens/backup/backup_page.dart | 5 +- .../backup/edit_backup_password_page.dart | 12 +- lib/src/screens/base_page.dart | 4 +- lib/src/screens/buy/pre_order_page.dart | 18 +- .../screens/contact/contact_list_page.dart | 13 +- lib/src/screens/contact/contact_page.dart | 13 +- lib/src/screens/dashboard/dashboard_page.dart | 26 +- .../dashboard/desktop_dashboard_page.dart | 2 +- .../desktop_action_button.dart | 17 +- .../desktop_sidebar/side_menu_item.dart | 2 +- .../desktop_sidebar_wrapper.dart | 2 +- .../desktop_wallet_selection_dropdown.dart | 8 +- .../desktop_widgets/dropdown_item_widget.dart | 2 +- .../dashboard/widgets/action_button.dart | 6 +- .../dashboard/widgets/address_page.dart | 43 ++- .../widgets/anonpay_transaction_row.dart | 6 +- .../dashboard/widgets/balance_page.dart | 57 ++- .../dashboard/widgets/date_section_raw.dart | 5 +- .../dashboard/widgets/filter_widget.dart | 8 +- .../screens/dashboard/widgets/header_row.dart | 15 +- .../dashboard/widgets/market_place_page.dart | 7 +- .../dashboard/widgets/menu_widget.dart | 33 +- .../screens/dashboard/widgets/order_row.dart | 12 +- .../present_receive_option_picker.dart | 12 +- .../dashboard/widgets/sync_indicator.dart | 6 +- .../widgets/sync_indicator_icon.dart | 5 +- .../screens/dashboard/widgets/trade_row.dart | 6 +- .../dashboard/widgets/transaction_raw.dart | 10 +- .../dashboard/widgets/transactions_page.dart | 4 +- .../screens/disclaimer/disclaimer_page.dart | 22 +- lib/src/screens/exchange/exchange_page.dart | 12 +- .../exchange/exchange_template_page.dart | 22 +- .../widgets/currency_picker_item_widget.dart | 31 +- .../widgets/currency_picker_widget.dart | 5 +- .../exchange/widgets/exchange_card.dart | 46 ++- .../mobile_exchange_cards_section.dart | 11 +- .../widgets/present_provider_picker.dart | 5 +- .../exchange_trade/exchange_confirm_page.dart | 32 +- .../exchange_trade/exchange_trade_page.dart | 26 +- .../exchange_trade/information_page.dart | 8 +- lib/src/screens/faq/faq_item.dart | 9 +- .../ionia/auth/ionia_create_account_page.dart | 23 +- .../screens/ionia/auth/ionia_login_page.dart | 10 +- .../ionia/auth/ionia_verify_otp_page.dart | 17 +- .../ionia/auth/ionia_welcome_page.dart | 16 +- .../ionia/cards/ionia_account_cards_page.dart | 49 ++- .../ionia/cards/ionia_account_page.dart | 17 +- .../cards/ionia_activate_debit_card_page.dart | 10 +- .../cards/ionia_buy_card_detail_page.dart | 40 +-- .../ionia/cards/ionia_buy_gift_card.dart | 46 ++- .../ionia/cards/ionia_custom_redeem_page.dart | 43 ++- .../ionia/cards/ionia_custom_tip_page.dart | 45 ++- .../ionia/cards/ionia_debit_card_page.dart | 56 ++- .../cards/ionia_gift_card_detail_page.dart | 19 +- .../ionia/cards/ionia_manage_cards_page.dart | 40 ++- .../ionia/cards/ionia_more_options_page.dart | 9 +- .../cards/ionia_payment_status_page.dart | 25 +- .../ionia/widgets/ionia_alert_model.dart | 12 +- .../ionia/widgets/ionia_filter_modal.dart | 12 +- lib/src/screens/ionia/widgets/ionia_tile.dart | 4 +- .../ionia/widgets/rounded_checkbox.dart | 4 +- .../ionia/widgets/text_icon_button.dart | 4 +- .../monero_account_edit_or_create_page.dart | 2 +- .../monero_account_list_page.dart | 2 +- .../monero_accounts/widgets/account_tile.dart | 10 +- .../advanced_privacy_settings_page.dart | 10 +- .../screens/new_wallet/new_wallet_page.dart | 21 +- .../new_wallet/new_wallet_type_page.dart | 10 +- .../new_wallet/widgets/select_button.dart | 24 +- .../nodes/node_create_or_edit_page.dart | 5 +- .../screens/nodes/widgets/node_list_row.dart | 2 +- lib/src/screens/pin_code/pin_code_widget.dart | 27 +- .../screens/receive/anonpay_invoice_page.dart | 21 +- .../screens/receive/anonpay_receive_page.dart | 24 +- .../screens/receive/fullscreen_qr_page.dart | 14 +- lib/src/screens/receive/receive_page.dart | 52 ++- .../widgets/anonpay_currency_input_field.dart | 27 +- .../receive/widgets/anonpay_input_form.dart | 21 +- .../widgets/anonpay_status_section.dart | 24 +- .../receive/widgets/copy_link_item.dart | 15 +- .../receive/widgets/currency_input_field.dart | 23 +- .../screens/receive/widgets/header_tile.dart | 11 +- .../screens/receive/widgets/qr_widget.dart | 18 +- .../release_notes/release_notes_screen.dart | 10 +- lib/src/screens/rescan/rescan_page.dart | 5 +- .../restore/restore_from_backup_page.dart | 5 +- .../restore_wallet_from_seed_details.dart | 5 +- .../screens/restore/sweeping_wallet_page.dart | 17 +- .../wallet_restore_from_keys_form.dart | 2 +- .../wallet_restore_from_seed_form.dart | 2 +- .../screens/restore/wallet_restore_page.dart | 20 +- .../restore/widgets/restore_button.dart | 19 +- lib/src/screens/seed/pre_seed_page.dart | 7 +- lib/src/screens/seed/wallet_seed_page.dart | 13 +- .../seed_language/seed_language_page.dart | 3 +- lib/src/screens/send/send_page.dart | 12 +- lib/src/screens/send/send_template_page.dart | 33 +- .../widgets/choose_yat_address_alert.dart | 4 +- .../send/widgets/confirm_sending_alert.dart | 14 +- lib/src/screens/send/widgets/send_card.dart | 46 +-- .../desktop_settings_page.dart | 5 +- .../widgets/settings_cell_with_arrow.dart | 2 +- .../widgets/settings_choices_cell.dart | 23 +- .../widgets/settings_picker_cell.dart | 2 +- .../widgets/settings_version_cell.dart | 3 +- .../address_edit_or_create_page.dart | 5 +- lib/src/screens/support/support_page.dart | 5 +- .../widgets/textfield_list_row.dart | 17 +- .../unspent_coins_list_page.dart | 2 +- .../widgets/unspent_coins_switch_row.dart | 6 +- .../screens/wallet_keys/wallet_keys_page.dart | 4 +- .../screens/wallet_list/wallet_list_page.dart | 18 +- lib/src/screens/welcome/welcome_page.dart | 46 ++- lib/src/screens/yat_emoji_id.dart | 7 +- lib/src/widgets/add_template_button.dart | 13 +- lib/src/widgets/address_text_field.dart | 19 +- lib/src/widgets/alert_with_one_action.dart | 9 +- lib/src/widgets/base_alert_dialog.dart | 25 +- lib/src/widgets/base_text_form_field.dart | 19 +- lib/src/widgets/blockchain_height_widget.dart | 3 +- lib/src/widgets/cake_scrollbar.dart | 6 +- lib/src/widgets/check_box_picker.dart | 26 +- lib/src/widgets/checkbox_widget.dart | 16 +- .../widgets/collapsible_standart_list.dart | 2 +- lib/src/widgets/introducing_card.dart | 6 +- lib/src/widgets/list_row.dart | 10 +- lib/src/widgets/market_place_item.dart | 6 +- lib/src/widgets/picker.dart | 69 ++-- lib/src/widgets/seed_widget.dart | 17 +- lib/src/widgets/setting_action_button.dart | 4 +- lib/src/widgets/standard_checkbox.dart | 8 +- lib/src/widgets/standard_list.dart | 14 +- lib/src/widgets/standard_list_card.dart | 4 +- lib/src/widgets/standard_list_status_row.dart | 8 +- lib/src/widgets/standard_switch.dart | 10 +- lib/src/widgets/template_tile.dart | 4 +- lib/src/widgets/trail_button.dart | 5 +- lib/themes/bright_theme.dart | 304 +++++++++------- lib/themes/dark_theme.dart | 337 ++++++++++-------- lib/themes/light_theme.dart | 305 +++++++++------- 141 files changed, 1954 insertions(+), 1111 deletions(-) diff --git a/lib/src/screens/auth/auth_page.dart b/lib/src/screens/auth/auth_page.dart index 7a1bd8420..dcd1c8016 100644 --- a/lib/src/screens/auth/auth_page.dart +++ b/lib/src/screens/auth/auth_page.dart @@ -141,7 +141,7 @@ class AuthPageState extends State { ), )) : Container(), - backgroundColor: Theme.of(context).backgroundColor, + backgroundColor: Theme.of(context).colorScheme.background, border: null), resizeToAvoidBottomInset: false, body: PinCode((pin, _) => widget.authViewModel.auth(password: pin), diff --git a/lib/src/screens/backup/backup_page.dart b/lib/src/screens/backup/backup_page.dart index 966b289d1..6f720ed9a 100644 --- a/lib/src/screens/backup/backup_page.dart +++ b/lib/src/screens/backup/backup_page.dart @@ -79,7 +79,10 @@ class BackupPage extends BasePage { isLoading: backupViewModelBase.state is IsExecutingState, onPressed: () => onExportBackup(context), text: S.of(context).export_backup, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white)), bottom: 24, left: 24, diff --git a/lib/src/screens/backup/edit_backup_password_page.dart b/lib/src/screens/backup/edit_backup_password_page.dart index f1ddaf4e1..40eb722c9 100644 --- a/lib/src/screens/backup/edit_backup_password_page.dart +++ b/lib/src/screens/backup/edit_backup_password_page.dart @@ -38,14 +38,20 @@ class EditBackupPasswordPage extends BasePage { keyboardType: TextInputType.visiblePassword, controller: textEditingController, style: TextStyle( - fontSize: 26, - color: Theme.of(context).primaryTextTheme!.headline6!.color!)))), + fontSize: 26, + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!)))), Positioned( child: Observer( builder: (_) => PrimaryButton( onPressed: () => onSave(context), text: S.of(context).save, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, isDisabled: !editBackupPasswordViewModel.canSave)), bottom: 24, diff --git a/lib/src/screens/base_page.dart b/lib/src/screens/base_page.dart index 51f8c1ad2..a06e0ae5a 100644 --- a/lib/src/screens/base_page.dart +++ b/lib/src/screens/base_page.dart @@ -48,7 +48,7 @@ abstract class BasePage extends StatelessWidget { } final _backButton = Icon(Icons.arrow_back_ios, - color: titleColor ?? Theme.of(context).primaryTextTheme.headline6!.color!, + color: titleColor ?? Theme.of(context).primaryTextTheme!.titleLarge!.color!, size: 16,); return MergeSemantics( @@ -83,7 +83,7 @@ abstract class BasePage extends StatelessWidget { fontWeight: FontWeight.bold, fontFamily: 'Lato', color: titleColor ?? - Theme.of(context).primaryTextTheme!.headline6!.color!), + Theme.of(context).primaryTextTheme!.titleLarge!.color!), ); } diff --git a/lib/src/screens/buy/pre_order_page.dart b/lib/src/screens/buy/pre_order_page.dart index 00a64896f..ccd6a5422 100644 --- a/lib/src/screens/buy/pre_order_page.dart +++ b/lib/src/screens/buy/pre_order_page.dart @@ -80,7 +80,9 @@ class PreOrderPage extends BasePage { return KeyboardActions( config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1! + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! .backgroundColor!, nextFocus: false, actions: [ @@ -91,7 +93,7 @@ class PreOrderPage extends BasePage { ]), child: Container( height: 0, - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: ScrollableWithBottomSection( contentPadding: EdgeInsets.only(bottom: 24), content: Observer(builder: (_) => Column( @@ -102,9 +104,9 @@ class PreOrderPage extends BasePage { bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)), gradient: LinearGradient(colors: [ - Theme.of(context).primaryTextTheme.subtitle1!.color!, + Theme.of(context).primaryTextTheme!.titleMedium!.color!, Theme.of(context) - .primaryTextTheme.subtitle1! + .primaryTextTheme!.titleMedium! .decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight), ), @@ -160,11 +162,11 @@ class PreOrderPage extends BasePage { ), ), hintText: '0.00', - borderColor: Theme.of(context).primaryTextTheme.bodyText1!.decorationColor!, + borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.decorationColor!, borderWidth: 0.5, textStyle: TextStyle(fontSize: 36, fontWeight: FontWeight.w500, color: Colors.white), placeholderTextStyle: TextStyle( - color: Theme.of(context).primaryTextTheme.headline5!.decorationColor!, + color: Theme.of(context).primaryTextTheme!.headlineSmall!.decorationColor!, fontWeight: FontWeight.w500, fontSize: 36, ), @@ -179,7 +181,7 @@ class PreOrderPage extends BasePage { S.of(context).buy_with + ':', textAlign: TextAlign.center, style: TextStyle( - color: Theme.of(context).primaryTextTheme.headline6!.color!, + color: Theme.of(context).primaryTextTheme.titleLarge!.color!, fontSize: 18, fontWeight: FontWeight.bold ), @@ -246,7 +248,7 @@ class PreOrderPage extends BasePage { ? S.of(context).buy : S.of(context).buy_with + ' ${buyViewModel.selectedProvider!.description.title}', - color: Theme.of(context).accentTextTheme.bodyText1!.color!, + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!, textColor: Colors.white, isLoading: buyViewModel.isRunning, isDisabled: (buyViewModel.selectedProvider == null) || diff --git a/lib/src/screens/contact/contact_list_page.dart b/lib/src/screens/contact/contact_list_page.dart index 96887ff5f..c276b9d80 100644 --- a/lib/src/screens/contact/contact_list_page.dart +++ b/lib/src/screens/contact/contact_list_page.dart @@ -29,12 +29,15 @@ class ContactListPage extends BasePage { height: 32.0, decoration: BoxDecoration( shape: BoxShape.circle, - color: Theme.of(context).accentTextTheme.caption!.color!), + color: Theme.of(context) + .accentTextTheme! + .bodySmall! + .color!), child: Stack( alignment: Alignment.center, children: [ Icon(Icons.add, - color: Theme.of(context).primaryTextTheme.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, size: 22.0), ButtonTheme( minWidth: 32.0, @@ -64,9 +67,9 @@ class ContactListPage extends BasePage { return CollapsibleSectionList( context: context, sectionCount: 2, - themeColor: Theme.of(context).primaryTextTheme.headline6!.color!, + themeColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!, dividerThemeColor: - Theme.of(context).primaryTextTheme.caption!.decorationColor!, + Theme.of(context).primaryTextTheme!.bodySmall!.decorationColor!, sectionTitleBuilder: (_, int sectionIndex) { var title = S.current.contact_list_contacts; @@ -140,7 +143,7 @@ class ContactListPage extends BasePage { style: TextStyle( fontSize: 14, fontWeight: FontWeight.normal, - color: Theme.of(context).primaryTextTheme.headline6!.color!), + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!), ), ) ) diff --git a/lib/src/screens/contact/contact_page.dart b/lib/src/screens/contact/contact_page.dart index 09dc5efc3..fc9c6c109 100644 --- a/lib/src/screens/contact/contact_page.dart +++ b/lib/src/screens/contact/contact_page.dart @@ -47,7 +47,8 @@ class ContactPage extends BasePage { @override Widget body(BuildContext context) { final downArrow = Image.asset('assets/images/arrow_bottom_purple_icon.png', - color: Theme.of(context).primaryTextTheme!.overline!.color!, height: 8); + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!, + height: 8); reaction((_) => contactViewModel.state, (ExecutionState state) { if (state is FailureState) { @@ -98,12 +99,14 @@ class ContactPage extends BasePage { AddressTextFieldOption.paste, AddressTextFieldOption.qrCode, ], - buttonColor: - Theme.of(context).accentTextTheme!.headline3!.color!, + buttonColor: Theme.of(context) + .accentTextTheme! + .displaySmall! + .color!, iconColor: PaletteDark.gray, borderColor: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .backgroundColor!, validator: AddressValidator(type: contactViewModel.currency!), @@ -142,7 +145,7 @@ class ContactPage extends BasePage { text: S.of(context).save, color: Theme.of(context) .accentTextTheme! - .bodyText1! + .bodyLarge! .color!, textColor: Colors.white, isDisabled: !contactViewModel.isReady))) diff --git a/lib/src/screens/dashboard/dashboard_page.dart b/lib/src/screens/dashboard/dashboard_page.dart index a76b93fc0..2b485aa7a 100644 --- a/lib/src/screens/dashboard/dashboard_page.dart +++ b/lib/src/screens/dashboard/dashboard_page.dart @@ -77,7 +77,7 @@ class _DashboardPageView extends BasePage { (BuildContext context, Widget scaffold) => Container( decoration: BoxDecoration( gradient: LinearGradient(colors: [ - Theme.of(context).accentColor, + Theme.of(context).colorScheme.secondary, Theme.of(context).scaffoldBackgroundColor, Theme.of(context).primaryColor, ], begin: Alignment.topRight, end: Alignment.bottomLeft)), @@ -99,7 +99,10 @@ class _DashboardPageView extends BasePage { @override Widget trailing(BuildContext context) { final menuButton = Image.asset('assets/images/menu.png', - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!); + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor); return Container( alignment: Alignment.centerRight, @@ -167,7 +170,7 @@ class _DashboardPageView extends BasePage { dotColor: Theme.of(context).indicatorColor, activeDotColor: Theme.of(context) .accentTextTheme! - .headline4! + .headlineMedium! .backgroundColor!), ), ); @@ -186,7 +189,10 @@ class _DashboardPageView extends BasePage { : Colors.transparent, width: 1, ), - color: Theme.of(context).textTheme.headline6!.backgroundColor!, + color: Theme.of(context) + .textTheme! + .titleLarge! + .backgroundColor!, ), child: Container( padding: EdgeInsets.only(left: 32, right: 32), @@ -207,12 +213,12 @@ class _DashboardPageView extends BasePage { dashboardViewModel) ?? true ? Theme.of(context) - .accentTextTheme - .headline2! + .accentTextTheme! + .displayMedium! .backgroundColor! : Theme.of(context) - .accentTextTheme - .headline3! + .accentTextTheme! + .displaySmall! .backgroundColor!), title: action.name(context), onClick: () async => await action.onTap( @@ -222,8 +228,8 @@ class _DashboardPageView extends BasePage { true ? null : Theme.of(context) - .accentTextTheme - .headline3! + .accentTextTheme! + .displaySmall! .backgroundColor!, ), )) diff --git a/lib/src/screens/dashboard/desktop_dashboard_page.dart b/lib/src/screens/dashboard/desktop_dashboard_page.dart index df74a3f6f..2332f4db6 100644 --- a/lib/src/screens/dashboard/desktop_dashboard_page.dart +++ b/lib/src/screens/dashboard/desktop_dashboard_page.dart @@ -37,7 +37,7 @@ class DesktopDashboardPage extends StatelessWidget { _setEffects(context); return Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/lib/src/screens/dashboard/desktop_widgets/desktop_action_button.dart b/lib/src/screens/dashboard/desktop_widgets/desktop_action_button.dart index 0e3588a17..6e6db72cc 100644 --- a/lib/src/screens/dashboard/desktop_widgets/desktop_action_button.dart +++ b/lib/src/screens/dashboard/desktop_widgets/desktop_action_button.dart @@ -30,7 +30,7 @@ class DesktopActionButton extends StatelessWidget { width: double.infinity, decoration: BoxDecoration( borderRadius: BorderRadius.circular(15.0), - color: Theme.of(context).textTheme.headline6!.backgroundColor!, + color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!, ), child: Center( child: Row( @@ -41,8 +41,14 @@ class DesktopActionButton extends StatelessWidget { height: 30, width: 30, color: isEnabled - ? Theme.of(context).accentTextTheme.headline2!.backgroundColor! - : Theme.of(context).accentTextTheme.headline3!.backgroundColor!, + ? Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor! + : Theme.of(context) + .accentTextTheme! + .displaySmall! + .backgroundColor!, ), const SizedBox(width: 10), AutoSizeText( @@ -52,7 +58,10 @@ class DesktopActionButton extends StatelessWidget { fontFamily: 'Lato', fontWeight: FontWeight.bold, color: isEnabled - ? Theme.of(context).accentTextTheme.headline2!.backgroundColor! + ? Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor! : null, height: 1, ), diff --git a/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart b/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart index 42f4b0e4e..74ad54870 100644 --- a/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart +++ b/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart @@ -16,7 +16,7 @@ class SideMenuItem extends StatelessWidget { Color _setColor(BuildContext context) { if (isSelected) { - return Theme.of(context).primaryTextTheme.headline6!.color!; + return Theme.of(context).primaryTextTheme!.titleLarge!.color!; } else { return Theme.of(context).highlightColor; } diff --git a/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart b/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart index 72e65da34..31348aed4 100644 --- a/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart +++ b/lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart @@ -126,7 +126,7 @@ class DesktopSidebarWrapper extends BasePage { children: [ child, Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, padding: EdgeInsets.all(20), child: Navigator( initialRoute: Routes.support, diff --git a/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart b/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart index a8f050002..501252978 100644 --- a/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart +++ b/lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart @@ -36,14 +36,14 @@ class _DesktopWalletSelectionDropDownState extends State Image.asset( 'assets/images/restore_wallet.png', height: 12, width: 12, - color: Theme.of(context).primaryTextTheme.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ); Flushbar? _progressBar; @@ -93,8 +93,8 @@ class _DesktopWalletSelectionDropDownState extends State dropDownItems.map((item) => item.child).toList(), value: dropDownItems.firstWhere((element) => element.isSelected), underline: const SizedBox(), diff --git a/lib/src/screens/dashboard/desktop_widgets/dropdown_item_widget.dart b/lib/src/screens/dashboard/desktop_widgets/dropdown_item_widget.dart index 47efd04a7..14dcbb0d8 100644 --- a/lib/src/screens/dashboard/desktop_widgets/dropdown_item_widget.dart +++ b/lib/src/screens/dashboard/desktop_widgets/dropdown_item_widget.dart @@ -23,7 +23,7 @@ class DropDownItemWidget extends StatelessWidget { style: TextStyle( fontSize: 22, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), overflow: TextOverflow.ellipsis, maxLines: 1, diff --git a/lib/src/screens/dashboard/widgets/action_button.dart b/lib/src/screens/dashboard/widgets/action_button.dart index e9ef3669a..a3626fe3f 100644 --- a/lib/src/screens/dashboard/widgets/action_button.dart +++ b/lib/src/screens/dashboard/widgets/action_button.dart @@ -45,7 +45,11 @@ class ActionButton extends StatelessWidget { title, style: TextStyle( fontSize: 10, - color: textColor ?? Theme.of(context).accentTextTheme!.headline2!.backgroundColor!), + color: textColor ?? + Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!), ) ], ), diff --git a/lib/src/screens/dashboard/widgets/address_page.dart b/lib/src/screens/dashboard/widgets/address_page.dart index 975887a7a..a5fac2053 100644 --- a/lib/src/screens/dashboard/widgets/address_page.dart +++ b/lib/src/screens/dashboard/widgets/address_page.dart @@ -63,7 +63,10 @@ class AddressPage extends BasePage { Widget? leading(BuildContext context) { final _backButton = Icon( Icons.arrow_back_ios, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, size: 16, ); final _closeButton = currentTheme.type == ThemeType.dark @@ -106,7 +109,7 @@ class AddressPage extends BasePage { (BuildContext context, Widget scaffold) => Container( decoration: BoxDecoration( gradient: LinearGradient(colors: [ - Theme.of(context).accentColor, + Theme.of(context).colorScheme.secondary, Theme.of(context).scaffoldBackgroundColor, Theme.of(context).primaryColor, ], begin: Alignment.topRight, end: Alignment.bottomLeft)), @@ -131,7 +134,10 @@ class AddressPage extends BasePage { icon: Icon( Icons.share, size: 20, - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, ), ), ); @@ -172,7 +178,10 @@ class AddressPage extends BasePage { tapOutsideToDismiss: true, config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!, + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .backgroundColor!, nextFocus: false, actions: [ KeyboardActionsItem( @@ -204,8 +213,15 @@ class AddressPage extends BasePage { decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(25)), border: Border.all( - color: Theme.of(context).textTheme.subtitle1!.color!, width: 1), - color: Theme.of(context).buttonColor), + color: Theme.of(context) + .textTheme! + .titleMedium! + .color!, + width: 1), + color: Theme.of(context) + .textTheme! + .titleLarge! + .backgroundColor!), child: Row( mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -219,15 +235,17 @@ class AddressPage extends BasePage { fontSize: 14, fontWeight: FontWeight.w500, color: Theme.of(context) - .accentTextTheme - .headline2! + .accentTextTheme! + .displayMedium! .backgroundColor!), )), Icon( Icons.arrow_forward_ios, size: 14, - color: - Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, ) ], ), @@ -237,7 +255,10 @@ class AddressPage extends BasePage { textAlign: TextAlign.center, style: TextStyle( fontSize: 15, - color: Theme.of(context).accentTextTheme.headline3!.backgroundColor!)); + color: Theme.of(context) + .accentTextTheme! + .displaySmall! + .backgroundColor!)); }) ], ), diff --git a/lib/src/screens/dashboard/widgets/anonpay_transaction_row.dart b/lib/src/screens/dashboard/widgets/anonpay_transaction_row.dart index 38f0ffd88..3b33e8e22 100644 --- a/lib/src/screens/dashboard/widgets/anonpay_transaction_row.dart +++ b/lib/src/screens/dashboard/widgets/anonpay_transaction_row.dart @@ -37,19 +37,19 @@ class AnonpayTransactionRow extends StatelessWidget { style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!)), + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!)), Text(amount + ' ' + currency, style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!)) + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!)) ]), SizedBox(height: 5), Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text(createdAt, style: TextStyle( fontSize: 14, - color: Theme.of(context).textTheme.overline!.backgroundColor!)) + color: Theme.of(context).textTheme!.labelSmall!.backgroundColor!)) ]) ], )) diff --git a/lib/src/screens/dashboard/widgets/balance_page.dart b/lib/src/screens/dashboard/widgets/balance_page.dart index 14933e7c5..6e2893429 100644 --- a/lib/src/screens/dashboard/widgets/balance_page.dart +++ b/lib/src/screens/dashboard/widgets/balance_page.dart @@ -35,7 +35,10 @@ class BalancePage extends StatelessWidget { fontSize: 24, fontFamily: 'Lato', fontWeight: FontWeight.w600, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, height: 1), maxLines: 1, textAlign: TextAlign.center); @@ -98,7 +101,7 @@ class BalancePage extends StatelessWidget { : Colors.transparent, width: 1, ), - color: Theme.of(context).textTheme!.headline6!.backgroundColor!), + color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!), child: Container( margin: const EdgeInsets.only(top: 16, left: 24, right: 24, bottom: 24), child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -111,7 +114,10 @@ class BalancePage extends StatelessWidget { fontSize: 12, fontFamily: 'Lato', fontWeight: FontWeight.w400, - color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displaySmall! + .backgroundColor!, height: 1)), SizedBox(height: 5), Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ @@ -120,7 +126,10 @@ class BalancePage extends StatelessWidget { fontSize: 24, fontFamily: 'Lato', fontWeight: FontWeight.w900, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, height: 1), maxLines: 1, textAlign: TextAlign.center), @@ -129,7 +138,10 @@ class BalancePage extends StatelessWidget { fontSize: 28, fontFamily: 'Lato', fontWeight: FontWeight.w800, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, height: 1)), ]), SizedBox( @@ -141,7 +153,10 @@ class BalancePage extends StatelessWidget { fontSize: 16, fontFamily: 'Lato', fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, height: 1)), SizedBox(height: 26), if (frozenBalance.isNotEmpty) @@ -152,7 +167,10 @@ class BalancePage extends StatelessWidget { fontSize: 12, fontFamily: 'Lato', fontWeight: FontWeight.w400, - color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displaySmall! + .backgroundColor!, height: 1)), SizedBox(height: 8), AutoSizeText(frozenBalance, @@ -160,7 +178,10 @@ class BalancePage extends StatelessWidget { fontSize: 20, fontFamily: 'Lato', fontWeight: FontWeight.w400, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, height: 1), maxLines: 1, textAlign: TextAlign.center), @@ -172,7 +193,10 @@ class BalancePage extends StatelessWidget { fontSize: 12, fontFamily: 'Lato', fontWeight: FontWeight.w400, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, height: 1), ), SizedBox(height: 24) @@ -183,7 +207,10 @@ class BalancePage extends StatelessWidget { fontSize: 12, fontFamily: 'Lato', fontWeight: FontWeight.w400, - color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displaySmall! + .backgroundColor!, height: 1)), SizedBox(height: 8), AutoSizeText(additionalBalance, @@ -191,7 +218,10 @@ class BalancePage extends StatelessWidget { fontSize: 20, fontFamily: 'Lato', fontWeight: FontWeight.w400, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, height: 1), maxLines: 1, textAlign: TextAlign.center), @@ -205,7 +235,10 @@ class BalancePage extends StatelessWidget { fontSize: 12, fontFamily: 'Lato', fontWeight: FontWeight.w400, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, height: 1), ) ])), diff --git a/lib/src/screens/dashboard/widgets/date_section_raw.dart b/lib/src/screens/dashboard/widgets/date_section_raw.dart index e5f1625f7..7abaa0ba7 100644 --- a/lib/src/screens/dashboard/widgets/date_section_raw.dart +++ b/lib/src/screens/dashboard/widgets/date_section_raw.dart @@ -36,6 +36,9 @@ class DateSectionRaw extends StatelessWidget { child: Text(title, style: TextStyle( fontSize: 12, - color: Theme.of(context).textTheme!.overline!.backgroundColor!))); + color: Theme.of(context) + .textTheme! + .labelSmall! + .backgroundColor!))); } } diff --git a/lib/src/screens/dashboard/widgets/filter_widget.dart b/lib/src/screens/dashboard/widgets/filter_widget.dart index 456ed95f7..da13208bc 100644 --- a/lib/src/screens/dashboard/widgets/filter_widget.dart +++ b/lib/src/screens/dashboard/widgets/filter_widget.dart @@ -23,7 +23,7 @@ class FilterWidget extends StatelessWidget { child: ClipRRect( borderRadius: BorderRadius.all(Radius.circular(24)), child: Container( - color: Theme.of(context).textTheme!.bodyText1!.decorationColor!, + color: Theme.of(context).textTheme!.bodyLarge!.decorationColor!, child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -33,8 +33,8 @@ class FilterWidget extends StatelessWidget { S.of(context).filter_by, style: TextStyle( color: Theme.of(context) - .primaryTextTheme - .overline! + .primaryTextTheme! + .labelSmall! .color!, fontSize: 16, fontFamily: 'Lato', @@ -65,7 +65,7 @@ class FilterWidget extends StatelessWidget { style: TextStyle( color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!, fontSize: 16, fontFamily: 'Lato', diff --git a/lib/src/screens/dashboard/widgets/header_row.dart b/lib/src/screens/dashboard/widgets/header_row.dart index f3553c0e9..44fdb6c59 100644 --- a/lib/src/screens/dashboard/widgets/header_row.dart +++ b/lib/src/screens/dashboard/widgets/header_row.dart @@ -12,7 +12,7 @@ class HeaderRow extends StatelessWidget { @override Widget build(BuildContext context) { final filterIcon = Image.asset('assets/images/filter_icon.png', - color: Theme.of(context).textTheme!.caption!.decorationColor!); + color: Theme.of(context).textTheme!.bodySmall!.decorationColor!); return Container( height: 52, @@ -25,10 +25,12 @@ class HeaderRow extends StatelessWidget { Text( S.of(context).transactions, style: TextStyle( - fontSize: 20, - fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor! - ), + fontSize: 20, + fontWeight: FontWeight.w500, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!), ), GestureDetector( onTap: () { @@ -43,8 +45,7 @@ class HeaderRow extends StatelessWidget { width: 36, decoration: BoxDecoration( shape: BoxShape.circle, - color: Theme.of(context).textTheme!.overline!.color! - ), + color: Theme.of(context).textTheme!.labelSmall!.color!), child: filterIcon, ), ) diff --git a/lib/src/screens/dashboard/widgets/market_place_page.dart b/lib/src/screens/dashboard/widgets/market_place_page.dart index 9ac225634..fe0eb9ec8 100644 --- a/lib/src/screens/dashboard/widgets/market_place_page.dart +++ b/lib/src/screens/dashboard/widgets/market_place_page.dart @@ -22,7 +22,7 @@ class MarketPlacePage extends StatelessWidget { child: RawScrollbar( thumbColor: Colors.white.withOpacity(0.15), radius: Radius.circular(20), - isAlwaysShown: true, + thumbVisibility: true, thickness: 2, controller: _scrollController, child: Padding( @@ -36,7 +36,10 @@ class MarketPlacePage extends StatelessWidget { style: TextStyle( fontSize: 24, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, ), ), Expanded( diff --git a/lib/src/screens/dashboard/widgets/menu_widget.dart b/lib/src/screens/dashboard/widgets/menu_widget.dart index ac1835869..56b2e87e6 100644 --- a/lib/src/screens/dashboard/widgets/menu_widget.dart +++ b/lib/src/screens/dashboard/widgets/menu_widget.dart @@ -84,9 +84,15 @@ class MenuWidgetState extends State { final itemCount = SettingActions.all.length; moneroIcon = Image.asset('assets/images/monero_menu.png', - color: Theme.of(context).accentTextTheme.overline!.decorationColor!); + color: Theme.of(context) + .accentTextTheme! + .labelSmall! + .decorationColor!); bitcoinIcon = Image.asset('assets/images/bitcoin_menu.png', - color: Theme.of(context).accentTextTheme.overline!.decorationColor!); + color: Theme.of(context) + .accentTextTheme! + .labelSmall! + .decorationColor!); litecoinIcon = Image.asset('assets/images/litecoin_menu.png'); havenIcon = Image.asset('assets/images/haven_menu.png'); @@ -108,7 +114,8 @@ class MenuWidgetState extends State { borderRadius: BorderRadius.only( topLeft: Radius.circular(24), bottomLeft: Radius.circular(24)), child: Container( - color: Theme.of(context).textTheme.bodyText1!.decorationColor!, + color: + Theme.of(context).textTheme!.bodyLarge!.decorationColor!, child: ListView.separated( padding: EdgeInsets.only(top: 0), itemBuilder: (_, index) { @@ -117,9 +124,14 @@ class MenuWidgetState extends State { height: headerHeight, decoration: BoxDecoration( gradient: LinearGradient(colors: [ - Theme.of(context).accentTextTheme.headline4!.color!, - Theme.of(context).accentTextTheme.headline4!.decorationColor!, - ], begin: Alignment.topLeft, end: Alignment.bottomRight), + Theme.of(context) + .accentTextTheme! + .headlineMedium! + .color!, + Theme.of(context) + .accentTextTheme! + .headlineMedium! + .decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight), ), padding: EdgeInsets.only( left: 24, top: fromTopEdge, right: 24, bottom: fromBottomEdge), @@ -149,8 +161,8 @@ class MenuWidgetState extends State { widget.dashboardViewModel.subname, style: TextStyle( color: Theme.of(context) - .accentTextTheme - .overline! + .accentTextTheme! + .labelSmall! .decorationColor!, fontWeight: FontWeight.w500, fontSize: 12), @@ -182,7 +194,10 @@ class MenuWidgetState extends State { }, separatorBuilder: (_, index) => Container( height: 1, - color: Theme.of(context).primaryTextTheme.caption!.decorationColor!, + color: Theme.of(context) + .primaryTextTheme! + .bodySmall! + .decorationColor!, ), itemCount: itemCount + 1), ))) diff --git a/lib/src/screens/dashboard/widgets/order_row.dart b/lib/src/screens/dashboard/widgets/order_row.dart index edfe0eb21..961f31784 100644 --- a/lib/src/screens/dashboard/widgets/order_row.dart +++ b/lib/src/screens/dashboard/widgets/order_row.dart @@ -20,7 +20,7 @@ class OrderRow extends StatelessWidget { @override Widget build(BuildContext context) { final iconColor = - Theme.of(context).primaryTextTheme!.headline1!.backgroundColor!; + Theme.of(context).primaryTextTheme!.displayLarge!.backgroundColor!; final providerIcon = getBuyProviderIcon(provider, iconColor: iconColor); @@ -48,14 +48,14 @@ class OrderRow extends StatelessWidget { style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor! + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor! )), formattedAmount != null ? Text(formattedAmount! + ' ' + to, style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor! + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor! )) : Container() ]), @@ -66,8 +66,10 @@ class OrderRow extends StatelessWidget { Text(createdAtFormattedDate, style: TextStyle( fontSize: 14, - color: Theme.of(context).textTheme! - .overline!.backgroundColor!)) + color: Theme.of(context) + .textTheme! + .labelSmall! + .backgroundColor!)) ]) ], ) diff --git a/lib/src/screens/dashboard/widgets/present_receive_option_picker.dart b/lib/src/screens/dashboard/widgets/present_receive_option_picker.dart index 7b02765b3..c29442450 100644 --- a/lib/src/screens/dashboard/widgets/present_receive_option_picker.dart +++ b/lib/src/screens/dashboard/widgets/present_receive_option_picker.dart @@ -18,7 +18,10 @@ class PresentReceiveOptionPicker extends StatelessWidget { @override Widget build(BuildContext context) { final textIconTheme = hasWhiteBackground - ? Theme.of(context).accentTextTheme.headline2!.backgroundColor! + ? Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor! : Colors.white; final arrowBottom = Image.asset( 'assets/images/arrow_bottom_purple_icon.png', @@ -83,7 +86,7 @@ class PresentReceiveOptionPicker extends StatelessWidget { margin: EdgeInsets.symmetric(horizontal: 24), decoration: BoxDecoration( borderRadius: BorderRadius.circular(30), - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, ), child: Padding( padding: const EdgeInsets.only(top: 24, bottom: 24), @@ -110,7 +113,10 @@ class PresentReceiveOptionPicker extends StatelessWidget { Text(option.toString(), textAlign: TextAlign.left, style: textSmall( - color: Theme.of(context).primaryTextTheme.headline6!.color!, + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!, ).copyWith( fontWeight: value == option ? FontWeight.w800 : FontWeight.w500, diff --git a/lib/src/screens/dashboard/widgets/sync_indicator.dart b/lib/src/screens/dashboard/widgets/sync_indicator.dart index 90da3b83f..11a973d6e 100644 --- a/lib/src/screens/dashboard/widgets/sync_indicator.dart +++ b/lib/src/screens/dashboard/widgets/sync_indicator.dart @@ -32,7 +32,7 @@ class SyncIndicator extends StatelessWidget { child: Container( height: 30, width: syncIndicatorWidth, - color: Theme.of(context).textTheme!.headline6!.decorationColor!, + color: Theme.of(context).textTheme!.titleLarge!.decorationColor!, child: Stack( alignment: Alignment.center, children: [ @@ -44,7 +44,7 @@ class SyncIndicator extends StatelessWidget { child: Container( width: indicatorWidth, height: 30, - color: Theme.of(context).textTheme!.headline6!.backgroundColor!, + color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!, ) ) : Offstage(), @@ -66,7 +66,7 @@ class SyncIndicator extends StatelessWidget { style: TextStyle( fontSize: 12, fontWeight: FontWeight.w500, - color: Theme.of(context).textTheme!.headline6!.color! + color: Theme.of(context).textTheme!.titleLarge!.color! ), ), ) diff --git a/lib/src/screens/dashboard/widgets/sync_indicator_icon.dart b/lib/src/screens/dashboard/widgets/sync_indicator_icon.dart index a73163824..0aa8fa7c5 100644 --- a/lib/src/screens/dashboard/widgets/sync_indicator_icon.dart +++ b/lib/src/screens/dashboard/widgets/sync_indicator_icon.dart @@ -26,14 +26,15 @@ class SyncIndicatorIcon extends StatelessWidget { if (boolMode) { indicatorColor = isSynced ? PaletteDark.brightGreen - : Theme.of(context).textTheme!.caption!.color!; + : Theme.of(context).textTheme!.bodySmall!.color!; } else { switch (value.toLowerCase()) { case waiting: indicatorColor = Colors.red; break; case actionRequired: - indicatorColor = Theme.of(context).textTheme!.headline2!.decorationColor!; + indicatorColor = + Theme.of(context).textTheme!.displayMedium!.decorationColor!; break; case created: indicatorColor = PaletteDark.brightGreen; diff --git a/lib/src/screens/dashboard/widgets/trade_row.dart b/lib/src/screens/dashboard/widgets/trade_row.dart index 3b613b0e2..754e9d237 100644 --- a/lib/src/screens/dashboard/widgets/trade_row.dart +++ b/lib/src/screens/dashboard/widgets/trade_row.dart @@ -43,14 +43,14 @@ class TradeRow extends StatelessWidget { style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!)), + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!)), formattedAmount != null ? Text(formattedAmount! + ' ' + amountCrypto, style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, color: - Theme.of(context).accentTextTheme!.headline2!.backgroundColor!)) + Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!)) : Container() ]), SizedBox(height: 5), @@ -59,7 +59,7 @@ class TradeRow extends StatelessWidget { Text(createdAtFormattedDate!, style: TextStyle( fontSize: 14, - color: Theme.of(context).textTheme!.overline!.backgroundColor!)) + color: Theme.of(context).textTheme!.labelSmall!.backgroundColor!)) ]) ], )) diff --git a/lib/src/screens/dashboard/widgets/transaction_raw.dart b/lib/src/screens/dashboard/widgets/transaction_raw.dart index b7d8cef93..aae3397ee 100644 --- a/lib/src/screens/dashboard/widgets/transaction_raw.dart +++ b/lib/src/screens/dashboard/widgets/transaction_raw.dart @@ -35,7 +35,7 @@ class TransactionRow extends StatelessWidget { width: 36, decoration: BoxDecoration( shape: BoxShape.circle, - color: Theme.of(context).textTheme!.overline!.decorationColor! + color: Theme.of(context).textTheme!.labelSmall!.decorationColor! ), child: Image.asset( direction == TransactionDirection.incoming @@ -55,13 +55,13 @@ class TransactionRow extends StatelessWidget { fontSize: 16, fontWeight: FontWeight.w500, color: Theme.of(context).accentTextTheme! - .headline2!.backgroundColor!)), + .displayMedium!.backgroundColor!)), Text(formattedAmount, style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, color: Theme.of(context).accentTextTheme! - .headline2!.backgroundColor!)) + .displayMedium!.backgroundColor!)) ]), SizedBox(height: 5), Row( @@ -72,14 +72,14 @@ class TransactionRow extends StatelessWidget { fontSize: 14, color: Theme.of(context) .textTheme! - .overline! + .labelSmall! .backgroundColor!)), Text(formattedFiatAmount, style: TextStyle( fontSize: 14, color: Theme.of(context) .textTheme! - .overline! + .labelSmall! .backgroundColor!)) ]) ], diff --git a/lib/src/screens/dashboard/widgets/transactions_page.dart b/lib/src/screens/dashboard/widgets/transactions_page.dart index 2efb38e89..c80edc8d9 100644 --- a/lib/src/screens/dashboard/widgets/transactions_page.dart +++ b/lib/src/screens/dashboard/widgets/transactions_page.dart @@ -28,7 +28,7 @@ class TransactionsPage extends StatelessWidget { return Container( color: ResponsiveLayoutUtil.instance.isMobile(context) ? null - : Theme.of(context).backgroundColor, + : Theme.of(context).colorScheme.background, padding: EdgeInsets.only(top: 24, bottom: 24), child: Column( children: [ @@ -121,7 +121,7 @@ class TransactionsPage extends StatelessWidget { S.of(context).placeholder_transactions, style: TextStyle( fontSize: 14, - color: Theme.of(context).primaryTextTheme.overline!.decorationColor!), + color: Theme.of(context).primaryTextTheme!.labelSmall!.decorationColor!), ), ); })) diff --git a/lib/src/screens/disclaimer/disclaimer_page.dart b/lib/src/screens/disclaimer/disclaimer_page.dart index b6ec835d9..1bb05eca0 100644 --- a/lib/src/screens/disclaimer/disclaimer_page.dart +++ b/lib/src/screens/disclaimer/disclaimer_page.dart @@ -67,7 +67,7 @@ class DisclaimerBodyState extends State { return WillPopScope( onWillPop: () async => false, child: Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: Column( children: [ SizedBox(height: 10.0), @@ -89,7 +89,7 @@ class DisclaimerBodyState extends State { fontWeight: FontWeight.bold, color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!), ), ) @@ -109,7 +109,7 @@ class DisclaimerBodyState extends State { fontWeight: FontWeight.bold, color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!), ), ) @@ -128,7 +128,7 @@ class DisclaimerBodyState extends State { fontWeight: FontWeight.normal, color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!), )) ], @@ -148,7 +148,7 @@ class DisclaimerBodyState extends State { fontWeight: FontWeight.bold, color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!), ), ) @@ -195,7 +195,7 @@ class DisclaimerBodyState extends State { Theme.of(context) .backgroundColor .withOpacity(0.0), - Theme.of(context).backgroundColor, + Theme.of(context).colorScheme.background, ], begin: FractionalOffset.topCenter, end: FractionalOffset.bottomCenter, @@ -234,12 +234,12 @@ class DisclaimerBodyState extends State { border: Border.all( color: Theme.of(context) .primaryTextTheme! - .caption! + .bodySmall! .color!, width: 1.0), borderRadius: BorderRadius.all( Radius.circular(8.0)), - color: Theme.of(context).backgroundColor), + color: Theme.of(context).colorScheme.background), child: _checked ? Icon( Icons.check, @@ -255,7 +255,7 @@ class DisclaimerBodyState extends State { fontSize: 14.0, color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!), ) ], @@ -275,11 +275,11 @@ class DisclaimerBodyState extends State { text: 'Accept', color: Theme.of(context) .accentTextTheme! - .subtitle2! + .titleSmall! .decorationColor!, textColor: Theme.of(context) .accentTextTheme! - .headline5! + .headlineSmall! .decorationColor!), ), ], diff --git a/lib/src/screens/exchange/exchange_page.dart b/lib/src/screens/exchange/exchange_page.dart index 0254ef0d4..6eea29b42 100644 --- a/lib/src/screens/exchange/exchange_page.dart +++ b/lib/src/screens/exchange/exchange_page.dart @@ -151,7 +151,7 @@ class ExchangePage extends BasePage { config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, keyboardBarColor: - Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!, + Theme.of(context).accentTextTheme!.bodyLarge!.backgroundColor!, nextFocus: false, actions: [ KeyboardActionsItem( @@ -162,7 +162,7 @@ class ExchangePage extends BasePage { toolbarButtons: [(_) => KeyboardDoneButton()]) ]), child: Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: Form( key: _formKey, child: ScrollableWithBottomSection( @@ -209,7 +209,7 @@ class ExchangePage extends BasePage { style: TextStyle( color: Theme.of(context) .primaryTextTheme! - .headline1! + .displayLarge! .decorationColor!, fontWeight: FontWeight.w500, fontSize: 12), @@ -243,7 +243,7 @@ class ExchangePage extends BasePage { } } }, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!, textColor: Colors.white, isDisabled: exchangeViewModel.selectedProviders.isEmpty, isLoading: exchangeViewModel.tradeState is TradeIsCreating)), @@ -654,7 +654,7 @@ class ExchangePage extends BasePage { imageArrow: arrowBottomPurple, currencyButtonColor: Colors.transparent, addressButtonsColor: Theme.of(context).focusColor!, - borderColor: Theme.of(context).primaryTextTheme!.bodyText1!.color!, + borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.color!, currencyValueValidator: (value) { return !exchangeViewModel.isFixedRateMode ? AmountValidator( @@ -704,7 +704,7 @@ class ExchangePage extends BasePage { currencyButtonColor: Colors.transparent, addressButtonsColor: Theme.of(context).focusColor!, borderColor: - Theme.of(context).primaryTextTheme!.bodyText1!.decorationColor!, + Theme.of(context).primaryTextTheme!.bodyLarge!.decorationColor!, currencyValueValidator: (value) { return exchangeViewModel.isFixedRateMode ? AmountValidator( diff --git a/lib/src/screens/exchange/exchange_template_page.dart b/lib/src/screens/exchange/exchange_template_page.dart index 00eee49c2..ddd2c90b7 100644 --- a/lib/src/screens/exchange/exchange_template_page.dart +++ b/lib/src/screens/exchange/exchange_template_page.dart @@ -73,8 +73,10 @@ class ExchangeTemplatePage extends BasePage { disableScroll: true, config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: - Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!, + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .backgroundColor!, nextFocus: false, actions: [ KeyboardActionsItem( @@ -85,7 +87,7 @@ class ExchangeTemplatePage extends BasePage { toolbarButtons: [(_) => KeyboardDoneButton()]) ]), child: Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: Form( key: _formKey, child: ScrollableWithBottomSection( @@ -99,8 +101,8 @@ class ExchangeTemplatePage extends BasePage { ), gradient: LinearGradient( colors: [ - Theme.of(context).primaryTextTheme.bodyText2!.color!, - Theme.of(context).primaryTextTheme.bodyText2!.decorationColor!, + Theme.of(context).primaryTextTheme!.bodyMedium!.color!, + Theme.of(context).primaryTextTheme!.bodyMedium!.decorationColor!, ], stops: [0.35, 1.0], begin: Alignment.topLeft, @@ -119,10 +121,10 @@ class ExchangeTemplatePage extends BasePage { gradient: LinearGradient( colors: [ Theme.of(context) - .primaryTextTheme.subtitle2! + .primaryTextTheme!.titleSmall! .color!, Theme.of(context) - .primaryTextTheme.subtitle2! + .primaryTextTheme!.titleSmall! .decorationColor!, ], begin: Alignment.topLeft, @@ -157,7 +159,7 @@ class ExchangeTemplatePage extends BasePage { addressButtonsColor: Theme.of(context).focusColor, borderColor: Theme.of(context) - .primaryTextTheme.bodyText1! + .primaryTextTheme!.bodyLarge! .color!, currencyValueValidator: AmountValidator( currency: exchangeViewModel.depositCurrency), @@ -197,7 +199,7 @@ class ExchangeTemplatePage extends BasePage { addressButtonsColor: Theme.of(context).focusColor, borderColor: Theme.of(context) - .primaryTextTheme.bodyText1! + .primaryTextTheme!.bodyLarge! .decorationColor!, currencyValueValidator: AmountValidator( currency: exchangeViewModel.receiveCurrency), @@ -225,7 +227,7 @@ class ExchangeTemplatePage extends BasePage { textAlign: TextAlign.center, style: TextStyle( color: Theme.of(context) - .primaryTextTheme.headline1! + .primaryTextTheme!.displayLarge! .decorationColor!, fontWeight: FontWeight.w500, fontSize: 12), diff --git a/lib/src/screens/exchange/widgets/currency_picker_item_widget.dart b/lib/src/screens/exchange/widgets/currency_picker_item_widget.dart index 88aaaedd3..3dc0f80e3 100644 --- a/lib/src/screens/exchange/widgets/currency_picker_item_widget.dart +++ b/lib/src/screens/exchange/widgets/currency_picker_item_widget.dart @@ -20,7 +20,10 @@ class PickerItemWidget extends StatelessWidget { return GestureDetector( onTap: onTap, child: Container( - color: Theme.of(context).accentTextTheme!.headline6!.color!, + color: Theme.of(context) + .accentTextTheme! + .titleLarge! + .color!, child: Padding( padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 24), child: Row( @@ -39,7 +42,12 @@ class PickerItemWidget extends StatelessWidget { Text( title.toUpperCase(), style: TextStyle( - color: isSelected ? Palette.blueCraiola : Theme.of(context).primaryTextTheme!.headline6!.color!, + color: isSelected + ? Palette.blueCraiola + : Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!, fontSize: isSelected ? 16 : 14.0, fontFamily: 'Lato', fontWeight: FontWeight.w600, @@ -55,20 +63,33 @@ class PickerItemWidget extends StatelessWidget { child: Text( tag!, style: TextStyle( - fontSize: 7.0, fontFamily: 'Lato', color: Theme.of(context).textTheme!.bodyText2!.color!), + fontSize: 7.0, + fontFamily: 'Lato', + color: Theme.of(context) + .textTheme! + .bodyMedium! + .color!), ), ), decoration: BoxDecoration( borderRadius: BorderRadius.circular(6.0), //border: Border.all(color: ), - color: Theme.of(context).textTheme!.bodyText2!.decorationColor!, + color: Theme.of(context) + .textTheme! + .bodyMedium! + .decorationColor!, ), ), ), ], ), ), - if (isSelected) Icon(Icons.check_circle, color: Theme.of(context).accentTextTheme!.bodyText1!.color!) + if (isSelected) + Icon(Icons.check_circle, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!) ], ), ), diff --git a/lib/src/screens/exchange/widgets/currency_picker_widget.dart b/lib/src/screens/exchange/widgets/currency_picker_widget.dart index ae7fa052e..de835fe18 100644 --- a/lib/src/screens/exchange/widgets/currency_picker_widget.dart +++ b/lib/src/screens/exchange/widgets/currency_picker_widget.dart @@ -20,7 +20,10 @@ class CurrencyPickerWidget extends StatelessWidget { @override Widget build(BuildContext context) { return Container( - color: Theme.of(context).accentTextTheme!.headline6!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .titleLarge! + .backgroundColor!, child: Scrollbar( controller: _scrollController, child: GridView.builder( diff --git a/lib/src/screens/exchange/widgets/exchange_card.dart b/lib/src/screens/exchange/widgets/exchange_card.dart index ae92fa0c1..f77e885c2 100644 --- a/lib/src/screens/exchange/widgets/exchange_card.dart +++ b/lib/src/screens/exchange/widgets/exchange_card.dart @@ -160,7 +160,7 @@ class ExchangeCardState extends State { final copyImage = Image.asset('assets/images/copy_content.png', height: 16, width: 16, - color: Theme.of(context).primaryTextTheme.headline3!.color!); + color: Theme.of(context).primaryTextTheme!.displaySmall!.color!); return Container( width: double.infinity, @@ -175,7 +175,7 @@ class ExchangeCardState extends State { style: TextStyle( fontSize: 18, fontWeight: FontWeight.w600, - color: Theme.of(context).textTheme.headline5!.color!), + color: Theme.of(context).textTheme!.headlineSmall!.color!), ) ], ), @@ -210,7 +210,11 @@ class ExchangeCardState extends State { child: Container( height: 32, decoration: BoxDecoration( - color: widget.addressButtonsColor ?? Theme.of(context).primaryTextTheme.headline4!.color!, + color: widget.addressButtonsColor ?? + Theme.of(context) + .primaryTextTheme! + .headlineMedium! + .color!, borderRadius: BorderRadius.all(Radius.circular(6))), child: Center( @@ -221,7 +225,8 @@ class ExchangeCardState extends State { fontSize: 12, fontWeight: FontWeight.bold, color: Theme.of(context) - .primaryTextTheme.headline4! + .primaryTextTheme! + .headlineMedium! .decorationColor!)), ), ), @@ -264,7 +269,8 @@ class ExchangeCardState extends State { fontSize: 16, fontWeight: FontWeight.w600, color: Theme.of(context) - .accentTextTheme.headline1! + .accentTextTheme! + .displayLarge! .decorationColor!), validator: _isAmountEditable ? widget.currencyValueValidator @@ -277,7 +283,8 @@ class ExchangeCardState extends State { width: 32, decoration: BoxDecoration( color: Theme.of(context) - .primaryTextTheme.headline4! + .primaryTextTheme! + .headlineMedium! .color!, borderRadius: BorderRadius.all(Radius.circular(6))), @@ -290,7 +297,8 @@ class ExchangeCardState extends State { fontSize: 12, fontWeight: FontWeight.bold, color: Theme.of(context) - .primaryTextTheme.headline4! + .primaryTextTheme! + .headlineMedium! .decorationColor!)), ), ), @@ -300,9 +308,12 @@ class ExchangeCardState extends State { ), ], )), - Divider(height: 1,color: Theme.of(context) - .primaryTextTheme.headline5! - .decorationColor!), + Divider( + height: 1, + color: Theme.of(context) + .primaryTextTheme! + .headlineSmall! + .decorationColor!), Padding( padding: EdgeInsets.only(top: 5), child: Container( @@ -319,7 +330,8 @@ class ExchangeCardState extends State { fontSize: 10, height: 1.2, color: Theme.of(context) - .accentTextTheme.headline1! + .accentTextTheme! + .displayLarge! .decorationColor!), ) : Offstage(), @@ -333,7 +345,8 @@ class ExchangeCardState extends State { fontSize: 10, height: 1.2, color: Theme.of(context) - .accentTextTheme.headline1! + .accentTextTheme! + .displayLarge! .decorationColor!)) : Offstage(), ])), @@ -347,7 +360,8 @@ class ExchangeCardState extends State { fontSize: 14, fontWeight: FontWeight.w500, color: Theme.of(context) - .accentTextTheme.headline1! + .accentTextTheme! + .displayLarge! .decorationColor!), )) : Offstage(), @@ -387,7 +401,8 @@ class ExchangeCardState extends State { fontSize: 16, fontWeight: FontWeight.w600, color: Theme.of(context) - .accentTextTheme.headline1! + .accentTextTheme! + .displayLarge! .decorationColor!), buttonColor: widget.addressButtonsColor, validator: widget.addressTextFieldValidator, @@ -458,7 +473,8 @@ class ExchangeCardState extends State { child: Image.asset( 'assets/images/open_book.png', color: Theme.of(context) - .primaryTextTheme.headline4! + .primaryTextTheme! + .headlineMedium! .decorationColor!, )), )), diff --git a/lib/src/screens/exchange/widgets/mobile_exchange_cards_section.dart b/lib/src/screens/exchange/widgets/mobile_exchange_cards_section.dart index 762c36a55..61da007f1 100644 --- a/lib/src/screens/exchange/widgets/mobile_exchange_cards_section.dart +++ b/lib/src/screens/exchange/widgets/mobile_exchange_cards_section.dart @@ -21,8 +21,8 @@ class MobileExchangeCardsSection extends StatelessWidget { ), gradient: LinearGradient( colors: [ - Theme.of(context).primaryTextTheme.bodyText2!.color!, - Theme.of(context).primaryTextTheme.bodyText2!.decorationColor!, + Theme.of(context).primaryTextTheme!.bodyMedium!.color!, + Theme.of(context).primaryTextTheme!.bodyMedium!.decorationColor!, ], stops: [0.35, 1.0], begin: Alignment.topLeft, @@ -37,8 +37,11 @@ class MobileExchangeCardsSection extends StatelessWidget { bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)), gradient: LinearGradient( colors: [ - Theme.of(context).primaryTextTheme.subtitle2!.color!, - Theme.of(context).primaryTextTheme.subtitle2!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleSmall!.color!, + Theme.of(context) + .primaryTextTheme! + .titleSmall! + .decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight, diff --git a/lib/src/screens/exchange/widgets/present_provider_picker.dart b/lib/src/screens/exchange/widgets/present_provider_picker.dart index 9300aaf89..20d3bf70c 100644 --- a/lib/src/screens/exchange/widgets/present_provider_picker.dart +++ b/lib/src/screens/exchange/widgets/present_provider_picker.dart @@ -49,7 +49,10 @@ class PresentProviderPicker extends StatelessWidget { style: TextStyle( fontSize: 10.0, fontWeight: FontWeight.w500, - color: Theme.of(context).textTheme.headline5!.color!))) + color: Theme.of(context) + .textTheme! + .headlineSmall! + .color!))) ], ), SizedBox(width: 5), diff --git a/lib/src/screens/exchange_trade/exchange_confirm_page.dart b/lib/src/screens/exchange_trade/exchange_confirm_page.dart index 9bd217816..e4422c36f 100644 --- a/lib/src/screens/exchange_trade/exchange_confirm_page.dart +++ b/lib/src/screens/exchange_trade/exchange_confirm_page.dart @@ -36,7 +36,10 @@ class ExchangeConfirmPage extends BasePage { style: TextStyle( fontSize: 18.0, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme!.headline6!.color!), + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!), ), )), Container( @@ -45,8 +48,14 @@ class ExchangeConfirmPage extends BasePage { borderRadius: BorderRadius.all(Radius.circular(30)), border: Border.all( width: 1, - color: Theme.of(context).accentTextTheme!.caption!.color!), - color: Theme.of(context).accentTextTheme!.headline6!.color!), + color: Theme.of(context) + .accentTextTheme! + .bodySmall! + .color!), + color: Theme.of(context) + .accentTextTheme! + .titleLarge! + .color!), child: Column( children: [ Expanded( @@ -63,7 +72,7 @@ class ExchangeConfirmPage extends BasePage { fontWeight: FontWeight.w500, color: Theme.of(context) .primaryTextTheme! - .overline! + .labelSmall! .color!), ), Text( @@ -75,7 +84,7 @@ class ExchangeConfirmPage extends BasePage { fontWeight: FontWeight.w600, color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!), ), ], @@ -93,10 +102,12 @@ class ExchangeConfirmPage extends BasePage { text: S.of(context).copy_id, color: Theme.of(context) .accentTextTheme! - .caption! + .bodySmall! .backgroundColor!, - textColor: - Theme.of(context).primaryTextTheme!.headline6!.color!), + textColor: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!), ), ) ], @@ -125,7 +136,10 @@ class ExchangeConfirmPage extends BasePage { onPressed: () => Navigator.of(context) .pushReplacementNamed(Routes.exchangeTrade), text: S.of(context).saved_the_trade_id, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white) ], ), diff --git a/lib/src/screens/exchange_trade/exchange_trade_page.dart b/lib/src/screens/exchange_trade/exchange_trade_page.dart index f06e879a9..b230488cc 100644 --- a/lib/src/screens/exchange_trade/exchange_trade_page.dart +++ b/lib/src/screens/exchange_trade/exchange_trade_page.dart @@ -51,7 +51,7 @@ class ExchangeTradePage extends BasePage { @override Widget trailing(BuildContext context) { final questionImage = Image.asset('assets/images/question_mark.png', - color: Theme.of(context).primaryTextTheme!.headline6!.color!); + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!); return SizedBox( height: 20.0, @@ -111,7 +111,7 @@ class ExchangeTradeState extends State { final copyImage = Image.asset('assets/images/copy_content.png', height: 16, width: 16, - color: Theme.of(context).primaryTextTheme!.overline!.color!); + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!); _setEffects(); @@ -135,14 +135,14 @@ class ExchangeTradeState extends State { fontWeight: FontWeight.w500, color: Theme.of(context) .primaryTextTheme! - .overline! + .labelSmall! .color!), ), if (trade.expiredAt != null) TimerWidget(trade.expiredAt!, color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!) ]) : Offstage(), @@ -162,7 +162,7 @@ class ExchangeTradeState extends State { width: 3, color: Theme.of(context) .accentTextTheme! - .subtitle2! + .titleSmall! .color! ) ), @@ -181,7 +181,7 @@ class ExchangeTradeState extends State { height: 1, color: Theme.of(context) .accentTextTheme! - .subtitle2! + .titleSmall! .backgroundColor!, ), itemBuilder: (context, index) { @@ -228,7 +228,10 @@ class ExchangeTradeState extends State { onPressed: () => widget.exchangeTradeViewModel.confirmSending(), text: S.of(context).confirm, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white) : Offstage(); })), @@ -340,7 +343,7 @@ class ExchangeTradeState extends State { fontWeight: FontWeight.bold, color: Theme.of(popupContext) .primaryTextTheme! - .headline6! + .titleLarge! .color, decoration: TextDecoration.none, ), @@ -359,7 +362,7 @@ class ExchangeTradeState extends State { text: S.of(popupContext).send_got_it, color: Theme.of(popupContext) .accentTextTheme! - .bodyText1! + .bodyLarge! .color!, textColor: Colors.white)) ], @@ -392,7 +395,10 @@ class ExchangeTradeState extends State { style: TextStyle( fontSize: 22, fontWeight: FontWeight.bold, - color: Theme.of(popupContext).primaryTextTheme!.headline6!.color!, + color: Theme.of(popupContext) + .primaryTextTheme! + .titleLarge! + .color!, decoration: TextDecoration.none, ), ), diff --git a/lib/src/screens/exchange_trade/information_page.dart b/lib/src/screens/exchange_trade/information_page.dart index 4d9cc9b3c..76c2d5c1a 100644 --- a/lib/src/screens/exchange_trade/information_page.dart +++ b/lib/src/screens/exchange_trade/information_page.dart @@ -21,7 +21,7 @@ class InformationPage extends StatelessWidget { ), decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(30)), - color: Theme.of(context).textTheme!.bodyText1!.decorationColor! + color: Theme.of(context).textTheme!.bodyLarge!.decorationColor! ), child: Column( mainAxisSize: MainAxisSize.min, @@ -35,7 +35,7 @@ class InformationPage extends StatelessWidget { fontWeight: FontWeight.normal, fontFamily: 'Lato', decoration: TextDecoration.none, - color: Theme.of(context).accentTextTheme!.caption!.decorationColor! + color: Theme.of(context).accentTextTheme!.bodySmall!.decorationColor! ), ), ), @@ -44,8 +44,8 @@ class InformationPage extends StatelessWidget { child: PrimaryButton( onPressed: () => Navigator.of(context).pop(), text: S.of(context).send_got_it, - color: Theme.of(context).accentTextTheme!.caption!.backgroundColor!, - textColor: Theme.of(context).primaryTextTheme!.headline6!.color! + color: Theme.of(context).accentTextTheme!.bodySmall!.backgroundColor!, + textColor: Theme.of(context).primaryTextTheme!.titleLarge!.color! ), ) ], diff --git a/lib/src/screens/faq/faq_item.dart b/lib/src/screens/faq/faq_item.dart index 5827f71a0..c41adf399 100644 --- a/lib/src/screens/faq/faq_item.dart +++ b/lib/src/screens/faq/faq_item.dart @@ -25,13 +25,13 @@ class FAQItemState extends State { @override Widget build(BuildContext context) { - final addIcon = - Icon(Icons.add, color: Theme.of(context).primaryTextTheme!.headline6!.color!); + final addIcon = Icon(Icons.add, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!); final removeIcon = Icon(Icons.remove, color: Palette.blueCraiola); final icon = isActive ? removeIcon : addIcon; final color = isActive ? Palette.blueCraiola - : Theme.of(context).primaryTextTheme!.headline6!.color!; + : Theme.of(context).primaryTextTheme!.titleLarge!.color!; return ListTileTheme( contentPadding: EdgeInsets.fromLTRB(0, 6, 24, 6), @@ -53,7 +53,8 @@ class FAQItemState extends State { style: TextStyle( fontSize: 14, fontWeight: FontWeight.normal, - color: Theme.of(context).primaryTextTheme!.headline6!.color!), + color: + Theme.of(context).primaryTextTheme!.titleLarge!.color!), ), )) ]) 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 abdf3501c..3c8c71290 100644 --- a/lib/src/screens/ionia/auth/ionia_create_account_page.dart +++ b/lib/src/screens/ionia/auth/ionia_create_account_page.dart @@ -40,7 +40,10 @@ class IoniaCreateAccountPage extends BasePage { return Text( S.current.sign_up, style: textMediumSemiBold( - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, ), ); } @@ -79,8 +82,12 @@ class IoniaCreateAccountPage extends BasePage { builder: (_) => LoadingPrimaryButton( text: S.of(context).create_account, onPressed: _createAccount, - isLoading: _authViewModel.createUserState is IoniaCreateStateLoading, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + isLoading: + _authViewModel.createUserState is IoniaCreateStateLoading, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, ), ), @@ -100,7 +107,10 @@ class IoniaCreateAccountPage extends BasePage { TextSpan( text: S.of(context).settings_terms_and_conditions, style: TextStyle( - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, fontWeight: FontWeight.w700, ), recognizer: TapGestureRecognizer() @@ -112,7 +122,10 @@ class IoniaCreateAccountPage extends BasePage { TextSpan( text: S.of(context).privacy_policy, style: TextStyle( - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, fontWeight: FontWeight.w700, ), recognizer: TapGestureRecognizer() diff --git a/lib/src/screens/ionia/auth/ionia_login_page.dart b/lib/src/screens/ionia/auth/ionia_login_page.dart index e6e8680f3..912b9c3dc 100644 --- a/lib/src/screens/ionia/auth/ionia_login_page.dart +++ b/lib/src/screens/ionia/auth/ionia_login_page.dart @@ -33,7 +33,10 @@ class IoniaLoginPage extends BasePage { return Text( S.current.login, style: textMediumSemiBold( - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, ), ); } @@ -71,7 +74,10 @@ class IoniaLoginPage extends BasePage { text: S.of(context).login, onPressed: _login, isLoading: _authViewModel.signInState is IoniaCreateStateLoading, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, ), ), diff --git a/lib/src/screens/ionia/auth/ionia_verify_otp_page.dart b/lib/src/screens/ionia/auth/ionia_verify_otp_page.dart index b9829b1b5..7382a6aee 100644 --- a/lib/src/screens/ionia/auth/ionia_verify_otp_page.dart +++ b/lib/src/screens/ionia/auth/ionia_verify_otp_page.dart @@ -41,7 +41,10 @@ class IoniaVerifyIoniaOtp extends BasePage { return Text( S.current.verification, style: textMediumSemiBold( - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, ), ); } @@ -62,7 +65,10 @@ class IoniaVerifyIoniaOtp extends BasePage { return KeyboardActions( config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!, + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .backgroundColor!, nextFocus: false, actions: [ KeyboardActionsItem( @@ -72,7 +78,7 @@ class IoniaVerifyIoniaOtp extends BasePage { ]), child: Container( height: 0, - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: ScrollableWithBottomSection( contentPadding: EdgeInsets.all(24), content: Column( @@ -120,7 +126,10 @@ class IoniaVerifyIoniaOtp extends BasePage { onPressed: _verify, isDisabled: _authViewModel.otpState is IoniaOtpSendDisabled, isLoading: _authViewModel.otpState is IoniaOtpValidating, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, ), ), diff --git a/lib/src/screens/ionia/auth/ionia_welcome_page.dart b/lib/src/screens/ionia/auth/ionia_welcome_page.dart index 0b68cdd63..4d0cf69c0 100644 --- a/lib/src/screens/ionia/auth/ionia_welcome_page.dart +++ b/lib/src/screens/ionia/auth/ionia_welcome_page.dart @@ -17,7 +17,10 @@ class IoniaWelcomePage extends BasePage { return Text( S.current.welcome_to_cakepay, style: textMediumSemiBold( - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, ), ); } @@ -45,7 +48,7 @@ class IoniaWelcomePage extends BasePage { fontSize: 18, fontWeight: FontWeight.w400, fontFamily: 'Lato', - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), ), SizedBox(height: 20), @@ -55,7 +58,7 @@ class IoniaWelcomePage extends BasePage { fontSize: 18, fontWeight: FontWeight.w400, fontFamily: 'Lato', - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), ), ], @@ -66,7 +69,10 @@ class IoniaWelcomePage extends BasePage { PrimaryButton( text: S.of(context).create_account, onPressed: () => Navigator.of(context).pushNamed(Routes.ioniaCreateAccountPage), - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, ), SizedBox( @@ -78,7 +84,7 @@ class IoniaWelcomePage extends BasePage { fontSize: 15, fontWeight: FontWeight.w500, fontFamily: 'Lato', - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), ), SizedBox(height: 8), diff --git a/lib/src/screens/ionia/cards/ionia_account_cards_page.dart b/lib/src/screens/ionia/cards/ionia_account_cards_page.dart index d5442987f..1e88078ee 100644 --- a/lib/src/screens/ionia/cards/ionia_account_cards_page.dart +++ b/lib/src/screens/ionia/cards/ionia_account_cards_page.dart @@ -20,7 +20,10 @@ class IoniaAccountCardsPage extends BasePage { return Text( S.of(context).cards, style: textLargeSemiBold( - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, ), ); } @@ -69,23 +72,34 @@ class _IoniaCardTabsState extends State<_IoniaCardTabs> with SingleTickerProvide width: 230, padding: EdgeInsets.all(5), decoration: BoxDecoration( - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!.withOpacity(0.1), + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor! + .withOpacity(0.1), borderRadius: BorderRadius.circular( 25.0, ), ), child: Theme( - data: ThemeData(primaryTextTheme: TextTheme(bodyText1: TextStyle(backgroundColor: Colors.transparent))), + data: ThemeData(primaryTextTheme: TextTheme(bodyLarge: TextStyle(backgroundColor: Colors.transparent))), child: TabBar( controller: _tabController, indicator: BoxDecoration( borderRadius: BorderRadius.circular( 25.0, ), - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, ), - labelColor: Theme.of(context).primaryTextTheme!.headline1!.backgroundColor!, - unselectedLabelColor: Theme.of(context).primaryTextTheme!.headline6!.color!, + labelColor: Theme.of(context) + .primaryTextTheme! + .displayLarge! + .backgroundColor!, + unselectedLabelColor: + Theme.of(context).primaryTextTheme!.titleLarge!.color!, tabs: [ Tab( text: S.of(context).active, @@ -154,9 +168,13 @@ class _IoniaCardListView extends StatelessWidget { Widget build(BuildContext context) { if(isLoading){ return Center( - child: CircularProgressIndicator( - backgroundColor: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, - valueColor: AlwaysStoppedAnimation(Theme.of(context).primaryTextTheme!.bodyText2!.color!), + child: CircularProgressIndicator( + backgroundColor: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, + valueColor: AlwaysStoppedAnimation( + Theme.of(context).primaryTextTheme!.bodyMedium!.color!), ), ); } @@ -166,7 +184,7 @@ class _IoniaCardListView extends StatelessWidget { emptyText, textAlign: TextAlign.center, style: textSmall( - color: Theme.of(context).primaryTextTheme!.overline!.color!, + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!, ), ), ) @@ -179,11 +197,18 @@ class _IoniaCardListView extends StatelessWidget { child: CardItem( onTap: () => onTap?.call(merchant), title: merchant.legalName, - backgroundColor: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!.withOpacity(0.1), + backgroundColor: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor! + .withOpacity(0.1), discount: 0, hideBorder: true, discountBackground: AssetImage('assets/images/red_badge_discount.png'), - titleColor: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, + titleColor: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, subtitleColor: Theme.of(context).hintColor, subTitle: '', logoUrl: merchant.logoUrl, diff --git a/lib/src/screens/ionia/cards/ionia_account_page.dart b/lib/src/screens/ionia/cards/ionia_account_page.dart index 31f7db409..f3ce3f560 100644 --- a/lib/src/screens/ionia/cards/ionia_account_page.dart +++ b/lib/src/screens/ionia/cards/ionia_account_page.dart @@ -19,7 +19,10 @@ class IoniaAccountPage extends BasePage { return Text( S.current.account, style: textMediumSemiBold( - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, ), ); } @@ -133,7 +136,10 @@ class IoniaAccountPage extends BasePage { bottomSection: Column( children: [ PrimaryButton( - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, text: S.of(context).logout, onPressed: () { @@ -164,11 +170,8 @@ class _GradiantContainer extends StatelessWidget { borderRadius: BorderRadius.circular(15), gradient: LinearGradient( colors: [ - Theme.of(context) - .primaryTextTheme! - .subtitle1! - .decorationColor!, - Theme.of(context).primaryTextTheme!.subtitle1!.color!, + Theme.of(context).primaryTextTheme!.titleMedium!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleMedium!.color!, ], begin: Alignment.topRight, end: Alignment.bottomLeft, diff --git a/lib/src/screens/ionia/cards/ionia_activate_debit_card_page.dart b/lib/src/screens/ionia/cards/ionia_activate_debit_card_page.dart index 62bb5bd06..ff1b918eb 100644 --- a/lib/src/screens/ionia/cards/ionia_activate_debit_card_page.dart +++ b/lib/src/screens/ionia/cards/ionia_activate_debit_card_page.dart @@ -23,7 +23,10 @@ class IoniaActivateDebitCardPage extends BasePage { return Text( S.current.debit_card, style: textMediumSemiBold( - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, ), ); } @@ -76,7 +79,10 @@ class IoniaActivateDebitCardPage extends BasePage { }, isLoading: _cardsListViewModel.createCardState is IoniaCreateCardLoading, text: S.of(context).agree_and_continue, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, ), ); diff --git a/lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart b/lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart index 4b9f0a220..0080c551c 100644 --- a/lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart +++ b/lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart @@ -28,7 +28,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage { Widget middle(BuildContext context) { return Text( ioniaPurchaseViewModel.ioniaMerchant.legalName, - style: textMediumSemiBold(color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!), + style: textMediumSemiBold(color: Theme.of(context).accentTextTheme!.displayLarge!.backgroundColor!), ); } @@ -96,8 +96,8 @@ class IoniaBuyGiftCardDetailPage extends BasePage { borderRadius: BorderRadius.circular(20), gradient: LinearGradient( colors: [ - Theme.of(context).primaryTextTheme!.subtitle1!.color!, - Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleMedium!.color!, + Theme.of(context).primaryTextTheme!.titleMedium!.decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight, @@ -163,7 +163,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage { Text( S.of(context).tip, style: TextStyle( - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, fontWeight: FontWeight.w700, fontSize: 14, ), @@ -202,7 +202,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage { ioniaPurchaseViewModel.invoiceCommittingState is IsExecutingState, onPressed: () => purchaseCard(context), text: S.of(context).purchase_gift_card, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!, textColor: Colors.white, ); }), @@ -212,7 +212,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage { onTap: () => _showTermsAndCondition(context), child: Text(S.of(context).settings_terms_and_conditions, style: textMediumSemiBold( - color: Theme.of(context).primaryTextTheme!.bodyText2!.color!, + color: Theme.of(context).primaryTextTheme.bodyMedium!.color!, ).copyWith(fontSize: 12)), ), SizedBox(height: 16) @@ -232,7 +232,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage { child: Text( ioniaPurchaseViewModel.ioniaMerchant.termsAndConditions, style: textMedium( - color: Theme.of(context).textTheme!.headline3!.color!, + color: Theme.of(context).textTheme!.displaySmall!.color!, ), ), ), @@ -270,13 +270,13 @@ class IoniaBuyGiftCardDetailPage extends BasePage { child: Text( instruction.header, style: textLargeSemiBold( - color: Theme.of(context).textTheme!.headline3!.color!, + color: Theme.of(context).textTheme!.displaySmall!.color!, ), )), Text( instruction.body, style: textMedium( - color: Theme.of(context).textTheme!.headline3!.color!, + color: Theme.of(context).textTheme!.displaySmall!.color!, ), ) ]; @@ -323,7 +323,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage { alertLeftActionButtonTextColor: Colors.white, alertRightActionButtonTextColor: Colors.white, alertLeftActionButtonColor: Palette.brightOrange, - alertRightActionButtonColor: Theme.of(context).textTheme!.subtitle2!.color, + alertRightActionButtonColor: Theme.of(context).textTheme!.titleSmall!.color, actionRightButton: () async { Navigator.of(context).pop(); await ioniaPurchaseViewModel.commitPaymentInvoice(); @@ -399,34 +399,34 @@ class TipButton extends StatelessWidget { Color captionTextColor(BuildContext context) { if (isDark(context)) { - return Theme.of(context).primaryTextTheme!.headline6!.color!; + return Theme.of(context).primaryTextTheme!.titleLarge!.color!; } return isSelected - ? Theme.of(context).accentTextTheme!.headline6!.color! - : Theme.of(context).primaryTextTheme!.headline6!.color!; + ? Theme.of(context).accentTextTheme!.titleLarge!.color! + : Theme.of(context).primaryTextTheme!.titleLarge!.color!; } Color subTitleTextColor(BuildContext context) { if (isDark(context)) { - return Theme.of(context).primaryTextTheme!.headline6!.color!; + return Theme.of(context).primaryTextTheme!.titleLarge!.color!; } return isSelected - ? Theme.of(context).accentTextTheme!.headline6!.color! - : Theme.of(context).primaryTextTheme!.overline!.color!; + ? Theme.of(context).accentTextTheme!.titleLarge!.color! + : Theme.of(context).primaryTextTheme!.labelSmall!.color!; } Color? backgroundColor(BuildContext context) { if (isDark(context)) { return isSelected ? null - : Theme.of(context).accentTextTheme!.headline1!.backgroundColor!.withOpacity(0.01); + : Theme.of(context).accentTextTheme!.displayLarge!.backgroundColor!.withOpacity(0.01); } return isSelected ? null - : Theme.of(context).accentTextTheme!.headline1!.backgroundColor!.withOpacity(0.1); + : Theme.of(context).accentTextTheme!.displayLarge!.backgroundColor!.withOpacity(0.1); } @override @@ -459,8 +459,8 @@ class TipButton extends StatelessWidget { gradient: isSelected ? LinearGradient( colors: [ - Theme.of(context).primaryTextTheme!.subtitle1!.color!, - Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleMedium!.color!, + Theme.of(context).primaryTextTheme!.titleMedium!.decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight, diff --git a/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart b/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart index a60b967f2..e8dce712e 100644 --- a/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart +++ b/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart @@ -50,7 +50,10 @@ class IoniaBuyGiftCardPage extends BasePage { disableScroll: true, config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!, + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .backgroundColor!, nextFocus: false, actions: [ KeyboardActionsItem( @@ -59,7 +62,7 @@ class IoniaBuyGiftCardPage extends BasePage { ), ]), child: Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: ScrollableWithBottomSection( contentPadding: EdgeInsets.zero, content: Column( @@ -72,8 +75,11 @@ class IoniaBuyGiftCardPage extends BasePage { bottomRight: Radius.circular(24), ), gradient: LinearGradient(colors: [ - Theme.of(context).primaryTextTheme!.subtitle1!.color!, - Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleMedium!.color!, + Theme.of(context) + .primaryTextTheme! + .titleMedium! + .decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight), ), child: Column( @@ -95,7 +101,10 @@ class IoniaBuyGiftCardPage extends BasePage { ], hintText: '1000', placeholderTextStyle: TextStyle( - color: Theme.of(context).primaryTextTheme.headline5!.color!, + color: Theme.of(context) + .primaryTextTheme! + .headlineSmall! + .color!, fontWeight: FontWeight.w600, fontSize: 36, ), @@ -115,7 +124,10 @@ class IoniaBuyGiftCardPage extends BasePage { ), ), Divider( - color: Theme.of(context).primaryTextTheme.headline5!.color!, + color: Theme.of(context) + .primaryTextTheme! + .headlineSmall! + .color!, height: 1, ), SizedBox(height: 8), @@ -126,13 +138,19 @@ class IoniaBuyGiftCardPage extends BasePage { Text( S.of(context).min_amount(merchant.minimumCardPurchase.toStringAsFixed(2)), style: TextStyle( - color: Theme.of(context).primaryTextTheme!.headline5!.color!, + color: Theme.of(context) + .primaryTextTheme! + .headlineSmall! + .color!, ), ), Text( S.of(context).max_amount(merchant.maximumCardPurchase.toStringAsFixed(2)), style: TextStyle( - color: Theme.of(context).primaryTextTheme!.headline5!.color!, + color: Theme.of(context) + .primaryTextTheme! + .headlineSmall! + .color!, ), ), ], @@ -147,11 +165,14 @@ class IoniaBuyGiftCardPage extends BasePage { title: merchant.legalName, backgroundColor: Theme.of(context) .accentTextTheme! - .headline1! + .displayLarge! .backgroundColor! .withOpacity(0.1), discount: merchant.discount, - titleColor: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, + titleColor: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, subtitleColor: Theme.of(context).hintColor, subTitle: merchant.avaibilityStatus, logoUrl: merchant.logoUrl, @@ -174,7 +195,10 @@ class IoniaBuyGiftCardPage extends BasePage { ), text: S.of(context).continue_text, isDisabled: !ioniaBuyCardViewModel.isEnablePurchase, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, ), ); diff --git a/lib/src/screens/ionia/cards/ionia_custom_redeem_page.dart b/lib/src/screens/ionia/cards/ionia_custom_redeem_page.dart index f2702d791..2a5f39845 100644 --- a/lib/src/screens/ionia/cards/ionia_custom_redeem_page.dart +++ b/lib/src/screens/ionia/cards/ionia_custom_redeem_page.dart @@ -50,7 +50,10 @@ class IoniaCustomRedeemPage extends BasePage { disableScroll: true, config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!, + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .backgroundColor!, nextFocus: false, actions: [ KeyboardActionsItem( @@ -59,7 +62,7 @@ class IoniaCustomRedeemPage extends BasePage { ), ]), child: Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: ScrollableWithBottomSection( contentPadding: EdgeInsets.zero, content: Column( @@ -70,8 +73,11 @@ class IoniaCustomRedeemPage extends BasePage { borderRadius: BorderRadius.only( bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)), gradient: LinearGradient(colors: [ - Theme.of(context).primaryTextTheme.subtitle1!.color!, - Theme.of(context).primaryTextTheme.subtitle1!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleMedium!.color!, + Theme.of(context) + .primaryTextTheme! + .titleMedium! + .decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight), ), child: Column( @@ -86,11 +92,17 @@ class IoniaCustomRedeemPage extends BasePage { inputFormatters: [FilteringTextInputFormatter.deny(RegExp('[\-|\ ]'))], hintText: '1000', placeholderTextStyle: TextStyle( - color: Theme.of(context).primaryTextTheme.headline5!.color!, + color: Theme.of(context) + .primaryTextTheme! + .headlineSmall! + .color!, fontWeight: FontWeight.w500, fontSize: 36, ), - borderColor: Theme.of(context).primaryTextTheme.headline5!.color!, + borderColor: Theme.of(context) + .primaryTextTheme! + .headlineSmall! + .color!, textColor: Colors.white, textStyle: TextStyle( color: Colors.white, @@ -121,7 +133,10 @@ class IoniaCustomRedeemPage extends BasePage { child: Text( '\$${giftCard.remainingAmount} - \$${ioniaCustomRedeemViewModel.amount} = \$${ioniaCustomRedeemViewModel.formattedRemaining} ${S.of(context).remaining}', style: TextStyle( - color: Theme.of(context).primaryTextTheme.headline5!.color!, + color: Theme.of(context) + .primaryTextTheme! + .headlineSmall! + .color!, ), ), ) @@ -136,14 +151,17 @@ class IoniaCustomRedeemPage extends BasePage { child: CardItem( title: giftCard.legalName, backgroundColor: Theme.of(context) - .accentTextTheme - .headline1! + .accentTextTheme! + .displayLarge! .backgroundColor! .withOpacity(0.1), discount: giftCard.remainingAmount, isAmount: true, discountBackground: AssetImage('assets/images/red_badge_discount.png'), - titleColor: Theme.of(context).accentTextTheme.headline1!.backgroundColor!, + titleColor: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, subtitleColor: Theme.of(context).hintColor, subTitle: S.of(context).online, logoUrl: giftCard.logoUrl, @@ -160,7 +178,10 @@ class IoniaCustomRedeemPage extends BasePage { isLoading: ioniaCustomRedeemViewModel.redeemState is IsExecutingState, isDisabled: ioniaCustomRedeemViewModel.disableRedeem, text: S.of(context).add_custom_redemption, - color: Theme.of(context).accentTextTheme.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, onPressed: () => ioniaCustomRedeemViewModel.addCustomRedeem().then((value) { Navigator.of(context).pop(ioniaCustomRedeemViewModel.remaining.toString()); diff --git a/lib/src/screens/ionia/cards/ionia_custom_tip_page.dart b/lib/src/screens/ionia/cards/ionia_custom_tip_page.dart index b52b2082d..f31f0ef30 100644 --- a/lib/src/screens/ionia/cards/ionia_custom_tip_page.dart +++ b/lib/src/screens/ionia/cards/ionia_custom_tip_page.dart @@ -51,7 +51,10 @@ class IoniaCustomTipPage extends BasePage { disableScroll: true, config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!, + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .backgroundColor!, nextFocus: false, actions: [ KeyboardActionsItem( @@ -60,7 +63,7 @@ class IoniaCustomTipPage extends BasePage { ), ]), child: Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: ScrollableWithBottomSection( contentPadding: EdgeInsets.zero, content: Column( @@ -70,8 +73,11 @@ class IoniaCustomTipPage extends BasePage { decoration: BoxDecoration( borderRadius: BorderRadius.only(bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)), gradient: LinearGradient(colors: [ - Theme.of(context).primaryTextTheme!.subtitle1!.color!, - Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleMedium!.color!, + Theme.of(context) + .primaryTextTheme! + .titleMedium! + .decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight), ), child: Column( @@ -86,11 +92,17 @@ class IoniaCustomTipPage extends BasePage { inputFormatters: [FilteringTextInputFormatter.deny(RegExp('[\-|\ ]'))], hintText: '1000', placeholderTextStyle: TextStyle( - color: Theme.of(context).primaryTextTheme!.headline5!.color!, + color: Theme.of(context) + .primaryTextTheme! + .headlineSmall! + .color!, fontWeight: FontWeight.w500, fontSize: 36, ), - borderColor: Theme.of(context).primaryTextTheme!.headline5!.color!, + borderColor: Theme.of(context) + .primaryTextTheme! + .headlineSmall! + .color!, textColor: Colors.white, textStyle: TextStyle( color: Colors.white, @@ -125,7 +137,10 @@ class IoniaCustomTipPage extends BasePage { text: TextSpan( text: '\$${_amountController.text}', style: TextStyle( - color: Theme.of(context).primaryTextTheme!.headline5!.color!, + color: Theme.of(context) + .primaryTextTheme! + .headlineSmall! + .color!, ), children: [ TextSpan(text: ' ${S.of(context).is_percentage} '), @@ -143,9 +158,16 @@ class IoniaCustomTipPage extends BasePage { padding: const EdgeInsets.all(24.0), child: CardItem( title: merchant.legalName, - backgroundColor: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!.withOpacity(0.1), + backgroundColor: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor! + .withOpacity(0.1), discount: 0.0, - titleColor: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, + titleColor: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, subtitleColor: Theme.of(context).hintColor, subTitle: merchant.isOnline ? S.of(context).online : S.of(context).offline, logoUrl: merchant.logoUrl, @@ -162,7 +184,10 @@ class IoniaCustomTipPage extends BasePage { Navigator.of(context).pop(customTipViewModel.customTip); }, text: S.of(context).add_tip, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, ), ), diff --git a/lib/src/screens/ionia/cards/ionia_debit_card_page.dart b/lib/src/screens/ionia/cards/ionia_debit_card_page.dart index 52888ac11..968e8cc34 100644 --- a/lib/src/screens/ionia/cards/ionia_debit_card_page.dart +++ b/lib/src/screens/ionia/cards/ionia_debit_card_page.dart @@ -23,7 +23,10 @@ class IoniaDebitCardPage extends BasePage { return Text( S.current.debit_card, style: textMediumSemiBold( - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, ), ); } @@ -51,7 +54,11 @@ class IoniaDebitCardPage extends BasePage { padding: const EdgeInsets.symmetric(horizontal: 20.0), child: Text( S.of(context).billing_address_info, - style: textSmall(color: Theme.of(context).textTheme!.headline4!.color!), + style: textSmall( + color: Theme.of(context) + .textTheme! + .headlineMedium! + .color!), textAlign: TextAlign.center, ), ), @@ -60,13 +67,16 @@ class IoniaDebitCardPage extends BasePage { text: S.of(context).order_physical_card, onPressed: () {}, color: Color(0xffE9F2FC), - textColor: Theme.of(context).textTheme!.headline3!.color!, + textColor: Theme.of(context).textTheme!.displaySmall!.color!, ), SizedBox(height: 8), PrimaryButton( text: S.of(context).add_value, onPressed: () {}, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, ), SizedBox(height: 16) @@ -112,11 +122,17 @@ class IoniaDebitCardPage extends BasePage { child: RichText( text: TextSpan( text: S.of(context).get_a, - style: textMedium(color: Theme.of(context).textTheme!.headline3!.color!), + style: textMedium( + color: + Theme.of(context).textTheme!.displaySmall!.color!), children: [ TextSpan( text: S.of(context).digital_and_physical_card, - style: textMediumBold(color: Theme.of(context).textTheme!.headline3!.color!), + style: textMediumBold( + color: Theme.of(context) + .textTheme! + .displaySmall! + .color!), ), TextSpan( text: S.of(context).get_card_note, @@ -134,7 +150,10 @@ class IoniaDebitCardPage extends BasePage { bottomSection: PrimaryButton( text: S.of(context).activate, onPressed: () => _showHowToUseCard(context, activate: true), - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, ), ); @@ -157,7 +176,7 @@ class IoniaDebitCardPage extends BasePage { padding: EdgeInsets.only(top: 24, left: 24, right: 24), margin: EdgeInsets.all(24), decoration: BoxDecoration( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, borderRadius: BorderRadius.circular(30), ), child: Column( @@ -165,7 +184,8 @@ class IoniaDebitCardPage extends BasePage { Text( S.of(context).how_to_use_card, style: textLargeSemiBold( - color: Theme.of(context).textTheme!.bodyText2!.color!, + color: + Theme.of(context).textTheme!.bodyMedium!.color!, ), ), SizedBox(height: 24), @@ -174,7 +194,10 @@ class IoniaDebitCardPage extends BasePage { child: Text( S.of(context).signup_for_card_accept_terms, style: textSmallSemiBold( - color: Theme.of(context).textTheme!.headline3!.color!, + color: Theme.of(context) + .textTheme! + .displaySmall! + .color!, ), ), ), @@ -195,7 +218,8 @@ class IoniaDebitCardPage extends BasePage { : Navigator.pop(context), text: S.of(context).send_got_it, color: Color.fromRGBO(233, 242, 252, 1), - textColor: Theme.of(context).textTheme!.headline3!.color!, + textColor: + Theme.of(context).textTheme!.displaySmall!.color!, ), SizedBox(height: 21), ], @@ -259,8 +283,8 @@ class _IoniaDebitCardState extends State<_IoniaDebitCard> { borderRadius: BorderRadius.circular(24), gradient: LinearGradient( colors: [ - Theme.of(context).primaryTextTheme!.subtitle1!.color!, - Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleMedium!.color!, + Theme.of(context).primaryTextTheme!.titleMedium!.decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight, @@ -368,12 +392,14 @@ class _TitleSubtitleTile extends StatelessWidget { children: [ Text( title, - style: textSmallSemiBold(color: Theme.of(context).textTheme!.headline3!.color!), + style: textSmallSemiBold( + color: Theme.of(context).textTheme!.displaySmall!.color!), ), SizedBox(height: 4), Text( subtitle, - style: textSmall(color: Theme.of(context).textTheme!.headline3!.color!), + style: textSmall( + color: Theme.of(context).textTheme!.displaySmall!.color!), ), ], ); diff --git a/lib/src/screens/ionia/cards/ionia_gift_card_detail_page.dart b/lib/src/screens/ionia/cards/ionia_gift_card_detail_page.dart index 0b7a479e0..9d017bc69 100644 --- a/lib/src/screens/ionia/cards/ionia_gift_card_detail_page.dart +++ b/lib/src/screens/ionia/cards/ionia_gift_card_detail_page.dart @@ -33,7 +33,7 @@ class IoniaGiftCardDetailPage extends BasePage { final _backButton = Icon( Icons.arrow_back_ios, - color: Theme.of(context).primaryTextTheme.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, size: 16, ); return Padding( @@ -59,8 +59,11 @@ class IoniaGiftCardDetailPage extends BasePage { Widget middle(BuildContext context) { return Text( viewModel.giftCard.legalName, - style: - textMediumSemiBold(color: Theme.of(context).accentTextTheme.headline1!.backgroundColor!), + style: textMediumSemiBold( + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!), ); } @@ -142,8 +145,8 @@ class IoniaGiftCardDetailPage extends BasePage { viewModel.refeshCard(); }, text: S.of(context).more_options, - color: Theme.of(context).accentTextTheme.caption!.color!, - textColor: Theme.of(context).primaryTextTheme.headline6!.color!, + color: Theme.of(context).accentTextTheme!.bodySmall!.color!, + textColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), SizedBox(height: 12), LoadingPrimaryButton( @@ -155,7 +158,7 @@ class IoniaGiftCardDetailPage extends BasePage { }, ), text: S.of(context).mark_as_redeemed, - color: Theme.of(context).accentTextTheme.bodyText1!.color!, + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!, textColor: Colors.white, ), ], @@ -198,13 +201,13 @@ class IoniaGiftCardDetailPage extends BasePage { child: Text( instruction.header, style: textLargeSemiBold( - color: Theme.of(context).textTheme.headline3!.color!, + color: Theme.of(context).textTheme!.displaySmall!.color!, ), )), Text( instruction.body, style: textMedium( - color: Theme.of(context).textTheme.headline3!.color!, + color: Theme.of(context).textTheme!.displaySmall!.color!, ), ) ]; diff --git a/lib/src/screens/ionia/cards/ionia_manage_cards_page.dart b/lib/src/screens/ionia/cards/ionia_manage_cards_page.dart index 1c13f7a88..9baa38f24 100644 --- a/lib/src/screens/ionia/cards/ionia_manage_cards_page.dart +++ b/lib/src/screens/ionia/cards/ionia_manage_cards_page.dart @@ -48,7 +48,7 @@ class IoniaManageCardsPage extends BasePage { decoration: BoxDecoration( gradient: LinearGradient( colors: [ - Theme.of(context).accentColor, + Theme.of(context).colorScheme.secondary, Theme.of(context).scaffoldBackgroundColor, Theme.of(context).primaryColor, ], @@ -69,7 +69,10 @@ class IoniaManageCardsPage extends BasePage { Widget leading(BuildContext context) { final _backButton = Icon( Icons.arrow_back_ios, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, size: 16, ); @@ -94,7 +97,10 @@ class IoniaManageCardsPage extends BasePage { return Text( S.of(context).gift_cards, style: textMediumSemiBold( - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, ), ); } @@ -118,7 +124,7 @@ class IoniaManageCardsPage extends BasePage { width: 32, padding: EdgeInsets.all(8), decoration: BoxDecoration( - color: Theme.of(context).textTheme!.headline6!.backgroundColor!, + color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!, border: Border.all( color: Colors.white.withOpacity(0.2), ), @@ -126,7 +132,7 @@ class IoniaManageCardsPage extends BasePage { ), child: Image.asset( 'assets/images/filter.png', - color: Theme.of(context).textTheme!.caption!.decorationColor!, + color: Theme.of(context).textTheme!.bodySmall!.decorationColor!, ), ) ); @@ -225,9 +231,9 @@ class _IoniaManageCardsPageBodyState extends State { }, title: merchant.legalName, subTitle: merchant.avaibilityStatus, - backgroundColor: Theme.of(context).textTheme!.headline6!.backgroundColor!, - titleColor: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, - subtitleColor: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!, + backgroundColor: Theme.of(context).textTheme!.titleLarge!.backgroundColor!, + titleColor: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!, + subtitleColor: Theme.of(context).accentTextTheme!.displaySmall!.backgroundColor!, discount: merchant.discount, ); }, @@ -238,8 +244,8 @@ class _IoniaManageCardsPageBodyState extends State { thumbHeight: thumbHeight, rightOffset: 1, width: 3, - backgroundColor: Theme.of(context).textTheme!.caption!.decorationColor!.withOpacity(0.05), - thumbColor: Theme.of(context).textTheme!.caption!.decorationColor!.withOpacity(0.5), + backgroundColor: Theme.of(context).textTheme!.bodySmall!.decorationColor!.withOpacity(0.05), + thumbColor: Theme.of(context).textTheme!.bodySmall!.decorationColor!.withOpacity(0.5), fromTop: widget.cardsListViewModel.scrollOffsetFromTop, ) : Offstage() @@ -247,8 +253,8 @@ class _IoniaManageCardsPageBodyState extends State { } return Center( child: CircularProgressIndicator( - backgroundColor: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, - valueColor: AlwaysStoppedAnimation(Theme.of(context).primaryTextTheme!.bodyText2!.color!), + backgroundColor: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!, + valueColor: AlwaysStoppedAnimation(Theme.of(context).primaryTextTheme!.bodyMedium!.color!), ), ); } @@ -269,12 +275,12 @@ class _SearchWidget extends StatelessWidget { padding: EdgeInsets.all(8), child: Image.asset( 'assets/images/mini_search_icon.png', - color: Theme.of(context).textTheme!.caption!.decorationColor!, + color: Theme.of(context).textTheme!.bodySmall!.decorationColor!, ), ); return TextField( - style: TextStyle(color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!), + style: TextStyle(color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!), controller: controller, decoration: InputDecoration( filled: true, @@ -282,10 +288,10 @@ class _SearchWidget extends StatelessWidget { top: 10, left: 10, ), - fillColor: Theme.of(context).textTheme!.headline6!.backgroundColor!, + fillColor: Theme.of(context).textTheme!.titleLarge!.backgroundColor!, hintText: S.of(context).search, hintStyle: TextStyle( - color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!, + color: Theme.of(context).accentTextTheme!.displaySmall!.backgroundColor!, ), alignLabelWithHint: true, floatingLabelBehavior: FloatingLabelBehavior.never, @@ -329,7 +335,7 @@ class _TrailingIcon extends StatelessWidget { onPressed: onPressed, icon: Image.asset( asset, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!, ), ), ); diff --git a/lib/src/screens/ionia/cards/ionia_more_options_page.dart b/lib/src/screens/ionia/cards/ionia_more_options_page.dart index 7d38c5e1e..c2b76c1b8 100644 --- a/lib/src/screens/ionia/cards/ionia_more_options_page.dart +++ b/lib/src/screens/ionia/cards/ionia_more_options_page.dart @@ -15,7 +15,10 @@ class IoniaMoreOptionsPage extends BasePage { return Text( S.current.more_options, style: textMediumSemiBold( - color: Theme.of(context).accentTextTheme.headline1!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!, ), ); } @@ -34,7 +37,7 @@ class IoniaMoreOptionsPage extends BasePage { child: Text( S.of(context).choose_from_available_options, style: textMedium( - color: Theme.of(context).primaryTextTheme.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), ), ), @@ -78,7 +81,7 @@ class _GradiantContainer extends StatelessWidget { gradient: LinearGradient( colors: [ Theme.of(context).scaffoldBackgroundColor, - Theme.of(context).accentColor, + Theme.of(context).colorScheme.secondary, ], begin: Alignment.topRight, end: Alignment.bottomLeft, diff --git a/lib/src/screens/ionia/cards/ionia_payment_status_page.dart b/lib/src/screens/ionia/cards/ionia_payment_status_page.dart index 4096560db..50af2f2f6 100644 --- a/lib/src/screens/ionia/cards/ionia_payment_status_page.dart +++ b/lib/src/screens/ionia/cards/ionia_payment_status_page.dart @@ -23,8 +23,11 @@ class IoniaPaymentStatusPage extends BasePage { S.of(context).generating_gift_card, textAlign: TextAlign.center, style: textMediumSemiBold( - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!)); - } + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!)); + } @override Widget body(BuildContext context) { @@ -90,7 +93,7 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage Text( S.of(context).awaiting_payment_confirmation, style: textLargeSemiBold( - color: Theme.of(context).primaryTextTheme!.headline6!.color!)) + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!)) ]), SizedBox(height: 40), Row(children: [ @@ -129,7 +132,7 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage Text( S.of(context).gift_card_is_generated, style: textLargeSemiBold( - color: Theme.of(context).primaryTextTheme!.headline6!.color!)) + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!)) ])); } @@ -147,7 +150,7 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage Text( S.of(context).generating_gift_card, style: textLargeSemiBold( - color: Theme.of(context).primaryTextTheme!.headline6!.color!))]); + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!))]); }), ], ), @@ -160,7 +163,7 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage widget.viewModel.payingByBitcoin ? S.of(context).bitcoin_payments_require_1_confirmation : S.of(context).proceed_after_one_minute, style: textMedium( - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ).copyWith(fontWeight: FontWeight.w500), textAlign: TextAlign.center, )), @@ -172,15 +175,15 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage Routes.ioniaGiftCardDetailPage, arguments: [widget.viewModel.giftCard]), text: S.of(context).open_gift_card, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!, textColor: Colors.white); } return PrimaryButton( onPressed: () => Navigator.of(context).pushNamed(Routes.support), text: S.of(context).contact_support, - color: Theme.of(context).accentTextTheme!.caption!.color!, - textColor: Theme.of(context).primaryTextTheme!.headline6!.color!); + color: Theme.of(context).accentTextTheme!.bodySmall!.color!, + textColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!); }) ]) ), @@ -196,14 +199,14 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage Text( title, style: textXSmall( - color: Theme.of(context).primaryTextTheme!.overline!.color!, + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!, ), ), SizedBox(height: 8), Text( subtitle, style: textMedium( - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), ), ], diff --git a/lib/src/screens/ionia/widgets/ionia_alert_model.dart b/lib/src/screens/ionia/widgets/ionia_alert_model.dart index d6ea02342..536bb19d4 100644 --- a/lib/src/screens/ionia/widgets/ionia_alert_model.dart +++ b/lib/src/screens/ionia/widgets/ionia_alert_model.dart @@ -32,7 +32,7 @@ class IoniaAlertModal extends StatelessWidget { padding: EdgeInsets.only(top: 24, left: 24, right: 24), margin: EdgeInsets.all(24), decoration: BoxDecoration( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, borderRadius: BorderRadius.circular(30), ), child: Column( @@ -41,7 +41,7 @@ class IoniaAlertModal extends StatelessWidget { Text( title, style: textLargeSemiBold( - color: Theme.of(context).textTheme!.bodyText2!.color!, + color: Theme.of(context).textTheme!.bodyMedium!.color!, ), ), Container( @@ -56,8 +56,12 @@ class IoniaAlertModal extends StatelessWidget { PrimaryButton( onPressed: () => Navigator.pop(context), text: actionTitle, - color: Theme.of(context).accentTextTheme!.caption!.color!, - textColor: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodySmall! + .color!, + textColor: + Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), SizedBox(height: 21), ], diff --git a/lib/src/screens/ionia/widgets/ionia_filter_modal.dart b/lib/src/screens/ionia/widgets/ionia_filter_modal.dart index 2b885f736..4c40270b1 100644 --- a/lib/src/screens/ionia/widgets/ionia_filter_modal.dart +++ b/lib/src/screens/ionia/widgets/ionia_filter_modal.dart @@ -20,7 +20,7 @@ class IoniaFilterModal extends StatelessWidget { padding: EdgeInsets.all(10), child: Image.asset( 'assets/images/mini_search_icon.png', - color: Theme.of(context).textTheme.subtitle2!.color!, + color: Theme.of(context).textTheme!.titleSmall!.color!, ), ); return Scaffold( @@ -34,7 +34,7 @@ class IoniaFilterModal extends StatelessWidget { padding: EdgeInsets.only(top: 24, bottom: 20), margin: EdgeInsets.all(24), decoration: BoxDecoration( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, borderRadius: BorderRadius.circular(30), ), child: Column( @@ -46,14 +46,14 @@ class IoniaFilterModal extends StatelessWidget { child: TextField( onChanged: ioniaGiftCardsListViewModel.onSearchFilter, style: textMedium( - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), decoration: InputDecoration( filled: true, prefixIcon: searchIcon, hintText: S.of(context).search_category, contentPadding: EdgeInsets.only(bottom: 5), - fillColor: Theme.of(context).primaryTextTheme!.caption!.decorationColor!.withOpacity(0.5), + fillColor: Theme.of(context).primaryTextTheme!.bodySmall!.decorationColor!.withOpacity(0.5), border: OutlineInputBorder( borderSide: BorderSide.none, borderRadius: BorderRadius.circular(8), @@ -84,12 +84,12 @@ class IoniaFilterModal extends StatelessWidget { children: [ Image.asset( category.iconPath, - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), SizedBox(width: 10), Text(category.title, style: textSmall( - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ).copyWith(fontWeight: FontWeight.w500)), ], ), diff --git a/lib/src/screens/ionia/widgets/ionia_tile.dart b/lib/src/screens/ionia/widgets/ionia_tile.dart index 2a9e346b8..b7a672b35 100644 --- a/lib/src/screens/ionia/widgets/ionia_tile.dart +++ b/lib/src/screens/ionia/widgets/ionia_tile.dart @@ -26,14 +26,14 @@ class IoniaTile extends StatelessWidget { Text( title, style: textXSmall( - color: Theme.of(context).primaryTextTheme!.overline!.color!, + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!, ), ), SizedBox(height: 8), Text( subTitle, style: textMediumBold( - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), ), ], diff --git a/lib/src/screens/ionia/widgets/rounded_checkbox.dart b/lib/src/screens/ionia/widgets/rounded_checkbox.dart index 7461eb646..51a09e5d9 100644 --- a/lib/src/screens/ionia/widgets/rounded_checkbox.dart +++ b/lib/src/screens/ionia/widgets/rounded_checkbox.dart @@ -15,11 +15,11 @@ class RoundedCheckbox extends StatelessWidget { width: 20.0, decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(50.0)), - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!, ), child: Icon( Icons.check, - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, size: 14.0, )) : Offstage(); diff --git a/lib/src/screens/ionia/widgets/text_icon_button.dart b/lib/src/screens/ionia/widgets/text_icon_button.dart index dffec60a6..600e62aa2 100644 --- a/lib/src/screens/ionia/widgets/text_icon_button.dart +++ b/lib/src/screens/ionia/widgets/text_icon_button.dart @@ -22,12 +22,12 @@ class TextIconButton extends StatelessWidget { Text( label, style: textMediumSemiBold( - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), ), Icon( Icons.chevron_right_rounded, - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), ], ), diff --git a/lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart b/lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart index dbf7279b2..1b5f6be6b 100644 --- a/lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart +++ b/lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart @@ -56,7 +56,7 @@ class MoneroAccountEditOrCreatePage extends BasePage { text: moneroAccountCreationViewModel.isEdit ? S.of(context).rename : S.of(context).add, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!, textColor: Colors.white, isLoading: moneroAccountCreationViewModel.state is IsExecutingState, diff --git a/lib/src/screens/monero_accounts/monero_account_list_page.dart b/lib/src/screens/monero_accounts/monero_account_list_page.dart index 09a08a425..ff5087cdd 100644 --- a/lib/src/screens/monero_accounts/monero_account_list_page.dart +++ b/lib/src/screens/monero_accounts/monero_account_list_page.dart @@ -65,7 +65,7 @@ class MoneroAccountListPage extends StatelessWidget { borderRadius: BorderRadius.all(Radius.circular(14)), child: Container( height: 296, - color: Theme.of(context).textTheme!.headline1!.decorationColor!, + color: Theme.of(context).textTheme!.displayLarge!.decorationColor!, child: Column( children: [ Expanded( diff --git a/lib/src/screens/monero_accounts/widgets/account_tile.dart b/lib/src/screens/monero_accounts/widgets/account_tile.dart index c214fa4e2..a446ca556 100644 --- a/lib/src/screens/monero_accounts/widgets/account_tile.dart +++ b/lib/src/screens/monero_accounts/widgets/account_tile.dart @@ -20,11 +20,11 @@ class AccountTile extends StatelessWidget { @override Widget build(BuildContext context) { final color = isCurrent - ? Theme.of(context).textTheme.subtitle2!.decorationColor! - : Theme.of(context).textTheme.headline1!.decorationColor!; + ? Theme.of(context).textTheme!.titleSmall!.decorationColor! + : Theme.of(context).textTheme!.displayLarge!.decorationColor!; final textColor = isCurrent - ? Theme.of(context).textTheme.subtitle2!.color! - : Theme.of(context).textTheme.headline1!.color!; + ? Theme.of(context).textTheme!.titleSmall!.color! + : Theme.of(context).textTheme!.displayLarge!.color!; final Widget cell = GestureDetector( onTap: onTap, @@ -57,7 +57,7 @@ class AccountTile extends StatelessWidget { fontSize: 15, fontWeight: FontWeight.w600, fontFamily: 'Lato', - color: Theme.of(context).textTheme.headline4!.color!, + color: Theme.of(context).textTheme!.headlineMedium!.color!, decoration: TextDecoration.none, ), ), diff --git a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart index cf0708f21..c49644d7c 100644 --- a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart +++ b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart @@ -111,7 +111,10 @@ class _AdvancedPrivacySettingsBodyState extends State { style: TextStyle( fontSize: 20.0, fontWeight: FontWeight.w600, - color: Theme.of(context).primaryTextTheme!.headline6!.color!), + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!), decoration: InputDecoration( hintStyle: TextStyle( fontSize: 18.0, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme!.headline2!.color!), + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .color), hintText: S.of(context).wallet_name, focusedBorder: UnderlineInputBorder( borderSide: BorderSide( color: Theme.of(context) .accentTextTheme! - .headline2! + .displayMedium! .decorationColor!, width: 1.0)), enabledBorder: UnderlineInputBorder( borderSide: BorderSide( color: Theme.of(context) .accentTextTheme! - .headline2! + .displayMedium! .decorationColor!, width: 1.0), ), @@ -165,7 +171,7 @@ class _WalletNameFormState extends State { 'assets/images/refresh_icon.png', color: Theme.of(context) .primaryTextTheme! - .headline4! + .headlineMedium! .decorationColor!, ), ), @@ -187,7 +193,10 @@ class _WalletNameFormState extends State { style: TextStyle( fontSize: 16.0, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme!.headline6!.color!), + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!), ), ), Padding( diff --git a/lib/src/screens/new_wallet/new_wallet_type_page.dart b/lib/src/screens/new_wallet/new_wallet_type_page.dart index 407582923..e2521b95b 100644 --- a/lib/src/screens/new_wallet/new_wallet_type_page.dart +++ b/lib/src/screens/new_wallet/new_wallet_type_page.dart @@ -80,7 +80,10 @@ class WalletTypeFormState extends State { style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme.headline6!.color!), + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!), ), ), ...types.map((type) => Padding( @@ -99,7 +102,10 @@ class WalletTypeFormState extends State { bottomSection: PrimaryButton( onPressed: () => onTypeSelected(), text: S.of(context).seed_language_next, - color: Theme.of(context).accentTextTheme.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, isDisabled: selected == null, ), diff --git a/lib/src/screens/new_wallet/widgets/select_button.dart b/lib/src/screens/new_wallet/widgets/select_button.dart index fad7053f5..f8f5ac41f 100644 --- a/lib/src/screens/new_wallet/widgets/select_button.dart +++ b/lib/src/screens/new_wallet/widgets/select_button.dart @@ -16,14 +16,26 @@ class SelectButton extends StatelessWidget { @override Widget build(BuildContext context) { final color = isSelected - ? Colors.green - : Theme.of(context).accentTextTheme!.caption!.color!; + ? Colors.green + : Theme.of(context) + .accentTextTheme! + .bodySmall! + .color!; final textColor = isSelected - ? Theme.of(context).accentTextTheme!.headline5!.decorationColor! - : Theme.of(context).primaryTextTheme!.headline6!.color!; + ? Theme.of(context) + .accentTextTheme! + .headlineSmall! + .decorationColor! + : Theme.of(context).primaryTextTheme!.titleLarge!.color!; final arrowColor = isSelected - ? Theme.of(context).accentTextTheme!.headline5!.decorationColor! - : Theme.of(context).accentTextTheme!.subtitle1!.color!; + ? Theme.of(context) + .accentTextTheme! + .headlineSmall! + .decorationColor! + : Theme.of(context) + .accentTextTheme! + .titleMedium! + .color!; final selectArrowImage = Image.asset('assets/images/select_arrow.png', color: arrowColor); diff --git a/lib/src/screens/nodes/node_create_or_edit_page.dart b/lib/src/screens/nodes/node_create_or_edit_page.dart index 6ca77d8de..71f615c6a 100644 --- a/lib/src/screens/nodes/node_create_or_edit_page.dart +++ b/lib/src/screens/nodes/node_create_or_edit_page.dart @@ -148,7 +148,10 @@ class NodeCreateOrEditPage extends BasePage { Navigator.of(context).pop(); }, text: S.of(context).save, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, isDisabled: (!nodeCreateOrEditViewModel.isReady)|| (nodeCreateOrEditViewModel diff --git a/lib/src/screens/nodes/widgets/node_list_row.dart b/lib/src/screens/nodes/widgets/node_list_row.dart index 90bb3eba1..6169c6df4 100644 --- a/lib/src/screens/nodes/widgets/node_list_row.dart +++ b/lib/src/screens/nodes/widgets/node_list_row.dart @@ -36,7 +36,7 @@ class NodeHeaderListRow extends StandardListRow { return SizedBox( width: 20, child: Icon(Icons.add, - color: Theme.of(context).accentTextTheme.subtitle1?.color, size: 24.0), + color: Theme.of(context).accentTextTheme!.titleMedium!.color,size: 24.0), ); } } diff --git a/lib/src/screens/pin_code/pin_code_widget.dart b/lib/src/screens/pin_code/pin_code_widget.dart index 0ce4ab333..628d5ab6f 100644 --- a/lib/src/screens/pin_code/pin_code_widget.dart +++ b/lib/src/screens/pin_code/pin_code_widget.dart @@ -110,11 +110,11 @@ class PinCodeState extends State { Widget body(BuildContext context) { final deleteIconImage = Image.asset( 'assets/images/delete_icon.png', - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ); final faceImage = Image.asset( 'assets/images/face.png', - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ); return RawKeyboardListener( @@ -133,7 +133,7 @@ class PinCodeState extends State { } }, child: Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, padding: EdgeInsets.only(left: 40.0, right: 40.0, bottom: 40.0), child: Column( children: [ @@ -142,7 +142,8 @@ class PinCodeState extends State { style: TextStyle( fontSize: 20, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme!.headline6!.color!)), + color: + Theme.of(context).primaryTextTheme!.titleLarge!.color!)), Spacer(flex: 3), Container( width: 180, @@ -158,10 +159,13 @@ class PinCodeState extends State { decoration: BoxDecoration( shape: BoxShape.circle, color: isFilled - ? Theme.of(context).primaryTextTheme!.headline6!.color! + ? Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color! : Theme.of(context) .accentTextTheme! - .bodyText2! + .bodyMedium! .color! .withOpacity(0.25), )); @@ -181,7 +185,10 @@ class PinCodeState extends State { style: TextStyle( fontSize: 14.0, fontWeight: FontWeight.normal, - color: Theme.of(context).accentTextTheme!.bodyText2!.decorationColor!), + color: Theme.of(context) + .accentTextTheme! + .bodyMedium! + .decorationColor!), ), ) ], @@ -225,7 +232,7 @@ class PinCodeState extends State { child: TextButton( onPressed: () => _pop(), style: TextButton.styleFrom( - backgroundColor: Theme.of(context).backgroundColor, + backgroundColor: Theme.of(context).colorScheme.background, shape: CircleBorder(), ), child: deleteIconImage, @@ -242,7 +249,7 @@ class PinCodeState extends State { child: TextButton( onPressed: () => _push(index), style: TextButton.styleFrom( - backgroundColor: Theme.of(context).backgroundColor, + backgroundColor: Theme.of(context).colorScheme.background, shape: CircleBorder(), ), child: Text('$index', @@ -251,7 +258,7 @@ class PinCodeState extends State { fontWeight: FontWeight.w600, color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!)), ), ); diff --git a/lib/src/screens/receive/anonpay_invoice_page.dart b/lib/src/screens/receive/anonpay_invoice_page.dart index 055307d08..199c33e09 100644 --- a/lib/src/screens/receive/anonpay_invoice_page.dart +++ b/lib/src/screens/receive/anonpay_invoice_page.dart @@ -73,7 +73,10 @@ class AnonPayInvoicePage extends BasePage { disableScroll: true, config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!, + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .backgroundColor!, nextFocus: false, actions: [ KeyboardActionsItem( @@ -82,7 +85,7 @@ class AnonPayInvoicePage extends BasePage { ), ]), child: Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: ScrollableWithBottomSection( contentPadding: EdgeInsets.only(bottom: 24), content: Container( @@ -91,8 +94,8 @@ class AnonPayInvoicePage extends BasePage { bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)), gradient: LinearGradient( colors: [ - Theme.of(context).primaryTextTheme.subtitle2!.color!, - Theme.of(context).primaryTextTheme.subtitle2!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleSmall!.color!, + Theme.of(context).primaryTextTheme!.titleSmall!.decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight, @@ -130,7 +133,10 @@ class AnonPayInvoicePage extends BasePage { : S.of(context).anonpay_description("a donation link", "donate"), textAlign: TextAlign.center, style: TextStyle( - color: Theme.of(context).primaryTextTheme.headline1!.decorationColor!, + color: Theme.of(context) + .primaryTextTheme! + .displayLarge! + .decorationColor!, fontWeight: FontWeight.w500, fontSize: 12), ), @@ -157,7 +163,10 @@ class AnonPayInvoicePage extends BasePage { anonInvoicePageViewModel.generateDonationLink(); } }, - color: Theme.of(context).accentTextTheme.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, isLoading: anonInvoicePageViewModel.state is IsExecutingState, ), diff --git a/lib/src/screens/receive/anonpay_receive_page.dart b/lib/src/screens/receive/anonpay_receive_page.dart index 1ee947d49..0c175eb19 100644 --- a/lib/src/screens/receive/anonpay_receive_page.dart +++ b/lib/src/screens/receive/anonpay_receive_page.dart @@ -35,7 +35,10 @@ class AnonPayReceivePage extends BasePage { Widget leading(BuildContext context) { final _backButton = Icon( Icons.arrow_back_ios, - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, size: 16, ); @@ -62,7 +65,10 @@ class AnonPayReceivePage extends BasePage { fontSize: 18.0, fontWeight: FontWeight.bold, fontFamily: 'Lato', - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!), + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!), ), Text( invoiceInfo is AnonpayInvoiceInfo @@ -71,7 +77,7 @@ class AnonPayReceivePage extends BasePage { style: TextStyle( fontSize: 10.0, fontWeight: FontWeight.w500, - color: Theme.of(context).textTheme.headline5!.color!), + color: Theme.of(context).textTheme!.headlineSmall!.color!), ) ], ); @@ -93,7 +99,10 @@ class AnonPayReceivePage extends BasePage { ), icon: Icon( Icons.edit, - color: Theme.of(context).accentTextTheme.caption!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodySmall! + .color!, size: 22.0, ), ), @@ -105,7 +114,7 @@ class AnonPayReceivePage extends BasePage { (BuildContext context, Widget scaffold) => Container( decoration: BoxDecoration( gradient: LinearGradient(colors: [ - Theme.of(context).accentColor, + Theme.of(context).colorScheme.secondary, Theme.of(context).scaffoldBackgroundColor, Theme.of(context).primaryColor, ], begin: Alignment.topRight, end: Alignment.bottomLeft)), @@ -151,7 +160,10 @@ class AnonPayReceivePage extends BasePage { decoration: BoxDecoration( border: Border.all( width: 3, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, ), ), child: QrImage( diff --git a/lib/src/screens/receive/fullscreen_qr_page.dart b/lib/src/screens/receive/fullscreen_qr_page.dart index 2fcc24e2c..b7949013e 100644 --- a/lib/src/screens/receive/fullscreen_qr_page.dart +++ b/lib/src/screens/receive/fullscreen_qr_page.dart @@ -22,7 +22,10 @@ class FullscreenQRPage extends BasePage { Widget leading(BuildContext context) { final _backButton = Icon( Icons.arrow_back_ios, - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, size: 16, ); @@ -48,7 +51,7 @@ class FullscreenQRPage extends BasePage { decoration: BoxDecoration( gradient: LinearGradient( colors: [ - Theme.of(context).accentColor, + Theme.of(context).colorScheme.secondary, Theme.of(context).scaffoldBackgroundColor, Theme.of(context).primaryColor, ], @@ -70,7 +73,12 @@ class FullscreenQRPage extends BasePage { child: Container( padding: EdgeInsets.all(10), decoration: BoxDecoration( - border: Border.all(width: 3, color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!)), + border: Border.all( + width: 3, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!)), child: Container( decoration: BoxDecoration( border: Border.all(width: 3, color: Colors.white)), diff --git a/lib/src/screens/receive/receive_page.dart b/lib/src/screens/receive/receive_page.dart index 1dd4b8585..9077bf08c 100644 --- a/lib/src/screens/receive/receive_page.dart +++ b/lib/src/screens/receive/receive_page.dart @@ -64,7 +64,10 @@ class ReceivePage extends BasePage { fontSize: 18.0, fontWeight: FontWeight.bold, fontFamily: 'Lato', - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!), + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!), ); } @@ -73,7 +76,7 @@ class ReceivePage extends BasePage { (BuildContext context, Widget scaffold) => Container( decoration: BoxDecoration( gradient: LinearGradient(colors: [ - Theme.of(context).accentColor, + Theme.of(context).colorScheme.secondary, Theme.of(context).scaffoldBackgroundColor, Theme.of(context).primaryColor, ], begin: Alignment.topRight, end: Alignment.bottomLeft)), @@ -100,7 +103,10 @@ class ReceivePage extends BasePage { icon: Icon( Icons.share, size: 20, - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, ), ), )); @@ -113,7 +119,10 @@ class ReceivePage extends BasePage { ? KeyboardActions( config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!, + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .backgroundColor!, nextFocus: false, actions: [ KeyboardActionsItem( @@ -154,7 +163,10 @@ class ReceivePage extends BasePage { icon: Icon( Icons.arrow_forward_ios, size: 14, - color: Theme.of(context).textTheme!.headline4!.color!, + color: Theme.of(context) + .textTheme! + .headlineMedium! + .color!, )); } @@ -166,7 +178,10 @@ class ReceivePage extends BasePage { icon: Icon( Icons.add, size: 20, - color: Theme.of(context).textTheme!.headline4!.color!, + color: Theme.of(context) + .textTheme! + .headlineMedium! + .color!, )); } @@ -175,11 +190,23 @@ class ReceivePage extends BasePage { final isCurrent = item.address == addressListViewModel.address.address; final backgroundColor = isCurrent - ? Theme.of(context).textTheme!.headline2!.decorationColor! - : Theme.of(context).textTheme!.headline3!.decorationColor!; + ? Theme.of(context) + .textTheme! + .displayMedium! + .decorationColor! + : Theme.of(context) + .textTheme! + .displaySmall! + .decorationColor!; final textColor = isCurrent - ? Theme.of(context).textTheme!.headline2!.color! - : Theme.of(context).textTheme!.headline3!.color!; + ? Theme.of(context) + .textTheme! + .displayMedium! + .color! + : Theme.of(context) + .textTheme! + .displaySmall! + .color!; return AddressCell.fromItem(item, isCurrent: isCurrent, @@ -225,7 +252,10 @@ class ReceivePage extends BasePage { textAlign: TextAlign.center, style: TextStyle( fontSize: 15, - color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!)), + color: Theme.of(context) + .accentTextTheme! + .displaySmall! + .backgroundColor!)), ], ), ); diff --git a/lib/src/screens/receive/widgets/anonpay_currency_input_field.dart b/lib/src/screens/receive/widgets/anonpay_currency_input_field.dart index 824044333..5bca308c9 100644 --- a/lib/src/screens/receive/widgets/anonpay_currency_input_field.dart +++ b/lib/src/screens/receive/widgets/anonpay_currency_input_field.dart @@ -32,7 +32,8 @@ class AnonpayCurrencyInputField extends StatelessWidget { decoration: BoxDecoration( border: Border( bottom: BorderSide( - color: Theme.of(context).primaryTextTheme.bodyText1!.color!, + color: + Theme.of(context).primaryTextTheme!.bodyLarge!.color!, width: 1)), ), child: Padding( @@ -64,7 +65,10 @@ class AnonpayCurrencyInputField extends StatelessWidget { child: Container( height: 32, decoration: BoxDecoration( - color: Theme.of(context).primaryTextTheme.headline4!.color!, + color: Theme.of(context) + .primaryTextTheme! + .headlineMedium! + .color!, borderRadius: BorderRadius.all(Radius.circular(6))), child: Center( child: Padding( @@ -75,8 +79,8 @@ class AnonpayCurrencyInputField extends StatelessWidget { fontSize: 12, fontWeight: FontWeight.bold, color: Theme.of(context) - .primaryTextTheme - .headline4! + .primaryTextTheme! + .headlineMedium! .decorationColor!, ), ), @@ -115,7 +119,10 @@ class AnonpayCurrencyInputField extends StatelessWidget { placeholderTextStyle: TextStyle( fontSize: 16, fontWeight: FontWeight.w600, - color: Theme.of(context).accentTextTheme.headline1!.decorationColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .decorationColor!, ), validator: null, ), @@ -136,14 +143,20 @@ class AnonpayCurrencyInputField extends StatelessWidget { style: TextStyle( fontSize: 10, height: 1.2, - color: Theme.of(context).accentTextTheme.headline1!.decorationColor!), + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .decorationColor!), ), SizedBox(width: 10), Text(S.of(context).max_value(maxAmount, selectedCurrency.toString()), style: TextStyle( fontSize: 10, height: 1.2, - color: Theme.of(context).accentTextTheme.headline1!.decorationColor!)), + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .decorationColor!)), ], ), ) diff --git a/lib/src/screens/receive/widgets/anonpay_input_form.dart b/lib/src/screens/receive/widgets/anonpay_input_form.dart index bd8a23d9c..b041aeee9 100644 --- a/lib/src/screens/receive/widgets/anonpay_input_form.dart +++ b/lib/src/screens/receive/widgets/anonpay_input_form.dart @@ -69,14 +69,17 @@ class AnonInvoiceForm extends StatelessWidget { BaseTextFormField( controller: nameController, focusNode: _nameFocusNode, - borderColor: Theme.of(context).primaryTextTheme.bodyText1!.color!, + borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.color!, suffixIcon: SizedBox(width: 36), hintText: S.of(context).optional_name, textInputAction: TextInputAction.next, placeholderTextStyle: TextStyle( fontSize: 16, fontWeight: FontWeight.w600, - color: Theme.of(context).accentTextTheme.headline1!.decorationColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .decorationColor!, ), textStyle: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white), validator: null, @@ -88,13 +91,16 @@ class AnonInvoiceForm extends StatelessWidget { controller: descriptionController, focusNode: _descriptionFocusNode, textInputAction: TextInputAction.next, - borderColor: Theme.of(context).primaryTextTheme.bodyText1!.color!, + borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.color!, suffixIcon: SizedBox(width: 36), hintText: S.of(context).optional_description, placeholderTextStyle: TextStyle( fontSize: 16, fontWeight: FontWeight.w600, - color: Theme.of(context).accentTextTheme.headline1!.decorationColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .decorationColor!, ), textStyle: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white), validator: null, @@ -104,14 +110,17 @@ class AnonInvoiceForm extends StatelessWidget { controller: emailController, textInputAction: TextInputAction.next, focusNode: _emailFocusNode, - borderColor: Theme.of(context).primaryTextTheme.bodyText1!.color!, + borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.color!, suffixIcon: SizedBox(width: 36), keyboardType: TextInputType.emailAddress, hintText: S.of(context).optional_email_hint, placeholderTextStyle: TextStyle( fontSize: 16, fontWeight: FontWeight.w600, - color: Theme.of(context).accentTextTheme.headline1!.decorationColor!, + color: Theme.of(context) + .accentTextTheme! + .displayLarge! + .decorationColor!, ), textStyle: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white), validator: EmailValidator(), diff --git a/lib/src/screens/receive/widgets/anonpay_status_section.dart b/lib/src/screens/receive/widgets/anonpay_status_section.dart index d1c8f5137..21817d686 100644 --- a/lib/src/screens/receive/widgets/anonpay_status_section.dart +++ b/lib/src/screens/receive/widgets/anonpay_status_section.dart @@ -18,7 +18,7 @@ class AnonInvoiceStatusSection extends StatelessWidget { width: 200, padding: EdgeInsets.all(19), decoration: BoxDecoration( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, borderRadius: BorderRadius.circular(30), ), child: Column( @@ -31,13 +31,19 @@ class AnonInvoiceStatusSection extends StatelessWidget { style: TextStyle( fontSize: 14, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme.headline1!.decorationColor!, + color: Theme.of(context) + .primaryTextTheme! + .displayLarge! + .decorationColor!, ), ), Container( padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5), decoration: BoxDecoration( - color: Theme.of(context).accentTextTheme.headline3!.color!, + color: Theme.of(context) + .accentTextTheme! + .displaySmall! + .color!, borderRadius: BorderRadius.circular(10), ), child: Row( @@ -52,7 +58,10 @@ class AnonInvoiceStatusSection extends StatelessWidget { Text( invoiceInfo.status ?? '', style: textSmallSemiBold( - color: Theme.of(context).primaryTextTheme.headline6!.color, + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color, ), ) ], @@ -69,13 +78,16 @@ class AnonInvoiceStatusSection extends StatelessWidget { style: TextStyle( fontSize: 14, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme.headline1!.decorationColor!, + color: Theme.of(context) + .primaryTextTheme! + .displayLarge! + .decorationColor!, ), ), Text( invoiceInfo.invoiceId ?? '', style: textSmallSemiBold( - color: Theme.of(context).primaryTextTheme.headline6!.color, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color, ), ), ], diff --git a/lib/src/screens/receive/widgets/copy_link_item.dart b/lib/src/screens/receive/widgets/copy_link_item.dart index 5fe122028..cecf33e6c 100644 --- a/lib/src/screens/receive/widgets/copy_link_item.dart +++ b/lib/src/screens/receive/widgets/copy_link_item.dart @@ -14,7 +14,10 @@ class CopyLinkItem extends StatelessWidget { @override Widget build(BuildContext context) { final copyImage = Image.asset('assets/images/copy_address.png', - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!); + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!); return Row( mainAxisAlignment: MainAxisAlignment.center, @@ -22,7 +25,10 @@ class CopyLinkItem extends StatelessWidget { Text( title, style: textMedium( - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, ), ), SizedBox(width: 50), @@ -45,7 +51,10 @@ class CopyLinkItem extends StatelessWidget { onPressed: () => Share.share(url), icon: Icon( Icons.share, - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, ), ) ], diff --git a/lib/src/screens/receive/widgets/currency_input_field.dart b/lib/src/screens/receive/widgets/currency_input_field.dart index 273bbb46b..f1ce170f7 100644 --- a/lib/src/screens/receive/widgets/currency_input_field.dart +++ b/lib/src/screens/receive/widgets/currency_input_field.dart @@ -22,7 +22,10 @@ class CurrencyInputField extends StatelessWidget { Widget build(BuildContext context) { final arrowBottomPurple = Image.asset( 'assets/images/arrow_bottom_purple_icon.png', - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, height: 8, ); final _width = MediaQuery.of(context).size.width; @@ -40,13 +43,13 @@ class CurrencyInputField extends StatelessWidget { inputFormatters: [FilteringTextInputFormatter.allow(RegExp(r'^\d+(\.|\,)?\d{0,8}'))], hintText: '0.000', placeholderTextStyle: isLight ? null : TextStyle( - color: Theme.of(context).primaryTextTheme.headline5!.color!, + color: Theme.of(context).primaryTextTheme!.headlineSmall!.color!, fontWeight: FontWeight.w600, ), - borderColor: Theme.of(context).accentTextTheme.headline6!.backgroundColor!, - textColor: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + borderColor: Theme.of(context).accentTextTheme!.titleLarge!.backgroundColor!, + textColor: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!, textStyle: TextStyle( - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!, ), prefixIcon: Padding( padding: EdgeInsets.only( @@ -69,7 +72,7 @@ class CurrencyInputField extends StatelessWidget { style: TextStyle( fontWeight: FontWeight.w600, fontSize: 16, - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!, ), ), if (selectedCurrency.tag != null) @@ -77,7 +80,7 @@ class CurrencyInputField extends StatelessWidget { padding: const EdgeInsets.only(right: 3.0), child: Container( decoration: BoxDecoration( - color: Theme.of(context).primaryTextTheme.headline4!.color!, + color: Theme.of(context).primaryTextTheme!.headlineMedium!.color!, borderRadius: BorderRadius.all( Radius.circular(6), ), @@ -89,8 +92,8 @@ class CurrencyInputField extends StatelessWidget { fontSize: 12, fontWeight: FontWeight.bold, color: Theme.of(context) - .primaryTextTheme - .headline4! + .primaryTextTheme! + .headlineMedium! .decorationColor!, ), ), @@ -105,7 +108,7 @@ class CurrencyInputField extends StatelessWidget { fontWeight: FontWeight.w600, fontSize: 20, color: - Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!, ), ), ), diff --git a/lib/src/screens/receive/widgets/header_tile.dart b/lib/src/screens/receive/widgets/header_tile.dart index 40243a3a3..ef9cd7779 100644 --- a/lib/src/screens/receive/widgets/header_tile.dart +++ b/lib/src/screens/receive/widgets/header_tile.dart @@ -22,7 +22,7 @@ class HeaderTile extends StatelessWidget { top: 24, bottom: 24 ), - color: Theme.of(context).textTheme!.headline3!.decorationColor!, + color: Theme.of(context).textTheme!.displaySmall!.decorationColor!, child: Row( mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -32,16 +32,17 @@ class HeaderTile extends StatelessWidget { style: TextStyle( fontSize: 18, fontWeight: FontWeight.w600, - color: Theme.of(context).textTheme!.headline3!.color! - ), + color: Theme.of(context)!.textTheme.displaySmall!.color!), ), Container( height: 32, width: 32, decoration: BoxDecoration( shape: BoxShape.circle, - color: Theme.of(context).textTheme!.headline4!.decorationColor! - ), + color: Theme.of(context) + .textTheme! + .headlineMedium! + .decorationColor!), child: icon, ) ], diff --git a/lib/src/screens/receive/widgets/qr_widget.dart b/lib/src/screens/receive/widgets/qr_widget.dart index 610b0d245..70a8e48bc 100644 --- a/lib/src/screens/receive/widgets/qr_widget.dart +++ b/lib/src/screens/receive/widgets/qr_widget.dart @@ -35,7 +35,7 @@ class QRWidget extends StatelessWidget { @override Widget build(BuildContext context) { final copyImage = Image.asset('assets/images/copy_address.png', - color: Theme.of(context).textTheme.subtitle1!.decorationColor!); + color: Theme.of(context).textTheme!.titleMedium!.decorationColor!); return Column( mainAxisSize: MainAxisSize.min, @@ -51,7 +51,10 @@ class QRWidget extends StatelessWidget { style: TextStyle( fontSize: 14, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!), + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!), ), ), Row( @@ -82,8 +85,10 @@ class QRWidget extends StatelessWidget { decoration: BoxDecoration( border: Border.all( width: 3, - color: - Theme.of(context).accentTextTheme.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, ), ), child: Container( @@ -147,7 +152,10 @@ class QRWidget extends StatelessWidget { style: TextStyle( fontSize: 15, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!), + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!), ), ), Padding( diff --git a/lib/src/screens/release_notes/release_notes_screen.dart b/lib/src/screens/release_notes/release_notes_screen.dart index f8b3730fb..f72a85a3e 100644 --- a/lib/src/screens/release_notes/release_notes_screen.dart +++ b/lib/src/screens/release_notes/release_notes_screen.dart @@ -51,7 +51,10 @@ class ReleaseNotesScreen extends StatelessWidget { fontSize: 24.0, fontWeight: FontWeight.bold, fontFamily: 'Lato', - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, ), child: Text(title), ), @@ -118,7 +121,10 @@ class ReleaseNotesScreen extends StatelessWidget { decoration: TextDecoration.none, fontSize: 16.0, fontFamily: 'Lato', - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .backgroundColor!, ), child: Row( crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/src/screens/rescan/rescan_page.dart b/lib/src/screens/rescan/rescan_page.dart index c88a1e7f4..58c51ae5b 100644 --- a/lib/src/screens/rescan/rescan_page.dart +++ b/lib/src/screens/rescan/rescan_page.dart @@ -35,7 +35,10 @@ class RescanPage extends BasePage { _blockchainHeightWidgetKey.currentState!.height); Navigator.of(context).pop(); }, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, isDisabled: !_rescanViewModel.isButtonEnabled, )) diff --git a/lib/src/screens/restore/restore_from_backup_page.dart b/lib/src/screens/restore/restore_from_backup_page.dart index 16aa3dbef..a057dd131 100644 --- a/lib/src/screens/restore/restore_from_backup_page.dart +++ b/lib/src/screens/restore/restore_from_backup_page.dart @@ -75,7 +75,10 @@ class RestoreFromBackupPage extends BasePage { restoreFromBackupViewModel.state is IsExecutingState, onPressed: () => onImportHandler(context), text: S.of(context).import, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white); })) ])), diff --git a/lib/src/screens/restore/restore_wallet_from_seed_details.dart b/lib/src/screens/restore/restore_wallet_from_seed_details.dart index bb662150d..d13606fa1 100644 --- a/lib/src/screens/restore/restore_wallet_from_seed_details.dart +++ b/lib/src/screens/restore/restore_wallet_from_seed_details.dart @@ -134,7 +134,10 @@ class _RestoreFromSeedDetailsFormState isLoading: widget.walletRestorationFromSeedVM.state is IsExecutingState, text: S.of(context).restore_recover, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, isDisabled: _nameController.text.isNotEmpty, ); diff --git a/lib/src/screens/restore/sweeping_wallet_page.dart b/lib/src/screens/restore/sweeping_wallet_page.dart index a7828b385..96887b955 100644 --- a/lib/src/screens/restore/sweeping_wallet_page.dart +++ b/lib/src/screens/restore/sweeping_wallet_page.dart @@ -16,7 +16,7 @@ class SweepingWalletPage extends BasePage { @override Widget build(BuildContext context) { return Scaffold( - backgroundColor: Theme.of(context).backgroundColor, + backgroundColor: Theme.of(context).colorScheme.background, resizeToAvoidBottomInset: false, body: body(context)); } @@ -82,7 +82,10 @@ class _SweepingWalletWidgetState extends State { style: TextStyle( fontSize: 18, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme!.headline2!.color!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .color, ), textAlign: TextAlign.center, ), @@ -94,7 +97,10 @@ class _SweepingWalletWidgetState extends State { style: TextStyle( fontSize: 36, fontWeight: FontWeight.bold, - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!, ), textAlign: TextAlign.center, ), @@ -106,7 +112,10 @@ class _SweepingWalletWidgetState extends State { style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme!.headline2!.color!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .color, ), textAlign: TextAlign.center, ), diff --git a/lib/src/screens/restore/wallet_restore_from_keys_form.dart b/lib/src/screens/restore/wallet_restore_from_keys_form.dart index f8411b138..732bd650e 100644 --- a/lib/src/screens/restore/wallet_restore_from_keys_form.dart +++ b/lib/src/screens/restore/wallet_restore_from_keys_form.dart @@ -91,7 +91,7 @@ class WalletRestoreFromKeysFromState extends State { 'assets/images/refresh_icon.png', color: Theme.of(context) .primaryTextTheme! - .headline4! + .headlineMedium! .decorationColor!, ), ), diff --git a/lib/src/screens/restore/wallet_restore_from_seed_form.dart b/lib/src/screens/restore/wallet_restore_from_seed_form.dart index 3071d9a82..eeba53b04 100644 --- a/lib/src/screens/restore/wallet_restore_from_seed_form.dart +++ b/lib/src/screens/restore/wallet_restore_from_seed_form.dart @@ -95,7 +95,7 @@ class WalletRestoreFromSeedFormState extends State { 'assets/images/refresh_icon.png', color: Theme.of(context) .primaryTextTheme! - .headline4! + .headlineMedium! .decorationColor!, ), ), diff --git a/lib/src/screens/restore/wallet_restore_page.dart b/lib/src/screens/restore/wallet_restore_page.dart index aa9d31f1b..8e4407b3c 100644 --- a/lib/src/screens/restore/wallet_restore_page.dart +++ b/lib/src/screens/restore/wallet_restore_page.dart @@ -91,7 +91,8 @@ class WalletRestorePage extends BasePage { fontSize: 18.0, fontWeight: FontWeight.bold, fontFamily: 'Lato', - color: titleColor ?? Theme.of(context).primaryTextTheme.headline6!.color!), + color: titleColor ?? + Theme.of(context).primaryTextTheme!.titleLarge!.color!), )); final WalletRestoreViewModel walletRestoreViewModel; @@ -138,7 +139,10 @@ class WalletRestorePage extends BasePage { return KeyboardActions( config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!, + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .backgroundColor!, nextFocus: false, actions: [ KeyboardActionsItem( @@ -149,7 +153,7 @@ class WalletRestorePage extends BasePage { ), child: Container( height: 0, - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: Center( child: ConstrainedBox( constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtil.kDesktopMaxWidthConstraint), @@ -190,8 +194,14 @@ class WalletRestorePage extends BasePage { return LoadingPrimaryButton( onPressed: _confirmForm, text: S.of(context).restore_recover, - color: Theme.of(context).accentTextTheme.subtitle2!.decorationColor!, - textColor: Theme.of(context).accentTextTheme.headline5!.decorationColor!, + color: Theme.of(context) + .accentTextTheme! + .titleSmall! + .decorationColor!, + textColor: Theme.of(context) + .accentTextTheme! + .headlineSmall! + .decorationColor!, isLoading: walletRestoreViewModel.state is IsExecutingState, isDisabled: !walletRestoreViewModel.isButtonEnabled, ); diff --git a/lib/src/screens/restore/widgets/restore_button.dart b/lib/src/screens/restore/widgets/restore_button.dart index 3b89bcae2..aa44947b5 100644 --- a/lib/src/screens/restore/widgets/restore_button.dart +++ b/lib/src/screens/restore/widgets/restore_button.dart @@ -23,8 +23,11 @@ class RestoreButton extends StatelessWidget { padding: EdgeInsets.all(24), alignment: Alignment.topLeft, decoration: BoxDecoration( - borderRadius: BorderRadius.all(Radius.circular(12)), - color: Theme.of(context).accentTextTheme!.caption!.color!, + borderRadius: BorderRadius.all(Radius.circular(12)), + color: Theme.of(context) + .accentTextTheme! + .bodySmall! + .color!, ), child: Row( mainAxisSize: MainAxisSize.max, @@ -45,8 +48,10 @@ class RestoreButton extends StatelessWidget { style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme!.headline6!.color! - ), + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!), ), Padding( padding: EdgeInsets.only(top: 5), @@ -55,8 +60,10 @@ class RestoreButton extends StatelessWidget { style: TextStyle( fontSize: 14, fontWeight: FontWeight.normal, - color: Theme.of(context).primaryTextTheme!.overline!.color! - ), + color: Theme.of(context) + .primaryTextTheme! + .labelSmall! + .color!), ), ) ], diff --git a/lib/src/screens/seed/pre_seed_page.dart b/lib/src/screens/seed/pre_seed_page.dart index 86d88c96e..5d0b0b804 100644 --- a/lib/src/screens/seed/pre_seed_page.dart +++ b/lib/src/screens/seed/pre_seed_page.dart @@ -62,7 +62,7 @@ class PreSeedPage extends BasePage { fontWeight: FontWeight.normal, color: Theme.of(context) .primaryTextTheme! - .caption! + .bodySmall! .color!), ), ), @@ -70,7 +70,10 @@ class PreSeedPage extends BasePage { onPressed: () => Navigator.of(context) .popAndPushNamed(Routes.seed, arguments: true), text: S.of(context).pre_seed_button_text, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white) ], )) diff --git a/lib/src/screens/seed/wallet_seed_page.dart b/lib/src/screens/seed/wallet_seed_page.dart index 034ab832c..d0687aa74 100644 --- a/lib/src/screens/seed/wallet_seed_page.dart +++ b/lib/src/screens/seed/wallet_seed_page.dart @@ -67,7 +67,10 @@ class WalletSeedPage extends BasePage { margin: EdgeInsets.only(left: 10), decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(16)), - color: Theme.of(context).accentTextTheme!.caption!.color!), + color: Theme.of(context) + .accentTextTheme! + .bodySmall! + .color!), child: Text( S.of(context).seed_language_next, style: TextStyle( @@ -115,7 +118,7 @@ class WalletSeedPage extends BasePage { fontWeight: FontWeight.w600, color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!), ), Padding( @@ -129,7 +132,7 @@ class WalletSeedPage extends BasePage { fontWeight: FontWeight.normal, color: Theme.of(context) .primaryTextTheme! - .caption! + .bodySmall! .color!), ), ) @@ -151,7 +154,7 @@ class WalletSeedPage extends BasePage { fontWeight: FontWeight.normal, color: Theme.of(context) .primaryTextTheme! - .overline! + .labelSmall! .color!), ), ) @@ -187,7 +190,7 @@ class WalletSeedPage extends BasePage { text: S.of(context).copy, color: Theme.of(context) .accentTextTheme! - .bodyText2! + .bodyMedium! .color!, textColor: Colors.white)), )) diff --git a/lib/src/screens/seed_language/seed_language_page.dart b/lib/src/screens/seed_language/seed_language_page.dart index 38f8b67c7..287a1ef07 100644 --- a/lib/src/screens/seed_language/seed_language_page.dart +++ b/lib/src/screens/seed_language/seed_language_page.dart @@ -66,7 +66,8 @@ class SeedLanguageFormState extends State { style: TextStyle( fontSize: 16.0, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme!.headline6!.color!), + color: + Theme.of(context).primaryTextTheme!.titleLarge!.color!), ), ), Padding( diff --git a/lib/src/screens/send/send_page.dart b/lib/src/screens/send/send_page.dart index ee0d8431c..9e648d094 100644 --- a/lib/src/screens/send/send_page.dart +++ b/lib/src/screens/send/send_page.dart @@ -192,10 +192,10 @@ class SendPage extends BasePage { dotWidth: 6.0, dotHeight: 6.0, dotColor: Theme.of(context) - .primaryTextTheme.headline3! + .primaryTextTheme!.displaySmall! .backgroundColor!, activeDotColor: Theme.of(context) - .primaryTextTheme.headline2! + .primaryTextTheme!.displayMedium! .backgroundColor!), ) : Offstage(); @@ -294,7 +294,7 @@ class SendPage extends BasePage { text: 'Change your asset (${sendViewModel.selectedCryptoCurrency})', color: Colors.transparent, textColor: Theme.of(context) - .accentTextTheme.headline3! + .accentTextTheme!.displaySmall! .decorationColor!, ) ) @@ -312,11 +312,11 @@ class SendPage extends BasePage { text: S.of(context).add_receiver, color: Colors.transparent, textColor: Theme.of(context) - .accentTextTheme.headline3! + .accentTextTheme!.displaySmall! .decorationColor!, isDottedBorder: true, borderColor: Theme.of(context) - .primaryTextTheme.headline3! + .primaryTextTheme!.displaySmall! .decorationColor!, )), Observer( @@ -345,7 +345,7 @@ class SendPage extends BasePage { }, text: S.of(context).send, - color: Theme.of(context).accentTextTheme.bodyText1!.color!, + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!, textColor: Colors.white, isLoading: sendViewModel.state is IsExecutingState || sendViewModel.state is TransactionCommitting, diff --git a/lib/src/screens/send/send_template_page.dart b/lib/src/screens/send/send_template_page.dart index d7a9a6d4b..51c591fe3 100644 --- a/lib/src/screens/send/send_template_page.dart +++ b/lib/src/screens/send/send_template_page.dart @@ -50,8 +50,10 @@ class SendTemplatePage extends BasePage { return KeyboardActions( config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: - Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!, + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .backgroundColor!, nextFocus: false, actions: [ KeyboardActionsItem( @@ -65,7 +67,7 @@ class SendTemplatePage extends BasePage { ]), child: Container( height: 0, - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: ScrollableWithBottomSection( contentPadding: EdgeInsets.only(bottom: 24), content: Container( @@ -75,8 +77,11 @@ class SendTemplatePage extends BasePage { bottomRight: Radius.circular(24), ), gradient: LinearGradient(colors: [ - Theme.of(context).primaryTextTheme!.subtitle1!.color!, - Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleMedium!.color!, + Theme.of(context) + .primaryTextTheme! + .titleMedium! + .decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight), ), child: Form( @@ -92,7 +97,7 @@ class SendTemplatePage extends BasePage { hintText: S.of(context).send_name, borderColor: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .color!, textStyle: TextStyle( fontSize: 14, @@ -101,7 +106,7 @@ class SendTemplatePage extends BasePage { placeholderTextStyle: TextStyle( color: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .decorationColor!, fontWeight: FontWeight.w500, fontSize: 14), @@ -123,11 +128,11 @@ class SendTemplatePage extends BasePage { ], buttonColor: Theme.of(context) .primaryTextTheme! - .headline4! + .headlineMedium! .color!, borderColor: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .color!, textStyle: TextStyle( fontSize: 14, @@ -138,7 +143,7 @@ class SendTemplatePage extends BasePage { fontWeight: FontWeight.w500, color: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .decorationColor!), ), ), @@ -170,7 +175,7 @@ class SendTemplatePage extends BasePage { hintText: '0.0000', borderColor: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .color!, textStyle: TextStyle( fontSize: 14, @@ -179,7 +184,7 @@ class SendTemplatePage extends BasePage { placeholderTextStyle: TextStyle( color: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .decorationColor!, fontWeight: FontWeight.w500, fontSize: 14), @@ -212,7 +217,7 @@ class SendTemplatePage extends BasePage { hintText: '0.00', borderColor: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .color!, textStyle: TextStyle( fontSize: 14, @@ -221,7 +226,7 @@ class SendTemplatePage extends BasePage { placeholderTextStyle: TextStyle( color: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .decorationColor!, fontWeight: FontWeight.w500, fontSize: 14), diff --git a/lib/src/screens/send/widgets/choose_yat_address_alert.dart b/lib/src/screens/send/widgets/choose_yat_address_alert.dart index 5d937a571..f18c116f6 100644 --- a/lib/src/screens/send/widgets/choose_yat_address_alert.dart +++ b/lib/src/screens/send/widgets/choose_yat_address_alert.dart @@ -66,7 +66,7 @@ class ChooseYatAddressButtonsState extends State { Container( width: 300, height: 158, - color: Theme.of(context).accentTextTheme!.bodyText2!.backgroundColor!, + color: Theme.of(context).accentTextTheme!.bodyMedium!.backgroundColor!, child: ListView.separated( controller: controller, padding: EdgeInsets.all(0), @@ -95,7 +95,7 @@ class ChooseYatAddressButtonsState extends State { fontSize: 15, fontWeight: FontWeight.w600, fontFamily: 'Lato', - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, decoration: TextDecoration.none, ), ) diff --git a/lib/src/screens/send/widgets/confirm_sending_alert.dart b/lib/src/screens/send/widgets/confirm_sending_alert.dart index 3d5f5c928..775971fe8 100644 --- a/lib/src/screens/send/widgets/confirm_sending_alert.dart +++ b/lib/src/screens/send/widgets/confirm_sending_alert.dart @@ -206,7 +206,7 @@ class ConfirmSendingAlertContentState extends State fontWeight: FontWeight.normal, fontFamily: 'Lato', color: Theme.of(context).primaryTextTheme! - .headline6!.color!, + .titleLarge!.color!, decoration: TextDecoration.none, ), ), @@ -220,7 +220,7 @@ class ConfirmSendingAlertContentState extends State fontWeight: FontWeight.w600, fontFamily: 'Lato', color: Theme.of(context).primaryTextTheme! - .headline6!.color!, + .titleLarge!.color!, decoration: TextDecoration.none, ), ), @@ -242,7 +242,7 @@ class ConfirmSendingAlertContentState extends State fontFamily: 'Lato', color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!, decoration: TextDecoration.none, ), @@ -258,7 +258,7 @@ class ConfirmSendingAlertContentState extends State fontFamily: 'Lato', color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color, decoration: TextDecoration.none, ), @@ -290,7 +290,7 @@ class ConfirmSendingAlertContentState extends State fontSize: 16, fontWeight: FontWeight.normal, fontFamily: 'Lato', - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, decoration: TextDecoration.none, ), ), @@ -303,7 +303,7 @@ class ConfirmSendingAlertContentState extends State fontSize: 18, fontWeight: FontWeight.w600, fontFamily: 'Lato', - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, decoration: TextDecoration.none, ), ), @@ -334,7 +334,7 @@ class ConfirmSendingAlertContentState extends State fontFamily: 'Lato', color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!, decoration: TextDecoration.none, ), diff --git a/lib/src/screens/send/widgets/send_card.dart b/lib/src/screens/send/widgets/send_card.dart index 297e7d660..96045b1bd 100644 --- a/lib/src/screens/send/widgets/send_card.dart +++ b/lib/src/screens/send/widgets/send_card.dart @@ -102,7 +102,9 @@ class SendCardState extends State KeyboardActions( config: KeyboardActionsConfig( keyboardActionsPlatform: KeyboardActionsPlatform.IOS, - keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1! + keyboardBarColor: Theme.of(context) + .accentTextTheme! + .bodyLarge! .backgroundColor!, nextFocus: false, actions: [ @@ -125,10 +127,10 @@ class SendCardState extends State bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)), gradient: LinearGradient(colors: [ - Theme.of(context).primaryTextTheme!.subtitle1!.color!, + Theme.of(context).primaryTextTheme!.titleMedium!.color!, Theme.of(context) .primaryTextTheme! - .subtitle1! + .titleMedium! .decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight), ) : null, @@ -164,11 +166,11 @@ class SendCardState extends State ], buttonColor: Theme.of(context) .primaryTextTheme! - .headline4! + .headlineMedium! .color!, borderColor: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .color!, textStyle: TextStyle( fontSize: 14, @@ -179,7 +181,7 @@ class SendCardState extends State fontWeight: FontWeight.w500, color: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .decorationColor!), onPushPasteButton: (context) async { output.resetParsedAddress(); @@ -200,7 +202,7 @@ class SendCardState extends State readOnly: true, borderColor: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .color!, textStyle: TextStyle( fontSize: 14, @@ -232,7 +234,7 @@ class SendCardState extends State decoration: BoxDecoration( color: Theme.of(context) .primaryTextTheme! - .headline4! + .headlineMedium! .color!, borderRadius: BorderRadius.all(Radius.circular(6))), @@ -245,7 +247,7 @@ class SendCardState extends State fontWeight: FontWeight.bold, color: Theme.of(context) .primaryTextTheme! - .headline4! + .headlineMedium! .decorationColor!)), ), ), @@ -286,7 +288,7 @@ class SendCardState extends State placeholderTextStyle: TextStyle( color: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .decorationColor!, fontWeight: FontWeight.w500, fontSize: 14), @@ -307,7 +309,7 @@ class SendCardState extends State decoration: BoxDecoration( color: Theme.of(context) .primaryTextTheme! - .headline4! + .headlineMedium! .color!, borderRadius: BorderRadius.all( @@ -324,7 +326,7 @@ class SendCardState extends State color: Theme.of(context) .primaryTextTheme! - .headline4! + .headlineMedium! .decorationColor!))), ))))]), ), @@ -333,7 +335,7 @@ class SendCardState extends State )), Divider(height: 1,color: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .decorationColor!), Observer( builder: (_) => Padding( @@ -352,7 +354,7 @@ class SendCardState extends State fontWeight: FontWeight.w600, color: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .decorationColor!), )), Text( @@ -362,7 +364,7 @@ class SendCardState extends State fontWeight: FontWeight.w600, color: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .decorationColor!), ) ], @@ -393,7 +395,7 @@ class SendCardState extends State hintText: '0.00', borderColor: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .color!, textStyle: TextStyle( fontSize: 14, @@ -401,7 +403,7 @@ class SendCardState extends State color: Colors.white), placeholderTextStyle: TextStyle( color: Theme.of(context) - .primaryTextTheme!.headline5!.decorationColor!, + .primaryTextTheme!.headlineSmall!.decorationColor!, fontWeight: FontWeight.w500, fontSize: 14), )), @@ -413,7 +415,7 @@ class SendCardState extends State maxLines: null, borderColor: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .color!, textStyle: TextStyle( fontSize: 14, @@ -425,7 +427,7 @@ class SendCardState extends State fontWeight: FontWeight.w500, color: Theme.of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .decorationColor!), ), ), @@ -448,7 +450,7 @@ class SendCardState extends State fontSize: 12, fontWeight: FontWeight.w500, - //color: Theme.of(context).primaryTextTheme!.headline3!.color!, + //color: Theme.of(context).primaryTextTheme!.displaySmall!.color!, color: Colors.white)), Container( child: Row( @@ -469,7 +471,7 @@ class SendCardState extends State fontSize: 12, fontWeight: FontWeight.w600, - //color: Theme.of(context).primaryTextTheme!.headline3!.color!, + //color: Theme.of(context).primaryTextTheme!.displaySmall!.color!, color: Colors.white)), Padding( @@ -489,7 +491,7 @@ class SendCardState extends State color: Theme .of(context) .primaryTextTheme! - .headline5! + .headlineSmall! .decorationColor!)) ), ], diff --git a/lib/src/screens/settings/desktop_settings/desktop_settings_page.dart b/lib/src/screens/settings/desktop_settings/desktop_settings_page.dart index 54af82526..dabdafb64 100644 --- a/lib/src/screens/settings/desktop_settings/desktop_settings_page.dart +++ b/lib/src/screens/settings/desktop_settings/desktop_settings_page.dart @@ -71,7 +71,10 @@ class _DesktopSettingsPageState extends State { }, separatorBuilder: (_, index) => Container( height: 1, - color: Theme.of(context).primaryTextTheme.caption!.decorationColor!, + color: Theme.of(context) + .primaryTextTheme! + .bodySmall! + .decorationColor!, ), itemCount: itemCount, ), diff --git a/lib/src/screens/settings/widgets/settings_cell_with_arrow.dart b/lib/src/screens/settings/widgets/settings_cell_with_arrow.dart index 1f1828b88..1d97db08c 100644 --- a/lib/src/screens/settings/widgets/settings_cell_with_arrow.dart +++ b/lib/src/screens/settings/widgets/settings_cell_with_arrow.dart @@ -8,5 +8,5 @@ class SettingsCellWithArrow extends StandardListRow { @override Widget buildTrailing(BuildContext context) => Image.asset('assets/images/select_arrow.png', - color: Theme.of(context).primaryTextTheme!.overline!.color!); + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!); } \ No newline at end of file diff --git a/lib/src/screens/settings/widgets/settings_choices_cell.dart b/lib/src/screens/settings/widgets/settings_choices_cell.dart index f08a555b0..49bc301f1 100644 --- a/lib/src/screens/settings/widgets/settings_choices_cell.dart +++ b/lib/src/screens/settings/widgets/settings_choices_cell.dart @@ -9,7 +9,7 @@ class SettingsChoicesCell extends StatelessWidget { @override Widget build(BuildContext context) { return Container( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, padding: EdgeInsets.all(24), child: Column( mainAxisSize: MainAxisSize.min, @@ -22,7 +22,7 @@ class SettingsChoicesCell extends StatelessWidget { style: TextStyle( fontSize: 14, fontWeight: FontWeight.normal, - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, ), ), ], @@ -34,7 +34,10 @@ class SettingsChoicesCell extends StatelessWidget { child: Container( decoration: BoxDecoration( borderRadius: BorderRadius.circular(30), - color: Theme.of(context).accentTextTheme!.headline3!.color!, + color: Theme.of(context) + .accentTextTheme! + .displaySmall! + .color!, ), child: Row( mainAxisAlignment: MainAxisAlignment.center, @@ -48,12 +51,22 @@ class SettingsChoicesCell extends StatelessWidget { padding: EdgeInsets.symmetric(horizontal: 32, vertical: 8), decoration: BoxDecoration( borderRadius: BorderRadius.circular(30), - color: isSelected ? Theme.of(context).accentTextTheme!.bodyText1!.color! : null, + color: isSelected + ? Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color! + : null, ), child: Text( choicesListItem.displayItem?.call(e) ?? e.toString(), style: TextStyle( - color: isSelected ? Colors.white : Theme.of(context).primaryTextTheme!.caption!.color!, + color: isSelected + ? Colors.white + : Theme.of(context) + .primaryTextTheme! + .bodySmall! + .color!, fontWeight: isSelected ? FontWeight.w700 : FontWeight.normal, ), ), diff --git a/lib/src/screens/settings/widgets/settings_picker_cell.dart b/lib/src/screens/settings/widgets/settings_picker_cell.dart index 8dd5c8c2c..64086d8d1 100644 --- a/lib/src/screens/settings/widgets/settings_picker_cell.dart +++ b/lib/src/screens/settings/widgets/settings_picker_cell.dart @@ -55,7 +55,7 @@ class SettingsPickerCell extends StandardListRow { style: TextStyle( fontSize: 14.0, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme.overline?.color, + color: Theme.of(context).primaryTextTheme!.labelSmall?.color, ), ); } diff --git a/lib/src/screens/settings/widgets/settings_version_cell.dart b/lib/src/screens/settings/widgets/settings_version_cell.dart index 4451bb125..e314d549d 100644 --- a/lib/src/screens/settings/widgets/settings_version_cell.dart +++ b/lib/src/screens/settings/widgets/settings_version_cell.dart @@ -18,8 +18,7 @@ class SettingsVersionCell extends StatelessWidget { style: TextStyle( fontSize: 12, fontWeight: FontWeight.normal, - color: Theme.of(context).primaryTextTheme!.overline!.color! - ), + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!), ) ], ), diff --git a/lib/src/screens/subaddress/address_edit_or_create_page.dart b/lib/src/screens/subaddress/address_edit_or_create_page.dart index c0b003dec..86659130a 100644 --- a/lib/src/screens/subaddress/address_edit_or_create_page.dart +++ b/lib/src/screens/subaddress/address_edit_or_create_page.dart @@ -53,7 +53,10 @@ class AddressEditOrCreatePage extends BasePage { text: addressEditOrCreateViewModel.isEdit ? S.of(context).rename : S.of(context).new_subaddress_create, - color: Theme.of(context).accentTextTheme!.bodyText1!.color!, + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!, textColor: Colors.white, isLoading: addressEditOrCreateViewModel.state is AddressIsSaving, diff --git a/lib/src/screens/support/support_page.dart b/lib/src/screens/support/support_page.dart index 801f81775..b385530fb 100644 --- a/lib/src/screens/support/support_page.dart +++ b/lib/src/screens/support/support_page.dart @@ -19,7 +19,10 @@ class SupportPage extends BasePage { @override Widget body(BuildContext context) { - final iconColor = Theme.of(context).accentTextTheme!.headline1!.backgroundColor!; + final iconColor = Theme.of(context) + .accentTextTheme! + .displayLarge! + .backgroundColor!; // FIX-ME: Added `context` it was not used here before, maby bug ? return Center( child: ConstrainedBox( diff --git a/lib/src/screens/transaction_details/widgets/textfield_list_row.dart b/lib/src/screens/transaction_details/widgets/textfield_list_row.dart index 81776da10..18e5368a6 100644 --- a/lib/src/screens/transaction_details/widgets/textfield_list_row.dart +++ b/lib/src/screens/transaction_details/widgets/textfield_list_row.dart @@ -23,7 +23,7 @@ class TextFieldListRow extends StatelessWidget { Widget build(BuildContext context) { return Container( width: double.infinity, - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: Padding( padding: const EdgeInsets.only(left: 24, top: 16, bottom: 16, right: 24), @@ -35,7 +35,9 @@ class TextFieldListRow extends StatelessWidget { fontSize: titleFontSize, fontWeight: FontWeight.w500, color: Theme.of(context) - .primaryTextTheme!.overline!.color!), + .primaryTextTheme! + .labelSmall! + .color!), textAlign: TextAlign.left), TextField( controller: _textController, @@ -46,8 +48,8 @@ class TextFieldListRow extends StatelessWidget { style: TextStyle( fontSize: valueFontSize, fontWeight: FontWeight.w500, - color: Theme.of(context) - .primaryTextTheme!.headline6!.color!), + color: + Theme.of(context).primaryTextTheme!.titleLarge!.color!), decoration: InputDecoration( isDense: true, contentPadding: EdgeInsets.only(top: 12, bottom: 0), @@ -56,9 +58,10 @@ class TextFieldListRow extends StatelessWidget { fontSize: valueFontSize, fontWeight: FontWeight.w500, color: Theme.of(context) - .primaryTextTheme!.overline!.color!), - border: InputBorder.none - ), + .primaryTextTheme! + .labelSmall! + .color!), + border: InputBorder.none), onSubmitted: (value) => onSubmitted?.call(value), ) ]), diff --git a/lib/src/screens/unspent_coins/unspent_coins_list_page.dart b/lib/src/screens/unspent_coins/unspent_coins_list_page.dart index cb2a75f9f..432fdc5f6 100644 --- a/lib/src/screens/unspent_coins/unspent_coins_list_page.dart +++ b/lib/src/screens/unspent_coins/unspent_coins_list_page.dart @@ -18,7 +18,7 @@ class UnspentCoinsListPage extends BasePage { //@override //Widget trailing(BuildContext context) { // final questionImage = Image.asset('assets/images/question_mark.png', - // color: Theme.of(context).primaryTextTheme!.headline6!.color!); + // color: Theme.of(context).primaryTextTheme!.titleLarge!.color!); // return SizedBox( // height: 20.0, diff --git a/lib/src/screens/unspent_coins/widgets/unspent_coins_switch_row.dart b/lib/src/screens/unspent_coins/widgets/unspent_coins_switch_row.dart index 734aeb7ee..43550a9c5 100644 --- a/lib/src/screens/unspent_coins/widgets/unspent_coins_switch_row.dart +++ b/lib/src/screens/unspent_coins/widgets/unspent_coins_switch_row.dart @@ -17,7 +17,7 @@ class UnspentCoinsSwitchRow extends StatelessWidget { Widget build(BuildContext context) { return Container( width: double.infinity, - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: Padding( padding: const EdgeInsets.only(left: 24, top: 16, bottom: 16, right: 24), @@ -29,7 +29,9 @@ class UnspentCoinsSwitchRow extends StatelessWidget { fontSize: titleFontSize, fontWeight: FontWeight.w500, color: Theme.of(context) - .primaryTextTheme!.overline!.color!), + .primaryTextTheme! + .labelSmall! + .color!), textAlign: TextAlign.left), Padding( padding: EdgeInsets.only(top: 12), diff --git a/lib/src/screens/wallet_keys/wallet_keys_page.dart b/lib/src/screens/wallet_keys/wallet_keys_page.dart index c1c2e6fb5..5142fb2c2 100644 --- a/lib/src/screens/wallet_keys/wallet_keys_page.dart +++ b/lib/src/screens/wallet_keys/wallet_keys_page.dart @@ -56,7 +56,7 @@ class WalletKeysPage extends BasePage { width: double.infinity, decoration: BoxDecoration( borderRadius: BorderRadius.circular(12.0), - color: Theme.of(context).accentTextTheme!.caption!.color!, + color: Theme.of(context).accentTextTheme!.bodySmall!.color!, ), child: Center( child: Padding( @@ -84,7 +84,7 @@ class WalletKeysPage extends BasePage { separatorBuilder: (context, index) => Container( height: 1, padding: EdgeInsets.only(left: 24), - color: Theme.of(context).accentTextTheme!.headline6!.backgroundColor!, + color: Theme.of(context).accentTextTheme!.titleLarge!.backgroundColor!, child: const SectionDivider(), ), itemCount: walletKeysViewModel.items.length, diff --git a/lib/src/screens/wallet_list/wallet_list_page.dart b/lib/src/screens/wallet_list/wallet_list_page.dart index dce7e2ccf..b20b2bd1a 100644 --- a/lib/src/screens/wallet_list/wallet_list_page.dart +++ b/lib/src/screens/wallet_list/wallet_list_page.dart @@ -57,7 +57,7 @@ class WalletListBodyState extends State { final newWalletImage = Image.asset('assets/images/new_wallet.png', height: 12, width: 12, color: Colors.white); final restoreWalletImage = Image.asset('assets/images/restore_wallet.png', - height: 12, width: 12, color: Theme.of(context).primaryTextTheme.headline6!.color!); + height: 12, width: 12, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!); return Container( padding: EdgeInsets.only(top: 16), @@ -69,13 +69,13 @@ class WalletListBodyState extends State { shrinkWrap: true, physics: const NeverScrollableScrollPhysics(), separatorBuilder: (_, index) => - Divider(color: Theme.of(context).backgroundColor, height: 32), + Divider(color: Theme.of(context).colorScheme.background, height: 32), itemCount: widget.walletListViewModel.wallets.length, itemBuilder: (__, index) { final wallet = widget.walletListViewModel.wallets[index]; final currentColor = wallet.isCurrent - ? Theme.of(context).accentTextTheme.subtitle2!.decorationColor! - : Theme.of(context).backgroundColor; + ? Theme.of(context).accentTextTheme!.titleSmall!.decorationColor! + : Theme.of(context).colorScheme.background; final row = GestureDetector( onTap: () async { if (wallet.isCurrent || !wallet.isEnabled) { @@ -120,7 +120,7 @@ class WalletListBodyState extends State { child: Container( height: tileHeight, padding: EdgeInsets.only(left: 20, right: 20), - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, alignment: Alignment.centerLeft, child: Row( crossAxisAlignment: CrossAxisAlignment.center, @@ -136,7 +136,7 @@ class WalletListBodyState extends State { fontWeight: FontWeight.w500, color: Theme.of(context) .primaryTextTheme - .headline6! + .titleLarge! .color!), ) ], @@ -171,7 +171,7 @@ class WalletListBodyState extends State { }, image: newWalletImage, text: S.of(context).wallet_list_create_new_wallet, - color: Theme.of(context).accentTextTheme.bodyText1!.color!, + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!, textColor: Colors.white, ), SizedBox(height: 10.0), @@ -181,8 +181,8 @@ class WalletListBodyState extends State { }, image: restoreWalletImage, text: S.of(context).wallet_list_restore_wallet, - color: Theme.of(context).accentTextTheme.caption!.color!, - textColor: Theme.of(context).primaryTextTheme.headline6!.color!) + color: Theme.of(context).accentTextTheme!.bodySmall!.color!, + textColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!) ])), ); } diff --git a/lib/src/screens/welcome/welcome_page.dart b/lib/src/screens/welcome/welcome_page.dart index 0249093bd..3d3e4c2e4 100644 --- a/lib/src/screens/welcome/welcome_page.dart +++ b/lib/src/screens/welcome/welcome_page.dart @@ -39,7 +39,7 @@ class WelcomePage extends BasePage { @override Widget build(BuildContext context) { return Scaffold( - backgroundColor: Theme.of(context).backgroundColor, + backgroundColor: Theme.of(context).colorScheme.background, resizeToAvoidBottomInset: false, body: body(context)); } @@ -51,9 +51,14 @@ class WelcomePage extends BasePage { final newWalletImage = Image.asset('assets/images/new_wallet.png', height: 12, width: 12, - color: Theme.of(context).accentTextTheme!.headline5!.decorationColor!); + color: Theme.of(context) + .accentTextTheme! + .headlineSmall! + .decorationColor!); final restoreWalletImage = Image.asset('assets/images/restore_wallet.png', - height: 12, width: 12, color: Theme.of(context).primaryTextTheme!.headline6!.color!); + height: 12, + width: 12, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!); return WillPopScope( onWillPop: () async => false, @@ -85,7 +90,10 @@ class WelcomePage extends BasePage { style: TextStyle( fontSize: 18, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme!.headline2!.color!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .color, ), textAlign: TextAlign.center, ), @@ -97,7 +105,10 @@ class WelcomePage extends BasePage { style: TextStyle( fontSize: 36, fontWeight: FontWeight.bold, - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!, ), textAlign: TextAlign.center, ), @@ -109,7 +120,10 @@ class WelcomePage extends BasePage { style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, - color: Theme.of(context).accentTextTheme!.headline2!.color!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .color, ), textAlign: TextAlign.center, ), @@ -123,7 +137,10 @@ class WelcomePage extends BasePage { style: TextStyle( fontSize: 12, fontWeight: FontWeight.normal, - color: Theme.of(context).accentTextTheme!.headline2!.color!, + color: Theme.of(context) + .accentTextTheme! + .displayMedium! + .color, ), textAlign: TextAlign.center, ), @@ -136,11 +153,11 @@ class WelcomePage extends BasePage { text: S.of(context).create_new, color: Theme.of(context) .accentTextTheme! - .subtitle2! + .titleSmall! .decorationColor!, textColor: Theme.of(context) .accentTextTheme! - .headline5! + .headlineSmall! .decorationColor!, ), ), @@ -153,9 +170,14 @@ class WelcomePage extends BasePage { }, image: restoreWalletImage, text: S.of(context).restore_wallet, - color: Theme.of(context).accentTextTheme!.caption!.color!, - textColor: - Theme.of(context).primaryTextTheme!.headline6!.color!), + color: Theme.of(context) + .accentTextTheme! + .bodySmall! + .color!, + textColor: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!), ) ], ) diff --git a/lib/src/screens/yat_emoji_id.dart b/lib/src/screens/yat_emoji_id.dart index 1ae86aa41..6e3ec9cb1 100644 --- a/lib/src/screens/yat_emoji_id.dart +++ b/lib/src/screens/yat_emoji_id.dart @@ -38,7 +38,8 @@ class YatEmojiId extends StatelessWidget { topRight: Radius.circular(24)), child: Container( height: 420, - color: Theme.of(context).buttonColor, + color: + Theme.of(context).textTheme!.titleLarge!.backgroundColor!, padding: EdgeInsets.fromLTRB(24, 15, 24, 24), child: Column( mainAxisSize: MainAxisSize.max, @@ -88,7 +89,7 @@ class YatEmojiId extends StatelessWidget { fontSize: 32, fontWeight: FontWeight.bold, fontFamily: 'Lato', - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!, decoration: TextDecoration.none, ) ), @@ -103,7 +104,7 @@ class YatEmojiId extends StatelessWidget { fontFamily: 'Lato', color: Theme.of(context) .accentTextTheme! - .headline3! + .displaySmall! .backgroundColor!, decoration: TextDecoration.none, ) diff --git a/lib/src/widgets/add_template_button.dart b/lib/src/widgets/add_template_button.dart index 249c493a6..87951e044 100644 --- a/lib/src/widgets/add_template_button.dart +++ b/lib/src/widgets/add_template_button.dart @@ -19,7 +19,8 @@ class AddTemplateButton extends StatelessWidget { child: DottedBorder( borderType: BorderType.RRect, dashPattern: [6, 4], - color: Theme.of(context).primaryTextTheme.headline3!.decorationColor!, + color: + Theme.of(context).primaryTextTheme!.displaySmall!.decorationColor!, strokeWidth: 2, radius: Radius.circular(20), child: Container( @@ -34,14 +35,20 @@ class AddTemplateButton extends StatelessWidget { child: currentTemplatesLength >= 1 ? Icon( Icons.add, - color: Theme.of(context).primaryTextTheme.headline2!.color!, + color: Theme.of(context) + .primaryTextTheme! + .displayMedium! + .color!, ) : Text( S.of(context).new_template, style: TextStyle( fontSize: 14, fontWeight: FontWeight.w600, - color: Theme.of(context).primaryTextTheme.headline2!.color!, + color: Theme.of(context) + .primaryTextTheme! + .displayMedium! + .color!, ), ), ), diff --git a/lib/src/widgets/address_text_field.dart b/lib/src/widgets/address_text_field.dart index 059dc51aa..415d40c6d 100644 --- a/lib/src/widgets/address_text_field.dart +++ b/lib/src/widgets/address_text_field.dart @@ -68,7 +68,7 @@ class AddressTextField extends StatelessWidget { style: textStyle ?? TextStyle( fontSize: 16, - color: Theme.of(context).primaryTextTheme.headline6!.color!), + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!), decoration: InputDecoration( suffixIcon: SizedBox( width: prefixIconWidth * options.length + @@ -121,7 +121,8 @@ class AddressTextField extends StatelessWidget { decoration: BoxDecoration( color: buttonColor ?? Theme.of(context) - .accentTextTheme.headline6! + .accentTextTheme! + .titleLarge! .color!, borderRadius: BorderRadius.all(Radius.circular(6))), @@ -129,7 +130,8 @@ class AddressTextField extends StatelessWidget { 'assets/images/paste_ios.png', color: iconColor ?? Theme.of(context) - .primaryTextTheme.headline4! + .primaryTextTheme! + .headlineMedium! .decorationColor!, )), )), @@ -147,7 +149,8 @@ class AddressTextField extends StatelessWidget { decoration: BoxDecoration( color: buttonColor ?? Theme.of(context) - .accentTextTheme.headline6! + .accentTextTheme + .titleLarge! .color!, borderRadius: BorderRadius.all(Radius.circular(6))), @@ -155,7 +158,7 @@ class AddressTextField extends StatelessWidget { 'assets/images/qr_code_icon.png', color: iconColor ?? Theme.of(context) - .primaryTextTheme.headline4! + .primaryTextTheme!.headlineMedium! .decorationColor!, )), )) @@ -174,7 +177,8 @@ class AddressTextField extends StatelessWidget { decoration: BoxDecoration( color: buttonColor ?? Theme.of(context) - .accentTextTheme.headline6! + .accentTextTheme! + .titleLarge! .color!, borderRadius: BorderRadius.all(Radius.circular(6))), @@ -182,7 +186,8 @@ class AddressTextField extends StatelessWidget { 'assets/images/open_book.png', color: iconColor ?? Theme.of(context) - .primaryTextTheme.headline4! + .primaryTextTheme! + .headlineMedium! .decorationColor!, )), )) diff --git a/lib/src/widgets/alert_with_one_action.dart b/lib/src/widgets/alert_with_one_action.dart index 78752a4c3..c3b364e8d 100644 --- a/lib/src/widgets/alert_with_one_action.dart +++ b/lib/src/widgets/alert_with_one_action.dart @@ -31,7 +31,10 @@ class AlertWithOneAction extends BaseAlertDialog { width: 300, height: 52, padding: EdgeInsets.only(left: 12, right: 12), - color: Theme.of(context).accentTextTheme!.bodyText2!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .bodyMedium! + .backgroundColor!, child: ButtonTheme( minWidth: double.infinity, child: TextButton( @@ -45,7 +48,9 @@ class AlertWithOneAction extends BaseAlertDialog { style: TextStyle( fontSize: 15, fontWeight: FontWeight.w600, - color: Theme.of(context).primaryTextTheme!.bodyText2! + color: Theme.of(context) + .primaryTextTheme! + .bodyMedium! .backgroundColor!, decoration: TextDecoration.none, ), diff --git a/lib/src/widgets/base_alert_dialog.dart b/lib/src/widgets/base_alert_dialog.dart index effbbc562..995e3f205 100644 --- a/lib/src/widgets/base_alert_dialog.dart +++ b/lib/src/widgets/base_alert_dialog.dart @@ -25,7 +25,7 @@ class BaseAlertDialog extends StatelessWidget { fontSize: 20, fontFamily: 'Lato', fontWeight: FontWeight.w600, - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, decoration: TextDecoration.none, ), ); @@ -39,7 +39,7 @@ class BaseAlertDialog extends StatelessWidget { fontSize: 16, fontWeight: FontWeight.normal, fontFamily: 'Lato', - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, decoration: TextDecoration.none, ), ); @@ -59,7 +59,7 @@ class BaseAlertDialog extends StatelessWidget { backgroundColor: leftActionButtonColor ?? Theme.of(context) .accentTextTheme! - .bodyText1! + .bodyLarge! .decorationColor!, shape: const RoundedRectangleBorder( borderRadius: BorderRadius.all(Radius.zero))), @@ -71,8 +71,10 @@ class BaseAlertDialog extends StatelessWidget { fontFamily: 'Lato', fontWeight: FontWeight.w600, color: leftActionButtonTextColor ?? - Theme.of(context).primaryTextTheme! - .bodyText1!.backgroundColor!, + Theme.of(context) + .primaryTextTheme! + .bodyLarge! + .backgroundColor!, decoration: TextDecoration.none, ), )), @@ -83,8 +85,10 @@ class BaseAlertDialog extends StatelessWidget { onPressed: actionRight, style: TextButton.styleFrom( backgroundColor: rightActionButtonColor ?? - Theme.of(context).accentTextTheme! - .bodyText2!.backgroundColor!, + Theme.of(context) + .accentTextTheme! + .bodyMedium! + .backgroundColor!, shape: const RoundedRectangleBorder( borderRadius: BorderRadius.all(Radius.zero))), child: Text( @@ -97,7 +101,7 @@ class BaseAlertDialog extends StatelessWidget { color: rightActionButtonTextColor ?? Theme.of(context) .primaryTextTheme! - .bodyText2! + .bodyMedium! .backgroundColor!, decoration: TextDecoration.none, ), @@ -124,7 +128,10 @@ class BaseAlertDialog extends StatelessWidget { borderRadius: BorderRadius.all(Radius.circular(30)), child: Container( width: 300, - color: Theme.of(context).accentTextTheme!.headline6!.decorationColor!, + color: Theme.of(context) + .accentTextTheme! + .titleLarge! + .decorationColor!, child: Column( mainAxisSize: MainAxisSize.min, children: [ diff --git a/lib/src/widgets/base_text_form_field.dart b/lib/src/widgets/base_text_form_field.dart index ff2102843..a9dd51380 100644 --- a/lib/src/widgets/base_text_form_field.dart +++ b/lib/src/widgets/base_text_form_field.dart @@ -77,8 +77,8 @@ class BaseTextFormField extends StatelessWidget { style: textStyle ?? TextStyle( fontSize: 16.0, - color: - textColor ?? Theme.of(context).primaryTextTheme.headline6!.color!), + color: textColor ?? + Theme.of(context).primaryTextTheme!.titleLarge!.color!), decoration: InputDecoration( prefix: prefix, prefixIcon: prefixIcon, @@ -92,17 +92,26 @@ class BaseTextFormField extends StatelessWidget { focusedBorder: UnderlineInputBorder( borderSide: BorderSide( color: borderColor ?? - Theme.of(context).primaryTextTheme.headline6!.backgroundColor!, + Theme.of(context) + .primaryTextTheme! + .titleLarge! + .backgroundColor!, width: borderWidth)), disabledBorder: UnderlineInputBorder( borderSide: BorderSide( color: borderColor ?? - Theme.of(context).primaryTextTheme.headline6!.backgroundColor!, + Theme.of(context) + .primaryTextTheme! + .titleLarge! + .backgroundColor!, width: borderWidth)), enabledBorder: UnderlineInputBorder( borderSide: BorderSide( color: borderColor ?? - Theme.of(context).primaryTextTheme.headline6!.backgroundColor!, + Theme.of(context) + .primaryTextTheme! + .titleLarge! + .backgroundColor!, width: borderWidth))), validator: validator, ); diff --git a/lib/src/widgets/blockchain_height_widget.dart b/lib/src/widgets/blockchain_height_widget.dart index f40ef0cf1..6d2b891db 100644 --- a/lib/src/widgets/blockchain_height_widget.dart +++ b/lib/src/widgets/blockchain_height_widget.dart @@ -80,7 +80,8 @@ class BlockchainHeightState extends State { style: TextStyle( fontSize: 16.0, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme!.headline6!.color!), + color: + Theme.of(context).primaryTextTheme!.titleLarge!.color!), ), ), Row( diff --git a/lib/src/widgets/cake_scrollbar.dart b/lib/src/widgets/cake_scrollbar.dart index 23da151ec..6b8cb59da 100644 --- a/lib/src/widgets/cake_scrollbar.dart +++ b/lib/src/widgets/cake_scrollbar.dart @@ -27,7 +27,8 @@ class CakeScrollbar extends StatelessWidget { height: backgroundHeight, width: width, decoration: BoxDecoration( - color: backgroundColor ?? Theme.of(context).textTheme!.bodyText2!.decorationColor!, + color: backgroundColor ?? + Theme.of(context).textTheme!.bodyMedium!.decorationColor!, borderRadius: BorderRadius.all(Radius.circular(3))), child: Stack( children: [ @@ -38,7 +39,8 @@ class CakeScrollbar extends StatelessWidget { height: thumbHeight, width: width, decoration: BoxDecoration( - color: thumbColor ?? Theme.of(context).textTheme!.bodyText2!.color!, + color: thumbColor ?? + Theme.of(context).textTheme!.bodyMedium!.color!, borderRadius: BorderRadius.all(Radius.circular(3))), ), ) diff --git a/lib/src/widgets/check_box_picker.dart b/lib/src/widgets/check_box_picker.dart index 47b0be041..7fd0b57a3 100644 --- a/lib/src/widgets/check_box_picker.dart +++ b/lib/src/widgets/check_box_picker.dart @@ -53,7 +53,10 @@ class CheckBoxPickerState extends State { child: ClipRRect( borderRadius: BorderRadius.all(Radius.circular(30)), child: Container( - color: Theme.of(context).accentTextTheme.headline6!.color!, + color: Theme.of(context) + .accentTextTheme! + .titleLarge! + .color!, child: ConstrainedBox( constraints: BoxConstraints( maxHeight: MediaQuery.of(context).size.height * 0.65, @@ -87,7 +90,10 @@ class CheckBoxPickerState extends State { Widget itemsList() { return Container( - color: Theme.of(context).accentTextTheme.headline6!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .titleLarge! + .backgroundColor!, child: ListView.separated( padding: EdgeInsets.zero, controller: controller, @@ -95,8 +101,8 @@ class CheckBoxPickerState extends State { separatorBuilder: (context, index) => widget.isSeparated ? Divider( color: Theme.of(context) - .accentTextTheme - .headline6! + .accentTextTheme! + .titleLarge! .backgroundColor!, height: 1, ) @@ -116,13 +122,19 @@ class CheckBoxPickerState extends State { }, child: Container( height: 55, - color: Theme.of(context).accentTextTheme.headline6!.color!, + color: Theme.of(context) + .accentTextTheme! + .titleLarge! + .color!, padding: EdgeInsets.only(left: 24, right: 24), child: CheckboxListTile( value: item.value, activeColor: item.value ? Palette.blueCraiola - : Theme.of(context).accentTextTheme.subtitle1!.decorationColor!, + : Theme.of(context) + .accentTextTheme! + .titleMedium! + .decorationColor!, checkColor: Colors.white, title: widget.displayItem?.call(item) ?? Text( @@ -133,7 +145,7 @@ class CheckBoxPickerState extends State { fontWeight: FontWeight.w600, color: item.isDisabled ? Colors.grey.withOpacity(0.5) - : Theme.of(context).primaryTextTheme.headline6!.color!, + : Theme.of(context).primaryTextTheme!.titleLarge!.color!, decoration: TextDecoration.none, ), ), diff --git a/lib/src/widgets/checkbox_widget.dart b/lib/src/widgets/checkbox_widget.dart index 748f2d4a8..a2603ad19 100644 --- a/lib/src/widgets/checkbox_widget.dart +++ b/lib/src/widgets/checkbox_widget.dart @@ -42,15 +42,19 @@ class CheckboxWidgetState extends State { decoration: BoxDecoration( color: value ? Palette.blueCraiola - : Theme.of(context).accentTextTheme!.subtitle1!.decorationColor!, + : Theme.of(context) + .accentTextTheme! + .titleMedium! + .decorationColor!, borderRadius: BorderRadius.all(Radius.circular(2)), border: Border.all( color: value ? Palette.blueCraiola - : Theme.of(context).accentTextTheme!.overline!.color!, - width: 1 - ) - ), + : Theme.of(context) + .accentTextTheme! + .labelSmall! + .color!, + width: 1)), child: value ? Center( child: Icon( @@ -66,7 +70,7 @@ class CheckboxWidgetState extends State { child: Text( caption, style: TextStyle( - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!, fontSize: 18, fontFamily: 'Lato', fontWeight: FontWeight.w500, diff --git a/lib/src/widgets/collapsible_standart_list.dart b/lib/src/widgets/collapsible_standart_list.dart index 514308b45..1fef64969 100644 --- a/lib/src/widgets/collapsible_standart_list.dart +++ b/lib/src/widgets/collapsible_standart_list.dart @@ -38,7 +38,7 @@ class CollapsibleSectionList extends SectionStandardList { items.add(Theme( data: ThemeData( - textTheme: TextTheme(subtitle1: TextStyle(color: themeColor,fontFamily: 'Lato')), + textTheme: TextTheme(titleMedium: TextStyle(color: themeColor,fontFamily: 'Lato')), backgroundColor: dividerThemeColor, unselectedWidgetColor: themeColor, accentColor: themeColor) diff --git a/lib/src/widgets/introducing_card.dart b/lib/src/widgets/introducing_card.dart index 59885d440..638d68c8a 100644 --- a/lib/src/widgets/introducing_card.dart +++ b/lib/src/widgets/introducing_card.dart @@ -26,7 +26,7 @@ class IntroducingCard extends StatelessWidget { color: borderColor, width: 1, ), - color: Theme.of(context).textTheme!.headline6!.backgroundColor!), + color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.start, @@ -46,7 +46,7 @@ class IntroducingCard extends StatelessWidget { fontWeight: FontWeight.bold, color: Theme.of(context) .accentTextTheme! - .headline2! + .displayMedium! .backgroundColor!, height: 1), maxLines: 1, @@ -59,7 +59,7 @@ class IntroducingCard extends StatelessWidget { fontFamily: 'Lato', color: Theme.of(context) .accentTextTheme! - .headline2! + .displayMedium! .backgroundColor!, height: 1)), ], diff --git a/lib/src/widgets/list_row.dart b/lib/src/widgets/list_row.dart index 40824fe59..d9d9e2f8d 100644 --- a/lib/src/widgets/list_row.dart +++ b/lib/src/widgets/list_row.dart @@ -19,7 +19,7 @@ class ListRow extends StatelessWidget { Widget build(BuildContext context) { return Container( width: double.infinity, - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: Padding( padding: const EdgeInsets.only(left: 24, top: 16, bottom: 16, right: 24), @@ -30,8 +30,10 @@ class ListRow extends StatelessWidget { style: TextStyle( fontSize: titleFontSize, fontWeight: FontWeight.w500, - color: - Theme.of(context).primaryTextTheme!.overline!.color!), + color: Theme.of(context) + .primaryTextTheme! + .labelSmall! + .color!), textAlign: TextAlign.left), Padding( padding: const EdgeInsets.only(top: 12), @@ -47,7 +49,7 @@ class ListRow extends StatelessWidget { fontWeight: FontWeight.w500, color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!)), ), image != null diff --git a/lib/src/widgets/market_place_item.dart b/lib/src/widgets/market_place_item.dart index 438391c97..30e617258 100644 --- a/lib/src/widgets/market_place_item.dart +++ b/lib/src/widgets/market_place_item.dart @@ -26,7 +26,7 @@ class MarketPlaceItem extends StatelessWidget { padding: EdgeInsets.all(20), width: double.infinity, decoration: BoxDecoration( - color: Theme.of(context).textTheme!.headline6!.backgroundColor!, + color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!, borderRadius: BorderRadius.circular(20), border: Border.all( color: Colors.white.withOpacity(0.20), @@ -41,7 +41,7 @@ class MarketPlaceItem extends StatelessWidget { style: TextStyle( color: Theme.of(context) .accentTextTheme! - .headline2! + .displayMedium! .backgroundColor!, fontSize: 24, fontWeight: FontWeight.w900, @@ -53,7 +53,7 @@ class MarketPlaceItem extends StatelessWidget { style: TextStyle( color: Theme.of(context) .accentTextTheme! - .headline2! + .displayMedium! .backgroundColor!, fontWeight: FontWeight.w500, fontFamily: 'Lato'), diff --git a/lib/src/widgets/picker.dart b/lib/src/widgets/picker.dart index e160a083b..7be1d611a 100644 --- a/lib/src/widgets/picker.dart +++ b/lib/src/widgets/picker.dart @@ -143,7 +143,10 @@ class _PickerState extends State> { child: ClipRRect( borderRadius: BorderRadius.all(Radius.circular(30)), child: Container( - color: Theme.of(context).accentTextTheme.headline6!.color!, + color: Theme.of(context) + .accentTextTheme! + .titleLarge! + .color!, child: ConstrainedBox( constraints: BoxConstraints( maxHeight: containerHeight, @@ -159,8 +162,8 @@ class _PickerState extends State> { controller: searchController, style: TextStyle( color: Theme.of(context) - .primaryTextTheme - .headline6! + .primaryTextTheme! + .titleLarge! .color!), decoration: InputDecoration( hintText: widget.hintText, @@ -168,8 +171,8 @@ class _PickerState extends State> { Image.asset("assets/images/search_icon.png"), filled: true, fillColor: Theme.of(context) - .accentTextTheme - .headline3! + .accentTextTheme! + .displaySmall! .color!, alignLabelWithHint: false, contentPadding: const EdgeInsets.symmetric( @@ -189,8 +192,8 @@ class _PickerState extends State> { ), Divider( color: Theme.of(context) - .accentTextTheme - .headline6! + .accentTextTheme! + .titleLarge! .backgroundColor!, height: 1, ), @@ -220,8 +223,8 @@ class _PickerState extends State> { fontFamily: 'Lato', decoration: TextDecoration.none, color: Theme.of(context) - .primaryTextTheme - .headline6! + .primaryTextTheme! + .titleLarge! .color!, ), ), @@ -242,7 +245,10 @@ class _PickerState extends State> { Widget itemsList() { return Container( - color: Theme.of(context).accentTextTheme.headline6!.backgroundColor!, + color: Theme.of(context) + .accentTextTheme! + .titleLarge! + .backgroundColor!, child: widget.isGridView ? GridView.builder( padding: EdgeInsets.zero, @@ -263,8 +269,8 @@ class _PickerState extends State> { separatorBuilder: (context, index) => widget.isSeparated ? Divider( color: Theme.of(context) - .accentTextTheme - .headline6! + .accentTextTheme! + .titleLarge! .backgroundColor!, height: 1, ) @@ -296,7 +302,10 @@ class _PickerState extends State> { }, child: Container( height: 55, - color: Theme.of(context).accentTextTheme.headline6!.color!, + color: Theme.of(context) + .accentTextTheme! + .titleLarge! + .color!, padding: EdgeInsets.symmetric(horizontal: 24), child: Row( mainAxisSize: MainAxisSize.max, @@ -318,8 +327,8 @@ class _PickerState extends State> { fontFamily: 'Lato', fontWeight: FontWeight.w600, color: Theme.of(context) - .primaryTextTheme - .headline6! + .primaryTextTheme! + .titleLarge! .color!, decoration: TextDecoration.none, ), @@ -338,8 +347,8 @@ class _PickerState extends State> { fontSize: 7.0, fontFamily: 'Lato', color: Theme.of(context) - .textTheme - .bodyText2! + .textTheme! + .bodyMedium! .color!), ), ), @@ -347,8 +356,8 @@ class _PickerState extends State> { borderRadius: BorderRadius.circular(6.0), //border: Border.all(color: ), color: Theme.of(context) - .textTheme - .bodyText2! + .textTheme! + .bodyMedium! .decorationColor!, ), ), @@ -383,7 +392,10 @@ class _PickerState extends State> { }, child: Container( height: 55, - color: Theme.of(context).accentTextTheme.headline6!.color!, + color: Theme.of(context) + .accentTextTheme! + .titleLarge! + .color!, padding: EdgeInsets.symmetric(horizontal: 24), child: Row( mainAxisSize: MainAxisSize.max, @@ -405,8 +417,8 @@ class _PickerState extends State> { fontFamily: 'Lato', fontWeight: FontWeight.w700, color: Theme.of(context) - .primaryTextTheme - .headline6! + .primaryTextTheme! + .titleLarge! .color!, decoration: TextDecoration.none, ), @@ -425,8 +437,8 @@ class _PickerState extends State> { fontSize: 7.0, fontFamily: 'Lato', color: Theme.of(context) - .textTheme - .bodyText2! + .textTheme! + .bodyMedium! .color!), ), ), @@ -434,8 +446,8 @@ class _PickerState extends State> { borderRadius: BorderRadius.circular(6.0), //border: Border.all(color: ), color: Theme.of(context) - .textTheme - .bodyText2! + .textTheme! + .bodyMedium! .decorationColor!, ), ), @@ -445,7 +457,10 @@ class _PickerState extends State> { ), ), Icon(Icons.check_circle, - color: Theme.of(context).accentTextTheme.bodyText1!.color!), + color: Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color!), ], ), ), diff --git a/lib/src/widgets/seed_widget.dart b/lib/src/widgets/seed_widget.dart index dad6480e9..0041f9b79 100644 --- a/lib/src/widgets/seed_widget.dart +++ b/lib/src/widgets/seed_widget.dart @@ -89,7 +89,10 @@ class SeedWidgetState extends State { cursorColor: Colors.blue, backgroundCursorColor: Colors.blue, validStyle: TextStyle( - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!, backgroundColor: Colors.transparent, fontWeight: FontWeight.normal, fontSize: 16), @@ -102,7 +105,10 @@ class SeedWidgetState extends State { controller: controller, words: words, textStyle: TextStyle( - color: Theme.of(context).primaryTextTheme!.headline6!.color!, + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .color!, backgroundColor: Colors.transparent, fontWeight: FontWeight.normal, fontSize: 16), @@ -124,14 +130,17 @@ class SeedWidgetState extends State { child: Image.asset('assets/images/paste_ios.png', color: Theme.of(context) .primaryTextTheme! - .headline4! + .headlineMedium! .decorationColor!)), ))) ]), Container( margin: EdgeInsets.only(top: 15), height: 1.0, - color: Theme.of(context).primaryTextTheme!.headline6!.backgroundColor!), + color: Theme.of(context) + .primaryTextTheme! + .titleLarge! + .backgroundColor!), ])); } diff --git a/lib/src/widgets/setting_action_button.dart b/lib/src/widgets/setting_action_button.dart index ef2d4e1bd..939e6b857 100644 --- a/lib/src/widgets/setting_action_button.dart +++ b/lib/src/widgets/setting_action_button.dart @@ -29,10 +29,10 @@ class SettingActionButton extends StatelessWidget { @override Widget build(BuildContext context) { Color? color = isSelected - ? Theme.of(context).textTheme.headline3!.color + ? Theme.of(context).textTheme!.displaySmall!.color : selectionActive ? Palette.darkBlue - : Theme.of(context).textTheme.headline3!.color; + : Theme.of(context).textTheme!.displaySmall!.color; return InkWell( onTap: onTap, hoverColor: Colors.transparent, diff --git a/lib/src/widgets/standard_checkbox.dart b/lib/src/widgets/standard_checkbox.dart index d2cd6463d..b1d14cc92 100644 --- a/lib/src/widgets/standard_checkbox.dart +++ b/lib/src/widgets/standard_checkbox.dart @@ -21,12 +21,12 @@ class StandardCheckbox extends StatelessWidget { @override Widget build(BuildContext context) { final baseGradient = LinearGradient(colors: [ - Theme.of(context).primaryTextTheme.subtitle1!.color!, - Theme.of(context).primaryTextTheme.subtitle1!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleMedium!.color!, + Theme.of(context).primaryTextTheme!.titleMedium!.decorationColor!, ], begin: Alignment.centerLeft, end: Alignment.centerRight); final boxBorder = Border.all( - color: borderColor ?? Theme.of(context).primaryTextTheme.caption!.color!, width: 1.0); + color: borderColor ?? Theme.of(context).primaryTextTheme!.bodySmall!.color!, width: 1.0); final checkedBoxDecoration = BoxDecoration( gradient: gradientBackground ? baseGradient : null, @@ -60,7 +60,7 @@ class StandardCheckbox extends StatelessWidget { child: Text( caption, style: TextStyle( - fontSize: 16.0, color: Theme.of(context).primaryTextTheme!.headline6!.color!), + fontSize: 16.0, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!), )) ], ), diff --git a/lib/src/widgets/standard_list.dart b/lib/src/widgets/standard_list.dart index 680cf6edd..0e371ac8a 100644 --- a/lib/src/widgets/standard_list.dart +++ b/lib/src/widgets/standard_list.dart @@ -54,10 +54,10 @@ class StandardListRow extends StatelessWidget { Color titleColor(BuildContext context) => isSelected ? Palette.blueCraiola - : Theme.of(context).primaryTextTheme!.headline6!.color!; + : Theme.of(context).primaryTextTheme!.titleLarge!.color!; Color _backgroundColor(BuildContext context) { - return Theme.of(context).backgroundColor; + return Theme.of(context).colorScheme.background; } } @@ -68,7 +68,7 @@ class SectionHeaderListRow extends StatelessWidget { Container( width: double.infinity, height: 40, - color: Theme.of(context).backgroundColor), + color: Theme.of(context).colorScheme.background), //StandardListSeparator(padding: EdgeInsets.only(left: 24)) ]); } @@ -85,11 +85,13 @@ class StandardListSeparator extends StatelessWidget { return Container( height: height, padding: padding, - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: Container( height: height, - color: Theme.of(context).primaryTextTheme.headline6?.backgroundColor - )); + color: Theme.of(context) + .primaryTextTheme! + .titleLarge + ?.backgroundColor)); } } diff --git a/lib/src/widgets/standard_list_card.dart b/lib/src/widgets/standard_list_card.dart index 7b2ecc2ce..27385bd44 100644 --- a/lib/src/widgets/standard_list_card.dart +++ b/lib/src/widgets/standard_list_card.dart @@ -21,8 +21,8 @@ class TradeDetailsStandardListCard extends StatelessWidget { final darkTheme = currentTheme == ThemeType.dark; final baseGradient = LinearGradient(colors: [ - Theme.of(context).primaryTextTheme!.subtitle2!.color!, - Theme.of(context).primaryTextTheme!.subtitle2!.decorationColor!, + Theme.of(context).primaryTextTheme!.titleSmall!.color!, + Theme.of(context).primaryTextTheme!.titleSmall!.decorationColor!, ], begin: Alignment.centerLeft, end: Alignment.centerRight); final gradient = LinearGradient(colors: [ diff --git a/lib/src/widgets/standard_list_status_row.dart b/lib/src/widgets/standard_list_status_row.dart index f958e83ae..5f5970a24 100644 --- a/lib/src/widgets/standard_list_status_row.dart +++ b/lib/src/widgets/standard_list_status_row.dart @@ -13,7 +13,7 @@ class StandardListStatusRow extends StatelessWidget { Widget build(BuildContext context) { return Container( width: double.infinity, - color: Theme.of(context).backgroundColor, + color: Theme.of(context).colorScheme.background, child: Padding( padding: const EdgeInsets.only(left: 24, top: 16, bottom: 16, right: 24), @@ -24,13 +24,13 @@ class StandardListStatusRow extends StatelessWidget { style: TextStyle( fontSize: 14, fontWeight: FontWeight.w500, - color: Theme.of(context).primaryTextTheme!.overline!.color!), + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!), textAlign: TextAlign.left), Padding( padding: const EdgeInsets.only(top: 12), child: Container( decoration: BoxDecoration( - color: Theme.of(context).accentTextTheme!.headline3!.color!, + color: Theme.of(context).accentTextTheme!.displaySmall!.color!, borderRadius: BorderRadius.circular(30.0), ), child: Padding( @@ -52,7 +52,7 @@ class StandardListStatusRow extends StatelessWidget { fontWeight: FontWeight.w500, color: Theme.of(context) .primaryTextTheme! - .headline6! + .titleLarge! .color!)) ], ), diff --git a/lib/src/widgets/standard_switch.dart b/lib/src/widgets/standard_switch.dart index 929286058..060e27990 100644 --- a/lib/src/widgets/standard_switch.dart +++ b/lib/src/widgets/standard_switch.dart @@ -24,8 +24,14 @@ class StandardSwitchState extends State { height: 28, decoration: BoxDecoration( color: widget.value - ? Theme.of(context).accentTextTheme!.bodyText1!.color! - : Theme.of(context).accentTextTheme!.headline1!.color!, + ? Theme.of(context) + .accentTextTheme! + .bodyLarge! + .color! + : Theme.of(context) + .accentTextTheme! + .displayLarge! + .color!, borderRadius: BorderRadius.all(Radius.circular(14.0))), child: Container( width: 24.0, diff --git a/lib/src/widgets/template_tile.dart b/lib/src/widgets/template_tile.dart index 8667384d2..8798e2518 100644 --- a/lib/src/widgets/template_tile.dart +++ b/lib/src/widgets/template_tile.dart @@ -47,7 +47,7 @@ class TemplateTileState extends State { @override Widget build(BuildContext context) { - final color = isRemovable ? Colors.white : Theme.of(context).primaryTextTheme!.headline6!.color!; + final color = isRemovable ? Colors.white : Theme.of(context).primaryTextTheme!.titleLarge!.color!; final toIcon = Image.asset('assets/images/to_icon.png', color: color); final content = Row( @@ -105,7 +105,7 @@ class TemplateTileState extends State { child: Container( height: 40, padding: EdgeInsets.only(left: 24, right: 24), - color: Theme.of(context).primaryTextTheme!.headline2!.decorationColor!, + color: Theme.of(context).primaryTextTheme!.displayMedium!.decorationColor!, child: content, ), ), diff --git a/lib/src/widgets/trail_button.dart b/lib/src/widgets/trail_button.dart index f2aafe563..b9c430d5d 100644 --- a/lib/src/widgets/trail_button.dart +++ b/lib/src/widgets/trail_button.dart @@ -24,7 +24,10 @@ class TrailButton extends StatelessWidget { caption, style: TextStyle( color: textColor ?? - Theme.of(context).accentTextTheme!.headline1!.decorationColor!, + Theme.of(context) + .accentTextTheme! + .displayLarge! + .decorationColor!, fontWeight: FontWeight.w600, fontSize: 14), ), diff --git a/lib/themes/bright_theme.dart b/lib/themes/bright_theme.dart index bd1275246..4e5437b64 100644 --- a/lib/themes/bright_theme.dart +++ b/lib/themes/bright_theme.dart @@ -12,78 +12,82 @@ class BrightTheme extends ThemeBase { @override ThemeType get type => ThemeType.bright; - @override - ThemeData get themeData => ThemeData( + ThemeData theme = ThemeData( fontFamily: 'Lato', brightness: Brightness.light, - backgroundColor: Colors.white, - accentColor: Palette.blueCraiola, // first gradient color scaffoldBackgroundColor: Palette.pinkFlamingo, // second gradient color primaryColor: Palette.redHat, // third gradient color - buttonColor: Colors.white.withOpacity(0.2), // action buttons on dashboard page indicatorColor: Colors.white.withOpacity(0.5), // page indicator hoverColor: Colors.white, // amount hint text (receive page) dividerColor: Palette.paleBlue, hintColor: Palette.gray, textTheme: TextTheme( - // title -> headline6 - headline6: TextStyle( + // title -> titleLarge + titleLarge: TextStyle( color: Colors.white, // sync_indicator text backgroundColor: Colors.white.withOpacity(0.2), // synced sync_indicator decorationColor: Colors.white.withOpacity(0.15), // not synced sync_indicator ), - caption: TextStyle( + bodySmall: TextStyle( color: Palette.shineOrange, // not synced light decorationColor: Colors.white, // filter icon ), - overline: TextStyle( + labelSmall: TextStyle( color: Colors.white.withOpacity(0.2), // filter button - backgroundColor: Colors.white.withOpacity(0.5), // date section row - decorationColor: Colors.white.withOpacity(0.2) // icons (transaction and trade rows) - ), - // subhead -> subtitle1 - subtitle1: TextStyle( + backgroundColor: + Colors.white.withOpacity(0.5), // date section row + decorationColor: Colors.white + .withOpacity(0.2) // icons (transaction and trade rows) + ), + // subhead -> titleMedium + titleMedium: TextStyle( color: Colors.white.withOpacity(0.2), // address button border decorationColor: Colors.white.withOpacity(0.4), // copy button (qr widget) ), - // headline -> headline5 - headline5: TextStyle( + // headline -> headlineSmall + headlineSmall: TextStyle( color: Colors.white, // qr code decorationColor: Colors.white.withOpacity(0.5), // bottom border of amount (receive page) ), - // display1 -> headline4 - headline4: TextStyle( + // display1 -> headlineMedium + headlineMedium: TextStyle( color: PaletteDark.lightBlueGrey, // icons color (receive page) decorationColor: Palette.lavender, // icons background (receive page) ), - // display2 -> headline3 - headline3: TextStyle( - color: Palette.darkBlueCraiola, // text color of tiles (receive page) - decorationColor: Colors.white // background of tiles (receive page) - ), - // display3 -> headline2 - headline2: TextStyle( + // display2 -> displaySmall + displaySmall: TextStyle( + color: + Palette.darkBlueCraiola, // text color of tiles (receive page) + decorationColor: + Colors.white // background of tiles (receive page) + ), + // display3 -> displayMedium + displayMedium: TextStyle( color: Colors.white, // text color of current tile (receive page), //decorationColor: Palette.blueCraiola // background of current tile (receive page) - decorationColor: Palette.moderateSlateBlue // background of current tile (receive page) - ), - // display4 -> headline1 - headline1: TextStyle( + decorationColor: Palette + .moderateSlateBlue // background of current tile (receive page) + ), + // display4 -> displayLarge + displayLarge: TextStyle( color: Palette.violetBlue, // text color of tiles (account list) - decorationColor: Colors.white // background of tiles (account list) - ), - // subtitle -> subtitle2 - subtitle2: TextStyle( - color: Palette.moderateSlateBlue, // text color of current tile (account list) - decorationColor: Colors.white // background of current tile (account list) - ), - // body -> bodyText2 - bodyText2: TextStyle( + decorationColor: + Colors.white // background of tiles (account list) + ), + // subtitle -> titleSmall + titleSmall: TextStyle( + color: Palette + .moderateSlateBlue, // text color of current tile (account list) + decorationColor: + Colors.white // background of current tile (account list) + ), + // body -> bodyMedium + bodyMedium: TextStyle( color: Palette.moderatePurpleBlue, // scrollbar thumb decorationColor: Palette.periwinkleCraiola // scrollbar background - ), - // body2 -> bodyText1 - bodyText1: TextStyle( + ), + // body2 -> bodyLarge + bodyLarge: TextStyle( color: Palette.moderateLavender, // menu header decorationColor: Colors.white, // menu background ) @@ -93,147 +97,179 @@ class BrightTheme extends ThemeBase { trackColor: MaterialStateProperty.all(Palette.periwinkleCraiola), radius: Radius.circular(3), thickness: MaterialStateProperty.all(6), - isAlwaysShown: true, + thumbVisibility: MaterialStateProperty.all(true), crossAxisMargin: 6, ), primaryTextTheme: TextTheme( - // title -> headline6 - headline6: TextStyle( + titleLarge: TextStyle( color: Palette.darkBlueCraiola, // title color backgroundColor: Palette.wildPeriwinkle // textfield underline - ), - caption: TextStyle( + ), + bodySmall: TextStyle( color: PaletteDark.pigeonBlue, // secondary text decorationColor: Palette.wildLavender // menu divider - ), - overline: TextStyle( + ), + labelSmall: TextStyle( color: Palette.darkGray, // transaction/trade details titles decorationColor: Colors.white.withOpacity(0.5), // placeholder ), - // subhead -> subtitle1 - subtitle1: TextStyle( + // subhead -> titleMedium + titleMedium: TextStyle( color: Palette.blueCraiola, // first gradient color (send page) - decorationColor: Palette.pinkFlamingo // second gradient color (send page) + decorationColor: + Palette.pinkFlamingo // second gradient color (send page) + ), + // headline -> headlineSmall + headlineSmall: TextStyle( + color: Colors.white + .withOpacity(0.5), // text field border color (send page) + decorationColor: Colors.white + .withOpacity(0.5), // text field hint color (send page) ), - // headline -> headline5 - headline5: TextStyle( - color: Colors.white.withOpacity(0.5), // text field border color (send page) - decorationColor: Colors.white.withOpacity(0.5), // text field hint color (send page) - ), - // display1 -> headline4 - headline4: TextStyle( - color: Colors.white.withOpacity(0.2), // text field button color (send page) - decorationColor: Colors.white // text field button icon color (send page) - ), - // display2 -> headline3 - headline3: TextStyle( + // display1 -> headlineMedium + headlineMedium: TextStyle( + color: Colors.white + .withOpacity(0.2), // text field button color (send page) + decorationColor: + Colors.white // text field button icon color (send page) + ), + // display2 -> displaySmall + displaySmall: TextStyle( color: Colors.white.withOpacity(0.5), // estimated fee (send page) - backgroundColor: PaletteDark.darkCyanBlue.withOpacity(0.67), // dot color for indicator on send page - decorationColor: Palette.shadowWhite // template dotted border (send page) - ), - // display3 -> headline2 - headline2: TextStyle( + backgroundColor: PaletteDark.darkCyanBlue + .withOpacity(0.67), // dot color for indicator on send page + decorationColor: + Palette.shadowWhite // template dotted border (send page) + ), + // display3 -> displayMedium + displayMedium: TextStyle( color: Palette.darkBlueCraiola, // template new text (send page) - backgroundColor: PaletteDark.darkNightBlue, // active dot color for indicator on send page - decorationColor: Palette.shadowWhite // template background color (send page) - ), - // display4 -> headline1 - headline1: TextStyle( + backgroundColor: PaletteDark + .darkNightBlue, // active dot color for indicator on send page + decorationColor: + Palette.shadowWhite // template background color (send page) + ), + // display4 -> displayLarge + displayLarge: TextStyle( color: Palette.darkBlueCraiola, // template title (send page) - backgroundColor: Colors.white, // icon color on order row (moonpay) - decorationColor: Palette.niagara // receive amount text (exchange page) - ), - // subtitle -> subtitle2 - subtitle2: TextStyle( - color: Palette.blueCraiola, // first gradient color top panel (exchange page) - decorationColor: Palette.pinkFlamingo // second gradient color top panel (exchange page) - ), - // body -> bodyText2 - bodyText2: TextStyle( - color: Palette.blueCraiola.withOpacity(0.7), // first gradient color bottom panel (exchange page) - decorationColor: Palette.pinkFlamingo.withOpacity(0.7), // second gradient color bottom panel (exchange page) - backgroundColor: Palette.moderateSlateBlue // alert right button text - ), - // body2 -> bodyText1 - bodyText1: TextStyle( - color: Colors.white.withOpacity(0.5), // text field border on top panel (exchange page) - decorationColor: Colors.white.withOpacity(0.5), // text field border on bottom panel (exchange page) + backgroundColor: + Colors.white, // icon color on order row (moonpay) + decorationColor: + Palette.niagara // receive amount text (exchange page) + ), + // subtitle -> titleSmall + titleSmall: TextStyle( + color: Palette + .blueCraiola, // first gradient color top panel (exchange page) + decorationColor: Palette + .pinkFlamingo // second gradient color top panel (exchange page) + ), + // body -> bodyMedium + bodyMedium: TextStyle( + color: Palette.blueCraiola.withOpacity( + 0.7), // first gradient color bottom panel (exchange page) + decorationColor: Palette.pinkFlamingo.withOpacity( + 0.7), // second gradient color bottom panel (exchange page) + backgroundColor: + Palette.moderateSlateBlue // alert right button text + ), + // body2 -> bodyLarge + bodyLarge: TextStyle( + color: Colors.white.withOpacity( + 0.5), // text field border on top panel (exchange page) + decorationColor: Colors.white.withOpacity( + 0.5), // text field border on bottom panel (exchange page) backgroundColor: Palette.brightOrange // alert left button text ) ), focusColor: Colors.white.withOpacity(0.2), // text field button (exchange page) accentTextTheme: TextTheme( - // title -> headline6 - headline6: TextStyle( + // title -> titleLarge + titleLarge: TextStyle( color: Colors.white, // picker background backgroundColor: Palette.periwinkleCraiola, // picker divider decorationColor: Colors.white // dialog background - ), - caption: TextStyle( + ), + bodySmall: TextStyle( color: Palette.moderateLavender, // container (confirm exchange) backgroundColor: Palette.moderateLavender, // button background (confirm exchange) decorationColor: Palette.darkBlueCraiola, // text color (information page) ), - // subtitle -> subtitle2 - subtitle2: TextStyle( + // subtitle -> titleSmall + titleSmall: TextStyle( color: Palette.darkBlueCraiola, // QR code (exchange trade page) backgroundColor: Palette.wildPeriwinkle, // divider (exchange trade page) //decorationColor: Palette.blueCraiola // crete new wallet button background (wallet list page) - decorationColor: Palette.moderateSlateBlue // crete new wallet button background (wallet list page) - ), - // headline -> headline5 - headline5: TextStyle( - color: Palette.moderateLavender, // first gradient color of wallet action buttons (wallet list page) - backgroundColor: Palette.moderateLavender, // second gradient color of wallet action buttons (wallet list page) - decorationColor: Colors.white // restore wallet button text color (wallet list page) - ), - // subhead -> subtitle1 - subtitle1: TextStyle( + decorationColor: Palette + .moderateSlateBlue // crete new wallet button background (wallet list page) + ), + // headline -> headlineSmall + headlineSmall: TextStyle( + color: Palette + .moderateLavender, // first gradient color of wallet action buttons (wallet list page) + backgroundColor: Palette + .moderateLavender, // second gradient color of wallet action buttons (wallet list page) + decorationColor: Colors + .white // restore wallet button text color (wallet list page) + ), + // subhead -> titleMedium + titleMedium: TextStyle( color: Palette.darkGray, // titles color (filter widget) backgroundColor: Palette.periwinkle, // divider color (filter widget) decorationColor: Colors.white // checkbox background (filter widget) - ), - overline: TextStyle( + ), + labelSmall: TextStyle( color: Palette.wildPeriwinkle, // checkbox bounds (filter widget) decorationColor: Colors.white, // menu subname ), - // display1 -> headline4 - headline4: TextStyle( + // display1 -> headlineMedium + headlineMedium: TextStyle( color: Palette.blueCraiola, // first gradient color (menu header) decorationColor: Palette.pinkFlamingo, // second gradient color(menu header) backgroundColor: Colors.white // active dot color - ), - // display2 -> headline3 - headline3: TextStyle( - color: Palette.shadowWhite, // action button color (address text field) + ), + // display2 -> displaySmall + displaySmall: TextStyle( + color: + Palette.shadowWhite, // action button color (address text field) decorationColor: Palette.darkGray, // hint text (seed widget) - backgroundColor: Colors.white.withOpacity(0.5) // text on balance page - ), - // display3 -> headline2 - headline2: TextStyle( + backgroundColor: + Colors.white.withOpacity(0.5) // text on balance page + ), + // display3 -> displayMedium + displayMedium: TextStyle( color: Palette.darkGray, // hint text (new wallet page) - decorationColor: Palette.periwinkleCraiola, // underline (new wallet page) - backgroundColor: Colors.white // menu, icons, balance (dashboard page) - ), - // display4 -> headline1 - headline1: TextStyle( + decorationColor: + Palette.periwinkleCraiola, // underline (new wallet page) + backgroundColor: + Colors.white // menu, icons, balance (dashboard page) + ), + // display4 -> displayLarge + displayLarge: TextStyle( color: Palette.darkGray, // switch background (settings page) - backgroundColor: Colors.black, // icon color on support page (moonpay, github) - decorationColor: Colors.white.withOpacity(0.4) // hint text (exchange page) - ), - // body -> bodyText2 - bodyText2: TextStyle( + backgroundColor: + Colors.black, // icon color on support page (moonpay, github) + decorationColor: + Colors.white.withOpacity(0.4) // hint text (exchange page) + ), + // body -> bodyMedium + bodyMedium: TextStyle( color: Palette.darkGray, // indicators (PIN code) decorationColor: Palette.darkGray, // switch (PIN code) backgroundColor: Colors.white // alert right button - ), - // body2 -> bodyText1 - bodyText1: TextStyle( + ), + // body2 -> bodyLarge + bodyLarge: TextStyle( color: Palette.moderateSlateBlue, // primary buttons decorationColor: Colors.white, // alert left button, backgroundColor: Palette.dullGray // keyboard bar color ), ), cardColor: Palette.moderateSlateBlue // bottom button (action list) - ); -} \ No newline at end of file + ); + + @override + ThemeData get themeData => theme.copyWith( + colorScheme: theme.colorScheme + .copyWith(background: Colors.white, secondary: Palette.blueCraiola)); +} diff --git a/lib/themes/dark_theme.dart b/lib/themes/dark_theme.dart index 9b2d471fe..e8cfab633 100644 --- a/lib/themes/dark_theme.dart +++ b/lib/themes/dark_theme.dart @@ -12,77 +12,83 @@ class DarkTheme extends ThemeBase { @override ThemeType get type => ThemeType.dark; - @override - ThemeData get themeData => ThemeData( + ThemeData theme = ThemeData( fontFamily: 'Lato', brightness: Brightness.dark, - backgroundColor: PaletteDark.backgroundColor, - accentColor: PaletteDark.backgroundColor, // first gradient color - scaffoldBackgroundColor: PaletteDark.backgroundColor, // second gradient color + scaffoldBackgroundColor: + PaletteDark.backgroundColor, // second gradient color primaryColor: PaletteDark.backgroundColor, // third gradient color - buttonColor: PaletteDark.nightBlue, // action buttons on dashboard page indicatorColor: PaletteDark.cyanBlue, // page indicator hoverColor: PaletteDark.cyanBlue, // amount hint text (receive page) dividerColor: PaletteDark.dividerColor, hintColor: PaletteDark.pigeonBlue, // menu textTheme: TextTheme( - // title -> headline6 - headline6: TextStyle( + // title -> titleLarge + titleLarge: TextStyle( color: PaletteDark.wildBlue, // sync_indicator text - backgroundColor: PaletteDark.lightNightBlue, // synced sync_indicator - decorationColor: PaletteDark.oceanBlue // not synced sync_indicator - ), - caption: TextStyle( + backgroundColor: + PaletteDark.lightNightBlue, // synced sync_indicator + decorationColor: + PaletteDark.oceanBlue // not synced sync_indicator + ), + bodySmall: TextStyle( color: PaletteDark.orangeYellow, // not synced light decorationColor: PaletteDark.wildBlue, // filter icon ), - overline: TextStyle( + labelSmall: TextStyle( color: PaletteDark.oceanBlue, // filter button backgroundColor: PaletteDark.darkCyanBlue, // date section row - decorationColor: PaletteDark.wildNightBlue // icons (transaction and trade rows) - ), - // subhead -> subtitle1 - subtitle1: TextStyle( + decorationColor: PaletteDark + .wildNightBlue // icons (transaction and trade rows) + ), + // subhead -> titleMedium + titleMedium: TextStyle( color: PaletteDark.nightBlue, // address button border decorationColor: PaletteDark.lightBlueGrey, // copy button (qr widget) ), - // headline -> headline5 - headline5: TextStyle( + // headline -> headlineSmall + headlineSmall: TextStyle( color: PaletteDark.lightBlueGrey, // qr code decorationColor: PaletteDark.darkGrey, // bottom border of amount (receive page) ), - // display1 -> headline4 - headline4: TextStyle( + // display1 -> headlineMedium + headlineMedium: TextStyle( color: Colors.white, // icons color (receive page) decorationColor: PaletteDark.distantNightBlue, // icons background (receive page) ), - // display2 -> headline3 - headline3: TextStyle( + // display2 -> displaySmall + displaySmall: TextStyle( color: Colors.white, // text color of tiles (receive page) - decorationColor: PaletteDark.nightBlue // background of tiles (receive page) - ), - // display3 -> headline2 - headline2: TextStyle( - color: Palette.blueCraiola, // text color of current tile (receive page) - decorationColor: PaletteDark.lightOceanBlue // background of current tile (receive page) - ), - // display4 -> headline1 - headline1: TextStyle( + decorationColor: + PaletteDark.nightBlue // background of tiles (receive page) + ), + // display3 -> displayMedium + displayMedium: TextStyle( + color: Palette + .blueCraiola, // text color of current tile (receive page) + decorationColor: PaletteDark + .lightOceanBlue // background of current tile (receive page) + ), + // display4 -> displayLarge + displayLarge: TextStyle( color: Colors.white, // text color of tiles (account list) - decorationColor: PaletteDark.darkOceanBlue // background of tiles (account list) - ), - // subtitle -> subtitle2 - subtitle2: TextStyle( - color: Palette.blueCraiola, // text color of current tile (account list) - decorationColor: PaletteDark.darkNightBlue // background of current tile (account list) - ), - // body1 -> bodyText2 - bodyText2: TextStyle( + decorationColor: PaletteDark + .darkOceanBlue // background of tiles (account list) + ), + // subtitle -> titleSmall + titleSmall: TextStyle( + color: Palette + .blueCraiola, // text color of current tile (account list) + decorationColor: PaletteDark + .darkNightBlue // background of current tile (account list) + ), + // body1 -> bodyMedium + bodyMedium: TextStyle( color: PaletteDark.wildBlueGrey, // scrollbar thumb decorationColor: PaletteDark.violetBlue // scrollbar background - ), - // body2 -> bodyText1 - bodyText1: TextStyle( + ), + // body2 -> bodyLarge + bodyLarge: TextStyle( color: PaletteDark.deepPurpleBlue, // menu header decorationColor: PaletteDark.deepPurpleBlue, // menu background ) @@ -92,147 +98,188 @@ class DarkTheme extends ThemeBase { trackColor: MaterialStateProperty.all(PaletteDark.violetBlue), radius: Radius.circular(3), thickness: MaterialStateProperty.all(6), - isAlwaysShown: true, + thumbVisibility: MaterialStateProperty.all(true), crossAxisMargin: 6, ), primaryTextTheme: TextTheme( - // title -> headline6 - headline6: TextStyle( + // title -> titleLarge + titleLarge: TextStyle( color: Colors.white, // title color backgroundColor: PaletteDark.darkOceanBlue // textfield underline - ), - caption: TextStyle( + ), + bodySmall: TextStyle( color: PaletteDark.darkCyanBlue, // secondary text decorationColor: PaletteDark.darkOceanBlue // menu divider - ), - overline: TextStyle( - color: PaletteDark.lightBlueGrey, // transaction/trade details titles + ), + labelSmall: TextStyle( + color: + PaletteDark.lightBlueGrey, // transaction/trade details titles decorationColor: Colors.grey, // placeholder ), - // subhead -> subtitle1 - subtitle1: TextStyle( - color: PaletteDark.darkNightBlue, // first gradient color (send page) - decorationColor: PaletteDark.darkNightBlue // second gradient color (send page) + // subhead -> titleMedium + titleMedium: TextStyle( + color: + PaletteDark.darkNightBlue, // first gradient color (send page) + decorationColor: + PaletteDark.darkNightBlue // second gradient color (send page) + ), + // headline -> headlineSmall + headlineSmall: TextStyle( + color: PaletteDark + .lightVioletBlue, // text field border color (send page) + decorationColor: + PaletteDark.darkCyanBlue, // text field hint color (send page) ), - // headline -> headline5 - headline5: TextStyle( - color: PaletteDark.lightVioletBlue, // text field border color (send page) - decorationColor: PaletteDark.darkCyanBlue, // text field hint color (send page) - ), - // display1 -> headline4 - headline4: TextStyle( - color: PaletteDark.buttonNightBlue, // text field button color (send page) - decorationColor: PaletteDark.gray // text field button icon color (send page) - ), - // display2 -> headline3 - headline3: TextStyle( + // display1 -> headlineMedium + headlineMedium: TextStyle( + color: PaletteDark + .buttonNightBlue, // text field button color (send page) + decorationColor: + PaletteDark.gray // text field button icon color (send page) + ), + // display2 -> displaySmall + displaySmall: TextStyle( color: Colors.white, // estimated fee (send page) - backgroundColor: PaletteDark.cyanBlue, // dot color for indicator on send page - decorationColor: PaletteDark.darkCyanBlue // template dotted border (send page) - ), - // display3 -> headline2 - headline2: TextStyle( + backgroundColor: + PaletteDark.cyanBlue, // dot color for indicator on send page + decorationColor: + PaletteDark.darkCyanBlue // template dotted border (send page) + ), + // display3 -> displayMedium + displayMedium: TextStyle( color: PaletteDark.darkCyanBlue, // template new text (send page) - backgroundColor: Colors.white, // active dot color for indicator on send page - decorationColor: PaletteDark.darkVioletBlue // template background color (send page) - ), - // display4 -> headline1 - headline1: TextStyle( + backgroundColor: + Colors.white, // active dot color for indicator on send page + decorationColor: PaletteDark + .darkVioletBlue // template background color (send page) + ), + // display4 -> displayLarge + displayLarge: TextStyle( color: PaletteDark.cyanBlue, // template title (send page) - backgroundColor: Colors.white, // icon color on order row (moonpay) - decorationColor: PaletteDark.darkCyanBlue // receive amount text (exchange page) - ), - // subtitle -> subtitle2 - subtitle2: TextStyle( - color: PaletteDark.wildVioletBlue, // first gradient color top panel (exchange page) - decorationColor: PaletteDark.wildVioletBlue // second gradient color top panel (exchange page) - ), - // body1 -> bodyText2 - bodyText2: TextStyle( - color: PaletteDark.darkNightBlue, // first gradient color bottom panel (exchange page) - decorationColor: PaletteDark.darkNightBlue, // second gradient color bottom panel (exchange page) + backgroundColor: + Colors.white, // icon color on order row (moonpay) + decorationColor: PaletteDark + .darkCyanBlue // receive amount text (exchange page) + ), + // subtitle -> titleSmall + titleSmall: TextStyle( + color: PaletteDark + .wildVioletBlue, // first gradient color top panel (exchange page) + decorationColor: PaletteDark + .wildVioletBlue // second gradient color top panel (exchange page) + ), + // body1 -> bodyMedium + bodyMedium: TextStyle( + color: PaletteDark + .darkNightBlue, // first gradient color bottom panel (exchange page) + decorationColor: PaletteDark + .darkNightBlue, // second gradient color bottom panel (exchange page) backgroundColor: Palette.blueCraiola // alert right button text - ), - // body2 -> bodyText1 - bodyText1: TextStyle( - color: PaletteDark.blueGrey, // text field border on top panel (exchange page) - decorationColor: PaletteDark.moderateVioletBlue, // text field border on bottom panel (exchange page) + ), + // body2 -> bodyLarge + bodyLarge: TextStyle( + color: PaletteDark + .blueGrey, // text field border on top panel (exchange page) + decorationColor: PaletteDark + .moderateVioletBlue, // text field border on bottom panel (exchange page) backgroundColor: Palette.alizarinRed // alert left button text ) ), focusColor: PaletteDark.moderateBlue, // text field button (exchange page) accentTextTheme: TextTheme( - // title -> headline6 - headline6: TextStyle( + // title -> titleLarge + titleLarge: TextStyle( color: PaletteDark.nightBlue, // picker background backgroundColor: PaletteDark.dividerColor, // picker divider decorationColor: PaletteDark.darkNightBlue // dialog background - ), - caption: TextStyle( + ), + bodySmall: TextStyle( color: PaletteDark.nightBlue, // container (confirm exchange) backgroundColor: PaletteDark.deepVioletBlue, // button background (confirm exchange) decorationColor: Palette.darkLavender, // text color (information page) ), - // subtitle -> subtitle2 - subtitle2: TextStyle( - //color: PaletteDark.lightBlueGrey, // QR code (exchange trade page) + // subtitle -> titleSmall + titleSmall: TextStyle( + //color: PaletteDark.lightBlueGrey, // QR code (exchange trade page) color: Colors.white, // QR code (exchange trade page) - backgroundColor: PaletteDark.deepVioletBlue, // divider (exchange trade page) - decorationColor: Colors.white // crete new wallet button background (wallet list page) - ), - // headline -> headline5 - headline5: TextStyle( - color: PaletteDark.distantBlue, // first gradient color of wallet action buttons (wallet list page) - backgroundColor: PaletteDark.distantNightBlue, // second gradient color of wallet action buttons (wallet list page) - decorationColor: Palette.darkBlueCraiola // restore wallet button text color (wallet list page) - ), - // subhead -> subtitle1 - subtitle1: TextStyle( + backgroundColor: + PaletteDark.deepVioletBlue, // divider (exchange trade page) + decorationColor: Colors + .white // crete new wallet button background (wallet list page) + ), + // headline -> headlineSmall + headlineSmall: TextStyle( + color: PaletteDark + .distantBlue, // first gradient color of wallet action buttons (wallet list page) + backgroundColor: PaletteDark + .distantNightBlue, // second gradient color of wallet action buttons (wallet list page) + decorationColor: Palette + .darkBlueCraiola // restore wallet button text color (wallet list page) + ), + // subhead -> titleMedium + titleMedium: TextStyle( color: Colors.white, // titles color (filter widget) - backgroundColor: PaletteDark.darkOceanBlue, // divider color (filter widget) - decorationColor: PaletteDark.wildVioletBlue.withOpacity(0.3) // checkbox background (filter widget) - ), - overline: TextStyle( + backgroundColor: + PaletteDark.darkOceanBlue, // divider color (filter widget) + decorationColor: PaletteDark.wildVioletBlue + .withOpacity(0.3) // checkbox background (filter widget) + ), + labelSmall: TextStyle( color: PaletteDark.wildVioletBlue, // checkbox bounds (filter widget) decorationColor: PaletteDark.darkCyanBlue, // menu subname ), - // display1 -> headline4 - headline4: TextStyle( - color: PaletteDark.deepPurpleBlue, // first gradient color (menu header) - decorationColor: PaletteDark.deepPurpleBlue, // second gradient color(menu header) + // display1 -> headlineMedium + headlineMedium: TextStyle( + color: PaletteDark + .deepPurpleBlue, // first gradient color (menu header) + decorationColor: PaletteDark + .deepPurpleBlue, // second gradient color(menu header) backgroundColor: Colors.white // active dot color - ), - // display2 -> headline3 - headline3: TextStyle( - color: PaletteDark.nightBlue, // action button color (address text field) - decorationColor: PaletteDark.darkCyanBlue, // hint text (seed widget) + ), + // display2 -> displaySmall + displaySmall: TextStyle( + color: PaletteDark + .nightBlue, // action button color (address text field) + decorationColor: + PaletteDark.darkCyanBlue, // hint text (seed widget) backgroundColor: PaletteDark.cyanBlue // text on balance page - ), - // display3 -> headline2 - headline2: TextStyle( + ), + // display3 -> displayMedium + displayMedium: TextStyle( color: PaletteDark.cyanBlue, // hint text (new wallet page) - decorationColor: PaletteDark.darkGrey, // underline (new wallet page) - backgroundColor: Colors.white // menu, icons, balance (dashboard page) - ), - // display4 -> headline1 - headline1: TextStyle( - color: PaletteDark.deepVioletBlue, // switch background (settings page) - backgroundColor: Colors.white, // icon color on support page (moonpay, github) - decorationColor: PaletteDark.lightBlueGrey // hint text (exchange page) - ), - // body1 -> bodyText2 - bodyText2: TextStyle( + decorationColor: + PaletteDark.darkGrey, // underline (new wallet page) + backgroundColor: + Colors.white // menu, icons, balance (dashboard page) + ), + // display4 -> displayLarge + displayLarge: TextStyle( + color: + PaletteDark.deepVioletBlue, // switch background (settings page) + backgroundColor: + Colors.white, // icon color on support page (moonpay, github) + decorationColor: + PaletteDark.lightBlueGrey // hint text (exchange page) + ), + // body1 -> bodyMedium + bodyMedium: TextStyle( color: PaletteDark.indicatorVioletBlue, // indicators (PIN code) decorationColor: PaletteDark.lightPurpleBlue, // switch (PIN code) backgroundColor: PaletteDark.darkNightBlue // alert right button - ), - // body2 -> bodyText1 - bodyText1: TextStyle( + ), + // body2 -> bodyLarge + bodyLarge: TextStyle( color: Palette.blueCraiola, // primary buttons decorationColor: PaletteDark.darkNightBlue, // alert left button backgroundColor: PaletteDark.granite // keyboard bar color ), ), cardColor: PaletteDark.darkNightBlue // bottom button (action list) - ); -} \ No newline at end of file + ); + + @override + ThemeData get themeData => theme.copyWith( + colorScheme: theme.colorScheme.copyWith( + background: PaletteDark.backgroundColor, + secondary: PaletteDark.backgroundColor)); +} diff --git a/lib/themes/light_theme.dart b/lib/themes/light_theme.dart index dda9032da..ad572c13f 100644 --- a/lib/themes/light_theme.dart +++ b/lib/themes/light_theme.dart @@ -12,78 +12,82 @@ class LightTheme extends ThemeBase { @override ThemeType get type => ThemeType.light; - @override - ThemeData get themeData => ThemeData( + ThemeData theme = ThemeData( fontFamily: 'Lato', brightness: Brightness.light, - backgroundColor: Colors.white, - accentColor: Colors.white, // first gradient color scaffoldBackgroundColor: Colors.white, // second gradient color primaryColor: Colors.white, // third gradient color - buttonColor: Palette.blueAlice, // action buttons on dashboard page - indicatorColor: PaletteDark.darkCyanBlue.withOpacity(0.67), // page indicator + indicatorColor: + PaletteDark.darkCyanBlue.withOpacity(0.67), // page indicator hoverColor: Palette.darkBlueCraiola, // amount hint text (receive page) dividerColor: Palette.paleBlue, hintColor: Palette.gray, textTheme: TextTheme( - // title -> headline6 - headline6: TextStyle( + // title -> titleLarge + titleLarge: TextStyle( color: Palette.darkBlueCraiola, // sync_indicator text backgroundColor: Palette.blueAlice, // synced sync_indicator decorationColor: Palette.blueAlice.withOpacity(0.75), // not synced sync_indicator ), - caption: TextStyle( + bodySmall: TextStyle( color: Palette.shineOrange, // not synced light decorationColor: PaletteDark.wildBlue, // filter icon ), - overline: TextStyle( + labelSmall: TextStyle( color: Palette.blueAlice, // filter button backgroundColor: PaletteDark.darkCyanBlue, // date section row - decorationColor: Palette.blueAlice // icons (transaction and trade rows) - ), - // subhead -> subtitle1 - subtitle1: TextStyle( + decorationColor: + Palette.blueAlice // icons (transaction and trade rows) + ), + // subhead -> titleMedium + titleMedium: TextStyle( color: Palette.blueAlice, // address button border decorationColor: PaletteDark.lightBlueGrey, // copy button (qr widget) ), - // headline -> headline5 - headline5: TextStyle( + // headline -> headlineSmall + headlineSmall: TextStyle( color: Colors.white, // qr code decorationColor: Palette.darkBlueCraiola, // bottom border of amount (receive page) ), - // display1 -> headline4 - headline4: TextStyle( + // display1 -> headlineMedium + headlineMedium: TextStyle( color: PaletteDark.lightBlueGrey, // icons color (receive page) decorationColor: Palette.moderateLavender, // icons background (receive page) ), - // display2 -> headline3 - headline3: TextStyle( - color: Palette.darkBlueCraiola, // text color of tiles (receive page) - decorationColor: Palette.blueAlice // background of tiles (receive page) - ), - // display3 -> headline2 - headline2: TextStyle( + // display2 -> headldisplaySmalline3 + displaySmall: TextStyle( + color: + Palette.darkBlueCraiola, // text color of tiles (receive page) + decorationColor: + Palette.blueAlice // background of tiles (receive page) + ), + // display3 -> displayMedium + displayMedium: TextStyle( color: Colors.white, // text color of current tile (receive page), //decorationColor: Palette.blueCraiola // background of current tile (receive page) - decorationColor: Palette.blueCraiola // background of current tile (receive page) - ), - // display4 -> headline1 - headline1: TextStyle( + decorationColor: Palette + .blueCraiola // background of current tile (receive page) + ), + // display4 -> displayLarge + displayLarge: TextStyle( color: Palette.violetBlue, // text color of tiles (account list) - decorationColor: Colors.white // background of tiles (account list) - ), - // subtitle -> subtitle2 - subtitle2: TextStyle( - color: Palette.protectiveBlue, // text color of current tile (account list) - decorationColor: Colors.white // background of current tile (account list) - ), - // body -> bodyText2 - bodyText2: TextStyle( + decorationColor: + Colors.white // background of tiles (account list) + ), + // subtitle -> titleSmall + titleSmall: TextStyle( + color: Palette + .protectiveBlue, // text color of current tile (account list) + decorationColor: + Colors.white // background of current tile (account list) + ), + // body -> bodyMedium + bodyMedium: TextStyle( color: Palette.moderatePurpleBlue, // scrollbar thumb decorationColor: Palette.periwinkleCraiola // scrollbar background - ), - // body2 -> bodyText1 - bodyText1: TextStyle( + ), + // body2 -> bodyLarge + bodyLarge: TextStyle( color: Palette.moderateLavender, // menu header decorationColor: Colors.white, // menu background ) @@ -93,146 +97,179 @@ class LightTheme extends ThemeBase { trackColor: MaterialStateProperty.all(Palette.periwinkleCraiola), radius: Radius.circular(3), thickness: MaterialStateProperty.all(6), - isAlwaysShown: true, + thumbVisibility: MaterialStateProperty.all(true), crossAxisMargin: 6, ), primaryTextTheme: TextTheme( - // title -> headline6 - headline6: TextStyle( + // title -> titleLarge + titleLarge: TextStyle( color: Palette.darkBlueCraiola, // title color backgroundColor: Palette.wildPeriwinkle // textfield underline - ), - caption: TextStyle( + ), + bodySmall: TextStyle( color: PaletteDark.pigeonBlue, // secondary text decorationColor: Palette.wildLavender // menu divider - ), - overline: TextStyle( + ), + labelSmall: TextStyle( color: Palette.darkGray, // transaction/trade details titles decorationColor: PaletteDark.darkCyanBlue, // placeholder ), - // subhead -> subtitle1 - subtitle1: TextStyle( + // subhead -> titleMedium + titleMedium: TextStyle( color: Palette.blueCraiola, // first gradient color (send page) - decorationColor: Palette.blueGreyCraiola // second gradient color (send page) + decorationColor: + Palette.blueGreyCraiola // second gradient color (send page) + ), + // headline -> headlineSmall + headlineSmall: TextStyle( + color: Colors.white + .withOpacity(0.5), // text field border color (send page) + decorationColor: Colors.white + .withOpacity(0.5), // text field hint color (send page) ), - // headline -> headline5 - headline5: TextStyle( - color: Colors.white.withOpacity(0.5), // text field border color (send page) - decorationColor: Colors.white.withOpacity(0.5), // text field hint color (send page) - ), - // display1 -> headline4 - headline4: TextStyle( - color: Colors.white.withOpacity(0.2), // text field button color (send page) - decorationColor: Colors.white // text field button icon color (send page) - ), - // display2 -> headline3 - headline3: TextStyle( + // display1 -> headlineMedium + headlineMedium: TextStyle( + color: Colors.white + .withOpacity(0.2), // text field button color (send page) + decorationColor: + Colors.white // text field button icon color (send page) + ), + // display2 -> displaySmall + displaySmall: TextStyle( color: Colors.white.withOpacity(0.5), // estimated fee (send page) - backgroundColor: PaletteDark.darkCyanBlue.withOpacity(0.67), // dot color for indicator on send page - decorationColor: Palette.moderateLavender // template dotted border (send page) - ), - // display3 -> headline2 - headline2: TextStyle( + backgroundColor: PaletteDark.darkCyanBlue + .withOpacity(0.67), // dot color for indicator on send page + decorationColor: + Palette.moderateLavender // template dotted border (send page) + ), + // display3 -> displayMedium + displayMedium: TextStyle( color: Palette.darkBlueCraiola, // template new text (send page) - backgroundColor: PaletteDark.darkNightBlue, // active dot color for indicator on send page - decorationColor: Palette.blueAlice // template background color (send page) - ), - // display4 -> headline1 - headline1: TextStyle( + backgroundColor: PaletteDark + .darkNightBlue, // active dot color for indicator on send page + decorationColor: + Palette.blueAlice // template background color (send page) + ), + // display4 -> displayLarge + displayLarge: TextStyle( color: Palette.darkBlueCraiola, // template title (send page) - backgroundColor: Colors.black, // icon color on order row (moonpay) - decorationColor: Palette.niagara // receive amount text (exchange page) - ), - // subtitle -> subtitle2 - subtitle2: TextStyle( - color: Palette.blueCraiola, // first gradient color top panel (exchange page) - decorationColor: Palette.blueGreyCraiola // second gradient color top panel (exchange page) - ), - // body -> bodyText2 - bodyText2: TextStyle( - color: Palette.blueCraiola.withOpacity(0.7), // first gradient color bottom panel (exchange page) - decorationColor: Palette.blueGreyCraiola.withOpacity(0.7), // second gradient color bottom panel (exchange page) + backgroundColor: + Colors.black, // icon color on order row (moonpay) + decorationColor: + Palette.niagara // receive amount text (exchange page) + ), + // subtitle -> titleSmall + titleSmall: TextStyle( + color: Palette + .blueCraiola, // first gradient color top panel (exchange page) + decorationColor: Palette + .blueGreyCraiola // second gradient color top panel (exchange page) + ), + // body -> bodyMedium + bodyMedium: TextStyle( + color: Palette.blueCraiola.withOpacity( + 0.7), // first gradient color bottom panel (exchange page) + decorationColor: Palette.blueGreyCraiola.withOpacity( + 0.7), // second gradient color bottom panel (exchange page) backgroundColor: Palette.protectiveBlue // alert right button text - ), - // body2 -> bodyText1 - bodyText1: TextStyle( - color: Colors.white.withOpacity(0.5), // text field border on top panel (exchange page) - decorationColor: Colors.white.withOpacity(0.5), // text field border on bottom panel (exchange page) + ), + // body2 -> bodyLarge + bodyLarge: TextStyle( + color: Colors.white.withOpacity( + 0.5), // text field border on top panel (exchange page) + decorationColor: Colors.white.withOpacity( + 0.5), // text field border on bottom panel (exchange page) backgroundColor: Palette.brightOrange // alert left button text ) ), focusColor: Colors.white.withOpacity(0.2), // text field button (exchange page) accentTextTheme: TextTheme( - // title -> headline6 - headline6: TextStyle( + // title -> headlititleLargene6 + titleLarge: TextStyle( color: Colors.white, // picker background backgroundColor: Palette.periwinkleCraiola, // picker divider decorationColor: Colors.white // dialog background - ), - caption: TextStyle( + ), + bodySmall: TextStyle( color: Palette.blueAlice, // container (confirm exchange) backgroundColor: Palette.blueAlice, // button background (confirm exchange) decorationColor: Palette.darkBlueCraiola, // text color (information page) ), - // subtitle -> subtitle2 - subtitle2: TextStyle( + // subtitle -> titleSmall + titleSmall: TextStyle( color: Palette.darkBlueCraiola, // QR code (exchange trade page) - backgroundColor: Palette.wildPeriwinkle, // divider (exchange trade page) - decorationColor: Palette.protectiveBlue // crete new wallet button background (wallet list page) - ), - // headline -> headline5 - headline5: TextStyle( - color: Palette.moderateLavender, // first gradient color of wallet action buttons (wallet list page) - backgroundColor: Palette.moderateLavender, // second gradient color of wallet action buttons (wallet list page) - decorationColor: Colors.white // restore wallet button text color (wallet list page) - ), - // subhead -> subtitle1 - subtitle1: TextStyle( + backgroundColor: + Palette.wildPeriwinkle, // divider (exchange trade page) + decorationColor: Palette + .protectiveBlue // crete new wallet button background (wallet list page) + ), + // headline -> headlineSmall + headlineSmall: TextStyle( + color: Palette + .moderateLavender, // first gradient color of wallet action buttons (wallet list page) + backgroundColor: Palette + .moderateLavender, // second gradient color of wallet action buttons (wallet list page) + decorationColor: Colors + .white // restore wallet button text color (wallet list page) + ), + // subhead -> titleMedium + titleMedium: TextStyle( color: Palette.darkGray, // titles color (filter widget) backgroundColor: Palette.periwinkle, // divider color (filter widget) decorationColor: Colors.white // checkbox background (filter widget) - ), - overline: TextStyle( + ), + labelSmall: TextStyle( color: Palette.wildPeriwinkle, // checkbox bounds (filter widget) decorationColor: Colors.white, // menu subname ), - // display1 -> headline4 - headline4: TextStyle( + // display1 -> headlineMedium + headlineMedium: TextStyle( color: Palette.blueCraiola, // first gradient color (menu header) decorationColor: Palette.blueGreyCraiola, // second gradient color(menu header) backgroundColor: PaletteDark.darkNightBlue // active dot color - ), - // display2 -> headline3 - headline3: TextStyle( - color: Palette.shadowWhite, // action button color (address text field) + ), + // display2 -> displaySmall + displaySmall: TextStyle( + color: + Palette.shadowWhite, // action button color (address text field) decorationColor: Palette.darkGray, // hint text (seed widget) - backgroundColor: Palette.darkBlueCraiola.withOpacity(0.67) // text on balance page - ), - // display3 -> headline2 - headline2: TextStyle( + backgroundColor: Palette.darkBlueCraiola + .withOpacity(0.67) // text on balance page + ), + // display3 -> displayMedium + displayMedium: TextStyle( color: Palette.darkGray, // hint text (new wallet page) - decorationColor: Palette.periwinkleCraiola, // underline (new wallet page) - backgroundColor: Palette.darkBlueCraiola // menu, icons, balance (dashboard page) - ), - // display4 -> headline1 - headline1: TextStyle( + decorationColor: + Palette.periwinkleCraiola, // underline (new wallet page) + backgroundColor: + Palette.darkBlueCraiola // menu, icons, balance (dashboard page) + ), + // display4 -> displayLarge + displayLarge: TextStyle( color: Palette.darkGray, // switch background (settings page) - backgroundColor: Colors.black, // icon color on support page (moonpay, github) - decorationColor: Colors.white.withOpacity(0.4) // hint text (exchange page) - ), - // body -> bodyText2 - bodyText2: TextStyle( + backgroundColor: + Colors.black, // icon color on support page (moonpay, github) + decorationColor: + Colors.white.withOpacity(0.4) // hint text (exchange page) + ), + // body -> bodyMedium + bodyMedium: TextStyle( color: Palette.darkGray, // indicators (PIN code) decorationColor: Palette.darkGray, // switch (PIN code) backgroundColor: Colors.white // alert right button - ), - // body2 -> bodyText1 - bodyText1: TextStyle( + ), + // body2 -> bodyLarge + bodyLarge: TextStyle( color: Palette.protectiveBlue, // primary buttons decorationColor: Colors.white, // alert left button, backgroundColor: Palette.dullGray // keyboard bar color ), ), cardColor: Palette.protectiveBlue // bottom button (action list) - ); -} \ No newline at end of file + ); + + @override + ThemeData get themeData => theme.copyWith( + colorScheme: theme.colorScheme + .copyWith(background: Colors.white, secondary: Colors.white)); +} From 4e4b3c7a56325242bff51729fb8cf98da8dddf12 Mon Sep 17 00:00:00 2001 From: Omar Hatem Date: Thu, 25 May 2023 15:46:45 +0300 Subject: [PATCH 6/8] Update Monero package (#942) --- pubspec_base.yaml | 1 + scripts/android/build_monero.sh | 2 +- scripts/ios/build_monero.sh | 2 +- scripts/macos/build_monero.sh | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pubspec_base.yaml b/pubspec_base.yaml index 836b82ff0..73c835f4a 100644 --- a/pubspec_base.yaml +++ b/pubspec_base.yaml @@ -91,6 +91,7 @@ dev_dependencies: flutter_test: sdk: flutter build_runner: ^2.3.3 + logging: 1.1.1 mobx_codegen: ^2.1.1 build_resolvers: ^2.0.9 hive_generator: ^1.1.3 diff --git a/scripts/android/build_monero.sh b/scripts/android/build_monero.sh index a88f589ec..e0010b351 100755 --- a/scripts/android/build_monero.sh +++ b/scripts/android/build_monero.sh @@ -1,7 +1,7 @@ #!/bin/sh . ./config.sh -MONERO_BRANCH=release-v0.18.0.0-android +MONERO_BRANCH=release-v0.18.2.2-android MONERO_SRC_DIR=${WORKDIR}/monero git clone https://github.com/cake-tech/monero.git ${MONERO_SRC_DIR} --branch ${MONERO_BRANCH} diff --git a/scripts/ios/build_monero.sh b/scripts/ios/build_monero.sh index 1e082bfb0..9a892d8c5 100755 --- a/scripts/ios/build_monero.sh +++ b/scripts/ios/build_monero.sh @@ -4,7 +4,7 @@ MONERO_URL="https://github.com/cake-tech/monero.git" MONERO_DIR_PATH="${EXTERNAL_IOS_SOURCE_DIR}/monero" -MONERO_VERSION=release-v0.18.0.0 +MONERO_VERSION=release-v0.18.2.2 BUILD_TYPE=release PREFIX=${EXTERNAL_IOS_DIR} DEST_LIB_DIR=${EXTERNAL_IOS_LIB_DIR}/monero diff --git a/scripts/macos/build_monero.sh b/scripts/macos/build_monero.sh index 4dc9a9137..c1ee0e5d3 100755 --- a/scripts/macos/build_monero.sh +++ b/scripts/macos/build_monero.sh @@ -4,7 +4,7 @@ MONERO_URL="https://github.com/cake-tech/monero.git" MONERO_DIR_PATH="${EXTERNAL_MACOS_SOURCE_DIR}/monero" -MONERO_VERSION=release-v0.18.0.0 +MONERO_VERSION=release-v0.18.2.2 BUILD_TYPE=release PREFIX=${EXTERNAL_MACOS_DIR} DEST_LIB_DIR=${EXTERNAL_MACOS_LIB_DIR}/monero From 75c65d67bf31184deb1562dc35ea6318ba294ab0 Mon Sep 17 00:00:00 2001 From: Godwin Asuquo <41484542+godilite@users.noreply.github.com> Date: Thu, 25 May 2023 20:30:21 +0300 Subject: [PATCH 7/8] CW-404 Add yoruba language (#946) * Add Yoruba translation * Add Yoruba localization * Rename flag --- README.md | 2 + assets/images/flags/{nga.png => yor.png} | Bin lib/entities/language_service.dart | 4 +- lib/{ => locales}/hausa_intl.dart | 0 lib/locales/locale.dart | 16 + lib/locales/yoruba_intl.dart | 940 +++++++++++++++++++++++ lib/main.dart | 12 +- res/values/strings_en.arb | 2 +- res/values/strings_yo.arb | 727 ++++++++++++++++++ 9 files changed, 1691 insertions(+), 12 deletions(-) rename assets/images/flags/{nga.png => yor.png} (100%) rename lib/{ => locales}/hausa_intl.dart (100%) create mode 100644 lib/locales/locale.dart create mode 100644 lib/locales/yoruba_intl.dart create mode 100644 res/values/strings_yo.arb diff --git a/README.md b/README.md index 0fb45f6de..317ad91b7 100644 --- a/README.md +++ b/README.md @@ -114,6 +114,8 @@ Edit the applicable `strings_XX.arb` file in `res/values/` and open a pull reque - Bulgarian - Czech - Indonesian +- Hausa +- Yoruba ## Add a new language diff --git a/assets/images/flags/nga.png b/assets/images/flags/yor.png similarity index 100% rename from assets/images/flags/nga.png rename to assets/images/flags/yor.png diff --git a/lib/entities/language_service.dart b/lib/entities/language_service.dart index b9990a8b5..05e84cef9 100644 --- a/lib/entities/language_service.dart +++ b/lib/entities/language_service.dart @@ -27,6 +27,7 @@ class LanguageService { 'cs': 'čeština (Czech)', 'ur': 'اردو (Urdu)', 'id': 'Bahasa Indonesia (Indonesian)', + 'yo': 'Yorùbá (Yoruba)', 'ha': 'Hausa Najeriya (Nigeria)' }; @@ -54,7 +55,8 @@ class LanguageService { 'cs': 'czk', 'ur': 'pak', 'id': 'idn', - 'ha': 'hau', + 'yo': 'yor', + 'ha': 'hau' }; static final list = {}; diff --git a/lib/hausa_intl.dart b/lib/locales/hausa_intl.dart similarity index 100% rename from lib/hausa_intl.dart rename to lib/locales/hausa_intl.dart diff --git a/lib/locales/locale.dart b/lib/locales/locale.dart new file mode 100644 index 000000000..794743c00 --- /dev/null +++ b/lib/locales/locale.dart @@ -0,0 +1,16 @@ +import 'package:cake_wallet/generated/i18n.dart'; +import 'package:cake_wallet/locales/hausa_intl.dart'; +import 'package:cake_wallet/locales/yoruba_intl.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_localizations/flutter_localizations.dart'; + +Iterable> localizationDelegates = [ + S.delegate, + GlobalCupertinoLocalizations.delegate, + GlobalMaterialLocalizations.delegate, + GlobalWidgetsLocalizations.delegate, + HaMaterialLocalizations.delegate, + HaCupertinoLocalizations.delegate, + YoCupertinoLocalizations.delegate, + YoMaterialLocalizations.delegate, +]; diff --git a/lib/locales/yoruba_intl.dart b/lib/locales/yoruba_intl.dart new file mode 100644 index 000000000..974a3d22c --- /dev/null +++ b/lib/locales/yoruba_intl.dart @@ -0,0 +1,940 @@ + +import 'dart:async'; + +import 'package:flutter/cupertino.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_localizations/flutter_localizations.dart'; +import 'package:intl/date_symbol_data_custom.dart' as date_symbol_data_custom; +import 'package:intl/date_symbols.dart' as intl; +import 'package:intl/intl.dart' as intl; + +// #docregion Date +const yoLocaleDatePatterns = { + 'd': 'd.', + 'E': 'ccc', + 'EEEE': 'cccc', + 'LLL': 'LLL', +// #enddocregion Date + 'LLLL': 'LLLL', + 'M': 'L.', + 'Md': 'd.M.', + 'MEd': 'EEE d.M.', + 'MMM': 'LLL', + 'MMMd': 'd. MMM', + 'MMMEd': 'EEE d. MMM', + 'MMMM': 'LLLL', + 'MMMMd': 'd. MMMM', + 'MMMMEEEEd': 'EEEE d. MMMM', + 'QQQ': 'QQQ', + 'QQQQ': 'QQQQ', + 'y': 'y', + 'yM': 'M.y', + 'yMd': 'd.M.y', + 'yMEd': 'EEE d.MM.y', + 'yMMM': 'MMM y', + 'yMMMd': 'd. MMM y', + 'yMMMEd': 'EEE d. MMM y', + 'yMMMM': 'MMMM y', + 'yMMMMd': 'd. MMMM y', + 'yMMMMEEEEd': 'EEEE d. MMMM y', + 'yQQQ': 'QQQ y', + 'yQQQQ': 'QQQQ y', + 'H': 'HH', + 'Hm': 'HH:mm', + 'Hms': 'HH:mm:ss', + 'j': 'HH', + 'jm': 'HH:mm', + 'jms': 'HH:mm:ss', + 'jmv': 'HH:mm v', + 'jmz': 'HH:mm z', + 'jz': 'HH z', + 'm': 'm', + 'ms': 'mm:ss', + 's': 's', + 'v': 'v', + 'z': 'z', + 'zzzz': 'zzzz', + 'ZZZZ': 'ZZZZ', +}; + +// #docregion Date2 +const yoDateSymbols = { + 'NAME': 'yo', + 'ERAS': [ + 'f.Sk.', + 'e.Lk.', + ], +// #enddocregion Date2 + 'ERANAMES': [ + 'Ṣaaju Kristi', + 'Lẹhin Kristi', + ], + 'NARROWMONTHS': [ + 'J', + 'F', + 'M', + 'A', + 'M', + 'J', + 'J', + 'A', + 'S', + 'O', + 'N', + 'D', + ], + 'STANDALONENARROWMONTHS': [ + 'J', + 'F', + 'M', + 'A', + 'M', + 'J', + 'J', + 'A', + 'S', + 'O', + 'N', + 'D', + ], + 'MONTHS': [ + 'januárì', + 'feburárì', + 'màársì', + 'éfrílù', + 'méè', + 'júùnù', + 'júùlù', + 'ágústà', + 'sètẹ̀mbà', + 'ọkùtọ̀bà', + 'nọvẹ̀mbà', + 'dẹsẹ̀mbà', + ], + 'STANDALONEMONTHS': [ + 'januárì', + 'feburárì', + 'màársì', + 'éfrílù', + 'méè', + 'júùnù', + 'júùlù', + 'ágústà', + 'sètẹ̀mbà', + 'ọkùtọ̀bà', + 'nọvẹ̀mbà', + 'dẹsẹ̀mbà', + ], + 'SHORTMONTHS': [ + 'jan.', + 'feb.', + 'mar.', + 'ápr.', + 'mẹ̀', + 'jún.', + 'júl.', + 'ágú.', + 'sẹ̀p.', + 'ọkù.', + 'nọv.', + 'dẹs.', + ], + 'STANDALONESHORTMONTHS': [ + 'jan', + 'feb', + 'mar', + 'ápr', + 'mẹ̀', + 'jún', + 'júl', + 'ágú', + 'sẹ̀p', + 'ọkù', + 'nọv', + 'dẹs', + ], + 'WEEKDAYS': [ + 'ọjọ́ Ajé', + 'ọjọ́ Ìsẹ́gun', + 'ọjọ́ Ìsẹ́gun-Etì', + 'ọjọ́ Ìsẹ́gun-Ọ̀rú', + 'ọjọ́ Àìkú', + 'ọjọ́ Jíń', + 'ọjọ́ Àbámẹ́ta', + ], + 'STANDALONEWEEKDAYS': [ +'Ọjọ́ Ajé', +'Ọjọ́ Ìsẹ́gun', +'Ọjọ́ Ìsẹ́gun-Ẹtì', +'Ọjọ́ Ìsẹ́gun-Ọ̀rú', +'Ọjọ́ Àìkú', +'Ọjọ́ Jímọ̀', +'Ọjọ́ Àbámẹ́ta', +], +'SHORTWEEKDAYS': [ +'Ajé', +'Ìsẹ́gun', +'Ìsẹ́gun-Ẹtì', +'Ìsẹ́gun-Ọ̀rú', +'Àìkú', +'Jímọ̀', +'Àbámẹ́ta', +], +'STANDALONESHORTWEEKDAYS': [ +'Ajé', +'Ìsẹ́gun', +'Ìsẹ́gun-Ẹtì', +'Ìsẹ́gun-Ọ̀rú', +'Àìkú', +'Jímọ̀', +'Àbámẹ́ta', +], +'NARROWWEEKDAYS': [ +'A', +'A', +'Ì', +'A', +'À', +'J', +'À', +], +'STANDALONENARROWWEEKDAYS': [ +'A', +'A', +'Ì', +'A', +'À', +'J', +'À', +], +'SHORTQUARTERS': [ +'K1', +'K2', +'K3', +'K4', +], +'QUARTERS': [ +'1. kwata', +'2. kwata', +'3. kwata', +'4. kwata', +], + 'AMPMS': [ + 'a.m.', + 'p.m.', + ], + 'DATEFORMATS': [ + 'EEEE d. MMMM y', + 'd. MMMM y', + 'd. MMM y', + 'dd.MM.y', + ], + 'TIMEFORMATS': [ + 'HH:mm:ss zzzz', + 'HH:mm:ss z', + 'HH:mm:ss', + 'HH:mm', + ], + 'AVAILABLEFORMATS': null, + 'FIRSTDAYOFWEEK': 0, + 'WEEKENDRANGE': [ + 5, + 6, + ], + 'FIRSTWEEKCUTOFFDAY': 3, + 'DATETIMEFORMATS': [ + '{1} {0}', + '{1} \'kl\'. {0}', + '{1}, {0}', + '{1}, {0}', + ], +}; + +// #docregion Delegate +class _YoMaterialLocalizationsDelegate extends LocalizationsDelegate { + const _YoMaterialLocalizationsDelegate(); + + @override + bool isSupported(Locale locale) => locale.languageCode == 'yo'; + + @override + Future load(Locale locale) async { + final String localeName = intl.Intl.canonicalizedLocale(locale.toString()); + + // The locale (in this case `yo`) needs to be initialized into the custom + // date symbols and patterns setup that Flutter uses. + date_symbol_data_custom.initializeDateFormattingCustom( + locale: localeName, + patterns: yoLocaleDatePatterns, + symbols: intl.DateSymbols.deserializeFromMap(yoDateSymbols), + ); + + return SynchronousFuture( + YoMaterialLocalizations( + localeName: localeName, + // The `intl` library's NumberFormat class is generated from CLDR data + // (see https://github.com/dart-lang/intl/blob/master/lib/number_symbols_data.dart). + // Unfortunately, there is no way to use a locale that isn't defined in + // this map and the only way to work around this is to use a listed + // locale's NumberFormat symbols. So, here we use the number formats + // for 'en_US' instead. + decimalFormat: intl.NumberFormat('#,##0.###', 'en_US'), + twoDigitZeroPaddedFormat: intl.NumberFormat('00', 'en_US'), + // DateFormat here will use the symbols and patterns provided in the + // `date_symbol_data_custom.initializeDateFormattingCustom` call above. + // However, an alternative is to simply use a supported locale's + // DateFormat symbols, similar to NumberFormat above. + fullYearFormat: intl.DateFormat('y', localeName), + compactDateFormat: intl.DateFormat('yMd', localeName), + shortDateFormat: intl.DateFormat('yMMMd', localeName), + mediumDateFormat: intl.DateFormat('EEE, MMM d', localeName), + longDateFormat: intl.DateFormat('EEEE, MMMM d, y', localeName), + yearMonthFormat: intl.DateFormat('MMMM y', localeName), + shortMonthDayFormat: intl.DateFormat('MMM d', localeName), + ), + ); + } + + @override + bool shouldReload(_YoMaterialLocalizationsDelegate old) => false; +} + +// #enddocregion Delegate +class YoMaterialLocalizations extends GlobalMaterialLocalizations { + const YoMaterialLocalizations({ + super.localeName = 'yo', + required super.fullYearFormat, + required super.compactDateFormat, + required super.shortDateFormat, + required super.mediumDateFormat, + required super.longDateFormat, + required super.yearMonthFormat, + required super.shortMonthDayFormat, + required super.decimalFormat, + required super.twoDigitZeroPaddedFormat, + }); + +// #docregion Getters +@override +String get moreButtonTooltip => r'Kò sí ìròhùn tí ó múni'; + +@override +String get aboutListTileTitleRaw => r'Fun Àpótí àwọn $applicationname'; + +@override +String get alertDialogLabel => r'Ìròhùn Àlàyé'; + +// #enddocregion Getters + +@override +String get anteMeridiemAbbreviation => r'AM'; + +@override +String get backButtonTooltip => r'Fíran'; + +@override +String get cancelButtonLabel => r'FAGILE'; + +@override +String get closeButtonLabel => r'KÚ'; + +@override +String get closeButtonTooltip => r'Kú'; + +@override +String get collapsedIconTapHint => r'Tá'; + +@override +String get continueButtonLabel => r'TÓ WÁ'; + +@override +String get copyButtonLabel => r'DÚPLÍKÉTÍ'; + +@override +String get cutButtonLabel => r'TÒ'; + +@override +String get deleteButtonTooltip => r'Máa kú'; + +@override +String get dialogLabel => r'Ìròhùn'; + +@override +String get drawerLabel => r'Àgbèjọ àwọn àpọ̀tí'; + +@override +String get expandedIconTapHint => r'Tá'; + +@override +String get firstPageTooltip => r'Ojú ewe'; + +@override +String get hideAccountsLabel => r'Fí èrò àpótí wáyé sílẹ̀'; + +@override +String get lastPageTooltip => r'Ojú ayé'; + +@override +String get licensesPageTitle => r'Ìròhùn Ọdún'; + +@override +String get modalBarrierDismissLabel => r'Sọ'; + +@override +String get nextMonthTooltip => r'Oṣù kọja'; + +@override +String get nextPageTooltip => r'Ojú ọjọ́ kẹta'; + +@override +String get okButtonLabel => r'Ò daájú'; +@override +// A custom drawer tooltip message. +String get openAppDrawerTooltip => r'Aya ntọju Iwe Awọn Aka'; + +// #docregion Raw +@override +String get pageRowsInfoTitleRaw => r'$firstRow–$lastRow lati $rowCount'; + +@override +String get pageRowsInfoTitleApproximateRaw => r'$firstRow–$lastRow lati kiakia $rowCount'; +// #enddocregion Raw + +@override +String get pasteButtonLabel => r'TÌ'; + +@override +String get popupMenuLabel => r'Meniu Pop-up'; + +@override +String get menuBarMenuLabel => r'Meniu Akọkọ'; + +@override +String get postMeridiemAbbreviation => r'PM'; + +@override +String get previousMonthTooltip => r'Oṣu Kanakana'; + +@override +String get previousPageTooltip => r'Ojú ewé akọkọ kan'; + +@override +String get refreshIndicatorSemanticLabel => r'Gbiyanju'; + +@override +String? get remainingTextFieldCharacterCountFew => null; + +@override +String? get remainingTextFieldCharacterCountMany => null; + +@override +String get remainingTextFieldCharacterCountOne => r'1 àmì báálẹ̀'; + +@override +String get remainingTextFieldCharacterCountOther => r'$remainingCount àmì báálẹ̀'; + +@override +String? get remainingTextFieldCharacterCountTwo => null; + +@override +String get remainingTextFieldCharacterCountZero => r'Kò sí ìwọlé létà láti ń ṣe'; + +@override +String get reorderItemDown => r'Jù sí ilẹ'; + +@override +String get reorderItemLeft => r'Jù sí àrà'; + +@override +String get reorderItemRight => r'Jù sí òtútù'; + +@override +String get reorderItemToEnd => r'Jù sí ìbẹ̀jì'; + +@override +String get reorderItemToStart => r'Jù sí àkọ́kọ́'; + +@override +String get reorderItemUp => r'Jù sí ọ̀rùn'; + +@override +String get rowsPerPageTitle => r'Ìlò Fún àwọn Ìtọ́kasíwájú:'; + +@override +ScriptCategory get scriptCategory => ScriptCategory.englishLike; + +@override +String get searchFieldLabel => 'Ṣẹda'; + +@override +String get selectAllButtonLabel => 'FADỌHỌN DỌFÚN GBÁJÚMỌ̀'; + +@override +String? get selectedRowCountTitleFew => null; + +@override +String? get selectedRowCountTitleMany => null; + +@override +String get selectedRowCountTitleOne => '1 káyé'; + +@override +String get selectedRowCountTitleOther => r'$selectedRowCount káyé'; + +@override +String? get selectedRowCountTitleTwo => null; + +@override +String get selectedRowCountTitleZero => 'Kò sí káyé ti o wọlé'; + +@override +String get showAccountsLabel => 'Fi iyipada mu kọ'; + +@override +String get showMenuTooltip => 'Fi Meniu mu kọ'; + +@override +String get signedInLabel => 'Ọ̀nà'; + +@override +String get tabLabelRaw => r'Àwọn tabin $tabIndex lati $tabCount'; + + @override +TimeOfDayFormat get timeOfDayFormatRaw => TimeOfDayFormat.h_colon_mm_space_a; + +@override +String get timePickerHourModeAnnouncement => 'Tuntun waqtu lọ'; + +@override +String get timePickerMinuteModeAnnouncement => 'Tuntun daɗi minti'; + +@override +String get viewLicensesButtonLabel => 'WO NIKI'; + +@override +List get narrowWeekdays => const ['L', 'L', 'A', 'O', 'Ọ', 'Ẹ', 'Ẹ']; + +@override +int get firstDayOfWeekIndex => 0; + +static const LocalizationsDelegate delegate = +_YoMaterialLocalizationsDelegate(); + +@override +String get calendarModeButtonLabel => 'Tọ́rọ̀ kálẹ̀ndà'; + +@override +String get dateHelpText => 'mm/dd/yyyy'; + +@override +String get dateInputLabel => 'Firanṣẹ̀ Ọjọ́'; + +@override +String get dateOutOfRangeLabel => 'Nínú iwọ̀ lọ́wọ́'; + +@override +String get datePickerHelpText => 'WÁSÍ'; + +@override +String get dateRangeEndDateSemanticLabelRaw => r'Ọjọ́ tuntun to ṣà'; + +@override +String get dateRangeEndLabel => 'Ọjọ́ tuntun to ṣà'; + +@override +String get dateRangePickerHelpText => 'WÁSÍ ÌGBÀ'; + +@override +String get dateRangeStartDateSemanticLabelRaw => 'Ọjọ́ tuntun ti dá'; + +@override +String get dateRangeStartLabel => 'Ọjọ́ tuntun ti dá'; + +@override +String get dateSeparator => '/'; + +@override +String get dialModeButtonLabel => 'Tọ́rọ̀ wakati'; + +@override +String get inputDateModeButtonLabel => 'Tọ́rọ̀ firanṣẹ̀ ọjọ́'; + +@override +String get inputTimeModeButtonLabel => 'Tọ́rọ̀ wakati bayi lọ́wọ́'; + +@override +String get invalidDateFormatLabel => 'Akọ́kọ́tọ́ tó jẹ́kúnrin'; + +@override +String get invalidDateRangeLabel => 'Àmì jẹ́ káàkiri lẹ́yìn ilé'; + +@override +String get invalidTimeLabel => 'Akọ́kọ́tọ́ àkójọ ìwádìí'; + +@override +String get licensesPackageDetailTextOther => r'$licenseCount àwọn níkí'; + +@override +String get saveButtonLabel => 'TÙN DÁRA'; + +@override +String get selectYearSemanticsLabel => 'Fọ́ọ̀ shẹ́kàrà'; + +@override +String get timePickerDialHelpText => 'WÁSÍ WÁKÀTÌ'; + +@override +String get timePickerHourLabel => 'Wákàtì àṣà'; + +@override +String get timePickerInputHelpText => 'Shìgárà wákàtì'; + +@override +String get timePickerMinuteLabel => 'Mìntì'; + +@override +String get unspecifiedDate => 'Ọjọ̀kúnrin'; + +@override +String get unspecifiedDateRange => 'Ọjọ̀kúnrin àdáyọ̀'; + +@override +String get keyboardKeyAlt => 'Alt'; + +@override +String get keyboardKeyAltGraph => 'AltGraph'; + +@override +String get keyboardKeyBackspace => 'Báckspàcè'; + +@override +String get keyboardKeyCapsLock => 'Caps Lock'; + +@override +String get keyboardKeyChannelDown => 'Báyàkàmmàlàsàké'; + +@override +String get keyboardKeyChannelUp => 'Yíkàmmàlàsàké'; + +@override +String get keyboardKeyControl => 'Kọ́ntírọ̀l'; + +@override +String get keyboardKeyDelete => 'Shápè'; + +@override +String get keyboardKeyEject => 'Èjẹ̀tì'; + +@override +String get keyboardKeyEnd => 'Tàbí'; + +@override +String get keyboardKeyEscape => 'Tòkè'; + + @override +String get keyboardKeyFn => 'Fn'; + +@override +String get keyboardKeyHome => 'Ile'; + +@override +String get keyboardKeyInsert => 'Fi sori'; + +@override +String get keyboardKeyMeta => 'Meta'; + +@override +String get keyboardKeyMetaMacOs => 'Amfani pẹlu Command'; + +@override +String get keyboardKeyMetaWindows => 'Windows'; + + @override + String get keyboardKeyNumLock => 'Num Lock'; + + @override + String get keyboardKeyNumpad0 => 'Numpad 0'; + + @override + String get keyboardKeyNumpad1 => 'Numpad 1'; + + @override + String get keyboardKeyNumpad2 => 'Numpad 2'; + + @override + String get keyboardKeyNumpad3 => 'Numpad 3'; + + @override + String get keyboardKeyNumpad4 => 'Numpad 4'; + + @override + String get keyboardKeyNumpad5 => 'Numpad 5'; + + @override + String get keyboardKeyNumpad6 => 'Numpad 6'; + + @override + String get keyboardKeyNumpad7 => 'Numpad 7'; + + @override + String get keyboardKeyNumpad8 => 'Numpad 8'; + + @override + String get keyboardKeyNumpad9 => 'Numpad 9'; + + @override + String get keyboardKeyNumpadAdd => 'Numpad +'; + + @override + String get keyboardKeyNumpadComma => 'Numpad ,'; + + @override + String get keyboardKeyNumpadDecimal => 'Numpad .'; + + @override + String get keyboardKeyNumpadDivide => 'Numpad /'; + + @override + String get keyboardKeyNumpadEnter => 'Numpad Enter'; + + @override + String get keyboardKeyNumpadEqual => 'Numpad ='; + + @override + String get keyboardKeyNumpadMultiply => 'Numpad *'; + + @override + String get keyboardKeyNumpadParenLeft => 'Numpad ('; + + @override + String get keyboardKeyNumpadParenRight => 'Numpad )'; + + @override + String get keyboardKeyNumpadSubtract => 'Numpad -'; + + @override + String get keyboardKeyPageDown => 'Page Down'; + + @override + String get keyboardKeyPageUp => 'Page Up'; + + @override + String get keyboardKeyPower => 'Power'; + + @override + String get keyboardKeyPowerOff => 'Power Off'; + + @override + String get keyboardKeyPrintScreen => 'Print Screen'; + + @override + String get keyboardKeyScrollLock => 'Scroll Lock'; + + @override + String get keyboardKeySelect => 'Zabi'; + + @override + String get keyboardKeySpace => 'Space'; +} + +/// Cupertino Support +/// Strings Copied from "https://github.com/flutter/flutter/blob/master/packages/flutter_localizations/lib/src/l10n/generated_cupertino_localizations.dart" + +class _YoCupertinoLocalizationsDelegate extends LocalizationsDelegate { + const _YoCupertinoLocalizationsDelegate(); + + @override + bool isSupported(Locale locale) => locale.languageCode == 'yo'; + + @override + Future load(Locale locale) async { + final String localeName = intl.Intl.canonicalizedLocale(locale.toString()); + + // The locale (in this case `yo`) needs to be initialized into the custom =>> `yo` + // date symbols and patterns setup that Flutter uses. + date_symbol_data_custom.initializeDateFormattingCustom( + locale: localeName, + patterns: yoLocaleDatePatterns, + symbols: intl.DateSymbols.deserializeFromMap(yoDateSymbols), + ); + + return SynchronousFuture( + YoCupertinoLocalizations( + localeName: localeName, + // The `intl` library's NumberFormat class is generated from CLDR data + // (see https://github.com/dart-lang/intl/blob/master/lib/number_symbols_data.dart). + // Unfortunately, there is no way to use a locale that isn't defined in + // this map and the only way to work around this is to use a listed + // locale's NumberFormat symbols. So, here we use the number formats + // for 'en_US' instead. + decimalFormat: intl.NumberFormat('#,##0.###', 'en_US'), + // DateFormat here will use the symbols and patterns provided in the + // `date_symbol_data_custom.initializeDateFormattingCustom` call above. + // However, an alternative is to simply use a supported locale's + // DateFormat symbols, similar to NumberFormat above. + fullYearFormat: intl.DateFormat('y', localeName), + mediumDateFormat: intl.DateFormat('EEE, MMM d', localeName), + dayFormat: intl.DateFormat('d', localeName), + doubleDigitMinuteFormat: intl.DateFormat('mm', localeName), + singleDigitHourFormat: intl.DateFormat('j', localeName), + singleDigitMinuteFormat: intl.DateFormat.m(localeName), + singleDigitSecondFormat: intl.DateFormat.s(localeName), + ), + ); + } + + @override + bool shouldReload(_YoCupertinoLocalizationsDelegate old) => false; +} +// #enddocregion Delegate + +/// A custom set of localizations for the 'nn' locale. In this example, only =>> `yo` +/// the value for openAppDrawerTooltip was modified to use a custom message as +/// an example. Everything else uses the American English (en_US) messages +/// and formatting. +class YoCupertinoLocalizations extends GlobalCupertinoLocalizations { + const YoCupertinoLocalizations({ + super.localeName = 'yo', + required super.fullYearFormat, + required super.mediumDateFormat, + required super.decimalFormat, + required super.dayFormat, + required super.singleDigitHourFormat, + required super.singleDigitMinuteFormat, + required super.doubleDigitMinuteFormat, + required super.singleDigitSecondFormat, + }); + +@override +String get alertDialogLabel => 'Àdàkárò'; + +@override +String get anteMeridiemAbbreviation => 'AM'; + +@override +String get copyButtonLabel => 'Kòpy'; + +@override +String get cutButtonLabel => 'Kọ́t'; + +@override +String get datePickerDateOrderString => 'mdy'; + +@override +String get datePickerDateTimeOrderString => 'date_time_dayPeriod'; + +@override +String? get datePickerHourSemanticsLabelFew => null; + +@override +String? get datePickerHourSemanticsLabelMany => null; + +@override +String? get datePickerHourSemanticsLabelOne => r"$hour o'clock"; + +@override +String get datePickerHourSemanticsLabelOther => r"$hour o'clock"; + +@override +String? get datePickerHourSemanticsLabelTwo => null; + +@override +String? get datePickerHourSemanticsLabelZero => null; + +@override +String? get datePickerMinuteSemanticsLabelFew => null; + +@override +String? get datePickerMinuteSemanticsLabelMany => null; + +@override +String? get datePickerMinuteSemanticsLabelOne => '1 wakati'; + +@override +String get datePickerMinuteSemanticsLabelOther => r'$minute wakati'; + +@override +String? get datePickerMinuteSemanticsLabelTwo => null; + +@override +String? get datePickerMinuteSemanticsLabelZero => null; + +@override +String get modalBarrierDismissLabel => 'Búta'; + +@override +String get pasteButtonLabel => 'Tẹ́ẹ́'; + +@override +String get postMeridiemAbbreviation => 'PM'; + +@override +String get searchTextFieldPlaceholderLabel => 'Wúró àtúntà'; + +@override +String get selectAllButtonLabel => 'Fírànsé gbógbo'; + +@override +String get tabSemanticsLabelRaw => r'Tab $tabIndex nínú $tabCount'; + +@override +String? get timerPickerHourLabelFew => null; + +@override +String? get timerPickerHourLabelMany => null; + +@override +String? get timerPickerHourLabelOne => 'òǹdì'; + +@override +String get timerPickerHourLabelOther => 'òǹdì'; + +@override +String? get timerPickerHourLabelTwo => null; + +@override +String? get timerPickerHourLabelZero => null; + +@override +String? get timerPickerMinuteLabelFew => null; + +@override +String? get timerPickerMinuteLabelMany => null; + +@override +String? get timerPickerMinuteLabelOne => 'wakati.'; + +@override +String get timerPickerMinuteLabelOther => 'wakati.'; + +@override +String? get timerPickerMinuteLabelTwo => null; + +@override +String? get timerPickerMinuteLabelZero => null; + +@override +String? get timerPickerSecondLabelFew => null; + +@override +String? get timerPickerSecondLabelMany => null; + +@override +String? get timerPickerSecondLabelOne => 'dákìkà.'; + +@override +String get timerPickerSecondLabelOther => 'dákìkà.'; + +@override +String? get timerPickerSecondLabelTwo => null; + +@override +String? get timerPickerSecondLabelZero => null; + +@override +String get todayLabel => 'Oyọ'; + + static const LocalizationsDelegate delegate = + _YoCupertinoLocalizationsDelegate(); +} diff --git a/lib/main.dart b/lib/main.dart index 2d88d251f..3bfcc8617 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -3,7 +3,7 @@ import 'package:cake_wallet/anonpay/anonpay_invoice_info.dart'; import 'package:cake_wallet/core/auth_service.dart'; import 'package:cake_wallet/entities/language_service.dart'; import 'package:cake_wallet/buy/order.dart'; -import 'package:cake_wallet/hausa_intl.dart'; +import 'package:cake_wallet/locales/locale.dart'; import 'package:cake_wallet/store/yat/yat_store.dart'; import 'package:cake_wallet/utils/exception_handler.dart'; import 'package:flutter/foundation.dart'; @@ -13,7 +13,6 @@ import 'package:hive/hive.dart'; import 'package:cake_wallet/di.dart'; import 'package:path_provider/path_provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:cake_wallet/themes/theme_base.dart'; @@ -283,14 +282,7 @@ class AppState extends State with SingleTickerProviderStateMixin { navigatorKey: navigatorKey, debugShowCheckedModeBanner: false, theme: settingsStore.theme, - localizationsDelegates: [ - S.delegate, - GlobalCupertinoLocalizations.delegate, - GlobalMaterialLocalizations.delegate, - GlobalWidgetsLocalizations.delegate, - HaMaterialLocalizations.delegate, - HaCupertinoLocalizations.delegate, - ], + localizationsDelegates: localizationDelegates, supportedLocales: S.delegate.supportedLocales, locale: Locale(settingsStore.languageCode), onGenerateRoute: (settings) => Router.createRoute(settings), diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb index 1092e3186..9d88d6125 100644 --- a/res/values/strings_en.arb +++ b/res/values/strings_en.arb @@ -586,7 +586,7 @@ "get_card_note": " that you can reload with digital currencies. No additional information needed!", "signup_for_card_accept_terms": "Sign up for the card and accept the terms.", "add_fund_to_card": "Add prepaid funds to the cards (up to ${value})", - "use_card_info_two": "Funds are converted to USD when the held in the prepaid account, not in digital currencies.", + "use_card_info_two": "Funds are converted to USD when they're held in the prepaid account, not in digital currencies.", "use_card_info_three": "Use the digital card online or with contactless payment methods.", "optionally_order_card": "Optionally order a physical card.", "hide_details" : "Hide Details", diff --git a/res/values/strings_yo.arb b/res/values/strings_yo.arb new file mode 100644 index 000000000..57ed51d24 --- /dev/null +++ b/res/values/strings_yo.arb @@ -0,0 +1,727 @@ +{ + "welcome" : "Ẹ káàbọ sí", + "cake_wallet" : "Cake Wallet", + "first_wallet_text" : "Àpamọ́wọ́ t'á fi Monero, Bitcoin, Litecoin, àti Haven pamọ́ wà pa", + "please_make_selection" : "Ẹ jọ̀wọ́, yàn dá àpamọ́wọ́ yín tàbí dá àpamọ́wọ́ yín padà n’ísàlẹ̀.", + "create_new" : "Dá àpamọ́wọ́ tuntun", + "restore_wallet" : "Mú àpamọ́wọ́ padà", + + "monero_com": "Monero.com latí ọwọ́ Cake Wallet", + "monero_com_wallet_text": "Àpamọ́wọ́ Monero wà pa", + + "haven_app": "Haven latí ọwọ́ Cake Wallet", + "haven_app_wallet_text": "Àpamọ́wọ́ Haven wà pa", + + "accounts" : "Àwọn àkáǹtì", + "edit" : "Pààrọ̀", + "account" : "Àkáǹtì", + "add" : "Fikún", + + + "address_book" : "Ìwé Àdírẹ́sì", + "contact" : "Olùbásọ̀rọ̀", + "please_select" : "Ẹ jọ̀wọ́ yàn:", + "cancel" : "Fagi lé e", + "ok" : "Ó dáa", + "contact_name" : "Orúkọ olùbásọ̀rọ̀", + "reset" : "Tún ṣe", + "save" : "Pamọ́", + "address_remove_contact" : "Yọ olùbásọ̀rọ̀ kúrò", + "address_remove_content" : "Ṣó dá ẹ lójú pé ẹ fẹ́ yọ olùbásọ̀rọ̀ yíyàn kúrò?", + + + "authenticated" : "A ti jẹ́rìísí yín", + "authentication" : "Ìfẹ̀rílàdí", + "failed_authentication" : "Ìfẹ̀rílàdí pipòfo. ${state_error}", + + + "wallet_menu" : "Mẹ́nù", + "Blocks_remaining" : "Àkójọpọ̀ ${status} kikù", + "please_try_to_connect_to_another_node" : "Ẹ jọ̀wọ́, gbìyànjú dárapọ̀ mọ́ apẹka mìíràn yí wọlé", + "xmr_hidden" : "Bìbò", + "xmr_available_balance" : "Owó tó wà ḿbí", + "xmr_full_balance" : "Ìyókù owó", + "send" : "Ránṣẹ́", + "receive" : "Gbà", + "transactions" : "Àwọn àránṣẹ́", + "incoming" : "Wọ́n tó ń bọ̀", + "outgoing" : "Wọ́n tó ń jáde", + "transactions_by_date" : "Àwọn àránṣẹ́ t'á ti fi aago ṣa", + "trades" : "Àwọn pàṣípààrọ̀", + "filter_by": "Ṣẹ́ láti", + "today" : "Lénìí", + "yesterday" : "Lánàá", + "received" : "Owó t'á ti gbà", + "sent" : "Owó t'á ti ránṣẹ́", + "pending" : " pípẹ́", + "rescan" : "Tún Wá", + "reconnect" : "Ṣe àtúnse", + "wallets" : "Àwọn àpamọ́wọ́", + "show_seed" : "Wo hóró", + "show_keys" : "Wo hóró / àwọn kọ́kọ́rọ́", + "address_book_menu" : "Ìwé Àdírẹ́sì", + "reconnection" : "Àtúnṣe", + "reconnect_alert_text" : "Ṣó dá ẹ lójú pé ẹ fẹ́ ṣe àtúnse?", + + + "exchange" : "Pàṣípààrọ̀", + "clear" : "Pa gbogbo nǹkan", + "refund_address" : "Àdírẹ́sì t'ẹ́ gba owó sí", + "change_exchange_provider" : "Pààrọ̀ Ilé Ìfowóṣòwò", + "you_will_send" : "Ṣe pàṣípààrọ̀ láti", + "you_will_get" : "Ṣe pàṣípààrọ̀ sí", + "amount_is_guaranteed" : "ó di dandan pé owó á wọlé", + "amount_is_estimate" : "Ìdíyelé ni iye tó ń bọ̀", + "powered_by" : "Láti ọwọ́ ${title}", + "error" : "Àṣìṣe", + "estimated" : "Ó tó a fojú díwọ̀n", + "min_value" : "kò gbọ́dọ̀ kéré ju ${value} ${currency}", + "max_value" : "kò gbọ́dọ̀ tóbi ju ${value} ${currency}", + "change_currency" : "Pààrọ̀ irú owó", + "overwrite_amount" : "Pààrọ̀ iye owó", + "qr_payment_amount" : "Iye owó t'á ránṣé wà nínú àmì ìlujá yìí. Ṣé ẹ fẹ́ pààrọ̀ ẹ̀?", + + "copy_id" : "Ṣẹ̀dà àmì ìdánimọ̀", + "exchange_result_write_down_trade_id" : "Ẹ jọ̀wọ́, kọ àmì ìdánimọ̀ pàṣípààrọ̀ sílẹ̀ kí tẹ̀síwájú.", + "trade_id" : "Pàṣípààrọ̀ àmì ìdánimọ̀:", + "copied_to_clipboard" : "Jíjí wò sí àtẹ àkọsílẹ̀", + "saved_the_trade_id" : "Mo ti pamọ́ àmì ìdánimọ̀ pàṣípààrọ̀", + "fetching" : "ń wá", + "id" : "Àmì Ìdánimọ̀: ", + "amount" : "Iye: ", + "payment_id" : "Àmì ìdánimọ̀ àránṣẹ́: ", + "status" : "Tó ń ṣẹlẹ̀: ", + "offer_expires_in" : "Ìrònúdábàá máa gbẹ́mìí mì ní: ", + "trade_is_powered_by" : "${provider} ń fikún pàṣípààrọ̀ yìí lágbára", + "copy_address" : "Ṣẹ̀dà àdírẹ́sì", + "exchange_result_confirm" : "T'ẹ́ bá tẹ̀ jẹ́rìí, ẹ máa fi ${fetchingLabel} ${from} ránṣẹ́ láti àpamọ́wọ́ yín t'á pe ${walletName} sí àdírẹ́sì t'ó ṣàfihàn òun lísàlẹ̀. Tàbí ẹ lè fi àpamọ́wọ́ mìíràn yín ránṣẹ́ sí àdírẹ́sì / àmì ìlujá lísàlẹ̀.\n\nẸ jọ̀wọ́ tẹ̀ jẹ́rìí́ tẹ̀síwájú tàbí padà sọ́dọ̀ pààrọ̀ iye náà.", + "exchange_result_description" : "Ẹ gbọ́dọ̀ ránṣẹ́ iye owó tó pọ̀ jù ${fetchingLabel} ${from} sí àdírẹ́sì tó ṣàfihàn òun lójú tó ń bọ̀. T'ẹ́ bá fi iye tí kò pọ̀ jù ${fetchingLabel} ${from}, a kò lè pàṣípààrọ̀ ẹ̀. A sì kò lè dá a padà fún yín.", + "exchange_result_write_down_ID" : "*Ẹ jọ̀wọ́, ṣẹ̀dà àmì ìdánimọ̀ yín tó ṣàfihàn òun lókè.", + "confirm" : "Jẹ́rìísí", + "confirm_sending" : "Jẹ́rìí sí ránṣẹ́", + "commit_transaction_amount_fee" : "Jẹ́rìí sí àránṣẹ́\nOwó: ${amount}\nIye àfikún: ${fee}", + "sending" : "Ó ń ránṣẹ́", + "transaction_sent" : "Ẹ ti ránṣẹ́ ẹ̀!", + "expired" : "Kíkú", + "time" : "${minutes}ìṣj ${seconds}ìṣs", + "send_xmr" : "Fi XMR ránṣẹ́", + "exchange_new_template" : "Àwòṣe títun", + + "faq" : "Àwọn ìbéèrè l'a máa ń bèèrè", + + + "enter_your_pin" : "Tẹ̀ òǹkà ìdánimọ̀ àdáni yín", + "loading_your_wallet" : "A ń ṣí àpamọ́wọ́ yín", + + + "new_wallet" : "Àpamọ́wọ́ títun", + "wallet_name" : "Orúkọ àpamọ́wọ́", + "continue_text" : "Tẹ̀síwájú", + "choose_wallet_currency" : "Ẹ jọ̀wọ́, yàn irú owó ti àpamọ́wọ́ yín:", + + + "node_new" : "Apẹka títun", + "node_address" : "Àdírẹ́sì apẹka", + "node_port" : "Ojú ìkànpọ̀ apẹka", + "login" : "Orúkọ", + "password" : "Ọ̀rọ̀ aṣínà", + "nodes" : "Àwọn apẹka", + "node_reset_settings_title" : "Tún àwọn ààtò ṣe", + "nodes_list_reset_to_default_message" : "Ṣé ó dá yín lójú pé ẹ fẹ́ yí àwọn ààtò padà?", + "change_current_node" : "Ṣé ó dá yín lójú pé ẹ fẹ́ pààrọ̀ apẹka lọ́wọ́ sí ${node}?", + "change" : "Pààrọ̀", + "remove_node" : "Yọ apẹka kúrò", + "remove_node_message" : "Ṣé ó da yín lójú pé ẹ fẹ́ yọ apẹka lọwọ́ kúrò?", + "remove" : "Yọ ọ́ kúrò", + "delete" : "Pa á", + "add_new_node" : "Fi apẹka kún", + "change_current_node_title" : "Pààrọ̀ apẹka lọwọ́", + "node_test" : "Dánwò", + "node_connection_successful" : "Ìkànpọ̀ ti dára", + "node_connection_failed" : "Ìkànpọ̀ ti kùnà", + "new_node_testing" : "A ń dán apẹka títun wò", + + + "use" : "Lo", + "digit_pin" : "-díjíìtì òǹkà ìdánimọ̀ àdáni", + + + "share_address" : "Pín àdírẹ́sì", + "receive_amount" : "Iye", + "subaddresses" : "Àwọn àdírẹ́sì kékeré", + "addresses" : "Àwọn àdírẹ́sì", + "scan_qr_code" : "Ẹ ya àmì ìlujá láti gba àdírẹ́sì", + "qr_fullscreen" : "Àmì ìlujá túbọ̀ máa tóbi tí o bá tẹ̀", + "rename" : "Pààrọ̀ orúkọ", + "choose_account" : "Yan àkáǹtì", + "create_new_account" : "Dá àkáǹtì títun", + "accounts_subaddresses" : "Àwọn àkáǹtì àti àwọn àdírẹ́sì kékeré", + + + "restore_restore_wallet" : "Mú àpamọ́wọ́ padà", + "restore_title_from_seed_keys" : "Fi hóró/kọ́kọ́rọ́ mú padà", + "restore_description_from_seed_keys" : "Mú àpamọ́wọ́ yín padà láti hóró/kọ́kọ́rọ́ t'ẹ́ ti pamọ́ sí ibi láìléwu", + "restore_next" : "Tẹ̀síwájú", + "restore_title_from_backup" : "Fi ẹ̀dà nípamọ́ mú padà", + "restore_description_from_backup" : "Ẹ lè fi ẹ̀dà nípamọ́ yín mú odindi Cake Wallet áàpù padà.", + "restore_seed_keys_restore" : "Mú hóró/kọ́kọ́rọ́ padà", + "restore_title_from_seed" : "Fi hóró mú padà", + "restore_description_from_seed" : "Ẹ mú àpamọ́wọ́ yín padà láti àkànpọ̀ ọlọ́rọ̀ ẹ̀ẹ̀marùndínlọgbọ̀n tàbí ti mẹ́talá.", + "restore_title_from_keys" : "Fi kọ́kọ́rọ́ ṣẹ̀dá", + "restore_description_from_keys" : "Mú àpamọ́wọ́ yín padà láti àwọn àtẹ̀ nípamọ́ láti àwọn kọ́kọ́rọ́ àdáni yín", + "restore_wallet_name" : "Orúkọ àpamọ́wọ́", + "restore_address" : "Àdírẹ́sì", + "restore_view_key_private" : "kọ́kọ́rọ́ ìrán àdáni", + "restore_spend_key_private" : "kọ́kọ́rọ́ àdáni fún níná", + "restore_recover" : "Mú padà", + "restore_wallet_restore_description" : "Ìṣapẹrẹ mú àpamọ́wọ́ padà", + "restore_new_seed" : "Hóró títun", + "restore_active_seed" : "Hóró lọ́wọ́", + "restore_bitcoin_description_from_seed" : "Mú àpamọ́wọ́ yín padà láti àkànpọ̀ ọlọ́rọ̀ ẹ̀ẹ̀mẹrinlélógun", + "restore_bitcoin_description_from_keys" : "Mú àpamọ́wọ́ yín padà láti ọ̀rọ̀ WIF t'á ti dá láti kọ́kọ́rọ́ àdáni yín", + "restore_bitcoin_title_from_keys" : "Mú padà láti WIF", + "restore_from_date_or_blockheight" : "Ẹ jọ̀wọ́, tẹ̀ ìgbà ọjọ́ díẹ̀ k'ẹ́ tó ti dá àpamọ́wọ́ yìí. Tàbí ẹ lè tẹ̀ ẹ́ t'ẹ́ bá mọ gíga àkójọpọ̀.", + + + "seed_reminder" : "Ẹ jọ̀wọ́, kọ wọnyí sílẹ̀ k'ẹ́ tó pàdánù ẹ̀rọ ìbánisọ̀rọ̀ yín", + "seed_title" : "Hóró", + "seed_share" : "Pín hóró", + "copy" : "Ṣẹ̀dà", + + + "seed_language_choose" : "Ẹ jọ̀wọ́ yan èdè hóró:", + "seed_choose" : "Yan èdè hóró", + "seed_language_next" : "Tẹ̀síwájú", + "seed_language_english" : "Èdè Gẹ̀ẹ́sì", + "seed_language_chinese" : "Èdè Ṣáínà", + "seed_language_dutch" : "Èdè Nẹ́dálaǹdì", + "seed_language_german" : "Èdè Jámánì", + "seed_language_japanese" : "Èdè Jẹ́páànì", + "seed_language_portuguese" : "Èdè Potogí", + "seed_language_russian" : "Èdè Rọ́síà", + "seed_language_spanish" : "Èdè Sípéènì", + "seed_language_french": "Èdè Fránsì", + "seed_language_italian": "Èdè Itálíà", + + + "send_title" : "Ránṣẹ́", + "send_your_wallet" : "Àpamọ́wọ́ yín", + "send_address" : "${cryptoCurrency} àdírẹ́sì", + "send_payment_id" : "Àmì ìdánimọ̀ àránṣẹ́ (ìyàn nìyí)", + "all" : "Gbogbo", + "send_error_minimum_value" : "Ránṣẹ́ owó kò kéré dé 0.01", + "send_error_currency" : "Ó yẹ kí òǹkà dá wà nínu iye", + "send_estimated_fee" : "Iye àfikún l'a fojú díwọ̀n:", + "send_priority" : "${transactionPriority} agbára ni owó àfikún lọ́wọ́lọ́wọ́.\nẸ lè pààrọ̀ iye agbára t'ẹ fikún àránṣẹ́ lórí àwọn ààtò", + "send_creating_transaction" : "Ńṣe àránṣẹ́", + "send_templates" : "Àwọn àwòṣe", + "send_new" : "Títun", + "send_amount" : "Iye:", + "send_fee" : "Owó àfikún:", + "send_name" : "Orúkọ", + "send_got_it" : "Ó dáa", + "send_sending" : "Ń Ránṣẹ́...", + "send_success" : "A ti ránṣẹ́ ${crypto} yín dáadáa", + + + "settings_title" : "Àwọn ààtò", + "settings_nodes" : "Àwọn apẹka", + "settings_current_node" : "Apẹka lọ́wọ́lọ́wó", + "settings_wallets" : "Àwọn àpamọ́wọ́", + "settings_display_balance" : "Ṣàfihàn ìyókù owó", + "settings_currency" : "Iye owó", + "settings_fee_priority" : "Bí iye àfikún ṣe ṣe pàtàkì", + "settings_save_recipient_address" : "Pamọ́ àdírẹ́sì olùgbà", + "settings_personal" : "Àdáni", + "settings_change_pin" : "Pààrọ̀ òǹkà ìdánimọ̀ àdáni", + "settings_change_language" : "Pààrọ̀ èdè", + "settings_allow_biometrical_authentication" : "Fi àyè gba ìfẹ̀rílàdí biometrical", + "settings_dark_mode" : "Ṣókùnkùn Áápù", + "settings_transactions" : "Àwọn àránṣẹ́", + "settings_trades" : "Àwọn pàṣípààrọ̀", + "settings_display_on_dashboard_list" : "Ṣàfihàn lórí àkọsílẹ̀ tá fihàn", + "settings_all" : "Gbogbo", + "settings_only_trades" : "Àwọn pàṣípààrọ̀ nìkan", + "settings_only_transactions" : "Àwọn àránṣẹ́ nìkan", + "settings_none" : "Kòsóhun", + "settings_support" : "Ìranlọ́wọ́", + "settings_terms_and_conditions" : "Àwọn Òfin àti àwọn Àjọrò", + "pin_is_incorrect" : "òǹkà ìdánimọ̀ àdáni kò yẹ́", + + + "setup_pin" : "Setup òǹkà ìdánimọ̀ àdáni", + "enter_your_pin_again" : "Tún òǹkà ìdánimọ̀ àdáni yín tẹ̀", + "setup_successful" : "Òǹkà ìdánimọ̀ àdáni yín ti ṣe!", + + + "wallet_keys" : "Hóró/kọ́kọ́rọ́ àpamọ́wọ́", + "wallet_seed" : "Hóró àpamọ́wọ́", + "private_key" : "Kọ́kọ́rọ́ àdáni", + "public_key" : "Kọ́kọ́rọ́ tó kò àdáni", + "view_key_private" : "Kọ́kọ́rọ́ ìwò (àdáni)", + "view_key_public" : "Kọ́kọ́rọ́ ìwò (kò àdáni)", + "spend_key_private" : "Kọ́kọ́rọ́ sísan (àdáni)", + "spend_key_public" : "Kọ́kọ́rọ́ sísan (kò àdáni)", + "copied_key_to_clipboard" : "Ti ṣeda ${key} sí àtẹ àkọsílẹ̀", + + + "new_subaddress_title" : "Àdírẹ́sì títun", + "new_subaddress_label_name" : "Orúkọ", + "new_subaddress_create" : "Ṣe é", + + "address_label" : "Orúkọ àdírẹ́sì", + + "subaddress_title" : "Àkọsílẹ̀ ni nínú àwọn àdírẹ́sì tíwọn rẹ̀lẹ̀", + + + "trade_details_title" : "Ìsọfúnni pàṣípààrọ̀", + "trade_details_id" : "Àmì ìdánimọ̀:", + "trade_details_state" : "Tó ń ṣẹlẹ̀", + "trade_details_fetching" : "Ń mú wá", + "trade_details_provider" : "Ilé pàṣípààrọ̀", + "trade_details_created_at" : "Ṣíṣe ní", + "trade_details_pair" : "Àwọn irú owó t'á pàṣípààrọ̀ jọ", + "trade_details_copied" : "Ti ṣeda ${title} sí àtẹ àkọsílẹ̀", + + + "trade_history_title" : "Ìtan pàṣípààrọ̀", + + + "transaction_details_title" : "Àránṣẹ́ ìsọfúnni", + "transaction_details_transaction_id" : "Àmì ìdánimọ̀ àránṣẹ́", + "transaction_details_date" : "Ìgbà", + "transaction_details_height" : "Gíga", + "transaction_details_amount" : "Iye owó", + "transaction_details_fee" : "Iye àfikún", + "transaction_details_copied" : "A ṣeda ${title} sí àkọsílẹ̀", + "transaction_details_recipient_address" : "Àwọn àdírẹ́sì olùgbà", + + + "wallet_list_title" : "Àpamọ́wọ́ Monero", + "wallet_list_create_new_wallet" : "Ṣe àpamọ́wọ́ títun", + "wallet_list_restore_wallet" : "Restore àpamọ́wọ́", + "wallet_list_load_wallet" : "Load àpamọ́wọ́", + "wallet_list_loading_wallet" : "Ń ṣí àpamọ́wọ́ ${wallet_name}", + "wallet_list_failed_to_load" : "Ti kùnà ṣí́ àpamọ́wọ́ ${wallet_name}. ${error}", + "wallet_list_removing_wallet" : "Ń yọ àpamọ́wọ́ ${wallet_name} kúrò", + "wallet_list_failed_to_remove" : "Ti kùnà yọ ${wallet_name} àpamọ́wọ́ kúrò. ${error}", + + + "widgets_address" : "Àdírẹ́sì", + "widgets_restore_from_blockheight" : "Dá padà sípò láti gíga àkójọpọ̀", + "widgets_restore_from_date" : "Dá padà sípò láti ìgbà", + "widgets_or" : "tàbí", + "widgets_seed" : "Hóró", + + + "router_no_route" : "Ọ̀nà kò sí fún ${name}", + + + "error_text_account_name" : "Orúkọ àkáǹtì lè ni nìkan nínú ẹyọ ọ̀rọ̀ àti òǹkà\nGígun rẹ̀ kò gbọ́dọ̀ kéré ju oókan. Gígun rẹ̀ sì kò gbọ́dọ̀ tóbi ju márùndínlógún.", + "error_text_contact_name" : "Orúkọ olùbásọ̀rọ̀ kò lè ni nínú ` , ' \" ẹyọ ọ̀rọ̀.\nIye ẹyọ ọ̀rọ̀ kò gbọ́dọ̀ kéré ju oókan. Ó sì kò gbọ́dọ̀ tóbi ju méjìlélọ́gbọ̀n.", + "error_text_address" : "Àdírẹ́sì àpamọ́wọ́ gbọ́dọ̀ báramu irú owó", + "error_text_node_address" : "Ẹ jọ̀wọ́ tẹ̀ àdírẹ́sì iPv4", + "error_text_node_port" : "Ojú ìkànpọ̀ apẹka lè ni nìkan nínú òǹkà l'áàárín òdo àti márùn-úndínlógojí lé ní ẹ̀ẹ́dẹgbẹ̀ta lé ní ọ̀kẹ́ mẹ́ta lé ní ẹ̀ẹ́dẹ́gbàta", + "error_text_payment_id" : "Iye ẹyọ ọ̀rọ̀ nínú àmì ìdánimọ̀ àránṣẹ́ gbọ́dọ̀ wà l'áàárín aárùndínlógún dé ẹẹ́rinlélọ́gọ́ta.", + "error_text_xmr" : "Iye XMR kò lè tóbi ju ìyókù.\nIye díjíìtì léyìn ẹsẹ kò gbọ́dọ̀ tóbi ju eéjìlá.", + "error_text_fiat" : "Iye àránṣẹ́ kò tóbi ju ìyókù owó.\nIye díjíìtì léyìn ẹsẹ kò gbọ́dọ̀ tóbi ju eéjì.", + "error_text_subaddress_name" : "Orúkọ àdírẹ́sì tó rẹ̀lẹ̀ kò ni nínú àmì ` , ' \"\nIye ẹyọ ọ̀rọ̀ gbọ́dọ̀ wà láàárín oókan àti ogún", + "error_text_amount" : "Iye lè ni nìkan nínú àwọn òǹkà", + "error_text_wallet_name" : "Orúkọ àpamọ́wọ́ lè ni nìkan nínú àwọn òǹkà àti ẹyọ ọ̀rọ̀ àti àmì _ -\nIye ẹyọ ọ̀rọ̀ gbọ́dọ̀ wà láàárín 1 àti 33", + "error_text_keys" : "Àwọn kọ́kọ́rọ́ àpamọ́wọ́ gbọ́dọ̀ ní ẹyọ ọ̀rọ̀ mẹ́rinlélọ́gọ́ta lílà mẹ́rìndínlógún", + "error_text_crypto_currency" : "Iye díjíìtì léyìn ẹsẹ kò gbọ́dọ̀ tóbi ju eéjìlá.", + "error_text_minimal_limit" : "A kò tí ì ṣe pàṣípààrọ̀ tí ${provider} nítorí iye kéré ju ${min} ${currency}", + "error_text_maximum_limit" : "A kò tí ì ṣe pàṣípààrọ̀ tí ${provider} nítorí iye tóbi ju ${min} ${currency}", + "error_text_limits_loading_failed" : "A kò tí ì ṣe pàṣípààrọ̀ tí ${provider} nítorí a ti kùnà mú àwọn ààlà wá", + "error_text_template" : "Orúkọ àwòṣe àti àdírẹ́sì kò lè ni nínú àwọn àmì ` , ' \"\nIye ẹyọ ọ̀rọ̀ náà gbọ́dọ̀ jẹ́ láàárín 1 àti 106", + + + "auth_store_ban_timeout" : "ìfòfindè ti gbẹ́mìí mì", + "auth_store_banned_for" : "A ti fòfin de ẹ̀ nítorí ", + "auth_store_banned_minutes" : " ìṣéjú", + "auth_store_incorrect_password" : "Òǹkà ìdánimọ̀ àdáni kọ́ ni èyí", + "wallet_store_monero_wallet" : "Àpamọ́wọ́ Monero", + "wallet_restoration_store_incorrect_seed_length" : "Gígùn hóró tí a máa ń lò kọ́ ni èyí", + + + "full_balance" : "Ìyókù owó kíkún", + "available_balance" : "Ìyókù owó tó wà níbẹ̀", + "hidden_balance" : "Ìyókù owó dídé", + + + "sync_status_syncronizing" : "Ń MÚDỌ́GBA", + "sync_status_syncronized" : "TI MÚDỌ́GBA", + "sync_status_not_connected" : "KÒ TI DÁRAPỌ̀ MỌ́ Ọ", + "sync_status_starting_sync" : "Ń BẸ̀RẸ̀ RẸ́", + "sync_status_failed_connect" : "ÌKÀNPỌ̀ TI KÚ", + "sync_status_connecting" : "Ń DÁRAPỌ̀ MỌ́", + "sync_status_connected" : "TI DÁRAPỌ̀ MỌ́", + "sync_status_attempting_sync" : "Ń GBÌYÀNJÚ MÚDỌ́GBA", + + + "transaction_priority_slow" : "Díẹ̀", + "transaction_priority_regular" : "Àjùmọ̀lò", + "transaction_priority_medium" : "L’áàárín", + "transaction_priority_fast" : "Yára", + "transaction_priority_fastest" : "Yá jù lọ", + + + "trade_for_not_created" : "A kò tí ì ṣe pàṣípààrọ̀ ${title}", + "trade_not_created" : "A kò tí ì ṣe pàṣípààrọ̀ náà", + "trade_id_not_found" : "Trade ${tradeId} ti a ko ba ri ninu ${title}.", + "trade_not_found" : "A kò tí ì wá pàṣípààrọ̀.", + + + "trade_state_pending" : "Pípẹ́", + "trade_state_confirming" : "Ń jẹ́rìí", + "trade_state_trading" : "Ń ṣe pàṣípààrọ̀", + "trade_state_traded" : "Ti ṣe pàṣípààrọ̀", + "trade_state_complete" : "Ti ṣetán", + "trade_state_to_be_created" : "Máa ṣe", + "trade_state_unpaid" : "Kò tíì san", + "trade_state_underpaid" : "Ti san iye tó kéré jù", + "trade_state_paid_unconfirmed" : "Ti san. A kò tíì jẹ́rìí ẹ̀", + "trade_state_paid" : "Ti san", + "trade_state_btc_sent" : "Ti san BTC", + "trade_state_timeout" : "Ti gbẹ́mìí mì", + "trade_state_created" : "Ti ṣe", + "trade_state_finished" : "Ti ṣetán", + + "change_language" : "Pààrọ̀ èdè", + "change_language_to" : "Pààrọ̀ èdè sí ${language}?", + + "paste" : "Fikún ẹ̀dà yín", + "restore_from_seed_placeholder" : "Ẹ jọ̀wọ́ tẹ̀ hóró yín tàbí fikún ẹ̀dà hóró ḿbí.", + "add_new_word" : "Fikún ọ̀rọ̀ títun", + "incorrect_seed" : "Ọ̀rọ̀ tí a tẹ̀ kì í ṣe èyí.", + + "biometric_auth_reason" : "Ya ìka ọwọ́ yín láti ṣe ìfẹ̀rílàdí", + "version" : "Àtúnse ${currentVersion}", + + "extracted_address_content" : "Ẹ máa máa fi owó ránṣẹ́ sí\n${recipient_name}", + + "card_address" : "Àdírẹ́sì:", + "buy" : "Rà", + "sell": "Tà", + + "placeholder_transactions" : "A máa fihàn àwọn àránṣẹ́ yín ḿbí", + "placeholder_contacts" : "A máa fihàn àwọn olùbásọ̀rọ̀ yín ḿbí", + + "template" : "Àwòṣe", + "confirm_delete_template" : "Ìṣe yìí máa yọ àwòṣe yìí kúrò. Ṣé ẹ fẹ́ tẹ̀síwájú?", + "confirm_delete_wallet" : "Ìṣe yìí máa yọ àpamọ́wọ́ yìí kúrò. Ṣé ẹ fẹ́ tẹ̀síwájú?", + + "picker_description" : "Ẹ jọ̀wọ́ pààrọ̀ owó tí ẹ pàṣípààrọ̀ jọ yín lákọ̀ọ́kọ́ kí ẹ yán ChangeNOW tàbí MorphToken", + + "change_wallet_alert_title" : "Ẹ pààrọ̀ àpamọ́wọ́ yìí", + "change_wallet_alert_content" : "Ṣe ẹ fẹ́ pààrọ̀ àpamọ́wọ́ yìí sí ${wallet_name}?", + + "creating_new_wallet" : "Ń dá àpamọ́wọ́ títun", + "creating_new_wallet_error" : "Àṣìṣe: ${description}", + + "seed_alert_title" : "Ẹ wo", + "seed_alert_content" : "Hóró ni ọ̀nà nìkan kí ṣẹ̀dà àpamọ́wọ́ yín. Ṣé ẹ ti kọ ọ́ sílẹ̀?", + "seed_alert_back" : "Padà sọ́dọ̀", + "seed_alert_yes" : "Mo ti kọ ọ́", + + "exchange_sync_alert_content" : "Ẹ jọ̀wọ́ dúró kí a ti múdọ́gba àpamọ́wọ́ yín", + + "pre_seed_title" : "Ó TI ṢE PÀTÀKÌ", + "pre_seed_description" : "Ẹ máa wo àwọn ọ̀rọ̀ ${words} lórí ojú tó ń bọ̀. Èyí ni hóró aládàáni yín tó kì í jọra. Ẹ lè fi í nìkan dá àpamọ́wọ́ yín padà sípò tí àṣìṣe tàbí ìbàjẹ́ bá ṣẹlẹ̀. Hóró yín ni ẹ gbọ́dọ̀ kọ sílẹ̀ àti pamọ́ síbí tó kò léwu níta Cake Wallet.", + "pre_seed_button_text" : "Mo ti gbọ́. O fi hóró mi hàn mi", + + "provider_error" : "Àṣìṣe ${provider}", + + "use_ssl" : "Lo SSL", + "trusted" : "A ti fọkàn ẹ̀ tán", + + "color_theme" : "Àwọn ààtò àwọ̀", + "light_theme" : "Funfun bí eérú", + "bright_theme" : "Funfun", + "dark_theme" : "Dúdú", + "enter_your_note" : "Tẹ̀ àkọsílẹ̀ yín", + "note_optional" : "Àkọsílẹ̀ (ìyàn nìyí)", + "note_tap_to_change" : "Àkọsílẹ̀ (ẹ tẹ̀ láti pààrọ̀)", + "view_in_block_explorer" : "Wo lórí olùṣèwádìí àkójọpọ̀", + "view_transaction_on" : "Wo pàṣípààrọ̀ lórí ", + "transaction_key" : "Kọ́kọ́rọ́ pàṣípààrọ̀", + "confirmations" : "Àwọn ẹ̀rí", + "recipient_address" : "Àdírẹ́sì olùgbà", + + "extra_id" : "Àmì ìdánimọ̀ tó fikún:", + "destination_tag" : "Orúkọ tí ìbí tó a ránṣẹ́ sí:", + "memo" : "Àkọsílẹ̀:", + + "backup" : "Ṣẹ̀dà", + "change_password" : "Pààrọ̀ ọ̀rọ̀ aṣínà", + "backup_password" : "Ṣẹ̀dà ọ̀rọ̀ aṣínà", + "write_down_backup_password" : "Ẹ jọ̀wọ́ ẹ̀dà ọ̀rọ̀ aṣínà ti ẹ̀dà nípamọ́ yín tó máa ń bá yín ṣí àkọsílẹ̀ yín l'ẹ kọ sílẹ̀.", + "export_backup" : "Sún ẹ̀dà nípamọ́ síta", + "save_backup_password" : "Ẹ jọ̀wọ́ dájú pé ẹ ti pamọ́ ọ̀rọ̀ aṣínà ti ẹ̀dà nípamọ́ yín. Ti ẹ kò bá ni í, ẹ kò lè ṣí àwọn àkọsílẹ̀ nípamọ́ yín.", + "backup_file" : "Ṣẹ̀dà akọsílẹ̀", + + "edit_backup_password" : "Pààrọ̀ ọ̀rọ̀ aṣínà", + "save_backup_password_alert" : "Pamọ́ ọ̀rọ̀ aṣínà ti ẹ̀dà", + "change_backup_password_alert" : "Ẹ kò lè fi ọ̀rọ̀ aṣínà títun ti ẹ̀dà nípamọ́ ṣí àwọn àkọsílẹ̀ nípamọ́ tẹ́lẹ̀tẹ́lẹ̀ yín. Ẹ máa fi ọ̀rọ̀ aṣínà ti ẹ̀dà nípamọ́ títun ṣí àwọn àkọsílẹ̀ nípamọ́ títun nìkan. Ṣé ó dá ẹ lójú pé ẹ fẹ́ pààrọ̀ aṣínà ti ẹ̀dà nípamọ́?", + + "enter_backup_password" : "Tẹ̀ ọ̀rọ̀ aṣínà ti ẹ̀dà ḿbí", + "select_backup_file" : "Select backup file", + "import" : "Gba wọlé", + "please_select_backup_file" : "Ẹ jọ̀wọ́ yan àkọsílẹ̀ nípamọ́ àti tẹ̀ ọ̀rọ̀ aṣínà ti ẹ̀dà.", + + "fixed_rate" : "Iye t'á ṣẹ́ owó sí ò ní pààrọ̀", + "fixed_rate_alert" : "Ẹ lè tẹ̀ iye owó tó ń bọ̀ tí iye t'a ṣẹ́ owó sí bá is checked. Ṣé ẹ fẹ́ sún ipò ti iye t'á ṣẹ́ owó sí ò ní pààrọ̀ mọ́?", + + "xlm_extra_info" : "Ẹ jọ̀wọ́ ẹ kò gbàgbé pèsè àmì ìdánimọ̀ àkọsílẹ̀ t'ẹ́ ń bá ránṣẹ́ pàṣípààrọ̀ ti XLM yín sí ilé ìfowóṣòwò", + "xrp_extra_info" : "Ẹ jọ̀wọ́ ẹ kò gbàgbé pèsè orúkọ̀ àdírẹ́sì ti a ránṣẹ́ sí t'ẹ́ bá ránṣẹ pàṣípààrọ̀ ti XRP yín sílé ìfowóṣòwò", + + "exchange_incorrect_current_wallet_for_xmr" : "T'ẹ́ bá fẹ́ pàṣípààrọ̀ XMR láti ìyókù owó Cake Wallet yín, ẹ jọ̀wọ́ kọ́kọ́ sún àpamọ́wọ́ Monero mọ́.", + "confirmed" : "A ti jẹ́rìí ẹ̀", + "unconfirmed" : "A kò tí ì jẹ́rìí ẹ̀", + "displayable" : "A lè ṣàfihàn ẹ̀", + + "submit_request" : "Ṣé ìbéèrè", + + "buy_alert_content" : "A jẹ́ kí ríra Bitcoin àti Litecoin nìkan. Ẹ jọ̀wọ́ dá tàbí sún àpamọ́wọ́ ti Bitcoin yín tàbí àpamọ́wọ́ ti Litecoin yín mọ́, t'ẹ́ bá fẹ́ ra Bitcoin tàbí Litecoin.", + "sell_alert_content": "A jẹ́ kí títa Bitcoin nìkan. Ẹ jọ̀wọ́ dá tàbí sún àpamọ́wọ́ ti Bitcoin yín mọ́, t'ẹ́ bá fẹ́ ta Bitcoin.", + + "outdated_electrum_wallet_description" : "Àwọn àpamọ́wọ́ títun Bitcoin ti a ti dá nínú Cake Wallet lọ́wọ́lọ́wọ́. Àwọn àpamọ́wọ́ títun t'á dá nínú Cake Wallet ni hóró tó ní ọ̀rọ̀ mẹ́rinlélógún. Ẹ gbọ́dọ̀ dá àpamọ́wọ́. Ẹ sì sún gbogbo owó yín sí àpamọ́wọ́ títun náà tó dá lórí ọ̀rọ̀ mẹ́rinlélógún. Ẹ sì gbọ́dọ̀ yé lo àwọn àpamọ́wọ́ tó dá lórí hóró tó ní ọ̀rọ̀ méjìlá. Ẹ jọ̀wọ́ ṣe èyí láìpẹ́ kí ẹ ba owó yín.", + "understand" : "Ó ye mi", + + "apk_update" : "Àtúnse áàpù títun wà", + + "buy_bitcoin" : "Ra Bitcoin", + "buy_with" : "Rà pẹ̀lú", + "moonpay_alert_text" : "Iye owó kò gbọ́dọ̀ kéré ju ${minAmount} ${fiatCurrency}", + + "outdated_electrum_wallet_receive_warning": "Ẹ KÒ FI BITCOIN SÍ ÀPAMỌ́WỌ́ YÌÍ t'á ti dá a nínú Cake Wallet àti àpamọ́wọ́ yìí ni hóró ti ọ̀rọ̀ méjìlá. A lè pàdánù BTC t'á ránṣẹ́ sí àpamọ́wọ́ yìí. Ẹ dá àpamọ́wọ́ títun tó ni hóró tó ni ọ̀rọ̀ mẹ́rinlélógún (Ẹ tẹ àkọsílẹ̀ tó wa l’ókè l'ọ́tún nígbàna, ẹ sì yan àwọn àpamọ́wọ́ nígbàna, ẹ sì yan Dá Àpamọ́wọ́ Títun nígbàna, ẹ sì yan Bitcoin) àti sún Bitcoin yín síbẹ̀ ní sinsìn yẹn. Àwọn àpamọ́wọ́ títun (hóró ni ọ̀rọ̀ mẹ́rinlélógún) láti Cake Wallet wa láìléwu.", + "do_not_show_me": "Kò fi eléyìí hàn mi mọ́", + + "unspent_coins_title" : "Àwọn owó ẹyọ t'á kò tí ì san", + "unspent_coins_details_title" : "Àwọn owó ẹyọ t'á kò tí ì san", + "freeze" : "Tì pa", + "frozen" : "Ó l'a tì pa", + "coin_control" : "Ìdarí owó ẹyọ (ìyàn nìyí)", + + "address_detected" : "A ti gbọ́ àdírẹ́sì", + "address_from_domain" : "Àdírẹ́sì yìí wá láti ${domain} lórí Unstoppable Domains", + + "add_receiver" : "Fikún àdírẹ́sì mìíràn (ìyàn nìyí)", + + "manage_yats" : "Bójú Yats", + "yat_alert_title" : "Lílò Yat láti ránṣẹ́ àti gba owó dùn ṣe pọ̀ ju lọ", + "yat_alert_content" : "Àwọn olùṣàmúlò ti Cake Wallet lè fi orúkọ olùṣàmúlò t'á dá lórí emójì tó kì í jọra ránṣẹ́ àti gba gbogbo àwọn irú owó tíwọn yàn láàyò lọ́wọ́lọ́wọ́.", + "get_your_yat" : "Gba Yat yín", + "connect_an_existing_yat" : "So Yat wíwà", + "connect_yats": "So àwọn Yat", + "yat_address" : "Àdírẹ́sì Yat", + "yat" : "Yat", + "address_from_yat" : "Àdírẹ́sì yìí wá láti ${emoji} lórí Yat", + "yat_error" : "Àṣìṣe Yat", + "yat_error_content" : "Kò sí àdírẹ́sìkádírẹ́sì tó so Yat yìí. Ẹ gbìyànjú Yat mìíràn", + "choose_address" : "\n\nẸ jọ̀wọ́ yan àdírẹ́sì:", + "yat_popup_title" : "Ẹ lè dá àpamọ́wọ́ yín láti emójì.", + "yat_popup_content" : "Ẹ lè fi Yat yín (orúkọ olùṣàmúlò kúkurú t'á dá lórí emójì) ránṣẹ́ àti gba owó nínú Cake Wallet lọ́wọ́lọ́wọ́. Bójú Yats lórí ojú ààtò lígbàkúgbà.", + "second_intro_title" : "Àdírẹ́sì kan t'á dá láti emójì tó pàṣẹ gbogbo ohun wà", + "second_intro_content" : "Àdírẹ́sì kan tó dá lórí emójì tó kì í jọra ni Yat yín. Ó rọ́pò gbogbo àwọn àdírẹ́sì gígùn yín tó dá lórí ìlà mẹ́rìndínlógún ti gbogbo àwọn iye owó yín.", + "third_intro_title" : "Àlàáfíà ni Yat àti àwọn ìmíìn jọ wà", + "third_intro_content" : "A sì lè lo Yats níta Cake Wallet. A lè rọ́pò Àdírẹ́sì kankan àpamọ́wọ́ fún Yat!", + "learn_more" : "Túbọ̀ kọ́", + "search": "Wá", + "search_language": "Wá èdè", + "search_currency": "Wá irú owó", + "new_template" : "Àwòṣe títun", + "electrum_address_disclaimer": "A dá àwọn àdírẹ́sì títun ní gbogbo àwọn ìgbà t'ẹ́ lo ó kan ṣùgbọ́n ẹ lè tẹ̀síwájú lo àwọn àdírẹ́sì tẹ́lẹ̀tẹ́lẹ̀.", + "wallet_name_exists": "Ẹ ti ní àpamọ́wọ́ pẹ̀lú orúkọ̀ yẹn. Ẹ jọ̀wọ́ yàn orúkọ̀ tó yàtọ̀ tàbí pààrọ̀ orúkọ ti àpamọ́wọ́ tẹ́lẹ̀.", + "market_place": "Ọjà", + "cake_pay_title": "Àwọn káàdì ìrajà t'á lò nínú ìtajà kan ti Cake Pay", + "cake_pay_subtitle": "Ra àwọn káàdì ìrajà t'á lò nínú ìtajà kan fún owó tí kò pọ̀ (USA nìkan)", + "cake_pay_web_cards_title": "Àwọn káàdì wẹ́ẹ̀bù ti Cake Pay", + "cake_pay_web_cards_subtitle": "Ra àwọn káàdì ìrajà t'á lò nínú ìtajà kan àti àwọn káàdì náà t'á lè lò níbikíbi", + "about_cake_pay": "Cake Pay jẹ́ kí ẹ lè fi owó wẹ́ẹ̀bù ra àwọn káàdì ìrajà t'á lò nínú iye ìtajà kan. Ẹ lè san wọn láìpẹ́ nítajà 150,000 nínú Amẹ́ríkà.", + "cake_pay_account_note": "Ẹ fi àdírẹ́sì ímeèlì nìkan forúkọ sílẹ̀ k'ẹ́ rí àti ra àwọn káàdì. Ẹ lè fi owó tó kéré jù ra àwọn káàdì kan!", + "already_have_account": "Ṣé ẹ ti ní àkáǹtì?", + "create_account": "Dá àkáǹtì", + "privacy_policy": "Òfin Aládàáni", + "welcome_to_cakepay": "Ẹ káàbọ̀ sí Cake Pay!", + "sign_up": "Forúkọ sílẹ̀", + "forgot_password": "Ẹ ti gbàgbé ọ̀rọ̀ aṣínà", + "reset_password": "Tún ọ̀rọ̀ aṣínà ṣe", + "gift_cards": "Àwọn káàdì ìrajà t'á lò nínú iye kan ìtajà", + "setup_your_debit_card": "Dá àwọn káàdì ìrajà yín", + "no_id_required": "Ẹ kò nílò àmì ìdánimọ̀. Ẹ lè fikún owó àti san níbikíbi", + "how_to_use_card": "Báyìí ni wọ́n ṣe ń lo káàdì yìí.", + "purchase_gift_card": "Ra káàdì ìrajà t'á lò nínú irú kan ìtajà", + "verification": "Ìjẹ́rìísí", + "fill_code": "Ẹ jọ̀wọ́ tẹ̀ ọ̀rọ̀ ìjẹ́rìísí t'á ti ránṣẹ́ sí ímeèlì yín.", + "dont_get_code": "Ṣé ẹ ti gba ọ̀rọ̀ ìdánimọ̀?", + "resend_code": "Ẹ jọ̀wọ́ tún un ránṣé", + "debit_card": "Káàdì ìrajà", + "cakepay_prepaid_card": "Káàdì ìrajà ti CakePay", + "no_id_needed": "Ẹ kò nílò àmì ìdánimọ̀!", + "frequently_asked_questions": "Àwọn ìbéèrè la máa ń béèrè", + "debit_card_terms": "Òfin ti olùṣe àjọrò káàdì ìrajà bójú irú ọ̀nà t'á pamọ́ àti a lo òǹkà ti káàdì ìrajà yín (àti ọ̀rọ̀ ìdánimọ̀ tí káàdì náà) nínú àpamọ́wọ́ yìí.", + "please_reference_document": "Ẹ jọ̀wọ́ fi àwọn àkọsílẹ̀ l’ábẹ́ túbọ̀ mọ ìsọfúnni.", + "cardholder_agreement": "Àjọrò olùṣe káàdì ìrajà", + "e_sign_consent": "Jẹ́rìí sí lórí ayélujára", + "agree_and_continue": "Jọ Rò àti Tẹ̀síwájú", + "email_address": "Àdírẹ́sì ímeèlì", + "agree_to": "Tẹ́ ẹ bá dá àkáǹtì ẹ jọ rò ", + "and": "àti", + "enter_code": "Tẹ̀ ọ̀rọ̀", + "congratulations": "Ẹ kúuṣẹ́ ooo!", + "you_now_have_debit_card": "Ẹ ni káàdì ìrajà lọ́wọ́lọ́wọ́", + "min_amount" : "kò kéré ju: ${value}", + "max_amount" : "kò tóbi ju: ${value}", + "enter_amount": "Tẹ̀ iye", + "billing_address_info": "Tí ọlọ́jà bá bèèrè àdírẹ́sì sísan yín, fún òun ni àdírẹ́sì t'á ránṣẹ́ káàdì yìí sí", + "order_physical_card": "Bèèrè káàdì t'ara", + "add_value": "Fikún owó", + "activate": "Fi àyè gba", + "get_a": "Gba ", + "digital_and_physical_card": " káàdì ìrajà t'ara àti ti ayélujára", + "get_card_note": " t'ẹ lè fikún owó ayélujára. Ẹ kò nílò ìṣofúnni àfikún!", + "signup_for_card_accept_terms": "Ẹ f'orúkọ sílẹ̀ láti gba káàdì àti àjọrò.", + "add_fund_to_card": "Ẹ fikún owó sí àwọn káàdì (kò tóbi ju ${value})", + "use_card_info_two": "A pààrọ̀ owó sí owó Amẹ́ríkà tó bá wà nínú àkanti t'á ti fikún tẹ́lẹ̀tẹ́lẹ̀. A kò kó owó náà nínú owó ayélujára.", + "use_card_info_three": "Ẹ lo káàdí ayélujára lórí wẹ́ẹ̀bù tàbí ẹ lò ó lórí àwọn ẹ̀rọ̀ ìrajà tíwọn kò kò.", + "optionally_order_card": "Ẹ lè fi ìyàn bèèrè káàdì t'ara.", + "hide_details" : "Dé ìsọfúnni kékeré", + "show_details" : "Fi ìsọfúnni kékeré hàn", + "upto": "kò tóbi ju ${value}", + "discount": "Pamọ́ ${value}%", + "gift_card_amount": "owó ìyókù káàdì", + "bill_amount": "Iye ìwé owó", + "you_pay": "Ẹ sàn", + "tip": "Owó àfikún:", + "custom": "Ohun t'á ti pààrọ̀", + "by_cake_pay": "láti ọwọ́ Cake Pay", + "expires": "Ó parí", + "mm": "Os", + "yy": "Ọd", + "online": "Lórí ayélujára", + "offline": "kò wà lórí ayélujára", + "gift_card_number": "Òǹkà káàdì ìrajì", + "pin_number": "Òǹkà ìdánimọ̀ àdáni", + "total_saving": "Owó t'ẹ́ ti pamọ́", + "last_30_days": "Ọ̀jọ̀ mọ́gbọ̀n tó kọjà", + "avg_savings": "Ìpamọ́ l’óòrèkóòrè", + "view_all": "Wo gbogbo nǹkan kan", + "active_cards": "Àwọn káàdì títàn", + "delete_account": "Pa ìṣàmúlò", + "cards": "Àwọn káàdì", + "active": "Ó títàn", + "redeemed": "Ó lílò", + "gift_card_balance_note": "Àwọn káàdì ìrajà t'á lò nínú irú kan ìtajà tíwọn ṣì ní owó máa fihàn ḿbí", + "gift_card_redeemed_note": "Àwọn káàdì ìrajà t'á lò nínú irú kan ìtajà t'ẹ́ ti lò máa fihàn ḿbí", + "logout": "Jáde", + "add_tip": "Fún owó àfikún", + "percentageOf": "láti ${amount}", + "is_percentage": "jẹ́", + "search_category": "Wá nínú ẹgbẹ́", + "mark_as_redeemed": "Fún orúkọ lílò", + "more_options": "Ìyàn àfikún", + "awaiting_payment_confirmation": "À ń dúró de ìjẹ́rìísí àránṣẹ́", + "transaction_sent_notice": "Tí aṣàfihàn kò bá tẹ̀síwájú l'áàárín ìṣẹ́jú kan, ẹ tọ́ olùṣèwádìí àkójọpọ̀ àti ímeèlì yín wò.", + "agree": "Jọ rò", + "in_store": "A níyí", + "generating_gift_card": "À ń dá káàdì ìrajà t'á lò nínú irú kan ìtajà", + "payment_was_received": "Àránṣẹ́ yín ti dé.", + "proceed_after_one_minute": "Tí aṣàfihàn kò bá tẹ̀síwájú l'áàárín ìṣẹ́jú kan, ẹ tọ́ ímeèlì yín wò.", + "order_id": "Àmì ìdánimọ̀ ti ìbéèrè", + "gift_card_is_generated": "A ti dá káàdí ìrajà t'á lò nínú irú kan ìtajà", + "open_gift_card": "Ṣí káàdí ìrajà t'á lò nínú irú kan ìtajà", + "contact_support": "Bá ìranlọ́wọ́ sọ̀rọ̀", + "gift_cards_unavailable": "A lè fi Monero, Bitcoin, àti Litecoin nìkan ra káàdí ìrajà t'á lò nínú irú kan ìtajà lọ́wọ́lọ́wọ́", + "introducing_cake_pay": "Ẹ bá Cake Pay!", + "cake_pay_learn_more": "Láìpẹ́ ra àti lo àwọn káàdí ìrajà t'á lò nínú irú kan ìtajà nínú áàpù!\nẸ tẹ̀ òsì de ọ̀tún láti kọ́ jù.", + "automatic": "Ó máa ń ṣàdédé", + "fixed_pair_not_supported": "A kì í ṣe k'á fi àwọn ilé pàṣípààrọ̀ yìí ṣe pàṣípààrọ̀ irú owó méji yìí", + "variable_pair_not_supported": "A kì í ṣe k'á fi àwọn ilé pàṣípààrọ̀ yìí ṣe pàṣípààrọ̀ irú owó méji yìí", + "none_of_selected_providers_can_exchange": "Àwọn ilé pàṣípààrọ̀ yíyàn kò lè ṣe pàṣípààrọ̀ yìí", + "choose_one": "Ẹ yàn kan", + "choose_from_available_options": "Ẹ yàn láti àwọn ìyàn yìí:", + "custom_redeem_amount": "Iye owó l'á máa ná", + "add_custom_redemption": "Tẹ̀ iye owó t'ẹ́ fẹ́ ná", + "remaining": "ìyókù", + "delete_wallet": "Pa àpamọ́wọ́", + "delete_wallet_confirm_message" : "Ṣó dá ẹ lójú pé ẹ fẹ́ pa àpamọ́wọ́ ${wallet_name}?", + "low_fee": "Owó àfikún kékeré", + "low_fee_alert": "Ẹ ń fi owó àfikún kékeré fún àwọn àránṣẹ́ yín lágbára. Eleyìí lè pẹ́ gba àránṣẹ́ yín. Ó sì lè dá àwọn iye mìíràn t'á ṣẹ́ owó sí. Ó sì lè pa àwọn pàṣípààrọ̀. A dábàá pé k'ẹ́ lo owó àfikún títobi láti ṣe àṣejèrè.", + "ignor": "Ṣàìfiyèsí", + "use_suggested": "Lo àbá", + "do_not_share_warning_text" : "Ẹ kò pín wọnyìí sí ẹnikẹ́ni. Ẹ sì kò pin wọnyìí sí ìranlọ́wọ́. Ẹnikẹ́ni lè jí owó yín! Wọ́n máa jí owó yín!", + "help": "ìranlọ́wọ́", + "all_transactions": "Gbogbo àwọn àránṣẹ́", + "all_trades": "Gbogbo àwọn pàṣípààrọ̀", + "connection_sync": "Ìkànpọ̀ àti ìbádọ́gba", + "security_and_backup": "Ìṣọ́ àti ẹ̀dà nípamọ́", + "create_backup": "Ṣẹ̀dà nípamọ́", + "privacy_settings": "Ààtò àdáni", + "privacy": "Ìdáwà", + "display_settings": "Fihàn àwọn ààtò", + "other_settings": "Àwọn ààtò mìíràn", + "require_pin_after": "Ẹ nílò òǹkà ìdánimọ̀ àdáni láàárín", + "always": "Ní gbogbo àwọn ìgbà", + "minutes_to_pin_code": "${minute} ìṣẹ́jú", + "disable_exchange": "Pa ilé pàṣípààrọ̀", + "advanced_privacy_settings": "Àwọn ààtò àdáni títóbi", + "settings_can_be_changed_later": "Ẹ lè pààrọ̀ àwọn ààtò yìí nínú ààtò áàpù t’ó bá yá", + "add_custom_node": "Fikún apẹka títun t'ẹ́ pààrọ̀", + "disable_fiat": "Pa owó tí ìjọba pàṣẹ wa lò", + "fiat_api": "Ojú ètò áàpù owó tí ìjọba pàṣẹ wa lò", + "disabled": "Wọ́n tí a ti pa", + "enabled": "Wọ́n tíwọn ti tan", + "tor_only": "Tor nìkan", + "unmatched_currencies": "Irú owó ti àpamọ́wọ́ yín kì í ṣe irú ti yíya àmì ìlujá", + "contact_list_contacts": "Àwọn olùbásọ̀rọ̀", + "contact_list_wallets": "Àwọn àpamọ́wọ́ mi", + "bitcoin_payments_require_1_confirmation": "Àwọn àránṣẹ́ Bitcoin nílò ìjẹ́rìísí kan. Ó lè lo ìṣéjú ogun tàbí ìṣéjú jù. A dúpẹ́ fún sùúrù yín! Ẹ máa gba ímeèlì t'ó bá jẹ́rìísí àránṣẹ́ náà.", + "send_to_this_address" : "Ẹ fi ${currency} ${tag}ránṣẹ́ sí àdírẹ́sì yìí", + "arrive_in_this_address" : "${currency} ${tag} máa dé sí àdírẹ́sì yìí", + "do_not_send": "Ẹ kò ránṣ", + "error_dialog_content": "Àṣìṣe ti dé.\n\nẸ jọ̀wọ́, fi àkọsílẹ̀ àṣìṣe ránṣẹ́ sí ẹgbẹ́ ìranlọ́wọ́ wa kí áàpù wa bá túbọ̀ dára.", + "scan_qr_code": "Yan QR koodu", + "cold_or_recover_wallet": "Fi owo aisan tabi yiyewo owo iwe iwe", + "please_wait": "Jọwọ saa", + "sweeping_wallet": "Fi owo iwe iwe wofo", + "sweeping_wallet_alert": "Yio kọja pada si ikan yii. Kì yoo daadaa leede yii tabi owo ti o ti fi se iwe iwe naa yoo gbe.", + "invoice_details": "Iru awọn ẹya ọrọ", + "donation_link_details": "Iru awọn ẹya ọrọ ti o funni", + "anonpay_description": "Ṣe akọkọ ${type}. Awọn alabara le ${method} pẹlu eyikeyi iwo ise ati owo yoo wọle si iwe iwe yii.", + "create_invoice": "Ṣe iwe iwe", + "create_donation_link": "Ṣe kọọkan alabara asopọ", + "optional_email_hint": "Ṣeto imọ-ẹrọ iye fun owo ti o gbọdọjọ", + "optional_description": "Ṣeto ẹru iye", + "optional_name": "Ṣeto orukọ ti o ni", + "clearnet_link": "Kọja ilọ oke", + "onion_link": "Kọja ilọ alubosa", + "decimal_places_error": "Oọ̀rọ̀ ayipada ti o wa ni o dara julọ", + "edit_node": "Tun awọn ọwọnrin ṣiṣe", + "frozen_balance": "Aferugbo Iye", + "settings": "Awọn aseṣe", + "sell_monero_com_alert_content": "Kọ ju lọwọ Monero ko ṣe ni ibamu", + "error_text_input_below_minimum_limit" : "Iye jọwọ ni o kere ti o wọle diẹ", + "error_text_input_above_maximum_limit" : "Iye jọwọ ni o yẹ diẹ ti o wọle diẹ", + "show_market_place" :"Wa Sopọ Pataki", + "prevent_screenshots": "Pese asapọ ti awọn ẹrọ eto aṣa", + "modify_2fa": "Fi iṣiro 2FA sii Cake", + "disable_cake_2fa": "Ko 2FA Cake sii", + "question_to_disable_2fa":"Ṣe o wa daadaa pe o fẹ ko 2FA Cake? Ko si itumọ ti a yoo nilo lati ranse si iwe iwe naa ati eyikeyi iṣẹ ti o ni.", + "disable": "Ko si", + "setup_2fa": "Ṣeto Cake 2FA", + "verify_with_2fa": "Ṣeẹda pẹlu Cake 2FA", + "totp_code": "Koodu TOTP", + "please_fill_totp": "Jọwọ bọ ti ẹrọ ti o wọle ni 8-digits ti o wa ni eto miiran re", + "totp_2fa_success": "Pelu ogo! Cake 2FA ti fi sii lori iwe iwe yii. Tọ, mọ iye ẹrọ miiran akojọrọ jẹki o kọ ipin eto.", + "totp_verification_success" :"Ìbẹrẹ dọkita!", + "totp_2fa_failure": "Koodu ti o daju ko ri. Jọwọ jẹ koodu miiran tabi ṣiṣẹ iwe kiakia. Lo fun 2FA eto ti o ba ṣe ni jẹ 2FA ti o gba idaniloju 8-digits ati SHA512.", + "enter_totp_code": "Jọwọ pọ koodu TOTP.", + "add_secret_code":"Fọya koodu iye yii si eto miiran", + "totp_secret_code":"Koodu iye TOTP", + "important_note": "Iwọ nikan nipasẹ iwe iṣẹ kan", + "setup_2fa_text": "Cake 2FA kii ṣe nipasẹ aisan tabi ni akoso aisan. 2FA ti ṣe pada ninu awọn iṣẹ pataki, bi atilẹyin ti o fun iṣẹ rẹ ti o ti jẹ saanu.\n\n Cake 2FA kii ṣe pada ninu atilẹyin ti o ti ba alabara kan ti o sise gidi gan.\n\n Ti o ba pọ akosile rẹ 2FA, O YOO RI ATOJU SI IWE IWE NA. O yoo nilo lati yan pẹlu iwe iwe ni o ba ṣe iṣẹ rẹ. O ni aṣẹ iru ki o gba asise akojọ iwe iwe rẹ! Nitori a ko ni aṣẹ pẹlu ohun ti o ba ṣe iṣẹ rẹ lati yan pẹlu akojọ iwe iwe rẹ, nitori Cake ni iwe iwe ti ko se iṣẹ itumọ.", + "setup_totp_recommended": "Sọ TOTP (Kẹṣọdọ)", + "disable_buy": "Ko iṣọrọ ọja", + "disable_sell": "Ko iṣọrọ iṣọrọ" +} From 19cbc40e81dc13fc88667949c7d187300ec5ffd1 Mon Sep 17 00:00:00 2001 From: Omar Hatem Date: Fri, 26 May 2023 21:13:22 +0300 Subject: [PATCH 8/8] New versions 4.6.6 and 1.3.7 (#949) Disable 'prevent screenshots' option from Desktop since it's not supported yet --- assets/text/Monerocom_Release_Notes.txt | 9 ++++++--- assets/text/Release_Notes.txt | 9 ++++++--- lib/src/screens/settings/privacy_page.dart | 14 ++++++++------ lib/store/settings_store.dart | 11 +++++++---- macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- scripts/android/app_env.sh | 8 ++++---- scripts/ios/app_env.sh | 8 ++++---- scripts/macos/app_env.sh | 4 ++-- 8 files changed, 38 insertions(+), 27 deletions(-) diff --git a/assets/text/Monerocom_Release_Notes.txt b/assets/text/Monerocom_Release_Notes.txt index 56fb3deb7..178fa45ea 100644 --- a/assets/text/Monerocom_Release_Notes.txt +++ b/assets/text/Monerocom_Release_Notes.txt @@ -1,3 +1,6 @@ -Reliability fixes for PIN login, transaction appearance, keyboard inputs, and QR codes -Show amount received by each Monero account in account overview -Other bugfixes \ No newline at end of file +Opt-in to Cake 2FA for security. More info: https://guides.cakewallet.com/docs/advanced-features/authentication/#cake-2fa +Auto generate restore height for Monero restore QR codes +Hausa and Yoruba languages +Additional privacy settings +Update Monero to 0.18.2.2 +Refactoring and bug fixes \ No newline at end of file diff --git a/assets/text/Release_Notes.txt b/assets/text/Release_Notes.txt index 56fb3deb7..178fa45ea 100644 --- a/assets/text/Release_Notes.txt +++ b/assets/text/Release_Notes.txt @@ -1,3 +1,6 @@ -Reliability fixes for PIN login, transaction appearance, keyboard inputs, and QR codes -Show amount received by each Monero account in account overview -Other bugfixes \ No newline at end of file +Opt-in to Cake 2FA for security. More info: https://guides.cakewallet.com/docs/advanced-features/authentication/#cake-2fa +Auto generate restore height for Monero restore QR codes +Hausa and Yoruba languages +Additional privacy settings +Update Monero to 0.18.2.2 +Refactoring and bug fixes \ No newline at end of file diff --git a/lib/src/screens/settings/privacy_page.dart b/lib/src/screens/settings/privacy_page.dart index c84bdc8e9..186e19d37 100644 --- a/lib/src/screens/settings/privacy_page.dart +++ b/lib/src/screens/settings/privacy_page.dart @@ -4,6 +4,7 @@ import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/src/screens/base_page.dart'; import 'package:cake_wallet/src/screens/settings/widgets/settings_choices_cell.dart'; import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart'; +import 'package:cake_wallet/utils/device_info.dart'; import 'package:cake_wallet/view_model/settings/choices_list_item.dart'; import 'package:cake_wallet/view_model/settings/privacy_settings_view_model.dart'; import 'package:flutter/material.dart'; @@ -48,12 +49,13 @@ class PrivacyPage extends BasePage { onValueChange: (BuildContext _, bool value) { _privacySettingsViewModel.setShouldSaveRecipientAddress(value); }), - SettingsSwitcherCell( - title: S.current.prevent_screenshots, - value: _privacySettingsViewModel.isAppSecure, - onValueChange: (BuildContext _, bool value) { - _privacySettingsViewModel.setIsAppSecure(value); - }), + if (DeviceInfo.instance.isMobile) + SettingsSwitcherCell( + title: S.current.prevent_screenshots, + value: _privacySettingsViewModel.isAppSecure, + onValueChange: (BuildContext _, bool value) { + _privacySettingsViewModel.setIsAppSecure(value); + }), SettingsSwitcherCell( title: S.current.disable_buy, value: _privacySettingsViewModel.disableBuy, diff --git a/lib/store/settings_store.dart b/lib/store/settings_store.dart index 01723fc6e..9dfdacd39 100644 --- a/lib/store/settings_store.dart +++ b/lib/store/settings_store.dart @@ -4,6 +4,7 @@ import 'package:cake_wallet/bitcoin/bitcoin.dart'; import 'package:cake_wallet/entities/exchange_api_mode.dart'; import 'package:cake_wallet/entities/pin_code_required_duration.dart'; import 'package:cake_wallet/entities/preferences_key.dart'; +import 'package:cake_wallet/utils/device_info.dart'; import 'package:cw_core/transaction_priority.dart'; import 'package:cake_wallet/themes/theme_base.dart'; import 'package:cake_wallet/themes/theme_list.dart'; @@ -135,12 +136,14 @@ abstract class SettingsStoreBase with Store { (bool shouldSaveRecipientAddress) => sharedPreferences.setBool( PreferencesKey.shouldSaveRecipientAddressKey, shouldSaveRecipientAddress)); - setIsAppSecureNative(isAppSecure); + if (DeviceInfo.instance.isMobile) { + setIsAppSecureNative(isAppSecure); - reaction((_) => isAppSecure, (bool isAppSecure) { - sharedPreferences.setBool(PreferencesKey.isAppSecureKey, isAppSecure); + reaction((_) => isAppSecure, (bool isAppSecure) { + sharedPreferences.setBool(PreferencesKey.isAppSecureKey, isAppSecure); setIsAppSecureNative(isAppSecure); - }); + }); + } reaction( (_) => disableBuy, diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index 437237153..c7f78b30f 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -25,7 +25,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { CwMoneroPlugin.register(with: registry.registrar(forPlugin: "CwMoneroPlugin")) DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin")) DevicelocalePlugin.register(with: registry.registrar(forPlugin: "DevicelocalePlugin")) - FlutterSecureStorageMacosPlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStorageMacosPlugin")) + FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin")) InAppReviewPlugin.register(with: registry.registrar(forPlugin: "InAppReviewPlugin")) FLTPackageInfoPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh index 98e5762f2..119ddb56c 100644 --- a/scripts/android/app_env.sh +++ b/scripts/android/app_env.sh @@ -14,14 +14,14 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN) APP_ANDROID_TYPE=$1 MONERO_COM_NAME="Monero.com" -MONERO_COM_VERSION="1.3.6" -MONERO_COM_BUILD_NUMBER=49 +MONERO_COM_VERSION="1.3.7" +MONERO_COM_BUILD_NUMBER=50 MONERO_COM_BUNDLE_ID="com.monero.app" MONERO_COM_PACKAGE="com.monero.app" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="4.6.5" -CAKEWALLET_BUILD_NUMBER=159 +CAKEWALLET_VERSION="4.6.6" +CAKEWALLET_BUILD_NUMBER=160 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet" CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet" diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh index 0ee76e82d..360b64770 100644 --- a/scripts/ios/app_env.sh +++ b/scripts/ios/app_env.sh @@ -13,13 +13,13 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN) APP_IOS_TYPE=$1 MONERO_COM_NAME="Monero.com" -MONERO_COM_VERSION="1.3.6" -MONERO_COM_BUILD_NUMBER=47 +MONERO_COM_VERSION="1.3.7" +MONERO_COM_BUILD_NUMBER=48 MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="4.6.5" -CAKEWALLET_BUILD_NUMBER=154 +CAKEWALLET_VERSION="4.6.6" +CAKEWALLET_BUILD_NUMBER=155 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" HAVEN_NAME="Haven" diff --git a/scripts/macos/app_env.sh b/scripts/macos/app_env.sh index 09a077303..8f328465e 100755 --- a/scripts/macos/app_env.sh +++ b/scripts/macos/app_env.sh @@ -15,8 +15,8 @@ if [ -n "$1" ]; then fi CAKEWALLET_NAME="Cake Wallet" -CAKEWALLET_VERSION="1.0.4" -CAKEWALLET_BUILD_NUMBER=22 +CAKEWALLET_VERSION="1.0.5" +CAKEWALLET_BUILD_NUMBER=24 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then