Skip to content

Commit f876b48

Browse files
committed
revert changing signature of dematerialize
1 parent 1846c15 commit f876b48

File tree

9 files changed

+23
-17
lines changed

9 files changed

+23
-17
lines changed

example/lib/src/ui/device_detail/characteristic_interaction_dialog.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,10 @@ class _CharacteristicInteractionDialogState
135135
border: OutlineInputBorder(),
136136
labelText: 'Value',
137137
),
138+
keyboardType: TextInputType.numberWithOptions(
139+
decimal: true,
140+
signed: false,
141+
),
138142
),
139143
),
140144
Row(

lib/src/connected_device_operation.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class ConnectedDeviceOperationImpl implements ConnectedDeviceOperation {
4545
Future<List<int>> readCharacteristic(QualifiedCharacteristic characteristic) {
4646
final specificCharacteristicValueStream = characteristicValueStream
4747
.where((update) => update.characteristic == characteristic)
48-
.map((update) => update.result.dematerialize()!);
48+
.map((update) => update.result.dematerialize());
4949

5050
return _controller
5151
.readCharacteristic(characteristic)

lib/src/converter/protobuf_converter.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class ProtobufConverterImpl implements ProtobufConverter {
138138
return WriteCharacteristicInfo(
139139
characteristic: qualifiedCharacteristicFrom(message.characteristic),
140140
result: resultFrom(
141-
getValue: () {},
141+
getValue: () => Unit(),
142142
failure: genericFailureFrom(
143143
hasFailure: message.hasFailure(),
144144
getFailure: () => message.failure,

lib/src/device_scanner.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class DeviceScannerImpl implements DeviceScanner {
6161

6262
final scanRepeater = Repeater(
6363
onListenEmitFrom: () =>
64-
_scanStream.map((scan) => scan.result.dematerialize()!).handleError(
64+
_scanStream.map((scan) => scan.result.dematerialize()).handleError(
6565
(Object e, StackTrace s) {
6666
if (!completer.isCompleted) {
6767
completer.completeError(e, s);

lib/src/model/result.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ class Result<Value, Failure> {
1212
_value = null; // ignore: avoid_field_initializers_in_const_classes
1313

1414
/// Provides the value in case of success or throws [Exception] in case of failure.
15-
Value? dematerialize() => iif(
16-
success: (value) => value,
15+
Value dematerialize() => iif(
16+
success: (value) => value!,
1717
failure: (failure) {
1818
if (failure is Exception && failure != null) {
1919
throw failure;
@@ -24,8 +24,8 @@ class Result<Value, Failure> {
2424
);
2525

2626
/// Execute specific actions on success and on failure.
27-
T? iif<T>(
28-
{required T? Function(Value? value) success,
27+
T iif<T>(
28+
{required T Function(Value? value) success,
2929
required T Function(Failure? failure) failure}) {
3030
assert(_value == null || _failure == null);
3131

lib/src/model/write_characteristic_info.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import 'package:flutter_reactive_ble/src/model/generic_failure.dart';
22
import 'package:flutter_reactive_ble/src/model/qualified_characteristic.dart';
33
import 'package:flutter_reactive_ble/src/model/result.dart';
4+
import 'package:flutter_reactive_ble/src/model/unit.dart';
45
import 'package:meta/meta.dart';
56

67
@immutable
78
class WriteCharacteristicInfo {
89
final QualifiedCharacteristic characteristic;
9-
final Result<void, GenericFailure<WriteCharacteristicFailure>?> result;
10+
final Result<Unit, GenericFailure<WriteCharacteristicFailure>?> result;
1011

1112
const WriteCharacteristicInfo({
1213
required this.characteristic,

test/connected_device_operation_test.dart

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import 'package:flutter_reactive_ble/src/connected_device_operation.dart';
55
import 'package:flutter_reactive_ble/src/model/characteristic_value.dart';
66
import 'package:flutter_reactive_ble/src/model/qualified_characteristic.dart';
77
import 'package:flutter_reactive_ble/src/model/result.dart';
8+
import 'package:flutter_reactive_ble/src/model/unit.dart';
89
import 'package:flutter_reactive_ble/src/model/uuid.dart';
910
import 'package:flutter_reactive_ble/src/model/write_characteristic_info.dart';
1011
import 'package:flutter_reactive_ble/src/plugin_controller.dart';
@@ -154,8 +155,8 @@ void main() {
154155
setUp(() {
155156
info = WriteCharacteristicInfo(
156157
characteristic: characteristic,
157-
result: const Result<void,
158-
GenericFailure<WriteCharacteristicFailure>>.success(1),
158+
result: const Result<Unit,
159+
GenericFailure<WriteCharacteristicFailure>>.success(Unit()),
159160
);
160161

161162
when(_controller.writeCharacteristicWithResponse(any, any))
@@ -172,7 +173,7 @@ void main() {
172173
setUp(() {
173174
info = WriteCharacteristicInfo(
174175
characteristic: characteristic,
175-
result: const Result<void,
176+
result: const Result<Unit,
176177
GenericFailure<WriteCharacteristicFailure>>.failure(
177178
GenericFailure<WriteCharacteristicFailure>(
178179
code: WriteCharacteristicFailure.unknown,
@@ -200,8 +201,8 @@ void main() {
200201
setUp(() {
201202
info = WriteCharacteristicInfo(
202203
characteristic: characteristic,
203-
result: const Result<void,
204-
GenericFailure<WriteCharacteristicFailure>>.success(1),
204+
result: const Result<Unit,
205+
GenericFailure<WriteCharacteristicFailure>>.success(Unit()),
205206
);
206207

207208
when(_controller.writeCharacteristicWithoutResponse(any, any))
@@ -220,7 +221,7 @@ void main() {
220221
setUp(() {
221222
info = WriteCharacteristicInfo(
222223
characteristic: characteristic,
223-
result: const Result<void,
224+
result: const Result<Unit,
224225
GenericFailure<WriteCharacteristicFailure>>.failure(
225226
GenericFailure<WriteCharacteristicFailure>(
226227
code: WriteCharacteristicFailure.unknown,

test/converter/protobuf_converter_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ void main() {
400400
.iif(
401401
success: (_) => throw AssertionError("Not expected to succeed"),
402402
failure: (f) => f!);
403-
expect(result?.code, WriteCharacteristicFailure.unknown);
403+
expect(result.code, WriteCharacteristicFailure.unknown);
404404
});
405405
});
406406

@@ -433,7 +433,7 @@ void main() {
433433
.iif(
434434
success: (_) => throw AssertionError("Not expected to succeed"),
435435
failure: (f) => f!);
436-
expect(result?.code, ConnectionPriorityFailure.unknown);
436+
expect(result.code, ConnectionPriorityFailure.unknown);
437437
});
438438
});
439439

test/plugin_controller_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ void main() {
265265
// ignore: void_checks
266266
characteristic: characteristic,
267267
// ignore: void_checks
268-
result: const Result.success(0));
268+
result: const Result.success(Unit()));
269269

270270
when(_methodChannel.invokeMethod<List<int>?>(any, any)).thenAnswer(
271271
(_) async => [1],

0 commit comments

Comments
 (0)