CAKE-306 | applied buy_webview_page.dart to the app; fixed order_details_view_model.dart and order_row.dart; applied localization to the pre_order_page.dart; deleted unused files

lib/src/screens/buy/buy_webview_page.dart

@@ -0,0 +1,108 @@
+import 'dart:async';
+import 'dart:io';
+import 'package:cake_wallet/buy/buy_provider.dart';
+import 'package:cake_wallet/buy/moonpay/moonpay_buy_provider.dart';
+import 'package:cake_wallet/buy/wyre/wyre_buy_provider.dart';
+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:cake_wallet/view_model/buy/buy_view_model.dart';
+import 'package:flutter/material.dart';
+import 'package:webview_flutter/webview_flutter.dart';
+
+class BuyWebViewPage extends BasePage {
+  BuyWebViewPage(this.buyViewModel,
+      {@required this.ordersStore, @required this.url});
+
+  final OrdersStore ordersStore;
+  final String url;
+  final BuyViewModel buyViewModel;
+
+  @override
+  String get title => S.current.buy;
+
+  @override
+  Color get backgroundDarkColor => Colors.white;
+
+  @override
+  Color get titleColor => Palette.darkBlueCraiola;
+
+  @override
+  Widget body(BuildContext context) =>
+      BuyWebViewPageBody(buyViewModel, ordersStore: ordersStore, url: url);
+}
+
+class BuyWebViewPageBody extends StatefulWidget {
+  BuyWebViewPageBody(this.buyViewModel, {this.ordersStore, this.url});
+
+  final OrdersStore ordersStore;
+  final String url;
+  final BuyViewModel buyViewModel;
+
+  @override
+  BuyWebViewPageBodyState createState() => BuyWebViewPageBodyState();
+}
+
+class BuyWebViewPageBodyState extends State<BuyWebViewPageBody> {
+  String orderId;
+  WebViewController _webViewController;
+  GlobalKey _webViewkey;
+  Timer _timer;
+  bool _isSaving;
+  BuyProvider _provider;
+
+  @override
+  void initState() {
+    super.initState();
+    _webViewkey = GlobalKey();
+    _isSaving = false;
+    widget.ordersStore.orderId = '';
+    _provider = widget.buyViewModel.selectedProvider;
+
+    if (Platform.isAndroid) WebView.platform = SurfaceAndroidWebView();
+
+    if (_provider is WyreBuyProvider) {
+      _timer?.cancel();
+      _timer = Timer.periodic(Duration(seconds: 1), (timer) async {
+
+        try {
+          if (_webViewController == null || _isSaving) {
+            return;
+          }
+
+          final url = await _webViewController.currentUrl();
+
+          if (url.contains('completed')) {
+            final urlParts = url.split('/');
+            orderId = urlParts.last;
+            widget.ordersStore.orderId = orderId;
+
+            if (orderId.isNotEmpty) {
+              _isSaving = true;
+              await widget.buyViewModel.saveOrder(orderId);
+              timer.cancel();
+            }
+          }
+        } catch (e) {
+          _isSaving = false;
+          print(e);
+        }
+      });
+    }
+
+    if (_provider is MoonPayBuyProvider) {
+      // FIXME: fetch orderId
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return WebView(
+        key: _webViewkey,
+        initialUrl: widget.url,
+        javascriptMode: JavascriptMode.unrestricted,
+        onWebViewCreated: (WebViewController controller) =>
+            setState(() => _webViewController = controller));
+  }
+}

lib/src/screens/buy/pre_order_page.dart

@@ -14,6 +14,7 @@ import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
+import 'package:mobx/mobx.dart';
 
 class PreOrderPage extends BasePage {
   PreOrderPage({@required this.buyViewModel})
@@ -31,14 +32,22 @@ class PreOrderPage extends BasePage {
         buyViewModel.selectedProvider = null;
       }
     });
+
+    reaction((_) => buyViewModel.buyAmountViewModel.amount, (String amount) {
+      if (_amountController.text != amount) {
+        _amountController.text = amount;
+      }
+    });
   }
 
+  static const _amountPattern = '^([0-9]+([.\,][0-9]{0,2})?|[.\,][0-9]{1,2})\$';
+
   final BuyViewModel buyViewModel;
   final FocusNode _amountFocus;
   final TextEditingController _amountController;
 
   @override
-  String get title => 'Buy Bitcoin';
+  String get title => S.current.buy_bitcoin;
 
   @override
   Color get titleColor => Colors.white;
@@ -96,7 +105,7 @@ class PreOrderPage extends BasePage {
                             signed: false, decimal: true),
                         inputFormatters: [
                           FilteringTextInputFormatter
-                            .allow(RegExp('^([0-9]+([.\,][0-9]{0,2})?|[.\,][0-9]{1,2})\$'))
+                            .allow(RegExp(_amountPattern))
                         ],
                         prefixIcon: Padding(
                           padding: EdgeInsets.only(top: 2),
@@ -130,7 +139,7 @@ class PreOrderPage extends BasePage {
                 Padding(
                   padding: EdgeInsets.only(top: 38, bottom: 18),
                   child: Text(
-                    'Buy with:',
+                    S.of(context).buy_with + ':',
                     textAlign: TextAlign.center,
                     style: TextStyle(
                         color: Theme.of(context).primaryTextTheme.title.color,
@@ -185,16 +194,21 @@ class PreOrderPage extends BasePage {
                 return LoadingPrimaryButton(
                     onPressed: buyViewModel.isRunning
                     ? null
-                    :  () {
+                    :  () async {
                       buyViewModel.isRunning = true;
-
-                      // FIXME: Start WebView
-
+                      final url =
+                        await buyViewModel.fetchUrl();
+                      if (url.isNotEmpty) {
+                        await Navigator.of(context)
+                            .pushNamed(Routes.buyWebView, arguments: url);
+                        buyViewModel.reset();
+                      }
                       buyViewModel.isRunning = false;
                     },
                     text: buyViewModel.selectedProvider == null
-                          ? 'Buy'
-                          : 'Buy with ${buyViewModel.selectedProvider
+                          ? S.of(context).buy
+                          : S.of(context).buy_with +
+                            ' ${buyViewModel.selectedProvider
                              .description.title}',
                     color: Theme.of(context).accentTextTheme.body2.color,
                     textColor: Colors.white,

lib/src/screens/buy/widgets/buy_list_item.dart

@@ -1,5 +1,5 @@
-import 'package:cake_wallet/buy/buy_provider_description.dart';
 import 'package:cake_wallet/buy/buy_provider.dart';
+import 'package:cake_wallet/buy/get_buy_provider_icon.dart';
 import 'package:cake_wallet/entities/crypto_currency.dart';
 import 'package:cake_wallet/entities/fiat_currency.dart';
 import 'package:cake_wallet/palette.dart';
@@ -16,11 +16,6 @@ class BuyListItem extends StatelessWidget {
     @required this.onTap
   });
 
-  final _wyreIcon =
-    Image.asset('assets/images/wyre-icon.png', width: 36, height: 36);
-  final _mooonPayIcon =
-    Image.asset('assets/images/wyre-icon.png', width: 36, height: 36);
-
   final BuyProvider selectedProvider;
   final BuyProvider provider;
   final double sourceAmount;
@@ -31,7 +26,7 @@ class BuyListItem extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final providerIcon = _getProviderIcon(provider.description);
+    final providerIcon = getBuyProviderIcon(provider.description);
 
     final backgroundColor = selectedProvider != null
         ? selectedProvider.description == provider.description
@@ -116,16 +111,4 @@ class BuyListItem extends StatelessWidget {
       )
     );
   }
-
-  Image _getProviderIcon(BuyProviderDescription providerDescription) {
-    switch (providerDescription) {
-      case BuyProviderDescription.wyre:
-        return _wyreIcon;
-      case BuyProviderDescription.moonPay:
-        //return _mooonPayIcon;
-        return null;
-      default:
-        return null;
-    }
-  }
 }

lib/src/screens/dashboard/widgets/order_row.dart

@@ -1,22 +1,26 @@
+import 'package:cake_wallet/buy/buy_provider_description.dart';
+import 'package:cake_wallet/buy/get_buy_provider_icon.dart';
 import 'package:flutter/material.dart';
 
 class OrderRow extends StatelessWidget {
   OrderRow({
     @required this.onTap,
+    @required this.provider,
     this.from,
     this.to,
     this.createdAtFormattedDate,
     this.formattedAmount});
   final VoidCallback onTap;
+  final BuyProviderDescription provider;
   final String from;
   final String to;
   final String createdAtFormattedDate;
   final String formattedAmount;
-  final wyreImage =
-      Image.asset('assets/images/wyre-icon.png', width: 36, height: 36);
 
   @override
   Widget build(BuildContext context) {
+    final providerIcon = getBuyProviderIcon(provider);
+
     return InkWell(
         onTap: onTap,
         child: Container(
@@ -26,7 +30,7 @@ class OrderRow extends StatelessWidget {
             mainAxisSize: MainAxisSize.max,
             crossAxisAlignment: CrossAxisAlignment.center,
             children: [
-              wyreImage,
+              providerIcon ?? Offstage(),
               SizedBox(width: 12),
               Expanded(
                   child: Column(

lib/src/screens/dashboard/widgets/transactions_page.dart

@@ -84,6 +84,7 @@ class TransactionsPage extends StatelessWidget {
                             onTap: () => Navigator.of(context).pushNamed(
                                 Routes.orderDetails,
                                 arguments: order),
+                            provider: order.provider,
                             from: order.from,
                             to: order.to,
                             createdAtFormattedDate:

lib/src/screens/wyre/wyre_page.dart

@@ -1,97 +0,0 @@
-import 'dart:async';
-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:cake_wallet/view_model/wyre_view_model.dart';
-import 'package:flutter/material.dart';
-import 'package:webview_flutter/webview_flutter.dart';
-
-class WyrePage extends BasePage {
-  WyrePage(this.wyreViewModel,
-      {@required this.ordersStore, @required this.url});
-
-  final OrdersStore ordersStore;
-  final String url;
-  final WyreViewModel wyreViewModel;
-
-  @override
-  String get title => S.current.buy;
-
-  @override
-  Color get backgroundDarkColor => Colors.white;
-
-  @override
-  Color get titleColor => Palette.darkBlueCraiola;
-
-  @override
-  Widget body(BuildContext context) =>
-      WyrePageBody(wyreViewModel, ordersStore: ordersStore, url: url);
-}
-
-class WyrePageBody extends StatefulWidget {
-  WyrePageBody(this.wyreViewModel, {this.ordersStore, this.url});
-
-  final OrdersStore ordersStore;
-  final String url;
-  final WyreViewModel wyreViewModel;
-
-  @override
-  WyrePageBodyState createState() => WyrePageBodyState();
-}
-
-class WyrePageBodyState extends State<WyrePageBody> {
-  String orderId;
-  WebViewController _webViewController;
-  GlobalKey _webViewkey;
-  Timer _timer;
-  bool _isSaving;
-
-  @override
-  void initState() {
-    super.initState();
-    _webViewkey = GlobalKey();
-    _isSaving = false;
-    widget.ordersStore.orderId = '';
-
-    if (Platform.isAndroid) WebView.platform = SurfaceAndroidWebView();
-
-    _timer?.cancel();
-    _timer = Timer.periodic(Duration(seconds: 1), (timer) async {
-
-      try {
-        if (_webViewController == null || _isSaving) {
-          return;
-        }
-
-        final url = await _webViewController.currentUrl();
-
-        if (url.contains('completed')) {
-          final urlParts = url.split('/');
-          orderId = urlParts.last;
-          widget.ordersStore.orderId = orderId;
-
-          if (orderId.isNotEmpty) {
-            _isSaving = true;
-            await widget.wyreViewModel.saveOrder(orderId);
-            timer.cancel();
-          }
-        }
-      } catch (e) {
-        _isSaving = false;
-        print(e);
-      }
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return WebView(
-        key: _webViewkey,
-        initialUrl: widget.url,
-        javascriptMode: JavascriptMode.unrestricted,
-        onWebViewCreated: (WebViewController controller) =>
-            setState(() => _webViewController = controller));
-  }
-}