Michael/xtremflow
1
0 Fork 0
mirror of https://github.com/R0m1k3/xtremflow.git synced 2026-10-15 03:07:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(design): Warm Cinema theme + event-driven adaptive players

Browse Source 
Replaces the Projector Noir palette with "Warm Cinema" and rebuilds the
web players around a shared, event-driven engine.

Design
- app_colors: warm charcoal (#0B0908), cream (#F3E9DF), ember (#D9541F);
  adds posterScrim/heroScrim gradients, lift()/emberFocus() shadows,
  const cream-alpha tokens replacing Colors.whiteNN, and primaryFill,
  a deeper ember reserved for text-bearing fills so white labels clear
  the 4.5:1 AA threshold that #D9541F alone does not
- app_theme / mobile_theme: Fraunces (display serif) + Karla (body),
  tighter radii, 20+ component themes
- glass_container: opaque layered surfaces replace the blurred glass
- themed_loading_screen restyled; players and boot splash follow

Performance
- drop every BackdropFilter: backdrop blur forced a full framebuffer
  read per frame per card, the main source of scroll jank
- bundle Fraunces/Karla as assets so google_fonts stops fetching from
  fonts.gstatic.com at startup
- bound image decode size on 12 sites: a 40-poster grid drops from
  ~240 MB to a few tens of MB of GPU memory

Players (new shared engine: web/xf-player-core.js)
- start on media events instead of polling the buffer every 100-200 ms
- hls.js/mpegts.js loaded on demand, so ~213 KB of mpegts is never
  fetched for HLS streams
- liveSyncDurationCount 10 -> 2, startFragPrefetch on, testBandwidth
  off, MPEG-TS initial stash 512 KB -> 64 KB
- adaptive escalation fast -> balanced -> safe after repeated stalls in
  a 60 s window, applied live for HLS so there is no visible cut

Preserved from the recent streaming work on main: server-side quality
selection, stable player viewId, the turbo direct MPEG-TS path, vendored
library cache headers and the CI/Docker changes. Only the theme layer and
the player front-end were replaced; GlassCard stays in ui_components.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
MichaelandClaude Opus 5 committed 2026-08-10 21:42:56 +02:00
1 parent e332895d7d
commit 1feeaae78a
49 files changed
+2341 -1751
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/features/admin/screens/admin_panel.dart
+7 -7
View File
@@ -152,7 +152,7 @@ class _AdminContentState extends ConsumerState<AdminContent>
const SizedBox(width: 8),
Text(
label,
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontWeight: FontWeight.w600,
fontSize: 14,
color: isSelected ? AppColors.textPrimary : AppColors.textSecondary,
@@ -265,7 +265,7 @@ class _PlaylistsTab extends ConsumerWidget {
style: Theme.of(context)
.textTheme
.titleMedium
?.copyWith(color: Colors.white),
?.copyWith(color: AppColors.onSurface),
),
const SizedBox(height: 4),
Text(
@@ -273,7 +273,7 @@ class _PlaylistsTab extends ConsumerWidget {
style: Theme.of(context)
.textTheme
.bodyMedium
?.copyWith(color: Colors.white60),
?.copyWith(color: AppColors.onSurface54),
),
],
),
@@ -282,7 +282,7 @@ class _PlaylistsTab extends ConsumerWidget {
children: [
IconButton(
icon: const Icon(Icons.edit_outlined, size: 20),
color: Colors.white70,
color: AppColors.onSurfaceVariant,
onPressed: () =>
_showPlaylistDialog(context, ref, playlist),
tooltip: 'Edit',
@@ -544,7 +544,7 @@ class _UsersTab extends ConsumerWidget {
style: Theme.of(context)
.textTheme
.titleMedium
?.copyWith(color: Colors.white),
?.copyWith(color: AppColors.onSurface),
),
if (user.isAdmin) ...[
const SizedBox(width: 8),
@@ -576,7 +576,7 @@ class _UsersTab extends ConsumerWidget {
style: Theme.of(context)
.textTheme
.bodyMedium
?.copyWith(color: Colors.white60),
?.copyWith(color: AppColors.onSurface54),
),
],
),
@@ -584,7 +584,7 @@ class _UsersTab extends ConsumerWidget {
PopupMenuButton<String>(
icon: const Icon(
Icons.more_vert,
color: Colors.white70,
color: AppColors.onSurfaceVariant,
),
color: AppColors.surface,
shape: RoundedRectangleBorder(
lib/features/auth/screens/login_screen.dart
+6 -6
View File
@@ -144,7 +144,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
// Title
Text(
'XtremFlow',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 42,
fontWeight: FontWeight.w700,
color: AppColors.textPrimary,
@@ -154,7 +154,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
const SizedBox(height: 8),
Text(
'Sign in to sync your playlists',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 18,
color: AppColors.textSecondary,
fontWeight: FontWeight.w400,
@@ -266,7 +266,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
)
: Text(
'Sign In',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
color: AppColors.primary,
fontSize: 18,
fontWeight: FontWeight.w600,
@@ -282,7 +282,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
const SizedBox(height: 32),
Text(
'Default: admin / admin',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 14,
color: AppColors.textTertiary,
),
@@ -310,13 +310,13 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
return TextFormField(
controller: controller,
obscureText: obscureText,
style: GoogleFonts.instrumentSans(fontSize: 18, color: AppColors.textPrimary),
style: GoogleFonts.karla(fontSize: 18, color: AppColors.textPrimary),
autofocus: autofocus,
textInputAction: nextFocus ? TextInputAction.next : TextInputAction.done,
onFieldSubmitted: isLast ? (_) => onSubmitted?.call() : null,
decoration: InputDecoration(
labelText: label,
labelStyle: GoogleFonts.instrumentSans(color: AppColors.textSecondary),
labelStyle: GoogleFonts.karla(color: AppColors.textSecondary),
prefixIcon: Icon(icon, color: AppColors.textSecondary),
suffixIcon: suffix,
filled: true,
lib/features/iptv/screens/player_screen.dart
+31 -31
View File
@@ -535,7 +535,7 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
'Unknown')
.toString()
: widget.title,
style: GoogleFonts.syne(
style: GoogleFonts.fraunces(
color: AppColors.textPrimary,
fontSize: 18,
fontWeight: FontWeight.w600,
@@ -544,7 +544,7 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
),
Text(
'Live TV',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
color: AppColors.primary,
fontSize: 12,
fontWeight: FontWeight.bold,
@@ -601,7 +601,7 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
_buildInlineEpg(),
const SizedBox(height: 12),
const Divider(
color: Colors.white10,
color: AppColors.onSurface06,
),
const SizedBox(height: 8),
// Control Buttons
@@ -706,10 +706,10 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
Expanded(
child: Text(
widget.title,
style: GoogleFonts.syne(
style: GoogleFonts.fraunces(
fontSize: 20,
fontWeight: FontWeight.w600,
color: Colors.white,
color: AppColors.onSurface,
),
),
),
@@ -733,7 +733,7 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
right: 40,
child: GlassContainer.glass(
borderRadius: 24,
borderColor: Colors.white.withOpacity(0.1),
borderColor: AppColors.onSurface.withOpacity(0.1),
padding: const EdgeInsets.all(24),
child: Column(
mainAxisSize: MainAxisSize.min,
@@ -747,8 +747,8 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
seconds: _currentPosition.toInt(),
),
),
style: GoogleFonts.instrumentSans(
color: Colors.white70,
style: GoogleFonts.karla(
color: AppColors.onSurfaceVariant,
),
),
const SizedBox(width: 16),
@@ -758,8 +758,8 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
trackHeight: 4,
activeTrackColor: AppColors.primary,
inactiveTrackColor:
Colors.white.withOpacity(0.2),
thumbColor: Colors.white,
AppColors.onSurface.withOpacity(0.2),
thumbColor: AppColors.onSurface,
thumbShape: const RoundSliderThumbShape(
enabledThumbRadius: 8,
),
@@ -799,8 +799,8 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
seconds: _totalDuration.toInt(),
),
),
style: GoogleFonts.instrumentSans(
color: Colors.white70,
style: GoogleFonts.karla(
color: AppColors.onSurfaceVariant,
),
),
],
@@ -892,7 +892,7 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
}) {
// Button with direct Material/InkWell - PointerInterceptor is on outer container
final button = Material(
color: transparent ? Colors.transparent : Colors.white.withOpacity(0.1),
color: transparent ? Colors.transparent : AppColors.onSurface.withOpacity(0.1),
shape: const CircleBorder(),
child: InkWell(
onTap: onTap,
@@ -905,9 +905,9 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
shape: BoxShape.circle,
border: transparent
? null
: Border.all(color: Colors.white.withOpacity(0.1)),
: Border.all(color: AppColors.onSurface.withOpacity(0.1)),
),
child: Icon(icon, color: Colors.white, size: iconSize),
child: Icon(icon, color: AppColors.onSurface, size: iconSize),
),
),
);
@@ -987,7 +987,7 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
final button = Material(
color: highlighted
? AppColors.primary.withOpacity(0.2)
: Colors.white.withOpacity(0.1),
: AppColors.onSurface.withOpacity(0.1),
shape: const CircleBorder(),
child: InkWell(
onTap: onTap,
@@ -1003,13 +1003,13 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
border: Border.all(
color: highlighted
? AppColors.primary.withOpacity(0.5)
: Colors.white.withOpacity(0.2),
: AppColors.onSurface.withOpacity(0.2),
width: highlighted ? 2 : 1,
),
),
child: Icon(
icon,
color: highlighted ? AppColors.primary : Colors.white,
color: highlighted ? AppColors.primary : AppColors.onSurface,
size: iconSize,
),
),
@@ -1048,7 +1048,7 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
child: const Text(
'LIVE',
style: TextStyle(
color: Colors.white,
color: AppColors.onSurface,
fontSize: 11,
fontWeight: FontWeight.bold,
),
@@ -1060,8 +1060,8 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
widget.channels != null
? widget.channels![_currentIndex].name
: widget.title,
style: GoogleFonts.syne(
color: Colors.white,
style: GoogleFonts.fraunces(
color: AppColors.onSurface,
fontSize: 16,
fontWeight: FontWeight.w600,
),
@@ -1096,7 +1096,7 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
child: const Text(
'LIVE',
style: TextStyle(
color: Colors.white,
color: AppColors.onSurface,
fontSize: 11,
fontWeight: FontWeight.bold,
),
@@ -1110,8 +1110,8 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
children: [
Text(
currentProgram.title,
style: GoogleFonts.syne(
color: Colors.white,
style: GoogleFonts.fraunces(
color: AppColors.onSurface,
fontSize: 15,
fontWeight: FontWeight.w600,
),
@@ -1121,8 +1121,8 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
if (currentProgram.description.isNotEmpty)
Text(
currentProgram.description,
style: GoogleFonts.instrumentSans(
color: Colors.white60,
style: GoogleFonts.karla(
color: AppColors.onSurface54,
fontSize: 12,
),
maxLines: 1,
@@ -1145,7 +1145,7 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
child: const Text(
'LIVE',
style: TextStyle(
color: Colors.white,
color: AppColors.onSurface,
fontSize: 11,
fontWeight: FontWeight.bold,
),
@@ -1156,8 +1156,8 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
widget.channels != null
? widget.channels![_currentIndex].name
: widget.title,
style: GoogleFonts.syne(
color: Colors.white,
style: GoogleFonts.fraunces(
color: AppColors.onSurface,
fontSize: 16,
fontWeight: FontWeight.w600,
),
@@ -1168,8 +1168,8 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
widget.channels != null
? widget.channels![_currentIndex].name
: widget.title,
style: GoogleFonts.syne(
color: Colors.white,
style: GoogleFonts.fraunces(
color: AppColors.onSurface,
fontSize: 16,
fontWeight: FontWeight.w600,
),
lib/features/iptv/screens/playlist_selection_screen.dart
+18 -18
View File
@@ -27,7 +27,7 @@ class PlaylistSelectionScreen extends ConsumerWidget {
appBar: AppBar(
title: Text(
'Select Playlist',
style: GoogleFonts.roboto(
style: GoogleFonts.karla(
fontWeight: FontWeight.w600,
color: AppColors.textPrimary,
),
@@ -97,7 +97,7 @@ class PlaylistSelectionScreen extends ConsumerWidget {
const SizedBox(height: 16),
Text(
'Error loading playlists',
style: GoogleFonts.syne(
style: GoogleFonts.fraunces(
fontSize: 18,
color: AppColors.textSecondary,
),
@@ -109,7 +109,7 @@ class PlaylistSelectionScreen extends ConsumerWidget {
backgroundColor: AppColors.primary,
foregroundColor: AppColors.textPrimary,
),
child: Text('Retry', style: GoogleFonts.instrumentSans()),
child: Text('Retry', style: GoogleFonts.karla()),
),
],
),
@@ -123,14 +123,14 @@ class PlaylistSelectionScreen extends ConsumerWidget {
const Icon(
Icons.playlist_remove,
size: 64,
color: Colors.white24,
color: AppColors.onSurface24,
),
const SizedBox(height: 16),
Text(
'No playlists available',
style: GoogleFonts.syne(
style: GoogleFonts.fraunces(
fontSize: 18,
color: Colors.white60,
color: AppColors.onSurface54,
),
),
const SizedBox(height: 8),
@@ -138,9 +138,9 @@ class PlaylistSelectionScreen extends ConsumerWidget {
currentUser?.isAdmin ?? false
? 'Add playlists in Admin Panel'
: 'Contact administrator',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 14,
color: Colors.white38,
color: AppColors.onSurface38,
),
),
],
@@ -209,13 +209,13 @@ class _PlaylistCardState extends State<_PlaylistCard> {
duration: const Duration(milliseconds: 200),
decoration: BoxDecoration(
color: _isHovered
? Colors.white.withOpacity(0.1)
: Colors.white.withOpacity(0.03),
? AppColors.onSurface.withOpacity(0.1)
: AppColors.onSurface.withOpacity(0.03),
borderRadius: BorderRadius.circular(24),
border: Border.all(
color: _isHovered
? AppColors.primary.withOpacity(0.5)
: Colors.white.withOpacity(0.08),
: AppColors.onSurface.withOpacity(0.08),
width: 1.5,
),
boxShadow: _isHovered
@@ -245,8 +245,8 @@ class _PlaylistCardState extends State<_PlaylistCard> {
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
Colors.white.withOpacity(0.1),
Colors.white.withOpacity(0.05),
AppColors.onSurface.withOpacity(0.1),
AppColors.onSurface.withOpacity(0.05),
],
),
shape: BoxShape.circle,
@@ -263,16 +263,16 @@ class _PlaylistCardState extends State<_PlaylistCard> {
child: Icon(
Icons.playlist_play_rounded,
size: 32,
color: _isHovered ? Colors.white : Colors.white70,
color: _isHovered ? AppColors.onSurface : AppColors.onSurfaceVariant,
),
),
const SizedBox(height: 20),
Text(
widget.playlist.name,
style: GoogleFonts.syne(
style: GoogleFonts.fraunces(
fontSize: 22,
fontWeight: FontWeight.bold,
color: Colors.white,
color: AppColors.onSurface,
height: 1.2,
),
maxLines: 2,
@@ -281,9 +281,9 @@ class _PlaylistCardState extends State<_PlaylistCard> {
const SizedBox(height: 8),
Text(
Uri.tryParse(widget.playlist.dns)?.host ?? widget.playlist.dns,
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 13,
color: Colors.white38,
color: AppColors.onSurface38,
letterSpacing: 0.5,
),
maxLines: 1,
lib/features/iptv/screens/series_detail_screen.dart
+11 -10
View File
@@ -130,6 +130,7 @@ class _SeriesDetailScreenState extends ConsumerState<SeriesDetailScreen> {
width: 248,
height: 350,
fit: BoxFit.cover,
memCacheWidth: 500,
errorWidget: (_, __, ___) => Container(
width: 248,
height: 350,
@@ -143,7 +144,7 @@ class _SeriesDetailScreenState extends ConsumerState<SeriesDetailScreen> {
// Title
Text(
_seriesInfo!.name,
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 18,
fontWeight: FontWeight.bold,
color: AppColors.onSurface,
@@ -159,7 +160,7 @@ class _SeriesDetailScreenState extends ConsumerState<SeriesDetailScreen> {
const SizedBox(width: 4),
Text(
_formatRating(_seriesInfo!.rating!)!,
style: GoogleFonts.roboto(fontSize: 13, color: AppColors.onSurfaceVariant),
style: GoogleFonts.karla(fontSize: 13, color: AppColors.onSurfaceVariant),
),
],
),
@@ -169,7 +170,7 @@ class _SeriesDetailScreenState extends ConsumerState<SeriesDetailScreen> {
if (_seriesInfo!.plot != null && _seriesInfo!.plot!.isNotEmpty)
Text(
_seriesInfo!.plot!,
style: GoogleFonts.roboto(fontSize: 12, color: AppColors.onSurfaceVariant),
style: GoogleFonts.karla(fontSize: 12, color: AppColors.onSurfaceVariant),
maxLines: 5,
overflow: TextOverflow.ellipsis,
),
@@ -178,7 +179,7 @@ class _SeriesDetailScreenState extends ConsumerState<SeriesDetailScreen> {
// Season selector
Text(
'Seasons',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 14,
fontWeight: FontWeight.w600,
color: AppColors.onSurface,
@@ -200,7 +201,7 @@ class _SeriesDetailScreenState extends ConsumerState<SeriesDetailScreen> {
},
selectedColor: AppColors.primaryContainer,
backgroundColor: AppColors.surfaceContainer,
labelStyle: GoogleFonts.instrumentSans(
labelStyle: GoogleFonts.karla(
color: isSelected ? AppColors.onPrimary : AppColors.onSurfaceVariant,
fontSize: 12,
),
@@ -224,7 +225,7 @@ class _SeriesDetailScreenState extends ConsumerState<SeriesDetailScreen> {
padding: const EdgeInsets.all(16),
child: Text(
'Season $_selectedSeason - ${currentEpisodes.length} Episodes',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 16,
fontWeight: FontWeight.w600,
color: AppColors.onSurface,
@@ -236,7 +237,7 @@ class _SeriesDetailScreenState extends ConsumerState<SeriesDetailScreen> {
? Center(
child: Text(
'No episodes found',
style: GoogleFonts.roboto(color: AppColors.onSurfaceVariant),
style: GoogleFonts.karla(color: AppColors.onSurfaceVariant),
),
)
: ListView.builder(
@@ -323,7 +324,7 @@ class _SeriesDetailScreenState extends ConsumerState<SeriesDetailScreen> {
? const Icon(Icons.check, color: AppColors.onSurface, size: 20)
: Text(
'${episode.episodeNum}',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 16,
fontWeight: FontWeight.bold,
color: AppColors.onSurface,
@@ -340,7 +341,7 @@ class _SeriesDetailScreenState extends ConsumerState<SeriesDetailScreen> {
children: [
Text(
episode.title,
style: GoogleFonts.roboto(
style: GoogleFonts.karla(
fontSize: 14,
fontWeight: FontWeight.w500,
color: isWatched ? AppColors.onSurfaceVariant : AppColors.onSurface,
@@ -351,7 +352,7 @@ class _SeriesDetailScreenState extends ConsumerState<SeriesDetailScreen> {
if (episode.durationSecs != null && episode.durationSecs! > 0)
Text(
_formatDuration(episode.durationSecs!),
style: GoogleFonts.roboto(
style: GoogleFonts.karla(
fontSize: 12,
color: AppColors.onSurfaceVariant,
),
lib/features/iptv/widgets/category_carousel.dart
+2 -2
View File
@@ -123,8 +123,8 @@ class CategoryCarousel<T> extends StatelessWidget {
end: Alignment.centerRight,
colors: [
Colors.transparent,
Colors.white,
Colors.white,
AppColors.onSurface,
AppColors.onSurface,
Colors.transparent,
],
stops: [0.0, 0.02, 0.98, 1.0],
lib/features/iptv/widgets/epg_overlay.dart
+1 -1
View File
@@ -52,7 +52,7 @@ class EpgOverlay extends ConsumerWidget {
color: AppColors.surfaceContainerLow
.withOpacity(0.85), // Match Native player controls
borderRadius: BorderRadius.circular(24),
border: Border.all(color: Colors.white.withOpacity(0.1)),
border: Border.all(color: AppColors.onSurface.withOpacity(0.1)),
),
child: Row(
mainAxisSize: MainAxisSize.min,
lib/features/iptv/widgets/epg_widget.dart
+3 -3
View File
@@ -99,7 +99,7 @@ class _EPGWidgetState extends ConsumerState<EPGWidget> {
),
child: Text(
'LIVE',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 9,
fontWeight: FontWeight.bold,
color: AppColors.onSurface,
@@ -110,7 +110,7 @@ class _EPGWidgetState extends ConsumerState<EPGWidget> {
Expanded(
child: Text(
_epg!.nowPlaying!,
style: GoogleFonts.roboto(
style: GoogleFonts.karla(
fontSize: 11,
fontWeight: FontWeight.w600,
color: AppColors.onSurface,
@@ -151,7 +151,7 @@ class _EPGWidgetState extends ConsumerState<EPGWidget> {
Expanded(
child: Text(
'Next: ${_epg!.nextPlaying}',
style: GoogleFonts.roboto(
style: GoogleFonts.karla(
fontSize: 10,
color: AppColors.outline,
),
lib/features/iptv/widgets/live_tv_tab.dart
+34 -32
View File
@@ -63,7 +63,7 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
body: channelsAsync.when(
loading: () => const ThemedLoading(),
error: (e, s) => Center(
child: Text('Error: $e', style: const TextStyle(color: Colors.white)),
child: Text('Error: $e', style: const TextStyle(color: AppColors.onSurface)),
),
data: (groupedChannels) {
var categories = groupedChannels.keys.toList();
@@ -118,12 +118,12 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
child: Container(
padding: const EdgeInsets.all(8),
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.1),
color: AppColors.onSurface.withOpacity(0.1),
shape: BoxShape.circle,
),
child: const Icon(
Icons.arrow_back,
color: Colors.white,
color: AppColors.onSurface,
),
),
),
@@ -137,10 +137,10 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
: _showFavoritesOnly
? 'Favorites'
: _selectedCategory ?? 'Live TV',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 24,
fontWeight: FontWeight.w700,
color: Colors.white,
color: AppColors.onSurface,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
@@ -152,17 +152,17 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
width: 250,
height: 44,
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.1),
color: AppColors.onSurface.withOpacity(0.1),
borderRadius: BorderRadius.circular(12),
),
child: TextField(
controller: _searchController,
style: GoogleFonts.instrumentSans(color: Colors.white),
style: GoogleFonts.karla(color: AppColors.onSurface),
decoration: InputDecoration(
hintText: 'Search channels...',
hintStyle: GoogleFonts.instrumentSans(color: Colors.white54),
hintStyle: GoogleFonts.karla(color: AppColors.onSurface54),
prefixIcon:
const Icon(Icons.search, color: Colors.white54),
const Icon(Icons.search, color: AppColors.onSurface54),
border: InputBorder.none,
contentPadding: const EdgeInsets.symmetric(
horizontal: 16,
@@ -172,7 +172,7 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
? IconButton(
icon: const Icon(
Icons.clear,
color: Colors.white,
color: AppColors.onSurface,
),
onPressed: _searchController.clear,
)
@@ -197,7 +197,7 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
decoration: BoxDecoration(
color: _showFavoritesOnly
? AppColors.live.withOpacity(0.2)
: Colors.white.withOpacity(0.1),
: AppColors.onSurface.withOpacity(0.1),
borderRadius: BorderRadius.circular(12),
border: _showFavoritesOnly
? Border.all(color: AppColors.live)
@@ -209,7 +209,7 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
: Icons.favorite_border,
color: _showFavoritesOnly
? AppColors.live
: Colors.white,
: AppColors.onSurface,
),
),
),
@@ -230,13 +230,13 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
Icon(
Icons.tv_off,
size: 64,
color: Colors.white.withOpacity(0.3),
color: AppColors.onSurface.withOpacity(0.3),
),
const SizedBox(height: 16),
Text(
'No channels found',
style: GoogleFonts.instrumentSans(
color: Colors.white54,
style: GoogleFonts.karla(
color: AppColors.onSurface54,
fontSize: 18,
),
),
@@ -310,7 +310,7 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
children: [
Icon(
Icons.folder_copy_outlined,
color: Colors.white.withOpacity(0.9),
color: AppColors.onSurface.withOpacity(0.9),
size: 32,
),
const SizedBox(height: 12),
@@ -319,10 +319,10 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
child: Text(
category,
textAlign: TextAlign.center,
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 16,
fontWeight: FontWeight.w600,
color: Colors.white,
color: AppColors.onSurface,
),
maxLines: 2,
overflow: TextOverflow.ellipsis,
@@ -331,9 +331,9 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
const SizedBox(height: 4),
Text(
'$count Channels',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 13,
color: Colors.white54,
color: AppColors.onSurface54,
),
),
],
@@ -386,7 +386,7 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
Expanded(
child: Container(
decoration: BoxDecoration(
color: Colors.white.withOpacity(
color: AppColors.onSurface.withOpacity(
0.05,
), // Subtle transparent background
borderRadius: const BorderRadius.vertical(
@@ -398,18 +398,20 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
child: channel.streamIcon.isNotEmpty
? Image.network(
_getProxiedIconUrl(channel.streamIcon)!,
cacheWidth: 160,
filterQuality: FilterQuality.low,
errorBuilder: (_, __, ___) => Icon(
Icons.tv,
color: Colors.white.withOpacity(0.3),
color: AppColors.onSurface.withOpacity(0.3),
size: 40,
),
)
: Text(
channel.name.characters.first.toUpperCase(),
style: GoogleFonts.syne(
style: GoogleFonts.fraunces(
fontSize: 40,
fontWeight: FontWeight.bold,
color: Colors.white24,
color: AppColors.onSurface24,
),
),
),
@@ -427,8 +429,8 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
children: [
Text(
channel.name,
style: GoogleFonts.instrumentSans(
color: Colors.white,
style: GoogleFonts.karla(
color: AppColors.onSurface,
fontSize: 13,
fontWeight: FontWeight.w500,
),
@@ -452,8 +454,8 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
if (epgList.isEmpty) {
return Text(
'No Info',
style: GoogleFonts.instrumentSans(
color: Colors.white54,
style: GoogleFonts.karla(
color: AppColors.onSurface54,
fontSize: 10,
),
);
@@ -480,7 +482,7 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
return Text(
currentProgram.title,
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
color: AppColors.ratingGold,
fontSize: 10,
fontWeight: FontWeight.w600,
@@ -491,14 +493,14 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
},
loading: () => Text(
'...',
style: GoogleFonts.instrumentSans(
color: Colors.white24,
style: GoogleFonts.karla(
color: AppColors.onSurface24,
fontSize: 10,
),
),
error: (_, __) => Text(
'Err',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
color: Colors.red,
fontSize: 10,
),
lib/features/iptv/widgets/movies_tab.dart
+8 -6
View File
@@ -219,7 +219,7 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
children: [
Text(
'Movies',
style: GoogleFonts.syne(
style: GoogleFonts.fraunces(
fontSize: 24,
fontWeight: FontWeight.w700,
color: AppColors.onSurface,
@@ -251,14 +251,14 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
Expanded(
child: TextField(
controller: _searchController,
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 14,
color: AppColors.onSurface,
),
decoration: InputDecoration(
hintText: 'Search movies...',
hintStyle:
GoogleFonts.instrumentSans(color: AppColors.outline),
GoogleFonts.karla(color: AppColors.outline),
border: InputBorder.none,
isDense: true,
contentPadding:
@@ -353,6 +353,8 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
? Image.network(
_getProxiedImageUrl(movie.streamIcon),
fit: BoxFit.cover,
cacheWidth: 400,
filterQuality: FilterQuality.low,
errorBuilder: (ctx, err, stack) => Container(
color: AppColors.surfaceContainerLow,
child: Center(
@@ -426,7 +428,7 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
const SizedBox(width: 4),
Text(
_formatRating(movie.rating)!,
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 10,
fontWeight: FontWeight.bold,
color: AppColors.onSurface,
@@ -448,7 +450,7 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
children: [
Text(
movie.name,
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
color: AppColors.onSurface,
fontSize: 13,
fontWeight: FontWeight.w600,
@@ -467,7 +469,7 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
padding: const EdgeInsets.only(top: 4),
child: Text(
'WATCHED',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
color: AppColors.primary,
fontSize: 10,
fontWeight: FontWeight.bold,
lib/features/iptv/widgets/quality_selector_widget.dart
+5 -5
View File
@@ -64,7 +64,7 @@ class QualitySelectorButton extends StatelessWidget {
Text(
q.label,
overflow: TextOverflow.ellipsis,
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
color: AppColors.textPrimary,
fontWeight: FontWeight.w600,
fontSize: 14,
@@ -73,7 +73,7 @@ class QualitySelectorButton extends StatelessWidget {
Text(
q.description,
overflow: TextOverflow.ellipsis,
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
color: AppColors.textTertiary,
fontSize: 11,
),
@@ -91,13 +91,13 @@ class QualitySelectorButton extends StatelessWidget {
height: size,
alignment: Alignment.center,
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.1),
color: AppColors.onSurface.withOpacity(0.1),
shape: BoxShape.circle,
border: Border.all(color: Colors.white.withOpacity(0.2)),
border: Border.all(color: AppColors.onSurface.withOpacity(0.2)),
),
child: const Icon(
Icons.high_quality_rounded,
color: Colors.white,
color: AppColors.onSurface,
size: 22,
),
),
lib/features/iptv/widgets/recording_modal.dart
+14 -14
View File
@@ -106,7 +106,7 @@ class _RecordingModalState extends State<RecordingModal> {
Expanded(
child: Text(
'Programmer un enregistrement',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 20,
fontWeight: FontWeight.bold,
color: AppColors.onSurface,
@@ -120,12 +120,12 @@ class _RecordingModalState extends State<RecordingModal> {
// Informations Chaine
Text(
'Chaîne ciblée :',
style: GoogleFonts.instrumentSans(color: AppColors.onSurfaceVariant, fontSize: 14),
style: GoogleFonts.karla(color: AppColors.onSurfaceVariant, fontSize: 14),
),
const SizedBox(height: 8),
Text(
widget.channel.name,
style: GoogleFonts.instrumentSans(color: AppColors.onSurface, fontSize: 18),
style: GoogleFonts.karla(color: AppColors.onSurface, fontSize: 18),
),
const SizedBox(height: 24),
@@ -139,7 +139,7 @@ class _RecordingModalState extends State<RecordingModal> {
children: [
Text(
'Date :',
style: GoogleFonts.instrumentSans(color: AppColors.onSurfaceVariant, fontSize: 14),
style: GoogleFonts.karla(color: AppColors.onSurfaceVariant, fontSize: 14),
),
const SizedBox(height: 8),
TvFocusableCard(
@@ -163,7 +163,7 @@ class _RecordingModalState extends State<RecordingModal> {
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 12),
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.1),
color: AppColors.onSurface.withOpacity(0.1),
borderRadius: BorderRadius.circular(8),
),
child: Row(
@@ -173,7 +173,7 @@ class _RecordingModalState extends State<RecordingModal> {
Expanded(
child: Text(
'${_startTime.day.toString().padLeft(2, '0')}/${_startTime.month.toString().padLeft(2, '0')}/${_startTime.year}',
style: GoogleFonts.instrumentSans(color: AppColors.onSurface),
style: GoogleFonts.karla(color: AppColors.onSurface),
overflow: TextOverflow.ellipsis,
),
),
@@ -193,7 +193,7 @@ class _RecordingModalState extends State<RecordingModal> {
children: [
Text(
'Heure :',
style: GoogleFonts.instrumentSans(color: AppColors.onSurfaceVariant, fontSize: 14),
style: GoogleFonts.karla(color: AppColors.onSurfaceVariant, fontSize: 14),
),
const SizedBox(height: 8),
TvFocusableCard(
@@ -226,7 +226,7 @@ class _RecordingModalState extends State<RecordingModal> {
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 12),
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.1),
color: AppColors.onSurface.withOpacity(0.1),
borderRadius: BorderRadius.circular(8),
),
child: Row(
@@ -236,7 +236,7 @@ class _RecordingModalState extends State<RecordingModal> {
Expanded(
child: Text(
'${_startTime.hour.toString().padLeft(2, '0')}:${_startTime.minute.toString().padLeft(2, '0')}',
style: GoogleFonts.instrumentSans(color: AppColors.onSurface),
style: GoogleFonts.karla(color: AppColors.onSurface),
),
),
],
@@ -255,7 +255,7 @@ class _RecordingModalState extends State<RecordingModal> {
children: [
Text(
'Durée (min) :',
style: GoogleFonts.instrumentSans(color: AppColors.onSurfaceVariant, fontSize: 14),
style: GoogleFonts.karla(color: AppColors.onSurfaceVariant, fontSize: 14),
),
const SizedBox(height: 8),
GlassContainer.glass(
@@ -277,7 +277,7 @@ class _RecordingModalState extends State<RecordingModal> {
child: Text(
'$_durationMinutes',
textAlign: TextAlign.center,
style: GoogleFonts.instrumentSans(color: AppColors.onSurface),
style: GoogleFonts.karla(color: AppColors.onSurface),
),
),
IconButton(
@@ -308,7 +308,7 @@ class _RecordingModalState extends State<RecordingModal> {
onPressed: _isLoading ? null : () => Navigator.of(context).pop(),
child: Text(
'Annuler',
style: GoogleFonts.instrumentSans(color: AppColors.onSurfaceVariant),
style: GoogleFonts.karla(color: AppColors.onSurfaceVariant),
),
),
const SizedBox(width: 16),
@@ -328,7 +328,7 @@ class _RecordingModalState extends State<RecordingModal> {
)
: Text(
'Enregistrer de suite',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
color: AppColors.onSurface,
fontWeight: FontWeight.bold,
),
@@ -352,7 +352,7 @@ class _RecordingModalState extends State<RecordingModal> {
)
: Text(
'Programmer',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
color: AppColors.onSurface,
fontWeight: FontWeight.bold,
),
lib/features/iptv/widgets/recordings_tab.dart
+73 -72
View File
@@ -34,14 +34,14 @@ class _RecordingsTabState extends State<RecordingsTab> {
color: Colors.grey[900],
child: const Row(
children: [
Icon(Icons.videocam, color: Colors.white, size: 28),
Icon(Icons.videocam, color: AppColors.onSurface, size: 28),
SizedBox(width: 12),
Text(
'Enregistrements',
style: TextStyle(
fontSize: 26,
fontWeight: FontWeight.bold,
color: Colors.white,
color: AppColors.onSurface,
),
),
],
@@ -183,8 +183,8 @@ class _EpgGuideViewState extends ConsumerState<_EpgGuideView>
children: [
Text(
'GROUPES',
style: GoogleFonts.syne(
color: Colors.white38,
style: GoogleFonts.fraunces(
color: AppColors.onSurface38,
fontSize: 10,
fontWeight: FontWeight.bold,
letterSpacing: 1.2,
@@ -211,16 +211,16 @@ class _EpgGuideViewState extends ConsumerState<_EpgGuideView>
margin: const EdgeInsets.only(bottom: 4),
decoration: BoxDecoration(
color: isSelected
? Colors.white.withOpacity(0.1)
? AppColors.onSurface.withOpacity(0.1)
: Colors.transparent,
borderRadius: BorderRadius.circular(8),
),
child: Text(
cat,
style: GoogleFonts.syne(
style: GoogleFonts.fraunces(
color: isSelected
? Colors.white
: Colors.white60,
? AppColors.onSurface
: AppColors.onSurface54,
fontSize: 12,
fontWeight: isSelected
? FontWeight.bold
@@ -238,7 +238,7 @@ class _EpgGuideViewState extends ConsumerState<_EpgGuideView>
),
),
const VerticalDivider(width: 32, color: Colors.white10),
const VerticalDivider(width: 32, color: AppColors.onSurface06),
// ── Colonne 2 : CHAÎNES ──
SizedBox(
@@ -248,20 +248,20 @@ class _EpgGuideViewState extends ConsumerState<_EpgGuideView>
// Barre de recherche
TextField(
controller: _searchCtrl,
style: const TextStyle(color: Colors.white, fontSize: 13),
style: const TextStyle(color: AppColors.onSurface, fontSize: 13),
decoration: InputDecoration(
hintText: 'Rechercher...',
hintStyle: const TextStyle(
color: Colors.white38,
color: AppColors.onSurface38,
fontSize: 13,
),
prefixIcon: const Icon(
Icons.search,
color: Colors.white38,
color: AppColors.onSurface38,
size: 18,
),
filled: true,
fillColor: Colors.white.withOpacity(0.07),
fillColor: AppColors.onSurface.withOpacity(0.07),
contentPadding: const EdgeInsets.symmetric(vertical: 8),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(10),
@@ -276,7 +276,7 @@ class _EpgGuideViewState extends ConsumerState<_EpgGuideView>
child: Text(
'Aucune chaîne',
style: TextStyle(
color: Colors.white24,
color: AppColors.onSurface24,
fontSize: 12,
),
),
@@ -299,7 +299,7 @@ class _EpgGuideViewState extends ConsumerState<_EpgGuideView>
decoration: BoxDecoration(
color: isSelected
? Colors.redAccent.withOpacity(0.2)
: Colors.white.withOpacity(0.05),
: AppColors.onSurface.withOpacity(0.05),
borderRadius: BorderRadius.circular(8),
border: Border.all(
color: isSelected
@@ -314,27 +314,28 @@ class _EpgGuideViewState extends ConsumerState<_EpgGuideView>
ch.streamIcon,
width: 24,
height: 16,
cacheWidth: 64,
fit: BoxFit.contain,
errorBuilder: (_, __, ___) =>
const Icon(
Icons.tv,
color: Colors.white24,
color: AppColors.onSurface24,
size: 16,
),
)
: const Icon(
Icons.tv,
color: Colors.white24,
color: AppColors.onSurface24,
size: 16,
),
const SizedBox(width: 10),
Expanded(
child: Text(
ch.name,
style: GoogleFonts.syne(
style: GoogleFonts.fraunces(
color: isSelected
? Colors.white
: Colors.white70,
? AppColors.onSurface
: AppColors.onSurfaceVariant,
fontSize: 12,
),
maxLines: 1,
@@ -352,7 +353,7 @@ class _EpgGuideViewState extends ConsumerState<_EpgGuideView>
),
),
const VerticalDivider(width: 32, color: Colors.white10),
const VerticalDivider(width: 32, color: AppColors.onSurface06),
// ── Colonne droite : programmes EPG ──
Expanded(
@@ -370,8 +371,8 @@ class _EpgGuideViewState extends ConsumerState<_EpgGuideView>
Text(
'Sélectionnez une chaîne\npour voir son guide des programmes',
textAlign: TextAlign.center,
style: GoogleFonts.syne(
color: Colors.white38,
style: GoogleFonts.fraunces(
color: AppColors.onSurface38,
fontSize: 15,
),
),
@@ -385,8 +386,8 @@ class _EpgGuideViewState extends ConsumerState<_EpgGuideView>
children: [
Text(
_selectedChannel!.name,
style: GoogleFonts.syne(
color: Colors.white,
style: GoogleFonts.fraunces(
color: AppColors.onSurface,
fontWeight: FontWeight.bold,
fontSize: 16,
),
@@ -395,7 +396,7 @@ class _EpgGuideViewState extends ConsumerState<_EpgGuideView>
IconButton(
icon: const Icon(
Icons.refresh,
color: Colors.white54,
color: AppColors.onSurface54,
size: 18,
),
tooltip: 'Recharger l\'EPG',
@@ -403,7 +404,7 @@ class _EpgGuideViewState extends ConsumerState<_EpgGuideView>
),
],
),
const Divider(color: Colors.white12),
const Divider(color: AppColors.onSurface12),
Expanded(
child: _loadingEpg
? const Center(
@@ -425,8 +426,8 @@ class _EpgGuideViewState extends ConsumerState<_EpgGuideView>
child: Text(
'Aucun programme EPG disponible\npour cette chaîne',
textAlign: TextAlign.center,
style: GoogleFonts.syne(
color: Colors.white38,
style: GoogleFonts.fraunces(
color: AppColors.onSurface38,
),
),
)
@@ -525,7 +526,7 @@ class _ProgrammeCard extends StatelessWidget {
Expanded(
child: Text(
'Enregistrer',
style: GoogleFonts.syne(color: Colors.white),
style: GoogleFonts.fraunces(color: AppColors.onSurface),
),
),
],
@@ -536,8 +537,8 @@ class _ProgrammeCard extends StatelessWidget {
children: [
Text(
title.isEmpty ? channel.name : title,
style: GoogleFonts.syne(
color: Colors.white,
style: GoogleFonts.fraunces(
color: AppColors.onSurface,
fontWeight: FontWeight.bold,
fontSize: 16,
),
@@ -545,7 +546,7 @@ class _ProgrammeCard extends StatelessWidget {
const SizedBox(height: 8),
Text(
'${_fmt(_start)} → ${_fmt(_end)}',
style: const TextStyle(color: Colors.white70),
style: const TextStyle(color: AppColors.onSurfaceVariant),
),
if (_description.isNotEmpty) ...[
const SizedBox(height: 8),
@@ -553,7 +554,7 @@ class _ProgrammeCard extends StatelessWidget {
_description,
maxLines: 3,
overflow: TextOverflow.ellipsis,
style: const TextStyle(color: Colors.white38, fontSize: 12),
style: const TextStyle(color: AppColors.onSurface38, fontSize: 12),
),
],
],
@@ -632,13 +633,13 @@ class _ProgrammeCard extends StatelessWidget {
color: isNow
? Colors.red.withOpacity(0.15)
: isPast
? Colors.white.withOpacity(0.03)
: Colors.white.withOpacity(0.06),
? AppColors.onSurface.withOpacity(0.03)
: AppColors.onSurface.withOpacity(0.06),
borderRadius: BorderRadius.circular(10),
border: Border.all(
color: isNow
? Colors.redAccent.withOpacity(0.4)
: Colors.white.withOpacity(0.07),
: AppColors.onSurface.withOpacity(0.07),
),
),
child: ListTile(
@@ -658,8 +659,8 @@ class _ProgrammeCard extends StatelessWidget {
),
child: Text(
'LIVE',
style: GoogleFonts.syne(
color: Colors.white,
style: GoogleFonts.fraunces(
color: AppColors.onSurface,
fontSize: 8,
fontWeight: FontWeight.bold,
),
@@ -668,8 +669,8 @@ class _ProgrammeCard extends StatelessWidget {
else
Text(
_fmt(_start),
style: GoogleFonts.syne(
color: isPast ? Colors.white24 : Colors.white70,
style: GoogleFonts.fraunces(
color: isPast ? AppColors.onSurface24 : AppColors.onSurfaceVariant,
fontSize: 13,
fontWeight: FontWeight.w600,
),
@@ -678,15 +679,15 @@ class _ProgrammeCard extends StatelessWidget {
Text(
_fmt(_end),
style:
GoogleFonts.syne(color: Colors.white24, fontSize: 10),
GoogleFonts.fraunces(color: AppColors.onSurface24, fontSize: 10),
),
],
),
),
title: Text(
_title.isEmpty ? '—' : _title,
style: GoogleFonts.syne(
color: isPast ? Colors.white38 : Colors.white,
style: GoogleFonts.fraunces(
color: isPast ? AppColors.onSurface38 : AppColors.onSurface,
fontWeight: isNow ? FontWeight.bold : FontWeight.normal,
),
maxLines: 2,
@@ -697,7 +698,7 @@ class _ProgrammeCard extends StatelessWidget {
_description,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: const TextStyle(color: Colors.white38, fontSize: 11),
style: const TextStyle(color: AppColors.onSurface38, fontSize: 11),
)
: null,
trailing: !isPast
@@ -827,7 +828,7 @@ class _RecordingsListViewState extends State<_RecordingsListView> {
backgroundColor: AppColors.surfaceContainer,
title: Text(
title,
style: GoogleFonts.syne(color: Colors.white, fontSize: 14),
style: GoogleFonts.fraunces(color: AppColors.onSurface, fontSize: 14),
),
content: SizedBox(
width: 500,
@@ -836,7 +837,7 @@ class _RecordingsListViewState extends State<_RecordingsListView> {
child: Text(
content,
style: const TextStyle(
color: Colors.white70,
color: AppColors.onSurfaceVariant,
fontSize: 11,
fontFamily: 'monospace',
),
@@ -895,7 +896,7 @@ class _RecordingsListViewState extends State<_RecordingsListView> {
mainAxisAlignment: MainAxisAlignment.end,
children: [
IconButton(
icon: const Icon(Icons.refresh, color: Colors.white70),
icon: const Icon(Icons.refresh, color: AppColors.onSurfaceVariant),
onPressed: _fetchRecordings,
tooltip: 'Rafraîchir',
),
@@ -924,8 +925,8 @@ class _RecordingsListViewState extends State<_RecordingsListView> {
const SizedBox(height: 16),
Text(
'Aucun enregistrement',
style: GoogleFonts.syne(
color: Colors.white38,
style: GoogleFonts.fraunces(
color: AppColors.onSurface38,
fontSize: 16,
),
),
@@ -942,10 +943,10 @@ class _RecordingsListViewState extends State<_RecordingsListView> {
return Container(
margin: const EdgeInsets.only(bottom: 8),
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.05),
color: AppColors.onSurface.withOpacity(0.05),
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: Colors.white.withOpacity(0.1),
color: AppColors.onSurface.withOpacity(0.1),
),
),
child: ListTile(
@@ -962,8 +963,8 @@ class _RecordingsListViewState extends State<_RecordingsListView> {
),
title: Text(
rec['title'] ?? '—',
style: GoogleFonts.syne(
color: Colors.white,
style: GoogleFonts.fraunces(
color: AppColors.onSurface,
fontWeight: FontWeight.w600,
),
),
@@ -974,7 +975,7 @@ class _RecordingsListViewState extends State<_RecordingsListView> {
Text(
'${_fmtDate(rec['start_time'])} → ${_fmtDate(rec['end_time'])}',
style: const TextStyle(
color: Colors.white54,
color: AppColors.onSurface54,
fontSize: 12,
),
),
@@ -1051,7 +1052,7 @@ class _RecordingsListViewState extends State<_RecordingsListView> {
IconButton(
icon: const Icon(
Icons.delete_outline,
color: Colors.white38,
color: AppColors.onSurface38,
size: 20,
),
tooltip: 'Supprimer',
@@ -1132,7 +1133,7 @@ class _SeasonPassesViewState extends State<_SeasonPassesView> {
const SizedBox(width: 8),
Text(
'Nouveau Season Pass',
style: GoogleFonts.syne(color: Colors.white),
style: GoogleFonts.fraunces(color: AppColors.onSurface),
),
],
),
@@ -1143,7 +1144,7 @@ class _SeasonPassesViewState extends State<_SeasonPassesView> {
children: [
Text(
'Enregistre automatiquement toutes les nouvelles diffusions d\'une émission.',
style: GoogleFonts.syne(color: Colors.white54, fontSize: 13),
style: GoogleFonts.fraunces(color: AppColors.onSurface54, fontSize: 13),
),
const SizedBox(height: 16),
_buildField(
@@ -1206,12 +1207,12 @@ class _SeasonPassesViewState extends State<_SeasonPassesView> {
Widget _buildField(TextEditingController c, String label) {
return TextField(
controller: c,
style: const TextStyle(color: Colors.white),
style: const TextStyle(color: AppColors.onSurface),
decoration: InputDecoration(
labelText: label,
labelStyle: const TextStyle(color: Colors.white54, fontSize: 12),
labelStyle: const TextStyle(color: AppColors.onSurface54, fontSize: 12),
enabledBorder: const UnderlineInputBorder(
borderSide: BorderSide(color: Colors.white24),
borderSide: BorderSide(color: AppColors.onSurface24),
),
focusedBorder: const UnderlineInputBorder(
borderSide: BorderSide(color: Colors.purpleAccent),
@@ -1231,7 +1232,7 @@ class _SeasonPassesViewState extends State<_SeasonPassesView> {
children: [
Text(
'Enregistrements automatiques',
style: GoogleFonts.syne(color: Colors.white54, fontSize: 13),
style: GoogleFonts.fraunces(color: AppColors.onSurface54, fontSize: 13),
),
ElevatedButton.icon(
style: ElevatedButton.styleFrom(
@@ -1262,7 +1263,7 @@ class _SeasonPassesViewState extends State<_SeasonPassesView> {
Expanded(
child: Text(
'Scanne l\'EPG toutes les 4h et programme automatiquement les nouvelles diffusions. Seuls les nouveaux épisodes sont enregistrés.',
style: GoogleFonts.syne(
style: GoogleFonts.fraunces(
color: Colors.purpleAccent.shade100,
fontSize: 12,
),
@@ -1288,16 +1289,16 @@ class _SeasonPassesViewState extends State<_SeasonPassesView> {
const SizedBox(height: 16),
Text(
'Aucun Season Pass actif',
style: GoogleFonts.syne(
color: Colors.white38,
style: GoogleFonts.fraunces(
color: AppColors.onSurface38,
fontSize: 16,
),
),
const SizedBox(height: 8),
Text(
'Créez-en un pour enregistrer automatiquement vos émissions préférées',
style: GoogleFonts.syne(
color: Colors.white24,
style: GoogleFonts.fraunces(
color: AppColors.onSurface24,
fontSize: 12,
),
textAlign: TextAlign.center,
@@ -1325,8 +1326,8 @@ class _SeasonPassesViewState extends State<_SeasonPassesView> {
),
title: Text(
p['show_title'] ?? '—',
style: GoogleFonts.syne(
color: Colors.white,
style: GoogleFonts.fraunces(
color: AppColors.onSurface,
fontWeight: FontWeight.w600,
),
),
@@ -1336,14 +1337,14 @@ class _SeasonPassesViewState extends State<_SeasonPassesView> {
Text(
'Chaîne : ${p['channel_id']}',
style: const TextStyle(
color: Colors.white54,
color: AppColors.onSurface54,
fontSize: 11,
),
),
Text(
'Flux : ${p['stream_url']}',
style: const TextStyle(
color: Colors.white38,
color: AppColors.onSurface38,
fontSize: 10,
),
),
@@ -1352,7 +1353,7 @@ class _SeasonPassesViewState extends State<_SeasonPassesView> {
trailing: IconButton(
icon: const Icon(
Icons.delete_outline,
color: Colors.white38,
color: AppColors.onSurface38,
),
tooltip: 'Supprimer',
onPressed: () =>
lib/features/iptv/widgets/series_tab.dart
+7 -5
View File
@@ -199,7 +199,7 @@ class _SeriesTabState extends ConsumerState<SeriesTab> {
children: [
Text(
'TV Series',
style: GoogleFonts.syne(
style: GoogleFonts.fraunces(
fontSize: 24,
fontWeight: FontWeight.w700,
color: AppColors.onSurface,
@@ -229,14 +229,14 @@ class _SeriesTabState extends ConsumerState<SeriesTab> {
Expanded(
child: TextField(
controller: _searchController,
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 14,
color: AppColors.onSurface,
),
decoration: InputDecoration(
hintText: 'Search series...',
hintStyle:
GoogleFonts.instrumentSans(color: AppColors.outline),
GoogleFonts.karla(color: AppColors.outline),
border: InputBorder.none,
isDense: true,
contentPadding:
@@ -344,6 +344,8 @@ class _SeriesTabState extends ConsumerState<SeriesTab> {
? Image.network(
_getProxiedImageUrl(serie.cover),
fit: BoxFit.cover,
cacheWidth: 400,
filterQuality: FilterQuality.low,
errorBuilder: (ctx, err, stack) => Container(
color: AppColors.surfaceContainerLow,
child: Center(
@@ -397,7 +399,7 @@ class _SeriesTabState extends ConsumerState<SeriesTab> {
bottom: 12,
child: Text(
serie.name,
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
color: AppColors.onSurface,
fontSize: 13,
fontWeight: FontWeight.w600,
@@ -440,7 +442,7 @@ class _SeriesTabState extends ConsumerState<SeriesTab> {
const SizedBox(width: 4),
Text(
_formatRating(serie.rating)!,
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 10,
fontWeight: FontWeight.bold,
color: AppColors.onSurface,
lib/features/iptv/widgets/settings_tab.dart
+18 -18
View File
@@ -155,7 +155,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab>
const SizedBox(width: 12),
Text(
'Thème',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 18,
fontWeight: FontWeight.w600,
color: AppColors.onSurface,
@@ -212,7 +212,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab>
),
title: Text(
'Mode actuel',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontWeight: FontWeight.w500,
color: AppColors.onSurface,
),
@@ -279,7 +279,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab>
children: [
Text(
title,
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontWeight: FontWeight.w600,
color: isSelected
? colorScheme.primary
@@ -288,7 +288,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab>
),
Text(
subtitle,
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 12,
color: colorScheme.onSurfaceVariant,
),
@@ -327,11 +327,11 @@ class _SettingsTabState extends ConsumerState<SettingsTab>
leading: const Icon(Icons.person, color: AppColors.onSurface),
title: Text(
'Connecté en tant que',
style: GoogleFonts.instrumentSans(fontSize: 12, color: AppColors.onSurfaceVariant),
style: GoogleFonts.karla(fontSize: 12, color: AppColors.onSurfaceVariant),
),
subtitle: Text(
currentUser?.username ?? 'Unknown',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontWeight: FontWeight.w600,
color: AppColors.onSurface,
),
@@ -340,7 +340,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab>
? Chip(
label: Text(
'Admin',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 11,
color: AppColors.onPrimaryContainer,
),
@@ -355,7 +355,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab>
// Category filters section
Text(
'Filtres de Catégories',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontWeight: FontWeight.bold,
fontSize: 16,
color: AppColors.onSurface,
@@ -364,7 +364,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab>
const SizedBox(height: 4),
Text(
'Seules les catégories contenant un de ces mots-clés seront affichées. Séparez par des virgules.',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 12,
color: AppColors.onSurfaceVariant,
),
@@ -430,7 +430,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab>
leading: const Icon(Icons.playlist_play, color: AppColors.onSurface),
title: Text(
'Changer de Playlist',
style: GoogleFonts.instrumentSans(color: AppColors.onSurface),
style: GoogleFonts.karla(color: AppColors.onSurface),
),
trailing: const Icon(Icons.chevron_right, color: AppColors.onSurfaceVariant),
onTap: () => context.go('/playlists'),
@@ -449,11 +449,11 @@ class _SettingsTabState extends ConsumerState<SettingsTab>
leading: const Icon(Icons.info_outline, color: AppColors.onSurface),
title: Text(
'À propos',
style: GoogleFonts.instrumentSans(color: AppColors.onSurface),
style: GoogleFonts.karla(color: AppColors.onSurface),
),
subtitle: Text(
'XtremFlow IPTV v1.0.0',
style: GoogleFonts.instrumentSans(fontSize: 12, color: AppColors.onSurfaceVariant),
style: GoogleFonts.karla(fontSize: 12, color: AppColors.onSurfaceVariant),
),
),
),
@@ -470,11 +470,11 @@ class _SettingsTabState extends ConsumerState<SettingsTab>
leading: const Icon(Icons.cleaning_services, color: AppColors.warning),
title: Text(
'Maintenance',
style: GoogleFonts.instrumentSans(color: AppColors.onSurface),
style: GoogleFonts.karla(color: AppColors.onSurface),
),
subtitle: Text(
'En cas de problèmes d\'affichage ou de mise à jour',
style: GoogleFonts.instrumentSans(fontSize: 12, color: AppColors.onSurfaceVariant),
style: GoogleFonts.karla(fontSize: 12, color: AppColors.onSurfaceVariant),
),
trailing: FilledButton.icon(
onPressed: () {
@@ -573,7 +573,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab>
const SizedBox(width: 8),
Text(
title,
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontWeight: FontWeight.w600,
fontSize: 13,
color: AppColors.onSurface,
@@ -587,7 +587,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab>
decoration: InputDecoration(
hintText: 'Ex: FR,FRANCE,HD,SPORT',
hintStyle:
GoogleFonts.instrumentSans(fontSize: 12, color: AppColors.outline),
GoogleFonts.karla(fontSize: 12, color: AppColors.outline),
filled: true,
fillColor: AppColors.surfaceContainerHigh,
border: OutlineInputBorder(
@@ -612,7 +612,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab>
)
: null,
),
style: GoogleFonts.instrumentSans(fontSize: 12, color: AppColors.onSurface),
style: GoogleFonts.karla(fontSize: 12, color: AppColors.onSurface),
onChanged: onChanged,
),
if (keywords.isNotEmpty) ...[
@@ -633,7 +633,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab>
child: Text(
keyword,
style:
GoogleFonts.instrumentSans(fontSize: 11, color: AppColors.onSurface),
GoogleFonts.karla(fontSize: 11, color: AppColors.onSurface),
),
);
}).toList(),
lib/features/iptv/widgets/simple_recording_widget.dart
+9 -9
View File
@@ -132,10 +132,10 @@ class _SimpleRecordingWidgetState extends State<SimpleRecordingWidget> {
// Title
Text(
'🎬 Record "${widget.channel.name}"',
style: GoogleFonts.poppins(
style: GoogleFonts.fraunces(
fontSize: 24,
fontWeight: FontWeight.bold,
color: Colors.white,
color: AppColors.onSurface,
),
),
const SizedBox(height: 24),
@@ -150,9 +150,9 @@ class _SimpleRecordingWidgetState extends State<SimpleRecordingWidget> {
),
child: Text(
_status,
style: GoogleFonts.poppins(
style: GoogleFonts.fraunces(
fontSize: 14,
color: Colors.white70,
color: AppColors.onSurfaceVariant,
),
),
),
@@ -162,10 +162,10 @@ class _SimpleRecordingWidgetState extends State<SimpleRecordingWidget> {
if (!_isRecording) ...[
Text(
'⚡ Quick Record',
style: GoogleFonts.poppins(
style: GoogleFonts.fraunces(
fontSize: 16,
fontWeight: FontWeight.w600,
color: Colors.white,
color: AppColors.onSurface,
),
),
const SizedBox(height: 12),
@@ -202,7 +202,7 @@ class _SimpleRecordingWidgetState extends State<SimpleRecordingWidget> {
label: const Text('STOP RECORDING'),
style: ElevatedButton.styleFrom(
backgroundColor: Colors.red,
foregroundColor: Colors.white,
foregroundColor: AppColors.onSurface,
padding: const EdgeInsets.symmetric(vertical: 16),
),
),
@@ -212,10 +212,10 @@ class _SimpleRecordingWidgetState extends State<SimpleRecordingWidget> {
ExpansionTile(
title: Text(
'🔵 Schedule for Later',
style: GoogleFonts.poppins(
style: GoogleFonts.fraunces(
fontSize: 14,
fontWeight: FontWeight.w600,
color: Colors.white,
color: AppColors.onSurface,
),
),
children: [
lib/features/iptv/widgets/streaming_settings_tab.dart
+19 -19
View File
@@ -19,7 +19,7 @@ class StreamingSettingsTab extends ConsumerWidget {
// Header
Text(
'Paramètres Streaming Live TV',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 18,
fontWeight: FontWeight.bold,
color: AppColors.onSurface,
@@ -28,7 +28,7 @@ class StreamingSettingsTab extends ConsumerWidget {
const SizedBox(height: 8),
Text(
'Ces paramètres s\'appliquent uniquement aux flux TV en direct.',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 12,
color: AppColors.onSurfaceVariant,
),
@@ -101,15 +101,15 @@ class StreamingSettingsTab extends ConsumerWidget {
ConnectionTimeout.long => 'Long (60s)',
},
),
Divider(height: 1, color: Colors.white.withOpacity(0.1)),
Divider(height: 1, color: AppColors.onSurface.withOpacity(0.1)),
SwitchListTile(
title: Text(
'Reconnexion automatique',
style: GoogleFonts.instrumentSans(fontSize: 14, color: AppColors.onSurface),
style: GoogleFonts.karla(fontSize: 14, color: AppColors.onSurface),
),
subtitle: Text(
'Se reconnecter en cas de coupure',
style: GoogleFonts.instrumentSans(fontSize: 12, color: AppColors.onSurfaceVariant),
style: GoogleFonts.karla(fontSize: 12, color: AppColors.onSurfaceVariant),
),
value: settings.autoReconnect,
activeThumbColor: AppColors.primaryContainer,
@@ -137,15 +137,15 @@ class StreamingSettingsTab extends ConsumerWidget {
TranscodingMode.disabled => 'Désactivé (direct)',
},
),
Divider(height: 1, color: Colors.white.withOpacity(0.1)),
Divider(height: 1, color: AppColors.onSurface.withOpacity(0.1)),
SwitchListTile(
title: Text(
'Préférer lecture directe',
style: GoogleFonts.instrumentSans(fontSize: 14, color: AppColors.onSurface),
style: GoogleFonts.karla(fontSize: 14, color: AppColors.onSurface),
),
subtitle: Text(
'Utiliser le flux original si compatible',
style: GoogleFonts.instrumentSans(fontSize: 12, color: AppColors.onSurfaceVariant),
style: GoogleFonts.karla(fontSize: 12, color: AppColors.onSurfaceVariant),
),
value: settings.preferDirectPlay,
activeThumbColor: AppColors.primaryContainer,
@@ -186,11 +186,11 @@ class StreamingSettingsTab extends ConsumerWidget {
SwitchListTile(
title: Text(
'Accélération NVIDIA GPU',
style: GoogleFonts.instrumentSans(fontSize: 14, color: AppColors.onSurface),
style: GoogleFonts.karla(fontSize: 14, color: AppColors.onSurface),
),
subtitle: Text(
'Utiliser NVENC/NVDEC pour le transcodage (requiert GPU NVIDIA)',
style: GoogleFonts.instrumentSans(fontSize: 12, color: AppColors.onSurfaceVariant),
style: GoogleFonts.karla(fontSize: 12, color: AppColors.onSurfaceVariant),
),
value: settings.enableNvidiaGpu,
activeThumbColor: Colors.green,
@@ -215,7 +215,7 @@ class StreamingSettingsTab extends ConsumerWidget {
Expanded(
child: Text(
'Les changements prennent effet immédiatement pour les nouveaux flux.',
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 12,
color: AppColors.primary,
),
@@ -236,9 +236,9 @@ class StreamingSettingsTab extends ConsumerWidget {
}) {
return Container(
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.05),
color: AppColors.onSurface.withOpacity(0.05),
borderRadius: BorderRadius.circular(16),
border: Border.all(color: Colors.white.withOpacity(0.1)),
border: Border.all(color: AppColors.onSurface.withOpacity(0.1)),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -251,7 +251,7 @@ class StreamingSettingsTab extends ConsumerWidget {
const SizedBox(width: 8),
Text(
title,
style: GoogleFonts.instrumentSans(
style: GoogleFonts.karla(
fontSize: 16,
fontWeight: FontWeight.w600,
color: AppColors.onSurface,
@@ -260,7 +260,7 @@ class StreamingSettingsTab extends ConsumerWidget {
],
),
),
Divider(height: 1, color: Colors.white.withOpacity(0.1)),
Divider(height: 1, color: AppColors.onSurface.withOpacity(0.1)),
...children,
],
),
@@ -278,11 +278,11 @@ class StreamingSettingsTab extends ConsumerWidget {
return ListTile(
title: Text(
title,
style: GoogleFonts.instrumentSans(fontSize: 14, color: AppColors.onSurface),
style: GoogleFonts.karla(fontSize: 14, color: AppColors.onSurface),
),
subtitle: Text(
subtitle,
style: GoogleFonts.instrumentSans(fontSize: 12, color: AppColors.onSurfaceVariant),
style: GoogleFonts.karla(fontSize: 12, color: AppColors.onSurfaceVariant),
),
trailing: DropdownButton<T>(
value: value,
@@ -293,12 +293,12 @@ class StreamingSettingsTab extends ConsumerWidget {
value: item,
child: Text(
labelBuilder(item),
style: GoogleFonts.instrumentSans(fontSize: 13, color: AppColors.onSurface),
style: GoogleFonts.karla(fontSize: 13, color: AppColors.onSurface),
),
);
}).toList(),
onChanged: onChanged,
style: GoogleFonts.instrumentSans(color: AppColors.onSurface),
style: GoogleFonts.karla(color: AppColors.onSurface),
iconEnabledColor: AppColors.onSurfaceVariant,
),
);