Skip to content

Commit

Permalink
Prefer final locals (#36)
Browse files Browse the repository at this point in the history
* remove unnecessary type annotations
  • Loading branch information
clintpurser authored May 26, 2023
1 parent 5ca369c commit 8451fe4
Show file tree
Hide file tree
Showing 20 changed files with 117 additions and 116 deletions.
1 change: 1 addition & 0 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ linter:
- unawaited_futures
- unnecessary_statements
- unnecessary_await_in_return
- prefer_final_locals

analyzer:
errors:
Expand Down
11 changes: 6 additions & 5 deletions example/viam_example_app/lib/screens/stream.dart
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,15 @@ class _StreamScreenState extends State<StreamScreen> {
}
}

ui.ImmutableBuffer buffer = await ui.ImmutableBuffer.fromUint8List(image.toUint8List());
final ui.ImmutableBuffer buffer = await ui.ImmutableBuffer.fromUint8List(image.toUint8List());

ui.ImageDescriptor id = ui.ImageDescriptor.raw(buffer, height: image.height, width: image.width, pixelFormat: ui.PixelFormat.rgba8888);
final ui.ImageDescriptor id =
ui.ImageDescriptor.raw(buffer, height: image.height, width: image.width, pixelFormat: ui.PixelFormat.rgba8888);

ui.Codec codec = await id.instantiateCodec(targetHeight: image.height, targetWidth: image.width);
final ui.Codec codec = await id.instantiateCodec(targetHeight: image.height, targetWidth: image.width);

ui.FrameInfo fi = await codec.getNextFrame();
ui.Image uiImage = fi.image;
final ui.FrameInfo fi = await codec.getNextFrame();
final ui.Image uiImage = fi.image;

return uiImage;
}
Expand Down
20 changes: 10 additions & 10 deletions lib/src/components/arm/service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -21,49 +21,49 @@ class ArmService extends ArmServiceBase {

@override
Future<DoCommandResponse> doCommand(ServiceCall call, DoCommandRequest request) async {
final Arm arm = _armFromManager(request.name);
final arm = _armFromManager(request.name);
final result = await arm.doCommand(request.command.toMap());
return DoCommandResponse(result: result.toStruct());
}

@override
Future<IsMovingResponse> isMoving(ServiceCall call, IsMovingRequest request) async {
final Arm arm = _armFromManager(request.name);
final bool isMoving = await arm.isMoving();
final arm = _armFromManager(request.name);
final isMoving = await arm.isMoving();
return IsMovingResponse(isMoving: isMoving);
}

@override
Future<StopResponse> stop(ServiceCall call, StopRequest request) async {
final Arm arm = _armFromManager(request.name);
final arm = _armFromManager(request.name);
await arm.stop(extra: request.extra.toMap());
return StopResponse();
}

@override
Future<GetEndPositionResponse> getEndPosition(ServiceCall call, GetEndPositionRequest request) async {
final Arm arm = _armFromManager(request.name);
final Pose pose = await arm.endPosition(extra: request.extra.toMap());
final arm = _armFromManager(request.name);
final pose = await arm.endPosition(extra: request.extra.toMap());
return GetEndPositionResponse(pose: pose);
}

@override
Future<GetJointPositionsResponse> getJointPositions(ServiceCall call, GetJointPositionsRequest request) async {
final Arm arm = _armFromManager(request.name);
final JointPositions jointPositions = await arm.jointPositions(extra: request.extra.toMap());
final arm = _armFromManager(request.name);
final jointPositions = await arm.jointPositions(extra: request.extra.toMap());
return GetJointPositionsResponse(positions: jointPositions);
}

@override
Future<MoveToJointPositionsResponse> moveToJointPositions(ServiceCall call, MoveToJointPositionsRequest request) async {
final Arm arm = _armFromManager(request.name);
final arm = _armFromManager(request.name);
await arm.moveToJointPositions(request.positions, extra: request.extra.toMap());
return MoveToJointPositionsResponse();
}

@override
Future<MoveToPositionResponse> moveToPosition(ServiceCall call, MoveToPositionRequest request) async {
final Arm arm = _armFromManager(request.name);
final arm = _armFromManager(request.name);
await arm.moveToPosition(request.to, extra: request.extra.toMap());
return MoveToPositionResponse();
}
Expand Down
2 changes: 1 addition & 1 deletion lib/src/components/base/client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class BaseClient extends Base {

@override
Future<bool> isMoving() async {
var response = await _client.isMoving(IsMovingRequest(name: name));
final response = await _client.isMoving(IsMovingRequest(name: name));
return response.isMoving;
}

Expand Down
14 changes: 7 additions & 7 deletions lib/src/components/base/service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -21,49 +21,49 @@ class BaseService extends BaseServiceBase {

@override
Future<MoveStraightResponse> moveStraight(ServiceCall call, MoveStraightRequest request) async {
Base base = _fromManager(request.name);
final base = _fromManager(request.name);
await base.moveStraight(request.distanceMm.toInt(), request.mmPerSec, extra: request.extra.toMap());
return MoveStraightResponse();
}

@override
Future<SpinResponse> spin(ServiceCall call, SpinRequest request) async {
Base base = _fromManager(request.name);
final base = _fromManager(request.name);
await base.spin(request.angleDeg, request.degsPerSec, extra: request.extra.toMap());
return SpinResponse();
}

@override
Future<SetPowerResponse> setPower(ServiceCall call, SetPowerRequest request) async {
Base base = _fromManager(request.name);
final base = _fromManager(request.name);
await base.setPower(request.linear, request.angular, extra: request.extra.toMap());
return SetPowerResponse();
}

@override
Future<SetVelocityResponse> setVelocity(ServiceCall call, SetVelocityRequest request) async {
Base base = _fromManager(request.name);
final base = _fromManager(request.name);
await base.setVelocity(request.linear, request.angular, extra: request.extra.toMap());
return SetVelocityResponse();
}

@override
Future<StopResponse> stop(ServiceCall call, StopRequest request) async {
Base base = _fromManager(request.name);
final base = _fromManager(request.name);
await base.stop(extra: request.extra.toMap());
return StopResponse();
}

@override
Future<IsMovingResponse> isMoving(ServiceCall call, IsMovingRequest request) async {
Base base = _fromManager(request.name);
final base = _fromManager(request.name);
final result = await base.isMoving();
return IsMovingResponse(isMoving: result);
}

@override
Future<DoCommandResponse> doCommand(ServiceCall call, DoCommandRequest request) async {
Base base = _fromManager(request.name);
final base = _fromManager(request.name);
final result = await base.doCommand(request.command.toMap());
return DoCommandResponse(result: result.toStruct());
}
Expand Down
4 changes: 2 additions & 2 deletions lib/src/components/board/board.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ class BoardStatus {
const BoardStatus(this.analogs, this.digitalInterrupts);

factory BoardStatus.fromProto(common.BoardStatus pbBoardStatus) {
BoardStatus boardStatus = const BoardStatus(<String, int>{}, <String, int>{});
const boardStatus = BoardStatus(<String, int>{}, <String, int>{});
pbBoardStatus.analogs.forEach((key, value) => boardStatus.analogs[key] = value.value);
pbBoardStatus.digitalInterrupts.forEach((key, value) => boardStatus.digitalInterrupts[key] = (value.value.toInt()));
return boardStatus;
}

common.BoardStatus get proto {
common.BoardStatus pbBoardStatus = common.BoardStatus();
final pbBoardStatus = common.BoardStatus();
analogs.forEach((key, value) => pbBoardStatus.analogs[key] = AnalogStatus(value: value));
digitalInterrupts.forEach((key, value) => pbBoardStatus.digitalInterrupts[key] = DigitalInterruptStatus(value: Int64(value)));
return pbBoardStatus;
Expand Down
12 changes: 6 additions & 6 deletions lib/src/components/board/client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class BoardClient extends Board {

@override
Future<BoardStatus> status({Map<String, dynamic>? extra}) async {
var response = await _client.status(StatusRequest(name: name, extra: extra?.toStruct()));
final response = await _client.status(StatusRequest(name: name, extra: extra?.toStruct()));
return BoardStatus.fromProto(response.status);
}

Expand All @@ -35,13 +35,13 @@ class BoardClient extends Board {

@override
Future<bool> gpio(String pin, {Map<String, dynamic>? extra}) async {
var response = await _client.getGPIO(GetGPIORequest(name: name, extra: extra?.toStruct()));
final response = await _client.getGPIO(GetGPIORequest(name: name, extra: extra?.toStruct()));
return response.high;
}

@override
Future<double> pwm(String pin, {Map<String, dynamic>? extra}) async {
var response = await _client.pWM(PWMRequest(name: name, extra: extra?.toStruct()));
final response = await _client.pWM(PWMRequest(name: name, extra: extra?.toStruct()));
return response.dutyCyclePct;
}

Expand All @@ -52,7 +52,7 @@ class BoardClient extends Board {

@override
Future<int> pwmFrequency({Map<String, dynamic>? extra}) async {
var response = await _client.pWMFrequency(PWMFrequencyRequest(name: name, extra: extra?.toStruct()));
final response = await _client.pWMFrequency(PWMFrequencyRequest(name: name, extra: extra?.toStruct()));
return response.frequencyHz as int;
}

Expand All @@ -63,14 +63,14 @@ class BoardClient extends Board {

@override
Future<int> analogReaderValue(String analogReaderName, {Map<String, dynamic>? extra}) async {
var response = await _client
final response = await _client
.readAnalogReader(ReadAnalogReaderRequest(boardName: name, analogReaderName: analogReaderName, extra: extra?.toStruct()));
return response.value;
}

@override
Future<int> digitalInterruptValue(String digitalInterruptName, {Map<String, dynamic>? extra}) async {
var response = await _client.getDigitalInterruptValue(
final response = await _client.getDigitalInterruptValue(
GetDigitalInterruptValueRequest(boardName: name, digitalInterruptName: digitalInterruptName, extra: extra?.toStruct()));
return response.value as int;
}
Expand Down
24 changes: 12 additions & 12 deletions lib/src/components/board/service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,78 +22,78 @@ class BoardService extends BoardServiceBase {

@override
Future<common.DoCommandResponse> doCommand(ServiceCall call, common.DoCommandRequest request) async {
final Board board = _fromManager(request.name);
final board = _fromManager(request.name);
final result = await board.doCommand(request.command.toMap());
return common.DoCommandResponse(result: result.toStruct());
}

@override
Future<GetDigitalInterruptValueResponse> getDigitalInterruptValue(ServiceCall call, GetDigitalInterruptValueRequest request) async {
final Board board = _fromManager(request.boardName);
final board = _fromManager(request.boardName);
final value = await board.digitalInterruptValue(request.digitalInterruptName, extra: request.extra.toMap());
return GetDigitalInterruptValueResponse(value: Int64(value));
}

@override
Future<GetGPIOResponse> getGPIO(ServiceCall call, GetGPIORequest request) async {
final Board board = _fromManager(request.name);
final board = _fromManager(request.name);
final high = await board.gpio(request.pin, extra: request.extra.toMap());
return GetGPIOResponse(high: high);
}

@override
Future<PWMResponse> pWM(ServiceCall call, PWMRequest request) async {
final Board board = _fromManager(request.name);
final board = _fromManager(request.name);
final dutyCyclePct = await board.pwm(request.pin, extra: request.extra.toMap());
return PWMResponse(dutyCyclePct: dutyCyclePct);
}

@override
Future<PWMFrequencyResponse> pWMFrequency(ServiceCall call, PWMFrequencyRequest request) async {
final Board board = _fromManager(request.name);
final board = _fromManager(request.name);
final frequencyHz = await board.pwmFrequency(extra: request.extra.toMap());
return PWMFrequencyResponse(frequencyHz: Int64(frequencyHz));
}

@override
Future<ReadAnalogReaderResponse> readAnalogReader(ServiceCall call, ReadAnalogReaderRequest request) async {
final Board board = _fromManager(request.boardName);
final board = _fromManager(request.boardName);
final value = await board.analogReaderValue(request.analogReaderName, extra: request.extra.toMap());
return ReadAnalogReaderResponse(value: value);
}

@override
Future<SetGPIOResponse> setGPIO(ServiceCall call, SetGPIORequest request) async {
final Board board = _fromManager(request.name);
final board = _fromManager(request.name);
await board.setGpioState(request.pin, request.high, extra: request.extra.toMap());
return SetGPIOResponse();
}

@override
Future<SetPWMResponse> setPWM(ServiceCall call, SetPWMRequest request) async {
final Board board = _fromManager(request.name);
final board = _fromManager(request.name);
await board.setPwm(request.pin, request.dutyCyclePct, extra: request.extra.toMap());
return SetPWMResponse();
}

@override
Future<SetPWMFrequencyResponse> setPWMFrequency(ServiceCall call, SetPWMFrequencyRequest request) async {
final Board board = _fromManager(request.name);
final board = _fromManager(request.name);
await board.setPwmFrequency(request.pin, request.frequencyHz.toInt(), extra: request.extra.toMap());
return SetPWMFrequencyResponse();
}

@override
Future<SetPowerModeResponse> setPowerMode(ServiceCall call, SetPowerModeRequest request) async {
final Board board = _fromManager(request.name);
final board = _fromManager(request.name);
await board.setPowerMode(request.powerMode, request.duration.seconds.toInt(), request.duration.nanos, extra: request.extra.toMap());
return SetPowerModeResponse();
}

@override
Future<StatusResponse> status(ServiceCall call, StatusRequest request) async {
final Board board = _fromManager(request.name);
final BoardStatus boardStatus = await board.status(extra: request.extra.toMap());
final board = _fromManager(request.name);
final boardStatus = await board.status(extra: request.extra.toMap());
return StatusResponse(status: boardStatus.proto);
}
}
Loading

0 comments on commit 8451fe4

Please sign in to comment.