Michael/xtremflow
1
0 Fork 0
mirror of https://github.com/R0m1k3/xtremflow.git synced 2026-10-18 12:49:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/R0m1k3/xtremflow

Browse Source
This commit is contained in:
Michael committed 2025-12-16 08:14:25 +01:00
2 parents 1c1198f1c1 1259380ca7
commit 9326572fbc
59 files changed
+3683 -1083
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/core/database/hive_service.dart
+9 -10
View File
@@ -8,7 +8,7 @@ import '../models/playlist_config.dart';
class HiveService {
static const String _usersBoxName = 'users';
static const String _playlistsBoxName = 'playlists';
static bool _initialized = false;
static List<int>? _encryptionKey;
@@ -45,27 +45,27 @@ class HiveService {
// Generate new 256-bit key
_encryptionKey = Hive.generateSecureKey();
return _encryptionKey!;
}
/// Seed default admin user (admin/admin)
static Future<void> _seedDefaultAdmin() async {
final usersBox = Hive.box<AppUser>(_usersBoxName);
if (usersBox.isEmpty) {
final adminId = const Uuid().v4();
final passwordHash = _hashPassword('admin');
final admin = AppUser(
id: adminId,
username: 'admin',
passwordHash: passwordHash,
isAdmin: true,
assignedPlaylistIds: [],
assignedPlaylistIds: const [],
createdAt: DateTime.now(),
);
await usersBox.put(adminId, admin);
}
}
@@ -88,12 +88,12 @@ class HiveService {
final legacyHash = sha256.convert(utf8.encode(password)).toString();
return legacyHash == storedHash;
}
final salt = parts[0];
final expectedHash = parts[1];
final bytes = utf8.encode(password + salt);
final actualHash = sha256.convert(bytes).toString();
return actualHash == expectedHash;
} catch (e) {
return false;
@@ -103,12 +103,11 @@ class HiveService {
/// Public method to hash passwords (used by auth)
static String hashPassword(String password) => _hashPassword(password);
/// Get users box
static Box<AppUser> get usersBox => Hive.box<AppUser>(_usersBoxName);
/// Get playlists box
static Box<PlaylistConfig> get playlistsBox =>
static Box<PlaylistConfig> get playlistsBox =>
Hive.box<PlaylistConfig>(_playlistsBoxName);
/// Close all boxes (cleanup)
lib/core/theme/app_colors.dart
+27 -28
View File
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
/// XtremFlow Apple TV Style Palette
///
///
/// Ultra minimalist, focus-driven palette.
/// - Background: Pure Black (#000000)
/// - Focus/Active: Pure White (#FFFFFF)
@@ -13,20 +13,20 @@ class AppColors {
// ============ BACKGROUNDS ============
/// Pure black for that infinite depth look (OLED friendly)
static const Color background = Color(0xFF000000);
/// Very deep grey for surfaces that need to be distinct but subtle (Apple Dark Grey)
static const Color surface = Color(0xFF1C1C1E);
/// Slightly lighter grey for secondary surfaces or hover states
static const Color surfaceVariant = Color(0xFF3A3A3C);
/// Focused element background (often white in tvOS for text, or bright accent)
static const Color focusColor = Color(0xFFFFFFFF);
// ============ ACCENTS ============
/// Minimal white accent. In Apple TV, color is used sparingly.
/// We keep a subtle blue only for specific indicators if needed.
static const Color primary = Color(0xFFFFFFFF);
static const Color primary = Color(0xFFFFFFFF);
static const Color accent = Color(0xFFE5E5E5);
/// Primary Gradient (Subtle silver/white glow)
@@ -49,7 +49,7 @@ class AppColors {
// ============ BORDERS ============
// Borders are usually hidden until focused
static const Color border = Color(0xFF1F1F1F);
static const Color border = Color(0xFF1F1F1F);
static const Color focusBorder = Color(0xFFFFFFFF);
// ============ GLASSMORPHISM ============
@@ -59,28 +59,27 @@ class AppColors {
// ============ THEME SCHEMES ============
static ColorScheme get darkColorScheme => const ColorScheme.dark(
primary: primary,
secondary: accent,
surface: surface,
background: background,
error: error,
onPrimary: Colors.black, // White text on buttons -> Black text on White buttons
onSecondary: Colors.black,
onSurface: textPrimary,
onError: Colors.white,
brightness: Brightness.dark,
);
primary: primary,
secondary: accent,
surface: surface,
error: error,
onPrimary: Colors
.black, // White text on buttons -> Black text on White buttons
onSecondary: Colors.black,
onSurface: textPrimary,
onError: Colors.white,
brightness: Brightness.dark,
);
static ColorScheme get lightColorScheme => const ColorScheme.light(
primary: Colors.black,
secondary: Colors.grey,
surface: Color(0xFFF2F2F7),
background: Colors.white,
error: error,
onPrimary: Colors.white,
onSecondary: Colors.white,
onSurface: Colors.black,
onError: Colors.white,
brightness: Brightness.light,
);
primary: Colors.black,
secondary: Colors.grey,
surface: Color(0xFFF2F2F7),
error: error,
onPrimary: Colors.white,
onSecondary: Colors.white,
onSurface: Colors.black,
onError: Colors.white,
brightness: Brightness.light,
);
}
lib/core/widgets/glass_container.dart
-1
View File
@@ -1,7 +1,6 @@
import 'dart:ui';
import 'package:flutter/material.dart';
import '../theme/app_colors.dart';
import '../theme/app_theme.dart';
class GlassContainer extends StatelessWidget {
final Widget child;
lib/core/widgets/themed_loading_screen.dart
-1
View File
@@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import '../theme/app_colors.dart';
class ThemedLoading extends StatelessWidget {
const ThemedLoading({super.key});
lib/features/admin/screens/admin_panel.dart
+361 -97
View File
@@ -87,9 +87,9 @@ class _AdminContentState extends ConsumerState<AdminContent>
Text(
'Administration',
style: Theme.of(context).textTheme.headlineMedium?.copyWith(
color: Colors.white,
fontWeight: FontWeight.bold,
),
color: Colors.white,
fontWeight: FontWeight.bold,
),
),
const Spacer(),
// Custom Tab Bar Indicator
@@ -111,12 +111,13 @@ class _AdminContentState extends ConsumerState<AdminContent>
],
),
),
// Content
Expanded(
child: TabBarView(
controller: _tabController,
physics: const NeverScrollableScrollPhysics(), // Custom tabs handle ref
physics:
const NeverScrollableScrollPhysics(), // Custom tabs handle ref
children: const [
_PlaylistsTab(),
_UsersTab(),
@@ -182,7 +183,13 @@ class _PlaylistsTab extends ConsumerWidget {
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text('${playlistsAsync.asData?.value.length ?? 0} Playlists', style: Theme.of(context).textTheme.bodyLarge?.copyWith(color: Colors.white70)),
Text(
'${playlistsAsync.asData?.value.length ?? 0} Playlists',
style: Theme.of(context)
.textTheme
.bodyLarge
?.copyWith(color: Colors.white70),
),
GradientButton(
label: 'Add Playlist',
icon: Icons.add,
@@ -194,16 +201,28 @@ class _PlaylistsTab extends ConsumerWidget {
Expanded(
child: playlistsAsync.when(
loading: () => const Center(child: CircularProgressIndicator()),
error: (error, stack) => Center(child: Text('Error: $error', style: const TextStyle(color: AppColors.error))),
error: (error, stack) => Center(
child: Text(
'Error: $error',
style: const TextStyle(color: AppColors.error),
),
),
data: (playlists) {
if (playlists.isEmpty) {
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(Icons.playlist_remove, size: 64, color: AppColors.textSecondary.withOpacity(0.5)),
Icon(
Icons.playlist_remove,
size: 64,
color: AppColors.textSecondary.withOpacity(0.5),
),
const SizedBox(height: 16),
Text('No playlists configured', style: Theme.of(context).textTheme.titleMedium),
Text(
'No playlists configured',
style: Theme.of(context).textTheme.titleMedium,
),
const SizedBox(height: 8),
TextButton(
onPressed: () => _showPlaylistDialog(context, ref),
@@ -215,7 +234,8 @@ class _PlaylistsTab extends ConsumerWidget {
}
return ListView.separated(
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 8),
padding:
const EdgeInsets.symmetric(horizontal: 24, vertical: 8),
itemCount: playlists.length,
separatorBuilder: (_, __) => const SizedBox(height: 12),
itemBuilder: (context, index) {
@@ -231,16 +251,31 @@ class _PlaylistsTab extends ConsumerWidget {
color: AppColors.surface,
borderRadius: BorderRadius.circular(12),
),
child: const Icon(Icons.playlist_play, color: AppColors.textPrimary),
child: const Icon(
Icons.playlist_play,
color: AppColors.textPrimary,
),
),
const SizedBox(width: 16),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(playlist.name, style: Theme.of(context).textTheme.titleMedium?.copyWith(color: Colors.white)),
Text(
playlist.name,
style: Theme.of(context)
.textTheme
.titleMedium
?.copyWith(color: Colors.white),
),
const SizedBox(height: 4),
Text(playlist.dns, style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: Colors.white60)),
Text(
playlist.dns,
style: Theme.of(context)
.textTheme
.bodyMedium
?.copyWith(color: Colors.white60),
),
],
),
),
@@ -249,13 +284,15 @@ class _PlaylistsTab extends ConsumerWidget {
IconButton(
icon: const Icon(Icons.edit_outlined, size: 20),
color: Colors.white70,
onPressed: () => _showPlaylistDialog(context, ref, playlist),
onPressed: () =>
_showPlaylistDialog(context, ref, playlist),
tooltip: 'Edit',
),
IconButton(
icon: const Icon(Icons.delete_outline, size: 20),
color: AppColors.error,
onPressed: () => _deletePlaylist(context, ref, playlist),
onPressed: () =>
_deletePlaylist(context, ref, playlist),
tooltip: 'Delete',
),
],
@@ -272,7 +309,11 @@ class _PlaylistsTab extends ConsumerWidget {
);
}
void _showPlaylistDialog(BuildContext context, WidgetRef ref, [PlaylistConfig? playlist]) {
void _showPlaylistDialog(
BuildContext context,
WidgetRef ref, [
PlaylistConfig? playlist,
]) {
final nameController = TextEditingController(text: playlist?.name);
final dnsController = TextEditingController(text: playlist?.dns);
final usernameController = TextEditingController(text: playlist?.username);
@@ -284,40 +325,87 @@ class _PlaylistsTab extends ConsumerWidget {
context: context,
builder: (dialogContext) => StatefulBuilder(
builder: (context, setState) => AlertDialog(
title: Text(playlist == null ? 'Ajouter une playlist' : 'Modifier la playlist'),
title: Text(
playlist == null ? 'Ajouter une playlist' : 'Modifier la playlist',
),
content: SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
TextField(controller: nameController, decoration: const InputDecoration(labelText: 'Nom')),
TextField(
controller: nameController,
decoration: const InputDecoration(labelText: 'Nom'),
),
const SizedBox(height: 12),
TextField(controller: dnsController, decoration: const InputDecoration(labelText: 'URL du serveur', hintText: 'http://server.com:8080')),
TextField(
controller: dnsController,
decoration: const InputDecoration(
labelText: 'URL du serveur',
hintText: 'http://server.com:8080',
),
),
const SizedBox(height: 12),
TextField(controller: usernameController, decoration: const InputDecoration(labelText: 'Utilisateur')),
TextField(
controller: usernameController,
decoration: const InputDecoration(labelText: 'Utilisateur'),
),
const SizedBox(height: 12),
TextField(controller: passwordController, decoration: const InputDecoration(labelText: 'Mot de passe'), obscureText: true),
TextField(
controller: passwordController,
decoration: const InputDecoration(labelText: 'Mot de passe'),
obscureText: true,
),
],
),
),
actions: [
TextButton(onPressed: isLoading ? null : () => Navigator.pop(dialogContext), child: const Text('Annuler')),
TextButton(
onPressed: isLoading ? null : () => Navigator.pop(dialogContext),
child: const Text('Annuler'),
),
FilledButton(
onPressed: isLoading ? null : () async {
if (nameController.text.isEmpty || dnsController.text.isEmpty) {
ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Tous les champs sont requis')));
return;
}
setState(() => isLoading = true);
final dns = dnsController.text.trim().replaceAll(RegExp(r'/$'), '');
if (playlist == null) {
await service.createPlaylist(name: nameController.text.trim(), dns: dns, username: usernameController.text.trim(), password: passwordController.text);
} else {
await service.updatePlaylist(id: playlist.id, name: nameController.text.trim(), dns: dns, username: usernameController.text.trim(), password: passwordController.text);
}
if (dialogContext.mounted) Navigator.pop(dialogContext);
ref.invalidate(playlistsProvider);
},
child: isLoading ? const SizedBox(width: 20, height: 20, child: CircularProgressIndicator(strokeWidth: 2)) : const Text('Sauvegarder'),
onPressed: isLoading
? null
: () async {
if (nameController.text.isEmpty ||
dnsController.text.isEmpty) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Tous les champs sont requis'),
),
);
return;
}
setState(() => isLoading = true);
final dns = dnsController.text
.trim()
.replaceAll(RegExp(r'/$'), '');
if (playlist == null) {
await service.createPlaylist(
name: nameController.text.trim(),
dns: dns,
username: usernameController.text.trim(),
password: passwordController.text,
);
} else {
await service.updatePlaylist(
id: playlist.id,
name: nameController.text.trim(),
dns: dns,
username: usernameController.text.trim(),
password: passwordController.text,
);
}
if (dialogContext.mounted) Navigator.pop(dialogContext);
ref.invalidate(playlistsProvider);
},
child: isLoading
? const SizedBox(
width: 20,
height: 20,
child: CircularProgressIndicator(strokeWidth: 2),
)
: const Text('Sauvegarder'),
),
],
),
@@ -325,14 +413,21 @@ class _PlaylistsTab extends ConsumerWidget {
);
}
void _deletePlaylist(BuildContext context, WidgetRef ref, PlaylistConfig playlist) {
void _deletePlaylist(
BuildContext context,
WidgetRef ref,
PlaylistConfig playlist,
) {
showDialog(
context: context,
builder: (dialogContext) => AlertDialog(
title: const Text('Supprimer la playlist'),
content: Text('Supprimer "${playlist.name}" ?'),
actions: [
TextButton(onPressed: () => Navigator.pop(dialogContext), child: const Text('Annuler')),
TextButton(
onPressed: () => Navigator.pop(dialogContext),
child: const Text('Annuler'),
),
FilledButton(
onPressed: () async {
Navigator.pop(dialogContext);
@@ -363,7 +458,13 @@ class _UsersTab extends ConsumerWidget {
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text('${usersAsync.asData?.value.length ?? 0} Users', style: Theme.of(context).textTheme.bodyLarge?.copyWith(color: Colors.white70)),
Text(
'${usersAsync.asData?.value.length ?? 0} Users',
style: Theme.of(context)
.textTheme
.bodyLarge
?.copyWith(color: Colors.white70),
),
GradientButton(
label: 'Create User',
icon: Icons.person_add,
@@ -375,23 +476,36 @@ class _UsersTab extends ConsumerWidget {
Expanded(
child: usersAsync.when(
loading: () => const Center(child: CircularProgressIndicator()),
error: (error, stack) => Center(child: Text('Error: $error', style: const TextStyle(color: AppColors.error))),
error: (error, stack) => Center(
child: Text(
'Error: $error',
style: const TextStyle(color: AppColors.error),
),
),
data: (users) {
if (users.isEmpty) {
return Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(Icons.people_outline, size: 64, color: AppColors.textSecondary.withOpacity(0.5)),
Icon(
Icons.people_outline,
size: 64,
color: AppColors.textSecondary.withOpacity(0.5),
),
const SizedBox(height: 16),
Text('No users found', style: Theme.of(context).textTheme.titleMedium),
Text(
'No users found',
style: Theme.of(context).textTheme.titleMedium,
),
],
),
);
}
return ListView.separated(
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 8),
padding:
const EdgeInsets.symmetric(horizontal: 24, vertical: 8),
itemCount: users.length,
separatorBuilder: (_, __) => const SizedBox(height: 12),
itemBuilder: (context, index) {
@@ -404,12 +518,18 @@ class _UsersTab extends ConsumerWidget {
width: 48,
height: 48,
decoration: BoxDecoration(
color: user.isAdmin ? AppColors.focusColor : AppColors.surface,
color: user.isAdmin
? AppColors.focusColor
: AppColors.surface,
shape: BoxShape.circle,
),
child: Icon(
user.isAdmin ? Icons.admin_panel_settings : Icons.person,
color: user.isAdmin ? Colors.black : AppColors.textPrimary,
user.isAdmin
? Icons.admin_panel_settings
: Icons.person,
color: user.isAdmin
? Colors.black
: AppColors.textPrimary,
size: 24,
),
),
@@ -420,38 +540,95 @@ class _UsersTab extends ConsumerWidget {
children: [
Row(
children: [
Text(user.username, style: Theme.of(context).textTheme.titleMedium?.copyWith(color: Colors.white)),
Text(
user.username,
style: Theme.of(context)
.textTheme
.titleMedium
?.copyWith(color: Colors.white),
),
if (user.isAdmin) ...[
const SizedBox(width: 8),
Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
padding: const EdgeInsets.symmetric(
horizontal: 8,
vertical: 2,
),
decoration: BoxDecoration(
color: AppColors.focusColor.withOpacity(0.2),
color: AppColors.focusColor
.withOpacity(0.2),
borderRadius: BorderRadius.circular(50),
),
child: const Text('ADMIN', style: TextStyle(fontSize: 10, fontWeight: FontWeight.bold, color: AppColors.focusColor)),
child: const Text(
'ADMIN',
style: TextStyle(
fontSize: 10,
fontWeight: FontWeight.bold,
color: AppColors.focusColor,
),
),
),
],
],
),
const SizedBox(height: 4),
Text('ID: ${user.id}', style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: Colors.white60)),
Text(
'ID: ${user.id}',
style: Theme.of(context)
.textTheme
.bodyMedium
?.copyWith(color: Colors.white60),
),
],
),
),
PopupMenuButton<String>(
icon: const Icon(Icons.more_vert, color: Colors.white70),
icon: const Icon(
Icons.more_vert,
color: Colors.white70,
),
color: AppColors.surface,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12),
),
onSelected: (value) {
switch (value) {
case 'password': _showChangePasswordDialog(context, ref, user); break;
case 'delete': _deleteUser(context, ref, user); break;
case 'password':
_showChangePasswordDialog(context, ref, user);
break;
case 'delete':
_deleteUser(context, ref, user);
break;
}
},
itemBuilder: (context) => [
const PopupMenuItem(value: 'password', child: Row(children: [Icon(Icons.lock_reset, size: 18), SizedBox(width: 8), Text('Change Password')])),
const PopupMenuItem(value: 'delete', child: Row(children: [Icon(Icons.delete, color: AppColors.error, size: 18), SizedBox(width: 8), Text('Delete', style: TextStyle(color: AppColors.error))])),
const PopupMenuItem(
value: 'password',
child: Row(
children: [
Icon(Icons.lock_reset, size: 18),
SizedBox(width: 8),
Text('Change Password'),
],
),
),
const PopupMenuItem(
value: 'delete',
child: Row(
children: [
Icon(
Icons.delete,
color: AppColors.error,
size: 18,
),
SizedBox(width: 8),
Text(
'Delete',
style: TextStyle(color: AppColors.error),
),
],
),
),
],
),
],
@@ -480,9 +657,22 @@ class _UsersTab extends ConsumerWidget {
content: Column(
mainAxisSize: MainAxisSize.min,
children: [
TextField(controller: usernameController, decoration: const InputDecoration(labelText: 'Nom d\'utilisateur', prefixIcon: Icon(Icons.person_outline))),
TextField(
controller: usernameController,
decoration: const InputDecoration(
labelText: 'Nom d\'utilisateur',
prefixIcon: Icon(Icons.person_outline),
),
),
const SizedBox(height: 12),
TextField(controller: passwordController, decoration: const InputDecoration(labelText: 'Mot de passe', prefixIcon: Icon(Icons.lock_outline)), obscureText: true),
TextField(
controller: passwordController,
decoration: const InputDecoration(
labelText: 'Mot de passe',
prefixIcon: Icon(Icons.lock_outline),
),
obscureText: true,
),
const SizedBox(height: 16),
SwitchListTile(
title: const Text('Administrateur'),
@@ -493,22 +683,47 @@ class _UsersTab extends ConsumerWidget {
],
),
actions: [
TextButton(onPressed: isLoading ? null : () => Navigator.pop(dialogContext), child: const Text('Annuler')),
TextButton(
onPressed: isLoading ? null : () => Navigator.pop(dialogContext),
child: const Text('Annuler'),
),
FilledButton(
onPressed: isLoading ? null : () async {
if (usernameController.text.isEmpty || passwordController.text.isEmpty) {
ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Tous les champs sont requis')));
return;
}
setState(() => isLoading = true);
final result = await UserApiService().createUser(username: usernameController.text.trim(), password: passwordController.text, isAdmin: isAdmin);
if (dialogContext.mounted) Navigator.pop(dialogContext);
ref.invalidate(usersProvider);
if (!result.success && context.mounted) {
ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(result.error ?? 'Erreur'), backgroundColor: AppColors.error));
}
},
child: isLoading ? const SizedBox(width: 20, height: 20, child: CircularProgressIndicator(strokeWidth: 2)) : const Text('Créer'),
onPressed: isLoading
? null
: () async {
if (usernameController.text.isEmpty ||
passwordController.text.isEmpty) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Tous les champs sont requis'),
),
);
return;
}
setState(() => isLoading = true);
final result = await UserApiService().createUser(
username: usernameController.text.trim(),
password: passwordController.text,
isAdmin: isAdmin,
);
if (dialogContext.mounted) Navigator.pop(dialogContext);
ref.invalidate(usersProvider);
if (!result.success && context.mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(result.error ?? 'Erreur'),
backgroundColor: AppColors.error,
),
);
}
},
child: isLoading
? const SizedBox(
width: 20,
height: 20,
child: CircularProgressIndicator(strokeWidth: 2),
)
: const Text('Créer'),
),
],
),
@@ -516,7 +731,11 @@ class _UsersTab extends ConsumerWidget {
);
}
void _showChangePasswordDialog(BuildContext context, WidgetRef ref, AppUser user) {
void _showChangePasswordDialog(
BuildContext context,
WidgetRef ref,
AppUser user,
) {
final passwordController = TextEditingController();
bool isLoading = false;
@@ -525,25 +744,60 @@ class _UsersTab extends ConsumerWidget {
builder: (dialogContext) => StatefulBuilder(
builder: (context, setState) => AlertDialog(
title: Text('Changer le mot de passe de ${user.username}'),
content: TextField(controller: passwordController, decoration: const InputDecoration(labelText: 'Nouveau mot de passe', prefixIcon: Icon(Icons.lock_outline)), obscureText: true),
content: TextField(
controller: passwordController,
decoration: const InputDecoration(
labelText: 'Nouveau mot de passe',
prefixIcon: Icon(Icons.lock_outline),
),
obscureText: true,
),
actions: [
TextButton(onPressed: isLoading ? null : () => Navigator.pop(dialogContext), child: const Text('Annuler')),
TextButton(
onPressed: isLoading ? null : () => Navigator.pop(dialogContext),
child: const Text('Annuler'),
),
FilledButton(
onPressed: isLoading ? null : () async {
if (passwordController.text.isEmpty) {
ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Mot de passe requis')));
return;
}
setState(() => isLoading = true);
final result = await UserApiService().updatePassword(userId: user.id, newPassword: passwordController.text);
if (dialogContext.mounted) Navigator.pop(dialogContext);
if (result.success && context.mounted) {
ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Mot de passe modifié'), backgroundColor: AppColors.success));
} else if (context.mounted) {
ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(result.error ?? 'Erreur'), backgroundColor: AppColors.error));
}
},
child: isLoading ? const SizedBox(width: 20, height: 20, child: CircularProgressIndicator(strokeWidth: 2)) : const Text('Changer'),
onPressed: isLoading
? null
: () async {
if (passwordController.text.isEmpty) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Mot de passe requis'),
),
);
return;
}
setState(() => isLoading = true);
final result = await UserApiService().updatePassword(
userId: user.id,
newPassword: passwordController.text,
);
if (dialogContext.mounted) Navigator.pop(dialogContext);
if (result.success && context.mounted) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Mot de passe modifié'),
backgroundColor: AppColors.success,
),
);
} else if (context.mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(result.error ?? 'Erreur'),
backgroundColor: AppColors.error,
),
);
}
},
child: isLoading
? const SizedBox(
width: 20,
height: 20,
child: CircularProgressIndicator(strokeWidth: 2),
)
: const Text('Changer'),
),
],
),
@@ -556,16 +810,26 @@ class _UsersTab extends ConsumerWidget {
context: context,
builder: (dialogContext) => AlertDialog(
title: const Text('Supprimer l\'utilisateur'),
content: Text('Supprimer "${user.username}" ? Cette action est irréversible.'),
content: Text(
'Supprimer "${user.username}" ? Cette action est irréversible.',
),
actions: [
TextButton(onPressed: () => Navigator.pop(dialogContext), child: const Text('Annuler')),
TextButton(
onPressed: () => Navigator.pop(dialogContext),
child: const Text('Annuler'),
),
FilledButton(
onPressed: () async {
Navigator.pop(dialogContext);
final result = await UserApiService().deleteUser(user.id);
ref.invalidate(usersProvider);
if (!result.success && context.mounted) {
ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(result.error ?? 'Erreur'), backgroundColor: AppColors.error));
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(result.error ?? 'Erreur'),
backgroundColor: AppColors.error,
),
);
}
},
style: FilledButton.styleFrom(backgroundColor: AppColors.error),
lib/features/auth/screens/login_screen.dart
+9 -6
View File
@@ -4,7 +4,6 @@ import 'package:go_router/go_router.dart';
import 'package:google_fonts/google_fonts.dart';
import '../providers/auth_provider.dart';
import '../../../core/theme/app_colors.dart';
import '../../../core/theme/app_theme.dart';
import '../../../core/widgets/glass_container.dart';
import '../../../core/widgets/tv_focusable_card.dart';
@@ -66,7 +65,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
),
),
),
// 2. Ambient Glows (Apple TV Style)
Positioned(
top: -size.height * 0.2,
@@ -206,7 +205,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
},
),
),
// Error Message
if (authState.errorMessage != null) ...[
const SizedBox(height: 24),
@@ -261,7 +260,10 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
? const SizedBox(
width: 24,
height: 24,
child: CircularProgressIndicator(strokeWidth: 2.5, color: Colors.black),
child: CircularProgressIndicator(
strokeWidth: 2.5,
color: Colors.black,
),
)
: Text(
'Sign In',
@@ -277,7 +279,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
),
),
),
const SizedBox(height: 32),
Text(
'Default: admin / admin',
@@ -332,7 +334,8 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
borderRadius: BorderRadius.circular(12),
borderSide: const BorderSide(color: AppColors.focusColor, width: 2),
),
contentPadding: const EdgeInsets.symmetric(horizontal: 20, vertical: 20),
contentPadding:
const EdgeInsets.symmetric(horizontal: 20, vertical: 20),
),
validator: (value) {
if (value == null || value.trim().isEmpty) {
lib/features/iptv/models/xtream_models.dart
+4 -1
View File
@@ -31,7 +31,7 @@ class LiveChannel {
}
String getStreamUrl(String dns, String username, String password) {
return '$dns/live/$username/$password/$streamId.m3u8';
return '$dns/live/$username/$password/$streamId.ts';
}
}
@@ -43,6 +43,7 @@ class Movie {
final String categoryName;
final String? containerExtension;
final String? rating;
final int? durationSecs;
const Movie({
required this.streamId,
@@ -52,6 +53,7 @@ class Movie {
this.categoryName = '',
this.containerExtension,
this.rating,
this.durationSecs,
});
factory Movie.fromJson(Map<String, dynamic> json) {
@@ -69,6 +71,7 @@ class Movie {
categoryName: json['category_name']?.toString() ?? '',
containerExtension: json['container_extension']?.toString() ?? 'mp4',
rating: json['rating']?.toString(),
durationSecs: int.tryParse(json['duration_secs']?.toString() ?? json['duration']?.toString() ?? '0'),
);
}
lib/features/iptv/screens/dashboard_screen.dart
+1 -1
View File
@@ -31,7 +31,7 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
Icons.live_tv_rounded,
Icons.movie_rounded,
Icons.tv_rounded,
Icons.settings_rounded
Icons.settings_rounded,
];
@override
lib/features/iptv/screens/player_screen.dart
+337 -218
View File
@@ -7,8 +7,6 @@ import 'package:google_fonts/google_fonts.dart';
import 'package:pointer_interceptor/pointer_interceptor.dart';
import '../providers/xtream_provider.dart';
import '../providers/playback_positions_provider.dart';
import '../providers/settings_provider.dart';
import '../widgets/lite_player_view.dart';
// ... (existing imports)
// ... (existing imports)
@@ -17,7 +15,6 @@ import '../../../core/models/iptv_models.dart';
import '../../../core/widgets/tv_focusable_card.dart';
import '../../../core/widgets/glass_container.dart';
import '../../../core/theme/app_colors.dart';
import '../models/xtream_models.dart';
import '../widgets/epg_overlay.dart';
enum StreamType { live, vod, series }
@@ -30,6 +27,7 @@ class PlayerScreen extends ConsumerStatefulWidget {
final String containerExtension;
final List<Channel>? channels;
final double? startTime;
final Duration? duration;
const PlayerScreen({
super.key,
@@ -40,6 +38,7 @@ class PlayerScreen extends ConsumerStatefulWidget {
this.containerExtension = 'mp4',
this.channels,
this.startTime,
this.duration,
});
@override
@@ -56,7 +55,7 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
bool _isInitialized = false;
bool _isLoading = true;
StreamSubscription? _messageSubscription;
String _aspectRatio = 'contain';
final String _aspectRatio = 'contain';
bool _isSeeking = false;
String _viewId = 'iptv-player';
String? _currentStreamUrl;
@@ -68,7 +67,8 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
void initState() {
super.initState();
if (widget.channels != null) {
_currentIndex = widget.channels!.indexWhere((c) => c.streamId == widget.streamId);
_currentIndex =
widget.channels!.indexWhere((c) => c.streamId == widget.streamId);
if (_currentIndex == -1) _currentIndex = 0;
}
// Show controls at start, then auto-hide after timeout
@@ -85,7 +85,10 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
super.dispose();
}
Future<void> _initializePlayer({double? startTimeOverride, bool isChannelSwitch = false}) async {
Future<void> _initializePlayer({
double? startTimeOverride,
bool isChannelSwitch = false,
}) async {
setState(() {
_isLoading = true;
_statusMessage = 'Loading...';
@@ -94,12 +97,12 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
try {
// Determine Stream ID (Initial or Current Index)
final currentStreamId = isChannelSwitch && widget.channels != null
? widget.channels![_currentIndex].streamId
? widget.channels![_currentIndex].streamId
: widget.streamId;
_viewId = 'iptv-player-$currentStreamId-${DateTime.now().millisecondsSinceEpoch}';
_viewId =
'iptv-player-$currentStreamId-${DateTime.now().millisecondsSinceEpoch}';
final service = ref.read(xtreamServiceProvider(widget.playlist));
String streamUrl = '';
@@ -108,32 +111,41 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
if (widget.streamType == StreamType.live) {
streamUrl = service.getLiveStreamUrl(currentStreamId);
} else if (widget.streamType == StreamType.vod) {
streamUrl = service.getVodStreamUrl(currentStreamId, widget.containerExtension);
streamUrl =
service.getVodStreamUrl(currentStreamId, widget.containerExtension);
} else if (widget.streamType == StreamType.series) {
streamUrl = service.getSeriesStreamUrl(currentStreamId, widget.containerExtension);
streamUrl = service.getSeriesStreamUrl(
currentStreamId,
widget.containerExtension,
);
}
// Store URL for Lite Player
_currentStreamUrl = streamUrl;
final encodedUrl = Uri.encodeComponent(streamUrl);
final streamTypeParam = widget.streamType == StreamType.live ? 'live' : 'vod';
final streamTypeParam =
widget.streamType == StreamType.live ? 'live' : 'vod';
// Force player choice based on stream type:
// - Live TV: Player Lite (simple TS playback with mpegts.js)
// - VOD/Series: Player Standard (fuller controls, HLS support)
final isLiveTV = widget.streamType == StreamType.live;
// Cache buster to force reload of updated player.html
final cacheBuster = DateTime.now().millisecondsSinceEpoch;
var playerSrc = isLiveTV
? 'player_lite.html?url=$encodedUrl&type=live&v=$cacheBuster'
var playerSrc = isLiveTV
? 'player_lite.html?url=$encodedUrl&type=live&v=$cacheBuster'
: 'player.html?url=$encodedUrl&type=vod&v=$cacheBuster';
if (startTimeOverride != null) {
playerSrc += '&t=$startTimeOverride';
}
if (widget.duration != null) {
playerSrc += '&duration=${widget.duration!.inSeconds}';
}
// Register View Factory (Only needed for Standard Player, but safe to do always or conditionally)
ui_web.platformViewRegistry.registerViewFactory(_viewId, (int viewId) {
final iframe = html.IFrameElement()
@@ -151,7 +163,7 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
_isInitialized = true;
_isLoading = false;
});
// Force unmute on load (after a short delay to ensure iframe is ready)
Future.delayed(const Duration(milliseconds: 500), () {
if (mounted) {
@@ -179,24 +191,23 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
final currentTime = (data['currentTime'] as num).toDouble();
final rawDuration = (data['duration'] as num).toDouble();
final duration = rawDuration.isFinite ? rawDuration : 0.0;
// Only update position if user is NOT dragging the slider
if (!_isSeeking) {
setState(() {
_currentPosition = currentTime;
_totalDuration = duration > 0 ? duration : 1;
});
}
// Update watch history if relevant
if (currentTime > 0) {
ref.read(playbackPositionsProvider.notifier).savePosition(
widget.streamId,
currentTime,
duration
);
setState(() {
_currentPosition = currentTime;
_totalDuration = duration > 0 ? duration : 1;
});
}
// Update watch history if relevant
if (currentTime > 0) {
ref.read(playbackPositionsProvider.notifier).savePosition(
widget.streamId,
currentTime,
duration,
);
}
} else if (type == 'playback_status') {
setState(() => _isPlaying = data['status'] == 'playing');
} else if (type == 'user_activity') {
@@ -207,7 +218,8 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
void _sendMessage(Map<String, dynamic> message) {
if (_isInitialized) {
final iframe = html.document.getElementById(_viewId) as html.IFrameElement?;
final iframe =
html.document.getElementById(_viewId) as html.IFrameElement?;
iframe?.contentWindow?.postMessage(message, '*');
}
}
@@ -266,7 +278,7 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
_initializePlayer(isChannelSwitch: true);
}
}
String _formatDuration(Duration d) {
String twoDigits(int n) => n.toString().padLeft(2, '0');
final hours = twoDigits(d.inHours);
@@ -300,8 +312,7 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
fit: StackFit.expand,
children: [
// Video Player (iframe with native controls)
if (_isInitialized)
HtmlElementView(viewType: _viewId),
if (_isInitialized) HtmlElementView(viewType: _viewId),
// Top Bar: Back Button + Title (with auto-hide)
AnimatedPositioned(
@@ -320,25 +331,48 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
customBorder: const CircleBorder(),
child: const Padding(
padding: EdgeInsets.all(12),
child: Icon(Icons.arrow_back_rounded, color: Colors.white),
child: Icon(
Icons.arrow_back_rounded,
color: Colors.white,
),
),
),
),
const SizedBox(width: 16),
Expanded(
child: Text(
widget.channels != null
? widget.channels![_currentIndex].name
widget.channels != null
? widget.channels![_currentIndex].name
: widget.title,
style: const TextStyle(
color: Colors.white,
fontSize: 18,
color: Colors.white,
fontSize: 18,
fontWeight: FontWeight.bold,
shadows: [Shadow(blurRadius: 4, color: Colors.black)],
shadows: [
Shadow(blurRadius: 4, color: Colors.black),
],
),
overflow: TextOverflow.ellipsis,
),
),
// Mute button for Live TV
Material(
color: Colors.black54,
shape: const CircleBorder(),
child: InkWell(
onTap: _toggleMute,
customBorder: const CircleBorder(),
child: Padding(
padding: const EdgeInsets.all(12),
child: Icon(
_isMuted
? Icons.volume_off_rounded
: Icons.volume_up_rounded,
color: Colors.white,
),
),
),
),
],
),
),
@@ -363,7 +397,11 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
customBorder: const CircleBorder(),
child: const Padding(
padding: EdgeInsets.all(14),
child: Icon(Icons.keyboard_arrow_up, color: Colors.white, size: 28),
child: Icon(
Icons.keyboard_arrow_up,
color: Colors.white,
size: 28,
),
),
),
),
@@ -377,7 +415,11 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
customBorder: const CircleBorder(),
child: const Padding(
padding: EdgeInsets.all(14),
child: Icon(Icons.keyboard_arrow_down, color: Colors.white, size: 28),
child: Icon(
Icons.keyboard_arrow_down,
color: Colors.white,
size: 28,
),
),
),
),
@@ -396,8 +438,8 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
child: PointerInterceptor(
child: EpgOverlay(
playlist: widget.playlist,
streamId: widget.channels != null
? widget.channels![_currentIndex].streamId
streamId: widget.channels != null
? widget.channels![_currentIndex].streamId
: widget.streamId,
),
),
@@ -416,8 +458,7 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
fit: StackFit.expand,
children: [
// 1. Video Player Layer
if (_isInitialized)
HtmlElementView(viewType: _viewId),
if (_isInitialized) HtmlElementView(viewType: _viewId),
// 2. Interaction Layer
Positioned.fill(
@@ -447,178 +488,256 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
color: Colors.black.withOpacity(0.3), // Dim background
child: Stack(
children: [
// Top Bar (Back + Title)
Positioned(
top: 24,
left: 24,
right: 24,
child: Row(
children: [
TvFocusableCard(
onTap: () => Navigator.pop(context),
borderRadius: 50,
child: Container(
padding: const EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.1),
shape: BoxShape.circle,
),
child: const Icon(Icons.arrow_back_rounded, color: Colors.white),
),
),
const SizedBox(width: 24),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Text(
widget.channels != null
? widget.channels![_currentIndex].name
: widget.title,
style: GoogleFonts.inter(
fontSize: 24,
fontWeight: FontWeight.w700,
color: Colors.white,
),
),
if (widget.streamType == StreamType.live && widget.channels != null)
Text(
'Live TV',
style: GoogleFonts.inter(fontSize: 14, color: AppColors.live, fontWeight: FontWeight.bold)
// Top Bar (Back + Title)
Positioned(
top: 24,
left: 24,
right: 24,
child: Row(
children: [
TvFocusableCard(
onTap: () => Navigator.pop(context),
borderRadius: 50,
child: Container(
padding: const EdgeInsets.all(12),
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.1),
shape: BoxShape.circle,
),
child: const Icon(
Icons.arrow_back_rounded,
color: Colors.white,
),
),
),
const SizedBox(width: 24),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Text(
widget.channels != null
? widget.channels![_currentIndex].name
: widget.title,
style: GoogleFonts.inter(
fontSize: 24,
fontWeight: FontWeight.w700,
color: Colors.white,
),
),
if (widget.streamType == StreamType.live &&
widget.channels != null)
Text(
'Live TV',
style: GoogleFonts.inter(
fontSize: 14,
color: AppColors.live,
fontWeight: FontWeight.bold,
),
],
),
],
),
),
),
],
),
],
),
),
// Center Play/Pause (Animated)
Center(
child: _isLoading
? const CircularProgressIndicator(color: Colors.white)
: TvFocusableCard(
onTap: _togglePlayPause,
borderRadius: 100,
scaleFactor: 1.2,
child: Container(
width: 80,
height: 80,
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.2),
shape: BoxShape.circle,
border: Border.all(color: Colors.white.withOpacity(0.3)),
),
child: Icon(
_isPlaying ? Icons.pause_rounded : Icons.play_arrow_rounded,
color: Colors.white,
size: 48,
),
),
),
),
// Center Play/Pause (Animated)
Center(
child: _isLoading
? const CircularProgressIndicator(
color: Colors.white,
)
: TvFocusableCard(
onTap: _togglePlayPause,
borderRadius: 100,
scaleFactor: 1.2,
child: Container(
width: 80,
height: 80,
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.2),
shape: BoxShape.circle,
border: Border.all(
color: Colors.white.withOpacity(0.3),
),
),
child: Icon(
_isPlaying
? Icons.pause_rounded
: Icons.play_arrow_rounded,
color: Colors.white,
size: 48,
),
),
),
),
// EPG Overlay
if (widget.streamType == StreamType.live)
Positioned(
bottom: 140,
left: 40,
child: EpgOverlay(
streamId: widget.channels != null
? widget.channels![_currentIndex].streamId
: widget.streamId,
playlist: widget.playlist,
),
),
// EPG Overlay
if (widget.streamType == StreamType.live)
Positioned(
bottom: 140,
left: 40,
child: EpgOverlay(
streamId: widget.channels != null
? widget.channels![_currentIndex].streamId
: widget.streamId,
playlist: widget.playlist,
),
),
// Bottom Control Bar
Positioned(
bottom: 40,
left: 40,
right: 40,
child: GlassContainer(
borderRadius: 24,
opacity: 0.8,
padding: const EdgeInsets.all(24),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
// Progress Bar (if not live)
if (widget.streamType != StreamType.live)
Padding(
padding: const EdgeInsets.only(bottom: 16),
child: Row(
children: [
Text(_formatDuration(Duration(seconds: _currentPosition.toInt())), style: const TextStyle(color: Colors.white70)),
const SizedBox(width: 16),
Expanded(
child: SliderTheme(
data: SliderThemeData(
trackHeight: 4,
thumbShape: const RoundSliderThumbShape(enabledThumbRadius: 8),
overlayShape: const RoundSliderOverlayShape(overlayRadius: 16),
activeTrackColor: AppColors.primary,
inactiveTrackColor: Colors.white24,
thumbColor: Colors.white,
),
child: Slider(
value: _currentPosition,
min: 0,
max: _totalDuration,
onChangeStart: (value) {
setState(() => _isSeeking = true);
},
onChanged: (value) {
// Update UI immediately (optimistic update)
setState(() => _currentPosition = value);
},
onChangeEnd: (value) {
_sendMessage({'type': 'seek', 'value': value});
// Small delay to prevent jitter from incoming messages
Future.delayed(const Duration(milliseconds: 500), () {
if (mounted) setState(() => _isSeeking = false);
});
},
),
),
),
const SizedBox(width: 16),
Text(_formatDuration(Duration(seconds: _totalDuration.toInt())), style: const TextStyle(color: Colors.white70)),
],
),
),
// Controls Row
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
// Channel Zapping for Live TV
if (widget.streamType == StreamType.live && widget.channels != null) ...[
_buildTvControl(Icons.navigate_before_rounded, _previousChannel),
const SizedBox(width: 32),
_buildTvControl(Icons.navigate_next_rounded, _nextChannel),
],
// Controls for VOD (Keep Skip buttons, they act as Prev/Next track if playlist or maybe seek)
// The user said: "only for live tv, other buttons skip/prev must allow changing channel"
// This implies for VOD they might want seek? But existing buttons were skip_previous/skip_next.
// We keep them for VOD if channels list is present, or just hide them if not needed.
// For now, I will restore them for VOD as well if channels > 0 (playlist mode)
if (widget.streamType != StreamType.live && widget.channels != null && widget.channels!.isNotEmpty) ...[
_buildTvControl(Icons.skip_previous_rounded, _previousChannel),
const SizedBox(width: 32),
_buildTvControl(Icons.skip_next_rounded, _nextChannel),
],
const Spacer(),
_buildTvControl(Icons.subtitles_rounded, () {}),
const SizedBox(width: 16),
_buildTvControl(Icons.aspect_ratio_rounded, _toggleFullscreen),
],
),
],
),
),
),
// Bottom Control Bar
Positioned(
bottom: 40,
left: 40,
right: 40,
child: GlassContainer(
borderRadius: 24,
opacity: 0.8,
padding: const EdgeInsets.all(24),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
// Progress Bar (if not live)
if (widget.streamType != StreamType.live)
Padding(
padding: const EdgeInsets.only(bottom: 16),
child: Row(
children: [
Text(
_formatDuration(
Duration(
seconds: _currentPosition.toInt(),
),
),
style: const TextStyle(
color: Colors.white70,
),
),
const SizedBox(width: 16),
Expanded(
child: SliderTheme(
data: const SliderThemeData(
trackHeight: 4,
thumbShape: RoundSliderThumbShape(
enabledThumbRadius: 8,
),
overlayShape:
RoundSliderOverlayShape(
overlayRadius: 16,
),
activeTrackColor: AppColors.primary,
inactiveTrackColor: Colors.white24,
thumbColor: Colors.white,
),
child: Slider(
value: _currentPosition,
min: 0,
max: _totalDuration,
onChangeStart: (value) {
setState(() => _isSeeking = true);
},
onChanged: (value) {
// Update UI immediately (optimistic update)
setState(
() => _currentPosition = value,
);
},
onChangeEnd: (value) {
_sendMessage({
'type': 'seek',
'value': value,
});
// Small delay to prevent jitter from incoming messages
Future.delayed(
const Duration(
milliseconds: 500,
), () {
if (mounted) {
setState(
() => _isSeeking = false,
);
}
});
},
),
),
),
const SizedBox(width: 16),
Text(
_formatDuration(
Duration(
seconds: _totalDuration.toInt(),
),
),
style: const TextStyle(
color: Colors.white70,
),
),
],
),
),
// Controls Row
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
// Channel Zapping for Live TV
if (widget.streamType == StreamType.live &&
widget.channels != null) ...[
_buildTvControl(
Icons.navigate_before_rounded,
_previousChannel,
),
const SizedBox(width: 32),
_buildTvControl(
Icons.navigate_next_rounded,
_nextChannel,
),
],
// Controls for VOD (Keep Skip buttons, they act as Prev/Next track if playlist or maybe seek)
// The user said: "only for live tv, other buttons skip/prev must allow changing channel"
// This implies for VOD they might want seek? But existing buttons were skip_previous/skip_next.
// We keep them for VOD if channels list is present, or just hide them if not needed.
// For now, I will restore them for VOD as well if channels > 0 (playlist mode)
if (widget.streamType != StreamType.live &&
widget.channels != null &&
widget.channels!.isNotEmpty) ...[
_buildTvControl(
Icons.skip_previous_rounded,
_previousChannel,
),
const SizedBox(width: 32),
_buildTvControl(
Icons.skip_next_rounded,
_nextChannel,
),
],
const Spacer(),
// Volume/Mute button
_buildTvControl(
_isMuted
? Icons.volume_off_rounded
: Icons.volume_up_rounded,
_toggleMute,
),
const SizedBox(width: 16),
_buildTvControl(
Icons.subtitles_rounded,
() {},
),
const SizedBox(width: 16),
_buildTvControl(
Icons.aspect_ratio_rounded,
_toggleFullscreen,
),
],
),
],
),
),
),
],
),
),
@@ -628,7 +747,7 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
),
);
}
Widget _buildTvControl(IconData icon, VoidCallback onTap) {
return TvFocusableCard(
onTap: onTap,
lib/features/iptv/screens/playlist_selection_screen.dart
+35 -18
View File
@@ -26,14 +26,18 @@ class PlaylistSelectionScreen extends ConsumerWidget {
appBar: AppBar(
title: Text(
'Select Playlist',
style: GoogleFonts.roboto(fontWeight: FontWeight.w600, color: Colors.white),
style: GoogleFonts.roboto(
fontWeight: FontWeight.w600,
color: Colors.white,
),
),
backgroundColor: Colors.transparent,
elevation: 0,
actions: [
if (currentUser?.isAdmin ?? false)
IconButton(
icon: const Icon(Icons.admin_panel_settings, color: Colors.white70),
icon:
const Icon(Icons.admin_panel_settings, color: Colors.white70),
onPressed: () => context.go('/admin'),
tooltip: 'Admin Panel',
),
@@ -69,7 +73,13 @@ class PlaylistSelectionScreen extends ConsumerWidget {
children: [
Icon(Icons.error_outline, size: 64, color: Colors.red.shade400),
const SizedBox(height: 16),
Text('Error loading playlists', style: GoogleFonts.roboto(fontSize: 18, color: Colors.white70)),
Text(
'Error loading playlists',
style: GoogleFonts.roboto(
fontSize: 18,
color: Colors.white70,
),
),
const SizedBox(height: 8),
ElevatedButton(
onPressed: () => ref.refresh(playlistsProvider),
@@ -84,7 +94,7 @@ class PlaylistSelectionScreen extends ConsumerWidget {
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
const Icon(
Icons.playlist_remove,
size: 64,
color: Colors.white24,
@@ -113,7 +123,12 @@ class PlaylistSelectionScreen extends ConsumerWidget {
}
return GridView.builder(
padding: const EdgeInsets.fromLTRB(24, 100, 24, 24), // Top padding for transparent AppBar
padding: const EdgeInsets.fromLTRB(
24,
100,
24,
24,
), // Top padding for transparent AppBar
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 3,
crossAxisSpacing: 24,
@@ -165,23 +180,25 @@ class _PlaylistCardState extends State<_PlaylistCard> {
child: AnimatedContainer(
duration: const Duration(milliseconds: 200),
decoration: BoxDecoration(
color: _isHovered
? Colors.white.withOpacity(0.15)
color: _isHovered
? Colors.white.withOpacity(0.15)
: Colors.white.withOpacity(0.05), // Glass effect
borderRadius: BorderRadius.circular(16),
border: Border.all(
color: _isHovered
? Colors.white.withOpacity(0.5)
color: _isHovered
? Colors.white.withOpacity(0.5)
: Colors.white.withOpacity(0.1),
width: 1.5,
),
boxShadow: _isHovered ? [
BoxShadow(
color: Colors.black.withOpacity(0.3),
blurRadius: 20,
offset: const Offset(0, 10),
),
] : [],
boxShadow: _isHovered
? [
BoxShadow(
color: Colors.black.withOpacity(0.3),
blurRadius: 20,
offset: const Offset(0, 10),
),
]
: [],
),
padding: const EdgeInsets.all(24),
child: Column(
@@ -204,7 +221,8 @@ class _PlaylistCardState extends State<_PlaylistCard> {
const SizedBox(height: 16),
Text(
widget.playlist.name,
style: GoogleFonts.outfit( // Using Outfit for modern look
style: GoogleFonts.outfit(
// Using Outfit for modern look
fontSize: 20,
fontWeight: FontWeight.bold,
color: Colors.white,
@@ -229,4 +247,3 @@ class _PlaylistCardState extends State<_PlaylistCard> {
);
}
}
lib/features/iptv/screens/series_detail_screen.dart
+17 -1
View File
@@ -267,10 +267,25 @@ class _SeriesDetailScreenState extends ConsumerState<SeriesDetailScreen> {
color: Colors.grey.shade800,
margin: const EdgeInsets.only(bottom: 8),
child: InkWell(
onTap: () {
onTap: () async {
// Mark as watched when playing
ref.read(watchHistoryProvider.notifier).markEpisodeWatched(episodeKey);
// Fetch actual duration from API if not available
Duration? episodeDuration;
if (episode.durationSecs != null && episode.durationSecs! > 0) {
episodeDuration = Duration(seconds: episode.durationSecs!);
} else {
// Try to fetch from API using getVodDuration (episodes are often queryable as VODs)
final service = ref.read(xtreamServiceProvider(widget.playlist));
final durationSecs = await service.getVodDuration(episode.id);
if (durationSecs != null && durationSecs > 0) {
episodeDuration = Duration(seconds: durationSecs);
}
}
if (!context.mounted) return;
Navigator.push(
context,
MaterialPageRoute(
@@ -280,6 +295,7 @@ class _SeriesDetailScreenState extends ConsumerState<SeriesDetailScreen> {
playlist: widget.playlist,
streamType: StreamType.series,
containerExtension: episode.containerExtension ?? 'mkv',
duration: episodeDuration,
),
),
);
lib/features/iptv/services/xtream_service.dart
+58 -1
View File
@@ -80,8 +80,9 @@ class XtreamService {
if (_currentPlaylist == null) throw Exception('No playlist configured');
// Pass extension to backend for correct upstream URL construction
// And include type parameter for correct path handling (movie vs series)
final baseUrl = html.window.location.origin;
return '$baseUrl/api/vod/$streamId.$containerExtension/playlist.m3u8';
return '$baseUrl/api/vod/$streamId.$containerExtension/playlist.m3u8?type=series';
}
/// Authenticate and get server info
@@ -501,6 +502,62 @@ class XtreamService {
}
}
/// Get VOD (movie) info including duration
///
/// Returns detailed movie information including duration in seconds
Future<int?> getVodDuration(String vodId) async {
if (_currentPlaylist == null) return null;
try {
final response = await _dio.get(
_wrapWithProxy(_currentPlaylist!.apiBaseUrl),
queryParameters: {
'username': _currentPlaylist!.username,
'password': _currentPlaylist!.password,
'action': 'get_vod_info',
'vod_id': vodId,
},
options: Options(extra: _cacheOptions.toExtra()),
);
final data = response.data as Map<String, dynamic>;
// Try to get duration from movie_properties or info
final movieData = data['movie_data'] as Map<String, dynamic>?;
final info = data['info'] as Map<String, dynamic>?;
// Duration can be in different formats: seconds (int), "HH:MM:SS", or minutes
String? durationStr = movieData?['duration']?.toString() ??
info?['duration']?.toString() ??
info?['duration_secs']?.toString();
if (durationStr == null || durationStr.isEmpty) return null;
// Parse duration - could be "01:30:00" format or seconds
if (durationStr.contains(':')) {
// HH:MM:SS format
final parts = durationStr.split(':');
if (parts.length == 3) {
final hours = int.tryParse(parts[0]) ?? 0;
final minutes = int.tryParse(parts[1]) ?? 0;
final seconds = int.tryParse(parts[2]) ?? 0;
return hours * 3600 + minutes * 60 + seconds;
} else if (parts.length == 2) {
// MM:SS format
final minutes = int.tryParse(parts[0]) ?? 0;
final seconds = int.tryParse(parts[1]) ?? 0;
return minutes * 60 + seconds;
}
}
// Try parsing as seconds directly
return int.tryParse(durationStr);
} catch (e) {
// Duration is optional, don't fail
return null;
}
}
/// Get short EPG for a specific stream
///
/// Returns "Now" and "Next" program info
lib/features/iptv/widgets/category_carousel.dart
+11 -16
View File
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import '../../../core/theme/app_colors.dart';
/// Horizontal carousel for displaying channels by category
///
///
/// Netflix-style horizontal scrolling list with:
/// - Category title with count
/// - Smooth horizontal scrolling
@@ -36,7 +36,7 @@ class CategoryCarousel<T> extends StatelessWidget {
Widget build(BuildContext context) {
final theme = Theme.of(context);
final colorScheme = theme.colorScheme;
if (items.isEmpty) {
return const SizedBox.shrink();
}
@@ -110,15 +110,15 @@ class CategoryCarousel<T> extends StatelessWidget {
],
),
),
const SizedBox(height: 12),
// Horizontal scrolling list with fade edges
SizedBox(
height: itemHeight,
child: ShaderMask(
shaderCallback: (Rect bounds) {
return LinearGradient(
return const LinearGradient(
begin: Alignment.centerLeft,
end: Alignment.centerRight,
colors: [
@@ -127,7 +127,7 @@ class CategoryCarousel<T> extends StatelessWidget {
Colors.white,
Colors.transparent,
],
stops: const [0.0, 0.02, 0.98, 1.0],
stops: [0.0, 0.02, 0.98, 1.0],
).createShader(bounds);
},
blendMode: BlendMode.dstIn,
@@ -173,7 +173,7 @@ class CategoryChipButton extends StatelessWidget {
Widget build(BuildContext context) {
final theme = Theme.of(context);
final colorScheme = theme.colorScheme;
return GestureDetector(
onTap: onTap,
child: AnimatedContainer(
@@ -181,14 +181,10 @@ class CategoryChipButton extends StatelessWidget {
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
decoration: BoxDecoration(
gradient: isSelected ? AppColors.primaryGradient : null,
color: isSelected
? null
: colorScheme.surfaceContainerHighest,
color: isSelected ? null : colorScheme.surfaceContainerHighest,
borderRadius: BorderRadius.circular(20),
border: Border.all(
color: isSelected
? Colors.transparent
: colorScheme.outlineVariant,
color: isSelected ? Colors.transparent : colorScheme.outlineVariant,
),
),
child: Row(
@@ -209,9 +205,8 @@ class CategoryChipButton extends StatelessWidget {
style: TextStyle(
fontSize: 13,
fontWeight: FontWeight.w600,
color: isSelected
? colorScheme.onPrimary
: colorScheme.onSurface,
color:
isSelected ? colorScheme.onPrimary : colorScheme.onSurface,
),
),
],
lib/features/iptv/widgets/epg_overlay.dart
-1
View File
@@ -1,4 +1,3 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../../core/models/playlist_config.dart';
lib/features/iptv/widgets/lite_player_view.dart
+1 -1
View File
@@ -122,7 +122,7 @@ class _LitePlayerViewState extends ConsumerState<LitePlayerView> {
_initializePlayer();
},
child: const Text('Retry'),
)
),
],
),
);
lib/features/iptv/widgets/live_tv_tab.dart
+193 -105
View File
@@ -8,13 +8,10 @@ import '../screens/player_screen.dart';
import '../../../core/models/iptv_models.dart';
import '../../../core/models/playlist_config.dart';
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 '../../../core/widgets/glass_container.dart';
import '../../../core/widgets/tv_focusable_card.dart';
import 'channel_card.dart';
class LiveTVTab extends ConsumerStatefulWidget {
final PlaylistConfig playlist;
@@ -27,9 +24,8 @@ class LiveTVTab extends ConsumerStatefulWidget {
class _LiveTVTabState extends ConsumerState<LiveTVTab>
with AutomaticKeepAliveClientMixin {
String? _selectedCategory;
bool _isGridView = true;
final bool _isGridView = true;
final TextEditingController _searchController = TextEditingController();
bool _showFavoritesOnly = false;
String _searchQuery = '';
@@ -57,7 +53,8 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
Widget build(BuildContext context) {
super.build(context);
final channelsAsync = ref.watch(liveChannelsByPlaylistProvider(widget.playlist));
final channelsAsync =
ref.watch(liveChannelsByPlaylistProvider(widget.playlist));
final favorites = ref.watch(favoritesProvider);
final settings = ref.watch(iptvSettingsProvider);
@@ -65,30 +62,36 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
backgroundColor: Colors.transparent,
body: channelsAsync.when(
loading: () => const ThemedLoading(),
error: (e, s) => Center(child: Text('Error: $e', style: const TextStyle(color: Colors.white))),
error: (e, s) => Center(
child: Text('Error: $e', style: const TextStyle(color: Colors.white)),
),
data: (groupedChannels) {
var categories = groupedChannels.keys.toList();
if (settings.liveTvKeywords.isNotEmpty) {
categories = categories.where((cat) => settings.matchesLiveTvFilter(cat)).toList();
}
categories.sort();
List<Channel> displayedChannels = [];
bool showingCategoryGrid = false;
if (_searchQuery.isNotEmpty) {
displayedChannels = groupedChannels.values.expand((l) => l)
.where((c) => c.name.toLowerCase().contains(_searchQuery))
.toList();
} else if (_showFavoritesOnly) {
displayedChannels = groupedChannels.values.expand((l) => l)
.where((c) => favorites.contains(c.streamId))
.toList();
} else if (_selectedCategory != null) {
displayedChannels = groupedChannels[_selectedCategory] ?? [];
} else {
showingCategoryGrid = true;
}
var categories = groupedChannels.keys.toList();
if (settings.liveTvKeywords.isNotEmpty) {
categories = categories
.where((cat) => settings.matchesLiveTvFilter(cat))
.toList();
}
categories.sort();
List<Channel> displayedChannels = [];
bool showingCategoryGrid = false;
if (_searchQuery.isNotEmpty) {
displayedChannels = groupedChannels.values
.expand((l) => l)
.where((c) => c.name.toLowerCase().contains(_searchQuery))
.toList();
} else if (_showFavoritesOnly) {
displayedChannels = groupedChannels.values
.expand((l) => l)
.where((c) => favorites.contains(c.streamId))
.toList();
} else if (_selectedCategory != null) {
displayedChannels = groupedChannels[_selectedCategory] ?? [];
} else {
showingCategoryGrid = true;
}
return Column(
children: [
@@ -98,16 +101,19 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
child: GlassContainer(
borderRadius: 16,
opacity: 0.6,
padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
padding:
const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
child: Row(
children: [
if (_selectedCategory != null && _searchQuery.isEmpty && !_showFavoritesOnly) ...[
if (_selectedCategory != null &&
_searchQuery.isEmpty &&
!_showFavoritesOnly) ...[
TvFocusableCard(
onTap: () {
setState(() {
_selectedCategory = null;
_mainScrollController.jumpTo(0);
});
setState(() {
_selectedCategory = null;
_mainScrollController.jumpTo(0);
});
},
borderRadius: 50,
child: Container(
@@ -116,7 +122,10 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
color: Colors.white.withOpacity(0.1),
shape: BoxShape.circle,
),
child: const Icon(Icons.arrow_back, color: Colors.white),
child: const Icon(
Icons.arrow_back,
color: Colors.white,
),
),
),
const SizedBox(width: 16),
@@ -124,9 +133,11 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
Expanded(
child: Text(
_searchQuery.isNotEmpty ? 'Search Results' :
_showFavoritesOnly ? 'Favorites' :
_selectedCategory ?? 'Live TV',
_searchQuery.isNotEmpty
? 'Search Results'
: _showFavoritesOnly
? 'Favorites'
: _selectedCategory ?? 'Live TV',
style: GoogleFonts.inter(
fontSize: 24,
fontWeight: FontWeight.w700,
@@ -136,7 +147,7 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
overflow: TextOverflow.ellipsis,
),
),
// Search Bar
Container(
width: 250,
@@ -151,37 +162,55 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
decoration: InputDecoration(
hintText: 'Search channels...',
hintStyle: GoogleFonts.inter(color: Colors.white54),
prefixIcon: const Icon(Icons.search, color: Colors.white54),
prefixIcon:
const Icon(Icons.search, color: Colors.white54),
border: InputBorder.none,
contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
suffixIcon: _searchQuery.isNotEmpty
? IconButton(icon: const Icon(Icons.clear, color: Colors.white), onPressed: _searchController.clear)
: null,
contentPadding: const EdgeInsets.symmetric(
horizontal: 16,
vertical: 10,
),
suffixIcon: _searchQuery.isNotEmpty
? IconButton(
icon: const Icon(
Icons.clear,
color: Colors.white,
),
onPressed: _searchController.clear,
)
: null,
),
),
),
const SizedBox(width: 12),
// Favorites Toggle
TvFocusableCard(
onTap: () {
setState(() {
_showFavoritesOnly = !_showFavoritesOnly;
if (_showFavoritesOnly) _searchController.clear();
_selectedCategory = null;
});
setState(() {
_showFavoritesOnly = !_showFavoritesOnly;
if (_showFavoritesOnly) _searchController.clear();
_selectedCategory = null;
});
},
borderRadius: 12,
child: Container(
padding: const EdgeInsets.all(10),
decoration: BoxDecoration(
color: _showFavoritesOnly ? AppColors.live.withOpacity(0.2) : Colors.white.withOpacity(0.1),
color: _showFavoritesOnly
? AppColors.live.withOpacity(0.2)
: Colors.white.withOpacity(0.1),
borderRadius: BorderRadius.circular(12),
border: _showFavoritesOnly ? Border.all(color: AppColors.live) : null,
border: _showFavoritesOnly
? Border.all(color: AppColors.live)
: null,
),
child: Icon(
_showFavoritesOnly ? Icons.favorite : Icons.favorite_border,
color: _showFavoritesOnly ? AppColors.live : Colors.white,
_showFavoritesOnly
? Icons.favorite
: Icons.favorite_border,
color: _showFavoritesOnly
? AppColors.live
: Colors.white,
),
),
),
@@ -199,11 +228,18 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(Icons.tv_off, size: 64, color: Colors.white.withOpacity(0.3)),
Icon(
Icons.tv_off,
size: 64,
color: Colors.white.withOpacity(0.3),
),
const SizedBox(height: 16),
Text(
'No channels found',
style: GoogleFonts.inter(color: Colors.white54, fontSize: 18),
style: GoogleFonts.inter(
color: Colors.white54,
fontSize: 18,
),
),
],
),
@@ -218,7 +254,10 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
);
}
Widget _buildCategoryGrid(List<String> categories, Map<String, List<Channel>> groupedChannels) {
Widget _buildCategoryGrid(
List<String> categories,
Map<String, List<Channel>> groupedChannels,
) {
final columns = ResponsiveLayout.value(
context,
mobile: 2,
@@ -239,7 +278,7 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
itemBuilder: (context, index) {
final category = categories[index];
final count = groupedChannels[category]?.length ?? 0;
return TvFocusableCard(
onTap: () {
setState(() {
@@ -271,7 +310,11 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(Icons.folder_copy_outlined, color: Colors.white.withOpacity(0.9), size: 32),
Icon(
Icons.folder_copy_outlined,
color: Colors.white.withOpacity(0.9),
size: 32,
),
const SizedBox(height: 12),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
@@ -290,7 +333,10 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
const SizedBox(height: 4),
Text(
'$count Channels',
style: GoogleFonts.inter(fontSize: 13, color: Colors.white54),
style: GoogleFonts.inter(
fontSize: 13,
color: Colors.white54,
),
),
],
),
@@ -337,74 +383,116 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
// Icon Area
Expanded(
child: Container(
decoration: BoxDecoration(
decoration: const BoxDecoration(
color: Colors.white,
borderRadius: const BorderRadius.vertical(top: Radius.circular(12)),
borderRadius:
BorderRadius.vertical(top: Radius.circular(12)),
),
padding: const EdgeInsets.all(16),
child: Center(
child: channel.streamIcon.isNotEmpty
? Image.network(
_getProxiedIconUrl(channel.streamIcon)!,
errorBuilder: (_,__,___) => const Icon(Icons.tv, color: Colors.grey, size: 40),
)
: Text(
channel.name.characters.first.toUpperCase(),
style: GoogleFonts.inter(fontSize: 40, fontWeight: FontWeight.bold, color: Colors.black12),
),
child: channel.streamIcon.isNotEmpty
? Image.network(
_getProxiedIconUrl(channel.streamIcon)!,
errorBuilder: (_, __, ___) => const Icon(
Icons.tv,
color: Colors.grey,
size: 40,
),
)
: Text(
channel.name.characters.first.toUpperCase(),
style: GoogleFonts.inter(
fontSize: 40,
fontWeight: FontWeight.bold,
color: Colors.black12,
),
),
),
),
),
// Footer
Container(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
padding:
const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
color: Colors.black54,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
channel.name,
style: GoogleFonts.inter(color: Colors.white, fontSize: 13, fontWeight: FontWeight.w500),
style: GoogleFonts.inter(
color: Colors.white,
fontSize: 13,
fontWeight: FontWeight.w500,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
const SizedBox(height: 4),
Consumer(
builder: (context, ref, _) {
final epgAsync = ref.watch(epgByPlaylistProvider(
EpgRequestKey(playlist: widget.playlist, streamId: channel.streamId)
));
return epgAsync.when(
data: (epgList) {
if (epgList.isEmpty) {
return Text('No Info', style: GoogleFonts.inter(color: Colors.white54, fontSize: 10));
}
final now = DateTime.now();
final currentProgram = epgList.firstWhere(
(entry) {
try {
final start = DateTime.parse(entry.start);
final end = DateTime.parse(entry.end);
return now.isAfter(start) && now.isBefore(end);
} catch (e) {
return false;
}
},
orElse: () => epgList.first,
);
final epgAsync = ref.watch(
epgByPlaylistProvider(
EpgRequestKey(
playlist: widget.playlist,
streamId: channel.streamId,
),
),
);
return epgAsync.when(
data: (epgList) {
if (epgList.isEmpty) {
return Text(
currentProgram.title,
style: GoogleFonts.inter(color: const Color(0xFFFFD700), fontSize: 10, fontWeight: FontWeight.w600),
maxLines: 1,
overflow: TextOverflow.ellipsis,
'No Info',
style: GoogleFonts.inter(
color: Colors.white54,
fontSize: 10,
),
);
},
loading: () => Text('...', style: GoogleFonts.inter(color: Colors.white24, fontSize: 10)),
error: (_,__) => Text('Err', style: GoogleFonts.inter(color: Colors.red, fontSize: 10)),
);
}
}
final now = DateTime.now();
final currentProgram = epgList.firstWhere(
(entry) {
try {
final start = DateTime.parse(entry.start);
final end = DateTime.parse(entry.end);
return now.isAfter(start) &&
now.isBefore(end);
} catch (e) {
return false;
}
},
orElse: () => epgList.first,
);
return Text(
currentProgram.title,
style: GoogleFonts.inter(
color: const Color(0xFFFFD700),
fontSize: 10,
fontWeight: FontWeight.w600,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
);
},
loading: () => Text(
'...',
style: GoogleFonts.inter(
color: Colors.white24,
fontSize: 10,
),
),
error: (_, __) => Text(
'Err',
style: GoogleFonts.inter(
color: Colors.red,
fontSize: 10,
),
),
);
},
),
],
),
lib/features/iptv/widgets/movies_tab.dart
+173 -84
View File
@@ -4,10 +4,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:google_fonts/google_fonts.dart';
import '../../../core/models/playlist_config.dart';
import '../../../core/theme/app_colors.dart';
import '../../../core/theme/app_theme.dart';
import '../../../core/utils/responsive_layout.dart';
import '../../../core/widgets/components/hero_carousel.dart';
import '../../../core/widgets/themed_loading_screen.dart';
import '../../../core/widgets/glass_container.dart';
import '../../../core/widgets/tv_focusable_card.dart';
import '../providers/watch_history_provider.dart';
@@ -62,7 +60,7 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
void _onSearchChanged(String query) {
_searchDebounce?.cancel();
setState(() {
_searchQuery = query;
if (query.isEmpty) {
@@ -70,7 +68,7 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
_isSearching = false;
}
});
if (query.length >= 2) {
_searchDebounce = Timer(const Duration(milliseconds: 500), () {
_performSearch(query);
@@ -80,13 +78,13 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
Future<void> _performSearch(String query) async {
if (query.isEmpty) return;
setState(() => _isSearching = true);
try {
final service = ref.read(xtreamServiceProvider(widget.playlist));
final results = await service.searchMovies(query);
if (mounted && _searchQuery == query) {
setState(() {
_searchResults = results;
@@ -149,9 +147,24 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
return originalUrl;
}
void _playMovie(Movie movie) {
Future<void> _playMovie(Movie movie) async {
ref.read(watchHistoryProvider.notifier).markMovieWatched(movie.streamId);
// Fetch actual duration from API if not available in movie data
Duration? movieDuration;
if (movie.durationSecs != null && movie.durationSecs! > 0) {
movieDuration = Duration(seconds: movie.durationSecs!);
} else {
// Try to fetch from API
final service = ref.read(xtreamServiceProvider(widget.playlist));
final durationSecs = await service.getVodDuration(movie.streamId);
if (durationSecs != null && durationSecs > 0) {
movieDuration = Duration(seconds: durationSecs);
}
}
if (!mounted) return;
Navigator.push(
context,
MaterialPageRoute(
@@ -161,6 +174,7 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
playlist: widget.playlist,
streamType: StreamType.vod,
containerExtension: movie.containerExtension ?? 'mp4',
duration: movieDuration,
),
),
);
@@ -170,17 +184,19 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
Widget build(BuildContext context) {
final settings = ref.watch(iptvSettingsProvider);
final watchHistory = ref.watch(watchHistoryProvider);
List<Movie> displayMovies;
if (_searchQuery.isNotEmpty && _searchResults != null) {
displayMovies = _searchResults!;
} else {
displayMovies = settings.moviesKeywords.isEmpty
? _movies
: _movies.where((m) => settings.matchesMoviesFilter(m.categoryName)).toList();
: _movies
.where((m) => settings.matchesMoviesFilter(m.categoryName))
.toList();
}
final double gridItemRatio = 0.65;
const double gridItemRatio = 0.65;
final int crossAxisCount = ResponsiveLayout.value(
context,
mobile: 3,
@@ -200,7 +216,8 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
child: GlassContainer(
borderRadius: 100,
opacity: 0.6,
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 12),
padding:
const EdgeInsets.symmetric(horizontal: 24, vertical: 12),
child: Row(
children: [
Text(
@@ -212,7 +229,7 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
),
),
const Spacer(),
// Search Bar
Container(
width: 300,
@@ -224,32 +241,52 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Row(
children: [
const Icon(Icons.search, size: 20, color: Colors.white54),
const Icon(
Icons.search,
size: 20,
color: Colors.white54,
),
const SizedBox(width: 8),
Expanded(
child: TextField(
controller: _searchController,
style: GoogleFonts.inter(fontSize: 14, color: Colors.white),
style: GoogleFonts.inter(
fontSize: 14,
color: Colors.white,
),
decoration: InputDecoration(
hintText: 'Search movies...',
hintStyle: GoogleFonts.inter(color: Colors.white54),
hintStyle:
GoogleFonts.inter(color: Colors.white54),
border: InputBorder.none,
isDense: true,
contentPadding: const EdgeInsets.only(bottom: 12),
contentPadding:
const EdgeInsets.only(bottom: 12),
),
onChanged: _onSearchChanged,
),
),
if (_isSearching)
const SizedBox(width: 16, height: 16, child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white)),
const SizedBox(
width: 16,
height: 16,
child: CircularProgressIndicator(
strokeWidth: 2,
color: Colors.white,
),
),
if (_searchQuery.isNotEmpty)
GestureDetector(
onTap: () {
_searchController.clear();
_onSearchChanged('');
},
child: const Icon(Icons.close, size: 16, color: Colors.white),
),
GestureDetector(
onTap: () {
_searchController.clear();
_onSearchChanged('');
},
child: const Icon(
Icons.close,
size: 16,
color: Colors.white,
),
),
],
),
),
@@ -265,21 +302,29 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
child: Padding(
padding: const EdgeInsets.only(bottom: 32),
child: HeroCarousel(
items: displayMovies.take(5).map((m) => HeroItem(
id: m.streamId,
title: m.name,
imageUrl: _getProxiedImageUrl(m.streamIcon),
subtitle: m.rating != null ? '${_formatRating(m.rating)} ★' : null,
onMoreInfo: () => _playMovie(m),
)).toList(),
items: displayMovies
.take(5)
.map(
(m) => HeroItem(
id: m.streamId,
title: m.name,
imageUrl: _getProxiedImageUrl(m.streamIcon),
subtitle: m.rating != null
? '${_formatRating(m.rating)} ★'
: null,
onMoreInfo: () => _playMovie(m),
),
)
.toList(),
onTap: (item) {
final movie = _movies.firstWhere((element) => element.streamId == item.id);
_playMovie(movie);
final movie = _movies
.firstWhere((element) => element.streamId == item.id);
_playMovie(movie);
},
),
),
),
// Movies Grid
SliverPadding(
padding: const EdgeInsets.symmetric(horizontal: 24),
@@ -295,7 +340,7 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
if (index >= displayMovies.length) return null;
final movie = displayMovies[index];
final isWatched = watchHistory.isMovieWatched(movie.streamId);
return TvFocusableCard(
onTap: () => _playMovie(movie),
borderRadius: 12,
@@ -305,66 +350,99 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
// Poster Image
ClipRRect(
borderRadius: BorderRadius.circular(12),
child: movie.streamIcon != null && movie.streamIcon!.isNotEmpty
? Image.network(
_getProxiedImageUrl(movie.streamIcon),
fit: BoxFit.cover,
errorBuilder: (ctx, err, stack) => Container(
child: movie.streamIcon != null &&
movie.streamIcon!.isNotEmpty
? Image.network(
_getProxiedImageUrl(movie.streamIcon),
fit: BoxFit.cover,
errorBuilder: (ctx, err, stack) => Container(
color: AppColors.surfaceVariant,
child: const Center(
child: Icon(
Icons.movie,
size: 48,
color: Colors.white24,
),
),
),
)
: Container(
color: AppColors.surfaceVariant,
child: const Center(child: Icon(Icons.movie, size: 48, color: Colors.white24)),
child: const Center(
child: Icon(
Icons.movie,
size: 48,
color: Colors.white24,
),
),
),
)
: Container(
color: AppColors.surfaceVariant,
child: const Center(child: Icon(Icons.movie, size: 48, color: Colors.white24)),
),
),
// Gradient Overlay
Positioned(
left: 0, right: 0, bottom: 0,
left: 0,
right: 0,
bottom: 0,
height: 80,
child: Container(
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [Colors.transparent, Colors.black.withOpacity(0.9)],
colors: [
Colors.transparent,
Colors.black.withOpacity(0.9),
],
),
borderRadius: const BorderRadius.vertical(
bottom: Radius.circular(12),
),
borderRadius: const BorderRadius.vertical(bottom: Radius.circular(12)),
),
),
),
// Rating Badge
if (movie.rating != null && movie.rating!.isNotEmpty)
Positioned(
top: 8,
right: 8,
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
decoration: BoxDecoration(
color: Colors.black.withOpacity(0.7),
borderRadius: BorderRadius.circular(4),
border: Border.all(color: Colors.white24),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(Icons.star, size: 10, color: Colors.amber),
const SizedBox(width: 4),
Text(
_formatRating(movie.rating)!,
style: GoogleFonts.inter(fontSize: 10, fontWeight: FontWeight.bold, color: Colors.white),
),
],
),
),
),
// Rating Badge
if (movie.rating != null && movie.rating!.isNotEmpty)
Positioned(
top: 8,
right: 8,
child: Container(
padding: const EdgeInsets.symmetric(
horizontal: 6,
vertical: 2,
),
decoration: BoxDecoration(
color: Colors.black.withOpacity(0.7),
borderRadius: BorderRadius.circular(4),
border: Border.all(color: Colors.white24),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(
Icons.star,
size: 10,
color: Colors.amber,
),
const SizedBox(width: 4),
Text(
_formatRating(movie.rating)!,
style: GoogleFonts.inter(
fontSize: 10,
fontWeight: FontWeight.bold,
color: Colors.white,
),
),
],
),
),
),
// Title
Positioned(
left: 12, right: 12, bottom: 12,
left: 12,
right: 12,
bottom: 12,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
@@ -375,7 +453,12 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
color: Colors.white,
fontSize: 13,
fontWeight: FontWeight.w600,
shadows: [const Shadow(color: Colors.black, blurRadius: 4)],
shadows: [
const Shadow(
color: Colors.black,
blurRadius: 4,
),
],
),
maxLines: 2,
overflow: TextOverflow.ellipsis,
@@ -385,7 +468,11 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
padding: const EdgeInsets.only(top: 4),
child: Text(
'WATCHED',
style: GoogleFonts.inter(color: AppColors.primary, fontSize: 10, fontWeight: FontWeight.bold),
style: GoogleFonts.inter(
color: AppColors.primary,
fontSize: 10,
fontWeight: FontWeight.bold,
),
),
),
],
@@ -399,16 +486,18 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
),
),
),
// Loader
if (_isLoading)
const SliverToBoxAdapter(
child: Padding(
padding: EdgeInsets.all(32),
child: Center(child: CircularProgressIndicator(color: Colors.white)),
child: Center(
child: CircularProgressIndicator(color: Colors.white),
),
),
),
const SliverPadding(padding: EdgeInsets.only(bottom: 50)),
],
),
lib/features/iptv/widgets/series_tab.dart
+153 -76
View File
@@ -62,7 +62,7 @@ class _SeriesTabState extends ConsumerState<SeriesTab> {
void _onSearchChanged(String query) {
_searchDebounce?.cancel();
setState(() {
_searchQuery = query;
if (query.isEmpty) {
@@ -70,7 +70,7 @@ class _SeriesTabState extends ConsumerState<SeriesTab> {
_isSearching = false;
}
});
if (query.length >= 2) {
_searchDebounce = Timer(const Duration(milliseconds: 500), () {
_performSearch(query);
@@ -80,13 +80,13 @@ class _SeriesTabState extends ConsumerState<SeriesTab> {
Future<void> _performSearch(String query) async {
if (query.isEmpty) return;
setState(() => _isSearching = true);
try {
final service = ref.read(xtreamServiceProvider(widget.playlist));
final results = await service.searchSeries(query);
if (mounted && _searchQuery == query) {
setState(() {
_searchResults = results;
@@ -164,17 +164,19 @@ class _SeriesTabState extends ConsumerState<SeriesTab> {
@override
Widget build(BuildContext context) {
final settings = ref.watch(iptvSettingsProvider);
List<Series> displaySeries;
if (_searchQuery.isNotEmpty && _searchResults != null) {
displaySeries = _searchResults!;
} else {
displaySeries = settings.seriesKeywords.isEmpty
? _series
: _series.where((s) => settings.matchesSeriesFilter(s.categoryName)).toList();
: _series
.where((s) => settings.matchesSeriesFilter(s.categoryName))
.toList();
}
final double gridItemRatio = 0.65;
const double gridItemRatio = 0.65;
final int crossAxisCount = ResponsiveLayout.value(
context,
mobile: 3,
@@ -194,7 +196,8 @@ class _SeriesTabState extends ConsumerState<SeriesTab> {
child: GlassContainer(
borderRadius: 100,
opacity: 0.6,
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 12),
padding:
const EdgeInsets.symmetric(horizontal: 24, vertical: 12),
child: Row(
children: [
Text(
@@ -216,32 +219,52 @@ class _SeriesTabState extends ConsumerState<SeriesTab> {
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Row(
children: [
const Icon(Icons.search, size: 20, color: Colors.white54),
const Icon(
Icons.search,
size: 20,
color: Colors.white54,
),
const SizedBox(width: 8),
Expanded(
child: TextField(
controller: _searchController,
style: GoogleFonts.inter(fontSize: 14, color: Colors.white),
style: GoogleFonts.inter(
fontSize: 14,
color: Colors.white,
),
decoration: InputDecoration(
hintText: 'Search series...',
hintStyle: GoogleFonts.inter(color: Colors.white54),
hintStyle:
GoogleFonts.inter(color: Colors.white54),
border: InputBorder.none,
isDense: true,
contentPadding: const EdgeInsets.only(bottom: 12),
contentPadding:
const EdgeInsets.only(bottom: 12),
),
onChanged: _onSearchChanged,
),
),
if (_isSearching)
const SizedBox(width: 16, height: 16, child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white)),
const SizedBox(
width: 16,
height: 16,
child: CircularProgressIndicator(
strokeWidth: 2,
color: Colors.white,
),
),
if (_searchQuery.isNotEmpty)
GestureDetector(
onTap: () {
_searchController.clear();
_onSearchChanged('');
},
child: const Icon(Icons.close, size: 16, color: Colors.white),
),
GestureDetector(
onTap: () {
_searchController.clear();
_onSearchChanged('');
},
child: const Icon(
Icons.close,
size: 16,
color: Colors.white,
),
),
],
),
),
@@ -257,24 +280,39 @@ class _SeriesTabState extends ConsumerState<SeriesTab> {
child: Padding(
padding: const EdgeInsets.only(bottom: 32),
child: HeroCarousel(
items: displaySeries.take(5).map((s) => HeroItem(
id: s.seriesId.toString(),
title: s.name,
imageUrl: _getProxiedImageUrl(s.cover),
subtitle: s.rating != null ? '${_formatRating(s.rating)} ★' : null,
onMoreInfo: () {
final series = _series.firstWhere((element) => element.seriesId.toString() == s.seriesId.toString(), orElse: () => s);
_openSeries(series);
},
)).toList(),
items: displaySeries
.take(5)
.map(
(s) => HeroItem(
id: s.seriesId.toString(),
title: s.name,
imageUrl: _getProxiedImageUrl(s.cover),
subtitle: s.rating != null
? '${_formatRating(s.rating)} ★'
: null,
onMoreInfo: () {
final series = _series.firstWhere(
(element) =>
element.seriesId.toString() ==
s.seriesId.toString(),
orElse: () => s,
);
_openSeries(series);
},
),
)
.toList(),
onTap: (item) {
final series = _series.firstWhere((element) => element.seriesId.toString() == item.id, orElse: () => _series[0]);
_openSeries(series);
final series = _series.firstWhere(
(element) => element.seriesId.toString() == item.id,
orElse: () => _series[0],
);
_openSeries(series);
},
),
),
),
// Grid
SliverPadding(
padding: const EdgeInsets.symmetric(horizontal: 24),
@@ -299,77 +337,114 @@ class _SeriesTabState extends ConsumerState<SeriesTab> {
ClipRRect(
borderRadius: BorderRadius.circular(12),
child: serie.cover != null && serie.cover!.isNotEmpty
? Image.network(
_getProxiedImageUrl(serie.cover),
fit: BoxFit.cover,
errorBuilder: (ctx, err, stack) => Container(
? Image.network(
_getProxiedImageUrl(serie.cover),
fit: BoxFit.cover,
errorBuilder: (ctx, err, stack) => Container(
color: AppColors.surfaceVariant,
child: const Center(
child: Icon(
Icons.tv,
size: 48,
color: Colors.white24,
),
),
),
)
: Container(
color: AppColors.surfaceVariant,
child: const Center(child: Icon(Icons.tv, size: 48, color: Colors.white24)),
child: const Center(
child: Icon(
Icons.tv,
size: 48,
color: Colors.white24,
),
),
),
)
: Container(
color: AppColors.surfaceVariant,
child: const Center(child: Icon(Icons.tv, size: 48, color: Colors.white24)),
),
),
// Gradient Overlay
Positioned(
left: 0, right: 0, bottom: 0,
left: 0,
right: 0,
bottom: 0,
height: 80,
child: Container(
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [Colors.transparent, Colors.black.withOpacity(0.9)],
colors: [
Colors.transparent,
Colors.black.withOpacity(0.9),
],
),
borderRadius: const BorderRadius.vertical(
bottom: Radius.circular(12),
),
borderRadius: const BorderRadius.vertical(bottom: Radius.circular(12)),
),
),
),
// Title
Positioned(
left: 12, right: 12, bottom: 12,
left: 12,
right: 12,
bottom: 12,
child: Text(
serie.name,
style: GoogleFonts.inter(
color: Colors.white,
fontSize: 13,
fontWeight: FontWeight.w600,
shadows: [const Shadow(color: Colors.black, blurRadius: 4)],
shadows: [
const Shadow(
color: Colors.black,
blurRadius: 4,
),
],
),
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
),
// Rating Badge
if (serie.rating != null && serie.rating!.isNotEmpty)
Positioned(
top: 8,
right: 8,
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
decoration: BoxDecoration(
color: Colors.black.withOpacity(0.7),
borderRadius: BorderRadius.circular(4),
border: Border.all(color: Colors.white24),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(Icons.star, size: 10, color: Colors.amber),
const SizedBox(width: 4),
Text(
_formatRating(serie.rating)!,
style: GoogleFonts.inter(fontSize: 10, fontWeight: FontWeight.bold, color: Colors.white),
),
],
Positioned(
top: 8,
right: 8,
child: Container(
padding: const EdgeInsets.symmetric(
horizontal: 6,
vertical: 2,
),
decoration: BoxDecoration(
color: Colors.black.withOpacity(0.7),
borderRadius: BorderRadius.circular(4),
border: Border.all(color: Colors.white24),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(
Icons.star,
size: 10,
color: Colors.amber,
),
const SizedBox(width: 4),
Text(
_formatRating(serie.rating)!,
style: GoogleFonts.inter(
fontSize: 10,
fontWeight: FontWeight.bold,
color: Colors.white,
),
),
],
),
),
),
),
],
),
);
@@ -378,17 +453,19 @@ class _SeriesTabState extends ConsumerState<SeriesTab> {
),
),
),
// Loader
if (_isLoading)
const SliverToBoxAdapter(
child: Padding(
padding: EdgeInsets.all(32),
child: Center(child: CircularProgressIndicator(color: Colors.white)),
child: Center(
child: CircularProgressIndicator(color: Colors.white),
),
),
),
const SliverPadding(padding: EdgeInsets.only(bottom: 50)),
const SliverPadding(padding: EdgeInsets.only(bottom: 50)),
],
),
);
lib/features/iptv/widgets/settings_tab.dart
+124 -83
View File
@@ -18,7 +18,8 @@ class SettingsTab extends ConsumerStatefulWidget {
ConsumerState<SettingsTab> createState() => _SettingsTabState();
}
class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProviderStateMixin {
class _SettingsTabState extends ConsumerState<SettingsTab>
with SingleTickerProviderStateMixin {
late TabController _tabController;
late TextEditingController _liveTvController;
late TextEditingController _moviesController;
@@ -45,13 +46,16 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
}
void _syncControllers(IptvSettings settings) {
if (!_initialized || _liveTvController.text != settings.liveTvCategoryFilter) {
if (!_initialized ||
_liveTvController.text != settings.liveTvCategoryFilter) {
_liveTvController.text = settings.liveTvCategoryFilter;
}
if (!_initialized || _moviesController.text != settings.moviesCategoryFilter) {
if (!_initialized ||
_moviesController.text != settings.moviesCategoryFilter) {
_moviesController.text = settings.moviesCategoryFilter;
}
if (!_initialized || _seriesController.text != settings.seriesCategoryFilter) {
if (!_initialized ||
_seriesController.text != settings.seriesCategoryFilter) {
_seriesController.text = settings.seriesCategoryFilter;
}
_initialized = true;
@@ -61,7 +65,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
Widget build(BuildContext context) {
final currentUser = ref.watch(authProvider).currentUser;
final settings = ref.watch(iptvSettingsProvider);
// Sync controllers with persisted state (only on first load)
WidgetsBinding.instance.addPostFrameCallback((_) {
if (!_initialized) _syncControllers(settings);
@@ -85,17 +89,20 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
labelColor: Colors.white,
unselectedLabelColor: Colors.white54,
dividerColor: Colors.transparent,
overlayColor: MaterialStateProperty.all(Colors.transparent),
overlayColor: WidgetStateProperty.all(Colors.transparent),
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'),
const Tab(
icon: Icon(Icons.admin_panel_settings),
text: 'Administration',
),
],
),
),
// TabBarView
Expanded(
child: TabBarView(
@@ -103,16 +110,15 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
children: [
// Filters Tab
_buildFiltersTab(context, currentUser, settings),
// Streaming Tab
const StreamingSettingsTab(),
// Appearance Tab
_buildAppearanceTab(context),
// Admin Tab
if (currentUser?.isAdmin ?? false)
const AdminContent(),
if (currentUser?.isAdmin ?? false) const AdminContent(),
],
),
),
@@ -125,7 +131,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
final themeState = ref.watch(themeProvider);
final themeNotifier = ref.read(themeProvider.notifier);
final isDark = Theme.of(context).brightness == Brightness.dark;
return ListView(
padding: const EdgeInsets.all(16),
children: [
@@ -142,7 +148,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
children: [
Row(
children: [
Icon(
const Icon(
Icons.dark_mode,
color: Colors.white,
),
@@ -158,7 +164,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
],
),
const SizedBox(height: 16),
// Theme options
_buildThemeOption(
context: context,
@@ -189,9 +195,9 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
],
),
),
const SizedBox(height: 16),
// Quick toggle card
Container(
decoration: BoxDecoration(
@@ -206,20 +212,23 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
),
title: Text(
'Mode actuel',
style: GoogleFonts.inter(fontWeight: FontWeight.w500, color: Colors.white),
style: GoogleFonts.inter(
fontWeight: FontWeight.w500,
color: Colors.white,
),
),
subtitle: Text(
isDark ? 'Thème sombre actif' : 'Thème clair actif',
style: TextStyle(color: Colors.white70),
style: const TextStyle(color: Colors.white70),
),
trailing: Switch(
value: isDark,
onChanged: (_) => themeNotifier.toggleTheme(),
activeColor: AppColors.primary,
trackColor: MaterialStateProperty.resolveWith(
(states) => states.contains(MaterialState.selected)
? AppColors.primary.withOpacity(0.5)
: Colors.grey.shade800,
activeThumbColor: AppColors.primary,
trackColor: WidgetStateProperty.resolveWith(
(states) => states.contains(WidgetState.selected)
? AppColors.primary.withOpacity(0.5)
: Colors.grey.shade800,
),
),
),
@@ -238,7 +247,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
}) {
final theme = Theme.of(context);
final colorScheme = theme.colorScheme;
return InkWell(
onTap: onTap,
borderRadius: BorderRadius.circular(12),
@@ -298,8 +307,11 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
);
}
Widget _buildFiltersTab(BuildContext context, dynamic currentUser, IptvSettings settings) {
Widget _buildFiltersTab(
BuildContext context,
dynamic currentUser,
IptvSettings settings,
) {
return ListView(
padding: const EdgeInsets.all(16),
children: [
@@ -319,18 +331,27 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
),
subtitle: Text(
currentUser?.username ?? 'Unknown',
style: GoogleFonts.roboto(fontWeight: FontWeight.w600, color: Colors.white),
style: GoogleFonts.roboto(
fontWeight: FontWeight.w600,
color: Colors.white,
),
),
trailing: currentUser?.isAdmin ?? false
? Chip(
label: Text('Admin', style: GoogleFonts.roboto(fontSize: 11, color: Colors.black)),
label: Text(
'Admin',
style: GoogleFonts.roboto(
fontSize: 11,
color: Colors.black,
),
),
backgroundColor: Colors.white,
)
: null,
),
),
const SizedBox(height: 16),
// Category filters section
Text(
'Filtres de Catégories',
@@ -349,7 +370,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
),
),
const SizedBox(height: 12),
// Live TV Filter
_buildFilterCard(
title: 'Filtre TV Live',
@@ -365,7 +386,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
},
),
const SizedBox(height: 8),
// Movies Filter
_buildFilterCard(
title: 'Filtre Films',
@@ -381,7 +402,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
},
),
const SizedBox(height: 8),
// Series Filter
_buildFilterCard(
title: 'Filtre Séries',
@@ -397,9 +418,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
},
),
const SizedBox(height: 16),
// Change playlist
Container(
decoration: BoxDecoration(
@@ -409,13 +428,16 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
),
child: ListTile(
leading: const Icon(Icons.playlist_play, color: Colors.white),
title: Text('Changer de Playlist', style: GoogleFonts.roboto(color: Colors.white)),
title: Text(
'Changer de Playlist',
style: GoogleFonts.roboto(color: Colors.white),
),
trailing: const Icon(Icons.chevron_right, color: Colors.white54),
onTap: () => context.go('/playlists'),
),
),
const SizedBox(height: 8),
// About
Container(
decoration: BoxDecoration(
@@ -425,7 +447,10 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
),
child: ListTile(
leading: const Icon(Icons.info_outline, color: Colors.white),
title: Text('À propos', style: GoogleFonts.roboto(color: Colors.white)),
title: Text(
'À propos',
style: GoogleFonts.roboto(color: Colors.white),
),
subtitle: Text(
'XtremFlow IPTV v1.0.0',
style: GoogleFonts.roboto(fontSize: 12, color: Colors.white54),
@@ -433,7 +458,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
),
),
const SizedBox(height: 16),
// Maintenance Section
Container(
decoration: BoxDecoration(
@@ -443,50 +468,58 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
),
child: ListTile(
leading: const Icon(Icons.cleaning_services, color: Colors.orange),
title: Text('Maintenance', style: GoogleFonts.roboto(color: Colors.white)),
title: Text(
'Maintenance',
style: GoogleFonts.roboto(color: Colors.white),
),
subtitle: Text(
'En cas de problèmes d\'affichage ou de mise à jour',
style: GoogleFonts.roboto(fontSize: 12, color: Colors.white54),
),
trailing: FilledButton.icon(
onPressed: () {
// Show confirmation dialog
showDialog(
context: context,
builder: (context) => AlertDialog(
backgroundColor: const Color(0xFF1E1E1E),
title: const Text('Vider le cache ?', style: TextStyle(color: Colors.white)),
content: const Text(
'Cette action va recharger l\'application et effacer les données temporaires.\n'
'Vos réglages et favoris sont sauvegardés sur le serveur.',
style: TextStyle(color: Colors.white70),
),
actions: [
TextButton(
onPressed: () => Navigator.pop(context),
child: const Text('Annuler'),
),
FilledButton(
style: FilledButton.styleFrom(backgroundColor: Colors.orange),
onPressed: () {
Navigator.pop(context);
// Clear Flutter Image Cache
PaintingBinding.instance.imageCache.clear();
PaintingBinding.instance.imageCache.clearLiveImages();
// Clear Browser Local Storage (SharedPreferences backend for Web)
html.window.localStorage.clear();
html.window.sessionStorage.clear();
// Reload application
html.window.location.reload();
},
child: const Text('Vider et Recharger'),
),
],
)
);
// Show confirmation dialog
showDialog(
context: context,
builder: (context) => AlertDialog(
backgroundColor: const Color(0xFF1E1E1E),
title: const Text(
'Vider le cache ?',
style: TextStyle(color: Colors.white),
),
content: const Text(
'Cette action va recharger l\'application et effacer les données temporaires.\n'
'Vos réglages et favoris sont sauvegardés sur le serveur.',
style: TextStyle(color: Colors.white70),
),
actions: [
TextButton(
onPressed: () => Navigator.pop(context),
child: const Text('Annuler'),
),
FilledButton(
style: FilledButton.styleFrom(
backgroundColor: Colors.orange,
),
onPressed: () {
Navigator.pop(context);
// Clear Flutter Image Cache
PaintingBinding.instance.imageCache.clear();
PaintingBinding.instance.imageCache.clearLiveImages();
// Clear Browser Local Storage (SharedPreferences backend for Web)
html.window.localStorage.clear();
html.window.sessionStorage.clear();
// Reload application
html.window.location.reload();
},
child: const Text('Vider et Recharger'),
),
],
),
);
},
icon: const Icon(Icons.refresh, size: 16),
label: const Text('Vider le Cache'),
@@ -498,7 +531,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
),
),
const SizedBox(height: 24),
// Logout button
FilledButton.icon(
onPressed: () {
@@ -553,7 +586,8 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
controller: controller,
decoration: InputDecoration(
hintText: 'Ex: FR,FRANCE,HD,SPORT',
hintStyle: GoogleFonts.roboto(fontSize: 12, color: Colors.white30),
hintStyle:
GoogleFonts.roboto(fontSize: 12, color: Colors.white30),
filled: true,
fillColor: Colors.black26,
border: OutlineInputBorder(
@@ -567,7 +601,11 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
),
suffixIcon: controller.text.isNotEmpty
? IconButton(
icon: const Icon(Icons.clear, size: 16, color: Colors.white54),
icon: const Icon(
Icons.clear,
size: 16,
color: Colors.white54,
),
onPressed: onClear,
padding: EdgeInsets.zero,
constraints: const BoxConstraints(),
@@ -584,15 +622,18 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
runSpacing: 6,
children: keywords.map((keyword) {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 4),
padding:
const EdgeInsets.symmetric(horizontal: 10, vertical: 4),
decoration: BoxDecoration(
color: Colors.blueAccent.withOpacity(0.2),
borderRadius: BorderRadius.circular(50),
border: Border.all(color: Colors.blueAccent.withOpacity(0.5)),
border:
Border.all(color: Colors.blueAccent.withOpacity(0.5)),
),
child: Text(
keyword,
style: GoogleFonts.roboto(fontSize: 11, color: Colors.white),
style:
GoogleFonts.roboto(fontSize: 11, color: Colors.white),
),
);
}).toList(),
lib/features/iptv/widgets/streaming_settings_tab.dart
+10 -5
View File
@@ -111,7 +111,7 @@ class StreamingSettingsTab extends ConsumerWidget {
style: GoogleFonts.roboto(fontSize: 12, color: Colors.white54),
),
value: settings.autoReconnect,
activeColor: Colors.blueAccent,
activeThumbColor: Colors.blueAccent,
onChanged: (v) => notifier.setAutoReconnect(v),
),
],
@@ -147,10 +147,9 @@ class StreamingSettingsTab extends ConsumerWidget {
style: GoogleFonts.roboto(fontSize: 12, color: Colors.white54),
),
value: settings.preferDirectPlay,
activeColor: Colors.blueAccent,
activeThumbColor: Colors.blueAccent,
onChanged: (v) => notifier.setPreferDirectPlay(v),
),
],
),
const SizedBox(height: 16),
@@ -253,8 +252,14 @@ class StreamingSettingsTab extends ConsumerWidget {
required String Function(T) labelBuilder,
}) {
return ListTile(
title: Text(title, style: GoogleFonts.roboto(fontSize: 14, color: Colors.white)),
subtitle: Text(subtitle, style: GoogleFonts.roboto(fontSize: 12, color: Colors.white54)),
title: Text(
title,
style: GoogleFonts.roboto(fontSize: 14, color: Colors.white),
),
subtitle: Text(
subtitle,
style: GoogleFonts.roboto(fontSize: 12, color: Colors.white54),
),
trailing: DropdownButton<T>(
value: value,
underline: const SizedBox(),
lib/mobile/features/auth/screens/mobile_login_screen.dart
+1 -1
View File
@@ -193,7 +193,7 @@ class _MobileLoginScreenState extends ConsumerState<MobileLoginScreen> {
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
elevation: 0,
).copyWith(
overlayColor: MaterialStateProperty.all(Colors.black12),
overlayColor: WidgetStateProperty.all(Colors.black12),
),
child: authState.isLoading
? const SizedBox(
lib/mobile/features/iptv/screens/mobile_series_detail_screen.dart
+54 -19
View File
@@ -6,7 +6,7 @@ import '../../../../core/models/playlist_config.dart';
import '../../../../features/iptv/models/xtream_models.dart';
import '../../../../features/iptv/providers/xtream_provider.dart';
import '../../../../features/iptv/providers/watch_history_provider.dart';
import '../../../../features/iptv/screens/player_screen.dart'; // Explicit import for StreamType
// Explicit import for StreamType
import 'mobile_player_screen.dart';
import '../../../../core/theme/app_colors.dart';
import '../../../../core/widgets/glass_container.dart';
@@ -22,10 +22,12 @@ class MobileSeriesDetailScreen extends ConsumerStatefulWidget {
});
@override
ConsumerState<MobileSeriesDetailScreen> createState() => _MobileSeriesDetailScreenState();
ConsumerState<MobileSeriesDetailScreen> createState() =>
_MobileSeriesDetailScreenState();
}
class _MobileSeriesDetailScreenState extends ConsumerState<MobileSeriesDetailScreen> {
class _MobileSeriesDetailScreenState
extends ConsumerState<MobileSeriesDetailScreen> {
SeriesInfo? _seriesInfo;
bool _isLoading = true;
String? _error;
@@ -83,7 +85,7 @@ class _MobileSeriesDetailScreenState extends ConsumerState<MobileSeriesDetailScr
fit: StackFit.expand,
children: [
// Global Background
Container(
Container(
decoration: const BoxDecoration(
gradient: RadialGradient(
center: Alignment.center,
@@ -92,18 +94,28 @@ class _MobileSeriesDetailScreenState extends ConsumerState<MobileSeriesDetailScr
),
),
),
if (_isLoading)
const Center(child: CircularProgressIndicator(color: Colors.white))
else if (_error != null)
Center(
Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Icon(Icons.error_outline, size: 48, color: AppColors.error),
const Icon(
Icons.error_outline,
size: 48,
color: AppColors.error,
),
const SizedBox(height: 16),
Text('Error: $_error', style: GoogleFonts.inter(color: Colors.white70)),
TextButton(onPressed: _loadSeriesInfo, child: const Text('Retry')),
Text(
'Error: $_error',
style: GoogleFonts.inter(color: Colors.white70),
),
TextButton(
onPressed: _loadSeriesInfo,
child: const Text('Retry'),
),
],
),
)
@@ -145,7 +157,8 @@ class _MobileSeriesDetailScreenState extends ConsumerState<MobileSeriesDetailScr
CachedNetworkImage(
imageUrl: _seriesInfo!.cover!,
fit: BoxFit.cover,
errorWidget: (_, __, ___) => Container(color: Colors.grey.shade900),
errorWidget: (_, __, ___) =>
Container(color: Colors.grey.shade900),
),
// Gradient Overlay
Container(
@@ -164,7 +177,9 @@ class _MobileSeriesDetailScreenState extends ConsumerState<MobileSeriesDetailScr
),
// Info Overlay
Positioned(
bottom: 16, left: 16, right: 16,
bottom: 16,
left: 16,
right: 16,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
@@ -181,17 +196,27 @@ class _MobileSeriesDetailScreenState extends ConsumerState<MobileSeriesDetailScr
Row(
children: [
if (_seriesInfo!.rating != null) ...[
const Icon(Icons.star, size: 16, color: Colors.amber),
const Icon(
Icons.star,
size: 16,
color: Colors.amber,
),
const SizedBox(width: 4),
Text(
_formatRating(_seriesInfo!.rating!)!,
style: GoogleFonts.inter(color: Colors.white70, fontSize: 13),
style: GoogleFonts.inter(
color: Colors.white70,
fontSize: 13,
),
),
const SizedBox(width: 16),
],
Text(
'${_seriesInfo!.episodes.keys.length} Seasons',
style: GoogleFonts.inter(color: Colors.white70, fontSize: 13),
style: GoogleFonts.inter(
color: Colors.white70,
fontSize: 13,
),
),
],
),
@@ -241,7 +266,9 @@ class _MobileSeriesDetailScreenState extends ConsumerState<MobileSeriesDetailScr
color: isSelected ? Colors.white : Colors.white70,
fontWeight: isSelected ? FontWeight.w600 : FontWeight.w400,
),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(20),
),
showCheckmark: false,
side: BorderSide.none,
);
@@ -287,7 +314,9 @@ class _MobileSeriesDetailScreenState extends ConsumerState<MobileSeriesDetailScr
padding: EdgeInsets.zero,
child: InkWell(
onTap: () {
ref.read(watchHistoryProvider.notifier).markEpisodeWatched(episodeKey);
ref
.read(watchHistoryProvider.notifier)
.markEpisodeWatched(episodeKey);
Navigator.push(
context,
MaterialPageRoute(
@@ -311,7 +340,9 @@ class _MobileSeriesDetailScreenState extends ConsumerState<MobileSeriesDetailScr
width: 40,
height: 40,
decoration: BoxDecoration(
color: isWatched ? AppColors.primary : Colors.white.withOpacity(0.1),
color: isWatched
? AppColors.primary
: Colors.white.withOpacity(0.1),
shape: BoxShape.circle,
),
child: Icon(
@@ -335,10 +366,14 @@ class _MobileSeriesDetailScreenState extends ConsumerState<MobileSeriesDetailScr
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
if (episode.durationSecs != null && episode.durationSecs! > 0)
if (episode.durationSecs != null &&
episode.durationSecs! > 0)
Text(
_formatDuration(episode.durationSecs!),
style: GoogleFonts.inter(color: Colors.white54, fontSize: 12),
style: GoogleFonts.inter(
color: Colors.white54,
fontSize: 12,
),
),
],
),
lib/mobile/features/iptv/widgets/mobile_live_tv_tab.dart
+109 -54
View File
@@ -34,7 +34,8 @@ class _MobileLiveTVTabState extends ConsumerState<MobileLiveTVTab> {
@override
Widget build(BuildContext context) {
final channelsAsync = ref.watch(liveChannelsByPlaylistProvider(widget.playlist));
final channelsAsync =
ref.watch(liveChannelsByPlaylistProvider(widget.playlist));
final favorites = ref.watch(favoritesProvider);
final settings = ref.watch(iptvSettingsProvider);
@@ -42,26 +43,32 @@ class _MobileLiveTVTabState extends ConsumerState<MobileLiveTVTab> {
backgroundColor: Colors.transparent, // Handled by MobileScaffold
body: channelsAsync.when(
loading: () => const Center(child: CircularProgressIndicator()),
error: (e, s) => Center(child: Text('Error: $e', style: const TextStyle(color: Colors.white))),
error: (e, s) => Center(
child: Text('Error: $e', style: const TextStyle(color: Colors.white)),
),
data: (groupedChannels) {
var categories = groupedChannels.keys.toList();
if (settings.liveTvKeywords.isNotEmpty) {
categories = categories.where((cat) => settings.matchesLiveTvFilter(cat)).toList();
categories = categories
.where((cat) => settings.matchesLiveTvFilter(cat))
.toList();
}
categories.sort();
List<Channel> displayedChannels = [];
if (_searchQuery.isNotEmpty) {
displayedChannels = groupedChannels.values.expand((l) => l)
displayedChannels = groupedChannels.values
.expand((l) => l)
.where((c) => c.name.toLowerCase().contains(_searchQuery))
.toList();
} else if (_showFavoritesOnly) {
displayedChannels = groupedChannels.values.expand((l) => l)
displayedChannels = groupedChannels.values
.expand((l) => l)
.where((c) => favorites.contains(c.streamId))
.toList();
} else {
if (_selectedCategory == null && categories.isNotEmpty) {
_selectedCategory = categories.first;
_selectedCategory = categories.first;
}
if (_selectedCategory != null) {
displayedChannels = groupedChannels[_selectedCategory] ?? [];
@@ -78,27 +85,33 @@ class _MobileLiveTVTabState extends ConsumerState<MobileLiveTVTab> {
child: GlassContainer(
borderRadius: 16,
opacity: 0.1,
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
padding:
const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
child: Row(
children: [
Expanded(
child: TextField(
controller: _searchController,
style: GoogleFonts.inter(color: Colors.white),
decoration: InputDecoration(
hintText: 'Search channels...',
hintStyle: GoogleFonts.inter(color: Colors.white54),
border: InputBorder.none,
prefixIcon: const Icon(Icons.search, color: Colors.white54),
isDense: true,
),
),
),
if (_searchQuery.isNotEmpty)
GestureDetector(
onTap: () => _searchController.clear(),
child: const Icon(Icons.close, color: Colors.white54),
),
Expanded(
child: TextField(
controller: _searchController,
style: GoogleFonts.inter(color: Colors.white),
decoration: InputDecoration(
hintText: 'Search channels...',
hintStyle:
GoogleFonts.inter(color: Colors.white54),
border: InputBorder.none,
prefixIcon: const Icon(
Icons.search,
color: Colors.white54,
),
isDense: true,
),
),
),
if (_searchQuery.isNotEmpty)
GestureDetector(
onTap: () => _searchController.clear(),
child:
const Icon(Icons.close, color: Colors.white54),
),
],
),
),
@@ -117,19 +130,28 @@ class _MobileLiveTVTabState extends ConsumerState<MobileLiveTVTab> {
final category = categories[index];
final isSelected = category == _selectedCategory;
return GestureDetector(
onTap: () => setState(() => _selectedCategory = category),
onTap: () =>
setState(() => _selectedCategory = category),
child: AnimatedContainer(
duration: const Duration(milliseconds: 200),
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
padding: const EdgeInsets.symmetric(
horizontal: 16,
vertical: 10,
),
decoration: BoxDecoration(
color: isSelected ? Colors.white : Colors.black.withOpacity(0.4),
color: isSelected
? Colors.white
: Colors.black.withOpacity(0.4),
borderRadius: BorderRadius.circular(20),
),
child: Text(
category,
style: GoogleFonts.inter(
color: isSelected ? Colors.black : Colors.white70,
fontWeight: isSelected ? FontWeight.w600 : FontWeight.w500,
color:
isSelected ? Colors.black : Colors.white70,
fontWeight: isSelected
? FontWeight.w600
: FontWeight.w500,
fontSize: 13,
),
),
@@ -145,28 +167,40 @@ class _MobileLiveTVTabState extends ConsumerState<MobileLiveTVTab> {
child: Row(
children: [
Text(
_searchQuery.isNotEmpty ? 'Results' :
_showFavoritesOnly ? 'Favorites' :
_selectedCategory ?? 'Channels',
_searchQuery.isNotEmpty
? 'Results'
: _showFavoritesOnly
? 'Favorites'
: _selectedCategory ?? 'Channels',
style: GoogleFonts.inter(
color: Colors.white,
color: Colors.white,
fontWeight: FontWeight.bold,
fontSize: 18,
),
),
const Spacer(),
GestureDetector(
onTap: () => setState(() => _showFavoritesOnly = !_showFavoritesOnly),
onTap: () => setState(
() => _showFavoritesOnly = !_showFavoritesOnly,
),
child: Container(
padding: const EdgeInsets.all(8),
decoration: BoxDecoration(
color: _showFavoritesOnly ? AppColors.live.withOpacity(0.2) : Colors.white.withOpacity(0.1),
color: _showFavoritesOnly
? AppColors.live.withOpacity(0.2)
: Colors.white.withOpacity(0.1),
borderRadius: BorderRadius.circular(8),
border: _showFavoritesOnly ? Border.all(color: AppColors.live) : null,
border: _showFavoritesOnly
? Border.all(color: AppColors.live)
: null,
),
child: Icon(
_showFavoritesOnly ? Icons.favorite : Icons.favorite_border,
color: _showFavoritesOnly ? AppColors.live : Colors.white,
_showFavoritesOnly
? Icons.favorite
: Icons.favorite_border,
color: _showFavoritesOnly
? AppColors.live
: Colors.white,
size: 20,
),
),
@@ -182,7 +216,11 @@ class _MobileLiveTVTabState extends ConsumerState<MobileLiveTVTab> {
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Icon(Icons.tv_off, color: Colors.white24, size: 48),
const Icon(
Icons.tv_off,
color: Colors.white24,
size: 48,
),
const SizedBox(height: 16),
Text(
'No channels found',
@@ -194,7 +232,8 @@ class _MobileLiveTVTabState extends ConsumerState<MobileLiveTVTab> {
: ListView.separated(
padding: const EdgeInsets.fromLTRB(16, 0, 16, 100),
itemCount: displayedChannels.length,
separatorBuilder: (_, __) => const SizedBox(height: 8),
separatorBuilder: (_, __) =>
const SizedBox(height: 8),
itemBuilder: (context, index) {
final channel = displayedChannels[index];
return _MobileChannelTile(
@@ -240,14 +279,17 @@ class _MobileChannelTile extends ConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final iconUrl = channel.streamIcon.isNotEmpty && channel.streamIcon.startsWith('http')
? '/api/xtream/${channel.streamIcon}'
: null;
final iconUrl =
channel.streamIcon.isNotEmpty && channel.streamIcon.startsWith('http')
? '/api/xtream/${channel.streamIcon}'
: null;
// Fetch EPG
final epgAsync = ref.watch(epgByPlaylistProvider(
EpgRequestKey(playlist: playlist, streamId: channel.streamId)
));
final epgAsync = ref.watch(
epgByPlaylistProvider(
EpgRequestKey(playlist: playlist, streamId: channel.streamId),
),
);
return GlassContainer(
borderRadius: 12,
@@ -270,9 +312,10 @@ class _MobileChannelTile extends ConsumerWidget {
padding: const EdgeInsets.all(4),
child: iconUrl != null
? Image.network(
iconUrl,
iconUrl,
fit: BoxFit.contain,
errorBuilder: (_, __, ___) => const Icon(Icons.tv, color: Colors.white24),
errorBuilder: (_, __, ___) =>
const Icon(Icons.tv, color: Colors.white24),
)
: const Icon(Icons.tv, color: Colors.white24),
),
@@ -291,7 +334,7 @@ class _MobileChannelTile extends ConsumerWidget {
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
// EPG Only (Replaces Channel Number)
epgAsync.when(
data: (epgList) {
@@ -308,7 +351,9 @@ class _MobileChannelTile extends ConsumerWidget {
return Text(
current.title,
style: GoogleFonts.inter(
color: const Color(0xFFFFD700), // Gold/Amber for visibility check
color: const Color(
0xFFFFD700,
), // Gold/Amber for visibility check
fontSize: 12,
fontWeight: FontWeight.w500,
),
@@ -316,8 +361,14 @@ class _MobileChannelTile extends ConsumerWidget {
overflow: TextOverflow.ellipsis,
);
},
loading: () => Text('...', style: TextStyle(color: Colors.white38, fontSize: 12)),
error: (err, stack) => Text('Err', style: TextStyle(color: Colors.red, fontSize: 10)),
loading: () => const Text(
'...',
style: TextStyle(color: Colors.white38, fontSize: 12),
),
error: (err, stack) => const Text(
'Err',
style: TextStyle(color: Colors.red, fontSize: 10),
),
),
],
),
@@ -328,7 +379,11 @@ class _MobileChannelTile extends ConsumerWidget {
color: Colors.white.withOpacity(0.1),
shape: BoxShape.circle,
),
child: const Icon(Icons.play_arrow_rounded, color: Colors.white, size: 16),
child: const Icon(
Icons.play_arrow_rounded,
color: Colors.white,
size: 16,
),
),
],
),
lib/mobile/features/iptv/widgets/mobile_movies_tab.dart
+120 -52
View File
@@ -49,9 +49,10 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
}
void _onScroll() {
if (!_isLoading && _hasMore &&
if (!_isLoading &&
_hasMore &&
_scrollController.position.pixels >=
_scrollController.position.maxScrollExtent * 0.8) {
_scrollController.position.maxScrollExtent * 0.8) {
_loadMoreMovies();
}
}
@@ -65,7 +66,7 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
_isSearching = false;
}
});
if (query.length >= 2) {
_searchDebounce = Timer(const Duration(milliseconds: 500), () {
_performSearch(query);
@@ -76,11 +77,11 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
Future<void> _performSearch(String query) async {
if (query.isEmpty) return;
setState(() => _isSearching = true);
try {
final service = ref.read(xtreamServiceProvider(widget.playlist));
final results = await service.searchMovies(query);
if (mounted && _searchQuery == query) {
setState(() {
_searchResults = results;
@@ -138,7 +139,7 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
void _playMovie(Movie movie) {
ref.read(watchHistoryProvider.notifier).markMovieWatched(movie.streamId);
Navigator.push(
context,
MaterialPageRoute(
@@ -157,23 +158,30 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
Widget build(BuildContext context) {
final settings = ref.watch(iptvSettingsProvider);
final watchHistory = ref.watch(watchHistoryProvider);
List<Movie> displayMovies;
if (_searchQuery.isNotEmpty && _searchResults != null) {
displayMovies = _searchResults!;
} else {
displayMovies = settings.moviesKeywords.isEmpty
? _movies
: _movies.where((m) => settings.matchesMoviesFilter(m.categoryName)).toList();
: _movies
.where((m) => settings.matchesMoviesFilter(m.categoryName))
.toList();
}
final heroItems = displayMovies.take(3).map((m) => HeroItem(
id: m.streamId,
title: m.name,
imageUrl: _getProxiedImageUrl(m.streamIcon),
subtitle: m.rating != null ? '${_formatRating(m.rating)} ★' : null,
onMoreInfo: () => _playMovie(m),
)).toList();
final heroItems = displayMovies
.take(3)
.map(
(m) => HeroItem(
id: m.streamId,
title: m.name,
imageUrl: _getProxiedImageUrl(m.streamIcon),
subtitle: m.rating != null ? '${_formatRating(m.rating)} ★' : null,
onMoreInfo: () => _playMovie(m),
),
)
.toList();
return SafeArea(
bottom: false,
@@ -187,7 +195,8 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
child: GlassContainer(
borderRadius: 100,
opacity: 0.1, // Glass
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
padding:
const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
child: Row(
children: [
const Icon(Icons.search, size: 20, color: Colors.white54),
@@ -195,7 +204,10 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
Expanded(
child: TextField(
controller: _searchController,
style: GoogleFonts.inter(fontSize: 14, color: Colors.white),
style: GoogleFonts.inter(
fontSize: 14,
color: Colors.white,
),
decoration: InputDecoration(
hintText: 'Search Movies...',
hintStyle: GoogleFonts.inter(color: Colors.white54),
@@ -207,14 +219,25 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
),
),
if (_isSearching)
const SizedBox(width: 12, height: 12, child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white)),
const SizedBox(
width: 12,
height: 12,
child: CircularProgressIndicator(
strokeWidth: 2,
color: Colors.white,
),
),
if (_searchQuery.isNotEmpty)
GestureDetector(
onTap: () {
_searchController.clear();
_onSearchChanged('');
_searchController.clear();
_onSearchChanged('');
},
child: const Icon(Icons.close, size: 16, color: Colors.white),
child: const Icon(
Icons.close,
size: 16,
color: Colors.white,
),
),
],
),
@@ -228,18 +251,19 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
child: Padding(
padding: const EdgeInsets.only(bottom: 24),
child: SizedBox(
height: 250,
child: HeroCarousel(
items: heroItems,
onTap: (item) {
final movie = _movies.firstWhere((element) => element.streamId == item.id);
_playMovie(movie);
},
),
height: 250,
child: HeroCarousel(
items: heroItems,
onTap: (item) {
final movie = _movies
.firstWhere((element) => element.streamId == item.id);
_playMovie(movie);
},
),
),
),
),
// Grid
SliverPadding(
padding: const EdgeInsets.fromLTRB(16, 0, 16, 80),
@@ -255,11 +279,13 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
if (index >= displayMovies.length) return null;
final movie = displayMovies[index];
final isWatched = watchHistory.isMovieWatched(movie.streamId);
return GestureDetector(
onTap: () => _playMovie(movie),
onLongPress: () {
ref.read(watchHistoryProvider.notifier).toggleMovieWatched(movie.streamId);
ref
.read(watchHistoryProvider.notifier)
.toggleMovieWatched(movie.streamId);
},
child: Stack(
fit: StackFit.expand,
@@ -267,46 +293,74 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
// Poster
ClipRRect(
borderRadius: BorderRadius.circular(16),
child: movie.streamIcon != null && movie.streamIcon!.isNotEmpty
? Image.network(
_getProxiedImageUrl(movie.streamIcon),
fit: BoxFit.cover,
errorBuilder: (_, __, ___) => Container(color: Colors.white10),
)
: Container(color: Colors.white10, child: const Icon(Icons.movie, color: Colors.white24)),
child: movie.streamIcon != null &&
movie.streamIcon!.isNotEmpty
? Image.network(
_getProxiedImageUrl(movie.streamIcon),
fit: BoxFit.cover,
errorBuilder: (_, __, ___) =>
Container(color: Colors.white10),
)
: Container(
color: Colors.white10,
child: const Icon(
Icons.movie,
color: Colors.white24,
),
),
),
// Gradient Overlay
Positioned(
bottom: 0, left: 0, right: 0,
bottom: 0,
left: 0,
right: 0,
height: 80,
child: Container(
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [Colors.transparent, Colors.black.withOpacity(0.9)],
colors: [
Colors.transparent,
Colors.black.withOpacity(0.9),
],
),
borderRadius: const BorderRadius.vertical(
bottom: Radius.circular(16),
),
borderRadius: const BorderRadius.vertical(bottom: Radius.circular(16)),
),
),
),
// Title
Positioned(
bottom: 12, left: 12, right: 12,
bottom: 12,
left: 12,
right: 12,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Text(
movie.name,
style: GoogleFonts.inter(color: Colors.white, fontSize: 13, fontWeight: FontWeight.w600),
style: GoogleFonts.inter(
color: Colors.white,
fontSize: 13,
fontWeight: FontWeight.w600,
),
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
if (isWatched)
Text('WATCHED', style: GoogleFonts.inter(color: AppColors.primary, fontSize: 10, fontWeight: FontWeight.bold)),
Text(
'WATCHED',
style: GoogleFonts.inter(
color: AppColors.primary,
fontSize: 10,
fontWeight: FontWeight.bold,
),
),
],
),
),
@@ -314,19 +368,31 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
// Rating
if (movie.rating != null && movie.rating!.isNotEmpty)
Positioned(
top: 8, right: 8,
top: 8,
right: 8,
child: GlassContainer(
borderRadius: 4,
opacity: 0.6,
padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
padding: const EdgeInsets.symmetric(
horizontal: 6,
vertical: 2,
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(Icons.star, size: 10, color: Colors.amber),
const Icon(
Icons.star,
size: 10,
color: Colors.amber,
),
const SizedBox(width: 4),
Text(
_formatRating(movie.rating)!,
style: GoogleFonts.inter(fontSize: 10, fontWeight: FontWeight.bold, color: Colors.white),
style: GoogleFonts.inter(
fontSize: 10,
fontWeight: FontWeight.bold,
color: Colors.white,
),
),
],
),
@@ -340,12 +406,14 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
),
),
),
if (_isLoading)
const SliverToBoxAdapter(
child: Padding(
padding: EdgeInsets.all(24),
child: Center(child: CircularProgressIndicator(color: Colors.white)),
child: Center(
child: CircularProgressIndicator(color: Colors.white),
),
),
),
],
lib/mobile/features/iptv/widgets/mobile_series_tab.dart
+114 -54
View File
@@ -29,7 +29,7 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
bool _isSearching = false;
bool _hasMore = true;
int _currentOffset = 0;
static const int _pageSize = 50;
static const int _pageSize = 50;
Timer? _searchDebounce;
@override
@@ -48,9 +48,10 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
}
void _onScroll() {
if (!_isLoading && _hasMore &&
if (!_isLoading &&
_hasMore &&
_scrollController.position.pixels >=
_scrollController.position.maxScrollExtent * 0.8) {
_scrollController.position.maxScrollExtent * 0.8) {
_loadMoreSeries();
}
}
@@ -64,7 +65,7 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
_isSearching = false;
}
});
if (query.length >= 2) {
_searchDebounce = Timer(const Duration(milliseconds: 500), () {
_performSearch(query);
@@ -75,11 +76,11 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
Future<void> _performSearch(String query) async {
if (query.isEmpty) return;
setState(() => _isSearching = true);
try {
final service = ref.read(xtreamServiceProvider(widget.playlist));
final results = await service.searchSeries(query);
if (mounted && _searchQuery == query) {
setState(() {
_searchResults = results;
@@ -150,23 +151,30 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
@override
Widget build(BuildContext context) {
final settings = ref.watch(iptvSettingsProvider);
List<Series> displaySeries;
if (_searchQuery.isNotEmpty && _searchResults != null) {
displaySeries = _searchResults!;
} else {
displaySeries = settings.seriesKeywords.isEmpty
? _series
: _series.where((s) => settings.matchesSeriesFilter(s.categoryName)).toList();
: _series
.where((s) => settings.matchesSeriesFilter(s.categoryName))
.toList();
}
final heroItems = displaySeries.take(3).map((s) => HeroItem(
id: s.seriesId.toString(),
title: s.name,
imageUrl: _getProxiedImageUrl(s.cover),
subtitle: s.rating != null ? '${_formatRating(s.rating)} ★' : null,
onMoreInfo: () => _openSeries(s),
)).toList();
final heroItems = displaySeries
.take(3)
.map(
(s) => HeroItem(
id: s.seriesId.toString(),
title: s.name,
imageUrl: _getProxiedImageUrl(s.cover),
subtitle: s.rating != null ? '${_formatRating(s.rating)} ★' : null,
onMoreInfo: () => _openSeries(s),
),
)
.toList();
return SafeArea(
bottom: false,
@@ -180,7 +188,8 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
child: GlassContainer(
borderRadius: 100,
opacity: 0.1,
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
padding:
const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
child: Row(
children: [
const Icon(Icons.search, size: 20, color: Colors.white54),
@@ -188,7 +197,10 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
Expanded(
child: TextField(
controller: _searchController,
style: GoogleFonts.inter(fontSize: 14, color: Colors.white),
style: GoogleFonts.inter(
fontSize: 14,
color: Colors.white,
),
decoration: InputDecoration(
hintText: 'Search Series...',
hintStyle: GoogleFonts.inter(color: Colors.white54),
@@ -200,14 +212,25 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
),
),
if (_isSearching)
const SizedBox(width: 12, height: 12, child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white)),
const SizedBox(
width: 12,
height: 12,
child: CircularProgressIndicator(
strokeWidth: 2,
color: Colors.white,
),
),
if (_searchQuery.isNotEmpty)
GestureDetector(
onTap: () {
_searchController.clear();
_onSearchChanged('');
_searchController.clear();
_onSearchChanged('');
},
child: const Icon(Icons.close, size: 16, color: Colors.white),
child: const Icon(
Icons.close,
size: 16,
color: Colors.white,
),
),
],
),
@@ -221,22 +244,24 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
child: Padding(
padding: const EdgeInsets.only(bottom: 24),
child: SizedBox(
height: 250,
child: HeroCarousel(
items: heroItems,
onTap: (item) {
try {
final series = _series.firstWhere((s) => s.seriesId.toString() == item.id);
_openSeries(series);
} catch (e) {
// Fallback
}
},
),
height: 250,
child: HeroCarousel(
items: heroItems,
onTap: (item) {
try {
final series = _series.firstWhere(
(s) => s.seriesId.toString() == item.id,
);
_openSeries(series);
} catch (e) {
// Fallback
}
},
),
),
),
),
// Grid
SliverPadding(
padding: const EdgeInsets.fromLTRB(16, 0, 16, 80),
@@ -251,7 +276,7 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
(context, index) {
if (index >= displaySeries.length) return null;
final series = displaySeries[index];
return GestureDetector(
onTap: () => _openSeries(series),
child: Stack(
@@ -260,37 +285,58 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
// Poster
ClipRRect(
borderRadius: BorderRadius.circular(16),
child: series.cover != null && series.cover!.isNotEmpty
? Image.network(
_getProxiedImageUrl(series.cover),
fit: BoxFit.cover,
errorBuilder: (_, __, ___) => Container(color: Colors.white10),
)
: Container(color: Colors.white10, child: const Icon(Icons.tv, color: Colors.white24)),
child:
series.cover != null && series.cover!.isNotEmpty
? Image.network(
_getProxiedImageUrl(series.cover),
fit: BoxFit.cover,
errorBuilder: (_, __, ___) =>
Container(color: Colors.white10),
)
: Container(
color: Colors.white10,
child: const Icon(
Icons.tv,
color: Colors.white24,
),
),
),
// Gradient Overlay
Positioned(
bottom: 0, left: 0, right: 0,
bottom: 0,
left: 0,
right: 0,
height: 80,
child: Container(
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topCenter,
end: Alignment.bottomCenter,
colors: [Colors.transparent, Colors.black.withOpacity(0.9)],
colors: [
Colors.transparent,
Colors.black.withOpacity(0.9),
],
),
borderRadius: const BorderRadius.vertical(
bottom: Radius.circular(16),
),
borderRadius: const BorderRadius.vertical(bottom: Radius.circular(16)),
),
),
),
// Title
Positioned(
bottom: 12, left: 12, right: 12,
bottom: 12,
left: 12,
right: 12,
child: Text(
series.name,
style: GoogleFonts.inter(color: Colors.white, fontSize: 13, fontWeight: FontWeight.w600),
style: GoogleFonts.inter(
color: Colors.white,
fontSize: 13,
fontWeight: FontWeight.w600,
),
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
@@ -299,19 +345,31 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
// Rating
if (series.rating != null && series.rating!.isNotEmpty)
Positioned(
top: 8, right: 8,
top: 8,
right: 8,
child: GlassContainer(
borderRadius: 4,
opacity: 0.6,
padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
padding: const EdgeInsets.symmetric(
horizontal: 6,
vertical: 2,
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(Icons.star, size: 10, color: Colors.amber),
const Icon(
Icons.star,
size: 10,
color: Colors.amber,
),
const SizedBox(width: 4),
Text(
_formatRating(series.rating)!,
style: GoogleFonts.inter(fontSize: 10, fontWeight: FontWeight.bold, color: Colors.white),
style: GoogleFonts.inter(
fontSize: 10,
fontWeight: FontWeight.bold,
color: Colors.white,
),
),
],
),
@@ -325,12 +383,14 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
),
),
),
if (_isLoading)
const SliverToBoxAdapter(
child: Padding(
padding: EdgeInsets.all(24),
child: Center(child: CircularProgressIndicator(color: Colors.white)),
child: Center(
child: CircularProgressIndicator(color: Colors.white),
),
),
),
],
lib/mobile/features/iptv/widgets/mobile_settings_tab.dart
+119 -52
View File
@@ -37,13 +37,16 @@ class _MobileSettingsTabState extends ConsumerState<MobileSettingsTab> {
}
void _syncControllers(IptvSettings settings) {
if (!_initialized || _liveTvController.text != settings.liveTvCategoryFilter) {
if (!_initialized ||
_liveTvController.text != settings.liveTvCategoryFilter) {
_liveTvController.text = settings.liveTvCategoryFilter;
}
if (!_initialized || _moviesController.text != settings.moviesCategoryFilter) {
if (!_initialized ||
_moviesController.text != settings.moviesCategoryFilter) {
_moviesController.text = settings.moviesCategoryFilter;
}
if (!_initialized || _seriesController.text != settings.seriesCategoryFilter) {
if (!_initialized ||
_seriesController.text != settings.seriesCategoryFilter) {
_seriesController.text = settings.seriesCategoryFilter;
}
_initialized = true;
@@ -56,7 +59,7 @@ class _MobileSettingsTabState extends ConsumerState<MobileSettingsTab> {
final themeState = ref.watch(themeProvider);
final themeNotifier = ref.read(themeProvider.notifier);
final isDark = Theme.of(context).brightness == Brightness.dark;
WidgetsBinding.instance.addPostFrameCallback((_) {
if (!_initialized) _syncControllers(settings);
});
@@ -66,7 +69,7 @@ class _MobileSettingsTabState extends ConsumerState<MobileSettingsTab> {
padding: const EdgeInsets.all(16),
children: [
// Header
Padding(
Padding(
padding: const EdgeInsets.only(bottom: 24),
child: Text(
'Settings',
@@ -87,7 +90,10 @@ class _MobileSettingsTabState extends ConsumerState<MobileSettingsTab> {
backgroundColor: AppColors.primary.withOpacity(0.2),
child: Text(
currentUser?.username.substring(0, 1).toUpperCase() ?? 'U',
style: const TextStyle(fontWeight: FontWeight.bold, color: AppColors.primary),
style: const TextStyle(
fontWeight: FontWeight.bold,
color: AppColors.primary,
),
),
),
const SizedBox(width: 16),
@@ -106,12 +112,22 @@ class _MobileSettingsTabState extends ConsumerState<MobileSettingsTab> {
if (currentUser?.isAdmin ?? false)
Container(
margin: const EdgeInsets.only(top: 4),
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
padding: const EdgeInsets.symmetric(
horizontal: 8,
vertical: 2,
),
decoration: BoxDecoration(
color: AppColors.primary.withOpacity(0.2),
borderRadius: BorderRadius.circular(4),
),
child: const Text('ADMIN', style: TextStyle(fontSize: 10, color: AppColors.primary, fontWeight: FontWeight.bold)),
child: const Text(
'ADMIN',
style: TextStyle(
fontSize: 10,
color: AppColors.primary,
fontWeight: FontWeight.bold,
),
),
),
],
),
@@ -131,19 +147,30 @@ class _MobileSettingsTabState extends ConsumerState<MobileSettingsTab> {
child: Column(
children: [
SwitchListTile(
title: const Text('Dark Mode', style: TextStyle(color: AppColors.textPrimary)),
secondary: Icon(isDark ? Icons.dark_mode : Icons.light_mode, color: AppColors.primary),
title: const Text(
'Dark Mode',
style: TextStyle(color: AppColors.textPrimary),
),
secondary: Icon(
isDark ? Icons.dark_mode : Icons.light_mode,
color: AppColors.primary,
),
value: isDark,
onChanged: (_) => themeNotifier.toggleTheme(),
activeColor: AppColors.primary,
activeThumbColor: AppColors.primary,
),
const Divider(height: 1),
SwitchListTile(
title: const Text('Show Clock', style: TextStyle(color: AppColors.textPrimary)),
secondary: const Icon(Icons.access_time, color: AppColors.primary),
title: const Text(
'Show Clock',
style: TextStyle(color: AppColors.textPrimary),
),
secondary:
const Icon(Icons.access_time, color: AppColors.primary),
value: settings.showClock,
onChanged: (val) => ref.read(iptvSettingsProvider.notifier).setShowClock(val),
activeColor: AppColors.primary,
onChanged: (val) =>
ref.read(iptvSettingsProvider.notifier).setShowClock(val),
activeThumbColor: AppColors.primary,
),
],
),
@@ -167,7 +194,11 @@ class _MobileSettingsTabState extends ConsumerState<MobileSettingsTab> {
items: StreamQuality.values,
labelBuilder: (v) => v.name.toUpperCase(),
onChanged: (v) {
if (v != null) ref.read(iptvSettingsProvider.notifier).setStreamQuality(v);
if (v != null) {
ref
.read(iptvSettingsProvider.notifier)
.setStreamQuality(v);
}
},
),
const Divider(height: 1),
@@ -178,19 +209,26 @@ class _MobileSettingsTabState extends ConsumerState<MobileSettingsTab> {
items: BufferSize.values,
labelBuilder: (v) => v.name.toUpperCase(),
onChanged: (v) {
if (v != null) ref.read(iptvSettingsProvider.notifier).setBufferSize(v);
if (v != null) {
ref.read(iptvSettingsProvider.notifier).setBufferSize(v);
}
},
),
const Divider(height: 1),
_DropdownSetting<ConnectionTimeout>(
label: 'Timeout',
icon: Icons.timer,
value: settings.connectionTimeout,
items: ConnectionTimeout.values,
labelBuilder: (v) => '${v.name.toUpperCase()} (${ref.read(iptvSettingsProvider).timeoutSeconds}s)',
onChanged: (v) {
if (v != null) ref.read(iptvSettingsProvider.notifier).setConnectionTimeout(v);
},
label: 'Timeout',
icon: Icons.timer,
value: settings.connectionTimeout,
items: ConnectionTimeout.values,
labelBuilder: (v) =>
'${v.name.toUpperCase()} (${ref.read(iptvSettingsProvider).timeoutSeconds}s)',
onChanged: (v) {
if (v != null) {
ref
.read(iptvSettingsProvider.notifier)
.setConnectionTimeout(v);
}
},
),
const Divider(height: 1),
_DropdownSetting<TranscodingMode>(
@@ -200,22 +238,35 @@ class _MobileSettingsTabState extends ConsumerState<MobileSettingsTab> {
items: TranscodingMode.values,
labelBuilder: (v) {
switch (v) {
case TranscodingMode.auto: return 'AUTO';
case TranscodingMode.forced: return 'TRANSCODE';
case TranscodingMode.disabled: return 'DIRECT';
case TranscodingMode.auto:
return 'AUTO';
case TranscodingMode.forced:
return 'TRANSCODE';
case TranscodingMode.disabled:
return 'DIRECT';
}
},
onChanged: (v) {
if (v != null) ref.read(iptvSettingsProvider.notifier).setTranscodingMode(v);
if (v != null) {
ref
.read(iptvSettingsProvider.notifier)
.setTranscodingMode(v);
}
},
),
const Divider(height: 1),
SwitchListTile(
title: const Text('Auto Reconnect', style: TextStyle(color: AppColors.textPrimary)),
secondary: const Icon(Icons.refresh, color: AppColors.primary),
SwitchListTile(
title: const Text(
'Auto Reconnect',
style: TextStyle(color: AppColors.textPrimary),
),
secondary:
const Icon(Icons.refresh, color: AppColors.primary),
value: settings.autoReconnect,
onChanged: (val) => ref.read(iptvSettingsProvider.notifier).setAutoReconnect(val),
activeColor: AppColors.primary,
onChanged: (val) => ref
.read(iptvSettingsProvider.notifier)
.setAutoReconnect(val),
activeThumbColor: AppColors.primary,
),
],
),
@@ -236,21 +287,27 @@ class _MobileSettingsTabState extends ConsumerState<MobileSettingsTab> {
label: 'Live TV Keywords',
icon: Icons.live_tv,
controller: _liveTvController,
onChanged: (val) => ref.read(iptvSettingsProvider.notifier).setLiveTvFilter(val),
onChanged: (val) => ref
.read(iptvSettingsProvider.notifier)
.setLiveTvFilter(val),
),
const Divider(height: 24),
_FilterInput(
label: 'Movies Keywords',
icon: Icons.movie,
controller: _moviesController,
onChanged: (val) => ref.read(iptvSettingsProvider.notifier).setMoviesFilter(val),
onChanged: (val) => ref
.read(iptvSettingsProvider.notifier)
.setMoviesFilter(val),
),
const Divider(height: 24),
_FilterInput(
label: 'Series Keywords',
icon: Icons.tv,
controller: _seriesController,
onChanged: (val) => ref.read(iptvSettingsProvider.notifier).setSeriesFilter(val),
onChanged: (val) => ref
.read(iptvSettingsProvider.notifier)
.setSeriesFilter(val),
),
],
),
@@ -271,19 +328,19 @@ class _MobileSettingsTabState extends ConsumerState<MobileSettingsTab> {
onTap: () => context.go('/playlists'),
),
const SizedBox(height: 32),
FilledButton.icon(
onPressed: () {
ref.read(authProvider.notifier).logout();
context.go('/login');
},
style: FilledButton.styleFrom(
backgroundColor: AppColors.error.withOpacity(0.1),
foregroundColor: AppColors.error,
minimumSize: const Size(double.infinity, 50),
),
icon: const Icon(Icons.logout),
label: const Text('Logout'),
onPressed: () {
ref.read(authProvider.notifier).logout();
context.go('/login');
},
style: FilledButton.styleFrom(
backgroundColor: AppColors.error.withOpacity(0.1),
foregroundColor: AppColors.error,
minimumSize: const Size(double.infinity, 50),
),
icon: const Icon(Icons.logout),
label: const Text('Logout'),
),
const SizedBox(height: 100),
],
@@ -335,10 +392,17 @@ class _FilterInput extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(label, style: const TextStyle(fontSize: 12, color: AppColors.textSecondary)),
Text(
label,
style: const TextStyle(
fontSize: 12,
color: AppColors.textSecondary,
),
),
TextField(
controller: controller,
style: const TextStyle(fontSize: 14, color: AppColors.textPrimary),
style:
const TextStyle(fontSize: 14, color: AppColors.textPrimary),
decoration: const InputDecoration(
isDense: true,
contentPadding: EdgeInsets.symmetric(vertical: 4),
@@ -435,7 +499,10 @@ class _DropdownSetting<T> extends StatelessWidget {
value: value,
underline: const SizedBox(),
dropdownColor: AppColors.surfaceVariant,
icon: const Icon(Icons.arrow_drop_down, color: AppColors.textSecondary),
icon: const Icon(
Icons.arrow_drop_down,
color: AppColors.textSecondary,
),
style: const TextStyle(color: AppColors.textPrimary),
items: items.map((item) {
return DropdownMenuItem<T>(
lib/mobile/widgets/mobile_scaffold.dart
+12 -6
View File
@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:google_fonts/google_fonts.dart';
import 'dart:ui';
import '../../core/theme/app_colors.dart';
class MobileScaffold extends ConsumerWidget {
final Widget child;
@@ -25,7 +24,7 @@ class MobileScaffold extends ConsumerWidget {
fit: StackFit.expand,
children: [
// Global Background
Container(
Container(
decoration: const BoxDecoration(
gradient: RadialGradient(
center: Alignment.center,
@@ -37,7 +36,7 @@ class MobileScaffold extends ConsumerWidget {
),
),
),
// Content
child,
],
@@ -48,7 +47,12 @@ class MobileScaffold extends ConsumerWidget {
child: Container(
decoration: BoxDecoration(
color: const Color(0xFF1C1C1E).withOpacity(0.85),
border: Border(top: BorderSide(color: Colors.white.withOpacity(0.1), width: 0.5)),
border: Border(
top: BorderSide(
color: Colors.white.withOpacity(0.1),
width: 0.5,
),
),
),
child: BottomNavigationBar(
currentIndex: currentIndex,
@@ -58,8 +62,10 @@ class MobileScaffold extends ConsumerWidget {
elevation: 0,
selectedItemColor: Colors.white,
unselectedItemColor: Colors.white38,
selectedLabelStyle: GoogleFonts.inter(fontWeight: FontWeight.w600, fontSize: 11),
unselectedLabelStyle: GoogleFonts.inter(fontWeight: FontWeight.w500, fontSize: 11),
selectedLabelStyle:
GoogleFonts.inter(fontWeight: FontWeight.w600, fontSize: 11),
unselectedLabelStyle:
GoogleFonts.inter(fontWeight: FontWeight.w500, fontSize: 11),
items: const [
BottomNavigationBarItem(
icon: Icon(Icons.live_tv_rounded),