Skip to content

Centered add-authenticator form and made the QR scanner a square viewfinder #432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PianoNic merged 1 commit into from
Jul 19, 2026
Merged

Centered add-authenticator form and made the QR scanner a square viewfinder #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
130 changes: 78 additions & 52 deletions lib/ui/authenticator/add_totp_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,15 @@ class _AddTotpScreenState extends State<AddTotpScreen> {
String _newId() => DateTime.now().microsecondsSinceEpoch.toString();

Future<void> _scan() async {
final scanned = await Navigator.of(context).push<String>(
MaterialPageRoute(builder: (_) => const TotpScanScreen()),
);
final scanned = await Navigator.of(
context,
).push<String>(MaterialPageRoute(builder: (_) => const TotpScanScreen()));
if (scanned == null || scanned.isEmpty || !mounted) return;
final entry = TotpEntry.fromPayload(_newId(), scanned);
if (entry == null) {
setState(() => _error = "That QR code doesn't contain a valid TOTP secret.");
setState(
() => _error = "That QR code doesn't contain a valid TOTP secret.",
);
return;
}
await _save(entry);
Expand All @@ -49,7 +51,9 @@ class _AddTotpScreenState extends State<AddTotpScreen> {
Future<void> _saveManual() async {
final secret = _secretCtrl.text.trim();
if (TotpConfig.tryParse(secret) == null) {
setState(() => _error = 'Enter a valid TOTP secret (base32) or otpauth:// URI.');
setState(
() => _error = 'Enter a valid TOTP secret (base32) or otpauth:// URI.',
);
return;
}
final entry = TotpEntry.fromPayload(
Expand All @@ -59,7 +63,9 @@ class _AddTotpScreenState extends State<AddTotpScreen> {
account: _accountCtrl.text.trim(),
);
if (entry == null) {
setState(() => _error = 'Enter a valid TOTP secret (base32) or otpauth:// URI.');
setState(
() => _error = 'Enter a valid TOTP secret (base32) or otpauth:// URI.',
);
return;
}
await _save(entry);
Expand Down Expand Up @@ -87,54 +93,74 @@ class _AddTotpScreenState extends State<AddTotpScreen> {
return FScaffold(
header: FHeader.nested(
title: const Text('Add authenticator'),
prefixes: [FHeaderAction.back(onPress: () => Navigator.of(context).pop())],
prefixes: [
FHeaderAction.back(onPress: () => Navigator.of(context).pop()),
],
),
child: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
spacing: 16,
children: [
FButton(
onPress: _busy ? null : _scan,
prefix: const Icon(FIcons.scanQrCode),
child: const Text('Scan QR code'),
),
Row(
children: [
const Expanded(child: FDivider()),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 12),
child: Text('or enter manually', style: typography.sm.copyWith(color: colors.mutedForeground)),
),
const Expanded(child: FDivider()),
],
),
FTextField(
control: FTextFieldControl.managed(controller: _issuerCtrl),
label: const Text('Provider (optional)'),
hint: 'e.g. Schulnetz, GitHub',
autocorrect: false,
),
FTextField(
control: FTextFieldControl.managed(controller: _accountCtrl),
label: const Text('Account (optional)'),
hint: 'e.g. your username or email',
autocorrect: false,
),
FTextField(
control: FTextFieldControl.managed(controller: _secretCtrl),
label: const Text('Setup key'),
hint: 'TOTP secret or otpauth:// URI',
autocorrect: false,
),
FButton(
style: FButtonStyle.outline(),
onPress: _busy ? null : _saveManual,
child: Text(_busy ? 'Saving…' : 'Save'),
child: LayoutBuilder(
builder: (context, constraints) => SingleChildScrollView(
child: ConstrainedBox(
constraints: BoxConstraints(minHeight: constraints.maxHeight),
child: IntrinsicHeight(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.stretch,
spacing: 16,
children: [
FButton(
onPress: _busy ? null : _scan,
prefix: const Icon(FIcons.scanQrCode),
child: const Text('Scan QR code'),
),
Row(
children: [
const Expanded(child: FDivider()),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 12),
child: Text(
'or enter manually',
style: typography.sm.copyWith(
color: colors.mutedForeground,
),
),
),
const Expanded(child: FDivider()),
],
),
FTextField(
control: FTextFieldControl.managed(controller: _issuerCtrl),
label: const Text('Provider (optional)'),
hint: 'e.g. Schulnetz, GitHub',
autocorrect: false,
),
FTextField(
control: FTextFieldControl.managed(
controller: _accountCtrl,
),
label: const Text('Account (optional)'),
hint: 'e.g. your username or email',
autocorrect: false,
),
FTextField(
control: FTextFieldControl.managed(controller: _secretCtrl),
label: const Text('Setup key'),
hint: 'TOTP secret or otpauth:// URI',
autocorrect: false,
),
FButton(
style: FButtonStyle.outline(),
onPress: _busy ? null : _saveManual,
child: Text(_busy ? 'Saving…' : 'Save'),
),
if (_error != null)
SelectableText(
_error!,
style: TextStyle(color: colors.destructive),
),
],
),
),
if (_error != null)
SelectableText(_error!, style: TextStyle(color: colors.destructive)),
],
),
),
),
);
Expand Down
23 changes: 17 additions & 6 deletions lib/ui/authenticator/totp_scan_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,24 @@ class _TotpScanScreenState extends State<TotpScanScreen> {
],
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
spacing: 16,
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
spacing: 24,
children: [
Expanded(
child: ClipRRect(
borderRadius: BorderRadius.circular(12),
child: MobileScanner(onDetect: _onDetect),
Center(
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 280),
child: AspectRatio(
aspectRatio: 1,
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(16),
border: Border.all(color: colors.border, width: 2),
),
clipBehavior: Clip.antiAlias,
child: MobileScanner(onDetect: _onDetect),
),
),
),
),
Text(
Expand Down
Loading