f0ck/fApp
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 51 Wiki Activity

v1.4.4+65
All checks were successful
Flutter Schmutter / build (push) Successful in 3m35s
Details

Browse Source
This commit is contained in:
Flummi
2025-06-22 03:02:18 +02:00
parent 7f0743808a
commit 95f6dcfe2b
13 changed files with 461 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
lib/widgets/video_widget.dart
View File

@ -8,6 +8,7 @@ import 'package:get/get.dart';
import 'package:f0ckapp/models/item.dart';
import 'package:f0ckapp/widgets/video_controls_overlay.dart';
import 'package:f0ckapp/controller/settingscontroller.dart';
import 'package:f0ckapp/controller/mediacontroller.dart';
class VideoWidget extends StatefulWidget {
@ -29,8 +30,9 @@ class VideoWidget extends StatefulWidget {
}
class _VideoWidgetState extends State<VideoWidget> {
final MediaController controller = Get.find<MediaController>();
late CachedVideoPlayerPlusController _controller;
final MediaController mediaController = Get.find<MediaController>();
final SettingsController settingsController = Get.find<SettingsController>();
late CachedVideoPlayerPlusController videoController;
late Worker _muteWorker;
late Worker _timerResetWorker;
late Worker _hideControlsWorker;
@ -41,12 +43,14 @@ class _VideoWidgetState extends State<VideoWidget> {
void initState() {
super.initState();
_initController();
_muteWorker = ever(controller.muted, (bool muted) {
if (_controller.value.isInitialized) {
_controller.setVolume(muted ? 0.0 : 1.0);
_muteWorker = ever(settingsController.muted, (bool muted) {
if (videoController.value.isInitialized) {
videoController.setVolume(muted ? 0.0 : 1.0);
}
});
_timerResetWorker = ever(controller.videoControlsTimerNotifier, (_) {
_timerResetWorker = ever(settingsController.videoControlsTimerNotifier, (
_,
) {
if (widget.isActive && mounted) {
if (!_showControls) {
setState(() => _showControls = true);
@ -54,7 +58,7 @@ class _VideoWidgetState extends State<VideoWidget> {
_startHideControlsTimer();
}
});
_hideControlsWorker = ever(controller.hideControlsNotifier, (_) {
_hideControlsWorker = ever(settingsController.hideControlsNotifier, (_) {
if (mounted && _showControls) {
setState(() => _showControls = false);
_hideControlsTimer?.cancel();
@ -63,20 +67,18 @@ class _VideoWidgetState extends State<VideoWidget> {
}
Future<void> _initController() async {
_controller = CachedVideoPlayerPlusController.networkUrl(
videoController = CachedVideoPlayerPlusController.networkUrl(
Uri.parse(widget.details.mediaUrl),
videoPlayerOptions: VideoPlayerOptions(mixWithOthers: true),
);
await _controller.initialize();
await videoController.initialize();
widget.onInitialized?.call();
if (!mounted) return;
setState(() {});
_controller.addListener(() => setState(() {}));
_controller.setLooping(true);
_controller.setVolume(controller.muted.value ? 0.0 : 1.0);
videoController.setLooping(true);
videoController.setVolume(settingsController.muted.value ? 0.0 : 1.0);
if (widget.isActive) {
_controller.play();
videoController.play();
}
}
@ -85,9 +87,9 @@ class _VideoWidgetState extends State<VideoWidget> {
super.didUpdateWidget(oldWidget);
if (widget.isActive != oldWidget.isActive) {
if (widget.isActive) {
_controller.play();
videoController.play();
} else {
_controller.pause();
videoController.pause();
}
}
}
@ -97,7 +99,7 @@ class _VideoWidgetState extends State<VideoWidget> {
_muteWorker.dispose();
_timerResetWorker.dispose();
_hideControlsWorker.dispose();
_controller.dispose();
videoController.dispose();
_hideControlsTimer?.cancel();
super.dispose();
}
@ -129,7 +131,7 @@ class _VideoWidgetState extends State<VideoWidget> {
@override
Widget build(BuildContext context) {
final bool muted = controller.muted.value;
final bool muted = settingsController.muted.value;
bool isAudio = widget.details.mime.startsWith('audio');
Widget mediaContent;
@ -144,36 +146,43 @@ class _VideoWidgetState extends State<VideoWidget> {
),
);
} else {
mediaContent = _controller.value.isInitialized
? CachedVideoPlayerPlus(_controller)
mediaContent = videoController.value.isInitialized
? CachedVideoPlayerPlus(videoController)
: const Center(child: CircularProgressIndicator());
}
return AspectRatio(
aspectRatio: _controller.value.isInitialized
? _controller.value.aspectRatio
aspectRatio: videoController.value.isInitialized
? videoController.value.aspectRatio
: (isAudio ? 16 / 9 : 9 / 16),
child: Stack(
alignment: Alignment.center,
children: [
GestureDetector(onTap: _onTap, child: mediaContent),
if (_controller.value.isInitialized && _showControls)
Positioned.fill(
child: GestureDetector(
onTap: _onTap,
child: Container(
color: Colors.black.withValues(alpha: 0.5),
child: VideoControlsOverlay(
controller: _controller,
onOverlayTap: () => _onTap(ctrlButton: true),
muted: muted,
onMuteToggle: () {
controller.toggleMuted();
},
AnimatedBuilder(
animation: videoController,
builder: (context, child) {
if (videoController.value.isInitialized && _showControls) {
return Positioned.fill(
child: GestureDetector(
onTap: _onTap,
child: Container(
color: Colors.black.withValues(alpha: 0.5),
child: VideoControlsOverlay(
controller: videoController,
onOverlayTap: () => _onTap(ctrlButton: true),
muted: muted,
onMuteToggle: () {
settingsController.toggleMuted();
},
),
),
),
),
),
),
);
}
return const SizedBox.shrink();
},
),
],
),
);