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

Fix some deprecations.

Browse Source
This commit is contained in:
Dain Nilsson 2023-11-23 15:37:58 +01:00
parent c8007213bd
commit a74c8556ac
No known key found for this signature in database
GPG Key ID: F04367096FBA95E8
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/app/views/action_popup_menu.dart
View File

@ -58,7 +58,10 @@ PopupMenuItem _buildMenuItem(BuildContext context, ActionItem actionItem) {
trailing: shortcut != null
? Opacity(
opacity: 0.5,
child: Text(shortcut, textScaleFactor: 0.7),
child: Text(
shortcut,
textScaler: const TextScaler.linear(0.7),
),
)
: null,
),

19
lib/app/views/user_interaction.dart
View File

@ -150,12 +150,14 @@ UserInteractionController _dialogUserInteraction(
Widget? icon,
void Function()? onCancel,
}) {
var completed = false;
var wasPopped = false;
final controller = _UserInteractionController(
title: title,
description: description,
icon: icon,
onClosed: () {
completed = true;
if (!wasPopped) {
Navigator.of(context).pop();
}
@ -165,20 +167,19 @@ UserInteractionController _dialogUserInteraction(
context: context,
routeSettings: const RouteSettings(name: 'user_interaction_prompt'),
builder: (context) {
return WillPopScope(
onWillPop: () async {
if (onCancel != null) {
onCancel();
return PopScope(
canPop: onCancel != null,
onPopInvoked: (didPop) {
if (didPop) {
wasPopped = true;
return true;
} else {
return false;
if (!completed && onCancel != null) {
onCancel();
}
}
},
child: _UserInteractionDialog(
controller: controller,
),
);
));
});
return controller;