8000 chore: Migrating to lints 2.0.0. (#1128) · myname-caoben/flutter-webrtc@9e3c09e · GitHub
[go: up one dir, main page]
8000
Skip to content

Commit 9e3c09e

Browse files
cloudwebrtccloudwebrtc
authored
chore: Migrating to lints 2.0.0. (flutter-webrtc#1128)
1 parent 3a03101 commit 9e3c09e

14 files changed

+41
-34
lines changed

‎analysis_options.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include: package:pedantic/analysis_options.yaml
1+
include: package:lints/recommended.yaml
22

33
linter:
44
rules:
@@ -47,3 +47,4 @@ analyzer:
4747
sdk_version_async_exported_from_core: ignore
4848
# Conflict with import_sorter
4949
directives_ordering: ignore
50+
constant_identifier_names: ignore

‎lib/src/helper.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ class Helper {
9191
if (deviceId == null) throw 'You need to specify the deviceId';
9292
if (stream == null) throw 'You need to specify the stream';
9393

94-
var _cameras = await cameras;
95-
if (!_cameras.any((e) => e.deviceId == deviceId)) {
94+
var cams = await cameras;
95+
if (!cams.any((e) => e.deviceId == deviceId)) {
9696
throw 'The provided deviceId is not available, make sure to retreive the deviceId from Helper.cammeras()';
9797
}
9898

@@ -108,10 +108,10 @@ class Helper {
108108
'video': {'deviceId': deviceId}
109109
};
110110

111-
var _stream = await openCamera(mediaConstraints);
112-
var _cameraTrack = _stream.getVideoTracks()[0];
111+
var newStream = await openCamera(mediaConstraints);
112+
var newCamTrack = newStream.getVideoTracks()[0];
113113

114-
await stream.addTrack(_cameraTrack, addToNative: true);
114+
await stream.addTrack(newCamTrack, addToNative: true);
115115

116116
return Future.value(true);
117117
}

‎lib/src/media_recorder.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import 'package:webrtc_interface/webrtc_interface.dart' as _interface;
1+
import 'package:webrtc_interface/webrtc_interface.dart' as rtc;
22

33
import '../flutter_webrtc.dart';
44

5-
class MediaRecorder extends _interface.MediaRecorder {
5+
class MediaRecorder extends rtc.MediaRecorder {
66
MediaRecorder() : _delegate = mediaRecorder();
7-
final _interface.MediaRecorder _delegate;
7+
final rtc.MediaRecorder _delegate;
88

99
@override
1010
Future<void> start(String path,

‎lib/src/native/media_stream_impl.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ class MediaStreamNative extends MediaStream {
2020
void setMediaTracks(List<dynamic> audioTracks, List<dynamic> videoTracks) {
2121
_audioTracks.clear();
2222

23-
audioTracks.forEach((track) {
23+
for (var track in audioTracks) {
2424
_audioTracks.add(MediaStreamTrackNative(
2525
track['id'], track['label'], track['kind'], track['enabled']));
26-
});
26+
}
2727

2828
_videoTracks.clear();
29-
videoTracks.forEach((track) {
29+
for (var track in videoTracks) {
3030
_videoTracks.add(MediaStreamTrackNative(
3131
track['id'], track['label'], track['kind'], track['enabled']));
32-
});
32+
}
3333
}
3434

3535
@override
@@ -88,7 +88,7 @@ class MediaStreamNative extends MediaStream {
8888
}
8989

9090
@override
91-
Future<Null> dispose() async {
91+
Future<void> dispose() async {
9292
await WebRTC.invokeMethod(
9393
'streamDispose',
9494
<String, dynamic>{'streamId': id},

‎lib/src/native/media_stream_track_impl.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ class MediaStreamTrackNative extends MediaStreamTrack {
7777
'captureFrame',
7878
<String, dynamic>{
7979
'trackId': _trackId,
80-
'path': filePath.path + '/captureFrame.png'
80+
'path': '${filePath.path}/captureFrame.png'
8181
},
8282
);
83-
return File(filePath.path + '/captureFrame.png')
83+
return File('${filePath.path}/captureFrame.png')
8484
.readAsBytes()
8585
.then((value) => value.buffer);
8686
}
@@ -89,9 +89,9 @@ class MediaStreamTrackNative extends MediaStreamTrack {
8989
Future<void> applyConstraints([Map<String, dynamic>? constraints]) {
9090
if (constraints == null) return Future.value();
9191

92-
var _current = getConstraints();
92+
var current = getConstraints();
9393
if (constraints.containsKey('volume') &&
94-
_current['volume'] != constraints['volume']) {
94+
current['volume'] != constraints['volume']) {
9595
Helper.setVolume(constraints['volume'], this);
9696
}
9797

‎lib/src/native/mediadevices_impl.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ class MediaDeviceNative extends MediaDevices {
8787

8888
@override
8989
Future<List<MediaDeviceInfo>> enumerateDevices() async {
90-
var _source = await getSources();
91-
return _source
90+
var source = await getSources();
91+
return source
9292
.map(
9393
(e) => MediaDeviceInfo(
9494
deviceId: e['deviceId'],

‎lib/src/native/rtc_data_channel_impl.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ class RTCDataChannelNative extends RTCDataChannel {
3030
final String _label;
3131
int _bufferedAmount = 0;
3232
@override
33+
// ignore: overridden_fields
3334
int? bufferedAmountLowThreshold;
3435

3536
/// Id for the datachannel in the Flutter <-> Native layer.

‎lib/src/native/rtc_peerconnection_impl.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,16 +371,16 @@ class RTCPeerConnectionNative extends RTCPeerConnection {
371371
try {
372372
final response = await WebRTC.invokeMethod('getStats', <String, dynamic>{
373373
'peerConnectionId': _peerConnectionId,
374-
'trackId': track != null ? track.id : null
374+
'trackId': track?.id
375375
});
376376

377377
var stats = <StatsReport>[];
378378
if (response != null) {
379379
List<dynamic> reports = response['stats'];
380-
reports.forEach((report) {
380+
for (var report in reports) {
381381
stats.add(StatsReport(report['id'], report['type'],
382382
(report['timestamp'] as num).toDouble(), report['values']));
383-
});
383+
}
384384
}
385385
return stats;
386386
} on PlatformException catch (e) {

‎lib/src/native/rtc_rtp_receiver_impl.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ class RTCRtpReceiverNative extends RTCRtpReceiver {
3535
var stats = <StatsReport>[];
3636
if (response != null) {
3737
List<dynamic> reports = response['stats'];
38-
reports.forEach((report) {
38+
for (var report in reports) {
3939
stats.add(StatsReport(report['id'], report['type'],
4040
report['timestamp'], report['values']));
41-
});
41+
}
4242
}
4343
return stats;
4444
} on PlatformException catch (e) {

‎lib/src/native/rtc_rtp_sender_impl.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ class RTCRtpSenderNative extends RTCRtpSender {
5252
var stats = <StatsReport>[];
5353
if (response != null) {
5454
List<dynamic> reports = response['stats'];
55-
reports.forEach((report) {
55+
for (var report in reports) {
5656
stats.add(StatsReport(report['id'], report['type'],
5757
report['timestamp'], report['values']));
58-
});
58+
}
5959
}
6060
return stats;
6161
} on PlatformException catch (e) {

0 commit comments

Comments
 (0)
0