fix deprecations in android qr scanner views

Yubico · Nov 23, 2023 · 4438183 · 4438183
1 parent be19eb1
commit 4438183
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/lib/android/qr_scanner/qr_scanner_permissions_view.dart b/lib/android/qr_scanner/qr_scanner_permissions_view.dart
@@ -19,6 +19,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:yubico_authenticator/android/qr_scanner/qr_scanner_provider.dart';
 
 import 'qr_scanner_scan_status.dart';
+import 'qr_scanner_widgets.dart';
 
 class QRScannerPermissionsUI extends StatelessWidget {
   final ScanStatus status;
@@ -56,11 +57,7 @@ class QRScannerPermissionsUI extends StatelessWidget {
                     children: [
                       Column(
                         children: [
-                          Text(
-                            l10n.q_want_to_scan,
-                            textScaleFactor: 0.7,
-                            style: const TextStyle(color: Colors.white),
-                          ),
+                          SmallWhiteText(l10n.q_want_to_scan),
                           OutlinedButton(
                               onPressed: () {
                                 onPermissionRequest();
@@ -78,11 +75,7 @@ class QRScannerPermissionsUI extends StatelessWidget {
                     mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                     children: [
                       Column(children: [
-                        Text(
-                          l10n.q_have_account_info,
-                          textScaleFactor: 0.7,
-                          style: const TextStyle(color: Colors.white),
-                        ),
+                        SmallWhiteText(l10n.q_have_account_info),
                       ])
                     ]),
                 Row(

diff --git a/lib/android/qr_scanner/qr_scanner_ui_view.dart b/lib/android/qr_scanner/qr_scanner_ui_view.dart
@@ -16,10 +16,11 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:yubico_authenticator/android/qr_scanner/qr_scanner_provider.dart';
 
 import '../keys.dart' as keys;
+import 'qr_scanner_provider.dart';
 import 'qr_scanner_scan_status.dart';
+import 'qr_scanner_widgets.dart';
 
 class QRScannerUI extends StatelessWidget {
   final ScanStatus status;
@@ -69,11 +70,7 @@ class QRScannerUI extends StatelessWidget {
               const SizedBox(height: 16),
               Column(
                 children: [
-                  Text(
-                    l10n.q_no_qr,
-                    textScaleFactor: 0.7,
-                    style: const TextStyle(color: Colors.white),
-                  ),
+                  SmallWhiteText(l10n.q_no_qr),
                   Row(mainAxisAlignment: MainAxisAlignment.center, children: [
                     OutlinedButton(
                         onPressed: () {

diff --git a/lib/android/qr_scanner/qr_scanner_widgets.dart b/lib/android/qr_scanner/qr_scanner_widgets.dart
@@ -0,0 +1,16 @@
+import 'package:flutter/material.dart';
+
+class SmallWhiteText extends StatelessWidget {
+  final String _text;
+
+  const SmallWhiteText(this._text, {super.key});
+
+  @override
+  Widget build(BuildContext context) => Text(
+        _text,
+        style: Theme.of(context)
+            .textTheme
+            .bodySmall
+            ?.copyWith(color: Colors.white),
+      );
+}