Yubico/yubioath-flutter
1
1
Fork 0
mirror of https://github.com/Yubico/yubioath-flutter.git synced 2024-12-23 10:11:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Misc UI fixes

Browse Source
This commit is contained in:
Elias Bonnici 2024-04-25 15:26:33 +02:00
parent 63bb6292a5
commit b5b5804f3a
No known key found for this signature in database
GPG Key ID: 5EAC28EA3F980CCF
10 changed files with 114 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/fido/views/credential_dialog.dart
View File

@ -60,9 +60,13 @@ class CredentialDialog extends ConsumerWidget {
top: 48, bottom: 32, left: 16, right: 16), top: 48, bottom: 32, left: 16, right: 16),
child: Column( child: Column(
children: [ children: [
const Padding( Padding(
padding: EdgeInsets.all(16), padding: const EdgeInsets.all(16),
child: Icon(Symbols.passkey, size: 72), child: Icon(
Symbols.passkey,
size: 100,
color: Theme.of(context).colorScheme.onSurface,
),
), ),
CredentialInfoTable(credential), CredentialInfoTable(credential),
], ],

6
lib/fido/views/fingerprint_dialog.dart
View File

@ -81,7 +81,11 @@ class FingerprintDialog extends ConsumerWidget {
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
const Icon(Symbols.fingerprint, size: 72), Icon(
Symbols.fingerprint,
size: 100,
color: Theme.of(context).colorScheme.onSurface,
),
], ],
), ),
), ),

3
lib/fido/views/fingerprints_screen.dart
View File

@ -278,7 +278,8 @@ class _FidoUnlockedPageState extends ConsumerState<_FidoUnlockedPage> {
elevation: 0.0, elevation: 0.0,
color: Theme.of(context).hoverColor, color: Theme.of(context).hoverColor,
child: Padding( child: Padding(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.symmetric(
vertical: 24, horizontal: 16),
// TODO: Reuse from fingerprint_dialog // TODO: Reuse from fingerprint_dialog
child: Column( child: Column(
children: [ children: [

3
lib/fido/views/passkeys_screen.dart
View File

@ -442,7 +442,8 @@ class _FidoUnlockedPageState extends ConsumerState<_FidoUnlockedPage> {
elevation: 0.0, elevation: 0.0,
color: Theme.of(context).hoverColor, color: Theme.of(context).hoverColor,
child: Padding( child: Padding(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.symmetric(
vertical: 24, horizontal: 16),
child: CredentialInfoTable(credential), child: CredentialInfoTable(credential),
), ),
), ),

24
lib/oath/views/account_dialog.dart
View File

@ -27,6 +27,7 @@ import '../../app/views/action_list.dart';
import '../../app/views/fs_dialog.dart'; import '../../app/views/fs_dialog.dart';
import '../../core/models.dart'; import '../../core/models.dart';
import '../../core/state.dart'; import '../../core/state.dart';
import '../../widgets/tooltip_if_truncated.dart';
import '../features.dart' as features; import '../features.dart' as features;
import '../models.dart'; import '../models.dart';
import '../state.dart'; import '../state.dart';
@ -132,26 +133,25 @@ class AccountDialog extends ConsumerWidget {
], ],
), ),
), ),
Text( TooltipIfTruncated(
helper.title, text: helper.title,
style: Theme.of(context).textTheme.headlineSmall, style: TextStyle(
softWrap: true, fontSize: Theme.of(context)
textAlign: TextAlign.center, .textTheme
.headlineSmall
?.fontSize),
), ),
if (subtitle != null) if (subtitle != null)
Text( TooltipIfTruncated(
subtitle, text: subtitle,
softWrap: true,
textAlign: TextAlign.center,
// This is what ListTile uses for subtitle // This is what ListTile uses for subtitle
style: Theme.of(context) style: Theme.of(context)
.textTheme .textTheme
.bodyMedium! .bodyMedium!
.copyWith( .copyWith(
color: Theme.of(context) color: Theme.of(context)
.textTheme .colorScheme
.bodySmall! .onSurfaceVariant,
.color,
), ),
), ),
], ],

35
lib/oath/views/oath_screen.dart
View File

@ -40,6 +40,7 @@ import '../../widgets/app_input_decoration.dart';
import '../../widgets/app_text_form_field.dart'; import '../../widgets/app_text_form_field.dart';
import '../../widgets/file_drop_overlay.dart'; import '../../widgets/file_drop_overlay.dart';
import '../../widgets/list_title.dart'; import '../../widgets/list_title.dart';
import '../../widgets/tooltip_if_truncated.dart';
import '../features.dart' as features; import '../features.dart' as features;
import '../keys.dart' as keys; import '../keys.dart' as keys;
import '../models.dart'; import '../models.dart';
@ -303,13 +304,11 @@ class _UnlockedViewState extends ConsumerState<_UnlockedView> {
elevation: 0.0, elevation: 0.0,
color: Theme.of(context).hoverColor, color: Theme.of(context).hoverColor,
child: Padding( child: Padding(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.symmetric(
vertical: 24, horizontal: 16),
child: Column( child: Column(
children: [ children: [
Padding( Row(
padding:
const EdgeInsets.symmetric(vertical: 16),
child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
@ -325,28 +324,26 @@ class _UnlockedViewState extends ConsumerState<_UnlockedView> {
), ),
], ],
), ),
), const SizedBox(height: 16),
Text( TooltipIfTruncated(
helper.title, text: helper.title,
style: style: TextStyle(
Theme.of(context).textTheme.headlineSmall, fontSize: Theme.of(context)
softWrap: true, .textTheme
textAlign: TextAlign.center, .headlineSmall
?.fontSize),
), ),
if (subtitle != null) if (subtitle != null)
Text( TooltipIfTruncated(
subtitle, text: subtitle,
softWrap: true,
textAlign: TextAlign.center,
// This is what ListTile uses for subtitle // This is what ListTile uses for subtitle
style: Theme.of(context) style: Theme.of(context)
.textTheme .textTheme
.bodyMedium! .bodyMedium!
.copyWith( .copyWith(
color: Theme.of(context) color: Theme.of(context)
.textTheme .colorScheme
.bodySmall! .onSurfaceVariant,
.color,
), ),
), ),
], ],

17
lib/otp/views/otp_screen.dart
View File

@ -109,7 +109,8 @@ class _OtpScreenState extends ConsumerState<OtpScreen> {
elevation: 0.0, elevation: 0.0,
color: Theme.of(context).hoverColor, color: Theme.of(context).hoverColor,
child: Padding( child: Padding(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.symmetric(
vertical: 24, horizontal: 16.0),
// TODO: Reuse from fingerprint_dialog // TODO: Reuse from fingerprint_dialog
child: Column( child: Column(
children: [ children: [
@ -128,9 +129,19 @@ class _OtpScreenState extends ConsumerState<OtpScreen> {
size: 100.0, size: 100.0,
), ),
const SizedBox(height: 8), const SizedBox(height: 8),
Text(selected.isConfigured Text(
selected.isConfigured
? l10n.l_otp_slot_configured ? l10n.l_otp_slot_configured
: l10n.l_otp_slot_empty) : l10n.l_otp_slot_empty,
style: Theme.of(context)
.textTheme
.bodyMedium!
.copyWith(
color: Theme.of(context)
.colorScheme
.onSurfaceVariant,
),
)
], ],
), ),
), ),

18
lib/otp/views/slot_dialog.dart
View File

@ -63,7 +63,7 @@ class SlotDialog extends ConsumerWidget {
child: Column( child: Column(
children: [ children: [
Padding( Padding(
padding: const EdgeInsets.only(top: 48, bottom: 16), padding: const EdgeInsets.only(top: 48, bottom: 32),
child: Column( child: Column(
children: [ children: [
Text( Text(
@ -73,14 +73,24 @@ class SlotDialog extends ConsumerWidget {
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
const SizedBox(height: 8), const SizedBox(height: 8),
const Icon( Icon(
Symbols.touch_app, Symbols.touch_app,
size: 100.0, size: 100.0,
color: Theme.of(context).colorScheme.onSurface,
), ),
const SizedBox(height: 8), const SizedBox(height: 8),
Text(otpSlot.isConfigured Text(
otpSlot.isConfigured
? l10n.l_otp_slot_configured ? l10n.l_otp_slot_configured
: l10n.l_otp_slot_empty) : l10n.l_otp_slot_empty,
style: Theme.of(context)
.textTheme
.bodyMedium
?.copyWith(
color: Theme.of(context)
.colorScheme
.onSurfaceVariant),
)
], ],
), ),
), ),

6
lib/piv/views/piv_screen.dart
View File

@ -131,7 +131,8 @@ class _PivScreenState extends ConsumerState<PivScreen> {
elevation: 0.0, elevation: 0.0,
color: Theme.of(context).hoverColor, color: Theme.of(context).hoverColor,
child: Padding( child: Padding(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.symmetric(
horizontal: 16, vertical: 24),
child: Column( child: Column(
children: [ children: [
Text( Text(
@ -149,7 +150,8 @@ class _PivScreenState extends ConsumerState<PivScreen> {
alwaysIncludePrivate: alwaysIncludePrivate:
pivState.supportsMetadata, pivState.supportsMetadata,
), ),
const SizedBox(height: 16), if (selected.certInfo == null)
const SizedBox(height: 16)
], ],
if (selected.certInfo == null) if (selected.certInfo == null)
Text( Text(

25
lib/piv/views/slot_dialog.dart
View File

@ -71,40 +71,38 @@ class SlotDialog extends ConsumerWidget {
child: Column( child: Column(
children: [ children: [
Padding( Padding(
padding: const EdgeInsets.only(top: 48, bottom: 16), padding: const EdgeInsets.only(top: 48, bottom: 32),
child: Column( child: Column(
children: [ children: [
Text( Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: Text(
pivSlot.getDisplayName(l10n), pivSlot.getDisplayName(l10n),
style: textTheme.headlineSmall, style: textTheme.headlineSmall,
softWrap: true, softWrap: true,
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
),
const SizedBox(height: 16.0),
Padding( Padding(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column( child: Column(
children: [ children: [
if (certInfo != null || metadata != null) ...[ if (certInfo != null || metadata != null) ...[
Padding( CertInfoTable(
padding: const EdgeInsets.only(bottom: 16),
child: CertInfoTable(
certInfo, certInfo,
metadata, metadata,
alwaysIncludePrivate: alwaysIncludePrivate: pivState.supportsMetadata,
pivState.supportsMetadata,
),
), ),
if (certInfo == null) const SizedBox(height: 16),
], ],
if (certInfo == null) ...[ if (certInfo == null) ...[
Padding( Text(
padding: const EdgeInsets.only(bottom: 16),
child: Text(
l10n.l_no_certificate, l10n.l_no_certificate,
softWrap: true, softWrap: true,
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: subtitleStyle, style: subtitleStyle,
), ),
),
], ],
], ],
), ),
@ -112,7 +110,6 @@ class SlotDialog extends ConsumerWidget {
], ],
), ),
), ),
const SizedBox(height: 16),
ActionListSection.fromMenuActions( ActionListSection.fromMenuActions(
context, context,
l10n.s_actions, l10n.s_actions,