Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 5351513619 | |||
| 8c7bbc5f2d |
@@ -3,6 +3,7 @@ import 'package:provider/provider.dart';
|
|||||||
import 'package:intl/intl.dart';
|
import 'package:intl/intl.dart';
|
||||||
import '../services/iptv_provider.dart';
|
import '../services/iptv_provider.dart';
|
||||||
import '../models/xtream_models.dart';
|
import '../models/xtream_models.dart';
|
||||||
|
import '../utils/channel_name_formatter.dart';
|
||||||
import 'player_screen.dart';
|
import 'player_screen.dart';
|
||||||
import '../widgets/simple_countries_sidebar.dart';
|
import '../widgets/simple_countries_sidebar.dart';
|
||||||
|
|
||||||
@@ -550,7 +551,10 @@ class _ContentListScreenState extends State<ContentListScreen> {
|
|||||||
void _loadContent() {
|
void _loadContent() {
|
||||||
final provider = context.read<IPTVProvider>();
|
final provider = context.read<IPTVProvider>();
|
||||||
if (widget.type == ContentType.live) {
|
if (widget.type == ContentType.live) {
|
||||||
|
// Keep live list in memory while app is running.
|
||||||
|
if (provider.liveStreams.isEmpty) {
|
||||||
provider.loadLiveStreams(_selectedCountry ?? '');
|
provider.loadLiveStreams(_selectedCountry ?? '');
|
||||||
|
}
|
||||||
} else if (widget.type == ContentType.movies) {
|
} else if (widget.type == ContentType.movies) {
|
||||||
provider.loadVodStreams();
|
provider.loadVodStreams();
|
||||||
} else {
|
} else {
|
||||||
@@ -611,6 +615,7 @@ class _ContentListScreenState extends State<ContentListScreen> {
|
|||||||
: (_isMediumScreen ? 300.0 : 250.0);
|
: (_isMediumScreen ? 300.0 : 250.0);
|
||||||
final searchHeight = _isLargeScreen ? 56.0 : 44.0;
|
final searchHeight = _isLargeScreen ? 56.0 : 44.0;
|
||||||
final iconSize = _isLargeScreen ? 32.0 : 24.0;
|
final iconSize = _isLargeScreen ? 32.0 : 24.0;
|
||||||
|
final showSearch = widget.type != ContentType.live;
|
||||||
return Container(
|
return Container(
|
||||||
padding: EdgeInsets.all(_headerPadding),
|
padding: EdgeInsets.all(_headerPadding),
|
||||||
child: Row(
|
child: Row(
|
||||||
@@ -631,6 +636,7 @@ class _ContentListScreenState extends State<ContentListScreen> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
const Spacer(),
|
const Spacer(),
|
||||||
|
if (showSearch)
|
||||||
SizedBox(
|
SizedBox(
|
||||||
width: searchWidth,
|
width: searchWidth,
|
||||||
height: searchHeight,
|
height: searchHeight,
|
||||||
@@ -980,20 +986,27 @@ class _ChannelCardState extends State<_ChannelCard> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
Positioned(
|
Positioned(
|
||||||
bottom: padding,
|
|
||||||
left: padding,
|
left: padding,
|
||||||
right: padding,
|
right: padding,
|
||||||
|
bottom: padding,
|
||||||
|
child: SizedBox(
|
||||||
|
height: textSize * 2.8,
|
||||||
|
child: Center(
|
||||||
child: Text(
|
child: Text(
|
||||||
widget.stream.name,
|
ChannelNameFormatter.forDisplay(widget.stream.name),
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
color: Colors.white,
|
color: Colors.white,
|
||||||
fontSize: textSize,
|
fontSize: textSize,
|
||||||
fontWeight: FontWeight.w500,
|
fontWeight: FontWeight.w600,
|
||||||
|
height: 1.15,
|
||||||
),
|
),
|
||||||
maxLines: 2,
|
maxLines: 2,
|
||||||
|
textAlign: TextAlign.center,
|
||||||
overflow: TextOverflow.ellipsis,
|
overflow: TextOverflow.ellipsis,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
if (widget.stream.rating != null)
|
if (widget.stream.rating != null)
|
||||||
Positioned(
|
Positioned(
|
||||||
top: padding,
|
top: padding,
|
||||||
|
|||||||
@@ -102,15 +102,6 @@ class _PlayerScreenState extends State<PlayerScreen> {
|
|||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
backgroundColor: Colors.black,
|
backgroundColor: Colors.black,
|
||||||
appBar: AppBar(
|
|
||||||
backgroundColor: Colors.transparent,
|
|
||||||
elevation: 0,
|
|
||||||
title: Text(
|
|
||||||
widget.stream.name,
|
|
||||||
style: const TextStyle(color: Colors.white),
|
|
||||||
),
|
|
||||||
iconTheme: const IconThemeData(color: Colors.white),
|
|
||||||
),
|
|
||||||
body: Center(
|
body: Center(
|
||||||
child: _isLoading
|
child: _isLoading
|
||||||
? const CircularProgressIndicator(color: Colors.red)
|
? const CircularProgressIndicator(color: Colors.red)
|
||||||
|
|||||||
55
lib/utils/channel_name_formatter.dart
Normal file
55
lib/utils/channel_name_formatter.dart
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
class ChannelNameFormatter {
|
||||||
|
static final Map<String, String> _cache = <String, String>{};
|
||||||
|
static const Set<String> _qualityTokens = <String>{
|
||||||
|
'SD',
|
||||||
|
'HD',
|
||||||
|
'FHD',
|
||||||
|
'UHD',
|
||||||
|
'4K',
|
||||||
|
'8K',
|
||||||
|
'HDR',
|
||||||
|
'HEVC',
|
||||||
|
'H264',
|
||||||
|
'H265',
|
||||||
|
'FULLHD',
|
||||||
|
};
|
||||||
|
|
||||||
|
static String forDisplay(String rawName) {
|
||||||
|
if (rawName.isEmpty) return rawName;
|
||||||
|
|
||||||
|
final cached = _cache[rawName];
|
||||||
|
if (cached != null) return cached;
|
||||||
|
|
||||||
|
var display = rawName.trim();
|
||||||
|
|
||||||
|
final pipeIndex = display.indexOf('|');
|
||||||
|
if (pipeIndex >= 0 && pipeIndex < display.length - 1) {
|
||||||
|
display = display.substring(pipeIndex + 1).trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
display = display.replaceFirst(RegExp(r'^[\-\–\—:]+'), '').trim();
|
||||||
|
|
||||||
|
if (display.isNotEmpty) {
|
||||||
|
final parts = display.split(RegExp(r'\s+')).toList(growable: true);
|
||||||
|
while (parts.isNotEmpty && _isQualityToken(parts.last)) {
|
||||||
|
parts.removeLast();
|
||||||
|
}
|
||||||
|
display = parts.join(' ').trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (display.isEmpty) {
|
||||||
|
display = rawName.trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_cache.length > 50000) {
|
||||||
|
_cache.clear();
|
||||||
|
}
|
||||||
|
_cache[rawName] = display;
|
||||||
|
return display;
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool _isQualityToken(String token) {
|
||||||
|
final normalized = token.toUpperCase().replaceAll(RegExp(r'[^A-Z0-9]'), '');
|
||||||
|
return _qualityTokens.contains(normalized);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user