mirror of
https://github.com/cypherstack/stack_wallet.git
synced 2024-12-23 03:49:22 +00:00
password progressbar fix
This commit is contained in:
parent
6ce899cd27
commit
d084fac057
1 changed files with 58 additions and 6 deletions
|
@ -7,6 +7,7 @@ import 'package:stackwallet/utilities/constants.dart';
|
||||||
import 'package:stackwallet/utilities/text_styles.dart';
|
import 'package:stackwallet/utilities/text_styles.dart';
|
||||||
import 'package:stackwallet/utilities/theme/stack_colors.dart';
|
import 'package:stackwallet/utilities/theme/stack_colors.dart';
|
||||||
import 'package:stackwallet/widgets/desktop/primary_button.dart';
|
import 'package:stackwallet/widgets/desktop/primary_button.dart';
|
||||||
|
import 'package:stackwallet/widgets/progress_bar.dart';
|
||||||
import 'package:stackwallet/widgets/rounded_white_container.dart';
|
import 'package:stackwallet/widgets/rounded_white_container.dart';
|
||||||
import 'package:stackwallet/widgets/stack_text_field.dart';
|
import 'package:stackwallet/widgets/stack_text_field.dart';
|
||||||
import 'package:zxcvbn/zxcvbn.dart';
|
import 'package:zxcvbn/zxcvbn.dart';
|
||||||
|
@ -145,15 +146,15 @@ class _SecuritySettings extends ConsumerState<SecuritySettings> {
|
||||||
child: TextField(
|
child: TextField(
|
||||||
key: const Key(
|
key: const Key(
|
||||||
"desktopSecurityRestoreFromFilePasswordFieldKey"),
|
"desktopSecurityRestoreFromFilePasswordFieldKey"),
|
||||||
focusNode: passwordFocusNode,
|
focusNode: passwordCurrentFocusNode,
|
||||||
controller: passwordController,
|
controller: passwordCurrentController,
|
||||||
style: STextStyles.field(context),
|
style: STextStyles.field(context),
|
||||||
obscureText: hidePassword,
|
obscureText: hidePassword,
|
||||||
enableSuggestions: false,
|
enableSuggestions: false,
|
||||||
autocorrect: false,
|
autocorrect: false,
|
||||||
decoration: standardInputDecoration(
|
decoration: standardInputDecoration(
|
||||||
"Enter current password",
|
"Enter current password",
|
||||||
passwordFocusNode,
|
passwordCurrentFocusNode,
|
||||||
context,
|
context,
|
||||||
).copyWith(
|
).copyWith(
|
||||||
labelStyle:
|
labelStyle:
|
||||||
|
@ -214,15 +215,15 @@ class _SecuritySettings extends ConsumerState<SecuritySettings> {
|
||||||
child: TextField(
|
child: TextField(
|
||||||
key: const Key(
|
key: const Key(
|
||||||
"desktopSecurityCreateNewPasswordFieldKey1"),
|
"desktopSecurityCreateNewPasswordFieldKey1"),
|
||||||
focusNode: passwordCurrentFocusNode,
|
focusNode: passwordFocusNode,
|
||||||
controller: passwordCurrentController,
|
controller: passwordController,
|
||||||
style: STextStyles.field(context),
|
style: STextStyles.field(context),
|
||||||
obscureText: hidePassword,
|
obscureText: hidePassword,
|
||||||
enableSuggestions: false,
|
enableSuggestions: false,
|
||||||
autocorrect: false,
|
autocorrect: false,
|
||||||
decoration: standardInputDecoration(
|
decoration: standardInputDecoration(
|
||||||
"Enter new password",
|
"Enter new password",
|
||||||
passwordCurrentFocusNode,
|
passwordFocusNode,
|
||||||
context,
|
context,
|
||||||
).copyWith(
|
).copyWith(
|
||||||
labelStyle:
|
labelStyle:
|
||||||
|
@ -302,6 +303,57 @@ class _SecuritySettings extends ConsumerState<SecuritySettings> {
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
if (passwordFocusNode.hasFocus ||
|
||||||
|
passwordRepeatFocusNode.hasFocus ||
|
||||||
|
passwordController.text.isNotEmpty)
|
||||||
|
Padding(
|
||||||
|
padding: EdgeInsets.only(
|
||||||
|
left: 12,
|
||||||
|
right: 12,
|
||||||
|
top:
|
||||||
|
passwordFeedback.isNotEmpty ? 4 : 0,
|
||||||
|
),
|
||||||
|
child: passwordFeedback.isNotEmpty
|
||||||
|
? Text(
|
||||||
|
passwordFeedback,
|
||||||
|
style: STextStyles.infoSmall(
|
||||||
|
context),
|
||||||
|
)
|
||||||
|
: null,
|
||||||
|
),
|
||||||
|
if (passwordFocusNode.hasFocus ||
|
||||||
|
passwordRepeatFocusNode.hasFocus ||
|
||||||
|
passwordController.text.isNotEmpty)
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.only(
|
||||||
|
left: 12,
|
||||||
|
right: 12,
|
||||||
|
top: 10,
|
||||||
|
),
|
||||||
|
child: ProgressBar(
|
||||||
|
key: const Key(
|
||||||
|
"desktopSecurityCreateStackBackUpProgressBar"),
|
||||||
|
width: 450,
|
||||||
|
height: 5,
|
||||||
|
fillColor: passwordStrength < 0.51
|
||||||
|
? Theme.of(context)
|
||||||
|
.extension<StackColors>()!
|
||||||
|
.accentColorRed
|
||||||
|
: passwordStrength < 1
|
||||||
|
? Theme.of(context)
|
||||||
|
.extension<StackColors>()!
|
||||||
|
.accentColorYellow
|
||||||
|
: Theme.of(context)
|
||||||
|
.extension<StackColors>()!
|
||||||
|
.accentColorGreen,
|
||||||
|
backgroundColor: Theme.of(context)
|
||||||
|
.extension<StackColors>()!
|
||||||
|
.buttonBackSecondary,
|
||||||
|
percent: passwordStrength < 0.25
|
||||||
|
? 0.03
|
||||||
|
: passwordStrength,
|
||||||
|
),
|
||||||
|
),
|
||||||
const SizedBox(height: 16),
|
const SizedBox(height: 16),
|
||||||
Text(
|
Text(
|
||||||
"Confirm new password",
|
"Confirm new password",
|
||||||
|
|
Loading…
Reference in a new issue