Merge pull request #212 from GhostenEditor/releases/v2.2.0

closes #178, closes #209 closes #177

Author: GhostenEditor

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
 
       - uses: subosito/flutter-action@v1
         with:
-          flutter-version: '3.32.1'
+          flutter-version: '3.32.8'
 
       - run: flutter pub get
 
@@ -50,11 +50,19 @@ jobs:
           run-id: ${{ secrets.API_RUN_ID }}
           repository: ${{ secrets.API_REPOSITORY }}
 
+      - name: Download Libraries
+        uses: actions/download-artifact@v4
+        with:
+          github-token: ${{ secrets.TOKEN }}
+          run-id: ${{ secrets.MPV_RUN_ID }}
+          repository: ${{ secrets.MPV_REPOSITORY }}
+
       - name: Move Libraries
         run: |
           mkdir android/app/libs
           mv media3-extension/* android/app/libs
           mv api/* android/app/libs
+          mv mpv/* android/app/libs
 
       - name: Extract version from pubspec.yaml
         run: |
@@ -78,7 +86,6 @@ jobs:
           --build-number=${{ env.BUILD_NUMBER }} \
           --dart-define=BUILD_DATE=$(date "+%F") \
           --dart-define=BUILD_VERSION=${{ env.VERSION }} \
-          --dart-define=DEFAULT_IPTV_URL=${{ vars.DEFAULT_IPTV_URL }} \
           --flavor=mobile
 
       - name: Build TV apk
@@ -91,7 +98,6 @@ jobs:
           --build-number=${{ env.BUILD_NUMBER }} \
           --dart-define=BUILD_DATE=$(date "+%F") \
           --dart-define=BUILD_VERSION=${{ env.VERSION }} \
-          --dart-define=DEFAULT_IPTV_URL=${{ vars.DEFAULT_IPTV_URL }} \
           --flavor=tv
 
       - name: Rename Android APK

android/app/src/main/AndroidManifest.xml

@@ -10,6 +10,7 @@
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" android:minSdkVersion="30"/>
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" android:minSdkVersion="33"/>
     <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" android:minSdkVersion="33"/>
 

android/build.gradle

@@ -8,13 +8,16 @@ allprojects {
 // FIX flutter plugin install_plugin for Flutter 3.24
 subprojects {
     afterEvaluate { project ->
-        if (project.group == "com.example.installplugin" || project.group == "io.flutter.plugins.webview_cookie_manager") {
+        if (project.group == "com.example.installplugin") {
             project.android {
                 compileSdkVersion = 35
                 namespace = project.group
                 compileOptions {
-                    sourceCompatibility = JavaVersion.VERSION_17
-                    targetCompatibility = JavaVersion.VERSION_17
+                    sourceCompatibility = JavaVersion.VERSION_11
+                    targetCompatibility = JavaVersion.VERSION_11
+                }
+                kotlinOptions {
+                    jvmTarget = JavaVersion.VERSION_11
                 }
             }
         }

lib/components/player_i18n_adaptor.dart

@@ -21,6 +21,7 @@ class PlayerI18nAdaptor extends StatelessWidget {
       tagUnknown: AppLocalizations.of(context)!.tagUnknown,
       willSkipEnding: AppLocalizations.of(context)!.willSkipEnding,
       playerEnableDecoderFallback: AppLocalizations.of(context)!.playerEnableDecoderFallback,
+      playerShowLiteProgressbar: AppLocalizations.of(context)!.playerShowLiteProgressbar,
       extensionRendererMode: AppLocalizations.of(context)!.audioDecoder,
       extensionRendererModeLabel: AppLocalizations.of(context)!.audioDecoderLabel,
       playerShowThumbnails: AppLocalizations.of(context)!.playerShowThumbnails,

lib/l10n/app_en.arb

@@ -165,8 +165,10 @@
   "playerFastForwardSpeed": "Speed",
   "playerOpenFileWithParallelThreads": "Open File With Parallel Threads",
   "playerParallelsCount": "Parallels Count",
+  "playerShowLiteProgressbar": "Show Playback Progress",
   "playerShowThumbnails": "Show Thumbnails",
   "playerSliceSize": "Slice Size",
+  "playerType": "{playerType, select, media3{Media 3} mpv{MPV} other{Unknown}}",
   "playerUseHardwareCodec": "Use Hardware Codec",
   "playerVideoClarity": "Video Clarity",
   "queryType": "{queryType, select, genre{Genre} studio{Studio} keyword{Keyword} actor{Actor} other{Unknown}}",
@@ -216,6 +218,7 @@
   "settingsItemNfoEnabled": "NFO Enabled",
   "settingsItemOthers": "Others Settings",
   "settingsItemPlayerHistory": "Player History",
+  "settingsItemPlayerKernel": "Player Kernel",
   "settingsItemPlayerSettings": "Player Settings",
   "settingsItemProxySettings": "Proxy Settings",
   "settingsItemScraperBehavior": "Scraper Behavior",

lib/l10n/app_localizations.dart

@@ -1088,6 +1088,12 @@ abstract class AppLocalizations {
   /// **'Parallels Count'**
   String get playerParallelsCount;
 
+  /// No description provided for @playerShowLiteProgressbar.
+  ///
+  /// In en, this message translates to:
+  /// **'Show Playback Progress'**
+  String get playerShowLiteProgressbar;
+
   /// No description provided for @playerShowThumbnails.
   ///
   /// In en, this message translates to:
@@ -1100,6 +1106,12 @@ abstract class AppLocalizations {
   /// **'Slice Size'**
   String get playerSliceSize;
 
+  /// No description provided for @playerType.
+  ///
+  /// In en, this message translates to:
+  /// **'{playerType, select, media3{Media 3} mpv{MPV} other{Unknown}}'**
+  String playerType(String playerType);
+
   /// No description provided for @playerUseHardwareCodec.
   ///
   /// In en, this message translates to:
@@ -1394,6 +1406,12 @@ abstract class AppLocalizations {
   /// **'Player History'**
   String get settingsItemPlayerHistory;
 
+  /// No description provided for @settingsItemPlayerKernel.
+  ///
+  /// In en, this message translates to:
+  /// **'Player Kernel'**
+  String get settingsItemPlayerKernel;
+
   /// No description provided for @settingsItemPlayerSettings.
   ///
   /// In en, this message translates to:

lib/l10n/app_localizations_en.dart

@@ -631,12 +631,21 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get playerParallelsCount => 'Parallels Count';
 
+  @override
+  String get playerShowLiteProgressbar => 'Show Playback Progress';
+
   @override
   String get playerShowThumbnails => 'Show Thumbnails';
 
   @override
   String get playerSliceSize => 'Slice Size';
 
+  @override
+  String playerType(String playerType) {
+    String _temp0 = intl.Intl.selectLogic(playerType, {'media3': 'Media 3', 'mpv': 'MPV', 'other': 'Unknown'});
+    return '$_temp0';
+  }
+
   @override
   String get playerUseHardwareCodec => 'Use Hardware Codec';
 
@@ -838,6 +847,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get settingsItemPlayerHistory => 'Player History';
 
+  @override
+  String get settingsItemPlayerKernel => 'Player Kernel';
+
   @override
   String get settingsItemPlayerSettings => 'Player Settings';
 

lib/l10n/app_localizations_zh.dart

@@ -619,12 +619,21 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get playerParallelsCount => '线程数';
 
+  @override
+  String get playerShowLiteProgressbar => '显示播放进度';
+
   @override
   String get playerShowThumbnails => '显示缩略图';
 
   @override
   String get playerSliceSize => '分片大小';
 
+  @override
+  String playerType(String playerType) {
+    String _temp0 = intl.Intl.selectLogic(playerType, {'media3': 'Media 3', 'mpv': 'MPV', 'other': '未知'});
+    return '$_temp0';
+  }
+
   @override
   String get playerUseHardwareCodec => '使用硬解码';
 
@@ -825,6 +834,9 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get settingsItemPlayerHistory => '播放历史';
 
+  @override
+  String get settingsItemPlayerKernel => '播放器内核';
+
   @override
   String get settingsItemPlayerSettings => '播放设置';
 

lib/l10n/app_zh.arb

@@ -166,8 +166,10 @@
   "playerFastForwardSpeed": "快进速度",
   "playerOpenFileWithParallelThreads": "使用多线程打开文件",
   "playerParallelsCount": "线程数",
+  "playerShowLiteProgressbar": "显示播放进度",
   "playerShowThumbnails": "显示缩略图",
   "playerSliceSize": "分片大小",
+  "playerType": "{playerType, select, media3{Media 3} mpv{MPV} other{未知}}",
   "playerUseHardwareCodec": "使用硬解码",
   "playerVideoClarity": "视频清晰度",
   "queryType": "{queryType, select, genre{类型} studio{播出平台} keyword{关键词} actor{演职人员} other{未知}}",
@@ -217,6 +219,7 @@
   "settingsItemNfoEnabled": "NFO 启用",
   "settingsItemOthers": "其他设置",
   "settingsItemPlayerHistory": "播放历史",
+  "settingsItemPlayerKernel": "播放器内核",
   "settingsItemPlayerSettings": "播放设置",
   "settingsItemProxySettings": "代理设置",
   "settingsItemScraperBehavior": "刮削行为",

lib/pages/player/player_controls_full.dart

@@ -73,6 +73,18 @@ class _PlayerControlsFullState<T> extends State<PlayerControlsFull<T>> with Play
           _isShowLockButton.value = show;
         });
     _controlsStream.add(ControlsStreamStatus.show);
+    _controller.status.addListener(() {
+      switch (_controller.status.value) {
+        case PlayerStatus.playing:
+          if (_isShowControls.value) _controlsStream.add(ControlsStreamStatus.show);
+        case PlayerStatus.paused:
+        case PlayerStatus.ended:
+        case PlayerStatus.error:
+        case PlayerStatus.idle:
+          _controlsStream.add(ControlsStreamStatus.showInfinite);
+        case PlayerStatus.buffering:
+      }
+    });
     setPreferredOrientations(true);
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
     final autoForceLandscape = context.read<UserConfig>().autoForceLandscape;