github-such-software/hash-wallet
1
0
Fork 1
mirror of https://github.com/Such-Software/hash-wallet.git synced 2026-10-19 05:58:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

CAKE-279 | renamed WebViewPage on WyrePage; applied spinner to Buy button on dashboard_page.dart

Browse Source
This commit is contained in:
OleksandrSobol
2021-03-18 20:36:58 +02:00
parent e77cf89651
commit b20246ad89
6 changed files with 55 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/screens/dashboard/dashboard_page.dart
+33 -19
View File
@@ -1,4 +1,3 @@
import 'package:cake_wallet/entities/find_order_by_id.dart';
import 'package:cake_wallet/entities/wallet_type.dart';
import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/routes.dart';
@@ -16,6 +15,7 @@ import 'package:cake_wallet/src/screens/dashboard/widgets/sync_indicator.dart';
import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_view_model.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:smooth_page_indicator/smooth_page_indicator.dart';
import 'package:flutter_spinkit/flutter_spinkit.dart';
class DashboardPage extends BasePage {
DashboardPage({
@@ -126,26 +126,40 @@ class DashboardPage extends BasePage {
title: S.of(context).exchange,
route: Routes.exchange),
if (walletViewModel.type == WalletType.bitcoin) Observer(
builder: (_) => ActionButton(
image: buyImage,
title: S.of(context).buy,
onClick: walletViewModel.isRunningWebView
? null
: () async {
walletViewModel.isRunningWebView = true;
final url = await walletViewModel.getWyreUrl();
if (url.isNotEmpty) {
await Navigator.of(context)
.pushNamed(Routes.webView, arguments: url);
builder: (_) => Stack(
clipBehavior: Clip.none,
alignment: Alignment.topCenter,
children: [
if (walletViewModel.isRunningWebView) Positioned(
top: -5,
child: SpinKitRing(
color: Theme.of(context).buttonColor,
lineWidth: 3,
size: 70.0,
),
),
ActionButton(
image: buyImage,
title: S.of(context).buy,
onClick: walletViewModel.isRunningWebView
? null
: () async {
walletViewModel.isRunningWebView = true;
final url = await walletViewModel.getWyreUrl();
if (url.isNotEmpty) {
await Navigator.of(context)
.pushNamed(Routes.wyre, arguments: url);
final orderId = walletViewModel.ordersStore.orderId;
final orderId = walletViewModel.ordersStore.orderId;
if (orderId.isNotEmpty) {
await walletViewModel.saveOrder(orderId);
}
}
walletViewModel.isRunningWebView = false;
})),
if (orderId.isNotEmpty) {
await walletViewModel.saveOrder(orderId);
}
}
walletViewModel.isRunningWebView = false;
})
],
)),
],
)),
)
lib/src/screens/web_view/web_view_page.dart → lib/src/screens/wyre/wyre_page.dart
+14 -7
View File
@@ -1,12 +1,13 @@
import 'dart:io';
import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/palette.dart';
import 'package:cake_wallet/src/screens/base_page.dart';
import 'package:cake_wallet/store/dashboard/orders_store.dart';
import 'package:flutter/material.dart';
import 'package:webview_flutter/webview_flutter.dart';
class WebViewPage extends BasePage {
WebViewPage({@required this.ordersStore, @required this.url});
class WyrePage extends BasePage {
WyrePage({@required this.ordersStore, @required this.url});
final OrdersStore ordersStore;
final String url;
@@ -14,22 +15,28 @@ class WebViewPage extends BasePage {
@override
String get title => S.current.buy;
@override
Color get backgroundDarkColor => Colors.white;
@override
Color get titleColor => Palette.darkBlueCraiola;
@override
Widget body(BuildContext context) =>
WebViewPageBody(ordersStore: ordersStore,url: url);
WyrePageBody(ordersStore: ordersStore,url: url);
}
class WebViewPageBody extends StatefulWidget {
WebViewPageBody({this.ordersStore, this.url});
class WyrePageBody extends StatefulWidget {
WyrePageBody({this.ordersStore, this.url});
final OrdersStore ordersStore;
final String url;
@override
WebViewPageBodyState createState() => WebViewPageBodyState();
WyrePageBodyState createState() => WyrePageBodyState();
}
class WebViewPageBodyState extends State<WebViewPageBody> {
class WyrePageBodyState extends State<WyrePageBody> {
String orderId;
WebViewController _webViewController;
GlobalKey _webViewkey;