Dart 2 compatibility. Fixes #51

ozxcorp · Apr 2, 2018 · 69493c9 · 69493c9
1 parent 8266b4a
commit 69493c9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -211,7 +211,7 @@ class _FlutterBlueAppState extends State<FlutterBlueApp> {
         .toList();
   }
 
-  _buildDescriptorTile(BluetoothDescriptor d) {
+  Widget _buildDescriptorTile(BluetoothDescriptor d) {
     var title = new Column(
       mainAxisAlignment: MainAxisAlignment.center,
       crossAxisAlignment: CrossAxisAlignment.start,
@@ -251,7 +251,7 @@ class _FlutterBlueAppState extends State<FlutterBlueApp> {
     );
   }
 
-  _buildCharacteristicTile(BluetoothCharacteristic c) {
+  Widget _buildCharacteristicTile(BluetoothCharacteristic c) {
     var descriptorTiles =
         c.descriptors.map((d) => _buildDescriptorTile(d)).toList();
     var actions = new Row(
@@ -308,7 +308,7 @@ class _FlutterBlueAppState extends State<FlutterBlueApp> {
     }
   }
 
-  _buildServiceTile(BluetoothService s) {
+  Widget _buildServiceTile(BluetoothService s) {
     var characteristicsTiles = s.characteristics
         .map((c) => _buildCharacteristicTile(c))
         .toList();
@@ -338,7 +338,7 @@ class _FlutterBlueAppState extends State<FlutterBlueApp> {
     }
   }
 
-  _buildServiceTiles() {
+  List<Widget> _buildServiceTiles() {
     return services.map((s) => _buildServiceTile(s)).toList();
   }
 
@@ -389,7 +389,7 @@ class _FlutterBlueAppState extends State<FlutterBlueApp> {
 
   @override
   Widget build(BuildContext context) {
-    var tiles = new List();
+    var tiles = new List<Widget>();
     if (state != BluetoothState.on) {
       tiles.add(_buildAlertTile());
     }

diff --git a/lib/src/flutter_blue.dart b/lib/src/flutter_blue.dart
@@ -90,7 +90,7 @@ class FlutterBlue {
   }
 
   /// Stops a scan for Bluetooth Low Energy devices
-  Future<Null> _stopScan() => _channel.invokeMethod('stopScan');
+  Future _stopScan() => _channel.invokeMethod('stopScan');
 
   /// Establishes a connection to the Bluetooth Device.
   /// Returns a stream of [BluetoothDeviceState]
@@ -104,7 +104,7 @@ class FlutterBlue {
     var connected = false;
     StreamSubscription subscription;
     StreamController controller;
-    controller = new StreamController(
+    controller = new StreamController<BluetoothDeviceState>(
       onListen: () {
         if(timeout != null) {
           new Future.delayed(timeout, () => (!connected) ? controller.close(): null);
@@ -134,9 +134,7 @@ class FlutterBlue {
   }
 
   /// Cancels connection to the Bluetooth Device
-  Future<Null> _cancelConnection(BluetoothDevice device) {
-    return _channel.invokeMethod('disconnect', device.id.toString());
-  }
+  Future _cancelConnection(BluetoothDevice device) => _channel.invokeMethod('disconnect', device.id.toString());
 }
 
 /// State of the bluetooth adapter.