Updated to flutter v1.22.2
M committed
Oct 19, 2020 at 14:20 UTC
6b86cfbea27a0b6fde0044c16b00760fa36c8ee0
5 files changed
+309
-332
.gitignore
+1
@@ -92,3 +92,4 @@ android/key.properties
92
vendor/
93
94
android/app/.cxx/**
95
+ios/Flutter/.last_build_id
lib/main.dart
+2
-2
@@ -8,7 +8,7 @@ import 'package:flutter_localizations/flutter_localizations.dart';
8
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
9
import 'package:flutter_mobx/flutter_mobx.dart';
10
import 'package:cw_monero/wallet.dart' as monero_wallet;
11
-import 'package:cake_wallet/router.dart';
11
+import 'package:cake_wallet/router.dart' as Router;
12
import 'package:cake_wallet/routes.dart';
13
import 'package:cake_wallet/generated/i18n.dart';
14
import 'package:cake_wallet/reactions/bootstrap.dart';
@@ -144,7 +144,7 @@ class App extends StatelessWidget {
144
],
145
supportedLocales: S.delegate.supportedLocales,
146
locale: Locale(settingsStore.languageCode),
147
- onGenerateRoute: (settings) => Router.generateRoute(settings),
147
+ onGenerateRoute: (settings) => Router.createRoute(settings),
148
initialRoute: initialRoute,
149
));
150
});
lib/router.dart
+260
-266
@@ -49,271 +49,265 @@ import 'package:cake_wallet/src/screens/exchange/exchange_template_page.dart';
49
import 'package:cake_wallet/src/screens/exchange_trade/exchange_confirm_page.dart';
50
import 'package:cake_wallet/src/screens/exchange_trade/exchange_trade_page.dart';
51
52
-class Router {
53
- static Route<dynamic> generateRoute(RouteSettings settings) {
54
- switch (settings.name) {
55
- case Routes.welcome:
56
- return MaterialPageRoute<void>(builder: (_) => createWelcomePage());
57
-
58
- case Routes.newWalletFromWelcome:
59
- return CupertinoPageRoute<void>(
60
- builder: (_) => getIt.get<SetupPinCodePage>(
61
- param1: (BuildContext context, dynamic _) =>
62
- Navigator.pushNamed(context, Routes.newWallet)),
63
- fullscreenDialog: true);
64
-
65
- case Routes.newWalletType:
66
- return CupertinoPageRoute<void>(
67
- builder: (_) => NewWalletTypePage(
52
+Route<dynamic> createRoute(RouteSettings settings) {
53
+ switch (settings.name) {
54
+ case Routes.welcome:
55
+ return MaterialPageRoute<void>(builder: (_) => createWelcomePage());
56
+
57
+ case Routes.newWalletFromWelcome:
58
+ return CupertinoPageRoute<void>(
59
+ builder: (_) => getIt.get<SetupPinCodePage>(
60
+ param1: (BuildContext context, dynamic _) =>
61
+ Navigator.pushNamed(context, Routes.newWallet)),
62
+ fullscreenDialog: true);
63
+
64
+ case Routes.newWalletType:
65
+ return CupertinoPageRoute<void>(
66
+ builder: (_) => NewWalletTypePage(
67
+ onTypeSelected: (context, type) => Navigator.of(context)
68
+ .pushNamed(Routes.newWallet, arguments: type)));
69
+
70
+ case Routes.newWallet:
71
+ final type = WalletType.monero; // settings.arguments as WalletType;
72
+ final walletNewVM = getIt.get<WalletNewVM>(param1: type);
73
+
74
+ return CupertinoPageRoute<void>(
75
+ builder: (_) => NewWalletPage(walletNewVM));
76
+
77
+ case Routes.setupPin:
78
+ Function(BuildContext, String) callback;
79
+
80
+ if (settings.arguments is Function(BuildContext, String)) {
81
+ callback = settings.arguments as Function(BuildContext, String);
82
+ }
83
+
84
+ return CupertinoPageRoute<void>(
85
+ builder: (_) => getIt.get<SetupPinCodePage>(param1: callback));
86
+
87
+ case Routes.restoreWalletType:
88
+ return CupertinoPageRoute<void>(
89
+ builder: (_) => NewWalletTypePage(
90
onTypeSelected: (context, type) => Navigator.of(context)
69
- .pushNamed(Routes.newWallet, arguments: type)));
70
-
71
- case Routes.newWallet:
72
- final type = WalletType.monero; // settings.arguments as WalletType;
73
- final walletNewVM = getIt.get<WalletNewVM>(param1: type);
74
-
75
- return CupertinoPageRoute<void>(
76
- builder: (_) => NewWalletPage(walletNewVM));
77
-
78
- case Routes.setupPin:
79
- Function(BuildContext, String) callback;
80
-
81
- if (settings.arguments is Function(BuildContext, String)) {
82
- callback = settings.arguments as Function(BuildContext, String);
83
- }
84
-
85
- return CupertinoPageRoute<void>(
86
- builder: (_) => getIt.get<SetupPinCodePage>(param1: callback));
87
-
88
- case Routes.restoreWalletType:
89
- return CupertinoPageRoute<void>(
90
- builder: (_) => NewWalletTypePage(
91
- onTypeSelected: (context, type) => Navigator.of(context)
92
- .pushNamed(Routes.restoreWalletOptions, arguments: type),
93
- isNewWallet: false,
94
- ));
95
-
96
- case Routes.restoreOptions:
97
- final type = settings.arguments as WalletType;
98
- return CupertinoPageRoute<void>(
99
- builder: (_) => RestoreOptionsPage(type: type));
100
-
101
- case Routes.restoreWalletOptions:
102
- final type = WalletType.monero; //settings.arguments as WalletType;
103
-
104
- return CupertinoPageRoute<void>(
105
- builder: (_) => RestoreWalletOptionsPage(
106
- type: type,
107
- onRestoreFromSeed: (context) {
108
- final route = type == WalletType.monero
109
- ? Routes.seedLanguage
110
- : Routes.restoreWalletFromSeed;
111
- final args = type == WalletType.monero
112
- ? [type, Routes.restoreWalletFromSeed]
113
- : [type];
114
-
115
- Navigator.of(context).pushNamed(route, arguments: args);
116
- },
117
- onRestoreFromKeys: (context) {
118
- final route = type == WalletType.monero
119
- ? Routes.seedLanguage
120
- : Routes.restoreWalletFromKeys;
121
- final args = type == WalletType.monero
122
- ? [type, Routes.restoreWalletFromKeys]
123
- : [type];
124
-
125
- Navigator.of(context).pushNamed(route, arguments: args);
126
- }));
127
-
128
- case Routes.restoreWalletOptionsFromWelcome:
129
- return CupertinoPageRoute<void>(
130
- builder: (_) => getIt.get<SetupPinCodePage>(
131
- param1: (BuildContext context, dynamic _) =>
132
- Navigator.pushNamed(context, Routes.restoreWallet)),
133
- fullscreenDialog: true);
134
-
135
- case Routes.seed:
136
- return MaterialPageRoute<void>(
137
- builder: (_) =>
138
- getIt.get<WalletSeedPage>(param1: settings.arguments as bool));
139
-
140
- case Routes.restoreWallet:
141
- return MaterialPageRoute<void>(
142
- builder: (_) =>
143
- getIt.get<WalletRestorePage>(param1: WalletType.monero));
144
-
145
- case Routes.restoreWalletFromSeed:
146
- // final args = settings.arguments as List<dynamic>;
147
- final type = WalletType.monero; //args.first as WalletType;
148
- // final language = type == WalletType.monero
149
- // ? args[1] as String
150
- // : LanguageList.english;
151
-
152
- return CupertinoPageRoute<void>(
153
- builder: (_) => RestoreWalletFromSeedPage(type: type));
154
-
155
- case Routes.restoreWalletFromKeys:
156
- final args = settings.arguments as List<dynamic>;
157
- final type = args.first as WalletType;
158
- final language = type == WalletType.monero
159
- ? args[1] as String
160
- : LanguageList.english;
161
-
162
- final walletRestorationFromKeysVM =
163
- getIt.get<WalletRestorationFromKeysVM>(param1: [type, language]);
164
-
165
- return CupertinoPageRoute<void>(
166
- builder: (_) => RestoreWalletFromKeysPage(
167
- walletRestorationFromKeysVM: walletRestorationFromKeysVM));
168
-
169
- case Routes.dashboard:
170
- return CupertinoPageRoute<void>(
171
- builder: (_) => getIt.get<DashboardPage>());
172
-
173
- case Routes.send:
174
- return CupertinoPageRoute<void>(
175
- fullscreenDialog: true, builder: (_) => getIt.get<SendPage>());
176
-
177
- case Routes.sendTemplate:
178
- return CupertinoPageRoute<void>(
179
- fullscreenDialog: true,
180
- builder: (_) => getIt.get<SendTemplatePage>());
181
-
182
- case Routes.receive:
183
- return CupertinoPageRoute<void>(
184
- fullscreenDialog: true, builder: (_) => getIt.get<ReceivePage>());
185
-
186
- case Routes.transactionDetails:
187
- return CupertinoPageRoute<void>(
188
- fullscreenDialog: true,
189
- builder: (_) =>
190
- TransactionDetailsPage(settings.arguments as TransactionInfo));
191
-
192
- case Routes.newSubaddress:
193
- return CupertinoPageRoute<void>(
194
- builder: (_) =>
195
- getIt.get<AddressEditOrCreatePage>(param1: settings.arguments));
196
-
197
- case Routes.disclaimer:
198
- return CupertinoPageRoute<void>(builder: (_) => DisclaimerPage());
199
-
200
- case Routes.readDisclaimer:
201
- return CupertinoPageRoute<void>(
202
- builder: (_) => DisclaimerPage(isReadOnly: true));
203
-
204
- case Routes.seedLanguage:
205
- final args = settings.arguments as List<dynamic>;
206
- final type = args.first as WalletType;
207
- final redirectRoute = args[1] as String;
208
-
209
- return CupertinoPageRoute<void>(builder: (_) {
210
- return SeedLanguage(
211
- onConfirm: (context, lang) => Navigator.of(context)
212
- .popAndPushNamed(redirectRoute, arguments: [type, lang]));
213
- });
214
-
215
- case Routes.walletList:
216
- return MaterialPageRoute<void>(
217
- fullscreenDialog: true,
218
- builder: (_) => getIt.get<WalletListPage>());
219
-
220
- case Routes.auth:
221
- return MaterialPageRoute<void>(
222
- fullscreenDialog: true,
223
- builder: (_) => getIt.get<AuthPage>(
224
- param1: settings.arguments as OnAuthenticationFinished,
225
- param2: true));
226
-
227
- case Routes.unlock:
228
- return MaterialPageRoute<void>(
229
- fullscreenDialog: true,
230
- builder: (_) => getIt.get<AuthPage>(
231
- param1: settings.arguments as OnAuthenticationFinished,
232
- param2: false));
233
-
234
- case Routes.nodeList:
235
- return CupertinoPageRoute<void>(
236
- builder: (_) => getIt.get<NodeListPage>());
237
-
238
- case Routes.newNode:
239
- return CupertinoPageRoute<void>(
240
- builder: (_) => getIt.get<NodeCreateOrEditPage>());
241
-
242
- case Routes.login:
243
- return CupertinoPageRoute<void>(
244
- builder: (context) => getIt.get<AuthPage>(instanceName: 'login'),
245
- fullscreenDialog: true);
246
-
247
- case Routes.accountCreation:
248
- return CupertinoPageRoute<String>(
249
- builder: (_) => getIt.get<MoneroAccountEditOrCreatePage>());
250
-
251
- case Routes.addressBook:
252
- return MaterialPageRoute<void>(
253
- builder: (_) => getIt.get<ContactListPage>(param1: true));
254
-
255
- case Routes.pickerAddressBook:
256
- return MaterialPageRoute<void>(
257
- builder: (_) => getIt.get<ContactListPage>(param1: false));
258
-
259
- case Routes.addressBookAddContact:
260
- return CupertinoPageRoute<void>(
261
- builder: (_) => getIt.get<ContactPage>(
262
- param1: settings.arguments as ContactRecord));
263
-
264
- case Routes.showKeys:
265
- return MaterialPageRoute<void>(
266
- builder: (_) => getIt.get<WalletKeysPage>(),
267
- fullscreenDialog: true);
268
-
269
- case Routes.exchangeTrade:
270
- return CupertinoPageRoute<void>(
271
- builder: (_) => getIt.get<ExchangeTradePage>());
272
-
273
- case Routes.exchangeConfirm:
274
- return MaterialPageRoute<void>(
275
- builder: (_) => getIt.get<ExchangeConfirmPage>());
276
-
277
- case Routes.tradeDetails:
278
- return MaterialPageRoute<void>(
279
- builder: (_) => TradeDetailsPage(settings.arguments as Trade));
280
-
281
- case Routes.restoreWalletFromSeedDetails:
282
- final args = settings.arguments as List;
283
- final walletRestorationFromSeedVM =
284
- getIt.get<WalletRestorationFromSeedVM>(param1: args);
285
-
286
- return CupertinoPageRoute<void>(
287
- builder: (_) => RestoreWalletFromSeedDetailsPage(
288
- walletRestorationFromSeedVM: walletRestorationFromSeedVM));
289
-
290
- case Routes.exchange:
291
- return CupertinoPageRoute<void>(
292
- builder: (_) => getIt.get<ExchangePage>());
293
-
294
- case Routes.exchangeTemplate:
295
- return CupertinoPageRoute<void>(
296
- builder: (_) => getIt.get<ExchangeTemplatePage>());
297
-
298
- case Routes.settings:
299
- return MaterialPageRoute<void>(
300
- builder: (_) => getIt.get<SettingsPage>());
301
-
302
- case Routes.rescan:
303
- return MaterialPageRoute<void>(builder: (_) => getIt.get<RescanPage>());
304
-
305
- case Routes.faq:
306
- return MaterialPageRoute<void>(builder: (_) => getIt.get<FaqPage>());
307
-
308
- case Routes.changeLanguage:
309
- return MaterialPageRoute<void>(
310
- builder: (_) => getIt.get<LanguageListPage>());
311
-
312
- default:
313
- return MaterialPageRoute<void>(
314
- builder: (_) => Scaffold(
315
- body: Center(
316
- child: Text(S.current.router_no_route(settings.name)))));
317
- }
91
+ .pushNamed(Routes.restoreWalletOptions, arguments: type),
92
+ isNewWallet: false,
93
+ ));
94
+
95
+ case Routes.restoreOptions:
96
+ final type = settings.arguments as WalletType;
97
+ return CupertinoPageRoute<void>(
98
+ builder: (_) => RestoreOptionsPage(type: type));
99
+
100
+ case Routes.restoreWalletOptions:
101
+ final type = WalletType.monero; //settings.arguments as WalletType;
102
+
103
+ return CupertinoPageRoute<void>(
104
+ builder: (_) => RestoreWalletOptionsPage(
105
+ type: type,
106
+ onRestoreFromSeed: (context) {
107
+ final route = type == WalletType.monero
108
+ ? Routes.seedLanguage
109
+ : Routes.restoreWalletFromSeed;
110
+ final args = type == WalletType.monero
111
+ ? [type, Routes.restoreWalletFromSeed]
112
+ : [type];
113
+
114
+ Navigator.of(context).pushNamed(route, arguments: args);
115
+ },
116
+ onRestoreFromKeys: (context) {
117
+ final route = type == WalletType.monero
118
+ ? Routes.seedLanguage
119
+ : Routes.restoreWalletFromKeys;
120
+ final args = type == WalletType.monero
121
+ ? [type, Routes.restoreWalletFromKeys]
122
+ : [type];
123
+
124
+ Navigator.of(context).pushNamed(route, arguments: args);
125
+ }));
126
+
127
+ case Routes.restoreWalletOptionsFromWelcome:
128
+ return CupertinoPageRoute<void>(
129
+ builder: (_) => getIt.get<SetupPinCodePage>(
130
+ param1: (BuildContext context, dynamic _) =>
131
+ Navigator.pushNamed(context, Routes.restoreWallet)),
132
+ fullscreenDialog: true);
133
+
134
+ case Routes.seed:
135
+ return MaterialPageRoute<void>(
136
+ builder: (_) =>
137
+ getIt.get<WalletSeedPage>(param1: settings.arguments as bool));
138
+
139
+ case Routes.restoreWallet:
140
+ return MaterialPageRoute<void>(
141
+ builder: (_) =>
142
+ getIt.get<WalletRestorePage>(param1: WalletType.monero));
143
+
144
+ case Routes.restoreWalletFromSeed:
145
+ // final args = settings.arguments as List<dynamic>;
146
+ final type = WalletType.monero; //args.first as WalletType;
147
+ // final language = type == WalletType.monero
148
+ // ? args[1] as String
149
+ // : LanguageList.english;
150
+
151
+ return CupertinoPageRoute<void>(
152
+ builder: (_) => RestoreWalletFromSeedPage(type: type));
153
+
154
+ case Routes.restoreWalletFromKeys:
155
+ final args = settings.arguments as List<dynamic>;
156
+ final type = args.first as WalletType;
157
+ final language =
158
+ type == WalletType.monero ? args[1] as String : LanguageList.english;
159
+
160
+ final walletRestorationFromKeysVM =
161
+ getIt.get<WalletRestorationFromKeysVM>(param1: [type, language]);
162
+
163
+ return CupertinoPageRoute<void>(
164
+ builder: (_) => RestoreWalletFromKeysPage(
165
+ walletRestorationFromKeysVM: walletRestorationFromKeysVM));
166
+
167
+ case Routes.dashboard:
168
+ return CupertinoPageRoute<void>(
169
+ builder: (_) => getIt.get<DashboardPage>());
170
+
171
+ case Routes.send:
172
+ return CupertinoPageRoute<void>(
173
+ fullscreenDialog: true, builder: (_) => getIt.get<SendPage>());
174
+
175
+ case Routes.sendTemplate:
176
+ return CupertinoPageRoute<void>(
177
+ fullscreenDialog: true,
178
+ builder: (_) => getIt.get<SendTemplatePage>());
179
+
180
+ case Routes.receive:
181
+ return CupertinoPageRoute<void>(
182
+ fullscreenDialog: true, builder: (_) => getIt.get<ReceivePage>());
183
+
184
+ case Routes.transactionDetails:
185
+ return CupertinoPageRoute<void>(
186
+ fullscreenDialog: true,
187
+ builder: (_) =>
188
+ TransactionDetailsPage(settings.arguments as TransactionInfo));
189
+
190
+ case Routes.newSubaddress:
191
+ return CupertinoPageRoute<void>(
192
+ builder: (_) =>
193
+ getIt.get<AddressEditOrCreatePage>(param1: settings.arguments));
194
+
195
+ case Routes.disclaimer:
196
+ return CupertinoPageRoute<void>(builder: (_) => DisclaimerPage());
197
+
198
+ case Routes.readDisclaimer:
199
+ return CupertinoPageRoute<void>(
200
+ builder: (_) => DisclaimerPage(isReadOnly: true));
201
+
202
+ case Routes.seedLanguage:
203
+ final args = settings.arguments as List<dynamic>;
204
+ final type = args.first as WalletType;
205
+ final redirectRoute = args[1] as String;
206
+
207
+ return CupertinoPageRoute<void>(builder: (_) {
208
+ return SeedLanguage(
209
+ onConfirm: (context, lang) => Navigator.of(context)
210
+ .popAndPushNamed(redirectRoute, arguments: [type, lang]));
211
+ });
212
+
213
+ case Routes.walletList:
214
+ return MaterialPageRoute<void>(
215
+ fullscreenDialog: true, builder: (_) => getIt.get<WalletListPage>());
216
+
217
+ case Routes.auth:
218
+ return MaterialPageRoute<void>(
219
+ fullscreenDialog: true,
220
+ builder: (_) => getIt.get<AuthPage>(
221
+ param1: settings.arguments as OnAuthenticationFinished,
222
+ param2: true));
223
+
224
+ case Routes.unlock:
225
+ return MaterialPageRoute<void>(
226
+ fullscreenDialog: true,
227
+ builder: (_) => getIt.get<AuthPage>(
228
+ param1: settings.arguments as OnAuthenticationFinished,
229
+ param2: false));
230
+
231
+ case Routes.nodeList:
232
+ return CupertinoPageRoute<void>(
233
+ builder: (_) => getIt.get<NodeListPage>());
234
+
235
+ case Routes.newNode:
236
+ return CupertinoPageRoute<void>(
237
+ builder: (_) => getIt.get<NodeCreateOrEditPage>());
238
+
239
+ case Routes.login:
240
+ return CupertinoPageRoute<void>(
241
+ builder: (context) => getIt.get<AuthPage>(instanceName: 'login'),
242
+ fullscreenDialog: true);
243
+
244
+ case Routes.accountCreation:
245
+ return CupertinoPageRoute<String>(
246
+ builder: (_) => getIt.get<MoneroAccountEditOrCreatePage>());
247
+
248
+ case Routes.addressBook:
249
+ return MaterialPageRoute<void>(
250
+ builder: (_) => getIt.get<ContactListPage>(param1: true));
251
+
252
+ case Routes.pickerAddressBook:
253
+ return MaterialPageRoute<void>(
254
+ builder: (_) => getIt.get<ContactListPage>(param1: false));
255
+
256
+ case Routes.addressBookAddContact:
257
+ return CupertinoPageRoute<void>(
258
+ builder: (_) => getIt.get<ContactPage>(
259
+ param1: settings.arguments as ContactRecord));
260
+
261
+ case Routes.showKeys:
262
+ return MaterialPageRoute<void>(
263
+ builder: (_) => getIt.get<WalletKeysPage>(), fullscreenDialog: true);
264
+
265
+ case Routes.exchangeTrade:
266
+ return CupertinoPageRoute<void>(
267
+ builder: (_) => getIt.get<ExchangeTradePage>());
268
+
269
+ case Routes.exchangeConfirm:
270
+ return MaterialPageRoute<void>(
271
+ builder: (_) => getIt.get<ExchangeConfirmPage>());
272
+
273
+ case Routes.tradeDetails:
274
+ return MaterialPageRoute<void>(
275
+ builder: (_) => TradeDetailsPage(settings.arguments as Trade));
276
+
277
+ case Routes.restoreWalletFromSeedDetails:
278
+ final args = settings.arguments as List;
279
+ final walletRestorationFromSeedVM =
280
+ getIt.get<WalletRestorationFromSeedVM>(param1: args);
281
+
282
+ return CupertinoPageRoute<void>(
283
+ builder: (_) => RestoreWalletFromSeedDetailsPage(
284
+ walletRestorationFromSeedVM: walletRestorationFromSeedVM));
285
+
286
+ case Routes.exchange:
287
+ return CupertinoPageRoute<void>(
288
+ builder: (_) => getIt.get<ExchangePage>());
289
+
290
+ case Routes.exchangeTemplate:
291
+ return CupertinoPageRoute<void>(
292
+ builder: (_) => getIt.get<ExchangeTemplatePage>());
293
+
294
+ case Routes.settings:
295
+ return MaterialPageRoute<void>(builder: (_) => getIt.get<SettingsPage>());
296
+
297
+ case Routes.rescan:
298
+ return MaterialPageRoute<void>(builder: (_) => getIt.get<RescanPage>());
299
+
300
+ case Routes.faq:
301
+ return MaterialPageRoute<void>(builder: (_) => getIt.get<FaqPage>());
302
+
303
+ case Routes.changeLanguage:
304
+ return MaterialPageRoute<void>(
305
+ builder: (_) => getIt.get<LanguageListPage>());
306
+
307
+ default:
308
+ return MaterialPageRoute<void>(
309
+ builder: (_) => Scaffold(
310
+ body: Center(
311
+ child: Text(S.current.router_no_route(settings.name)))));
312
}
319
-}
313
+}
\ No newline at end of file
pubspec.lock
+43
-57
@@ -7,14 +7,14 @@ packages:
7
name: _fe_analyzer_shared
8
url: "https://pub.dartlang.org"
9
source: hosted
10
- version: "6.0.0"
10
+ version: "11.0.0"
11
analyzer:
12
dependency: transitive
13
description:
14
name: analyzer
15
url: "https://pub.dartlang.org"
16
source: hosted
17
- version: "0.39.14"
17
+ version: "0.40.4"
18
archive:
19
dependency: transitive
20
description:
@@ -42,7 +42,7 @@ packages:
42
name: async
43
url: "https://pub.dartlang.org"
44
source: hosted
45
- version: "2.4.2"
45
+ version: "2.5.0-nullsafety.1"
46
auto_size_text:
47
dependency: "direct main"
48
description:
@@ -98,7 +98,7 @@ packages:
98
name: boolean_selector
99
url: "https://pub.dartlang.org"
100
source: hosted
101
- version: "2.0.0"
101
+ version: "2.1.0-nullsafety.1"
102
bs58check:
103
dependency: transitive
104
description:
@@ -112,7 +112,7 @@ packages:
112
name: build
113
url: "https://pub.dartlang.org"
114
source: hosted
115
- version: "1.3.0"
115
+ version: "1.5.0"
116
build_config:
117
dependency: transitive
118
description:
@@ -133,21 +133,21 @@ packages:
133
name: build_resolvers
134
url: "https://pub.dartlang.org"
135
source: hosted
136
- version: "1.3.11"
136
+ version: "1.4.1"
137
build_runner:
138
dependency: "direct dev"
139
description:
140
name: build_runner
141
url: "https://pub.dartlang.org"
142
source: hosted
143
- version: "1.10.1"
143
+ version: "1.10.3"
144
build_runner_core:
145
dependency: transitive
146
description:
147
name: build_runner_core
148
url: "https://pub.dartlang.org"
149
source: hosted
150
- version: "6.0.1"
150
+ version: "6.0.3"
151
built_collection:
152
dependency: transitive
153
description:
@@ -168,14 +168,14 @@ packages:
168
name: characters
169
url: "https://pub.dartlang.org"
170
source: hosted
171
- version: "1.0.0"
171
+ version: "1.1.0-nullsafety.3"
172
charcode:
173
dependency: transitive
174
description:
175
name: charcode
176
url: "https://pub.dartlang.org"
177
source: hosted
178
- version: "1.1.3"
178
+ version: "1.2.0-nullsafety.1"
179
checked_yaml:
180
dependency: transitive
181
description:
@@ -189,35 +189,35 @@ packages:
189
name: cli_util
190
url: "https://pub.dartlang.org"
191
source: hosted
192
- version: "0.1.4"
192
+ version: "0.2.0"
193
clock:
194
dependency: transitive
195
description:
196
name: clock
197
url: "https://pub.dartlang.org"
198
source: hosted
199
- version: "1.0.1"
199
+ version: "1.1.0-nullsafety.1"
200
code_builder:
201
dependency: transitive
202
description:
203
name: code_builder
204
url: "https://pub.dartlang.org"
205
source: hosted
206
- version: "3.4.1"
206
+ version: "3.5.0"
207
collection:
208
dependency: transitive
209
description:
210
name: collection
211
url: "https://pub.dartlang.org"
212
source: hosted
213
- version: "1.14.13"
213
+ version: "1.15.0-nullsafety.3"
214
connectivity:
215
dependency: "direct main"
216
description:
217
name: connectivity
218
url: "https://pub.dartlang.org"
219
source: hosted
220
- version: "0.4.9+3"
220
+ version: "0.4.9+5"
221
connectivity_for_web:
222
dependency: transitive
223
description:
@@ -253,13 +253,6 @@ packages:
253
url: "https://pub.dartlang.org"
254
source: hosted
255
version: "2.1.5"
256
- csslib:
257
- dependency: transitive
258
- description:
259
- name: csslib
260
- url: "https://pub.dartlang.org"
261
- source: hosted
262
- version: "0.16.2"
256
cupertino_icons:
257
dependency: "direct main"
258
description:
@@ -280,9 +273,9 @@ packages:
273
name: dart_style
274
url: "https://pub.dartlang.org"
275
source: hosted
283
- version: "1.3.6"
276
+ version: "1.3.7"
277
dartx:
285
- dependency: "direct overridden"
278
+ dependency: transitive
279
description:
280
name: dartx
281
url: "https://pub.dartlang.org"
@@ -336,7 +329,7 @@ packages:
329
name: fake_async
330
url: "https://pub.dartlang.org"
331
source: hosted
339
- version: "1.1.0"
332
+ version: "1.2.0-nullsafety.1"
333
ffi:
334
dependency: transitive
335
description:
@@ -463,7 +456,7 @@ packages:
456
name: hive
457
url: "https://pub.dartlang.org"
458
source: hosted
466
- version: "1.4.4"
459
+ version: "1.4.4+1"
460
hive_flutter:
461
dependency: "direct main"
462
description:
@@ -477,14 +470,7 @@ packages:
470
name: hive_generator
471
url: "https://pub.dartlang.org"
472
source: hosted
480
- version: "0.7.2+1"
481
- html:
482
- dependency: transitive
483
- description:
484
- name: html
485
- url: "https://pub.dartlang.org"
486
- source: hosted
487
- version: "0.14.0+3"
473
+ version: "0.8.1"
474
http:
475
dependency: "direct main"
476
description:
@@ -547,14 +533,14 @@ packages:
533
name: keyboard_actions
534
url: "https://pub.dartlang.org"
535
source: hosted
550
- version: "3.3.0+1"
536
+ version: "3.3.1+1"
537
local_auth:
538
dependency: "direct main"
539
description:
540
name: local_auth
541
url: "https://pub.dartlang.org"
542
source: hosted
557
- version: "0.6.3+2"
543
+ version: "0.6.3+3"
544
logging:
545
dependency: transitive
546
description:
@@ -568,14 +554,14 @@ packages:
554
name: matcher
555
url: "https://pub.dartlang.org"
556
source: hosted
571
- version: "0.12.8"
557
+ version: "0.12.10-nullsafety.1"
558
meta:
559
dependency: transitive
560
description:
561
name: meta
562
url: "https://pub.dartlang.org"
563
source: hosted
578
- version: "1.1.8"
564
+ version: "1.3.0-nullsafety.3"
565
mime:
566
dependency: transitive
567
description:
@@ -589,14 +575,14 @@ packages:
575
name: mobx
576
url: "https://pub.dartlang.org"
577
source: hosted
592
- version: "1.2.1+2"
578
+ version: "1.2.1+3"
579
mobx_codegen:
580
dependency: "direct dev"
581
description:
582
name: mobx_codegen
583
url: "https://pub.dartlang.org"
584
source: hosted
599
- version: "1.1.0+2"
585
+ version: "1.1.1+1"
586
node_interop:
587
dependency: transitive
588
description:
@@ -638,7 +624,7 @@ packages:
624
name: path
625
url: "https://pub.dartlang.org"
626
source: hosted
641
- version: "1.7.0"
627
+ version: "1.8.0-nullsafety.1"
628
path_drawing:
629
dependency: transitive
630
description:
@@ -659,7 +645,7 @@ packages:
645
name: path_provider
646
url: "https://pub.dartlang.org"
647
source: hosted
662
- version: "1.6.18"
648
+ version: "1.6.21"
649
path_provider_linux:
650
dependency: transitive
651
description:
@@ -694,14 +680,14 @@ packages:
680
name: pedantic
681
url: "https://pub.dartlang.org"
682
source: hosted
697
- version: "1.9.0"
683
+ version: "1.9.2"
684
petitparser:
685
dependency: transitive
686
description:
687
name: petitparser
688
url: "https://pub.dartlang.org"
689
source: hosted
704
- version: "3.0.4"
690
+ version: "3.1.0"
691
platform:
692
dependency: transitive
693
description:
@@ -792,14 +778,14 @@ packages:
778
name: share
779
url: "https://pub.dartlang.org"
780
source: hosted
795
- version: "0.6.5+2"
781
+ version: "0.6.5+3"
782
shared_preferences:
783
dependency: "direct main"
784
description:
785
name: shared_preferences
786
url: "https://pub.dartlang.org"
787
source: hosted
802
- version: "0.5.12"
788
+ version: "0.5.12+2"
789
shared_preferences_linux:
790
dependency: transitive
791
description:
@@ -874,21 +860,21 @@ packages:
860
name: source_span
861
url: "https://pub.dartlang.org"
862
source: hosted
877
- version: "1.7.0"
863
+ version: "1.8.0-nullsafety.2"
864
stack_trace:
865
dependency: transitive
866
description:
867
name: stack_trace
868
url: "https://pub.dartlang.org"
869
source: hosted
884
- version: "1.9.5"
870
+ version: "1.10.0-nullsafety.1"
871
stream_channel:
872
dependency: transitive
873
description:
874
name: stream_channel
875
url: "https://pub.dartlang.org"
876
source: hosted
891
- version: "2.0.0"
877
+ version: "2.1.0-nullsafety.1"
878
stream_transform:
879
dependency: transitive
880
description:
@@ -902,21 +888,21 @@ packages:
888
name: string_scanner
889
url: "https://pub.dartlang.org"
890
source: hosted
905
- version: "1.0.5"
891
+ version: "1.1.0-nullsafety.1"
892
term_glyph:
893
dependency: transitive
894
description:
895
name: term_glyph
896
url: "https://pub.dartlang.org"
897
source: hosted
912
- version: "1.1.0"
898
+ version: "1.2.0-nullsafety.1"
899
test_api:
900
dependency: transitive
901
description:
902
name: test_api
903
url: "https://pub.dartlang.org"
904
source: hosted
919
- version: "0.2.17"
905
+ version: "0.2.19-nullsafety.2"
906
time:
907
dependency: transitive
908
description:
@@ -937,14 +923,14 @@ packages:
923
name: typed_data
924
url: "https://pub.dartlang.org"
925
source: hosted
940
- version: "1.2.0"
926
+ version: "1.3.0-nullsafety.3"
927
url_launcher:
928
dependency: "direct main"
929
description:
930
name: url_launcher
931
url: "https://pub.dartlang.org"
932
source: hosted
947
- version: "5.7.2"
933
+ version: "5.7.5"
934
url_launcher_linux:
935
dependency: transitive
936
description:
@@ -993,7 +979,7 @@ packages:
979
name: vector_math
980
url: "https://pub.dartlang.org"
981
source: hosted
996
- version: "2.0.8"
982
+ version: "2.1.0-nullsafety.3"
983
watcher:
984
dependency: transitive
985
description:
@@ -1021,7 +1007,7 @@ packages:
1007
name: xdg_directories
1008
url: "https://pub.dartlang.org"
1009
source: hosted
1024
- version: "0.1.0"
1010
+ version: "0.1.2"
1011
xml:
1012
dependency: transitive
1013
description:
@@ -1037,5 +1023,5 @@ packages:
1023
source: hosted
1024
version: "2.2.1"
1025
sdks:
1040
- dart: ">=2.9.0-14.0.dev <3.0.0"
1026
+ dart: ">=2.10.0-110 <2.11.0"
1027
flutter: ">=1.12.13+hotfix.5 <2.0.0"
pubspec.yaml
+3
-7
@@ -46,7 +46,7 @@ dependencies:
46
dio: 3.0.7
47
cw_monero:
48
path: ./cw_monero
49
- hive: ^1.4.2
49
+ hive: ^1.4.4+1
50
hive_flutter: ^0.3.1
51
local_auth: ^0.6.1
52
package_info: ^0.4.0+13
@@ -70,17 +70,13 @@ dependencies:
70
dev_dependencies:
71
flutter_test:
72
sdk: flutter
73
- build_runner: 1.10.1
73
+ build_runner: ^1.10.3
74
build_resolvers: ^1.3.10
75
mobx_codegen: ^1.1.0+1
76
- hive_generator: ^0.7.0+2
76
+ hive_generator: ^0.8.1
77
flutter_launcher_icons: ^0.7.4
78
pedantic: ^1.8.0
79
80
-# Fix for hive https://github.com/hivedb/hive/issues/247#issuecomment-606838497
81
-dependency_overrides:
82
- dartx: ^0.5.0
83
-
80
flutter_icons:
81
image_path: "assets/images/app_logo.png"
82
android: true