organize track & pub to directory

lib/livekit_client.dart

@@ -13,13 +13,13 @@ export 'src/participant/remote_participant.dart';
 export 'src/proto/livekit_models.pb.dart' show TrackType;
 export 'src/proto/livekit_rtc.pb.dart' show VideoQuality;
 export 'src/room.dart';
-export 'src/track/local_audio_track.dart';
-export 'src/track/local_track_publication.dart';
-export 'src/track/local_video_track.dart';
-export 'src/track/local_track.dart';
+export 'src/track/local/audio.dart';
+export 'src/publication/local_track_publication.dart';
+export 'src/track/local/video.dart';
+export 'src/track/local.dart';
 export 'src/track/options.dart';
-export 'src/track/remote_track_publication.dart';
+export 'src/publication/remote_track_publication.dart';
 export 'src/track/track.dart';
-export 'src/track/track_publication.dart';
+export 'src/publication/track_publication.dart';
 export 'src/types.dart';
 export 'src/widget/video_track_renderer.dart';

lib/src/events.dart

@@ -5,10 +5,10 @@ import 'participant/participant.dart';
 import 'participant/remote_participant.dart';
 import 'proto/livekit_models.pb.dart' as lk_models;
 import 'proto/livekit_rtc.pb.dart' as lk_rtc;
-import 'track/local_track_publication.dart';
-import 'track/remote_track_publication.dart';
+import 'publication/local_track_publication.dart';
+import 'publication/remote_track_publication.dart';
 import 'track/track.dart';
-import 'track/track_publication.dart';
+import 'publication/track_publication.dart';
 import 'types.dart';
 
 abstract class LiveKitEvent {}

lib/src/participant/local_participant.dart

@@ -10,10 +10,10 @@ import '../managers/event.dart';
 import '../options.dart';
 import '../proto/livekit_models.pb.dart' as lk_models;
 import '../rtc_engine.dart';
-import '../track/local_audio_track.dart';
-import '../track/local_track_publication.dart';
-import '../track/local_video_track.dart';
-import '../track/track_publication.dart';
+import '../track/local/audio.dart';
+import '../publication/local_track_publication.dart';
+import '../track/local/video.dart';
+import '../publication/track_publication.dart';
 import '../types.dart';
 import '../utils.dart';
 import 'participant.dart';

lib/src/participant/participant.dart

@@ -8,7 +8,7 @@ import '../managers/event.dart';
 import '../proto/livekit_models.pb.dart' as lk_models;
 import '../support/disposable.dart';
 import '../track/track.dart';
-import '../track/track_publication.dart';
+import '../publication/track_publication.dart';
 import '../types.dart';
 import 'remote_participant.dart';
 

lib/src/participant/remote_participant.dart

@@ -8,9 +8,9 @@ import '../logger.dart';
 import '../managers/event.dart';
 import '../proto/livekit_models.pb.dart' as lk_models;
 import '../rtc_engine.dart';
-import '../track/remote_audio_track.dart';
-import '../track/remote_track_publication.dart';
-import '../track/remote_video_track.dart';
+import '../track/remote/audio.dart';
+import '../publication/remote_track_publication.dart';
+import '../track/remote/video.dart';
 import '../track/track.dart';
 import '../types.dart';
 import 'participant.dart';

lib/src/publication/local_track_publication.dart

@@ -3,8 +3,8 @@ import '../extensions.dart';
 import '../internal/events.dart';
 import '../participant/local_participant.dart';
 import '../proto/livekit_models.pb.dart' as lk_models;
-import 'local_track.dart';
-import 'track.dart';
+import '../track/local.dart';
+import '../track/track.dart';
 import 'track_publication.dart';
 
 class LocalTrackPublication extends TrackPublication {

lib/src/publication/remote_track_publication.dart

@@ -12,8 +12,8 @@ import '../participant/remote_participant.dart';
 import '../proto/livekit_models.pb.dart' as lk_models;
 import '../proto/livekit_rtc.pb.dart' as lk_rtc;
 import '../utils.dart';
-import 'remote_track.dart';
-import 'track.dart';
+import '../track/remote.dart';
+import '../track/track.dart';
 import 'track_publication.dart';
 
 class RendererVisibility {

lib/src/publication/track_publication.dart

@@ -4,7 +4,7 @@ import '../extensions.dart';
 import '../proto/livekit_models.pb.dart' as lk_models;
 import '../support/disposable.dart';
 import '../types.dart';
-import 'track.dart';
+import '../track/track.dart';
 
 /// Represents a track that's published to the server. This class contains
 /// metadata associated with tracks.

lib/src/room.dart

@@ -16,7 +16,7 @@ import 'proto/livekit_models.pb.dart' as lk_models;
 import 'proto/livekit_rtc.pb.dart' as lk_rtc;
 import 'rtc_engine.dart';
 import 'support/disposable.dart';
-import 'track/local_track_publication.dart';
+import 'publication/local_track_publication.dart';
 import 'track/track.dart';
 import 'types.dart';
 

lib/src/track/audio_management.dart

@@ -7,8 +7,8 @@ import 'package:synchronized/synchronized.dart' as sync;
 
 import '../logger.dart';
 import '../support/native_audio.dart';
-import 'local_audio_track.dart';
-import 'local_track.dart';
+import 'local/audio.dart';
+import 'local.dart';
 
 enum AudioTrackState {
   none,

lib/src/track/local/audio.dart

@@ -2,11 +2,11 @@ import 'dart:async';
 
 import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
 
-import '../proto/livekit_models.pb.dart' as lk_models;
-import '../types.dart';
-import 'audio_management.dart';
-import 'local_track.dart';
-import 'options.dart';
+import '../../proto/livekit_models.pb.dart' as lk_models;
+import '../../types.dart';
+import '../audio_management.dart';
+import '../local.dart';
+import '../options.dart';
 
 class LocalAudioTrack extends LocalTrack with AudioTrack, AudioManagementMixin {
   // Options used for this track

lib/src/track/local/video.dart

@@ -1,11 +1,11 @@
 import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
 
-import '../logger.dart';
-import '../proto/livekit_models.pb.dart' as lk_models;
-import '../types.dart';
-import 'local_track.dart';
-import 'options.dart';
-import 'track.dart';
+import '../../logger.dart';
+import '../../proto/livekit_models.pb.dart' as lk_models;
+import '../../types.dart';
+import '../local.dart';
+import '../options.dart';
+import '../track.dart';
 
 /// A video track from the local device. Use static methods in this class to create
 /// video tracks.

lib/src/track/remote/audio.dart

@@ -1,11 +1,12 @@
 import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
 
-import '../proto/livekit_models.pb.dart' as lk_models;
-import '../types.dart';
-import '_audio_api.dart' if (dart.library.html) '_audio_html.dart' as audio;
-import 'audio_management.dart';
-import 'local_track.dart';
-import 'remote_track.dart';
+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';
 
 class RemoteAudioTrack extends RemoteTrack
     with AudioTrack, AudioManagementMixin {

lib/src/track/remote/video.dart

@@ -1,9 +1,9 @@
 import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
-import 'package:livekit_client/src/track/local_track.dart';
+import 'package:livekit_client/src/track/local.dart';
 
-import '../proto/livekit_models.pb.dart' as lk_models;
-import '../types.dart';
-import 'remote_track.dart';
+import '../../proto/livekit_models.pb.dart' as lk_models;
+import '../../types.dart';
+import '../remote.dart';
 
 class RemoteVideoTrack extends RemoteTrack with VideoTrack {
   //

lib/src/widget/video_track_renderer.dart

@@ -1,7 +1,7 @@
 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_track.dart';
+import 'package:livekit_client/src/track/local.dart';
 import 'package:visibility_detector/visibility_detector.dart';
 
 import '../events.dart';
@@ -9,7 +9,7 @@ import '../extensions.dart';
 import '../internal/events.dart';
 import '../logger.dart';
 import '../managers/event.dart';
-import '../track/local_video_track.dart';
+import '../track/local/video.dart';
 
 /// Widget that renders a [VideoTrack].
 class VideoTrackRenderer extends StatefulWidget {