feat(network-checker): single utils in client

Signed-off-by: Kapdroid <kapdroid@Kapdroids-MacBook-Pro.local>

Author: Kapdroid

example2/lib/di/injector.dart

@@ -3,23 +3,14 @@ import 'package:fa_flutter_core/fa_flutter_core.dart';
 
 import '../interceptor/auth_interceptor.dart';
 import '../interceptor/logging_interceptor.dart';
-import '../interceptor/network/network_info.dart';
-import '../interceptor/network_interceptor.dart';
 
 const _debugBaseUrl = 'https://fa-maapins-debug.fieldassist.io/api/';
 
 final locator = GetIt.instance;
 
 class Injector {
   Future<void> init() async {
-    locator.registerLazySingleton<NetworkInfo>(
-      () => NetworkInfoImpl(
-        connectionChecker: InternetConnectionChecker.instance,
-      ),
-    );
-
     final interceptors = [
-      MyNetworkInterceptor(networkInfo: locator()),
       MyAuthInterceptor(),
       // ErrorInterceptor(),
       MyLoggingInterceptor(),

example2/lib/interceptor/network/network_info.dart

@@ -11,3 +11,4 @@ export 'src/api_options/api_options.dart';
 export 'src/interceptors/cache_interceptor.dart';
 export 'src/interceptors/cancel_token_interceptor.dart';
 export 'src/interceptors/refresh_token_interceptor.dart';
+export 'src/utils/network_checker.dart';

example2/lib/interceptor/network_interceptor.dart

@@ -1,5 +1,7 @@
 import 'package:dio/dio.dart';
+import 'package:fa_flutter_core/fa_flutter_core.dart';
 
+import '../../fa_flutter_api_client.dart';
 import '../exceptions/errors.dart';
 
 abstract class NetworkInterceptor extends Interceptor {
@@ -8,7 +10,7 @@ abstract class NetworkInterceptor extends Interceptor {
     RequestOptions options,
     RequestInterceptorHandler handler,
   ) async {
-    final isConnected = await isInternetConnected();
+    final isConnected = await NetworkConnectivityService.instance.isConnected;
     if (!isConnected) {
       // Intentional delay to mimic making server request behavior
       await Future.delayed(getDelay());
@@ -27,6 +29,4 @@ abstract class NetworkInterceptor extends Interceptor {
   Duration getDelay() {
     return Duration(milliseconds: 500);
   }
-
-  Future<bool> isInternetConnected();
 }

lib/fa_flutter_api_client.dart

@@ -0,0 +1,24 @@
+import 'package:internet_connection_checker/internet_connection_checker.dart';
+
+class NetworkConnectivityService {
+  NetworkConnectivityService._internal()
+      : connectionChecker = InternetConnectionChecker.createInstance(
+          addresses: [
+            AddressCheckOption(uri: Uri.parse('https://www.google.com')),
+            AddressCheckOption(uri: Uri.parse('https://www.bing.com')),
+            AddressCheckOption(uri: Uri.parse('https://www.amazon.com')),
+            AddressCheckOption(uri: Uri.parse('https://www.cloudflare.com')),
+          ],
+        );
+
+  static NetworkConnectivityService? _instance;
+
+  static NetworkConnectivityService get instance {
+    _instance ??= NetworkConnectivityService._internal();
+    return _instance!;
+  }
+
+  final InternetConnectionChecker connectionChecker;
+
+  Future<bool> get isConnected => connectionChecker.hasConnection;
+}