From 1e4b0b5196447fe83f81a55968ee6a432e02da80 Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Fri, 8 Oct 2021 22:10:44 +0300 Subject: [PATCH 1/4] Replace print with developer.log --- analysis_options.yaml | 3 --- .../example/lib/main.dart | 7 +++---- .../lib/android_alarm_manager_plus.dart | 3 ++- .../connectivity_plus/example/lib/main.dart | 3 ++- .../network_info_plus/example/lib/main.dart | 17 +++++++++-------- 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index 67bf994280..48e108ab64 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -11,9 +11,6 @@ analyzer: # Ignore generated files - '**/*.g.dart' - 'lib/src/generated/*.dart' - - errors: - avoid_print: ignore linter: rules: diff --git a/packages/android_alarm_manager_plus/example/lib/main.dart b/packages/android_alarm_manager_plus/example/lib/main.dart index fe992b989b..5ecfb4ded0 100644 --- a/packages/android_alarm_manager_plus/example/lib/main.dart +++ b/packages/android_alarm_manager_plus/example/lib/main.dart @@ -4,6 +4,7 @@ // ignore_for_file: public_member_api_docs +import 'dart:developer' as developer; import 'dart:isolate'; import 'dart:math'; import 'dart:ui'; @@ -78,8 +79,7 @@ class _AlarmHomePageState extends State<_AlarmHomePage> { } Future _incrementCounter() async { - print('Increment counter!'); - + developer.log('Increment counter!'); // Ensure we've loaded the updated count from the background isolate. await prefs.reload(); @@ -93,8 +93,7 @@ class _AlarmHomePageState extends State<_AlarmHomePage> { // The callback for our alarm static Future callback() async { - print('Alarm fired!'); - + developer.log('Alarm fired!'); // Get the previous cached count and increment it. final prefs = await SharedPreferences.getInstance(); final currentCount = prefs.getInt(countKey); diff --git a/packages/android_alarm_manager_plus/lib/android_alarm_manager_plus.dart b/packages/android_alarm_manager_plus/lib/android_alarm_manager_plus.dart index ce2e7012ba..f341779d2d 100644 --- a/packages/android_alarm_manager_plus/lib/android_alarm_manager_plus.dart +++ b/packages/android_alarm_manager_plus/lib/android_alarm_manager_plus.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'dart:async'; +import 'dart:developer' as developer; import 'dart:io'; import 'dart:ui'; @@ -33,7 +34,7 @@ void _alarmManagerCallbackDispatcher() { final closure = PluginUtilities.getCallbackFromHandle(handle); if (closure == null) { - print('Fatal: could not find callback'); + developer.log('Fatal: could not find callback'); exit(-1); } diff --git a/packages/connectivity_plus/connectivity_plus/example/lib/main.dart b/packages/connectivity_plus/connectivity_plus/example/lib/main.dart index 681d3c30d6..52e01f03d3 100644 --- a/packages/connectivity_plus/connectivity_plus/example/lib/main.dart +++ b/packages/connectivity_plus/connectivity_plus/example/lib/main.dart @@ -5,6 +5,7 @@ // ignore_for_file: public_member_api_docs import 'dart:async'; +import 'dart:developer' as developer; import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:flutter/foundation.dart'; @@ -67,7 +68,7 @@ class _MyHomePageState extends State { try { result = await _connectivity.checkConnectivity(); } on PlatformException catch (e) { - print(e.toString()); + developer.log('Couldn\'t check connectivity status', error: e); return; } diff --git a/packages/network_info_plus/network_info_plus/example/lib/main.dart b/packages/network_info_plus/network_info_plus/example/lib/main.dart index 0157d32beb..7acfc798a0 100644 --- a/packages/network_info_plus/network_info_plus/example/lib/main.dart +++ b/packages/network_info_plus/network_info_plus/example/lib/main.dart @@ -5,6 +5,7 @@ // ignore_for_file: public_member_api_docs import 'dart:async'; +import 'dart:developer' as developer; import 'dart:io'; import 'package:network_info_plus/network_info_plus.dart'; @@ -95,7 +96,7 @@ class _MyHomePageState extends State { wifiName = await _networkInfo.getWifiName(); } } on PlatformException catch (e) { - print(e.toString()); + developer.log('Failed to get Wifi Name', error: e); wifiName = 'Failed to get Wifi Name'; } @@ -115,49 +116,49 @@ class _MyHomePageState extends State { wifiBSSID = await _networkInfo.getWifiBSSID(); } } on PlatformException catch (e) { - print(e.toString()); + developer.log('Failed to get Wifi BSSID', error: e); wifiBSSID = 'Failed to get Wifi BSSID'; } try { wifiIPv4 = await _networkInfo.getWifiIP(); } on PlatformException catch (e) { - print(e.toString()); + developer.log('Failed to get Wifi IPv4', error: e); wifiIPv4 = 'Failed to get Wifi IPv4'; } try { wifiIPv6 = await _networkInfo.getWifiIPv6(); } on PlatformException catch (e) { - print(e.toString()); + developer.log('Failed to get Wifi IPv6', error: e); wifiIPv6 = 'Failed to get Wifi IPv6'; } try { wifiSubmask = await _networkInfo.getWifiSubmask(); } on PlatformException catch (e) { - print(e.toString()); + developer.log('Failed to get Wifi submask address', error: e); wifiSubmask = 'Failed to get Wifi submask address'; } try { wifiBroadcast = await _networkInfo.getWifiBroadcast(); } on PlatformException catch (e) { - print(e.toString()); + developer.log('Failed to get Wifi broadcast', error: e); wifiBroadcast = 'Failed to get Wifi broadcast'; } try { wifiGatewayIP = await _networkInfo.getWifiGatewayIP(); } on PlatformException catch (e) { - print(e.toString()); + developer.log('Failed to get Wifi gateway address', error: e); wifiGatewayIP = 'Failed to get Wifi gateway address'; } try { wifiSubmask = await _networkInfo.getWifiSubmask(); } on PlatformException catch (e) { - print(e.toString()); + developer.log('Failed to get Wifi submask', error: e); wifiSubmask = 'Failed to get Wifi submask'; } From 31d1ebdf44c2c52454065fb8dd03615b1d2127a7 Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Sat, 9 Oct 2021 00:17:13 +0300 Subject: [PATCH 2/4] (sensor_plus) remove print(), fix typos --- .../sensors_plus_web/lib/src/sensors.dart | 37 +++++++++------ .../sensors_plus_web/lib/src/utils.dart | 46 ++++++++++--------- 2 files changed, 49 insertions(+), 34 deletions(-) diff --git a/packages/sensors_plus/sensors_plus_web/lib/src/sensors.dart b/packages/sensors_plus/sensors_plus_web/lib/src/sensors.dart index e02d742f90..31e0869b4b 100644 --- a/packages/sensors_plus/sensors_plus_web/lib/src/sensors.dart +++ b/packages/sensors_plus/sensors_plus_web/lib/src/sensors.dart @@ -1,8 +1,10 @@ import 'dart:async'; +import 'dart:developer' as developer; import 'dart:html' as html show LinearAccelerationSensor, Accelerometer, Gyroscope, Magnetometer; import 'dart:js'; import 'dart:js_util'; + import 'package:flutter_web_plugins/flutter_web_plugins.dart'; import 'package:sensors_plus_platform_interface/sensors_plus_platform_interface.dart'; @@ -17,7 +19,7 @@ class SensorsPlugin extends SensorsPlatform { void _featureDetected( Function initSensor, { String? apiName, - String? premissionName, + String? permissionName, Function? onError, }) { try { @@ -35,14 +37,17 @@ class SensorsPlugin extends SensorsPlatform { /// See Feature-Policy for implementation instructions in the browsers. if (error.toString().contains('SecurityError')) { /// See the note above about feature policy. - print('$apiName construction was blocked by a feature policy.'); + developer.log('$apiName construction was blocked by a feature policy.', + error: error); /// if this feature is not supported or Flag is not enabled yet! } else if (error.toString().contains('ReferenceError')) { - print('$apiName is not supported by the User Agent.'); + developer.log('$apiName is not supported by the User Agent.', + error: error); /// if this is unknown error, rethrow it } else { + developer.log('Unknown error happened, rethrowing.'); rethrow; } } @@ -78,11 +83,13 @@ class SensorsPlugin extends SensorsPlatform { _accelerometer.start(); _accelerometer.onError.forEach( - (e) => print('The Api is supported but something is wrong! $e'), + (e) => developer.log( + 'The accelerometer API is supported but something is wrong!', + error: e), ); }, apiName: 'Accelerometer()', - premissionName: 'accelerometer', + permissionName: 'accelerometer', onError: () { _accelerometerStreamController!.add(AccelerometerEvent(0, 0, 0)); }, @@ -124,11 +131,13 @@ class SensorsPlugin extends SensorsPlatform { _gyroscope.start(); _gyroscope.onError.forEach( - (e) => print('The Api is supported but something is wrong! $e'), + (e) => developer.log( + 'The gyroscope API is supported but something is wrong!', + error: e), ); }, apiName: 'Gyroscope()', - premissionName: 'gyroscope', + permissionName: 'gyroscope', onError: () { _gyroscopeEventStreamController!.add(GyroscopeEvent(0, 0, 0)); }, @@ -171,11 +180,13 @@ class SensorsPlugin extends SensorsPlatform { _linearAccelerationSensor.start(); _linearAccelerationSensor.onError.forEach( - (e) => print('The Api is supported but something is wrong! $e'), + (e) => developer.log( + 'The linear acceleration API is supported but something is wrong!', + error: e), ); }, apiName: 'LinearAccelerationSensor()', - premissionName: 'accelerometer', + permissionName: 'accelerometer', onError: () { _userAccelerometerStreamController! .add(UserAccelerometerEvent(0, 0, 0)); @@ -218,13 +229,13 @@ class SensorsPlugin extends SensorsPlatform { _magnetometerSensor.start(); _magnetometerSensor.onError.forEach( - (e) => - print('[SensorsPlugin] API supported but something is wrong: ' - 'Magnetometer $e'), + (e) => developer.log( + 'The magnetometer API is supported but something is wrong!', + error: e), ); }, apiName: 'Magnetometer()', - premissionName: 'magnetometer', + permissionName: 'magnetometer', onError: () { _magnetometerStreamController!.add(MagnetometerEvent(0, 0, 0)); }, diff --git a/packages/sensors_plus/sensors_plus_web/lib/src/utils.dart b/packages/sensors_plus/sensors_plus_web/lib/src/utils.dart index dedcd3fd53..ae4d33d52f 100644 --- a/packages/sensors_plus/sensors_plus_web/lib/src/utils.dart +++ b/packages/sensors_plus/sensors_plus_web/lib/src/utils.dart @@ -1,40 +1,44 @@ +import 'dart:developer' as developer; import 'dart:html' as html; /// Receive permission status of the API. -Future checkPremission( +Future checkPermission( Function initSensor, { - String? premissionName, + String? permissionName, }) async { - final _premission = html.window.navigator.permissions; + final _permission = html.window.navigator.permissions; // Check if browser supports this API or supports permission manager - if (_premission != null) { + if (_permission != null) { try { - // Request for permission or check premission status - final premissionStatus = await _premission.query( + // Request for permission or check permission status + final permissionStatus = await _permission.query( { - 'name': premissionName, + 'name': permissionName, }, ); - if (premissionStatus.state == 'granted') { - initSensor(); - } else if (premissionStatus.state == 'prompt') { - /// user needs to intract with this - print( - 'Premission [$premissionName] still has not been granted or denied.', - ); - } else { - // If permission is denied, do not do anything - print('Permission [$premissionName] to use sensor was denied.'); + switch (permissionStatus.state) { + case 'granted': + initSensor(); + break; + case 'prompt': + // user needs to interact with this + developer.log( + 'Permission [$permissionName] still has not been granted or denied.'); + break; + default: + // If permission is denied, do nothing + developer + .log('Permission [$permissionName] to use sensor is denied.'); } } catch (e) { - print( - 'Integration with Permissions API is not enabled, still try to start app.', - ); + developer.log( + 'Integration with Permissions API is not enabled, still trying to start app.', + error: e); initSensor(); } } else { - print('No Permissions API, still try to start app.'); + developer.log('No Permissions API, still try to start app.'); initSensor(); } } From cc4c5b22b7562857414e6571786a8cf144fd77a5 Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Sat, 9 Oct 2021 00:32:37 +0300 Subject: [PATCH 3/4] Replace other print() usages --- .../test_driver/android_alarm_manager_plus_e2e.dart | 2 +- .../example/test_driver/battery_plus_e2e.dart | 3 ++- .../battery_plus_linux/lib/src/upower_device.dart | 5 +++-- .../device_info_plus/example/lib/main.dart | 8 ++++---- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/android_alarm_manager_plus/example/test_driver/android_alarm_manager_plus_e2e.dart b/packages/android_alarm_manager_plus/example/test_driver/android_alarm_manager_plus_e2e.dart index 3a376d35d4..e97b77196e 100644 --- a/packages/android_alarm_manager_plus/example/test_driver/android_alarm_manager_plus_e2e.dart +++ b/packages/android_alarm_manager_plus/example/test_driver/android_alarm_manager_plus_e2e.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'dart:io'; import 'package:android_alarm_manager_plus/android_alarm_manager_plus.dart'; import 'package:e2e/e2e.dart'; -import 'package:flutter/cupertino.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:path_provider/path_provider.dart'; diff --git a/packages/battery_plus/battery_plus/example/test_driver/battery_plus_e2e.dart b/packages/battery_plus/battery_plus/example/test_driver/battery_plus_e2e.dart index 29bfcf5d4e..98967132bb 100644 --- a/packages/battery_plus/battery_plus/example/test_driver/battery_plus_e2e.dart +++ b/packages/battery_plus/battery_plus/example/test_driver/battery_plus_e2e.dart @@ -5,6 +5,7 @@ // @dart=2.9 import 'package:battery_plus/battery_plus.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; @@ -21,7 +22,7 @@ void main() { (WidgetTester tester) async { final battery = Battery(); final isInBatterySaveMode = await battery.isInBatterySaveMode; - print(isInBatterySaveMode); + debugPrint('$isInBatterySaveMode'); expect(isInBatterySaveMode, isNotNull); }); } diff --git a/packages/battery_plus/battery_plus_linux/lib/src/upower_device.dart b/packages/battery_plus/battery_plus_linux/lib/src/upower_device.dart index e5bfdf0e67..4ce41172fd 100644 --- a/packages/battery_plus/battery_plus_linux/lib/src/upower_device.dart +++ b/packages/battery_plus/battery_plus_linux/lib/src/upower_device.dart @@ -1,5 +1,6 @@ // ignore: import_of_legacy_library_into_null_safe import 'package:dbus/dbus.dart'; +import 'dart:developer' as developer; const _kInterface = 'org.freedesktop.UPower'; const _kDeviceAddress = 'org.freedesktop.UPower.Device'; @@ -42,14 +43,14 @@ class UPowerDevice extends DBusRemoteObject { Future getPercentage() { return getProperty(_kDeviceAddress, 'Percentage').then( (value) => (value as DBusDouble).value, - onError: (error) => print(error), + onError: (error) => developer.log("Couldn't get percentage", error: error), ); } Future getState() { return getProperty(_kDeviceAddress, 'State').then( (value) => (value as DBusUint32).value.toBatteryState(), - onError: (error) => print(error), + onError: (error) => developer.log("Couldn't get battery state", error: error), ); } diff --git a/packages/device_info_plus/device_info_plus/example/lib/main.dart b/packages/device_info_plus/device_info_plus/example/lib/main.dart index 1e284f0e62..5ef1c5e66d 100644 --- a/packages/device_info_plus/device_info_plus/example/lib/main.dart +++ b/packages/device_info_plus/device_info_plus/example/lib/main.dart @@ -5,19 +5,19 @@ // ignore_for_file: public_member_api_docs import 'dart:async'; - +import 'dart:developer' as developer; import 'dart:io'; + +import 'package:device_info_plus/device_info_plus.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:device_info_plus/device_info_plus.dart'; void main() { runZonedGuarded(() { runApp(const MyApp()); }, (dynamic error, dynamic stack) { - print(error); - print(stack); + developer.log("Something went wrong!", error: error, stackTrace: stack); }); } From cb578efb1b8a8ee96b21ce89c02a2d7ce697d879 Mon Sep 17 00:00:00 2001 From: Volodymyr Buberenko Date: Sat, 9 Oct 2021 01:24:35 +0300 Subject: [PATCH 4/4] Fix dart formatting --- .../battery_plus_linux/lib/src/upower_device.dart | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/battery_plus/battery_plus_linux/lib/src/upower_device.dart b/packages/battery_plus/battery_plus_linux/lib/src/upower_device.dart index 4ce41172fd..f1a98b0a19 100644 --- a/packages/battery_plus/battery_plus_linux/lib/src/upower_device.dart +++ b/packages/battery_plus/battery_plus_linux/lib/src/upower_device.dart @@ -1,7 +1,8 @@ // ignore: import_of_legacy_library_into_null_safe -import 'package:dbus/dbus.dart'; import 'dart:developer' as developer; +import 'package:dbus/dbus.dart'; + const _kInterface = 'org.freedesktop.UPower'; const _kDeviceAddress = 'org.freedesktop.UPower.Device'; const _kDisplayDevicePath = '/org/freedesktop/UPower/devices/DisplayDevice'; @@ -43,14 +44,16 @@ class UPowerDevice extends DBusRemoteObject { Future getPercentage() { return getProperty(_kDeviceAddress, 'Percentage').then( (value) => (value as DBusDouble).value, - onError: (error) => developer.log("Couldn't get percentage", error: error), + onError: (error) => + developer.log("Couldn't get percentage", error: error), ); } Future getState() { return getProperty(_kDeviceAddress, 'State').then( (value) => (value as DBusUint32).value.toBatteryState(), - onError: (error) => developer.log("Couldn't get battery state", error: error), + onError: (error) => + developer.log("Couldn't get battery state", error: error), ); }