From abc81bc10ed3f50376dac93df7ec3e75a7eb2193 Mon Sep 17 00:00:00 2001 From: gabaldon Date: Tue, 1 Aug 2023 11:14:56 +0200 Subject: [PATCH 1/2] feat: remove wallet type label for hd wallets --- lib/constants.dart | 2 +- lib/widgets/layouts/dashboard_layout.dart | 5 +++-- lib/widgets/layouts/layout.dart | 4 +++- lib/widgets/select_wallet_box.dart | 2 +- lib/widgets/wallet_type_label.dart | 18 ++++++++++-------- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/lib/constants.dart b/lib/constants.dart index 97f408fd..6914b778 100644 --- a/lib/constants.dart +++ b/lib/constants.dart @@ -46,7 +46,7 @@ Map DEFAULT_MINER_FEE_OPTIONS = { }; Map walletTypeToLabel = { WalletType.hd: 'HD wallet', - WalletType.single: 'Single address', + WalletType.single: 'Node', }; Map xprvTypeToWalletType = { CreateWalletType.encryptedXprv: WalletType.hd, diff --git a/lib/widgets/layouts/dashboard_layout.dart b/lib/widgets/layouts/dashboard_layout.dart index 99bec973..3a1cce65 100644 --- a/lib/widgets/layouts/dashboard_layout.dart +++ b/lib/widgets/layouts/dashboard_layout.dart @@ -140,7 +140,7 @@ class DashboardLayoutState extends State ? _showCreateVTTDialog : () {}, icon: Container( - height: 38, + height: 40, child: Icon( FontAwesomeIcons.locationArrow, size: 18, @@ -177,7 +177,7 @@ class DashboardLayoutState extends State ? _showReceiveDialog : () {}, icon: Container( - height: 38, + height: 40, child: Transform.rotate( angle: 90 * math.pi / 90, child: Icon( @@ -264,6 +264,7 @@ class DashboardLayoutState extends State mainAxisAlignment: MainAxisAlignment.center, children: [ _buildBalanceDisplay(), + SizedBox(height: 8), _buildDashboardActions(), ], ); diff --git a/lib/widgets/layouts/layout.dart b/lib/widgets/layouts/layout.dart index f78fc065..a21b258f 100644 --- a/lib/widgets/layouts/layout.dart +++ b/lib/widgets/layouts/layout.dart @@ -290,7 +290,9 @@ class LayoutState extends State with TickerProviderStateMixin { style: TextStyle( color: extendedTheme.headerTextColor, fontSize: 16))), - SizedBox(height: 8), + SizedBox( + height: + wallet.walletType == WalletType.single ? 8 : 0), WalletTypeLabel(label: wallet.walletType), ], ))), diff --git a/lib/widgets/select_wallet_box.dart b/lib/widgets/select_wallet_box.dart index 0822870c..ca359353 100644 --- a/lib/widgets/select_wallet_box.dart +++ b/lib/widgets/select_wallet_box.dart @@ -90,7 +90,7 @@ class SelectWalletBox extends StatelessWidget { child: Column(crossAxisAlignment: CrossAxisAlignment.end, children: [ WalletTypeLabel(label: walletType), - SizedBox(height: 8), + SizedBox(height: walletType == WalletType.single ? 8 : 0), Text( '$balance ${WIT_UNIT[WitUnit.Wit]}', textAlign: TextAlign.end, diff --git a/lib/widgets/wallet_type_label.dart b/lib/widgets/wallet_type_label.dart index 66cbe955..249320d9 100644 --- a/lib/widgets/wallet_type_label.dart +++ b/lib/widgets/wallet_type_label.dart @@ -22,13 +22,15 @@ class WalletTypeLabel extends StatelessWidget { } Widget build(BuildContext context) { - return Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(4), - color: walletTypeToBgColor(context)[label]), - child: Padding( - padding: EdgeInsets.only(top: 2, bottom: 2, left: 4, right: 4), - child: Text(walletTypeToLabel[label]!, - style: TextStyle(color: WitnetPallet.white, fontSize: 10)))); + return label == WalletType.single + ? Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(4), + color: walletTypeToBgColor(context)[label]), + child: Padding( + padding: EdgeInsets.only(top: 2, bottom: 2, left: 4, right: 4), + child: Text(walletTypeToLabel[label]!, + style: TextStyle(color: WitnetPallet.white, fontSize: 10)))) + : Container(); } } From 7e06fdd20a2f76a36c0480a7ca2dacfdc5725676 Mon Sep 17 00:00:00 2001 From: gabaldon Date: Tue, 1 Aug 2023 13:25:42 +0200 Subject: [PATCH 2/2] feat: add select for selecting xprv origin --- lib/constants.dart | 17 +- lib/screens/create_wallet/enc_xprv_card.dart | 171 +++++++------------ lib/widgets/select.dart | 23 ++- 3 files changed, 94 insertions(+), 117 deletions(-) diff --git a/lib/constants.dart b/lib/constants.dart index 6914b778..d2f5be21 100644 --- a/lib/constants.dart +++ b/lib/constants.dart @@ -35,6 +35,8 @@ Map WIT_UNIT = { enum EstimatedFeeOptions { Stinky, Low, Medium, High, Opulent, Custom } +enum ImportOrigin { fromSheikah, fromMyWitWallet, fromNode } + // ignore: non_constant_identifier_names Map DEFAULT_MINER_FEE_OPTIONS = { EstimatedFeeOptions.Stinky: '0', @@ -48,14 +50,21 @@ Map walletTypeToLabel = { WalletType.hd: 'HD wallet', WalletType.single: 'Node', }; + +Map importOriginToLabel = { + ImportOrigin.fromMyWitWallet: 'myWitWallet', + ImportOrigin.fromSheikah: 'Sheikah', + ImportOrigin.fromNode: 'Node' +}; +Map importOriginToXprvType = { + ImportOrigin.fromMyWitWallet: CreateWalletType.encryptedXprv, + ImportOrigin.fromSheikah: CreateWalletType.encryptedXprv, + ImportOrigin.fromNode: CreateWalletType.xprv +}; Map xprvTypeToWalletType = { CreateWalletType.encryptedXprv: WalletType.hd, CreateWalletType.xprv: WalletType.single }; -Map walletTypeToXprvType = { - WalletType.hd: CreateWalletType.encryptedXprv, - WalletType.single: CreateWalletType.xprv -}; const int EXTERNAL_GAP_LIMIT = 3; const int INTERNAL_GAP_LIMIT = 3; const bool ENCRYPT_DB = false; diff --git a/lib/screens/create_wallet/enc_xprv_card.dart b/lib/screens/create_wallet/enc_xprv_card.dart index a35f81bd..5cbbf69c 100644 --- a/lib/screens/create_wallet/enc_xprv_card.dart +++ b/lib/screens/create_wallet/enc_xprv_card.dart @@ -6,11 +6,10 @@ import 'package:my_wit_wallet/screens/create_wallet/bloc/api_create_wallet.dart' import 'package:my_wit_wallet/screens/create_wallet/bloc/create_wallet_bloc.dart'; import 'package:my_wit_wallet/screens/create_wallet/create_wallet_screen.dart'; import 'package:my_wit_wallet/shared/locator.dart'; -import 'package:my_wit_wallet/theme/extended_theme.dart'; import 'package:my_wit_wallet/util/storage/database/wallet.dart'; import 'package:my_wit_wallet/widgets/input_login.dart'; import 'package:my_wit_wallet/screens/create_wallet/nav_action.dart'; -import 'package:my_wit_wallet/widgets/toggle_switch.dart'; +import 'package:my_wit_wallet/widgets/select.dart'; import 'package:my_wit_wallet/widgets/witnet/transactions/value_transfer/create_dialog_box/qr_scanner.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'dart:io' show Platform; @@ -53,7 +52,7 @@ class EnterXprvCardState extends State String? errorText; String? _errorXprvText; bool isScanQrFocused = false; - int _selectedIndex = 0; + String _selectedOrigin = ImportOrigin.fromMyWitWallet.name; CreateWalletType _xprvType = CreateWalletType.encryptedXprv; @override @@ -66,7 +65,6 @@ class EnterXprvCardState extends State _textFocusNode.requestFocus(); _xprvType = BlocProvider.of(context).state.createWalletType; - _selectedIndex = _xprvType == CreateWalletType.encryptedXprv ? 0 : 1; WidgetsBinding.instance .addPostFrameCallback((_) => widget.prevAction(prev)); WidgetsBinding.instance @@ -100,7 +98,7 @@ class EnterXprvCardState extends State }); } - Widget _buildConfirmField() { + Widget _buildXprvInput() { final theme = Theme.of(context); return TextField( decoration: InputDecoration( @@ -209,7 +207,6 @@ class EnterXprvCardState extends State setState(() => isXprvValid = false); } } catch (e) { - print(e); setState(() => isXprvValid = false); } } @@ -275,112 +272,74 @@ class EnterXprvCardState extends State return Column(children: _children); } + ImportOrigin labelToWalletOrigin(String origin) { + return ImportOrigin.values.firstWhere((e) { + return e.name == origin; + }); + } + @override Widget build(BuildContext context) { final theme = Theme.of(context); - final extendedTheme = theme.extension()!; CreateWalletType type = BlocProvider.of(context).state.createWalletType; - return Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'Import wallet from an Xprv key', - style: theme.textTheme.titleLarge, //Textstyle - ), - SizedBox( - height: 16, - ), - Text( - 'Xprv is a key exchange format that encodes and protects your wallet with a password. Xprv keys look like a long sequence of apparently random letters and numbers, preceded by "xprv".', - style: theme.textTheme.bodyLarge, //Textstyle - ), - SizedBox(height: 8), - Text( - 'To import your wallet from a node master key, you need to type the key itself and click continue.', - style: theme.textTheme.bodyLarge, //Textstyle - ), - SizedBox(height: 8), - Text( - 'To import your wallet from an Xprv key encrypted with a password, you need to type the key itself and its password below:', - style: theme.textTheme.bodyLarge, //Textstyle - ), - SizedBox( - height: 16, - ), - _buildConfirmField(), - SizedBox( - height: 16, - ), - type == CreateWalletType.encryptedXprv - ? _buildPasswordField() - : SizedBox( - height: 0, - ), - SizedBox( - height: type == CreateWalletType.encryptedXprv ? 16 : 0, - ), - Row( - mainAxisAlignment: MainAxisAlignment.end, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: EdgeInsets.only(right: 8), - child: Tooltip( - margin: EdgeInsets.all(8), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(8), - color: extendedTheme.tooltipBgColor, - ), - height: 100, - richMessage: TextSpan( - text: '\'HD Wallet\' ', - style: theme.textTheme.bodyMedium! - .copyWith(fontWeight: FontWeight.bold), - children: [ - TextSpan( - text: - '(recommended) is the standard BIP-32 compliant wallet.\nSelect ', - style: theme.textTheme.bodyMedium), - TextSpan( - text: '\'Single address\' ', - style: theme.textTheme.bodyMedium! - .copyWith(fontWeight: FontWeight.bold), - ), - TextSpan( - text: 'wallet to import a node address.', - style: theme.textTheme.bodyMedium), - ], - ), - child: MouseRegion( - cursor: SystemMouseCursors.click, - child: Icon(FontAwesomeIcons.circleQuestion, - size: 12, color: extendedTheme.inputIconColor))), - ), - ToggleSwitch( - minWidth: 120.0, - inactiveBgColor: extendedTheme.switchInactiveBg, - initialLabelIndex: _selectedIndex, - activeFgColor: extendedTheme.switchActiveFg, - inactiveFgColor: extendedTheme.switchInactiveFg, - activeBgColor: [extendedTheme.switchActiveBg!], - cornerRadius: 4, - borderWidth: 1.0, - borderColor: [extendedTheme.switchBorderColor!], - totalSwitches: 2, - labels: - walletTypeToLabel.values.map((label) => label).toList(), - onToggle: (index) { - WalletType selectedKeyLabel = walletTypeToLabel.keys - .map((label) => label) - .toList()[index]; + return Column(crossAxisAlignment: CrossAxisAlignment.start, children: < + Widget>[ + Text( + 'Import wallet from an Xprv key', + style: theme.textTheme.titleLarge, //Textstyle + ), + SizedBox( + height: 16, + ), + Text( + 'Xprv is a key exchange format that encodes and protects your wallet with a password. Xprv keys look like a long sequence of apparently random letters and numbers, preceded by "xprv".', + style: theme.textTheme.bodyLarge, //Textstyle + ), + SizedBox(height: 8), + Text( + 'To import your wallet from an Xprv key encrypted with a password, you need to type the key itself and its password below:', + style: theme.textTheme.bodyLarge, //Textstyle + ), + SizedBox( + height: 16, + ), + Text( + 'Xprv origin', + style: theme.textTheme.titleSmall, + ), + SizedBox(height: 8), + Select( + selectedItem: _selectedOrigin, + listItems: importOriginToXprvType.keys + .map((label) => + SelectItem(label.name, importOriginToLabel[label] ?? '')) + .toList(), + onChanged: (String? label) => { + if (label != null) + { setState(() { - _selectedIndex = index; - }); - _setXprvType(walletTypeToXprvType[selectedKeyLabel]!); + _selectedOrigin = label; + }), + _setXprvType( + importOriginToXprvType[labelToWalletOrigin(label)]!), }, - ) - ]), - ]); + }), + SizedBox( + height: 16, + ), + _buildXprvInput(), + SizedBox( + height: 16, + ), + type == CreateWalletType.encryptedXprv + ? _buildPasswordField() + : SizedBox( + height: 0, + ), + SizedBox( + height: type == CreateWalletType.encryptedXprv ? 16 : 0, + ), + ]); } } diff --git a/lib/widgets/select.dart b/lib/widgets/select.dart index 7c91c9b6..12953bc6 100644 --- a/lib/widgets/select.dart +++ b/lib/widgets/select.dart @@ -1,18 +1,25 @@ import 'package:flutter/material.dart'; import 'package:my_wit_wallet/theme/extended_theme.dart'; -DropdownMenuItem _buildWalletDropdownItem(String value) { +DropdownMenuItem _buildWalletDropdownItem(SelectItem value) { return DropdownMenuItem( - value: value, - child: Text(value), + value: value.key, + child: Text(value.label), ); } typedef void StringCallback(String? value); +class SelectItem { + final String key; + final String label; + + SelectItem(this.key, this.label); +} + class Select extends StatelessWidget { final String selectedItem; - final List listItems; + final List listItems; final StringCallback onChanged; const Select({ @@ -37,11 +44,12 @@ class Select extends StatelessWidget { iconEnabledColor: theme.selectedTextColor, style: TextStyle(color: theme.dropdownTextColor, fontSize: 16), selectedItemBuilder: (BuildContext context) { - return listItems.map((String item) { + return listItems.map((SelectItem item) { return Container( + padding: EdgeInsets.all(8), alignment: Alignment.centerLeft, child: Text( - item, + item.label, style: TextStyle( color: theme.selectedTextColor, fontWeight: FontWeight.normal), @@ -53,7 +61,8 @@ class Select extends StatelessWidget { borderRadius: BorderRadius.circular(4), isExpanded: true, items: listItems - .map>(_buildWalletDropdownItem) + .map>( + (SelectItem item) => _buildWalletDropdownItem(item)) .toList(), onChanged: onChanged), ),