Merge branch 'set_postion_update' into set-position

# Conflicts: # flutter_vlc_player/lib/src/vlc_player_controller.dart # flutter_vlc_player/pubspec.yaml # flutter_vlc_player_platform_interface/lib/src/messages/messages.dart
Foundation-Devices · Oct 2, 2024 · 89e10da · 89e10da
2 parents 405f034 + 2972ca0
commit 89e10da
Show file tree

Hide file tree

Showing 56 changed files with 2,172 additions and 1,380 deletions.
diff --git a/.github/funding.yml b/.github/funding.yml
diff --git a/.github/workflows/code_check_for_flutter_vlc_player.yaml b/.github/workflows/code_check_for_flutter_vlc_player.yaml
@@ -0,0 +1,58 @@
+name: Library ON Push & PR DO Code check
+on: [push, pull_request]
+
+jobs:
+  code-check:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Setup flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+
+      - name: Check flutter sdk version
+        run: flutter --version
+
+      - name: Get dependencies
+        working-directory: ./flutter_vlc_player
+        run: flutter pub get
+
+      - name: Setup Dart Code Metrics
+        working-directory: ./flutter_vlc_player
+        run: dart pub get dart_code_metrics
+
+      - 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
+        run: dart format . --set-exit-if-changed
+
+      - name: Run tests
+        run: |
+          # run tests if `test` folder exists
+          if [ -d test ]
+          then
+              flutter test -r expanded
+          else
+              echo "Tests not found."
+          fi
diff --git a/.github/workflows/code_check_for_flutter_vlc_player_platform_interface.yaml b/.github/workflows/code_check_for_flutter_vlc_player_platform_interface.yaml
@@ -0,0 +1,61 @@
+name: Interface ON Push & PR DO Code check
+on: [push, pull_request]
+
+jobs:
+  code-check:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Setup flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+
+      - name: Check flutter sdk version
+        working-directory: ./flutter_vlc_player_platform_interface
+        run: flutter --version
+
+      - name: Get dependencies
+        working-directory: ./flutter_vlc_player_platform_interface
+        run: flutter pub get
+
+      - name: Setup Dart Code Metrics
+        working-directory: ./flutter_vlc_player_platform_interface
+        run: dart pub get dart_code_metrics
+
+      - 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
+
+      - name: Run tests
+        working-directory: ./flutter_vlc_player_platform_interface
+        run: |
+          # run tests if `test` folder exists
+          if [ -d test ]
+          then
+              flutter test -r expanded
+          else
+              echo "Tests not found."
+          fi
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 #  Flutter VLC Player Plugin
 [![Join the chat at https://discord.gg/mNY4fjVk](https://img.shields.io/discord/716939396464508958?label=discord)](https://discord.gg/mNY4fjVk)
 [![Support me on Patreon](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Dsolidsoftwarehq%26type%3Dpatrons&style=flat)](https://patreon.com/solidsoftwarehq)
+[![flutter_vlc_player](https://nokycucwgzweensacwfy.supabase.co/functions/v1/get_project_badge?projectId=148)](https://nokycucwgzweensacwfy.supabase.co/functions/v1/get_project_url?projectId=148)
 
 A VLC-powered alternative to Flutter's video_player that supports iOS and Android.
 
@@ -90,7 +91,6 @@ android {
    buildTypes {
       release {
          minifyEnabled true
-         useProguard true
          proguardFiles getDefaultProguardFile(
                  'proguard-android-optimize.txt'),
                  'proguard-rules.pro'

diff --git a/flutter_vlc_player/CHANGELOG.md b/flutter_vlc_player/CHANGELOG.md
@@ -1,3 +1,47 @@
+## 7.4.2
+* fixed getVolume #486
+  Credits to pinpong (https://github.com/pinpong)
+* updated MobileVLCKit & libvlc
+  Credits to pinpong (https://github.com/pinpong)
+* Fix: Unable to replay when status is stopped #449
+  Credits to Virczz (https://github.com/Virczz) 
+
+## 7.4.1
+* Add support for Flutter 3.16
+  Credits to thearaks (https://github.com/thearaks)
+
+## 7.4.0
+* Important change: Removed [AutomaticKeepAliveClientMixin](https://api.flutter.dev/flutter/widgets/AutomaticKeepAliveClientMixin-mixin.html) from plugin widget
+* Mobile VLC update to 3.6.0-eap9
+* Allow background playback
+  Credits to Oliver Nitzschke (https://github.com/pinpong)
+* fix instructions for proguard
+  Credits to Luiz Fernando Baldo Marques (https://github.com/luizbaldo)
+
+## 7.3.1
+* Restore Flutter 3.3-3.7 compatibility
+  Credits to Yang Fang (https://github.com/yangsfang)
+
+## 7.3.0
+* Fix http-user-agent & reuse options on iOS
+  Credits to Afriza N. Arief (https://github.com/afriza)
+* Update to Dart 3 and Flutter 3.13
+  Credits to romain.gyh (https://github.com/romaingyh)
+
+## 7.2.0
+* Update to latest VLCKit sdks
+Credits to Mitch Ross (https://github.com/mitchross)
+
+## 7.1.5
+* Fix plugin destructor (https://github.com/solid-software/flutter_vlc_player/issues/237)
+
+## 7.1.4
+* Interim release to fix Flutter 3 issues
+
+## 7.1.3
+* Added support for multi-window mode in Android.
+Credits to Andy Chentsov (https://github.com/andyduke).
+
 ## 7.1.2
 * Add Hybrid composition support for Android.
 

diff --git a/flutter_vlc_player/README.md b/flutter_vlc_player/README.md
@@ -1,4 +1,8 @@
 #  VLC Player Plugin
+[![style: solid](https://img.shields.io/badge/style-solid-orange)](https://pub.dev/packages/solid_lints)
+[![flutter_vlc_player](https://nokycucwgzweensacwfy.supabase.co/functions/v1/get_project_badge?projectId=148)](https://nokycucwgzweensacwfy.supabase.co/functions/v1/get_project_url?projectId=148)
+
+
 A VLC-powered alternative to Flutter's video_player that supports iOS and Android.
 
 <div>
@@ -87,7 +91,6 @@ android {
    buildTypes {
       release {
          minifyEnabled true
-         useProguard true
          proguardFiles getDefaultProguardFile(
                  'proguard-android-optimize.txt'),
                  'proguard-rules.pro'
@@ -100,6 +103,25 @@ android {
 ```proguard
 -keep class org.videolan.libvlc.** { *; }
 ```
+<hr>
+
+#### Android multi-window support
+
+To enable multi-window support in your Android application, you need to make changes to `AndroidManifest.xml`, add the `android:resizeableActivity` key for the main activity, as well as the `android.allow_multiple_resumed_activities` metadata for application:
+```xml
+<manifest ...>
+  <application ...>
+    <activity ...
+      android:resizeableActivity="true">
+      ...
+    </activity>
+    ...
+    <meta-data
+      android:name="android.allow_multiple_resumed_activities"
+      android:value="true" />
+  </application>
+</manifest>
+```
 
 <br>
 

diff --git a/flutter_vlc_player/analysis_options.yaml b/flutter_vlc_player/analysis_options.yaml
@@ -1 +1,12 @@
-include: package:flutter_lints/flutter.yaml
+include: package:solid_lints/analysis_options.yaml
+
+dart_code_metrics:
+  metrics: 
+    cyclomatic-complexity: 30
+
+linter:
+  rules:
+    lines_longer_than_80_chars: false 
+    comment_references: false
+    public_member_api_docs: false
+    avoid_positional_boolean_parameters: false
diff --git a/flutter_vlc_player/android/build.gradle b/flutter_vlc_player/android/build.gradle
@@ -4,28 +4,30 @@ version '1.0-SNAPSHOT'
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 
 rootProject.allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 31
+    namespace 'software.solid.fluttervlcplayer'
+
+    compileSdk 34
 
     defaultConfig {
-        minSdkVersion 20
+        minSdkVersion 19
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
@@ -39,7 +41,7 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'org.videolan.android:libvlc-all:3.5.0-eap6'
+    implementation 'org.videolan.android:libvlc-all:3.6.0-eap12'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.annotation:annotation:1.2.0'

diff --git a/flutter_vlc_player/android/gradle/wrapper/gradle-wrapper.properties b/flutter_vlc_player/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
diff --git a/flutter_vlc_player/android/src/main/AndroidManifest.xml b/flutter_vlc_player/android/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="software.solid.fluttervlcplayer">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>