update beta dialog code to follow common pattern

integration_test/android/beta_welcome_dialog_test.dart

@@ -3,7 +3,7 @@ import 'package:integration_test/integration_test.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:yubico_authenticator/android/keys.dart' as keys;
 
-import '../test_util.dart';
+import '../android/util.dart' as android_test_util;
 import 'constants.dart';
 
 void main() {
@@ -11,29 +11,28 @@ void main() {
   binding.framePolicy = LiveTestWidgetsFlutterBindingFramePolicy.fullyLive;
 
   group('Beta welcome dialog', () {
-
-    // this is here to make sure yubikey is connected before we test the dialog
-    testWidgets('startup', (WidgetTester tester) async {
-      await tester.startUp({
-        'dlg.beta.enabled': false,
-      });
-    });
-
     testWidgets('shows welcome screen', (WidgetTester tester) async {
-      await tester.startUp({
+      await android_test_util.startUp(tester, {
         'dlg.beta.enabled': true,
+        'needs_yubikey': false,
       });
 
       expect(find.byKey(keys.betaDialogView), findsOneWidget);
     });
 
     testWidgets('does not show welcome dialog', (WidgetTester tester) async {
-      await tester.startUp();
+      await android_test_util.startUp(tester, {
+        'dlg.beta.enabled': false,
+        'needs_yubikey': false,
+      });
       expect(find.byKey(keys.betaDialogView), findsNothing);
     });
 
     testWidgets('updates preferences', (WidgetTester tester) async {
-      await tester.startUp({'dlg.beta.enabled': true});
+      await android_test_util.startUp(tester, {
+        'dlg.beta.enabled': true,
+        'needs_yubikey': false,
+      });
       var prefs = await SharedPreferences.getInstance();
       await tester.tap(find.byKey(keys.okButton));
       await expectLater(prefs.getBool(betaDialogPrefName), equals(false));

integration_test/android/util.dart

@@ -22,11 +22,15 @@ Future<void> startUp(WidgetTester tester,
 
   await tester.pumpWidget(await initialize());
 
+  // only wait for yubikey connection when needed
+  // needs_yubikey defaults to true
+  if (startUpParams['needs_yubikey'] != false) {
     // wait for a YubiKey connection
     await tester.waitForFinder(find.descendant(
         of: tester.findDeviceButton(),
         matching: find.byWidgetPredicate((widget) =>
             widget is DeviceAvatar && widget.key != app_keys.noDeviceAvatar)));
+  }
 
   await tester.pump(const Duration(milliseconds: 500));
 }

lib/android/init.dart

@@ -65,8 +65,8 @@ Future<Widget> initialize() async {
           /// initializes global handler for dialogs
           ref.read(androidDialogProvider);
 
-          var betaDialog = BetaDialog(context, ref);
-          betaDialog.request();
+          /// if the beta dialog was not shown yet, this will show it
+          requestBetaDialog(ref);
 
           return const MainPage();
         },

lib/android/views/beta_dialog.dart

@@ -2,34 +2,79 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../../app/message.dart';
+import '../../app/state.dart';
 import '../../core/state.dart';
 import '../keys.dart' as keys;
 
-class BetaDialog {
-  final BuildContext context;
-  final WidgetRef ref;
-
-  const BetaDialog(this.context, this.ref);
-
-  void request() {
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
+void requestBetaDialog(WidgetRef ref) async {
+  const String prefBetaDialogShouldBeShown = 'prefBetaDialogShouldBeShown';
   var sharedPrefs = ref.read(prefProvider);
   await sharedPrefs.reload();
   var dialogShouldBeShown =
       sharedPrefs.getBool(prefBetaDialogShouldBeShown) ?? true;
   if (dialogShouldBeShown) {
-        Future.delayed(const Duration(milliseconds: 100), () async {
-          await showBetaDialog();
-        });
-      }
-    });
-  }
+    final withContext = ref.read(withContextProvider);
 
-  Future<void> showBetaDialog() async {
+    await withContext(
+      (context) async {
         await showBlurDialog(
           context: context,
-      builder: (context) {
+          builder: (context) => const _BetaDialog(),
+          routeSettings: const RouteSettings(name: 'android_beta_dialog'),
+        );
+      },
+    );
+
+    await sharedPrefs.setBool(prefBetaDialogShouldBeShown, false);
+  }
+}
+
+class _BetaDialog extends StatefulWidget {
+  const _BetaDialog();
+
+  @override
+  State<StatefulWidget> createState() => _BetaDialogState();
+}
+
+class _BetaDialogState extends State<_BetaDialog> {
+  late FocusScopeNode _focus;
+
+  @override
+  void initState() {
+    super.initState();
+    _focus = FocusScopeNode();
+  }
+
+  @override
+  void dispose() {
+    _focus.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // This keeps the focus in the dialog, even if the underlying page
+    // changes as it does when a new device is selected.
+    return FocusScope(
+      node: _focus,
+      autofocus: true,
+      onFocusChange: (focused) {
+        if (!focused) {
+          _focus.requestFocus();
+        }
+      },
+      child: const _BetaDialogContent(),
+    );
+  }
+}
+
+class _BetaDialogContent extends ConsumerWidget {
+  const _BetaDialogContent();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
     final isDarkTheme = Theme.of(context).brightness == Brightness.dark;
+
     return WillPopScope(
       onWillPop: () async => false,
       child: AlertDialog(
@@ -49,8 +94,10 @@ class BetaDialog {
             const SizedBox(height: 24),
             Text(
               'Welcome to Yubico Authenticator Beta!',
-                  style: Theme.of(context).textTheme.headlineMedium?.copyWith(
-                      color: isDarkTheme ? Colors.white : Colors.black),
+              style: Theme.of(context)
+                  .textTheme
+                  .headlineMedium
+                  ?.copyWith(color: isDarkTheme ? Colors.white : Colors.black),
               textAlign: TextAlign.center,
             ),
             const SizedBox(height: 24),
@@ -86,19 +133,11 @@ class BetaDialog {
                     ?.copyWith(fontWeight: FontWeight.bold),
               ),
               child: const Text('Got it'),
-                onPressed: () => onBetaDialogClosed(context, ref),
+              onPressed: () => Navigator.of(context)
+                  .pop(true) //{}, //onBetaDialogClosed(context, ref),
               ),
         ],
       ),
     );
-      },
-    );
-  }
-
-  final String prefBetaDialogShouldBeShown = 'prefBetaDialogShouldBeShown';
-
-  void onBetaDialogClosed(BuildContext context, WidgetRef ref) async {
-    Navigator.of(context).pop(true);
-    await ref.read(prefProvider).setBool(prefBetaDialogShouldBeShown, false);
   }
 }

lib/app/views/main_page.dart

@@ -26,6 +26,7 @@ class MainPage extends ConsumerWidget {
       Navigator.of(context).popUntil((route) {
         return route.isFirst ||
             [
+              'android_beta_dialog',
               'device_picker',
               'settings',
               'about',