Skip to content

Commit

Permalink
All analyzer warnings fixed with some lint options
Browse files Browse the repository at this point in the history
  • Loading branch information
git-elliot committed Oct 3, 2022
1 parent 51ac199 commit ee21f04
Show file tree
Hide file tree
Showing 25 changed files with 114 additions and 97 deletions.
6 changes: 6 additions & 0 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,9 @@ linter:
avoid_classes_with_only_static_members: false

sort_constructors_first: true

# Good packages document everything
public_member_api_docs: false
avoid_dynamic_calls: false
use_build_context_synchronously: false
avoid_positional_boolean_parameters: false
10 changes: 5 additions & 5 deletions lib/api/isp_loader.dart
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ class ISPLoader {
return _mimicLoad();
}
final SharedPreferences sp = await SharedPreferences.getInstance();
final String _ip = await compute(loadIP, 'https://api.ipify.org');
if (_ip.isNotEmpty) {
final String ip = await compute(loadIP, 'https://api.ipify.org');
if (ip.isNotEmpty) {
//Fetch internet provider data
final String? json = sp.getString(_ip);
final String? json = sp.getString(ip);
if (json != null && json.isNotEmpty) {
// print('Response fetched from local $json');
return InternetProvider.fromMap(
Expand All @@ -50,11 +50,11 @@ class ISPLoader {

// Secret secret = await SecretLoader('assets/secrets.json').load();
final String url =
'http://ipwhois.app/json/$_ip?objects=isp,country,region,city,latitude,longitude,country_flag,ip,type';
'http://ipwhois.app/json/$ip?objects=isp,country,region,city,latitude,longitude,country_flag,ip,type';

final String body = await compute(loadISP, url);
if (body.isNotEmpty) {
sp.setString(_ip, body);
sp.setString(ip, body);
return InternetProvider.fromMap(jsonDecode(body) as Map<String, dynamic>);
}
return null;
Expand Down
8 changes: 2 additions & 6 deletions lib/api/update_checker.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:http/http.dart' as http;
import 'package:package_info_plus/package_info_plus.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:vernet/helper/utils_helper.dart';

Future<bool> _checkUpdates(String v) async {
final Uri url = Uri.parse(
Expand All @@ -30,10 +30,6 @@ Future<bool> _checkUpdates(String v) async {
return false;
}

Future<void> _launchURL(String url) async {
await canLaunch(url) ? await launch(url) : throw 'Could not launch $url';
}

Future<void> checkForUpdates(
BuildContext context, {
bool showIfNoUpdate = false,
Expand Down Expand Up @@ -80,5 +76,5 @@ Future<void> _navigateToStore() async {
'https://play.google.com/store/apps/details?id=org.fsociety.vernet.store';
}
}
_launchURL(url);
launchURL(url);
}
5 changes: 5 additions & 0 deletions lib/helper/utils_helper.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import 'package:url_launcher/url_launcher_string.dart';

Future<void> launchURL(String url) async => await canLaunchUrlString(url)
? await launchUrlString(url)
: throw 'Could not launch $url';
8 changes: 4 additions & 4 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Future<void> main() async {
}

class MyApp extends StatefulWidget {
const MyApp(this.allowed, {Key? key}) : super(key: key);
const MyApp(this.allowed, {super.key});

final bool allowed;

Expand Down Expand Up @@ -66,7 +66,7 @@ class _MyAppState extends State<MyApp> {
}

class TabBarPage extends StatefulWidget {
const TabBarPage({Key? key}) : super(key: key);
const TabBarPage({super.key});
@override
_HomePageState createState() => _HomePageState();
}
Expand All @@ -87,11 +87,11 @@ class _HomePageState extends State<TabBarPage> {

@override
Widget build(BuildContext context) {
final List<Widget> _children = [const HomePage(), const SettingsPage()];
final List<Widget> children = [const HomePage(), const SettingsPage()];
return Scaffold(
body: Container(
padding: MediaQuery.of(context).padding,
child: _children[_currentIndex],
child: children[_currentIndex],
),
bottomNavigationBar: BottomNavigationBar(
onTap: onTabTapped, // new
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/dns/dns_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:flutter/services.dart';
import 'package:vernet/pages/base_page.dart';

class DNSPage extends StatefulWidget {
const DNSPage({Key? key}) : super(key: key);
const DNSPage({super.key});

@override
_DNSPageState createState() => _DNSPageState();
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/dns/reverse_dns_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:flutter/services.dart';
import 'package:vernet/pages/base_page.dart';

class ReverseDNSPage extends StatefulWidget {
const ReverseDNSPage({Key? key}) : super(key: key);
const ReverseDNSPage({super.key});

@override
_ReverseDNSPageState createState() => _ReverseDNSPageState();
Expand Down
13 changes: 5 additions & 8 deletions lib/pages/home_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ 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/helper/utils_helper.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/host_scan_page.dart';
import 'package:vernet/pages/network_troubleshoot/port_scan_page.dart';
import 'package:vernet/pages/ping_page/ping_page.dart';
import 'package:vernet/pages/port_scan_page/port_scan_page.dart';
import 'package:vernet/ui/custom_tile.dart';

class HomePage extends StatefulWidget {
const HomePage({Key? key}) : super(key: key);
const HomePage({super.key});

@override
_WifiDetailState createState() => _WifiDetailState();
Expand Down Expand Up @@ -133,7 +133,7 @@ class _WifiDetailState extends State<HomePage> {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => PortScanPage(),
builder: (context) => const PortScanPage(),
),
);
},
Expand Down Expand Up @@ -239,7 +239,7 @@ class _WifiDetailState extends State<HomePage> {
const SizedBox(height: 10),
ElevatedButton.icon(
onPressed: () {
_launchURL('https://fast.com');
launchURL('https://fast.com');
},
icon: const Icon(Icons.speed),
label: const Text('Speed Test'),
Expand All @@ -253,7 +253,4 @@ class _WifiDetailState extends State<HomePage> {
),
);
}

Future<void> _launchURL(String url) async =>
await canLaunch(url) ? await launch(url) : throw 'Could not launch $url';
}
18 changes: 11 additions & 7 deletions lib/pages/host_scan_page/host_scna_bloc/host_scan_bloc.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'dart:async';

import 'package:bloc/bloc.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:injectable/injectable.dart';
import 'package:isolate_contactor/isolate_contactor.dart';
Expand Down Expand Up @@ -75,10 +75,14 @@ class HostScanBloc extends Bloc<HostScanEvent, HostScanState> {

activeHostList.add(tempDeviceInTheNetwork);
activeHostList.sort((a, b) {
final int aIp = int.parse(a.internetAddress.address
.substring(a.internetAddress.address.lastIndexOf('.') + 1));
final int bIp = int.parse(b.internetAddress.address
.substring(b.internetAddress.address.lastIndexOf('.') + 1));
final int aIp = int.parse(
a.internetAddress.address
.substring(a.internetAddress.address.lastIndexOf('.') + 1),
);
final int bIp = int.parse(
b.internetAddress.address
.substring(b.internetAddress.address.lastIndexOf('.') + 1),
);
return aIp.compareTo(bIp);
});
emit(const HostScanState.loadInProgress());
Expand All @@ -91,7 +95,7 @@ class HostScanBloc extends Bloc<HostScanEvent, HostScanState> {
}
}
}
print('The end of the scan');
debugPrint('The end of the scan');

// emit(HostScanState.loadSuccess(activeHostList));
}
Expand All @@ -110,7 +114,7 @@ class HostScanBloc extends Bloc<HostScanEvent, HostScanState> {
final String subnetIsolate = paramsListString[0];
final int firstSubnetIsolate = int.parse(paramsListString[1]);
final int lastSubnetIsolate = int.parse(paramsListString[2]);
print('scanning from $firstSubnetIsolate to $lastSubnetIsolate');
debugPrint('scanning from $firstSubnetIsolate to $lastSubnetIsolate');

/// Will contain all the hosts that got discovered in the network, will
/// be use inorder to cancel on dispose of the page.
Expand Down
13 changes: 9 additions & 4 deletions lib/pages/host_scan_page/widgets/host_scan_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:vernet/pages/host_scan_page/device_in_the_network.dart';
import 'package:vernet/pages/host_scan_page/host_scna_bloc/host_scan_bloc.dart';
import 'package:vernet/pages/port_scan_page/port_scan_page.dart';
import 'package:vernet/pages/network_troubleshoot/port_scan_page.dart';
// import 'package:vernet/pages/port_scan_page/port_scan_page.dart';

class HostScanWidget extends StatelessWidget {
@override
Expand Down Expand Up @@ -63,14 +64,18 @@ class HostScanWidget extends StatelessWidget {
context,
MaterialPageRoute(
builder: (context) => PortScanPage(
target: host.internetAddress.address),
target: host.internetAddress.address,
),
),
);
},
),
onLongPress: () {
Clipboard.setData(ClipboardData(
text: host.internetAddress.address));
Clipboard.setData(
ClipboardData(
text: host.internetAddress.address,
),
);
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('IP copied to clipboard'),
Expand Down
8 changes: 4 additions & 4 deletions lib/pages/location_consent_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'package:vernet/helper/consent_loader.dart';
import 'package:vernet/main.dart';

class LocationConsentPage extends StatefulWidget {
const LocationConsentPage({Key? key}) : super(key: key);
const LocationConsentPage({super.key});

@override
_LocationConsentPageState createState() => _LocationConsentPageState();
Expand Down Expand Up @@ -44,16 +44,16 @@ class _LocationConsentPageState extends State<LocationConsentPage> {
const SizedBox(height: 10),
TextButton(
onPressed: () async {
final NetworkInfo _networkInfo = NetworkInfo();
final NetworkInfo networkInfo = NetworkInfo();
if (Platform.isMacOS ||
Platform.isLinux ||
Platform.isWindows) {
_navigate(context);
} else if (Platform.isIOS) {
LocationAuthorizationStatus status =
await _networkInfo.getLocationServiceAuthorization();
await networkInfo.getLocationServiceAuthorization();
if (status == LocationAuthorizationStatus.notDetermined) {
status = await _networkInfo
status = await networkInfo
.requestLocationServiceAuthorization();
}
if (status ==
Expand Down
18 changes: 9 additions & 9 deletions lib/pages/network_troubleshoot/port_scan_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import 'package:vernet/models/port.dart';
import 'package:vernet/ui/custom_tile.dart';
import 'package:vernet/ui/popular_chip.dart';

class _PortScanPage extends StatefulWidget {
const _PortScanPage({Key? key, this.target = ''}) : super(key: key);
class PortScanPage extends StatefulWidget {
const PortScanPage({this.target = ''});

final String target;

Expand All @@ -20,7 +20,7 @@ class _PortScanPage extends StatefulWidget {

enum ScanType { single, top, range }

class _PortScanPageState extends State<_PortScanPage>
class _PortScanPageState extends State<PortScanPage>
with SingleTickerProviderStateMixin {
final Set<OpenPort> _openPorts = {};
final Map<String, Port> _allPorts = {};
Expand Down Expand Up @@ -417,7 +417,7 @@ class _PortScanPageState extends State<_PortScanPage>
: ListView.builder(
itemCount: _openPorts.length,
itemBuilder: (context, index) {
final OpenPort _openPort = _openPorts.toList()[index];
final OpenPort openPort = _openPorts.toList()[index];
return Column(
children: [
ListTile(
Expand All @@ -429,7 +429,7 @@ class _PortScanPageState extends State<_PortScanPage>
style: Theme.of(context).textTheme.subtitle1,
),
trailing: Text(
'${_openPort.port}',
'${openPort.port}',
style: Theme.of(context)
.textTheme
.headline6!
Expand All @@ -441,24 +441,24 @@ class _PortScanPageState extends State<_PortScanPage>
title: _allPorts.isEmpty
? const SizedBox()
: Text(
_allPorts[_openPort.port.toString()]!.desc,
_allPorts[openPort.port.toString()]!.desc,
),
subtitle: _allPorts.isEmpty
? const SizedBox()
: Row(
children: [
if (_allPorts[_openPort.port.toString()]!
if (_allPorts[openPort.port.toString()]!
.isTCP)
const Text('TCP ')
else
const SizedBox(),
if (_allPorts[_openPort.port.toString()]!
if (_allPorts[openPort.port.toString()]!
.isUDP)
const Text('UDP ')
else
const SizedBox(),
Text(
_allPorts[_openPort.port.toString()]!
_allPorts[openPort.port.toString()]!
.status,
),
],
Expand Down
6 changes: 3 additions & 3 deletions lib/pages/ping_page/bloc/ping_bloc.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ part 'ping_state.dart';
part 'ping_bloc.freezed.dart';

class PingBloc extends Bloc<PingEvent, PingState> {
PingBloc() : super(PingState.initial()) {
PingBloc() : super(const PingState.initial()) {
on<StartPing>(_startPing);
on<StopPing>(_stopPing);
}

_startPing(StartPing event, Emitter<PingState> emit) {}
void _startPing(StartPing event, Emitter<PingState> emit) {}

_stopPing(StopPing event, Emitter<PingState> emit) {}
void _stopPing(StopPing event, Emitter<PingState> emit) {}
}
Loading

0 comments on commit ee21f04

Please sign in to comment.