From 02a2097b103f5cb3408569b763cf0d938f105596 Mon Sep 17 00:00:00 2001 From: NaiJi Date: Wed, 20 Dec 2023 16:50:43 +0400 Subject: [PATCH 1/5] refactor(linter): Change DioError to DioException --- lib/logic/api_maps/rest_maps/backblaze.dart | 2 +- .../rest_maps/dns_providers/cloudflare/cloudflare_api.dart | 2 +- .../digital_ocean_dns/digital_ocean_dns_api.dart | 2 +- lib/logic/api_maps/rest_maps/rest_api_map.dart | 4 ++-- .../rest_maps/server_providers/hetzner/hetzner_api.dart | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/logic/api_maps/rest_maps/backblaze.dart b/lib/logic/api_maps/rest_maps/backblaze.dart index f622a2fd..97a9ac4f 100644 --- a/lib/logic/api_maps/rest_maps/backblaze.dart +++ b/lib/logic/api_maps/rest_maps/backblaze.dart @@ -103,7 +103,7 @@ class BackblazeApi extends RestApiMap { } else { throw Exception('code: ${response.statusCode}'); } - } on DioError catch (e) { + } on DioException catch (e) { print(e); return GenericResult( data: false, diff --git a/lib/logic/api_maps/rest_maps/dns_providers/cloudflare/cloudflare_api.dart b/lib/logic/api_maps/rest_maps/dns_providers/cloudflare/cloudflare_api.dart index 0ba88ee3..bfc1b029 100644 --- a/lib/logic/api_maps/rest_maps/dns_providers/cloudflare/cloudflare_api.dart +++ b/lib/logic/api_maps/rest_maps/dns_providers/cloudflare/cloudflare_api.dart @@ -144,7 +144,7 @@ class CloudflareApi extends RestApiMap { ); } await Future.wait(allCreateFutures); - } on DioError catch (e) { + } on DioException catch (e) { print(e.message); rethrow; } catch (e) { diff --git a/lib/logic/api_maps/rest_maps/dns_providers/digital_ocean_dns/digital_ocean_dns_api.dart b/lib/logic/api_maps/rest_maps/dns_providers/digital_ocean_dns/digital_ocean_dns_api.dart index e1b5c601..558915ce 100644 --- a/lib/logic/api_maps/rest_maps/dns_providers/digital_ocean_dns/digital_ocean_dns_api.dart +++ b/lib/logic/api_maps/rest_maps/dns_providers/digital_ocean_dns/digital_ocean_dns_api.dart @@ -133,7 +133,7 @@ class DigitalOceanDnsApi extends RestApiMap { ); } await Future.wait(allCreateFutures); - } on DioError catch (e) { + } on DioException catch (e) { print(e.message); rethrow; } catch (e) { diff --git a/lib/logic/api_maps/rest_maps/rest_api_map.dart b/lib/logic/api_maps/rest_maps/rest_api_map.dart index 547ce4aa..f915e024 100644 --- a/lib/logic/api_maps/rest_maps/rest_api_map.dart +++ b/lib/logic/api_maps/rest_maps/rest_api_map.dart @@ -25,7 +25,7 @@ abstract class RestApiMap { dio.interceptors.add( InterceptorsWrapper( - onError: (final DioError e, final ErrorInterceptorHandler handler) { + onError: (final DioException e, final ErrorInterceptorHandler handler) { print(e.requestOptions.path); print(e.requestOptions.data); @@ -96,7 +96,7 @@ class ConsoleInterceptor extends InterceptorsWrapper { @override Future onError( - final DioError err, + final DioException err, final ErrorInterceptorHandler handler, ) async { final Response? response = err.response; diff --git a/lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner_api.dart b/lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner_api.dart index 3778498a..fe317327 100644 --- a/lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner_api.dart +++ b/lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner_api.dart @@ -87,7 +87,7 @@ class HetznerApi extends RestApiMap { final String stagingAcme = TlsOptions.stagingAcme ? 'true' : 'false'; Response? serverCreateResponse; HetznerServerInfo? serverInfo; - DioError? hetznerError; + DioException? hetznerError; bool success = false; final Dio client = await getClient(); @@ -117,7 +117,7 @@ class HetznerApi extends RestApiMap { serverCreateResponse.data['server'], ); success = true; - } on DioError catch (e) { + } on DioException catch (e) { print(e); hetznerError = e; } catch (e) { From 2ef012132116b9febe61913ff9173099e180f489 Mon Sep 17 00:00:00 2001 From: NaiJi Date: Wed, 20 Dec 2023 16:56:31 +0400 Subject: [PATCH 2/5] refactor(linter): Create HTTP client from adapter --- lib/logic/api_maps/rest_maps/rest_api_map.dart | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/logic/api_maps/rest_maps/rest_api_map.dart b/lib/logic/api_maps/rest_maps/rest_api_map.dart index f915e024..e2f7ad58 100644 --- a/lib/logic/api_maps/rest_maps/rest_api_map.dart +++ b/lib/logic/api_maps/rest_maps/rest_api_map.dart @@ -15,13 +15,10 @@ abstract class RestApiMap { dio.interceptors.add(PrettyDioLogger()); } dio.interceptors.add(ConsoleInterceptor()); - (dio.httpClientAdapter as IOHttpClientAdapter).onHttpClientCreate = - (final HttpClient client) { - client.badCertificateCallback = - (final X509Certificate cert, final String host, final int port) => - true; - return client; - }; + final adapter = dio.httpClientAdapter as IOHttpClientAdapter; + final client = adapter.createHttpClient!(); + client.badCertificateCallback = + (final X509Certificate cert, final String host, final int port) => true; dio.interceptors.add( InterceptorsWrapper( From 5c0374957728ec257ccd4d19807079990b79e33b Mon Sep 17 00:00:00 2001 From: NaiJi Date: Wed, 20 Dec 2023 16:57:52 +0400 Subject: [PATCH 3/5] refactor(linter): Add library; to brand icons --- lib/ui/components/brand_icons/brand_icons.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/ui/components/brand_icons/brand_icons.dart b/lib/ui/components/brand_icons/brand_icons.dart index f66ed8ec..97b52c27 100644 --- a/lib/ui/components/brand_icons/brand_icons.dart +++ b/lib/ui/components/brand_icons/brand_icons.dart @@ -13,6 +13,8 @@ /// /// /// +library; + import 'package:flutter/widgets.dart'; class BrandIcons { From 9ea952b46e42d102fa09d0b0ef8c4bb3ab73c240 Mon Sep 17 00:00:00 2001 From: NaiJi Date: Wed, 20 Dec 2023 16:58:46 +0400 Subject: [PATCH 4/5] refactor(linter): Force const constructor where needed --- lib/ui/pages/server_details/charts/cpu_chart.dart | 8 ++++---- lib/ui/pages/server_details/charts/network_charts.dart | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/ui/pages/server_details/charts/cpu_chart.dart b/lib/ui/pages/server_details/charts/cpu_chart.dart index 7350f003..252d5069 100644 --- a/lib/ui/pages/server_details/charts/cpu_chart.dart +++ b/lib/ui/pages/server_details/charts/cpu_chart.dart @@ -65,7 +65,7 @@ class CpuChart extends StatelessWidget { isCurved: false, barWidth: 2, color: Theme.of(context).colorScheme.primary, - dotData: FlDotData( + dotData: const FlDotData( show: false, ), belowBarData: BarAreaData( @@ -86,7 +86,7 @@ class CpuChart extends StatelessWidget { maxY: 100, minX: 0, titlesData: FlTitlesData( - topTitles: AxisTitles( + topTitles: const AxisTitles( sideTitles: SideTitles(showTitles: false), ), bottomTitles: AxisTitles( @@ -109,12 +109,12 @@ class CpuChart extends StatelessWidget { showTitles: true, ), ), - leftTitles: AxisTitles( + leftTitles: const AxisTitles( sideTitles: SideTitles( showTitles: false, ), ), - rightTitles: AxisTitles( + rightTitles: const AxisTitles( sideTitles: SideTitles( showTitles: false, ), diff --git a/lib/ui/pages/server_details/charts/network_charts.dart b/lib/ui/pages/server_details/charts/network_charts.dart index 08747192..ce79df6b 100644 --- a/lib/ui/pages/server_details/charts/network_charts.dart +++ b/lib/ui/pages/server_details/charts/network_charts.dart @@ -73,7 +73,7 @@ class NetworkChart extends StatelessWidget { isCurved: false, barWidth: 2, color: Theme.of(context).colorScheme.primary, - dotData: FlDotData( + dotData: const FlDotData( show: false, ), belowBarData: BarAreaData( @@ -94,7 +94,7 @@ class NetworkChart extends StatelessWidget { isCurved: false, barWidth: 2, color: Theme.of(context).colorScheme.tertiary, - dotData: FlDotData( + dotData: const FlDotData( show: false, ), belowBarData: BarAreaData( @@ -118,7 +118,7 @@ class NetworkChart extends StatelessWidget { 1.2, minX: 0, titlesData: FlTitlesData( - topTitles: AxisTitles( + topTitles: const AxisTitles( sideTitles: SideTitles(showTitles: false), ), bottomTitles: AxisTitles( @@ -141,7 +141,7 @@ class NetworkChart extends StatelessWidget { showTitles: true, ), ), - leftTitles: AxisTitles( + leftTitles: const AxisTitles( sideTitles: SideTitles(showTitles: false), ), rightTitles: AxisTitles( From 371d83b4be6ba5657c6e979a1260aa121b273f91 Mon Sep 17 00:00:00 2001 From: NaiJi Date: Wed, 20 Dec 2023 17:04:33 +0400 Subject: [PATCH 5/5] fix(linter): Change httpClientAdapter callback creation --- lib/logic/api_maps/rest_maps/rest_api_map.dart | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/logic/api_maps/rest_maps/rest_api_map.dart b/lib/logic/api_maps/rest_maps/rest_api_map.dart index e2f7ad58..3a8d0571 100644 --- a/lib/logic/api_maps/rest_maps/rest_api_map.dart +++ b/lib/logic/api_maps/rest_maps/rest_api_map.dart @@ -15,10 +15,15 @@ abstract class RestApiMap { dio.interceptors.add(PrettyDioLogger()); } dio.interceptors.add(ConsoleInterceptor()); - final adapter = dio.httpClientAdapter as IOHttpClientAdapter; - final client = adapter.createHttpClient!(); - client.badCertificateCallback = - (final X509Certificate cert, final String host, final int port) => true; + dio.httpClientAdapter = IOHttpClientAdapter( + createHttpClient: () { + final client = HttpClient(); + client.badCertificateCallback = + (final X509Certificate cert, final String host, final int port) => + true; + return client; + }, + ); dio.interceptors.add( InterceptorsWrapper(