@samitouri / QOSAMI-cakewallet / commits / baabc0a91

Cw 373 theme refactoring in preparation to support additional themes (#933)

* refactor(Theme): migrate accentColor - based on the specs at https://docs.flutter.dev/release/breaking-changes/theme-data-accent-properties#migration-guide. * refactor(Theme): all deprecated TextTheme styles * refactor(Theme): deprecated backgroundColor for colorScheme.background * refactor(Theme): deprecated buttonColor to use TextTheme backgroundColor instead * refactor(Theme): deprecated isAlwaysShown to use thumbVisibility instead

Rafael Saes committed May 24, 2023 at 20:19 UTC baabc0a9153e69b6be27b71c2bcd2726a000a87e
141 files changed +1954 -1111
lib/src/screens/auth/auth_page.dart
+1 -1
@@ -141,7 +141,7 @@ class AuthPageState extends State<AuthPage> {
141 ),
142 ))
143 : Container(),
144 - backgroundColor: Theme.of(context).backgroundColor,
144 + backgroundColor: Theme.of(context).colorScheme.background,
145 border: null),
146 resizeToAvoidBottomInset: false,
147 body: PinCode((pin, _) => widget.authViewModel.auth(password: pin),
lib/src/screens/backup/backup_page.dart
+4 -1
@@ -79,7 +79,10 @@ class BackupPage extends BasePage {
79 isLoading: backupViewModelBase.state is IsExecutingState,
80 onPressed: () => onExportBackup(context),
81 text: S.of(context).export_backup,
82 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
82 + color: Theme.of(context)
83 + .accentTextTheme!
84 + .bodyLarge!
85 + .color!,
86 textColor: Colors.white)),
87 bottom: 24,
88 left: 24,
lib/src/screens/backup/edit_backup_password_page.dart
+9 -3
@@ -38,14 +38,20 @@ class EditBackupPasswordPage extends BasePage {
38 keyboardType: TextInputType.visiblePassword,
39 controller: textEditingController,
40 style: TextStyle(
41 - fontSize: 26,
42 - color: Theme.of(context).primaryTextTheme!.headline6!.color!)))),
41 + fontSize: 26,
42 + color: Theme.of(context)
43 + .primaryTextTheme!
44 + .titleLarge!
45 + .color!)))),
46 Positioned(
47 child: Observer(
48 builder: (_) => PrimaryButton(
49 onPressed: () => onSave(context),
50 text: S.of(context).save,
48 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
51 + color: Theme.of(context)
52 + .accentTextTheme!
53 + .bodyLarge!
54 + .color!,
55 textColor: Colors.white,
56 isDisabled: !editBackupPasswordViewModel.canSave)),
57 bottom: 24,
lib/src/screens/base_page.dart
+2 -2
@@ -48,7 +48,7 @@ abstract class BasePage extends StatelessWidget {
48 }
49
50 final _backButton = Icon(Icons.arrow_back_ios,
51 - color: titleColor ?? Theme.of(context).primaryTextTheme.headline6!.color!,
51 + color: titleColor ?? Theme.of(context).primaryTextTheme!.titleLarge!.color!,
52 size: 16,);
53
54 return MergeSemantics(
@@ -83,7 +83,7 @@ abstract class BasePage extends StatelessWidget {
83 fontWeight: FontWeight.bold,
84 fontFamily: 'Lato',
85 color: titleColor ??
86 - Theme.of(context).primaryTextTheme!.headline6!.color!),
86 + Theme.of(context).primaryTextTheme!.titleLarge!.color!),
87 );
88 }
89
lib/src/screens/buy/pre_order_page.dart
+10 -8
@@ -80,7 +80,9 @@ class PreOrderPage extends BasePage {
80 return KeyboardActions(
81 config: KeyboardActionsConfig(
82 keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
83 - keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1!
83 + keyboardBarColor: Theme.of(context)
84 + .accentTextTheme!
85 + .bodyLarge!
86 .backgroundColor!,
87 nextFocus: false,
88 actions: [
@@ -91,7 +93,7 @@ class PreOrderPage extends BasePage {
93 ]),
94 child: Container(
95 height: 0,
94 - color: Theme.of(context).backgroundColor,
96 + color: Theme.of(context).colorScheme.background,
97 child: ScrollableWithBottomSection(
98 contentPadding: EdgeInsets.only(bottom: 24),
99 content: Observer(builder: (_) => Column(
@@ -102,9 +104,9 @@ class PreOrderPage extends BasePage {
104 bottomLeft: Radius.circular(24),
105 bottomRight: Radius.circular(24)),
106 gradient: LinearGradient(colors: [
105 - Theme.of(context).primaryTextTheme.subtitle1!.color!,
107 + Theme.of(context).primaryTextTheme!.titleMedium!.color!,
108 Theme.of(context)
107 - .primaryTextTheme.subtitle1!
109 + .primaryTextTheme!.titleMedium!
110 .decorationColor!,
111 ], begin: Alignment.topLeft, end: Alignment.bottomRight),
112 ),
@@ -160,11 +162,11 @@ class PreOrderPage extends BasePage {
162 ),
163 ),
164 hintText: '0.00',
163 - borderColor: Theme.of(context).primaryTextTheme.bodyText1!.decorationColor!,
165 + borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.decorationColor!,
166 borderWidth: 0.5,
167 textStyle: TextStyle(fontSize: 36, fontWeight: FontWeight.w500, color: Colors.white),
168 placeholderTextStyle: TextStyle(
167 - color: Theme.of(context).primaryTextTheme.headline5!.decorationColor!,
169 + color: Theme.of(context).primaryTextTheme!.headlineSmall!.decorationColor!,
170 fontWeight: FontWeight.w500,
171 fontSize: 36,
172 ),
@@ -179,7 +181,7 @@ class PreOrderPage extends BasePage {
181 S.of(context).buy_with + ':',
182 textAlign: TextAlign.center,
183 style: TextStyle(
182 - color: Theme.of(context).primaryTextTheme.headline6!.color!,
184 + color: Theme.of(context).primaryTextTheme.titleLarge!.color!,
185 fontSize: 18,
186 fontWeight: FontWeight.bold
187 ),
@@ -246,7 +248,7 @@ class PreOrderPage extends BasePage {
248 ? S.of(context).buy
249 : S.of(context).buy_with +
250 ' ${buyViewModel.selectedProvider!.description.title}',
249 - color: Theme.of(context).accentTextTheme.bodyText1!.color!,
251 + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
252 textColor: Colors.white,
253 isLoading: buyViewModel.isRunning,
254 isDisabled: (buyViewModel.selectedProvider == null) ||
lib/src/screens/contact/contact_list_page.dart
+8 -5
@@ -29,12 +29,15 @@ class ContactListPage extends BasePage {
29 height: 32.0,
30 decoration: BoxDecoration(
31 shape: BoxShape.circle,
32 - color: Theme.of(context).accentTextTheme.caption!.color!),
32 + color: Theme.of(context)
33 + .accentTextTheme!
34 + .bodySmall!
35 + .color!),
36 child: Stack(
37 alignment: Alignment.center,
38 children: <Widget>[
39 Icon(Icons.add,
37 - color: Theme.of(context).primaryTextTheme.headline6!.color!,
40 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
41 size: 22.0),
42 ButtonTheme(
43 minWidth: 32.0,
@@ -64,9 +67,9 @@ class ContactListPage extends BasePage {
67 return CollapsibleSectionList(
68 context: context,
69 sectionCount: 2,
67 - themeColor: Theme.of(context).primaryTextTheme.headline6!.color!,
70 + themeColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
71 dividerThemeColor:
69 - Theme.of(context).primaryTextTheme.caption!.decorationColor!,
72 + Theme.of(context).primaryTextTheme!.bodySmall!.decorationColor!,
73 sectionTitleBuilder: (_, int sectionIndex) {
74 var title = S.current.contact_list_contacts;
75
@@ -140,7 +143,7 @@ class ContactListPage extends BasePage {
143 style: TextStyle(
144 fontSize: 14,
145 fontWeight: FontWeight.normal,
143 - color: Theme.of(context).primaryTextTheme.headline6!.color!),
146 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!),
147 ),
148 )
149 )
lib/src/screens/contact/contact_page.dart
+8 -5
@@ -47,7 +47,8 @@ class ContactPage extends BasePage {
47 @override
48 Widget body(BuildContext context) {
49 final downArrow = Image.asset('assets/images/arrow_bottom_purple_icon.png',
50 - color: Theme.of(context).primaryTextTheme!.overline!.color!, height: 8);
50 + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!,
51 + height: 8);
52
53 reaction((_) => contactViewModel.state, (ExecutionState state) {
54 if (state is FailureState) {
@@ -98,12 +99,14 @@ class ContactPage extends BasePage {
99 AddressTextFieldOption.paste,
100 AddressTextFieldOption.qrCode,
101 ],
101 - buttonColor:
102 - Theme.of(context).accentTextTheme!.headline3!.color!,
102 + buttonColor: Theme.of(context)
103 + .accentTextTheme!
104 + .displaySmall!
105 + .color!,
106 iconColor: PaletteDark.gray,
107 borderColor: Theme.of(context)
108 .primaryTextTheme!
106 - .headline6!
109 + .titleLarge!
110 .backgroundColor!,
111 validator:
112 AddressValidator(type: contactViewModel.currency!),
@@ -142,7 +145,7 @@ class ContactPage extends BasePage {
145 text: S.of(context).save,
146 color: Theme.of(context)
147 .accentTextTheme!
145 - .bodyText1!
148 + .bodyLarge!
149 .color!,
150 textColor: Colors.white,
151 isDisabled: !contactViewModel.isReady)))
lib/src/screens/dashboard/dashboard_page.dart
+16 -10
@@ -77,7 +77,7 @@ class _DashboardPageView extends BasePage {
77 (BuildContext context, Widget scaffold) => Container(
78 decoration: BoxDecoration(
79 gradient: LinearGradient(colors: [
80 - Theme.of(context).accentColor,
80 + Theme.of(context).colorScheme.secondary,
81 Theme.of(context).scaffoldBackgroundColor,
82 Theme.of(context).primaryColor,
83 ], begin: Alignment.topRight, end: Alignment.bottomLeft)),
@@ -99,7 +99,10 @@ class _DashboardPageView extends BasePage {
99 @override
100 Widget trailing(BuildContext context) {
101 final menuButton = Image.asset('assets/images/menu.png',
102 - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!);
102 + color: Theme.of(context)
103 + .accentTextTheme!
104 + .displayMedium!
105 + .backgroundColor);
106
107 return Container(
108 alignment: Alignment.centerRight,
@@ -167,7 +170,7 @@ class _DashboardPageView extends BasePage {
170 dotColor: Theme.of(context).indicatorColor,
171 activeDotColor: Theme.of(context)
172 .accentTextTheme!
170 - .headline4!
173 + .headlineMedium!
174 .backgroundColor!),
175 ),
176 );
@@ -186,7 +189,10 @@ class _DashboardPageView extends BasePage {
189 : Colors.transparent,
190 width: 1,
191 ),
189 - color: Theme.of(context).textTheme.headline6!.backgroundColor!,
192 + color: Theme.of(context)
193 + .textTheme!
194 + .titleLarge!
195 + .backgroundColor!,
196 ),
197 child: Container(
198 padding: EdgeInsets.only(left: 32, right: 32),
@@ -207,12 +213,12 @@ class _DashboardPageView extends BasePage {
213 dashboardViewModel) ??
214 true
215 ? Theme.of(context)
210 - .accentTextTheme
211 - .headline2!
216 + .accentTextTheme!
217 + .displayMedium!
218 .backgroundColor!
219 : Theme.of(context)
214 - .accentTextTheme
215 - .headline3!
220 + .accentTextTheme!
221 + .displaySmall!
222 .backgroundColor!),
223 title: action.name(context),
224 onClick: () async => await action.onTap(
@@ -222,8 +228,8 @@ class _DashboardPageView extends BasePage {
228 true
229 ? null
230 : Theme.of(context)
225 - .accentTextTheme
226 - .headline3!
231 + .accentTextTheme!
232 + .displaySmall!
233 .backgroundColor!,
234 ),
235 ))
lib/src/screens/dashboard/desktop_dashboard_page.dart
+1 -1
@@ -37,7 +37,7 @@ class DesktopDashboardPage extends StatelessWidget {
37 _setEffects(context);
38
39 return Container(
40 - color: Theme.of(context).backgroundColor,
40 + color: Theme.of(context).colorScheme.background,
41 child: Row(
42 crossAxisAlignment: CrossAxisAlignment.start,
43 children: [
lib/src/screens/dashboard/desktop_widgets/desktop_action_button.dart
+13 -4
@@ -30,7 +30,7 @@ class DesktopActionButton extends StatelessWidget {
30 width: double.infinity,
31 decoration: BoxDecoration(
32 borderRadius: BorderRadius.circular(15.0),
33 - color: Theme.of(context).textTheme.headline6!.backgroundColor!,
33 + color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!,
34 ),
35 child: Center(
36 child: Row(
@@ -41,8 +41,14 @@ class DesktopActionButton extends StatelessWidget {
41 height: 30,
42 width: 30,
43 color: isEnabled
44 - ? Theme.of(context).accentTextTheme.headline2!.backgroundColor!
45 - : Theme.of(context).accentTextTheme.headline3!.backgroundColor!,
44 + ? Theme.of(context)
45 + .accentTextTheme!
46 + .displayMedium!
47 + .backgroundColor!
48 + : Theme.of(context)
49 + .accentTextTheme!
50 + .displaySmall!
51 + .backgroundColor!,
52 ),
53 const SizedBox(width: 10),
54 AutoSizeText(
@@ -52,7 +58,10 @@ class DesktopActionButton extends StatelessWidget {
58 fontFamily: 'Lato',
59 fontWeight: FontWeight.bold,
60 color: isEnabled
55 - ? Theme.of(context).accentTextTheme.headline2!.backgroundColor!
61 + ? Theme.of(context)
62 + .accentTextTheme!
63 + .displayMedium!
64 + .backgroundColor!
65 : null,
66 height: 1,
67 ),
lib/src/screens/dashboard/desktop_widgets/desktop_sidebar/side_menu_item.dart
+1 -1
@@ -16,7 +16,7 @@ class SideMenuItem extends StatelessWidget {
16
17 Color _setColor(BuildContext context) {
18 if (isSelected) {
19 - return Theme.of(context).primaryTextTheme.headline6!.color!;
19 + return Theme.of(context).primaryTextTheme!.titleLarge!.color!;
20 } else {
21 return Theme.of(context).highlightColor;
22 }
lib/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart
+1 -1
@@ -126,7 +126,7 @@ class DesktopSidebarWrapper extends BasePage {
126 children: [
127 child,
128 Container(
129 - color: Theme.of(context).backgroundColor,
129 + color: Theme.of(context).colorScheme.background,
130 padding: EdgeInsets.all(20),
131 child: Navigator(
132 initialRoute: Routes.support,
lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart
+4 -4
@@ -36,14 +36,14 @@ class _DesktopWalletSelectionDropDownState extends State<DesktopWalletSelectionD
36 'assets/images/new_wallet.png',
37 height: 12,
38 width: 12,
39 - color: Theme.of(context).primaryTextTheme.headline6!.color!,
39 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
40 );
41
42 Image _restoreWalletImage(BuildContext context) => Image.asset(
43 'assets/images/restore_wallet.png',
44 height: 12,
45 width: 12,
46 - color: Theme.of(context).primaryTextTheme.headline6!.color!,
46 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
47 );
48
49 Flushbar<void>? _progressBar;
@@ -93,8 +93,8 @@ class _DesktopWalletSelectionDropDownState extends State<DesktopWalletSelectionD
93 onChanged: (item) {
94 item?.onSelected();
95 },
96 - dropdownColor: themeData.textTheme.bodyText1?.decorationColor,
97 - style: TextStyle(color: themeData.primaryTextTheme.headline6?.color),
96 + dropdownColor: themeData.textTheme!.bodyLarge?.decorationColor,
97 + style: TextStyle(color: themeData.primaryTextTheme!.titleLarge?.color),
98 selectedItemBuilder: (context) => dropDownItems.map((item) => item.child).toList(),
99 value: dropDownItems.firstWhere((element) => element.isSelected),
100 underline: const SizedBox(),
lib/src/screens/dashboard/desktop_widgets/dropdown_item_widget.dart
+1 -1
@@ -23,7 +23,7 @@ class DropDownItemWidget extends StatelessWidget {
23 style: TextStyle(
24 fontSize: 22,
25 fontWeight: FontWeight.w500,
26 - color: Theme.of(context).primaryTextTheme.headline6!.color!,
26 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
27 ),
28 overflow: TextOverflow.ellipsis,
29 maxLines: 1,
lib/src/screens/dashboard/widgets/action_button.dart
+5 -1
@@ -45,7 +45,11 @@ class ActionButton extends StatelessWidget {
45 title,
46 style: TextStyle(
47 fontSize: 10,
48 - color: textColor ?? Theme.of(context).accentTextTheme!.headline2!.backgroundColor!),
48 + color: textColor ??
49 + Theme.of(context)
50 + .accentTextTheme!
51 + .displayMedium!
52 + .backgroundColor!),
53 )
54 ],
55 ),
lib/src/screens/dashboard/widgets/address_page.dart
+32 -11
@@ -63,7 +63,10 @@ class AddressPage extends BasePage {
63 Widget? leading(BuildContext context) {
64 final _backButton = Icon(
65 Icons.arrow_back_ios,
66 - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
66 + color: Theme.of(context)
67 + .accentTextTheme!
68 + .displayMedium!
69 + .backgroundColor!,
70 size: 16,
71 );
72 final _closeButton = currentTheme.type == ThemeType.dark
@@ -106,7 +109,7 @@ class AddressPage extends BasePage {
109 (BuildContext context, Widget scaffold) => Container(
110 decoration: BoxDecoration(
111 gradient: LinearGradient(colors: [
109 - Theme.of(context).accentColor,
112 + Theme.of(context).colorScheme.secondary,
113 Theme.of(context).scaffoldBackgroundColor,
114 Theme.of(context).primaryColor,
115 ], begin: Alignment.topRight, end: Alignment.bottomLeft)),
@@ -131,7 +134,10 @@ class AddressPage extends BasePage {
134 icon: Icon(
135 Icons.share,
136 size: 20,
134 - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
137 + color: Theme.of(context)
138 + .accentTextTheme!
139 + .displayMedium!
140 + .backgroundColor!,
141 ),
142 ),
143 );
@@ -172,7 +178,10 @@ class AddressPage extends BasePage {
178 tapOutsideToDismiss: true,
179 config: KeyboardActionsConfig(
180 keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
175 - keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!,
181 + keyboardBarColor: Theme.of(context)
182 + .accentTextTheme!
183 + .bodyLarge!
184 + .backgroundColor!,
185 nextFocus: false,
186 actions: [
187 KeyboardActionsItem(
@@ -204,8 +213,15 @@ class AddressPage extends BasePage {
213 decoration: BoxDecoration(
214 borderRadius: BorderRadius.all(Radius.circular(25)),
215 border: Border.all(
207 - color: Theme.of(context).textTheme.subtitle1!.color!, width: 1),
208 - color: Theme.of(context).buttonColor),
216 + color: Theme.of(context)
217 + .textTheme!
218 + .titleMedium!
219 + .color!,
220 + width: 1),
221 + color: Theme.of(context)
222 + .textTheme!
223 + .titleLarge!
224 + .backgroundColor!),
225 child: Row(
226 mainAxisSize: MainAxisSize.max,
227 mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -219,15 +235,17 @@ class AddressPage extends BasePage {
235 fontSize: 14,
236 fontWeight: FontWeight.w500,
237 color: Theme.of(context)
222 - .accentTextTheme
223 - .headline2!
238 + .accentTextTheme!
239 + .displayMedium!
240 .backgroundColor!),
241 )),
242 Icon(
243 Icons.arrow_forward_ios,
244 size: 14,
229 - color:
230 - Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
245 + color: Theme.of(context)
246 + .accentTextTheme!
247 + .displayMedium!
248 + .backgroundColor!,
249 )
250 ],
251 ),
@@ -237,7 +255,10 @@ class AddressPage extends BasePage {
255 textAlign: TextAlign.center,
256 style: TextStyle(
257 fontSize: 15,
240 - color: Theme.of(context).accentTextTheme.headline3!.backgroundColor!));
258 + color: Theme.of(context)
259 + .accentTextTheme!
260 + .displaySmall!
261 + .backgroundColor!));
262 })
263 ],
264 ),
lib/src/screens/dashboard/widgets/anonpay_transaction_row.dart
+3 -3
@@ -37,19 +37,19 @@ class AnonpayTransactionRow extends StatelessWidget {
37 style: TextStyle(
38 fontSize: 16,
39 fontWeight: FontWeight.w500,
40 - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!)),
40 + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!)),
41 Text(amount + ' ' + currency,
42 style: TextStyle(
43 fontSize: 16,
44 fontWeight: FontWeight.w500,
45 - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!))
45 + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!))
46 ]),
47 SizedBox(height: 5),
48 Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: <Widget>[
49 Text(createdAt,
50 style: TextStyle(
51 fontSize: 14,
52 - color: Theme.of(context).textTheme.overline!.backgroundColor!))
52 + color: Theme.of(context).textTheme!.labelSmall!.backgroundColor!))
53 ])
54 ],
55 ))
lib/src/screens/dashboard/widgets/balance_page.dart
+45 -12
@@ -35,7 +35,10 @@ class BalancePage extends StatelessWidget {
35 fontSize: 24,
36 fontFamily: 'Lato',
37 fontWeight: FontWeight.w600,
38 - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
38 + color: Theme.of(context)
39 + .accentTextTheme!
40 + .displayMedium!
41 + .backgroundColor!,
42 height: 1),
43 maxLines: 1,
44 textAlign: TextAlign.center);
@@ -98,7 +101,7 @@ class BalancePage extends StatelessWidget {
101 : Colors.transparent,
102 width: 1,
103 ),
101 - color: Theme.of(context).textTheme!.headline6!.backgroundColor!),
104 + color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!),
105 child: Container(
106 margin: const EdgeInsets.only(top: 16, left: 24, right: 24, bottom: 24),
107 child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
@@ -111,7 +114,10 @@ class BalancePage extends StatelessWidget {
114 fontSize: 12,
115 fontFamily: 'Lato',
116 fontWeight: FontWeight.w400,
114 - color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!,
117 + color: Theme.of(context)
118 + .accentTextTheme!
119 + .displaySmall!
120 + .backgroundColor!,
121 height: 1)),
122 SizedBox(height: 5),
123 Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
@@ -120,7 +126,10 @@ class BalancePage extends StatelessWidget {
126 fontSize: 24,
127 fontFamily: 'Lato',
128 fontWeight: FontWeight.w900,
123 - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
129 + color: Theme.of(context)
130 + .accentTextTheme!
131 + .displayMedium!
132 + .backgroundColor!,
133 height: 1),
134 maxLines: 1,
135 textAlign: TextAlign.center),
@@ -129,7 +138,10 @@ class BalancePage extends StatelessWidget {
138 fontSize: 28,
139 fontFamily: 'Lato',
140 fontWeight: FontWeight.w800,
132 - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
141 + color: Theme.of(context)
142 + .accentTextTheme!
143 + .displayMedium!
144 + .backgroundColor!,
145 height: 1)),
146 ]),
147 SizedBox(
@@ -141,7 +153,10 @@ class BalancePage extends StatelessWidget {
153 fontSize: 16,
154 fontFamily: 'Lato',
155 fontWeight: FontWeight.w500,
144 - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
156 + color: Theme.of(context)
157 + .accentTextTheme!
158 + .displayMedium!
159 + .backgroundColor!,
160 height: 1)),
161 SizedBox(height: 26),
162 if (frozenBalance.isNotEmpty)
@@ -152,7 +167,10 @@ class BalancePage extends StatelessWidget {
167 fontSize: 12,
168 fontFamily: 'Lato',
169 fontWeight: FontWeight.w400,
155 - color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!,
170 + color: Theme.of(context)
171 + .accentTextTheme!
172 + .displaySmall!
173 + .backgroundColor!,
174 height: 1)),
175 SizedBox(height: 8),
176 AutoSizeText(frozenBalance,
@@ -160,7 +178,10 @@ class BalancePage extends StatelessWidget {
178 fontSize: 20,
179 fontFamily: 'Lato',
180 fontWeight: FontWeight.w400,
163 - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
181 + color: Theme.of(context)
182 + .accentTextTheme!
183 + .displayMedium!
184 + .backgroundColor!,
185 height: 1),
186 maxLines: 1,
187 textAlign: TextAlign.center),
@@ -172,7 +193,10 @@ class BalancePage extends StatelessWidget {
193 fontSize: 12,
194 fontFamily: 'Lato',
195 fontWeight: FontWeight.w400,
175 - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
196 + color: Theme.of(context)
197 + .accentTextTheme!
198 + .displayMedium!
199 + .backgroundColor!,
200 height: 1),
201 ),
202 SizedBox(height: 24)
@@ -183,7 +207,10 @@ class BalancePage extends StatelessWidget {
207 fontSize: 12,
208 fontFamily: 'Lato',
209 fontWeight: FontWeight.w400,
186 - color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!,
210 + color: Theme.of(context)
211 + .accentTextTheme!
212 + .displaySmall!
213 + .backgroundColor!,
214 height: 1)),
215 SizedBox(height: 8),
216 AutoSizeText(additionalBalance,
@@ -191,7 +218,10 @@ class BalancePage extends StatelessWidget {
218 fontSize: 20,
219 fontFamily: 'Lato',
220 fontWeight: FontWeight.w400,
194 - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
221 + color: Theme.of(context)
222 + .accentTextTheme!
223 + .displayMedium!
224 + .backgroundColor!,
225 height: 1),
226 maxLines: 1,
227 textAlign: TextAlign.center),
@@ -205,7 +235,10 @@ class BalancePage extends StatelessWidget {
235 fontSize: 12,
236 fontFamily: 'Lato',
237 fontWeight: FontWeight.w400,
208 - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
238 + color: Theme.of(context)
239 + .accentTextTheme!
240 + .displayMedium!
241 + .backgroundColor!,
242 height: 1),
243 )
244 ])),
lib/src/screens/dashboard/widgets/date_section_raw.dart
+4 -1
@@ -36,6 +36,9 @@ class DateSectionRaw extends StatelessWidget {
36 child: Text(title,
37 style: TextStyle(
38 fontSize: 12,
39 - color: Theme.of(context).textTheme!.overline!.backgroundColor!)));
39 + color: Theme.of(context)
40 + .textTheme!
41 + .labelSmall!
42 + .backgroundColor!)));
43 }
44 }
lib/src/screens/dashboard/widgets/filter_widget.dart
+4 -4
@@ -23,7 +23,7 @@ class FilterWidget extends StatelessWidget {
23 child: ClipRRect(
24 borderRadius: BorderRadius.all(Radius.circular(24)),
25 child: Container(
26 - color: Theme.of(context).textTheme!.bodyText1!.decorationColor!,
26 + color: Theme.of(context).textTheme!.bodyLarge!.decorationColor!,
27 child: Column(
28 crossAxisAlignment: CrossAxisAlignment.start,
29 children: [
@@ -33,8 +33,8 @@ class FilterWidget extends StatelessWidget {
33 S.of(context).filter_by,
34 style: TextStyle(
35 color: Theme.of(context)
36 - .primaryTextTheme
37 - .overline!
36 + .primaryTextTheme!
37 + .labelSmall!
38 .color!,
39 fontSize: 16,
40 fontFamily: 'Lato',
@@ -65,7 +65,7 @@ class FilterWidget extends StatelessWidget {
65 style: TextStyle(
66 color: Theme.of(context)
67 .primaryTextTheme!
68 - .headline6!
68 + .titleLarge!
69 .color!,
70 fontSize: 16,
71 fontFamily: 'Lato',
lib/src/screens/dashboard/widgets/header_row.dart
+8 -7
@@ -12,7 +12,7 @@ class HeaderRow extends StatelessWidget {
12 @override
13 Widget build(BuildContext context) {
14 final filterIcon = Image.asset('assets/images/filter_icon.png',
15 - color: Theme.of(context).textTheme!.caption!.decorationColor!);
15 + color: Theme.of(context).textTheme!.bodySmall!.decorationColor!);
16
17 return Container(
18 height: 52,
@@ -25,10 +25,12 @@ class HeaderRow extends StatelessWidget {
25 Text(
26 S.of(context).transactions,
27 style: TextStyle(
28 - fontSize: 20,
29 - fontWeight: FontWeight.w500,
30 - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!
31 - ),
28 + fontSize: 20,
29 + fontWeight: FontWeight.w500,
30 + color: Theme.of(context)
31 + .accentTextTheme!
32 + .displayMedium!
33 + .backgroundColor!),
34 ),
35 GestureDetector(
36 onTap: () {
@@ -43,8 +45,7 @@ class HeaderRow extends StatelessWidget {
45 width: 36,
46 decoration: BoxDecoration(
47 shape: BoxShape.circle,
46 - color: Theme.of(context).textTheme!.overline!.color!
47 - ),
48 + color: Theme.of(context).textTheme!.labelSmall!.color!),
49 child: filterIcon,
50 ),
51 )
lib/src/screens/dashboard/widgets/market_place_page.dart
+5 -2
@@ -22,7 +22,7 @@ class MarketPlacePage extends StatelessWidget {
22 child: RawScrollbar(
23 thumbColor: Colors.white.withOpacity(0.15),
24 radius: Radius.circular(20),
25 - isAlwaysShown: true,
25 + thumbVisibility: true,
26 thickness: 2,
27 controller: _scrollController,
28 child: Padding(
@@ -36,7 +36,10 @@ class MarketPlacePage extends StatelessWidget {
36 style: TextStyle(
37 fontSize: 24,
38 fontWeight: FontWeight.w500,
39 - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
39 + color: Theme.of(context)
40 + .accentTextTheme!
41 + .displayMedium!
42 + .backgroundColor!,
43 ),
44 ),
45 Expanded(
lib/src/screens/dashboard/widgets/menu_widget.dart
+24 -9
@@ -84,9 +84,15 @@ class MenuWidgetState extends State<MenuWidget> {
84 final itemCount = SettingActions.all.length;
85
86 moneroIcon = Image.asset('assets/images/monero_menu.png',
87 - color: Theme.of(context).accentTextTheme.overline!.decorationColor!);
87 + color: Theme.of(context)
88 + .accentTextTheme!
89 + .labelSmall!
90 + .decorationColor!);
91 bitcoinIcon = Image.asset('assets/images/bitcoin_menu.png',
89 - color: Theme.of(context).accentTextTheme.overline!.decorationColor!);
92 + color: Theme.of(context)
93 + .accentTextTheme!
94 + .labelSmall!
95 + .decorationColor!);
96 litecoinIcon = Image.asset('assets/images/litecoin_menu.png');
97 havenIcon = Image.asset('assets/images/haven_menu.png');
98
@@ -108,7 +114,8 @@ class MenuWidgetState extends State<MenuWidget> {
114 borderRadius: BorderRadius.only(
115 topLeft: Radius.circular(24), bottomLeft: Radius.circular(24)),
116 child: Container(
111 - color: Theme.of(context).textTheme.bodyText1!.decorationColor!,
117 + color:
118 + Theme.of(context).textTheme!.bodyLarge!.decorationColor!,
119 child: ListView.separated(
120 padding: EdgeInsets.only(top: 0),
121 itemBuilder: (_, index) {
@@ -117,9 +124,14 @@ class MenuWidgetState extends State<MenuWidget> {
124 height: headerHeight,
125 decoration: BoxDecoration(
126 gradient: LinearGradient(colors: [
120 - Theme.of(context).accentTextTheme.headline4!.color!,
121 - Theme.of(context).accentTextTheme.headline4!.decorationColor!,
122 - ], begin: Alignment.topLeft, end: Alignment.bottomRight),
127 + Theme.of(context)
128 + .accentTextTheme!
129 + .headlineMedium!
130 + .color!,
131 + Theme.of(context)
132 + .accentTextTheme!
133 + .headlineMedium!
134 + .decorationColor!, ], begin: Alignment.topLeft, end: Alignment.bottomRight),
135 ),
136 padding: EdgeInsets.only(
137 left: 24, top: fromTopEdge, right: 24, bottom: fromBottomEdge),
@@ -149,8 +161,8 @@ class MenuWidgetState extends State<MenuWidget> {
161 widget.dashboardViewModel.subname,
162 style: TextStyle(
163 color: Theme.of(context)
152 - .accentTextTheme
153 - .overline!
164 + .accentTextTheme!
165 + .labelSmall!
166 .decorationColor!,
167 fontWeight: FontWeight.w500,
168 fontSize: 12),
@@ -182,7 +194,10 @@ class MenuWidgetState extends State<MenuWidget> {
194 },
195 separatorBuilder: (_, index) => Container(
196 height: 1,
185 - color: Theme.of(context).primaryTextTheme.caption!.decorationColor!,
197 + color: Theme.of(context)
198 + .primaryTextTheme!
199 + .bodySmall!
200 + .decorationColor!,
201 ),
202 itemCount: itemCount + 1),
203 )))
lib/src/screens/dashboard/widgets/order_row.dart
+7 -5
@@ -20,7 +20,7 @@ class OrderRow extends StatelessWidget {
20 @override
21 Widget build(BuildContext context) {
22 final iconColor =
23 - Theme.of(context).primaryTextTheme!.headline1!.backgroundColor!;
23 + Theme.of(context).primaryTextTheme!.displayLarge!.backgroundColor!;
24
25 final providerIcon = getBuyProviderIcon(provider, iconColor: iconColor);
26
@@ -48,14 +48,14 @@ class OrderRow extends StatelessWidget {
48 style: TextStyle(
49 fontSize: 16,
50 fontWeight: FontWeight.w500,
51 - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!
51 + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!
52 )),
53 formattedAmount != null
54 ? Text(formattedAmount! + ' ' + to,
55 style: TextStyle(
56 fontSize: 16,
57 fontWeight: FontWeight.w500,
58 - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!
58 + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!
59 ))
60 : Container()
61 ]),
@@ -66,8 +66,10 @@ class OrderRow extends StatelessWidget {
66 Text(createdAtFormattedDate,
67 style: TextStyle(
68 fontSize: 14,
69 - color: Theme.of(context).textTheme!
70 - .overline!.backgroundColor!))
69 + color: Theme.of(context)
70 + .textTheme!
71 + .labelSmall!
72 + .backgroundColor!))
73 ])
74 ],
75 )
lib/src/screens/dashboard/widgets/present_receive_option_picker.dart
+9 -3
@@ -18,7 +18,10 @@ class PresentReceiveOptionPicker extends StatelessWidget {
18 @override
19 Widget build(BuildContext context) {
20 final textIconTheme = hasWhiteBackground
21 - ? Theme.of(context).accentTextTheme.headline2!.backgroundColor!
21 + ? Theme.of(context)
22 + .accentTextTheme!
23 + .displayMedium!
24 + .backgroundColor!
25 : Colors.white;
26 final arrowBottom = Image.asset(
27 'assets/images/arrow_bottom_purple_icon.png',
@@ -83,7 +86,7 @@ class PresentReceiveOptionPicker extends StatelessWidget {
86 margin: EdgeInsets.symmetric(horizontal: 24),
87 decoration: BoxDecoration(
88 borderRadius: BorderRadius.circular(30),
86 - color: Theme.of(context).backgroundColor,
89 + color: Theme.of(context).colorScheme.background,
90 ),
91 child: Padding(
92 padding: const EdgeInsets.only(top: 24, bottom: 24),
@@ -110,7 +113,10 @@ class PresentReceiveOptionPicker extends StatelessWidget {
113 Text(option.toString(),
114 textAlign: TextAlign.left,
115 style: textSmall(
113 - color: Theme.of(context).primaryTextTheme.headline6!.color!,
116 + color: Theme.of(context)
117 + .primaryTextTheme!
118 + .titleLarge!
119 + .color!,
120 ).copyWith(
121 fontWeight:
122 value == option ? FontWeight.w800 : FontWeight.w500,
lib/src/screens/dashboard/widgets/sync_indicator.dart
+3 -3
@@ -32,7 +32,7 @@ class SyncIndicator extends StatelessWidget {
32 child: Container(
33 height: 30,
34 width: syncIndicatorWidth,
35 - color: Theme.of(context).textTheme!.headline6!.decorationColor!,
35 + color: Theme.of(context).textTheme!.titleLarge!.decorationColor!,
36 child: Stack(
37 alignment: Alignment.center,
38 children: <Widget>[
@@ -44,7 +44,7 @@ class SyncIndicator extends StatelessWidget {
44 child: Container(
45 width: indicatorWidth,
46 height: 30,
47 - color: Theme.of(context).textTheme!.headline6!.backgroundColor!,
47 + color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!,
48 )
49 )
50 : Offstage(),
@@ -66,7 +66,7 @@ class SyncIndicator extends StatelessWidget {
66 style: TextStyle(
67 fontSize: 12,
68 fontWeight: FontWeight.w500,
69 - color: Theme.of(context).textTheme!.headline6!.color!
69 + color: Theme.of(context).textTheme!.titleLarge!.color!
70 ),
71 ),
72 )
lib/src/screens/dashboard/widgets/sync_indicator_icon.dart
+3 -2
@@ -26,14 +26,15 @@ class SyncIndicatorIcon extends StatelessWidget {
26 if (boolMode) {
27 indicatorColor = isSynced
28 ? PaletteDark.brightGreen
29 - : Theme.of(context).textTheme!.caption!.color!;
29 + : Theme.of(context).textTheme!.bodySmall!.color!;
30 } else {
31 switch (value.toLowerCase()) {
32 case waiting:
33 indicatorColor = Colors.red;
34 break;
35 case actionRequired:
36 - indicatorColor = Theme.of(context).textTheme!.headline2!.decorationColor!;
36 + indicatorColor =
37 + Theme.of(context).textTheme!.displayMedium!.decorationColor!;
38 break;
39 case created:
40 indicatorColor = PaletteDark.brightGreen;
lib/src/screens/dashboard/widgets/trade_row.dart
+3 -3
@@ -43,14 +43,14 @@ class TradeRow extends StatelessWidget {
43 style: TextStyle(
44 fontSize: 16,
45 fontWeight: FontWeight.w500,
46 - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!)),
46 + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!)),
47 formattedAmount != null
48 ? Text(formattedAmount! + ' ' + amountCrypto,
49 style: TextStyle(
50 fontSize: 16,
51 fontWeight: FontWeight.w500,
52 color:
53 - Theme.of(context).accentTextTheme!.headline2!.backgroundColor!))
53 + Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!))
54 : Container()
55 ]),
56 SizedBox(height: 5),
@@ -59,7 +59,7 @@ class TradeRow extends StatelessWidget {
59 Text(createdAtFormattedDate!,
60 style: TextStyle(
61 fontSize: 14,
62 - color: Theme.of(context).textTheme!.overline!.backgroundColor!))
62 + color: Theme.of(context).textTheme!.labelSmall!.backgroundColor!))
63 ])
64 ],
65 ))
lib/src/screens/dashboard/widgets/transaction_raw.dart
+5 -5
@@ -35,7 +35,7 @@ class TransactionRow extends StatelessWidget {
35 width: 36,
36 decoration: BoxDecoration(
37 shape: BoxShape.circle,
38 - color: Theme.of(context).textTheme!.overline!.decorationColor!
38 + color: Theme.of(context).textTheme!.labelSmall!.decorationColor!
39 ),
40 child: Image.asset(
41 direction == TransactionDirection.incoming
@@ -55,13 +55,13 @@ class TransactionRow extends StatelessWidget {
55 fontSize: 16,
56 fontWeight: FontWeight.w500,
57 color: Theme.of(context).accentTextTheme!
58 - .headline2!.backgroundColor!)),
58 + .displayMedium!.backgroundColor!)),
59 Text(formattedAmount,
60 style: TextStyle(
61 fontSize: 16,
62 fontWeight: FontWeight.w500,
63 color: Theme.of(context).accentTextTheme!
64 - .headline2!.backgroundColor!))
64 + .displayMedium!.backgroundColor!))
65 ]),
66 SizedBox(height: 5),
67 Row(
@@ -72,14 +72,14 @@ class TransactionRow extends StatelessWidget {
72 fontSize: 14,
73 color: Theme.of(context)
74 .textTheme!
75 - .overline!
75 + .labelSmall!
76 .backgroundColor!)),
77 Text(formattedFiatAmount,
78 style: TextStyle(
79 fontSize: 14,
80 color: Theme.of(context)
81 .textTheme!
82 - .overline!
82 + .labelSmall!
83 .backgroundColor!))
84 ])
85 ],
lib/src/screens/dashboard/widgets/transactions_page.dart
+2 -2
@@ -28,7 +28,7 @@ class TransactionsPage extends StatelessWidget {
28 return Container(
29 color: ResponsiveLayoutUtil.instance.isMobile(context)
30 ? null
31 - : Theme.of(context).backgroundColor,
31 + : Theme.of(context).colorScheme.background,
32 padding: EdgeInsets.only(top: 24, bottom: 24),
33 child: Column(
34 children: <Widget>[
@@ -121,7 +121,7 @@ class TransactionsPage extends StatelessWidget {
121 S.of(context).placeholder_transactions,
122 style: TextStyle(
123 fontSize: 14,
124 - color: Theme.of(context).primaryTextTheme.overline!.decorationColor!),
124 + color: Theme.of(context).primaryTextTheme!.labelSmall!.decorationColor!),
125 ),
126 );
127 }))
lib/src/screens/disclaimer/disclaimer_page.dart
+11 -11
@@ -67,7 +67,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
67 return WillPopScope(
68 onWillPop: () async => false,
69 child: Container(
70 - color: Theme.of(context).backgroundColor,
70 + color: Theme.of(context).colorScheme.background,
71 child: Column(
72 children: <Widget>[
73 SizedBox(height: 10.0),
@@ -89,7 +89,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
89 fontWeight: FontWeight.bold,
90 color: Theme.of(context)
91 .primaryTextTheme!
92 - .headline6!
92 + .titleLarge!
93 .color!),
94 ),
95 )
@@ -109,7 +109,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
109 fontWeight: FontWeight.bold,
110 color: Theme.of(context)
111 .primaryTextTheme!
112 - .headline6!
112 + .titleLarge!
113 .color!),
114 ),
115 )
@@ -128,7 +128,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
128 fontWeight: FontWeight.normal,
129 color: Theme.of(context)
130 .primaryTextTheme!
131 - .headline6!
131 + .titleLarge!
132 .color!),
133 ))
134 ],
@@ -148,7 +148,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
148 fontWeight: FontWeight.bold,
149 color: Theme.of(context)
150 .primaryTextTheme!
151 - .headline6!
151 + .titleLarge!
152 .color!),
153 ),
154 )
@@ -195,7 +195,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
195 Theme.of(context)
196 .backgroundColor
197 .withOpacity(0.0),
198 - Theme.of(context).backgroundColor,
198 + Theme.of(context).colorScheme.background,
199 ],
200 begin: FractionalOffset.topCenter,
201 end: FractionalOffset.bottomCenter,
@@ -234,12 +234,12 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
234 border: Border.all(
235 color: Theme.of(context)
236 .primaryTextTheme!
237 - .caption!
237 + .bodySmall!
238 .color!,
239 width: 1.0),
240 borderRadius: BorderRadius.all(
241 Radius.circular(8.0)),
242 - color: Theme.of(context).backgroundColor),
242 + color: Theme.of(context).colorScheme.background),
243 child: _checked
244 ? Icon(
245 Icons.check,
@@ -255,7 +255,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
255 fontSize: 14.0,
256 color: Theme.of(context)
257 .primaryTextTheme!
258 - .headline6!
258 + .titleLarge!
259 .color!),
260 )
261 ],
@@ -275,11 +275,11 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
275 text: 'Accept',
276 color: Theme.of(context)
277 .accentTextTheme!
278 - .subtitle2!
278 + .titleSmall!
279 .decorationColor!,
280 textColor: Theme.of(context)
281 .accentTextTheme!
282 - .headline5!
282 + .headlineSmall!
283 .decorationColor!),
284 ),
285 ],
lib/src/screens/exchange/exchange_page.dart
+6 -6
@@ -151,7 +151,7 @@ class ExchangePage extends BasePage {
151 config: KeyboardActionsConfig(
152 keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
153 keyboardBarColor:
154 - Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!,
154 + Theme.of(context).accentTextTheme!.bodyLarge!.backgroundColor!,
155 nextFocus: false,
156 actions: [
157 KeyboardActionsItem(
@@ -162,7 +162,7 @@ class ExchangePage extends BasePage {
162 toolbarButtons: [(_) => KeyboardDoneButton()])
163 ]),
164 child: Container(
165 - color: Theme.of(context).backgroundColor,
165 + color: Theme.of(context).colorScheme.background,
166 child: Form(
167 key: _formKey,
168 child: ScrollableWithBottomSection(
@@ -209,7 +209,7 @@ class ExchangePage extends BasePage {
209 style: TextStyle(
210 color: Theme.of(context)
211 .primaryTextTheme!
212 - .headline1!
212 + .displayLarge!
213 .decorationColor!,
214 fontWeight: FontWeight.w500,
215 fontSize: 12),
@@ -243,7 +243,7 @@ class ExchangePage extends BasePage {
243 }
244 }
245 },
246 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
246 + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
247 textColor: Colors.white,
248 isDisabled: exchangeViewModel.selectedProviders.isEmpty,
249 isLoading: exchangeViewModel.tradeState is TradeIsCreating)),
@@ -654,7 +654,7 @@ class ExchangePage extends BasePage {
654 imageArrow: arrowBottomPurple,
655 currencyButtonColor: Colors.transparent,
656 addressButtonsColor: Theme.of(context).focusColor!,
657 - borderColor: Theme.of(context).primaryTextTheme!.bodyText1!.color!,
657 + borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.color!,
658 currencyValueValidator: (value) {
659 return !exchangeViewModel.isFixedRateMode
660 ? AmountValidator(
@@ -704,7 +704,7 @@ class ExchangePage extends BasePage {
704 currencyButtonColor: Colors.transparent,
705 addressButtonsColor: Theme.of(context).focusColor!,
706 borderColor:
707 - Theme.of(context).primaryTextTheme!.bodyText1!.decorationColor!,
707 + Theme.of(context).primaryTextTheme!.bodyLarge!.decorationColor!,
708 currencyValueValidator: (value) {
709 return exchangeViewModel.isFixedRateMode
710 ? AmountValidator(
lib/src/screens/exchange/exchange_template_page.dart
+12 -10
@@ -73,8 +73,10 @@ class ExchangeTemplatePage extends BasePage {
73 disableScroll: true,
74 config: KeyboardActionsConfig(
75 keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
76 - keyboardBarColor:
77 - Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!,
76 + keyboardBarColor: Theme.of(context)
77 + .accentTextTheme!
78 + .bodyLarge!
79 + .backgroundColor!,
80 nextFocus: false,
81 actions: [
82 KeyboardActionsItem(
@@ -85,7 +87,7 @@ class ExchangeTemplatePage extends BasePage {
87 toolbarButtons: [(_) => KeyboardDoneButton()])
88 ]),
89 child: Container(
88 - color: Theme.of(context).backgroundColor,
90 + color: Theme.of(context).colorScheme.background,
91 child: Form(
92 key: _formKey,
93 child: ScrollableWithBottomSection(
@@ -99,8 +101,8 @@ class ExchangeTemplatePage extends BasePage {
101 ),
102 gradient: LinearGradient(
103 colors: [
102 - Theme.of(context).primaryTextTheme.bodyText2!.color!,
103 - Theme.of(context).primaryTextTheme.bodyText2!.decorationColor!,
104 + Theme.of(context).primaryTextTheme!.bodyMedium!.color!,
105 + Theme.of(context).primaryTextTheme!.bodyMedium!.decorationColor!,
106 ],
107 stops: [0.35, 1.0],
108 begin: Alignment.topLeft,
@@ -119,10 +121,10 @@ class ExchangeTemplatePage extends BasePage {
121 gradient: LinearGradient(
122 colors: [
123 Theme.of(context)
122 - .primaryTextTheme.subtitle2!
124 + .primaryTextTheme!.titleSmall!
125 .color!,
126 Theme.of(context)
125 - .primaryTextTheme.subtitle2!
127 + .primaryTextTheme!.titleSmall!
128 .decorationColor!,
129 ],
130 begin: Alignment.topLeft,
@@ -157,7 +159,7 @@ class ExchangeTemplatePage extends BasePage {
159 addressButtonsColor:
160 Theme.of(context).focusColor,
161 borderColor: Theme.of(context)
160 - .primaryTextTheme.bodyText1!
162 + .primaryTextTheme!.bodyLarge!
163 .color!,
164 currencyValueValidator: AmountValidator(
165 currency: exchangeViewModel.depositCurrency),
@@ -197,7 +199,7 @@ class ExchangeTemplatePage extends BasePage {
199 addressButtonsColor:
200 Theme.of(context).focusColor,
201 borderColor: Theme.of(context)
200 - .primaryTextTheme.bodyText1!
202 + .primaryTextTheme!.bodyLarge!
203 .decorationColor!,
204 currencyValueValidator: AmountValidator(
205 currency: exchangeViewModel.receiveCurrency),
@@ -225,7 +227,7 @@ class ExchangeTemplatePage extends BasePage {
227 textAlign: TextAlign.center,
228 style: TextStyle(
229 color: Theme.of(context)
228 - .primaryTextTheme.headline1!
230 + .primaryTextTheme!.displayLarge!
231 .decorationColor!,
232 fontWeight: FontWeight.w500,
233 fontSize: 12),
lib/src/screens/exchange/widgets/currency_picker_item_widget.dart
+26 -5
@@ -20,7 +20,10 @@ class PickerItemWidget extends StatelessWidget {
20 return GestureDetector(
21 onTap: onTap,
22 child: Container(
23 - color: Theme.of(context).accentTextTheme!.headline6!.color!,
23 + color: Theme.of(context)
24 + .accentTextTheme!
25 + .titleLarge!
26 + .color!,
27 child: Padding(
28 padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 24),
29 child: Row(
@@ -39,7 +42,12 @@ class PickerItemWidget extends StatelessWidget {
42 Text(
43 title.toUpperCase(),
44 style: TextStyle(
42 - color: isSelected ? Palette.blueCraiola : Theme.of(context).primaryTextTheme!.headline6!.color!,
45 + color: isSelected
46 + ? Palette.blueCraiola
47 + : Theme.of(context)
48 + .primaryTextTheme!
49 + .titleLarge!
50 + .color!,
51 fontSize: isSelected ? 16 : 14.0,
52 fontFamily: 'Lato',
53 fontWeight: FontWeight.w600,
@@ -55,20 +63,33 @@ class PickerItemWidget extends StatelessWidget {
63 child: Text(
64 tag!,
65 style: TextStyle(
58 - fontSize: 7.0, fontFamily: 'Lato', color: Theme.of(context).textTheme!.bodyText2!.color!),
66 + fontSize: 7.0,
67 + fontFamily: 'Lato',
68 + color: Theme.of(context)
69 + .textTheme!
70 + .bodyMedium!
71 + .color!),
72 ),
73 ),
74 decoration: BoxDecoration(
75 borderRadius: BorderRadius.circular(6.0),
76 //border: Border.all(color: ),
64 - color: Theme.of(context).textTheme!.bodyText2!.decorationColor!,
77 + color: Theme.of(context)
78 + .textTheme!
79 + .bodyMedium!
80 + .decorationColor!,
81 ),
82 ),
83 ),
84 ],
85 ),
86 ),
71 - if (isSelected) Icon(Icons.check_circle, color: Theme.of(context).accentTextTheme!.bodyText1!.color!)
87 + if (isSelected)
88 + Icon(Icons.check_circle,
89 + color: Theme.of(context)
90 + .accentTextTheme!
91 + .bodyLarge!
92 + .color!)
93 ],
94 ),
95 ),
lib/src/screens/exchange/widgets/currency_picker_widget.dart
+4 -1
@@ -20,7 +20,10 @@ class CurrencyPickerWidget extends StatelessWidget {
20 @override
21 Widget build(BuildContext context) {
22 return Container(
23 - color: Theme.of(context).accentTextTheme!.headline6!.backgroundColor!,
23 + color: Theme.of(context)
24 + .accentTextTheme!
25 + .titleLarge!
26 + .backgroundColor!,
27 child: Scrollbar(
28 controller: _scrollController,
29 child: GridView.builder(
lib/src/screens/exchange/widgets/exchange_card.dart
+31 -15
@@ -160,7 +160,7 @@ class ExchangeCardState extends State<ExchangeCard> {
160 final copyImage = Image.asset('assets/images/copy_content.png',
161 height: 16,
162 width: 16,
163 - color: Theme.of(context).primaryTextTheme.headline3!.color!);
163 + color: Theme.of(context).primaryTextTheme!.displaySmall!.color!);
164
165 return Container(
166 width: double.infinity,
@@ -175,7 +175,7 @@ class ExchangeCardState extends State<ExchangeCard> {
175 style: TextStyle(
176 fontSize: 18,
177 fontWeight: FontWeight.w600,
178 - color: Theme.of(context).textTheme.headline5!.color!),
178 + color: Theme.of(context).textTheme!.headlineSmall!.color!),
179 )
180 ],
181 ),
@@ -210,7 +210,11 @@ class ExchangeCardState extends State<ExchangeCard> {
210 child: Container(
211 height: 32,
212 decoration: BoxDecoration(
213 - color: widget.addressButtonsColor ?? Theme.of(context).primaryTextTheme.headline4!.color!,
213 + color: widget.addressButtonsColor ??
214 + Theme.of(context)
215 + .primaryTextTheme!
216 + .headlineMedium!
217 + .color!,
218 borderRadius:
219 BorderRadius.all(Radius.circular(6))),
220 child: Center(
@@ -221,7 +225,8 @@ class ExchangeCardState extends State<ExchangeCard> {
225 fontSize: 12,
226 fontWeight: FontWeight.bold,
227 color: Theme.of(context)
224 - .primaryTextTheme.headline4!
228 + .primaryTextTheme!
229 + .headlineMedium!
230 .decorationColor!)),
231 ),
232 ),
@@ -264,7 +269,8 @@ class ExchangeCardState extends State<ExchangeCard> {
269 fontSize: 16,
270 fontWeight: FontWeight.w600,
271 color: Theme.of(context)
267 - .accentTextTheme.headline1!
272 + .accentTextTheme!
273 + .displayLarge!
274 .decorationColor!),
275 validator: _isAmountEditable
276 ? widget.currencyValueValidator
@@ -277,7 +283,8 @@ class ExchangeCardState extends State<ExchangeCard> {
283 width: 32,
284 decoration: BoxDecoration(
285 color: Theme.of(context)
280 - .primaryTextTheme.headline4!
286 + .primaryTextTheme!
287 + .headlineMedium!
288 .color!,
289 borderRadius:
290 BorderRadius.all(Radius.circular(6))),
@@ -290,7 +297,8 @@ class ExchangeCardState extends State<ExchangeCard> {
297 fontSize: 12,
298 fontWeight: FontWeight.bold,
299 color: Theme.of(context)
293 - .primaryTextTheme.headline4!
300 + .primaryTextTheme!
301 + .headlineMedium!
302 .decorationColor!)),
303 ),
304 ),
@@ -300,9 +308,12 @@ class ExchangeCardState extends State<ExchangeCard> {
308 ),
309 ],
310 )),
303 - Divider(height: 1,color: Theme.of(context)
304 - .primaryTextTheme.headline5!
305 - .decorationColor!),
311 + Divider(
312 + height: 1,
313 + color: Theme.of(context)
314 + .primaryTextTheme!
315 + .headlineSmall!
316 + .decorationColor!),
317 Padding(
318 padding: EdgeInsets.only(top: 5),
319 child: Container(
@@ -319,7 +330,8 @@ class ExchangeCardState extends State<ExchangeCard> {
330 fontSize: 10,
331 height: 1.2,
332 color: Theme.of(context)
322 - .accentTextTheme.headline1!
333 + .accentTextTheme!
334 + .displayLarge!
335 .decorationColor!),
336 )
337 : Offstage(),
@@ -333,7 +345,8 @@ class ExchangeCardState extends State<ExchangeCard> {
345 fontSize: 10,
346 height: 1.2,
347 color: Theme.of(context)
336 - .accentTextTheme.headline1!
348 + .accentTextTheme!
349 + .displayLarge!
350 .decorationColor!))
351 : Offstage(),
352 ])),
@@ -347,7 +360,8 @@ class ExchangeCardState extends State<ExchangeCard> {
360 fontSize: 14,
361 fontWeight: FontWeight.w500,
362 color: Theme.of(context)
350 - .accentTextTheme.headline1!
363 + .accentTextTheme!
364 + .displayLarge!
365 .decorationColor!),
366 ))
367 : Offstage(),
@@ -387,7 +401,8 @@ class ExchangeCardState extends State<ExchangeCard> {
401 fontSize: 16,
402 fontWeight: FontWeight.w600,
403 color: Theme.of(context)
390 - .accentTextTheme.headline1!
404 + .accentTextTheme!
405 + .displayLarge!
406 .decorationColor!),
407 buttonColor: widget.addressButtonsColor,
408 validator: widget.addressTextFieldValidator,
@@ -458,7 +473,8 @@ class ExchangeCardState extends State<ExchangeCard> {
473 child: Image.asset(
474 'assets/images/open_book.png',
475 color: Theme.of(context)
461 - .primaryTextTheme.headline4!
476 + .primaryTextTheme!
477 + .headlineMedium!
478 .decorationColor!,
479 )),
480 )),
lib/src/screens/exchange/widgets/mobile_exchange_cards_section.dart
+7 -4
@@ -21,8 +21,8 @@ class MobileExchangeCardsSection extends StatelessWidget {
21 ),
22 gradient: LinearGradient(
23 colors: [
24 - Theme.of(context).primaryTextTheme.bodyText2!.color!,
25 - Theme.of(context).primaryTextTheme.bodyText2!.decorationColor!,
24 + Theme.of(context).primaryTextTheme!.bodyMedium!.color!,
25 + Theme.of(context).primaryTextTheme!.bodyMedium!.decorationColor!,
26 ],
27 stops: [0.35, 1.0],
28 begin: Alignment.topLeft,
@@ -37,8 +37,11 @@ class MobileExchangeCardsSection extends StatelessWidget {
37 bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)),
38 gradient: LinearGradient(
39 colors: [
40 - Theme.of(context).primaryTextTheme.subtitle2!.color!,
41 - Theme.of(context).primaryTextTheme.subtitle2!.decorationColor!,
40 + Theme.of(context).primaryTextTheme!.titleSmall!.color!,
41 + Theme.of(context)
42 + .primaryTextTheme!
43 + .titleSmall!
44 + .decorationColor!,
45 ],
46 begin: Alignment.topLeft,
47 end: Alignment.bottomRight,
lib/src/screens/exchange/widgets/present_provider_picker.dart
+4 -1
@@ -49,7 +49,10 @@ class PresentProviderPicker extends StatelessWidget {
49 style: TextStyle(
50 fontSize: 10.0,
51 fontWeight: FontWeight.w500,
52 - color: Theme.of(context).textTheme.headline5!.color!)))
52 + color: Theme.of(context)
53 + .textTheme!
54 + .headlineSmall!
55 + .color!)))
56 ],
57 ),
58 SizedBox(width: 5),
lib/src/screens/exchange_trade/exchange_confirm_page.dart
+23 -9
@@ -36,7 +36,10 @@ class ExchangeConfirmPage extends BasePage {
36 style: TextStyle(
37 fontSize: 18.0,
38 fontWeight: FontWeight.w500,
39 - color: Theme.of(context).primaryTextTheme!.headline6!.color!),
39 + color: Theme.of(context)
40 + .primaryTextTheme!
41 + .titleLarge!
42 + .color!),
43 ),
44 )),
45 Container(
@@ -45,8 +48,14 @@ class ExchangeConfirmPage extends BasePage {
48 borderRadius: BorderRadius.all(Radius.circular(30)),
49 border: Border.all(
50 width: 1,
48 - color: Theme.of(context).accentTextTheme!.caption!.color!),
49 - color: Theme.of(context).accentTextTheme!.headline6!.color!),
51 + color: Theme.of(context)
52 + .accentTextTheme!
53 + .bodySmall!
54 + .color!),
55 + color: Theme.of(context)
56 + .accentTextTheme!
57 + .titleLarge!
58 + .color!),
59 child: Column(
60 children: <Widget>[
61 Expanded(
@@ -63,7 +72,7 @@ class ExchangeConfirmPage extends BasePage {
72 fontWeight: FontWeight.w500,
73 color: Theme.of(context)
74 .primaryTextTheme!
66 - .overline!
75 + .labelSmall!
76 .color!),
77 ),
78 Text(
@@ -75,7 +84,7 @@ class ExchangeConfirmPage extends BasePage {
84 fontWeight: FontWeight.w600,
85 color: Theme.of(context)
86 .primaryTextTheme!
78 - .headline6!
87 + .titleLarge!
88 .color!),
89 ),
90 ],
@@ -93,10 +102,12 @@ class ExchangeConfirmPage extends BasePage {
102 text: S.of(context).copy_id,
103 color: Theme.of(context)
104 .accentTextTheme!
96 - .caption!
105 + .bodySmall!
106 .backgroundColor!,
98 - textColor:
99 - Theme.of(context).primaryTextTheme!.headline6!.color!),
107 + textColor: Theme.of(context)
108 + .primaryTextTheme!
109 + .titleLarge!
110 + .color!),
111 ),
112 )
113 ],
@@ -125,7 +136,10 @@ class ExchangeConfirmPage extends BasePage {
136 onPressed: () => Navigator.of(context)
137 .pushReplacementNamed(Routes.exchangeTrade),
138 text: S.of(context).saved_the_trade_id,
128 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
139 + color: Theme.of(context)
140 + .accentTextTheme!
141 + .bodyLarge!
142 + .color!,
143 textColor: Colors.white)
144 ],
145 ),
lib/src/screens/exchange_trade/exchange_trade_page.dart
+16 -10
@@ -51,7 +51,7 @@ class ExchangeTradePage extends BasePage {
51 @override
52 Widget trailing(BuildContext context) {
53 final questionImage = Image.asset('assets/images/question_mark.png',
54 - color: Theme.of(context).primaryTextTheme!.headline6!.color!);
54 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!);
55
56 return SizedBox(
57 height: 20.0,
@@ -111,7 +111,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
111 final copyImage = Image.asset('assets/images/copy_content.png',
112 height: 16,
113 width: 16,
114 - color: Theme.of(context).primaryTextTheme!.overline!.color!);
114 + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!);
115
116 _setEffects();
117
@@ -135,14 +135,14 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
135 fontWeight: FontWeight.w500,
136 color: Theme.of(context)
137 .primaryTextTheme!
138 - .overline!
138 + .labelSmall!
139 .color!),
140 ),
141 if (trade.expiredAt != null)
142 TimerWidget(trade.expiredAt!,
143 color: Theme.of(context)
144 .primaryTextTheme!
145 - .headline6!
145 + .titleLarge!
146 .color!)
147 ])
148 : Offstage(),
@@ -162,7 +162,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
162 width: 3,
163 color: Theme.of(context)
164 .accentTextTheme!
165 - .subtitle2!
165 + .titleSmall!
166 .color!
167 )
168 ),
@@ -181,7 +181,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
181 height: 1,
182 color: Theme.of(context)
183 .accentTextTheme!
184 - .subtitle2!
184 + .titleSmall!
185 .backgroundColor!,
186 ),
187 itemBuilder: (context, index) {
@@ -228,7 +228,10 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
228 onPressed: () =>
229 widget.exchangeTradeViewModel.confirmSending(),
230 text: S.of(context).confirm,
231 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
231 + color: Theme.of(context)
232 + .accentTextTheme!
233 + .bodyLarge!
234 + .color!,
235 textColor: Colors.white)
236 : Offstage();
237 })),
@@ -340,7 +343,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
343 fontWeight: FontWeight.bold,
344 color: Theme.of(popupContext)
345 .primaryTextTheme!
343 - .headline6!
346 + .titleLarge!
347 .color,
348 decoration: TextDecoration.none,
349 ),
@@ -359,7 +362,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
362 text: S.of(popupContext).send_got_it,
363 color: Theme.of(popupContext)
364 .accentTextTheme!
362 - .bodyText1!
365 + .bodyLarge!
366 .color!,
367 textColor: Colors.white))
368 ],
@@ -392,7 +395,10 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
395 style: TextStyle(
396 fontSize: 22,
397 fontWeight: FontWeight.bold,
395 - color: Theme.of(popupContext).primaryTextTheme!.headline6!.color!,
398 + color: Theme.of(popupContext)
399 + .primaryTextTheme!
400 + .titleLarge!
401 + .color!,
402 decoration: TextDecoration.none,
403 ),
404 ),
lib/src/screens/exchange_trade/information_page.dart
+4 -4
@@ -21,7 +21,7 @@ class InformationPage extends StatelessWidget {
21 ),
22 decoration: BoxDecoration(
23 borderRadius: BorderRadius.all(Radius.circular(30)),
24 - color: Theme.of(context).textTheme!.bodyText1!.decorationColor!
24 + color: Theme.of(context).textTheme!.bodyLarge!.decorationColor!
25 ),
26 child: Column(
27 mainAxisSize: MainAxisSize.min,
@@ -35,7 +35,7 @@ class InformationPage extends StatelessWidget {
35 fontWeight: FontWeight.normal,
36 fontFamily: 'Lato',
37 decoration: TextDecoration.none,
38 - color: Theme.of(context).accentTextTheme!.caption!.decorationColor!
38 + color: Theme.of(context).accentTextTheme!.bodySmall!.decorationColor!
39 ),
40 ),
41 ),
@@ -44,8 +44,8 @@ class InformationPage extends StatelessWidget {
44 child: PrimaryButton(
45 onPressed: () => Navigator.of(context).pop(),
46 text: S.of(context).send_got_it,
47 - color: Theme.of(context).accentTextTheme!.caption!.backgroundColor!,
48 - textColor: Theme.of(context).primaryTextTheme!.headline6!.color!
47 + color: Theme.of(context).accentTextTheme!.bodySmall!.backgroundColor!,
48 + textColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!
49 ),
50 )
51 ],
lib/src/screens/faq/faq_item.dart
+5 -4
@@ -25,13 +25,13 @@ class FAQItemState extends State<FAQItem> {
25
26 @override
27 Widget build(BuildContext context) {
28 - final addIcon =
29 - Icon(Icons.add, color: Theme.of(context).primaryTextTheme!.headline6!.color!);
28 + final addIcon = Icon(Icons.add,
29 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!);
30 final removeIcon = Icon(Icons.remove, color: Palette.blueCraiola);
31 final icon = isActive ? removeIcon : addIcon;
32 final color = isActive
33 ? Palette.blueCraiola
34 - : Theme.of(context).primaryTextTheme!.headline6!.color!;
34 + : Theme.of(context).primaryTextTheme!.titleLarge!.color!;
35
36 return ListTileTheme(
37 contentPadding: EdgeInsets.fromLTRB(0, 6, 24, 6),
@@ -53,7 +53,8 @@ class FAQItemState extends State<FAQItem> {
53 style: TextStyle(
54 fontSize: 14,
55 fontWeight: FontWeight.normal,
56 - color: Theme.of(context).primaryTextTheme!.headline6!.color!),
56 + color:
57 + Theme.of(context).primaryTextTheme!.titleLarge!.color!),
58 ),
59 ))
60 ])
lib/src/screens/ionia/auth/ionia_create_account_page.dart
+18 -5
@@ -40,7 +40,10 @@ class IoniaCreateAccountPage extends BasePage {
40 return Text(
41 S.current.sign_up,
42 style: textMediumSemiBold(
43 - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!,
43 + color: Theme.of(context)
44 + .accentTextTheme!
45 + .displayLarge!
46 + .backgroundColor!,
47 ),
48 );
49 }
@@ -79,8 +82,12 @@ class IoniaCreateAccountPage extends BasePage {
82 builder: (_) => LoadingPrimaryButton(
83 text: S.of(context).create_account,
84 onPressed: _createAccount,
82 - isLoading: _authViewModel.createUserState is IoniaCreateStateLoading,
83 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
85 + isLoading:
86 + _authViewModel.createUserState is IoniaCreateStateLoading,
87 + color: Theme.of(context)
88 + .accentTextTheme!
89 + .bodyLarge!
90 + .color!,
91 textColor: Colors.white,
92 ),
93 ),
@@ -100,7 +107,10 @@ class IoniaCreateAccountPage extends BasePage {
107 TextSpan(
108 text: S.of(context).settings_terms_and_conditions,
109 style: TextStyle(
103 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
110 + color: Theme.of(context)
111 + .accentTextTheme!
112 + .bodyLarge!
113 + .color!,
114 fontWeight: FontWeight.w700,
115 ),
116 recognizer: TapGestureRecognizer()
@@ -112,7 +122,10 @@ class IoniaCreateAccountPage extends BasePage {
122 TextSpan(
123 text: S.of(context).privacy_policy,
124 style: TextStyle(
115 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
125 + color: Theme.of(context)
126 + .accentTextTheme!
127 + .bodyLarge!
128 + .color!,
129 fontWeight: FontWeight.w700,
130 ),
131 recognizer: TapGestureRecognizer()
lib/src/screens/ionia/auth/ionia_login_page.dart
+8 -2
@@ -33,7 +33,10 @@ class IoniaLoginPage extends BasePage {
33 return Text(
34 S.current.login,
35 style: textMediumSemiBold(
36 - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!,
36 + color: Theme.of(context)
37 + .accentTextTheme!
38 + .displayLarge!
39 + .backgroundColor!,
40 ),
41 );
42 }
@@ -71,7 +74,10 @@ class IoniaLoginPage extends BasePage {
74 text: S.of(context).login,
75 onPressed: _login,
76 isLoading: _authViewModel.signInState is IoniaCreateStateLoading,
74 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
77 + color: Theme.of(context)
78 + .accentTextTheme!
79 + .bodyLarge!
80 + .color!,
81 textColor: Colors.white,
82 ),
83 ),
lib/src/screens/ionia/auth/ionia_verify_otp_page.dart
+13 -4
@@ -41,7 +41,10 @@ class IoniaVerifyIoniaOtp extends BasePage {
41 return Text(
42 S.current.verification,
43 style: textMediumSemiBold(
44 - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!,
44 + color: Theme.of(context)
45 + .accentTextTheme!
46 + .displayLarge!
47 + .backgroundColor!,
48 ),
49 );
50 }
@@ -62,7 +65,10 @@ class IoniaVerifyIoniaOtp extends BasePage {
65 return KeyboardActions(
66 config: KeyboardActionsConfig(
67 keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
65 - keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!,
68 + keyboardBarColor: Theme.of(context)
69 + .accentTextTheme!
70 + .bodyLarge!
71 + .backgroundColor!,
72 nextFocus: false,
73 actions: [
74 KeyboardActionsItem(
@@ -72,7 +78,7 @@ class IoniaVerifyIoniaOtp extends BasePage {
78 ]),
79 child: Container(
80 height: 0,
75 - color: Theme.of(context).backgroundColor,
81 + color: Theme.of(context).colorScheme.background,
82 child: ScrollableWithBottomSection(
83 contentPadding: EdgeInsets.all(24),
84 content: Column(
@@ -120,7 +126,10 @@ class IoniaVerifyIoniaOtp extends BasePage {
126 onPressed: _verify,
127 isDisabled: _authViewModel.otpState is IoniaOtpSendDisabled,
128 isLoading: _authViewModel.otpState is IoniaOtpValidating,
123 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
129 + color: Theme.of(context)
130 + .accentTextTheme!
131 + .bodyLarge!
132 + .color!,
133 textColor: Colors.white,
134 ),
135 ),
lib/src/screens/ionia/auth/ionia_welcome_page.dart
+11 -5
@@ -17,7 +17,10 @@ class IoniaWelcomePage extends BasePage {
17 return Text(
18 S.current.welcome_to_cakepay,
19 style: textMediumSemiBold(
20 - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!,
20 + color: Theme.of(context)
21 + .accentTextTheme!
22 + .displayLarge!
23 + .backgroundColor!,
24 ),
25 );
26 }
@@ -45,7 +48,7 @@ class IoniaWelcomePage extends BasePage {
48 fontSize: 18,
49 fontWeight: FontWeight.w400,
50 fontFamily: 'Lato',
48 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
51 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
52 ),
53 ),
54 SizedBox(height: 20),
@@ -55,7 +58,7 @@ class IoniaWelcomePage extends BasePage {
58 fontSize: 18,
59 fontWeight: FontWeight.w400,
60 fontFamily: 'Lato',
58 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
61 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
62 ),
63 ),
64 ],
@@ -66,7 +69,10 @@ class IoniaWelcomePage extends BasePage {
69 PrimaryButton(
70 text: S.of(context).create_account,
71 onPressed: () => Navigator.of(context).pushNamed(Routes.ioniaCreateAccountPage),
69 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
72 + color: Theme.of(context)
73 + .accentTextTheme!
74 + .bodyLarge!
75 + .color!,
76 textColor: Colors.white,
77 ),
78 SizedBox(
@@ -78,7 +84,7 @@ class IoniaWelcomePage extends BasePage {
84 fontSize: 15,
85 fontWeight: FontWeight.w500,
86 fontFamily: 'Lato',
81 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
87 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
88 ),
89 ),
90 SizedBox(height: 8),
lib/src/screens/ionia/cards/ionia_account_cards_page.dart
+37 -12
@@ -20,7 +20,10 @@ class IoniaAccountCardsPage extends BasePage {
20 return Text(
21 S.of(context).cards,
22 style: textLargeSemiBold(
23 - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!,
23 + color: Theme.of(context)
24 + .accentTextTheme!
25 + .displayLarge!
26 + .backgroundColor!,
27 ),
28 );
29 }
@@ -69,23 +72,34 @@ class _IoniaCardTabsState extends State<_IoniaCardTabs> with SingleTickerProvide
72 width: 230,
73 padding: EdgeInsets.all(5),
74 decoration: BoxDecoration(
72 - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!.withOpacity(0.1),
75 + color: Theme.of(context)
76 + .accentTextTheme!
77 + .displayLarge!
78 + .backgroundColor!
79 + .withOpacity(0.1),
80 borderRadius: BorderRadius.circular(
81 25.0,
82 ),
83 ),
84 child: Theme(
78 - data: ThemeData(primaryTextTheme: TextTheme(bodyText1: TextStyle(backgroundColor: Colors.transparent))),
85 + data: ThemeData(primaryTextTheme: TextTheme(bodyLarge: TextStyle(backgroundColor: Colors.transparent))),
86 child: TabBar(
87 controller: _tabController,
88 indicator: BoxDecoration(
89 borderRadius: BorderRadius.circular(
90 25.0,
91 ),
85 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
92 + color: Theme.of(context)
93 + .accentTextTheme!
94 + .bodyLarge!
95 + .color!,
96 ),
87 - labelColor: Theme.of(context).primaryTextTheme!.headline1!.backgroundColor!,
88 - unselectedLabelColor: Theme.of(context).primaryTextTheme!.headline6!.color!,
97 + labelColor: Theme.of(context)
98 + .primaryTextTheme!
99 + .displayLarge!
100 + .backgroundColor!,
101 + unselectedLabelColor:
102 + Theme.of(context).primaryTextTheme!.titleLarge!.color!,
103 tabs: [
104 Tab(
105 text: S.of(context).active,
@@ -154,9 +168,13 @@ class _IoniaCardListView extends StatelessWidget {
168 Widget build(BuildContext context) {
169 if(isLoading){
170 return Center(
157 - child: CircularProgressIndicator(
158 - backgroundColor: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
159 - valueColor: AlwaysStoppedAnimation<Color>(Theme.of(context).primaryTextTheme!.bodyText2!.color!),
171 + child: CircularProgressIndicator(
172 + backgroundColor: Theme.of(context)
173 + .accentTextTheme!
174 + .displayMedium!
175 + .backgroundColor!,
176 + valueColor: AlwaysStoppedAnimation<Color>(
177 + Theme.of(context).primaryTextTheme!.bodyMedium!.color!),
178 ),
179 );
180 }
@@ -166,7 +184,7 @@ class _IoniaCardListView extends StatelessWidget {
184 emptyText,
185 textAlign: TextAlign.center,
186 style: textSmall(
169 - color: Theme.of(context).primaryTextTheme!.overline!.color!,
187 + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!,
188 ),
189 ),
190 )
@@ -179,11 +197,18 @@ class _IoniaCardListView extends StatelessWidget {
197 child: CardItem(
198 onTap: () => onTap?.call(merchant),
199 title: merchant.legalName,
182 - backgroundColor: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!.withOpacity(0.1),
200 + backgroundColor: Theme.of(context)
201 + .accentTextTheme!
202 + .displayLarge!
203 + .backgroundColor!
204 + .withOpacity(0.1),
205 discount: 0,
206 hideBorder: true,
207 discountBackground: AssetImage('assets/images/red_badge_discount.png'),
186 - titleColor: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!,
208 + titleColor: Theme.of(context)
209 + .accentTextTheme!
210 + .displayLarge!
211 + .backgroundColor!,
212 subtitleColor: Theme.of(context).hintColor,
213 subTitle: '',
214 logoUrl: merchant.logoUrl,
lib/src/screens/ionia/cards/ionia_account_page.dart
+10 -7
@@ -19,7 +19,10 @@ class IoniaAccountPage extends BasePage {
19 return Text(
20 S.current.account,
21 style: textMediumSemiBold(
22 - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!,
22 + color: Theme.of(context)
23 + .accentTextTheme!
24 + .displayLarge!
25 + .backgroundColor!,
26 ),
27 );
28 }
@@ -133,7 +136,10 @@ class IoniaAccountPage extends BasePage {
136 bottomSection: Column(
137 children: [
138 PrimaryButton(
136 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
139 + color: Theme.of(context)
140 + .accentTextTheme!
141 + .bodyLarge!
142 + .color!,
143 textColor: Colors.white,
144 text: S.of(context).logout,
145 onPressed: () {
@@ -164,11 +170,8 @@ class _GradiantContainer extends StatelessWidget {
170 borderRadius: BorderRadius.circular(15),
171 gradient: LinearGradient(
172 colors: [
167 - Theme.of(context)
168 - .primaryTextTheme!
169 - .subtitle1!
170 - .decorationColor!,
171 - Theme.of(context).primaryTextTheme!.subtitle1!.color!,
173 + Theme.of(context).primaryTextTheme!.titleMedium!.decorationColor!,
174 + Theme.of(context).primaryTextTheme!.titleMedium!.color!,
175 ],
176 begin: Alignment.topRight,
177 end: Alignment.bottomLeft,
lib/src/screens/ionia/cards/ionia_activate_debit_card_page.dart
+8 -2
@@ -23,7 +23,10 @@ class IoniaActivateDebitCardPage extends BasePage {
23 return Text(
24 S.current.debit_card,
25 style: textMediumSemiBold(
26 - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!,
26 + color: Theme.of(context)
27 + .accentTextTheme!
28 + .displayLarge!
29 + .backgroundColor!,
30 ),
31 );
32 }
@@ -76,7 +79,10 @@ class IoniaActivateDebitCardPage extends BasePage {
79 },
80 isLoading: _cardsListViewModel.createCardState is IoniaCreateCardLoading,
81 text: S.of(context).agree_and_continue,
79 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
82 + color: Theme.of(context)
83 + .accentTextTheme!
84 + .bodyLarge!
85 + .color!,
86 textColor: Colors.white,
87 ),
88 );
lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart
+20 -20
@@ -28,7 +28,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
28 Widget middle(BuildContext context) {
29 return Text(
30 ioniaPurchaseViewModel.ioniaMerchant.legalName,
31 - style: textMediumSemiBold(color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!),
31 + style: textMediumSemiBold(color: Theme.of(context).accentTextTheme!.displayLarge!.backgroundColor!),
32 );
33 }
34
@@ -96,8 +96,8 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
96 borderRadius: BorderRadius.circular(20),
97 gradient: LinearGradient(
98 colors: [
99 - Theme.of(context).primaryTextTheme!.subtitle1!.color!,
100 - Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!,
99 + Theme.of(context).primaryTextTheme!.titleMedium!.color!,
100 + Theme.of(context).primaryTextTheme!.titleMedium!.decorationColor!,
101 ],
102 begin: Alignment.topLeft,
103 end: Alignment.bottomRight,
@@ -163,7 +163,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
163 Text(
164 S.of(context).tip,
165 style: TextStyle(
166 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
166 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
167 fontWeight: FontWeight.w700,
168 fontSize: 14,
169 ),
@@ -202,7 +202,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
202 ioniaPurchaseViewModel.invoiceCommittingState is IsExecutingState,
203 onPressed: () => purchaseCard(context),
204 text: S.of(context).purchase_gift_card,
205 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
205 + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
206 textColor: Colors.white,
207 );
208 }),
@@ -212,7 +212,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
212 onTap: () => _showTermsAndCondition(context),
213 child: Text(S.of(context).settings_terms_and_conditions,
214 style: textMediumSemiBold(
215 - color: Theme.of(context).primaryTextTheme!.bodyText2!.color!,
215 + color: Theme.of(context).primaryTextTheme.bodyMedium!.color!,
216 ).copyWith(fontSize: 12)),
217 ),
218 SizedBox(height: 16)
@@ -232,7 +232,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
232 child: Text(
233 ioniaPurchaseViewModel.ioniaMerchant.termsAndConditions,
234 style: textMedium(
235 - color: Theme.of(context).textTheme!.headline3!.color!,
235 + color: Theme.of(context).textTheme!.displaySmall!.color!,
236 ),
237 ),
238 ),
@@ -270,13 +270,13 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
270 child: Text(
271 instruction.header,
272 style: textLargeSemiBold(
273 - color: Theme.of(context).textTheme!.headline3!.color!,
273 + color: Theme.of(context).textTheme!.displaySmall!.color!,
274 ),
275 )),
276 Text(
277 instruction.body,
278 style: textMedium(
279 - color: Theme.of(context).textTheme!.headline3!.color!,
279 + color: Theme.of(context).textTheme!.displaySmall!.color!,
280 ),
281 )
282 ];
@@ -323,7 +323,7 @@ class IoniaBuyGiftCardDetailPage extends BasePage {
323 alertLeftActionButtonTextColor: Colors.white,
324 alertRightActionButtonTextColor: Colors.white,
325 alertLeftActionButtonColor: Palette.brightOrange,
326 - alertRightActionButtonColor: Theme.of(context).textTheme!.subtitle2!.color,
326 + alertRightActionButtonColor: Theme.of(context).textTheme!.titleSmall!.color,
327 actionRightButton: () async {
328 Navigator.of(context).pop();
329 await ioniaPurchaseViewModel.commitPaymentInvoice();
@@ -399,34 +399,34 @@ class TipButton extends StatelessWidget {
399
400 Color captionTextColor(BuildContext context) {
401 if (isDark(context)) {
402 - return Theme.of(context).primaryTextTheme!.headline6!.color!;
402 + return Theme.of(context).primaryTextTheme!.titleLarge!.color!;
403 }
404
405 return isSelected
406 - ? Theme.of(context).accentTextTheme!.headline6!.color!
407 - : Theme.of(context).primaryTextTheme!.headline6!.color!;
406 + ? Theme.of(context).accentTextTheme!.titleLarge!.color!
407 + : Theme.of(context).primaryTextTheme!.titleLarge!.color!;
408 }
409
410 Color subTitleTextColor(BuildContext context) {
411 if (isDark(context)) {
412 - return Theme.of(context).primaryTextTheme!.headline6!.color!;
412 + return Theme.of(context).primaryTextTheme!.titleLarge!.color!;
413 }
414
415 return isSelected
416 - ? Theme.of(context).accentTextTheme!.headline6!.color!
417 - : Theme.of(context).primaryTextTheme!.overline!.color!;
416 + ? Theme.of(context).accentTextTheme!.titleLarge!.color!
417 + : Theme.of(context).primaryTextTheme!.labelSmall!.color!;
418 }
419
420 Color? backgroundColor(BuildContext context) {
421 if (isDark(context)) {
422 return isSelected
423 ? null
424 - : Theme.of(context).accentTextTheme!.headline1!.backgroundColor!.withOpacity(0.01);
424 + : Theme.of(context).accentTextTheme!.displayLarge!.backgroundColor!.withOpacity(0.01);
425 }
426
427 return isSelected
428 ? null
429 - : Theme.of(context).accentTextTheme!.headline1!.backgroundColor!.withOpacity(0.1);
429 + : Theme.of(context).accentTextTheme!.displayLarge!.backgroundColor!.withOpacity(0.1);
430 }
431
432 @override
@@ -459,8 +459,8 @@ class TipButton extends StatelessWidget {
459 gradient: isSelected
460 ? LinearGradient(
461 colors: [
462 - Theme.of(context).primaryTextTheme!.subtitle1!.color!,
463 - Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!,
462 + Theme.of(context).primaryTextTheme!.titleMedium!.color!,
463 + Theme.of(context).primaryTextTheme!.titleMedium!.decorationColor!,
464 ],
465 begin: Alignment.topLeft,
466 end: Alignment.bottomRight,
lib/src/screens/ionia/cards/ionia_buy_gift_card.dart
+35 -11
@@ -50,7 +50,10 @@ class IoniaBuyGiftCardPage extends BasePage {
50 disableScroll: true,
51 config: KeyboardActionsConfig(
52 keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
53 - keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!,
53 + keyboardBarColor: Theme.of(context)
54 + .accentTextTheme!
55 + .bodyLarge!
56 + .backgroundColor!,
57 nextFocus: false,
58 actions: [
59 KeyboardActionsItem(
@@ -59,7 +62,7 @@ class IoniaBuyGiftCardPage extends BasePage {
62 ),
63 ]),
64 child: Container(
62 - color: Theme.of(context).backgroundColor,
65 + color: Theme.of(context).colorScheme.background,
66 child: ScrollableWithBottomSection(
67 contentPadding: EdgeInsets.zero,
68 content: Column(
@@ -72,8 +75,11 @@ class IoniaBuyGiftCardPage extends BasePage {
75 bottomRight: Radius.circular(24),
76 ),
77 gradient: LinearGradient(colors: [
75 - Theme.of(context).primaryTextTheme!.subtitle1!.color!,
76 - Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!,
78 + Theme.of(context).primaryTextTheme!.titleMedium!.color!,
79 + Theme.of(context)
80 + .primaryTextTheme!
81 + .titleMedium!
82 + .decorationColor!,
83 ], begin: Alignment.topLeft, end: Alignment.bottomRight),
84 ),
85 child: Column(
@@ -95,7 +101,10 @@ class IoniaBuyGiftCardPage extends BasePage {
101 ],
102 hintText: '1000',
103 placeholderTextStyle: TextStyle(
98 - color: Theme.of(context).primaryTextTheme.headline5!.color!,
104 + color: Theme.of(context)
105 + .primaryTextTheme!
106 + .headlineSmall!
107 + .color!,
108 fontWeight: FontWeight.w600,
109 fontSize: 36,
110 ),
@@ -115,7 +124,10 @@ class IoniaBuyGiftCardPage extends BasePage {
124 ),
125 ),
126 Divider(
118 - color: Theme.of(context).primaryTextTheme.headline5!.color!,
127 + color: Theme.of(context)
128 + .primaryTextTheme!
129 + .headlineSmall!
130 + .color!,
131 height: 1,
132 ),
133 SizedBox(height: 8),
@@ -126,13 +138,19 @@ class IoniaBuyGiftCardPage extends BasePage {
138 Text(
139 S.of(context).min_amount(merchant.minimumCardPurchase.toStringAsFixed(2)),
140 style: TextStyle(
129 - color: Theme.of(context).primaryTextTheme!.headline5!.color!,
141 + color: Theme.of(context)
142 + .primaryTextTheme!
143 + .headlineSmall!
144 + .color!,
145 ),
146 ),
147 Text(
148 S.of(context).max_amount(merchant.maximumCardPurchase.toStringAsFixed(2)),
149 style: TextStyle(
135 - color: Theme.of(context).primaryTextTheme!.headline5!.color!,
150 + color: Theme.of(context)
151 + .primaryTextTheme!
152 + .headlineSmall!
153 + .color!,
154 ),
155 ),
156 ],
@@ -147,11 +165,14 @@ class IoniaBuyGiftCardPage extends BasePage {
165 title: merchant.legalName,
166 backgroundColor: Theme.of(context)
167 .accentTextTheme!
150 - .headline1!
168 + .displayLarge!
169 .backgroundColor!
170 .withOpacity(0.1),
171 discount: merchant.discount,
154 - titleColor: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!,
172 + titleColor: Theme.of(context)
173 + .accentTextTheme!
174 + .displayLarge!
175 + .backgroundColor!,
176 subtitleColor: Theme.of(context).hintColor,
177 subTitle: merchant.avaibilityStatus,
178 logoUrl: merchant.logoUrl,
@@ -174,7 +195,10 @@ class IoniaBuyGiftCardPage extends BasePage {
195 ),
196 text: S.of(context).continue_text,
197 isDisabled: !ioniaBuyCardViewModel.isEnablePurchase,
177 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
198 + color: Theme.of(context)
199 + .accentTextTheme!
200 + .bodyLarge!
201 + .color!,
202 textColor: Colors.white,
203 ),
204 );
lib/src/screens/ionia/cards/ionia_custom_redeem_page.dart
+32 -11
@@ -50,7 +50,10 @@ class IoniaCustomRedeemPage extends BasePage {
50 disableScroll: true,
51 config: KeyboardActionsConfig(
52 keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
53 - keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!,
53 + keyboardBarColor: Theme.of(context)
54 + .accentTextTheme!
55 + .bodyLarge!
56 + .backgroundColor!,
57 nextFocus: false,
58 actions: [
59 KeyboardActionsItem(
@@ -59,7 +62,7 @@ class IoniaCustomRedeemPage extends BasePage {
62 ),
63 ]),
64 child: Container(
62 - color: Theme.of(context).backgroundColor,
65 + color: Theme.of(context).colorScheme.background,
66 child: ScrollableWithBottomSection(
67 contentPadding: EdgeInsets.zero,
68 content: Column(
@@ -70,8 +73,11 @@ class IoniaCustomRedeemPage extends BasePage {
73 borderRadius: BorderRadius.only(
74 bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)),
75 gradient: LinearGradient(colors: [
73 - Theme.of(context).primaryTextTheme.subtitle1!.color!,
74 - Theme.of(context).primaryTextTheme.subtitle1!.decorationColor!,
76 + Theme.of(context).primaryTextTheme!.titleMedium!.color!,
77 + Theme.of(context)
78 + .primaryTextTheme!
79 + .titleMedium!
80 + .decorationColor!,
81 ], begin: Alignment.topLeft, end: Alignment.bottomRight),
82 ),
83 child: Column(
@@ -86,11 +92,17 @@ class IoniaCustomRedeemPage extends BasePage {
92 inputFormatters: [FilteringTextInputFormatter.deny(RegExp('[\-|\ ]'))],
93 hintText: '1000',
94 placeholderTextStyle: TextStyle(
89 - color: Theme.of(context).primaryTextTheme.headline5!.color!,
95 + color: Theme.of(context)
96 + .primaryTextTheme!
97 + .headlineSmall!
98 + .color!,
99 fontWeight: FontWeight.w500,
100 fontSize: 36,
101 ),
93 - borderColor: Theme.of(context).primaryTextTheme.headline5!.color!,
102 + borderColor: Theme.of(context)
103 + .primaryTextTheme!
104 + .headlineSmall!
105 + .color!,
106 textColor: Colors.white,
107 textStyle: TextStyle(
108 color: Colors.white,
@@ -121,7 +133,10 @@ class IoniaCustomRedeemPage extends BasePage {
133 child: Text(
134 '\$${giftCard.remainingAmount} - \$${ioniaCustomRedeemViewModel.amount} = \$${ioniaCustomRedeemViewModel.formattedRemaining} ${S.of(context).remaining}',
135 style: TextStyle(
124 - color: Theme.of(context).primaryTextTheme.headline5!.color!,
136 + color: Theme.of(context)
137 + .primaryTextTheme!
138 + .headlineSmall!
139 + .color!,
140 ),
141 ),
142 )
@@ -136,14 +151,17 @@ class IoniaCustomRedeemPage extends BasePage {
151 child: CardItem(
152 title: giftCard.legalName,
153 backgroundColor: Theme.of(context)
139 - .accentTextTheme
140 - .headline1!
154 + .accentTextTheme!
155 + .displayLarge!
156 .backgroundColor!
157 .withOpacity(0.1),
158 discount: giftCard.remainingAmount,
159 isAmount: true,
160 discountBackground: AssetImage('assets/images/red_badge_discount.png'),
146 - titleColor: Theme.of(context).accentTextTheme.headline1!.backgroundColor!,
161 + titleColor: Theme.of(context)
162 + .accentTextTheme!
163 + .displayLarge!
164 + .backgroundColor!,
165 subtitleColor: Theme.of(context).hintColor,
166 subTitle: S.of(context).online,
167 logoUrl: giftCard.logoUrl,
@@ -160,7 +178,10 @@ class IoniaCustomRedeemPage extends BasePage {
178 isLoading: ioniaCustomRedeemViewModel.redeemState is IsExecutingState,
179 isDisabled: ioniaCustomRedeemViewModel.disableRedeem,
180 text: S.of(context).add_custom_redemption,
163 - color: Theme.of(context).accentTextTheme.bodyText1!.color!,
181 + color: Theme.of(context)
182 + .accentTextTheme!
183 + .bodyLarge!
184 + .color!,
185 textColor: Colors.white,
186 onPressed: () => ioniaCustomRedeemViewModel.addCustomRedeem().then((value) {
187 Navigator.of(context).pop(ioniaCustomRedeemViewModel.remaining.toString());
lib/src/screens/ionia/cards/ionia_custom_tip_page.dart
+35 -10
@@ -51,7 +51,10 @@ class IoniaCustomTipPage extends BasePage {
51 disableScroll: true,
52 config: KeyboardActionsConfig(
53 keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
54 - keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!,
54 + keyboardBarColor: Theme.of(context)
55 + .accentTextTheme!
56 + .bodyLarge!
57 + .backgroundColor!,
58 nextFocus: false,
59 actions: [
60 KeyboardActionsItem(
@@ -60,7 +63,7 @@ class IoniaCustomTipPage extends BasePage {
63 ),
64 ]),
65 child: Container(
63 - color: Theme.of(context).backgroundColor,
66 + color: Theme.of(context).colorScheme.background,
67 child: ScrollableWithBottomSection(
68 contentPadding: EdgeInsets.zero,
69 content: Column(
@@ -70,8 +73,11 @@ class IoniaCustomTipPage extends BasePage {
73 decoration: BoxDecoration(
74 borderRadius: BorderRadius.only(bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)),
75 gradient: LinearGradient(colors: [
73 - Theme.of(context).primaryTextTheme!.subtitle1!.color!,
74 - Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!,
76 + Theme.of(context).primaryTextTheme!.titleMedium!.color!,
77 + Theme.of(context)
78 + .primaryTextTheme!
79 + .titleMedium!
80 + .decorationColor!,
81 ], begin: Alignment.topLeft, end: Alignment.bottomRight),
82 ),
83 child: Column(
@@ -86,11 +92,17 @@ class IoniaCustomTipPage extends BasePage {
92 inputFormatters: [FilteringTextInputFormatter.deny(RegExp('[\-|\ ]'))],
93 hintText: '1000',
94 placeholderTextStyle: TextStyle(
89 - color: Theme.of(context).primaryTextTheme!.headline5!.color!,
95 + color: Theme.of(context)
96 + .primaryTextTheme!
97 + .headlineSmall!
98 + .color!,
99 fontWeight: FontWeight.w500,
100 fontSize: 36,
101 ),
93 - borderColor: Theme.of(context).primaryTextTheme!.headline5!.color!,
102 + borderColor: Theme.of(context)
103 + .primaryTextTheme!
104 + .headlineSmall!
105 + .color!,
106 textColor: Colors.white,
107 textStyle: TextStyle(
108 color: Colors.white,
@@ -125,7 +137,10 @@ class IoniaCustomTipPage extends BasePage {
137 text: TextSpan(
138 text: '\$${_amountController.text}',
139 style: TextStyle(
128 - color: Theme.of(context).primaryTextTheme!.headline5!.color!,
140 + color: Theme.of(context)
141 + .primaryTextTheme!
142 + .headlineSmall!
143 + .color!,
144 ),
145 children: [
146 TextSpan(text: ' ${S.of(context).is_percentage} '),
@@ -143,9 +158,16 @@ class IoniaCustomTipPage extends BasePage {
158 padding: const EdgeInsets.all(24.0),
159 child: CardItem(
160 title: merchant.legalName,
146 - backgroundColor: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!.withOpacity(0.1),
161 + backgroundColor: Theme.of(context)
162 + .accentTextTheme!
163 + .displayLarge!
164 + .backgroundColor!
165 + .withOpacity(0.1),
166 discount: 0.0,
148 - titleColor: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!,
167 + titleColor: Theme.of(context)
168 + .accentTextTheme!
169 + .displayLarge!
170 + .backgroundColor!,
171 subtitleColor: Theme.of(context).hintColor,
172 subTitle: merchant.isOnline ? S.of(context).online : S.of(context).offline,
173 logoUrl: merchant.logoUrl,
@@ -162,7 +184,10 @@ class IoniaCustomTipPage extends BasePage {
184 Navigator.of(context).pop(customTipViewModel.customTip);
185 },
186 text: S.of(context).add_tip,
165 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
187 + color: Theme.of(context)
188 + .accentTextTheme!
189 + .bodyLarge!
190 + .color!,
191 textColor: Colors.white,
192 ),
193 ),
lib/src/screens/ionia/cards/ionia_debit_card_page.dart
+41 -15
@@ -23,7 +23,10 @@ class IoniaDebitCardPage extends BasePage {
23 return Text(
24 S.current.debit_card,
25 style: textMediumSemiBold(
26 - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!,
26 + color: Theme.of(context)
27 + .accentTextTheme!
28 + .displayLarge!
29 + .backgroundColor!,
30 ),
31 );
32 }
@@ -51,7 +54,11 @@ class IoniaDebitCardPage extends BasePage {
54 padding: const EdgeInsets.symmetric(horizontal: 20.0),
55 child: Text(
56 S.of(context).billing_address_info,
54 - style: textSmall(color: Theme.of(context).textTheme!.headline4!.color!),
57 + style: textSmall(
58 + color: Theme.of(context)
59 + .textTheme!
60 + .headlineMedium!
61 + .color!),
62 textAlign: TextAlign.center,
63 ),
64 ),
@@ -60,13 +67,16 @@ class IoniaDebitCardPage extends BasePage {
67 text: S.of(context).order_physical_card,
68 onPressed: () {},
69 color: Color(0xffE9F2FC),
63 - textColor: Theme.of(context).textTheme!.headline3!.color!,
70 + textColor: Theme.of(context).textTheme!.displaySmall!.color!,
71 ),
72 SizedBox(height: 8),
73 PrimaryButton(
74 text: S.of(context).add_value,
75 onPressed: () {},
69 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
76 + color: Theme.of(context)
77 + .accentTextTheme!
78 + .bodyLarge!
79 + .color!,
80 textColor: Colors.white,
81 ),
82 SizedBox(height: 16)
@@ -112,11 +122,17 @@ class IoniaDebitCardPage extends BasePage {
122 child: RichText(
123 text: TextSpan(
124 text: S.of(context).get_a,
115 - style: textMedium(color: Theme.of(context).textTheme!.headline3!.color!),
125 + style: textMedium(
126 + color:
127 + Theme.of(context).textTheme!.displaySmall!.color!),
128 children: [
129 TextSpan(
130 text: S.of(context).digital_and_physical_card,
119 - style: textMediumBold(color: Theme.of(context).textTheme!.headline3!.color!),
131 + style: textMediumBold(
132 + color: Theme.of(context)
133 + .textTheme!
134 + .displaySmall!
135 + .color!),
136 ),
137 TextSpan(
138 text: S.of(context).get_card_note,
@@ -134,7 +150,10 @@ class IoniaDebitCardPage extends BasePage {
150 bottomSection: PrimaryButton(
151 text: S.of(context).activate,
152 onPressed: () => _showHowToUseCard(context, activate: true),
137 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
153 + color: Theme.of(context)
154 + .accentTextTheme!
155 + .bodyLarge!
156 + .color!,
157 textColor: Colors.white,
158 ),
159 );
@@ -157,7 +176,7 @@ class IoniaDebitCardPage extends BasePage {
176 padding: EdgeInsets.only(top: 24, left: 24, right: 24),
177 margin: EdgeInsets.all(24),
178 decoration: BoxDecoration(
160 - color: Theme.of(context).backgroundColor,
179 + color: Theme.of(context).colorScheme.background,
180 borderRadius: BorderRadius.circular(30),
181 ),
182 child: Column(
@@ -165,7 +184,8 @@ class IoniaDebitCardPage extends BasePage {
184 Text(
185 S.of(context).how_to_use_card,
186 style: textLargeSemiBold(
168 - color: Theme.of(context).textTheme!.bodyText2!.color!,
187 + color:
188 + Theme.of(context).textTheme!.bodyMedium!.color!,
189 ),
190 ),
191 SizedBox(height: 24),
@@ -174,7 +194,10 @@ class IoniaDebitCardPage extends BasePage {
194 child: Text(
195 S.of(context).signup_for_card_accept_terms,
196 style: textSmallSemiBold(
177 - color: Theme.of(context).textTheme!.headline3!.color!,
197 + color: Theme.of(context)
198 + .textTheme!
199 + .displaySmall!
200 + .color!,
201 ),
202 ),
203 ),
@@ -195,7 +218,8 @@ class IoniaDebitCardPage extends BasePage {
218 : Navigator.pop(context),
219 text: S.of(context).send_got_it,
220 color: Color.fromRGBO(233, 242, 252, 1),
198 - textColor: Theme.of(context).textTheme!.headline3!.color!,
221 + textColor:
222 + Theme.of(context).textTheme!.displaySmall!.color!,
223 ),
224 SizedBox(height: 21),
225 ],
@@ -259,8 +283,8 @@ class _IoniaDebitCardState extends State<_IoniaDebitCard> {
283 borderRadius: BorderRadius.circular(24),
284 gradient: LinearGradient(
285 colors: [
262 - Theme.of(context).primaryTextTheme!.subtitle1!.color!,
263 - Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!,
286 + Theme.of(context).primaryTextTheme!.titleMedium!.color!,
287 + Theme.of(context).primaryTextTheme!.titleMedium!.decorationColor!,
288 ],
289 begin: Alignment.topLeft,
290 end: Alignment.bottomRight,
@@ -368,12 +392,14 @@ class _TitleSubtitleTile extends StatelessWidget {
392 children: [
393 Text(
394 title,
371 - style: textSmallSemiBold(color: Theme.of(context).textTheme!.headline3!.color!),
395 + style: textSmallSemiBold(
396 + color: Theme.of(context).textTheme!.displaySmall!.color!),
397 ),
398 SizedBox(height: 4),
399 Text(
400 subtitle,
376 - style: textSmall(color: Theme.of(context).textTheme!.headline3!.color!),
401 + style: textSmall(
402 + color: Theme.of(context).textTheme!.displaySmall!.color!),
403 ),
404 ],
405 );
lib/src/screens/ionia/cards/ionia_gift_card_detail_page.dart
+11 -8
@@ -33,7 +33,7 @@ class IoniaGiftCardDetailPage extends BasePage {
33
34 final _backButton = Icon(
35 Icons.arrow_back_ios,
36 - color: Theme.of(context).primaryTextTheme.headline6!.color!,
36 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
37 size: 16,
38 );
39 return Padding(
@@ -59,8 +59,11 @@ class IoniaGiftCardDetailPage extends BasePage {
59 Widget middle(BuildContext context) {
60 return Text(
61 viewModel.giftCard.legalName,
62 - style:
63 - textMediumSemiBold(color: Theme.of(context).accentTextTheme.headline1!.backgroundColor!),
62 + style: textMediumSemiBold(
63 + color: Theme.of(context)
64 + .accentTextTheme!
65 + .displayLarge!
66 + .backgroundColor!),
67 );
68 }
69
@@ -142,8 +145,8 @@ class IoniaGiftCardDetailPage extends BasePage {
145 viewModel.refeshCard();
146 },
147 text: S.of(context).more_options,
145 - color: Theme.of(context).accentTextTheme.caption!.color!,
146 - textColor: Theme.of(context).primaryTextTheme.headline6!.color!,
148 + color: Theme.of(context).accentTextTheme!.bodySmall!.color!,
149 + textColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
150 ),
151 SizedBox(height: 12),
152 LoadingPrimaryButton(
@@ -155,7 +158,7 @@ class IoniaGiftCardDetailPage extends BasePage {
158 },
159 ),
160 text: S.of(context).mark_as_redeemed,
158 - color: Theme.of(context).accentTextTheme.bodyText1!.color!,
161 + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
162 textColor: Colors.white,
163 ),
164 ],
@@ -198,13 +201,13 @@ class IoniaGiftCardDetailPage extends BasePage {
201 child: Text(
202 instruction.header,
203 style: textLargeSemiBold(
201 - color: Theme.of(context).textTheme.headline3!.color!,
204 + color: Theme.of(context).textTheme!.displaySmall!.color!,
205 ),
206 )),
207 Text(
208 instruction.body,
209 style: textMedium(
207 - color: Theme.of(context).textTheme.headline3!.color!,
210 + color: Theme.of(context).textTheme!.displaySmall!.color!,
211 ),
212 )
213 ];
lib/src/screens/ionia/cards/ionia_manage_cards_page.dart
+23 -17
@@ -48,7 +48,7 @@ class IoniaManageCardsPage extends BasePage {
48 decoration: BoxDecoration(
49 gradient: LinearGradient(
50 colors: [
51 - Theme.of(context).accentColor,
51 + Theme.of(context).colorScheme.secondary,
52 Theme.of(context).scaffoldBackgroundColor,
53 Theme.of(context).primaryColor,
54 ],
@@ -69,7 +69,10 @@ class IoniaManageCardsPage extends BasePage {
69 Widget leading(BuildContext context) {
70 final _backButton = Icon(
71 Icons.arrow_back_ios,
72 - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
72 + color: Theme.of(context)
73 + .accentTextTheme!
74 + .displayMedium!
75 + .backgroundColor!,
76 size: 16,
77 );
78
@@ -94,7 +97,10 @@ class IoniaManageCardsPage extends BasePage {
97 return Text(
98 S.of(context).gift_cards,
99 style: textMediumSemiBold(
97 - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
100 + color: Theme.of(context)
101 + .accentTextTheme!
102 + .displayMedium!
103 + .backgroundColor!,
104 ),
105 );
106 }
@@ -118,7 +124,7 @@ class IoniaManageCardsPage extends BasePage {
124 width: 32,
125 padding: EdgeInsets.all(8),
126 decoration: BoxDecoration(
121 - color: Theme.of(context).textTheme!.headline6!.backgroundColor!,
127 + color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!,
128 border: Border.all(
129 color: Colors.white.withOpacity(0.2),
130 ),
@@ -126,7 +132,7 @@ class IoniaManageCardsPage extends BasePage {
132 ),
133 child: Image.asset(
134 'assets/images/filter.png',
129 - color: Theme.of(context).textTheme!.caption!.decorationColor!,
135 + color: Theme.of(context).textTheme!.bodySmall!.decorationColor!,
136 ),
137 )
138 );
@@ -225,9 +231,9 @@ class _IoniaManageCardsPageBodyState extends State<IoniaManageCardsPageBody> {
231 },
232 title: merchant.legalName,
233 subTitle: merchant.avaibilityStatus,
228 - backgroundColor: Theme.of(context).textTheme!.headline6!.backgroundColor!,
229 - titleColor: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
230 - subtitleColor: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!,
234 + backgroundColor: Theme.of(context).textTheme!.titleLarge!.backgroundColor!,
235 + titleColor: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!,
236 + subtitleColor: Theme.of(context).accentTextTheme!.displaySmall!.backgroundColor!,
237 discount: merchant.discount,
238 );
239 },
@@ -238,8 +244,8 @@ class _IoniaManageCardsPageBodyState extends State<IoniaManageCardsPageBody> {
244 thumbHeight: thumbHeight,
245 rightOffset: 1,
246 width: 3,
241 - backgroundColor: Theme.of(context).textTheme!.caption!.decorationColor!.withOpacity(0.05),
242 - thumbColor: Theme.of(context).textTheme!.caption!.decorationColor!.withOpacity(0.5),
247 + backgroundColor: Theme.of(context).textTheme!.bodySmall!.decorationColor!.withOpacity(0.05),
248 + thumbColor: Theme.of(context).textTheme!.bodySmall!.decorationColor!.withOpacity(0.5),
249 fromTop: widget.cardsListViewModel.scrollOffsetFromTop,
250 )
251 : Offstage()
@@ -247,8 +253,8 @@ class _IoniaManageCardsPageBodyState extends State<IoniaManageCardsPageBody> {
253 }
254 return Center(
255 child: CircularProgressIndicator(
250 - backgroundColor: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
251 - valueColor: AlwaysStoppedAnimation<Color>(Theme.of(context).primaryTextTheme!.bodyText2!.color!),
256 + backgroundColor: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!,
257 + valueColor: AlwaysStoppedAnimation<Color>(Theme.of(context).primaryTextTheme!.bodyMedium!.color!),
258 ),
259 );
260 }
@@ -269,12 +275,12 @@ class _SearchWidget extends StatelessWidget {
275 padding: EdgeInsets.all(8),
276 child: Image.asset(
277 'assets/images/mini_search_icon.png',
272 - color: Theme.of(context).textTheme!.caption!.decorationColor!,
278 + color: Theme.of(context).textTheme!.bodySmall!.decorationColor!,
279 ),
280 );
281
282 return TextField(
277 - style: TextStyle(color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!),
283 + style: TextStyle(color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!),
284 controller: controller,
285 decoration: InputDecoration(
286 filled: true,
@@ -282,10 +288,10 @@ class _SearchWidget extends StatelessWidget {
288 top: 10,
289 left: 10,
290 ),
285 - fillColor: Theme.of(context).textTheme!.headline6!.backgroundColor!,
291 + fillColor: Theme.of(context).textTheme!.titleLarge!.backgroundColor!,
292 hintText: S.of(context).search,
293 hintStyle: TextStyle(
288 - color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!,
294 + color: Theme.of(context).accentTextTheme!.displaySmall!.backgroundColor!,
295 ),
296 alignLabelWithHint: true,
297 floatingLabelBehavior: FloatingLabelBehavior.never,
@@ -329,7 +335,7 @@ class _TrailingIcon extends StatelessWidget {
335 onPressed: onPressed,
336 icon: Image.asset(
337 asset,
332 - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
338 + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!,
339 ),
340 ),
341 );
lib/src/screens/ionia/cards/ionia_more_options_page.dart
+6 -3
@@ -15,7 +15,10 @@ class IoniaMoreOptionsPage extends BasePage {
15 return Text(
16 S.current.more_options,
17 style: textMediumSemiBold(
18 - color: Theme.of(context).accentTextTheme.headline1!.backgroundColor!,
18 + color: Theme.of(context)
19 + .accentTextTheme!
20 + .displayLarge!
21 + .backgroundColor!,
22 ),
23 );
24 }
@@ -34,7 +37,7 @@ class IoniaMoreOptionsPage extends BasePage {
37 child: Text(
38 S.of(context).choose_from_available_options,
39 style: textMedium(
37 - color: Theme.of(context).primaryTextTheme.headline6!.color!,
40 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
41 ),
42 ),
43 ),
@@ -78,7 +81,7 @@ class _GradiantContainer extends StatelessWidget {
81 gradient: LinearGradient(
82 colors: [
83 Theme.of(context).scaffoldBackgroundColor,
81 - Theme.of(context).accentColor,
84 + Theme.of(context).colorScheme.secondary,
85 ],
86 begin: Alignment.topRight,
87 end: Alignment.bottomLeft,
lib/src/screens/ionia/cards/ionia_payment_status_page.dart
+14 -11
@@ -23,8 +23,11 @@ class IoniaPaymentStatusPage extends BasePage {
23 S.of(context).generating_gift_card,
24 textAlign: TextAlign.center,
25 style: textMediumSemiBold(
26 - color: Theme.of(context).accentTextTheme!.headline1!.backgroundColor!));
27 - }
26 + color: Theme.of(context)
27 + .accentTextTheme!
28 + .displayLarge!
29 + .backgroundColor!));
30 + }
31
32 @override
33 Widget body(BuildContext context) {
@@ -90,7 +93,7 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
93 Text(
94 S.of(context).awaiting_payment_confirmation,
95 style: textLargeSemiBold(
93 - color: Theme.of(context).primaryTextTheme!.headline6!.color!))
96 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!))
97 ]),
98 SizedBox(height: 40),
99 Row(children: [
@@ -129,7 +132,7 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
132 Text(
133 S.of(context).gift_card_is_generated,
134 style: textLargeSemiBold(
132 - color: Theme.of(context).primaryTextTheme!.headline6!.color!))
135 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!))
136 ]));
137 }
138
@@ -147,7 +150,7 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
150 Text(
151 S.of(context).generating_gift_card,
152 style: textLargeSemiBold(
150 - color: Theme.of(context).primaryTextTheme!.headline6!.color!))]);
153 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!))]);
154 }),
155 ],
156 ),
@@ -160,7 +163,7 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
163 widget.viewModel.payingByBitcoin ? S.of(context).bitcoin_payments_require_1_confirmation
164 : S.of(context).proceed_after_one_minute,
165 style: textMedium(
163 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
166 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
167 ).copyWith(fontWeight: FontWeight.w500),
168 textAlign: TextAlign.center,
169 )),
@@ -172,15 +175,15 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
175 Routes.ioniaGiftCardDetailPage,
176 arguments: [widget.viewModel.giftCard]),
177 text: S.of(context).open_gift_card,
175 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
178 + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
179 textColor: Colors.white);
180 }
181
182 return PrimaryButton(
183 onPressed: () => Navigator.of(context).pushNamed(Routes.support),
184 text: S.of(context).contact_support,
182 - color: Theme.of(context).accentTextTheme!.caption!.color!,
183 - textColor: Theme.of(context).primaryTextTheme!.headline6!.color!);
185 + color: Theme.of(context).accentTextTheme!.bodySmall!.color!,
186 + textColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!);
187 })
188 ])
189 ),
@@ -196,14 +199,14 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
199 Text(
200 title,
201 style: textXSmall(
199 - color: Theme.of(context).primaryTextTheme!.overline!.color!,
202 + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!,
203 ),
204 ),
205 SizedBox(height: 8),
206 Text(
207 subtitle,
208 style: textMedium(
206 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
209 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
210 ),
211 ),
212 ],
lib/src/screens/ionia/widgets/ionia_alert_model.dart
+8 -4
@@ -32,7 +32,7 @@ class IoniaAlertModal extends StatelessWidget {
32 padding: EdgeInsets.only(top: 24, left: 24, right: 24),
33 margin: EdgeInsets.all(24),
34 decoration: BoxDecoration(
35 - color: Theme.of(context).backgroundColor,
35 + color: Theme.of(context).colorScheme.background,
36 borderRadius: BorderRadius.circular(30),
37 ),
38 child: Column(
@@ -41,7 +41,7 @@ class IoniaAlertModal extends StatelessWidget {
41 Text(
42 title,
43 style: textLargeSemiBold(
44 - color: Theme.of(context).textTheme!.bodyText2!.color!,
44 + color: Theme.of(context).textTheme!.bodyMedium!.color!,
45 ),
46 ),
47 Container(
@@ -56,8 +56,12 @@ class IoniaAlertModal extends StatelessWidget {
56 PrimaryButton(
57 onPressed: () => Navigator.pop(context),
58 text: actionTitle,
59 - color: Theme.of(context).accentTextTheme!.caption!.color!,
60 - textColor: Theme.of(context).primaryTextTheme!.headline6!.color!,
59 + color: Theme.of(context)
60 + .accentTextTheme!
61 + .bodySmall!
62 + .color!,
63 + textColor:
64 + Theme.of(context).primaryTextTheme!.titleLarge!.color!,
65 ),
66 SizedBox(height: 21),
67 ],
lib/src/screens/ionia/widgets/ionia_filter_modal.dart
+6 -6
@@ -20,7 +20,7 @@ class IoniaFilterModal extends StatelessWidget {
20 padding: EdgeInsets.all(10),
21 child: Image.asset(
22 'assets/images/mini_search_icon.png',
23 - color: Theme.of(context).textTheme.subtitle2!.color!,
23 + color: Theme.of(context).textTheme!.titleSmall!.color!,
24 ),
25 );
26 return Scaffold(
@@ -34,7 +34,7 @@ class IoniaFilterModal extends StatelessWidget {
34 padding: EdgeInsets.only(top: 24, bottom: 20),
35 margin: EdgeInsets.all(24),
36 decoration: BoxDecoration(
37 - color: Theme.of(context).backgroundColor,
37 + color: Theme.of(context).colorScheme.background,
38 borderRadius: BorderRadius.circular(30),
39 ),
40 child: Column(
@@ -46,14 +46,14 @@ class IoniaFilterModal extends StatelessWidget {
46 child: TextField(
47 onChanged: ioniaGiftCardsListViewModel.onSearchFilter,
48 style: textMedium(
49 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
49 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
50 ),
51 decoration: InputDecoration(
52 filled: true,
53 prefixIcon: searchIcon,
54 hintText: S.of(context).search_category,
55 contentPadding: EdgeInsets.only(bottom: 5),
56 - fillColor: Theme.of(context).primaryTextTheme!.caption!.decorationColor!.withOpacity(0.5),
56 + fillColor: Theme.of(context).primaryTextTheme!.bodySmall!.decorationColor!.withOpacity(0.5),
57 border: OutlineInputBorder(
58 borderSide: BorderSide.none,
59 borderRadius: BorderRadius.circular(8),
@@ -84,12 +84,12 @@ class IoniaFilterModal extends StatelessWidget {
84 children: [
85 Image.asset(
86 category.iconPath,
87 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
87 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
88 ),
89 SizedBox(width: 10),
90 Text(category.title,
91 style: textSmall(
92 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
92 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
93 ).copyWith(fontWeight: FontWeight.w500)),
94 ],
95 ),
lib/src/screens/ionia/widgets/ionia_tile.dart
+2 -2
@@ -26,14 +26,14 @@ class IoniaTile extends StatelessWidget {
26 Text(
27 title,
28 style: textXSmall(
29 - color: Theme.of(context).primaryTextTheme!.overline!.color!,
29 + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!,
30 ),
31 ),
32 SizedBox(height: 8),
33 Text(
34 subTitle,
35 style: textMediumBold(
36 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
36 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
37 ),
38 ),
39 ],
lib/src/screens/ionia/widgets/rounded_checkbox.dart
+2 -2
@@ -15,11 +15,11 @@ class RoundedCheckbox extends StatelessWidget {
15 width: 20.0,
16 decoration: BoxDecoration(
17 borderRadius: BorderRadius.all(Radius.circular(50.0)),
18 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
18 + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
19 ),
20 child: Icon(
21 Icons.check,
22 - color: Theme.of(context).backgroundColor,
22 + color: Theme.of(context).colorScheme.background,
23 size: 14.0,
24 ))
25 : Offstage();
lib/src/screens/ionia/widgets/text_icon_button.dart
+2 -2
@@ -22,12 +22,12 @@ class TextIconButton extends StatelessWidget {
22 Text(
23 label,
24 style: textMediumSemiBold(
25 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
25 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
26 ),
27 ),
28 Icon(
29 Icons.chevron_right_rounded,
30 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
30 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
31 ),
32 ],
33 ),
lib/src/screens/monero_accounts/monero_account_edit_or_create_page.dart
+1 -1
@@ -56,7 +56,7 @@ class MoneroAccountEditOrCreatePage extends BasePage {
56 text: moneroAccountCreationViewModel.isEdit
57 ? S.of(context).rename
58 : S.of(context).add,
59 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
59 + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
60 textColor: Colors.white,
61 isLoading: moneroAccountCreationViewModel.state
62 is IsExecutingState,
lib/src/screens/monero_accounts/monero_account_list_page.dart
+1 -1
@@ -65,7 +65,7 @@ class MoneroAccountListPage extends StatelessWidget {
65 borderRadius: BorderRadius.all(Radius.circular(14)),
66 child: Container(
67 height: 296,
68 - color: Theme.of(context).textTheme!.headline1!.decorationColor!,
68 + color: Theme.of(context).textTheme!.displayLarge!.decorationColor!,
69 child: Column(
70 children: <Widget>[
71 Expanded(
lib/src/screens/monero_accounts/widgets/account_tile.dart
+5 -5
@@ -20,11 +20,11 @@ class AccountTile extends StatelessWidget {
20 @override
21 Widget build(BuildContext context) {
22 final color = isCurrent
23 - ? Theme.of(context).textTheme.subtitle2!.decorationColor!
24 - : Theme.of(context).textTheme.headline1!.decorationColor!;
23 + ? Theme.of(context).textTheme!.titleSmall!.decorationColor!
24 + : Theme.of(context).textTheme!.displayLarge!.decorationColor!;
25 final textColor = isCurrent
26 - ? Theme.of(context).textTheme.subtitle2!.color!
27 - : Theme.of(context).textTheme.headline1!.color!;
26 + ? Theme.of(context).textTheme!.titleSmall!.color!
27 + : Theme.of(context).textTheme!.displayLarge!.color!;
28
29 final Widget cell = GestureDetector(
30 onTap: onTap,
@@ -57,7 +57,7 @@ class AccountTile extends StatelessWidget {
57 fontSize: 15,
58 fontWeight: FontWeight.w600,
59 fontFamily: 'Lato',
60 - color: Theme.of(context).textTheme.headline4!.color!,
60 + color: Theme.of(context).textTheme!.headlineMedium!.color!,
61 decoration: TextDecoration.none,
62 ),
63 ),
lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
+8 -2
@@ -111,7 +111,10 @@ class _AdvancedPrivacySettingsBodyState extends State<AdvancedPrivacySettingsBod
111 Navigator.pop(context);
112 },
113 text: S.of(context).continue_text,
114 - color: Theme.of(context).accentTextTheme.bodyText1!.color!,
114 + color: Theme.of(context)
115 + .accentTextTheme!
116 + .bodyLarge!
117 + .color!,
118 textColor: Colors.white,
119 ),
120 const SizedBox(height: 25),
@@ -121,7 +124,10 @@ class _AdvancedPrivacySettingsBodyState extends State<AdvancedPrivacySettingsBod
124 S.of(context).settings_can_be_changed_later,
125 textAlign: TextAlign.center,
126 style: TextStyle(
124 - color: Theme.of(context).accentTextTheme.headline2?.color,
127 + color: Theme.of(context)
128 + .accentTextTheme!
129 + .displayMedium!
130 + .color,
131 ),
132 ),
133 ),
lib/src/screens/new_wallet/new_wallet_page.dart
+15 -6
@@ -117,25 +117,31 @@ class _WalletNameFormState extends State<WalletNameForm> {
117 style: TextStyle(
118 fontSize: 20.0,
119 fontWeight: FontWeight.w600,
120 - color: Theme.of(context).primaryTextTheme!.headline6!.color!),
120 + color: Theme.of(context)
121 + .primaryTextTheme!
122 + .titleLarge!
123 + .color!),
124 decoration: InputDecoration(
125 hintStyle: TextStyle(
126 fontSize: 18.0,
127 fontWeight: FontWeight.w500,
125 - color: Theme.of(context).accentTextTheme!.headline2!.color!),
128 + color: Theme.of(context)
129 + .accentTextTheme!
130 + .displayMedium!
131 + .color),
132 hintText: S.of(context).wallet_name,
133 focusedBorder: UnderlineInputBorder(
134 borderSide: BorderSide(
135 color: Theme.of(context)
136 .accentTextTheme!
131 - .headline2!
137 + .displayMedium!
138 .decorationColor!,
139 width: 1.0)),
140 enabledBorder: UnderlineInputBorder(
141 borderSide: BorderSide(
142 color: Theme.of(context)
143 .accentTextTheme!
138 - .headline2!
144 + .displayMedium!
145 .decorationColor!,
146 width: 1.0),
147 ),
@@ -165,7 +171,7 @@ class _WalletNameFormState extends State<WalletNameForm> {
171 'assets/images/refresh_icon.png',
172 color: Theme.of(context)
173 .primaryTextTheme!
168 - .headline4!
174 + .headlineMedium!
175 .decorationColor!,
176 ),
177 ),
@@ -187,7 +193,10 @@ class _WalletNameFormState extends State<WalletNameForm> {
193 style: TextStyle(
194 fontSize: 16.0,
195 fontWeight: FontWeight.w500,
190 - color: Theme.of(context).primaryTextTheme!.headline6!.color!),
196 + color: Theme.of(context)
197 + .primaryTextTheme!
198 + .titleLarge!
199 + .color!),
200 ),
201 ),
202 Padding(
lib/src/screens/new_wallet/new_wallet_type_page.dart
+8 -2
@@ -80,7 +80,10 @@ class WalletTypeFormState extends State<WalletTypeForm> {
80 style: TextStyle(
81 fontSize: 16,
82 fontWeight: FontWeight.w500,
83 - color: Theme.of(context).primaryTextTheme.headline6!.color!),
83 + color: Theme.of(context)
84 + .primaryTextTheme!
85 + .titleLarge!
86 + .color!),
87 ),
88 ),
89 ...types.map((type) => Padding(
@@ -99,7 +102,10 @@ class WalletTypeFormState extends State<WalletTypeForm> {
102 bottomSection: PrimaryButton(
103 onPressed: () => onTypeSelected(),
104 text: S.of(context).seed_language_next,
102 - color: Theme.of(context).accentTextTheme.bodyText1!.color!,
105 + color: Theme.of(context)
106 + .accentTextTheme!
107 + .bodyLarge!
108 + .color!,
109 textColor: Colors.white,
110 isDisabled: selected == null,
111 ),
lib/src/screens/new_wallet/widgets/select_button.dart
+18 -6
@@ -16,14 +16,26 @@ class SelectButton extends StatelessWidget {
16 @override
17 Widget build(BuildContext context) {
18 final color = isSelected
19 - ? Colors.green
20 - : Theme.of(context).accentTextTheme!.caption!.color!;
19 + ? Colors.green
20 + : Theme.of(context)
21 + .accentTextTheme!
22 + .bodySmall!
23 + .color!;
24 final textColor = isSelected
22 - ? Theme.of(context).accentTextTheme!.headline5!.decorationColor!
23 - : Theme.of(context).primaryTextTheme!.headline6!.color!;
25 + ? Theme.of(context)
26 + .accentTextTheme!
27 + .headlineSmall!
28 + .decorationColor!
29 + : Theme.of(context).primaryTextTheme!.titleLarge!.color!;
30 final arrowColor = isSelected
25 - ? Theme.of(context).accentTextTheme!.headline5!.decorationColor!
26 - : Theme.of(context).accentTextTheme!.subtitle1!.color!;
31 + ? Theme.of(context)
32 + .accentTextTheme!
33 + .headlineSmall!
34 + .decorationColor!
35 + : Theme.of(context)
36 + .accentTextTheme!
37 + .titleMedium!
38 + .color!;
39
40 final selectArrowImage = Image.asset('assets/images/select_arrow.png',
41 color: arrowColor);
lib/src/screens/nodes/node_create_or_edit_page.dart
+4 -1
@@ -148,7 +148,10 @@ class NodeCreateOrEditPage extends BasePage {
148 Navigator.of(context).pop();
149 },
150 text: S.of(context).save,
151 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
151 + color: Theme.of(context)
152 + .accentTextTheme!
153 + .bodyLarge!
154 + .color!,
155 textColor: Colors.white,
156 isDisabled: (!nodeCreateOrEditViewModel.isReady)||
157 (nodeCreateOrEditViewModel
lib/src/screens/nodes/widgets/node_list_row.dart
+1 -1
@@ -36,7 +36,7 @@ class NodeHeaderListRow extends StandardListRow {
36 return SizedBox(
37 width: 20,
38 child: Icon(Icons.add,
39 - color: Theme.of(context).accentTextTheme.subtitle1?.color, size: 24.0),
39 + color: Theme.of(context).accentTextTheme!.titleMedium!.color,size: 24.0),
40 );
41 }
42 }
lib/src/screens/pin_code/pin_code_widget.dart
+17 -10
@@ -110,11 +110,11 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
110 Widget body(BuildContext context) {
111 final deleteIconImage = Image.asset(
112 'assets/images/delete_icon.png',
113 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
113 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
114 );
115 final faceImage = Image.asset(
116 'assets/images/face.png',
117 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
117 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
118 );
119
120 return RawKeyboardListener(
@@ -133,7 +133,7 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
133 }
134 },
135 child: Container(
136 - color: Theme.of(context).backgroundColor,
136 + color: Theme.of(context).colorScheme.background,
137 padding: EdgeInsets.only(left: 40.0, right: 40.0, bottom: 40.0),
138 child: Column(
139 children: <Widget>[
@@ -142,7 +142,8 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
142 style: TextStyle(
143 fontSize: 20,
144 fontWeight: FontWeight.w500,
145 - color: Theme.of(context).primaryTextTheme!.headline6!.color!)),
145 + color:
146 + Theme.of(context).primaryTextTheme!.titleLarge!.color!)),
147 Spacer(flex: 3),
148 Container(
149 width: 180,
@@ -158,10 +159,13 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
159 decoration: BoxDecoration(
160 shape: BoxShape.circle,
161 color: isFilled
161 - ? Theme.of(context).primaryTextTheme!.headline6!.color!
162 + ? Theme.of(context)
163 + .primaryTextTheme!
164 + .titleLarge!
165 + .color!
166 : Theme.of(context)
167 .accentTextTheme!
164 - .bodyText2!
168 + .bodyMedium!
169 .color!
170 .withOpacity(0.25),
171 ));
@@ -181,7 +185,10 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
185 style: TextStyle(
186 fontSize: 14.0,
187 fontWeight: FontWeight.normal,
184 - color: Theme.of(context).accentTextTheme!.bodyText2!.decorationColor!),
188 + color: Theme.of(context)
189 + .accentTextTheme!
190 + .bodyMedium!
191 + .decorationColor!),
192 ),
193 )
194 ],
@@ -225,7 +232,7 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
232 child: TextButton(
233 onPressed: () => _pop(),
234 style: TextButton.styleFrom(
228 - backgroundColor: Theme.of(context).backgroundColor,
235 + backgroundColor: Theme.of(context).colorScheme.background,
236 shape: CircleBorder(),
237 ),
238 child: deleteIconImage,
@@ -242,7 +249,7 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
249 child: TextButton(
250 onPressed: () => _push(index),
251 style: TextButton.styleFrom(
245 - backgroundColor: Theme.of(context).backgroundColor,
252 + backgroundColor: Theme.of(context).colorScheme.background,
253 shape: CircleBorder(),
254 ),
255 child: Text('$index',
@@ -251,7 +258,7 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
258 fontWeight: FontWeight.w600,
259 color: Theme.of(context)
260 .primaryTextTheme!
254 - .headline6!
261 + .titleLarge!
262 .color!)),
263 ),
264 );
lib/src/screens/receive/anonpay_invoice_page.dart
+15 -6
@@ -73,7 +73,10 @@ class AnonPayInvoicePage extends BasePage {
73 disableScroll: true,
74 config: KeyboardActionsConfig(
75 keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
76 - keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!,
76 + keyboardBarColor: Theme.of(context)
77 + .accentTextTheme!
78 + .bodyLarge!
79 + .backgroundColor!,
80 nextFocus: false,
81 actions: [
82 KeyboardActionsItem(
@@ -82,7 +85,7 @@ class AnonPayInvoicePage extends BasePage {
85 ),
86 ]),
87 child: Container(
85 - color: Theme.of(context).backgroundColor,
88 + color: Theme.of(context).colorScheme.background,
89 child: ScrollableWithBottomSection(
90 contentPadding: EdgeInsets.only(bottom: 24),
91 content: Container(
@@ -91,8 +94,8 @@ class AnonPayInvoicePage extends BasePage {
94 bottomLeft: Radius.circular(24), bottomRight: Radius.circular(24)),
95 gradient: LinearGradient(
96 colors: [
94 - Theme.of(context).primaryTextTheme.subtitle2!.color!,
95 - Theme.of(context).primaryTextTheme.subtitle2!.decorationColor!,
97 + Theme.of(context).primaryTextTheme!.titleSmall!.color!,
98 + Theme.of(context).primaryTextTheme!.titleSmall!.decorationColor!,
99 ],
100 begin: Alignment.topLeft,
101 end: Alignment.bottomRight,
@@ -130,7 +133,10 @@ class AnonPayInvoicePage extends BasePage {
133 : S.of(context).anonpay_description("a donation link", "donate"),
134 textAlign: TextAlign.center,
135 style: TextStyle(
133 - color: Theme.of(context).primaryTextTheme.headline1!.decorationColor!,
136 + color: Theme.of(context)
137 + .primaryTextTheme!
138 + .displayLarge!
139 + .decorationColor!,
140 fontWeight: FontWeight.w500,
141 fontSize: 12),
142 ),
@@ -157,7 +163,10 @@ class AnonPayInvoicePage extends BasePage {
163 anonInvoicePageViewModel.generateDonationLink();
164 }
165 },
160 - color: Theme.of(context).accentTextTheme.bodyText1!.color!,
166 + color: Theme.of(context)
167 + .accentTextTheme!
168 + .bodyLarge!
169 + .color!,
170 textColor: Colors.white,
171 isLoading: anonInvoicePageViewModel.state is IsExecutingState,
172 ),
lib/src/screens/receive/anonpay_receive_page.dart
+18 -6
@@ -35,7 +35,10 @@ class AnonPayReceivePage extends BasePage {
35 Widget leading(BuildContext context) {
36 final _backButton = Icon(
37 Icons.arrow_back_ios,
38 - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
38 + color: Theme.of(context)
39 + .accentTextTheme!
40 + .displayMedium!
41 + .backgroundColor!,
42 size: 16,
43 );
44
@@ -62,7 +65,10 @@ class AnonPayReceivePage extends BasePage {
65 fontSize: 18.0,
66 fontWeight: FontWeight.bold,
67 fontFamily: 'Lato',
65 - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!),
68 + color: Theme.of(context)
69 + .accentTextTheme!
70 + .displayMedium!
71 + .backgroundColor!),
72 ),
73 Text(
74 invoiceInfo is AnonpayInvoiceInfo
@@ -71,7 +77,7 @@ class AnonPayReceivePage extends BasePage {
77 style: TextStyle(
78 fontSize: 10.0,
79 fontWeight: FontWeight.w500,
74 - color: Theme.of(context).textTheme.headline5!.color!),
80 + color: Theme.of(context).textTheme!.headlineSmall!.color!),
81 )
82 ],
83 );
@@ -93,7 +99,10 @@ class AnonPayReceivePage extends BasePage {
99 ),
100 icon: Icon(
101 Icons.edit,
96 - color: Theme.of(context).accentTextTheme.caption!.color!,
102 + color: Theme.of(context)
103 + .accentTextTheme!
104 + .bodySmall!
105 + .color!,
106 size: 22.0,
107 ),
108 ),
@@ -105,7 +114,7 @@ class AnonPayReceivePage extends BasePage {
114 (BuildContext context, Widget scaffold) => Container(
115 decoration: BoxDecoration(
116 gradient: LinearGradient(colors: [
108 - Theme.of(context).accentColor,
117 + Theme.of(context).colorScheme.secondary,
118 Theme.of(context).scaffoldBackgroundColor,
119 Theme.of(context).primaryColor,
120 ], begin: Alignment.topRight, end: Alignment.bottomLeft)),
@@ -151,7 +160,10 @@ class AnonPayReceivePage extends BasePage {
160 decoration: BoxDecoration(
161 border: Border.all(
162 width: 3,
154 - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
163 + color: Theme.of(context)
164 + .accentTextTheme!
165 + .displayMedium!
166 + .backgroundColor!,
167 ),
168 ),
169 child: QrImage(
lib/src/screens/receive/fullscreen_qr_page.dart
+11 -3
@@ -22,7 +22,10 @@ class FullscreenQRPage extends BasePage {
22 Widget leading(BuildContext context) {
23 final _backButton = Icon(
24 Icons.arrow_back_ios,
25 - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
25 + color: Theme.of(context)
26 + .accentTextTheme!
27 + .displayMedium!
28 + .backgroundColor!,
29 size: 16,
30 );
31
@@ -48,7 +51,7 @@ class FullscreenQRPage extends BasePage {
51 decoration: BoxDecoration(
52 gradient: LinearGradient(
53 colors: [
51 - Theme.of(context).accentColor,
54 + Theme.of(context).colorScheme.secondary,
55 Theme.of(context).scaffoldBackgroundColor,
56 Theme.of(context).primaryColor,
57 ],
@@ -70,7 +73,12 @@ class FullscreenQRPage extends BasePage {
73 child: Container(
74 padding: EdgeInsets.all(10),
75 decoration: BoxDecoration(
73 - border: Border.all(width: 3, color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!)),
76 + border: Border.all(
77 + width: 3,
78 + color: Theme.of(context)
79 + .accentTextTheme!
80 + .displayMedium!
81 + .backgroundColor!)),
82 child: Container(
83 decoration: BoxDecoration(
84 border: Border.all(width: 3, color: Colors.white)),
lib/src/screens/receive/receive_page.dart
+41 -11
@@ -64,7 +64,10 @@ class ReceivePage extends BasePage {
64 fontSize: 18.0,
65 fontWeight: FontWeight.bold,
66 fontFamily: 'Lato',
67 - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!),
67 + color: Theme.of(context)
68 + .accentTextTheme!
69 + .displayMedium!
70 + .backgroundColor!),
71 );
72 }
73
@@ -73,7 +76,7 @@ class ReceivePage extends BasePage {
76 (BuildContext context, Widget scaffold) => Container(
77 decoration: BoxDecoration(
78 gradient: LinearGradient(colors: [
76 - Theme.of(context).accentColor,
79 + Theme.of(context).colorScheme.secondary,
80 Theme.of(context).scaffoldBackgroundColor,
81 Theme.of(context).primaryColor,
82 ], begin: Alignment.topRight, end: Alignment.bottomLeft)),
@@ -100,7 +103,10 @@ class ReceivePage extends BasePage {
103 icon: Icon(
104 Icons.share,
105 size: 20,
103 - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
106 + color: Theme.of(context)
107 + .accentTextTheme!
108 + .displayMedium!
109 + .backgroundColor!,
110 ),
111 ),
112 ));
@@ -113,7 +119,10 @@ class ReceivePage extends BasePage {
119 ? KeyboardActions(
120 config: KeyboardActionsConfig(
121 keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
116 - keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!,
122 + keyboardBarColor: Theme.of(context)
123 + .accentTextTheme!
124 + .bodyLarge!
125 + .backgroundColor!,
126 nextFocus: false,
127 actions: [
128 KeyboardActionsItem(
@@ -154,7 +163,10 @@ class ReceivePage extends BasePage {
163 icon: Icon(
164 Icons.arrow_forward_ios,
165 size: 14,
157 - color: Theme.of(context).textTheme!.headline4!.color!,
166 + color: Theme.of(context)
167 + .textTheme!
168 + .headlineMedium!
169 + .color!,
170 ));
171 }
172
@@ -166,7 +178,10 @@ class ReceivePage extends BasePage {
178 icon: Icon(
179 Icons.add,
180 size: 20,
169 - color: Theme.of(context).textTheme!.headline4!.color!,
181 + color: Theme.of(context)
182 + .textTheme!
183 + .headlineMedium!
184 + .color!,
185 ));
186 }
187
@@ -175,11 +190,23 @@ class ReceivePage extends BasePage {
190 final isCurrent =
191 item.address == addressListViewModel.address.address;
192 final backgroundColor = isCurrent
178 - ? Theme.of(context).textTheme!.headline2!.decorationColor!
179 - : Theme.of(context).textTheme!.headline3!.decorationColor!;
193 + ? Theme.of(context)
194 + .textTheme!
195 + .displayMedium!
196 + .decorationColor!
197 + : Theme.of(context)
198 + .textTheme!
199 + .displaySmall!
200 + .decorationColor!;
201 final textColor = isCurrent
181 - ? Theme.of(context).textTheme!.headline2!.color!
182 - : Theme.of(context).textTheme!.headline3!.color!;
202 + ? Theme.of(context)
203 + .textTheme!
204 + .displayMedium!
205 + .color!
206 + : Theme.of(context)
207 + .textTheme!
208 + .displaySmall!
209 + .color!;
210
211 return AddressCell.fromItem(item,
212 isCurrent: isCurrent,
@@ -225,7 +252,10 @@ class ReceivePage extends BasePage {
252 textAlign: TextAlign.center,
253 style: TextStyle(
254 fontSize: 15,
228 - color: Theme.of(context).accentTextTheme!.headline3!.backgroundColor!)),
255 + color: Theme.of(context)
256 + .accentTextTheme!
257 + .displaySmall!
258 + .backgroundColor!)),
259 ],
260 ),
261 );
lib/src/screens/receive/widgets/anonpay_currency_input_field.dart
+20 -7
@@ -32,7 +32,8 @@ class AnonpayCurrencyInputField extends StatelessWidget {
32 decoration: BoxDecoration(
33 border: Border(
34 bottom: BorderSide(
35 - color: Theme.of(context).primaryTextTheme.bodyText1!.color!,
35 + color:
36 + Theme.of(context).primaryTextTheme!.bodyLarge!.color!,
37 width: 1)),
38 ),
39 child: Padding(
@@ -64,7 +65,10 @@ class AnonpayCurrencyInputField extends StatelessWidget {
65 child: Container(
66 height: 32,
67 decoration: BoxDecoration(
67 - color: Theme.of(context).primaryTextTheme.headline4!.color!,
68 + color: Theme.of(context)
69 + .primaryTextTheme!
70 + .headlineMedium!
71 + .color!,
72 borderRadius: BorderRadius.all(Radius.circular(6))),
73 child: Center(
74 child: Padding(
@@ -75,8 +79,8 @@ class AnonpayCurrencyInputField extends StatelessWidget {
79 fontSize: 12,
80 fontWeight: FontWeight.bold,
81 color: Theme.of(context)
78 - .primaryTextTheme
79 - .headline4!
82 + .primaryTextTheme!
83 + .headlineMedium!
84 .decorationColor!,
85 ),
86 ),
@@ -115,7 +119,10 @@ class AnonpayCurrencyInputField extends StatelessWidget {
119 placeholderTextStyle: TextStyle(
120 fontSize: 16,
121 fontWeight: FontWeight.w600,
118 - color: Theme.of(context).accentTextTheme.headline1!.decorationColor!,
122 + color: Theme.of(context)
123 + .accentTextTheme!
124 + .displayLarge!
125 + .decorationColor!,
126 ),
127 validator: null,
128 ),
@@ -136,14 +143,20 @@ class AnonpayCurrencyInputField extends StatelessWidget {
143 style: TextStyle(
144 fontSize: 10,
145 height: 1.2,
139 - color: Theme.of(context).accentTextTheme.headline1!.decorationColor!),
146 + color: Theme.of(context)
147 + .accentTextTheme!
148 + .displayLarge!
149 + .decorationColor!),
150 ),
151 SizedBox(width: 10),
152 Text(S.of(context).max_value(maxAmount, selectedCurrency.toString()),
153 style: TextStyle(
154 fontSize: 10,
155 height: 1.2,
146 - color: Theme.of(context).accentTextTheme.headline1!.decorationColor!)),
156 + color: Theme.of(context)
157 + .accentTextTheme!
158 + .displayLarge!
159 + .decorationColor!)),
160 ],
161 ),
162 )
lib/src/screens/receive/widgets/anonpay_input_form.dart
+15 -6
@@ -69,14 +69,17 @@ class AnonInvoiceForm extends StatelessWidget {
69 BaseTextFormField(
70 controller: nameController,
71 focusNode: _nameFocusNode,
72 - borderColor: Theme.of(context).primaryTextTheme.bodyText1!.color!,
72 + borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.color!,
73 suffixIcon: SizedBox(width: 36),
74 hintText: S.of(context).optional_name,
75 textInputAction: TextInputAction.next,
76 placeholderTextStyle: TextStyle(
77 fontSize: 16,
78 fontWeight: FontWeight.w600,
79 - color: Theme.of(context).accentTextTheme.headline1!.decorationColor!,
79 + color: Theme.of(context)
80 + .accentTextTheme!
81 + .displayLarge!
82 + .decorationColor!,
83 ),
84 textStyle: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white),
85 validator: null,
@@ -88,13 +91,16 @@ class AnonInvoiceForm extends StatelessWidget {
91 controller: descriptionController,
92 focusNode: _descriptionFocusNode,
93 textInputAction: TextInputAction.next,
91 - borderColor: Theme.of(context).primaryTextTheme.bodyText1!.color!,
94 + borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.color!,
95 suffixIcon: SizedBox(width: 36),
96 hintText: S.of(context).optional_description,
97 placeholderTextStyle: TextStyle(
98 fontSize: 16,
99 fontWeight: FontWeight.w600,
97 - color: Theme.of(context).accentTextTheme.headline1!.decorationColor!,
100 + color: Theme.of(context)
101 + .accentTextTheme!
102 + .displayLarge!
103 + .decorationColor!,
104 ),
105 textStyle: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white),
106 validator: null,
@@ -104,14 +110,17 @@ class AnonInvoiceForm extends StatelessWidget {
110 controller: emailController,
111 textInputAction: TextInputAction.next,
112 focusNode: _emailFocusNode,
107 - borderColor: Theme.of(context).primaryTextTheme.bodyText1!.color!,
113 + borderColor: Theme.of(context).primaryTextTheme!.bodyLarge!.color!,
114 suffixIcon: SizedBox(width: 36),
115 keyboardType: TextInputType.emailAddress,
116 hintText: S.of(context).optional_email_hint,
117 placeholderTextStyle: TextStyle(
118 fontSize: 16,
119 fontWeight: FontWeight.w600,
114 - color: Theme.of(context).accentTextTheme.headline1!.decorationColor!,
120 + color: Theme.of(context)
121 + .accentTextTheme!
122 + .displayLarge!
123 + .decorationColor!,
124 ),
125 textStyle: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Colors.white),
126 validator: EmailValidator(),
lib/src/screens/receive/widgets/anonpay_status_section.dart
+18 -6
@@ -18,7 +18,7 @@ class AnonInvoiceStatusSection extends StatelessWidget {
18 width: 200,
19 padding: EdgeInsets.all(19),
20 decoration: BoxDecoration(
21 - color: Theme.of(context).backgroundColor,
21 + color: Theme.of(context).colorScheme.background,
22 borderRadius: BorderRadius.circular(30),
23 ),
24 child: Column(
@@ -31,13 +31,19 @@ class AnonInvoiceStatusSection extends StatelessWidget {
31 style: TextStyle(
32 fontSize: 14,
33 fontWeight: FontWeight.w500,
34 - color: Theme.of(context).primaryTextTheme.headline1!.decorationColor!,
34 + color: Theme.of(context)
35 + .primaryTextTheme!
36 + .displayLarge!
37 + .decorationColor!,
38 ),
39 ),
40 Container(
41 padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5),
42 decoration: BoxDecoration(
40 - color: Theme.of(context).accentTextTheme.headline3!.color!,
43 + color: Theme.of(context)
44 + .accentTextTheme!
45 + .displaySmall!
46 + .color!,
47 borderRadius: BorderRadius.circular(10),
48 ),
49 child: Row(
@@ -52,7 +58,10 @@ class AnonInvoiceStatusSection extends StatelessWidget {
58 Text(
59 invoiceInfo.status ?? '',
60 style: textSmallSemiBold(
55 - color: Theme.of(context).primaryTextTheme.headline6!.color,
61 + color: Theme.of(context)
62 + .primaryTextTheme!
63 + .titleLarge!
64 + .color,
65 ),
66 )
67 ],
@@ -69,13 +78,16 @@ class AnonInvoiceStatusSection extends StatelessWidget {
78 style: TextStyle(
79 fontSize: 14,
80 fontWeight: FontWeight.w500,
72 - color: Theme.of(context).primaryTextTheme.headline1!.decorationColor!,
81 + color: Theme.of(context)
82 + .primaryTextTheme!
83 + .displayLarge!
84 + .decorationColor!,
85 ),
86 ),
87 Text(
88 invoiceInfo.invoiceId ?? '',
89 style: textSmallSemiBold(
78 - color: Theme.of(context).primaryTextTheme.headline6!.color,
90 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color,
91 ),
92 ),
93 ],
lib/src/screens/receive/widgets/copy_link_item.dart
+12 -3
@@ -14,7 +14,10 @@ class CopyLinkItem extends StatelessWidget {
14 @override
15 Widget build(BuildContext context) {
16 final copyImage = Image.asset('assets/images/copy_address.png',
17 - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!);
17 + color: Theme.of(context)
18 + .accentTextTheme!
19 + .displayMedium!
20 + .backgroundColor!);
21
22 return Row(
23 mainAxisAlignment: MainAxisAlignment.center,
@@ -22,7 +25,10 @@ class CopyLinkItem extends StatelessWidget {
25 Text(
26 title,
27 style: textMedium(
25 - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
28 + color: Theme.of(context)
29 + .accentTextTheme!
30 + .displayMedium!
31 + .backgroundColor!,
32 ),
33 ),
34 SizedBox(width: 50),
@@ -45,7 +51,10 @@ class CopyLinkItem extends StatelessWidget {
51 onPressed: () => Share.share(url),
52 icon: Icon(
53 Icons.share,
48 - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
54 + color: Theme.of(context)
55 + .accentTextTheme!
56 + .displayMedium!
57 + .backgroundColor!,
58 ),
59 )
60 ],
lib/src/screens/receive/widgets/currency_input_field.dart
+13 -10
@@ -22,7 +22,10 @@ class CurrencyInputField extends StatelessWidget {
22 Widget build(BuildContext context) {
23 final arrowBottomPurple = Image.asset(
24 'assets/images/arrow_bottom_purple_icon.png',
25 - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
25 + color: Theme.of(context)
26 + .accentTextTheme!
27 + .displayMedium!
28 + .backgroundColor!,
29 height: 8,
30 );
31 final _width = MediaQuery.of(context).size.width;
@@ -40,13 +43,13 @@ class CurrencyInputField extends StatelessWidget {
43 inputFormatters: [FilteringTextInputFormatter.allow(RegExp(r'^\d+(\.|\,)?\d{0,8}'))],
44 hintText: '0.000',
45 placeholderTextStyle: isLight ? null : TextStyle(
43 - color: Theme.of(context).primaryTextTheme.headline5!.color!,
46 + color: Theme.of(context).primaryTextTheme!.headlineSmall!.color!,
47 fontWeight: FontWeight.w600,
48 ),
46 - borderColor: Theme.of(context).accentTextTheme.headline6!.backgroundColor!,
47 - textColor: Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
49 + borderColor: Theme.of(context).accentTextTheme!.titleLarge!.backgroundColor!,
50 + textColor: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!,
51 textStyle: TextStyle(
49 - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
52 + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!,
53 ),
54 prefixIcon: Padding(
55 padding: EdgeInsets.only(
@@ -69,7 +72,7 @@ class CurrencyInputField extends StatelessWidget {
72 style: TextStyle(
73 fontWeight: FontWeight.w600,
74 fontSize: 16,
72 - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
75 + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!,
76 ),
77 ),
78 if (selectedCurrency.tag != null)
@@ -77,7 +80,7 @@ class CurrencyInputField extends StatelessWidget {
80 padding: const EdgeInsets.only(right: 3.0),
81 child: Container(
82 decoration: BoxDecoration(
80 - color: Theme.of(context).primaryTextTheme.headline4!.color!,
83 + color: Theme.of(context).primaryTextTheme!.headlineMedium!.color!,
84 borderRadius: BorderRadius.all(
85 Radius.circular(6),
86 ),
@@ -89,8 +92,8 @@ class CurrencyInputField extends StatelessWidget {
92 fontSize: 12,
93 fontWeight: FontWeight.bold,
94 color: Theme.of(context)
92 - .primaryTextTheme
93 - .headline4!
95 + .primaryTextTheme!
96 + .headlineMedium!
97 .decorationColor!,
98 ),
99 ),
@@ -105,7 +108,7 @@ class CurrencyInputField extends StatelessWidget {
108 fontWeight: FontWeight.w600,
109 fontSize: 20,
110 color:
108 - Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
111 + Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!,
112 ),
113 ),
114 ),
lib/src/screens/receive/widgets/header_tile.dart
+6 -5
@@ -22,7 +22,7 @@ class HeaderTile extends StatelessWidget {
22 top: 24,
23 bottom: 24
24 ),
25 - color: Theme.of(context).textTheme!.headline3!.decorationColor!,
25 + color: Theme.of(context).textTheme!.displaySmall!.decorationColor!,
26 child: Row(
27 mainAxisSize: MainAxisSize.max,
28 mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -32,16 +32,17 @@ class HeaderTile extends StatelessWidget {
32 style: TextStyle(
33 fontSize: 18,
34 fontWeight: FontWeight.w600,
35 - color: Theme.of(context).textTheme!.headline3!.color!
36 - ),
35 + color: Theme.of(context)!.textTheme.displaySmall!.color!),
36 ),
37 Container(
38 height: 32,
39 width: 32,
40 decoration: BoxDecoration(
41 shape: BoxShape.circle,
43 - color: Theme.of(context).textTheme!.headline4!.decorationColor!
44 - ),
42 + color: Theme.of(context)
43 + .textTheme!
44 + .headlineMedium!
45 + .decorationColor!),
46 child: icon,
47 )
48 ],
lib/src/screens/receive/widgets/qr_widget.dart
+13 -5
@@ -35,7 +35,7 @@ class QRWidget extends StatelessWidget {
35 @override
36 Widget build(BuildContext context) {
37 final copyImage = Image.asset('assets/images/copy_address.png',
38 - color: Theme.of(context).textTheme.subtitle1!.decorationColor!);
38 + color: Theme.of(context).textTheme!.titleMedium!.decorationColor!);
39
40 return Column(
41 mainAxisSize: MainAxisSize.min,
@@ -51,7 +51,10 @@ class QRWidget extends StatelessWidget {
51 style: TextStyle(
52 fontSize: 14,
53 fontWeight: FontWeight.w500,
54 - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!),
54 + color: Theme.of(context)
55 + .accentTextTheme!
56 + .displayMedium!
57 + .backgroundColor!),
58 ),
59 ),
60 Row(
@@ -82,8 +85,10 @@ class QRWidget extends StatelessWidget {
85 decoration: BoxDecoration(
86 border: Border.all(
87 width: 3,
85 - color:
86 - Theme.of(context).accentTextTheme.headline2!.backgroundColor!,
88 + color: Theme.of(context)
89 + .accentTextTheme!
90 + .displayMedium!
91 + .backgroundColor!,
92 ),
93 ),
94 child: Container(
@@ -147,7 +152,10 @@ class QRWidget extends StatelessWidget {
152 style: TextStyle(
153 fontSize: 15,
154 fontWeight: FontWeight.w500,
150 - color: Theme.of(context).accentTextTheme.headline2!.backgroundColor!),
155 + color: Theme.of(context)
156 + .accentTextTheme!
157 + .displayMedium!
158 + .backgroundColor!),
159 ),
160 ),
161 Padding(
lib/src/screens/release_notes/release_notes_screen.dart
+8 -2
@@ -51,7 +51,10 @@ class ReleaseNotesScreen extends StatelessWidget {
51 fontSize: 24.0,
52 fontWeight: FontWeight.bold,
53 fontFamily: 'Lato',
54 - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
54 + color: Theme.of(context)
55 + .accentTextTheme!
56 + .displayMedium!
57 + .backgroundColor!,
58 ),
59 child: Text(title),
60 ),
@@ -118,7 +121,10 @@ class ReleaseNotesScreen extends StatelessWidget {
121 decoration: TextDecoration.none,
122 fontSize: 16.0,
123 fontFamily: 'Lato',
121 - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
124 + color: Theme.of(context)
125 + .accentTextTheme!
126 + .displayMedium!
127 + .backgroundColor!,
128 ),
129 child: Row(
130 crossAxisAlignment: CrossAxisAlignment.start,
lib/src/screens/rescan/rescan_page.dart
+4 -1
@@ -35,7 +35,10 @@ class RescanPage extends BasePage {
35 _blockchainHeightWidgetKey.currentState!.height);
36 Navigator.of(context).pop();
37 },
38 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
38 + color: Theme.of(context)
39 + .accentTextTheme!
40 + .bodyLarge!
41 + .color!,
42 textColor: Colors.white,
43 isDisabled: !_rescanViewModel.isButtonEnabled,
44 ))
lib/src/screens/restore/restore_from_backup_page.dart
+4 -1
@@ -75,7 +75,10 @@ class RestoreFromBackupPage extends BasePage {
75 restoreFromBackupViewModel.state is IsExecutingState,
76 onPressed: () => onImportHandler(context),
77 text: S.of(context).import,
78 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
78 + color: Theme.of(context)
79 + .accentTextTheme!
80 + .bodyLarge!
81 + .color!,
82 textColor: Colors.white);
83 }))
84 ])),
lib/src/screens/restore/restore_wallet_from_seed_details.dart
+4 -1
@@ -134,7 +134,10 @@ class _RestoreFromSeedDetailsFormState
134 isLoading:
135 widget.walletRestorationFromSeedVM.state is IsExecutingState,
136 text: S.of(context).restore_recover,
137 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
137 + color: Theme.of(context)
138 + .accentTextTheme!
139 + .bodyLarge!
140 + .color!,
141 textColor: Colors.white,
142 isDisabled: _nameController.text.isNotEmpty,
143 );
lib/src/screens/restore/sweeping_wallet_page.dart
+13 -4
@@ -16,7 +16,7 @@ class SweepingWalletPage extends BasePage {
16 @override
17 Widget build(BuildContext context) {
18 return Scaffold(
19 - backgroundColor: Theme.of(context).backgroundColor,
19 + backgroundColor: Theme.of(context).colorScheme.background,
20 resizeToAvoidBottomInset: false,
21 body: body(context));
22 }
@@ -82,7 +82,10 @@ class _SweepingWalletWidgetState extends State<SweepingWalletWidget> {
82 style: TextStyle(
83 fontSize: 18,
84 fontWeight: FontWeight.w500,
85 - color: Theme.of(context).accentTextTheme!.headline2!.color!,
85 + color: Theme.of(context)
86 + .accentTextTheme!
87 + .displayMedium!
88 + .color,
89 ),
90 textAlign: TextAlign.center,
91 ),
@@ -94,7 +97,10 @@ class _SweepingWalletWidgetState extends State<SweepingWalletWidget> {
97 style: TextStyle(
98 fontSize: 36,
99 fontWeight: FontWeight.bold,
97 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
100 + color: Theme.of(context)
101 + .primaryTextTheme!
102 + .titleLarge!
103 + .color!,
104 ),
105 textAlign: TextAlign.center,
106 ),
@@ -106,7 +112,10 @@ class _SweepingWalletWidgetState extends State<SweepingWalletWidget> {
112 style: TextStyle(
113 fontSize: 16,
114 fontWeight: FontWeight.w500,
109 - color: Theme.of(context).accentTextTheme!.headline2!.color!,
115 + color: Theme.of(context)
116 + .accentTextTheme!
117 + .displayMedium!
118 + .color,
119 ),
120 textAlign: TextAlign.center,
121 ),
lib/src/screens/restore/wallet_restore_from_keys_form.dart
+1 -1
@@ -91,7 +91,7 @@ class WalletRestoreFromKeysFromState extends State<WalletRestoreFromKeysFrom> {
91 'assets/images/refresh_icon.png',
92 color: Theme.of(context)
93 .primaryTextTheme!
94 - .headline4!
94 + .headlineMedium!
95 .decorationColor!,
96 ),
97 ),
lib/src/screens/restore/wallet_restore_from_seed_form.dart
+1 -1
@@ -95,7 +95,7 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
95 'assets/images/refresh_icon.png',
96 color: Theme.of(context)
97 .primaryTextTheme!
98 - .headline4!
98 + .headlineMedium!
99 .decorationColor!,
100 ),
101 ),
lib/src/screens/restore/wallet_restore_page.dart
+15 -5
@@ -91,7 +91,8 @@ class WalletRestorePage extends BasePage {
91 fontSize: 18.0,
92 fontWeight: FontWeight.bold,
93 fontFamily: 'Lato',
94 - color: titleColor ?? Theme.of(context).primaryTextTheme.headline6!.color!),
94 + color: titleColor ??
95 + Theme.of(context).primaryTextTheme!.titleLarge!.color!),
96 ));
97
98 final WalletRestoreViewModel walletRestoreViewModel;
@@ -138,7 +139,10 @@ class WalletRestorePage extends BasePage {
139 return KeyboardActions(
140 config: KeyboardActionsConfig(
141 keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
141 - keyboardBarColor: Theme.of(context).accentTextTheme.bodyText1!.backgroundColor!,
142 + keyboardBarColor: Theme.of(context)
143 + .accentTextTheme!
144 + .bodyLarge!
145 + .backgroundColor!,
146 nextFocus: false,
147 actions: [
148 KeyboardActionsItem(
@@ -149,7 +153,7 @@ class WalletRestorePage extends BasePage {
153 ),
154 child: Container(
155 height: 0,
152 - color: Theme.of(context).backgroundColor,
156 + color: Theme.of(context).colorScheme.background,
157 child: Center(
158 child: ConstrainedBox(
159 constraints: BoxConstraints(maxWidth: ResponsiveLayoutUtil.kDesktopMaxWidthConstraint),
@@ -190,8 +194,14 @@ class WalletRestorePage extends BasePage {
194 return LoadingPrimaryButton(
195 onPressed: _confirmForm,
196 text: S.of(context).restore_recover,
193 - color: Theme.of(context).accentTextTheme.subtitle2!.decorationColor!,
194 - textColor: Theme.of(context).accentTextTheme.headline5!.decorationColor!,
197 + color: Theme.of(context)
198 + .accentTextTheme!
199 + .titleSmall!
200 + .decorationColor!,
201 + textColor: Theme.of(context)
202 + .accentTextTheme!
203 + .headlineSmall!
204 + .decorationColor!,
205 isLoading: walletRestoreViewModel.state is IsExecutingState,
206 isDisabled: !walletRestoreViewModel.isButtonEnabled,
207 );
lib/src/screens/restore/widgets/restore_button.dart
+13 -6
@@ -23,8 +23,11 @@ class RestoreButton extends StatelessWidget {
23 padding: EdgeInsets.all(24),
24 alignment: Alignment.topLeft,
25 decoration: BoxDecoration(
26 - borderRadius: BorderRadius.all(Radius.circular(12)),
27 - color: Theme.of(context).accentTextTheme!.caption!.color!,
26 + borderRadius: BorderRadius.all(Radius.circular(12)),
27 + color: Theme.of(context)
28 + .accentTextTheme!
29 + .bodySmall!
30 + .color!,
31 ),
32 child: Row(
33 mainAxisSize: MainAxisSize.max,
@@ -45,8 +48,10 @@ class RestoreButton extends StatelessWidget {
48 style: TextStyle(
49 fontSize: 16,
50 fontWeight: FontWeight.w500,
48 - color: Theme.of(context).primaryTextTheme!.headline6!.color!
49 - ),
51 + color: Theme.of(context)
52 + .primaryTextTheme!
53 + .titleLarge!
54 + .color!),
55 ),
56 Padding(
57 padding: EdgeInsets.only(top: 5),
@@ -55,8 +60,10 @@ class RestoreButton extends StatelessWidget {
60 style: TextStyle(
61 fontSize: 14,
62 fontWeight: FontWeight.normal,
58 - color: Theme.of(context).primaryTextTheme!.overline!.color!
59 - ),
63 + color: Theme.of(context)
64 + .primaryTextTheme!
65 + .labelSmall!
66 + .color!),
67 ),
68 )
69 ],
lib/src/screens/seed/pre_seed_page.dart
+5 -2
@@ -62,7 +62,7 @@ class PreSeedPage extends BasePage {
62 fontWeight: FontWeight.normal,
63 color: Theme.of(context)
64 .primaryTextTheme!
65 - .caption!
65 + .bodySmall!
66 .color!),
67 ),
68 ),
@@ -70,7 +70,10 @@ class PreSeedPage extends BasePage {
70 onPressed: () => Navigator.of(context)
71 .popAndPushNamed(Routes.seed, arguments: true),
72 text: S.of(context).pre_seed_button_text,
73 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
73 + color: Theme.of(context)
74 + .accentTextTheme!
75 + .bodyLarge!
76 + .color!,
77 textColor: Colors.white)
78 ],
79 ))
lib/src/screens/seed/wallet_seed_page.dart
+8 -5
@@ -67,7 +67,10 @@ class WalletSeedPage extends BasePage {
67 margin: EdgeInsets.only(left: 10),
68 decoration: BoxDecoration(
69 borderRadius: BorderRadius.all(Radius.circular(16)),
70 - color: Theme.of(context).accentTextTheme!.caption!.color!),
70 + color: Theme.of(context)
71 + .accentTextTheme!
72 + .bodySmall!
73 + .color!),
74 child: Text(
75 S.of(context).seed_language_next,
76 style: TextStyle(
@@ -115,7 +118,7 @@ class WalletSeedPage extends BasePage {
118 fontWeight: FontWeight.w600,
119 color: Theme.of(context)
120 .primaryTextTheme!
118 - .headline6!
121 + .titleLarge!
122 .color!),
123 ),
124 Padding(
@@ -129,7 +132,7 @@ class WalletSeedPage extends BasePage {
132 fontWeight: FontWeight.normal,
133 color: Theme.of(context)
134 .primaryTextTheme!
132 - .caption!
135 + .bodySmall!
136 .color!),
137 ),
138 )
@@ -151,7 +154,7 @@ class WalletSeedPage extends BasePage {
154 fontWeight: FontWeight.normal,
155 color: Theme.of(context)
156 .primaryTextTheme!
154 - .overline!
157 + .labelSmall!
158 .color!),
159 ),
160 )
@@ -187,7 +190,7 @@ class WalletSeedPage extends BasePage {
190 text: S.of(context).copy,
191 color: Theme.of(context)
192 .accentTextTheme!
190 - .bodyText2!
193 + .bodyMedium!
194 .color!,
195 textColor: Colors.white)),
196 ))
lib/src/screens/seed_language/seed_language_page.dart
+2 -1
@@ -66,7 +66,8 @@ class SeedLanguageFormState extends State<SeedLanguageForm> {
66 style: TextStyle(
67 fontSize: 16.0,
68 fontWeight: FontWeight.w500,
69 - color: Theme.of(context).primaryTextTheme!.headline6!.color!),
69 + color:
70 + Theme.of(context).primaryTextTheme!.titleLarge!.color!),
71 ),
72 ),
73 Padding(
lib/src/screens/send/send_page.dart
+6 -6
@@ -192,10 +192,10 @@ class SendPage extends BasePage {
192 dotWidth: 6.0,
193 dotHeight: 6.0,
194 dotColor: Theme.of(context)
195 - .primaryTextTheme.headline3!
195 + .primaryTextTheme!.displaySmall!
196 .backgroundColor!,
197 activeDotColor: Theme.of(context)
198 - .primaryTextTheme.headline2!
198 + .primaryTextTheme!.displayMedium!
199 .backgroundColor!),
200 )
201 : Offstage();
@@ -294,7 +294,7 @@ class SendPage extends BasePage {
294 text: 'Change your asset (${sendViewModel.selectedCryptoCurrency})',
295 color: Colors.transparent,
296 textColor: Theme.of(context)
297 - .accentTextTheme.headline3!
297 + .accentTextTheme!.displaySmall!
298 .decorationColor!,
299 )
300 )
@@ -312,11 +312,11 @@ class SendPage extends BasePage {
312 text: S.of(context).add_receiver,
313 color: Colors.transparent,
314 textColor: Theme.of(context)
315 - .accentTextTheme.headline3!
315 + .accentTextTheme!.displaySmall!
316 .decorationColor!,
317 isDottedBorder: true,
318 borderColor: Theme.of(context)
319 - .primaryTextTheme.headline3!
319 + .primaryTextTheme!.displaySmall!
320 .decorationColor!,
321 )),
322 Observer(
@@ -345,7 +345,7 @@ class SendPage extends BasePage {
345
346 },
347 text: S.of(context).send,
348 - color: Theme.of(context).accentTextTheme.bodyText1!.color!,
348 + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
349 textColor: Colors.white,
350 isLoading: sendViewModel.state is IsExecutingState ||
351 sendViewModel.state is TransactionCommitting,
lib/src/screens/send/send_template_page.dart
+19 -14
@@ -50,8 +50,10 @@ class SendTemplatePage extends BasePage {
50 return KeyboardActions(
51 config: KeyboardActionsConfig(
52 keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
53 - keyboardBarColor:
54 - Theme.of(context).accentTextTheme!.bodyText1!.backgroundColor!,
53 + keyboardBarColor: Theme.of(context)
54 + .accentTextTheme!
55 + .bodyLarge!
56 + .backgroundColor!,
57 nextFocus: false,
58 actions: [
59 KeyboardActionsItem(
@@ -65,7 +67,7 @@ class SendTemplatePage extends BasePage {
67 ]),
68 child: Container(
69 height: 0,
68 - color: Theme.of(context).backgroundColor,
70 + color: Theme.of(context).colorScheme.background,
71 child: ScrollableWithBottomSection(
72 contentPadding: EdgeInsets.only(bottom: 24),
73 content: Container(
@@ -75,8 +77,11 @@ class SendTemplatePage extends BasePage {
77 bottomRight: Radius.circular(24),
78 ),
79 gradient: LinearGradient(colors: [
78 - Theme.of(context).primaryTextTheme!.subtitle1!.color!,
79 - Theme.of(context).primaryTextTheme!.subtitle1!.decorationColor!,
80 + Theme.of(context).primaryTextTheme!.titleMedium!.color!,
81 + Theme.of(context)
82 + .primaryTextTheme!
83 + .titleMedium!
84 + .decorationColor!,
85 ], begin: Alignment.topLeft, end: Alignment.bottomRight),
86 ),
87 child: Form(
@@ -92,7 +97,7 @@ class SendTemplatePage extends BasePage {
97 hintText: S.of(context).send_name,
98 borderColor: Theme.of(context)
99 .primaryTextTheme!
95 - .headline5!
100 + .headlineSmall!
101 .color!,
102 textStyle: TextStyle(
103 fontSize: 14,
@@ -101,7 +106,7 @@ class SendTemplatePage extends BasePage {
106 placeholderTextStyle: TextStyle(
107 color: Theme.of(context)
108 .primaryTextTheme!
104 - .headline5!
109 + .headlineSmall!
110 .decorationColor!,
111 fontWeight: FontWeight.w500,
112 fontSize: 14),
@@ -123,11 +128,11 @@ class SendTemplatePage extends BasePage {
128 ],
129 buttonColor: Theme.of(context)
130 .primaryTextTheme!
126 - .headline4!
131 + .headlineMedium!
132 .color!,
133 borderColor: Theme.of(context)
134 .primaryTextTheme!
130 - .headline5!
135 + .headlineSmall!
136 .color!,
137 textStyle: TextStyle(
138 fontSize: 14,
@@ -138,7 +143,7 @@ class SendTemplatePage extends BasePage {
143 fontWeight: FontWeight.w500,
144 color: Theme.of(context)
145 .primaryTextTheme!
141 - .headline5!
146 + .headlineSmall!
147 .decorationColor!),
148 ),
149 ),
@@ -170,7 +175,7 @@ class SendTemplatePage extends BasePage {
175 hintText: '0.0000',
176 borderColor: Theme.of(context)
177 .primaryTextTheme!
173 - .headline5!
178 + .headlineSmall!
179 .color!,
180 textStyle: TextStyle(
181 fontSize: 14,
@@ -179,7 +184,7 @@ class SendTemplatePage extends BasePage {
184 placeholderTextStyle: TextStyle(
185 color: Theme.of(context)
186 .primaryTextTheme!
182 - .headline5!
187 + .headlineSmall!
188 .decorationColor!,
189 fontWeight: FontWeight.w500,
190 fontSize: 14),
@@ -212,7 +217,7 @@ class SendTemplatePage extends BasePage {
217 hintText: '0.00',
218 borderColor: Theme.of(context)
219 .primaryTextTheme!
215 - .headline5!
220 + .headlineSmall!
221 .color!,
222 textStyle: TextStyle(
223 fontSize: 14,
@@ -221,7 +226,7 @@ class SendTemplatePage extends BasePage {
226 placeholderTextStyle: TextStyle(
227 color: Theme.of(context)
228 .primaryTextTheme!
224 - .headline5!
229 + .headlineSmall!
230 .decorationColor!,
231 fontWeight: FontWeight.w500,
232 fontSize: 14),
lib/src/screens/send/widgets/choose_yat_address_alert.dart
+2 -2
@@ -66,7 +66,7 @@ class ChooseYatAddressButtonsState extends State<ChooseYatAddressButtons> {
66 Container(
67 width: 300,
68 height: 158,
69 - color: Theme.of(context).accentTextTheme!.bodyText2!.backgroundColor!,
69 + color: Theme.of(context).accentTextTheme!.bodyMedium!.backgroundColor!,
70 child: ListView.separated(
71 controller: controller,
72 padding: EdgeInsets.all(0),
@@ -95,7 +95,7 @@ class ChooseYatAddressButtonsState extends State<ChooseYatAddressButtons> {
95 fontSize: 15,
96 fontWeight: FontWeight.w600,
97 fontFamily: 'Lato',
98 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
98 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
99 decoration: TextDecoration.none,
100 ),
101 )
lib/src/screens/send/widgets/confirm_sending_alert.dart
+7 -7
@@ -206,7 +206,7 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
206 fontWeight: FontWeight.normal,
207 fontFamily: 'Lato',
208 color: Theme.of(context).primaryTextTheme!
209 - .headline6!.color!,
209 + .titleLarge!.color!,
210 decoration: TextDecoration.none,
211 ),
212 ),
@@ -220,7 +220,7 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
220 fontWeight: FontWeight.w600,
221 fontFamily: 'Lato',
222 color: Theme.of(context).primaryTextTheme!
223 - .headline6!.color!,
223 + .titleLarge!.color!,
224 decoration: TextDecoration.none,
225 ),
226 ),
@@ -242,7 +242,7 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
242 fontFamily: 'Lato',
243 color: Theme.of(context)
244 .primaryTextTheme!
245 - .headline6!
245 + .titleLarge!
246 .color!,
247 decoration: TextDecoration.none,
248 ),
@@ -258,7 +258,7 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
258 fontFamily: 'Lato',
259 color: Theme.of(context)
260 .primaryTextTheme!
261 - .headline6!
261 + .titleLarge!
262 .color,
263 decoration: TextDecoration.none,
264 ),
@@ -290,7 +290,7 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
290 fontSize: 16,
291 fontWeight: FontWeight.normal,
292 fontFamily: 'Lato',
293 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
293 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
294 decoration: TextDecoration.none,
295 ),
296 ),
@@ -303,7 +303,7 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
303 fontSize: 18,
304 fontWeight: FontWeight.w600,
305 fontFamily: 'Lato',
306 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
306 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
307 decoration: TextDecoration.none,
308 ),
309 ),
@@ -334,7 +334,7 @@ class ConfirmSendingAlertContentState extends State<ConfirmSendingAlertContent>
334 fontFamily: 'Lato',
335 color: Theme.of(context)
336 .primaryTextTheme!
337 - .headline6!
337 + .titleLarge!
338 .color!,
339 decoration: TextDecoration.none,
340 ),
lib/src/screens/send/widgets/send_card.dart
+24 -22
@@ -102,7 +102,9 @@ class SendCardState extends State<SendCard>
102 KeyboardActions(
103 config: KeyboardActionsConfig(
104 keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
105 - keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1!
105 + keyboardBarColor: Theme.of(context)
106 + .accentTextTheme!
107 + .bodyLarge!
108 .backgroundColor!,
109 nextFocus: false,
110 actions: [
@@ -125,10 +127,10 @@ class SendCardState extends State<SendCard>
127 bottomLeft: Radius.circular(24),
128 bottomRight: Radius.circular(24)),
129 gradient: LinearGradient(colors: [
128 - Theme.of(context).primaryTextTheme!.subtitle1!.color!,
130 + Theme.of(context).primaryTextTheme!.titleMedium!.color!,
131 Theme.of(context)
132 .primaryTextTheme!
131 - .subtitle1!
133 + .titleMedium!
134 .decorationColor!,
135 ], begin: Alignment.topLeft, end: Alignment.bottomRight),
136 ) : null,
@@ -164,11 +166,11 @@ class SendCardState extends State<SendCard>
166 ],
167 buttonColor: Theme.of(context)
168 .primaryTextTheme!
167 - .headline4!
169 + .headlineMedium!
170 .color!,
171 borderColor: Theme.of(context)
172 .primaryTextTheme!
171 - .headline5!
173 + .headlineSmall!
174 .color!,
175 textStyle: TextStyle(
176 fontSize: 14,
@@ -179,7 +181,7 @@ class SendCardState extends State<SendCard>
181 fontWeight: FontWeight.w500,
182 color: Theme.of(context)
183 .primaryTextTheme!
182 - .headline5!
184 + .headlineSmall!
185 .decorationColor!),
186 onPushPasteButton: (context) async {
187 output.resetParsedAddress();
@@ -200,7 +202,7 @@ class SendCardState extends State<SendCard>
202 readOnly: true,
203 borderColor: Theme.of(context)
204 .primaryTextTheme!
203 - .headline5!
205 + .headlineSmall!
206 .color!,
207 textStyle: TextStyle(
208 fontSize: 14,
@@ -232,7 +234,7 @@ class SendCardState extends State<SendCard>
234 decoration: BoxDecoration(
235 color: Theme.of(context)
236 .primaryTextTheme!
235 - .headline4!
237 + .headlineMedium!
238 .color!,
239 borderRadius:
240 BorderRadius.all(Radius.circular(6))),
@@ -245,7 +247,7 @@ class SendCardState extends State<SendCard>
247 fontWeight: FontWeight.bold,
248 color: Theme.of(context)
249 .primaryTextTheme!
248 - .headline4!
250 + .headlineMedium!
251 .decorationColor!)),
252 ),
253 ),
@@ -286,7 +288,7 @@ class SendCardState extends State<SendCard>
288 placeholderTextStyle: TextStyle(
289 color: Theme.of(context)
290 .primaryTextTheme!
289 - .headline5!
291 + .headlineSmall!
292 .decorationColor!,
293 fontWeight: FontWeight.w500,
294 fontSize: 14),
@@ -307,7 +309,7 @@ class SendCardState extends State<SendCard>
309 decoration: BoxDecoration(
310 color: Theme.of(context)
311 .primaryTextTheme!
310 - .headline4!
312 + .headlineMedium!
313 .color!,
314 borderRadius:
315 BorderRadius.all(
@@ -324,7 +326,7 @@ class SendCardState extends State<SendCard>
326 color:
327 Theme.of(context)
328 .primaryTextTheme!
327 - .headline4!
329 + .headlineMedium!
330 .decorationColor!))),
331 ))))]),
332 ),
@@ -333,7 +335,7 @@ class SendCardState extends State<SendCard>
335 )),
336 Divider(height: 1,color: Theme.of(context)
337 .primaryTextTheme!
336 - .headline5!
338 + .headlineSmall!
339 .decorationColor!),
340 Observer(
341 builder: (_) => Padding(
@@ -352,7 +354,7 @@ class SendCardState extends State<SendCard>
354 fontWeight: FontWeight.w600,
355 color: Theme.of(context)
356 .primaryTextTheme!
355 - .headline5!
357 + .headlineSmall!
358 .decorationColor!),
359 )),
360 Text(
@@ -362,7 +364,7 @@ class SendCardState extends State<SendCard>
364 fontWeight: FontWeight.w600,
365 color: Theme.of(context)
366 .primaryTextTheme!
365 - .headline5!
367 + .headlineSmall!
368 .decorationColor!),
369 )
370 ],
@@ -393,7 +395,7 @@ class SendCardState extends State<SendCard>
395 hintText: '0.00',
396 borderColor: Theme.of(context)
397 .primaryTextTheme!
396 - .headline5!
398 + .headlineSmall!
399 .color!,
400 textStyle: TextStyle(
401 fontSize: 14,
@@ -401,7 +403,7 @@ class SendCardState extends State<SendCard>
403 color: Colors.white),
404 placeholderTextStyle: TextStyle(
405 color: Theme.of(context)
404 - .primaryTextTheme!.headline5!.decorationColor!,
406 + .primaryTextTheme!.headlineSmall!.decorationColor!,
407 fontWeight: FontWeight.w500,
408 fontSize: 14),
409 )),
@@ -413,7 +415,7 @@ class SendCardState extends State<SendCard>
415 maxLines: null,
416 borderColor: Theme.of(context)
417 .primaryTextTheme!
416 - .headline5!
418 + .headlineSmall!
419 .color!,
420 textStyle: TextStyle(
421 fontSize: 14,
@@ -425,7 +427,7 @@ class SendCardState extends State<SendCard>
427 fontWeight: FontWeight.w500,
428 color: Theme.of(context)
429 .primaryTextTheme!
428 - .headline5!
430 + .headlineSmall!
431 .decorationColor!),
432 ),
433 ),
@@ -448,7 +450,7 @@ class SendCardState extends State<SendCard>
450 fontSize: 12,
451 fontWeight:
452 FontWeight.w500,
451 - //color: Theme.of(context).primaryTextTheme!.headline3!.color!,
453 + //color: Theme.of(context).primaryTextTheme!.displaySmall!.color!,
454 color: Colors.white)),
455 Container(
456 child: Row(
@@ -469,7 +471,7 @@ class SendCardState extends State<SendCard>
471 fontSize: 12,
472 fontWeight:
473 FontWeight.w600,
472 - //color: Theme.of(context).primaryTextTheme!.headline3!.color!,
474 + //color: Theme.of(context).primaryTextTheme!.displaySmall!.color!,
475 color:
476 Colors.white)),
477 Padding(
@@ -489,7 +491,7 @@ class SendCardState extends State<SendCard>
491 color: Theme
492 .of(context)
493 .primaryTextTheme!
492 - .headline5!
494 + .headlineSmall!
495 .decorationColor!))
496 ),
497 ],
lib/src/screens/settings/desktop_settings/desktop_settings_page.dart
+4 -1
@@ -71,7 +71,10 @@ class _DesktopSettingsPageState extends State<DesktopSettingsPage> {
71 },
72 separatorBuilder: (_, index) => Container(
73 height: 1,
74 - color: Theme.of(context).primaryTextTheme.caption!.decorationColor!,
74 + color: Theme.of(context)
75 + .primaryTextTheme!
76 + .bodySmall!
77 + .decorationColor!,
78 ),
79 itemCount: itemCount,
80 ),
lib/src/screens/settings/widgets/settings_cell_with_arrow.dart
+1 -1
@@ -8,5 +8,5 @@ class SettingsCellWithArrow extends StandardListRow {
8 @override
9 Widget buildTrailing(BuildContext context) =>
10 Image.asset('assets/images/select_arrow.png',
11 - color: Theme.of(context).primaryTextTheme!.overline!.color!);
11 + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!);
12 }
\ No newline at end of file
lib/src/screens/settings/widgets/settings_choices_cell.dart
+18 -5
@@ -9,7 +9,7 @@ class SettingsChoicesCell extends StatelessWidget {
9 @override
10 Widget build(BuildContext context) {
11 return Container(
12 - color: Theme.of(context).backgroundColor,
12 + color: Theme.of(context).colorScheme.background,
13 padding: EdgeInsets.all(24),
14 child: Column(
15 mainAxisSize: MainAxisSize.min,
@@ -22,7 +22,7 @@ class SettingsChoicesCell extends StatelessWidget {
22 style: TextStyle(
23 fontSize: 14,
24 fontWeight: FontWeight.normal,
25 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
25 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
26 ),
27 ),
28 ],
@@ -34,7 +34,10 @@ class SettingsChoicesCell extends StatelessWidget {
34 child: Container(
35 decoration: BoxDecoration(
36 borderRadius: BorderRadius.circular(30),
37 - color: Theme.of(context).accentTextTheme!.headline3!.color!,
37 + color: Theme.of(context)
38 + .accentTextTheme!
39 + .displaySmall!
40 + .color!,
41 ),
42 child: Row(
43 mainAxisAlignment: MainAxisAlignment.center,
@@ -48,12 +51,22 @@ class SettingsChoicesCell extends StatelessWidget {
51 padding: EdgeInsets.symmetric(horizontal: 32, vertical: 8),
52 decoration: BoxDecoration(
53 borderRadius: BorderRadius.circular(30),
51 - color: isSelected ? Theme.of(context).accentTextTheme!.bodyText1!.color! : null,
54 + color: isSelected
55 + ? Theme.of(context)
56 + .accentTextTheme!
57 + .bodyLarge!
58 + .color!
59 + : null,
60 ),
61 child: Text(
62 choicesListItem.displayItem?.call(e) ?? e.toString(),
63 style: TextStyle(
56 - color: isSelected ? Colors.white : Theme.of(context).primaryTextTheme!.caption!.color!,
64 + color: isSelected
65 + ? Colors.white
66 + : Theme.of(context)
67 + .primaryTextTheme!
68 + .bodySmall!
69 + .color!,
70 fontWeight: isSelected ? FontWeight.w700 : FontWeight.normal,
71 ),
72 ),
lib/src/screens/settings/widgets/settings_picker_cell.dart
+1 -1
@@ -55,7 +55,7 @@ class SettingsPickerCell<ItemType> extends StandardListRow {
55 style: TextStyle(
56 fontSize: 14.0,
57 fontWeight: FontWeight.w500,
58 - color: Theme.of(context).primaryTextTheme.overline?.color,
58 + color: Theme.of(context).primaryTextTheme!.labelSmall?.color,
59 ),
60 );
61 }
lib/src/screens/settings/widgets/settings_version_cell.dart
+1 -2
@@ -18,8 +18,7 @@ class SettingsVersionCell extends StatelessWidget {
18 style: TextStyle(
19 fontSize: 12,
20 fontWeight: FontWeight.normal,
21 - color: Theme.of(context).primaryTextTheme!.overline!.color!
22 - ),
21 + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!),
22 )
23 ],
24 ),
lib/src/screens/subaddress/address_edit_or_create_page.dart
+4 -1
@@ -53,7 +53,10 @@ class AddressEditOrCreatePage extends BasePage {
53 text: addressEditOrCreateViewModel.isEdit
54 ? S.of(context).rename
55 : S.of(context).new_subaddress_create,
56 - color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
56 + color: Theme.of(context)
57 + .accentTextTheme!
58 + .bodyLarge!
59 + .color!,
60 textColor: Colors.white,
61 isLoading:
62 addressEditOrCreateViewModel.state is AddressIsSaving,
lib/src/screens/support/support_page.dart
+4 -1
@@ -19,7 +19,10 @@ class SupportPage extends BasePage {
19
20 @override
21 Widget body(BuildContext context) {
22 - final iconColor = Theme.of(context).accentTextTheme!.headline1!.backgroundColor!;
22 + final iconColor = Theme.of(context)
23 + .accentTextTheme!
24 + .displayLarge!
25 + .backgroundColor!;
26 // FIX-ME: Added `context` it was not used here before, maby bug ?
27 return Center(
28 child: ConstrainedBox(
lib/src/screens/transaction_details/widgets/textfield_list_row.dart
+10 -7
@@ -23,7 +23,7 @@ class TextFieldListRow extends StatelessWidget {
23 Widget build(BuildContext context) {
24 return Container(
25 width: double.infinity,
26 - color: Theme.of(context).backgroundColor,
26 + color: Theme.of(context).colorScheme.background,
27 child: Padding(
28 padding:
29 const EdgeInsets.only(left: 24, top: 16, bottom: 16, right: 24),
@@ -35,7 +35,9 @@ class TextFieldListRow extends StatelessWidget {
35 fontSize: titleFontSize,
36 fontWeight: FontWeight.w500,
37 color: Theme.of(context)
38 - .primaryTextTheme!.overline!.color!),
38 + .primaryTextTheme!
39 + .labelSmall!
40 + .color!),
41 textAlign: TextAlign.left),
42 TextField(
43 controller: _textController,
@@ -46,8 +48,8 @@ class TextFieldListRow extends StatelessWidget {
48 style: TextStyle(
49 fontSize: valueFontSize,
50 fontWeight: FontWeight.w500,
49 - color: Theme.of(context)
50 - .primaryTextTheme!.headline6!.color!),
51 + color:
52 + Theme.of(context).primaryTextTheme!.titleLarge!.color!),
53 decoration: InputDecoration(
54 isDense: true,
55 contentPadding: EdgeInsets.only(top: 12, bottom: 0),
@@ -56,9 +58,10 @@ class TextFieldListRow extends StatelessWidget {
58 fontSize: valueFontSize,
59 fontWeight: FontWeight.w500,
60 color: Theme.of(context)
59 - .primaryTextTheme!.overline!.color!),
60 - border: InputBorder.none
61 - ),
61 + .primaryTextTheme!
62 + .labelSmall!
63 + .color!),
64 + border: InputBorder.none),
65 onSubmitted: (value) => onSubmitted?.call(value),
66 )
67 ]),
lib/src/screens/unspent_coins/unspent_coins_list_page.dart
+1 -1
@@ -18,7 +18,7 @@ class UnspentCoinsListPage extends BasePage {
18 //@override
19 //Widget trailing(BuildContext context) {
20 // final questionImage = Image.asset('assets/images/question_mark.png',
21 - // color: Theme.of(context).primaryTextTheme!.headline6!.color!);
21 + // color: Theme.of(context).primaryTextTheme!.titleLarge!.color!);
22
23 // return SizedBox(
24 // height: 20.0,
lib/src/screens/unspent_coins/widgets/unspent_coins_switch_row.dart
+4 -2
@@ -17,7 +17,7 @@ class UnspentCoinsSwitchRow extends StatelessWidget {
17 Widget build(BuildContext context) {
18 return Container(
19 width: double.infinity,
20 - color: Theme.of(context).backgroundColor,
20 + color: Theme.of(context).colorScheme.background,
21 child: Padding(
22 padding:
23 const EdgeInsets.only(left: 24, top: 16, bottom: 16, right: 24),
@@ -29,7 +29,9 @@ class UnspentCoinsSwitchRow extends StatelessWidget {
29 fontSize: titleFontSize,
30 fontWeight: FontWeight.w500,
31 color: Theme.of(context)
32 - .primaryTextTheme!.overline!.color!),
32 + .primaryTextTheme!
33 + .labelSmall!
34 + .color!),
35 textAlign: TextAlign.left),
36 Padding(
37 padding: EdgeInsets.only(top: 12),
lib/src/screens/wallet_keys/wallet_keys_page.dart
+2 -2
@@ -56,7 +56,7 @@ class WalletKeysPage extends BasePage {
56 width: double.infinity,
57 decoration: BoxDecoration(
58 borderRadius: BorderRadius.circular(12.0),
59 - color: Theme.of(context).accentTextTheme!.caption!.color!,
59 + color: Theme.of(context).accentTextTheme!.bodySmall!.color!,
60 ),
61 child: Center(
62 child: Padding(
@@ -84,7 +84,7 @@ class WalletKeysPage extends BasePage {
84 separatorBuilder: (context, index) => Container(
85 height: 1,
86 padding: EdgeInsets.only(left: 24),
87 - color: Theme.of(context).accentTextTheme!.headline6!.backgroundColor!,
87 + color: Theme.of(context).accentTextTheme!.titleLarge!.backgroundColor!,
88 child: const SectionDivider(),
89 ),
90 itemCount: walletKeysViewModel.items.length,
lib/src/screens/wallet_list/wallet_list_page.dart
+9 -9
@@ -57,7 +57,7 @@ class WalletListBodyState extends State<WalletListBody> {
57 final newWalletImage =
58 Image.asset('assets/images/new_wallet.png', height: 12, width: 12, color: Colors.white);
59 final restoreWalletImage = Image.asset('assets/images/restore_wallet.png',
60 - height: 12, width: 12, color: Theme.of(context).primaryTextTheme.headline6!.color!);
60 + height: 12, width: 12, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!);
61
62 return Container(
63 padding: EdgeInsets.only(top: 16),
@@ -69,13 +69,13 @@ class WalletListBodyState extends State<WalletListBody> {
69 shrinkWrap: true,
70 physics: const NeverScrollableScrollPhysics(),
71 separatorBuilder: (_, index) =>
72 - Divider(color: Theme.of(context).backgroundColor, height: 32),
72 + Divider(color: Theme.of(context).colorScheme.background, height: 32),
73 itemCount: widget.walletListViewModel.wallets.length,
74 itemBuilder: (__, index) {
75 final wallet = widget.walletListViewModel.wallets[index];
76 final currentColor = wallet.isCurrent
77 - ? Theme.of(context).accentTextTheme.subtitle2!.decorationColor!
78 - : Theme.of(context).backgroundColor;
77 + ? Theme.of(context).accentTextTheme!.titleSmall!.decorationColor!
78 + : Theme.of(context).colorScheme.background;
79 final row = GestureDetector(
80 onTap: () async {
81 if (wallet.isCurrent || !wallet.isEnabled) {
@@ -120,7 +120,7 @@ class WalletListBodyState extends State<WalletListBody> {
120 child: Container(
121 height: tileHeight,
122 padding: EdgeInsets.only(left: 20, right: 20),
123 - color: Theme.of(context).backgroundColor,
123 + color: Theme.of(context).colorScheme.background,
124 alignment: Alignment.centerLeft,
125 child: Row(
126 crossAxisAlignment: CrossAxisAlignment.center,
@@ -136,7 +136,7 @@ class WalletListBodyState extends State<WalletListBody> {
136 fontWeight: FontWeight.w500,
137 color: Theme.of(context)
138 .primaryTextTheme
139 - .headline6!
139 + .titleLarge!
140 .color!),
141 )
142 ],
@@ -171,7 +171,7 @@ class WalletListBodyState extends State<WalletListBody> {
171 },
172 image: newWalletImage,
173 text: S.of(context).wallet_list_create_new_wallet,
174 - color: Theme.of(context).accentTextTheme.bodyText1!.color!,
174 + color: Theme.of(context).accentTextTheme!.bodyLarge!.color!,
175 textColor: Colors.white,
176 ),
177 SizedBox(height: 10.0),
@@ -181,8 +181,8 @@ class WalletListBodyState extends State<WalletListBody> {
181 },
182 image: restoreWalletImage,
183 text: S.of(context).wallet_list_restore_wallet,
184 - color: Theme.of(context).accentTextTheme.caption!.color!,
185 - textColor: Theme.of(context).primaryTextTheme.headline6!.color!)
184 + color: Theme.of(context).accentTextTheme!.bodySmall!.color!,
185 + textColor: Theme.of(context).primaryTextTheme!.titleLarge!.color!)
186 ])),
187 );
188 }
lib/src/screens/welcome/welcome_page.dart
+34 -12
@@ -39,7 +39,7 @@ class WelcomePage extends BasePage {
39 @override
40 Widget build(BuildContext context) {
41 return Scaffold(
42 - backgroundColor: Theme.of(context).backgroundColor,
42 + backgroundColor: Theme.of(context).colorScheme.background,
43 resizeToAvoidBottomInset: false,
44 body: body(context));
45 }
@@ -51,9 +51,14 @@ class WelcomePage extends BasePage {
51 final newWalletImage = Image.asset('assets/images/new_wallet.png',
52 height: 12,
53 width: 12,
54 - color: Theme.of(context).accentTextTheme!.headline5!.decorationColor!);
54 + color: Theme.of(context)
55 + .accentTextTheme!
56 + .headlineSmall!
57 + .decorationColor!);
58 final restoreWalletImage = Image.asset('assets/images/restore_wallet.png',
56 - height: 12, width: 12, color: Theme.of(context).primaryTextTheme!.headline6!.color!);
59 + height: 12,
60 + width: 12,
61 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!);
62
63 return WillPopScope(
64 onWillPop: () async => false,
@@ -85,7 +90,10 @@ class WelcomePage extends BasePage {
90 style: TextStyle(
91 fontSize: 18,
92 fontWeight: FontWeight.w500,
88 - color: Theme.of(context).accentTextTheme!.headline2!.color!,
93 + color: Theme.of(context)
94 + .accentTextTheme!
95 + .displayMedium!
96 + .color,
97 ),
98 textAlign: TextAlign.center,
99 ),
@@ -97,7 +105,10 @@ class WelcomePage extends BasePage {
105 style: TextStyle(
106 fontSize: 36,
107 fontWeight: FontWeight.bold,
100 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
108 + color: Theme.of(context)
109 + .primaryTextTheme!
110 + .titleLarge!
111 + .color!,
112 ),
113 textAlign: TextAlign.center,
114 ),
@@ -109,7 +120,10 @@ class WelcomePage extends BasePage {
120 style: TextStyle(
121 fontSize: 16,
122 fontWeight: FontWeight.w500,
112 - color: Theme.of(context).accentTextTheme!.headline2!.color!,
123 + color: Theme.of(context)
124 + .accentTextTheme!
125 + .displayMedium!
126 + .color,
127 ),
128 textAlign: TextAlign.center,
129 ),
@@ -123,7 +137,10 @@ class WelcomePage extends BasePage {
137 style: TextStyle(
138 fontSize: 12,
139 fontWeight: FontWeight.normal,
126 - color: Theme.of(context).accentTextTheme!.headline2!.color!,
140 + color: Theme.of(context)
141 + .accentTextTheme!
142 + .displayMedium!
143 + .color,
144 ),
145 textAlign: TextAlign.center,
146 ),
@@ -136,11 +153,11 @@ class WelcomePage extends BasePage {
153 text: S.of(context).create_new,
154 color: Theme.of(context)
155 .accentTextTheme!
139 - .subtitle2!
156 + .titleSmall!
157 .decorationColor!,
158 textColor: Theme.of(context)
159 .accentTextTheme!
143 - .headline5!
160 + .headlineSmall!
161 .decorationColor!,
162 ),
163 ),
@@ -153,9 +170,14 @@ class WelcomePage extends BasePage {
170 },
171 image: restoreWalletImage,
172 text: S.of(context).restore_wallet,
156 - color: Theme.of(context).accentTextTheme!.caption!.color!,
157 - textColor:
158 - Theme.of(context).primaryTextTheme!.headline6!.color!),
173 + color: Theme.of(context)
174 + .accentTextTheme!
175 + .bodySmall!
176 + .color!,
177 + textColor: Theme.of(context)
178 + .primaryTextTheme!
179 + .titleLarge!
180 + .color!),
181 )
182 ],
183 )
lib/src/screens/yat_emoji_id.dart
+4 -3
@@ -38,7 +38,8 @@ class YatEmojiId extends StatelessWidget {
38 topRight: Radius.circular(24)),
39 child: Container(
40 height: 420,
41 - color: Theme.of(context).buttonColor,
41 + color:
42 + Theme.of(context).textTheme!.titleLarge!.backgroundColor!,
43 padding: EdgeInsets.fromLTRB(24, 15, 24, 24),
44 child: Column(
45 mainAxisSize: MainAxisSize.max,
@@ -88,7 +89,7 @@ class YatEmojiId extends StatelessWidget {
89 fontSize: 32,
90 fontWeight: FontWeight.bold,
91 fontFamily: 'Lato',
91 - color: Theme.of(context).accentTextTheme!.headline2!.backgroundColor!,
92 + color: Theme.of(context).accentTextTheme!.displayMedium!.backgroundColor!,
93 decoration: TextDecoration.none,
94 )
95 ),
@@ -103,7 +104,7 @@ class YatEmojiId extends StatelessWidget {
104 fontFamily: 'Lato',
105 color: Theme.of(context)
106 .accentTextTheme!
106 - .headline3!
107 + .displaySmall!
108 .backgroundColor!,
109 decoration: TextDecoration.none,
110 )
lib/src/widgets/add_template_button.dart
+10 -3
@@ -19,7 +19,8 @@ class AddTemplateButton extends StatelessWidget {
19 child: DottedBorder(
20 borderType: BorderType.RRect,
21 dashPattern: [6, 4],
22 - color: Theme.of(context).primaryTextTheme.headline3!.decorationColor!,
22 + color:
23 + Theme.of(context).primaryTextTheme!.displaySmall!.decorationColor!,
24 strokeWidth: 2,
25 radius: Radius.circular(20),
26 child: Container(
@@ -34,14 +35,20 @@ class AddTemplateButton extends StatelessWidget {
35 child: currentTemplatesLength >= 1
36 ? Icon(
37 Icons.add,
37 - color: Theme.of(context).primaryTextTheme.headline2!.color!,
38 + color: Theme.of(context)
39 + .primaryTextTheme!
40 + .displayMedium!
41 + .color!,
42 )
43 : Text(
44 S.of(context).new_template,
45 style: TextStyle(
46 fontSize: 14,
47 fontWeight: FontWeight.w600,
44 - color: Theme.of(context).primaryTextTheme.headline2!.color!,
48 + color: Theme.of(context)
49 + .primaryTextTheme!
50 + .displayMedium!
51 + .color!,
52 ),
53 ),
54 ),
lib/src/widgets/address_text_field.dart
+12 -7
@@ -68,7 +68,7 @@ class AddressTextField extends StatelessWidget {
68 style: textStyle ??
69 TextStyle(
70 fontSize: 16,
71 - color: Theme.of(context).primaryTextTheme.headline6!.color!),
71 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!),
72 decoration: InputDecoration(
73 suffixIcon: SizedBox(
74 width: prefixIconWidth * options.length +
@@ -121,7 +121,8 @@ class AddressTextField extends StatelessWidget {
121 decoration: BoxDecoration(
122 color: buttonColor ??
123 Theme.of(context)
124 - .accentTextTheme.headline6!
124 + .accentTextTheme!
125 + .titleLarge!
126 .color!,
127 borderRadius:
128 BorderRadius.all(Radius.circular(6))),
@@ -129,7 +130,8 @@ class AddressTextField extends StatelessWidget {
130 'assets/images/paste_ios.png',
131 color: iconColor ??
132 Theme.of(context)
132 - .primaryTextTheme.headline4!
133 + .primaryTextTheme!
134 + .headlineMedium!
135 .decorationColor!,
136 )),
137 )),
@@ -147,7 +149,8 @@ class AddressTextField extends StatelessWidget {
149 decoration: BoxDecoration(
150 color: buttonColor ??
151 Theme.of(context)
150 - .accentTextTheme.headline6!
152 + .accentTextTheme
153 + .titleLarge!
154 .color!,
155 borderRadius:
156 BorderRadius.all(Radius.circular(6))),
@@ -155,7 +158,7 @@ class AddressTextField extends StatelessWidget {
158 'assets/images/qr_code_icon.png',
159 color: iconColor ??
160 Theme.of(context)
158 - .primaryTextTheme.headline4!
161 + .primaryTextTheme!.headlineMedium!
162 .decorationColor!,
163 )),
164 ))
@@ -174,7 +177,8 @@ class AddressTextField extends StatelessWidget {
177 decoration: BoxDecoration(
178 color: buttonColor ??
179 Theme.of(context)
177 - .accentTextTheme.headline6!
180 + .accentTextTheme!
181 + .titleLarge!
182 .color!,
183 borderRadius:
184 BorderRadius.all(Radius.circular(6))),
@@ -182,7 +186,8 @@ class AddressTextField extends StatelessWidget {
186 'assets/images/open_book.png',
187 color: iconColor ??
188 Theme.of(context)
185 - .primaryTextTheme.headline4!
189 + .primaryTextTheme!
190 + .headlineMedium!
191 .decorationColor!,
192 )),
193 ))
lib/src/widgets/alert_with_one_action.dart
+7 -2
@@ -31,7 +31,10 @@ class AlertWithOneAction extends BaseAlertDialog {
31 width: 300,
32 height: 52,
33 padding: EdgeInsets.only(left: 12, right: 12),
34 - color: Theme.of(context).accentTextTheme!.bodyText2!.backgroundColor!,
34 + color: Theme.of(context)
35 + .accentTextTheme!
36 + .bodyMedium!
37 + .backgroundColor!,
38 child: ButtonTheme(
39 minWidth: double.infinity,
40 child: TextButton(
@@ -45,7 +48,9 @@ class AlertWithOneAction extends BaseAlertDialog {
48 style: TextStyle(
49 fontSize: 15,
50 fontWeight: FontWeight.w600,
48 - color: Theme.of(context).primaryTextTheme!.bodyText2!
51 + color: Theme.of(context)
52 + .primaryTextTheme!
53 + .bodyMedium!
54 .backgroundColor!,
55 decoration: TextDecoration.none,
56 ),
lib/src/widgets/base_alert_dialog.dart
+16 -9
@@ -25,7 +25,7 @@ class BaseAlertDialog extends StatelessWidget {
25 fontSize: 20,
26 fontFamily: 'Lato',
27 fontWeight: FontWeight.w600,
28 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
28 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
29 decoration: TextDecoration.none,
30 ),
31 );
@@ -39,7 +39,7 @@ class BaseAlertDialog extends StatelessWidget {
39 fontSize: 16,
40 fontWeight: FontWeight.normal,
41 fontFamily: 'Lato',
42 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
42 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
43 decoration: TextDecoration.none,
44 ),
45 );
@@ -59,7 +59,7 @@ class BaseAlertDialog extends StatelessWidget {
59 backgroundColor: leftActionButtonColor ??
60 Theme.of(context)
61 .accentTextTheme!
62 - .bodyText1!
62 + .bodyLarge!
63 .decorationColor!,
64 shape: const RoundedRectangleBorder(
65 borderRadius: BorderRadius.all(Radius.zero))),
@@ -71,8 +71,10 @@ class BaseAlertDialog extends StatelessWidget {
71 fontFamily: 'Lato',
72 fontWeight: FontWeight.w600,
73 color: leftActionButtonTextColor ??
74 - Theme.of(context).primaryTextTheme!
75 - .bodyText1!.backgroundColor!,
74 + Theme.of(context)
75 + .primaryTextTheme!
76 + .bodyLarge!
77 + .backgroundColor!,
78 decoration: TextDecoration.none,
79 ),
80 )),
@@ -83,8 +85,10 @@ class BaseAlertDialog extends StatelessWidget {
85 onPressed: actionRight,
86 style: TextButton.styleFrom(
87 backgroundColor: rightActionButtonColor ??
86 - Theme.of(context).accentTextTheme!
87 - .bodyText2!.backgroundColor!,
88 + Theme.of(context)
89 + .accentTextTheme!
90 + .bodyMedium!
91 + .backgroundColor!,
92 shape: const RoundedRectangleBorder(
93 borderRadius: BorderRadius.all(Radius.zero))),
94 child: Text(
@@ -97,7 +101,7 @@ class BaseAlertDialog extends StatelessWidget {
101 color: rightActionButtonTextColor ??
102 Theme.of(context)
103 .primaryTextTheme!
100 - .bodyText2!
104 + .bodyMedium!
105 .backgroundColor!,
106 decoration: TextDecoration.none,
107 ),
@@ -124,7 +128,10 @@ class BaseAlertDialog extends StatelessWidget {
128 borderRadius: BorderRadius.all(Radius.circular(30)),
129 child: Container(
130 width: 300,
127 - color: Theme.of(context).accentTextTheme!.headline6!.decorationColor!,
131 + color: Theme.of(context)
132 + .accentTextTheme!
133 + .titleLarge!
134 + .decorationColor!,
135 child: Column(
136 mainAxisSize: MainAxisSize.min,
137 children: <Widget>[
lib/src/widgets/base_text_form_field.dart
+14 -5
@@ -77,8 +77,8 @@ class BaseTextFormField extends StatelessWidget {
77 style: textStyle ??
78 TextStyle(
79 fontSize: 16.0,
80 - color:
81 - textColor ?? Theme.of(context).primaryTextTheme.headline6!.color!),
80 + color: textColor ??
81 + Theme.of(context).primaryTextTheme!.titleLarge!.color!),
82 decoration: InputDecoration(
83 prefix: prefix,
84 prefixIcon: prefixIcon,
@@ -92,17 +92,26 @@ class BaseTextFormField extends StatelessWidget {
92 focusedBorder: UnderlineInputBorder(
93 borderSide: BorderSide(
94 color: borderColor ??
95 - Theme.of(context).primaryTextTheme.headline6!.backgroundColor!,
95 + Theme.of(context)
96 + .primaryTextTheme!
97 + .titleLarge!
98 + .backgroundColor!,
99 width: borderWidth)),
100 disabledBorder: UnderlineInputBorder(
101 borderSide: BorderSide(
102 color: borderColor ??
100 - Theme.of(context).primaryTextTheme.headline6!.backgroundColor!,
103 + Theme.of(context)
104 + .primaryTextTheme!
105 + .titleLarge!
106 + .backgroundColor!,
107 width: borderWidth)),
108 enabledBorder: UnderlineInputBorder(
109 borderSide: BorderSide(
110 color: borderColor ??
105 - Theme.of(context).primaryTextTheme.headline6!.backgroundColor!,
111 + Theme.of(context)
112 + .primaryTextTheme!
113 + .titleLarge!
114 + .backgroundColor!,
115 width: borderWidth))),
116 validator: validator,
117 );
lib/src/widgets/blockchain_height_widget.dart
+2 -1
@@ -80,7 +80,8 @@ class BlockchainHeightState extends State<BlockchainHeightWidget> {
80 style: TextStyle(
81 fontSize: 16.0,
82 fontWeight: FontWeight.w500,
83 - color: Theme.of(context).primaryTextTheme!.headline6!.color!),
83 + color:
84 + Theme.of(context).primaryTextTheme!.titleLarge!.color!),
85 ),
86 ),
87 Row(
lib/src/widgets/cake_scrollbar.dart
+4 -2
@@ -27,7 +27,8 @@ class CakeScrollbar extends StatelessWidget {
27 height: backgroundHeight,
28 width: width,
29 decoration: BoxDecoration(
30 - color: backgroundColor ?? Theme.of(context).textTheme!.bodyText2!.decorationColor!,
30 + color: backgroundColor ??
31 + Theme.of(context).textTheme!.bodyMedium!.decorationColor!,
32 borderRadius: BorderRadius.all(Radius.circular(3))),
33 child: Stack(
34 children: <Widget>[
@@ -38,7 +39,8 @@ class CakeScrollbar extends StatelessWidget {
39 height: thumbHeight,
40 width: width,
41 decoration: BoxDecoration(
41 - color: thumbColor ?? Theme.of(context).textTheme!.bodyText2!.color!,
42 + color: thumbColor ??
43 + Theme.of(context).textTheme!.bodyMedium!.color!,
44 borderRadius: BorderRadius.all(Radius.circular(3))),
45 ),
46 )
lib/src/widgets/check_box_picker.dart
+19 -7
@@ -53,7 +53,10 @@ class CheckBoxPickerState extends State<CheckBoxPicker> {
53 child: ClipRRect(
54 borderRadius: BorderRadius.all(Radius.circular(30)),
55 child: Container(
56 - color: Theme.of(context).accentTextTheme.headline6!.color!,
56 + color: Theme.of(context)
57 + .accentTextTheme!
58 + .titleLarge!
59 + .color!,
60 child: ConstrainedBox(
61 constraints: BoxConstraints(
62 maxHeight: MediaQuery.of(context).size.height * 0.65,
@@ -87,7 +90,10 @@ class CheckBoxPickerState extends State<CheckBoxPicker> {
90
91 Widget itemsList() {
92 return Container(
90 - color: Theme.of(context).accentTextTheme.headline6!.backgroundColor!,
93 + color: Theme.of(context)
94 + .accentTextTheme!
95 + .titleLarge!
96 + .backgroundColor!,
97 child: ListView.separated(
98 padding: EdgeInsets.zero,
99 controller: controller,
@@ -95,8 +101,8 @@ class CheckBoxPickerState extends State<CheckBoxPicker> {
101 separatorBuilder: (context, index) => widget.isSeparated
102 ? Divider(
103 color: Theme.of(context)
98 - .accentTextTheme
99 - .headline6!
104 + .accentTextTheme!
105 + .titleLarge!
106 .backgroundColor!,
107 height: 1,
108 )
@@ -116,13 +122,19 @@ class CheckBoxPickerState extends State<CheckBoxPicker> {
122 },
123 child: Container(
124 height: 55,
119 - color: Theme.of(context).accentTextTheme.headline6!.color!,
125 + color: Theme.of(context)
126 + .accentTextTheme!
127 + .titleLarge!
128 + .color!,
129 padding: EdgeInsets.only(left: 24, right: 24),
130 child: CheckboxListTile(
131 value: item.value,
132 activeColor: item.value
133 ? Palette.blueCraiola
125 - : Theme.of(context).accentTextTheme.subtitle1!.decorationColor!,
134 + : Theme.of(context)
135 + .accentTextTheme!
136 + .titleMedium!
137 + .decorationColor!,
138 checkColor: Colors.white,
139 title: widget.displayItem?.call(item) ??
140 Text(
@@ -133,7 +145,7 @@ class CheckBoxPickerState extends State<CheckBoxPicker> {
145 fontWeight: FontWeight.w600,
146 color: item.isDisabled
147 ? Colors.grey.withOpacity(0.5)
136 - : Theme.of(context).primaryTextTheme.headline6!.color!,
148 + : Theme.of(context).primaryTextTheme!.titleLarge!.color!,
149 decoration: TextDecoration.none,
150 ),
151 ),
lib/src/widgets/checkbox_widget.dart
+10 -6
@@ -42,15 +42,19 @@ class CheckboxWidgetState extends State<CheckboxWidget> {
42 decoration: BoxDecoration(
43 color: value
44 ? Palette.blueCraiola
45 - : Theme.of(context).accentTextTheme!.subtitle1!.decorationColor!,
45 + : Theme.of(context)
46 + .accentTextTheme!
47 + .titleMedium!
48 + .decorationColor!,
49 borderRadius: BorderRadius.all(Radius.circular(2)),
50 border: Border.all(
51 color: value
52 ? Palette.blueCraiola
50 - : Theme.of(context).accentTextTheme!.overline!.color!,
51 - width: 1
52 - )
53 - ),
53 + : Theme.of(context)
54 + .accentTextTheme!
55 + .labelSmall!
56 + .color!,
57 + width: 1)),
58 child: value
59 ? Center(
60 child: Icon(
@@ -66,7 +70,7 @@ class CheckboxWidgetState extends State<CheckboxWidget> {
70 child: Text(
71 caption,
72 style: TextStyle(
69 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
73 + color: Theme.of(context).primaryTextTheme!.titleLarge!.color!,
74 fontSize: 18,
75 fontFamily: 'Lato',
76 fontWeight: FontWeight.w500,
lib/src/widgets/collapsible_standart_list.dart
+1 -1
@@ -38,7 +38,7 @@ class CollapsibleSectionList extends SectionStandardList {
38
39 items.add(Theme(
40 data: ThemeData(
41 - textTheme: TextTheme(subtitle1: TextStyle(color: themeColor,fontFamily: 'Lato')),
41 + textTheme: TextTheme(titleMedium: TextStyle(color: themeColor,fontFamily: 'Lato')),
42 backgroundColor: dividerThemeColor,
43 unselectedWidgetColor: themeColor,
44 accentColor: themeColor)
lib/src/widgets/introducing_card.dart
+3 -3
@@ -26,7 +26,7 @@ class IntroducingCard extends StatelessWidget {
26 color: borderColor,
27 width: 1,
28 ),
29 - color: Theme.of(context).textTheme!.headline6!.backgroundColor!),
29 + color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!),
30 child: Row(
31 mainAxisAlignment: MainAxisAlignment.spaceBetween,
32 crossAxisAlignment: CrossAxisAlignment.start,
@@ -46,7 +46,7 @@ class IntroducingCard extends StatelessWidget {
46 fontWeight: FontWeight.bold,
47 color: Theme.of(context)
48 .accentTextTheme!
49 - .headline2!
49 + .displayMedium!
50 .backgroundColor!,
51 height: 1),
52 maxLines: 1,
@@ -59,7 +59,7 @@ class IntroducingCard extends StatelessWidget {
59 fontFamily: 'Lato',
60 color: Theme.of(context)
61 .accentTextTheme!
62 - .headline2!
62 + .displayMedium!
63 .backgroundColor!,
64 height: 1)),
65 ],
lib/src/widgets/list_row.dart
+6 -4
@@ -19,7 +19,7 @@ class ListRow extends StatelessWidget {
19 Widget build(BuildContext context) {
20 return Container(
21 width: double.infinity,
22 - color: Theme.of(context).backgroundColor,
22 + color: Theme.of(context).colorScheme.background,
23 child: Padding(
24 padding:
25 const EdgeInsets.only(left: 24, top: 16, bottom: 16, right: 24),
@@ -30,8 +30,10 @@ class ListRow extends StatelessWidget {
30 style: TextStyle(
31 fontSize: titleFontSize,
32 fontWeight: FontWeight.w500,
33 - color:
34 - Theme.of(context).primaryTextTheme!.overline!.color!),
33 + color: Theme.of(context)
34 + .primaryTextTheme!
35 + .labelSmall!
36 + .color!),
37 textAlign: TextAlign.left),
38 Padding(
39 padding: const EdgeInsets.only(top: 12),
@@ -47,7 +49,7 @@ class ListRow extends StatelessWidget {
49 fontWeight: FontWeight.w500,
50 color: Theme.of(context)
51 .primaryTextTheme!
50 - .headline6!
52 + .titleLarge!
53 .color!)),
54 ),
55 image != null
lib/src/widgets/market_place_item.dart
+3 -3
@@ -26,7 +26,7 @@ class MarketPlaceItem extends StatelessWidget {
26 padding: EdgeInsets.all(20),
27 width: double.infinity,
28 decoration: BoxDecoration(
29 - color: Theme.of(context).textTheme!.headline6!.backgroundColor!,
29 + color: Theme.of(context).textTheme!.titleLarge!.backgroundColor!,
30 borderRadius: BorderRadius.circular(20),
31 border: Border.all(
32 color: Colors.white.withOpacity(0.20),
@@ -41,7 +41,7 @@ class MarketPlaceItem extends StatelessWidget {
41 style: TextStyle(
42 color: Theme.of(context)
43 .accentTextTheme!
44 - .headline2!
44 + .displayMedium!
45 .backgroundColor!,
46 fontSize: 24,
47 fontWeight: FontWeight.w900,
@@ -53,7 +53,7 @@ class MarketPlaceItem extends StatelessWidget {
53 style: TextStyle(
54 color: Theme.of(context)
55 .accentTextTheme!
56 - .headline2!
56 + .displayMedium!
57 .backgroundColor!,
58 fontWeight: FontWeight.w500,
59 fontFamily: 'Lato'),
lib/src/widgets/picker.dart
+42 -27
@@ -143,7 +143,10 @@ class _PickerState<Item> extends State<Picker<Item>> {
143 child: ClipRRect(
144 borderRadius: BorderRadius.all(Radius.circular(30)),
145 child: Container(
146 - color: Theme.of(context).accentTextTheme.headline6!.color!,
146 + color: Theme.of(context)
147 + .accentTextTheme!
148 + .titleLarge!
149 + .color!,
150 child: ConstrainedBox(
151 constraints: BoxConstraints(
152 maxHeight: containerHeight,
@@ -159,8 +162,8 @@ class _PickerState<Item> extends State<Picker<Item>> {
162 controller: searchController,
163 style: TextStyle(
164 color: Theme.of(context)
162 - .primaryTextTheme
163 - .headline6!
165 + .primaryTextTheme!
166 + .titleLarge!
167 .color!),
168 decoration: InputDecoration(
169 hintText: widget.hintText,
@@ -168,8 +171,8 @@ class _PickerState<Item> extends State<Picker<Item>> {
171 Image.asset("assets/images/search_icon.png"),
172 filled: true,
173 fillColor: Theme.of(context)
171 - .accentTextTheme
172 - .headline3!
174 + .accentTextTheme!
175 + .displaySmall!
176 .color!,
177 alignLabelWithHint: false,
178 contentPadding: const EdgeInsets.symmetric(
@@ -189,8 +192,8 @@ class _PickerState<Item> extends State<Picker<Item>> {
192 ),
193 Divider(
194 color: Theme.of(context)
192 - .accentTextTheme
193 - .headline6!
195 + .accentTextTheme!
196 + .titleLarge!
197 .backgroundColor!,
198 height: 1,
199 ),
@@ -220,8 +223,8 @@ class _PickerState<Item> extends State<Picker<Item>> {
223 fontFamily: 'Lato',
224 decoration: TextDecoration.none,
225 color: Theme.of(context)
223 - .primaryTextTheme
224 - .headline6!
226 + .primaryTextTheme!
227 + .titleLarge!
228 .color!,
229 ),
230 ),
@@ -242,7 +245,10 @@ class _PickerState<Item> extends State<Picker<Item>> {
245
246 Widget itemsList() {
247 return Container(
245 - color: Theme.of(context).accentTextTheme.headline6!.backgroundColor!,
248 + color: Theme.of(context)
249 + .accentTextTheme!
250 + .titleLarge!
251 + .backgroundColor!,
252 child: widget.isGridView
253 ? GridView.builder(
254 padding: EdgeInsets.zero,
@@ -263,8 +269,8 @@ class _PickerState<Item> extends State<Picker<Item>> {
269 separatorBuilder: (context, index) => widget.isSeparated
270 ? Divider(
271 color: Theme.of(context)
266 - .accentTextTheme
267 - .headline6!
272 + .accentTextTheme!
273 + .titleLarge!
274 .backgroundColor!,
275 height: 1,
276 )
@@ -296,7 +302,10 @@ class _PickerState<Item> extends State<Picker<Item>> {
302 },
303 child: Container(
304 height: 55,
299 - color: Theme.of(context).accentTextTheme.headline6!.color!,
305 + color: Theme.of(context)
306 + .accentTextTheme!
307 + .titleLarge!
308 + .color!,
309 padding: EdgeInsets.symmetric(horizontal: 24),
310 child: Row(
311 mainAxisSize: MainAxisSize.max,
@@ -318,8 +327,8 @@ class _PickerState<Item> extends State<Picker<Item>> {
327 fontFamily: 'Lato',
328 fontWeight: FontWeight.w600,
329 color: Theme.of(context)
321 - .primaryTextTheme
322 - .headline6!
330 + .primaryTextTheme!
331 + .titleLarge!
332 .color!,
333 decoration: TextDecoration.none,
334 ),
@@ -338,8 +347,8 @@ class _PickerState<Item> extends State<Picker<Item>> {
347 fontSize: 7.0,
348 fontFamily: 'Lato',
349 color: Theme.of(context)
341 - .textTheme
342 - .bodyText2!
350 + .textTheme!
351 + .bodyMedium!
352 .color!),
353 ),
354 ),
@@ -347,8 +356,8 @@ class _PickerState<Item> extends State<Picker<Item>> {
356 borderRadius: BorderRadius.circular(6.0),
357 //border: Border.all(color: ),
358 color: Theme.of(context)
350 - .textTheme
351 - .bodyText2!
359 + .textTheme!
360 + .bodyMedium!
361 .decorationColor!,
362 ),
363 ),
@@ -383,7 +392,10 @@ class _PickerState<Item> extends State<Picker<Item>> {
392 },
393 child: Container(
394 height: 55,
386 - color: Theme.of(context).accentTextTheme.headline6!.color!,
395 + color: Theme.of(context)
396 + .accentTextTheme!
397 + .titleLarge!
398 + .color!,
399 padding: EdgeInsets.symmetric(horizontal: 24),
400 child: Row(
401 mainAxisSize: MainAxisSize.max,
@@ -405,8 +417,8 @@ class _PickerState<Item> extends State<Picker<Item>> {
417 fontFamily: 'Lato',
418 fontWeight: FontWeight.w700,
419 color: Theme.of(context)
408 - .primaryTextTheme
409 - .headline6!
420 + .primaryTextTheme!
421 + .titleLarge!
422 .color!,
423 decoration: TextDecoration.none,
424 ),
@@ -425,8 +437,8 @@ class _PickerState<Item> extends State<Picker<Item>> {
437 fontSize: 7.0,
438 fontFamily: 'Lato',
439 color: Theme.of(context)
428 - .textTheme
429 - .bodyText2!
440 + .textTheme!
441 + .bodyMedium!
442 .color!),
443 ),
444 ),
@@ -434,8 +446,8 @@ class _PickerState<Item> extends State<Picker<Item>> {
446 borderRadius: BorderRadius.circular(6.0),
447 //border: Border.all(color: ),
448 color: Theme.of(context)
437 - .textTheme
438 - .bodyText2!
449 + .textTheme!
450 + .bodyMedium!
451 .decorationColor!,
452 ),
453 ),
@@ -445,7 +457,10 @@ class _PickerState<Item> extends State<Picker<Item>> {
457 ),
458 ),
459 Icon(Icons.check_circle,
448 - color: Theme.of(context).accentTextTheme.bodyText1!.color!),
460 + color: Theme.of(context)
461 + .accentTextTheme!
462 + .bodyLarge!
463 + .color!),
464 ],
465 ),
466 ),
lib/src/widgets/seed_widget.dart
+13 -4
@@ -89,7 +89,10 @@ class SeedWidgetState extends State<SeedWidget> {
89 cursorColor: Colors.blue,
90 backgroundCursorColor: Colors.blue,
91 validStyle: TextStyle(
92 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
92 + color: Theme.of(context)
93 + .primaryTextTheme!
94 + .titleLarge!
95 + .color!,
96 backgroundColor: Colors.transparent,
97 fontWeight: FontWeight.normal,
98 fontSize: 16),
@@ -102,7 +105,10 @@ class SeedWidgetState extends State<SeedWidget> {
105 controller: controller,
106 words: words,
107 textStyle: TextStyle(
105 - color: Theme.of(context).primaryTextTheme!.headline6!.color!,
108 + color: Theme.of(context)
109 + .primaryTextTheme!
110 + .titleLarge!
111 + .color!,
112 backgroundColor: Colors.transparent,
113 fontWeight: FontWeight.normal,
114 fontSize: 16),
@@ -124,14 +130,17 @@ class SeedWidgetState extends State<SeedWidget> {
130 child: Image.asset('assets/images/paste_ios.png',
131 color: Theme.of(context)
132 .primaryTextTheme!
127 - .headline4!
133 + .headlineMedium!
134 .decorationColor!)),
135 )))
136 ]),
137 Container(
138 margin: EdgeInsets.only(top: 15),
139 height: 1.0,
134 - color: Theme.of(context).primaryTextTheme!.headline6!.backgroundColor!),
140 + color: Theme.of(context)
141 + .primaryTextTheme!
142 + .titleLarge!
143 + .backgroundColor!),
144 ]));
145 }
146
lib/src/widgets/setting_action_button.dart
+2 -2
@@ -29,10 +29,10 @@ class SettingActionButton extends StatelessWidget {
29 @override
30 Widget build(BuildContext context) {
31 Color? color = isSelected
32 - ? Theme.of(context).textTheme.headline3!.color
32 + ? Theme.of(context).textTheme!.displaySmall!.color
33 : selectionActive
34 ? Palette.darkBlue
35 - : Theme.of(context).textTheme.headline3!.color;
35 + : Theme.of(context).textTheme!.displaySmall!.color;
36 return InkWell(
37 onTap: onTap,
38 hoverColor: Colors.transparent,
lib/src/widgets/standard_checkbox.dart
+4 -4
@@ -21,12 +21,12 @@ class StandardCheckbox extends StatelessWidget {
21 @override
22 Widget build(BuildContext context) {
23 final baseGradient = LinearGradient(colors: [
24 - Theme.of(context).primaryTextTheme.subtitle1!.color!,
25 - Theme.of(context).primaryTextTheme.subtitle1!.decorationColor!,
24 + Theme.of(context).primaryTextTheme!.titleMedium!.color!,
25 + Theme.of(context).primaryTextTheme!.titleMedium!.decorationColor!,
26 ], begin: Alignment.centerLeft, end: Alignment.centerRight);
27
28 final boxBorder = Border.all(
29 - color: borderColor ?? Theme.of(context).primaryTextTheme.caption!.color!, width: 1.0);
29 + color: borderColor ?? Theme.of(context).primaryTextTheme!.bodySmall!.color!, width: 1.0);
30
31 final checkedBoxDecoration = BoxDecoration(
32 gradient: gradientBackground ? baseGradient : null,
@@ -60,7 +60,7 @@ class StandardCheckbox extends StatelessWidget {
60 child: Text(
61 caption,
62 style: TextStyle(
63 - fontSize: 16.0, color: Theme.of(context).primaryTextTheme!.headline6!.color!),
63 + fontSize: 16.0, color: Theme.of(context).primaryTextTheme!.titleLarge!.color!),
64 ))
65 ],
66 ),
lib/src/widgets/standard_list.dart
+8 -6
@@ -54,10 +54,10 @@ class StandardListRow extends StatelessWidget {
54
55 Color titleColor(BuildContext context) => isSelected
56 ? Palette.blueCraiola
57 - : Theme.of(context).primaryTextTheme!.headline6!.color!;
57 + : Theme.of(context).primaryTextTheme!.titleLarge!.color!;
58
59 Color _backgroundColor(BuildContext context) {
60 - return Theme.of(context).backgroundColor;
60 + return Theme.of(context).colorScheme.background;
61 }
62 }
63
@@ -68,7 +68,7 @@ class SectionHeaderListRow extends StatelessWidget {
68 Container(
69 width: double.infinity,
70 height: 40,
71 - color: Theme.of(context).backgroundColor),
71 + color: Theme.of(context).colorScheme.background),
72 //StandardListSeparator(padding: EdgeInsets.only(left: 24))
73 ]);
74 }
@@ -85,11 +85,13 @@ class StandardListSeparator extends StatelessWidget {
85 return Container(
86 height: height,
87 padding: padding,
88 - color: Theme.of(context).backgroundColor,
88 + color: Theme.of(context).colorScheme.background,
89 child: Container(
90 height: height,
91 - color: Theme.of(context).primaryTextTheme.headline6?.backgroundColor
92 - ));
91 + color: Theme.of(context)
92 + .primaryTextTheme!
93 + .titleLarge
94 + ?.backgroundColor));
95 }
96 }
97
lib/src/widgets/standard_list_card.dart
+2 -2
@@ -21,8 +21,8 @@ class TradeDetailsStandardListCard extends StatelessWidget {
21 final darkTheme = currentTheme == ThemeType.dark;
22
23 final baseGradient = LinearGradient(colors: [
24 - Theme.of(context).primaryTextTheme!.subtitle2!.color!,
25 - Theme.of(context).primaryTextTheme!.subtitle2!.decorationColor!,
24 + Theme.of(context).primaryTextTheme!.titleSmall!.color!,
25 + Theme.of(context).primaryTextTheme!.titleSmall!.decorationColor!,
26 ], begin: Alignment.centerLeft, end: Alignment.centerRight);
27
28 final gradient = LinearGradient(colors: [
lib/src/widgets/standard_list_status_row.dart
+4 -4
@@ -13,7 +13,7 @@ class StandardListStatusRow extends StatelessWidget {
13 Widget build(BuildContext context) {
14 return Container(
15 width: double.infinity,
16 - color: Theme.of(context).backgroundColor,
16 + color: Theme.of(context).colorScheme.background,
17 child: Padding(
18 padding:
19 const EdgeInsets.only(left: 24, top: 16, bottom: 16, right: 24),
@@ -24,13 +24,13 @@ class StandardListStatusRow extends StatelessWidget {
24 style: TextStyle(
25 fontSize: 14,
26 fontWeight: FontWeight.w500,
27 - color: Theme.of(context).primaryTextTheme!.overline!.color!),
27 + color: Theme.of(context).primaryTextTheme!.labelSmall!.color!),
28 textAlign: TextAlign.left),
29 Padding(
30 padding: const EdgeInsets.only(top: 12),
31 child: Container(
32 decoration: BoxDecoration(
33 - color: Theme.of(context).accentTextTheme!.headline3!.color!,
33 + color: Theme.of(context).accentTextTheme!.displaySmall!.color!,
34 borderRadius: BorderRadius.circular(30.0),
35 ),
36 child: Padding(
@@ -52,7 +52,7 @@ class StandardListStatusRow extends StatelessWidget {
52 fontWeight: FontWeight.w500,
53 color: Theme.of(context)
54 .primaryTextTheme!
55 - .headline6!
55 + .titleLarge!
56 .color!))
57 ],
58 ),
lib/src/widgets/standard_switch.dart
+8 -2
@@ -24,8 +24,14 @@ class StandardSwitchState extends State<StandardSwitch> {
24 height: 28,
25 decoration: BoxDecoration(
26 color: widget.value
27 - ? Theme.of(context).accentTextTheme!.bodyText1!.color!
28 - : Theme.of(context).accentTextTheme!.headline1!.color!,
27 + ? Theme.of(context)
28 + .accentTextTheme!
29 + .bodyLarge!
30 + .color!
31 + : Theme.of(context)
32 + .accentTextTheme!
33 + .displayLarge!
34 + .color!,
35 borderRadius: BorderRadius.all(Radius.circular(14.0))),
36 child: Container(
37 width: 24.0,
lib/src/widgets/template_tile.dart
+2 -2
@@ -47,7 +47,7 @@ class TemplateTileState extends State<TemplateTile> {
47
48 @override
49 Widget build(BuildContext context) {
50 - final color = isRemovable ? Colors.white : Theme.of(context).primaryTextTheme!.headline6!.color!;
50 + final color = isRemovable ? Colors.white : Theme.of(context).primaryTextTheme!.titleLarge!.color!;
51 final toIcon = Image.asset('assets/images/to_icon.png', color: color);
52
53 final content = Row(
@@ -105,7 +105,7 @@ class TemplateTileState extends State<TemplateTile> {
105 child: Container(
106 height: 40,
107 padding: EdgeInsets.only(left: 24, right: 24),
108 - color: Theme.of(context).primaryTextTheme!.headline2!.decorationColor!,
108 + color: Theme.of(context).primaryTextTheme!.displayMedium!.decorationColor!,
109 child: content,
110 ),
111 ),
lib/src/widgets/trail_button.dart
+4 -1
@@ -24,7 +24,10 @@ class TrailButton extends StatelessWidget {
24 caption,
25 style: TextStyle(
26 color: textColor ??
27 - Theme.of(context).accentTextTheme!.headline1!.decorationColor!,
27 + Theme.of(context)
28 + .accentTextTheme!
29 + .displayLarge!
30 + .decorationColor!,
31 fontWeight: FontWeight.w600,
32 fontSize: 14),
33 ),
lib/themes/bright_theme.dart
+170 -134
@@ -12,78 +12,82 @@ class BrightTheme extends ThemeBase {
12 @override
13 ThemeType get type => ThemeType.bright;
14
15 - @override
16 - ThemeData get themeData => ThemeData(
15 + ThemeData theme = ThemeData(
16 fontFamily: 'Lato',
17 brightness: Brightness.light,
19 - backgroundColor: Colors.white,
20 - accentColor: Palette.blueCraiola, // first gradient color
18 scaffoldBackgroundColor: Palette.pinkFlamingo, // second gradient color
19 primaryColor: Palette.redHat, // third gradient color
23 - buttonColor: Colors.white.withOpacity(0.2), // action buttons on dashboard page
20 indicatorColor: Colors.white.withOpacity(0.5), // page indicator
21 hoverColor: Colors.white, // amount hint text (receive page)
22 dividerColor: Palette.paleBlue,
23 hintColor: Palette.gray,
24 textTheme: TextTheme(
29 - // title -> headline6
30 - headline6: TextStyle(
25 + // title -> titleLarge
26 + titleLarge: TextStyle(
27 color: Colors.white, // sync_indicator text
28 backgroundColor: Colors.white.withOpacity(0.2), // synced sync_indicator
29 decorationColor: Colors.white.withOpacity(0.15), // not synced sync_indicator
30 ),
35 - caption: TextStyle(
31 + bodySmall: TextStyle(
32 color: Palette.shineOrange, // not synced light
33 decorationColor: Colors.white, // filter icon
34 ),
39 - overline: TextStyle(
35 + labelSmall: TextStyle(
36 color: Colors.white.withOpacity(0.2), // filter button
41 - backgroundColor: Colors.white.withOpacity(0.5), // date section row
42 - decorationColor: Colors.white.withOpacity(0.2) // icons (transaction and trade rows)
43 - ),
44 - // subhead -> subtitle1
45 - subtitle1: TextStyle(
37 + backgroundColor:
38 + Colors.white.withOpacity(0.5), // date section row
39 + decorationColor: Colors.white
40 + .withOpacity(0.2) // icons (transaction and trade rows)
41 + ),
42 + // subhead -> titleMedium
43 + titleMedium: TextStyle(
44 color: Colors.white.withOpacity(0.2), // address button border
45 decorationColor: Colors.white.withOpacity(0.4), // copy button (qr widget)
46 ),
49 - // headline -> headline5
50 - headline5: TextStyle(
47 + // headline -> headlineSmall
48 + headlineSmall: TextStyle(
49 color: Colors.white, // qr code
50 decorationColor: Colors.white.withOpacity(0.5), // bottom border of amount (receive page)
51 ),
54 - // display1 -> headline4
55 - headline4: TextStyle(
52 + // display1 -> headlineMedium
53 + headlineMedium: TextStyle(
54 color: PaletteDark.lightBlueGrey, // icons color (receive page)
55 decorationColor: Palette.lavender, // icons background (receive page)
56 ),
59 - // display2 -> headline3
60 - headline3: TextStyle(
61 - color: Palette.darkBlueCraiola, // text color of tiles (receive page)
62 - decorationColor: Colors.white // background of tiles (receive page)
63 - ),
64 - // display3 -> headline2
65 - headline2: TextStyle(
57 + // display2 -> displaySmall
58 + displaySmall: TextStyle(
59 + color:
60 + Palette.darkBlueCraiola, // text color of tiles (receive page)
61 + decorationColor:
62 + Colors.white // background of tiles (receive page)
63 + ),
64 + // display3 -> displayMedium
65 + displayMedium: TextStyle(
66 color: Colors.white, // text color of current tile (receive page),
67 //decorationColor: Palette.blueCraiola // background of current tile (receive page)
68 - decorationColor: Palette.moderateSlateBlue // background of current tile (receive page)
69 - ),
70 - // display4 -> headline1
71 - headline1: TextStyle(
68 + decorationColor: Palette
69 + .moderateSlateBlue // background of current tile (receive page)
70 + ),
71 + // display4 -> displayLarge
72 + displayLarge: TextStyle(
73 color: Palette.violetBlue, // text color of tiles (account list)
73 - decorationColor: Colors.white // background of tiles (account list)
74 - ),
75 - // subtitle -> subtitle2
76 - subtitle2: TextStyle(
77 - color: Palette.moderateSlateBlue, // text color of current tile (account list)
78 - decorationColor: Colors.white // background of current tile (account list)
79 - ),
80 - // body -> bodyText2
81 - bodyText2: TextStyle(
74 + decorationColor:
75 + Colors.white // background of tiles (account list)
76 + ),
77 + // subtitle -> titleSmall
78 + titleSmall: TextStyle(
79 + color: Palette
80 + .moderateSlateBlue, // text color of current tile (account list)
81 + decorationColor:
82 + Colors.white // background of current tile (account list)
83 + ),
84 + // body -> bodyMedium
85 + bodyMedium: TextStyle(
86 color: Palette.moderatePurpleBlue, // scrollbar thumb
87 decorationColor: Palette.periwinkleCraiola // scrollbar background
84 - ),
85 - // body2 -> bodyText1
86 - bodyText1: TextStyle(
88 + ),
89 + // body2 -> bodyLarge
90 + bodyLarge: TextStyle(
91 color: Palette.moderateLavender, // menu header
92 decorationColor: Colors.white, // menu background
93 )
@@ -93,147 +97,179 @@ class BrightTheme extends ThemeBase {
97 trackColor: MaterialStateProperty.all(Palette.periwinkleCraiola),
98 radius: Radius.circular(3),
99 thickness: MaterialStateProperty.all(6),
96 - isAlwaysShown: true,
100 + thumbVisibility: MaterialStateProperty.all(true),
101 crossAxisMargin: 6,
102 ),
103 primaryTextTheme: TextTheme(
100 - // title -> headline6
101 - headline6: TextStyle(
104 + titleLarge: TextStyle(
105 color: Palette.darkBlueCraiola, // title color
106 backgroundColor: Palette.wildPeriwinkle // textfield underline
104 - ),
105 - caption: TextStyle(
107 + ),
108 + bodySmall: TextStyle(
109 color: PaletteDark.pigeonBlue, // secondary text
110 decorationColor: Palette.wildLavender // menu divider
108 - ),
109 - overline: TextStyle(
111 + ),
112 + labelSmall: TextStyle(
113 color: Palette.darkGray, // transaction/trade details titles
114 decorationColor: Colors.white.withOpacity(0.5), // placeholder
115 ),
113 - // subhead -> subtitle1
114 - subtitle1: TextStyle(
116 + // subhead -> titleMedium
117 + titleMedium: TextStyle(
118 color: Palette.blueCraiola, // first gradient color (send page)
116 - decorationColor: Palette.pinkFlamingo // second gradient color (send page)
117 - ),
118 - // headline -> headline5
119 - headline5: TextStyle(
120 - color: Colors.white.withOpacity(0.5), // text field border color (send page)
121 - decorationColor: Colors.white.withOpacity(0.5), // text field hint color (send page)
122 - ),
123 - // display1 -> headline4
124 - headline4: TextStyle(
125 - color: Colors.white.withOpacity(0.2), // text field button color (send page)
126 - decorationColor: Colors.white // text field button icon color (send page)
119 + decorationColor:
120 + Palette.pinkFlamingo // second gradient color (send page)
121 + ),
122 + // headline -> headlineSmall
123 + headlineSmall: TextStyle(
124 + color: Colors.white
125 + .withOpacity(0.5), // text field border color (send page)
126 + decorationColor: Colors.white
127 + .withOpacity(0.5), // text field hint color (send page)
128 ),
128 - // display2 -> headline3
129 - headline3: TextStyle(
129 + // display1 -> headlineMedium
130 + headlineMedium: TextStyle(
131 + color: Colors.white
132 + .withOpacity(0.2), // text field button color (send page)
133 + decorationColor:
134 + Colors.white // text field button icon color (send page)
135 + ),
136 + // display2 -> displaySmall
137 + displaySmall: TextStyle(
138 color: Colors.white.withOpacity(0.5), // estimated fee (send page)
131 - backgroundColor: PaletteDark.darkCyanBlue.withOpacity(0.67), // dot color for indicator on send page
132 - decorationColor: Palette.shadowWhite // template dotted border (send page)
133 - ),
134 - // display3 -> headline2
135 - headline2: TextStyle(
139 + backgroundColor: PaletteDark.darkCyanBlue
140 + .withOpacity(0.67), // dot color for indicator on send page
141 + decorationColor:
142 + Palette.shadowWhite // template dotted border (send page)
143 + ),
144 + // display3 -> displayMedium
145 + displayMedium: TextStyle(
146 color: Palette.darkBlueCraiola, // template new text (send page)
137 - backgroundColor: PaletteDark.darkNightBlue, // active dot color for indicator on send page
138 - decorationColor: Palette.shadowWhite // template background color (send page)
139 - ),
140 - // display4 -> headline1
141 - headline1: TextStyle(
147 + backgroundColor: PaletteDark
148 + .darkNightBlue, // active dot color for indicator on send page
149 + decorationColor:
150 + Palette.shadowWhite // template background color (send page)
151 + ),
152 + // display4 -> displayLarge
153 + displayLarge: TextStyle(
154 color: Palette.darkBlueCraiola, // template title (send page)
143 - backgroundColor: Colors.white, // icon color on order row (moonpay)
144 - decorationColor: Palette.niagara // receive amount text (exchange page)
145 - ),
146 - // subtitle -> subtitle2
147 - subtitle2: TextStyle(
148 - color: Palette.blueCraiola, // first gradient color top panel (exchange page)
149 - decorationColor: Palette.pinkFlamingo // second gradient color top panel (exchange page)
150 - ),
151 - // body -> bodyText2
152 - bodyText2: TextStyle(
153 - color: Palette.blueCraiola.withOpacity(0.7), // first gradient color bottom panel (exchange page)
154 - decorationColor: Palette.pinkFlamingo.withOpacity(0.7), // second gradient color bottom panel (exchange page)
155 - backgroundColor: Palette.moderateSlateBlue // alert right button text
156 - ),
157 - // body2 -> bodyText1
158 - bodyText1: TextStyle(
159 - color: Colors.white.withOpacity(0.5), // text field border on top panel (exchange page)
160 - decorationColor: Colors.white.withOpacity(0.5), // text field border on bottom panel (exchange page)
155 + backgroundColor:
156 + Colors.white, // icon color on order row (moonpay)
157 + decorationColor:
158 + Palette.niagara // receive amount text (exchange page)
159 + ),
160 + // subtitle -> titleSmall
161 + titleSmall: TextStyle(
162 + color: Palette
163 + .blueCraiola, // first gradient color top panel (exchange page)
164 + decorationColor: Palette
165 + .pinkFlamingo // second gradient color top panel (exchange page)
166 + ),
167 + // body -> bodyMedium
168 + bodyMedium: TextStyle(
169 + color: Palette.blueCraiola.withOpacity(
170 + 0.7), // first gradient color bottom panel (exchange page)
171 + decorationColor: Palette.pinkFlamingo.withOpacity(
172 + 0.7), // second gradient color bottom panel (exchange page)
173 + backgroundColor:
174 + Palette.moderateSlateBlue // alert right button text
175 + ),
176 + // body2 -> bodyLarge
177 + bodyLarge: TextStyle(
178 + color: Colors.white.withOpacity(
179 + 0.5), // text field border on top panel (exchange page)
180 + decorationColor: Colors.white.withOpacity(
181 + 0.5), // text field border on bottom panel (exchange page)
182 backgroundColor: Palette.brightOrange // alert left button text
183 )
184 ),
185 focusColor: Colors.white.withOpacity(0.2), // text field button (exchange page)
186 accentTextTheme: TextTheme(
166 - // title -> headline6
167 - headline6: TextStyle(
187 + // title -> titleLarge
188 + titleLarge: TextStyle(
189 color: Colors.white, // picker background
190 backgroundColor: Palette.periwinkleCraiola, // picker divider
191 decorationColor: Colors.white // dialog background
171 - ),
172 - caption: TextStyle(
192 + ),
193 + bodySmall: TextStyle(
194 color: Palette.moderateLavender, // container (confirm exchange)
195 backgroundColor: Palette.moderateLavender, // button background (confirm exchange)
196 decorationColor: Palette.darkBlueCraiola, // text color (information page)
197 ),
177 - // subtitle -> subtitle2
178 - subtitle2: TextStyle(
198 + // subtitle -> titleSmall
199 + titleSmall: TextStyle(
200 color: Palette.darkBlueCraiola, // QR code (exchange trade page)
201 backgroundColor: Palette.wildPeriwinkle, // divider (exchange trade page)
202 //decorationColor: Palette.blueCraiola // crete new wallet button background (wallet list page)
182 - decorationColor: Palette.moderateSlateBlue // crete new wallet button background (wallet list page)
183 - ),
184 - // headline -> headline5
185 - headline5: TextStyle(
186 - color: Palette.moderateLavender, // first gradient color of wallet action buttons (wallet list page)
187 - backgroundColor: Palette.moderateLavender, // second gradient color of wallet action buttons (wallet list page)
188 - decorationColor: Colors.white // restore wallet button text color (wallet list page)
189 - ),
190 - // subhead -> subtitle1
191 - subtitle1: TextStyle(
203 + decorationColor: Palette
204 + .moderateSlateBlue // crete new wallet button background (wallet list page)
205 + ),
206 + // headline -> headlineSmall
207 + headlineSmall: TextStyle(
208 + color: Palette
209 + .moderateLavender, // first gradient color of wallet action buttons (wallet list page)
210 + backgroundColor: Palette
211 + .moderateLavender, // second gradient color of wallet action buttons (wallet list page)
212 + decorationColor: Colors
213 + .white // restore wallet button text color (wallet list page)
214 + ),
215 + // subhead -> titleMedium
216 + titleMedium: TextStyle(
217 color: Palette.darkGray, // titles color (filter widget)
218 backgroundColor: Palette.periwinkle, // divider color (filter widget)
219 decorationColor: Colors.white // checkbox background (filter widget)
195 - ),
196 - overline: TextStyle(
220 + ),
221 + labelSmall: TextStyle(
222 color: Palette.wildPeriwinkle, // checkbox bounds (filter widget)
223 decorationColor: Colors.white, // menu subname
224 ),
200 - // display1 -> headline4
201 - headline4: TextStyle(
225 + // display1 -> headlineMedium
226 + headlineMedium: TextStyle(
227 color: Palette.blueCraiola, // first gradient color (menu header)
228 decorationColor: Palette.pinkFlamingo, // second gradient color(menu header)
229 backgroundColor: Colors.white // active dot color
205 - ),
206 - // display2 -> headline3
207 - headline3: TextStyle(
208 - color: Palette.shadowWhite, // action button color (address text field)
230 + ),
231 + // display2 -> displaySmall
232 + displaySmall: TextStyle(
233 + color:
234 + Palette.shadowWhite, // action button color (address text field)
235 decorationColor: Palette.darkGray, // hint text (seed widget)
210 - backgroundColor: Colors.white.withOpacity(0.5) // text on balance page
211 - ),
212 - // display3 -> headline2
213 - headline2: TextStyle(
236 + backgroundColor:
237 + Colors.white.withOpacity(0.5) // text on balance page
238 + ),
239 + // display3 -> displayMedium
240 + displayMedium: TextStyle(
241 color: Palette.darkGray, // hint text (new wallet page)
215 - decorationColor: Palette.periwinkleCraiola, // underline (new wallet page)
216 - backgroundColor: Colors.white // menu, icons, balance (dashboard page)
217 - ),
218 - // display4 -> headline1
219 - headline1: TextStyle(
242 + decorationColor:
243 + Palette.periwinkleCraiola, // underline (new wallet page)
244 + backgroundColor:
245 + Colors.white // menu, icons, balance (dashboard page)
246 + ),
247 + // display4 -> displayLarge
248 + displayLarge: TextStyle(
249 color: Palette.darkGray, // switch background (settings page)
221 - backgroundColor: Colors.black, // icon color on support page (moonpay, github)
222 - decorationColor: Colors.white.withOpacity(0.4) // hint text (exchange page)
223 - ),
224 - // body -> bodyText2
225 - bodyText2: TextStyle(
250 + backgroundColor:
251 + Colors.black, // icon color on support page (moonpay, github)
252 + decorationColor:
253 + Colors.white.withOpacity(0.4) // hint text (exchange page)
254 + ),
255 + // body -> bodyMedium
256 + bodyMedium: TextStyle(
257 color: Palette.darkGray, // indicators (PIN code)
258 decorationColor: Palette.darkGray, // switch (PIN code)
259 backgroundColor: Colors.white // alert right button
229 - ),
230 - // body2 -> bodyText1
231 - bodyText1: TextStyle(
260 + ),
261 + // body2 -> bodyLarge
262 + bodyLarge: TextStyle(
263 color: Palette.moderateSlateBlue, // primary buttons
264 decorationColor: Colors.white, // alert left button,
265 backgroundColor: Palette.dullGray // keyboard bar color
266 ),
267 ),
268 cardColor: Palette.moderateSlateBlue // bottom button (action list)
238 - );
239 -}
\ No newline at end of file
269 + );
270 +
271 + @override
272 + ThemeData get themeData => theme.copyWith(
273 + colorScheme: theme.colorScheme
274 + .copyWith(background: Colors.white, secondary: Palette.blueCraiola));
275 +}
lib/themes/dark_theme.dart
+192 -145
@@ -12,77 +12,83 @@ class DarkTheme extends ThemeBase {
12 @override
13 ThemeType get type => ThemeType.dark;
14
15 - @override
16 - ThemeData get themeData => ThemeData(
15 + ThemeData theme = ThemeData(
16 fontFamily: 'Lato',
17 brightness: Brightness.dark,
19 - backgroundColor: PaletteDark.backgroundColor,
20 - accentColor: PaletteDark.backgroundColor, // first gradient color
21 - scaffoldBackgroundColor: PaletteDark.backgroundColor, // second gradient color
18 + scaffoldBackgroundColor:
19 + PaletteDark.backgroundColor, // second gradient color
20 primaryColor: PaletteDark.backgroundColor, // third gradient color
23 - buttonColor: PaletteDark.nightBlue, // action buttons on dashboard page
21 indicatorColor: PaletteDark.cyanBlue, // page indicator
22 hoverColor: PaletteDark.cyanBlue, // amount hint text (receive page)
23 dividerColor: PaletteDark.dividerColor,
24 hintColor: PaletteDark.pigeonBlue, // menu
25 textTheme: TextTheme(
29 - // title -> headline6
30 - headline6: TextStyle(
26 + // title -> titleLarge
27 + titleLarge: TextStyle(
28 color: PaletteDark.wildBlue, // sync_indicator text
32 - backgroundColor: PaletteDark.lightNightBlue, // synced sync_indicator
33 - decorationColor: PaletteDark.oceanBlue // not synced sync_indicator
34 - ),
35 - caption: TextStyle(
29 + backgroundColor:
30 + PaletteDark.lightNightBlue, // synced sync_indicator
31 + decorationColor:
32 + PaletteDark.oceanBlue // not synced sync_indicator
33 + ),
34 + bodySmall: TextStyle(
35 color: PaletteDark.orangeYellow, // not synced light
36 decorationColor: PaletteDark.wildBlue, // filter icon
37 ),
39 - overline: TextStyle(
38 + labelSmall: TextStyle(
39 color: PaletteDark.oceanBlue, // filter button
40 backgroundColor: PaletteDark.darkCyanBlue, // date section row
42 - decorationColor: PaletteDark.wildNightBlue // icons (transaction and trade rows)
43 - ),
44 - // subhead -> subtitle1
45 - subtitle1: TextStyle(
41 + decorationColor: PaletteDark
42 + .wildNightBlue // icons (transaction and trade rows)
43 + ),
44 + // subhead -> titleMedium
45 + titleMedium: TextStyle(
46 color: PaletteDark.nightBlue, // address button border
47 decorationColor: PaletteDark.lightBlueGrey, // copy button (qr widget)
48 ),
49 - // headline -> headline5
50 - headline5: TextStyle(
49 + // headline -> headlineSmall
50 + headlineSmall: TextStyle(
51 color: PaletteDark.lightBlueGrey, // qr code
52 decorationColor: PaletteDark.darkGrey, // bottom border of amount (receive page)
53 ),
54 - // display1 -> headline4
55 - headline4: TextStyle(
54 + // display1 -> headlineMedium
55 + headlineMedium: TextStyle(
56 color: Colors.white, // icons color (receive page)
57 decorationColor: PaletteDark.distantNightBlue, // icons background (receive page)
58 ),
59 - // display2 -> headline3
60 - headline3: TextStyle(
59 + // display2 -> displaySmall
60 + displaySmall: TextStyle(
61 color: Colors.white, // text color of tiles (receive page)
62 - decorationColor: PaletteDark.nightBlue // background of tiles (receive page)
63 - ),
64 - // display3 -> headline2
65 - headline2: TextStyle(
66 - color: Palette.blueCraiola, // text color of current tile (receive page)
67 - decorationColor: PaletteDark.lightOceanBlue // background of current tile (receive page)
68 - ),
69 - // display4 -> headline1
70 - headline1: TextStyle(
62 + decorationColor:
63 + PaletteDark.nightBlue // background of tiles (receive page)
64 + ),
65 + // display3 -> displayMedium
66 + displayMedium: TextStyle(
67 + color: Palette
68 + .blueCraiola, // text color of current tile (receive page)
69 + decorationColor: PaletteDark
70 + .lightOceanBlue // background of current tile (receive page)
71 + ),
72 + // display4 -> displayLarge
73 + displayLarge: TextStyle(
74 color: Colors.white, // text color of tiles (account list)
72 - decorationColor: PaletteDark.darkOceanBlue // background of tiles (account list)
73 - ),
74 - // subtitle -> subtitle2
75 - subtitle2: TextStyle(
76 - color: Palette.blueCraiola, // text color of current tile (account list)
77 - decorationColor: PaletteDark.darkNightBlue // background of current tile (account list)
78 - ),
79 - // body1 -> bodyText2
80 - bodyText2: TextStyle(
75 + decorationColor: PaletteDark
76 + .darkOceanBlue // background of tiles (account list)
77 + ),
78 + // subtitle -> titleSmall
79 + titleSmall: TextStyle(
80 + color: Palette
81 + .blueCraiola, // text color of current tile (account list)
82 + decorationColor: PaletteDark
83 + .darkNightBlue // background of current tile (account list)
84 + ),
85 + // body1 -> bodyMedium
86 + bodyMedium: TextStyle(
87 color: PaletteDark.wildBlueGrey, // scrollbar thumb
88 decorationColor: PaletteDark.violetBlue // scrollbar background
83 - ),
84 - // body2 -> bodyText1
85 - bodyText1: TextStyle(
89 + ),
90 + // body2 -> bodyLarge
91 + bodyLarge: TextStyle(
92 color: PaletteDark.deepPurpleBlue, // menu header
93 decorationColor: PaletteDark.deepPurpleBlue, // menu background
94 )
@@ -92,147 +98,188 @@ class DarkTheme extends ThemeBase {
98 trackColor: MaterialStateProperty.all(PaletteDark.violetBlue),
99 radius: Radius.circular(3),
100 thickness: MaterialStateProperty.all(6),
95 - isAlwaysShown: true,
101 + thumbVisibility: MaterialStateProperty.all(true),
102 crossAxisMargin: 6,
103 ),
104 primaryTextTheme: TextTheme(
99 - // title -> headline6
100 - headline6: TextStyle(
105 + // title -> titleLarge
106 + titleLarge: TextStyle(
107 color: Colors.white, // title color
108 backgroundColor: PaletteDark.darkOceanBlue // textfield underline
103 - ),
104 - caption: TextStyle(
109 + ),
110 + bodySmall: TextStyle(
111 color: PaletteDark.darkCyanBlue, // secondary text
112 decorationColor: PaletteDark.darkOceanBlue // menu divider
107 - ),
108 - overline: TextStyle(
109 - color: PaletteDark.lightBlueGrey, // transaction/trade details titles
113 + ),
114 + labelSmall: TextStyle(
115 + color:
116 + PaletteDark.lightBlueGrey, // transaction/trade details titles
117 decorationColor: Colors.grey, // placeholder
118 ),
112 - // subhead -> subtitle1
113 - subtitle1: TextStyle(
114 - color: PaletteDark.darkNightBlue, // first gradient color (send page)
115 - decorationColor: PaletteDark.darkNightBlue // second gradient color (send page)
116 - ),
117 - // headline -> headline5
118 - headline5: TextStyle(
119 - color: PaletteDark.lightVioletBlue, // text field border color (send page)
120 - decorationColor: PaletteDark.darkCyanBlue, // text field hint color (send page)
119 + // subhead -> titleMedium
120 + titleMedium: TextStyle(
121 + color:
122 + PaletteDark.darkNightBlue, // first gradient color (send page)
123 + decorationColor:
124 + PaletteDark.darkNightBlue // second gradient color (send page)
125 + ),
126 + // headline -> headlineSmall
127 + headlineSmall: TextStyle(
128 + color: PaletteDark
129 + .lightVioletBlue, // text field border color (send page)
130 + decorationColor:
131 + PaletteDark.darkCyanBlue, // text field hint color (send page)
132 ),
122 - // display1 -> headline4
123 - headline4: TextStyle(
124 - color: PaletteDark.buttonNightBlue, // text field button color (send page)
125 - decorationColor: PaletteDark.gray // text field button icon color (send page)
126 - ),
127 - // display2 -> headline3
128 - headline3: TextStyle(
133 + // display1 -> headlineMedium
134 + headlineMedium: TextStyle(
135 + color: PaletteDark
136 + .buttonNightBlue, // text field button color (send page)
137 + decorationColor:
138 + PaletteDark.gray // text field button icon color (send page)
139 + ),
140 + // display2 -> displaySmall
141 + displaySmall: TextStyle(
142 color: Colors.white, // estimated fee (send page)
130 - backgroundColor: PaletteDark.cyanBlue, // dot color for indicator on send page
131 - decorationColor: PaletteDark.darkCyanBlue // template dotted border (send page)
132 - ),
133 - // display3 -> headline2
134 - headline2: TextStyle(
143 + backgroundColor:
144 + PaletteDark.cyanBlue, // dot color for indicator on send page
145 + decorationColor:
146 + PaletteDark.darkCyanBlue // template dotted border (send page)
147 + ),
148 + // display3 -> displayMedium
149 + displayMedium: TextStyle(
150 color: PaletteDark.darkCyanBlue, // template new text (send page)
136 - backgroundColor: Colors.white, // active dot color for indicator on send page
137 - decorationColor: PaletteDark.darkVioletBlue // template background color (send page)
138 - ),
139 - // display4 -> headline1
140 - headline1: TextStyle(
151 + backgroundColor:
152 + Colors.white, // active dot color for indicator on send page
153 + decorationColor: PaletteDark
154 + .darkVioletBlue // template background color (send page)
155 + ),
156 + // display4 -> displayLarge
157 + displayLarge: TextStyle(
158 color: PaletteDark.cyanBlue, // template title (send page)
142 - backgroundColor: Colors.white, // icon color on order row (moonpay)
143 - decorationColor: PaletteDark.darkCyanBlue // receive amount text (exchange page)
144 - ),
145 - // subtitle -> subtitle2
146 - subtitle2: TextStyle(
147 - color: PaletteDark.wildVioletBlue, // first gradient color top panel (exchange page)
148 - decorationColor: PaletteDark.wildVioletBlue // second gradient color top panel (exchange page)
149 - ),
150 - // body1 -> bodyText2
151 - bodyText2: TextStyle(
152 - color: PaletteDark.darkNightBlue, // first gradient color bottom panel (exchange page)
153 - decorationColor: PaletteDark.darkNightBlue, // second gradient color bottom panel (exchange page)
159 + backgroundColor:
160 + Colors.white, // icon color on order row (moonpay)
161 + decorationColor: PaletteDark
162 + .darkCyanBlue // receive amount text (exchange page)
163 + ),
164 + // subtitle -> titleSmall
165 + titleSmall: TextStyle(
166 + color: PaletteDark
167 + .wildVioletBlue, // first gradient color top panel (exchange page)
168 + decorationColor: PaletteDark
169 + .wildVioletBlue // second gradient color top panel (exchange page)
170 + ),
171 + // body1 -> bodyMedium
172 + bodyMedium: TextStyle(
173 + color: PaletteDark
174 + .darkNightBlue, // first gradient color bottom panel (exchange page)
175 + decorationColor: PaletteDark
176 + .darkNightBlue, // second gradient color bottom panel (exchange page)
177 backgroundColor: Palette.blueCraiola // alert right button text
155 - ),
156 - // body2 -> bodyText1
157 - bodyText1: TextStyle(
158 - color: PaletteDark.blueGrey, // text field border on top panel (exchange page)
159 - decorationColor: PaletteDark.moderateVioletBlue, // text field border on bottom panel (exchange page)
178 + ),
179 + // body2 -> bodyLarge
180 + bodyLarge: TextStyle(
181 + color: PaletteDark
182 + .blueGrey, // text field border on top panel (exchange page)
183 + decorationColor: PaletteDark
184 + .moderateVioletBlue, // text field border on bottom panel (exchange page)
185 backgroundColor: Palette.alizarinRed // alert left button text
186 )
187 ),
188 focusColor: PaletteDark.moderateBlue, // text field button (exchange page)
189 accentTextTheme: TextTheme(
165 - // title -> headline6
166 - headline6: TextStyle(
190 + // title -> titleLarge
191 + titleLarge: TextStyle(
192 color: PaletteDark.nightBlue, // picker background
193 backgroundColor: PaletteDark.dividerColor, // picker divider
194 decorationColor: PaletteDark.darkNightBlue // dialog background
170 - ),
171 - caption: TextStyle(
195 + ),
196 + bodySmall: TextStyle(
197 color: PaletteDark.nightBlue, // container (confirm exchange)
198 backgroundColor: PaletteDark.deepVioletBlue, // button background (confirm exchange)
199 decorationColor: Palette.darkLavender, // text color (information page)
200 ),
176 - // subtitle -> subtitle2
177 - subtitle2: TextStyle(
178 - //color: PaletteDark.lightBlueGrey, // QR code (exchange trade page)
201 + // subtitle -> titleSmall
202 + titleSmall: TextStyle(
203 + //color: PaletteDark.lightBlueGrey, // QR code (exchange trade page)
204 color: Colors.white, // QR code (exchange trade page)
180 - backgroundColor: PaletteDark.deepVioletBlue, // divider (exchange trade page)
181 - decorationColor: Colors.white // crete new wallet button background (wallet list page)
182 - ),
183 - // headline -> headline5
184 - headline5: TextStyle(
185 - color: PaletteDark.distantBlue, // first gradient color of wallet action buttons (wallet list page)
186 - backgroundColor: PaletteDark.distantNightBlue, // second gradient color of wallet action buttons (wallet list page)
187 - decorationColor: Palette.darkBlueCraiola // restore wallet button text color (wallet list page)
188 - ),
189 - // subhead -> subtitle1
190 - subtitle1: TextStyle(
205 + backgroundColor:
206 + PaletteDark.deepVioletBlue, // divider (exchange trade page)
207 + decorationColor: Colors
208 + .white // crete new wallet button background (wallet list page)
209 + ),
210 + // headline -> headlineSmall
211 + headlineSmall: TextStyle(
212 + color: PaletteDark
213 + .distantBlue, // first gradient color of wallet action buttons (wallet list page)
214 + backgroundColor: PaletteDark
215 + .distantNightBlue, // second gradient color of wallet action buttons (wallet list page)
216 + decorationColor: Palette
217 + .darkBlueCraiola // restore wallet button text color (wallet list page)
218 + ),
219 + // subhead -> titleMedium
220 + titleMedium: TextStyle(
221 color: Colors.white, // titles color (filter widget)
192 - backgroundColor: PaletteDark.darkOceanBlue, // divider color (filter widget)
193 - decorationColor: PaletteDark.wildVioletBlue.withOpacity(0.3) // checkbox background (filter widget)
194 - ),
195 - overline: TextStyle(
222 + backgroundColor:
223 + PaletteDark.darkOceanBlue, // divider color (filter widget)
224 + decorationColor: PaletteDark.wildVioletBlue
225 + .withOpacity(0.3) // checkbox background (filter widget)
226 + ),
227 + labelSmall: TextStyle(
228 color: PaletteDark.wildVioletBlue, // checkbox bounds (filter widget)
229 decorationColor: PaletteDark.darkCyanBlue, // menu subname
230 ),
199 - // display1 -> headline4
200 - headline4: TextStyle(
201 - color: PaletteDark.deepPurpleBlue, // first gradient color (menu header)
202 - decorationColor: PaletteDark.deepPurpleBlue, // second gradient color(menu header)
231 + // display1 -> headlineMedium
232 + headlineMedium: TextStyle(
233 + color: PaletteDark
234 + .deepPurpleBlue, // first gradient color (menu header)
235 + decorationColor: PaletteDark
236 + .deepPurpleBlue, // second gradient color(menu header)
237 backgroundColor: Colors.white // active dot color
204 - ),
205 - // display2 -> headline3
206 - headline3: TextStyle(
207 - color: PaletteDark.nightBlue, // action button color (address text field)
208 - decorationColor: PaletteDark.darkCyanBlue, // hint text (seed widget)
238 + ),
239 + // display2 -> displaySmall
240 + displaySmall: TextStyle(
241 + color: PaletteDark
242 + .nightBlue, // action button color (address text field)
243 + decorationColor:
244 + PaletteDark.darkCyanBlue, // hint text (seed widget)
245 backgroundColor: PaletteDark.cyanBlue // text on balance page
210 - ),
211 - // display3 -> headline2
212 - headline2: TextStyle(
246 + ),
247 + // display3 -> displayMedium
248 + displayMedium: TextStyle(
249 color: PaletteDark.cyanBlue, // hint text (new wallet page)
214 - decorationColor: PaletteDark.darkGrey, // underline (new wallet page)
215 - backgroundColor: Colors.white // menu, icons, balance (dashboard page)
216 - ),
217 - // display4 -> headline1
218 - headline1: TextStyle(
219 - color: PaletteDark.deepVioletBlue, // switch background (settings page)
220 - backgroundColor: Colors.white, // icon color on support page (moonpay, github)
221 - decorationColor: PaletteDark.lightBlueGrey // hint text (exchange page)
222 - ),
223 - // body1 -> bodyText2
224 - bodyText2: TextStyle(
250 + decorationColor:
251 + PaletteDark.darkGrey, // underline (new wallet page)
252 + backgroundColor:
253 + Colors.white // menu, icons, balance (dashboard page)
254 + ),
255 + // display4 -> displayLarge
256 + displayLarge: TextStyle(
257 + color:
258 + PaletteDark.deepVioletBlue, // switch background (settings page)
259 + backgroundColor:
260 + Colors.white, // icon color on support page (moonpay, github)
261 + decorationColor:
262 + PaletteDark.lightBlueGrey // hint text (exchange page)
263 + ),
264 + // body1 -> bodyMedium
265 + bodyMedium: TextStyle(
266 color: PaletteDark.indicatorVioletBlue, // indicators (PIN code)
267 decorationColor: PaletteDark.lightPurpleBlue, // switch (PIN code)
268 backgroundColor: PaletteDark.darkNightBlue // alert right button
228 - ),
229 - // body2 -> bodyText1
230 - bodyText1: TextStyle(
269 + ),
270 + // body2 -> bodyLarge
271 + bodyLarge: TextStyle(
272 color: Palette.blueCraiola, // primary buttons
273 decorationColor: PaletteDark.darkNightBlue, // alert left button
274 backgroundColor: PaletteDark.granite // keyboard bar color
275 ),
276 ),
277 cardColor: PaletteDark.darkNightBlue // bottom button (action list)
237 - );
238 -}
\ No newline at end of file
278 + );
279 +
280 + @override
281 + ThemeData get themeData => theme.copyWith(
282 + colorScheme: theme.colorScheme.copyWith(
283 + background: PaletteDark.backgroundColor,
284 + secondary: PaletteDark.backgroundColor));
285 +}
lib/themes/light_theme.dart
+171 -134
@@ -12,78 +12,82 @@ class LightTheme extends ThemeBase {
12 @override
13 ThemeType get type => ThemeType.light;
14
15 - @override
16 - ThemeData get themeData => ThemeData(
15 + ThemeData theme = ThemeData(
16 fontFamily: 'Lato',
17 brightness: Brightness.light,
19 - backgroundColor: Colors.white,
20 - accentColor: Colors.white, // first gradient color
18 scaffoldBackgroundColor: Colors.white, // second gradient color
19 primaryColor: Colors.white, // third gradient color
23 - buttonColor: Palette.blueAlice, // action buttons on dashboard page
24 - indicatorColor: PaletteDark.darkCyanBlue.withOpacity(0.67), // page indicator
20 + indicatorColor:
21 + PaletteDark.darkCyanBlue.withOpacity(0.67), // page indicator
22 hoverColor: Palette.darkBlueCraiola, // amount hint text (receive page)
23 dividerColor: Palette.paleBlue,
24 hintColor: Palette.gray,
25 textTheme: TextTheme(
29 - // title -> headline6
30 - headline6: TextStyle(
26 + // title -> titleLarge
27 + titleLarge: TextStyle(
28 color: Palette.darkBlueCraiola, // sync_indicator text
29 backgroundColor: Palette.blueAlice, // synced sync_indicator
30 decorationColor: Palette.blueAlice.withOpacity(0.75), // not synced sync_indicator
31 ),
35 - caption: TextStyle(
32 + bodySmall: TextStyle(
33 color: Palette.shineOrange, // not synced light
34 decorationColor: PaletteDark.wildBlue, // filter icon
35 ),
39 - overline: TextStyle(
36 + labelSmall: TextStyle(
37 color: Palette.blueAlice, // filter button
38 backgroundColor: PaletteDark.darkCyanBlue, // date section row
42 - decorationColor: Palette.blueAlice // icons (transaction and trade rows)
43 - ),
44 - // subhead -> subtitle1
45 - subtitle1: TextStyle(
39 + decorationColor:
40 + Palette.blueAlice // icons (transaction and trade rows)
41 + ),
42 + // subhead -> titleMedium
43 + titleMedium: TextStyle(
44 color: Palette.blueAlice, // address button border
45 decorationColor: PaletteDark.lightBlueGrey, // copy button (qr widget)
46 ),
49 - // headline -> headline5
50 - headline5: TextStyle(
47 + // headline -> headlineSmall
48 + headlineSmall: TextStyle(
49 color: Colors.white, // qr code
50 decorationColor: Palette.darkBlueCraiola, // bottom border of amount (receive page)
51 ),
54 - // display1 -> headline4
55 - headline4: TextStyle(
52 + // display1 -> headlineMedium
53 + headlineMedium: TextStyle(
54 color: PaletteDark.lightBlueGrey, // icons color (receive page)
55 decorationColor: Palette.moderateLavender, // icons background (receive page)
56 ),
59 - // display2 -> headline3
60 - headline3: TextStyle(
61 - color: Palette.darkBlueCraiola, // text color of tiles (receive page)
62 - decorationColor: Palette.blueAlice // background of tiles (receive page)
63 - ),
64 - // display3 -> headline2
65 - headline2: TextStyle(
57 + // display2 -> headldisplaySmalline3
58 + displaySmall: TextStyle(
59 + color:
60 + Palette.darkBlueCraiola, // text color of tiles (receive page)
61 + decorationColor:
62 + Palette.blueAlice // background of tiles (receive page)
63 + ),
64 + // display3 -> displayMedium
65 + displayMedium: TextStyle(
66 color: Colors.white, // text color of current tile (receive page),
67 //decorationColor: Palette.blueCraiola // background of current tile (receive page)
68 - decorationColor: Palette.blueCraiola // background of current tile (receive page)
69 - ),
70 - // display4 -> headline1
71 - headline1: TextStyle(
68 + decorationColor: Palette
69 + .blueCraiola // background of current tile (receive page)
70 + ),
71 + // display4 -> displayLarge
72 + displayLarge: TextStyle(
73 color: Palette.violetBlue, // text color of tiles (account list)
73 - decorationColor: Colors.white // background of tiles (account list)
74 - ),
75 - // subtitle -> subtitle2
76 - subtitle2: TextStyle(
77 - color: Palette.protectiveBlue, // text color of current tile (account list)
78 - decorationColor: Colors.white // background of current tile (account list)
79 - ),
80 - // body -> bodyText2
81 - bodyText2: TextStyle(
74 + decorationColor:
75 + Colors.white // background of tiles (account list)
76 + ),
77 + // subtitle -> titleSmall
78 + titleSmall: TextStyle(
79 + color: Palette
80 + .protectiveBlue, // text color of current tile (account list)
81 + decorationColor:
82 + Colors.white // background of current tile (account list)
83 + ),
84 + // body -> bodyMedium
85 + bodyMedium: TextStyle(
86 color: Palette.moderatePurpleBlue, // scrollbar thumb
87 decorationColor: Palette.periwinkleCraiola // scrollbar background
84 - ),
85 - // body2 -> bodyText1
86 - bodyText1: TextStyle(
88 + ),
89 + // body2 -> bodyLarge
90 + bodyLarge: TextStyle(
91 color: Palette.moderateLavender, // menu header
92 decorationColor: Colors.white, // menu background
93 )
@@ -93,146 +97,179 @@ class LightTheme extends ThemeBase {
97 trackColor: MaterialStateProperty.all(Palette.periwinkleCraiola),
98 radius: Radius.circular(3),
99 thickness: MaterialStateProperty.all(6),
96 - isAlwaysShown: true,
100 + thumbVisibility: MaterialStateProperty.all(true),
101 crossAxisMargin: 6,
102 ),
103 primaryTextTheme: TextTheme(
100 - // title -> headline6
101 - headline6: TextStyle(
104 + // title -> titleLarge
105 + titleLarge: TextStyle(
106 color: Palette.darkBlueCraiola, // title color
107 backgroundColor: Palette.wildPeriwinkle // textfield underline
104 - ),
105 - caption: TextStyle(
108 + ),
109 + bodySmall: TextStyle(
110 color: PaletteDark.pigeonBlue, // secondary text
111 decorationColor: Palette.wildLavender // menu divider
108 - ),
109 - overline: TextStyle(
112 + ),
113 + labelSmall: TextStyle(
114 color: Palette.darkGray, // transaction/trade details titles
115 decorationColor: PaletteDark.darkCyanBlue, // placeholder
116 ),
113 - // subhead -> subtitle1
114 - subtitle1: TextStyle(
117 + // subhead -> titleMedium
118 + titleMedium: TextStyle(
119 color: Palette.blueCraiola, // first gradient color (send page)
116 - decorationColor: Palette.blueGreyCraiola // second gradient color (send page)
117 - ),
118 - // headline -> headline5
119 - headline5: TextStyle(
120 - color: Colors.white.withOpacity(0.5), // text field border color (send page)
121 - decorationColor: Colors.white.withOpacity(0.5), // text field hint color (send page)
122 - ),
123 - // display1 -> headline4
124 - headline4: TextStyle(
125 - color: Colors.white.withOpacity(0.2), // text field button color (send page)
126 - decorationColor: Colors.white // text field button icon color (send page)
120 + decorationColor:
121 + Palette.blueGreyCraiola // second gradient color (send page)
122 + ),
123 + // headline -> headlineSmall
124 + headlineSmall: TextStyle(
125 + color: Colors.white
126 + .withOpacity(0.5), // text field border color (send page)
127 + decorationColor: Colors.white
128 + .withOpacity(0.5), // text field hint color (send page)
129 ),
128 - // display2 -> headline3
129 - headline3: TextStyle(
130 + // display1 -> headlineMedium
131 + headlineMedium: TextStyle(
132 + color: Colors.white
133 + .withOpacity(0.2), // text field button color (send page)
134 + decorationColor:
135 + Colors.white // text field button icon color (send page)
136 + ),
137 + // display2 -> displaySmall
138 + displaySmall: TextStyle(
139 color: Colors.white.withOpacity(0.5), // estimated fee (send page)
131 - backgroundColor: PaletteDark.darkCyanBlue.withOpacity(0.67), // dot color for indicator on send page
132 - decorationColor: Palette.moderateLavender // template dotted border (send page)
133 - ),
134 - // display3 -> headline2
135 - headline2: TextStyle(
140 + backgroundColor: PaletteDark.darkCyanBlue
141 + .withOpacity(0.67), // dot color for indicator on send page
142 + decorationColor:
143 + Palette.moderateLavender // template dotted border (send page)
144 + ),
145 + // display3 -> displayMedium
146 + displayMedium: TextStyle(
147 color: Palette.darkBlueCraiola, // template new text (send page)
137 - backgroundColor: PaletteDark.darkNightBlue, // active dot color for indicator on send page
138 - decorationColor: Palette.blueAlice // template background color (send page)
139 - ),
140 - // display4 -> headline1
141 - headline1: TextStyle(
148 + backgroundColor: PaletteDark
149 + .darkNightBlue, // active dot color for indicator on send page
150 + decorationColor:
151 + Palette.blueAlice // template background color (send page)
152 + ),
153 + // display4 -> displayLarge
154 + displayLarge: TextStyle(
155 color: Palette.darkBlueCraiola, // template title (send page)
143 - backgroundColor: Colors.black, // icon color on order row (moonpay)
144 - decorationColor: Palette.niagara // receive amount text (exchange page)
145 - ),
146 - // subtitle -> subtitle2
147 - subtitle2: TextStyle(
148 - color: Palette.blueCraiola, // first gradient color top panel (exchange page)
149 - decorationColor: Palette.blueGreyCraiola // second gradient color top panel (exchange page)
150 - ),
151 - // body -> bodyText2
152 - bodyText2: TextStyle(
153 - color: Palette.blueCraiola.withOpacity(0.7), // first gradient color bottom panel (exchange page)
154 - decorationColor: Palette.blueGreyCraiola.withOpacity(0.7), // second gradient color bottom panel (exchange page)
156 + backgroundColor:
157 + Colors.black, // icon color on order row (moonpay)
158 + decorationColor:
159 + Palette.niagara // receive amount text (exchange page)
160 + ),
161 + // subtitle -> titleSmall
162 + titleSmall: TextStyle(
163 + color: Palette
164 + .blueCraiola, // first gradient color top panel (exchange page)
165 + decorationColor: Palette
166 + .blueGreyCraiola // second gradient color top panel (exchange page)
167 + ),
168 + // body -> bodyMedium
169 + bodyMedium: TextStyle(
170 + color: Palette.blueCraiola.withOpacity(
171 + 0.7), // first gradient color bottom panel (exchange page)
172 + decorationColor: Palette.blueGreyCraiola.withOpacity(
173 + 0.7), // second gradient color bottom panel (exchange page)
174 backgroundColor: Palette.protectiveBlue // alert right button text
156 - ),
157 - // body2 -> bodyText1
158 - bodyText1: TextStyle(
159 - color: Colors.white.withOpacity(0.5), // text field border on top panel (exchange page)
160 - decorationColor: Colors.white.withOpacity(0.5), // text field border on bottom panel (exchange page)
175 + ),
176 + // body2 -> bodyLarge
177 + bodyLarge: TextStyle(
178 + color: Colors.white.withOpacity(
179 + 0.5), // text field border on top panel (exchange page)
180 + decorationColor: Colors.white.withOpacity(
181 + 0.5), // text field border on bottom panel (exchange page)
182 backgroundColor: Palette.brightOrange // alert left button text
183 )
184 ),
185 focusColor: Colors.white.withOpacity(0.2), // text field button (exchange page)
186 accentTextTheme: TextTheme(
166 - // title -> headline6
167 - headline6: TextStyle(
187 + // title -> headlititleLargene6
188 + titleLarge: TextStyle(
189 color: Colors.white, // picker background
190 backgroundColor: Palette.periwinkleCraiola, // picker divider
191 decorationColor: Colors.white // dialog background
171 - ),
172 - caption: TextStyle(
192 + ),
193 + bodySmall: TextStyle(
194 color: Palette.blueAlice, // container (confirm exchange)
195 backgroundColor: Palette.blueAlice, // button background (confirm exchange)
196 decorationColor: Palette.darkBlueCraiola, // text color (information page)
197 ),
177 - // subtitle -> subtitle2
178 - subtitle2: TextStyle(
198 + // subtitle -> titleSmall
199 + titleSmall: TextStyle(
200 color: Palette.darkBlueCraiola, // QR code (exchange trade page)
180 - backgroundColor: Palette.wildPeriwinkle, // divider (exchange trade page)
181 - decorationColor: Palette.protectiveBlue // crete new wallet button background (wallet list page)
182 - ),
183 - // headline -> headline5
184 - headline5: TextStyle(
185 - color: Palette.moderateLavender, // first gradient color of wallet action buttons (wallet list page)
186 - backgroundColor: Palette.moderateLavender, // second gradient color of wallet action buttons (wallet list page)
187 - decorationColor: Colors.white // restore wallet button text color (wallet list page)
188 - ),
189 - // subhead -> subtitle1
190 - subtitle1: TextStyle(
201 + backgroundColor:
202 + Palette.wildPeriwinkle, // divider (exchange trade page)
203 + decorationColor: Palette
204 + .protectiveBlue // crete new wallet button background (wallet list page)
205 + ),
206 + // headline -> headlineSmall
207 + headlineSmall: TextStyle(
208 + color: Palette
209 + .moderateLavender, // first gradient color of wallet action buttons (wallet list page)
210 + backgroundColor: Palette
211 + .moderateLavender, // second gradient color of wallet action buttons (wallet list page)
212 + decorationColor: Colors
213 + .white // restore wallet button text color (wallet list page)
214 + ),
215 + // subhead -> titleMedium
216 + titleMedium: TextStyle(
217 color: Palette.darkGray, // titles color (filter widget)
218 backgroundColor: Palette.periwinkle, // divider color (filter widget)
219 decorationColor: Colors.white // checkbox background (filter widget)
194 - ),
195 - overline: TextStyle(
220 + ),
221 + labelSmall: TextStyle(
222 color: Palette.wildPeriwinkle, // checkbox bounds (filter widget)
223 decorationColor: Colors.white, // menu subname
224 ),
199 - // display1 -> headline4
200 - headline4: TextStyle(
225 + // display1 -> headlineMedium
226 + headlineMedium: TextStyle(
227 color: Palette.blueCraiola, // first gradient color (menu header)
228 decorationColor: Palette.blueGreyCraiola, // second gradient color(menu header)
229 backgroundColor: PaletteDark.darkNightBlue // active dot color
204 - ),
205 - // display2 -> headline3
206 - headline3: TextStyle(
207 - color: Palette.shadowWhite, // action button color (address text field)
230 + ),
231 + // display2 -> displaySmall
232 + displaySmall: TextStyle(
233 + color:
234 + Palette.shadowWhite, // action button color (address text field)
235 decorationColor: Palette.darkGray, // hint text (seed widget)
209 - backgroundColor: Palette.darkBlueCraiola.withOpacity(0.67) // text on balance page
210 - ),
211 - // display3 -> headline2
212 - headline2: TextStyle(
236 + backgroundColor: Palette.darkBlueCraiola
237 + .withOpacity(0.67) // text on balance page
238 + ),
239 + // display3 -> displayMedium
240 + displayMedium: TextStyle(
241 color: Palette.darkGray, // hint text (new wallet page)
214 - decorationColor: Palette.periwinkleCraiola, // underline (new wallet page)
215 - backgroundColor: Palette.darkBlueCraiola // menu, icons, balance (dashboard page)
216 - ),
217 - // display4 -> headline1
218 - headline1: TextStyle(
242 + decorationColor:
243 + Palette.periwinkleCraiola, // underline (new wallet page)
244 + backgroundColor:
245 + Palette.darkBlueCraiola // menu, icons, balance (dashboard page)
246 + ),
247 + // display4 -> displayLarge
248 + displayLarge: TextStyle(
249 color: Palette.darkGray, // switch background (settings page)
220 - backgroundColor: Colors.black, // icon color on support page (moonpay, github)
221 - decorationColor: Colors.white.withOpacity(0.4) // hint text (exchange page)
222 - ),
223 - // body -> bodyText2
224 - bodyText2: TextStyle(
250 + backgroundColor:
251 + Colors.black, // icon color on support page (moonpay, github)
252 + decorationColor:
253 + Colors.white.withOpacity(0.4) // hint text (exchange page)
254 + ),
255 + // body -> bodyMedium
256 + bodyMedium: TextStyle(
257 color: Palette.darkGray, // indicators (PIN code)
258 decorationColor: Palette.darkGray, // switch (PIN code)
259 backgroundColor: Colors.white // alert right button
228 - ),
229 - // body2 -> bodyText1
230 - bodyText1: TextStyle(
260 + ),
261 + // body2 -> bodyLarge
262 + bodyLarge: TextStyle(
263 color: Palette.protectiveBlue, // primary buttons
264 decorationColor: Colors.white, // alert left button,
265 backgroundColor: Palette.dullGray // keyboard bar color
266 ),
267 ),
268 cardColor: Palette.protectiveBlue // bottom button (action list)
237 - );
238 -}
\ No newline at end of file
269 + );
270 +
271 + @override
272 + ThemeData get themeData => theme.copyWith(
273 + colorScheme: theme.colorScheme
274 + .copyWith(background: Colors.white, secondary: Colors.white));
275 +}