Merge pull request #33 from NextFaze/fix/flutter_analyze

Fix flutter analyze error and warning
NextFaze · Jan 12, 2024 · 7bb629c · 7bb629c
2 parents 25c7757 + 2a1cd02
commit 7bb629c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 22 deletions.
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -4,16 +4,15 @@ import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_remote_config/firebase_remote_config.dart';
 import 'package:flutter/material.dart';
 import 'package:manup/manup.dart';
-import 'package:manup/src/firebase_remote_config_man_up_service.dart';
-
-// generated with flutterfire_cli
-import 'firebase_options.dart';
 
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
   await Firebase.initializeApp(
-    options: DefaultFirebaseOptions.currentPlatform,
-  );
+      // You can get DefaultFirebaseOptions from the generated file(firebase_options.dart)
+      // from flutterfire_cli
+
+      // options: DefaultFirebaseOptions.currentPlatform,
+      );
 
   runApp(const MyApp());
 }

diff --git a/lib/manup.dart b/lib/manup.dart
@@ -1,18 +1,22 @@
 library manup;
 
+import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:firebase_remote_config/firebase_remote_config.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:http/http.dart' as http;
+import 'package:http/http.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:pub_semver/pub_semver.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 part 'src/config_storage.dart';
 part 'src/exception.dart';
+part 'src/firebase_remote_config_man_up_service.dart';
+part 'src/http_man_up_service.dart';
 part 'src/man_up_delegate.dart';
 part 'src/man_up_os.dart';
 part 'src/man_up_service.dart';

diff --git a/lib/src/firebase_remote_config_man_up_service.dart b/lib/src/firebase_remote_config_man_up_service.dart
@@ -1,9 +1,4 @@
-import 'dart:async';
-import 'dart:convert';
-
-import 'package:firebase_remote_config/firebase_remote_config.dart';
-import 'package:flutter/foundation.dart';
-import 'package:manup/manup.dart';
+part of manup;
 
 class FireBaseRemoteConfigManUpService extends ManUpService {
   final FirebaseRemoteConfig remoteConfig;

diff --git a/lib/src/http_man_up_service.dart b/lib/src/http_man_up_service.dart
@@ -1,8 +1,4 @@
-import 'dart:convert';
-
-import 'package:flutter/foundation.dart';
-import 'package:http/http.dart';
-import 'package:manup/manup.dart';
+part of manup;
 
 class HttpManUpService extends ManUpService {
   final String url;

diff --git a/lib/src/ui/man_up_app_dialog.dart b/lib/src/ui/man_up_app_dialog.dart
@@ -12,8 +12,8 @@ class ManUpAppDialog {
         barrierDismissible: barrierDismissible,
         context: context,
         builder: (BuildContext context) {
-          return WillPopScope(
-            onWillPop: () => Future.value(barrierDismissible),
+          return PopScope(
+            onPopInvoked: (didPop) => Future.value(barrierDismissible),
             child: AlertDialog(
               title: Text(message ?? ""),
               actions: <Widget>[

diff --git a/test/firebase_remote_config_man_up_service_test.dart b/test/firebase_remote_config_man_up_service_test.dart
@@ -2,7 +2,6 @@ import 'dart:convert';
 
 import 'package:flutter_test/flutter_test.dart';
 import 'package:manup/manup.dart';
-import 'package:manup/src/firebase_remote_config_man_up_service.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 import 'package:package_info_plus/package_info_plus.dart';

diff --git a/test/http_man_up_service_test.dart b/test/http_man_up_service_test.dart
@@ -4,7 +4,6 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:http/http.dart' as http;
 import 'package:http/testing.dart';
 import 'package:manup/manup.dart';
-import 'package:manup/src/http_man_up_service.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 import 'package:package_info_plus/package_info_plus.dart';