From 925e8e4748ff411fda91f740222503a67c220c49 Mon Sep 17 00:00:00 2001 From: Michael SCHAL Date: Sun, 7 Dec 2025 09:44:27 +0100 Subject: [PATCH 1/2] feat: introduce admin panel with user and playlist management, login screen, and IPTV settings tab --- lib/features/admin/screens/admin_panel.dart | 162 +++++++++++--------- lib/features/auth/screens/login_screen.dart | 42 ++++- lib/features/iptv/widgets/settings_tab.dart | 36 ++--- 3 files changed, 135 insertions(+), 105 deletions(-) diff --git a/lib/features/admin/screens/admin_panel.dart b/lib/features/admin/screens/admin_panel.dart index 20e7b75..651e988 100644 --- a/lib/features/admin/screens/admin_panel.dart +++ b/lib/features/admin/screens/admin_panel.dart @@ -17,29 +17,9 @@ final usersProvider = FutureProvider>((ref) async { return service.getAllUsers(); }); -class AdminPanel extends ConsumerStatefulWidget { +class AdminPanel extends StatelessWidget { const AdminPanel({super.key}); - @override - ConsumerState createState() => _AdminPanelState(); -} - -class _AdminPanelState extends ConsumerState - with SingleTickerProviderStateMixin { - late TabController _tabController; - - @override - void initState() { - super.initState(); - _tabController = TabController(length: 2, vsync: this); - } - - @override - void dispose() { - _tabController.dispose(); - super.dispose(); - } - @override Widget build(BuildContext context) { return Scaffold( @@ -56,64 +36,94 @@ class _AdminPanelState extends ConsumerState stops: [0.0, 1.0], ), ), - child: SafeArea( - child: Column( - children: [ - // Custom Glass Header - Container( - padding: const EdgeInsets.all(24), - child: Row( - children: [ - GlassCard( - borderRadius: 12, - padding: const EdgeInsets.all(8), - showBorder: false, - onTap: () => context.go('/playlists'), - child: const Icon(Icons.arrow_back, color: Colors.white70), - ), - const SizedBox(width: 16), - Text( - 'Administration', - style: Theme.of(context).textTheme.headlineMedium?.copyWith( - color: Colors.white, - fontWeight: FontWeight.bold, - ), - ), - const Spacer(), - // Custom Tab Bar Indicator - Container( - padding: const EdgeInsets.all(4), - decoration: BoxDecoration( - color: AppColors.surface, - borderRadius: BorderRadius.circular(50), - ), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - _buildTabButton(0, 'Playlists', Icons.playlist_play), - const SizedBox(width: 4), - _buildTabButton(1, 'Users', Icons.people), - ], - ), - ), - ], + child: const AdminContent(), + ), + ); + } +} + +class AdminContent extends ConsumerStatefulWidget { + const AdminContent({super.key}); + + @override + ConsumerState createState() => _AdminContentState(); +} + +class _AdminContentState extends ConsumerState + with SingleTickerProviderStateMixin { + late TabController _tabController; + + @override + void initState() { + super.initState(); + _tabController = TabController(length: 2, vsync: this); + } + + @override + void dispose() { + _tabController.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return SafeArea( + child: Column( + children: [ + // Custom Glass Header + Container( + padding: const EdgeInsets.all(24), + child: Row( + children: [ + // Back button only if standalone (optional, keeping for now) + GlassCard( + borderRadius: 12, + padding: const EdgeInsets.all(8), + showBorder: false, + onTap: () => context.go('/playlists'), + child: const Icon(Icons.arrow_back, color: Colors.white70), ), - ), - - // Content - Expanded( - child: TabBarView( - controller: _tabController, - physics: const NeverScrollableScrollPhysics(), // Custom tabs handle ref - children: const [ - _PlaylistsTab(), - _UsersTab(), - ], + const SizedBox(width: 16), + Text( + 'Administration', + style: Theme.of(context).textTheme.headlineMedium?.copyWith( + color: Colors.white, + fontWeight: FontWeight.bold, + ), ), - ), - ], + const Spacer(), + // Custom Tab Bar Indicator + Container( + padding: const EdgeInsets.all(4), + decoration: BoxDecoration( + color: AppColors.surface, + borderRadius: BorderRadius.circular(50), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + _buildTabButton(0, 'Playlists', Icons.playlist_play), + const SizedBox(width: 4), + _buildTabButton(1, 'Users', Icons.people), + ], + ), + ), + ], + ), ), - ), + + // Content + Expanded( + child: TabBarView( + controller: _tabController, + physics: const NeverScrollableScrollPhysics(), // Custom tabs handle ref + children: const [ + _PlaylistsTab(), + _UsersTab(), + ], + ), + ), + ], ), ); } diff --git a/lib/features/auth/screens/login_screen.dart b/lib/features/auth/screens/login_screen.dart index 65e2037..213aeb2 100644 --- a/lib/features/auth/screens/login_screen.dart +++ b/lib/features/auth/screens/login_screen.dart @@ -140,12 +140,25 @@ class _LoginScreenState extends ConsumerState { const SizedBox(height: 32), TextFormField( controller: _usernameController, - style: const TextStyle(color: AppColors.textPrimary), + style: const TextStyle(color: Colors.white), decoration: InputDecoration( labelText: 'Username', - prefixIcon: const Icon(Icons.person_outline), - fillColor: AppColors.surface, - hoverColor: AppColors.surface.withOpacity(0.8), + labelStyle: const TextStyle(color: Colors.white70), + prefixIcon: const Icon(Icons.person_outline, color: Colors.white70), + filled: true, + fillColor: Colors.white.withOpacity(0.05), + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(12), + borderSide: BorderSide(color: Colors.white.withOpacity(0.1)), + ), + enabledBorder: OutlineInputBorder( + borderRadius: BorderRadius.circular(12), + borderSide: BorderSide(color: Colors.white.withOpacity(0.1)), + ), + focusedBorder: OutlineInputBorder( + borderRadius: BorderRadius.circular(12), + borderSide: const BorderSide(color: AppColors.primary), + ), ), validator: (value) { if (value == null || value.trim().isEmpty) { @@ -160,16 +173,31 @@ class _LoginScreenState extends ConsumerState { TextFormField( controller: _passwordController, obscureText: _obscurePassword, - style: const TextStyle(color: AppColors.textPrimary), + style: const TextStyle(color: Colors.white), decoration: InputDecoration( labelText: 'Password', - prefixIcon: const Icon(Icons.lock_outline), - fillColor: AppColors.surface, + labelStyle: const TextStyle(color: Colors.white70), + prefixIcon: const Icon(Icons.lock_outline, color: Colors.white70), + filled: true, + fillColor: Colors.white.withOpacity(0.05), + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(12), + borderSide: BorderSide(color: Colors.white.withOpacity(0.1)), + ), + enabledBorder: OutlineInputBorder( + borderRadius: BorderRadius.circular(12), + borderSide: BorderSide(color: Colors.white.withOpacity(0.1)), + ), + focusedBorder: OutlineInputBorder( + borderRadius: BorderRadius.circular(12), + borderSide: const BorderSide(color: AppColors.primary), + ), suffixIcon: IconButton( icon: Icon( _obscurePassword ? Icons.visibility_outlined : Icons.visibility_off_outlined, + color: Colors.white70, ), onPressed: () { setState(() { diff --git a/lib/features/iptv/widgets/settings_tab.dart b/lib/features/iptv/widgets/settings_tab.dart index 9c0f373..c2d1241 100644 --- a/lib/features/iptv/widgets/settings_tab.dart +++ b/lib/features/iptv/widgets/settings_tab.dart @@ -7,6 +7,7 @@ import '../providers/settings_provider.dart'; import 'streaming_settings_tab.dart'; import '../../../core/providers/theme_provider.dart'; import '../../../core/theme/app_colors.dart'; +import '../../admin/screens/admin_panel.dart'; /// Main Settings tab with sub-tabs for Filters, Streaming, and Appearance class SettingsTab extends ConsumerStatefulWidget { @@ -26,7 +27,8 @@ class _SettingsTabState extends ConsumerState with SingleTickerProv @override void initState() { super.initState(); - _tabController = TabController(length: 3, vsync: this); + final isAdmin = ref.read(authProvider).currentUser?.isAdmin ?? false; + _tabController = TabController(length: isAdmin ? 4 : 3, vsync: this); _liveTvController = TextEditingController(); _moviesController = TextEditingController(); _seriesController = TextEditingController(); @@ -83,10 +85,12 @@ class _SettingsTabState extends ConsumerState with SingleTickerProv unselectedLabelColor: Colors.white54, dividerColor: Colors.transparent, overlayColor: MaterialStateProperty.all(Colors.transparent), - tabs: const [ - Tab(icon: Icon(Icons.filter_list), text: 'Filtres'), - Tab(icon: Icon(Icons.stream), text: 'Streaming'), - Tab(icon: Icon(Icons.palette), text: 'Apparence'), + tabs: [ + const Tab(icon: Icon(Icons.filter_list), text: 'Filtres'), + const Tab(icon: Icon(Icons.stream), text: 'Streaming'), + const Tab(icon: Icon(Icons.palette), text: 'Apparence'), + if (currentUser?.isAdmin ?? false) + const Tab(icon: Icon(Icons.admin_panel_settings), text: 'Administration'), ], ), ), @@ -104,6 +108,10 @@ class _SettingsTabState extends ConsumerState with SingleTickerProv // Appearance Tab _buildAppearanceTab(context), + + // Admin Tab + if (currentUser?.isAdmin ?? false) + const AdminContent(), ], ), ), @@ -389,23 +397,7 @@ class _SettingsTabState extends ConsumerState with SingleTickerProv ), const SizedBox(height: 16), - // Admin panel - if (currentUser?.isAdmin ?? false) ...[ - Container( - decoration: BoxDecoration( - color: Colors.white.withOpacity(0.05), - borderRadius: BorderRadius.circular(16), - border: Border.all(color: Colors.white.withOpacity(0.1)), - ), - child: ListTile( - leading: const Icon(Icons.admin_panel_settings, color: Colors.white), - title: Text('Panneau Admin', style: GoogleFonts.roboto(color: Colors.white)), - trailing: const Icon(Icons.chevron_right, color: Colors.white54), - onTap: () => context.go('/admin'), - ), - ), - const SizedBox(height: 8), - ], + // Change playlist Container( From fb2412e03a6c02abf9b7502a07f2f803a2385dfa Mon Sep 17 00:00:00 2001 From: Michael SCHAL Date: Sun, 7 Dec 2025 09:54:50 +0100 Subject: [PATCH 2/2] feat: introduce IPTV player, GoRouter setup, themed loading screen, and content tabs --- lib/core/router/app_router.dart | 3 +- lib/core/widgets/themed_loading_screen.dart | 29 +++ lib/features/iptv/screens/player_screen.dart | 260 ++++++++++++------- lib/features/iptv/widgets/live_tv_tab.dart | 12 +- lib/features/iptv/widgets/movies_tab.dart | 3 +- lib/features/iptv/widgets/series_tab.dart | 4 +- 6 files changed, 212 insertions(+), 99 deletions(-) create mode 100644 lib/core/widgets/themed_loading_screen.dart diff --git a/lib/core/router/app_router.dart b/lib/core/router/app_router.dart index 5c342a3..76567ef 100644 --- a/lib/core/router/app_router.dart +++ b/lib/core/router/app_router.dart @@ -10,6 +10,7 @@ import '../models/playlist_config.dart'; import '../../mobile/features/auth/screens/mobile_login_screen.dart'; import '../../mobile/features/iptv/screens/mobile_playlist_selection_screen.dart'; import '../../mobile/features/iptv/screens/mobile_dashboard_screen.dart'; +import '../widgets/themed_loading_screen.dart'; final routerProvider = Provider((ref) { final authState = ref.watch(authProvider); @@ -71,7 +72,7 @@ final routerProvider = Provider((ref) { context.go('/playlists'); }); return const Scaffold( - body: Center(child: CircularProgressIndicator()), + body: ThemedLoading(), ); } diff --git a/lib/core/widgets/themed_loading_screen.dart b/lib/core/widgets/themed_loading_screen.dart new file mode 100644 index 0000000..e792467 --- /dev/null +++ b/lib/core/widgets/themed_loading_screen.dart @@ -0,0 +1,29 @@ +import 'package:flutter/material.dart'; +import '../theme/app_colors.dart'; + +class ThemedLoading extends StatelessWidget { + const ThemedLoading({super.key}); + + @override + Widget build(BuildContext context) { + return Container( + decoration: const BoxDecoration( + gradient: RadialGradient( + center: Alignment(0, -0.2), + radius: 1.5, + colors: [ + Color(0xFF2C2C2E), + Color(0xFF000000), + ], + stops: [0.0, 1.0], + ), + ), + child: const Center( + child: CircularProgressIndicator( + color: Colors.white, + strokeWidth: 3, + ), + ), + ); + } +} diff --git a/lib/features/iptv/screens/player_screen.dart b/lib/features/iptv/screens/player_screen.dart index d10e374..90d1d8c 100644 --- a/lib/features/iptv/screens/player_screen.dart +++ b/lib/features/iptv/screens/player_screen.dart @@ -10,6 +10,8 @@ import '../providers/playback_positions_provider.dart'; import '../providers/settings_provider.dart'; import '../widgets/epg_overlay.dart'; import '../../../core/models/playlist_config.dart'; +import '../../../core/models/iptv_models.dart'; +import '../../../core/widgets/themed_loading_screen.dart'; /// Stream type enum for player enum StreamType { live, vod, series } @@ -21,6 +23,8 @@ class PlayerScreen extends ConsumerStatefulWidget { final StreamType streamType; final String containerExtension; final PlaylistConfig playlist; + final List? channels; + final int initialIndex; const PlayerScreen({ super.key, @@ -29,6 +33,8 @@ class PlayerScreen extends ConsumerStatefulWidget { required this.playlist, this.streamType = StreamType.live, this.containerExtension = 'mp4', + this.channels, + this.initialIndex = 0, }); @override @@ -41,18 +47,19 @@ class _PlayerScreenState extends ConsumerState { String? _statusMessage; late String _viewId; late String _contentId; + late int _currentIndex; bool _isInitialized = false; bool _isLoading = true; + bool _showControls = false; + Timer? _controlsTimer; StreamSubscription? _messageSubscription; @override void initState() { super.initState(); + _currentIndex = widget.initialIndex; _viewId = 'iptv-player-${widget.streamId}-${DateTime.now().millisecondsSinceEpoch}'; - // Content ID for resume feature - _contentId = widget.streamType == StreamType.live - ? '' // Live streams don't need resume - : '${widget.streamType.name}_${widget.streamId}'; + _initializePlayer(); _setupMessageListener(); } @@ -84,9 +91,50 @@ class _PlayerScreenState extends ConsumerState { @override void dispose() { _messageSubscription?.cancel(); + _controlsTimer?.cancel(); super.dispose(); } + void _hideControls() { + if (!mounted) return; + setState(() { + _showControls = false; + }); + } + + void _onHover() { + if (!_showControls) { + setState(() { + _showControls = true; + }); + } + _controlsTimer?.cancel(); + _controlsTimer = Timer(const Duration(seconds: 3), _hideControls); + } + + void _playNext() { + if (widget.channels == null || widget.channels!.isEmpty) return; + final nextIndex = (_currentIndex + 1) % widget.channels!.length; + _switchChannel(nextIndex); + } + + void _playPrevious() { + if (widget.channels == null || widget.channels!.isEmpty) return; + final prevIndex = (_currentIndex - 1 + widget.channels!.length) % widget.channels!.length; + _switchChannel(prevIndex); + } + + void _switchChannel(int index) { + setState(() { + _currentIndex = index; + _isLoading = true; + _isInitialized = false; + _errorMessage = null; + }); + // Give UI a moment to clear before re-initializing + Future.microtask(() => _initializePlayer()); + } + Future _initializePlayer() async { try { setState(() { @@ -104,6 +152,16 @@ class _PlayerScreenState extends ConsumerState { final xtreamService = ref.read(xtreamServiceProvider(widget.playlist)); xtreamService.setPlaylist(widget.playlist); + // Determine effective Stream ID (from navigation or initial) + final currentStreamId = widget.channels != null && widget.channels!.isNotEmpty + ? widget.channels![_currentIndex].streamId + : widget.streamId; + + // Set content ID for resume features + _contentId = widget.streamType == StreamType.live + ? '' + : '${widget.streamType.name}_$currentStreamId'; + String hlsUrl; if (widget.streamType == StreamType.live) { @@ -115,7 +173,7 @@ class _PlayerScreenState extends ConsumerState { // Build the FFmpeg endpoint URL with streaming settings final settings = ref.read(iptvSettingsProvider); final baseUrl = html.window.location.origin; - final iptvUrl = '${widget.playlist.dns}/live/${widget.playlist.username}/${widget.playlist.password}/${widget.streamId}.ts'; + final iptvUrl = '${widget.playlist.dns}/live/${widget.playlist.username}/${widget.playlist.password}/$currentStreamId.ts'; final encodedUrl = Uri.encodeComponent(iptvUrl); // Map enum values to string params @@ -137,21 +195,16 @@ class _PlayerScreenState extends ConsumerState { final modeParam = settings.modeString; // direct, transcode, or auto // Construct the stream URL directly using MPEG-TS format - // We add &ext=.ts to force the web player to use mpegts.js which is perfect for low-latency live streams - final streamEndpoint = '$baseUrl/api/stream/${widget.streamId}?url=$encodedUrl&quality=$qualityParam&buffer=$bufferParam&timeout=$timeoutParam&mode=$modeParam&ext=.ts'; + final streamEndpoint = '$baseUrl/api/stream/$currentStreamId?url=$encodedUrl&quality=$qualityParam&buffer=$bufferParam&timeout=$timeoutParam&mode=$modeParam&ext=.ts'; debugPrint('PlayerScreen: Starting Direct Stream: $streamEndpoint'); - - // Use the stream endpoint directly as the video source - // The server now pipelines fMP4 directly to this URL hlsUrl = streamEndpoint; } else { // For VOD and Series - use direct proxy streaming with Range support - // This allows seeking via Range requests final streamUrl = widget.streamType == StreamType.vod - ? xtreamService.getVodStreamUrl(widget.streamId, widget.containerExtension) - : xtreamService.getSeriesStreamUrl(widget.streamId, widget.containerExtension); + ? xtreamService.getVodStreamUrl(currentStreamId, widget.containerExtension) + : xtreamService.getSeriesStreamUrl(currentStreamId, widget.containerExtension); hlsUrl = streamUrl; debugPrint('PlayerScreen: Direct playback URL: $hlsUrl'); } @@ -211,89 +264,112 @@ class _PlayerScreenState extends ConsumerState { @override Widget build(BuildContext context) { return Scaffold( - appBar: AppBar( - title: Text(widget.title), - backgroundColor: Colors.black, + appBar: _showControls ? AppBar( + title: Text(widget.channels != null && widget.channels!.isNotEmpty + ? widget.channels![_currentIndex].name + : widget.title), + backgroundColor: Colors.transparent, foregroundColor: Colors.white, - ), + elevation: 0, + ) : null, + extendBodyBehindAppBar: true, backgroundColor: Colors.black, - body: _errorMessage != null - ? Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const Icon( - Icons.error_outline, - size: 64, - color: Colors.red, - ), - const SizedBox(height: 16), - const Text( - 'Failed to load stream', - style: TextStyle( - color: Colors.white, - fontSize: 18, - fontWeight: FontWeight.bold, + body: MouseRegion( + onHover: (_) => _onHover(), + child: _errorMessage != null + ? Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Icon(Icons.error_outline, size: 64, color: Colors.red), + const SizedBox(height: 16), + const Text('Failed to load stream', style: TextStyle(color: Colors.white, fontSize: 18)), + const SizedBox(height: 8), + Text(_errorMessage!, style: const TextStyle(color: Colors.white70)), + const SizedBox(height: 24), + ElevatedButton( + onPressed: () { + setState(() { + _errorMessage = null; + _isLoading = true; + }); + _initializePlayer(); + }, + child: const Text('Retry'), ), - ), - const SizedBox(height: 8), - Padding( - padding: const EdgeInsets.symmetric(horizontal: 32), - child: Text( - _errorMessage!, - style: const TextStyle(color: Colors.white70), - textAlign: TextAlign.center, - ), - ), - const SizedBox(height: 24), - ElevatedButton( - onPressed: () { - setState(() { - _errorMessage = null; - _isLoading = true; - }); - _initializePlayer(); - }, - child: const Text('Retry'), - ), - ], - ), - ) - : _isLoading - ? Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const CircularProgressIndicator(), - const SizedBox(height: 16), - Text( - _statusMessage ?? 'Loading...', - style: const TextStyle(color: Colors.white70), + ], + ), + ) + : _isLoading + ? const ThemedLoading() + : !_isInitialized + ? const ThemedLoading() + : Stack( + children: [ + // HTML5 video player via iframe + HtmlElementView(viewType: _viewId), + + // Hover Controls Layer + if (_showControls) ...[ + // Previous Channel (Left Zone) + if (widget.channels != null && widget.channels!.isNotEmpty) + Positioned( + left: 0, + top: 0, + bottom: 0, + width: 100, + child: InkWell( + onTap: _playPrevious, + hoverColor: Colors.black12, + child: const Center( + child: Icon(Icons.arrow_back_ios, color: Colors.white, size: 48), + ), + ), + ), + + // Next Channel (Right Zone) + if (widget.channels != null && widget.channels!.isNotEmpty) + Positioned( + right: 0, + top: 0, + bottom: 0, + width: 100, + child: InkWell( + onTap: _playNext, + hoverColor: Colors.black12, + child: const Center( + child: Icon(Icons.arrow_forward_ios, color: Colors.white, size: 48), + ), + ), + ), + + // EPG Overlay + if (widget.streamType == StreamType.live) + Positioned( + bottom: 0, + left: 0, + right: 0, + child: Container( + padding: const EdgeInsets.only(bottom: 20), + decoration: const BoxDecoration( + gradient: LinearGradient( + begin: Alignment.bottomCenter, + end: Alignment.topCenter, + colors: [Colors.black87, Colors.transparent], + ), + ), + child: EpgOverlay( + streamId: widget.channels != null + ? widget.channels![_currentIndex].streamId + : widget.streamId, + playlist: widget.playlist, + ), + ), + ), + ], + ], ), - ], - ), - ) - : !_isInitialized - ? const Center( - child: CircularProgressIndicator(), - ) - : Stack( - children: [ - // HTML5 video player via iframe - HtmlElementView(viewType: _viewId), - // EPG overlay for live streams - if (widget.streamType == StreamType.live) - Positioned( - bottom: 80, - left: 0, - right: 0, - child: EpgOverlay( - streamId: widget.streamId, - playlist: widget.playlist, - ), - ), - ], - ), + ), ); } } diff --git a/lib/features/iptv/widgets/live_tv_tab.dart b/lib/features/iptv/widgets/live_tv_tab.dart index 071b85e..d1b16fd 100644 --- a/lib/features/iptv/widgets/live_tv_tab.dart +++ b/lib/features/iptv/widgets/live_tv_tab.dart @@ -11,6 +11,7 @@ import '../../../core/theme/app_colors.dart'; import '../../../core/theme/app_theme.dart'; import '../../../core/utils/responsive_layout.dart'; import '../../../core/widgets/components/ui_components.dart'; +import '../../../core/widgets/themed_loading_screen.dart'; import 'channel_card.dart'; /// Live TV tab - Apple TV Style with Horizontal Category Filter @@ -69,7 +70,7 @@ class _LiveTVTabState extends ConsumerState return Scaffold( backgroundColor: Colors.transparent, body: channelsAsync.when( - loading: () => const Center(child: CircularProgressIndicator()), + loading: () => const ThemedLoading(), error: (e, s) => Center(child: Text('Error: $e')), data: (groupedChannels) { // Groups @@ -337,7 +338,7 @@ class _LiveTVTabState extends ConsumerState iconUrl: _getProxiedIconUrl(channel.streamIcon), currentProgram: null, playlist: widget.playlist, - onTap: () => _playChannel(channel), + onTap: () => _playChannel(channel, channels), ); }, ); @@ -360,7 +361,7 @@ class _LiveTVTabState extends ConsumerState height: 70, width: double.infinity, playlist: widget.playlist, - onTap: () => _playChannel(channel), + onTap: () => _playChannel(channel, channels), ), ); }, @@ -375,7 +376,8 @@ class _LiveTVTabState extends ConsumerState return originalUrl; } - void _playChannel(Channel channel) { + void _playChannel(Channel channel, List contextList) { + final index = contextList.indexOf(channel); Navigator.of(context).push( MaterialPageRoute( builder: (context) => PlayerScreen( @@ -383,6 +385,8 @@ class _LiveTVTabState extends ConsumerState title: channel.name, playlist: widget.playlist, streamType: StreamType.live, + channels: contextList, + initialIndex: index, ), ), ); diff --git a/lib/features/iptv/widgets/movies_tab.dart b/lib/features/iptv/widgets/movies_tab.dart index 75809e4..6f6713d 100644 --- a/lib/features/iptv/widgets/movies_tab.dart +++ b/lib/features/iptv/widgets/movies_tab.dart @@ -8,6 +8,7 @@ import '../../../core/theme/app_theme.dart'; import '../../../core/utils/responsive_layout.dart'; import '../../../core/widgets/components/hero_carousel.dart'; import '../../../core/widgets/components/ui_components.dart'; +import '../../../core/widgets/themed_loading_screen.dart'; import '../providers/watch_history_provider.dart'; import '../models/xtream_models.dart'; import '../providers/xtream_provider.dart'; @@ -301,7 +302,7 @@ class _MoviesTabState extends ConsumerState { const SliverToBoxAdapter( child: Padding( padding: EdgeInsets.all(24), - child: Center(child: CircularProgressIndicator()), + child: ThemedLoading(), ), ), ], diff --git a/lib/features/iptv/widgets/series_tab.dart b/lib/features/iptv/widgets/series_tab.dart index 6df5729..b24da26 100644 --- a/lib/features/iptv/widgets/series_tab.dart +++ b/lib/features/iptv/widgets/series_tab.dart @@ -8,6 +8,8 @@ import '../../../core/theme/app_theme.dart'; import '../../../core/utils/responsive_layout.dart'; import '../../../core/widgets/components/hero_carousel.dart'; import '../../../core/widgets/components/ui_components.dart'; +import '../../../core/widgets/themed_loading_screen.dart'; + import '../models/xtream_models.dart'; import '../providers/xtream_provider.dart'; import '../providers/settings_provider.dart'; @@ -287,7 +289,7 @@ class _SeriesTabState extends ConsumerState { const SliverToBoxAdapter( child: Padding( padding: EdgeInsets.all(24), - child: Center(child: CircularProgressIndicator()), + child: ThemedLoading(), ), ), ],