Merge the null_safety with master. (#27)

* initial migration using tool

* minor changes

* Completed null safety migration

* updated changelog

* Fix typo in PayloadStatus enum.

* Format changes

* Minor changes
This commit is contained in:
Prerak Mann
2021-01-27 15:10:00 +05:30
committed by GitHub
parent c2adf90962
commit 0797dedc35
8 changed files with 139 additions and 150 deletions

View File

@@ -39,7 +39,7 @@ class _MyBodyState extends State<Body> {
File tempFile; //reference to the file currently being transferred
Map<int, String> map =
Map(); //store filename mapped to corresponding payloadId
Map(); //store filename mapped to corresponding payloadId
@override
Widget build(BuildContext context) {
@@ -57,12 +57,12 @@ class _MyBodyState extends State<Body> {
child: Text("checkLocationPermission"),
onPressed: () async {
if (await Nearby().checkLocationPermission()) {
Scaffold.of(context).showSnackBar(SnackBar(
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content: Text("Location permissions granted :)")));
} else {
Scaffold.of(context).showSnackBar(SnackBar(
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content:
Text("Location permissions not granted :(")));
Text("Location permissions not granted :(")));
}
},
),
@@ -70,12 +70,12 @@ class _MyBodyState extends State<Body> {
child: Text("askLocationPermission"),
onPressed: () async {
if (await Nearby().askLocationPermission()) {
Scaffold.of(context).showSnackBar(SnackBar(
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content: Text("Location Permission granted :)")));
} else {
Scaffold.of(context).showSnackBar(SnackBar(
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content:
Text("Location permissions not granted :(")));
Text("Location permissions not granted :(")));
}
},
),
@@ -83,11 +83,11 @@ class _MyBodyState extends State<Body> {
child: Text("checkExternalStoragePermission"),
onPressed: () async {
if (await Nearby().checkExternalStoragePermission()) {
Scaffold.of(context).showSnackBar(SnackBar(
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content:
Text("External Storage permissions granted :)")));
Text("External Storage permissions granted :)")));
} else {
Scaffold.of(context).showSnackBar(SnackBar(
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content: Text(
"External Storage permissions not granted :(")));
}
@@ -109,10 +109,10 @@ class _MyBodyState extends State<Body> {
child: Text("checkLocationEnabled"),
onPressed: () async {
if (await Nearby().checkLocationEnabled()) {
Scaffold.of(context).showSnackBar(
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text("Location is ON :)")));
} else {
Scaffold.of(context).showSnackBar(
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text("Location is OFF :(")));
}
},
@@ -121,12 +121,12 @@ class _MyBodyState extends State<Body> {
child: Text("enableLocationServices"),
onPressed: () async {
if (await Nearby().enableLocationServices()) {
Scaffold.of(context).showSnackBar(SnackBar(
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content: Text("Location Service Enabled :)")));
} else {
Scaffold.of(context).showSnackBar(SnackBar(
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content:
Text("Enabling Location Service Failed :(")));
Text("Enabling Location Service Failed :(")));
}
},
),
@@ -148,7 +148,8 @@ class _MyBodyState extends State<Body> {
showSnackbar(status);
},
onDisconnected: (id) {
showSnackbar("Disconnected: ${endpointMap[id].endpointName}, id $id");
showSnackbar(
"Disconnected: ${endpointMap[id].endpointName}, id $id");
setState(() {
endpointMap.remove(id);
});
@@ -205,7 +206,8 @@ class _MyBodyState extends State<Body> {
setState(() {
endpointMap.remove(id);
});
showSnackbar("Disconnected from: ${endpointMap[id].endpointName}, id $id");
showSnackbar(
"Disconnected from: ${endpointMap[id].endpointName}, id $id");
},
);
},
@@ -217,7 +219,8 @@ class _MyBodyState extends State<Body> {
);
},
onEndpointLost: (id) {
showSnackbar("Lost discovered Endpoint: ${endpointMap[id].endpointName}, id $id");
showSnackbar(
"Lost discovered Endpoint: ${endpointMap[id].endpointName}, id $id");
},
);
showSnackbar("DISCOVERING: " + a.toString());
@@ -255,20 +258,23 @@ class _MyBodyState extends State<Body> {
String a = Random().nextInt(100).toString();
showSnackbar("Sending $a to ${value.endpointName}, id: $key");
Nearby().sendBytesPayload(key, Uint8List.fromList(a.codeUnits));
Nearby()
.sendBytesPayload(key, Uint8List.fromList(a.codeUnits));
});
},
),
RaisedButton(
child: Text("Send File Payload"),
onPressed: () async {
File file =
await ImagePicker.pickImage(source: ImageSource.gallery);
PickedFile file =
await ImagePicker().getImage(source: ImageSource.gallery);
if (file == null) return;
for(MapEntry<String, ConnectionInfo> m in endpointMap.entries){
int payloadId = await Nearby().sendFilePayload(m.key, file.path);
for (MapEntry<String, ConnectionInfo> m
in endpointMap.entries) {
int payloadId =
await Nearby().sendFilePayload(m.key, file.path);
showSnackbar("Sending file to ${m.key}");
Nearby().sendBytesPayload(
m.key,
@@ -341,7 +347,7 @@ class _MyBodyState extends State<Body> {
},
onPayloadTransferUpdate: (endid, payloadTransferUpdate) {
if (payloadTransferUpdate.status ==
PayloadStatus.IN_PROGRRESS) {
PayloadStatus.IN_PROGRESS) {
print(payloadTransferUpdate.bytesTransferred);
} else if (payloadTransferUpdate.status ==
PayloadStatus.FAILURE) {

View File

@@ -122,7 +122,7 @@ packages:
path: ".."
relative: true
source: path
version: "2.0.2"
version: "3.0.0-nullsafety.1"
path:
dependency: transitive
description:
@@ -130,20 +130,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0-nullsafety.3"
pedantic:
dependency: transitive
description:
name: pedantic
url: "https://pub.dartlang.org"
source: hosted
version: "1.9.2"
plugin_platform_interface:
dependency: transitive
description:
name: plugin_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.3"
sky_engine:
dependency: transitive
description: flutter
@@ -206,5 +192,5 @@ packages:
source: hosted
version: "2.1.0-nullsafety.5"
sdks:
dart: ">=2.12.0-0.0 <3.0.0"
dart: ">=2.12.0-29.10.beta <3.0.0"
flutter: ">=1.20.0 <2.0.0"