Merge pull request #67 from cake-tech/CWA-220-bug-fix-3

Cwa 220 bug fix 3

lib/src/screens/auth/auth_page.dart

@@ -8,6 +8,8 @@ import 'package:cake_wallet/src/stores/auth/auth_store.dart';
 import 'package:cake_wallet/src/screens/pin_code/pin_code.dart';
 import 'package:cake_wallet/src/stores/settings/settings_store.dart';
 import 'package:cake_wallet/src/domain/common/biometric_auth.dart';
+import 'package:cake_wallet/themes.dart';
+import 'package:cake_wallet/theme_changer.dart';
 
 typedef OnAuthenticationFinished = void Function(bool, AuthPageState);
 
@@ -26,6 +28,7 @@ class AuthPageState extends State<AuthPage> {
   final _pinCodeKey = GlobalKey<PinCodeState>();
   final _backArrowImageDarkTheme =
   Image.asset('assets/images/back_arrow_dark_theme.png');
+  final _backArrowImage = Image.asset('assets/images/back_arrow.png');
 
   void changeProcessText(String text) {
     _key.currentState.showSnackBar(
@@ -39,6 +42,10 @@ class AuthPageState extends State<AuthPage> {
     final authStore = Provider.of<AuthStore>(context);
     final settingsStore = Provider.of<SettingsStore>(context);
 
+    final _themeChanger = Provider.of<ThemeChanger>(context);
+    final _backButton = _themeChanger.getTheme() == Themes.darkTheme
+    ? _backArrowImageDarkTheme : _backArrowImage;
+
     if (settingsStore.allowBiometricalAuthentication) {
       WidgetsBinding.instance.addPostFrameCallback((_) {
         final biometricAuth = BiometricAuth();
@@ -134,7 +141,7 @@ class AuthPageState extends State<AuthPage> {
                   splashColor: Colors.transparent,
                   padding: EdgeInsets.all(0),
                   onPressed: () => Navigator.of(context).pop(),
-                  child: _backArrowImageDarkTheme),
+                  child: _backButton),
             ),
           )
           : Container(),
@@ -146,6 +153,7 @@ class AuthPageState extends State<AuthPage> {
             (pin, _) => authStore.auth(
                 password: pin.fold('', (ac, val) => ac + '$val')),
             false,
-            _pinCodeKey));
+            _pinCodeKey,
+            authStore: authStore,));
   }
 }

lib/src/screens/dashboard/dashboard_page.dart

@@ -28,6 +28,7 @@ class DashboardPageBodyState extends State<DashboardPageBody> {
 
     return SafeArea(
       child: Scaffold(
+        endDrawer: MenuWidget(),
         body: Container(
           decoration: BoxDecoration(
               gradient: LinearGradient(
@@ -49,17 +50,16 @@ class DashboardPageBodyState extends State<DashboardPageBody> {
                   width: 44,
                   child: ButtonTheme(
                     minWidth: double.minPositive,
-                    child: FlatButton(
+                    child: Builder(
+                      builder: (context) {
+                        return FlatButton(
                             highlightColor: Colors.transparent,
                             splashColor: Colors.transparent,
                             padding: EdgeInsets.all(0),
-                        onPressed: () async {
+                            onPressed: () => Scaffold.of(context).openEndDrawer(),
-                          await showDialog<void>(
+                            child: menuButton);
-                              builder: (_) => MenuWidget(),
+                      }
-                              context: context
+                    ),
-                          );
-                        },
-                        child: menuButton),
                   ),
                 ),
               ),

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

@@ -1,7 +1,5 @@
-import 'dart:async';
 import 'dart:ui';
 import 'package:flutter/material.dart';
-import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/screens/dashboard/wallet_menu.dart';
 import 'package:cake_wallet/src/stores/wallet/wallet_store.dart';
 import 'package:provider/provider.dart';
@@ -19,7 +17,6 @@ class MenuWidgetState extends State<MenuWidget> {
   double screenWidth;
   double screenHeight;
   double opacity;
-  bool isDraw;
 
   double headerHeight;
   double tileHeight;
@@ -32,7 +29,6 @@ class MenuWidgetState extends State<MenuWidget> {
     screenWidth = 0;
     screenHeight = 0;
     opacity = 0;
-    isDraw = false;
 
     headerHeight = 120;
     tileHeight = 75;
@@ -59,10 +55,6 @@ class MenuWidgetState extends State<MenuWidget> {
         fromBottomEdge *= scale;
       }
     });
-
-    Timer(Duration(milliseconds: 350), () =>
-        setState(() => isDraw = true)
-    );
   }
 
   @override
@@ -71,54 +63,39 @@ class MenuWidgetState extends State<MenuWidget> {
     final walletStore = Provider.of<WalletStore>(context);
     final itemCount = walletMenu.items.length;
 
-    return GestureDetector(
+    return Row(
-      onTap: () => Navigator.of(context).pop(),
-      child: Container(
-        color: Colors.transparent,
-        child: BackdropFilter(
-          filter: ImageFilter.blur(sigmaX: 3.0, sigmaY: 3.0),
-          child: Container(
-            decoration: BoxDecoration(color: PaletteDark.darkNightBlue.withOpacity(0.75)),
-            child: Row(
       mainAxisSize: MainAxisSize.max,
       crossAxisAlignment: CrossAxisAlignment.center,
       children: <Widget>[
         Padding(
           padding: EdgeInsets.only(left: 24),
-                  child: isDraw
+          child: Container(
-                    ? Container(
             height: 60,
             width: 4,
             decoration: BoxDecoration(
               borderRadius: BorderRadius.all(Radius.circular(2)),
-                        color: Theme.of(context).hintColor //
+              color: Theme.of(context).hintColor
             ),
           )
-                  : Container(
-                    height: 60,
-                    width: 4,
-                  )
         ),
         SizedBox(width: 12),
         Expanded(
             child: GestureDetector(
               onTap: () => null,
               child: Container(
-                      width: double.infinity,
-                      height: double.infinity,
-                      alignment: Alignment.centerRight,
-                      child: AnimatedContainer(
-                          alignment: Alignment.centerLeft,
                 width: menuWidth,
                 height: double.infinity,
-                          duration: Duration(milliseconds: 500),
-                          curve: Curves.fastOutSlowIn,
                 decoration: BoxDecoration(
-                              borderRadius: BorderRadius.only(topLeft: Radius.circular(24), bottomLeft: Radius.circular(24)),
+                  borderRadius: BorderRadius.only(
-                              color: Theme.of(context).primaryTextTheme.display1.color.withOpacity(opacity)
+                      topLeft: Radius.circular(24),
-                          ),
+                      bottomLeft: Radius.circular(24)),
-                          child: isDraw
+                  color: Theme.of(context).primaryTextTheme.display1.color
-                              ? ListView.separated(
+                ),
+                child: ClipRRect(
+                  borderRadius: BorderRadius.only(
+                      topLeft: Radius.circular(24),
+                      bottomLeft: Radius.circular(24)),
+                  child: ListView.separated(
                       itemBuilder: (_, index) {
 
                         if (index == 0) {
@@ -248,17 +225,12 @@ class MenuWidgetState extends State<MenuWidget> {
                             height: 1,
                             color: Theme.of(context).dividerColor,
                           ),
-                              itemCount: itemCount + 1)
+                      itemCount: itemCount + 1),
-                              : Offstage()
                 ),
               ),
             )
         )
       ],
-            )
-          ),
-        ),
-      ),
     );
   }
 }

lib/src/screens/nodes/nodes_list_page.dart

@@ -77,8 +77,6 @@ class NodeListPageBodyState extends State<NodeListPageBody> {
     final nodeList = Provider.of<NodeListStore>(context);
     final settings = Provider.of<SettingsStore>(context);
 
-    final trashImage = Image.asset('assets/images/trash.png', height: 32, width: 32, color: Colors.white);
-
     final currentColor = Theme.of(context).accentTextTheme.subtitle.decorationColor;
     final notCurrentColor = Theme.of(context).accentTextTheme.title.backgroundColor;
 
@@ -194,12 +192,16 @@ class NodeListPageBodyState extends State<NodeListPageBody> {
                               await nodeList.remove(node: node),
                               direction: DismissDirection.endToStart,
                               background: Container(
-                                  padding: EdgeInsets.only(right: 10.0, top: 2),
+                                  padding: EdgeInsets.only(right: 10.0),
                                   alignment: AlignmentDirectional.centerEnd,
                                   color: Palette.red,
                                   child: Column(
+                                    mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                                     children: <Widget>[
-                                      trashImage,
+                                      const Icon(
+                                        CupertinoIcons.delete,
+                                        color: Colors.white,
+                                      ),
                                       Text(
                                         S.of(context).delete,
                                         style: TextStyle(color: Colors.white),

lib/src/screens/pin_code/pin_code.dart

@@ -3,6 +3,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:cake_wallet/src/stores/settings/settings_store.dart';
 import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/src/stores/auth/auth_store.dart';
+import 'package:cake_wallet/src/domain/common/biometric_auth.dart';
 
 abstract class PinCodeWidget extends StatefulWidget {
   PinCodeWidget({Key key, this.onPinCodeEntered, this.hasLengthSwitcher})
@@ -14,21 +16,26 @@ abstract class PinCodeWidget extends StatefulWidget {
 
 class PinCode extends PinCodeWidget {
   PinCode(Function(List<int> pin, PinCodeState state) onPinCodeEntered,
-      bool hasLengthSwitcher, Key key)
+      bool hasLengthSwitcher, Key key, {this.authStore})
       : super(
             key: key,
             onPinCodeEntered: onPinCodeEntered,
             hasLengthSwitcher: hasLengthSwitcher);
 
+  final AuthStore authStore;
+
   @override
-  PinCodeState createState() => PinCodeState();
+  PinCodeState createState() => PinCodeState(authStore: authStore);
 }
 
 class PinCodeState<T extends PinCodeWidget> extends State<T> {
+  PinCodeState({this.authStore});
   static const defaultPinLength = 4;
   static const sixPinLength = 6;
   static const fourPinLength = 4;
   final _gridViewKey = GlobalKey();
+  final AuthStore authStore;
+  final _key = GlobalKey<ScaffoldState>();
 
   int pinLength = defaultPinLength;
   List<int> pin = List<int>.filled(defaultPinLength, null);
@@ -83,9 +90,11 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
   }
 
   @override
-  Widget build(BuildContext context) => Scaffold(body: body(context));
+  Widget build(BuildContext context) => Scaffold(key: _key, body: body(context));
 
   Widget body(BuildContext context) {
+    final settingsStore = Provider.of<SettingsStore>(context);
+
     final deleteIconImage = Image.asset(
       'assets/images/delete_icon.png',
       color: Theme.of(context).primaryTextTheme.title.color,
@@ -161,10 +170,35 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
                               margin: EdgeInsets.only(
                                   left: marginLeft, right: marginRight),
                               child: FlatButton(
-                                onPressed: () {},
+                                onPressed: (widget.hasLengthSwitcher ||
+                                    !settingsStore.allowBiometricalAuthentication)
+                                    ? null
+                                    : () {
+                                        if (authStore != null) {
+                                          WidgetsBinding.instance.addPostFrameCallback((_) {
+                                            final biometricAuth = BiometricAuth();
+                                            biometricAuth.isAuthenticated().then(
+                                                    (isAuth) {
+                                                  if (isAuth) {
+                                                    authStore.biometricAuth();
+                                                    _key.currentState.showSnackBar(
+                                                      SnackBar(
+                                                        content: Text(S.of(context).authenticated),
+                                                        backgroundColor: Colors.green,
+                                                      ),
+                                                    );
+                                                  }
+                                                }
+                                            );
+                                          });
+                                        }
+                                      },
                                 color: Theme.of(context).backgroundColor,
                                 shape: CircleBorder(),
-                                child: faceImage,
+                                child: (widget.hasLengthSwitcher ||
+                                    !settingsStore.allowBiometricalAuthentication)
+                                    ? Offstage()
+                                    : faceImage,
                               ),
                             );
                           } else if (index == 10) {

lib/src/screens/receive/receive_page.dart

@@ -245,7 +245,10 @@ class ReceivePageState extends State<ReceivePage> {
                         ),
                       ),
                       Observer(
-                          builder: (_) => ListView.separated(
+                          builder: (_) {
+                            subaddressListStore.updateShortAddressShow();
+
+                            return ListView.separated(
                                 separatorBuilder: (context, index) => Divider(
                                   height: 1,
                                   color: Theme.of(context).dividerColor,
@@ -301,12 +304,24 @@ class ReceivePageState extends State<ReceivePage> {
                                         final isCurrent =
                                             walletStore.subaddress.address == subaddress.address;
 
-                                      final label = subaddress.label.isNotEmpty
+                                        final content = Observer(
+                                            builder: (_) {
+                                              final isShortAddressShow = subaddressListStore.isShortAddressShow[index];
+
+                                              final label = index == 0
+                                                  ? 'Primary subaddress'
+                                                  : subaddress.label.isNotEmpty
                                                     ? subaddress.label
                                                     : subaddress.address;
 
-                                      final content = InkWell(
+                                              return InkWell(
                                                 onTap: () => walletStore.setSubaddress(subaddress),
+                                                onLongPress: () {
+                                                  if (subaddress.label.isNotEmpty) {
+                                                    return;
+                                                  }
+                                                  subaddressListStore.setShortAddressShow(index, !isShortAddressShow);
+                                                },
                                                 child: Container(
                                                   color: isCurrent ? currentColor : notCurrentColor,
                                                   padding: EdgeInsets.only(
@@ -317,9 +332,10 @@ class ReceivePageState extends State<ReceivePage> {
                                                   ),
                                                   child: Text(
                                                     label,
+                                                    maxLines: isShortAddressShow ? 1 : 10,
+                                                    overflow: TextOverflow.ellipsis,
                                                     style: TextStyle(
-                                              fontSize: subaddress.label.isNotEmpty
+                                                      fontSize: 18,
-                                                  ? 18 : 10,
                                                       fontWeight: FontWeight.bold,
                                                       color: isCurrent
                                                           ? currentTextColor
@@ -328,8 +344,10 @@ class ReceivePageState extends State<ReceivePage> {
                                                   ),
                                                 ),
                                               );
+                                            }
+                                        );
 
-                                      return isCurrent
+                                        return isCurrent || index == 0
                                             ? content
                                             : Slidable(
                                             key: Key(subaddress.address),
@@ -348,7 +366,8 @@ class ReceivePageState extends State<ReceivePage> {
                                       }
                                   );
                                 }
-                          )
+                            );
+                          }
                       ),
                     ],
                   ),

lib/src/stores/exchange/exchange_store.dart

@@ -33,10 +33,8 @@ abstract class ExchangeStoreBase with Store {
     provider = initialProvider;
     depositCurrency = initialDepositCurrency;
     receiveCurrency = initialReceiveCurrency;
-    /*isDepositAddressEnabled = !(depositCurrency == walletStore.type);
+    isDepositAddressEnabled = !(depositCurrency == walletStore.type);
-    isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);*/
+    isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);
-    isDepositAddressEnabled = true;
-    isReceiveAddressEnabled = true;
     depositAmount = '';
     receiveAmount = '';
     depositAddress = '';
@@ -109,16 +107,16 @@ abstract class ExchangeStoreBase with Store {
   void changeDepositCurrency({CryptoCurrency currency}) {
     depositCurrency = currency;
     _onPairChange();
-    /*isDepositAddressEnabled = !(depositCurrency == walletStore.type);
+    isDepositAddressEnabled = !(depositCurrency == walletStore.type);
-    isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);*/
+    isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);
   }
 
   @action
   void changeReceiveCurrency({CryptoCurrency currency}) {
     receiveCurrency = currency;
     _onPairChange();
-    /*isDepositAddressEnabled = !(depositCurrency == walletStore.type);
+    isDepositAddressEnabled = !(depositCurrency == walletStore.type);
-    isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);*/
+    isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);
   }
 
   @action
@@ -242,8 +240,8 @@ abstract class ExchangeStoreBase with Store {
     receiveCurrency = CryptoCurrency.btc;
     depositAddress = depositCurrency == walletStore.type ? walletStore.address : '';
     receiveAddress = receiveCurrency == walletStore.type ? walletStore.address : '';
-    /*isDepositAddressEnabled = !(depositCurrency == walletStore.type);
+    isDepositAddressEnabled = !(depositCurrency == walletStore.type);
-    isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);*/
+    isReceiveAddressEnabled = !(receiveCurrency == walletStore.type);
     _onPairChange();
   }
 

lib/src/stores/subaddress_list/subaddress_list_store.dart

@@ -15,6 +15,7 @@ class SubaddressListStore = SubaddressListStoreBase with _$SubaddressListStore;
 abstract class SubaddressListStoreBase with Store {
   SubaddressListStoreBase({@required WalletService walletService}) {
     subaddresses = ObservableList<Subaddress>();
+    isShortAddressShow = ObservableList<bool>();
 
     if (walletService.currentWallet != null) {
       _onWalletChanged(walletService.currentWallet);
@@ -27,12 +28,20 @@ abstract class SubaddressListStoreBase with Store {
   @observable
   ObservableList<Subaddress> subaddresses;
 
+  @observable
+  ObservableList<bool> isShortAddressShow;
+
   SubaddressList _subaddressList;
   StreamSubscription<Wallet> _onWalletChangeSubscription;
   StreamSubscription<List<Subaddress>> _onSubaddressesChangeSubscription;
   StreamSubscription<Account> _onAccountChangeSubscription;
   Account _account;
 
+  @action
+  void setShortAddressShow(int index, bool isShow) {
+    isShortAddressShow[index] = isShow;
+  }
+
   @override
   void dispose() {
     if (_onSubaddressesChangeSubscription != null) {
@@ -47,6 +56,10 @@ abstract class SubaddressListStoreBase with Store {
     super.dispose();
   }
 
+  void updateShortAddressShow() {
+    isShortAddressShow = ObservableList.of(List.generate(subaddresses.length, (i) => true));
+  }
+
   Future<void> _updateSubaddressList({int accountIndex}) async {
     await _subaddressList.refresh(accountIndex: accountIndex);
     subaddresses = ObservableList.of(_subaddressList.getAll());