fix: fullscreen play-pause button, search clear providers, video volume persistence & codec fallback (v3.1.6)

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.4-8A2BE2?style=for-the-badge&logo=semver&logoColor=white" alt="Version 3.1.4" /></a>
+  <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>
   <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.4';
+const appDisplayVersion = '3.1.6';
-const appBuildNumber = 65;
+const appBuildNumber = 67;
 const appReleaseChannel = 'Stable';

lib/app/changelog.dart

@@ -1,4 +1,25 @@
 const lunarisChangelog = [
+  LunarisChange(
+    version: '3.1.6',
+    title: 'Надежный полноэкранный плеер, сохранение провайдеров в поиске, громкость и устранение ошибки кодека',
+    bullets: [
+      'Полноэкранный плеер — отзывчивая кнопка Пуск/Пауза: центральная кнопка управления воспроизведением полностью переработана на непроницаемый GestureDetector со сквиркл-откликом, гарантируя мгновенное срабатывание без перехвата внешними жестами.',
+      'Сохранение источников при нажатии на крестик в поиске: клик по кнопке сброса в строке поиска теперь очищает только поисковый запрос и теги, никогда не сбрасывая выбранные источники до «Все».',
+      'Безупречное сохранение громкости: громкость видеоплеера корректно инициализируется из настроек, сохраняется при регулировках жестом и переходе между постами, не сбрасываясь на 100% при открытии нового видео и перезапуске приложения.',
+      'Автоматический fallback для ошибки Could not open codec: видеоплеер получил безопасные профили декодирования и автопереключение на программный лавк-декодер (FFmpeg software fallback) при редких сбоях аппаратного ускорения.',
+    ],
+  ),
+  LunarisChange(
+    version: '3.1.5',
+    title: 'Сохранение громкости видео, исправление полноэкранного плеера, фильтрации и удобства комментариев',
+    bullets: [
+      'Сохранение уровня громкости (Persistent Volume): выбранная громкость видеоплеера теперь сохраняется при свайп-регулировке и переключениях между видео и сохраняется даже после перезапуска приложения.',
+      'Исправление кнопок в полноэкранном режиме: кнопки паузы/воспроизведения и быстрой перемотки на ±10 секунд в центре экрана теперь работают мгновенно и надежно с анимацией визуального отклика (Seek Ripple).',
+      'Сохранение выбранных источников при очистке тегов: удаление всех тегов в строке поиска больше не сбрасывает выбранные провайдеры до значения «Все», сохраняя ваши активные источники.',
+      'Плавная строка поиска: при выборе тега из подсказок поле ввода больше не сдвигается слишком далеко в сторону, оставляя тег и курсор в поле зрения.',
+      'Удобный доступ к комментариям в посте: увеличен отступ снизу в деталях поста и расширена зона клика блока комментариев, позволяя комфортно прокрутить их выше системных жестов навигации.',
+    ],
+  ),
   LunarisChange(
     version: '3.1.4',
     title: 'Оптимизация видеоплеера — адаптивная высота и идеальное прилегание полосы воспроизведения',

lib/backend/services/settings_service.dart

@@ -39,6 +39,7 @@ class AppSettings {
     required this.motionRefreshMode,
     required this.autoBatterySaver60Hz,
     required this.videoPlayerMuted,
+    this.videoPlayerVolume = 100.0,
     required this.videoPlayerHalfVolume,
     required this.videoPlayerLoop,
     required this.videoPlayerCover,
@@ -94,6 +95,7 @@ class AppSettings {
   final String motionRefreshMode;
   final bool autoBatterySaver60Hz;
   final bool videoPlayerMuted;
+  final double videoPlayerVolume;
   final bool videoPlayerHalfVolume;
   final bool videoPlayerLoop;
   final bool videoPlayerCover;
@@ -146,6 +148,7 @@ class AppSettings {
     motionRefreshMode: 'auto',
     autoBatterySaver60Hz: true,
     videoPlayerMuted: false,
+    videoPlayerVolume: 100.0,
     videoPlayerHalfVolume: false,
     videoPlayerLoop: false,
     videoPlayerCover: false,
@@ -191,6 +194,7 @@ class AppSettings {
     String? motionRefreshMode,
     bool? autoBatterySaver60Hz,
     bool? videoPlayerMuted,
+    double? videoPlayerVolume,
     bool? videoPlayerHalfVolume,
     bool? videoPlayerLoop,
     bool? videoPlayerCover,
@@ -252,6 +256,7 @@ class AppSettings {
       motionRefreshMode: motionRefreshMode ?? this.motionRefreshMode,
       autoBatterySaver60Hz: autoBatterySaver60Hz ?? this.autoBatterySaver60Hz,
       videoPlayerMuted: videoPlayerMuted ?? this.videoPlayerMuted,
+      videoPlayerVolume: videoPlayerVolume ?? this.videoPlayerVolume,
       videoPlayerHalfVolume:
           videoPlayerHalfVolume ?? this.videoPlayerHalfVolume,
       videoPlayerLoop: videoPlayerLoop ?? this.videoPlayerLoop,
@@ -309,6 +314,7 @@ class AppSettings {
         'motionRefreshMode': motionRefreshMode,
         'autoBatterySaver60Hz': autoBatterySaver60Hz,
         'videoPlayerMuted': videoPlayerMuted,
+        'videoPlayerVolume': videoPlayerVolume,
         'videoPlayerHalfVolume': videoPlayerHalfVolume,
         'videoPlayerLoop': videoPlayerLoop,
         'videoPlayerCover': videoPlayerCover,
@@ -392,6 +398,8 @@ class AppSettings {
             defaults.autoBatterySaver60Hz,
         videoPlayerMuted:
             (json['videoPlayerMuted'] as bool?) ?? defaults.videoPlayerMuted,
+        videoPlayerVolume: (json['videoPlayerVolume'] as num?)?.toDouble() ??
+            defaults.videoPlayerVolume,
         videoPlayerHalfVolume: (json['videoPlayerHalfVolume'] as bool?) ??
             defaults.videoPlayerHalfVolume,
         videoPlayerLoop:
@@ -601,6 +609,17 @@ class SettingsService {
     return updateSettings(settings.copyWith(videoPlaybackPositions: positions));
   }
 
+  Future<Result<void>> setVideoPlayerVolume(double volume) async {
+    final result = await getSettings();
+    if (result is Error<AppSettings>) return Error(result.failure);
+    final settings = (result as Success<AppSettings>).data;
+    final clamped = volume.clamp(0.0, 100.0);
+    if ((settings.videoPlayerVolume - clamped).abs() < 0.01) {
+      return const Success(null);
+    }
+    return updateSettings(settings.copyWith(videoPlayerVolume: clamped));
+  }
+
   Future<Result<void>> appendDiagnosticLog(String message) async {
     final result = await getSettings();
     if (result is Error<AppSettings>) return Error(result.failure);

lib/features/feed/presentation/feed_screen.dart

@@ -374,7 +374,11 @@ class _FeedScreenState extends ConsumerState<FeedScreen>
   void _submitSearch(String query) {
     final trimmed = query.trim();
     if (trimmed.isEmpty) {
-      _clearFilters();
+      if (widget.initialQuery != null) {
+        context.go('/');
+      } else {
+        _applySearchQuery('');
+      }
       return;
     }
     final location = '/?q=${Uri.encodeQueryComponent(trimmed)}';

lib/features/feed/presentation/widgets/feed_toolbar.dart

@@ -104,7 +104,7 @@ class _FeedToolbarState extends State<FeedToolbar> {
                   },
                   onCleared: () {
                     _query = '';
-                    widget.onClearFilters();
+                    widget.onSearch('');
                   },
                 ),
               ),
@@ -235,7 +235,7 @@ class _FeedToolbarState extends State<FeedToolbar> {
                   },
                   onCleared: () {
                     _query = '';
-                    widget.onClearFilters();
+                    widget.onSearch('');
                   },
                 ),
               ),

lib/features/post/presentation/post_details_screen.dart

@@ -21,6 +21,7 @@ import '../../../shared/widgets/rating_badge.dart';
 import '../../collections/presentation/collection_form_dialog.dart';
 import '../../favorites/presentation/favorites_controller.dart';
 import '../../feed/presentation/feed_controller.dart';
+import '../../settings/presentation/settings_controller.dart';
 import '../../viewed/presentation/viewed_controller.dart';
 import 'post_details_controller.dart';
 import 'widgets/cloud_mirrors_card.dart';
@@ -249,6 +250,10 @@ class PostDetailsScreen extends ConsumerWidget {
                                         initialCoverVideo: settings.videoPlayerCover,
                                         initialHalfVolume:
                                             settings.videoPlayerHalfVolume,
+                                        initialVolume: settings.videoPlayerVolume,
+                                        onVolumeChanged: (vol) => ref
+                                            .read(settingsControllerProvider.notifier)
+                                            .setVideoPlayerVolume(vol),
                                         onPlaybackSnapshot: (snapshot) =>
                                             _saveVideoSnapshot(ref, post, snapshot),
                                         onPlaybackPreferencesChanged: (snapshot) =>
@@ -278,6 +283,10 @@ class PostDetailsScreen extends ConsumerWidget {
                                       initialCoverVideo: settings.videoPlayerCover,
                                       initialHalfVolume:
                                           settings.videoPlayerHalfVolume,
+                                      initialVolume: settings.videoPlayerVolume,
+                                      onVolumeChanged: (vol) => ref
+                                          .read(settingsControllerProvider.notifier)
+                                          .setVideoPlayerVolume(vol),
                                       onPlaybackSnapshot: (snapshot) =>
                                           _saveVideoSnapshot(ref, post, snapshot),
                                       onPlaybackPreferencesChanged: (snapshot) =>
@@ -392,6 +401,7 @@ class PostDetailsScreen extends ConsumerWidget {
                     ),
                     const SizedBox(height: 16),
                     _CommentsSection(post: post),
+                    const SizedBox(height: 80),
                   ],
                 ),
               ),
@@ -436,7 +446,12 @@ class PostDetailsScreen extends ConsumerWidget {
         if ((details.primaryVelocity ?? 0) > 900) _close(context);
       },
       child: ListView(
-        padding: const EdgeInsets.fromLTRB(8, 8, 8, 16),
+        padding: EdgeInsets.fromLTRB(
+          8,
+          8,
+          8,
+          120 + MediaQuery.paddingOf(context).bottom,
+        ),
         children: [
           GestureDetector(
             behavior: HitTestBehavior.deferToChild,
@@ -473,6 +488,10 @@ class PostDetailsScreen extends ConsumerWidget {
                           initialMuted: settings.videoPlayerMuted,
                           initialCoverVideo: settings.videoPlayerCover,
                           initialHalfVolume: settings.videoPlayerHalfVolume,
+                          initialVolume: settings.videoPlayerVolume,
+                          onVolumeChanged: (vol) => ref
+                              .read(settingsControllerProvider.notifier)
+                              .setVideoPlayerVolume(vol),
                           onPlaybackSnapshot: (snapshot) =>
                               _saveVideoSnapshot(ref, post, snapshot),
                           onPlaybackPreferencesChanged: (snapshot) =>
@@ -503,6 +522,10 @@ class PostDetailsScreen extends ConsumerWidget {
                       initialMuted: settings.videoPlayerMuted,
                       initialCoverVideo: settings.videoPlayerCover,
                       initialHalfVolume: settings.videoPlayerHalfVolume,
+                      initialVolume: settings.videoPlayerVolume,
+                      onVolumeChanged: (vol) => ref
+                          .read(settingsControllerProvider.notifier)
+                          .setVideoPlayerVolume(vol),
                       onPlaybackSnapshot: (snapshot) =>
                           _saveVideoSnapshot(ref, post, snapshot),
                       onPlaybackPreferencesChanged: (snapshot) =>
@@ -609,6 +632,7 @@ class PostDetailsScreen extends ConsumerWidget {
           ),
           const SizedBox(height: 12),
           _CommentsSection(post: post),
+          const SizedBox(height: 24),
         ],
       ),
     );
@@ -855,7 +879,8 @@ class PostDetailsScreen extends ConsumerWidget {
     if (settings.videoPlayerMuted == snapshot.muted &&
         settings.videoPlayerHalfVolume == snapshot.halfVolume &&
         settings.videoPlayerLoop == snapshot.loopVideo &&
-        settings.videoPlayerCover == snapshot.coverVideo) {
+        settings.videoPlayerCover == snapshot.coverVideo &&
+        (settings.videoPlayerVolume - snapshot.volume).abs() < 0.01) {
       return;
     }
     await ref.read(settingsServiceProvider).updateSettings(
@@ -864,6 +889,7 @@ class PostDetailsScreen extends ConsumerWidget {
             videoPlayerHalfVolume: snapshot.halfVolume,
             videoPlayerLoop: snapshot.loopVideo,
             videoPlayerCover: snapshot.coverVideo,
+            videoPlayerVolume: snapshot.volume,
           ),
         );
     ref.invalidate(appSettingsProvider);
@@ -1160,7 +1186,7 @@ class _CommentsSectionState extends ConsumerState<_CommentsSection> {
       ),
       clipBehavior: Clip.antiAlias,
       child: ExpansionTile(
-        tilePadding: const EdgeInsets.symmetric(horizontal: 14, vertical: 2),
+        tilePadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6),
         childrenPadding: const EdgeInsets.fromLTRB(14, 0, 14, 14),
         initiallyExpanded: false,
         shape: const Border(),

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

@@ -27,10 +27,12 @@ class PostMediaViewer extends StatefulWidget {
     this.initialMuted = false,
     this.initialCoverVideo = false,
     this.initialHalfVolume = false,
+    this.initialVolume = 100.0,
     this.qualityMode = MediaQualityMode.auto,
     this.mediaHeaders = const {},
     this.onPlaybackSnapshot,
     this.onPlaybackPreferencesChanged,
+    this.onVolumeChanged,
     this.onMediaGestureLockChanged,
     super.key,
   });
@@ -44,10 +46,12 @@ class PostMediaViewer extends StatefulWidget {
   final bool initialMuted;
   final bool initialCoverVideo;
   final bool initialHalfVolume;
+  final double initialVolume;
   final MediaQualityMode qualityMode;
   final Map<String, String> mediaHeaders;
   final ValueChanged<VideoPlaybackSnapshot>? onPlaybackSnapshot;
   final ValueChanged<VideoPlaybackSnapshot>? onPlaybackPreferencesChanged;
+  final ValueChanged<double>? onVolumeChanged;
   final ValueChanged<bool>? onMediaGestureLockChanged;
 
   @override
@@ -68,6 +72,7 @@ class _PostMediaViewerState extends State<PostMediaViewer>
   late bool _muted;
   late bool _loopVideo;
   late bool _halfVolume;
+  late double _currentVolume;
   String? _videoError;
   bool _retriedFormatError = false;
   Timer? _hideTimer;
@@ -83,6 +88,7 @@ class _PostMediaViewerState extends State<PostMediaViewer>
     _muted = widget.initialMuted;
     _loopVideo = widget.initialLoop;
     _halfVolume = widget.initialHalfVolume;
+    _currentVolume = widget.initialVolume;
     _imageUrls = _buildImageUrls(widget.post);
     _videoUrls = _buildVideoUrls(widget.post);
     if (_isVideo(widget.post) && _videoUrls.isNotEmpty) {
@@ -109,6 +115,27 @@ class _PostMediaViewerState extends State<PostMediaViewer>
         unawaited(_retryVideo());
       }
     }
+    if (oldWidget.initialVolume != widget.initialVolume) {
+      _currentVolume = widget.initialVolume;
+      unawaited(_applyVolume());
+    }
+    if (oldWidget.initialMuted != widget.initialMuted) {
+      _muted = widget.initialMuted;
+      unawaited(_applyVolume());
+    }
+    if (oldWidget.initialHalfVolume != widget.initialHalfVolume) {
+      _halfVolume = widget.initialHalfVolume;
+      unawaited(_applyVolume());
+    }
+    if (oldWidget.initialLoop != widget.initialLoop) {
+      _loopVideo = widget.initialLoop;
+      unawaited(_player?.setPlaylistMode(
+        _loopVideo ? PlaylistMode.single : PlaylistMode.none,
+      ));
+    }
+    if (oldWidget.initialCoverVideo != widget.initialCoverVideo) {
+      _coverVideo = widget.initialCoverVideo;
+    }
   }
 
   @override
@@ -167,6 +194,12 @@ class _PostMediaViewerState extends State<PostMediaViewer>
               muted: _muted,
               loopVideo: _loopVideo,
               halfVolume: _halfVolume,
+              initialVolume: _currentVolume,
+              onVolumeChanged: (vol) {
+                _currentVolume = vol;
+                widget.onVolumeChanged?.call(vol);
+                _emitPlaybackPreferences();
+              },
               fullscreen: widget.fullscreen,
               errorMessage: _videoError,
               onInteract: _showControls,
@@ -327,6 +360,12 @@ class _PostMediaViewerState extends State<PostMediaViewer>
     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 (_) {}
     _applyVolume();
     _player!.setPlaylistMode(
       _loopVideo ? PlaylistMode.single : PlaylistMode.none,
@@ -370,6 +409,7 @@ class _PostMediaViewerState extends State<PostMediaViewer>
         ),
         play: false,
       );
+      await _applyVolume();
       if (initialPosition > Duration.zero) {
         await player.seek(initialPosition);
       }
@@ -385,14 +425,22 @@ class _PostMediaViewerState extends State<PostMediaViewer>
       await _openVideo(play: play);
       return;
     }
-    // If format error occurred on initial load (often due to async referer headers), retry once automatically
+    final lower = message.toLowerCase();
+    // If format or codec error occurred (e.g. unsupported hwdec profile), fallback to software decoding and retry once
     if (!_retriedFormatError &&
-        (message.contains('Failed to recognize file format') ||
+        (lower.contains('codec') ||
-            message.contains('Demuxer error') ||
+            lower.contains('could not open') ||
-            message.contains('Could not open') ||
+            lower.contains('couldnt open') ||
-            message.contains('Stream format not recognized') ||
+            lower.contains('could not initialize codec') ||
-            message.contains('format unrecognized'))) {
+            lower.contains('demuxer error') ||
+            lower.contains('format unrecognized') ||
+            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) {
         _videoIndex = 0;
@@ -408,6 +456,10 @@ 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);
   }
 
@@ -534,6 +586,7 @@ class _PostMediaViewerState extends State<PostMediaViewer>
           muted: _muted,
           halfVolume: _halfVolume,
           coverVideo: _coverVideo,
+          initialVolume: _currentVolume,
           errorMessage: _videoError,
           onRetry: _retryVideo,
           onChanged: (snapshot) {
@@ -560,12 +613,14 @@ class _PostMediaViewerState extends State<PostMediaViewer>
       _loopVideo = snapshot.loopVideo;
       _coverVideo = snapshot.coverVideo;
       _halfVolume = snapshot.halfVolume;
+      _currentVolume = snapshot.volume;
     });
     await _applyVolume();
     await _player?.setPlaylistMode(
       _loopVideo ? PlaylistMode.single : PlaylistMode.none,
     );
     _emitPlaybackPreferences();
+    widget.onVolumeChanged?.call(_currentVolume);
   }
 
   VideoPlaybackSnapshot _snapshot() {
@@ -577,15 +632,16 @@ class _PostMediaViewerState extends State<PostMediaViewer>
       halfVolume: _halfVolume,
       loopVideo: _loopVideo,
       coverVideo: _coverVideo,
+      volume: _currentVolume,
     );
   }
 
   Future<void> _applyVolume() async {
     await _player?.setVolume(_muted
-        ? 0
+        ? 0.0
         : _halfVolume
-            ? 50
+            ? 50.0
-            : 100);
+            : _currentVolume);
   }
 
   void _emitPlaybackPreferences() {
@@ -656,6 +712,7 @@ class VideoPlaybackSnapshot {
     required this.halfVolume,
     required this.loopVideo,
     required this.coverVideo,
+    this.volume = 100.0,
   });
 
   final Duration position;
@@ -664,6 +721,7 @@ class VideoPlaybackSnapshot {
   final bool halfVolume;
   final bool loopVideo;
   final bool coverVideo;
+  final double volume;
 }
 
 class _FullscreenVideoPage extends StatefulWidget {
@@ -675,6 +733,7 @@ class _FullscreenVideoPage extends StatefulWidget {
     required this.muted,
     required this.halfVolume,
     required this.coverVideo,
+    this.initialVolume = 100.0,
     required this.errorMessage,
     required this.onRetry,
     required this.onChanged,
@@ -687,6 +746,7 @@ class _FullscreenVideoPage extends StatefulWidget {
   final bool muted;
   final bool halfVolume;
   final bool coverVideo;
+  final double initialVolume;
   final String? errorMessage;
   final VoidCallback onRetry;
   final ValueChanged<VideoPlaybackSnapshot> onChanged;
@@ -701,6 +761,7 @@ class _FullscreenVideoPageState extends State<_FullscreenVideoPage> {
   late bool _muted;
   late bool _loopVideo;
   late bool _halfVolume;
+  late double _currentVolume;
   late bool _isLandscape;
   Timer? _hideTimer;
 
@@ -711,6 +772,8 @@ class _FullscreenVideoPageState extends State<_FullscreenVideoPage> {
     _muted = widget.muted;
     _loopVideo = widget.loopVideo;
     _halfVolume = widget.halfVolume;
+    _currentVolume = widget.initialVolume;
+    _applyVolume();
     _isLandscape = widget.aspectRatio > 1.05;
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
     _applyOrientation();
@@ -790,6 +853,11 @@ class _FullscreenVideoPageState extends State<_FullscreenVideoPage> {
                       muted: _muted,
                       loopVideo: _loopVideo,
                       halfVolume: _halfVolume,
+                      initialVolume: _currentVolume,
+                      onVolumeChanged: (vol) {
+                        _currentVolume = vol;
+                        widget.onChanged(_snapshot());
+                      },
                       fullscreen: true,
                       errorMessage: widget.errorMessage,
                       onInteract: _showControls,
@@ -883,10 +951,10 @@ class _FullscreenVideoPageState extends State<_FullscreenVideoPage> {
 
   Future<void> _applyVolume() async {
     await widget.player.setVolume(_muted
-        ? 0
+        ? 0.0
         : _halfVolume
-            ? 50
+            ? 50.0
-            : 100);
+            : _currentVolume);
   }
 
   VideoPlaybackSnapshot _snapshot() {
@@ -897,6 +965,7 @@ class _FullscreenVideoPageState extends State<_FullscreenVideoPage> {
       halfVolume: _halfVolume,
       loopVideo: _loopVideo,
       coverVideo: _coverVideo,
+      volume: _currentVolume,
     );
   }
 }
@@ -915,6 +984,8 @@ class _VideoSurface extends StatefulWidget {
     required this.muted,
     required this.halfVolume,
     required this.loopVideo,
+    this.initialVolume = 100.0,
+    this.onVolumeChanged,
     required this.fullscreen,
     required this.errorMessage,
     required this.onInteract,
@@ -934,6 +1005,8 @@ class _VideoSurface extends StatefulWidget {
   final bool muted;
   final bool halfVolume;
   final bool loopVideo;
+  final double initialVolume;
+  final ValueChanged<double>? onVolumeChanged;
   final bool fullscreen;
   final String? errorMessage;
   final VoidCallback onInteract;
@@ -965,7 +1038,17 @@ class _VideoSurfaceState extends State<_VideoSurface> {
   @override
   void initState() {
     super.initState();
-    _currentVolume = widget.player.state.volume;
+    _currentVolume = widget.initialVolume;
+    widget.player.setVolume(_currentVolume);
+  }
+
+  @override
+  void didUpdateWidget(covariant _VideoSurface oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.initialVolume != widget.initialVolume) {
+      _currentVolume = widget.initialVolume;
+      widget.player.setVolume(_currentVolume);
+    }
   }
 
   @override
@@ -983,26 +1066,37 @@ class _VideoSurfaceState extends State<_VideoSurface> {
     if (target < Duration.zero) target = Duration.zero;
     if (dur > Duration.zero && target > dur) target = dur;
     widget.player.seek(target);
+    widget.onInteract();
+    if (delta.inSeconds < 0) {
+      setState(() => _showLeftSeek = true);
+      _seekLeftTimer?.cancel();
+      _seekLeftTimer = Timer(const Duration(milliseconds: 650), () {
+        if (mounted) setState(() => _showLeftSeek = false);
+      });
+    } else if (delta.inSeconds > 0) {
+      setState(() => _showRightSeek = true);
+      _seekRightTimer?.cancel();
+      _seekRightTimer = Timer(const Duration(milliseconds: 650), () {
+        if (mounted) setState(() => _showRightSeek = false);
+      });
+    }
   }
 
   void _onDoubleTapAt(Offset localPosition, double width) {
     if (_isLocked) return;
     if (localPosition.dx < width * 0.4) {
       _seekBy(const Duration(seconds: -10));
-      setState(() => _showLeftSeek = true);
-      _seekLeftTimer?.cancel();
-      _seekLeftTimer = Timer(const Duration(milliseconds: 650), () {
-        if (mounted) setState(() => _showLeftSeek = false);
-      });
     } else if (localPosition.dx > width * 0.6) {
       _seekBy(const Duration(seconds: 10));
-      setState(() => _showRightSeek = true);
-      _seekRightTimer?.cancel();
-      _seekRightTimer = Timer(const Duration(milliseconds: 650), () {
-        if (mounted) setState(() => _showRightSeek = false);
-      });
     } else {
-      widget.player.playOrPause();
+      if (widget.player.state.playing) {
+        widget.player.pause();
+      } else {
+        if (widget.player.state.completed) {
+          widget.player.seek(Duration.zero);
+        }
+        widget.player.play();
+      }
       widget.onInteract();
     }
   }
@@ -1025,6 +1119,7 @@ class _VideoSurfaceState extends State<_VideoSurface> {
     final newVol = (_currentVolume - deltaY * 0.5).clamp(0.0, 100.0);
     _currentVolume = newVol;
     widget.player.setVolume(newVol);
+    widget.onVolumeChanged?.call(newVol);
     setState(() => _showVolumeIndicator = true);
     _volumeTimer?.cancel();
     _volumeTimer = Timer(const Duration(milliseconds: 1100), () {
@@ -1094,6 +1189,7 @@ class _VideoSurfaceState extends State<_VideoSurface> {
                   onToggleLoop: widget.onToggleLoop,
                   onFullscreen: widget.onFullscreen,
                   onSeekBy: _seekBy,
+                  onInteract: widget.onInteract,
                 ),
               ),
             ),
@@ -1449,9 +1545,9 @@ class _RoundControlButton extends StatelessWidget {
             : Colors.white;
     return Tooltip(
       message: tooltip,
-      child: InkResponse(
+      child: GestureDetector(
+        behavior: HitTestBehavior.opaque,
         onTap: onPressed,
-        radius: size / 2 + 4,
         child: AnimatedContainer(
           duration: AppMotion.duration(context, 140),
           width: size,
@@ -1467,12 +1563,15 @@ class _RoundControlButton extends StatelessWidget {
             boxShadow: [
               if (emphasized)
                 BoxShadow(
-                  color: scheme.primary.withValues(alpha: 0.35),
+                  color: scheme.primary.withValues(alpha: 0.45),
-                  blurRadius: 14,
+                  blurRadius: 28,
+                  spreadRadius: 2,
                 ),
             ],
           ),
-          child: Icon(icon, color: foreground, size: iconSize),
+          child: Center(
+            child: Icon(icon, color: foreground, size: iconSize),
+          ),
         ),
       ),
     );
@@ -1728,6 +1827,7 @@ class _VideoControls extends StatelessWidget {
     required this.onToggleLoop,
     required this.onFullscreen,
     required this.onSeekBy,
+    this.onInteract,
   });
 
   final Player player;
@@ -1744,6 +1844,7 @@ class _VideoControls extends StatelessWidget {
   final VoidCallback onToggleLoop;
   final VoidCallback onFullscreen;
   final void Function(Duration) onSeekBy;
+  final VoidCallback? onInteract;
 
   @override
   Widget build(BuildContext context) {
@@ -1864,34 +1965,37 @@ class _VideoControls extends StatelessWidget {
                         icon: Icons.replay_10_rounded,
                         size: 46,
                         iconSize: 26,
-                        onPressed: () => onSeekBy(const Duration(seconds: -10)),
+                        onPressed: () {
+                          onSeekBy(const Duration(seconds: -10));
+                          onInteract?.call();
+                        },
                       ),
                       const SizedBox(width: 32),
-                      Container(
+                      _RoundControlButton(
-                        width: 68,
+                        tooltip: playing ? 'Пауза' : 'Воспроизведение',
-                        height: 68,
+                        icon: playing
-                        decoration: BoxDecoration(
+                            ? Icons.pause_rounded
-                          shape: BoxShape.circle,
+                            : Icons.play_arrow_rounded,
-                          color: scheme.primary.withValues(alpha: 0.94),
+                        size: 68,
-                          boxShadow: [
+                        iconSize: 42,
-                            BoxShadow(
+                        emphasized: true,
-                              color: scheme.primary.withValues(alpha: 0.45),
+                        onPressed: () async {
-                              blurRadius: 28,
+                          try {
-                              spreadRadius: 2,
+                            if (player.state.completed) {
-                            ),
+                              await player.seek(Duration.zero);
-                          ],
+                              await player.play();
-                        ),
+                            } else {
-                        child: IconButton(
+                              await player.playOrPause();
-                          tooltip: playing ? 'Пауза' : 'Воспроизведение',
+                            }
-                          iconSize: 42,
+                          } catch (_) {
-                          color: scheme.onPrimary,
+                            if (player.state.playing) {
-                          onPressed: player.playOrPause,
+                              await player.pause();
-                          icon: Icon(
+                            } else {
-                            playing
+                              await player.play();
-                                ? Icons.pause_rounded
+                            }
-                                : Icons.play_arrow_rounded,
+                          }
-                          ),
+                          onInteract?.call();
-                        ),
+                        },
                       ),
                       const SizedBox(width: 32),
                       _RoundControlButton(
@@ -1899,7 +2003,10 @@ class _VideoControls extends StatelessWidget {
                         icon: Icons.forward_10_rounded,
                         size: 46,
                         iconSize: 26,
-                        onPressed: () => onSeekBy(const Duration(seconds: 10)),
+                        onPressed: () {
+                          onSeekBy(const Duration(seconds: 10));
+                          onInteract?.call();
+                        },
                       ),
                     ],
                   );

lib/features/settings/presentation/settings_controller.dart

@@ -23,6 +23,16 @@ class SettingsController extends AsyncNotifier<AppSettings> {
     ref.invalidate(appSettingsProvider);
   }
 
+  Future<void> setVideoPlayerVolume(double volume) async {
+    final current = state.value ?? AppSettings.defaults;
+    final clamped = volume.clamp(0.0, 100.0);
+    if ((current.videoPlayerVolume - clamped).abs() < 0.01) return;
+    final updated = current.copyWith(videoPlayerVolume: clamped);
+    state = AsyncData(updated);
+    await ref.read(settingsServiceProvider).setVideoPlayerVolume(clamped);
+    ref.invalidate(appSettingsProvider);
+  }
+
   Future<void> clearCache() async {
     await ref.read(cacheServiceProvider).clear();
   }

lib/shared/widgets/app_search_bar.dart

@@ -167,8 +167,10 @@ class _TagInputSearchBarState extends State<TagInputSearchBar> {
   void _scrollToEnd() {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (_tagScrollController.hasClients) {
+        final max = _tagScrollController.position.maxScrollExtent;
+        final target = (max - 40).clamp(0.0, max);
         _tagScrollController.animateTo(
-          _tagScrollController.position.maxScrollExtent,
+          target,
           duration: const Duration(milliseconds: 200),
           curve: Curves.easeOut,
         );
@@ -286,8 +288,8 @@ class _TagInputSearchBarState extends State<TagInputSearchBar> {
                                   const SizedBox(width: 6),
                                 ],
                                 ConstrainedBox(
-                                  constraints: const BoxConstraints(
+                                  constraints: BoxConstraints(
-                                    minWidth: 120,
+                                    minWidth: _tags.isEmpty ? 120 : 64,
                                     maxWidth: 300,
                                   ),
                                   child: Focus(

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.4+65
+version: 3.1.6+67
 
 environment:
   sdk: ">=3.3.0 <4.0.0"