Skip to content

fix(battery_plus): Fix return value of getBattery to be nullable #2745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miquelbeltran merged 1 commit into from
Mar 21, 2024
Merged

fix(battery_plus): Fix return value of getBattery to be nullable #2745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
129 changes: 45 additions & 84 deletions packages/battery_plus/battery_plus/example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,24 +42,9 @@ class _MyHomePageState extends State<MyHomePage> {
@override
void initState() {
super.initState();
try {
_battery.batteryState.then(
_updateBatteryState,
onError: (e) {
_showError('onError: batteryState: $e');
_updateBatteryState(BatteryState.unknown);
},
);
_batteryStateSubscription = _battery.onBatteryStateChanged.listen(
_updateBatteryState,
onError: (e) {
_showError('onError: onBatteryStateChanged: $e');
_updateBatteryState(BatteryState.unknown);
},
);
} on Error catch (e) {
_showError('catch: batteryState: $e');
}
_battery.batteryState.then(_updateBatteryState);
_batteryStateSubscription =
_battery.onBatteryStateChanged.listen(_updateBatteryState);
}

void _updateBatteryState(BatteryState state) {
Expand All @@ -69,16 +54,6 @@ class _MyHomePageState extends State<MyHomePage> {
});
}

void _showError(String message) {
// see https://github.com/fluttercommunity/plus_plugins/pull/2720
// The exception may not be caught in the package and an exception may occur in the caller, so use try-catch as needed.
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(message),
),
);
}

@override
Widget build(BuildContext context) {
return Scaffold(
Expand All @@ -102,69 +77,55 @@ class _MyHomePageState extends State<MyHomePage> {
const SizedBox(height: 24),
ElevatedButton(
onPressed: () {
try {
_battery.batteryLevel.then(
(batteryLevel) {
showDialog<void>(
context: context,
builder: (_) => AlertDialog(
content: Text('Battery: $batteryLevel%'),
actions: <Widget>[
TextButton(
onPressed: () {
Navigator.pop(context);
},
child: const Text('OK'),
)
],
),
);
},
onError: (e) {
_showError('onError: batteryLevel: $e');
},
);
} on Error catch (e) {
_showError('catch: batteryLevel: $e');
}
_battery.batteryLevel.then(
(batteryLevel) {
showDialog<void>(
context: context,
builder: (_) => AlertDialog(
content: Text('Battery: $batteryLevel%'),
actions: <Widget>[
TextButton(
onPressed: () {
Navigator.pop(context);
},
child: const Text('OK'),
)
],
),
);
},
);
},
child: const Text('Get battery level'),
),
const SizedBox(height: 24),
ElevatedButton(
onPressed: () {
try {
_battery.isInBatterySaveMode.then(
(isInPowerSaveMode) {
showDialog<void>(
context: context,
builder: (_) => AlertDialog(
title: const Text(
'Is in Battery Save mode?',
style: TextStyle(fontSize: 20),
),
content: Text(
"$isInPowerSaveMode",
style: const TextStyle(fontSize: 18),
),
actions: <Widget>[
TextButton(
onPressed: () {
Navigator.pop(context);
},
child: const Text('Close'),
)
],
_battery.isInBatterySaveMode.then(
(isInPowerSaveMode) {
showDialog<void>(
context: context,
builder: (_) => AlertDialog(
title: const Text(
'Is in Battery Save mode?',
style: TextStyle(fontSize: 20),
),
content: Text(
"$isInPowerSaveMode",
style: const TextStyle(fontSize: 18),
),
);
},
onError: (e) {
_showError('onError: isInBatterySaveMode: $e');
},
);
} on Error catch (e) {
_showError('catch: isInBatterySaveMode: $e');
}
actions: <Widget>[
TextButton(
onPressed: () {
Navigator.pop(context);
},
child: const Text('Close'),
)
],
),
);
},
);
},
child: const Text('Is in Battery Save mode?'),
)
Expand Down
4 changes: 2 additions & 2 deletions packages/battery_plus/battery_plus/lib/src/battery_plus_web.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class BatteryPlusWebPlugin extends BatteryPlatform {
/// Return [BatteryManager] if the BatteryManager API is supported by the User Agent.
Future<BatteryManager?> _getBatteryManager() async {
try {
return await web.window.navigator.getBattery().toDart;
return await web.window.navigator.getBattery()?.toDart;
} on NoSuchMethodError catch (_) {
// BatteryManager API is not supported this User Agent.
return null;
Expand Down Expand Up @@ -108,7 +108,7 @@ class BatteryPlusWebPlugin extends BatteryPlatform {

extension on web.Navigator {
/// https://developer.mozilla.org/en-US/docs/Web/API/Navigator/getBattery
external JSPromise<BatteryManager> getBattery();
external JSPromise<BatteryManager>? getBattery();
}

/// BatteryManager API
Expand Down