Added a generate-name button for restore-from-key page and removed empty lines, types for final variables, and print statements
RafiaChy committed
Jan 24, 2022 at 20:00 UTC
3ed867aba3ba90dc469cefa14ea22720e7e80922
4 files changed
+33
-10
lib/entities/generate_name.dart
-1
@@ -20,6 +20,5 @@ Future<String> generateName() async {
20
final chosenNoun = nouns[randomThing.nextInt(nouns.length)];
21
final returnString =
22
chosenAdjective.capitalized() + ' ' + chosenNoun.capitalized();
23
-
23
return returnString;
24
}
lib/src/screens/new_wallet/new_wallet_page.dart
+1
-3
@@ -116,9 +116,7 @@ class _WalletNameFormState extends State<WalletNameForm> {
116
decoration: InputDecoration(
117
suffixIcon: IconButton(
118
onPressed: () async {
119
- final String rName = await generateName();
120
-
121
- print(rName);
119
+ final rName = await generateName();
120
setState(() {
121
_controller.text = rName;
122
_walletNewVM.name = rName;
lib/src/screens/restore/wallet_restore_from_keys_form.dart
+30
-2
@@ -7,12 +7,13 @@ import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
7
import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
8
import 'package:cake_wallet/generated/i18n.dart';
9
import 'package:cake_wallet/core/validator.dart';
10
+import 'package:cake_wallet/entities/generate_name.dart';
11
12
class WalletRestoreFromKeysFrom extends StatefulWidget {
13
WalletRestoreFromKeysFrom({Key key, this.onHeightOrDateEntered})
14
: super(key: key);
15
15
- final Function (bool) onHeightOrDateEntered;
16
+ final Function(bool) onHeightOrDateEntered;
17
18
@override
19
WalletRestoreFromKeysFromState createState() =>
@@ -56,7 +57,34 @@ class WalletRestoreFromKeysFromState extends State<WalletRestoreFromKeysFrom> {
57
BaseTextFormField(
58
controller: nameTextEditingController,
59
hintText: S.of(context).wallet_name,
59
- validator: WalletNameValidator()),
60
+ validator: WalletNameValidator(),
61
+ suffixIcon: Container(
62
+ width: 12,
63
+ height: 14,
64
+ margin: const EdgeInsets.only(bottom: 15, left: 13),
65
+ child: InkWell(
66
+ onTap: () async {
67
+ final rName = await generateName();
68
+ setState(() {
69
+ nameTextEditingController.text = rName;
70
+ nameTextEditingController.selection =
71
+ TextSelection.fromPosition(TextPosition(
72
+ offset: nameTextEditingController.text.length));
73
+ });
74
+ },
75
+ child: Container(
76
+ padding: EdgeInsets.all(8),
77
+ decoration: BoxDecoration(
78
+ color: Theme.of(context).hintColor,
79
+ borderRadius: BorderRadius.all(Radius.circular(6))),
80
+ child: Image.asset('assets/images/refresh_icon.png',
81
+ color: Theme.of(context)
82
+ .primaryTextTheme
83
+ .display1
84
+ .decorationColor)),
85
+ ),
86
+ ),
87
+ ),
88
Container(height: 20),
89
BaseTextFormField(
90
controller: addressController,
lib/src/screens/restore/wallet_restore_from_seed_form.dart
+2
-4
@@ -64,12 +64,10 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
64
suffixIcon: Container(
65
width: 12,
66
height: 14,
67
- margin: const EdgeInsets.only( bottom: 15, left: 13),
67
+ margin: const EdgeInsets.only(bottom: 15, left: 13),
68
child: InkWell(
69
onTap: () async {
70
- final String rName = await generateName();
71
-
72
- print(rName);
70
+ final rName = await generateName();
71
setState(() {
72
nameTextEditingController.text = rName;
73
nameTextEditingController.selection =