File tree Expand file tree Collapse file tree 4 files changed +5
-30
lines changed Expand file tree Collapse file tree 4 files changed +5
-30
lines changed Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ class BluetoothCharacteristic {
22
22
}
23
23
24
24
BehaviorSubject <List <int >> _value;
25
- Stream <List <int >> get value => Observable .merge ([
25
+ Stream <List <int >> get value => Rx .merge ([
26
26
_value.stream,
27
27
_onValueChangedStream,
28
28
]);
Original file line number Diff line number Diff line change @@ -87,7 +87,7 @@ class FlutterBlue {
87
87
final killStreams = < Stream > [];
88
88
killStreams.add (_stopScanPill);
89
89
if (timeout != null ) {
90
- killStreams.add (Observable .timer (null , timeout));
90
+ killStreams.add (Rx .timer (null , timeout));
91
91
}
92
92
93
93
// Clear scan results list
@@ -102,10 +102,8 @@ class FlutterBlue {
102
102
throw e;
103
103
}
104
104
105
- yield * Observable (FlutterBlue .instance._methodStream
106
- .where ((m) => m.method == "ScanResult" )
107
- .map ((m) => m.arguments))
108
- .takeUntil (Observable .merge (killStreams))
105
+ yield * FlutterBlue .instance._methodStream.where ((m) => m.method == "ScanResult" ).map ((m) => m.arguments)
106
+ .takeUntil (Rx .merge (killStreams))
109
107
.doOnDone (stopScan)
110
108
.map ((buffer) => new protos.ScanResult .fromBuffer (buffer))
111
109
.map ((p) {
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ dependencies:
14
14
sdk : flutter
15
15
convert : " ^2.1.1"
16
16
protobuf : " ^1.0.0"
17
- rxdart : " ^0.22.0 "
17
+ rxdart : ^0.23.1
18
18
19
19
dev_dependencies :
20
20
flutter_test :
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments