From 765cc887b869fe883acd4460aee56ae9e63ba431 Mon Sep 17 00:00:00 2001 From: Illia Aihistov Date: Thu, 20 Feb 2025 12:49:42 +0200 Subject: [PATCH] fix code format --- .../lib/src/vlc_player_controller.dart | 66 ++-- .../lib/src/vlc_player_platform.dart | 9 +- .../lib/src/enums/hardware_acceleration.dart | 7 +- .../lib/src/enums/renderer_event_type.dart | 6 +- .../vlc_subtitle_text_direction.dart | 6 +- .../method_channel_vlc_player.dart | 287 +++++++++--------- .../helpers/subtitles/vlc_subtitle_color.dart | 7 +- 7 files changed, 180 insertions(+), 208 deletions(-) diff --git a/flutter_vlc_player/lib/src/vlc_player_controller.dart b/flutter_vlc_player/lib/src/vlc_player_controller.dart index 41d45bd4..40aee9c9 100644 --- a/flutter_vlc_player/lib/src/vlc_player_controller.dart +++ b/flutter_vlc_player/lib/src/vlc_player_controller.dart @@ -104,10 +104,10 @@ class VlcPlayerController extends ValueNotifier { VoidCallback? onInit, @Deprecated('Please, use the addOnRendererEventListener method instead.') RendererCallback? onRendererHandler, - }) : _dataSourceType = DataSourceType.asset, - _onInit = onInit, - _onRendererHandler = onRendererHandler, - super(VlcPlayerValue(duration: Duration.zero)); + }) : _dataSourceType = DataSourceType.asset, + _onInit = onInit, + _onRendererHandler = onRendererHandler, + super(VlcPlayerValue(duration: Duration.zero)); /// Constructs a [VlcPlayerController] playing a video from obtained from /// the network. @@ -125,11 +125,11 @@ class VlcPlayerController extends ValueNotifier { VoidCallback? onInit, @Deprecated('Please, use the addOnRendererEventListener method instead.') RendererCallback? onRendererHandler, - }) : package = null, - _dataSourceType = DataSourceType.network, - _onInit = onInit, - _onRendererHandler = onRendererHandler, - super(VlcPlayerValue(duration: Duration.zero)); + }) : package = null, + _dataSourceType = DataSourceType.network, + _onInit = onInit, + _onRendererHandler = onRendererHandler, + super(VlcPlayerValue(duration: Duration.zero)); /// Constructs a [VlcPlayerController] playing a video from a file. /// @@ -146,12 +146,12 @@ class VlcPlayerController extends ValueNotifier { VoidCallback? onInit, @Deprecated('Please, use the addOnRendererEventListener method instead.') RendererCallback? onRendererHandler, - }) : dataSource = 'file://${file.path}', - package = null, - _dataSourceType = DataSourceType.file, - _onInit = onInit, - _onRendererHandler = onRendererHandler, - super(VlcPlayerValue(duration: Duration.zero)); + }) : dataSource = 'file://${file.path}', + package = null, + _dataSourceType = DataSourceType.file, + _onInit = onInit, + _onRendererHandler = onRendererHandler, + super(VlcPlayerValue(duration: Duration.zero)); /// Register a [VoidCallback] closure to be called when the controller gets initialized void addOnInitListener(VoidCallback listener) { @@ -273,9 +273,10 @@ class VlcPlayerController extends ValueNotifier { spuTracksCount: event.spuTracksCount, activeSpuTrack: event.activeSpuTrack, isPlaying: event.isPlaying, - playingState: (event.isPlaying ?? false) - ? PlayingState.playing - : value.playingState, + playingState: + (event.isPlaying ?? false) + ? PlayingState.playing + : value.playingState, errorDescription: VlcPlayerValue.noError, ); break; @@ -571,9 +572,7 @@ class VlcPlayerController extends ValueNotifier { Future getVolume() async { _throwIfNotInitialized('getVolume'); final volume = await vlcPlayerPlatform.getVolume(_viewId); - value = value.copyWith( - volume: volume?.clamp(0, _maxVolume), - ); + value = value.copyWith(volume: volume?.clamp(0, _maxVolume)); return volume; } @@ -612,10 +611,7 @@ class VlcPlayerController extends ValueNotifier { // the video is manually played from Flutter. if (!value.isPlaying) return; value = value.copyWith(playbackSpeed: speed); - await vlcPlayerPlatform.setPlaybackSpeed( - _viewId, - value.playbackSpeed, - ); + await vlcPlayerPlatform.setPlaybackSpeed(_viewId, value.playbackSpeed); } /// Returns the vlc playback speed. @@ -697,10 +693,7 @@ class VlcPlayerController extends ValueNotifier { /// Add extra subtitle file to media. /// [file] - Subtitle file /// [isSelected] - Set true if you wanna force the added subtitle to start display on media. - Future addSubtitleFromFile( - File file, { - bool? isSelected, - }) async { + Future addSubtitleFromFile(File file, {bool? isSelected}) async { return _addSubtitleTrack( 'file://${file.path}', dataSourceType: DataSourceType.file, @@ -729,8 +722,9 @@ class VlcPlayerController extends ValueNotifier { /// Returns the number of audio tracks Future getAudioTracksCount() async { _throwIfNotInitialized('getAudioTracksCount'); - final audioTracksCount = - await vlcPlayerPlatform.getAudioTracksCount(_viewId); + final audioTracksCount = await vlcPlayerPlatform.getAudioTracksCount( + _viewId, + ); value = value.copyWith(audioTracksCount: audioTracksCount); return audioTracksCount; @@ -797,10 +791,7 @@ class VlcPlayerController extends ValueNotifier { /// Add extra audio file to media. /// [file] - Audio file /// [isSelected] - Set true if you wanna force the added audio to start playing on media. - Future addAudioFromFile( - File file, { - bool? isSelected, - }) async { + Future addAudioFromFile(File file, {bool? isSelected}) async { return _addAudioTrack( 'file://${file.path}', dataSourceType: DataSourceType.file, @@ -829,8 +820,9 @@ class VlcPlayerController extends ValueNotifier { /// Returns the number of video tracks Future getVideoTracksCount() async { _throwIfNotInitialized('getVideoTracksCount'); - final videoTracksCount = - await vlcPlayerPlatform.getVideoTracksCount(_viewId); + final videoTracksCount = await vlcPlayerPlatform.getVideoTracksCount( + _viewId, + ); value = value.copyWith(videoTracksCount: videoTracksCount); return videoTracksCount; diff --git a/flutter_vlc_player/lib/src/vlc_player_platform.dart b/flutter_vlc_player/lib/src/vlc_player_platform.dart index 07479749..92557403 100644 --- a/flutter_vlc_player/lib/src/vlc_player_platform.dart +++ b/flutter_vlc_player/lib/src/vlc_player_platform.dart @@ -1,6 +1,7 @@ import 'package:flutter_vlc_player_platform_interface/flutter_vlc_player_platform_interface.dart'; -final VlcPlayerPlatform vlcPlayerPlatform = VlcPlayerPlatform.instance -// This will clear all open videos on the platform when a full restart is -// performed. - ..init(); +final VlcPlayerPlatform vlcPlayerPlatform = + VlcPlayerPlatform.instance + // This will clear all open videos on the platform when a full restart is + // performed. + ..init(); diff --git a/flutter_vlc_player_platform_interface/lib/src/enums/hardware_acceleration.dart b/flutter_vlc_player_platform_interface/lib/src/enums/hardware_acceleration.dart index 490ada41..e9dd27b3 100644 --- a/flutter_vlc_player_platform_interface/lib/src/enums/hardware_acceleration.dart +++ b/flutter_vlc_player_platform_interface/lib/src/enums/hardware_acceleration.dart @@ -1,7 +1,2 @@ // ignore: prefer-match-file-name -enum HwAcc { - auto, - disabled, - decoding, - full, -} +enum HwAcc { auto, disabled, decoding, full } diff --git a/flutter_vlc_player_platform_interface/lib/src/enums/renderer_event_type.dart b/flutter_vlc_player_platform_interface/lib/src/enums/renderer_event_type.dart index c2e7f396..baf1d46e 100644 --- a/flutter_vlc_player_platform_interface/lib/src/enums/renderer_event_type.dart +++ b/flutter_vlc_player_platform_interface/lib/src/enums/renderer_event_type.dart @@ -1,6 +1,2 @@ // ignore: prefer-match-file-name -enum VlcRendererEventType { - attached, - detached, - unknown, -} +enum VlcRendererEventType { attached, detached, unknown } diff --git a/flutter_vlc_player_platform_interface/lib/src/enums/subtitles/vlc_subtitle_text_direction.dart b/flutter_vlc_player_platform_interface/lib/src/enums/subtitles/vlc_subtitle_text_direction.dart index 1c663557..ddb244b9 100644 --- a/flutter_vlc_player_platform_interface/lib/src/enums/subtitles/vlc_subtitle_text_direction.dart +++ b/flutter_vlc_player_platform_interface/lib/src/enums/subtitles/vlc_subtitle_text_direction.dart @@ -1,8 +1,4 @@ -enum VlcSubtitleTextDirection { - ltr, - rtl, - auto, -} +enum VlcSubtitleTextDirection { ltr, rtl, auto } extension VlcSubtitleTextDirectionExtensionMap on VlcSubtitleTextDirection { static const valueMap = { diff --git a/flutter_vlc_player_platform_interface/lib/src/method_channel/method_channel_vlc_player.dart b/flutter_vlc_player_platform_interface/lib/src/method_channel/method_channel_vlc_player.dart index 496e34cc..80a085ff 100644 --- a/flutter_vlc_player_platform_interface/lib/src/method_channel/method_channel_vlc_player.dart +++ b/flutter_vlc_player_platform_interface/lib/src/method_channel/method_channel_vlc_player.dart @@ -68,35 +68,35 @@ class MethodChannelVlcPlayer extends VlcPlayerPlatform { if (Platform.isAndroid) { return virtualDisplay ? AndroidView( - viewType: viewType, - hitTestBehavior: PlatformViewHitTestBehavior.transparent, - onPlatformViewCreated: onPlatformViewCreated, - creationParamsCodec: const StandardMessageCodec(), - ) + viewType: viewType, + hitTestBehavior: PlatformViewHitTestBehavior.transparent, + onPlatformViewCreated: onPlatformViewCreated, + creationParamsCodec: const StandardMessageCodec(), + ) : PlatformViewLink( - viewType: viewType, - surfaceFactory: - (BuildContext context, PlatformViewController controller) { - return AndroidViewSurface( - controller: controller as AndroidViewController, - gestureRecognizers: const {}, - hitTestBehavior: PlatformViewHitTestBehavior.transparent, - ); - }, - onCreatePlatformView: (PlatformViewCreationParams params) { - return PlatformViewsService.initSurfaceAndroidView( + viewType: viewType, + surfaceFactory: ( + BuildContext context, + PlatformViewController controller, + ) { + return AndroidViewSurface( + controller: controller as AndroidViewController, + gestureRecognizers: const {}, + hitTestBehavior: PlatformViewHitTestBehavior.transparent, + ); + }, + onCreatePlatformView: (PlatformViewCreationParams params) { + return PlatformViewsService.initSurfaceAndroidView( id: params.id, viewType: viewType, layoutDirection: TextDirection.ltr, creationParamsCodec: const StandardMessageCodec(), ) - ..addOnPlatformViewCreatedListener( - params.onPlatformViewCreated, - ) - ..addOnPlatformViewCreatedListener(onPlatformViewCreated) - ..create(); - }, - ); + ..addOnPlatformViewCreatedListener(params.onPlatformViewCreated) + ..addOnPlatformViewCreatedListener(onPlatformViewCreated) + ..create(); + }, + ); } else if (Platform.isIOS) { return UiKitView( viewType: viewType, @@ -111,92 +111,80 @@ class MethodChannelVlcPlayer extends VlcPlayerPlatform { @override Stream mediaEventsFor(int viewId) { - return _mediaEventChannelFor(viewId).receiveBroadcastStream().map( - (dynamic event) { - final Map map = event as Map; - // - switch (map['event']) { - case 'opening': - return VlcMediaEvent( - mediaEventType: VlcMediaEventType.opening, - ); - - case 'paused': - return VlcMediaEvent( - mediaEventType: VlcMediaEventType.paused, - ); - - case 'stopped': - return VlcMediaEvent( - mediaEventType: VlcMediaEventType.stopped, - ); - - case 'playing': - return VlcMediaEvent( - mediaEventType: VlcMediaEventType.playing, - size: Size( - (map['width'] as num?)?.toDouble() ?? 0.0, - (map['height'] as num?)?.toDouble() ?? 0.0, - ), - playbackSpeed: map['speed'] as double? ?? 1.0, - duration: Duration(milliseconds: map['duration'] as int? ?? 0), - audioTracksCount: map['audioTracksCount'] as int? ?? 1, - activeAudioTrack: map['activeAudioTrack'] as int? ?? 0, - spuTracksCount: map['spuTracksCount'] as int? ?? 0, - activeSpuTrack: map['activeSpuTrack'] as int? ?? -1, - ); - - case 'ended': - return VlcMediaEvent( - mediaEventType: VlcMediaEventType.ended, - position: Duration(milliseconds: map['position'] as int? ?? 0), - ); - - case 'buffering': - case 'timeChanged': - const defaultBufferPercent = 100.0; - - return VlcMediaEvent( - mediaEventType: VlcMediaEventType.timeChanged, - size: Size( - (map['width'] as num?)?.toDouble() ?? 0.0, - (map['height'] as num?)?.toDouble() ?? 0.0, - ), - playbackSpeed: map['speed'] as double? ?? 1.0, - position: Duration(milliseconds: map['position'] as int? ?? 0), - duration: Duration(milliseconds: map['duration'] as int? ?? 0), - audioTracksCount: map['audioTracksCount'] as int? ?? 1, - activeAudioTrack: map['activeAudioTrack'] as int? ?? 0, - spuTracksCount: map['spuTracksCount'] as int? ?? 0, - activeSpuTrack: map['activeSpuTrack'] as int? ?? -1, - bufferPercent: map['buffer'] as double? ?? defaultBufferPercent, - isPlaying: map['isPlaying'] as bool? ?? false, - ); - - case 'mediaChanged': - return VlcMediaEvent( - mediaEventType: VlcMediaEventType.mediaChanged, - ); - - case 'recording': - return VlcMediaEvent( - mediaEventType: VlcMediaEventType.recording, - isRecording: map['isRecording'] as bool? ?? false, - recordPath: map['recordPath'] as String? ?? '', - ); - - case 'error': - return VlcMediaEvent( - mediaEventType: VlcMediaEventType.error, - ); - - default: - return VlcMediaEvent( - mediaEventType: VlcMediaEventType.unknown, - ); - } - }, - ); + return _mediaEventChannelFor(viewId).receiveBroadcastStream().map(( + dynamic event, + ) { + final Map map = event as Map; + // + switch (map['event']) { + case 'opening': + return VlcMediaEvent(mediaEventType: VlcMediaEventType.opening); + + case 'paused': + return VlcMediaEvent(mediaEventType: VlcMediaEventType.paused); + + case 'stopped': + return VlcMediaEvent(mediaEventType: VlcMediaEventType.stopped); + + case 'playing': + return VlcMediaEvent( + mediaEventType: VlcMediaEventType.playing, + size: Size( + (map['width'] as num?)?.toDouble() ?? 0.0, + (map['height'] as num?)?.toDouble() ?? 0.0, + ), + playbackSpeed: map['speed'] as double? ?? 1.0, + duration: Duration(milliseconds: map['duration'] as int? ?? 0), + audioTracksCount: map['audioTracksCount'] as int? ?? 1, + activeAudioTrack: map['activeAudioTrack'] as int? ?? 0, + spuTracksCount: map['spuTracksCount'] as int? ?? 0, + activeSpuTrack: map['activeSpuTrack'] as int? ?? -1, + ); + + case 'ended': + return VlcMediaEvent( + mediaEventType: VlcMediaEventType.ended, + position: Duration(milliseconds: map['position'] as int? ?? 0), + ); + + case 'buffering': + case 'timeChanged': + const defaultBufferPercent = 100.0; + + return VlcMediaEvent( + mediaEventType: VlcMediaEventType.timeChanged, + size: Size( + (map['width'] as num?)?.toDouble() ?? 0.0, + (map['height'] as num?)?.toDouble() ?? 0.0, + ), + playbackSpeed: map['speed'] as double? ?? 1.0, + position: Duration(milliseconds: map['position'] as int? ?? 0), + duration: Duration(milliseconds: map['duration'] as int? ?? 0), + audioTracksCount: map['audioTracksCount'] as int? ?? 1, + activeAudioTrack: map['activeAudioTrack'] as int? ?? 0, + spuTracksCount: map['spuTracksCount'] as int? ?? 0, + activeSpuTrack: map['activeSpuTrack'] as int? ?? -1, + bufferPercent: map['buffer'] as double? ?? defaultBufferPercent, + isPlaying: map['isPlaying'] as bool? ?? false, + ); + + case 'mediaChanged': + return VlcMediaEvent(mediaEventType: VlcMediaEventType.mediaChanged); + + case 'recording': + return VlcMediaEvent( + mediaEventType: VlcMediaEventType.recording, + isRecording: map['isRecording'] as bool? ?? false, + recordPath: map['recordPath'] as String? ?? '', + ); + + case 'error': + return VlcMediaEvent(mediaEventType: VlcMediaEventType.error); + + default: + return VlcMediaEvent(mediaEventType: VlcMediaEventType.unknown); + } + }); } @override @@ -309,16 +297,18 @@ class MethodChannelVlcPlayer extends VlcPlayerPlatform { @override Future getPlaybackSpeed(int viewId) async { - final response = - await _api.getPlaybackSpeed(ViewMessage()..viewId = viewId); + final response = await _api.getPlaybackSpeed( + ViewMessage()..viewId = viewId, + ); return response.speed; } @override Future getSpuTracksCount(int viewId) async { - final response = - await _api.getSpuTracksCount(ViewMessage()..viewId = viewId); + final response = await _api.getSpuTracksCount( + ViewMessage()..viewId = viewId, + ); return response.count; } @@ -380,8 +370,9 @@ class MethodChannelVlcPlayer extends VlcPlayerPlatform { @override Future getAudioTracksCount(int viewId) async { - final response = - await _api.getAudioTracksCount(ViewMessage()..viewId = viewId); + final response = await _api.getAudioTracksCount( + ViewMessage()..viewId = viewId, + ); return response.count; } @@ -443,8 +434,9 @@ class MethodChannelVlcPlayer extends VlcPlayerPlatform { @override Future getVideoTracksCount(int viewId) async { - final response = - await _api.getVideoTracksCount(ViewMessage()..viewId = viewId); + final response = await _api.getVideoTracksCount( + ViewMessage()..viewId = viewId, + ); return response.count; } @@ -499,8 +491,9 @@ class MethodChannelVlcPlayer extends VlcPlayerPlatform { @override Future getVideoAspectRatio(int viewId) async { - final response = - await _api.getVideoAspectRatio(ViewMessage()..viewId = viewId); + final response = await _api.getVideoAspectRatio( + ViewMessage()..viewId = viewId, + ); return response.aspectRatio; } @@ -519,8 +512,9 @@ class MethodChannelVlcPlayer extends VlcPlayerPlatform { @override Future> getAvailableRendererServices(int viewId) async { - final response = - await _api.getAvailableRendererServices(ViewMessage()..viewId = viewId); + final response = await _api.getAvailableRendererServices( + ViewMessage()..viewId = viewId, + ); return response.services?.cast() ?? []; } @@ -544,8 +538,9 @@ class MethodChannelVlcPlayer extends VlcPlayerPlatform { @override Future> getRendererDevices(int viewId) async { - final response = - await _api.getRendererDevices(ViewMessage()..viewId = viewId); + final response = await _api.getRendererDevices( + ViewMessage()..viewId = viewId, + ); return response.rendererDevices?.cast() ?? {}; } @@ -561,30 +556,30 @@ class MethodChannelVlcPlayer extends VlcPlayerPlatform { @override Stream rendererEventsFor(int viewId) { - return _rendererEventChannelFor(viewId).receiveBroadcastStream().map( - (dynamic event) { - final Map map = event as Map; + return _rendererEventChannelFor(viewId).receiveBroadcastStream().map(( + dynamic event, + ) { + final Map map = event as Map; + // + switch (map['event']) { + case 'attached': + return VlcRendererEvent( + eventType: VlcRendererEventType.attached, + rendererId: map['id'].toString(), + rendererName: map['name'].toString(), + ); // - switch (map['event']) { - case 'attached': - return VlcRendererEvent( - eventType: VlcRendererEventType.attached, - rendererId: map['id'].toString(), - rendererName: map['name'].toString(), - ); - // - case 'detached': - return VlcRendererEvent( - eventType: VlcRendererEventType.detached, - rendererId: map['id'].toString(), - rendererName: map['name'].toString(), - ); - // - default: - return VlcRendererEvent(eventType: VlcRendererEventType.unknown); - } - }, - ); + case 'detached': + return VlcRendererEvent( + eventType: VlcRendererEventType.detached, + rendererId: map['id'].toString(), + rendererName: map['name'].toString(), + ); + // + default: + return VlcRendererEvent(eventType: VlcRendererEventType.unknown); + } + }); } @override diff --git a/flutter_vlc_player_platform_interface/lib/src/utils/helpers/subtitles/vlc_subtitle_color.dart b/flutter_vlc_player_platform_interface/lib/src/utils/helpers/subtitles/vlc_subtitle_color.dart index 6b1b6f35..35ad412c 100644 --- a/flutter_vlc_player_platform_interface/lib/src/utils/helpers/subtitles/vlc_subtitle_color.dart +++ b/flutter_vlc_player_platform_interface/lib/src/utils/helpers/subtitles/vlc_subtitle_color.dart @@ -21,9 +21,6 @@ class VlcSubtitleColor { final int value; const VlcSubtitleColor(this.value); - const VlcSubtitleColor.rgb({ - int red = 0, - int green = 0, - int blue = 0, - }) : value = (red << _redHexOffset) + (green << _greenHexOffset) + blue; + const VlcSubtitleColor.rgb({int red = 0, int green = 0, int blue = 0}) + : value = (red << _redHexOffset) + (green << _greenHexOffset) + blue; }