From e06936de2dbcf5c871eb92645ed6f9d786a271b9 Mon Sep 17 00:00:00 2001 From: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com> Date: Sun, 5 Dec 2021 13:44:14 +0700 Subject: [PATCH] sort imports `flutter pub run import_sorter:main --no-comments` --- lib/livekit_client_web.dart | 7 +++++-- lib/src/events.dart | 2 +- lib/src/internal/events.dart | 3 ++- lib/src/managers/event.dart | 2 +- lib/src/participant/local_participant.dart | 1 + lib/src/participant/participant.dart | 2 +- lib/src/participant/remote_participant.dart | 2 +- lib/src/proto/livekit_models.pbenum.dart | 2 ++ lib/src/proto/livekit_models.pbjson.dart | 2 +- lib/src/proto/livekit_rtc.pb.dart | 1 - lib/src/proto/livekit_rtc.pbenum.dart | 2 ++ lib/src/proto/livekit_rtc.pbjson.dart | 2 +- lib/src/rtc_engine.dart | 3 ++- lib/src/support/disposable.dart | 1 + lib/src/support/native_audio.dart | 1 + lib/src/support/platforms/io.dart | 2 +- lib/src/support/platforms/web.dart | 5 +++-- lib/src/track/audio_management.dart | 3 ++- lib/src/track/remote/audio.dart | 5 +++-- lib/src/track/remote/video.dart | 2 +- lib/src/track/track.dart | 1 + lib/src/widget/video_track_renderer.dart | 3 ++- 22 files changed, 35 insertions(+), 19 deletions(-) diff --git a/lib/livekit_client_web.dart b/lib/livekit_client_web.dart index 7cf5cfd..30a622e 100644 --- a/lib/livekit_client_web.dart +++ b/lib/livekit_client_web.dart @@ -1,12 +1,15 @@ import 'dart:async'; + +import 'package:flutter/services.dart'; + +import 'package:flutter_web_plugins/flutter_web_plugins.dart'; + // In order to *not* need this ignore, consider extracting the "web" version // of your plugin as a separate package, instead of inlining it in the same // package as the core of your plugin. // ignore: avoid_web_libraries_in_flutter // import 'dart:html' as html show window; -import 'package:flutter/services.dart'; -import 'package:flutter_web_plugins/flutter_web_plugins.dart'; /// A web implementation of the Livekit plugin. class LiveKitWebPlugin { diff --git a/lib/src/events.dart b/lib/src/events.dart index 0639a7c..a5cebfe 100644 --- a/lib/src/events.dart +++ b/lib/src/events.dart @@ -7,8 +7,8 @@ import 'proto/livekit_models.pb.dart' as lk_models; import 'proto/livekit_rtc.pb.dart' as lk_rtc; import 'publication/local_track_publication.dart'; import 'publication/remote_track_publication.dart'; -import 'track/track.dart'; import 'publication/track_publication.dart'; +import 'track/track.dart'; import 'types.dart'; abstract class LiveKitEvent {} diff --git a/lib/src/internal/events.dart b/lib/src/internal/events.dart index 49309a4..085f361 100644 --- a/lib/src/internal/events.dart +++ b/lib/src/internal/events.dart @@ -1,7 +1,8 @@ // added + import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc; -import 'package:visibility_detector/visibility_detector.dart'; import 'package:meta/meta.dart'; +import 'package:visibility_detector/visibility_detector.dart'; import '../events.dart'; import '../track/track.dart'; diff --git a/lib/src/managers/event.dart b/lib/src/managers/event.dart index 5199a46..61c62f1 100644 --- a/lib/src/managers/event.dart +++ b/lib/src/managers/event.dart @@ -1,7 +1,7 @@ import 'dart:async'; -import 'package:synchronized/synchronized.dart' as sync; import 'package:meta/meta.dart'; +import 'package:synchronized/synchronized.dart' as sync; import '../exceptions.dart'; import '../extensions.dart'; diff --git a/lib/src/participant/local_participant.dart b/lib/src/participant/local_participant.dart index d2c94a3..763b8ca 100644 --- a/lib/src/participant/local_participant.dart +++ b/lib/src/participant/local_participant.dart @@ -1,4 +1,5 @@ import 'package:flutter/foundation.dart'; + import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc; import 'package:meta/meta.dart'; diff --git a/lib/src/participant/participant.dart b/lib/src/participant/participant.dart index 179a345..666f817 100644 --- a/lib/src/participant/participant.dart +++ b/lib/src/participant/participant.dart @@ -6,10 +6,10 @@ import '../extensions.dart'; import '../logger.dart'; import '../managers/event.dart'; import '../proto/livekit_models.pb.dart' as lk_models; +import '../publication/track_publication.dart'; import '../rtc_engine.dart'; import '../support/disposable.dart'; import '../track/track.dart'; -import '../publication/track_publication.dart'; import '../types.dart'; import 'remote_participant.dart'; diff --git a/lib/src/participant/remote_participant.dart b/lib/src/participant/remote_participant.dart index a39ac09..70ad38c 100644 --- a/lib/src/participant/remote_participant.dart +++ b/lib/src/participant/remote_participant.dart @@ -1,7 +1,7 @@ import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc; -import 'package:livekit_client/livekit_client.dart'; import 'package:meta/meta.dart'; +import 'package:livekit_client/livekit_client.dart'; import '../constants.dart'; import '../events.dart'; import '../extensions.dart'; diff --git a/lib/src/proto/livekit_models.pbenum.dart b/lib/src/proto/livekit_models.pbenum.dart index 1e5f124..a9bcda4 100644 --- a/lib/src/proto/livekit_models.pbenum.dart +++ b/lib/src/proto/livekit_models.pbenum.dart @@ -6,7 +6,9 @@ // ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name // ignore_for_file: UNDEFINED_SHOWN_NAME + import 'dart:core' as $core; + import 'package:protobuf/protobuf.dart' as $pb; class TrackType extends $pb.ProtobufEnum { diff --git a/lib/src/proto/livekit_models.pbjson.dart b/lib/src/proto/livekit_models.pbjson.dart index 26fcbf1..d10bf97 100644 --- a/lib/src/proto/livekit_models.pbjson.dart +++ b/lib/src/proto/livekit_models.pbjson.dart @@ -5,8 +5,8 @@ // @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name -import 'dart:core' as $core; import 'dart:convert' as $convert; +import 'dart:core' as $core; import 'dart:typed_data' as $typed_data; @$core.Deprecated('Use trackTypeDescriptor instead') diff --git a/lib/src/proto/livekit_rtc.pb.dart b/lib/src/proto/livekit_rtc.pb.dart index 622f70a..38a640b 100644 --- a/lib/src/proto/livekit_rtc.pb.dart +++ b/lib/src/proto/livekit_rtc.pb.dart @@ -10,7 +10,6 @@ import 'dart:core' as $core; import 'package:protobuf/protobuf.dart' as $pb; import 'livekit_models.pb.dart' as $0; - import 'livekit_models.pbenum.dart' as $0; import 'livekit_rtc.pbenum.dart'; diff --git a/lib/src/proto/livekit_rtc.pbenum.dart b/lib/src/proto/livekit_rtc.pbenum.dart index 4f2ef31..a66bd03 100644 --- a/lib/src/proto/livekit_rtc.pbenum.dart +++ b/lib/src/proto/livekit_rtc.pbenum.dart @@ -6,7 +6,9 @@ // ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name // ignore_for_file: UNDEFINED_SHOWN_NAME + import 'dart:core' as $core; + import 'package:protobuf/protobuf.dart' as $pb; class SignalTarget extends $pb.ProtobufEnum { diff --git a/lib/src/proto/livekit_rtc.pbjson.dart b/lib/src/proto/livekit_rtc.pbjson.dart index 4eccd04..035bca1 100644 --- a/lib/src/proto/livekit_rtc.pbjson.dart +++ b/lib/src/proto/livekit_rtc.pbjson.dart @@ -5,8 +5,8 @@ // @dart = 2.12 // ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name -import 'dart:core' as $core; import 'dart:convert' as $convert; +import 'dart:core' as $core; import 'dart:typed_data' as $typed_data; @$core.Deprecated('Use signalTargetDescriptor instead') diff --git a/lib/src/rtc_engine.dart b/lib/src/rtc_engine.dart index 7ce4f9e..bd53e65 100644 --- a/lib/src/rtc_engine.dart +++ b/lib/src/rtc_engine.dart @@ -1,7 +1,8 @@ import 'dart:async'; -import 'package:collection/collection.dart'; import 'package:flutter/foundation.dart'; + +import 'package:collection/collection.dart'; import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc; import 'package:meta/meta.dart'; diff --git a/lib/src/support/disposable.dart b/lib/src/support/disposable.dart index 2b8497a..a479e25 100644 --- a/lib/src/support/disposable.dart +++ b/lib/src/support/disposable.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; + import 'package:meta/meta.dart'; import '../extensions.dart'; diff --git a/lib/src/support/native_audio.dart b/lib/src/support/native_audio.dart index 85d0be7..5082dfa 100644 --- a/lib/src/support/native_audio.dart +++ b/lib/src/support/native_audio.dart @@ -1,4 +1,5 @@ // https://developer.apple.com/documentation/avfaudio/avaudiosession/category + import 'package:flutter/services.dart'; import '../logger.dart'; diff --git a/lib/src/support/platforms/io.dart b/lib/src/support/platforms/io.dart index 16baa02..22f6522 100644 --- a/lib/src/support/platforms/io.dart +++ b/lib/src/support/platforms/io.dart @@ -1,9 +1,9 @@ import 'dart:async'; import 'dart:io' as io; +import '../../extensions.dart'; import '../../logger.dart'; import '../websocket.dart'; -import '../../extensions.dart'; Future lkWebSocketConnect( Uri uri, [ diff --git a/lib/src/support/platforms/web.dart b/lib/src/support/platforms/web.dart index bfd4329..5f350d4 100644 --- a/lib/src/support/platforms/web.dart +++ b/lib/src/support/platforms/web.dart @@ -1,11 +1,12 @@ import 'dart:async'; - -// ignore: avoid_web_libraries_in_flutter import 'dart:html' as html; import 'dart:typed_data'; import '../websocket.dart'; +// ignore: avoid_web_libraries_in_flutter + + Future lkWebSocketConnect( Uri uri, [ WebSocketEventHandlers? options, diff --git a/lib/src/track/audio_management.dart b/lib/src/track/audio_management.dart index e87cd2b..4f5e91e 100644 --- a/lib/src/track/audio_management.dart +++ b/lib/src/track/audio_management.dart @@ -3,12 +3,13 @@ import 'dart:io'; import 'package:flutter/foundation.dart'; + import 'package:synchronized/synchronized.dart' as sync; import '../logger.dart'; import '../support/native_audio.dart'; -import 'local/audio.dart'; import 'local.dart'; +import 'local/audio.dart'; enum AudioTrackState { none, diff --git a/lib/src/track/remote/audio.dart b/lib/src/track/remote/audio.dart index bc04134..fb3e104 100644 --- a/lib/src/track/remote/audio.dart +++ b/lib/src/track/remote/audio.dart @@ -2,12 +2,13 @@ import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc; import '../../proto/livekit_models.pb.dart' as lk_models; import '../../types.dart'; -import '../web/_audio_api.dart' if (dart.library.html) '../web/_audio_html.dart' - as audio; import '../audio_management.dart'; import '../local.dart'; import '../remote.dart'; +import '../web/_audio_api.dart' if (dart.library.html) '../web/_audio_html.dart' + as audio; + class RemoteAudioTrack extends RemoteTrack with AudioTrack, AudioManagementMixin { // diff --git a/lib/src/track/remote/video.dart b/lib/src/track/remote/video.dart index 455f942..afa1a44 100644 --- a/lib/src/track/remote/video.dart +++ b/lib/src/track/remote/video.dart @@ -1,6 +1,6 @@ import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc; -import 'package:livekit_client/src/track/local.dart'; +import 'package:livekit_client/src/track/local.dart'; import '../../proto/livekit_models.pb.dart' as lk_models; import '../../types.dart'; import '../remote.dart'; diff --git a/lib/src/track/track.dart b/lib/src/track/track.dart index c728e0d..d67c836 100644 --- a/lib/src/track/track.dart +++ b/lib/src/track/track.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; + import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc; import 'package:meta/meta.dart'; import 'package:uuid/uuid.dart'; diff --git a/lib/src/widget/video_track_renderer.dart b/lib/src/widget/video_track_renderer.dart index 48b1284..eee3873 100644 --- a/lib/src/widget/video_track_renderer.dart +++ b/lib/src/widget/video_track_renderer.dart @@ -1,9 +1,10 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; + import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc; -import 'package:livekit_client/src/track/local.dart'; import 'package:visibility_detector/visibility_detector.dart'; +import 'package:livekit_client/src/track/local.dart'; import '../events.dart'; import '../extensions.dart'; import '../internal/events.dart';