feat: Implement streaming handlers for live MPEG-TS proxy and VOD HLS transcoding via FFmpeg, and add a release build script.

This commit is contained in:
Michael committed 2025-12-16 07:39:33 +01:00
1 parent c7ba52b88d
commit 8128174ac3
26 files changed
+1529 -927

No files matched your search

@@ -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,
),
),
],
@@ -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';
@@ -122,7 +122,7 @@ class _LitePlayerViewState extends ConsumerState<LitePlayerView> {
_initializePlayer();
},
child: const Text('Retry'),
)
),
],
),
);
+158 -104
View File
@@ -27,9 +27,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 +56,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 +65,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 +104,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 +125,8 @@ 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 +134,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 +148,7 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
overflow: TextOverflow.ellipsis,
),
),
// Search Bar
Container(
width: 250,
@@ -151,37 +163,50 @@ 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 +224,14 @@ 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 +246,8 @@ 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 +268,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 +300,8 @@ 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 +320,8 @@ 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 +368,97 @@ 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 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)),
);
}
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,
);
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)),
);
},
),
],
),
+128 -83
View File
@@ -62,7 +62,7 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
void _onSearchChanged(String query) {
_searchDebounce?.cancel();
setState(() {
_searchQuery = query;
if (query.isEmpty) {
@@ -70,7 +70,7 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
_isSearching = false;
}
});
if (query.length >= 2) {
_searchDebounce = Timer(const Duration(milliseconds: 500), () {
_performSearch(query);
@@ -80,13 +80,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;
@@ -151,7 +151,7 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
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) {
@@ -164,9 +164,9 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
movieDuration = Duration(seconds: durationSecs);
}
}
if (!mounted) return;
Navigator.push(
context,
MaterialPageRoute(
@@ -186,17 +186,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,
@@ -216,7 +218,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(
@@ -228,7 +231,7 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
),
),
const Spacer(),
// Search Bar
Container(
width: 300,
@@ -240,32 +243,41 @@ 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),
),
],
),
),
@@ -281,21 +293,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),
@@ -311,7 +331,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,
@@ -321,66 +341,84 @@ 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)),
),
),
),
// 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),
),
],
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),
),
],
),
),
),
// Title
Positioned(
left: 12, right: 12, bottom: 12,
left: 12,
right: 12,
bottom: 12,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
@@ -391,7 +429,10 @@ 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,
@@ -401,7 +442,10 @@ 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),
),
),
],
@@ -415,16 +459,17 @@ 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)),
],
),
+121 -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,41 @@ 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 +269,37 @@ 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 +324,96 @@ 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 +422,18 @@ 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)),
],
),
);
+100 -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,19 @@ 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 +109,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 +130,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 +147,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
children: [
Row(
children: [
Icon(
const Icon(
Icons.dark_mode,
color: Colors.white,
),
@@ -158,7 +163,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
],
),
const SizedBox(height: 16),
// Theme options
_buildThemeOption(
context: context,
@@ -189,9 +194,9 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
],
),
),
const SizedBox(height: 16),
// Quick toggle card
Container(
decoration: BoxDecoration(
@@ -206,20 +211,21 @@ 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 +244,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 +304,8 @@ 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 +325,21 @@ 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 +358,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
),
),
const SizedBox(height: 12),
// Live TV Filter
_buildFilterCard(
title: 'Filtre TV Live',
@@ -365,7 +374,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
},
),
const SizedBox(height: 8),
// Movies Filter
_buildFilterCard(
title: 'Filtre Films',
@@ -381,7 +390,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
},
),
const SizedBox(height: 8),
// Series Filter
_buildFilterCard(
title: 'Filtre Séries',
@@ -397,9 +406,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
},
),
const SizedBox(height: 16),
// Change playlist
Container(
decoration: BoxDecoration(
@@ -409,13 +416,14 @@ 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 +433,8 @@ 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 +442,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
),
),
const SizedBox(height: 16),
// Maintenance Section
Container(
decoration: BoxDecoration(
@@ -443,50 +452,53 @@ 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 +510,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
),
),
const SizedBox(height: 24),
// Logout button
FilledButton.icon(
onPressed: () {
@@ -553,7 +565,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 +580,8 @@ 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 +598,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(),
@@ -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,10 @@ 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(),