Merge branch 'master' into migrate

Author: solid-illiaaihistov

.github/workflows/code_check_for_flutter_vlc_player.yaml

@@ -20,31 +20,12 @@ jobs:
         working-directory: ./flutter_vlc_player
         run: flutter pub get
 
-      - name: Setup Dart Code Metrics
+      - name: Run Solid Lints
         working-directory: ./flutter_vlc_player
-        run: dart pub get dart_code_metrics
+        run: dart analyze
 
-      - name: Dart Code Metrics
-        working-directory: ./flutter_vlc_player
-        run: |
-          dirs_to_analyze=""
-          if [ -d lib ]; then dirs_to_analyze+=" lib"; fi
-          if [ -d test ]; then dirs_to_analyze+=" test"; fi
-          if [ -d example ]; then dirs_to_analyze+=" example"; fi
-          if [ dirs_to_analyze != "" ]
-          then
-            dart run dart_code_metrics:metrics \
-              analyze \
-              $dirs_to_analyze \
-              --fatal-warnings \
-              --fatal-performance \
-              --fatal-style
-            dart run dart_code_metrics:metrics \
-              check-unused-files \
-              $dirs_to_analyze \
-              --fatal-unused
-          fi
       - name: Check formatting
+        working-directory: ./flutter_vlc_player        
         run: dart format . --set-exit-if-changed
 
       - name: Run tests

.github/workflows/code_check_for_flutter_vlc_player_platform_interface.yaml

@@ -21,30 +21,10 @@ jobs:
         working-directory: ./flutter_vlc_player_platform_interface
         run: flutter pub get
 
-      - name: Setup Dart Code Metrics
+      - name: Run Solid Lints
         working-directory: ./flutter_vlc_player_platform_interface
-        run: dart pub get dart_code_metrics
+        run: dart analyze
 
-      - name: Dart Code Metrics
-        working-directory: ./flutter_vlc_player_platform_interface
-        run: |
-          dirs_to_analyze=""
-          if [ -d lib ]; then dirs_to_analyze+=" lib"; fi
-          if [ -d test ]; then dirs_to_analyze+=" test"; fi
-          if [ -d example ]; then dirs_to_analyze+=" example"; fi
-          if [ dirs_to_analyze != "" ]
-          then
-            dart run dart_code_metrics:metrics \
-              analyze \
-              $dirs_to_analyze \
-              --fatal-warnings \
-              --fatal-performance \
-              --fatal-style
-            dart run dart_code_metrics:metrics \
-              check-unused-files \
-              $dirs_to_analyze \
-              --fatal-unused
-          fi
       - name: Check formatting
         working-directory: ./flutter_vlc_player_platform_interface
         run: dart format . --set-exit-if-changed

flutter_vlc_player/android/src/main/java/software/solid/fluttervlcplayer/FlutterVlcPlayer.java

@@ -281,6 +281,8 @@ void setStreamUrl(String url, boolean isAssetUrl, boolean autoPlay, long hwAcc)
             Media media;
             if (isAssetUrl)
                 media = new Media(libVLC, context.getAssets().openFd(url));
+            else if(url.startsWith("content://"))
+                media = new Media(libVLC, context.getContentResolver().openFileDescriptor(Uri.parse(url), "r").getFileDescriptor());
             else
                 media = new Media(libVLC, Uri.parse(url));
             final HwAcc hwAccValue = HwAcc.values()[(int) hwAcc];

flutter_vlc_player/example/lib/single_tab.dart

@@ -219,7 +219,7 @@ class _SingleTabState extends State<SingleTab> {
                     await Future<void>.delayed(const Duration(seconds: 1));
                     final tempVideo = await _loadVideoToFs();
                     await Future<void>.delayed(const Duration(seconds: 1));
-                    if (!mounted) break;
+                    if (!context.mounted) break;
                     ScaffoldMessenger.of(context).showSnackBar(
                       const SnackBar(
                         content: Text('Now trying to play...'),
@@ -229,7 +229,7 @@ class _SingleTabState extends State<SingleTab> {
                     if (await tempVideo.exists()) {
                       await _controller.setMediaFromFile(tempVideo);
                     } else {
-                      if (!mounted) break;
+                      if (!context.mounted) break;
                       ScaffoldMessenger.of(context).showSnackBar(
                         const SnackBar(
                           content: Text('File load error.'),
@@ -264,3 +264,9 @@ class _SingleTabState extends State<SingleTab> {
     await _controller.dispose();
   }
 }
+
+class MyClass {
+  final int _myField = 0;
+
+  int get myField => _myField;
+}

flutter_vlc_player/lib/src/vlc_player_controller.dart

@@ -563,7 +563,8 @@ class VlcPlayerController extends ValueNotifier<VlcPlayerValue> {
     _throwIfNotInitialized('getVolume');
     final volume = await vlcPlayerPlatform.getVolume(_viewId);
     value = value.copyWith(
-        volume: volume?.clamp(0, _maxVolume),);
+      volume: volume?.clamp(0, _maxVolume),
+    );
 
     return volume;
   }

flutter_vlc_player/pigeons/messages.dart

@@ -71,7 +71,7 @@ class SnapshotMessage {
 
 class SpuTracksMessage {
   int? viewId;
-  Map? subtitles;
+  Map<Object?, Object?>? subtitles;
 }
 
 class SpuTrackMessage {
@@ -88,7 +88,7 @@ class AddSubtitleMessage {
 
 class AudioTracksMessage {
   int? viewId;
-  Map? audios;
+  Map<Object?, Object?>? audios;
 }
 
 class AudioTrackMessage {
@@ -105,7 +105,7 @@ class AddAudioMessage {
 
 class VideoTracksMessage {
   int? viewId;
-  Map? videos;
+  Map<Object?, Object?>? videos;
 }
 
 class VideoTrackMessage {
@@ -135,7 +135,7 @@ class RendererScanningMessage {
 
 class RendererDevicesMessage {
   int? viewId;
-  Map? rendererDevices;
+  Map<Object?, Object?>? rendererDevices;
 }
 
 class RenderDeviceMessage {