Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 66 additions & 55 deletions lib/widgets/dialogs/auth/auth_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -158,35 +158,53 @@ class _AuthDialogState extends ConsumerState<AuthDialog> {
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
CustomTextField(
controller: _emailController,
keyboardType: TextInputType.emailAddress,
autofillHints: const [AutofillHints.email],
hintText: 'Email',
textInputAction: TextInputAction.next,
hasError: _errorField == _AuthField.email,
MergeSemantics(
child: Semantics(
key: const ValueKey('auth-email-field'),
label: 'Email',
child: CustomTextField(
controller: _emailController,
keyboardType: TextInputType.emailAddress,
autofillHints: const [AutofillHints.email],
hintText: 'Email',
textInputAction: TextInputAction.next,
hasError: _errorField == _AuthField.email,
),
),
),
const SizedBox(height: 10),
CustomTextField(
controller: _passwordController,
obscureText: true,
autofillHints: const [AutofillHints.password],
hintText: 'Password',
textInputAction:
_isSignUp ? TextInputAction.next : TextInputAction.done,
onSubmitted: _isSignUp ? null : (_) => _submit(),
hasError: _errorField == _AuthField.password,
MergeSemantics(
child: Semantics(
key: const ValueKey('auth-password-field'),
label: 'Password',
child: CustomTextField(
controller: _passwordController,
obscureText: true,
autofillHints: const [AutofillHints.password],
hintText: 'Password',
textInputAction:
_isSignUp ? TextInputAction.next : TextInputAction.done,
onSubmitted: _isSignUp ? null : (_) => _submit(),
hasError: _errorField == _AuthField.password,
),
),
),
if (_isSignUp) ...[
const SizedBox(height: 10),
CustomTextField(
controller: _confirmController,
obscureText: true,
autofillHints: const [AutofillHints.password],
hintText: 'Confirm password',
textInputAction: TextInputAction.done,
onSubmitted: (_) => _submit(),
hasError: _errorField == _AuthField.confirm,
MergeSemantics(
child: Semantics(
key: const ValueKey('auth-confirm-password-field'),
label: 'Confirm password',
child: CustomTextField(
controller: _confirmController,
obscureText: true,
autofillHints: const [AutofillHints.password],
hintText: 'Confirm password',
textInputAction: TextInputAction.done,
onSubmitted: (_) => _submit(),
hasError: _errorField == _AuthField.confirm,
),
),
),
],
const SizedBox(height: 12),
Expand Down Expand Up @@ -223,6 +241,7 @@ class _AuthDialogState extends ConsumerState<AuthDialog> {
children: [
Expanded(
child: ShadButton.secondary(
key: const ValueKey('auth-mode-switch'),
onPressed: busy
? null
: () {
Expand All @@ -234,43 +253,35 @@ class _AuthDialogState extends ConsumerState<AuthDialog> {
});
},
child: Text(
_isSignUp
? 'Already have an account? Sign in'
: 'Need an account? Sign up',
_isSignUp ? 'Sign in instead' : 'Create an account',
),
),
),
],
),
const SizedBox(height: 10),
Row(
children: [
Expanded(
child: ShadButton.secondary(
onPressed:
busy || _waitingForDiscord ? null : _startDiscordSignIn,
child: const Text('Continue with Discord'),
),
),
const SizedBox(width: 10),
Expanded(
child: ShadButton(
onPressed: busy ? null : _submit,
leading: busy
? const SizedBox(
width: 14,
height: 14,
child: CircularProgressIndicator(strokeWidth: 2),
)
: null,
child: Text(
busy
? (_isSignUp ? 'Creating…' : 'Signing in…')
: (_isSignUp ? 'Create account' : 'Sign in'),
),
),
),
],
ShadButton.secondary(
key: const ValueKey('auth-discord-button'),
onPressed:
busy || _waitingForDiscord ? null : _startDiscordSignIn,
child: const Text('Continue with Discord'),
),
const SizedBox(height: 10),
ShadButton(
key: const ValueKey('auth-submit-button'),
onPressed: busy ? null : _submit,
leading: busy
? const SizedBox(
width: 14,
height: 14,
child: CircularProgressIndicator(strokeWidth: 2),
)
: null,
child: Text(
busy
? (_isSignUp ? 'Creating…' : 'Signing in…')
: (_isSignUp ? 'Create account' : 'Sign in'),
),
),
],
),
Expand Down
Loading
Loading