Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-01-22 18:54:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-78-Ethereum

Browse source 
 Conflicts:
	lib/src/screens/dashboard/widgets/menu_widget.dart
	lib/store/settings_store.dart
This commit is contained in:
OmarHatem 2023-05-30 14:20:21 +03:00
commit bb6f64ea97
189 changed files with 3800 additions and 1210 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -114,6 +114,8 @@ Edit the applicable `strings_XX.arb` file in `res/values/` and open a pull reque
- Bulgarian - Bulgarian
- Czech - Czech
- Indonesian - Indonesian
- Hausa
- Yoruba
## Add a new language ## Add a new language

0
assets/images/flags/nga.png → assets/images/flags/yor.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 193 B

After

Width:  |  Height:  |  Size: 193 B

9
assets/text/Monerocom_Release_Notes.txt
View file

@ -1,3 +1,6 @@
Reliability fixes for PIN login, transaction appearance, keyboard inputs, and QR codes Opt-in to Cake 2FA for security. More info: https://guides.cakewallet.com/docs/advanced-features/authentication/#cake-2fa
Show amount received by each Monero account in account overview Auto generate restore height for Monero restore QR codes
Other bugfixes Hausa and Yoruba languages
Additional privacy settings
Update Monero to 0.18.2.2
Refactoring and bug fixes

9
assets/text/Release_Notes.txt
View file

@ -1,3 +1,6 @@
Reliability fixes for PIN login, transaction appearance, keyboard inputs, and QR codes Opt-in to Cake 2FA for security. More info: https://guides.cakewallet.com/docs/advanced-features/authentication/#cake-2fa
Show amount received by each Monero account in account overview Auto generate restore height for Monero restore QR codes
Other bugfixes Hausa and Yoruba languages
Additional privacy settings
Update Monero to 0.18.2.2
Refactoring and bug fixes

2
cw_core/lib/get_height_by_date.dart
View file

@ -122,6 +122,8 @@ int getMoneroHeigthByDate({required DateTime date}) {
} }
const havenDates = { const havenDates = {
"2023-05": 1352995,
"2023-04": 1331460,
"2023-03": 1309180, "2023-03": 1309180,
"2023-01": 1266810, "2023-01": 1266810,
"2022-12": 1244510, "2022-12": 1244510,

5
lib/core/address_validator.dart
View file

@ -61,10 +61,11 @@ class AddressValidator extends TextValidator {
case CryptoCurrency.dai: case CryptoCurrency.dai:
case CryptoCurrency.dash: case CryptoCurrency.dash:
case CryptoCurrency.eos: case CryptoCurrency.eos:
case CryptoCurrency.ltc:
case CryptoCurrency.bch: case CryptoCurrency.bch:
case CryptoCurrency.bnb: case CryptoCurrency.bnb:
return '[0-9a-zA-Z]'; 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: case CryptoCurrency.hbar:
return '[0-9a-zA-Z.]'; return '[0-9a-zA-Z.]';
case CryptoCurrency.zaddr: case CryptoCurrency.zaddr:
@ -119,7 +120,7 @@ class AddressValidator extends TextValidator {
case CryptoCurrency.eth: case CryptoCurrency.eth:
return [42]; return [42];
case CryptoCurrency.ltc: case CryptoCurrency.ltc:
return [34, 43]; return [34, 43, 63];
case CryptoCurrency.nano: case CryptoCurrency.nano:
return [64, 65]; return [64, 65];
case CryptoCurrency.sc: case CryptoCurrency.sc:

4
lib/entities/language_service.dart
View file

@ -27,6 +27,7 @@ class LanguageService {
'cs': 'čeština (Czech)', 'cs': 'čeština (Czech)',
'ur': 'اردو (Urdu)', 'ur': 'اردو (Urdu)',
'id': 'Bahasa Indonesia (Indonesian)', 'id': 'Bahasa Indonesia (Indonesian)',
'yo': 'Yorùbá (Yoruba)',
'ha': 'Hausa Najeriya (Nigeria)' 'ha': 'Hausa Najeriya (Nigeria)'
}; };
@ -54,7 +55,8 @@ class LanguageService {
'cs': 'czk', 'cs': 'czk',
'ur': 'pak', 'ur': 'pak',
'id': 'idn', 'id': 'idn',
'ha': 'hau', 'yo': 'yor',
'ha': 'hau'
}; };
static final list = <String, String> {}; static final list = <String, String> {};

0
lib/hausa_intl.dart → lib/locales/hausa_intl.dart
View file

16
lib/locales/locale.dart Normal file
View file

@ -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<LocalizationsDelegate<dynamic>> localizationDelegates = [
S.delegate,
GlobalCupertinoLocalizations.delegate,
GlobalMaterialLocalizations.delegate,
GlobalWidgetsLocalizations.delegate,
HaMaterialLocalizations.delegate,
HaCupertinoLocalizations.delegate,
YoCupertinoLocalizations.delegate,
YoMaterialLocalizations.delegate,
];

940
lib/locales/yoruba_intl.dart Normal file
View file

@ -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': <dynamic>[
'f.Sk.',
'e.Lk.',
],
// #enddocregion Date2
'ERANAMES': <dynamic>[
'Ṣaaju Kristi',
'Lẹhin Kristi',
],
'NARROWMONTHS': <dynamic>[
'J',
'F',
'M',
'A',
'M',
'J',
'J',
'A',
'S',
'O',
'N',
'D',
],
'STANDALONENARROWMONTHS': <dynamic>[
'J',
'F',
'M',
'A',
'M',
'J',
'J',
'A',
'S',
'O',
'N',
'D',
],
'MONTHS': <dynamic>[
'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': <dynamic>[
'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': <dynamic>[
'jan.',
'feb.',
'mar.',
'ápr.',
'mẹ̀',
'jún.',
'júl.',
'ágú.',
'sẹ̀p.',
'ọkù.',
'nọv.',
'dẹs.',
],
'STANDALONESHORTMONTHS': <dynamic>[
'jan',
'feb',
'mar',
'ápr',
'mẹ̀',
'jún',
'júl',
'ágú',
'sẹ̀p',
'ọkù',
'nọv',
'dẹs',
],
'WEEKDAYS': <dynamic>[
'ọjọ́ Ajé',
'ọjọ́ Ìsẹ́gun',
'ọjọ́ Ìsẹ́gun-Etì',
'ọjọ́ Ìsẹ́gun-Ọ̀rú',
'ọjọ́ Àìkú',
'ọjọ́ Jíń',
'ọjọ́ Àbámẹ́ta',
],
'STANDALONEWEEKDAYS': <dynamic>[
'Ọjọ́ Ajé',
'Ọjọ́ Ìsẹ́gun',
'Ọjọ́ Ìsẹ́gun-Ẹtì',
'Ọjọ́ Ìsẹ́gun-Ọ̀rú',
'Ọjọ́ Àìkú',
'Ọjọ́ Jímọ̀',
'Ọjọ́ Àbámẹ́ta',
],
'SHORTWEEKDAYS': <dynamic>[
'Ajé',
'Ìsẹ́gun',
'Ìsẹ́gun-Ẹtì',
'Ìsẹ́gun-Ọ̀rú',
'Àìkú',
'Jímọ̀',
'Àbámẹ́ta',
],
'STANDALONESHORTWEEKDAYS': <dynamic>[
'Ajé',
'Ìsẹ́gun',
'Ìsẹ́gun-Ẹtì',
'Ìsẹ́gun-Ọ̀rú',
'Àìkú',
'Jímọ̀',
'Àbámẹ́ta',
],
'NARROWWEEKDAYS': <dynamic>[
'A',
'A',
'Ì',
'A',
'À',
'J',
'À',
],
'STANDALONENARROWWEEKDAYS': <dynamic>[
'A',
'A',
'Ì',
'A',
'À',
'J',
'À',
],
'SHORTQUARTERS': <dynamic>[
'K1',
'K2',
'K3',
'K4',
],
'QUARTERS': <dynamic>[
'1. kwata',
'2. kwata',
'3. kwata',
'4. kwata',
],
'AMPMS': <dynamic>[
'a.m.',
'p.m.',
],
'DATEFORMATS': <dynamic>[
'EEEE d. MMMM y',
'd. MMMM y',
'd. MMM y',
'dd.MM.y',
],
'TIMEFORMATS': <dynamic>[
'HH:mm:ss zzzz',
'HH:mm:ss z',
'HH:mm:ss',
'HH:mm',
],
'AVAILABLEFORMATS': null,
'FIRSTDAYOFWEEK': 0,
'WEEKENDRANGE': <dynamic>[
5,
6,
],
'FIRSTWEEKCUTOFFDAY': 3,
'DATETIMEFORMATS': <dynamic>[
'{1} {0}',
'{1} \'kl\'. {0}',
'{1}, {0}',
'{1}, {0}',
],
};
// #docregion Delegate
class _YoMaterialLocalizationsDelegate extends LocalizationsDelegate<MaterialLocalizations> {
const _YoMaterialLocalizationsDelegate();
@override
bool isSupported(Locale locale) => locale.languageCode == 'yo';
@override
Future<MaterialLocalizations> 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<MaterialLocalizations>(
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<String> get narrowWeekdays => const <String>['L', 'L', 'A', 'O', 'Ọ', 'Ẹ', 'Ẹ'];
@override
int get firstDayOfWeekIndex => 0;
static const LocalizationsDelegate<MaterialLocalizations> 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<CupertinoLocalizations> {
const _YoCupertinoLocalizationsDelegate();
@override
bool isSupported(Locale locale) => locale.languageCode == 'yo';
@override
Future<CupertinoLocalizations> 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<CupertinoLocalizations>(
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<CupertinoLocalizations> delegate =
_YoCupertinoLocalizationsDelegate();
}

12
lib/main.dart
View file

@ -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/core/auth_service.dart';
import 'package:cake_wallet/entities/language_service.dart'; import 'package:cake_wallet/entities/language_service.dart';
import 'package:cake_wallet/buy/order.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/store/yat/yat_store.dart';
import 'package:cake_wallet/utils/exception_handler.dart'; import 'package:cake_wallet/utils/exception_handler.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
@ -13,7 +13,6 @@ import 'package:hive/hive.dart';
import 'package:cake_wallet/di.dart'; import 'package:cake_wallet/di.dart';
import 'package:path_provider/path_provider.dart'; import 'package:path_provider/path_provider.dart';
import 'package:shared_preferences/shared_preferences.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_secure_storage/flutter_secure_storage.dart';
import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:cake_wallet/themes/theme_base.dart'; import 'package:cake_wallet/themes/theme_base.dart';
@ -283,14 +282,7 @@ class AppState extends State<App> with SingleTickerProviderStateMixin {
navigatorKey: navigatorKey, navigatorKey: navigatorKey,
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
theme: settingsStore.theme, theme: settingsStore.theme,
localizationsDelegates: [ localizationsDelegates: localizationDelegates,
S.delegate,
GlobalCupertinoLocalizations.delegate,
GlobalMaterialLocalizations.delegate,
GlobalWidgetsLocalizations.delegate,
HaMaterialLocalizations.delegate,
HaCupertinoLocalizations.delegate,
],
supportedLocales: S.delegate.supportedLocales, supportedLocales: S.delegate.supportedLocales,
locale: Locale(settingsStore.languageCode), locale: Locale(settingsStore.languageCode),
onGenerateRoute: (settings) => Router.createRoute(settings), onGenerateRoute: (settings) => Router.createRoute(settings),

44
lib/src/screens/anonpay_details/anonpay_details_page.dart
View file

@ -20,13 +20,33 @@ class AnonpayDetailsPage extends BasePage {
final AnonpayDetailsViewModel anonpayDetailsViewModel; final AnonpayDetailsViewModel anonpayDetailsViewModel;
@override @override
Widget body(BuildContext context) { Widget body(BuildContext context) => AnonpayDetailsPageBody(anonpayDetailsViewModel);
}
class AnonpayDetailsPageBody extends StatefulWidget {
AnonpayDetailsPageBody(this.anonpayDetailsViewModel);
final AnonpayDetailsViewModel anonpayDetailsViewModel;
@override
State<AnonpayDetailsPageBody> createState() => _AnonpayDetailsPageBodyState();
}
class _AnonpayDetailsPageBodyState extends State<AnonpayDetailsPageBody> {
@override
void dispose() {
super.dispose();
widget.anonpayDetailsViewModel.timer?.cancel();
}
@override
Widget build(BuildContext context) {
return SectionStandardList( return SectionStandardList(
context: context, context: context,
sectionCount: 1, sectionCount: 1,
itemCounter: (int _) => anonpayDetailsViewModel.items.length, itemCounter: (int _) => widget.anonpayDetailsViewModel.items.length,
itemBuilder: (_, __, index) { itemBuilder: (_, __, index) {
final item = anonpayDetailsViewModel.items[index]; final item = widget.anonpayDetailsViewModel.items[index];
if (item is DetailsListStatusItem) { if (item is DetailsListStatusItem) {
return StandardListStatusRow(title: item.title, value: item.value); return StandardListStatusRow(title: item.title, value: item.value);
@ -37,20 +57,18 @@ class AnonpayDetailsPage extends BasePage {
id: item.id, id: item.id,
create: item.createdAt, create: item.createdAt,
pair: item.pair, pair: item.pair,
currentTheme: anonpayDetailsViewModel.settingsStore.currentTheme.type, currentTheme: widget.anonpayDetailsViewModel.settingsStore.currentTheme.type,
onTap: item.onTap, onTap: item.onTap,
); );
} }
return GestureDetector( return GestureDetector(
onTap: () { onTap: () {
Clipboard.setData(ClipboardData(text: item.value)); Clipboard.setData(ClipboardData(text: item.value));
showBar<void>(context, S.of(context).transaction_details_copied(item.title)); showBar<void>(context, S.of(context).transaction_details_copied(item.title));
}, },
child: ListRow(title: '${item.title}:', value: item.value), child: ListRow(title: '${item.title}:', value: item.value),
); );
}); });
} }
} }

2
lib/src/screens/auth/auth_page.dart
View file

@ -141,7 +141,7 @@ class AuthPageState extends State<AuthPage> {
), ),
)) ))
: Container(), : Container(),
backgroundColor: Theme.of(context).backgroundColor, backgroundColor: Theme.of(context).colorScheme.background,
border: null), border: null),
resizeToAvoidBottomInset: false, resizeToAvoidBottomInset: false,
body: PinCode((pin, _) => widget.authViewModel.auth(password: pin), body: PinCode((pin, _) => widget.authViewModel.auth(password: pin),

5
lib/src/screens/backup/backup_page.dart
View file

@ -79,7 +79,10 @@ class BackupPage extends BasePage {
isLoading: backupViewModelBase.state is IsExecutingState, isLoading: backupViewModelBase.state is IsExecutingState,
onPressed: () => onExportBackup(context), onPressed: () => onExportBackup(context),
text: S.of(context).export_backup, text: S.of(context).export_backup,
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
textColor: Colors.white)), textColor: Colors.white)),
bottom: 24, bottom: 24,
left: 24, left: 24,

12
lib/src/screens/backup/edit_backup_password_page.dart
View file

@ -38,14 +38,20 @@ class EditBackupPasswordPage extends BasePage {
keyboardType: TextInputType.visiblePassword, keyboardType: TextInputType.visiblePassword,
controller: textEditingController, controller: textEditingController,
style: TextStyle( style: TextStyle(
fontSize: 26, fontSize: 26,
color: Theme.of(context).primaryTextTheme!.headline6!.color!)))), color: Theme.of(context)
.primaryTextTheme!
.titleLarge!
.color!)))),
Positioned( Positioned(
child: Observer( child: Observer(
builder: (_) => PrimaryButton( builder: (_) => PrimaryButton(
onPressed: () => onSave(context), onPressed: () => onSave(context),
text: S.of(context).save, text: S.of(context).save,
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
textColor: Colors.white, textColor: Colors.white,
isDisabled: !editBackupPasswordViewModel.canSave)), isDisabled: !editBackupPasswordViewModel.canSave)),
bottom: 24, bottom: 24,

4
lib/src/screens/base_page.dart
View file

@ -48,7 +48,7 @@ abstract class BasePage extends StatelessWidget {
} }
final _backButton = Icon(Icons.arrow_back_ios, 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,); size: 16,);
return MergeSemantics( return MergeSemantics(
@ -83,7 +83,7 @@ abstract class BasePage extends StatelessWidget {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontFamily: 'Lato', fontFamily: 'Lato',
color: titleColor ?? color: titleColor ??
Theme.of(context).primaryTextTheme!.headline6!.color!), Theme.of(context).primaryTextTheme!.titleLarge!.color!),
); );
} }

18
lib/src/screens/buy/pre_order_page.dart
View file

@ -80,7 +80,9 @@ class PreOrderPage extends BasePage {
return KeyboardActions( return KeyboardActions(
config: KeyboardActionsConfig( config: KeyboardActionsConfig(
keyboardActionsPlatform: KeyboardActionsPlatform.IOS, keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1! keyboardBarColor: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.backgroundColor!, .backgroundColor!,
nextFocus: false, nextFocus: false,
actions: [ actions: [
@ -91,7 +93,7 @@ class PreOrderPage extends BasePage {
]), ]),
child: Container( child: Container(
height: 0, height: 0,
color: Theme.of(context).backgroundColor, color: Theme.of(context).colorScheme.background,
child: ScrollableWithBottomSection( child: ScrollableWithBottomSection(
contentPadding: EdgeInsets.only(bottom: 24), contentPadding: EdgeInsets.only(bottom: 24),
content: Observer(builder: (_) => Column( content: Observer(builder: (_) => Column(
@ -102,9 +104,9 @@ class PreOrderPage extends BasePage {
bottomLeft: Radius.circular(24), bottomLeft: Radius.circular(24),
bottomRight: Radius.circular(24)), bottomRight: Radius.circular(24)),
gradient: LinearGradient(colors: [ gradient: LinearGradient(colors: [
Theme.of(context).primaryTextTheme.subtitle1!.color!, Theme.of(context).primaryTextTheme!.titleMedium!.color!,
Theme.of(context) Theme.of(context)
.primaryTextTheme.subtitle1! .primaryTextTheme!.titleMedium!
.decorationColor!, .decorationColor!,
], begin: Alignment.topLeft, end: Alignment.bottomRight), ], begin: Alignment.topLeft, end: Alignment.bottomRight),
), ),
@ -160,11 +162,11 @@ class PreOrderPage extends BasePage {
), ),
), ),
hintText: '0.00', hintText: '0.00',
borderColor: Theme.of(context).primaryTextTheme.bodyText1!.decorationColor!, borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.decorationColor!,
borderWidth: 0.5, borderWidth: 0.5,
textStyle: TextStyle(fontSize: 36, fontWeight: FontWeight.w500, color: Colors.white), textStyle: TextStyle(fontSize: 36, fontWeight: FontWeight.w500, color: Colors.white),
placeholderTextStyle: TextStyle( placeholderTextStyle: TextStyle(
color: Theme.of(context).primaryTextTheme.headline5!.decorationColor!, color: Theme.of(context).primaryTextTheme!.headlineSmall!.decorationColor!,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontSize: 36, fontSize: 36,
), ),
@ -179,7 +181,7 @@ class PreOrderPage extends BasePage {
S.of(context).buy_with + ':', S.of(context).buy_with + ':',
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: Theme.of(context).primaryTextTheme.headline6!.color!, color: Theme.of(context).primaryTextTheme.titleLarge!.color!,
fontSize: 18, fontSize: 18,
fontWeight: FontWeight.bold fontWeight: FontWeight.bold
), ),
@ -246,7 +248,7 @@ class PreOrderPage extends BasePage {
? S.of(context).buy ? S.of(context).buy
: S.of(context).buy_with + : S.of(context).buy_with +
' ${buyViewModel.selectedProvider!.description.title}', ' ${buyViewModel.selectedProvider!.description.title}',
color: Theme.of(context).accentTextTheme.bodyText1!.color!, color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
textColor: Colors.white, textColor: Colors.white,
isLoading: buyViewModel.isRunning, isLoading: buyViewModel.isRunning,
isDisabled: (buyViewModel.selectedProvider == null) || isDisabled: (buyViewModel.selectedProvider == null) ||

13
lib/src/screens/contact/contact_list_page.dart
View file

@ -29,12 +29,15 @@ class ContactListPage extends BasePage {
height: 32.0, height: 32.0,
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.circle, shape: BoxShape.circle,
color: Theme.of(context).accentTextTheme.caption!.color!), color: Theme.of(context)
.accentTextTheme!
.bodySmall!
.color!),
child: Stack( child: Stack(
alignment: Alignment.center, alignment: Alignment.center,
children: <Widget>[ children: <Widget>[
Icon(Icons.add, Icon(Icons.add,
color: Theme.of(context).primaryTextTheme.headline6!.color!, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
size: 22.0), size: 22.0),
ButtonTheme( ButtonTheme(
minWidth: 32.0, minWidth: 32.0,
@ -64,9 +67,9 @@ class ContactListPage extends BasePage {
return CollapsibleSectionList( return CollapsibleSectionList(
context: context, context: context,
sectionCount: 2, sectionCount: 2,
themeColor: Theme.of(context).primaryTextTheme.headline6!.color!, themeColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
dividerThemeColor: dividerThemeColor:
Theme.of(context).primaryTextTheme.caption!.decorationColor!, Theme.of(context).primaryTextTheme!.bodySmall!.decorationColor!,
sectionTitleBuilder: (_, int sectionIndex) { sectionTitleBuilder: (_, int sectionIndex) {
var title = S.current.contact_list_contacts; var title = S.current.contact_list_contacts;
@ -140,7 +143,7 @@ class ContactListPage extends BasePage {
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
color: Theme.of(context).primaryTextTheme.headline6!.color!), color: Theme.of(context).primaryTextTheme!.titleLarge!.color!),
), ),
) )
) )

13
lib/src/screens/contact/contact_page.dart
View file

@ -47,7 +47,8 @@ class ContactPage extends BasePage {
@override @override
Widget body(BuildContext context) { Widget body(BuildContext context) {
final downArrow = Image.asset('assets/images/arrow_bottom_purple_icon.png', 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) { reaction((_) => contactViewModel.state, (ExecutionState state) {
if (state is FailureState) { if (state is FailureState) {
@ -98,12 +99,14 @@ class ContactPage extends BasePage {
AddressTextFieldOption.paste, AddressTextFieldOption.paste,
AddressTextFieldOption.qrCode, AddressTextFieldOption.qrCode,
], ],
buttonColor: buttonColor: Theme.of(context)
Theme.of(context).accentTextTheme!.headline3!.color!, .accentTextTheme!
.displaySmall!
.color!,
iconColor: PaletteDark.gray, iconColor: PaletteDark.gray,
borderColor: Theme.of(context) borderColor: Theme.of(context)
.primaryTextTheme! .primaryTextTheme!
.headline6! .titleLarge!
.backgroundColor!, .backgroundColor!,
validator: validator:
AddressValidator(type: contactViewModel.currency!), AddressValidator(type: contactViewModel.currency!),
@ -142,7 +145,7 @@ class ContactPage extends BasePage {
text: S.of(context).save, text: S.of(context).save,
color: Theme.of(context) color: Theme.of(context)
.accentTextTheme! .accentTextTheme!
.bodyText1! .bodyLarge!
.color!, .color!,
textColor: Colors.white, textColor: Colors.white,
isDisabled: !contactViewModel.isReady))) isDisabled: !contactViewModel.isReady)))

26
lib/src/screens/dashboard/dashboard_page.dart
View file

@ -77,7 +77,7 @@ class _DashboardPageView extends BasePage {
(BuildContext context, Widget scaffold) => Container( (BuildContext context, Widget scaffold) => Container(
decoration: BoxDecoration( decoration: BoxDecoration(
gradient: LinearGradient(colors: [ gradient: LinearGradient(colors: [
Theme.of(context).accentColor, Theme.of(context).colorScheme.secondary,
Theme.of(context).scaffoldBackgroundColor, Theme.of(context).scaffoldBackgroundColor,
Theme.of(context).primaryColor, Theme.of(context).primaryColor,
], begin: Alignment.topRight, end: Alignment.bottomLeft)), ], begin: Alignment.topRight, end: Alignment.bottomLeft)),
@ -99,7 +99,10 @@ class _DashboardPageView extends BasePage {
@override @override
Widget trailing(BuildContext context) { Widget trailing(BuildContext context) {
final menuButton = Image.asset('assets/images/menu.png', final menuButton = Image.asset('assets/images/menu.png',
color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!); color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor);
return Container( return Container(
alignment: Alignment.centerRight, alignment: Alignment.centerRight,
@ -167,7 +170,7 @@ class _DashboardPageView extends BasePage {
dotColor: Theme.of(context).indicatorColor, dotColor: Theme.of(context).indicatorColor,
activeDotColor: Theme.of(context) activeDotColor: Theme.of(context)
.accentTextTheme! .accentTextTheme!
.headline4! .headlineMedium!
.backgroundColor!), .backgroundColor!),
), ),
); );
@ -186,7 +189,10 @@ class _DashboardPageView extends BasePage {
: Colors.transparent, : Colors.transparent,
width: 1, width: 1,
), ),
color: Theme.of(context).textTheme.headline6!.backgroundColor!, color: Theme.of(context)
.textTheme!
.titleLarge!
.backgroundColor!,
), ),
child: Container( child: Container(
padding: EdgeInsets.only(left: 32, right: 32), padding: EdgeInsets.only(left: 32, right: 32),
@ -207,12 +213,12 @@ class _DashboardPageView extends BasePage {
dashboardViewModel) ?? dashboardViewModel) ??
true true
? Theme.of(context) ? Theme.of(context)
.accentTextTheme .accentTextTheme!
.headline2! .displayMedium!
.backgroundColor! .backgroundColor!
: Theme.of(context) : Theme.of(context)
.accentTextTheme .accentTextTheme!
.headline3! .displaySmall!
.backgroundColor!), .backgroundColor!),
title: action.name(context), title: action.name(context),
onClick: () async => await action.onTap( onClick: () async => await action.onTap(
@ -222,8 +228,8 @@ class _DashboardPageView extends BasePage {
true true
? null ? null
: Theme.of(context) : Theme.of(context)
.accentTextTheme .accentTextTheme!
.headline3! .displaySmall!
.backgroundColor!, .backgroundColor!,
), ),
)) ))

2
lib/src/screens/dashboard/desktop_dashboard_page.dart
View file

@ -37,7 +37,7 @@ class DesktopDashboardPage extends StatelessWidget {
_setEffects(context); _setEffects(context);
return Container( return Container(
color: Theme.of(context).backgroundColor, color: Theme.of(context).colorScheme.background,
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [

17
lib/src/screens/dashboard/desktop_widgets/desktop_action_button.dart
View file

@ -30,7 +30,7 @@ class DesktopActionButton extends StatelessWidget {
width: double.infinity, width: double.infinity,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15.0), borderRadius: BorderRadius.circular(15.0),
color: Theme.of(context).textTheme.headline6!.backgroundColor!, color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!,
), ),
child: Center( child: Center(
child: Row( child: Row(
@ -41,8 +41,14 @@ class DesktopActionButton extends StatelessWidget {
height: 30, height: 30,
width: 30, width: 30,
color: isEnabled color: isEnabled
? Theme.of(context).accentTextTheme.headline2!.backgroundColor! ? Theme.of(context)
: Theme.of(context).accentTextTheme.headline3!.backgroundColor!, .accentTextTheme!
.displayMedium!
.backgroundColor!
: Theme.of(context)
.accentTextTheme!
.displaySmall!
.backgroundColor!,
), ),
const SizedBox(width: 10), const SizedBox(width: 10),
AutoSizeText( AutoSizeText(
@ -52,7 +58,10 @@ class DesktopActionButton extends StatelessWidget {
fontFamily: 'Lato', fontFamily: 'Lato',
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: isEnabled color: isEnabled
? Theme.of(context).accentTextTheme.headline2!.backgroundColor! ? Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!
: null, : null,
height: 1, height: 1,
), ),

2
lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart
View file

@ -16,7 +16,7 @@ class SideMenuItem extends StatelessWidget {
Color _setColor(BuildContext context) { Color _setColor(BuildContext context) {
if (isSelected) { if (isSelected) {
return Theme.of(context).primaryTextTheme.headline6!.color!; return Theme.of(context).primaryTextTheme!.titleLarge!.color!;
} else { } else {
return Theme.of(context).highlightColor; return Theme.of(context).highlightColor;
} }

2
lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart
View file

@ -126,7 +126,7 @@ class DesktopSidebarWrapper extends BasePage {
children: [ children: [
child, child,
Container( Container(
color: Theme.of(context).backgroundColor, color: Theme.of(context).colorScheme.background,
padding: EdgeInsets.all(20), padding: EdgeInsets.all(20),
child: Navigator( child: Navigator(
initialRoute: Routes.support, initialRoute: Routes.support,

8
lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart
View file

@ -36,14 +36,14 @@ class _DesktopWalletSelectionDropDownState extends State<DesktopWalletSelectionD
'assets/images/new_wallet.png', 'assets/images/new_wallet.png',
height: 12, height: 12,
width: 12, width: 12,
color: Theme.of(context).primaryTextTheme.headline6!.color!, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
); );
Image _restoreWalletImage(BuildContext context) => Image.asset( Image _restoreWalletImage(BuildContext context) => Image.asset(
'assets/images/restore_wallet.png', 'assets/images/restore_wallet.png',
height: 12, height: 12,
width: 12, width: 12,
color: Theme.of(context).primaryTextTheme.headline6!.color!, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
); );
Flushbar<void>? _progressBar; Flushbar<void>? _progressBar;
@ -93,8 +93,8 @@ class _DesktopWalletSelectionDropDownState extends State<DesktopWalletSelectionD
onChanged: (item) { onChanged: (item) {
item?.onSelected(); item?.onSelected();
}, },
dropdownColor: themeData.textTheme.bodyText1?.decorationColor, dropdownColor: themeData.textTheme!.bodyLarge?.decorationColor,
style: TextStyle(color: themeData.primaryTextTheme.headline6?.color), style: TextStyle(color: themeData.primaryTextTheme!.titleLarge?.color),
selectedItemBuilder: (context) => dropDownItems.map((item) => item.child).toList(), selectedItemBuilder: (context) => dropDownItems.map((item) => item.child).toList(),
value: dropDownItems.firstWhere((element) => element.isSelected), value: dropDownItems.firstWhere((element) => element.isSelected),
underline: const SizedBox(), underline: const SizedBox(),

2
lib/src/screens/dashboard/desktop_widgets/dropdown_item_widget.dart
View file

@ -23,7 +23,7 @@ class DropDownItemWidget extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontSize: 22, fontSize: 22,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context).primaryTextTheme.headline6!.color!, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
), ),
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
maxLines: 1, maxLines: 1,

6
lib/src/screens/dashboard/widgets/action_button.dart
View file

@ -45,7 +45,11 @@ class ActionButton extends StatelessWidget {
title, title,
style: TextStyle( style: TextStyle(
fontSize: 10, fontSize: 10,
color: textColor ?? Theme.of(context).accentTextTheme!.headline2!.backgroundColor!), color: textColor ??
Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!),
) )
], ],
), ),

43
lib/src/screens/dashboard/widgets/address_page.dart
View file

@ -63,7 +63,10 @@ class AddressPage extends BasePage {
Widget? leading(BuildContext context) { Widget? leading(BuildContext context) {
final _backButton = Icon( final _backButton = Icon(
Icons.arrow_back_ios, Icons.arrow_back_ios,
color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!,
size: 16, size: 16,
); );
final _closeButton = currentTheme.type == ThemeType.dark final _closeButton = currentTheme.type == ThemeType.dark
@ -106,7 +109,7 @@ class AddressPage extends BasePage {
(BuildContext context, Widget scaffold) => Container( (BuildContext context, Widget scaffold) => Container(
decoration: BoxDecoration( decoration: BoxDecoration(
gradient: LinearGradient(colors: [ gradient: LinearGradient(colors: [
Theme.of(context).accentColor, Theme.of(context).colorScheme.secondary,
Theme.of(context).scaffoldBackgroundColor, Theme.of(context).scaffoldBackgroundColor,
Theme.of(context).primaryColor, Theme.of(context).primaryColor,
], begin: Alignment.topRight, end: Alignment.bottomLeft)), ], begin: Alignment.topRight, end: Alignment.bottomLeft)),
@ -131,7 +134,10 @@ class AddressPage extends BasePage {
icon: Icon( icon: Icon(
Icons.share, Icons.share,
size: 20, 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, tapOutsideToDismiss: true,
config: KeyboardActionsConfig( config: KeyboardActionsConfig(
keyboardActionsPlatform: KeyboardActionsPlatform.IOS, keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!, keyboardBarColor: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.backgroundColor!,
nextFocus: false, nextFocus: false,
actions: [ actions: [
KeyboardActionsItem( KeyboardActionsItem(
@ -204,8 +213,15 @@ class AddressPage extends BasePage {
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(25)), borderRadius: BorderRadius.all(Radius.circular(25)),
border: Border.all( border: Border.all(
color: Theme.of(context).textTheme.subtitle1!.color!, width: 1), color: Theme.of(context)
color: Theme.of(context).buttonColor), .textTheme!
.titleMedium!
.color!,
width: 1),
color: Theme.of(context)
.textTheme!
.titleLarge!
.backgroundColor!),
child: Row( child: Row(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -219,15 +235,17 @@ class AddressPage extends BasePage {
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context) color: Theme.of(context)
.accentTextTheme .accentTextTheme!
.headline2! .displayMedium!
.backgroundColor!), .backgroundColor!),
)), )),
Icon( Icon(
Icons.arrow_forward_ios, Icons.arrow_forward_ios,
size: 14, size: 14,
color: color: Theme.of(context)
Theme.of(context).accentTextTheme.headline2!.backgroundColor!, .accentTextTheme!
.displayMedium!
.backgroundColor!,
) )
], ],
), ),
@ -237,7 +255,10 @@ class AddressPage extends BasePage {
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
fontSize: 15, fontSize: 15,
color: Theme.of(context).accentTextTheme.headline3!.backgroundColor!)); color: Theme.of(context)
.accentTextTheme!
.displaySmall!
.backgroundColor!));
}) })
], ],
), ),

6
lib/src/screens/dashboard/widgets/anonpay_transaction_row.dart
View file

@ -37,19 +37,19 @@ class AnonpayTransactionRow extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!)), color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!)),
Text(amount + ' ' + currency, Text(amount + ' ' + currency,
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!)) color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!))
]), ]),
SizedBox(height: 5), SizedBox(height: 5),
Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: <Widget>[ Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: <Widget>[
Text(createdAt, Text(createdAt,
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
color: Theme.of(context).textTheme.overline!.backgroundColor!)) color: Theme.of(context).textTheme!.labelSmall!.backgroundColor!))
]) ])
], ],
)) ))

57
lib/src/screens/dashboard/widgets/balance_page.dart
View file

@ -35,7 +35,10 @@ class BalancePage extends StatelessWidget {
fontSize: 24, fontSize: 24,
fontFamily: 'Lato', fontFamily: 'Lato',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!,
height: 1), height: 1),
maxLines: 1, maxLines: 1,
textAlign: TextAlign.center); textAlign: TextAlign.center);
@ -98,7 +101,7 @@ class BalancePage extends StatelessWidget {
: Colors.transparent, : Colors.transparent,
width: 1, width: 1,
), ),
color: Theme.of(context).textTheme!.headline6!.backgroundColor!), color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!),
child: Container( child: Container(
margin: const EdgeInsets.only(top: 16, left: 24, right: 24, bottom: 24), margin: const EdgeInsets.only(top: 16, left: 24, right: 24, bottom: 24),
child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
@ -111,7 +114,10 @@ class BalancePage extends StatelessWidget {
fontSize: 12, fontSize: 12,
fontFamily: 'Lato', fontFamily: 'Lato',
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!, color: Theme.of(context)
.accentTextTheme!
.displaySmall!
.backgroundColor!,
height: 1)), height: 1)),
SizedBox(height: 5), SizedBox(height: 5),
Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
@ -120,7 +126,10 @@ class BalancePage extends StatelessWidget {
fontSize: 24, fontSize: 24,
fontFamily: 'Lato', fontFamily: 'Lato',
fontWeight: FontWeight.w900, fontWeight: FontWeight.w900,
color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!,
height: 1), height: 1),
maxLines: 1, maxLines: 1,
textAlign: TextAlign.center), textAlign: TextAlign.center),
@ -129,7 +138,10 @@ class BalancePage extends StatelessWidget {
fontSize: 28, fontSize: 28,
fontFamily: 'Lato', fontFamily: 'Lato',
fontWeight: FontWeight.w800, fontWeight: FontWeight.w800,
color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!,
height: 1)), height: 1)),
]), ]),
SizedBox( SizedBox(
@ -141,7 +153,10 @@ class BalancePage extends StatelessWidget {
fontSize: 16, fontSize: 16,
fontFamily: 'Lato', fontFamily: 'Lato',
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!,
height: 1)), height: 1)),
SizedBox(height: 26), SizedBox(height: 26),
if (frozenBalance.isNotEmpty) if (frozenBalance.isNotEmpty)
@ -152,7 +167,10 @@ class BalancePage extends StatelessWidget {
fontSize: 12, fontSize: 12,
fontFamily: 'Lato', fontFamily: 'Lato',
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!, color: Theme.of(context)
.accentTextTheme!
.displaySmall!
.backgroundColor!,
height: 1)), height: 1)),
SizedBox(height: 8), SizedBox(height: 8),
AutoSizeText(frozenBalance, AutoSizeText(frozenBalance,
@ -160,7 +178,10 @@ class BalancePage extends StatelessWidget {
fontSize: 20, fontSize: 20,
fontFamily: 'Lato', fontFamily: 'Lato',
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!,
height: 1), height: 1),
maxLines: 1, maxLines: 1,
textAlign: TextAlign.center), textAlign: TextAlign.center),
@ -172,7 +193,10 @@ class BalancePage extends StatelessWidget {
fontSize: 12, fontSize: 12,
fontFamily: 'Lato', fontFamily: 'Lato',
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!,
height: 1), height: 1),
), ),
SizedBox(height: 24) SizedBox(height: 24)
@ -183,7 +207,10 @@ class BalancePage extends StatelessWidget {
fontSize: 12, fontSize: 12,
fontFamily: 'Lato', fontFamily: 'Lato',
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!, color: Theme.of(context)
.accentTextTheme!
.displaySmall!
.backgroundColor!,
height: 1)), height: 1)),
SizedBox(height: 8), SizedBox(height: 8),
AutoSizeText(additionalBalance, AutoSizeText(additionalBalance,
@ -191,7 +218,10 @@ class BalancePage extends StatelessWidget {
fontSize: 20, fontSize: 20,
fontFamily: 'Lato', fontFamily: 'Lato',
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!,
height: 1), height: 1),
maxLines: 1, maxLines: 1,
textAlign: TextAlign.center), textAlign: TextAlign.center),
@ -205,7 +235,10 @@ class BalancePage extends StatelessWidget {
fontSize: 12, fontSize: 12,
fontFamily: 'Lato', fontFamily: 'Lato',
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!,
height: 1), height: 1),
) )
])), ])),

5
lib/src/screens/dashboard/widgets/date_section_raw.dart
View file

@ -36,6 +36,9 @@ class DateSectionRaw extends StatelessWidget {
child: Text(title, child: Text(title,
style: TextStyle( style: TextStyle(
fontSize: 12, fontSize: 12,
color: Theme.of(context).textTheme!.overline!.backgroundColor!))); color: Theme.of(context)
.textTheme!
.labelSmall!
.backgroundColor!)));
} }
} }

8
lib/src/screens/dashboard/widgets/filter_widget.dart
View file

@ -23,7 +23,7 @@ class FilterWidget extends StatelessWidget {
child: ClipRRect( child: ClipRRect(
borderRadius: BorderRadius.all(Radius.circular(24)), borderRadius: BorderRadius.all(Radius.circular(24)),
child: Container( child: Container(
color: Theme.of(context).textTheme!.bodyText1!.decorationColor!, color: Theme.of(context).textTheme!.bodyLarge!.decorationColor!,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -33,8 +33,8 @@ class FilterWidget extends StatelessWidget {
S.of(context).filter_by, S.of(context).filter_by,
style: TextStyle( style: TextStyle(
color: Theme.of(context) color: Theme.of(context)
.primaryTextTheme .primaryTextTheme!
.overline! .labelSmall!
.color!, .color!,
fontSize: 16, fontSize: 16,
fontFamily: 'Lato', fontFamily: 'Lato',
@ -65,7 +65,7 @@ class FilterWidget extends StatelessWidget {
style: TextStyle( style: TextStyle(
color: Theme.of(context) color: Theme.of(context)
.primaryTextTheme! .primaryTextTheme!
.headline6! .titleLarge!
.color!, .color!,
fontSize: 16, fontSize: 16,
fontFamily: 'Lato', fontFamily: 'Lato',

15
lib/src/screens/dashboard/widgets/header_row.dart
View file

@ -12,7 +12,7 @@ class HeaderRow extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final filterIcon = Image.asset('assets/images/filter_icon.png', 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( return Container(
height: 52, height: 52,
@ -25,10 +25,12 @@ class HeaderRow extends StatelessWidget {
Text( Text(
S.of(context).transactions, S.of(context).transactions,
style: TextStyle( style: TextStyle(
fontSize: 20, fontSize: 20,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor! color: Theme.of(context)
), .accentTextTheme!
.displayMedium!
.backgroundColor!),
), ),
GestureDetector( GestureDetector(
onTap: () { onTap: () {
@ -43,8 +45,7 @@ class HeaderRow extends StatelessWidget {
width: 36, width: 36,
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.circle, shape: BoxShape.circle,
color: Theme.of(context).textTheme!.overline!.color! color: Theme.of(context).textTheme!.labelSmall!.color!),
),
child: filterIcon, child: filterIcon,
), ),
) )

7
lib/src/screens/dashboard/widgets/market_place_page.dart
View file

@ -22,7 +22,7 @@ class MarketPlacePage extends StatelessWidget {
child: RawScrollbar( child: RawScrollbar(
thumbColor: Colors.white.withOpacity(0.15), thumbColor: Colors.white.withOpacity(0.15),
radius: Radius.circular(20), radius: Radius.circular(20),
isAlwaysShown: true, thumbVisibility: true,
thickness: 2, thickness: 2,
controller: _scrollController, controller: _scrollController,
child: Padding( child: Padding(
@ -36,7 +36,10 @@ class MarketPlacePage extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontSize: 24, fontSize: 24,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!,
), ),
), ),
Expanded( Expanded(

35
lib/src/screens/dashboard/widgets/menu_widget.dart
View file

@ -18,7 +18,7 @@ class MenuWidget extends StatefulWidget {
} }
class MenuWidgetState extends State<MenuWidget> { class MenuWidgetState extends State<MenuWidget> {
MenuWidgetState() MenuWidgetState()
: this.menuWidth = 0, : this.menuWidth = 0,
this.screenWidth = 0, this.screenWidth = 0,
this.screenHeight = 0, this.screenHeight = 0,
@ -86,9 +86,15 @@ class MenuWidgetState extends State<MenuWidget> {
final itemCount = SettingActions.all.length; final itemCount = SettingActions.all.length;
moneroIcon = Image.asset('assets/images/monero_menu.png', 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', bitcoinIcon = Image.asset('assets/images/bitcoin_menu.png',
color: Theme.of(context).accentTextTheme.overline!.decorationColor!); color: Theme.of(context)
.accentTextTheme
.labelSmall!
.decorationColor!);
return Row( return Row(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
@ -108,7 +114,8 @@ class MenuWidgetState extends State<MenuWidget> {
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
topLeft: Radius.circular(24), bottomLeft: Radius.circular(24)), topLeft: Radius.circular(24), bottomLeft: Radius.circular(24)),
child: Container( child: Container(
color: Theme.of(context).textTheme.bodyText1!.decorationColor!, color:
Theme.of(context).textTheme!.bodyLarge!.decorationColor!,
child: ListView.separated( child: ListView.separated(
padding: EdgeInsets.only(top: 0), padding: EdgeInsets.only(top: 0),
itemBuilder: (_, index) { itemBuilder: (_, index) {
@ -117,9 +124,14 @@ class MenuWidgetState extends State<MenuWidget> {
height: headerHeight, height: headerHeight,
decoration: BoxDecoration( decoration: BoxDecoration(
gradient: LinearGradient(colors: [ gradient: LinearGradient(colors: [
Theme.of(context).accentTextTheme.headline4!.color!, Theme.of(context)
Theme.of(context).accentTextTheme.headline4!.decorationColor!, .accentTextTheme!
], begin: Alignment.topLeft, end: Alignment.bottomRight), .headlineMedium!
.color!,
Theme.of(context)
.accentTextTheme!
.headlineMedium!
.decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight),
), ),
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 24, top: fromTopEdge, right: 24, bottom: fromBottomEdge), left: 24, top: fromTopEdge, right: 24, bottom: fromBottomEdge),
@ -149,8 +161,8 @@ class MenuWidgetState extends State<MenuWidget> {
widget.dashboardViewModel.subname, widget.dashboardViewModel.subname,
style: TextStyle( style: TextStyle(
color: Theme.of(context) color: Theme.of(context)
.accentTextTheme .accentTextTheme!
.overline! .labelSmall!
.decorationColor!, .decorationColor!,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontSize: 12), fontSize: 12),
@ -182,7 +194,10 @@ class MenuWidgetState extends State<MenuWidget> {
}, },
separatorBuilder: (_, index) => Container( separatorBuilder: (_, index) => Container(
height: 1, height: 1,
color: Theme.of(context).primaryTextTheme.caption!.decorationColor!, color: Theme.of(context)
.primaryTextTheme!
.bodySmall!
.decorationColor!,
), ),
itemCount: itemCount + 1), itemCount: itemCount + 1),
))) )))

12
lib/src/screens/dashboard/widgets/order_row.dart
View file

@ -20,7 +20,7 @@ class OrderRow extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final iconColor = final iconColor =
Theme.of(context).primaryTextTheme!.headline1!.backgroundColor!; Theme.of(context).primaryTextTheme!.displayLarge!.backgroundColor!;
final providerIcon = getBuyProviderIcon(provider, iconColor: iconColor); final providerIcon = getBuyProviderIcon(provider, iconColor: iconColor);
@ -48,14 +48,14 @@ class OrderRow extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor! color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!
)), )),
formattedAmount != null formattedAmount != null
? Text(formattedAmount! + ' ' + to, ? Text(formattedAmount! + ' ' + to,
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor! color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!
)) ))
: Container() : Container()
]), ]),
@ -66,8 +66,10 @@ class OrderRow extends StatelessWidget {
Text(createdAtFormattedDate, Text(createdAtFormattedDate,
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
color: Theme.of(context).textTheme! color: Theme.of(context)
.overline!.backgroundColor!)) .textTheme!
.labelSmall!
.backgroundColor!))
]) ])
], ],
) )

12
lib/src/screens/dashboard/widgets/present_receive_option_picker.dart
View file

@ -18,7 +18,10 @@ class PresentReceiveOptionPicker extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final textIconTheme = hasWhiteBackground final textIconTheme = hasWhiteBackground
? Theme.of(context).accentTextTheme.headline2!.backgroundColor! ? Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!
: Colors.white; : Colors.white;
final arrowBottom = Image.asset( final arrowBottom = Image.asset(
'assets/images/arrow_bottom_purple_icon.png', 'assets/images/arrow_bottom_purple_icon.png',
@ -83,7 +86,7 @@ class PresentReceiveOptionPicker extends StatelessWidget {
margin: EdgeInsets.symmetric(horizontal: 24), margin: EdgeInsets.symmetric(horizontal: 24),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(30), borderRadius: BorderRadius.circular(30),
color: Theme.of(context).backgroundColor, color: Theme.of(context).colorScheme.background,
), ),
child: Padding( child: Padding(
padding: const EdgeInsets.only(top: 24, bottom: 24), padding: const EdgeInsets.only(top: 24, bottom: 24),
@ -110,7 +113,10 @@ class PresentReceiveOptionPicker extends StatelessWidget {
Text(option.toString(), Text(option.toString(),
textAlign: TextAlign.left, textAlign: TextAlign.left,
style: textSmall( style: textSmall(
color: Theme.of(context).primaryTextTheme.headline6!.color!, color: Theme.of(context)
.primaryTextTheme!
.titleLarge!
.color!,
).copyWith( ).copyWith(
fontWeight: fontWeight:
value == option ? FontWeight.w800 : FontWeight.w500, value == option ? FontWeight.w800 : FontWeight.w500,

6
lib/src/screens/dashboard/widgets/sync_indicator.dart
View file

@ -32,7 +32,7 @@ class SyncIndicator extends StatelessWidget {
child: Container( child: Container(
height: 30, height: 30,
width: syncIndicatorWidth, width: syncIndicatorWidth,
color: Theme.of(context).textTheme!.headline6!.decorationColor!, color: Theme.of(context).textTheme!.titleLarge!.decorationColor!,
child: Stack( child: Stack(
alignment: Alignment.center, alignment: Alignment.center,
children: <Widget>[ children: <Widget>[
@ -44,7 +44,7 @@ class SyncIndicator extends StatelessWidget {
child: Container( child: Container(
width: indicatorWidth, width: indicatorWidth,
height: 30, height: 30,
color: Theme.of(context).textTheme!.headline6!.backgroundColor!, color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!,
) )
) )
: Offstage(), : Offstage(),
@ -66,7 +66,7 @@ class SyncIndicator extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context).textTheme!.headline6!.color! color: Theme.of(context).textTheme!.titleLarge!.color!
), ),
), ),
) )

5
lib/src/screens/dashboard/widgets/sync_indicator_icon.dart
View file

@ -26,14 +26,15 @@ class SyncIndicatorIcon extends StatelessWidget {
if (boolMode) { if (boolMode) {
indicatorColor = isSynced indicatorColor = isSynced
? PaletteDark.brightGreen ? PaletteDark.brightGreen
: Theme.of(context).textTheme!.caption!.color!; : Theme.of(context).textTheme!.bodySmall!.color!;
} else { } else {
switch (value.toLowerCase()) { switch (value.toLowerCase()) {
case waiting: case waiting:
indicatorColor = Colors.red; indicatorColor = Colors.red;
break; break;
case actionRequired: case actionRequired:
indicatorColor = Theme.of(context).textTheme!.headline2!.decorationColor!; indicatorColor =
Theme.of(context).textTheme!.displayMedium!.decorationColor!;
break; break;
case created: case created:
indicatorColor = PaletteDark.brightGreen; indicatorColor = PaletteDark.brightGreen;

6
lib/src/screens/dashboard/widgets/trade_row.dart
View file

@ -43,14 +43,14 @@ class TradeRow extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!)), color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!)),
formattedAmount != null formattedAmount != null
? Text(formattedAmount! + ' ' + amountCrypto, ? Text(formattedAmount! + ' ' + amountCrypto,
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: color:
Theme.of(context).accentTextTheme!.headline2!.backgroundColor!)) Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!))
: Container() : Container()
]), ]),
SizedBox(height: 5), SizedBox(height: 5),
@ -59,7 +59,7 @@ class TradeRow extends StatelessWidget {
Text(createdAtFormattedDate!, Text(createdAtFormattedDate!,
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
color: Theme.of(context).textTheme!.overline!.backgroundColor!)) color: Theme.of(context).textTheme!.labelSmall!.backgroundColor!))
]) ])
], ],
)) ))

10
lib/src/screens/dashboard/widgets/transaction_raw.dart
View file

@ -35,7 +35,7 @@ class TransactionRow extends StatelessWidget {
width: 36, width: 36,
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.circle, shape: BoxShape.circle,
color: Theme.of(context).textTheme!.overline!.decorationColor! color: Theme.of(context).textTheme!.labelSmall!.decorationColor!
), ),
child: Image.asset( child: Image.asset(
direction == TransactionDirection.incoming direction == TransactionDirection.incoming
@ -55,13 +55,13 @@ class TransactionRow extends StatelessWidget {
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context).accentTextTheme! color: Theme.of(context).accentTextTheme!
.headline2!.backgroundColor!)), .displayMedium!.backgroundColor!)),
Text(formattedAmount, Text(formattedAmount,
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context).accentTextTheme! color: Theme.of(context).accentTextTheme!
.headline2!.backgroundColor!)) .displayMedium!.backgroundColor!))
]), ]),
SizedBox(height: 5), SizedBox(height: 5),
Row( Row(
@ -72,14 +72,14 @@ class TransactionRow extends StatelessWidget {
fontSize: 14, fontSize: 14,
color: Theme.of(context) color: Theme.of(context)
.textTheme! .textTheme!
.overline! .labelSmall!
.backgroundColor!)), .backgroundColor!)),
Text(formattedFiatAmount, Text(formattedFiatAmount,
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
color: Theme.of(context) color: Theme.of(context)
.textTheme! .textTheme!
.overline! .labelSmall!
.backgroundColor!)) .backgroundColor!))
]) ])
], ],

4
lib/src/screens/dashboard/widgets/transactions_page.dart
View file

@ -28,7 +28,7 @@ class TransactionsPage extends StatelessWidget {
return Container( return Container(
color: ResponsiveLayoutUtil.instance.isMobile(context) color: ResponsiveLayoutUtil.instance.isMobile(context)
? null ? null
: Theme.of(context).backgroundColor, : Theme.of(context).colorScheme.background,
padding: EdgeInsets.only(top: 24, bottom: 24), padding: EdgeInsets.only(top: 24, bottom: 24),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
@ -121,7 +121,7 @@ class TransactionsPage extends StatelessWidget {
S.of(context).placeholder_transactions, S.of(context).placeholder_transactions,
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
color: Theme.of(context).primaryTextTheme.overline!.decorationColor!), color: Theme.of(context).primaryTextTheme!.labelSmall!.decorationColor!),
), ),
); );
})) }))

22
lib/src/screens/disclaimer/disclaimer_page.dart
View file

@ -67,7 +67,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
return WillPopScope( return WillPopScope(
onWillPop: () async => false, onWillPop: () async => false,
child: Container( child: Container(
color: Theme.of(context).backgroundColor, color: Theme.of(context).colorScheme.background,
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
SizedBox(height: 10.0), SizedBox(height: 10.0),
@ -89,7 +89,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Theme.of(context) color: Theme.of(context)
.primaryTextTheme! .primaryTextTheme!
.headline6! .titleLarge!
.color!), .color!),
), ),
) )
@ -109,7 +109,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Theme.of(context) color: Theme.of(context)
.primaryTextTheme! .primaryTextTheme!
.headline6! .titleLarge!
.color!), .color!),
), ),
) )
@ -128,7 +128,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
color: Theme.of(context) color: Theme.of(context)
.primaryTextTheme! .primaryTextTheme!
.headline6! .titleLarge!
.color!), .color!),
)) ))
], ],
@ -148,7 +148,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Theme.of(context) color: Theme.of(context)
.primaryTextTheme! .primaryTextTheme!
.headline6! .titleLarge!
.color!), .color!),
), ),
) )
@ -195,7 +195,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
Theme.of(context) Theme.of(context)
.backgroundColor .backgroundColor
.withOpacity(0.0), .withOpacity(0.0),
Theme.of(context).backgroundColor, Theme.of(context).colorScheme.background,
], ],
begin: FractionalOffset.topCenter, begin: FractionalOffset.topCenter,
end: FractionalOffset.bottomCenter, end: FractionalOffset.bottomCenter,
@ -234,12 +234,12 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
border: Border.all( border: Border.all(
color: Theme.of(context) color: Theme.of(context)
.primaryTextTheme! .primaryTextTheme!
.caption! .bodySmall!
.color!, .color!,
width: 1.0), width: 1.0),
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
Radius.circular(8.0)), Radius.circular(8.0)),
color: Theme.of(context).backgroundColor), color: Theme.of(context).colorScheme.background),
child: _checked child: _checked
? Icon( ? Icon(
Icons.check, Icons.check,
@ -255,7 +255,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
fontSize: 14.0, fontSize: 14.0,
color: Theme.of(context) color: Theme.of(context)
.primaryTextTheme! .primaryTextTheme!
.headline6! .titleLarge!
.color!), .color!),
) )
], ],
@ -275,11 +275,11 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
text: 'Accept', text: 'Accept',
color: Theme.of(context) color: Theme.of(context)
.accentTextTheme! .accentTextTheme!
.subtitle2! .titleSmall!
.decorationColor!, .decorationColor!,
textColor: Theme.of(context) textColor: Theme.of(context)
.accentTextTheme! .accentTextTheme!
.headline5! .headlineSmall!
.decorationColor!), .decorationColor!),
), ),
], ],

12
lib/src/screens/exchange/exchange_page.dart
View file

@ -151,7 +151,7 @@ class ExchangePage extends BasePage {
config: KeyboardActionsConfig( config: KeyboardActionsConfig(
keyboardActionsPlatform: KeyboardActionsPlatform.IOS, keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
keyboardBarColor: keyboardBarColor:
Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!, Theme.of(context).accentTextTheme!.bodyLarge!.backgroundColor!,
nextFocus: false, nextFocus: false,
actions: [ actions: [
KeyboardActionsItem( KeyboardActionsItem(
@ -162,7 +162,7 @@ class ExchangePage extends BasePage {
toolbarButtons: [(_) => KeyboardDoneButton()]) toolbarButtons: [(_) => KeyboardDoneButton()])
]), ]),
child: Container( child: Container(
color: Theme.of(context).backgroundColor, color: Theme.of(context).colorScheme.background,
child: Form( child: Form(
key: _formKey, key: _formKey,
child: ScrollableWithBottomSection( child: ScrollableWithBottomSection(
@ -209,7 +209,7 @@ class ExchangePage extends BasePage {
style: TextStyle( style: TextStyle(
color: Theme.of(context) color: Theme.of(context)
.primaryTextTheme! .primaryTextTheme!
.headline1! .displayLarge!
.decorationColor!, .decorationColor!,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontSize: 12), 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, textColor: Colors.white,
isDisabled: exchangeViewModel.selectedProviders.isEmpty, isDisabled: exchangeViewModel.selectedProviders.isEmpty,
isLoading: exchangeViewModel.tradeState is TradeIsCreating)), isLoading: exchangeViewModel.tradeState is TradeIsCreating)),
@ -654,7 +654,7 @@ class ExchangePage extends BasePage {
imageArrow: arrowBottomPurple, imageArrow: arrowBottomPurple,
currencyButtonColor: Colors.transparent, currencyButtonColor: Colors.transparent,
addressButtonsColor: Theme.of(context).focusColor!, addressButtonsColor: Theme.of(context).focusColor!,
borderColor: Theme.of(context).primaryTextTheme!.bodyText1!.color!, borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.color!,
currencyValueValidator: (value) { currencyValueValidator: (value) {
return !exchangeViewModel.isFixedRateMode return !exchangeViewModel.isFixedRateMode
? AmountValidator( ? AmountValidator(
@ -704,7 +704,7 @@ class ExchangePage extends BasePage {
currencyButtonColor: Colors.transparent, currencyButtonColor: Colors.transparent,
addressButtonsColor: Theme.of(context).focusColor!, addressButtonsColor: Theme.of(context).focusColor!,
borderColor: borderColor:
Theme.of(context).primaryTextTheme!.bodyText1!.decorationColor!, Theme.of(context).primaryTextTheme!.bodyLarge!.decorationColor!,
currencyValueValidator: (value) { currencyValueValidator: (value) {
return exchangeViewModel.isFixedRateMode return exchangeViewModel.isFixedRateMode
? AmountValidator( ? AmountValidator(

22
lib/src/screens/exchange/exchange_template_page.dart
View file

@ -73,8 +73,10 @@ class ExchangeTemplatePage extends BasePage {
disableScroll: true, disableScroll: true,
config: KeyboardActionsConfig( config: KeyboardActionsConfig(
keyboardActionsPlatform: KeyboardActionsPlatform.IOS, keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
keyboardBarColor: keyboardBarColor: Theme.of(context)
Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!, .accentTextTheme!
.bodyLarge!
.backgroundColor!,
nextFocus: false, nextFocus: false,
actions: [ actions: [
KeyboardActionsItem( KeyboardActionsItem(
@ -85,7 +87,7 @@ class ExchangeTemplatePage extends BasePage {
toolbarButtons: [(_) => KeyboardDoneButton()]) toolbarButtons: [(_) => KeyboardDoneButton()])
]), ]),
child: Container( child: Container(
color: Theme.of(context).backgroundColor, color: Theme.of(context).colorScheme.background,
child: Form( child: Form(
key: _formKey, key: _formKey,
child: ScrollableWithBottomSection( child: ScrollableWithBottomSection(
@ -99,8 +101,8 @@ class ExchangeTemplatePage extends BasePage {
), ),
gradient: LinearGradient( gradient: LinearGradient(
colors: [ colors: [
Theme.of(context).primaryTextTheme.bodyText2!.color!, Theme.of(context).primaryTextTheme!.bodyMedium!.color!,
Theme.of(context).primaryTextTheme.bodyText2!.decorationColor!, Theme.of(context).primaryTextTheme!.bodyMedium!.decorationColor!,
], ],
stops: [0.35, 1.0], stops: [0.35, 1.0],
begin: Alignment.topLeft, begin: Alignment.topLeft,
@ -119,10 +121,10 @@ class ExchangeTemplatePage extends BasePage {
gradient: LinearGradient( gradient: LinearGradient(
colors: [ colors: [
Theme.of(context) Theme.of(context)
.primaryTextTheme.subtitle2! .primaryTextTheme!.titleSmall!
.color!, .color!,
Theme.of(context) Theme.of(context)
.primaryTextTheme.subtitle2! .primaryTextTheme!.titleSmall!
.decorationColor!, .decorationColor!,
], ],
begin: Alignment.topLeft, begin: Alignment.topLeft,
@ -157,7 +159,7 @@ class ExchangeTemplatePage extends BasePage {
addressButtonsColor: addressButtonsColor:
Theme.of(context).focusColor, Theme.of(context).focusColor,
borderColor: Theme.of(context) borderColor: Theme.of(context)
.primaryTextTheme.bodyText1! .primaryTextTheme!.bodyLarge!
.color!, .color!,
currencyValueValidator: AmountValidator( currencyValueValidator: AmountValidator(
currency: exchangeViewModel.depositCurrency), currency: exchangeViewModel.depositCurrency),
@ -197,7 +199,7 @@ class ExchangeTemplatePage extends BasePage {
addressButtonsColor: addressButtonsColor:
Theme.of(context).focusColor, Theme.of(context).focusColor,
borderColor: Theme.of(context) borderColor: Theme.of(context)
.primaryTextTheme.bodyText1! .primaryTextTheme!.bodyLarge!
.decorationColor!, .decorationColor!,
currencyValueValidator: AmountValidator( currencyValueValidator: AmountValidator(
currency: exchangeViewModel.receiveCurrency), currency: exchangeViewModel.receiveCurrency),
@ -225,7 +227,7 @@ class ExchangeTemplatePage extends BasePage {
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: Theme.of(context) color: Theme.of(context)
.primaryTextTheme.headline1! .primaryTextTheme!.displayLarge!
.decorationColor!, .decorationColor!,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontSize: 12), fontSize: 12),

31
lib/src/screens/exchange/widgets/currency_picker_item_widget.dart
View file

@ -20,7 +20,10 @@ class PickerItemWidget extends StatelessWidget {
return GestureDetector( return GestureDetector(
onTap: onTap, onTap: onTap,
child: Container( child: Container(
color: Theme.of(context).accentTextTheme!.headline6!.color!, color: Theme.of(context)
.accentTextTheme!
.titleLarge!
.color!,
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 24), padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 24),
child: Row( child: Row(
@ -39,7 +42,12 @@ class PickerItemWidget extends StatelessWidget {
Text( Text(
title.toUpperCase(), title.toUpperCase(),
style: TextStyle( 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, fontSize: isSelected ? 16 : 14.0,
fontFamily: 'Lato', fontFamily: 'Lato',
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@ -55,20 +63,33 @@ class PickerItemWidget extends StatelessWidget {
child: Text( child: Text(
tag!, tag!,
style: TextStyle( 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( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(6.0), borderRadius: BorderRadius.circular(6.0),
//border: Border.all(color: ), //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!)
], ],
), ),
), ),

5
lib/src/screens/exchange/widgets/currency_picker_widget.dart
View file

@ -20,7 +20,10 @@ class CurrencyPickerWidget extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
color: Theme.of(context).accentTextTheme!.headline6!.backgroundColor!, color: Theme.of(context)
.accentTextTheme!
.titleLarge!
.backgroundColor!,
child: Scrollbar( child: Scrollbar(
controller: _scrollController, controller: _scrollController,
child: GridView.builder( child: GridView.builder(

46
lib/src/screens/exchange/widgets/exchange_card.dart
View file

@ -160,7 +160,7 @@ class ExchangeCardState extends State<ExchangeCard> {
final copyImage = Image.asset('assets/images/copy_content.png', final copyImage = Image.asset('assets/images/copy_content.png',
height: 16, height: 16,
width: 16, width: 16,
color: Theme.of(context).primaryTextTheme.headline3!.color!); color: Theme.of(context).primaryTextTheme!.displaySmall!.color!);
return Container( return Container(
width: double.infinity, width: double.infinity,
@ -175,7 +175,7 @@ class ExchangeCardState extends State<ExchangeCard> {
style: TextStyle( style: TextStyle(
fontSize: 18, fontSize: 18,
fontWeight: FontWeight.w600, 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<ExchangeCard> {
child: Container( child: Container(
height: 32, height: 32,
decoration: BoxDecoration( decoration: BoxDecoration(
color: widget.addressButtonsColor ?? Theme.of(context).primaryTextTheme.headline4!.color!, color: widget.addressButtonsColor ??
Theme.of(context)
.primaryTextTheme!
.headlineMedium!
.color!,
borderRadius: borderRadius:
BorderRadius.all(Radius.circular(6))), BorderRadius.all(Radius.circular(6))),
child: Center( child: Center(
@ -221,7 +225,8 @@ class ExchangeCardState extends State<ExchangeCard> {
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Theme.of(context) color: Theme.of(context)
.primaryTextTheme.headline4! .primaryTextTheme!
.headlineMedium!
.decorationColor!)), .decorationColor!)),
), ),
), ),
@ -264,7 +269,8 @@ class ExchangeCardState extends State<ExchangeCard> {
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Theme.of(context) color: Theme.of(context)
.accentTextTheme.headline1! .accentTextTheme!
.displayLarge!
.decorationColor!), .decorationColor!),
validator: _isAmountEditable validator: _isAmountEditable
? widget.currencyValueValidator ? widget.currencyValueValidator
@ -277,7 +283,8 @@ class ExchangeCardState extends State<ExchangeCard> {
width: 32, width: 32,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context) color: Theme.of(context)
.primaryTextTheme.headline4! .primaryTextTheme!
.headlineMedium!
.color!, .color!,
borderRadius: borderRadius:
BorderRadius.all(Radius.circular(6))), BorderRadius.all(Radius.circular(6))),
@ -290,7 +297,8 @@ class ExchangeCardState extends State<ExchangeCard> {
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Theme.of(context) color: Theme.of(context)
.primaryTextTheme.headline4! .primaryTextTheme!
.headlineMedium!
.decorationColor!)), .decorationColor!)),
), ),
), ),
@ -300,9 +308,12 @@ class ExchangeCardState extends State<ExchangeCard> {
), ),
], ],
)), )),
Divider(height: 1,color: Theme.of(context) Divider(
.primaryTextTheme.headline5! height: 1,
.decorationColor!), color: Theme.of(context)
.primaryTextTheme!
.headlineSmall!
.decorationColor!),
Padding( Padding(
padding: EdgeInsets.only(top: 5), padding: EdgeInsets.only(top: 5),
child: Container( child: Container(
@ -319,7 +330,8 @@ class ExchangeCardState extends State<ExchangeCard> {
fontSize: 10, fontSize: 10,
height: 1.2, height: 1.2,
color: Theme.of(context) color: Theme.of(context)
.accentTextTheme.headline1! .accentTextTheme!
.displayLarge!
.decorationColor!), .decorationColor!),
) )
: Offstage(), : Offstage(),
@ -333,7 +345,8 @@ class ExchangeCardState extends State<ExchangeCard> {
fontSize: 10, fontSize: 10,
height: 1.2, height: 1.2,
color: Theme.of(context) color: Theme.of(context)
.accentTextTheme.headline1! .accentTextTheme!
.displayLarge!
.decorationColor!)) .decorationColor!))
: Offstage(), : Offstage(),
])), ])),
@ -347,7 +360,8 @@ class ExchangeCardState extends State<ExchangeCard> {
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context) color: Theme.of(context)
.accentTextTheme.headline1! .accentTextTheme!
.displayLarge!
.decorationColor!), .decorationColor!),
)) ))
: Offstage(), : Offstage(),
@ -387,7 +401,8 @@ class ExchangeCardState extends State<ExchangeCard> {
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Theme.of(context) color: Theme.of(context)
.accentTextTheme.headline1! .accentTextTheme!
.displayLarge!
.decorationColor!), .decorationColor!),
buttonColor: widget.addressButtonsColor, buttonColor: widget.addressButtonsColor,
validator: widget.addressTextFieldValidator, validator: widget.addressTextFieldValidator,
@ -458,7 +473,8 @@ class ExchangeCardState extends State<ExchangeCard> {
child: Image.asset( child: Image.asset(
'assets/images/open_book.png', 'assets/images/open_book.png',
color: Theme.of(context) color: Theme.of(context)
.primaryTextTheme.headline4! .primaryTextTheme!
.headlineMedium!
.decorationColor!, .decorationColor!,
)), )),
)), )),

11
lib/src/screens/exchange/widgets/mobile_exchange_cards_section.dart
View file

@ -21,8 +21,8 @@ class MobileExchangeCardsSection extends StatelessWidget {
), ),
gradient: LinearGradient( gradient: LinearGradient(
colors: [ colors: [
Theme.of(context).primaryTextTheme.bodyText2!.color!, Theme.of(context).primaryTextTheme!.bodyMedium!.color!,
Theme.of(context).primaryTextTheme.bodyText2!.decorationColor!, Theme.of(context).primaryTextTheme!.bodyMedium!.decorationColor!,
], ],
stops: [0.35, 1.0], stops: [0.35, 1.0],
begin: Alignment.topLeft, begin: Alignment.topLeft,
@ -37,8 +37,11 @@ class MobileExchangeCardsSection extends StatelessWidget {
bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)), bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)),
gradient: LinearGradient( gradient: LinearGradient(
colors: [ colors: [
Theme.of(context).primaryTextTheme.subtitle2!.color!, Theme.of(context).primaryTextTheme!.titleSmall!.color!,
Theme.of(context).primaryTextTheme.subtitle2!.decorationColor!, Theme.of(context)
.primaryTextTheme!
.titleSmall!
.decorationColor!,
], ],
begin: Alignment.topLeft, begin: Alignment.topLeft,
end: Alignment.bottomRight, end: Alignment.bottomRight,

5
lib/src/screens/exchange/widgets/present_provider_picker.dart
View file

@ -49,7 +49,10 @@ class PresentProviderPicker extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontSize: 10.0, fontSize: 10.0,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context).textTheme.headline5!.color!))) color: Theme.of(context)
.textTheme!
.headlineSmall!
.color!)))
], ],
), ),
SizedBox(width: 5), SizedBox(width: 5),

32
lib/src/screens/exchange_trade/exchange_confirm_page.dart
View file

@ -36,7 +36,10 @@ class ExchangeConfirmPage extends BasePage {
style: TextStyle( style: TextStyle(
fontSize: 18.0, fontSize: 18.0,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context).primaryTextTheme!.headline6!.color!), color: Theme.of(context)
.primaryTextTheme!
.titleLarge!
.color!),
), ),
)), )),
Container( Container(
@ -45,8 +48,14 @@ class ExchangeConfirmPage extends BasePage {
borderRadius: BorderRadius.all(Radius.circular(30)), borderRadius: BorderRadius.all(Radius.circular(30)),
border: Border.all( border: Border.all(
width: 1, width: 1,
color: Theme.of(context).accentTextTheme!.caption!.color!), color: Theme.of(context)
color: Theme.of(context).accentTextTheme!.headline6!.color!), .accentTextTheme!
.bodySmall!
.color!),
color: Theme.of(context)
.accentTextTheme!
.titleLarge!
.color!),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
@ -63,7 +72,7 @@ class ExchangeConfirmPage extends BasePage {
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context) color: Theme.of(context)
.primaryTextTheme! .primaryTextTheme!
.overline! .labelSmall!
.color!), .color!),
), ),
Text( Text(
@ -75,7 +84,7 @@ class ExchangeConfirmPage extends BasePage {
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Theme.of(context) color: Theme.of(context)
.primaryTextTheme! .primaryTextTheme!
.headline6! .titleLarge!
.color!), .color!),
), ),
], ],
@ -93,10 +102,12 @@ class ExchangeConfirmPage extends BasePage {
text: S.of(context).copy_id, text: S.of(context).copy_id,
color: Theme.of(context) color: Theme.of(context)
.accentTextTheme! .accentTextTheme!
.caption! .bodySmall!
.backgroundColor!, .backgroundColor!,
textColor: textColor: Theme.of(context)
Theme.of(context).primaryTextTheme!.headline6!.color!), .primaryTextTheme!
.titleLarge!
.color!),
), ),
) )
], ],
@ -125,7 +136,10 @@ class ExchangeConfirmPage extends BasePage {
onPressed: () => Navigator.of(context) onPressed: () => Navigator.of(context)
.pushReplacementNamed(Routes.exchangeTrade), .pushReplacementNamed(Routes.exchangeTrade),
text: S.of(context).saved_the_trade_id, 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) textColor: Colors.white)
], ],
), ),

26
lib/src/screens/exchange_trade/exchange_trade_page.dart
View file

@ -51,7 +51,7 @@ class ExchangeTradePage extends BasePage {
@override @override
Widget trailing(BuildContext context) { Widget trailing(BuildContext context) {
final questionImage = Image.asset('assets/images/question_mark.png', 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( return SizedBox(
height: 20.0, height: 20.0,
@ -111,7 +111,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
final copyImage = Image.asset('assets/images/copy_content.png', final copyImage = Image.asset('assets/images/copy_content.png',
height: 16, height: 16,
width: 16, width: 16,
color: Theme.of(context).primaryTextTheme!.overline!.color!); color: Theme.of(context).primaryTextTheme!.labelSmall!.color!);
_setEffects(); _setEffects();
@ -135,14 +135,14 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context) color: Theme.of(context)
.primaryTextTheme! .primaryTextTheme!
.overline! .labelSmall!
.color!), .color!),
), ),
if (trade.expiredAt != null) if (trade.expiredAt != null)
TimerWidget(trade.expiredAt!, TimerWidget(trade.expiredAt!,
color: Theme.of(context) color: Theme.of(context)
.primaryTextTheme! .primaryTextTheme!
.headline6! .titleLarge!
.color!) .color!)
]) ])
: Offstage(), : Offstage(),
@ -162,7 +162,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
width: 3, width: 3,
color: Theme.of(context) color: Theme.of(context)
.accentTextTheme! .accentTextTheme!
.subtitle2! .titleSmall!
.color! .color!
) )
), ),
@ -181,7 +181,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
height: 1, height: 1,
color: Theme.of(context) color: Theme.of(context)
.accentTextTheme! .accentTextTheme!
.subtitle2! .titleSmall!
.backgroundColor!, .backgroundColor!,
), ),
itemBuilder: (context, index) { itemBuilder: (context, index) {
@ -228,7 +228,10 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
onPressed: () => onPressed: () =>
widget.exchangeTradeViewModel.confirmSending(), widget.exchangeTradeViewModel.confirmSending(),
text: S.of(context).confirm, text: S.of(context).confirm,
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
textColor: Colors.white) textColor: Colors.white)
: Offstage(); : Offstage();
})), })),
@ -340,7 +343,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Theme.of(popupContext) color: Theme.of(popupContext)
.primaryTextTheme! .primaryTextTheme!
.headline6! .titleLarge!
.color, .color,
decoration: TextDecoration.none, decoration: TextDecoration.none,
), ),
@ -359,7 +362,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
text: S.of(popupContext).send_got_it, text: S.of(popupContext).send_got_it,
color: Theme.of(popupContext) color: Theme.of(popupContext)
.accentTextTheme! .accentTextTheme!
.bodyText1! .bodyLarge!
.color!, .color!,
textColor: Colors.white)) textColor: Colors.white))
], ],
@ -392,7 +395,10 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
style: TextStyle( style: TextStyle(
fontSize: 22, fontSize: 22,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Theme.of(popupContext).primaryTextTheme!.headline6!.color!, color: Theme.of(popupContext)
.primaryTextTheme!
.titleLarge!
.color!,
decoration: TextDecoration.none, decoration: TextDecoration.none,
), ),
), ),

8
lib/src/screens/exchange_trade/information_page.dart
View file

@ -21,7 +21,7 @@ class InformationPage extends StatelessWidget {
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(30)), borderRadius: BorderRadius.all(Radius.circular(30)),
color: Theme.of(context).textTheme!.bodyText1!.decorationColor! color: Theme.of(context).textTheme!.bodyLarge!.decorationColor!
), ),
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@ -35,7 +35,7 @@ class InformationPage extends StatelessWidget {
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
fontFamily: 'Lato', fontFamily: 'Lato',
decoration: TextDecoration.none, 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( child: PrimaryButton(
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pop(),
text: S.of(context).send_got_it, text: S.of(context).send_got_it,
color: Theme.of(context).accentTextTheme!.caption!.backgroundColor!, color: Theme.of(context).accentTextTheme!.bodySmall!.backgroundColor!,
textColor: Theme.of(context).primaryTextTheme!.headline6!.color! textColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!
), ),
) )
], ],

9
lib/src/screens/faq/faq_item.dart
View file

@ -25,13 +25,13 @@ class FAQItemState extends State<FAQItem> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final addIcon = final addIcon = Icon(Icons.add,
Icon(Icons.add, color: Theme.of(context).primaryTextTheme!.headline6!.color!); color: Theme.of(context).primaryTextTheme!.titleLarge!.color!);
final removeIcon = Icon(Icons.remove, color: Palette.blueCraiola); final removeIcon = Icon(Icons.remove, color: Palette.blueCraiola);
final icon = isActive ? removeIcon : addIcon; final icon = isActive ? removeIcon : addIcon;
final color = isActive final color = isActive
? Palette.blueCraiola ? Palette.blueCraiola
: Theme.of(context).primaryTextTheme!.headline6!.color!; : Theme.of(context).primaryTextTheme!.titleLarge!.color!;
return ListTileTheme( return ListTileTheme(
contentPadding: EdgeInsets.fromLTRB(0, 6, 24, 6), contentPadding: EdgeInsets.fromLTRB(0, 6, 24, 6),
@ -53,7 +53,8 @@ class FAQItemState extends State<FAQItem> {
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
color: Theme.of(context).primaryTextTheme!.headline6!.color!), color:
Theme.of(context).primaryTextTheme!.titleLarge!.color!),
), ),
)) ))
]) ])

23
lib/src/screens/ionia/auth/ionia_create_account_page.dart
View file

@ -40,7 +40,10 @@ class IoniaCreateAccountPage extends BasePage {
return Text( return Text(
S.current.sign_up, S.current.sign_up,
style: textMediumSemiBold( 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( builder: (_) => LoadingPrimaryButton(
text: S.of(context).create_account, text: S.of(context).create_account,
onPressed: _createAccount, onPressed: _createAccount,
isLoading: _authViewModel.createUserState is IoniaCreateStateLoading, isLoading:
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, _authViewModel.createUserState is IoniaCreateStateLoading,
color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
textColor: Colors.white, textColor: Colors.white,
), ),
), ),
@ -100,7 +107,10 @@ class IoniaCreateAccountPage extends BasePage {
TextSpan( TextSpan(
text: S.of(context).settings_terms_and_conditions, text: S.of(context).settings_terms_and_conditions,
style: TextStyle( style: TextStyle(
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
recognizer: TapGestureRecognizer() recognizer: TapGestureRecognizer()
@ -112,7 +122,10 @@ class IoniaCreateAccountPage extends BasePage {
TextSpan( TextSpan(
text: S.of(context).privacy_policy, text: S.of(context).privacy_policy,
style: TextStyle( style: TextStyle(
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
), ),
recognizer: TapGestureRecognizer() recognizer: TapGestureRecognizer()

10
lib/src/screens/ionia/auth/ionia_login_page.dart
View file

@ -33,7 +33,10 @@ class IoniaLoginPage extends BasePage {
return Text( return Text(
S.current.login, S.current.login,
style: textMediumSemiBold( 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, text: S.of(context).login,
onPressed: _login, onPressed: _login,
isLoading: _authViewModel.signInState is IoniaCreateStateLoading, isLoading: _authViewModel.signInState is IoniaCreateStateLoading,
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
textColor: Colors.white, textColor: Colors.white,
), ),
), ),

19
lib/src/screens/ionia/auth/ionia_verify_otp_page.dart
View file

@ -41,7 +41,10 @@ class IoniaVerifyIoniaOtp extends BasePage {
return Text( return Text(
S.current.verification, S.current.verification,
style: textMediumSemiBold( 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( return KeyboardActions(
config: KeyboardActionsConfig( config: KeyboardActionsConfig(
keyboardActionsPlatform: KeyboardActionsPlatform.IOS, keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!, keyboardBarColor: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.backgroundColor!,
nextFocus: false, nextFocus: false,
actions: [ actions: [
KeyboardActionsItem( KeyboardActionsItem(
@ -72,7 +78,7 @@ class IoniaVerifyIoniaOtp extends BasePage {
]), ]),
child: Container( child: Container(
height: 0, height: 0,
color: Theme.of(context).backgroundColor, color: Theme.of(context).colorScheme.background,
child: ScrollableWithBottomSection( child: ScrollableWithBottomSection(
contentPadding: EdgeInsets.all(24), contentPadding: EdgeInsets.all(24),
content: Column( content: Column(
@ -93,7 +99,7 @@ class IoniaVerifyIoniaOtp extends BasePage {
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Text(S.of(context).dont_get_code), Text(S.of(context).didnt_get_code),
SizedBox(width: 20), SizedBox(width: 20),
InkWell( InkWell(
onTap: () => isSignIn onTap: () => isSignIn
@ -120,7 +126,10 @@ class IoniaVerifyIoniaOtp extends BasePage {
onPressed: _verify, onPressed: _verify,
isDisabled: _authViewModel.otpState is IoniaOtpSendDisabled, isDisabled: _authViewModel.otpState is IoniaOtpSendDisabled,
isLoading: _authViewModel.otpState is IoniaOtpValidating, isLoading: _authViewModel.otpState is IoniaOtpValidating,
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
textColor: Colors.white, textColor: Colors.white,
), ),
), ),

16
lib/src/screens/ionia/auth/ionia_welcome_page.dart
View file

@ -17,7 +17,10 @@ class IoniaWelcomePage extends BasePage {
return Text( return Text(
S.current.welcome_to_cakepay, S.current.welcome_to_cakepay,
style: textMediumSemiBold( 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, fontSize: 18,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
fontFamily: 'Lato', fontFamily: 'Lato',
color: Theme.of(context).primaryTextTheme!.headline6!.color!, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
), ),
), ),
SizedBox(height: 20), SizedBox(height: 20),
@ -55,7 +58,7 @@ class IoniaWelcomePage extends BasePage {
fontSize: 18, fontSize: 18,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
fontFamily: 'Lato', 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( PrimaryButton(
text: S.of(context).create_account, text: S.of(context).create_account,
onPressed: () => Navigator.of(context).pushNamed(Routes.ioniaCreateAccountPage), onPressed: () => Navigator.of(context).pushNamed(Routes.ioniaCreateAccountPage),
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
textColor: Colors.white, textColor: Colors.white,
), ),
SizedBox( SizedBox(
@ -78,7 +84,7 @@ class IoniaWelcomePage extends BasePage {
fontSize: 15, fontSize: 15,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontFamily: 'Lato', fontFamily: 'Lato',
color: Theme.of(context).primaryTextTheme!.headline6!.color!, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
), ),
), ),
SizedBox(height: 8), SizedBox(height: 8),

49
lib/src/screens/ionia/cards/ionia_account_cards_page.dart
View file

@ -20,7 +20,10 @@ class IoniaAccountCardsPage extends BasePage {
return Text( return Text(
S.of(context).cards, S.of(context).cards,
style: textLargeSemiBold( 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, width: 230,
padding: EdgeInsets.all(5), padding: EdgeInsets.all(5),
decoration: BoxDecoration( 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( borderRadius: BorderRadius.circular(
25.0, 25.0,
), ),
), ),
child: Theme( child: Theme(
data: ThemeData(primaryTextTheme: TextTheme(bodyText1: TextStyle(backgroundColor: Colors.transparent))), data: ThemeData(primaryTextTheme: TextTheme(bodyLarge: TextStyle(backgroundColor: Colors.transparent))),
child: TabBar( child: TabBar(
controller: _tabController, controller: _tabController,
indicator: BoxDecoration( indicator: BoxDecoration(
borderRadius: BorderRadius.circular( borderRadius: BorderRadius.circular(
25.0, 25.0,
), ),
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
), ),
labelColor: Theme.of(context).primaryTextTheme!.headline1!.backgroundColor!, labelColor: Theme.of(context)
unselectedLabelColor: Theme.of(context).primaryTextTheme!.headline6!.color!, .primaryTextTheme!
.displayLarge!
.backgroundColor!,
unselectedLabelColor:
Theme.of(context).primaryTextTheme!.titleLarge!.color!,
tabs: [ tabs: [
Tab( Tab(
text: S.of(context).active, text: S.of(context).active,
@ -154,9 +168,13 @@ class _IoniaCardListView extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
if(isLoading){ if(isLoading){
return Center( return Center(
child: CircularProgressIndicator( child: CircularProgressIndicator(
backgroundColor: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, backgroundColor: Theme.of(context)
valueColor: AlwaysStoppedAnimation<Color>(Theme.of(context).primaryTextTheme!.bodyText2!.color!), .accentTextTheme!
.displayMedium!
.backgroundColor!,
valueColor: AlwaysStoppedAnimation<Color>(
Theme.of(context).primaryTextTheme!.bodyMedium!.color!),
), ),
); );
} }
@ -166,7 +184,7 @@ class _IoniaCardListView extends StatelessWidget {
emptyText, emptyText,
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: textSmall( 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( child: CardItem(
onTap: () => onTap?.call(merchant), onTap: () => onTap?.call(merchant),
title: merchant.legalName, 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, discount: 0,
hideBorder: true, hideBorder: true,
discountBackground: AssetImage('assets/images/red_badge_discount.png'), 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, subtitleColor: Theme.of(context).hintColor,
subTitle: '', subTitle: '',
logoUrl: merchant.logoUrl, logoUrl: merchant.logoUrl,

17
lib/src/screens/ionia/cards/ionia_account_page.dart
View file

@ -19,7 +19,10 @@ class IoniaAccountPage extends BasePage {
return Text( return Text(
S.current.account, S.current.account,
style: textMediumSemiBold( 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( bottomSection: Column(
children: [ children: [
PrimaryButton( PrimaryButton(
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
textColor: Colors.white, textColor: Colors.white,
text: S.of(context).logout, text: S.of(context).logout,
onPressed: () { onPressed: () {
@ -164,11 +170,8 @@ class _GradiantContainer extends StatelessWidget {
borderRadius: BorderRadius.circular(15), borderRadius: BorderRadius.circular(15),
gradient: LinearGradient( gradient: LinearGradient(
colors: [ colors: [
Theme.of(context) Theme.of(context).primaryTextTheme!.titleMedium!.decorationColor!,
.primaryTextTheme! Theme.of(context).primaryTextTheme!.titleMedium!.color!,
.subtitle1!
.decorationColor!,
Theme.of(context).primaryTextTheme!.subtitle1!.color!,
], ],
begin: Alignment.topRight, begin: Alignment.topRight,
end: Alignment.bottomLeft, end: Alignment.bottomLeft,

10
lib/src/screens/ionia/cards/ionia_activate_debit_card_page.dart
View file

@ -23,7 +23,10 @@ class IoniaActivateDebitCardPage extends BasePage {
return Text( return Text(
S.current.debit_card, S.current.debit_card,
style: textMediumSemiBold( 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, isLoading: _cardsListViewModel.createCardState is IoniaCreateCardLoading,
text: S.of(context).agree_and_continue, text: S.of(context).agree_and_continue,
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
textColor: Colors.white, textColor: Colors.white,
), ),
); );

40
lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart
View file

@ -28,7 +28,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
Widget middle(BuildContext context) { Widget middle(BuildContext context) {
return Text( return Text(
ioniaPurchaseViewModel.ioniaMerchant.legalName, 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), borderRadius: BorderRadius.circular(20),
gradient: LinearGradient( gradient: LinearGradient(
colors: [ colors: [
Theme.of(context).primaryTextTheme!.subtitle1!.color!, Theme.of(context).primaryTextTheme!.titleMedium!.color!,
Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!, Theme.of(context).primaryTextTheme!.titleMedium!.decorationColor!,
], ],
begin: Alignment.topLeft, begin: Alignment.topLeft,
end: Alignment.bottomRight, end: Alignment.bottomRight,
@ -163,7 +163,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
Text( Text(
S.of(context).tip, S.of(context).tip,
style: TextStyle( style: TextStyle(
color: Theme.of(context).primaryTextTheme!.headline6!.color!, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 14, fontSize: 14,
), ),
@ -202,7 +202,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
ioniaPurchaseViewModel.invoiceCommittingState is IsExecutingState, ioniaPurchaseViewModel.invoiceCommittingState is IsExecutingState,
onPressed: () => purchaseCard(context), onPressed: () => purchaseCard(context),
text: S.of(context).purchase_gift_card, text: S.of(context).purchase_gift_card,
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
textColor: Colors.white, textColor: Colors.white,
); );
}), }),
@ -212,7 +212,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
onTap: () => _showTermsAndCondition(context), onTap: () => _showTermsAndCondition(context),
child: Text(S.of(context).settings_terms_and_conditions, child: Text(S.of(context).settings_terms_and_conditions,
style: textMediumSemiBold( style: textMediumSemiBold(
color: Theme.of(context).primaryTextTheme!.bodyText2!.color!, color: Theme.of(context).primaryTextTheme.bodyMedium!.color!,
).copyWith(fontSize: 12)), ).copyWith(fontSize: 12)),
), ),
SizedBox(height: 16) SizedBox(height: 16)
@ -232,7 +232,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
child: Text( child: Text(
ioniaPurchaseViewModel.ioniaMerchant.termsAndConditions, ioniaPurchaseViewModel.ioniaMerchant.termsAndConditions,
style: textMedium( 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( child: Text(
instruction.header, instruction.header,
style: textLargeSemiBold( style: textLargeSemiBold(
color: Theme.of(context).textTheme!.headline3!.color!, color: Theme.of(context).textTheme!.displaySmall!.color!,
), ),
)), )),
Text( Text(
instruction.body, instruction.body,
style: textMedium( 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, alertLeftActionButtonTextColor: Colors.white,
alertRightActionButtonTextColor: Colors.white, alertRightActionButtonTextColor: Colors.white,
alertLeftActionButtonColor: Palette.brightOrange, alertLeftActionButtonColor: Palette.brightOrange,
alertRightActionButtonColor: Theme.of(context).textTheme!.subtitle2!.color, alertRightActionButtonColor: Theme.of(context).textTheme!.titleSmall!.color,
actionRightButton: () async { actionRightButton: () async {
Navigator.of(context).pop(); Navigator.of(context).pop();
await ioniaPurchaseViewModel.commitPaymentInvoice(); await ioniaPurchaseViewModel.commitPaymentInvoice();
@ -399,34 +399,34 @@ class TipButton extends StatelessWidget {
Color captionTextColor(BuildContext context) { Color captionTextColor(BuildContext context) {
if (isDark(context)) { if (isDark(context)) {
return Theme.of(context).primaryTextTheme!.headline6!.color!; return Theme.of(context).primaryTextTheme!.titleLarge!.color!;
} }
return isSelected return isSelected
? Theme.of(context).accentTextTheme!.headline6!.color! ? Theme.of(context).accentTextTheme!.titleLarge!.color!
: Theme.of(context).primaryTextTheme!.headline6!.color!; : Theme.of(context).primaryTextTheme!.titleLarge!.color!;
} }
Color subTitleTextColor(BuildContext context) { Color subTitleTextColor(BuildContext context) {
if (isDark(context)) { if (isDark(context)) {
return Theme.of(context).primaryTextTheme!.headline6!.color!; return Theme.of(context).primaryTextTheme!.titleLarge!.color!;
} }
return isSelected return isSelected
? Theme.of(context).accentTextTheme!.headline6!.color! ? Theme.of(context).accentTextTheme!.titleLarge!.color!
: Theme.of(context).primaryTextTheme!.overline!.color!; : Theme.of(context).primaryTextTheme!.labelSmall!.color!;
} }
Color? backgroundColor(BuildContext context) { Color? backgroundColor(BuildContext context) {
if (isDark(context)) { if (isDark(context)) {
return isSelected return isSelected
? null ? null
: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!.withOpacity(0.01); : Theme.of(context).accentTextTheme!.displayLarge!.backgroundColor!.withOpacity(0.01);
} }
return isSelected return isSelected
? null ? null
: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!.withOpacity(0.1); : Theme.of(context).accentTextTheme!.displayLarge!.backgroundColor!.withOpacity(0.1);
} }
@override @override
@ -459,8 +459,8 @@ class TipButton extends StatelessWidget {
gradient: isSelected gradient: isSelected
? LinearGradient( ? LinearGradient(
colors: [ colors: [
Theme.of(context).primaryTextTheme!.subtitle1!.color!, Theme.of(context).primaryTextTheme!.titleMedium!.color!,
Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!, Theme.of(context).primaryTextTheme!.titleMedium!.decorationColor!,
], ],
begin: Alignment.topLeft, begin: Alignment.topLeft,
end: Alignment.bottomRight, end: Alignment.bottomRight,

46
lib/src/screens/ionia/cards/ionia_buy_gift_card.dart
View file

@ -50,7 +50,10 @@ class IoniaBuyGiftCardPage extends BasePage {
disableScroll: true, disableScroll: true,
config: KeyboardActionsConfig( config: KeyboardActionsConfig(
keyboardActionsPlatform: KeyboardActionsPlatform.IOS, keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!, keyboardBarColor: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.backgroundColor!,
nextFocus: false, nextFocus: false,
actions: [ actions: [
KeyboardActionsItem( KeyboardActionsItem(
@ -59,7 +62,7 @@ class IoniaBuyGiftCardPage extends BasePage {
), ),
]), ]),
child: Container( child: Container(
color: Theme.of(context).backgroundColor, color: Theme.of(context).colorScheme.background,
child: ScrollableWithBottomSection( child: ScrollableWithBottomSection(
contentPadding: EdgeInsets.zero, contentPadding: EdgeInsets.zero,
content: Column( content: Column(
@ -72,8 +75,11 @@ class IoniaBuyGiftCardPage extends BasePage {
bottomRight: Radius.circular(24), bottomRight: Radius.circular(24),
), ),
gradient: LinearGradient(colors: [ gradient: LinearGradient(colors: [
Theme.of(context).primaryTextTheme!.subtitle1!.color!, Theme.of(context).primaryTextTheme!.titleMedium!.color!,
Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!, Theme.of(context)
.primaryTextTheme!
.titleMedium!
.decorationColor!,
], begin: Alignment.topLeft, end: Alignment.bottomRight), ], begin: Alignment.topLeft, end: Alignment.bottomRight),
), ),
child: Column( child: Column(
@ -95,7 +101,10 @@ class IoniaBuyGiftCardPage extends BasePage {
], ],
hintText: '1000', hintText: '1000',
placeholderTextStyle: TextStyle( placeholderTextStyle: TextStyle(
color: Theme.of(context).primaryTextTheme.headline5!.color!, color: Theme.of(context)
.primaryTextTheme!
.headlineSmall!
.color!,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 36, fontSize: 36,
), ),
@ -115,7 +124,10 @@ class IoniaBuyGiftCardPage extends BasePage {
), ),
), ),
Divider( Divider(
color: Theme.of(context).primaryTextTheme.headline5!.color!, color: Theme.of(context)
.primaryTextTheme!
.headlineSmall!
.color!,
height: 1, height: 1,
), ),
SizedBox(height: 8), SizedBox(height: 8),
@ -126,13 +138,19 @@ class IoniaBuyGiftCardPage extends BasePage {
Text( Text(
S.of(context).min_amount(merchant.minimumCardPurchase.toStringAsFixed(2)), S.of(context).min_amount(merchant.minimumCardPurchase.toStringAsFixed(2)),
style: TextStyle( style: TextStyle(
color: Theme.of(context).primaryTextTheme!.headline5!.color!, color: Theme.of(context)
.primaryTextTheme!
.headlineSmall!
.color!,
), ),
), ),
Text( Text(
S.of(context).max_amount(merchant.maximumCardPurchase.toStringAsFixed(2)), S.of(context).max_amount(merchant.maximumCardPurchase.toStringAsFixed(2)),
style: TextStyle( 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, title: merchant.legalName,
backgroundColor: Theme.of(context) backgroundColor: Theme.of(context)
.accentTextTheme! .accentTextTheme!
.headline1! .displayLarge!
.backgroundColor! .backgroundColor!
.withOpacity(0.1), .withOpacity(0.1),
discount: merchant.discount, discount: merchant.discount,
titleColor: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, titleColor: Theme.of(context)
.accentTextTheme!
.displayLarge!
.backgroundColor!,
subtitleColor: Theme.of(context).hintColor, subtitleColor: Theme.of(context).hintColor,
subTitle: merchant.avaibilityStatus, subTitle: merchant.avaibilityStatus,
logoUrl: merchant.logoUrl, logoUrl: merchant.logoUrl,
@ -174,7 +195,10 @@ class IoniaBuyGiftCardPage extends BasePage {
), ),
text: S.of(context).continue_text, text: S.of(context).continue_text,
isDisabled: !ioniaBuyCardViewModel.isEnablePurchase, isDisabled: !ioniaBuyCardViewModel.isEnablePurchase,
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
textColor: Colors.white, textColor: Colors.white,
), ),
); );

43
lib/src/screens/ionia/cards/ionia_custom_redeem_page.dart
View file

@ -50,7 +50,10 @@ class IoniaCustomRedeemPage extends BasePage {
disableScroll: true, disableScroll: true,
config: KeyboardActionsConfig( config: KeyboardActionsConfig(
keyboardActionsPlatform: KeyboardActionsPlatform.IOS, keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!, keyboardBarColor: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.backgroundColor!,
nextFocus: false, nextFocus: false,
actions: [ actions: [
KeyboardActionsItem( KeyboardActionsItem(
@ -59,7 +62,7 @@ class IoniaCustomRedeemPage extends BasePage {
), ),
]), ]),
child: Container( child: Container(
color: Theme.of(context).backgroundColor, color: Theme.of(context).colorScheme.background,
child: ScrollableWithBottomSection( child: ScrollableWithBottomSection(
contentPadding: EdgeInsets.zero, contentPadding: EdgeInsets.zero,
content: Column( content: Column(
@ -70,8 +73,11 @@ class IoniaCustomRedeemPage extends BasePage {
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)), bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)),
gradient: LinearGradient(colors: [ gradient: LinearGradient(colors: [
Theme.of(context).primaryTextTheme.subtitle1!.color!, Theme.of(context).primaryTextTheme!.titleMedium!.color!,
Theme.of(context).primaryTextTheme.subtitle1!.decorationColor!, Theme.of(context)
.primaryTextTheme!
.titleMedium!
.decorationColor!,
], begin: Alignment.topLeft, end: Alignment.bottomRight), ], begin: Alignment.topLeft, end: Alignment.bottomRight),
), ),
child: Column( child: Column(
@ -86,11 +92,17 @@ class IoniaCustomRedeemPage extends BasePage {
inputFormatters: [FilteringTextInputFormatter.deny(RegExp('[\-|\ ]'))], inputFormatters: [FilteringTextInputFormatter.deny(RegExp('[\-|\ ]'))],
hintText: '1000', hintText: '1000',
placeholderTextStyle: TextStyle( placeholderTextStyle: TextStyle(
color: Theme.of(context).primaryTextTheme.headline5!.color!, color: Theme.of(context)
.primaryTextTheme!
.headlineSmall!
.color!,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontSize: 36, fontSize: 36,
), ),
borderColor: Theme.of(context).primaryTextTheme.headline5!.color!, borderColor: Theme.of(context)
.primaryTextTheme!
.headlineSmall!
.color!,
textColor: Colors.white, textColor: Colors.white,
textStyle: TextStyle( textStyle: TextStyle(
color: Colors.white, color: Colors.white,
@ -121,7 +133,10 @@ class IoniaCustomRedeemPage extends BasePage {
child: Text( child: Text(
'\$${giftCard.remainingAmount} - \$${ioniaCustomRedeemViewModel.amount} = \$${ioniaCustomRedeemViewModel.formattedRemaining} ${S.of(context).remaining}', '\$${giftCard.remainingAmount} - \$${ioniaCustomRedeemViewModel.amount} = \$${ioniaCustomRedeemViewModel.formattedRemaining} ${S.of(context).remaining}',
style: TextStyle( 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( child: CardItem(
title: giftCard.legalName, title: giftCard.legalName,
backgroundColor: Theme.of(context) backgroundColor: Theme.of(context)
.accentTextTheme .accentTextTheme!
.headline1! .displayLarge!
.backgroundColor! .backgroundColor!
.withOpacity(0.1), .withOpacity(0.1),
discount: giftCard.remainingAmount, discount: giftCard.remainingAmount,
isAmount: true, isAmount: true,
discountBackground: AssetImage('assets/images/red_badge_discount.png'), 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, subtitleColor: Theme.of(context).hintColor,
subTitle: S.of(context).online, subTitle: S.of(context).online,
logoUrl: giftCard.logoUrl, logoUrl: giftCard.logoUrl,
@ -160,7 +178,10 @@ class IoniaCustomRedeemPage extends BasePage {
isLoading: ioniaCustomRedeemViewModel.redeemState is IsExecutingState, isLoading: ioniaCustomRedeemViewModel.redeemState is IsExecutingState,
isDisabled: ioniaCustomRedeemViewModel.disableRedeem, isDisabled: ioniaCustomRedeemViewModel.disableRedeem,
text: S.of(context).add_custom_redemption, text: S.of(context).add_custom_redemption,
color: Theme.of(context).accentTextTheme.bodyText1!.color!, color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
textColor: Colors.white, textColor: Colors.white,
onPressed: () => ioniaCustomRedeemViewModel.addCustomRedeem().then((value) { onPressed: () => ioniaCustomRedeemViewModel.addCustomRedeem().then((value) {
Navigator.of(context).pop(ioniaCustomRedeemViewModel.remaining.toString()); Navigator.of(context).pop(ioniaCustomRedeemViewModel.remaining.toString());

45
lib/src/screens/ionia/cards/ionia_custom_tip_page.dart
View file

@ -51,7 +51,10 @@ class IoniaCustomTipPage extends BasePage {
disableScroll: true, disableScroll: true,
config: KeyboardActionsConfig( config: KeyboardActionsConfig(
keyboardActionsPlatform: KeyboardActionsPlatform.IOS, keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!, keyboardBarColor: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.backgroundColor!,
nextFocus: false, nextFocus: false,
actions: [ actions: [
KeyboardActionsItem( KeyboardActionsItem(
@ -60,7 +63,7 @@ class IoniaCustomTipPage extends BasePage {
), ),
]), ]),
child: Container( child: Container(
color: Theme.of(context).backgroundColor, color: Theme.of(context).colorScheme.background,
child: ScrollableWithBottomSection( child: ScrollableWithBottomSection(
contentPadding: EdgeInsets.zero, contentPadding: EdgeInsets.zero,
content: Column( content: Column(
@ -70,8 +73,11 @@ class IoniaCustomTipPage extends BasePage {
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.only(bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)), borderRadius: BorderRadius.only(bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)),
gradient: LinearGradient(colors: [ gradient: LinearGradient(colors: [
Theme.of(context).primaryTextTheme!.subtitle1!.color!, Theme.of(context).primaryTextTheme!.titleMedium!.color!,
Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!, Theme.of(context)
.primaryTextTheme!
.titleMedium!
.decorationColor!,
], begin: Alignment.topLeft, end: Alignment.bottomRight), ], begin: Alignment.topLeft, end: Alignment.bottomRight),
), ),
child: Column( child: Column(
@ -86,11 +92,17 @@ class IoniaCustomTipPage extends BasePage {
inputFormatters: [FilteringTextInputFormatter.deny(RegExp('[\-|\ ]'))], inputFormatters: [FilteringTextInputFormatter.deny(RegExp('[\-|\ ]'))],
hintText: '1000', hintText: '1000',
placeholderTextStyle: TextStyle( placeholderTextStyle: TextStyle(
color: Theme.of(context).primaryTextTheme!.headline5!.color!, color: Theme.of(context)
.primaryTextTheme!
.headlineSmall!
.color!,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontSize: 36, fontSize: 36,
), ),
borderColor: Theme.of(context).primaryTextTheme!.headline5!.color!, borderColor: Theme.of(context)
.primaryTextTheme!
.headlineSmall!
.color!,
textColor: Colors.white, textColor: Colors.white,
textStyle: TextStyle( textStyle: TextStyle(
color: Colors.white, color: Colors.white,
@ -125,7 +137,10 @@ class IoniaCustomTipPage extends BasePage {
text: TextSpan( text: TextSpan(
text: '\$${_amountController.text}', text: '\$${_amountController.text}',
style: TextStyle( style: TextStyle(
color: Theme.of(context).primaryTextTheme!.headline5!.color!, color: Theme.of(context)
.primaryTextTheme!
.headlineSmall!
.color!,
), ),
children: [ children: [
TextSpan(text: ' ${S.of(context).is_percentage} '), TextSpan(text: ' ${S.of(context).is_percentage} '),
@ -143,9 +158,16 @@ class IoniaCustomTipPage extends BasePage {
padding: const EdgeInsets.all(24.0), padding: const EdgeInsets.all(24.0),
child: CardItem( child: CardItem(
title: merchant.legalName, 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, discount: 0.0,
titleColor: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!, titleColor: Theme.of(context)
.accentTextTheme!
.displayLarge!
.backgroundColor!,
subtitleColor: Theme.of(context).hintColor, subtitleColor: Theme.of(context).hintColor,
subTitle: merchant.isOnline ? S.of(context).online : S.of(context).offline, subTitle: merchant.isOnline ? S.of(context).online : S.of(context).offline,
logoUrl: merchant.logoUrl, logoUrl: merchant.logoUrl,
@ -162,7 +184,10 @@ class IoniaCustomTipPage extends BasePage {
Navigator.of(context).pop(customTipViewModel.customTip); Navigator.of(context).pop(customTipViewModel.customTip);
}, },
text: S.of(context).add_tip, text: S.of(context).add_tip,
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
textColor: Colors.white, textColor: Colors.white,
), ),
), ),

56
lib/src/screens/ionia/cards/ionia_debit_card_page.dart
View file

@ -23,7 +23,10 @@ class IoniaDebitCardPage extends BasePage {
return Text( return Text(
S.current.debit_card, S.current.debit_card,
style: textMediumSemiBold( 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), padding: const EdgeInsets.symmetric(horizontal: 20.0),
child: Text( child: Text(
S.of(context).billing_address_info, 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, textAlign: TextAlign.center,
), ),
), ),
@ -60,13 +67,16 @@ class IoniaDebitCardPage extends BasePage {
text: S.of(context).order_physical_card, text: S.of(context).order_physical_card,
onPressed: () {}, onPressed: () {},
color: Color(0xffE9F2FC), color: Color(0xffE9F2FC),
textColor: Theme.of(context).textTheme!.headline3!.color!, textColor: Theme.of(context).textTheme!.displaySmall!.color!,
), ),
SizedBox(height: 8), SizedBox(height: 8),
PrimaryButton( PrimaryButton(
text: S.of(context).add_value, text: S.of(context).add_value,
onPressed: () {}, onPressed: () {},
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
textColor: Colors.white, textColor: Colors.white,
), ),
SizedBox(height: 16) SizedBox(height: 16)
@ -112,11 +122,17 @@ class IoniaDebitCardPage extends BasePage {
child: RichText( child: RichText(
text: TextSpan( text: TextSpan(
text: S.of(context).get_a, 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: [ children: [
TextSpan( TextSpan(
text: S.of(context).digital_and_physical_card, 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( TextSpan(
text: S.of(context).get_card_note, text: S.of(context).get_card_note,
@ -134,7 +150,10 @@ class IoniaDebitCardPage extends BasePage {
bottomSection: PrimaryButton( bottomSection: PrimaryButton(
text: S.of(context).activate, text: S.of(context).activate,
onPressed: () => _showHowToUseCard(context, activate: true), onPressed: () => _showHowToUseCard(context, activate: true),
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
textColor: Colors.white, textColor: Colors.white,
), ),
); );
@ -157,7 +176,7 @@ class IoniaDebitCardPage extends BasePage {
padding: EdgeInsets.only(top: 24, left: 24, right: 24), padding: EdgeInsets.only(top: 24, left: 24, right: 24),
margin: EdgeInsets.all(24), margin: EdgeInsets.all(24),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).backgroundColor, color: Theme.of(context).colorScheme.background,
borderRadius: BorderRadius.circular(30), borderRadius: BorderRadius.circular(30),
), ),
child: Column( child: Column(
@ -165,7 +184,8 @@ class IoniaDebitCardPage extends BasePage {
Text( Text(
S.of(context).how_to_use_card, S.of(context).how_to_use_card,
style: textLargeSemiBold( style: textLargeSemiBold(
color: Theme.of(context).textTheme!.bodyText2!.color!, color:
Theme.of(context).textTheme!.bodyMedium!.color!,
), ),
), ),
SizedBox(height: 24), SizedBox(height: 24),
@ -174,7 +194,10 @@ class IoniaDebitCardPage extends BasePage {
child: Text( child: Text(
S.of(context).signup_for_card_accept_terms, S.of(context).signup_for_card_accept_terms,
style: textSmallSemiBold( 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), : Navigator.pop(context),
text: S.of(context).send_got_it, text: S.of(context).send_got_it,
color: Color.fromRGBO(233, 242, 252, 1), color: Color.fromRGBO(233, 242, 252, 1),
textColor: Theme.of(context).textTheme!.headline3!.color!, textColor:
Theme.of(context).textTheme!.displaySmall!.color!,
), ),
SizedBox(height: 21), SizedBox(height: 21),
], ],
@ -259,8 +283,8 @@ class _IoniaDebitCardState extends State<_IoniaDebitCard> {
borderRadius: BorderRadius.circular(24), borderRadius: BorderRadius.circular(24),
gradient: LinearGradient( gradient: LinearGradient(
colors: [ colors: [
Theme.of(context).primaryTextTheme!.subtitle1!.color!, Theme.of(context).primaryTextTheme!.titleMedium!.color!,
Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!, Theme.of(context).primaryTextTheme!.titleMedium!.decorationColor!,
], ],
begin: Alignment.topLeft, begin: Alignment.topLeft,
end: Alignment.bottomRight, end: Alignment.bottomRight,
@ -368,12 +392,14 @@ class _TitleSubtitleTile extends StatelessWidget {
children: [ children: [
Text( Text(
title, title,
style: textSmallSemiBold(color: Theme.of(context).textTheme!.headline3!.color!), style: textSmallSemiBold(
color: Theme.of(context).textTheme!.displaySmall!.color!),
), ),
SizedBox(height: 4), SizedBox(height: 4),
Text( Text(
subtitle, subtitle,
style: textSmall(color: Theme.of(context).textTheme!.headline3!.color!), style: textSmall(
color: Theme.of(context).textTheme!.displaySmall!.color!),
), ),
], ],
); );

19
lib/src/screens/ionia/cards/ionia_gift_card_detail_page.dart
View file

@ -33,7 +33,7 @@ class IoniaGiftCardDetailPage extends BasePage {
final _backButton = Icon( final _backButton = Icon(
Icons.arrow_back_ios, Icons.arrow_back_ios,
color: Theme.of(context).primaryTextTheme.headline6!.color!, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
size: 16, size: 16,
); );
return Padding( return Padding(
@ -59,8 +59,11 @@ class IoniaGiftCardDetailPage extends BasePage {
Widget middle(BuildContext context) { Widget middle(BuildContext context) {
return Text( return Text(
viewModel.giftCard.legalName, viewModel.giftCard.legalName,
style: style: textMediumSemiBold(
textMediumSemiBold(color: Theme.of(context).accentTextTheme.headline1!.backgroundColor!), color: Theme.of(context)
.accentTextTheme!
.displayLarge!
.backgroundColor!),
); );
} }
@ -142,8 +145,8 @@ class IoniaGiftCardDetailPage extends BasePage {
viewModel.refeshCard(); viewModel.refeshCard();
}, },
text: S.of(context).more_options, text: S.of(context).more_options,
color: Theme.of(context).accentTextTheme.caption!.color!, color: Theme.of(context).accentTextTheme!.bodySmall!.color!,
textColor: Theme.of(context).primaryTextTheme.headline6!.color!, textColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
), ),
SizedBox(height: 12), SizedBox(height: 12),
LoadingPrimaryButton( LoadingPrimaryButton(
@ -155,7 +158,7 @@ class IoniaGiftCardDetailPage extends BasePage {
}, },
), ),
text: S.of(context).mark_as_redeemed, text: S.of(context).mark_as_redeemed,
color: Theme.of(context).accentTextTheme.bodyText1!.color!, color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
textColor: Colors.white, textColor: Colors.white,
), ),
], ],
@ -198,13 +201,13 @@ class IoniaGiftCardDetailPage extends BasePage {
child: Text( child: Text(
instruction.header, instruction.header,
style: textLargeSemiBold( style: textLargeSemiBold(
color: Theme.of(context).textTheme.headline3!.color!, color: Theme.of(context).textTheme!.displaySmall!.color!,
), ),
)), )),
Text( Text(
instruction.body, instruction.body,
style: textMedium( style: textMedium(
color: Theme.of(context).textTheme.headline3!.color!, color: Theme.of(context).textTheme!.displaySmall!.color!,
), ),
) )
]; ];

40
lib/src/screens/ionia/cards/ionia_manage_cards_page.dart
View file

@ -48,7 +48,7 @@ class IoniaManageCardsPage extends BasePage {
decoration: BoxDecoration( decoration: BoxDecoration(
gradient: LinearGradient( gradient: LinearGradient(
colors: [ colors: [
Theme.of(context).accentColor, Theme.of(context).colorScheme.secondary,
Theme.of(context).scaffoldBackgroundColor, Theme.of(context).scaffoldBackgroundColor,
Theme.of(context).primaryColor, Theme.of(context).primaryColor,
], ],
@ -69,7 +69,10 @@ class IoniaManageCardsPage extends BasePage {
Widget leading(BuildContext context) { Widget leading(BuildContext context) {
final _backButton = Icon( final _backButton = Icon(
Icons.arrow_back_ios, Icons.arrow_back_ios,
color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!,
size: 16, size: 16,
); );
@ -94,7 +97,10 @@ class IoniaManageCardsPage extends BasePage {
return Text( return Text(
S.of(context).gift_cards, S.of(context).gift_cards,
style: textMediumSemiBold( 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, width: 32,
padding: EdgeInsets.all(8), padding: EdgeInsets.all(8),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).textTheme!.headline6!.backgroundColor!, color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!,
border: Border.all( border: Border.all(
color: Colors.white.withOpacity(0.2), color: Colors.white.withOpacity(0.2),
), ),
@ -126,7 +132,7 @@ class IoniaManageCardsPage extends BasePage {
), ),
child: Image.asset( child: Image.asset(
'assets/images/filter.png', '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<IoniaManageCardsPageBody> {
}, },
title: merchant.legalName, title: merchant.legalName,
subTitle: merchant.avaibilityStatus, subTitle: merchant.avaibilityStatus,
backgroundColor: Theme.of(context).textTheme!.headline6!.backgroundColor!, backgroundColor: Theme.of(context).textTheme!.titleLarge!.backgroundColor!,
titleColor: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, titleColor: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!,
subtitleColor: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!, subtitleColor: Theme.of(context).accentTextTheme!.displaySmall!.backgroundColor!,
discount: merchant.discount, discount: merchant.discount,
); );
}, },
@ -238,8 +244,8 @@ class _IoniaManageCardsPageBodyState extends State<IoniaManageCardsPageBody> {
thumbHeight: thumbHeight, thumbHeight: thumbHeight,
rightOffset: 1, rightOffset: 1,
width: 3, width: 3,
backgroundColor: Theme.of(context).textTheme!.caption!.decorationColor!.withOpacity(0.05), backgroundColor: Theme.of(context).textTheme!.bodySmall!.decorationColor!.withOpacity(0.05),
thumbColor: Theme.of(context).textTheme!.caption!.decorationColor!.withOpacity(0.5), thumbColor: Theme.of(context).textTheme!.bodySmall!.decorationColor!.withOpacity(0.5),
fromTop: widget.cardsListViewModel.scrollOffsetFromTop, fromTop: widget.cardsListViewModel.scrollOffsetFromTop,
) )
: Offstage() : Offstage()
@ -247,8 +253,8 @@ class _IoniaManageCardsPageBodyState extends State<IoniaManageCardsPageBody> {
} }
return Center( return Center(
child: CircularProgressIndicator( child: CircularProgressIndicator(
backgroundColor: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, backgroundColor: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!,
valueColor: AlwaysStoppedAnimation<Color>(Theme.of(context).primaryTextTheme!.bodyText2!.color!), valueColor: AlwaysStoppedAnimation<Color>(Theme.of(context).primaryTextTheme!.bodyMedium!.color!),
), ),
); );
} }
@ -269,12 +275,12 @@ class _SearchWidget extends StatelessWidget {
padding: EdgeInsets.all(8), padding: EdgeInsets.all(8),
child: Image.asset( child: Image.asset(
'assets/images/mini_search_icon.png', 'assets/images/mini_search_icon.png',
color: Theme.of(context).textTheme!.caption!.decorationColor!, color: Theme.of(context).textTheme!.bodySmall!.decorationColor!,
), ),
); );
return TextField( return TextField(
style: TextStyle(color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!), style: TextStyle(color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!),
controller: controller, controller: controller,
decoration: InputDecoration( decoration: InputDecoration(
filled: true, filled: true,
@ -282,10 +288,10 @@ class _SearchWidget extends StatelessWidget {
top: 10, top: 10,
left: 10, left: 10,
), ),
fillColor: Theme.of(context).textTheme!.headline6!.backgroundColor!, fillColor: Theme.of(context).textTheme!.titleLarge!.backgroundColor!,
hintText: S.of(context).search, hintText: S.of(context).search,
hintStyle: TextStyle( hintStyle: TextStyle(
color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!, color: Theme.of(context).accentTextTheme!.displaySmall!.backgroundColor!,
), ),
alignLabelWithHint: true, alignLabelWithHint: true,
floatingLabelBehavior: FloatingLabelBehavior.never, floatingLabelBehavior: FloatingLabelBehavior.never,
@ -329,7 +335,7 @@ class _TrailingIcon extends StatelessWidget {
onPressed: onPressed, onPressed: onPressed,
icon: Image.asset( icon: Image.asset(
asset, asset,
color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!,
), ),
), ),
); );

9
lib/src/screens/ionia/cards/ionia_more_options_page.dart
View file

@ -15,7 +15,10 @@ class IoniaMoreOptionsPage extends BasePage {
return Text( return Text(
S.current.more_options, S.current.more_options,
style: textMediumSemiBold( 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( child: Text(
S.of(context).choose_from_available_options, S.of(context).choose_from_available_options,
style: textMedium( 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( gradient: LinearGradient(
colors: [ colors: [
Theme.of(context).scaffoldBackgroundColor, Theme.of(context).scaffoldBackgroundColor,
Theme.of(context).accentColor, Theme.of(context).colorScheme.secondary,
], ],
begin: Alignment.topRight, begin: Alignment.topRight,
end: Alignment.bottomLeft, end: Alignment.bottomLeft,

25
lib/src/screens/ionia/cards/ionia_payment_status_page.dart
View file

@ -23,8 +23,11 @@ class IoniaPaymentStatusPage extends BasePage {
S.of(context).generating_gift_card, S.of(context).generating_gift_card,
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: textMediumSemiBold( style: textMediumSemiBold(
color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!)); color: Theme.of(context)
} .accentTextTheme!
.displayLarge!
.backgroundColor!));
}
@override @override
Widget body(BuildContext context) { Widget body(BuildContext context) {
@ -90,7 +93,7 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
Text( Text(
S.of(context).awaiting_payment_confirmation, S.of(context).awaiting_payment_confirmation,
style: textLargeSemiBold( style: textLargeSemiBold(
color: Theme.of(context).primaryTextTheme!.headline6!.color!)) color: Theme.of(context).primaryTextTheme!.titleLarge!.color!))
]), ]),
SizedBox(height: 40), SizedBox(height: 40),
Row(children: [ Row(children: [
@ -129,7 +132,7 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
Text( Text(
S.of(context).gift_card_is_generated, S.of(context).gift_card_is_generated,
style: textLargeSemiBold( 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( Text(
S.of(context).generating_gift_card, S.of(context).generating_gift_card,
style: textLargeSemiBold( 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 widget.viewModel.payingByBitcoin ? S.of(context).bitcoin_payments_require_1_confirmation
: S.of(context).proceed_after_one_minute, : S.of(context).proceed_after_one_minute,
style: textMedium( style: textMedium(
color: Theme.of(context).primaryTextTheme!.headline6!.color!, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
).copyWith(fontWeight: FontWeight.w500), ).copyWith(fontWeight: FontWeight.w500),
textAlign: TextAlign.center, textAlign: TextAlign.center,
)), )),
@ -172,15 +175,15 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
Routes.ioniaGiftCardDetailPage, Routes.ioniaGiftCardDetailPage,
arguments: [widget.viewModel.giftCard]), arguments: [widget.viewModel.giftCard]),
text: S.of(context).open_gift_card, text: S.of(context).open_gift_card,
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
textColor: Colors.white); textColor: Colors.white);
} }
return PrimaryButton( return PrimaryButton(
onPressed: () => Navigator.of(context).pushNamed(Routes.support), onPressed: () => Navigator.of(context).pushNamed(Routes.support),
text: S.of(context).contact_support, text: S.of(context).contact_support,
color: Theme.of(context).accentTextTheme!.caption!.color!, color: Theme.of(context).accentTextTheme!.bodySmall!.color!,
textColor: Theme.of(context).primaryTextTheme!.headline6!.color!); textColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!);
}) })
]) ])
), ),
@ -196,14 +199,14 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
Text( Text(
title, title,
style: textXSmall( style: textXSmall(
color: Theme.of(context).primaryTextTheme!.overline!.color!, color: Theme.of(context).primaryTextTheme!.labelSmall!.color!,
), ),
), ),
SizedBox(height: 8), SizedBox(height: 8),
Text( Text(
subtitle, subtitle,
style: textMedium( style: textMedium(
color: Theme.of(context).primaryTextTheme!.headline6!.color!, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
), ),
), ),
], ],

12
lib/src/screens/ionia/widgets/ionia_alert_model.dart
View file

@ -32,7 +32,7 @@ class IoniaAlertModal extends StatelessWidget {
padding: EdgeInsets.only(top: 24, left: 24, right: 24), padding: EdgeInsets.only(top: 24, left: 24, right: 24),
margin: EdgeInsets.all(24), margin: EdgeInsets.all(24),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).backgroundColor, color: Theme.of(context).colorScheme.background,
borderRadius: BorderRadius.circular(30), borderRadius: BorderRadius.circular(30),
), ),
child: Column( child: Column(
@ -41,7 +41,7 @@ class IoniaAlertModal extends StatelessWidget {
Text( Text(
title, title,
style: textLargeSemiBold( style: textLargeSemiBold(
color: Theme.of(context).textTheme!.bodyText2!.color!, color: Theme.of(context).textTheme!.bodyMedium!.color!,
), ),
), ),
Container( Container(
@ -56,8 +56,12 @@ class IoniaAlertModal extends StatelessWidget {
PrimaryButton( PrimaryButton(
onPressed: () => Navigator.pop(context), onPressed: () => Navigator.pop(context),
text: actionTitle, text: actionTitle,
color: Theme.of(context).accentTextTheme!.caption!.color!, color: Theme.of(context)
textColor: Theme.of(context).primaryTextTheme!.headline6!.color!, .accentTextTheme!
.bodySmall!
.color!,
textColor:
Theme.of(context).primaryTextTheme!.titleLarge!.color!,
), ),
SizedBox(height: 21), SizedBox(height: 21),
], ],

12
lib/src/screens/ionia/widgets/ionia_filter_modal.dart
View file

@ -20,7 +20,7 @@ class IoniaFilterModal extends StatelessWidget {
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
child: Image.asset( child: Image.asset(
'assets/images/mini_search_icon.png', 'assets/images/mini_search_icon.png',
color: Theme.of(context).textTheme.subtitle2!.color!, color: Theme.of(context).textTheme!.titleSmall!.color!,
), ),
); );
return Scaffold( return Scaffold(
@ -34,7 +34,7 @@ class IoniaFilterModal extends StatelessWidget {
padding: EdgeInsets.only(top: 24, bottom: 20), padding: EdgeInsets.only(top: 24, bottom: 20),
margin: EdgeInsets.all(24), margin: EdgeInsets.all(24),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).backgroundColor, color: Theme.of(context).colorScheme.background,
borderRadius: BorderRadius.circular(30), borderRadius: BorderRadius.circular(30),
), ),
child: Column( child: Column(
@ -46,14 +46,14 @@ class IoniaFilterModal extends StatelessWidget {
child: TextField( child: TextField(
onChanged: ioniaGiftCardsListViewModel.onSearchFilter, onChanged: ioniaGiftCardsListViewModel.onSearchFilter,
style: textMedium( style: textMedium(
color: Theme.of(context).primaryTextTheme!.headline6!.color!, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
), ),
decoration: InputDecoration( decoration: InputDecoration(
filled: true, filled: true,
prefixIcon: searchIcon, prefixIcon: searchIcon,
hintText: S.of(context).search_category, hintText: S.of(context).search_category,
contentPadding: EdgeInsets.only(bottom: 5), 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( border: OutlineInputBorder(
borderSide: BorderSide.none, borderSide: BorderSide.none,
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
@ -84,12 +84,12 @@ class IoniaFilterModal extends StatelessWidget {
children: [ children: [
Image.asset( Image.asset(
category.iconPath, category.iconPath,
color: Theme.of(context).primaryTextTheme!.headline6!.color!, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
), ),
SizedBox(width: 10), SizedBox(width: 10),
Text(category.title, Text(category.title,
style: textSmall( style: textSmall(
color: Theme.of(context).primaryTextTheme!.headline6!.color!, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
).copyWith(fontWeight: FontWeight.w500)), ).copyWith(fontWeight: FontWeight.w500)),
], ],
), ),

4
lib/src/screens/ionia/widgets/ionia_tile.dart
View file

@ -26,14 +26,14 @@ class IoniaTile extends StatelessWidget {
Text( Text(
title, title,
style: textXSmall( style: textXSmall(
color: Theme.of(context).primaryTextTheme!.overline!.color!, color: Theme.of(context).primaryTextTheme!.labelSmall!.color!,
), ),
), ),
SizedBox(height: 8), SizedBox(height: 8),
Text( Text(
subTitle, subTitle,
style: textMediumBold( style: textMediumBold(
color: Theme.of(context).primaryTextTheme!.headline6!.color!, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
), ),
), ),
], ],

4
lib/src/screens/ionia/widgets/rounded_checkbox.dart
View file

@ -15,11 +15,11 @@ class RoundedCheckbox extends StatelessWidget {
width: 20.0, width: 20.0,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(50.0)), borderRadius: BorderRadius.all(Radius.circular(50.0)),
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
), ),
child: Icon( child: Icon(
Icons.check, Icons.check,
color: Theme.of(context).backgroundColor, color: Theme.of(context).colorScheme.background,
size: 14.0, size: 14.0,
)) ))
: Offstage(); : Offstage();

4
lib/src/screens/ionia/widgets/text_icon_button.dart
View file

@ -22,12 +22,12 @@ class TextIconButton extends StatelessWidget {
Text( Text(
label, label,
style: textMediumSemiBold( style: textMediumSemiBold(
color: Theme.of(context).primaryTextTheme!.headline6!.color!, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
), ),
), ),
Icon( Icon(
Icons.chevron_right_rounded, Icons.chevron_right_rounded,
color: Theme.of(context).primaryTextTheme!.headline6!.color!, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
), ),
], ],
), ),

2
lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart
View file

@ -56,7 +56,7 @@ class MoneroAccountEditOrCreatePage extends BasePage {
text: moneroAccountCreationViewModel.isEdit text: moneroAccountCreationViewModel.isEdit
? S.of(context).rename ? S.of(context).rename
: S.of(context).add, : S.of(context).add,
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
textColor: Colors.white, textColor: Colors.white,
isLoading: moneroAccountCreationViewModel.state isLoading: moneroAccountCreationViewModel.state
is IsExecutingState, is IsExecutingState,

2
lib/src/screens/monero_accounts/monero_account_list_page.dart
View file

@ -65,7 +65,7 @@ class MoneroAccountListPage extends StatelessWidget {
borderRadius: BorderRadius.all(Radius.circular(14)), borderRadius: BorderRadius.all(Radius.circular(14)),
child: Container( child: Container(
height: 296, height: 296,
color: Theme.of(context).textTheme!.headline1!.decorationColor!, color: Theme.of(context).textTheme!.displayLarge!.decorationColor!,
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Expanded( Expanded(

10
lib/src/screens/monero_accounts/widgets/account_tile.dart
View file

@ -20,11 +20,11 @@ class AccountTile extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final color = isCurrent final color = isCurrent
? Theme.of(context).textTheme.subtitle2!.decorationColor! ? Theme.of(context).textTheme!.titleSmall!.decorationColor!
: Theme.of(context).textTheme.headline1!.decorationColor!; : Theme.of(context).textTheme!.displayLarge!.decorationColor!;
final textColor = isCurrent final textColor = isCurrent
? Theme.of(context).textTheme.subtitle2!.color! ? Theme.of(context).textTheme!.titleSmall!.color!
: Theme.of(context).textTheme.headline1!.color!; : Theme.of(context).textTheme!.displayLarge!.color!;
final Widget cell = GestureDetector( final Widget cell = GestureDetector(
onTap: onTap, onTap: onTap,
@ -57,7 +57,7 @@ class AccountTile extends StatelessWidget {
fontSize: 15, fontSize: 15,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontFamily: 'Lato', fontFamily: 'Lato',
color: Theme.of(context).textTheme.headline4!.color!, color: Theme.of(context).textTheme!.headlineMedium!.color!,
decoration: TextDecoration.none, decoration: TextDecoration.none,
), ),
), ),

10
lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
View file

@ -111,7 +111,10 @@ class _AdvancedPrivacySettingsBodyState extends State<AdvancedPrivacySettingsBod
Navigator.pop(context); Navigator.pop(context);
}, },
text: S.of(context).continue_text, text: S.of(context).continue_text,
color: Theme.of(context).accentTextTheme.bodyText1!.color!, color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
textColor: Colors.white, textColor: Colors.white,
), ),
const SizedBox(height: 25), const SizedBox(height: 25),
@ -121,7 +124,10 @@ class _AdvancedPrivacySettingsBodyState extends State<AdvancedPrivacySettingsBod
S.of(context).settings_can_be_changed_later, S.of(context).settings_can_be_changed_later,
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: Theme.of(context).accentTextTheme.headline2?.color, color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.color,
), ),
), ),
), ),

21
lib/src/screens/new_wallet/new_wallet_page.dart
View file

@ -117,25 +117,31 @@ class _WalletNameFormState extends State<WalletNameForm> {
style: TextStyle( style: TextStyle(
fontSize: 20.0, fontSize: 20.0,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Theme.of(context).primaryTextTheme!.headline6!.color!), color: Theme.of(context)
.primaryTextTheme!
.titleLarge!
.color!),
decoration: InputDecoration( decoration: InputDecoration(
hintStyle: TextStyle( hintStyle: TextStyle(
fontSize: 18.0, fontSize: 18.0,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context).accentTextTheme!.headline2!.color!), color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.color),
hintText: S.of(context).wallet_name, hintText: S.of(context).wallet_name,
focusedBorder: UnderlineInputBorder( focusedBorder: UnderlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: Theme.of(context) color: Theme.of(context)
.accentTextTheme! .accentTextTheme!
.headline2! .displayMedium!
.decorationColor!, .decorationColor!,
width: 1.0)), width: 1.0)),
enabledBorder: UnderlineInputBorder( enabledBorder: UnderlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: Theme.of(context) color: Theme.of(context)
.accentTextTheme! .accentTextTheme!
.headline2! .displayMedium!
.decorationColor!, .decorationColor!,
width: 1.0), width: 1.0),
), ),
@ -165,7 +171,7 @@ class _WalletNameFormState extends State<WalletNameForm> {
'assets/images/refresh_icon.png', 'assets/images/refresh_icon.png',
color: Theme.of(context) color: Theme.of(context)
.primaryTextTheme! .primaryTextTheme!
.headline4! .headlineMedium!
.decorationColor!, .decorationColor!,
), ),
), ),
@ -187,7 +193,10 @@ class _WalletNameFormState extends State<WalletNameForm> {
style: TextStyle( style: TextStyle(
fontSize: 16.0, fontSize: 16.0,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context).primaryTextTheme!.headline6!.color!), color: Theme.of(context)
.primaryTextTheme!
.titleLarge!
.color!),
), ),
), ),
Padding( Padding(

10
lib/src/screens/new_wallet/new_wallet_type_page.dart
View file

@ -81,7 +81,10 @@ class WalletTypeFormState extends State<WalletTypeForm> {
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context).primaryTextTheme.headline6!.color!), color: Theme.of(context)
.primaryTextTheme!
.titleLarge!
.color!),
), ),
), ),
...types.map((type) => Padding( ...types.map((type) => Padding(
@ -100,7 +103,10 @@ class WalletTypeFormState extends State<WalletTypeForm> {
bottomSection: PrimaryButton( bottomSection: PrimaryButton(
onPressed: () => onTypeSelected(), onPressed: () => onTypeSelected(),
text: S.of(context).seed_language_next, text: S.of(context).seed_language_next,
color: Theme.of(context).accentTextTheme.bodyText1!.color!, color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
textColor: Colors.white, textColor: Colors.white,
isDisabled: selected == null, isDisabled: selected == null,
), ),

24
lib/src/screens/new_wallet/widgets/select_button.dart
View file

@ -16,14 +16,26 @@ class SelectButton extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final color = isSelected final color = isSelected
? Colors.green ? Colors.green
: Theme.of(context).accentTextTheme!.caption!.color!; : Theme.of(context)
.accentTextTheme!
.bodySmall!
.color!;
final textColor = isSelected final textColor = isSelected
? Theme.of(context).accentTextTheme!.headline5!.decorationColor! ? Theme.of(context)
: Theme.of(context).primaryTextTheme!.headline6!.color!; .accentTextTheme!
.headlineSmall!
.decorationColor!
: Theme.of(context).primaryTextTheme!.titleLarge!.color!;
final arrowColor = isSelected final arrowColor = isSelected
? Theme.of(context).accentTextTheme!.headline5!.decorationColor! ? Theme.of(context)
: Theme.of(context).accentTextTheme!.subtitle1!.color!; .accentTextTheme!
.headlineSmall!
.decorationColor!
: Theme.of(context)
.accentTextTheme!
.titleMedium!
.color!;
final selectArrowImage = Image.asset('assets/images/select_arrow.png', final selectArrowImage = Image.asset('assets/images/select_arrow.png',
color: arrowColor); color: arrowColor);

5
lib/src/screens/nodes/node_create_or_edit_page.dart
View file

@ -148,7 +148,10 @@ class NodeCreateOrEditPage extends BasePage {
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
text: S.of(context).save, text: S.of(context).save,
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
textColor: Colors.white, textColor: Colors.white,
isDisabled: (!nodeCreateOrEditViewModel.isReady)|| isDisabled: (!nodeCreateOrEditViewModel.isReady)||
(nodeCreateOrEditViewModel (nodeCreateOrEditViewModel

2
lib/src/screens/nodes/widgets/node_list_row.dart
View file

@ -36,7 +36,7 @@ class NodeHeaderListRow extends StandardListRow {
return SizedBox( return SizedBox(
width: 20, width: 20,
child: Icon(Icons.add, child: Icon(Icons.add,
color: Theme.of(context).accentTextTheme.subtitle1?.color, size: 24.0), color: Theme.of(context).accentTextTheme!.titleMedium!.color,size: 24.0),
); );
} }
} }

27
lib/src/screens/pin_code/pin_code_widget.dart
View file

@ -110,11 +110,11 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
Widget body(BuildContext context) { Widget body(BuildContext context) {
final deleteIconImage = Image.asset( final deleteIconImage = Image.asset(
'assets/images/delete_icon.png', 'assets/images/delete_icon.png',
color: Theme.of(context).primaryTextTheme!.headline6!.color!, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
); );
final faceImage = Image.asset( final faceImage = Image.asset(
'assets/images/face.png', 'assets/images/face.png',
color: Theme.of(context).primaryTextTheme!.headline6!.color!, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
); );
return RawKeyboardListener( return RawKeyboardListener(
@ -133,7 +133,7 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
} }
}, },
child: Container( 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), padding: EdgeInsets.only(left: 40.0, right: 40.0, bottom: 40.0),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
@ -142,7 +142,8 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
style: TextStyle( style: TextStyle(
fontSize: 20, fontSize: 20,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context).primaryTextTheme!.headline6!.color!)), color:
Theme.of(context).primaryTextTheme!.titleLarge!.color!)),
Spacer(flex: 3), Spacer(flex: 3),
Container( Container(
width: 180, width: 180,
@ -158,10 +159,13 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.circle, shape: BoxShape.circle,
color: isFilled color: isFilled
? Theme.of(context).primaryTextTheme!.headline6!.color! ? Theme.of(context)
.primaryTextTheme!
.titleLarge!
.color!
: Theme.of(context) : Theme.of(context)
.accentTextTheme! .accentTextTheme!
.bodyText2! .bodyMedium!
.color! .color!
.withOpacity(0.25), .withOpacity(0.25),
)); ));
@ -181,7 +185,10 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
style: TextStyle( style: TextStyle(
fontSize: 14.0, fontSize: 14.0,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
color: Theme.of(context).accentTextTheme!.bodyText2!.decorationColor!), color: Theme.of(context)
.accentTextTheme!
.bodyMedium!
.decorationColor!),
), ),
) )
], ],
@ -225,7 +232,7 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
child: TextButton( child: TextButton(
onPressed: () => _pop(), onPressed: () => _pop(),
style: TextButton.styleFrom( style: TextButton.styleFrom(
backgroundColor: Theme.of(context).backgroundColor, backgroundColor: Theme.of(context).colorScheme.background,
shape: CircleBorder(), shape: CircleBorder(),
), ),
child: deleteIconImage, child: deleteIconImage,
@ -242,7 +249,7 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
child: TextButton( child: TextButton(
onPressed: () => _push(index), onPressed: () => _push(index),
style: TextButton.styleFrom( style: TextButton.styleFrom(
backgroundColor: Theme.of(context).backgroundColor, backgroundColor: Theme.of(context).colorScheme.background,
shape: CircleBorder(), shape: CircleBorder(),
), ),
child: Text('$index', child: Text('$index',
@ -251,7 +258,7 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Theme.of(context) color: Theme.of(context)
.primaryTextTheme! .primaryTextTheme!
.headline6! .titleLarge!
.color!)), .color!)),
), ),
); );

21
lib/src/screens/receive/anonpay_invoice_page.dart
View file

@ -73,7 +73,10 @@ class AnonPayInvoicePage extends BasePage {
disableScroll: true, disableScroll: true,
config: KeyboardActionsConfig( config: KeyboardActionsConfig(
keyboardActionsPlatform: KeyboardActionsPlatform.IOS, keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!, keyboardBarColor: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.backgroundColor!,
nextFocus: false, nextFocus: false,
actions: [ actions: [
KeyboardActionsItem( KeyboardActionsItem(
@ -82,7 +85,7 @@ class AnonPayInvoicePage extends BasePage {
), ),
]), ]),
child: Container( child: Container(
color: Theme.of(context).backgroundColor, color: Theme.of(context).colorScheme.background,
child: ScrollableWithBottomSection( child: ScrollableWithBottomSection(
contentPadding: EdgeInsets.only(bottom: 24), contentPadding: EdgeInsets.only(bottom: 24),
content: Container( content: Container(
@ -91,8 +94,8 @@ class AnonPayInvoicePage extends BasePage {
bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)), bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)),
gradient: LinearGradient( gradient: LinearGradient(
colors: [ colors: [
Theme.of(context).primaryTextTheme.subtitle2!.color!, Theme.of(context).primaryTextTheme!.titleSmall!.color!,
Theme.of(context).primaryTextTheme.subtitle2!.decorationColor!, Theme.of(context).primaryTextTheme!.titleSmall!.decorationColor!,
], ],
begin: Alignment.topLeft, begin: Alignment.topLeft,
end: Alignment.bottomRight, end: Alignment.bottomRight,
@ -130,7 +133,10 @@ class AnonPayInvoicePage extends BasePage {
: S.of(context).anonpay_description("a donation link", "donate"), : S.of(context).anonpay_description("a donation link", "donate"),
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: Theme.of(context).primaryTextTheme.headline1!.decorationColor!, color: Theme.of(context)
.primaryTextTheme!
.displayLarge!
.decorationColor!,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontSize: 12), fontSize: 12),
), ),
@ -157,7 +163,10 @@ class AnonPayInvoicePage extends BasePage {
anonInvoicePageViewModel.generateDonationLink(); anonInvoicePageViewModel.generateDonationLink();
} }
}, },
color: Theme.of(context).accentTextTheme.bodyText1!.color!, color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
textColor: Colors.white, textColor: Colors.white,
isLoading: anonInvoicePageViewModel.state is IsExecutingState, isLoading: anonInvoicePageViewModel.state is IsExecutingState,
), ),

24
lib/src/screens/receive/anonpay_receive_page.dart
View file

@ -35,7 +35,10 @@ class AnonPayReceivePage extends BasePage {
Widget leading(BuildContext context) { Widget leading(BuildContext context) {
final _backButton = Icon( final _backButton = Icon(
Icons.arrow_back_ios, Icons.arrow_back_ios,
color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!,
size: 16, size: 16,
); );
@ -62,7 +65,10 @@ class AnonPayReceivePage extends BasePage {
fontSize: 18.0, fontSize: 18.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontFamily: 'Lato', fontFamily: 'Lato',
color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!), color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!),
), ),
Text( Text(
invoiceInfo is AnonpayInvoiceInfo invoiceInfo is AnonpayInvoiceInfo
@ -71,7 +77,7 @@ class AnonPayReceivePage extends BasePage {
style: TextStyle( style: TextStyle(
fontSize: 10.0, fontSize: 10.0,
fontWeight: FontWeight.w500, 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( icon: Icon(
Icons.edit, Icons.edit,
color: Theme.of(context).accentTextTheme.caption!.color!, color: Theme.of(context)
.accentTextTheme!
.bodySmall!
.color!,
size: 22.0, size: 22.0,
), ),
), ),
@ -105,7 +114,7 @@ class AnonPayReceivePage extends BasePage {
(BuildContext context, Widget scaffold) => Container( (BuildContext context, Widget scaffold) => Container(
decoration: BoxDecoration( decoration: BoxDecoration(
gradient: LinearGradient(colors: [ gradient: LinearGradient(colors: [
Theme.of(context).accentColor, Theme.of(context).colorScheme.secondary,
Theme.of(context).scaffoldBackgroundColor, Theme.of(context).scaffoldBackgroundColor,
Theme.of(context).primaryColor, Theme.of(context).primaryColor,
], begin: Alignment.topRight, end: Alignment.bottomLeft)), ], begin: Alignment.topRight, end: Alignment.bottomLeft)),
@ -151,7 +160,10 @@ class AnonPayReceivePage extends BasePage {
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
width: 3, width: 3,
color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!,
), ),
), ),
child: QrImage( child: QrImage(

14
lib/src/screens/receive/fullscreen_qr_page.dart
View file

@ -22,7 +22,10 @@ class FullscreenQRPage extends BasePage {
Widget leading(BuildContext context) { Widget leading(BuildContext context) {
final _backButton = Icon( final _backButton = Icon(
Icons.arrow_back_ios, Icons.arrow_back_ios,
color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!,
size: 16, size: 16,
); );
@ -48,7 +51,7 @@ class FullscreenQRPage extends BasePage {
decoration: BoxDecoration( decoration: BoxDecoration(
gradient: LinearGradient( gradient: LinearGradient(
colors: [ colors: [
Theme.of(context).accentColor, Theme.of(context).colorScheme.secondary,
Theme.of(context).scaffoldBackgroundColor, Theme.of(context).scaffoldBackgroundColor,
Theme.of(context).primaryColor, Theme.of(context).primaryColor,
], ],
@ -70,7 +73,12 @@ class FullscreenQRPage extends BasePage {
child: Container( child: Container(
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
decoration: BoxDecoration( 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( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all(width: 3, color: Colors.white)), border: Border.all(width: 3, color: Colors.white)),

52
lib/src/screens/receive/receive_page.dart
View file

@ -64,7 +64,10 @@ class ReceivePage extends BasePage {
fontSize: 18.0, fontSize: 18.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontFamily: 'Lato', 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( (BuildContext context, Widget scaffold) => Container(
decoration: BoxDecoration( decoration: BoxDecoration(
gradient: LinearGradient(colors: [ gradient: LinearGradient(colors: [
Theme.of(context).accentColor, Theme.of(context).colorScheme.secondary,
Theme.of(context).scaffoldBackgroundColor, Theme.of(context).scaffoldBackgroundColor,
Theme.of(context).primaryColor, Theme.of(context).primaryColor,
], begin: Alignment.topRight, end: Alignment.bottomLeft)), ], begin: Alignment.topRight, end: Alignment.bottomLeft)),
@ -100,7 +103,10 @@ class ReceivePage extends BasePage {
icon: Icon( icon: Icon(
Icons.share, Icons.share,
size: 20, 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( ? KeyboardActions(
config: KeyboardActionsConfig( config: KeyboardActionsConfig(
keyboardActionsPlatform: KeyboardActionsPlatform.IOS, keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!, keyboardBarColor: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.backgroundColor!,
nextFocus: false, nextFocus: false,
actions: [ actions: [
KeyboardActionsItem( KeyboardActionsItem(
@ -154,7 +163,10 @@ class ReceivePage extends BasePage {
icon: Icon( icon: Icon(
Icons.arrow_forward_ios, Icons.arrow_forward_ios,
size: 14, 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( icon: Icon(
Icons.add, Icons.add,
size: 20, 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 = final isCurrent =
item.address == addressListViewModel.address.address; item.address == addressListViewModel.address.address;
final backgroundColor = isCurrent final backgroundColor = isCurrent
? Theme.of(context).textTheme!.headline2!.decorationColor! ? Theme.of(context)
: Theme.of(context).textTheme!.headline3!.decorationColor!; .textTheme!
.displayMedium!
.decorationColor!
: Theme.of(context)
.textTheme!
.displaySmall!
.decorationColor!;
final textColor = isCurrent final textColor = isCurrent
? Theme.of(context).textTheme!.headline2!.color! ? Theme.of(context)
: Theme.of(context).textTheme!.headline3!.color!; .textTheme!
.displayMedium!
.color!
: Theme.of(context)
.textTheme!
.displaySmall!
.color!;
return AddressCell.fromItem(item, return AddressCell.fromItem(item,
isCurrent: isCurrent, isCurrent: isCurrent,
@ -225,7 +252,10 @@ class ReceivePage extends BasePage {
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
fontSize: 15, fontSize: 15,
color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!)), color: Theme.of(context)
.accentTextTheme!
.displaySmall!
.backgroundColor!)),
], ],
), ),
); );

27
lib/src/screens/receive/widgets/anonpay_currency_input_field.dart
View file

@ -32,7 +32,8 @@ class AnonpayCurrencyInputField extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border( border: Border(
bottom: BorderSide( bottom: BorderSide(
color: Theme.of(context).primaryTextTheme.bodyText1!.color!, color:
Theme.of(context).primaryTextTheme!.bodyLarge!.color!,
width: 1)), width: 1)),
), ),
child: Padding( child: Padding(
@ -64,7 +65,10 @@ class AnonpayCurrencyInputField extends StatelessWidget {
child: Container( child: Container(
height: 32, height: 32,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).primaryTextTheme.headline4!.color!, color: Theme.of(context)
.primaryTextTheme!
.headlineMedium!
.color!,
borderRadius: BorderRadius.all(Radius.circular(6))), borderRadius: BorderRadius.all(Radius.circular(6))),
child: Center( child: Center(
child: Padding( child: Padding(
@ -75,8 +79,8 @@ class AnonpayCurrencyInputField extends StatelessWidget {
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Theme.of(context) color: Theme.of(context)
.primaryTextTheme .primaryTextTheme!
.headline4! .headlineMedium!
.decorationColor!, .decorationColor!,
), ),
), ),
@ -115,7 +119,10 @@ class AnonpayCurrencyInputField extends StatelessWidget {
placeholderTextStyle: TextStyle( placeholderTextStyle: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Theme.of(context).accentTextTheme.headline1!.decorationColor!, color: Theme.of(context)
.accentTextTheme!
.displayLarge!
.decorationColor!,
), ),
validator: null, validator: null,
), ),
@ -136,14 +143,20 @@ class AnonpayCurrencyInputField extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontSize: 10, fontSize: 10,
height: 1.2, height: 1.2,
color: Theme.of(context).accentTextTheme.headline1!.decorationColor!), color: Theme.of(context)
.accentTextTheme!
.displayLarge!
.decorationColor!),
), ),
SizedBox(width: 10), SizedBox(width: 10),
Text(S.of(context).max_value(maxAmount, selectedCurrency.toString()), Text(S.of(context).max_value(maxAmount, selectedCurrency.toString()),
style: TextStyle( style: TextStyle(
fontSize: 10, fontSize: 10,
height: 1.2, height: 1.2,
color: Theme.of(context).accentTextTheme.headline1!.decorationColor!)), color: Theme.of(context)
.accentTextTheme!
.displayLarge!
.decorationColor!)),
], ],
), ),
) )

21
lib/src/screens/receive/widgets/anonpay_input_form.dart
View file

@ -69,14 +69,17 @@ class AnonInvoiceForm extends StatelessWidget {
BaseTextFormField( BaseTextFormField(
controller: nameController, controller: nameController,
focusNode: _nameFocusNode, focusNode: _nameFocusNode,
borderColor: Theme.of(context).primaryTextTheme.bodyText1!.color!, borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.color!,
suffixIcon: SizedBox(width: 36), suffixIcon: SizedBox(width: 36),
hintText: S.of(context).optional_name, hintText: S.of(context).optional_name,
textInputAction: TextInputAction.next, textInputAction: TextInputAction.next,
placeholderTextStyle: TextStyle( placeholderTextStyle: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w600, 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), textStyle: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white),
validator: null, validator: null,
@ -88,13 +91,16 @@ class AnonInvoiceForm extends StatelessWidget {
controller: descriptionController, controller: descriptionController,
focusNode: _descriptionFocusNode, focusNode: _descriptionFocusNode,
textInputAction: TextInputAction.next, textInputAction: TextInputAction.next,
borderColor: Theme.of(context).primaryTextTheme.bodyText1!.color!, borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.color!,
suffixIcon: SizedBox(width: 36), suffixIcon: SizedBox(width: 36),
hintText: S.of(context).optional_description, hintText: S.of(context).optional_description,
placeholderTextStyle: TextStyle( placeholderTextStyle: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w600, 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), textStyle: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white),
validator: null, validator: null,
@ -104,14 +110,17 @@ class AnonInvoiceForm extends StatelessWidget {
controller: emailController, controller: emailController,
textInputAction: TextInputAction.next, textInputAction: TextInputAction.next,
focusNode: _emailFocusNode, focusNode: _emailFocusNode,
borderColor: Theme.of(context).primaryTextTheme.bodyText1!.color!, borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.color!,
suffixIcon: SizedBox(width: 36), suffixIcon: SizedBox(width: 36),
keyboardType: TextInputType.emailAddress, keyboardType: TextInputType.emailAddress,
hintText: S.of(context).optional_email_hint, hintText: S.of(context).optional_email_hint,
placeholderTextStyle: TextStyle( placeholderTextStyle: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w600, 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), textStyle: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white),
validator: EmailValidator(), validator: EmailValidator(),

24
lib/src/screens/receive/widgets/anonpay_status_section.dart
View file

@ -18,7 +18,7 @@ class AnonInvoiceStatusSection extends StatelessWidget {
width: 200, width: 200,
padding: EdgeInsets.all(19), padding: EdgeInsets.all(19),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).backgroundColor, color: Theme.of(context).colorScheme.background,
borderRadius: BorderRadius.circular(30), borderRadius: BorderRadius.circular(30),
), ),
child: Column( child: Column(
@ -31,13 +31,19 @@ class AnonInvoiceStatusSection extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context).primaryTextTheme.headline1!.decorationColor!, color: Theme.of(context)
.primaryTextTheme!
.displayLarge!
.decorationColor!,
), ),
), ),
Container( Container(
padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5), padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).accentTextTheme.headline3!.color!, color: Theme.of(context)
.accentTextTheme!
.displaySmall!
.color!,
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
), ),
child: Row( child: Row(
@ -52,7 +58,10 @@ class AnonInvoiceStatusSection extends StatelessWidget {
Text( Text(
invoiceInfo.status ?? '', invoiceInfo.status ?? '',
style: textSmallSemiBold( 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( style: TextStyle(
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context).primaryTextTheme.headline1!.decorationColor!, color: Theme.of(context)
.primaryTextTheme!
.displayLarge!
.decorationColor!,
), ),
), ),
Text( Text(
invoiceInfo.invoiceId ?? '', invoiceInfo.invoiceId ?? '',
style: textSmallSemiBold( style: textSmallSemiBold(
color: Theme.of(context).primaryTextTheme.headline6!.color, color: Theme.of(context).primaryTextTheme!.titleLarge!.color,
), ),
), ),
], ],

15
lib/src/screens/receive/widgets/copy_link_item.dart
View file

@ -14,7 +14,10 @@ class CopyLinkItem extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final copyImage = Image.asset('assets/images/copy_address.png', 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( return Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
@ -22,7 +25,10 @@ class CopyLinkItem extends StatelessWidget {
Text( Text(
title, title,
style: textMedium( style: textMedium(
color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!,
), ),
), ),
SizedBox(width: 50), SizedBox(width: 50),
@ -45,7 +51,10 @@ class CopyLinkItem extends StatelessWidget {
onPressed: () => Share.share(url), onPressed: () => Share.share(url),
icon: Icon( icon: Icon(
Icons.share, Icons.share,
color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!,
), ),
) )
], ],

23
lib/src/screens/receive/widgets/currency_input_field.dart
View file

@ -22,7 +22,10 @@ class CurrencyInputField extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final arrowBottomPurple = Image.asset( final arrowBottomPurple = Image.asset(
'assets/images/arrow_bottom_purple_icon.png', 'assets/images/arrow_bottom_purple_icon.png',
color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!,
height: 8, height: 8,
); );
final _width = MediaQuery.of(context).size.width; final _width = MediaQuery.of(context).size.width;
@ -40,13 +43,13 @@ class CurrencyInputField extends StatelessWidget {
inputFormatters: [FilteringTextInputFormatter.allow(RegExp(r'^\d+(\.|\,)?\d{0,8}'))], inputFormatters: [FilteringTextInputFormatter.allow(RegExp(r'^\d+(\.|\,)?\d{0,8}'))],
hintText: '0.000', hintText: '0.000',
placeholderTextStyle: isLight ? null : TextStyle( placeholderTextStyle: isLight ? null : TextStyle(
color: Theme.of(context).primaryTextTheme.headline5!.color!, color: Theme.of(context).primaryTextTheme!.headlineSmall!.color!,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
), ),
borderColor: Theme.of(context).accentTextTheme.headline6!.backgroundColor!, borderColor: Theme.of(context).accentTextTheme!.titleLarge!.backgroundColor!,
textColor: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, textColor: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!,
textStyle: TextStyle( textStyle: TextStyle(
color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!,
), ),
prefixIcon: Padding( prefixIcon: Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
@ -69,7 +72,7 @@ class CurrencyInputField extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 16, fontSize: 16,
color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!, color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!,
), ),
), ),
if (selectedCurrency.tag != null) if (selectedCurrency.tag != null)
@ -77,7 +80,7 @@ class CurrencyInputField extends StatelessWidget {
padding: const EdgeInsets.only(right: 3.0), padding: const EdgeInsets.only(right: 3.0),
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).primaryTextTheme.headline4!.color!, color: Theme.of(context).primaryTextTheme!.headlineMedium!.color!,
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
Radius.circular(6), Radius.circular(6),
), ),
@ -89,8 +92,8 @@ class CurrencyInputField extends StatelessWidget {
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Theme.of(context) color: Theme.of(context)
.primaryTextTheme .primaryTextTheme!
.headline4! .headlineMedium!
.decorationColor!, .decorationColor!,
), ),
), ),
@ -105,7 +108,7 @@ class CurrencyInputField extends StatelessWidget {
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
fontSize: 20, fontSize: 20,
color: color:
Theme.of(context).accentTextTheme.headline2!.backgroundColor!, Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!,
), ),
), ),
), ),

11
lib/src/screens/receive/widgets/header_tile.dart
View file

@ -22,7 +22,7 @@ class HeaderTile extends StatelessWidget {
top: 24, top: 24,
bottom: 24 bottom: 24
), ),
color: Theme.of(context).textTheme!.headline3!.decorationColor!, color: Theme.of(context).textTheme!.displaySmall!.decorationColor!,
child: Row( child: Row(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -32,16 +32,17 @@ class HeaderTile extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontSize: 18, fontSize: 18,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Theme.of(context).textTheme!.headline3!.color! color: Theme.of(context)!.textTheme.displaySmall!.color!),
),
), ),
Container( Container(
height: 32, height: 32,
width: 32, width: 32,
decoration: BoxDecoration( decoration: BoxDecoration(
shape: BoxShape.circle, shape: BoxShape.circle,
color: Theme.of(context).textTheme!.headline4!.decorationColor! color: Theme.of(context)
), .textTheme!
.headlineMedium!
.decorationColor!),
child: icon, child: icon,
) )
], ],

18
lib/src/screens/receive/widgets/qr_widget.dart
View file

@ -35,7 +35,7 @@ class QRWidget extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final copyImage = Image.asset('assets/images/copy_address.png', 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( return Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@ -51,7 +51,10 @@ class QRWidget extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!), color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!),
), ),
), ),
Row( Row(
@ -82,8 +85,10 @@ class QRWidget extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
width: 3, width: 3,
color: color: Theme.of(context)
Theme.of(context).accentTextTheme.headline2!.backgroundColor!, .accentTextTheme!
.displayMedium!
.backgroundColor!,
), ),
), ),
child: Container( child: Container(
@ -147,7 +152,10 @@ class QRWidget extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontSize: 15, fontSize: 15,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!), color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!),
), ),
), ),
Padding( Padding(

10
lib/src/screens/release_notes/release_notes_screen.dart
View file

@ -51,7 +51,10 @@ class ReleaseNotesScreen extends StatelessWidget {
fontSize: 24.0, fontSize: 24.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontFamily: 'Lato', fontFamily: 'Lato',
color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!,
), ),
child: Text(title), child: Text(title),
), ),
@ -118,7 +121,10 @@ class ReleaseNotesScreen extends StatelessWidget {
decoration: TextDecoration.none, decoration: TextDecoration.none,
fontSize: 16.0, fontSize: 16.0,
fontFamily: 'Lato', fontFamily: 'Lato',
color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!, color: Theme.of(context)
.accentTextTheme!
.displayMedium!
.backgroundColor!,
), ),
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,

5
lib/src/screens/rescan/rescan_page.dart
View file

@ -35,7 +35,10 @@ class RescanPage extends BasePage {
_blockchainHeightWidgetKey.currentState!.height); _blockchainHeightWidgetKey.currentState!.height);
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
textColor: Colors.white, textColor: Colors.white,
isDisabled: !_rescanViewModel.isButtonEnabled, isDisabled: !_rescanViewModel.isButtonEnabled,
)) ))

5
lib/src/screens/restore/restore_from_backup_page.dart
View file

@ -75,7 +75,10 @@ class RestoreFromBackupPage extends BasePage {
restoreFromBackupViewModel.state is IsExecutingState, restoreFromBackupViewModel.state is IsExecutingState,
onPressed: () => onImportHandler(context), onPressed: () => onImportHandler(context),
text: S.of(context).import, text: S.of(context).import,
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
textColor: Colors.white); textColor: Colors.white);
})) }))
])), ])),

5
lib/src/screens/restore/restore_wallet_from_seed_details.dart
View file

@ -134,7 +134,10 @@ class _RestoreFromSeedDetailsFormState
isLoading: isLoading:
widget.walletRestorationFromSeedVM.state is IsExecutingState, widget.walletRestorationFromSeedVM.state is IsExecutingState,
text: S.of(context).restore_recover, text: S.of(context).restore_recover,
color: Theme.of(context).accentTextTheme!.bodyText1!.color!, color: Theme.of(context)
.accentTextTheme!
.bodyLarge!
.color!,
textColor: Colors.white, textColor: Colors.white,
isDisabled: _nameController.text.isNotEmpty, isDisabled: _nameController.text.isNotEmpty,
); );

Some files were not shown because too many files have changed in this diff Show more