From d0ba699d75e908a22444decf69febaa7fb82ca73 Mon Sep 17 00:00:00 2001
From: Paras <fs0c19ty@protonmail.com>
Date: Tue, 18 Jan 2022 09:45:23 +0530
Subject: [PATCH] fixed #4 and #7

---
 android/app/build.gradle                      |  12 +-
 android/app/src/main/AndroidManifest.xml      |   1 +
 android/build.gradle                          |   2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |   4 +-
 android/local.properties                      |   4 +-
 lib/generated_plugin_registrant.dart          |   1 +
 lib/main.dart                                 |  51 +++-
 lib/pages/home_page.dart                      | 250 ++++++++++++++++--
 lib/pages/host_scan_page.dart                 |  19 +-
 lib/pages/location_consent_page.dart          |  10 +-
 lib/pages/settings_page.dart                  |  78 +++---
 lib/pages/wifi_detail.dart                    | 242 -----------------
 pubspec.lock                                  |  26 +-
 pubspec.yaml                                  |   6 +-
 14 files changed, 366 insertions(+), 340 deletions(-)
 delete mode 100644 lib/pages/wifi_detail.dart

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 7b842ba5..2a6ce2f9 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -31,11 +31,8 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 30
-    
-    lintOptions {
-        checkReleaseBuilds false
-    }
+    compileSdkVersion 31
+
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
@@ -44,7 +41,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "org.fsociety.vernet"
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
@@ -78,6 +75,9 @@ android {
             versionNameSuffix "-store"
         }
     }
+    lint {
+        checkReleaseBuilds false
+    }
 }
 
 flutter {
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 730bf3dc..ea67ebbf 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -20,6 +20,7 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
diff --git a/android/build.gradle b/android/build.gradle
index bc151583..9bcdf5b2 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:7.1.0-rc01'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 49faed88..845108ed 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
-distributionSha256Sum=22449f5231796abd892c98b2a07c9ceebe4688d192cd2d6763f8e3bf8acbedeb
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+#distributionSha256Sum=22449f5231796abd892c98b2a07c9ceebe4688d192cd2d6763f8e3bf8acbedeb
diff --git a/android/local.properties b/android/local.properties
index e21692f3..7b9d2ded 100644
--- a/android/local.properties
+++ b/android/local.properties
@@ -1,5 +1,5 @@
 sdk.dir=/Users/paras/Library/Android/sdk
 flutter.sdk=/Users/paras/Development/flutter
 flutter.buildMode=debug
-flutter.versionName=1.0.0
-flutter.versionCode=9
\ No newline at end of file
+flutter.versionName=1.0.1
+flutter.versionCode=10
\ No newline at end of file
diff --git a/lib/generated_plugin_registrant.dart b/lib/generated_plugin_registrant.dart
index f7ac9644..a7b03493 100644
--- a/lib/generated_plugin_registrant.dart
+++ b/lib/generated_plugin_registrant.dart
@@ -2,6 +2,7 @@
 // Generated file. Do not edit.
 //
 
+// ignore_for_file: directives_ordering
 // ignore_for_file: lines_longer_than_80_chars
 
 import 'package:network_info_plus_web/network_info_plus_web.dart';
diff --git a/lib/main.dart b/lib/main.dart
index 30a73b4e..efd53453 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -4,6 +4,9 @@ import 'package:vernet/pages/location_consent_page.dart';
 import 'helper/app_settings.dart';
 import 'helper/consent_loader.dart';
 import 'models/dark_theme_provider.dart';
+import 'package:vernet/api/update_checker.dart';
+import 'package:vernet/pages/settings_page.dart';
+
 import 'pages/home_page.dart';
 
 late AppSettings appSettings;
@@ -50,10 +53,56 @@ class _MyAppState extends State<MyApp> {
             theme: themeChangeProvider.darkTheme
                 ? ThemeData.dark()
                 : ThemeData.light(),
-            home: widget.allowed ? HomePage() : LocationConsentPage(),
+            home: widget.allowed ? TabBarPage() : LocationConsentPage(),
           );
         },
       ),
     );
   }
 }
+
+class TabBarPage extends StatefulWidget {
+  TabBarPage({Key? key}) : super(key: key);
+  @override
+  _HomePageState createState() => _HomePageState();
+}
+
+class _HomePageState extends State<TabBarPage> {
+  int _currentIndex = 0;
+  void onTabTapped(int index) {
+    setState(() {
+      _currentIndex = index;
+    });
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    checkForUpdates(context);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final List<Widget> _children = [HomePage(), SettingsPage()];
+    return Scaffold(
+      body: Container(
+        padding: MediaQuery.of(context).padding,
+        child: _children[_currentIndex],
+      ),
+      bottomNavigationBar: BottomNavigationBar(
+        onTap: onTabTapped, // new
+        currentIndex: _currentIndex, // new
+        items: [
+          new BottomNavigationBarItem(
+            icon: Icon(Icons.home),
+            label: 'Home',
+          ),
+          new BottomNavigationBarItem(
+            icon: Icon(Icons.settings),
+            label: 'Settings',
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/pages/home_page.dart b/lib/pages/home_page.dart
index a2607879..6489907d 100644
--- a/lib/pages/home_page.dart
+++ b/lib/pages/home_page.dart
@@ -1,50 +1,248 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
-import 'package:vernet/api/update_checker.dart';
-import 'package:vernet/pages/settings_page.dart';
-import 'wifi_detail.dart';
+import 'package:network_info_plus/network_info_plus.dart';
+import 'package:permission_handler/permission_handler.dart';
+import 'package:url_launcher/url_launcher.dart';
+import 'package:vernet/api/isp_loader.dart';
+import 'package:vernet/models/internet_provider.dart';
+import 'package:vernet/models/wifi_info.dart';
+import 'package:vernet/pages/dns/dns_page.dart';
+import 'package:vernet/pages/dns/reverse_dns_page.dart';
+import 'package:vernet/pages/host_scan_page.dart';
+import 'package:vernet/pages/network_troubleshoot/ping_page.dart';
+import 'package:vernet/pages/network_troubleshoot/port_scan_page.dart';
+
+import '../ui/custom_tile.dart';
 
 class HomePage extends StatefulWidget {
-  HomePage({Key? key}) : super(key: key);
+  const HomePage({Key? key}) : super(key: key);
+
   @override
-  _HomePageState createState() => _HomePageState();
+  _WifiDetailState createState() => _WifiDetailState();
 }
 
-class _HomePageState extends State<HomePage> {
-  int _currentIndex = 0;
-  void onTabTapped(int index) {
+class _WifiDetailState extends State<HomePage> {
+  WifiInfo? _wifiInfo;
+  bool _location = false;
+
+  _getWifiInfo() async {
+    if (Platform.isAndroid) {
+      await Permission.location.request();
+    }
+
+    var wifiIP = await (NetworkInfo().getWifiIP());
+    var wifiBSSID = await (NetworkInfo().getWifiBSSID());
+    var wifiName = await (NetworkInfo().getWifiName());
+
     setState(() {
-      _currentIndex = index;
+      _wifiInfo = WifiInfo(wifiIP, wifiBSSID, wifiName, wifiName == null);
     });
+    if (Platform.isAndroid || Platform.isIOS) {
+      Permission.location.serviceStatus.isEnabled.then((value) => setState(() {
+            _location = value;
+          }));
+    }
   }
 
   @override
   void initState() {
     super.initState();
-    checkForUpdates(context);
+    _getWifiInfo();
   }
 
   @override
   Widget build(BuildContext context) {
-    final List<Widget> _children = [WifiDetail(), SettingsPage()];
-    return Scaffold(
-      body: Container(
-        padding: MediaQuery.of(context).padding,
-        child: _children[_currentIndex],
-      ),
-      bottomNavigationBar: BottomNavigationBar(
-        onTap: onTabTapped, // new
-        currentIndex: _currentIndex, // new
-        items: [
-          new BottomNavigationBarItem(
-            icon: Icon(Icons.home),
-            label: 'Home',
+    return SingleChildScrollView(
+      child: Column(
+        children: [
+          Card(
+            child: _wifiInfo == null
+                ? CircularProgressIndicator.adaptive()
+                : ListTile(
+                    minVerticalPadding: 10,
+                    leading: Icon(Icons.router),
+                    title: Text('${_wifiInfo!.name}'),
+                    subtitle: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text('Connected to ${_wifiInfo!.bssid}'),
+                        SizedBox(height: 5),
+                        _location
+                            ? SizedBox()
+                            : Text(
+                                'Location should be on to display Wifi name',
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .caption!
+                                    .copyWith(
+                                        color: Theme.of(context).accentColor),
+                              ),
+                        Divider(height: 3),
+                        SizedBox(height: 10),
+                        ElevatedButton(
+                          onPressed: () {
+                            Navigator.push(
+                              context,
+                              MaterialPageRoute(
+                                builder: (context) => HostScanPage(),
+                              ),
+                            );
+                          },
+                          child: Text('Scan for devices'),
+                        ),
+                      ],
+                    ),
+                    trailing: IconButton(
+                      icon: Icon(Icons.refresh),
+                      onPressed: () {
+                        _getWifiInfo();
+                      },
+                    ),
+                  ),
+          ),
+          Card(
+            child: ListTile(
+              leading: Icon(Icons.network_check),
+              title: Text('Network Troubleshooting'),
+              minVerticalPadding: 10,
+              subtitle: Column(
+                children: [
+                  SizedBox(height: 10),
+                  Row(
+                    children: [
+                      ElevatedButton.icon(
+                        onPressed: () {
+                          Navigator.push(
+                            context,
+                            MaterialPageRoute(
+                              builder: (context) => PingPage(),
+                            ),
+                          );
+                        },
+                        icon: Icon(Icons.trending_up),
+                        label: Text('Ping'),
+                      ),
+                      SizedBox(width: 10),
+                      ElevatedButton.icon(
+                        onPressed: () {
+                          Navigator.push(
+                            context,
+                            MaterialPageRoute(
+                              builder: (context) => PortScanPage(),
+                            ),
+                          );
+                        },
+                        icon: Icon(Icons.radar),
+                        label: Text('Scan open ports'),
+                      )
+                    ],
+                  ),
+                ],
+              ),
+            ),
           ),
-          new BottomNavigationBarItem(
-            icon: Icon(Icons.settings),
-            label: 'Settings',
+          Card(
+            child: ListTile(
+              leading: Icon(Icons.dns),
+              title: Text('Domain Name System (DNS)'),
+              minVerticalPadding: 10,
+              subtitle: Column(
+                children: [
+                  SizedBox(height: 10),
+                  Row(
+                    children: [
+                      ElevatedButton.icon(
+                        onPressed: () {
+                          Navigator.push(
+                            context,
+                            MaterialPageRoute(
+                              builder: (context) => DNSPage(),
+                            ),
+                          );
+                        },
+                        icon: Icon(Icons.search),
+                        label: Text('Lookup'),
+                      ),
+                      SizedBox(width: 10),
+                      ElevatedButton.icon(
+                        onPressed: () {
+                          Navigator.push(
+                            context,
+                            MaterialPageRoute(
+                              builder: (context) => ReverseDNSPage(),
+                            ),
+                          );
+                        },
+                        icon: Icon(Icons.find_replace),
+                        label: Text('Reverse Lookup'),
+                      )
+                    ],
+                  ),
+                ],
+              ),
+            ),
+          ),
+          Card(
+            child: ListTile(
+              leading: Icon(Icons.signal_cellular_alt),
+              title: Text('Internet Service Provider (ISP)'),
+              subtitle: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  FutureBuilder<InternetProvider?>(
+                    future: ISPLoader().load(),
+                    builder: (BuildContext context,
+                        AsyncSnapshot<InternetProvider?> snapshot) {
+                      if (snapshot.hasData && snapshot.data != null) {
+                        return Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            CustomTile(
+                              leading: Icon(
+                                Icons.public,
+                                color: Theme.of(context).accentColor,
+                              ),
+                              child: Text('${snapshot.data!.ip}'),
+                            ),
+                            CustomTile(
+                                leading: Icon(Icons.dns,
+                                    color: Theme.of(context).accentColor),
+                                child: Text('${snapshot.data!.isp}')),
+                            CustomTile(
+                              leading: Icon(Icons.location_on,
+                                  color: Theme.of(context).accentColor),
+                              child: Text(snapshot.data!.location.address),
+                            ),
+                            SizedBox(height: 5),
+                            Divider(height: 3)
+                          ],
+                        );
+                      }
+                      if (snapshot.hasError) {
+                        return Text("Unable to fetch ISP details");
+                      }
+                      return Text("Loading ISP details..");
+                    },
+                  ),
+                  SizedBox(height: 10),
+                  ElevatedButton.icon(
+                    onPressed: () {
+                      _launchURL('https://fast.com');
+                    },
+                    icon: Icon(Icons.speed),
+                    label: Text('Speed Test'),
+                  ),
+                  SizedBox(height: 5),
+                ],
+              ),
+            ),
           ),
         ],
       ),
     );
   }
+
+  void _launchURL(String url) async =>
+      await canLaunch(url) ? await launch(url) : throw 'Could not launch $url';
 }
diff --git a/lib/pages/host_scan_page.dart b/lib/pages/host_scan_page.dart
index aaf874be..5a9d77dd 100644
--- a/lib/pages/host_scan_page.dart
+++ b/lib/pages/host_scan_page.dart
@@ -21,6 +21,7 @@ class _HostScanPageState extends State<HostScanPage>
     with TickerProviderStateMixin {
   Set<ActiveHost> _devices = {};
   double _progress = 0;
+  bool _isScanning = false;
   StreamSubscription<ActiveHost>? _streamSubscription;
 
   void _getDevices() async {
@@ -28,6 +29,10 @@ class _HostScanPageState extends State<HostScanPage>
     final String? ip = await (NetworkInfo().getWifiIP());
     if (ip != null && ip.isNotEmpty) {
       final String subnet = ip.substring(0, ip.lastIndexOf('.'));
+      setState(() {
+        _isScanning = true;
+      });
+
       final stream = HostScanner.discover(subnet,
           firstSubnet: appSettings.firstSubnet,
           lastSubnet: appSettings.lastSubnet, progressCallback: (progress) {
@@ -47,7 +52,15 @@ class _HostScanPageState extends State<HostScanPage>
       }, onDone: () {
         debugPrint('Scan completed');
         if (this.mounted) {
-          setState(() {});
+          setState(() {
+            _isScanning = false;
+          });
+        }
+      }, onError: (error) {
+        if (this.mounted) {
+          setState(() {
+            _isScanning = false;
+          });
         }
       });
     }
@@ -71,7 +84,7 @@ class _HostScanPageState extends State<HostScanPage>
       appBar: AppBar(
         title: Text('Scan for Devices'),
         actions: [
-          HostScanner.isScanning
+          _isScanning
               ? Container(
                   margin: EdgeInsets.only(right: 20.0),
                   child: new CircularPercentIndicator(
@@ -100,7 +113,7 @@ class _HostScanPageState extends State<HostScanPage>
         'No device found.\nTry changing first and last subnet in settings',
         textAlign: TextAlign.center,
       );
-    } else if (HostScanner.isScanning && _devices.isEmpty) {
+    } else if (_isScanning && _devices.isEmpty) {
       return CircularProgressIndicator.adaptive();
     }
 
diff --git a/lib/pages/location_consent_page.dart b/lib/pages/location_consent_page.dart
index 4ae47e23..956e898a 100644
--- a/lib/pages/location_consent_page.dart
+++ b/lib/pages/location_consent_page.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:network_info_plus/network_info_plus.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:vernet/helper/consent_loader.dart';
-import 'package:vernet/pages/home_page.dart';
+import '../main.dart';
 
 class LocationConsentPage extends StatefulWidget {
   const LocationConsentPage({Key? key}) : super(key: key);
@@ -43,7 +43,9 @@ class _LocationConsentPageState extends State<LocationConsentPage> {
                 TextButton(
                   onPressed: () async {
                     NetworkInfo _networkInfo = NetworkInfo();
-                    if (Platform.isMacOS) {
+                    if (Platform.isMacOS ||
+                        Platform.isLinux ||
+                        Platform.isWindows) {
                       _navigate(context);
                     } else if (Platform.isIOS) {
                       LocationAuthorizationStatus status =
@@ -56,7 +58,7 @@ class _LocationConsentPageState extends State<LocationConsentPage> {
                           LocationAuthorizationStatus.authorizedWhenInUse) {
                         _navigate(context);
                       }
-                    } else {
+                    } else if (Platform.isAndroid) {
                       Permission.location.request().isGranted.then((value) {
                         if (value) _navigate(context);
                       });
@@ -84,7 +86,7 @@ class _LocationConsentPageState extends State<LocationConsentPage> {
     Navigator.pushReplacement(
       context,
       MaterialPageRoute(
-        builder: (context) => HomePage(),
+        builder: (context) => TabBarPage(),
       ),
     );
   }
diff --git a/lib/pages/settings_page.dart b/lib/pages/settings_page.dart
index 38c2281a..f9b959c7 100644
--- a/lib/pages/settings_page.dart
+++ b/lib/pages/settings_page.dart
@@ -136,49 +136,53 @@ class _SettingsPageState extends State<SettingsPage> {
                   applicationVersion: '${info.version}+${info.buildNumber}',
                   applicationIcon: Icon(Icons.radar),
                   children: [
-                    Card(
-                      child: ListTile(
-                        leading: Icon(Icons.bug_report),
-                        title: Text('Report Issues'),
-                        subtitle: Text(_issueUrl),
-                        trailing: IconButton(
-                          icon: Icon(Icons.open_in_new),
-                          onPressed: () {
-                            _launchURL(_issueUrl);
-                          },
-                        ),
-                      ),
+                    ListTile(
+                      leading: Icon(Icons.bug_report),
+                      title: Text('Report Issues'),
+                      // subtitle: Text(_issueUrl),
+                      // trailing: IconButton(
+                      //   icon: Icon(Icons.open_in_new),
+                      //   onPressed: () {
+                      //     _launchURL(_issueUrl);
+                      //   },
+                      // ),
+                      onTap: () {
+                        _launchURL(_issueUrl);
+                      },
                     ),
-                    Card(
-                      child: ListTile(
-                        leading: Icon(Icons.favorite),
-                        title: Text('Donate'),
-                        subtitle: Text(_donateUrl),
-                        trailing: IconButton(
-                          icon: Icon(Icons.open_in_new),
-                          onPressed: () {
-                            _launchURL(_donateUrl);
-                          },
-                        ),
-                      ),
+                    ListTile(
+                      leading: Icon(Icons.favorite),
+                      title: Text('Donate'),
+                      // subtitle: Text(_donateUrl),
+                      // trailing: IconButton(
+                      //   icon: Icon(Icons.open_in_new),
+                      //   onPressed: () {
+                      //     _launchURL(_donateUrl);
+                      //   },
+                      // ),
+                      onTap: () {
+                        _launchURL(_donateUrl);
+                      },
                     ),
-                    Card(
-                      child: ListTile(
-                        leading: Icon(Icons.code),
-                        title: Text('Source Code'),
-                        subtitle: Text(_srcUrl),
-                        trailing: IconButton(
-                          icon: Icon(Icons.open_in_new),
-                          onPressed: () {
-                            _launchURL(_srcUrl);
-                          },
-                        ),
-                      ),
+                    ListTile(
+                      leading: Icon(Icons.code),
+                      title: Text('Source Code'),
+                      // subtitle: Text(_srcUrl),
+                      onTap: () {
+                        _launchURL(_srcUrl);
+                      },
+
+                      // trailing: IconButton(
+                      //   icon: Icon(Icons.open_in_new),
+                      //   onPressed: () {
+                      //     _launchURL(_srcUrl);
+                      //   },
+                      // ),
                     ),
                     ListTile(
                       title: Text(
                         "Made with ❤️ in India",
-                        textAlign: TextAlign.end,
+                        textAlign: TextAlign.center,
                       ),
                     )
                   ],
diff --git a/lib/pages/wifi_detail.dart b/lib/pages/wifi_detail.dart
deleted file mode 100644
index 10a3a0d2..00000000
--- a/lib/pages/wifi_detail.dart
+++ /dev/null
@@ -1,242 +0,0 @@
-import 'dart:io';
-
-import 'package:flutter/material.dart';
-import 'package:network_info_plus/network_info_plus.dart';
-import 'package:permission_handler/permission_handler.dart';
-import 'package:url_launcher/url_launcher.dart';
-import 'package:vernet/api/isp_loader.dart';
-import 'package:vernet/models/internet_provider.dart';
-import 'package:vernet/models/wifi_info.dart';
-import 'package:vernet/pages/dns/dns_page.dart';
-import 'package:vernet/pages/dns/reverse_dns_page.dart';
-import 'package:vernet/pages/host_scan_page.dart';
-import 'package:vernet/pages/network_troubleshoot/ping_page.dart';
-import 'package:vernet/pages/network_troubleshoot/port_scan_page.dart';
-
-import '../ui/custom_tile.dart';
-
-class WifiDetail extends StatefulWidget {
-  const WifiDetail({Key? key}) : super(key: key);
-
-  @override
-  _WifiDetailState createState() => _WifiDetailState();
-}
-
-class _WifiDetailState extends State<WifiDetail> {
-  WifiInfo? _wifiInfo;
-  bool _location = false;
-
-  _getWifiInfo() async {
-    if (Platform.isAndroid) {
-      await Permission.location.request();
-    }
-
-    var wifiIP = await (NetworkInfo().getWifiIP());
-    var wifiBSSID = await (NetworkInfo().getWifiBSSID());
-    var wifiName = await (NetworkInfo().getWifiName());
-
-    setState(() {
-      _wifiInfo = WifiInfo(wifiIP, wifiBSSID, wifiName, wifiName == null);
-    });
-    if (Platform.isAndroid || Platform.isIOS) {
-      Permission.location.serviceStatus.isEnabled.then((value) => setState(() {
-            _location = value;
-          }));
-    }
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    _getWifiInfo();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return SingleChildScrollView(
-      child: Column(
-        children: [
-          Card(
-            child: _wifiInfo == null
-                ? CircularProgressIndicator.adaptive()
-                : ListTile(
-                    minVerticalPadding: 10,
-                    leading: Icon(Icons.router),
-                    title: Text('${_wifiInfo!.name}'),
-                    subtitle: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Text('Connected to ${_wifiInfo!.bssid}'),
-                        SizedBox(height: 5),
-                        _location
-                            ? SizedBox()
-                            : Text(
-                                'Location should be on to display Wifi name',
-                                style: Theme.of(context)
-                                    .textTheme
-                                    .caption!
-                                    .copyWith(
-                                        color: Theme.of(context).accentColor),
-                              ),
-                        Divider(height: 3),
-                        SizedBox(height: 10),
-                        ElevatedButton(
-                          onPressed: () {
-                            Navigator.push(
-                              context,
-                              MaterialPageRoute(
-                                builder: (context) => HostScanPage(),
-                              ),
-                            );
-                          },
-                          child: Text('Scan for devices'),
-                        ),
-                      ],
-                    ),
-                    trailing: IconButton(
-                      icon: Icon(Icons.refresh),
-                      onPressed: () {
-                        _getWifiInfo();
-                      },
-                    ),
-                  ),
-          ),
-          Card(
-            child: ListTile(
-              leading: Icon(Icons.network_check),
-              title: Text('Network Troubleshooting'),
-              minVerticalPadding: 10,
-              subtitle: Column(
-                children: [
-                  SizedBox(height: 10),
-                  Row(
-                    children: [
-                      ElevatedButton.icon(
-                        onPressed: () {
-                          Navigator.push(
-                            context,
-                            MaterialPageRoute(
-                              builder: (context) => PingPage(),
-                            ),
-                          );
-                        },
-                        icon: Icon(Icons.trending_up),
-                        label: Text('Ping'),
-                      ),
-                      SizedBox(width: 10),
-                      ElevatedButton.icon(
-                        onPressed: () {
-                          Navigator.push(
-                            context,
-                            MaterialPageRoute(
-                              builder: (context) => PortScanPage(),
-                            ),
-                          );
-                        },
-                        icon: Icon(Icons.radar),
-                        label: Text('Scan open ports'),
-                      )
-                    ],
-                  ),
-                ],
-              ),
-            ),
-          ),
-          Card(
-            child: ListTile(
-              leading: Icon(Icons.signal_cellular_alt),
-              title: Text('Internet Service Provider (ISP)'),
-              subtitle: FutureBuilder<InternetProvider?>(
-                future: ISPLoader().load(),
-                builder: (BuildContext context,
-                    AsyncSnapshot<InternetProvider?> snapshot) {
-                  if (snapshot.hasData && snapshot.data != null) {
-                    return Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        CustomTile(
-                          leading: Icon(
-                            Icons.public,
-                            color: Theme.of(context).accentColor,
-                          ),
-                          child: Text('${snapshot.data!.ip}'),
-                        ),
-                        CustomTile(
-                            leading: Icon(Icons.dns,
-                                color: Theme.of(context).accentColor),
-                            child: Text('${snapshot.data!.isp}')),
-                        CustomTile(
-                          leading: Icon(Icons.location_on,
-                              color: Theme.of(context).accentColor),
-                          child: Text(snapshot.data!.location.address),
-                        ),
-                        SizedBox(height: 5),
-                        Divider(height: 3),
-                        SizedBox(height: 10),
-                        ElevatedButton.icon(
-                          onPressed: () {
-                            _launchURL('https://fast.com');
-                          },
-                          icon: Icon(Icons.speed),
-                          label: Text('Speed Test'),
-                        )
-                      ],
-                    );
-                  }
-                  if (snapshot.hasError) {
-                    return Text("Unable to fetch ISP details");
-                  }
-                  return Text("Loading ISP details..");
-                },
-              ),
-            ),
-          ),
-          Card(
-            child: ListTile(
-              leading: Icon(Icons.dns),
-              title: Text('Domain Name System (DNS)'),
-              minVerticalPadding: 10,
-              subtitle: Column(
-                children: [
-                  SizedBox(height: 10),
-                  Row(
-                    children: [
-                      ElevatedButton.icon(
-                        onPressed: () {
-                          Navigator.push(
-                            context,
-                            MaterialPageRoute(
-                              builder: (context) => DNSPage(),
-                            ),
-                          );
-                        },
-                        icon: Icon(Icons.search),
-                        label: Text('Lookup'),
-                      ),
-                      SizedBox(width: 10),
-                      ElevatedButton.icon(
-                        onPressed: () {
-                          Navigator.push(
-                            context,
-                            MaterialPageRoute(
-                              builder: (context) => ReverseDNSPage(),
-                            ),
-                          );
-                        },
-                        icon: Icon(Icons.find_replace),
-                        label: Text('Reverse Lookup'),
-                      )
-                    ],
-                  ),
-                ],
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  void _launchURL(String url) async =>
-      await canLaunch(url) ? await launch(url) : throw 'Could not launch $url';
-}
diff --git a/pubspec.lock b/pubspec.lock
index c4d8a5c0..521c7358 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -14,7 +14,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.6.1"
+    version: "2.8.2"
   boolean_selector:
     dependency: transitive
     description:
@@ -28,14 +28,14 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   clock:
     dependency: transitive
     description:
@@ -63,7 +63,7 @@ packages:
       name: dart_ping
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.0"
+    version: "6.1.1"
   dbus:
     dependency: transitive
     description:
@@ -134,14 +134,14 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.11"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   nested:
     dependency: transitive
     description:
@@ -194,10 +194,10 @@ packages:
   network_tools:
     dependency: "direct main"
     description:
-      name: network_tools
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.0.4"
+      path: "../network_tools"
+      relative: true
+    source: path
+    version: "0.0.5"
   package_info_plus:
     dependency: "direct main"
     description:
@@ -419,7 +419,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.4.3"
   typed_data:
     dependency: transitive
     description:
@@ -475,7 +475,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   win32:
     dependency: transitive
     description:
@@ -498,5 +498,5 @@ packages:
     source: hosted
     version: "5.1.1"
 sdks:
-  dart: ">=2.13.0 <3.0.0"
+  dart: ">=2.14.0 <3.0.0"
   flutter: ">=2.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 89ed1fef..81bd87b3 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -29,9 +29,9 @@ dependencies:
   percent_indicator: ^3.3.0-nullsafety.1
   shared_preferences: ^2.0.6
   provider: ^5.0.0
-  network_tools: ^0.0.4
-  # network_tools: 
-  #   path: ../network_tools
+  # network_tools: ^0.0.4
+  network_tools: 
+    path: ../network_tools
   package_info_plus: ^1.0.2
   http: ^0.13.3
   url_launcher: ^6.0.6