mirror of
https://github.com/R0m1k3/xtremobile.git
synced 2026-10-24 15:48:14 +02:00
UI: Clean up player controls (remove duplicate arrows, move LIVE badge)
This commit is contained in:
Michael committed
1 parent
e6281ff912
commit
3888a21990
12 files changed
+1121
-377
No files matched your search
@@ -1,24 +1,29 @@
|
||||
import 'dart:async';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:video_player/video_player.dart';
|
||||
import 'package:chewie/chewie.dart';
|
||||
import 'package:google_fonts/google_fonts.dart';
|
||||
import 'package:media_kit/media_kit.dart';
|
||||
import 'package:media_kit_video/media_kit_video.dart';
|
||||
import 'package:path_provider/path_provider.dart';
|
||||
import '../../../../core/models/playlist_config.dart';
|
||||
import '../../../../core/models/iptv_models.dart';
|
||||
import '../../../../core/theme/app_colors.dart';
|
||||
import '../../../../features/iptv/services/xtream_service_mobile.dart';
|
||||
import 'package:xtremflow/core/models/iptv_models.dart';
|
||||
import 'package:xtremflow/core/models/playlist_config.dart';
|
||||
import 'package:xtremflow/features/iptv/services/xtream_service_mobile.dart';
|
||||
import 'package:xtremflow/mobile/providers/mobile_settings_providers.dart';
|
||||
import 'package:xtremflow/core/theme/app_colors.dart';
|
||||
import 'package:xtremflow/mobile/providers/mobile_xtream_providers.dart';
|
||||
import 'package:xtremflow/features/iptv/models/xtream_models.dart' as xm;
|
||||
|
||||
/// Stream type enum for player
|
||||
enum StreamType { live, vod, series }
|
||||
|
||||
/// Native video player screen for Android/iOS
|
||||
/// Uses video_player + chewie for HLS/MP4 playback
|
||||
/// Uses media_kit (FFmpeg) for full codec support (AC3, EAC3, DTS, etc.)
|
||||
class NativePlayerScreen extends ConsumerStatefulWidget {
|
||||
final String streamId;
|
||||
final String title;
|
||||
final StreamType streamType;
|
||||
final String containerExtension;
|
||||
final String? containerExtension;
|
||||
final PlaylistConfig playlist;
|
||||
final List<Channel>? channels;
|
||||
final int initialIndex;
|
||||
@@ -28,8 +33,8 @@ class NativePlayerScreen extends ConsumerStatefulWidget {
|
||||
required this.streamId,
|
||||
required this.title,
|
||||
required this.playlist,
|
||||
this.streamType = StreamType.live,
|
||||
this.containerExtension = 'mp4',
|
||||
required this.streamType,
|
||||
this.containerExtension,
|
||||
this.channels,
|
||||
this.initialIndex = 0,
|
||||
});
|
||||
@@ -39,18 +44,71 @@ class NativePlayerScreen extends ConsumerStatefulWidget {
|
||||
}
|
||||
|
||||
class _NativePlayerScreenState extends ConsumerState<NativePlayerScreen> {
|
||||
VideoPlayerController? _videoController;
|
||||
ChewieController? _chewieController;
|
||||
late final Player _player;
|
||||
late final VideoController _controller;
|
||||
bool _isLoading = true;
|
||||
String? _errorMessage;
|
||||
late int _currentIndex;
|
||||
XtreamServiceMobile? _xtreamService; // Make nullable to handle async init
|
||||
XtreamServiceMobile? _xtreamService;
|
||||
bool _showControls = true;
|
||||
bool _isPlaying = false;
|
||||
Duration _position = Duration.zero;
|
||||
Duration _duration = Duration.zero;
|
||||
bool _isSeeking = false;
|
||||
|
||||
Timer? _clockTimer;
|
||||
String _currentTime = '';
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
// Only start clock if setting is enabled (will check in build too, but timer can run)
|
||||
_startClock();
|
||||
_currentIndex = widget.initialIndex;
|
||||
|
||||
// Initialize media_kit player with potential software decoding fallback
|
||||
// 'hwdec': 'auto' tries hardware first, then software.
|
||||
// 'vo': 'gpu' is standard.
|
||||
final config = PlayerConfiguration(
|
||||
vo: 'gpu',
|
||||
// msgLevel removed as it might be deprecated or invalid
|
||||
);
|
||||
// Create the player instance
|
||||
_player = Player(configuration: config);
|
||||
|
||||
// Enable software decoding fallback if hardware fails (handled by mpv usually, but ensuring 'auto' helps)
|
||||
(_player.platform as dynamic)?.setProperty('hwdec', 'auto');
|
||||
|
||||
_controller = VideoController(_player);
|
||||
|
||||
// Listen to player state
|
||||
_player.stream.playing.listen((playing) {
|
||||
if (mounted) {
|
||||
setState(() => _isPlaying = playing);
|
||||
}
|
||||
});
|
||||
|
||||
_player.stream.position.listen((position) {
|
||||
if (mounted && !_isSeeking) {
|
||||
setState(() => _position = position);
|
||||
}
|
||||
});
|
||||
|
||||
_player.stream.duration.listen((duration) {
|
||||
if (mounted) {
|
||||
setState(() => _duration = duration);
|
||||
}
|
||||
});
|
||||
|
||||
_player.stream.error.listen((error) {
|
||||
if (mounted && error.isNotEmpty) {
|
||||
setState(() {
|
||||
_errorMessage = error;
|
||||
_isLoading = false;
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
// Lock to landscape for video playback
|
||||
SystemChrome.setPreferredOrientations([
|
||||
DeviceOrientation.landscapeLeft,
|
||||
@@ -62,13 +120,49 @@ class _NativePlayerScreenState extends ConsumerState<NativePlayerScreen> {
|
||||
_initializeServiceAndPlayer();
|
||||
}
|
||||
|
||||
void _startClock() {
|
||||
_updateTime();
|
||||
_clockTimer = Timer.periodic(const Duration(seconds: 1), (_) => _updateTime());
|
||||
}
|
||||
|
||||
void _updateTime() {
|
||||
if (mounted) {
|
||||
final now = DateTime.now();
|
||||
setState(() {
|
||||
_currentTime = "${now.hour.toString().padLeft(2, '0')}:${now.minute.toString().padLeft(2, '0')}";
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_clockTimer?.cancel();
|
||||
_player.dispose();
|
||||
_xtreamService?.dispose();
|
||||
|
||||
// Restore normal orientation
|
||||
SystemChrome.setPreferredOrientations([
|
||||
DeviceOrientation.portraitUp,
|
||||
DeviceOrientation.portraitDown,
|
||||
DeviceOrientation.landscapeLeft,
|
||||
DeviceOrientation.landscapeRight,
|
||||
]);
|
||||
SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
|
||||
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
// Update build method to show clock in top bar
|
||||
// ...
|
||||
|
||||
|
||||
Future<void> _initializeServiceAndPlayer() async {
|
||||
try {
|
||||
final dir = await getApplicationDocumentsDirectory();
|
||||
_xtreamService = XtreamServiceMobile(dir.path);
|
||||
_xtreamService!.setPlaylist(widget.playlist);
|
||||
await _xtreamService!.setPlaylistAsync(widget.playlist);
|
||||
|
||||
await _initializePlayer();
|
||||
await _loadStream();
|
||||
} catch (e) {
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
@@ -79,99 +173,54 @@ class _NativePlayerScreenState extends ConsumerState<NativePlayerScreen> {
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _initializePlayer() async {
|
||||
ShortEPG? _epg;
|
||||
|
||||
// ... (existing initState)
|
||||
|
||||
Future<void> _loadStream() async {
|
||||
try {
|
||||
if (_xtreamService == null) return; // Should not happen if called correctly
|
||||
if (_xtreamService == null) return;
|
||||
|
||||
setState(() {
|
||||
_isLoading = true;
|
||||
_errorMessage = null;
|
||||
_epg = null; // Reset EPG
|
||||
});
|
||||
|
||||
// Dispose previous controllers if switching channels
|
||||
await _disposeControllers();
|
||||
|
||||
// Determine effective Stream ID
|
||||
final currentStreamId = widget.channels != null && widget.channels!.isNotEmpty
|
||||
? widget.channels![_currentIndex].streamId
|
||||
: widget.streamId;
|
||||
|
||||
// Load EPG if Live TV
|
||||
if (widget.streamType == StreamType.live) {
|
||||
_loadEpg(currentStreamId);
|
||||
}
|
||||
|
||||
// ... (rest of _loadStream logic: get url, open player)
|
||||
// Build stream URL based on type
|
||||
String streamUrl;
|
||||
|
||||
if (widget.streamType == StreamType.live) {
|
||||
// Live TV - use HLS format for best mobile compatibility
|
||||
streamUrl = _xtreamService!.getLiveStreamUrl(currentStreamId);
|
||||
} else if (widget.streamType == StreamType.vod) {
|
||||
// Movies
|
||||
streamUrl = _xtreamService!.getVodStreamUrl(currentStreamId, widget.containerExtension);
|
||||
streamUrl = _xtreamService!.getVodStreamUrl(currentStreamId, widget.containerExtension ?? 'mp4');
|
||||
} else {
|
||||
// Series
|
||||
streamUrl = _xtreamService!.getSeriesStreamUrl(currentStreamId, widget.containerExtension);
|
||||
streamUrl = _xtreamService!.getSeriesStreamUrl(currentStreamId, widget.containerExtension ?? 'mp4');
|
||||
}
|
||||
|
||||
debugPrint('NativePlayer: Loading stream: $streamUrl');
|
||||
debugPrint('MediaKitPlayer: Loading stream: $streamUrl');
|
||||
|
||||
// Initialize video controller
|
||||
_videoController = VideoPlayerController.networkUrl(
|
||||
Uri.parse(streamUrl),
|
||||
httpHeaders: {
|
||||
'User-Agent': 'XtremFlow/1.0',
|
||||
},
|
||||
);
|
||||
|
||||
await _videoController!.initialize();
|
||||
|
||||
// Initialize chewie controller with custom options
|
||||
_chewieController = ChewieController(
|
||||
videoPlayerController: _videoController!,
|
||||
autoPlay: true,
|
||||
looping: widget.streamType == StreamType.live, // Loop live streams
|
||||
allowFullScreen: true,
|
||||
allowMuting: true,
|
||||
showControls: true,
|
||||
showControlsOnInitialize: false,
|
||||
hideControlsTimer: const Duration(seconds: 3),
|
||||
materialProgressColors: ChewieProgressColors(
|
||||
playedColor: AppColors.primary,
|
||||
handleColor: AppColors.primary,
|
||||
backgroundColor: Colors.white24,
|
||||
bufferedColor: Colors.white38,
|
||||
),
|
||||
placeholder: Container(
|
||||
color: Colors.black,
|
||||
child: const Center(
|
||||
child: CircularProgressIndicator(color: AppColors.primary),
|
||||
),
|
||||
),
|
||||
errorBuilder: (context, errorMessage) {
|
||||
return Center(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
const Icon(Icons.error_outline, color: Colors.red, size: 48),
|
||||
const SizedBox(height: 16),
|
||||
Text(
|
||||
'Erreur de lecture',
|
||||
style: const TextStyle(color: Colors.white, fontSize: 18),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
errorMessage,
|
||||
style: const TextStyle(color: Colors.white70, fontSize: 14),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
await _player.open(
|
||||
Media(streamUrl, httpHeaders: {'User-Agent': 'XtremFlow/1.0'}),
|
||||
play: true,
|
||||
);
|
||||
|
||||
setState(() {
|
||||
_isLoading = false;
|
||||
});
|
||||
} catch (e) {
|
||||
debugPrint('NativePlayer error: $e');
|
||||
debugPrint('MediaKitPlayer error: $e');
|
||||
setState(() {
|
||||
_isLoading = false;
|
||||
_errorMessage = e.toString();
|
||||
@@ -179,11 +228,15 @@ class _NativePlayerScreenState extends ConsumerState<NativePlayerScreen> {
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _disposeControllers() async {
|
||||
_chewieController?.dispose();
|
||||
_chewieController = null;
|
||||
await _videoController?.dispose();
|
||||
_videoController = null;
|
||||
Future<void> _loadEpg(String streamId) async {
|
||||
try {
|
||||
final epg = await _xtreamService!.getShortEPG(streamId);
|
||||
if (mounted) {
|
||||
setState(() => _epg = epg);
|
||||
}
|
||||
} catch (e) {
|
||||
debugPrint('Error loading EPG: $e');
|
||||
}
|
||||
}
|
||||
|
||||
void _playNext() {
|
||||
@@ -202,26 +255,28 @@ class _NativePlayerScreenState extends ConsumerState<NativePlayerScreen> {
|
||||
setState(() {
|
||||
_currentIndex = index;
|
||||
});
|
||||
_initializeServiceAndPlayer(); // Re-trigger init purely for player part
|
||||
_loadStream();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_disposeControllers();
|
||||
_xtreamService?.dispose();
|
||||
|
||||
// Restore normal orientation
|
||||
SystemChrome.setPreferredOrientations([
|
||||
DeviceOrientation.portraitUp,
|
||||
DeviceOrientation.portraitDown,
|
||||
DeviceOrientation.landscapeLeft,
|
||||
DeviceOrientation.landscapeRight,
|
||||
]);
|
||||
SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
|
||||
|
||||
super.dispose();
|
||||
void _togglePlayPause() {
|
||||
if (_isPlaying) {
|
||||
_player.pause();
|
||||
} else {
|
||||
_player.play();
|
||||
}
|
||||
}
|
||||
|
||||
void _toggleControls() {
|
||||
setState(() {
|
||||
_showControls = !_showControls;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final title = widget.channels != null && widget.channels!.isNotEmpty
|
||||
@@ -230,92 +285,298 @@ class _NativePlayerScreenState extends ConsumerState<NativePlayerScreen> {
|
||||
|
||||
return Scaffold(
|
||||
backgroundColor: Colors.black,
|
||||
body: Stack(
|
||||
children: [
|
||||
// Video Player
|
||||
if (_errorMessage != null)
|
||||
_buildErrorView()
|
||||
else if (_isLoading)
|
||||
_buildLoadingView()
|
||||
else if (_chewieController != null)
|
||||
Center(
|
||||
child: Chewie(controller: _chewieController!),
|
||||
)
|
||||
else
|
||||
_buildLoadingView(),
|
||||
body: GestureDetector(
|
||||
onTap: _toggleControls,
|
||||
child: Stack(
|
||||
children: [
|
||||
// Video Player
|
||||
if (_errorMessage != null)
|
||||
_buildErrorView()
|
||||
else if (_isLoading)
|
||||
_buildLoadingView()
|
||||
else
|
||||
Center(
|
||||
child: Video(
|
||||
controller: _controller,
|
||||
controls: NoVideoControls, // We use our own custom controls
|
||||
),
|
||||
),
|
||||
|
||||
// Custom top bar for channel switching (live TV only)
|
||||
if (widget.channels != null && widget.channels!.isNotEmpty)
|
||||
Positioned(
|
||||
top: 0,
|
||||
left: 0,
|
||||
right: 0,
|
||||
child: SafeArea(
|
||||
child: Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
|
||||
decoration: BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
begin: Alignment.topCenter,
|
||||
end: Alignment.bottomCenter,
|
||||
colors: [
|
||||
Colors.black.withOpacity(0.7),
|
||||
Colors.transparent,
|
||||
// Custom controls overlay
|
||||
if (_showControls && _errorMessage == null && !_isLoading)
|
||||
_buildControlsOverlay(title),
|
||||
|
||||
// Top bar (always visible when controls are shown)
|
||||
if (_showControls)
|
||||
Positioned(
|
||||
top: 0,
|
||||
left: 0,
|
||||
right: 0,
|
||||
child: SafeArea(
|
||||
child: Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
|
||||
decoration: BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
begin: Alignment.topCenter,
|
||||
end: Alignment.bottomCenter,
|
||||
colors: [
|
||||
Colors.black.withOpacity(0.8),
|
||||
Colors.transparent,
|
||||
],
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
// Main Back Button
|
||||
IconButton(
|
||||
icon: const Icon(Icons.arrow_back, color: Colors.white),
|
||||
onPressed: () => Navigator.pop(context),
|
||||
),
|
||||
Expanded(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Text(
|
||||
title,
|
||||
style: const TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
if (widget.streamType == StreamType.live)
|
||||
Text(
|
||||
_currentTime,
|
||||
style: const TextStyle(
|
||||
color: Colors.white70,
|
||||
fontSize: 12,
|
||||
fontWeight: FontWeight.w500,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
// Removed top-right arrows as requested
|
||||
const SizedBox(width: 48), // Spacer for balance
|
||||
],
|
||||
),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
IconButton(
|
||||
icon: const Icon(Icons.arrow_back, color: Colors.white),
|
||||
onPressed: () => Navigator.pop(context),
|
||||
),
|
||||
Expanded(
|
||||
child: Text(
|
||||
title,
|
||||
style: const TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
),
|
||||
IconButton(
|
||||
icon: const Icon(Icons.skip_previous, color: Colors.white),
|
||||
onPressed: _playPrevious,
|
||||
),
|
||||
IconButton(
|
||||
icon: const Icon(Icons.skip_next, color: Colors.white),
|
||||
onPressed: _playNext,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
String _formatDuration(Duration duration) {
|
||||
String twoDigits(int n) => n.toString().padLeft(2, '0');
|
||||
String twoDigitMinutes = twoDigits(duration.inMinutes.remainder(60));
|
||||
String twoDigitSeconds = twoDigits(duration.inSeconds.remainder(60));
|
||||
return "${twoDigits(duration.inHours)}:$twoDigitMinutes:$twoDigitSeconds";
|
||||
}
|
||||
|
||||
Widget _buildControlsOverlay(String title) {
|
||||
final settings = ref.watch(mobileSettingsProvider);
|
||||
return Positioned.fill(
|
||||
child: Container(
|
||||
color: Colors.black.withOpacity(0.4),
|
||||
child: Stack(
|
||||
children: [
|
||||
// Removed Duplicate Back Button (Top Left) - handled by Top Bar now
|
||||
|
||||
// Center Controls
|
||||
Center(
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
// Prev Channel / Replay 10s
|
||||
if (widget.streamType == StreamType.live && widget.channels != null && widget.channels!.isNotEmpty)
|
||||
IconButton(
|
||||
icon: const Icon(Icons.skip_previous, color: Colors.white, size: 48),
|
||||
onPressed: _playPrevious,
|
||||
)
|
||||
else if (widget.streamType != StreamType.live)
|
||||
IconButton(
|
||||
icon: const Icon(Icons.replay_10, color: Colors.white, size: 48),
|
||||
onPressed: () async {
|
||||
final pos = await _player.stream.position.first;
|
||||
_player.seek(pos - const Duration(seconds: 10));
|
||||
},
|
||||
),
|
||||
|
||||
const SizedBox(width: 32),
|
||||
|
||||
// Play/Pause
|
||||
IconButton(
|
||||
iconSize: 72,
|
||||
icon: Icon(
|
||||
_isPlaying ? Icons.pause_circle_filled : Icons.play_circle_filled,
|
||||
color: Colors.white,
|
||||
),
|
||||
onPressed: _togglePlayPause,
|
||||
),
|
||||
|
||||
const SizedBox(width: 32),
|
||||
|
||||
// Next Channel / Forward 10s
|
||||
if (widget.streamType == StreamType.live && widget.channels != null && widget.channels!.isNotEmpty)
|
||||
IconButton(
|
||||
icon: const Icon(Icons.skip_next, color: Colors.white, size: 48),
|
||||
onPressed: _playNext,
|
||||
)
|
||||
else if (widget.streamType != StreamType.live)
|
||||
IconButton(
|
||||
icon: const Icon(Icons.forward_10, color: Colors.white, size: 48),
|
||||
onPressed: () async {
|
||||
final pos = await _player.stream.position.first;
|
||||
_player.seek(pos + const Duration(seconds: 10));
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
// Back button for VOD/Series (no channel switching)
|
||||
if (widget.channels == null || widget.channels!.isEmpty)
|
||||
Positioned(
|
||||
top: 0,
|
||||
left: 0,
|
||||
child: SafeArea(
|
||||
child: IconButton(
|
||||
icon: Container(
|
||||
padding: const EdgeInsets.all(8),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.black45,
|
||||
shape: BoxShape.circle,
|
||||
// EPG Box (Bottom Left) + LIVE Badge
|
||||
if (widget.streamType == StreamType.live && _epg != null && _epg!.nowPlaying != null)
|
||||
Positioned(
|
||||
bottom: 80, // Above progress/bottom bar
|
||||
left: 24,
|
||||
width: 350, // Increased width for badge
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.end,
|
||||
children: [
|
||||
Expanded(
|
||||
child: Container(
|
||||
padding: const EdgeInsets.all(12),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.black.withOpacity(0.7),
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
border: Border.all(color: Colors.white24),
|
||||
),
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Text(
|
||||
_epg!.nowPlaying!,
|
||||
style: const TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.bold),
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
if (_epg!.nextPlaying != null)
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(top: 4),
|
||||
child: Text(
|
||||
"A suivre: ${_epg!.nextPlaying}",
|
||||
style: const TextStyle(color: Colors.white70, fontSize: 14),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
// LIVE Badge inside the box, right side
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
|
||||
margin: const EdgeInsets.only(left: 8),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.red,
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
),
|
||||
child: const Text('LIVE', style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold, fontSize: 12)),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
child: const Icon(Icons.arrow_back, color: Colors.white),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
// Progress Bar / Time (Bottom)
|
||||
Positioned(
|
||||
bottom: 0,
|
||||
left: 0,
|
||||
right: 0,
|
||||
child: Container(
|
||||
padding: const EdgeInsets.fromLTRB(24, 0, 24, 24),
|
||||
decoration: const BoxDecoration(
|
||||
gradient: LinearGradient(
|
||||
colors: [Colors.transparent, Colors.black87],
|
||||
begin: Alignment.topCenter,
|
||||
end: Alignment.bottomCenter,
|
||||
),
|
||||
onPressed: () => Navigator.pop(context),
|
||||
),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
if (widget.streamType != StreamType.live)
|
||||
Row(
|
||||
children: [
|
||||
Text(
|
||||
_formatDuration(_position),
|
||||
style: const TextStyle(color: Colors.white, fontSize: 14),
|
||||
),
|
||||
Expanded(
|
||||
child: Slider(
|
||||
value: _position.inSeconds.toDouble().clamp(0, _duration.inSeconds.toDouble()),
|
||||
min: 0,
|
||||
max: _duration.inSeconds.toDouble(),
|
||||
activeColor: AppColors.primary,
|
||||
inactiveColor: Colors.white24,
|
||||
onChangeStart: (_) => _isSeeking = true,
|
||||
onChangeEnd: (value) async {
|
||||
await _player.seek(Duration(seconds: value.toInt()));
|
||||
_isSeeking = false;
|
||||
},
|
||||
onChanged: (value) {
|
||||
setState(() {
|
||||
_position = Duration(seconds: value.toInt());
|
||||
});
|
||||
},
|
||||
),
|
||||
),
|
||||
Text(
|
||||
_formatDuration(_duration),
|
||||
style: const TextStyle(color: Colors.white, fontSize: 14),
|
||||
),
|
||||
],
|
||||
)
|
||||
else
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 12),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.end,
|
||||
children: [
|
||||
if (widget.streamType == StreamType.live && settings.showClock)
|
||||
// Clock
|
||||
Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
|
||||
margin: const EdgeInsets.only(right: 12),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.black54,
|
||||
borderRadius: BorderRadius.circular(4),
|
||||
),
|
||||
child: Text(_currentTime, style: const TextStyle(color: Colors.white, fontWeight: FontWeight.bold)),
|
||||
),
|
||||
// LIVE Badge removed from here
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -348,10 +609,13 @@ class _NativePlayerScreenState extends ConsumerState<NativePlayerScreen> {
|
||||
style: TextStyle(color: Colors.white, fontSize: 18),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
_errorMessage ?? 'Une erreur inconnue est survenue',
|
||||
style: const TextStyle(color: Colors.white70),
|
||||
textAlign: TextAlign.center,
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 32),
|
||||
child: Text(
|
||||
_errorMessage ?? 'Une erreur inconnue est survenue',
|
||||
style: const TextStyle(color: Colors.white70),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
Row(
|
||||
@@ -362,16 +626,18 @@ class _NativePlayerScreenState extends ConsumerState<NativePlayerScreen> {
|
||||
icon: const Icon(Icons.arrow_back),
|
||||
label: const Text('Retour'),
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: Colors.grey[800],
|
||||
backgroundColor: Colors.white,
|
||||
foregroundColor: Colors.black,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 16),
|
||||
ElevatedButton.icon(
|
||||
onPressed: _initializePlayer,
|
||||
onPressed: _loadStream,
|
||||
icon: const Icon(Icons.refresh),
|
||||
label: const Text('Réessayer'),
|
||||
style: ElevatedButton.styleFrom(
|
||||
backgroundColor: AppColors.primary,
|
||||
foregroundColor: Colors.white,
|
||||
),
|
||||
),
|
||||
],
|
||||
|
||||
Reference in new issue
Block a user