Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 RarDog
|
a88a8b5050 | ||
|
RarDog
|
a039f09ec3 |
@@ -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.8-8A2BE2?style=for-the-badge&logo=semver&logoColor=white" alt="Version 3.1.8" /></a>
|
||||
<a href="https://github.com/RarDog/Lunaris/releases"><img src="https://img.shields.io/badge/Version-3.2.0-8A2BE2?style=for-the-badge&logo=semver&logoColor=white" alt="Version 3.2.0" /></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>
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
const appDisplayVersion = '3.1.8';
|
||||
const appBuildNumber = 69;
|
||||
const appDisplayVersion = '3.2.0';
|
||||
const appBuildNumber = 71;
|
||||
const appReleaseChannel = 'Stable';
|
||||
|
||||
@@ -1,4 +1,24 @@
|
||||
const lunarisChangelog = [
|
||||
LunarisChange(
|
||||
version: '3.2.0',
|
||||
title: 'Стабильный полноэкранный режим: сохранение воспроизведения, устранение вылетов плеера и чистый интерфейс',
|
||||
bullets: [
|
||||
'Сохранение воспроизведения видео при повороте экрана: исправлена логика адаптивности на смартфонах — альбомная ориентация больше не сбрасывает мобильный интерфейс и не уничтожает запущенный плеер.',
|
||||
'Защита жизненного цикла Player в фоне: плеер не уничтожается при переходе в полный экран, а кнопки «Пуск/Пауза» и перемотки работают мгновенно и безотказно.',
|
||||
'Чистый кинематографичный интерфейс: удалены старые дублирующиеся кнопки в правом верхнем углу; кнопка смены ориентации (альбомный/портретный режим) аккуратно интегрирована в верхнюю панель управления.',
|
||||
'Быстрое скрытие и показ контролов: касание свободной области видео плавно переключает видимость панели управления, а при нажатии на кнопки таймер автоскрытия автоматически обновляется.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
version: '3.1.9',
|
||||
title: 'Полноэкранный плеер 2.0: мгновенный переход без задержек, жесты яркости и скраббинг с превью',
|
||||
bullets: [
|
||||
'Мгновенный переход в полноэкранный режим: убраны промежуточные задержки и наложения текстур, вход и выход происходят без малейших задержек.',
|
||||
'Двухзонное жестовое управление: левая сторона экрана регулирует яркость подсветки с индикатором солнца, правая сторона — громкость звука.',
|
||||
'Плавный скраббинг с плавающим таймингом: перемещение по таймлайну видео теперь отображает интерактивную плашку точного времени, а контролы не исчезают во время удержания ползунка.',
|
||||
'Сброс яркости: при выходе из полноэкранного режима системный уровень яркости экрана аккуратно восстанавливается.',
|
||||
],
|
||||
),
|
||||
LunarisChange(
|
||||
version: '3.1.8',
|
||||
title: 'Безупречный полноэкранный плеер: устранение остановки при развертывании и отзывчивые кнопки управления',
|
||||
|
||||
+14
-4
@@ -1,3 +1,5 @@
|
||||
import 'dart:io';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/widgets.dart';
|
||||
|
||||
class AppBreakpoints {
|
||||
@@ -6,11 +8,19 @@ class AppBreakpoints {
|
||||
}
|
||||
|
||||
class Responsive {
|
||||
static bool isMobile(BuildContext context) =>
|
||||
MediaQuery.sizeOf(context).width < AppBreakpoints.mobile;
|
||||
static bool isMobile(BuildContext context) {
|
||||
if (!kIsWeb && (Platform.isAndroid || Platform.isIOS)) {
|
||||
return MediaQuery.sizeOf(context).shortestSide < 600;
|
||||
}
|
||||
return MediaQuery.sizeOf(context).width < AppBreakpoints.mobile;
|
||||
}
|
||||
|
||||
static bool isDesktop(BuildContext context) =>
|
||||
MediaQuery.sizeOf(context).width >= AppBreakpoints.desktop;
|
||||
static bool isDesktop(BuildContext context) {
|
||||
if (!kIsWeb && (Platform.isAndroid || Platform.isIOS)) {
|
||||
return MediaQuery.sizeOf(context).shortestSide >= 600;
|
||||
}
|
||||
return MediaQuery.sizeOf(context).width >= AppBreakpoints.desktop;
|
||||
}
|
||||
|
||||
static int columnsFor(
|
||||
BuildContext context, {
|
||||
|
||||
@@ -3,6 +3,7 @@ import 'dart:io';
|
||||
|
||||
import 'package:cached_network_image/cached_network_image.dart';
|
||||
import 'package:dio/dio.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/gestures.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
@@ -142,7 +143,9 @@ class _PostMediaViewerState extends State<PostMediaViewer>
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_disposeVideo();
|
||||
if (!_inFullscreen) {
|
||||
_disposeVideo();
|
||||
}
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@@ -204,6 +207,7 @@ class _PostMediaViewerState extends State<PostMediaViewer>
|
||||
},
|
||||
fullscreen: widget.fullscreen,
|
||||
errorMessage: _videoError,
|
||||
onTapSurface: _toggleControls,
|
||||
onInteract: _showControls,
|
||||
onRetry: _retryVideo,
|
||||
onToggleFit: () {
|
||||
@@ -552,6 +556,16 @@ class _PostMediaViewerState extends State<PostMediaViewer>
|
||||
});
|
||||
}
|
||||
|
||||
void _toggleControls() {
|
||||
if (!mounted) return;
|
||||
if (_controlsVisible) {
|
||||
_hideTimer?.cancel();
|
||||
setState(() => _controlsVisible = false);
|
||||
} else {
|
||||
_showControls();
|
||||
}
|
||||
}
|
||||
|
||||
void _showControls() {
|
||||
if (!mounted) return;
|
||||
setState(() => _controlsVisible = true);
|
||||
@@ -578,6 +592,8 @@ class _PostMediaViewerState extends State<PostMediaViewer>
|
||||
.push<VideoPlaybackSnapshot>(
|
||||
PageRouteBuilder(
|
||||
opaque: true,
|
||||
transitionDuration: Duration.zero,
|
||||
reverseTransitionDuration: Duration.zero,
|
||||
pageBuilder: (_, __, ___) => _FullscreenVideoPage(
|
||||
player: player,
|
||||
controller: controller,
|
||||
@@ -596,13 +612,14 @@ class _PostMediaViewerState extends State<PostMediaViewer>
|
||||
unawaited(_applyPlaybackSnapshot(snapshot));
|
||||
},
|
||||
),
|
||||
transitionsBuilder: (_, animation, __, child) => FadeTransition(
|
||||
opacity: animation,
|
||||
child: child,
|
||||
),
|
||||
),
|
||||
);
|
||||
if (mounted) setState(() => _inFullscreen = false);
|
||||
if (mounted) {
|
||||
setState(() => _inFullscreen = false);
|
||||
} else {
|
||||
player.dispose();
|
||||
return;
|
||||
}
|
||||
if (result != null) {
|
||||
await _applyPlaybackSnapshot(result);
|
||||
if (result.playing && !player.state.playing) {
|
||||
@@ -817,11 +834,28 @@ class _FullscreenVideoPageState extends State<_FullscreenVideoPage> {
|
||||
_showControls();
|
||||
}
|
||||
|
||||
void _toggleControls() {
|
||||
if (!mounted) return;
|
||||
if (_controlsVisible) {
|
||||
_hideTimer?.cancel();
|
||||
setState(() => _controlsVisible = false);
|
||||
} else {
|
||||
_showControls();
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_hideTimer?.cancel();
|
||||
SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
|
||||
SystemChrome.setPreferredOrientations(DeviceOrientation.values);
|
||||
if (!kIsWeb && (Platform.isAndroid || Platform.isIOS)) {
|
||||
SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
|
||||
Future.delayed(const Duration(milliseconds: 300), () {
|
||||
SystemChrome.setPreferredOrientations([]);
|
||||
});
|
||||
} else {
|
||||
SystemChrome.setPreferredOrientations(DeviceOrientation.values);
|
||||
}
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@@ -858,91 +892,59 @@ class _FullscreenVideoPageState extends State<_FullscreenVideoPage> {
|
||||
},
|
||||
child: Focus(
|
||||
autofocus: true,
|
||||
child: Stack(
|
||||
children: [
|
||||
Positioned.fill(
|
||||
child: _VideoSurface(
|
||||
player: widget.player,
|
||||
controller: widget.controller,
|
||||
aspectRatio: widget.aspectRatio,
|
||||
controlsVisible: _controlsVisible,
|
||||
coverVideo: _coverVideo,
|
||||
muted: _muted,
|
||||
loopVideo: _loopVideo,
|
||||
halfVolume: _halfVolume,
|
||||
initialVolume: _currentVolume,
|
||||
onVolumeChanged: (vol) {
|
||||
_currentVolume = vol;
|
||||
widget.onChanged(_snapshot());
|
||||
},
|
||||
fullscreen: true,
|
||||
errorMessage: widget.errorMessage,
|
||||
onInteract: _showControls,
|
||||
onRetry: widget.onRetry,
|
||||
onToggleFit: () {
|
||||
setState(() => _coverVideo = !_coverVideo);
|
||||
widget.onChanged(_snapshot());
|
||||
_showControls();
|
||||
},
|
||||
onToggleMute: () async {
|
||||
setState(() => _muted = !_muted);
|
||||
await _applyVolume();
|
||||
widget.onChanged(_snapshot());
|
||||
_showControls();
|
||||
},
|
||||
onToggleHalfVolume: () async {
|
||||
setState(() {
|
||||
_halfVolume = !_halfVolume;
|
||||
if (_halfVolume) _muted = false;
|
||||
});
|
||||
await _applyVolume();
|
||||
widget.onChanged(_snapshot());
|
||||
_showControls();
|
||||
},
|
||||
onToggleLoop: () async {
|
||||
setState(() => _loopVideo = !_loopVideo);
|
||||
await widget.player.setPlaylistMode(
|
||||
_loopVideo ? PlaylistMode.single : PlaylistMode.none,
|
||||
);
|
||||
widget.onChanged(_snapshot());
|
||||
_showControls();
|
||||
},
|
||||
onFullscreen: () => Navigator.of(
|
||||
context,
|
||||
rootNavigator: true,
|
||||
).pop(_snapshot()),
|
||||
),
|
||||
),
|
||||
Positioned(
|
||||
top: 12,
|
||||
right: 12,
|
||||
child: SafeArea(
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
IconButton.filledTonal(
|
||||
tooltip: _isLandscape
|
||||
? 'Портретная ориентация'
|
||||
: 'Альбомная ориентация',
|
||||
onPressed: _toggleOrientation,
|
||||
icon: Icon(_isLandscape
|
||||
? Icons.screen_lock_portrait_rounded
|
||||
: Icons.screen_lock_landscape_rounded),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
IconButton.filledTonal(
|
||||
tooltip: 'Close fullscreen',
|
||||
onPressed: () => Navigator.of(
|
||||
context,
|
||||
rootNavigator: true,
|
||||
).pop(_snapshot()),
|
||||
icon: const Icon(Icons.close_rounded),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
child: _VideoSurface(
|
||||
player: widget.player,
|
||||
controller: widget.controller,
|
||||
aspectRatio: widget.aspectRatio,
|
||||
controlsVisible: _controlsVisible,
|
||||
coverVideo: _coverVideo,
|
||||
muted: _muted,
|
||||
loopVideo: _loopVideo,
|
||||
halfVolume: _halfVolume,
|
||||
initialVolume: _currentVolume,
|
||||
onVolumeChanged: (vol) {
|
||||
_currentVolume = vol;
|
||||
widget.onChanged(_snapshot());
|
||||
},
|
||||
fullscreen: true,
|
||||
errorMessage: widget.errorMessage,
|
||||
onTapSurface: _toggleControls,
|
||||
onInteract: _showControls,
|
||||
isLandscape: _isLandscape,
|
||||
onToggleOrientation: _toggleOrientation,
|
||||
onRetry: widget.onRetry,
|
||||
onToggleFit: () {
|
||||
setState(() => _coverVideo = !_coverVideo);
|
||||
widget.onChanged(_snapshot());
|
||||
_showControls();
|
||||
},
|
||||
onToggleMute: () async {
|
||||
setState(() => _muted = !_muted);
|
||||
await _applyVolume();
|
||||
widget.onChanged(_snapshot());
|
||||
_showControls();
|
||||
},
|
||||
onToggleHalfVolume: () async {
|
||||
setState(() {
|
||||
_halfVolume = !_halfVolume;
|
||||
if (_halfVolume) _muted = false;
|
||||
});
|
||||
await _applyVolume();
|
||||
widget.onChanged(_snapshot());
|
||||
_showControls();
|
||||
},
|
||||
onToggleLoop: () async {
|
||||
setState(() => _loopVideo = !_loopVideo);
|
||||
await widget.player.setPlaylistMode(
|
||||
_loopVideo ? PlaylistMode.single : PlaylistMode.none,
|
||||
);
|
||||
widget.onChanged(_snapshot());
|
||||
_showControls();
|
||||
},
|
||||
onFullscreen: () => Navigator.of(
|
||||
context,
|
||||
rootNavigator: true,
|
||||
).pop(_snapshot()),
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -1005,6 +1007,7 @@ class _VideoSurface extends StatefulWidget {
|
||||
this.onVolumeChanged,
|
||||
required this.fullscreen,
|
||||
required this.errorMessage,
|
||||
this.onTapSurface,
|
||||
required this.onInteract,
|
||||
required this.onRetry,
|
||||
required this.onToggleFit,
|
||||
@@ -1012,6 +1015,8 @@ class _VideoSurface extends StatefulWidget {
|
||||
required this.onToggleHalfVolume,
|
||||
required this.onToggleLoop,
|
||||
required this.onFullscreen,
|
||||
this.isLandscape,
|
||||
this.onToggleOrientation,
|
||||
});
|
||||
|
||||
final Player player;
|
||||
@@ -1026,6 +1031,7 @@ class _VideoSurface extends StatefulWidget {
|
||||
final ValueChanged<double>? onVolumeChanged;
|
||||
final bool fullscreen;
|
||||
final String? errorMessage;
|
||||
final VoidCallback? onTapSurface;
|
||||
final VoidCallback onInteract;
|
||||
final VoidCallback onRetry;
|
||||
final VoidCallback onToggleFit;
|
||||
@@ -1033,6 +1039,8 @@ class _VideoSurface extends StatefulWidget {
|
||||
final VoidCallback onToggleHalfVolume;
|
||||
final VoidCallback onToggleLoop;
|
||||
final VoidCallback onFullscreen;
|
||||
final bool? isLandscape;
|
||||
final VoidCallback? onToggleOrientation;
|
||||
|
||||
@override
|
||||
State<_VideoSurface> createState() => _VideoSurfaceState();
|
||||
@@ -1052,6 +1060,10 @@ class _VideoSurfaceState extends State<_VideoSurface> {
|
||||
double _currentVolume = 100;
|
||||
Timer? _volumeTimer;
|
||||
|
||||
bool _showBrightnessIndicator = false;
|
||||
double _currentBrightness = 1.0;
|
||||
Timer? _brightnessTimer;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
@@ -1073,6 +1085,7 @@ class _VideoSurfaceState extends State<_VideoSurface> {
|
||||
_seekLeftTimer?.cancel();
|
||||
_seekRightTimer?.cancel();
|
||||
_volumeTimer?.cancel();
|
||||
_brightnessTimer?.cancel();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@@ -1144,6 +1157,19 @@ class _VideoSurfaceState extends State<_VideoSurface> {
|
||||
});
|
||||
}
|
||||
|
||||
void _adjustBrightness(double deltaY) {
|
||||
if (_isLocked) return;
|
||||
final newB = (_currentBrightness - deltaY * 0.004).clamp(0.08, 1.0);
|
||||
setState(() {
|
||||
_currentBrightness = newB;
|
||||
_showBrightnessIndicator = true;
|
||||
});
|
||||
_brightnessTimer?.cancel();
|
||||
_brightnessTimer = Timer(const Duration(milliseconds: 1100), () {
|
||||
if (mounted) setState(() => _showBrightnessIndicator = false);
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final player = widget.player;
|
||||
@@ -1164,11 +1190,21 @@ class _VideoSurfaceState extends State<_VideoSurface> {
|
||||
resumeUponEnteringForegroundMode: false,
|
||||
),
|
||||
),
|
||||
if (_currentBrightness < 0.99)
|
||||
Positioned.fill(
|
||||
child: IgnorePointer(
|
||||
child: ColoredBox(
|
||||
color: Colors.black.withValues(
|
||||
alpha: (1.0 - _currentBrightness).clamp(0.0, 0.92),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
Positioned.fill(
|
||||
child: GestureDetector(
|
||||
behavior: HitTestBehavior.opaque,
|
||||
onTapDown: (details) => lastTapDown = details.localPosition,
|
||||
onTap: widget.onInteract,
|
||||
onTap: widget.onTapSurface ?? widget.onInteract,
|
||||
onDoubleTap: () {
|
||||
if (lastTapDown != null) {
|
||||
_onDoubleTapAt(
|
||||
@@ -1182,7 +1218,9 @@ class _VideoSurfaceState extends State<_VideoSurface> {
|
||||
onVerticalDragUpdate: (details) {
|
||||
final x = details.localPosition.dx;
|
||||
final width = MediaQuery.sizeOf(context).width;
|
||||
if (x > width * 0.4) {
|
||||
if (x < width * 0.45) {
|
||||
_adjustBrightness(details.primaryDelta ?? 0.0);
|
||||
} else if (x > width * 0.55) {
|
||||
_adjustVolume(details.primaryDelta ?? 0.0);
|
||||
}
|
||||
},
|
||||
@@ -1202,6 +1240,8 @@ class _VideoSurfaceState extends State<_VideoSurface> {
|
||||
_DoubleTapSeekRipple(isLeft: false, visible: _showRightSeek),
|
||||
if (_showVolumeIndicator)
|
||||
_VolumeGestureBadge(volume: _currentVolume),
|
||||
if (_showBrightnessIndicator)
|
||||
_BrightnessGestureBadge(brightness: _currentBrightness),
|
||||
if (_isSpeedBoosted)
|
||||
const _SpeedBoostOverlayBadge(),
|
||||
if (widget.errorMessage != null)
|
||||
@@ -1226,6 +1266,8 @@ class _VideoSurfaceState extends State<_VideoSurface> {
|
||||
coverVideo: widget.coverVideo,
|
||||
fullscreen: widget.fullscreen,
|
||||
isLocked: _isLocked,
|
||||
isLandscape: widget.isLandscape,
|
||||
onToggleOrientation: widget.onToggleOrientation,
|
||||
onToggleLock: () => setState(() => _isLocked = !_isLocked),
|
||||
onToggleFit: widget.onToggleFit,
|
||||
onToggleMute: widget.onToggleMute,
|
||||
@@ -1781,6 +1823,68 @@ class _VolumeGestureBadge extends StatelessWidget {
|
||||
}
|
||||
}
|
||||
|
||||
class _BrightnessGestureBadge extends StatelessWidget {
|
||||
const _BrightnessGestureBadge({required this.brightness});
|
||||
|
||||
final double brightness;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final pct = (brightness * 100).round().clamp(0, 100);
|
||||
final icon = pct < 33
|
||||
? Icons.brightness_low_rounded
|
||||
: pct < 66
|
||||
? Icons.brightness_medium_rounded
|
||||
: Icons.brightness_high_rounded;
|
||||
|
||||
return Center(
|
||||
child: Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 18, vertical: 12),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.black.withValues(alpha: 0.8),
|
||||
borderRadius: BorderRadius.circular(22),
|
||||
border: Border.all(color: Colors.white.withValues(alpha: 0.16)),
|
||||
boxShadow: const [
|
||||
BoxShadow(color: Colors.black54, blurRadius: 24),
|
||||
],
|
||||
),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Icon(
|
||||
icon,
|
||||
color: Colors.white,
|
||||
size: 26,
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
SizedBox(
|
||||
width: 96,
|
||||
child: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
child: LinearProgressIndicator(
|
||||
value: brightness.clamp(0.0, 1.0),
|
||||
minHeight: 6,
|
||||
backgroundColor: Colors.white24,
|
||||
valueColor: const AlwaysStoppedAnimation(Colors.white),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 10),
|
||||
Text(
|
||||
'$pct%',
|
||||
style: const TextStyle(
|
||||
color: Colors.white,
|
||||
fontWeight: FontWeight.w800,
|
||||
fontSize: 13,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _DoubleTapSeekRipple extends StatelessWidget {
|
||||
const _DoubleTapSeekRipple({
|
||||
required this.isLeft,
|
||||
@@ -1840,7 +1944,7 @@ class _DoubleTapSeekRipple extends StatelessWidget {
|
||||
}
|
||||
}
|
||||
|
||||
class _VideoControls extends StatelessWidget {
|
||||
class _VideoControls extends StatefulWidget {
|
||||
const _VideoControls({
|
||||
required this.player,
|
||||
required this.muted,
|
||||
@@ -1849,6 +1953,8 @@ class _VideoControls extends StatelessWidget {
|
||||
required this.coverVideo,
|
||||
required this.fullscreen,
|
||||
required this.isLocked,
|
||||
this.isLandscape,
|
||||
this.onToggleOrientation,
|
||||
required this.onToggleLock,
|
||||
required this.onToggleFit,
|
||||
required this.onToggleMute,
|
||||
@@ -1866,6 +1972,8 @@ class _VideoControls extends StatelessWidget {
|
||||
final bool coverVideo;
|
||||
final bool fullscreen;
|
||||
final bool isLocked;
|
||||
final bool? isLandscape;
|
||||
final VoidCallback? onToggleOrientation;
|
||||
final VoidCallback onToggleLock;
|
||||
final VoidCallback onToggleFit;
|
||||
final VoidCallback onToggleMute;
|
||||
@@ -1875,11 +1983,18 @@ class _VideoControls extends StatelessWidget {
|
||||
final void Function(Duration) onSeekBy;
|
||||
final VoidCallback? onInteract;
|
||||
|
||||
@override
|
||||
State<_VideoControls> createState() => _VideoControlsState();
|
||||
}
|
||||
|
||||
class _VideoControlsState extends State<_VideoControls> {
|
||||
double? _scrubValue;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final scheme = Theme.of(context).colorScheme;
|
||||
|
||||
if (isLocked) {
|
||||
if (widget.isLocked) {
|
||||
return Align(
|
||||
alignment: Alignment.topLeft,
|
||||
child: SafeArea(
|
||||
@@ -1891,7 +2006,7 @@ class _VideoControls extends StatelessWidget {
|
||||
size: 44,
|
||||
iconSize: 24,
|
||||
emphasized: true,
|
||||
onPressed: onToggleLock,
|
||||
onPressed: widget.onToggleLock,
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -1899,8 +2014,8 @@ class _VideoControls extends StatelessWidget {
|
||||
}
|
||||
|
||||
return StreamBuilder<double>(
|
||||
stream: player.stream.rate,
|
||||
initialData: player.state.rate,
|
||||
stream: widget.player.stream.rate,
|
||||
initialData: widget.player.state.rate,
|
||||
builder: (context, rateSnapshot) {
|
||||
final currentRate = rateSnapshot.data ?? 1.0;
|
||||
|
||||
@@ -1922,56 +2037,71 @@ class _VideoControls extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
child: SafeArea(
|
||||
top: fullscreen,
|
||||
top: widget.fullscreen,
|
||||
bottom: false,
|
||||
left: fullscreen,
|
||||
right: fullscreen,
|
||||
left: widget.fullscreen,
|
||||
right: widget.fullscreen,
|
||||
child: Row(
|
||||
children: [
|
||||
if (fullscreen) ...[
|
||||
if (widget.fullscreen) ...[
|
||||
_RoundControlButton(
|
||||
tooltip: 'Закрыть',
|
||||
icon: Icons.arrow_back_rounded,
|
||||
onPressed: onFullscreen,
|
||||
onPressed: widget.onFullscreen,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
],
|
||||
if (widget.fullscreen && widget.onToggleOrientation != null) ...[
|
||||
_RoundControlButton(
|
||||
tooltip: (widget.isLandscape ?? false)
|
||||
? 'Портретная ориентация'
|
||||
: 'Альбомная ориентация',
|
||||
icon: (widget.isLandscape ?? false)
|
||||
? Icons.screen_lock_portrait_rounded
|
||||
: Icons.screen_lock_landscape_rounded,
|
||||
onPressed: () {
|
||||
widget.onToggleOrientation?.call();
|
||||
widget.onInteract?.call();
|
||||
},
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
],
|
||||
_RoundControlButton(
|
||||
tooltip: 'Заблокировать экран',
|
||||
icon: Icons.lock_outline_rounded,
|
||||
onPressed: onToggleLock,
|
||||
onPressed: widget.onToggleLock,
|
||||
),
|
||||
const Spacer(),
|
||||
_SpeedBadgeButton(
|
||||
currentRate: currentRate,
|
||||
onSelected: (newRate) => player.setRate(newRate),
|
||||
onSelected: (newRate) => widget.player.setRate(newRate),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
_RoundControlButton(
|
||||
tooltip: loopVideo ? 'Выключить повтор' : 'Повтор видео',
|
||||
selected: loopVideo,
|
||||
icon: loopVideo
|
||||
tooltip: widget.loopVideo ? 'Выключить повтор' : 'Повтор видео',
|
||||
selected: widget.loopVideo,
|
||||
icon: widget.loopVideo
|
||||
? Icons.repeat_one_on_rounded
|
||||
: Icons.repeat_one_rounded,
|
||||
onPressed: onToggleLoop,
|
||||
onPressed: widget.onToggleLoop,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
_RoundControlButton(
|
||||
tooltip: coverVideo ? 'Вписать' : 'Заполнить',
|
||||
selected: coverVideo,
|
||||
icon: coverVideo
|
||||
tooltip: widget.coverVideo ? 'Вписать' : 'Заполнить',
|
||||
selected: widget.coverVideo,
|
||||
icon: widget.coverVideo
|
||||
? Icons.fit_screen_rounded
|
||||
: Icons.crop_free_rounded,
|
||||
onPressed: onToggleFit,
|
||||
onPressed: widget.onToggleFit,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
_RoundControlButton(
|
||||
tooltip: muted ? 'Включить звук' : 'Выключить звук',
|
||||
selected: !muted,
|
||||
icon: muted
|
||||
tooltip: widget.muted ? 'Включить звук' : 'Выключить звук',
|
||||
selected: !widget.muted,
|
||||
icon: widget.muted
|
||||
? Icons.volume_off_rounded
|
||||
: Icons.volume_up_rounded,
|
||||
onPressed: onToggleMute,
|
||||
onPressed: widget.onToggleMute,
|
||||
),
|
||||
],
|
||||
),
|
||||
@@ -1982,8 +2112,8 @@ class _VideoControls extends StatelessWidget {
|
||||
// Center play/pause with quick 10s buttons
|
||||
Center(
|
||||
child: StreamBuilder<bool>(
|
||||
stream: player.stream.playing,
|
||||
initialData: player.state.playing,
|
||||
stream: widget.player.stream.playing,
|
||||
initialData: widget.player.state.playing,
|
||||
builder: (context, playingSnapshot) {
|
||||
final playing = playingSnapshot.data ?? false;
|
||||
return Row(
|
||||
@@ -1995,8 +2125,8 @@ class _VideoControls extends StatelessWidget {
|
||||
size: 46,
|
||||
iconSize: 26,
|
||||
onPressed: () {
|
||||
onSeekBy(const Duration(seconds: -10));
|
||||
onInteract?.call();
|
||||
widget.onSeekBy(const Duration(seconds: -10));
|
||||
widget.onInteract?.call();
|
||||
},
|
||||
),
|
||||
const SizedBox(width: 32),
|
||||
@@ -2010,22 +2140,20 @@ class _VideoControls extends StatelessWidget {
|
||||
emphasized: true,
|
||||
onPressed: () async {
|
||||
try {
|
||||
if (player.state.playing) {
|
||||
await player.pause();
|
||||
if (widget.player.state.playing) {
|
||||
await widget.player.pause();
|
||||
} else {
|
||||
if (player.state.completed) {
|
||||
await player.seek(Duration.zero);
|
||||
if (widget.player.state.completed) {
|
||||
await widget.player.seek(Duration.zero);
|
||||
}
|
||||
await player.play();
|
||||
await widget.player.play();
|
||||
}
|
||||
} catch (_) {
|
||||
if (player.state.playing) {
|
||||
await player.pause();
|
||||
} else {
|
||||
await player.play();
|
||||
}
|
||||
try {
|
||||
await widget.player.playOrPause();
|
||||
} catch (_) {}
|
||||
}
|
||||
onInteract?.call();
|
||||
widget.onInteract?.call();
|
||||
},
|
||||
),
|
||||
const SizedBox(width: 32),
|
||||
@@ -2035,8 +2163,8 @@ class _VideoControls extends StatelessWidget {
|
||||
size: 46,
|
||||
iconSize: 26,
|
||||
onPressed: () {
|
||||
onSeekBy(const Duration(seconds: 10));
|
||||
onInteract?.call();
|
||||
widget.onSeekBy(const Duration(seconds: 10));
|
||||
widget.onInteract?.call();
|
||||
},
|
||||
),
|
||||
],
|
||||
@@ -2055,7 +2183,7 @@ class _VideoControls extends StatelessWidget {
|
||||
14,
|
||||
8,
|
||||
14,
|
||||
fullscreen ? 10 : 4,
|
||||
widget.fullscreen ? 10 : 4,
|
||||
),
|
||||
decoration: const BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
@@ -2066,23 +2194,23 @@ class _VideoControls extends StatelessWidget {
|
||||
),
|
||||
child: SafeArea(
|
||||
top: false,
|
||||
bottom: fullscreen,
|
||||
left: fullscreen,
|
||||
right: fullscreen,
|
||||
bottom: widget.fullscreen,
|
||||
left: widget.fullscreen,
|
||||
right: widget.fullscreen,
|
||||
child: StreamBuilder<Duration>(
|
||||
stream: player.stream.duration,
|
||||
initialData: player.state.duration,
|
||||
stream: widget.player.stream.duration,
|
||||
initialData: widget.player.state.duration,
|
||||
builder: (context, durationSnapshot) {
|
||||
final duration = durationSnapshot.data ?? Duration.zero;
|
||||
return StreamBuilder<Duration>(
|
||||
stream: player.stream.position,
|
||||
initialData: player.state.position,
|
||||
stream: widget.player.stream.position,
|
||||
initialData: widget.player.state.position,
|
||||
builder: (context, positionSnapshot) {
|
||||
final position =
|
||||
positionSnapshot.data ?? Duration.zero;
|
||||
return StreamBuilder<Duration>(
|
||||
stream: player.stream.buffer,
|
||||
initialData: player.state.buffer,
|
||||
stream: widget.player.stream.buffer,
|
||||
initialData: widget.player.state.buffer,
|
||||
builder: (context, bufferSnapshot) {
|
||||
final buffer =
|
||||
bufferSnapshot.data ?? Duration.zero;
|
||||
@@ -2095,99 +2223,153 @@ class _VideoControls extends StatelessWidget {
|
||||
final bufferMs = buffer.inMilliseconds
|
||||
.clamp(0, maxMs.toInt())
|
||||
.toDouble();
|
||||
final displayMs =
|
||||
(_scrubValue ?? valueMs).clamp(0.0, maxMs);
|
||||
|
||||
return Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
return Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Text(
|
||||
_format(position),
|
||||
style: const TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w800,
|
||||
letterSpacing: 0.3,
|
||||
if (_scrubValue != null)
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 10,
|
||||
vertical: 4,
|
||||
),
|
||||
margin: const EdgeInsets.only(bottom: 6),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.black87,
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
border: Border.all(
|
||||
color: scheme.primary,
|
||||
),
|
||||
),
|
||||
child: Text(
|
||||
'${_format(Duration(milliseconds: displayMs.round()))} / ${_format(duration)}',
|
||||
style: TextStyle(
|
||||
color: scheme.primary,
|
||||
fontWeight: FontWeight.bold,
|
||||
fontSize: 12,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
Expanded(
|
||||
child: Stack(
|
||||
alignment: Alignment.center,
|
||||
children: [
|
||||
// Buffer progress track
|
||||
if (maxMs > 0 && bufferMs > 0)
|
||||
Positioned(
|
||||
left: 14,
|
||||
right: 14,
|
||||
child: ClipRRect(
|
||||
borderRadius:
|
||||
BorderRadius.circular(2),
|
||||
child: LinearProgressIndicator(
|
||||
value: (bufferMs / maxMs)
|
||||
.clamp(0.0, 1.0),
|
||||
minHeight: 3.5,
|
||||
backgroundColor:
|
||||
Colors.transparent,
|
||||
valueColor:
|
||||
AlwaysStoppedAnimation(
|
||||
Colors.white
|
||||
.withValues(alpha: 0.28),
|
||||
Row(
|
||||
crossAxisAlignment:
|
||||
CrossAxisAlignment.center,
|
||||
children: [
|
||||
Text(
|
||||
_format(Duration(
|
||||
milliseconds: displayMs.round())),
|
||||
style: const TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w800,
|
||||
letterSpacing: 0.3,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
Expanded(
|
||||
child: Stack(
|
||||
alignment: Alignment.center,
|
||||
children: [
|
||||
// Buffer progress track
|
||||
if (maxMs > 0 && bufferMs > 0)
|
||||
Positioned(
|
||||
left: 14,
|
||||
right: 14,
|
||||
child: ClipRRect(
|
||||
borderRadius:
|
||||
BorderRadius.circular(2),
|
||||
child:
|
||||
LinearProgressIndicator(
|
||||
value: (bufferMs / maxMs)
|
||||
.clamp(0.0, 1.0),
|
||||
minHeight: 3.5,
|
||||
backgroundColor:
|
||||
Colors.transparent,
|
||||
valueColor:
|
||||
AlwaysStoppedAnimation(
|
||||
Colors.white.withValues(
|
||||
alpha: 0.28),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
SliderTheme(
|
||||
data: SliderTheme.of(context).copyWith(
|
||||
activeTrackColor: scheme.primary,
|
||||
inactiveTrackColor: Colors.white
|
||||
.withValues(alpha: 0.2),
|
||||
trackHeight: 3.5,
|
||||
thumbColor: scheme.primary,
|
||||
overlayColor: scheme.primary
|
||||
.withValues(alpha: 0.22),
|
||||
thumbShape:
|
||||
const RoundSliderThumbShape(
|
||||
enabledThumbRadius: 6,
|
||||
),
|
||||
overlayShape:
|
||||
const RoundSliderOverlayShape(
|
||||
overlayRadius: 14,
|
||||
),
|
||||
),
|
||||
child: Slider(
|
||||
value: valueMs,
|
||||
max: maxMs,
|
||||
onChanged: duration == Duration.zero
|
||||
? null
|
||||
: (value) => player.seek(
|
||||
Duration(
|
||||
milliseconds:
|
||||
value.round(),
|
||||
),
|
||||
SliderTheme(
|
||||
data: SliderTheme.of(context)
|
||||
.copyWith(
|
||||
activeTrackColor:
|
||||
scheme.primary,
|
||||
inactiveTrackColor: Colors.white
|
||||
.withValues(alpha: 0.2),
|
||||
trackHeight: 3.5,
|
||||
thumbColor: scheme.primary,
|
||||
overlayColor: scheme.primary
|
||||
.withValues(alpha: 0.22),
|
||||
thumbShape:
|
||||
const RoundSliderThumbShape(
|
||||
enabledThumbRadius: 6,
|
||||
),
|
||||
overlayShape:
|
||||
const RoundSliderOverlayShape(
|
||||
overlayRadius: 14,
|
||||
),
|
||||
),
|
||||
child: Slider(
|
||||
value: displayMs,
|
||||
max: maxMs,
|
||||
onChangeStart: (value) {
|
||||
setState(() =>
|
||||
_scrubValue = value);
|
||||
widget.onInteract?.call();
|
||||
},
|
||||
onChanged: duration ==
|
||||
Duration.zero
|
||||
? null
|
||||
: (value) {
|
||||
setState(() =>
|
||||
_scrubValue =
|
||||
value);
|
||||
widget.onInteract
|
||||
?.call();
|
||||
},
|
||||
onChangeEnd: (value) {
|
||||
widget.player.seek(
|
||||
Duration(
|
||||
milliseconds:
|
||||
value.round(),
|
||||
),
|
||||
),
|
||||
);
|
||||
setState(
|
||||
() => _scrubValue = null);
|
||||
widget.onInteract?.call();
|
||||
},
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
Text(
|
||||
_format(duration),
|
||||
style: TextStyle(
|
||||
color: Colors.white.withValues(alpha: 0.72),
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w700,
|
||||
letterSpacing: 0.3,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
_RoundControlButton(
|
||||
tooltip: fullscreen
|
||||
? 'Выйти из полноэкранного режима'
|
||||
: 'Полноэкранный режим',
|
||||
icon: fullscreen
|
||||
? Icons.fullscreen_exit_rounded
|
||||
: Icons.fullscreen_rounded,
|
||||
onPressed: onFullscreen,
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
Text(
|
||||
_format(duration),
|
||||
style: TextStyle(
|
||||
color: Colors.white
|
||||
.withValues(alpha: 0.72),
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w700,
|
||||
letterSpacing: 0.3,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
_RoundControlButton(
|
||||
tooltip: widget.fullscreen
|
||||
? 'Выйти из полноэкранного режима'
|
||||
: 'Полноэкранный режим',
|
||||
icon: widget.fullscreen
|
||||
? Icons.fullscreen_exit_rounded
|
||||
: Icons.fullscreen_rounded,
|
||||
onPressed: widget.onFullscreen,
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
);
|
||||
|
||||
+4
-4
@@ -899,18 +899,18 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: screen_brightness_android
|
||||
sha256: "2df5e0488a22a73271a43d92dbcd80643df6910cf69690faacaf9929ae9ade3b"
|
||||
sha256: "2008ad8e9527cc968f7a4de1ec58b476d495b3c612a149dbd6550c4f046da147"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.1.4"
|
||||
version: "2.1.6"
|
||||
screen_brightness_platform_interface:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: screen_brightness_platform_interface
|
||||
sha256: "59d50850d6735d677780fc7359c8e997d0ff6df91c8465161c9e617a7b0a11d8"
|
||||
sha256: "2de60c0ba569b898950029cc1f7e9dd72bda44a22beb5054aac331cb6fce2ff2"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "2.1.1"
|
||||
version: "2.1.2"
|
||||
share_plus:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
|
||||
+1
-2
@@ -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.8+69
|
||||
version: 3.2.0+71
|
||||
|
||||
environment:
|
||||
sdk: ">=3.3.0 <4.0.0"
|
||||
@@ -33,7 +33,6 @@ dependencies:
|
||||
media_kit_libs_android_video: ^1.3.8
|
||||
share_plus: ^10.0.0
|
||||
dynamic_color: ^1.7.0
|
||||
|
||||
dev_dependencies:
|
||||
flutter_test:
|
||||
sdk: flutter
|
||||
|
||||
Reference in New Issue
Block a user