fix: fullscreen playback state retention and responsive control buttons (v3.1.8)

README.md

@@ -10,7 +10,7 @@
 </p>
 
 <p align="center">
-  <a href="https://github.com/RarDog/Lunaris/releases"><img src="https://img.shields.io/badge/Version-3.1.6-8A2BE2?style=for-the-badge&logo=semver&logoColor=white" alt="Version 3.1.6" /></a>
+  <a href="https://github.com/RarDog/Lunaris/releases"><img src="https://img.shields.io/badge/Version-3.1.8-8A2BE2?style=for-the-badge&logo=semver&logoColor=white" alt="Version 3.1.8" /></a>
   <img src="https://img.shields.io/badge/Flutter-3.47+-02569B?style=for-the-badge&logo=flutter&logoColor=white" alt="Flutter" />
   <img src="https://img.shields.io/badge/Platform-Android%20%7C%20Linux%20%7C%20Windows-00C853?style=for-the-badge" alt="Platforms" />
   <a href="https://github.com/RarDog/Lunaris/wiki"><img src="https://img.shields.io/badge/Wiki-Documentation-FF6F00?style=for-the-badge&logo=gitbook&logoColor=white" alt="Wiki" /></a>

lib/app/app_version.dart

@@ -1,3 +1,3 @@
-const appDisplayVersion = '3.1.6';
-const appBuildNumber = 67;
+const appDisplayVersion = '3.1.8';
+const appBuildNumber = 69;
 const appReleaseChannel = 'Stable';

lib/app/changelog.dart

@@ -1,4 +1,23 @@
 const lunarisChangelog = [
+  LunarisChange(
+    version: '3.1.8',
+    title: 'Безупречный полноэкранный плеер: устранение остановки при развертывании и отзывчивые кнопки управления',
+    bullets: [
+      'Непрерывное воспроизведение при открытии на весь экран: видео больше не останавливается самопроизвольно при входе в полноэкранный режим или смене ориентации устройства.',
+      'Корректный статус воспроизведения: устранен сброс кнопки на «Пуск» при переходе в полный экран — видео продолжает воспроизведение без ложных остановок.',
+      'Мгновенный отклик кнопок «Пуск/Пауза» и перемотки: жесты управления поверхностью (двойной тап, смахивание громкости) перемещены в фоновый слой, исключая перехват и отмену нажатий по кнопкам управления.',
+      'Синхронизация состояния при сворачивании: плеер точно запоминает состояние паузы/воспроизведения при выходе из полноэкранного режима обратно в пост.',
+    ],
+  ),
+  LunarisChange(
+    version: '3.1.7',
+    title: 'Устранение критического сбоя при открытии видеопоста (SIGSEGV в libmpv)',
+    bullets: [
+      'Устранение нативного вылета: полностью удалены небезопасные прямые FFI-вызовы setProperty к mpv, приводившие к немедленному падению приложения на Android при инициализации видео.',
+      'Безопасная конфигурация декодирования: перевод настроек аппаратного ускорения и фоллбэка кодеков на официальный типобезопасный VideoControllerConfiguration (media_kit_video).',
+      'Надежный фоллбэк при редких ошибках кодека: при несовместимости аппаратного декодера плеер бесшовно переключается на программный FFmpeg-декодер без риска краша.',
+    ],
+  ),
   LunarisChange(
     version: '3.1.6',
     title: 'Надежный полноэкранный плеер, сохранение провайдеров в поиске, громкость и устранение ошибки кодека',

lib/features/post/presentation/widgets/post_media_viewer.dart

@@ -75,6 +75,7 @@ class _PostMediaViewerState extends State<PostMediaViewer>
   late double _currentVolume;
   String? _videoError;
   bool _retriedFormatError = false;
+  bool _softwareDecodingFallback = false;
   Timer? _hideTimer;
   StreamSubscription<String>? _errorSubscription;
   StreamSubscription<Duration>? _positionSubscription;
@@ -105,6 +106,7 @@ class _PostMediaViewerState extends State<PostMediaViewer>
       _videoIndex = 0;
       _videoError = null;
       _retriedFormatError = false;
+      _softwareDecodingFallback = false;
       _imageUrls = _buildImageUrls(widget.post);
       _videoUrls = _buildVideoUrls(widget.post);
       if (_isVideo(widget.post) && _videoUrls.isNotEmpty) {
@@ -359,13 +361,13 @@ class _PostMediaViewerState extends State<PostMediaViewer>
   void _initializeVideo() {
     MediaKit.ensureInitialized();
     _player = Player();
-    _controller = VideoController(_player!);
-    try {
-      final native = _player!.platform as dynamic;
-      native?.setProperty('hwdec', 'auto-safe', waitForInitialization: false);
-      native?.setProperty('vd-lavc-software-fallback', 'yes', waitForInitialization: false);
-      native?.setProperty('vd-lavc-check-hw-profile', 'yes', waitForInitialization: false);
-    } catch (_) {}
+    _controller = VideoController(
+      _player!,
+      configuration: VideoControllerConfiguration(
+        enableHardwareAcceleration: !_softwareDecodingFallback,
+        hwdec: _softwareDecodingFallback ? 'no' : 'auto-safe',
+      ),
+    );
     _applyVolume();
     _player!.setPlaylistMode(
       _loopVideo ? PlaylistMode.single : PlaylistMode.none,
@@ -437,14 +439,12 @@ class _PostMediaViewerState extends State<PostMediaViewer>
             lower.contains('stream format not recognized') ||
             lower.contains('failed to recognize file format'))) {
       _retriedFormatError = true;
-      try {
-        final native = _player?.platform as dynamic;
-        await native?.setProperty('hwdec', 'no', waitForInitialization: false);
-      } catch (_) {}
-      await Future<void>.delayed(const Duration(milliseconds: 300));
-      if (mounted && _player != null) {
+      _softwareDecodingFallback = true;
+      _disposeVideo();
+      await Future<void>.delayed(const Duration(milliseconds: 250));
+      if (mounted) {
         _videoIndex = 0;
-        await _openVideo(play: play);
+        _initializeVideo();
         return;
       }
     }
@@ -456,11 +456,12 @@ class _PostMediaViewerState extends State<PostMediaViewer>
   Future<void> _retryVideo() async {
     _videoIndex = 0;
     _retriedFormatError = false;
-    try {
-      final native = _player?.platform as dynamic;
-      await native?.setProperty('hwdec', 'no', waitForInitialization: false);
-    } catch (_) {}
-    await _openVideo(play: true);
+    _softwareDecodingFallback = true;
+    _disposeVideo();
+    await Future<void>.delayed(const Duration(milliseconds: 150));
+    if (mounted) {
+      _initializeVideo();
+    }
   }
 
   void _disposeVideo() {
@@ -570,6 +571,7 @@ class _PostMediaViewerState extends State<PostMediaViewer>
     final player = _player;
     final controller = _controller;
     if (player == null || controller == null) return;
+    final wasPlaying = player.state.playing;
     setState(() => _inFullscreen = true);
     if (!context.mounted) return;
     final result = await Navigator.of(context, rootNavigator: true)
@@ -579,6 +581,7 @@ class _PostMediaViewerState extends State<PostMediaViewer>
         pageBuilder: (_, __, ___) => _FullscreenVideoPage(
           player: player,
           controller: controller,
+          wasPlaying: wasPlaying,
           aspectRatio: widget.post.width > 0 && widget.post.height > 0
               ? widget.post.width / widget.post.height
               : 16 / 9,
@@ -602,6 +605,11 @@ class _PostMediaViewerState extends State<PostMediaViewer>
     if (mounted) setState(() => _inFullscreen = false);
     if (result != null) {
       await _applyPlaybackSnapshot(result);
+      if (result.playing && !player.state.playing) {
+        await player.play();
+      } else if (!result.playing && player.state.playing) {
+        await player.pause();
+      }
       return;
     }
   }
@@ -728,6 +736,7 @@ class _FullscreenVideoPage extends StatefulWidget {
   const _FullscreenVideoPage({
     required this.player,
     required this.controller,
+    required this.wasPlaying,
     required this.aspectRatio,
     required this.loopVideo,
     required this.muted,
@@ -741,6 +750,7 @@ class _FullscreenVideoPage extends StatefulWidget {
 
   final Player player;
   final VideoController controller;
+  final bool wasPlaying;
   final double aspectRatio;
   final bool loopVideo;
   final bool muted;
@@ -778,6 +788,13 @@ class _FullscreenVideoPageState extends State<_FullscreenVideoPage> {
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
     _applyOrientation();
     _scheduleControlsHide();
+    if (widget.wasPlaying) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (mounted && !widget.player.state.playing) {
+          widget.player.play();
+        }
+      });
+    }
   }
 
   void _applyOrientation() {
@@ -1130,6 +1147,7 @@ class _VideoSurfaceState extends State<_VideoSurface> {
   @override
   Widget build(BuildContext context) {
     final player = widget.player;
+    Offset? lastTapDown;
 
     final child = LayoutBuilder(
       builder: (context, constraints) {
@@ -1142,6 +1160,32 @@ class _VideoSurfaceState extends State<_VideoSurface> {
                 controller: widget.controller,
                 fit: widget.coverVideo ? BoxFit.cover : BoxFit.contain,
                 controls: null,
+                pauseUponEnteringBackgroundMode: false,
+                resumeUponEnteringForegroundMode: false,
+              ),
+            ),
+            Positioned.fill(
+              child: GestureDetector(
+                behavior: HitTestBehavior.opaque,
+                onTapDown: (details) => lastTapDown = details.localPosition,
+                onTap: widget.onInteract,
+                onDoubleTap: () {
+                  if (lastTapDown != null) {
+                    _onDoubleTapAt(
+                      lastTapDown!,
+                      MediaQuery.sizeOf(context).width,
+                    );
+                  }
+                },
+                onLongPressStart: (_) => _startSpeedBoost(),
+                onLongPressEnd: (_) => _stopSpeedBoost(),
+                onVerticalDragUpdate: (details) {
+                  final x = details.localPosition.dx;
+                  final width = MediaQuery.sizeOf(context).width;
+                  if (x > width * 0.4) {
+                    _adjustVolume(details.primaryDelta ?? 0.0);
+                  }
+                },
               ),
             ),
             StreamBuilder<bool>(
@@ -1198,36 +1242,16 @@ class _VideoSurfaceState extends State<_VideoSurface> {
       },
     );
 
-    Offset? lastTapDown;
-
     return MouseRegion(
       onHover: (_) => widget.onInteract(),
-      child: GestureDetector(
-        onTapDown: (details) => lastTapDown = details.localPosition,
-        onTap: widget.onInteract,
-        onDoubleTap: () {
-          if (lastTapDown != null) {
-            _onDoubleTapAt(lastTapDown!, MediaQuery.sizeOf(context).width);
-          }
-        },
-        onLongPressStart: (_) => _startSpeedBoost(),
-        onLongPressEnd: (_) => _stopSpeedBoost(),
-        onVerticalDragUpdate: (details) {
-          final x = details.localPosition.dx;
-          final width = MediaQuery.sizeOf(context).width;
-          if (x > width * 0.4) {
-            _adjustVolume(details.primaryDelta ?? 0.0);
-          }
-        },
-        child: ClipRRect(
-          borderRadius: BorderRadius.circular(widget.fullscreen ? 0 : 10),
-          child: widget.fullscreen
-              ? SizedBox.expand(child: child)
-              : AspectRatio(
-                  aspectRatio: widget.aspectRatio.clamp(0.35, 2.4),
-                  child: child,
-                ),
-        ),
+      child: ClipRRect(
+        borderRadius: BorderRadius.circular(widget.fullscreen ? 0 : 10),
+        child: widget.fullscreen
+            ? SizedBox.expand(child: child)
+            : AspectRatio(
+                aspectRatio: widget.aspectRatio.clamp(0.35, 2.4),
+                child: child,
+              ),
       ),
     );
   }
@@ -1545,32 +1569,37 @@ class _RoundControlButton extends StatelessWidget {
             : Colors.white;
     return Tooltip(
       message: tooltip,
-      child: GestureDetector(
-        behavior: HitTestBehavior.opaque,
-        onTap: onPressed,
-        child: AnimatedContainer(
-          duration: AppMotion.duration(context, 140),
-          width: size,
-          height: size,
-          decoration: BoxDecoration(
-            color: background,
-            shape: BoxShape.circle,
-            border: Border.all(
-              color: selected
-                  ? scheme.primary.withValues(alpha: 0.4)
-                  : Colors.white.withValues(alpha: 0.14),
+      child: Material(
+        color: Colors.transparent,
+        shape: const CircleBorder(),
+        child: InkResponse(
+          containedInkWell: true,
+          highlightShape: BoxShape.circle,
+          onTap: onPressed,
+          child: AnimatedContainer(
+            duration: AppMotion.duration(context, 140),
+            width: size,
+            height: size,
+            decoration: BoxDecoration(
+              color: background,
+              shape: BoxShape.circle,
+              border: Border.all(
+                color: selected
+                    ? scheme.primary.withValues(alpha: 0.4)
+                    : Colors.white.withValues(alpha: 0.14),
+              ),
+              boxShadow: [
+                if (emphasized)
+                  BoxShadow(
+                    color: scheme.primary.withValues(alpha: 0.45),
+                    blurRadius: 28,
+                    spreadRadius: 2,
+                  ),
+              ],
+            ),
+            child: Center(
+              child: Icon(icon, color: foreground, size: iconSize),
             ),
-            boxShadow: [
-              if (emphasized)
-                BoxShadow(
-                  color: scheme.primary.withValues(alpha: 0.45),
-                  blurRadius: 28,
-                  spreadRadius: 2,
-                ),
-            ],
-          ),
-          child: Center(
-            child: Icon(icon, color: foreground, size: iconSize),
           ),
         ),
       ),
@@ -1981,11 +2010,13 @@ class _VideoControls extends StatelessWidget {
                         emphasized: true,
                         onPressed: () async {
                           try {
-                            if (player.state.completed) {
-                              await player.seek(Duration.zero);
-                              await player.play();
+                            if (player.state.playing) {
+                              await player.pause();
                             } else {
-                              await player.playOrPause();
+                              if (player.state.completed) {
+                                await player.seek(Duration.zero);
+                              }
+                              await player.play();
                             }
                           } catch (_) {
                             if (player.state.playing) {

lib/shared/widgets/post_card.dart

@@ -596,6 +596,8 @@ class _FeedVideoPreviewState extends State<_FeedVideoPreview> {
               controller: _controller,
               fit: BoxFit.cover,
               controls: null,
+              pauseUponEnteringBackgroundMode: false,
+              resumeUponEnteringForegroundMode: false,
             ),
           ),
         ),

pubspec.yaml

@@ -1,7 +1,7 @@
 name: gel_rule_app
 description: Local backend/core layer for a Flutter booru browser app.
 publish_to: "none"
-version: 3.1.6+67
+version: 3.1.8+69
 
 environment:
   sdk: ">=3.3.0 <4.0.0"