diff --git a/packages/battery_plus/battery_plus/lib/src/battery_plus_web.dart b/packages/battery_plus/battery_plus/lib/src/battery_plus_web.dart index 353227954d..f179ad289a 100644 --- a/packages/battery_plus/battery_plus/lib/src/battery_plus_web.dart +++ b/packages/battery_plus/battery_plus/lib/src/battery_plus_web.dart @@ -3,7 +3,7 @@ import 'dart:js_interop'; import 'package:battery_plus_platform_interface/battery_plus_platform_interface.dart'; import 'package:flutter_web_plugins/flutter_web_plugins.dart'; -import 'package:web/web.dart' as web; +import 'package:web/web.dart'; /// The web implementation of the BatteryPlatform of the Battery plugin. /// @@ -18,7 +18,7 @@ class BatteryPlusWebPlugin extends BatteryPlatform { /// Return [BatteryManager] if the BatteryManager API is supported by the User Agent. Future _getBatteryManager() async { try { - return await web.window.navigator.getBattery()?.toDart; + return await window.navigator.getBattery().toDart; } on NoSuchMethodError catch (_) { // BatteryManager API is not supported this User Agent. return null; @@ -44,7 +44,7 @@ class BatteryPlusWebPlugin extends BatteryPlatform { // level is a number representing the system's battery charge level scaled to a value between 0.0 and 1.0 final level = batteryManager.level; - return level * 100 as int; + return (level * 100).toInt(); } /// Returns the current battery state. @@ -80,7 +80,7 @@ class BatteryPlusWebPlugin extends BatteryPlatform { _checkBatteryChargingState(batteryManager.charging), ); - batteryManager.onchargingchange = (web.Event _) { + batteryManager.onchargingchange = (Event _) { _batteryChangeStreamController?.add( _checkBatteryChargingState(batteryManager.charging), ); @@ -105,21 +105,3 @@ class BatteryPlusWebPlugin extends BatteryPlatform { } } } - -extension on web.Navigator { - /// https://developer.mozilla.org/en-US/docs/Web/API/Navigator/getBattery - external JSPromise? getBattery(); -} - -/// BatteryManager API -/// https://developer.mozilla.org/en-US/docs/Web/API/BatteryManager -extension type BatteryManager(JSObject _) implements JSObject { - /// https://developer.mozilla.org/en-US/docs/Web/API/BatteryManager/level - external double get level; - - /// https://developer.mozilla.org/en-US/docs/Web/API/BatteryManager/charging - external bool get charging; - - /// https://developer.mozilla.org/en-US/docs/Web/API/BatteryManager/chargingchange_event - external set onchargingchange(JSFunction fn); -} diff --git a/packages/battery_plus/battery_plus/pubspec.yaml b/packages/battery_plus/battery_plus/pubspec.yaml index 38ac71870d..2c90f51e9d 100644 --- a/packages/battery_plus/battery_plus/pubspec.yaml +++ b/packages/battery_plus/battery_plus/pubspec.yaml @@ -34,7 +34,7 @@ dependencies: battery_plus_platform_interface: ^2.0.1 meta: ^1.8.0 upower: ^0.7.0 - web: ^0.5.0 + web: ^1.0.0 dev_dependencies: flutter_test: