Merge pull request #689 from atsign-foundation/hamdaan-improve-pubsco…

…re-atonboarding fix: improve pub score of at_onboarding_flutter
atsign-foundation · Jun 27, 2023 · 283536d · 283536d
2 parents 92730f5 + 18b78cf
commit 283536d
Show file tree

Hide file tree

Showing 22 changed files with 89 additions and 69 deletions.
diff --git a/packages/at_onboarding_flutter/example/lib/main.dart b/packages/at_onboarding_flutter/example/lib/main.dart
@@ -38,7 +38,7 @@ class _MyAppState extends State<MyApp> {
   AtClientPreference? atClientPreference;
 
   bool isChangeLanguage = false;
-  var _currentLocale = Locale('en', '');
+  var _currentLocale = const Locale('en', '');
 
   @override
   Widget build(BuildContext context) {
@@ -169,7 +169,6 @@ class _MyAppState extends State<MyApp> {
                         DropdownButton(
                           onChanged: (value) {
                             setState(() {
-                              print(value);
                               value == 'en'
                                   ? _currentLocale = const Locale('en')
                                   : _currentLocale = const Locale('fr');

diff --git a/packages/at_onboarding_flutter/example/lib/switch_atsign.dart b/packages/at_onboarding_flutter/example/lib/switch_atsign.dart
@@ -164,9 +164,9 @@ class _AtSignBottomSheetState extends State<AtSignBottomSheet> {
           ),
         ),
         isLoading
-            ? Center(
+            ? const Center(
                 child: Column(
-                  children: const [
+                  children: [
                     Text(
                       'Switching atsign...',
                       style: TextStyle(

diff --git a/packages/at_onboarding_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/at_onboarding_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -7,16 +7,18 @@ import Foundation
 
 import at_file_saver
 import biometric_storage
+import device_info_plus
 import file_selector_macos
 import package_info_plus
-import path_provider_macos
+import path_provider_foundation
 import share_plus_macos
 import shared_preferences_foundation
 import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   FileSaverPlugin.register(with: registry.registrar(forPlugin: "FileSaverPlugin"))
   BiometricStorageMacOSPlugin.register(with: registry.registrar(forPlugin: "BiometricStorageMacOSPlugin"))
+  DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
   FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))

diff --git a/packages/at_onboarding_flutter/example/pubspec.yaml b/packages/at_onboarding_flutter/example/pubspec.yaml
@@ -46,6 +46,7 @@ dependency_overrides:
   at_onboarding_flutter:
     path: ../
   at_client_mobile: ^3.2.9
+  intl: ^0.18.0
     # When depending on this package from a real application you should use in the dependencies section here we have used in dev_dependencies section:
     #   at_onboarding_flutter: ^x.y.z
     # See https://dart.dev/tools/pub/dependencies#version-constraints

diff --git a/packages/at_onboarding_flutter/lib/at_onboarding.dart b/packages/at_onboarding_flutter/lib/at_onboarding.dart
@@ -65,10 +65,12 @@ class AtOnboarding {
 
       if (result is AtOnboardingResult) {
         return result;
-      } else {
-        return AtOnboardingResult.cancelled();
-      }
-    } else {
+      } 
+
+      return AtOnboardingResult.cancelled();
+    } 
+
+    if (context.mounted){
       final result = await Navigator.push(
         context,
         MaterialPageRoute(
@@ -78,7 +80,7 @@ class AtOnboarding {
             );
           },
         ),
-      );
+      ); 
 
       if (result is AtOnboardingResult) {
         //Update primary atsign after onboard success
@@ -87,10 +89,10 @@ class AtOnboarding {
           await changePrimaryAtsign(atsign: result.atsign!);
         }
         return result;
-      } else {
-        return AtOnboardingResult.cancelled();
-      }
+      } 
     }
+
+    return AtOnboardingResult.cancelled();
   }
 
   static Future<AtOnboardingResult> activateAccount({
@@ -99,22 +101,26 @@ class AtOnboarding {
   }) async {
     /// Initial Setup
     await _initialSetup(context);
-    final result = await Navigator.push(
-      context,
-      MaterialPageRoute(
-        builder: (BuildContext context) {
-          return AtOnboardingActivateScreen(
-            hideReferences: false,
-            config: config,
-          );
-        },
-      ),
-    );
-    if (result is AtOnboardingResult) {
-      return result;
-    } else {
-      return AtOnboardingResult.cancelled();
+
+    if(context.mounted){
+      final result = await Navigator.push(
+        context,
+        MaterialPageRoute(
+          builder: (BuildContext context) {
+            return AtOnboardingActivateScreen(
+              hideReferences: false,
+              config: config,
+            );
+          },
+        ),
+      );
+
+      if (result is AtOnboardingResult) {
+        return result;
+      }
     }
+
+    return AtOnboardingResult.cancelled();
   }
 
   static Future<bool> changePrimaryAtsign({required String atsign}) async {
@@ -129,15 +135,18 @@ class AtOnboarding {
     /// Initial Setup
     await _initialSetup(context);
 
-    final result = await Navigator.push(context,
-        MaterialPageRoute(builder: (BuildContext context) {
-      return AtOnboardingResetScreen(config: config);
-    }));
-    if (result is AtOnboardingResetResult) {
-      return result;
-    } else {
-      return AtOnboardingResetResult.cancelled;
+    if(context.mounted){
+      final result = await Navigator.push(context,
+          MaterialPageRoute(builder: (BuildContext context) {
+        return AtOnboardingResetScreen(config: config);
+      }));
+
+      if (result is AtOnboardingResetResult) {
+        return result;
+      }
     }
+
+    return AtOnboardingResetResult.cancelled;
   }
 
   Future<bool> enableUsingSharedStorage() async {

diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_accounts_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_accounts_screen.dart
@@ -87,8 +87,7 @@ class _AtOnboardingAccountsScreenState
                   children: <Widget>[
                     Text(
                       widget.message ??
-                          AtOnboardingLocalizations.current
-                              .title_select_atSign,
+                          AtOnboardingLocalizations.current.title_select_atSign,
                       style: const TextStyle(
                         fontWeight: FontWeight.bold,
                         fontSize: AtOnboardingDimens.fontNormal,
@@ -168,18 +167,18 @@ class _AtOnboardingAccountsScreenState
         child: AlertDialog(
           content: RichText(
             text: TextSpan(
-              style: theme.textTheme.bodyText1,
+              style: theme.textTheme.bodyLarge,
               children: <InlineSpan>[
                 TextSpan(
-                  text: AtOnboardingLocalizations.current
-                      .title_pair_atSign_prev,
+                  text:
+                      AtOnboardingLocalizations.current.title_pair_atSign_prev,
                 ),
                 TextSpan(
                     text: ' $atsign ',
                     style: const TextStyle(fontWeight: FontWeight.bold)),
                 TextSpan(
-                  text: AtOnboardingLocalizations.current
-                      .title_pair_atSign_next,
+                  text:
+                      AtOnboardingLocalizations.current.title_pair_atSign_next,
                 )
               ],
             ),

diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_activate_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_activate_screen.dart
@@ -70,8 +70,7 @@ class _AtOnboardingActivateScreenState
         child: Scaffold(
           appBar: AppBar(
             title: Text(
-              AtOnboardingLocalizations.current
-                  .title_setting_up_your_atSign,
+              AtOnboardingLocalizations.current.title_setting_up_your_atSign,
             ),
             actions: [
               IconButton(
@@ -97,8 +96,7 @@ class _AtOnboardingActivateScreenState
                   ),
                   const SizedBox(height: 10),
                   Text(
-                    AtOnboardingLocalizations.current
-                        .msg_wait_fetching_atSign,
+                    AtOnboardingLocalizations.current.msg_wait_fetching_atSign,
                   ),
                 ],
               ),

diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_generate_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_generate_screen.dart
@@ -447,8 +447,7 @@ class _AtOnboardingGenerateScreenState
         message: AtOnboardingLocalizations.current.processing,
       );
       await Future.delayed(const Duration(milliseconds: 400));
-      bool isExist =
-          await _onboardingService.isExistingAtsign(verifiedAtSign);
+      bool isExist = await _onboardingService.isExistingAtsign(verifiedAtSign);
 
       if (isExist) {
         _inprogressDialog.close();

diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_otp_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_otp_screen.dart
@@ -198,7 +198,7 @@ class _AtOnboardingOTPScreenState extends State<AtOnboardingOTPScreen> {
                         children: <TextSpan>[
                           TextSpan(
                             text: AtOnboardingLocalizations.current.note,
-                            style: theme.textTheme.bodyText2?.copyWith(
+                            style: theme.textTheme.bodyMedium?.copyWith(
                               fontSize: AtOnboardingDimens.fontSmall,
                               height: 1.5,
                               fontWeight: FontWeight.bold,
@@ -207,7 +207,7 @@ class _AtOnboardingOTPScreenState extends State<AtOnboardingOTPScreen> {
                           TextSpan(
                             text: AtOnboardingLocalizations
                                 .current.note_otp_content,
-                            style: theme.textTheme.bodyText2?.copyWith(
+                            style: theme.textTheme.bodyMedium?.copyWith(
                               fontSize: AtOnboardingDimens.fontSmall,
                               height: 1.5,
                             ),
@@ -620,4 +620,4 @@ class _AtOnboardingOTPScreenState extends State<AtOnboardingOTPScreen> {
       },
     );
   }
-}
+}
diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_pair_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_pair_screen.dart
@@ -211,6 +211,7 @@ class _AtOnboardingPairScreenState extends State<AtOnboardingPairScreen> {
       if (status) {
         _showOTPScreen();
       } else {
+        if (!mounted) return;
         AtOnboardingDialog.showError(
           context: context,
           message: AtOnboardingLocalizations.current.error_please_enter_email,
@@ -249,6 +250,7 @@ class _AtOnboardingPairScreenState extends State<AtOnboardingPairScreen> {
       if (errorMessage.contains('maximum number of free atSigns')) {
         await showlimitDialog();
       } else {
+        if (!mounted) return status;
         AtOnboardingDialog.showError(context: context, message: errorMessage);
       }
     }
@@ -346,8 +348,10 @@ class _AtOnboardingPairScreenState extends State<AtOnboardingPairScreen> {
         data = response.body;
         data = jsonDecode(data);
         String errorMessage = data['message'];
+        if (!mounted) return;
         AtOnboardingDialog.showError(context: context, message: errorMessage);
       }
+      if (!mounted) return;
       final result2 = await AtOnboardingOTPScreen.push(
         context: context,
         atSign: result.atSign,

diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_qrcode_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_qrcode_screen.dart
@@ -190,6 +190,7 @@ class _AtOnboardingQRCodeScreenState extends State<AtOnboardingQRCodeScreen> {
         );
       } else {
         await _controller?.pauseCamera();
+        if (!mounted) return;
         await AtOnboardingDialog.showError(
           context: context,
           message: AtOnboardingLocalizations.current.invalid_QR,

diff --git a/packages/at_onboarding_flutter/lib/screen/at_onboarding_start_screen.dart b/packages/at_onboarding_flutter/lib/screen/at_onboarding_start_screen.dart
@@ -82,6 +82,7 @@ class _AtOnboardingStartScreenState extends State<AtOnboardingStartScreen> {
         if (!mounted) return;
         Navigator.pop(context, result);
       } else if (e == OnboardingStatus.ACTIVATE) {
+        if (!mounted) return;
         final result = await AtOnboarding.activateAccount(
           context: context,
           config: widget.config,

diff --git a/packages/at_onboarding_flutter/lib/services/at_onboarding_backup_service.dart b/packages/at_onboarding_flutter/lib/services/at_onboarding_backup_service.dart
@@ -7,7 +7,7 @@ class AtOnboardingBackupService {
   AtOnboardingBackupService._();
 
   static final AtOnboardingBackupService _instance =
-  AtOnboardingBackupService._();
+      AtOnboardingBackupService._();
 
   static AtOnboardingBackupService get instance => _instance;
 

diff --git a/packages/at_onboarding_flutter/lib/services/at_onboarding_tutorial_service.dart b/packages/at_onboarding_flutter/lib/services/at_onboarding_tutorial_service.dart
@@ -4,9 +4,17 @@ import 'package:shared_preferences/shared_preferences.dart';
 const int _tutorialVersion = 2;
 
 enum AtOnboardingTutorialDisplay {
-  normal, /// show once
-  always, /// always show tutorial when opening app
-  never, /// never show tutorial when opening app
+  normal,
+
+  /// show once
+
+  always,
+
+  /// always show tutorial when opening app
+
+  never,
+
+  /// never show tutorial when opening app
 }
 
 class AtTutorialServiceInfo {
@@ -29,10 +37,10 @@ class AtTutorialServiceInfo {
   }
 
   Map<String, dynamic> toJson() => {
-    "versionInfo": versionInfo,
-    "hasShowSignInPage": hasShowSignInPage,
-    "hasShowSignUpPage": hasShowSignUpPage,
-  };
+        "versionInfo": versionInfo,
+        "hasShowSignInPage": hasShowSignInPage,
+        "hasShowSignUpPage": hasShowSignUpPage,
+      };
 }
 
 class AtOnboardingTutorialService {

diff --git a/packages/at_onboarding_flutter/lib/utils/at_onboarding_strings.dart b/packages/at_onboarding_flutter/lib/utils/at_onboarding_strings.dart
@@ -3,4 +3,4 @@ class AtOnboardingStrings {
   static const String atsignHintText = 'alice';
   static const String _basepath = 'assets/images';
   static const String backupZip = '$_basepath/backup_key.png';
-}
+}
diff --git a/packages/at_onboarding_flutter/lib/widgets/at_onboarding_dialog.dart b/packages/at_onboarding_flutter/lib/widgets/at_onboarding_dialog.dart
@@ -79,4 +79,4 @@ class _AtOnboardingDialogState extends State<AtOnboardingDialog> {
       actions: widget.actions,
     );
   }
-}
+}
diff --git a/packages/at_onboarding_flutter/pubspec.yaml b/packages/at_onboarding_flutter/pubspec.yaml
@@ -45,8 +45,7 @@ dependencies:
   at_utils: ^3.0.12
   at_sync_ui_flutter: ^1.0.1
 
-dependency_overrides:
-  package_info_plus: ^3.0.0
+
 
 dev_dependencies:
   flutter_test:
@@ -55,6 +54,7 @@ dev_dependencies:
   mocktail: ^0.3.0
 
 
+
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 # The following section is specific to Flutter.

diff --git a/packages/at_onboarding_flutter/test/screens/at_onboarding_generate_screen_test.dart b/packages/at_onboarding_flutter/test/screens/at_onboarding_generate_screen_test.dart
@@ -25,6 +25,7 @@ void main() {
     onboardingDataTest = OnboardingDataTest();
   });
 
+  // ignore: unused_element
   Widget _defaultApp({
     ThemeData? theme,
   }) {

diff --git a/packages/at_onboarding_flutter/test/screens/at_onboarding_reference_screen_test.dart b/packages/at_onboarding_flutter/test/screens/at_onboarding_reference_screen_test.dart
@@ -13,6 +13,7 @@ void main() {
     onboardingDataTest = OnboardingDataTest();
   });
 
+  // ignore: unused_element
   Widget _defaultApp({
     ThemeData? theme,
   }) {

diff --git a/packages/at_onboarding_flutter/test/services/onboarding_service_test.dart b/packages/at_onboarding_flutter/test/services/onboarding_service_test.dart
@@ -63,7 +63,6 @@ void main() {
 
   group("test formatAtSign Func", () {
     test("formatAtSign don't @", () {
-
       final result = onboardingService.formatAtSign(
         "@${onboardingDataTest.atSignTest}",
       );