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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
M
2022-01-24 17:27:46 +02:00
parent db753241a5 712a5cfa43
commit 4664907d28
21 changed files with 3642 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/screens/new_wallet/new_wallet_page.dart
+65 -33
View File
@@ -1,3 +1,4 @@
import 'package:cake_wallet/entities/generate_name.dart';
import 'package:cake_wallet/routes.dart';
import 'package:cake_wallet/themes/theme_base.dart';
import 'package:cake_wallet/utils/show_pop_up.dart';
@@ -57,6 +58,8 @@ class _WalletNameFormState extends State<WalletNameForm> {
ReactionDisposer _stateReaction;
final WalletNewVM _walletNewVM;
final TextEditingController _controller = TextEditingController();
@override
void initState() {
_stateReaction ??=
@@ -101,39 +104,68 @@ class _WalletNameFormState extends State<WalletNameForm> {
Padding(
padding: EdgeInsets.only(top: 24),
child: Form(
key: _formKey,
child: TextFormField(
onChanged: (value) => _walletNewVM.name = value,
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 20.0,
fontWeight: FontWeight.w600,
color:
Theme.of(context).primaryTextTheme.title.color),
decoration: InputDecoration(
hintStyle: TextStyle(
fontSize: 18.0,
fontWeight: FontWeight.w500,
color: Theme.of(context)
.accentTextTheme
.display3
.color),
hintText: S.of(context).wallet_name,
focusedBorder: UnderlineInputBorder(
borderSide: BorderSide(
color: Theme.of(context)
.accentTextTheme
.display3
.decorationColor,
width: 1.0)),
enabledBorder: UnderlineInputBorder(
borderSide: BorderSide(
color: Theme.of(context)
.accentTextTheme
.display3
.decorationColor,
width: 1.0))),
validator: WalletNameValidator())),
key: _formKey,
child: TextFormField(
onChanged: (value) => _walletNewVM.name = value,
controller: _controller,
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 20.0,
fontWeight: FontWeight.w600,
color: Theme.of(context).primaryTextTheme.title.color),
decoration: InputDecoration(
suffixIcon: IconButton(
onPressed: () async {
final rName = await generateName();
setState(() {
_controller.text = rName;
_walletNewVM.name = rName;
_controller.selection = TextSelection.fromPosition(
TextPosition(offset: _controller.text.length));
});
},
icon: Container(
padding: const EdgeInsets.all(8),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(6.0),
color: Theme.of(context).hintColor,
),
width: 34,
height: 34,
child: Image.asset(
'assets/images/refresh_icon.png',
color: Theme.of(context)
.primaryTextTheme
.display1
.decorationColor,
),
),
),
hintStyle: TextStyle(
fontSize: 18.0,
fontWeight: FontWeight.w500,
color:
Theme.of(context).accentTextTheme.display3.color),
hintText: S.of(context).wallet_name,
focusedBorder: UnderlineInputBorder(
borderSide: BorderSide(
color: Theme.of(context)
.accentTextTheme
.display3
.decorationColor,
width: 1.0)),
enabledBorder: UnderlineInputBorder(
borderSide: BorderSide(
color: Theme.of(context)
.accentTextTheme
.display3
.decorationColor,
width: 1.0),
),
),
validator: WalletNameValidator(),
),
),
),
if (_walletNewVM.hasLanguageSelector) ...[
Padding(
lib/src/screens/restore/wallet_restore_from_keys_form.dart
+30 -2
View File
@@ -7,12 +7,13 @@ import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/core/validator.dart';
import 'package:cake_wallet/entities/generate_name.dart';
class WalletRestoreFromKeysFrom extends StatefulWidget {
WalletRestoreFromKeysFrom({Key key, this.onHeightOrDateEntered})
: super(key: key);
final Function (bool) onHeightOrDateEntered;
final Function(bool) onHeightOrDateEntered;
@override
WalletRestoreFromKeysFromState createState() =>
@@ -56,7 +57,34 @@ class WalletRestoreFromKeysFromState extends State<WalletRestoreFromKeysFrom> {
BaseTextFormField(
controller: nameTextEditingController,
hintText: S.of(context).wallet_name,
validator: WalletNameValidator()),
validator: WalletNameValidator(),
suffixIcon: Container(
width: 12,
height: 14,
margin: const EdgeInsets.only(bottom: 15, left: 13),
child: InkWell(
onTap: () async {
final rName = await generateName();
setState(() {
nameTextEditingController.text = rName;
nameTextEditingController.selection =
TextSelection.fromPosition(TextPosition(
offset: nameTextEditingController.text.length));
});
},
child: Container(
padding: EdgeInsets.all(8),
decoration: BoxDecoration(
color: Theme.of(context).hintColor,
borderRadius: BorderRadius.all(Radius.circular(6))),
child: Image.asset('assets/images/refresh_icon.png',
color: Theme.of(context)
.primaryTextTheme
.display1
.decorationColor)),
),
),
),
Container(height: 20),
BaseTextFormField(
controller: addressController,
lib/src/screens/restore/wallet_restore_from_seed_form.dart
+41 -5
View File
@@ -1,3 +1,4 @@
import 'package:cake_wallet/entities/generate_name.dart';
import 'package:cw_core/wallet_type.dart';
import 'package:cake_wallet/view_model/wallet_restore_view_model.dart';
import 'package:flutter/cupertino.dart';
@@ -18,7 +19,9 @@ class WalletRestoreFromSeedForm extends StatefulWidget {
@required this.displayBlockHeightSelector,
@required this.type,
this.blockHeightFocusNode,
this.onHeightOrDateEntered})
this.onHeightOrDateEntered,
this.onSeedChange,
this.onLanguageChange})
: super(key: key);
final WalletType type;
@@ -26,6 +29,8 @@ class WalletRestoreFromSeedForm extends StatefulWidget {
final bool displayBlockHeightSelector;
final FocusNode blockHeightFocusNode;
final Function(bool) onHeightOrDateEntered;
final void Function(String) onSeedChange;
final void Function(String) onLanguageChange;
@override
WalletRestoreFromSeedFormState createState() =>
@@ -57,12 +62,42 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
padding: EdgeInsets.only(left: 24, right: 24),
child: Column(children: [
BaseTextFormField(
controller: nameTextEditingController,
hintText: S.of(context).wallet_name,
validator: WalletNameValidator()),
controller: nameTextEditingController,
hintText: S.of(context).wallet_name,
validator: WalletNameValidator(),
suffixIcon: Container(
width: 12,
height: 14,
margin: const EdgeInsets.only(bottom: 15, left: 13),
child: InkWell(
onTap: () async {
final rName = await generateName();
setState(() {
nameTextEditingController.text = rName;
nameTextEditingController.selection =
TextSelection.fromPosition(TextPosition(
offset: nameTextEditingController.text.length));
});
},
child: Container(
padding: EdgeInsets.all(8),
decoration: BoxDecoration(
color: Theme.of(context).hintColor,
borderRadius: BorderRadius.all(Radius.circular(6))),
child: Image.asset('assets/images/refresh_icon.png',
color: Theme.of(context)
.primaryTextTheme
.display1
.decorationColor)),
),
),
),
Container(height: 20),
SeedWidget(
key: seedWidgetStateKey, language: language, type: widget.type),
key: seedWidgetStateKey,
language: language,
type: widget.type,
onSeedChange: widget.onSeedChange),
if (widget.displayLanguageSelector)
GestureDetector(
onTap: () async {
@@ -98,6 +133,7 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
this.language = language;
seedWidgetStateKey.currentState.changeSeedLanguage(language);
_setLanguageLabel(language);
widget.onLanguageChange?.call(language);
});
}
lib/src/screens/restore/wallet_restore_page.dart
+73 -2
View File
@@ -1,5 +1,6 @@
import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
import 'package:cw_core/wallet_type.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:keyboard_actions/keyboard_actions.dart';
@@ -18,6 +19,7 @@ import 'package:cake_wallet/utils/show_pop_up.dart';
import 'package:cake_wallet/core/validator.dart';
import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
import 'package:cake_wallet/core/seed_validator.dart';
class WalletRestorePage extends BasePage {
WalletRestorePage(this.walletRestoreViewModel)
@@ -39,8 +41,44 @@ class WalletRestorePage extends BasePage {
type: walletRestoreViewModel.type,
key: walletRestoreFromSeedFormKey,
blockHeightFocusNode: _blockHeightFocusNode,
onHeightOrDateEntered: (value) =>
walletRestoreViewModel.isButtonEnabled = value));
onHeightOrDateEntered: (value) {
if (_isValidSeed()) {
walletRestoreViewModel.isButtonEnabled = value;
}
},
onSeedChange: (String seed) {
if (walletRestoreViewModel.hasBlockchainHeightLanguageSelector) {
final hasHeight = walletRestoreFromSeedFormKey
.currentState
.blockchainHeightKey
.currentState
.restoreHeightController
.text
.isNotEmpty;
if (hasHeight) {
walletRestoreViewModel.isButtonEnabled = _isValidSeed();
}
} else {
walletRestoreViewModel.isButtonEnabled = _isValidSeed();
}
},
onLanguageChange: (_) {
if (walletRestoreViewModel.hasBlockchainHeightLanguageSelector) {
final hasHeight = walletRestoreFromSeedFormKey
.currentState
.blockchainHeightKey
.currentState
.restoreHeightController
.text
.isNotEmpty;
if (hasHeight) {
walletRestoreViewModel.isButtonEnabled = _isValidSeed();
}
} else {
walletRestoreViewModel.isButtonEnabled = _isValidSeed();
}
}));
break;
case WalletRestoreMode.keys:
_pages.add(WalletRestoreFromKeysFrom(
@@ -169,6 +207,39 @@ class WalletRestorePage extends BasePage {
])));
}
bool _isValidSeed() {
final seedWords = walletRestoreFromSeedFormKey
.currentState
.seedWidgetStateKey
.currentState
.text
.split(' ');
if (walletRestoreViewModel.type == WalletType.monero &&
seedWords.length != WalletRestoreViewModelBase.moneroSeedMnemonicLength) {
return false;
}
if ((walletRestoreViewModel.type == WalletType.bitcoin ||
walletRestoreViewModel.type == WalletType.litecoin) &&
(seedWords.length != WalletRestoreViewModelBase.electrumSeedMnemonicLength &&
seedWords.length != WalletRestoreViewModelBase.electrumShortSeedMnemonicLength)) {
return false;
}
final words = walletRestoreFromSeedFormKey
.currentState
.seedWidgetStateKey
.currentState
.words
.toSet();
return seedWords
.toSet()
.difference(words)
.toSet()
.isEmpty;
}
Map<String, dynamic> _credentials() {
final credentials = <String, dynamic>{};
lib/src/widgets/seed_widget.dart
+5 -5
View File
@@ -12,10 +12,11 @@ import 'package:cake_wallet/generated/i18n.dart';
import 'package:flutter/widgets.dart';
class SeedWidget extends StatefulWidget {
SeedWidget({Key key, this.language, this.type}) : super(key: key);
SeedWidget({Key key, this.language, this.type, this.onSeedChange}) : super(key: key);
final String language;
final WalletType type;
final void Function(String) onSeedChange;
@override
SeedWidgetState createState() => SeedWidgetState(language, type);
@@ -25,8 +26,7 @@ class SeedWidgetState extends State<SeedWidget> {
SeedWidgetState(String language, this.type)
: controller = TextEditingController(),
focusNode = FocusNode(),
words = SeedValidator.getWordList(
type:type, language: language) {
words = SeedValidator.getWordList(type: type, language: language) {
focusNode.addListener(() {
setState(() {
if (!focusNode.hasFocus && controller.text.isEmpty) {
@@ -52,12 +52,12 @@ class SeedWidgetState extends State<SeedWidget> {
void initState() {
super.initState();
_showPlaceholder = true;
controller.addListener(() => widget.onSeedChange?.call(text));
}
void changeSeedLanguage(String language) {
setState(() {
words = SeedValidator.getWordList(
type: type, language: language);
words = SeedValidator.getWordList(type: type, language: language);
});
}