Flutter upgrade

This commit is contained in:
M
2022-10-12 13:09:57 -04:00
parent c921ad890a
commit 1beb18b045
505 changed files with 6657 additions and 5875 deletions
+21 -14
View File
@@ -12,8 +12,8 @@ import 'package:flutter/material.dart';
import 'package:webview_flutter/webview_flutter.dart';
class BuyWebViewPage extends BasePage {
BuyWebViewPage({@required this.buyViewModel,
@required this.ordersStore, @required this.url});
BuyWebViewPage({required this.buyViewModel,
required this.ordersStore, required this.url});
final OrdersStore ordersStore;
final String url;
@@ -34,10 +34,10 @@ class BuyWebViewPage extends BasePage {
}
class BuyWebViewPageBody extends StatefulWidget {
BuyWebViewPageBody(this.buyViewModel, {this.ordersStore, this.url});
BuyWebViewPageBody(this.buyViewModel, {required this.ordersStore, this.url});
final OrdersStore ordersStore;
final String url;
final String? url;
final BuyViewModel buyViewModel;
@override
@@ -45,12 +45,16 @@ class BuyWebViewPageBody extends StatefulWidget {
}
class BuyWebViewPageBodyState extends State<BuyWebViewPageBody> {
BuyWebViewPageBodyState()
: _webViewkey = GlobalKey(),
_isSaving = false,
orderId = '';
String orderId;
WebViewController _webViewController;
WebViewController? _webViewController;
GlobalKey _webViewkey;
Timer _timer;
Timer? _timer;
bool _isSaving;
BuyProvider _provider;
@override
void initState() {
@@ -58,15 +62,14 @@ class BuyWebViewPageBodyState extends State<BuyWebViewPageBody> {
_webViewkey = GlobalKey();
_isSaving = false;
widget.ordersStore.orderId = '';
_provider = widget.buyViewModel.selectedProvider;
if (Platform.isAndroid) WebView.platform = SurfaceAndroidWebView();
if (_provider is WyreBuyProvider) {
if (widget.buyViewModel.selectedProvider is WyreBuyProvider) {
_saveOrder(keyword: 'completed', splitSymbol: '/');
}
if (_provider is MoonPayBuyProvider) {
if (widget.buyViewModel.selectedProvider is MoonPayBuyProvider) {
_saveOrder(keyword: 'transactionId', splitSymbol: '=');
}
}
@@ -81,7 +84,7 @@ class BuyWebViewPageBodyState extends State<BuyWebViewPageBody> {
setState(() => _webViewController = controller));
}
void _saveOrder({String keyword, String splitSymbol}) {
void _saveOrder({required String keyword, required String splitSymbol}) {
_timer?.cancel();
_timer = Timer.periodic(Duration(seconds: 1), (timer) async {
@@ -90,10 +93,14 @@ class BuyWebViewPageBodyState extends State<BuyWebViewPageBody> {
return;
}
final url = await _webViewController.currentUrl();
final url = await _webViewController!.currentUrl();
if (url.contains(keyword)) {
final urlParts = url.split(splitSymbol);
if (url == null) {
throw Exception('_saveOrder: Url is null');
}
if (url!.contains(keyword)) {
final urlParts = url!.split(splitSymbol);
orderId = urlParts.last;
widget.ordersStore.orderId = orderId;
+21 -23
View File
@@ -1,4 +1,3 @@
import 'dart:ui';
import 'package:cake_wallet/buy/buy_amount.dart';
import 'package:cake_wallet/buy/buy_provider.dart';
import 'package:cake_wallet/buy/moonpay/moonpay_buy_provider.dart';
@@ -10,7 +9,6 @@ import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
import 'package:cake_wallet/utils/show_pop_up.dart';
import 'package:cake_wallet/view_model/buy/buy_view_model.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
@@ -26,7 +24,7 @@ import 'package:mobx/mobx.dart';
import 'package:url_launcher/url_launcher.dart';
class PreOrderPage extends BasePage {
PreOrderPage({@required this.buyViewModel})
PreOrderPage({required this.buyViewModel})
: _amountFocus = FocusNode(),
_amountController = TextEditingController() {
_amountController.addListener(() {
@@ -82,8 +80,8 @@ class PreOrderPage extends BasePage {
return KeyboardActions(
config: KeyboardActionsConfig(
keyboardActionsPlatform: KeyboardActionsPlatform.IOS,
keyboardBarColor: Theme.of(context).accentTextTheme.body2
.backgroundColor,
keyboardBarColor: Theme.of(context).accentTextTheme!.bodyText1!
.backgroundColor!,
nextFocus: false,
actions: [
KeyboardActionsItem(
@@ -104,11 +102,11 @@ class PreOrderPage extends BasePage {
bottomLeft: Radius.circular(24),
bottomRight: Radius.circular(24)),
gradient: LinearGradient(colors: [
Theme.of(context).primaryTextTheme.subhead.color,
Theme.of(context).primaryTextTheme!.subtitle1!.color!,
Theme.of(context)
.primaryTextTheme
.subhead
.decorationColor,
.primaryTextTheme!
.subtitle1!
.decorationColor!,
], begin: Alignment.topLeft, end: Alignment.bottomRight),
),
child: Padding(
@@ -163,11 +161,11 @@ class PreOrderPage extends BasePage {
),
),
hintText: '0.00',
borderColor: Theme.of(context).primaryTextTheme.body2.decorationColor,
borderColor: Theme.of(context).primaryTextTheme!.bodyText1!.decorationColor!,
borderWidth: 0.5,
textStyle: TextStyle(fontSize: 36, fontWeight: FontWeight.w500, color: Colors.white),
placeholderTextStyle: TextStyle(
color: Theme.of(context).primaryTextTheme.headline.decorationColor,
color: Theme.of(context).primaryTextTheme!.headline5!.decorationColor!,
fontWeight: FontWeight.w500,
fontSize: 36,
),
@@ -182,7 +180,7 @@ class PreOrderPage extends BasePage {
S.of(context).buy_with + ':',
textAlign: TextAlign.center,
style: TextStyle(
color: Theme.of(context).primaryTextTheme.title.color,
color: Theme.of(context).primaryTextTheme!.headline6!.color!,
fontSize: 18,
fontWeight: FontWeight.bold
),
@@ -200,14 +198,15 @@ class PreOrderPage extends BasePage {
int minAmount;
if (snapshot.hasData) {
sourceAmount = snapshot.data.sourceAmount;
destAmount = snapshot.data.destAmount;
minAmount = snapshot.data.minAmount;
achAmount = snapshot.data.achSourceAmount;
sourceAmount = snapshot.data!.sourceAmount;
destAmount = snapshot.data!.destAmount;
minAmount = snapshot.data!.minAmount;
achAmount = snapshot.data!.achSourceAmount!;
} else {
sourceAmount = 0.0;
destAmount = 0.0;
minAmount = 0;
achAmount = 0;
}
return Padding(
@@ -216,7 +215,7 @@ class PreOrderPage extends BasePage {
child: Observer(builder: (_) {
return BuyListItem(
selectedProvider:
buyViewModel.selectedProvider,
buyViewModel.selectedProvider!,
provider: item.provider,
sourceAmount: sourceAmount,
sourceCurrency: buyViewModel.fiatCurrency,
@@ -247,9 +246,8 @@ class PreOrderPage extends BasePage {
text: buyViewModel.selectedProvider == null
? S.of(context).buy
: S.of(context).buy_with +
' ${buyViewModel.selectedProvider
.description.title}',
color: Theme.of(context).accentTextTheme.body2.color,
' ${buyViewModel.selectedProvider!.description.title}',
color: Theme.of(context).accentTextTheme!.bodyText1!.color!,
textColor: Colors.white,
isLoading: buyViewModel.isRunning,
isDisabled: (buyViewModel.selectedProvider == null) ||
@@ -261,8 +259,8 @@ class PreOrderPage extends BasePage {
);
}
void onSelectBuyProvider({BuildContext context, BuyProvider provider,
double sourceAmount, int minAmount}) {
void onSelectBuyProvider({required BuildContext context, required BuyProvider provider,
required double sourceAmount, required int minAmount}) {
if ((provider is MoonPayBuyProvider)&&
(buyViewModel.buyAmountViewModel.doubleAmount < minAmount)) {
@@ -285,7 +283,7 @@ class PreOrderPage extends BasePage {
: buyViewModel.isDisabled = true;
}
Future<void> onPresentProvider({BuildContext context}) async {
Future<void> onPresentProvider({required BuildContext context}) async {
if (buyViewModel.isRunning) {
return;
}
+11 -11
View File
@@ -8,14 +8,14 @@ import 'package:flutter/material.dart';
class BuyListItem extends StatelessWidget {
BuyListItem({
@required this.selectedProvider,
@required this.provider,
@required this.sourceAmount,
@required this.sourceCurrency,
@required this.destAmount,
@required this.destCurrency,
@required this.achSourceAmount,
@required this.onTap
required this.selectedProvider,
required this.provider,
required this.sourceAmount,
required this.sourceCurrency,
required this.destAmount,
required this.destCurrency,
required this.achSourceAmount,
this.onTap
});
final BuyProvider selectedProvider;
@@ -25,7 +25,7 @@ class BuyListItem extends StatelessWidget {
final double destAmount;
final CryptoCurrency destCurrency;
final double achSourceAmount;
final void Function() onTap;
final VoidCallback? onTap;
@override
Widget build(BuildContext context) {
@@ -33,7 +33,7 @@ class BuyListItem extends StatelessWidget {
final iconColor = isSelected ? Colors.white : Colors.black;
final providerIcon = getBuyProviderIcon(provider.description,
iconColor: iconColor);
iconColor: iconColor)!;
final backgroundColor = isSelected
? Palette.greyBlueCraiola
@@ -48,7 +48,7 @@ class BuyListItem extends StatelessWidget {
: Palette.darkBlueCraiola;
return GestureDetector(
onTap: () => onTap?.call(),
onTap: onTap,
child: Container(
padding: EdgeInsets.only(
left: 20,