minor nfc views refactor

lib/android/oath/state.dart

@@ -360,6 +360,7 @@ class _OathMethodChannelNotifier extends MethodChannelNotifier {
         'callArgs': {'password': password, 'remember': remember},
         'operationSuccess': l10n.s_nfc_unlock_success,
         'operationFailure': l10n.s_nfc_unlock_failure,
+        'showSuccess': false,
       });
 
   Future<dynamic> setPassword(String? current, String password) async =>

lib/android/tap_request_dialog.dart

@@ -39,9 +39,11 @@ final androidDialogProvider =
     NotifierProvider<_DialogProvider, int>(_DialogProvider.new);
 
 class _DialogProvider extends Notifier<int> {
-  Timer? processingTimer;
+  Timer? processingViewTimeout;
   bool explicitAction = false;
 
+  late final l10n = ref.read(l10nProvider);
+
   @override
   int build() {
     final l10n = ref.read(l10nProvider);
@@ -53,6 +55,7 @@ class _DialogProvider extends Notifier<int> {
       if (!explicitAction) {
         // setup properties for ad-hoc action
         viewNotifier.setDialogProperties(
+            operationSuccess: l10n.s_nfc_scan_success,
             operationFailure: l10n.l_nfc_read_key_failure,
             showSuccess: true,
             showCloseButton: false);
@@ -62,45 +65,37 @@ class _DialogProvider extends Notifier<int> {
 
       switch (current) {
         case NfcActivity.processingStarted:
-          viewNotifier.setDialogProperties(showCloseButton: false);
+          final timeout = explicitAction ? 300 : 500;
-          processingTimer?.cancel();
+          processingViewTimeout?.cancel();
-          final timeout = explicitAction ? 300 : 200;
+          processingViewTimeout = Timer(Duration(milliseconds: timeout), () {
-
+            notifier.sendCommand(showAccessingKeyView());
-          processingTimer = Timer(Duration(milliseconds: timeout), () {
-            if (!explicitAction) {
-              // show the widget
-              notifier.sendCommand(showNfcView(NfcContentWidget(
-                title: l10n.s_nfc_accessing_yubikey,
-                icon: const NfcIconProgressBar(true),
-              )));
-            } else {
-              // the processing view will only be shown if the timer is still active
-              notifier.sendCommand(updateNfcView(NfcContentWidget(
-                title: l10n.s_nfc_accessing_yubikey,
-                icon: const NfcIconProgressBar(true),
-              )));
-            }
           });
           break;
         case NfcActivity.processingFinished:
-          processingTimer?.cancel();
+          processingViewTimeout?.cancel();
           final showSuccess = properties.showSuccess ?? false;
           allowMessages = !showSuccess;
           if (showSuccess) {
             notifier.sendCommand(autoClose(
-              title: properties.operationSuccess,
+                title: properties.operationSuccess,
-              subtitle: l10n.s_nfc_remove_key,
+                subtitle: explicitAction ? l10n.s_nfc_remove_key : null,
-              icon: const NfcIconSuccess(),
+                icon: const NfcIconSuccess(),
-            ));
+                showIfHidden: false));
+            // hide
           }
-          // hide
+          notifier.sendCommand(hideNfcView(Duration(
-          notifier.sendCommand(hideNfcView(explicitAction ? 5000 : 400));
+              milliseconds: !showSuccess
+                  ? 0
+                  : explicitAction
+                      ? 5000
+                      : 400)));
+
           explicitAction = false; // next action might not be explicit
           break;
         case NfcActivity.processingInterrupted:
-          processingTimer?.cancel();
+          processingViewTimeout?.cancel();
           viewNotifier.setDialogProperties(showCloseButton: true);
-          notifier.sendCommand(updateNfcView(NfcContentWidget(
+          notifier.sendCommand(setNfcView(NfcContentWidget(
             title: properties.operationFailure,
             subtitle: l10n.s_nfc_scan_again,
             icon: const NfcIconFailure(),
@@ -119,14 +114,7 @@ class _DialogProvider extends Notifier<int> {
       switch (call.method) {
         case 'show':
           explicitAction = true;
-
+          notifier.sendCommand(showScanKeyView());
-          // we want to show the close button
-          viewNotifier.setDialogProperties(showCloseButton: true);
-
-          notifier.sendCommand(showNfcView(NfcContentWidget(
-            subtitle: l10n.s_nfc_scan_yubikey,
-            icon: const NfcIconProgressBar(false),
-          )));
           break;
 
         case 'close':
@@ -143,6 +131,26 @@ class _DialogProvider extends Notifier<int> {
     return 0;
   }
 
+  NfcEventCommand showScanKeyView() {
+    ref
+        .read(nfcViewNotifier.notifier)
+        .setDialogProperties(showCloseButton: true);
+    return setNfcView(NfcContentWidget(
+      subtitle: l10n.s_nfc_scan_yubikey,
+      icon: const NfcIconProgressBar(false),
+    ));
+  }
+
+  NfcEventCommand showAccessingKeyView() {
+    ref
+        .read(nfcViewNotifier.notifier)
+        .setDialogProperties(showCloseButton: false);
+    return setNfcView(NfcContentWidget(
+      title: l10n.s_nfc_accessing_yubikey,
+      icon: const NfcIconProgressBar(true),
+    ));
+  }
+
   void closeDialog() {
     ref.read(nfcEventCommandNotifier.notifier).sendCommand(hideNfcView());
   }
@@ -168,28 +176,3 @@ class _DialogProvider extends Notifier<int> {
     await completer.future;
   }
 }
-
-class MethodChannelHelper {
-  final ProviderRef _ref;
-  final MethodChannel _channel;
-
-  const MethodChannelHelper(this._ref, this._channel);
-
-  Future<dynamic> invoke(String method,
-      {String? operationSuccess,
-      String? operationFailure,
-      bool? showSuccess,
-      bool? showCloseButton,
-      Map<String, dynamic> arguments = const {}}) async {
-    final notifier = _ref.read(nfcViewNotifier.notifier);
-    notifier.setDialogProperties(
-        operationSuccess: operationSuccess,
-        operationFailure: operationFailure,
-        showSuccess: showSuccess,
-        showCloseButton: showCloseButton);
-
-    final result = await _channel.invokeMethod(method, arguments);
-    await _ref.read(androidDialogProvider.notifier).waitForDialogClosed();
-    return result;
-  }
-}

lib/android/views/nfc/models.dart

@@ -23,26 +23,21 @@ class NfcEvent {
   const NfcEvent();
 }
 
-class NfcShowViewEvent extends NfcEvent {
-  final Widget child;
-
-  const NfcShowViewEvent({required this.child});
-}
-
 class NfcHideViewEvent extends NfcEvent {
-  final int timeoutMs;
+  final Duration hideAfter;
 
-  const NfcHideViewEvent({required this.timeoutMs});
+  const NfcHideViewEvent({required this.hideAfter});
 }
 
 class NfcCancelEvent extends NfcEvent {
   const NfcCancelEvent();
 }
 
-class NfcUpdateViewEvent extends NfcEvent {
+class NfcSetViewEvent extends NfcEvent {
   final Widget child;
+  final bool showIfHidden;
 
-  const NfcUpdateViewEvent({required this.child});
+  const NfcSetViewEvent({required this.child, this.showIfHidden = true});
 }
 
 @freezed
@@ -63,11 +58,9 @@ class NfcEventCommand with _$NfcEventCommand {
   }) = _NfcEventCommand;
 }
 
-NfcEventCommand hideNfcView([int timeoutMs = 0]) =>
+NfcEventCommand hideNfcView([Duration hideAfter = Duration.zero]) =>
-    NfcEventCommand(event: NfcHideViewEvent(timeoutMs: timeoutMs));
+    NfcEventCommand(event: NfcHideViewEvent(hideAfter: hideAfter));
 
-NfcEventCommand updateNfcView(Widget child) =>
+NfcEventCommand setNfcView(Widget child, {bool showIfHidden = true}) =>
-    NfcEventCommand(event: NfcUpdateViewEvent(child: child));
+    NfcEventCommand(
-
+        event: NfcSetViewEvent(child: child, showIfHidden: showIfHidden));
-NfcEventCommand showNfcView(Widget child) =>
-    NfcEventCommand(event: NfcShowViewEvent(child: child));

lib/android/views/nfc/nfc_activity_command_listener.dart

@@ -41,14 +41,15 @@ class _NfcEventCommandListener {
         (previous, action) {
       _log.debug('Change in command for Overlay: $previous -> $action');
       switch (action) {
-        case (NfcShowViewEvent a):
+        case (NfcSetViewEvent a):
-          _show(context, a.child);
+          if (!visible && a.showIfHidden) {
-          break;
+            _show(context, a.child);
-        case (NfcUpdateViewEvent a):
+          } else {
-          _ref.read(nfcViewNotifier.notifier).update(a.child);
+            _ref.read(nfcViewNotifier.notifier).update(a.child);
+          }
           break;
         case (NfcHideViewEvent e):
-          _hide(context, Duration(milliseconds: e.timeoutMs));
+          _hide(context, e.hideAfter);
           break;
         case (NfcCancelEvent _):
           _ref.read(androidDialogProvider.notifier).cancelDialog();
@@ -61,8 +62,8 @@ class _NfcEventCommandListener {
   void _show(BuildContext context, Widget child) async {
     final notifier = _ref.read(nfcViewNotifier.notifier);
     notifier.update(child);
-    if (!_ref.read(nfcViewNotifier.select((s) => s.isShowing))) {
+    if (!visible) {
-      notifier.setShowing(true);
+      visible = true;
       final result = await showModalBottomSheet(
           context: context,
           builder: (BuildContext context) {
@@ -72,18 +73,22 @@ class _NfcEventCommandListener {
         // the modal sheet was cancelled by Back button, close button or dismiss
         _ref.read(androidDialogProvider.notifier).cancelDialog();
       }
-      notifier.setShowing(false);
+      visible = false;
     }
   }
 
   void _hide(BuildContext context, Duration timeout) {
     Future.delayed(timeout, () {
       _ref.read(withContextProvider)((context) async {
-        if (_ref.read(nfcViewNotifier.select((s) => s.isShowing))) {
+        if (visible) {
           Navigator.of(context).pop('HIDDEN');
-          _ref.read(nfcViewNotifier.notifier).setShowing(false);
+          visible = false;
         }
       });
     });
   }
+
+  bool get visible => _ref.read(nfcViewNotifier.select((s) => s.isShowing));
+  set visible(bool showing) =>
+      _ref.read(nfcViewNotifier.notifier).setShowing(showing);
 }

lib/android/views/nfc/nfc_auto_close_widget.dart

@@ -22,18 +22,20 @@ import 'models.dart';
 import 'nfc_activity_overlay.dart';
 import 'nfc_content_widget.dart';
 
-NfcEventCommand autoClose({
+NfcEventCommand autoClose(
-  String? title,
+        {String? title,
-  String? subtitle,
+        String? subtitle,
-  Widget? icon,
+        Widget? icon,
-}) =>
+        bool showIfHidden = true}) =>
-    updateNfcView(_NfcAutoCloseWidget(
+    setNfcView(
-      child: NfcContentWidget(
+        _NfcAutoCloseWidget(
-        title: title,
+          child: NfcContentWidget(
-        subtitle: subtitle,
+            title: title,
-        icon: icon,
+            subtitle: subtitle,
-      ),
+            icon: icon,
-    ));
+          ),
+        ),
+        showIfHidden: showIfHidden);
 
 class _NfcAutoCloseWidget extends ConsumerWidget {
   final Widget child;
@@ -44,7 +46,7 @@ class _NfcAutoCloseWidget extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     ref.listen(androidNfcActivityProvider, (previous, current) {
       if (current == NfcActivity.ready) {
-        ref.read(nfcEventCommandNotifier.notifier).sendCommand(hideNfcView(0));
+        ref.read(nfcEventCommandNotifier.notifier).sendCommand(hideNfcView());
       }
     });
 

lib/android/views/nfc/nfc_count_down_close_widget.dart

@@ -30,7 +30,7 @@ NfcEventCommand countDownClose({
   String? subtitle,
   Widget? icon,
 }) =>
-    updateNfcView(_CountDownCloseWidget(
+    setNfcView(_CountDownCloseWidget(
       closeInSec: closeInSec,
       child: NfcContentWidget(
         title: title,
@@ -109,6 +109,6 @@ class _CountDownCloseWidgetState extends ConsumerState<_CountDownCloseWidget> {
   }
 
   void hideNow() {
-    ref.read(nfcEventCommandNotifier.notifier).sendCommand(hideNfcView(0));
+    ref.read(nfcEventCommandNotifier.notifier).sendCommand(hideNfcView());
   }
 }

lib/l10n/app_de.arb

@@ -949,6 +949,7 @@
     "s_nfc_accessing_yubikey": null,
     "s_nfc_scan_yubikey": null,
     "s_nfc_scan_again": null,
+    "s_nfc_scan_success": null,
 
     "c_nfc_unlock": null,
     "s_nfc_unlock_processing": null,

lib/l10n/app_en.arb

@@ -949,6 +949,7 @@
     "s_nfc_accessing_yubikey": "Accessing YubiKey",
     "s_nfc_scan_yubikey": "Scan your YubiKey",
     "s_nfc_scan_again": "Scan again",
+    "s_nfc_scan_success": "Scanned your Yubikey",
 
     "c_nfc_unlock": "unlock",
     "s_nfc_unlock_processing": "Unlocking",

lib/l10n/app_fr.arb

@@ -949,6 +949,7 @@
     "s_nfc_accessing_yubikey": null,
     "s_nfc_scan_yubikey": null,
     "s_nfc_scan_again": null,
+    "s_nfc_scan_success": null,
 
     "c_nfc_unlock": null,
     "s_nfc_unlock_processing": null,

lib/l10n/app_ja.arb

@@ -949,6 +949,7 @@
     "s_nfc_accessing_yubikey": null,
     "s_nfc_scan_yubikey": null,
     "s_nfc_scan_again": null,
+    "s_nfc_scan_success": null,
 
     "c_nfc_unlock": null,
     "s_nfc_unlock_processing": null,

lib/l10n/app_pl.arb

@@ -949,6 +949,7 @@
     "s_nfc_accessing_yubikey": null,
     "s_nfc_scan_yubikey": null,
     "s_nfc_scan_again": null,
+    "s_nfc_scan_success": null,
 
     "c_nfc_unlock": null,
     "s_nfc_unlock_processing": null,

lib/l10n/app_vi.arb

@@ -949,6 +949,7 @@
     "s_nfc_accessing_yubikey": null,
     "s_nfc_scan_yubikey": null,
     "s_nfc_scan_again": null,
+    "s_nfc_scan_success": null,
 
     "c_nfc_unlock": null,
     "s_nfc_unlock_processing": null,