Skip to content

Commit e7ef5f2

Browse files
miquelbeltranmiquelbeltran
authored
Merge branch 'main' into 3403-share-plus-refactor
2 parents d0504d2 + 6648753 commit e7ef5f2

File tree

31 files changed

+381
-138
lines changed

31 files changed

+381
-138
lines changed

‎.github/workflows/all_plugins.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,21 @@ jobs:
106106
- name: "Flutter Test - Web"
107107
run: melos run test:web --no-select
108108

109+
analyze:
110+
runs-on: ubuntu-latest
111+
timeout-minutes: 40
112+
steps:
113+
- uses: actions/checkout@v4
114+
with:
115+
fetch-depth: 0
116+
- uses: flutter-actions/setup-flutter@v4
117+
118+
- name: "Install Tools"
119+
run: ./.github/workflows/scripts/install-tools.sh
120+
121+
- name: "Bootstrap Workspace"
122+
run: melos bootstrap
123+
124+
- name: "Flutter Analyze"
125+
run: melos run analyze
126+

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Contributing to PlusPlugins
22

3-
_See also: [Flutter's code of conduct](https://flutter.dev/design-principles/#code-of-conduct)_
3+
_See also: [Code of Conduct](CODE_OF_CONDUCT.md)_
44

55
## Types of contributions
66

‎packages/android_alarm_manager_plus/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 4.0.7
2+
3+
- **FIX**(alarm_manager_plus): removed import that broke build ([#3477](https://github.com/fluttercommunity/plus_plugins/issues/3477)). ([fdac82b0](https://github.com/fluttercommunity/plus_plugins/commit/fdac82b06c8b7f9188656d86155fa041d19a3f2d))
4+
15
## 4.0.6
26

37
- **FIX**(android_alarm_manager_plus): set correct environment versions ([#3420](https://github.com/fluttercommunity/plus_plugins/issues/3420)). ([c2722f83](https://github.com/fluttercommunity/plus_plugins/commit/c2722f8345407d3bf7c66b99e57fbf5c75da428f))

‎packages/android_alarm_manager_plus/example/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ environment:
88
dependencies:
99
flutter:
1010
sdk: flutter
11-
android_alarm_manager_plus: ^4.0.6
11+
android_alarm_manager_plus: ^4.0.7
1212
permission_handler: ^11.3.0
1313
shared_preferences: ^2.2.2
1414

‎packages/android_alarm_manager_plus/lib/android_alarm_manager_plus.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ class AndroidAlarmManager {
151151
///
152152
/// You can send extra data via `params`.
153153
/// For receiving extra data, a `callback` needs to be implemented:
154-
/// Function(int, Map<String,dynamic>)
154+
/// `Function(int, Map<String,dynamic>)`
155155
/// The params map must be parsable to Json.
156156
/// If one of the values can not be converted to Json,
157157
/// an UnsupportedError will be thrown.
@@ -221,7 +221,7 @@ class AndroidAlarmManager {
221221
///
222222
/// You can send extra data via `params`.
223223
/// For receiving extra data, a `callback` needs to be implemented:
224-
/// Function(int, Map<String,dynamic>)
224+
/// `Function(int, Map<String,dynamic>)`
225225
/// The params map must be parsable to Json.
226226
/// If one of the values can not be converted to Json,
227227
/// an UnsupportedError will be thrown.
@@ -304,7 +304,7 @@ class AndroidAlarmManager {
304304
///
305305
/// You can send extra data via `params`.
306306
/// For receiving extra data, a `callback` needs to be implemented:
307-
/// Function(int, Map<String,dynamic>)
307+
/// `Function(int, Map<String,dynamic>)`
308308
/// The params map must be parsable to Json.
309309
/// If one of the values can not be converted to Json,
310310
/// an UnsupportedError will be thrown.

‎packages/android_alarm_manager_plus/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: android_alarm_manager_plus
22
description: Flutter plugin for accessing the Android AlarmManager service, and
33
running Dart code in the background when alarms fire.
4-
version: 4.0.6
4+
version: 4.0.7
55
homepage: https://github.com/fluttercommunity/plus_plugins
66
repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/android_alarm_manager_plus
77
issue_tracker: https://github.com/fluttercommunity/plus_plugins/labels/android_alarm_manager_plus

‎packages/battery_plus/battery_plus/example/lib/main.dart‎

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -79,20 +79,22 @@ class _MyHomePageState extends State<MyHomePage> {
7979
onPressed: () {
8080
_battery.batteryLevel.then(
8181
(batteryLevel) {
82-
showDialog<void>(
83-
context: context,
84-
builder: (_) => AlertDialog(
85-
content: Text('Battery: $batteryLevel%'),
86-
actions: <Widget>[
87-
TextButton(
88-
onPressed: () {
89-
Navigator.pop(context);
90-
},
91-
child: const Text('OK'),
92-
)
93-
],
94-
),
95-
);
82+
if (context.mounted) {
83+
showDialog<void>(
84+
context: context,
85+
builder: (_) => AlertDialog(
86+
content: Text('Battery: $batteryLevel%'),
87+
actions: <Widget>[
88+
TextButton(
89+
onPressed: () {
90+
Navigator.pop(context);
91+
},
92+
child: const Text('OK'),
93+
)
94+
],
95+
),
96+
);
97+
}
9698
},
9799
);
98100
},
@@ -103,27 +105,29 @@ class _MyHomePageState extends State<MyHomePage> {
103105
onPressed: () {
104106
_battery.isInBatterySaveMode.then(
105107
(isInPowerSaveMode) {
106-
showDialog<void>(
107-
context: context,
108-
builder: (_) => AlertDialog(
109-
title: const Text(
110-
'Is in Battery Save mode?',
111-
style: TextStyle(fontSize: 20),
112-
),
113-
content: Text(
114-
"$isInPowerSaveMode",
115-
style: const TextStyle(fontSize: 18),
108+
if (context.mounted) {
109+
showDialog<void>(
110+
context: context,
111+
builder: (_) => AlertDialog(
112+
title: const Text(
113+
'Is in Battery Save mode?',
114+
style: TextStyle(fontSize: 20),
115+
),
116+
content: Text(
117+
"$isInPowerSaveMode",
118+
style: const TextStyle(fontSize: 18),
119+
),
120+
actions: <Widget>[
121+
TextButton(
122+
onPressed: () {
123+
Navigator.pop(context);
124+
},
125+
child: const Text('Close'),
126+
)
127+
],
116128
),
117-
actions: <Widget>[
118-
TextButton(
119-
onPressed: () {
120-
Navigator.pop(context);
121-
},
122-
child: const Text('Close'),
123-
)
124-
],
125-
),
126-
);
129+
);
130+
}
127131
},
128132
);
129133
},

‎packages/connectivity_plus/connectivity_plus/lib/src/web/utils/connectivity_result.dart‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎packages/device_info_plus/device_info_plus/CHANGELOG.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
## 11.3.3
2+
3+
- **FIX**(device_info_plus): handle nullability on getString(DEVICE_NAME) ([#3507](https://github.com/fluttercommunity/plus_plugins/issues/3507)). ([3201e056](https://github.com/fluttercommunity/plus_plugins/commit/3201e056b2a44ce74a3a9218fba59d71d9795379))
4+
5+
## 11.3.2
6+
7+
**Note:** This release bumps dependency `win32_registry` from `1.1.5` to `2.0.1`. It will not compile if you have Dependency Overrides for that package.
8+
9+
- **FIX**(device_info_plus): tighten dependency constraints ([#3497](https://github.com/fluttercommunity/plus_plugins/issues/3497)). ([c7e2428a](https://github.com/fluttercommunity/plus_plugins/commit/c7e2428a6075df4e37da9ef4934861c7cb0c3bee))
10+
- **FIX**(device_info_plus): fix memory leak when calling DeviceInfoPlugin().macOsInfo ([#3474](https://github.com/fluttercommunity/plus_plugins/issues/3474)). ([1cbf2b56](https://github.com/fluttercommunity/plus_plugins/commit/1cbf2b5621465456221b50ade7ac6c2f3266788d))
11+
12+
## 11.3.1
13+
14+
- Retracted release due to [#3496](https://sgithub.com/fluttercommunity/plus_plugins/issues/3496)
15+
116
## 11.3.0
217

318
- **FEAT**(device_info_plus): Add User Device Name in Android (PR [#3437](https://github.com/fluttercommunity/plus_plugins/issues/3437)) ([#3456](https://github.com/fluttercommunity/plus_plugins/issues/3456)). ([8c38a31d](https://github.com/fluttercommunity/plus_plugins/commit/8c38a31d7c1073d7011ec3e3193f6b99b3851ef1))

‎packages/device_info_plus/device_info_plus/android/src/main/kotlin/dev/fluttercommunity/plus/device_info/MethodCallHandlerImpl.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ internal class MethodCallHandlerImpl(
3939
build["product"] = Build.PRODUCT
4040

4141
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
42-
build["name"] = Settings.Global.getString(contentResolver, Settings.Global.DEVICE_NAME)
42+
build["name"] = Settings.Global.getString(contentResolver, Settings.Global.DEVICE_NAME) ?: ""
4343
}
4444

4545
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {

0 commit comments

Comments
 (0)