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

.metadata

@@ -0,0 +1,30 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: "f6ff1529fd6d8af5f706051d9251ac9231c83407"
+  channel: "stable"
+
+project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407
+      base_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407
+    - platform: windows
+      create_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407
+      base_revision: f6ff1529fd6d8af5f706051d9251ac9231c83407
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

BUILD.md

@@ -0,0 +1,37 @@
+# How to Build XtremFlow as an Executable
+
+To create a standalone `.exe` version of XtremFlow, you need to build it on your machine.
+
+## Prerequisites
+
+Since you are currently using Docker, you likely don't have these installed on your Windows system yet. You must install them to build the Windows executable.
+
+1.  **Install Flutter SDK**
+    *   Download from: [flutter.dev/install/windows](https://docs.flutter.dev/get-started/install/windows)
+    *   Extract the zip file to `C:\src\flutter` (for example).
+    *   Add `flutter/bin` to your **System PATH**.
+
+2.  **Verify Installation**
+    *   Open a new terminal.
+    *   Run `flutter doctor`.
+    *   Ensure it says "Flutter ... channel stable".
+
+## Building the App
+
+Once Flutter is installed:
+
+1.  Open PowerShell in this folder.
+2.  Run the build script:
+    ```powershell
+    .\build_release.ps1
+    ```
+
+## Adding FFmpeg
+
+1.  After the build finishes, open the new `dist` folder.
+2.  Go to `dist/ffmpeg/bin`.
+3.  Download `ffmpeg.exe` (from [ffmpeg.org](https://ffmpeg.org/download.html)) and place it there.
+
+## Running
+
+Double-click `dist/start.bat` to run the server!

bin/api/streaming_handler.dart

@@ -5,13 +5,23 @@ import 'dart:math';
 import 'package:shelf/shelf.dart';
 import 'package:shelf_router/shelf_router.dart';
 import 'package:http/http.dart' as http;
-import '../../lib/core/models/playlist_config.dart';
+import 'package:xtremflow/core/models/playlist_config.dart';
 
 /// Active FFmpeg processes for VOD transcoding
 final Map<String, Process> _vodProcesses = {};
 
 /// Directory for temporary HLS segments
-final Directory _hlsTempDir = Directory('/tmp/hls_vod');
+final Directory _hlsTempDir = Directory('${Directory.systemTemp.path}/xtremflow_streams');
+
+/// Helper to resolve FFmpeg path (SYSTEM PATH vs Portable)
+String _getFFmpegPath() {
+  if (Platform.isWindows) {
+    if (File('ffmpeg.exe').existsSync()) return 'ffmpeg.exe';
+    if (File('bin/ffmpeg.exe').existsSync()) return 'bin/ffmpeg.exe';
+    if (File('ffmpeg/bin/ffmpeg.exe').existsSync()) return 'ffmpeg/bin/ffmpeg.exe';
+  }
+  return 'ffmpeg'; // Default to PATH
+}
 
 /// Initialize streaming subsystem
 Future<void> initStreaming() async {
@@ -76,11 +86,12 @@ Handler createLiveStreamHandler(Future<PlaylistConfig?> Function(Request) getPla
       
       '-c', 'copy', // Direct stream copy (Very low CPU)
       '-f', 'mpegts',
-      'pipe:1' // Output to stdout
+      'pipe:1', // Output to stdout
     ];
 
     try {
-      final process = await Process.start('ffmpeg', ffmpegArgs);
+      final ffmpegPath = _getFFmpegPath();
+      final process = await Process.start(ffmpegPath, ffmpegArgs);
       
       // Cleanup handling: Kill FFmpeg when client disconnects
       final controller = StreamController<List<int>>(
@@ -100,7 +111,7 @@ Handler createLiveStreamHandler(Future<PlaylistConfig?> Function(Request) getPla
         onError: (e) {
            print('[Live] FFmpeg stream error: $e');
            controller.addError(e);
-        }
+        },
       );
       
       // Log errors
@@ -257,10 +268,11 @@ Handler createVodStreamHandler(Future<PlaylistConfig?> Function(Request) getPlay
       '-start_number', '0',
       
       // Write playlist to stdout or file? File is easier for static serving
-      '${streamDir.path}/playlist.m3u8'
+      '${streamDir.path}/playlist.m3u8',
     ];
 
-      Process.start('ffmpeg', ffmpegArgs).then((process) {
+       final ffmpegPath = _getFFmpegPath();
+       Process.start(ffmpegPath, ffmpegArgs).then((process) {
         _vodProcesses[streamId] = process;
         
         process.stderr.transform(utf8.decoder).listen((data) {

bin/database/database.dart

@@ -12,8 +12,8 @@ class AppDatabase {
 
   /// Initialize database and create tables
   Future<void> init() async {
-    final dbPath = '/app/data/xtremflow.db';
+    const dbPath = '/app/data/xtremflow.db';
-    
+
     // Ensure data directory exists
     final dir = Directory('/app/data');
     if (!await dir.exists()) {
@@ -21,7 +21,7 @@ class AppDatabase {
     }
 
     _db = sqlite3.open(dbPath);
-    
+
     await _createTables();
     print('Database initialized: $dbPath');
   }
@@ -79,9 +79,15 @@ class AppDatabase {
     ''');
 
     // Indexes
-    _db.execute('CREATE INDEX IF NOT EXISTS idx_sessions_token ON sessions(token)');
+    _db.execute(
-    _db.execute('CREATE INDEX IF NOT EXISTS idx_sessions_expires ON sessions(expires_at)');
+      'CREATE INDEX IF NOT EXISTS idx_sessions_token ON sessions(token)',
-    _db.execute('CREATE INDEX IF NOT EXISTS idx_playlists_user ON playlists(user_id)');
+    );
+    _db.execute(
+      'CREATE INDEX IF NOT EXISTS idx_sessions_expires ON sessions(expires_at)',
+    );
+    _db.execute(
+      'CREATE INDEX IF NOT EXISTS idx_playlists_user ON playlists(user_id)',
+    );
   }
 
   /// Seed default admin user if no users exist
@@ -93,10 +99,13 @@ class AppDatabase {
       final adminId = _uuid.v4();
       final passwordHash = PasswordHasher.hash('admin');
 
-      _db.execute('''
+      _db.execute(
+        '''
         INSERT INTO users (id, username, password_hash, is_admin)
         VALUES (?, ?, ?, 1)
-      ''', [adminId, 'admin', passwordHash],);
+      ''',
+        [adminId, 'admin', passwordHash],
+      );
 
       print('Default admin user created (username: admin, password: admin)');
     }
@@ -148,10 +157,13 @@ class AppDatabase {
     final userId = _uuid.v4();
     final passwordHash = PasswordHasher.hash(password);
 
-    _db.execute('''
+    _db.execute(
+      '''
       INSERT INTO users (id, username, password_hash, is_admin)
       VALUES (?, ?, ?, ?)
-    ''', [userId, username, passwordHash, isAdmin ? 1 : 0],);
+    ''',
+      [userId, username, passwordHash, isAdmin ? 1 : 0],
+    );
 
     return User(
       id: userId,
@@ -197,10 +209,13 @@ class AppDatabase {
     final token = _uuid.v4();
     final expiresAt = DateTime.now().add(duration ?? const Duration(days: 7));
 
-    _db.execute('''
+    _db.execute(
+      '''
       INSERT INTO sessions (id, user_id, token, expires_at)
       VALUES (?, ?, ?, ?)
-    ''', [sessionId, userId, token, expiresAt.toIso8601String()],);
+    ''',
+      [sessionId, userId, token, expiresAt.toIso8601String()],
+    );
 
     return models.Session(
       id: sessionId,
@@ -221,7 +236,7 @@ class AppDatabase {
     if (result.isEmpty) return null;
 
     final session = models.Session.fromMap(result.first);
-    
+
     // Check if expired
     if (session.isExpired) {
       deleteSession(token);
@@ -279,10 +294,13 @@ class AppDatabase {
     final playlistId = _uuid.v4();
     final now = DateTime.now().toIso8601String();
 
-    _db.execute('''
+    _db.execute(
+      '''
       INSERT INTO playlists (id, user_id, name, server_url, username, password, dns, created_at, updated_at)
       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
-    ''', [playlistId, userId, name, serverUrl, username, password, dns, now, now],);
+    ''',
+      [playlistId, userId, name, serverUrl, username, password, dns, now, now],
+    );
 
     return Playlist(
       id: playlistId,
@@ -308,11 +326,14 @@ class AppDatabase {
   }) {
     final now = DateTime.now().toIso8601String();
 
-    _db.execute('''
+    _db.execute(
+      '''
       UPDATE playlists 
       SET name = ?, server_url = ?, username = ?, password = ?, dns = ?, updated_at = ?
       WHERE id = ?
-    ''', [name, serverUrl, username, password, dns, now, playlistId],);
+    ''',
+      [name, serverUrl, username, password, dns, now, playlistId],
+    );
 
     return getPlaylistById(playlistId)!;
   }
@@ -338,15 +359,18 @@ class AppDatabase {
   /// Update user settings
   void updateUserSettings(String userId, String settingsJson) {
     final now = DateTime.now().toIso8601String();
-    
+
     // UPSERT (Insert or Replace)
-    _db.execute('''
+    _db.execute(
+      '''
       INSERT INTO user_settings (user_id, settings_json, updated_at)
       VALUES (?, ?, ?)
       ON CONFLICT(user_id) DO UPDATE SET
         settings_json = excluded.settings_json,
         updated_at = excluded.updated_at
-    ''', [userId, settingsJson, now]);
+    ''',
+      [userId, settingsJson, now],
+    );
   }
 
   /// Close database connection

bin/server.dart

@@ -10,7 +10,7 @@ import 'package:args/args.dart';
 import 'database/database.dart';
 import 'models/user.dart';
 import 'models/playlist.dart';
-import '../lib/core/models/playlist_config.dart';
+import 'package:xtremflow/core/models/playlist_config.dart';
 import 'api/auth_handler.dart';
 import 'api/users_handler.dart';
 import 'api/playlists_handler.dart';
@@ -49,17 +49,17 @@ void main(List<String> args) async {
     // Auth endpoints
     ..mount('/api/auth', authHandler.router)
     // Playlists endpoints
-    ..mount('/api/playlists', Pipeline()
+    ..mount('/api/playlists', const Pipeline()
       .addMiddleware(authMiddleware(db))
-      .addHandler(playlistsHandler.router.call))
+      .addHandler(playlistsHandler.router.call),)
     // Users endpoints
-    ..mount('/api/users', Pipeline()
+    ..mount('/api/users', const Pipeline()
       .addMiddleware(authMiddleware(db))
-      .addHandler(usersHandler.router.call))
+      .addHandler(usersHandler.router.call),)
     // Settings endpoints
-    ..mount('/api/settings', Pipeline()
+    ..mount('/api/settings', const Pipeline()
       .addMiddleware(authMiddleware(db))
-      .addHandler(settingsHandler.router.call));
+      .addHandler(settingsHandler.router.call),);
 
   // Initialize Cleanup Service
   final cleanupService = CleanupService();
@@ -70,7 +70,7 @@ void main(List<String> args) async {
   cleanupService.start();
 
   // Admin Routes (protected)
-  apiRouter.mount('/api/admin', Pipeline()
+  apiRouter.mount('/api/admin', const Pipeline()
       .addMiddleware(authMiddleware(db))
       .addHandler((Request request) {
         final router = Router();
@@ -90,7 +90,7 @@ void main(List<String> args) async {
         });
         
         return router(request);
-      }));
+      }),);
 
   // Create static handler
   final baseStaticHandler = createStaticHandler(
@@ -100,7 +100,7 @@ void main(List<String> args) async {
   );
 
   // Wrap static handler to enforce cache policies
-  Handler staticHandler = (Request request) async {
+  FutureOr<Response> staticHandler(Request request) async {
     final response = await baseStaticHandler(request);
     
     // Disable cache for entry points to ensure updates are seen immediately
@@ -113,17 +113,17 @@ void main(List<String> args) async {
         'Cache-Control': 'no-store, no-cache, must-revalidate, max-age=0',
         'Pragma': 'no-cache',
         'Expires': '0',
-      });
+      },);
     }
     
     // Allow aggressive caching for hashed assets
     return response.change(headers: {
       'Cache-Control': 'public, max-age=86400', 
-    });
+    },);
-  };
+  }
 
   // Helper to get playlist from request
-  Future<PlaylistConfig?> _getPlaylist(Request request) async {
+  Future<PlaylistConfig?> getPlaylist(Request request) async {
      Playlist? playlist;
      
      final user = request.context['user'] as User?;
@@ -155,8 +155,8 @@ void main(List<String> args) async {
 
   // Create Streaming Router (Mount handlers on correct paths)
   final streamingRouter = Router()
-    ..mount('/api/live', createLiveStreamHandler(_getPlaylist))
+    ..mount('/api/live', createLiveStreamHandler(getPlaylist))
-    ..mount('/api/vod', createVodStreamHandler(_getPlaylist));
+    ..mount('/api/vod', createVodStreamHandler(getPlaylist));
 
   // Main handler with API proxy and NEW Streaming Handlers
   final handler = Cascade()
@@ -167,7 +167,7 @@ void main(List<String> args) async {
     .handler;
 
   // Add middleware
-  final pipeline = Pipeline()
+  final pipeline = const Pipeline()
     .addMiddleware(logRequests())
     .addMiddleware(securityHeadersMiddleware())
     .addMiddleware(honeypotMiddleware())

build_release.ps1

@@ -0,0 +1,45 @@
+$ErrorActionPreference = "Stop"
+
+Write-Host "🚧 Starting XtremFlow Build Process..." -ForegroundColor Cyan
+
+# 1. Clean previous builds
+Write-Host "Cleaning previous builds..."
+if (Test-Path "dist") { Remove-Item -Recurse -Force "dist" }
+if (Test-Path "build") { Remove-Item -Recurse -Force "build" }
+New-Item -ItemType Directory -Force "dist"
+
+# 2. Build Flutter Web
+Write-Host "📦 Building Flutter Web Frontend..." -ForegroundColor Yellow
+flutter build web --release --no-tree-shake-icons
+if ($LASTEXITCODE -ne 0) { Write-Error "Flutter build failed"; exit 1 }
+
+# 3. Copy Web Assets to Dist
+Write-Host "📂 Copying Web Assets..."
+Copy-Item -Recurse "build\web" "dist\web"
+
+# 4. Compile Dart Server
+Write-Host "🔨 Compiling Backend Server..." -ForegroundColor Yellow
+dart compile exe bin/server.dart -o dist/xtremflow_server.exe
+if ($LASTEXITCODE -ne 0) { Write-Error "Dart compile failed"; exit 1 }
+
+# 5. Create Start Script
+Write-Host "📝 Creating Launcher Script..."
+$startScript = @"
+@echo off
+echo Starting XtremFlow Server...
+echo Open your browser at http://localhost:8089
+xtremflow_server.exe --path ./web --port 8089
+pause
+"@
+Set-Content "dist\start.bat" $startScript
+
+# 6. Setup FFmpeg Placeholder
+Write-Host "🎥 Setting up FFmpeg folder..."
+New-Item -ItemType Directory -Force "dist\ffmpeg\bin"
+Set-Content "dist\ffmpeg\README.txt" "Please download ffmpeg.exe and place it in the 'bin' folder here."
+
+# 7. Final Instructions
+Write-Host "✅ Build Complete!" -ForegroundColor Green
+Write-Host "Output directory: dist/"
+Write-Host "IMPORTANT: You must put 'ffmpeg.exe' in dist/ffmpeg/bin/ (or next to the exe)"
+

build_windows.ps1

@@ -0,0 +1,29 @@
+$ErrorActionPreference = "Stop"
+
+Write-Host "🚧 Starting XtremFlow Windows Build Process..." -ForegroundColor Cyan
+
+# 1. Clean previous builds
+Write-Host "Cleaning previous builds..."
+if (Test-Path "dist\windows") { Remove-Item -Recurse -Force "dist\windows" }
+if (Test-Path "build\windows") { Remove-Item -Recurse -Force "build\windows" }
+New-Item -ItemType Directory -Force "dist\windows"
+
+# 2. Build Flutter Windows
+Write-Host "📦 Building Flutter Windows Application..." -ForegroundColor Yellow
+flutter build windows --release
+if ($LASTEXITCODE -ne 0) { Write-Error "Flutter build failed"; exit 1 }
+
+# 3. Copy Build Artifacts to Dist
+Write-Host "📂 Copying Build Artifacts..."
+$buildDir = "build\windows\x64\runner\Release"
+Copy-Item -Recurse "$buildDir\*" "dist\windows"
+
+# 4. Setup FFmpeg Placeholder
+Write-Host "🎥 Setting up FFmpeg folder..."
+New-Item -ItemType Directory -Force "dist\windows\ffmpeg\bin"
+Set-Content "dist\windows\ffmpeg\README.txt" "Please download ffmpeg.exe and place it in the 'bin' folder here."
+
+# 5. Final Instructions
+Write-Host "✅ Build Complete!" -ForegroundColor Green
+Write-Host "Output directory: dist\windows"
+Write-Host "IMPORTANT: You must put 'ffmpeg.exe' in dist/windows/ffmpeg/bin/"

lib/core/database/hive_service.dart

@@ -8,7 +8,7 @@ import '../models/playlist_config.dart';
 class HiveService {
   static const String _usersBoxName = 'users';
   static const String _playlistsBoxName = 'playlists';
-  
+
   static bool _initialized = false;
   static List<int>? _encryptionKey;
 
@@ -45,27 +45,27 @@ class HiveService {
 
     // Generate new 256-bit key
     _encryptionKey = Hive.generateSecureKey();
-    
+
     return _encryptionKey!;
   }
 
   /// Seed default admin user (admin/admin)
   static Future<void> _seedDefaultAdmin() async {
     final usersBox = Hive.box<AppUser>(_usersBoxName);
-    
+
     if (usersBox.isEmpty) {
       final adminId = const Uuid().v4();
       final passwordHash = _hashPassword('admin');
-      
+
       final admin = AppUser(
         id: adminId,
         username: 'admin',
         passwordHash: passwordHash,
         isAdmin: true,
-        assignedPlaylistIds: [],
+        assignedPlaylistIds: const [],
         createdAt: DateTime.now(),
       );
-      
+
       await usersBox.put(adminId, admin);
     }
   }
@@ -88,12 +88,12 @@ class HiveService {
         final legacyHash = sha256.convert(utf8.encode(password)).toString();
         return legacyHash == storedHash;
       }
-      
+
       final salt = parts[0];
       final expectedHash = parts[1];
       final bytes = utf8.encode(password + salt);
       final actualHash = sha256.convert(bytes).toString();
-      
+
       return actualHash == expectedHash;
     } catch (e) {
       return false;
@@ -103,12 +103,11 @@ class HiveService {
   /// Public method to hash passwords (used by auth)
   static String hashPassword(String password) => _hashPassword(password);
 
-
   /// Get users box
   static Box<AppUser> get usersBox => Hive.box<AppUser>(_usersBoxName);
 
   /// Get playlists box
-  static Box<PlaylistConfig> get playlistsBox => 
+  static Box<PlaylistConfig> get playlistsBox =>
       Hive.box<PlaylistConfig>(_playlistsBoxName);
 
   /// Close all boxes (cleanup)

lib/core/theme/app_colors.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 
 /// XtremFlow Apple TV Style Palette
-/// 
+///
 /// Ultra minimalist, focus-driven palette.
 /// - Background: Pure Black (#000000)
 /// - Focus/Active: Pure White (#FFFFFF)
@@ -13,20 +13,20 @@ class AppColors {
   // ============ BACKGROUNDS ============
   /// Pure black for that infinite depth look (OLED friendly)
   static const Color background = Color(0xFF000000);
-  
+
   /// Very deep grey for surfaces that need to be distinct but subtle (Apple Dark Grey)
   static const Color surface = Color(0xFF1C1C1E);
-  
+
   /// Slightly lighter grey for secondary surfaces or hover states
   static const Color surfaceVariant = Color(0xFF3A3A3C);
-  
+
   /// Focused element background (often white in tvOS for text, or bright accent)
   static const Color focusColor = Color(0xFFFFFFFF);
 
   // ============ ACCENTS ============
   /// Minimal white accent. In Apple TV, color is used sparingly.
   /// We keep a subtle blue only for specific indicators if needed.
-  static const Color primary = Color(0xFFFFFFFF); 
+  static const Color primary = Color(0xFFFFFFFF);
   static const Color accent = Color(0xFFE5E5E5);
 
   /// Primary Gradient (Subtle silver/white glow)
@@ -49,7 +49,7 @@ class AppColors {
 
   // ============ BORDERS ============
   // Borders are usually hidden until focused
-  static const Color border = Color(0xFF1F1F1F); 
+  static const Color border = Color(0xFF1F1F1F);
   static const Color focusBorder = Color(0xFFFFFFFF);
 
   // ============ GLASSMORPHISM ============
@@ -59,28 +59,27 @@ class AppColors {
 
   // ============ THEME SCHEMES ============
   static ColorScheme get darkColorScheme => const ColorScheme.dark(
-    primary: primary,
+        primary: primary,
-    secondary: accent,
+        secondary: accent,
-    surface: surface,
+        surface: surface,
-    background: background,
+        error: error,
-    error: error,
+        onPrimary: Colors
-    onPrimary: Colors.black, // White text on buttons -> Black text on White buttons
+            .black, // White text on buttons -> Black text on White buttons
-    onSecondary: Colors.black,
+        onSecondary: Colors.black,
-    onSurface: textPrimary,
+        onSurface: textPrimary,
-    onError: Colors.white,
+        onError: Colors.white,
-    brightness: Brightness.dark,
+        brightness: Brightness.dark,
-  );
+      );
 
   static ColorScheme get lightColorScheme => const ColorScheme.light(
-    primary: Colors.black,
+        primary: Colors.black,
-    secondary: Colors.grey,
+        secondary: Colors.grey,
-    surface: Color(0xFFF2F2F7),
+        surface: Color(0xFFF2F2F7),
-    background: Colors.white,
+        error: error,
-    error: error,
+        onPrimary: Colors.white,
-    onPrimary: Colors.white,
+        onSecondary: Colors.white,
-    onSecondary: Colors.white,
+        onSurface: Colors.black,
-    onSurface: Colors.black,
+        onError: Colors.white,
-    onError: Colors.white,
+        brightness: Brightness.light,
-    brightness: Brightness.light,
+      );
-  );
 }

lib/core/widgets/glass_container.dart

@@ -1,7 +1,6 @@
 import 'dart:ui';
 import 'package:flutter/material.dart';
 import '../theme/app_colors.dart';
-import '../theme/app_theme.dart';
 
 class GlassContainer extends StatelessWidget {
   final Widget child;

lib/core/widgets/themed_loading_screen.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import '../theme/app_colors.dart';
 
 class ThemedLoading extends StatelessWidget {
   const ThemedLoading({super.key});

lib/features/admin/screens/admin_panel.dart

@@ -87,9 +87,9 @@ class _AdminContentState extends ConsumerState<AdminContent>
                 Text(
                   'Administration',
                   style: Theme.of(context).textTheme.headlineMedium?.copyWith(
-                    color: Colors.white,
+                        color: Colors.white,
-                    fontWeight: FontWeight.bold,
+                        fontWeight: FontWeight.bold,
-                  ),
+                      ),
                 ),
                 const Spacer(),
                 // Custom Tab Bar Indicator
@@ -111,12 +111,13 @@ class _AdminContentState extends ConsumerState<AdminContent>
               ],
             ),
           ),
-          
+
           // Content
           Expanded(
             child: TabBarView(
               controller: _tabController,
-              physics: const NeverScrollableScrollPhysics(), // Custom tabs handle ref
+              physics:
+                  const NeverScrollableScrollPhysics(), // Custom tabs handle ref
               children: const [
                 _PlaylistsTab(),
                 _UsersTab(),
@@ -182,7 +183,13 @@ class _PlaylistsTab extends ConsumerWidget {
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
-              Text('${playlistsAsync.asData?.value.length ?? 0} Playlists', style: Theme.of(context).textTheme.bodyLarge?.copyWith(color: Colors.white70)),
+              Text(
+                '${playlistsAsync.asData?.value.length ?? 0} Playlists',
+                style: Theme.of(context)
+                    .textTheme
+                    .bodyLarge
+                    ?.copyWith(color: Colors.white70),
+              ),
               GradientButton(
                 label: 'Add Playlist',
                 icon: Icons.add,
@@ -194,16 +201,28 @@ class _PlaylistsTab extends ConsumerWidget {
         Expanded(
           child: playlistsAsync.when(
             loading: () => const Center(child: CircularProgressIndicator()),
-            error: (error, stack) => Center(child: Text('Error: $error', style: const TextStyle(color: AppColors.error))),
+            error: (error, stack) => Center(
+              child: Text(
+                'Error: $error',
+                style: const TextStyle(color: AppColors.error),
+              ),
+            ),
             data: (playlists) {
               if (playlists.isEmpty) {
                 return Center(
                   child: Column(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: [
-                      Icon(Icons.playlist_remove, size: 64, color: AppColors.textSecondary.withOpacity(0.5)),
+                      Icon(
+                        Icons.playlist_remove,
+                        size: 64,
+                        color: AppColors.textSecondary.withOpacity(0.5),
+                      ),
                       const SizedBox(height: 16),
-                      Text('No playlists configured', style: Theme.of(context).textTheme.titleMedium),
+                      Text(
+                        'No playlists configured',
+                        style: Theme.of(context).textTheme.titleMedium,
+                      ),
                       const SizedBox(height: 8),
                       TextButton(
                         onPressed: () => _showPlaylistDialog(context, ref),
@@ -215,7 +234,8 @@ class _PlaylistsTab extends ConsumerWidget {
               }
 
               return ListView.separated(
-                padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 8),
+                padding:
+                    const EdgeInsets.symmetric(horizontal: 24, vertical: 8),
                 itemCount: playlists.length,
                 separatorBuilder: (_, __) => const SizedBox(height: 12),
                 itemBuilder: (context, index) {
@@ -231,16 +251,31 @@ class _PlaylistsTab extends ConsumerWidget {
                             color: AppColors.surface,
                             borderRadius: BorderRadius.circular(12),
                           ),
-                          child: const Icon(Icons.playlist_play, color: AppColors.textPrimary),
+                          child: const Icon(
+                            Icons.playlist_play,
+                            color: AppColors.textPrimary,
+                          ),
                         ),
                         const SizedBox(width: 16),
                         Expanded(
                           child: Column(
                             crossAxisAlignment: CrossAxisAlignment.start,
                             children: [
-                              Text(playlist.name, style: Theme.of(context).textTheme.titleMedium?.copyWith(color: Colors.white)),
+                              Text(
+                                playlist.name,
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .titleMedium
+                                    ?.copyWith(color: Colors.white),
+                              ),
                               const SizedBox(height: 4),
-                              Text(playlist.dns, style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: Colors.white60)),
+                              Text(
+                                playlist.dns,
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .bodyMedium
+                                    ?.copyWith(color: Colors.white60),
+                              ),
                             ],
                           ),
                         ),
@@ -249,13 +284,15 @@ class _PlaylistsTab extends ConsumerWidget {
                             IconButton(
                               icon: const Icon(Icons.edit_outlined, size: 20),
                               color: Colors.white70,
-                              onPressed: () => _showPlaylistDialog(context, ref, playlist),
+                              onPressed: () =>
+                                  _showPlaylistDialog(context, ref, playlist),
                               tooltip: 'Edit',
                             ),
                             IconButton(
                               icon: const Icon(Icons.delete_outline, size: 20),
                               color: AppColors.error,
-                              onPressed: () => _deletePlaylist(context, ref, playlist),
+                              onPressed: () =>
+                                  _deletePlaylist(context, ref, playlist),
                               tooltip: 'Delete',
                             ),
                           ],
@@ -272,7 +309,11 @@ class _PlaylistsTab extends ConsumerWidget {
     );
   }
 
-  void _showPlaylistDialog(BuildContext context, WidgetRef ref, [PlaylistConfig? playlist]) {
+  void _showPlaylistDialog(
+    BuildContext context,
+    WidgetRef ref, [
+    PlaylistConfig? playlist,
+  ]) {
     final nameController = TextEditingController(text: playlist?.name);
     final dnsController = TextEditingController(text: playlist?.dns);
     final usernameController = TextEditingController(text: playlist?.username);
@@ -284,40 +325,87 @@ class _PlaylistsTab extends ConsumerWidget {
       context: context,
       builder: (dialogContext) => StatefulBuilder(
         builder: (context, setState) => AlertDialog(
-          title: Text(playlist == null ? 'Ajouter une playlist' : 'Modifier la playlist'),
+          title: Text(
+            playlist == null ? 'Ajouter une playlist' : 'Modifier la playlist',
+          ),
           content: SingleChildScrollView(
             child: Column(
               mainAxisSize: MainAxisSize.min,
               children: [
-                TextField(controller: nameController, decoration: const InputDecoration(labelText: 'Nom')),
+                TextField(
+                  controller: nameController,
+                  decoration: const InputDecoration(labelText: 'Nom'),
+                ),
                 const SizedBox(height: 12),
-                TextField(controller: dnsController, decoration: const InputDecoration(labelText: 'URL du serveur', hintText: 'http://server.com:8080')),
+                TextField(
+                  controller: dnsController,
+                  decoration: const InputDecoration(
+                    labelText: 'URL du serveur',
+                    hintText: 'http://server.com:8080',
+                  ),
+                ),
                 const SizedBox(height: 12),
-                TextField(controller: usernameController, decoration: const InputDecoration(labelText: 'Utilisateur')),
+                TextField(
+                  controller: usernameController,
+                  decoration: const InputDecoration(labelText: 'Utilisateur'),
+                ),
                 const SizedBox(height: 12),
-                TextField(controller: passwordController, decoration: const InputDecoration(labelText: 'Mot de passe'), obscureText: true),
+                TextField(
+                  controller: passwordController,
+                  decoration: const InputDecoration(labelText: 'Mot de passe'),
+                  obscureText: true,
+                ),
               ],
             ),
           ),
           actions: [
-            TextButton(onPressed: isLoading ? null : () => Navigator.pop(dialogContext), child: const Text('Annuler')),
+            TextButton(
+              onPressed: isLoading ? null : () => Navigator.pop(dialogContext),
+              child: const Text('Annuler'),
+            ),
             FilledButton(
-              onPressed: isLoading ? null : () async {
+              onPressed: isLoading
-                if (nameController.text.isEmpty || dnsController.text.isEmpty) {
+                  ? null
-                  ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Tous les champs sont requis')));
+                  : () async {
-                  return;
+                      if (nameController.text.isEmpty ||
-                }
+                          dnsController.text.isEmpty) {
-                setState(() => isLoading = true);
+                        ScaffoldMessenger.of(context).showSnackBar(
-                final dns = dnsController.text.trim().replaceAll(RegExp(r'/$'), '');
+                          const SnackBar(
-                if (playlist == null) {
+                            content: Text('Tous les champs sont requis'),
-                  await service.createPlaylist(name: nameController.text.trim(), dns: dns, username: usernameController.text.trim(), password: passwordController.text);
+                          ),
-                } else {
+                        );
-                  await service.updatePlaylist(id: playlist.id, name: nameController.text.trim(), dns: dns, username: usernameController.text.trim(), password: passwordController.text);
+                        return;
-                }
+                      }
-                if (dialogContext.mounted) Navigator.pop(dialogContext);
+                      setState(() => isLoading = true);
-                ref.invalidate(playlistsProvider);
+                      final dns = dnsController.text
-              },
+                          .trim()
-              child: isLoading ? const SizedBox(width: 20, height: 20, child: CircularProgressIndicator(strokeWidth: 2)) : const Text('Sauvegarder'),
+                          .replaceAll(RegExp(r'/$'), '');
+                      if (playlist == null) {
+                        await service.createPlaylist(
+                          name: nameController.text.trim(),
+                          dns: dns,
+                          username: usernameController.text.trim(),
+                          password: passwordController.text,
+                        );
+                      } else {
+                        await service.updatePlaylist(
+                          id: playlist.id,
+                          name: nameController.text.trim(),
+                          dns: dns,
+                          username: usernameController.text.trim(),
+                          password: passwordController.text,
+                        );
+                      }
+                      if (dialogContext.mounted) Navigator.pop(dialogContext);
+                      ref.invalidate(playlistsProvider);
+                    },
+              child: isLoading
+                  ? const SizedBox(
+                      width: 20,
+                      height: 20,
+                      child: CircularProgressIndicator(strokeWidth: 2),
+                    )
+                  : const Text('Sauvegarder'),
             ),
           ],
         ),
@@ -325,14 +413,21 @@ class _PlaylistsTab extends ConsumerWidget {
     );
   }
 
-  void _deletePlaylist(BuildContext context, WidgetRef ref, PlaylistConfig playlist) {
+  void _deletePlaylist(
+    BuildContext context,
+    WidgetRef ref,
+    PlaylistConfig playlist,
+  ) {
     showDialog(
       context: context,
       builder: (dialogContext) => AlertDialog(
         title: const Text('Supprimer la playlist'),
         content: Text('Supprimer "${playlist.name}" ?'),
         actions: [
-          TextButton(onPressed: () => Navigator.pop(dialogContext), child: const Text('Annuler')),
+          TextButton(
+            onPressed: () => Navigator.pop(dialogContext),
+            child: const Text('Annuler'),
+          ),
           FilledButton(
             onPressed: () async {
               Navigator.pop(dialogContext);
@@ -363,7 +458,13 @@ class _UsersTab extends ConsumerWidget {
           child: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
-               Text('${usersAsync.asData?.value.length ?? 0} Users', style: Theme.of(context).textTheme.bodyLarge?.copyWith(color: Colors.white70)),
+              Text(
+                '${usersAsync.asData?.value.length ?? 0} Users',
+                style: Theme.of(context)
+                    .textTheme
+                    .bodyLarge
+                    ?.copyWith(color: Colors.white70),
+              ),
               GradientButton(
                 label: 'Create User',
                 icon: Icons.person_add,
@@ -375,23 +476,36 @@ class _UsersTab extends ConsumerWidget {
         Expanded(
           child: usersAsync.when(
             loading: () => const Center(child: CircularProgressIndicator()),
-            error: (error, stack) => Center(child: Text('Error: $error', style: const TextStyle(color: AppColors.error))),
+            error: (error, stack) => Center(
+              child: Text(
+                'Error: $error',
+                style: const TextStyle(color: AppColors.error),
+              ),
+            ),
             data: (users) {
               if (users.isEmpty) {
                 return Center(
                   child: Column(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: [
-                      Icon(Icons.people_outline, size: 64, color: AppColors.textSecondary.withOpacity(0.5)),
+                      Icon(
+                        Icons.people_outline,
+                        size: 64,
+                        color: AppColors.textSecondary.withOpacity(0.5),
+                      ),
                       const SizedBox(height: 16),
-                      Text('No users found', style: Theme.of(context).textTheme.titleMedium),
+                      Text(
+                        'No users found',
+                        style: Theme.of(context).textTheme.titleMedium,
+                      ),
                     ],
                   ),
                 );
               }
 
               return ListView.separated(
-                padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 8),
+                padding:
+                    const EdgeInsets.symmetric(horizontal: 24, vertical: 8),
                 itemCount: users.length,
                 separatorBuilder: (_, __) => const SizedBox(height: 12),
                 itemBuilder: (context, index) {
@@ -404,12 +518,18 @@ class _UsersTab extends ConsumerWidget {
                           width: 48,
                           height: 48,
                           decoration: BoxDecoration(
-                            color: user.isAdmin ? AppColors.focusColor : AppColors.surface,
+                            color: user.isAdmin
+                                ? AppColors.focusColor
+                                : AppColors.surface,
                             shape: BoxShape.circle,
                           ),
                           child: Icon(
-                            user.isAdmin ? Icons.admin_panel_settings : Icons.person,
+                            user.isAdmin
-                            color: user.isAdmin ? Colors.black : AppColors.textPrimary,
+                                ? Icons.admin_panel_settings
+                                : Icons.person,
+                            color: user.isAdmin
+                                ? Colors.black
+                                : AppColors.textPrimary,
                             size: 24,
                           ),
                         ),
@@ -420,38 +540,95 @@ class _UsersTab extends ConsumerWidget {
                             children: [
                               Row(
                                 children: [
-                                  Text(user.username, style: Theme.of(context).textTheme.titleMedium?.copyWith(color: Colors.white)),
+                                  Text(
+                                    user.username,
+                                    style: Theme.of(context)
+                                        .textTheme
+                                        .titleMedium
+                                        ?.copyWith(color: Colors.white),
+                                  ),
                                   if (user.isAdmin) ...[
                                     const SizedBox(width: 8),
                                     Container(
-                                      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
+                                      padding: const EdgeInsets.symmetric(
+                                        horizontal: 8,
+                                        vertical: 2,
+                                      ),
                                       decoration: BoxDecoration(
-                                        color: AppColors.focusColor.withOpacity(0.2),
+                                        color: AppColors.focusColor
+                                            .withOpacity(0.2),
                                         borderRadius: BorderRadius.circular(50),
                                       ),
-                                      child: const Text('ADMIN', style: TextStyle(fontSize: 10, fontWeight: FontWeight.bold, color: AppColors.focusColor)),
+                                      child: const Text(
+                                        'ADMIN',
+                                        style: TextStyle(
+                                          fontSize: 10,
+                                          fontWeight: FontWeight.bold,
+                                          color: AppColors.focusColor,
+                                        ),
+                                      ),
                                     ),
                                   ],
                                 ],
                               ),
                               const SizedBox(height: 4),
-                              Text('ID: ${user.id}', style: Theme.of(context).textTheme.bodyMedium?.copyWith(color: Colors.white60)),
+                              Text(
+                                'ID: ${user.id}',
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .bodyMedium
+                                    ?.copyWith(color: Colors.white60),
+                              ),
                             ],
                           ),
                         ),
                         PopupMenuButton<String>(
-                          icon: const Icon(Icons.more_vert, color: Colors.white70),
+                          icon: const Icon(
+                            Icons.more_vert,
+                            color: Colors.white70,
+                          ),
                           color: AppColors.surface,
-                          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+                          shape: RoundedRectangleBorder(
+                            borderRadius: BorderRadius.circular(12),
+                          ),
                           onSelected: (value) {
                             switch (value) {
-                              case 'password': _showChangePasswordDialog(context, ref, user); break;
+                              case 'password':
-                              case 'delete': _deleteUser(context, ref, user); break;
+                                _showChangePasswordDialog(context, ref, user);
+                                break;
+                              case 'delete':
+                                _deleteUser(context, ref, user);
+                                break;
                             }
                           },
                           itemBuilder: (context) => [
-                            const PopupMenuItem(value: 'password', child: Row(children: [Icon(Icons.lock_reset, size: 18), SizedBox(width: 8), Text('Change Password')])),
+                            const PopupMenuItem(
-                            const PopupMenuItem(value: 'delete', child: Row(children: [Icon(Icons.delete, color: AppColors.error, size: 18), SizedBox(width: 8), Text('Delete', style: TextStyle(color: AppColors.error))])),
+                              value: 'password',
+                              child: Row(
+                                children: [
+                                  Icon(Icons.lock_reset, size: 18),
+                                  SizedBox(width: 8),
+                                  Text('Change Password'),
+                                ],
+                              ),
+                            ),
+                            const PopupMenuItem(
+                              value: 'delete',
+                              child: Row(
+                                children: [
+                                  Icon(
+                                    Icons.delete,
+                                    color: AppColors.error,
+                                    size: 18,
+                                  ),
+                                  SizedBox(width: 8),
+                                  Text(
+                                    'Delete',
+                                    style: TextStyle(color: AppColors.error),
+                                  ),
+                                ],
+                              ),
+                            ),
                           ],
                         ),
                       ],
@@ -480,9 +657,22 @@ class _UsersTab extends ConsumerWidget {
           content: Column(
             mainAxisSize: MainAxisSize.min,
             children: [
-              TextField(controller: usernameController, decoration: const InputDecoration(labelText: 'Nom d\'utilisateur', prefixIcon: Icon(Icons.person_outline))),
+              TextField(
+                controller: usernameController,
+                decoration: const InputDecoration(
+                  labelText: 'Nom d\'utilisateur',
+                  prefixIcon: Icon(Icons.person_outline),
+                ),
+              ),
               const SizedBox(height: 12),
-              TextField(controller: passwordController, decoration: const InputDecoration(labelText: 'Mot de passe', prefixIcon: Icon(Icons.lock_outline)), obscureText: true),
+              TextField(
+                controller: passwordController,
+                decoration: const InputDecoration(
+                  labelText: 'Mot de passe',
+                  prefixIcon: Icon(Icons.lock_outline),
+                ),
+                obscureText: true,
+              ),
               const SizedBox(height: 16),
               SwitchListTile(
                 title: const Text('Administrateur'),
@@ -493,22 +683,47 @@ class _UsersTab extends ConsumerWidget {
             ],
           ),
           actions: [
-            TextButton(onPressed: isLoading ? null : () => Navigator.pop(dialogContext), child: const Text('Annuler')),
+            TextButton(
+              onPressed: isLoading ? null : () => Navigator.pop(dialogContext),
+              child: const Text('Annuler'),
+            ),
             FilledButton(
-              onPressed: isLoading ? null : () async {
+              onPressed: isLoading
-                if (usernameController.text.isEmpty || passwordController.text.isEmpty) {
+                  ? null
-                  ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Tous les champs sont requis')));
+                  : () async {
-                  return;
+                      if (usernameController.text.isEmpty ||
-                }
+                          passwordController.text.isEmpty) {
-                setState(() => isLoading = true);
+                        ScaffoldMessenger.of(context).showSnackBar(
-                final result = await UserApiService().createUser(username: usernameController.text.trim(), password: passwordController.text, isAdmin: isAdmin);
+                          const SnackBar(
-                if (dialogContext.mounted) Navigator.pop(dialogContext);
+                            content: Text('Tous les champs sont requis'),
-                ref.invalidate(usersProvider);
+                          ),
-                if (!result.success && context.mounted) {
+                        );
-                  ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(result.error ?? 'Erreur'), backgroundColor: AppColors.error));
+                        return;
-                }
+                      }
-              },
+                      setState(() => isLoading = true);
-              child: isLoading ? const SizedBox(width: 20, height: 20, child: CircularProgressIndicator(strokeWidth: 2)) : const Text('Créer'),
+                      final result = await UserApiService().createUser(
+                        username: usernameController.text.trim(),
+                        password: passwordController.text,
+                        isAdmin: isAdmin,
+                      );
+                      if (dialogContext.mounted) Navigator.pop(dialogContext);
+                      ref.invalidate(usersProvider);
+                      if (!result.success && context.mounted) {
+                        ScaffoldMessenger.of(context).showSnackBar(
+                          SnackBar(
+                            content: Text(result.error ?? 'Erreur'),
+                            backgroundColor: AppColors.error,
+                          ),
+                        );
+                      }
+                    },
+              child: isLoading
+                  ? const SizedBox(
+                      width: 20,
+                      height: 20,
+                      child: CircularProgressIndicator(strokeWidth: 2),
+                    )
+                  : const Text('Créer'),
             ),
           ],
         ),
@@ -516,7 +731,11 @@ class _UsersTab extends ConsumerWidget {
     );
   }
 
-  void _showChangePasswordDialog(BuildContext context, WidgetRef ref, AppUser user) {
+  void _showChangePasswordDialog(
+    BuildContext context,
+    WidgetRef ref,
+    AppUser user,
+  ) {
     final passwordController = TextEditingController();
     bool isLoading = false;
 
@@ -525,25 +744,60 @@ class _UsersTab extends ConsumerWidget {
       builder: (dialogContext) => StatefulBuilder(
         builder: (context, setState) => AlertDialog(
           title: Text('Changer le mot de passe de ${user.username}'),
-          content: TextField(controller: passwordController, decoration: const InputDecoration(labelText: 'Nouveau mot de passe', prefixIcon: Icon(Icons.lock_outline)), obscureText: true),
+          content: TextField(
+            controller: passwordController,
+            decoration: const InputDecoration(
+              labelText: 'Nouveau mot de passe',
+              prefixIcon: Icon(Icons.lock_outline),
+            ),
+            obscureText: true,
+          ),
           actions: [
-            TextButton(onPressed: isLoading ? null : () => Navigator.pop(dialogContext), child: const Text('Annuler')),
+            TextButton(
+              onPressed: isLoading ? null : () => Navigator.pop(dialogContext),
+              child: const Text('Annuler'),
+            ),
             FilledButton(
-              onPressed: isLoading ? null : () async {
+              onPressed: isLoading
-                if (passwordController.text.isEmpty) {
+                  ? null
-                  ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Mot de passe requis')));
+                  : () async {
-                  return;
+                      if (passwordController.text.isEmpty) {
-                }
+                        ScaffoldMessenger.of(context).showSnackBar(
-                setState(() => isLoading = true);
+                          const SnackBar(
-                final result = await UserApiService().updatePassword(userId: user.id, newPassword: passwordController.text);
+                            content: Text('Mot de passe requis'),
-                if (dialogContext.mounted) Navigator.pop(dialogContext);
+                          ),
-                if (result.success && context.mounted) {
+                        );
-                  ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Mot de passe modifié'), backgroundColor: AppColors.success));
+                        return;
-                } else if (context.mounted) {
+                      }
-                  ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(result.error ?? 'Erreur'), backgroundColor: AppColors.error));
+                      setState(() => isLoading = true);
-                }
+                      final result = await UserApiService().updatePassword(
-              },
+                        userId: user.id,
-              child: isLoading ? const SizedBox(width: 20, height: 20, child: CircularProgressIndicator(strokeWidth: 2)) : const Text('Changer'),
+                        newPassword: passwordController.text,
+                      );
+                      if (dialogContext.mounted) Navigator.pop(dialogContext);
+                      if (result.success && context.mounted) {
+                        ScaffoldMessenger.of(context).showSnackBar(
+                          const SnackBar(
+                            content: Text('Mot de passe modifié'),
+                            backgroundColor: AppColors.success,
+                          ),
+                        );
+                      } else if (context.mounted) {
+                        ScaffoldMessenger.of(context).showSnackBar(
+                          SnackBar(
+                            content: Text(result.error ?? 'Erreur'),
+                            backgroundColor: AppColors.error,
+                          ),
+                        );
+                      }
+                    },
+              child: isLoading
+                  ? const SizedBox(
+                      width: 20,
+                      height: 20,
+                      child: CircularProgressIndicator(strokeWidth: 2),
+                    )
+                  : const Text('Changer'),
             ),
           ],
         ),
@@ -556,16 +810,26 @@ class _UsersTab extends ConsumerWidget {
       context: context,
       builder: (dialogContext) => AlertDialog(
         title: const Text('Supprimer l\'utilisateur'),
-        content: Text('Supprimer "${user.username}" ? Cette action est irréversible.'),
+        content: Text(
+          'Supprimer "${user.username}" ? Cette action est irréversible.',
+        ),
         actions: [
-          TextButton(onPressed: () => Navigator.pop(dialogContext), child: const Text('Annuler')),
+          TextButton(
+            onPressed: () => Navigator.pop(dialogContext),
+            child: const Text('Annuler'),
+          ),
           FilledButton(
             onPressed: () async {
               Navigator.pop(dialogContext);
               final result = await UserApiService().deleteUser(user.id);
               ref.invalidate(usersProvider);
               if (!result.success && context.mounted) {
-                ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(result.error ?? 'Erreur'), backgroundColor: AppColors.error));
+                ScaffoldMessenger.of(context).showSnackBar(
+                  SnackBar(
+                    content: Text(result.error ?? 'Erreur'),
+                    backgroundColor: AppColors.error,
+                  ),
+                );
               }
             },
             style: FilledButton.styleFrom(backgroundColor: AppColors.error),

lib/features/auth/screens/login_screen.dart

@@ -4,7 +4,6 @@ import 'package:go_router/go_router.dart';
 import 'package:google_fonts/google_fonts.dart';
 import '../providers/auth_provider.dart';
 import '../../../core/theme/app_colors.dart';
-import '../../../core/theme/app_theme.dart';
 import '../../../core/widgets/glass_container.dart';
 import '../../../core/widgets/tv_focusable_card.dart';
 
@@ -66,7 +65,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
               ),
             ),
           ),
-          
+
           // 2. Ambient Glows (Apple TV Style)
           Positioned(
             top: -size.height * 0.2,
@@ -206,7 +205,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
                               },
                             ),
                           ),
-                          
+
                           // Error Message
                           if (authState.errorMessage != null) ...[
                             const SizedBox(height: 24),
@@ -261,7 +260,10 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
                                   ? const SizedBox(
                                       width: 24,
                                       height: 24,
-                                      child: CircularProgressIndicator(strokeWidth: 2.5, color: Colors.black),
+                                      child: CircularProgressIndicator(
+                                        strokeWidth: 2.5,
+                                        color: Colors.black,
+                                      ),
                                     )
                                   : Text(
                                       'Sign In',
@@ -277,7 +279,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
                       ),
                     ),
                   ),
-                  
+
                   const SizedBox(height: 32),
                   Text(
                     'Default: admin / admin',
@@ -332,7 +334,8 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
           borderRadius: BorderRadius.circular(12),
           borderSide: const BorderSide(color: AppColors.focusColor, width: 2),
         ),
-        contentPadding: const EdgeInsets.symmetric(horizontal: 20, vertical: 20),
+        contentPadding:
+            const EdgeInsets.symmetric(horizontal: 20, vertical: 20),
       ),
       validator: (value) {
         if (value == null || value.trim().isEmpty) {

lib/features/iptv/screens/dashboard_screen.dart

@@ -31,7 +31,7 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
     Icons.live_tv_rounded,
     Icons.movie_rounded,
     Icons.tv_rounded,
-    Icons.settings_rounded
+    Icons.settings_rounded,
   ];
 
   @override

lib/features/iptv/screens/player_screen.dart

@@ -7,8 +7,6 @@ import 'package:google_fonts/google_fonts.dart';
 import 'package:pointer_interceptor/pointer_interceptor.dart';
 import '../providers/xtream_provider.dart';
 import '../providers/playback_positions_provider.dart';
-import '../providers/settings_provider.dart';
-import '../widgets/lite_player_view.dart';
 
 // ... (existing imports)
 // ... (existing imports)
@@ -17,7 +15,6 @@ import '../../../core/models/iptv_models.dart';
 import '../../../core/widgets/tv_focusable_card.dart';
 import '../../../core/widgets/glass_container.dart';
 import '../../../core/theme/app_colors.dart';
-import '../models/xtream_models.dart';
 import '../widgets/epg_overlay.dart';
 
 enum StreamType { live, vod, series }
@@ -58,7 +55,7 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
   bool _isInitialized = false;
   bool _isLoading = true;
   StreamSubscription? _messageSubscription;
-  String _aspectRatio = 'contain';
+  final String _aspectRatio = 'contain';
   bool _isSeeking = false;
   String _viewId = 'iptv-player';
   String? _currentStreamUrl;
@@ -70,7 +67,8 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
   void initState() {
     super.initState();
     if (widget.channels != null) {
-      _currentIndex = widget.channels!.indexWhere((c) => c.streamId == widget.streamId);
+      _currentIndex =
+          widget.channels!.indexWhere((c) => c.streamId == widget.streamId);
       if (_currentIndex == -1) _currentIndex = 0;
     }
     // Show controls at start, then auto-hide after timeout
@@ -87,7 +85,10 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
     super.dispose();
   }
 
-  Future<void> _initializePlayer({double? startTimeOverride, bool isChannelSwitch = false}) async {
+  Future<void> _initializePlayer({
+    double? startTimeOverride,
+    bool isChannelSwitch = false,
+  }) async {
     setState(() {
       _isLoading = true;
       _statusMessage = 'Loading...';
@@ -96,12 +97,12 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
     try {
       // Determine Stream ID (Initial or Current Index)
       final currentStreamId = isChannelSwitch && widget.channels != null
-          ? widget.channels![_currentIndex].streamId 
+          ? widget.channels![_currentIndex].streamId
           : widget.streamId;
 
-      _viewId = 'iptv-player-$currentStreamId-${DateTime.now().millisecondsSinceEpoch}';
+      _viewId =
-      
+          'iptv-player-$currentStreamId-${DateTime.now().millisecondsSinceEpoch}';
-      
+
       final service = ref.read(xtreamServiceProvider(widget.playlist));
       String streamUrl = '';
 
@@ -110,34 +111,39 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
       if (widget.streamType == StreamType.live) {
         streamUrl = service.getLiveStreamUrl(currentStreamId);
       } else if (widget.streamType == StreamType.vod) {
-        streamUrl = service.getVodStreamUrl(currentStreamId, widget.containerExtension);
+        streamUrl =
+            service.getVodStreamUrl(currentStreamId, widget.containerExtension);
       } else if (widget.streamType == StreamType.series) {
-        streamUrl = service.getSeriesStreamUrl(currentStreamId, widget.containerExtension);
+        streamUrl = service.getSeriesStreamUrl(
+          currentStreamId,
+          widget.containerExtension,
+        );
       }
 
       // Store URL for Lite Player
       _currentStreamUrl = streamUrl;
 
       final encodedUrl = Uri.encodeComponent(streamUrl);
-      final streamTypeParam = widget.streamType == StreamType.live ? 'live' : 'vod';
+      final streamTypeParam =
-      
+          widget.streamType == StreamType.live ? 'live' : 'vod';
+
       // Force player choice based on stream type:
       // - Live TV: Player Lite (simple TS playback with mpegts.js)
       // - VOD/Series: Player Standard (fuller controls, HLS support)
       final isLiveTV = widget.streamType == StreamType.live;
       // Cache buster to force reload of updated player.html
       final cacheBuster = DateTime.now().millisecondsSinceEpoch;
-      
+
-      var playerSrc = isLiveTV 
+      var playerSrc = isLiveTV
-          ? 'player_lite.html?url=$encodedUrl&type=live&v=$cacheBuster' 
+          ? 'player_lite.html?url=$encodedUrl&type=live&v=$cacheBuster'
           : 'player.html?url=$encodedUrl&type=vod&v=$cacheBuster';
-      
+
       if (startTimeOverride != null) {
         playerSrc += '&t=$startTimeOverride';
       }
-      
+
       if (widget.duration != null) {
-         playerSrc += '&duration=${widget.duration!.inSeconds}';
+        playerSrc += '&duration=${widget.duration!.inSeconds}';
       }
 
       // Register View Factory (Only needed for Standard Player, but safe to do always or conditionally)
@@ -157,7 +163,7 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
           _isInitialized = true;
           _isLoading = false;
         });
-        
+
         // Force unmute on load (after a short delay to ensure iframe is ready)
         Future.delayed(const Duration(milliseconds: 500), () {
           if (mounted) {
@@ -185,24 +191,23 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
         final currentTime = (data['currentTime'] as num).toDouble();
         final rawDuration = (data['duration'] as num).toDouble();
         final duration = rawDuration.isFinite ? rawDuration : 0.0;
-        
+
         // Only update position if user is NOT dragging the slider
         if (!_isSeeking) {
-           setState(() {
+          setState(() {
-             _currentPosition = currentTime;
+            _currentPosition = currentTime;
-             _totalDuration = duration > 0 ? duration : 1;
+            _totalDuration = duration > 0 ? duration : 1;
-           });
+          });
-        }
-        
-        // Update watch history if relevant
-        if (currentTime > 0) {
-           ref.read(playbackPositionsProvider.notifier).savePosition(
-              widget.streamId, 
-              currentTime,
-              duration
-           );
         }
 
+        // Update watch history if relevant
+        if (currentTime > 0) {
+          ref.read(playbackPositionsProvider.notifier).savePosition(
+                widget.streamId,
+                currentTime,
+                duration,
+              );
+        }
       } else if (type == 'playback_status') {
         setState(() => _isPlaying = data['status'] == 'playing');
       } else if (type == 'user_activity') {
@@ -213,7 +218,8 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
 
   void _sendMessage(Map<String, dynamic> message) {
     if (_isInitialized) {
-      final iframe = html.document.getElementById(_viewId) as html.IFrameElement?;
+      final iframe =
+          html.document.getElementById(_viewId) as html.IFrameElement?;
       iframe?.contentWindow?.postMessage(message, '*');
     }
   }
@@ -272,7 +278,7 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
       _initializePlayer(isChannelSwitch: true);
     }
   }
-  
+
   String _formatDuration(Duration d) {
     String twoDigits(int n) => n.toString().padLeft(2, '0');
     final hours = twoDigits(d.inHours);
@@ -306,8 +312,7 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
               fit: StackFit.expand,
               children: [
                 // Video Player (iframe with native controls)
-                if (_isInitialized)
+                if (_isInitialized) HtmlElementView(viewType: _viewId),
-                  HtmlElementView(viewType: _viewId),
 
                 // Top Bar: Back Button + Title (with auto-hide)
                 AnimatedPositioned(
@@ -326,21 +331,26 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
                             customBorder: const CircleBorder(),
                             child: const Padding(
                               padding: EdgeInsets.all(12),
-                              child: Icon(Icons.arrow_back_rounded, color: Colors.white),
+                              child: Icon(
+                                Icons.arrow_back_rounded,
+                                color: Colors.white,
+                              ),
                             ),
                           ),
                         ),
                         const SizedBox(width: 16),
                         Expanded(
                           child: Text(
-                            widget.channels != null 
+                            widget.channels != null
-                                ? widget.channels![_currentIndex].name 
+                                ? widget.channels![_currentIndex].name
                                 : widget.title,
                             style: const TextStyle(
-                              color: Colors.white, 
+                              color: Colors.white,
-                              fontSize: 18, 
+                              fontSize: 18,
                               fontWeight: FontWeight.bold,
-                              shadows: [Shadow(blurRadius: 4, color: Colors.black)],
+                              shadows: [
+                                Shadow(blurRadius: 4, color: Colors.black),
+                              ],
                             ),
                             overflow: TextOverflow.ellipsis,
                           ),
@@ -355,8 +365,10 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
                             child: Padding(
                               padding: const EdgeInsets.all(12),
                               child: Icon(
-                                _isMuted ? Icons.volume_off_rounded : Icons.volume_up_rounded, 
+                                _isMuted
-                                color: Colors.white
+                                    ? Icons.volume_off_rounded
+                                    : Icons.volume_up_rounded,
+                                color: Colors.white,
                               ),
                             ),
                           ),
@@ -385,7 +397,11 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
                               customBorder: const CircleBorder(),
                               child: const Padding(
                                 padding: EdgeInsets.all(14),
-                                child: Icon(Icons.keyboard_arrow_up, color: Colors.white, size: 28),
+                                child: Icon(
+                                  Icons.keyboard_arrow_up,
+                                  color: Colors.white,
+                                  size: 28,
+                                ),
                               ),
                             ),
                           ),
@@ -399,7 +415,11 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
                               customBorder: const CircleBorder(),
                               child: const Padding(
                                 padding: EdgeInsets.all(14),
-                                child: Icon(Icons.keyboard_arrow_down, color: Colors.white, size: 28),
+                                child: Icon(
+                                  Icons.keyboard_arrow_down,
+                                  color: Colors.white,
+                                  size: 28,
+                                ),
                               ),
                             ),
                           ),
@@ -418,8 +438,8 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
                     child: PointerInterceptor(
                       child: EpgOverlay(
                         playlist: widget.playlist,
-                        streamId: widget.channels != null 
+                        streamId: widget.channels != null
-                            ? widget.channels![_currentIndex].streamId 
+                            ? widget.channels![_currentIndex].streamId
                             : widget.streamId,
                       ),
                     ),
@@ -438,8 +458,7 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
         fit: StackFit.expand,
         children: [
           // 1. Video Player Layer
-          if (_isInitialized)
+          if (_isInitialized) HtmlElementView(viewType: _viewId),
-            HtmlElementView(viewType: _viewId),
 
           // 2. Interaction Layer
           Positioned.fill(
@@ -469,184 +488,256 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
                   color: Colors.black.withOpacity(0.3), // Dim background
                   child: Stack(
                     children: [
-                       // Top Bar (Back + Title)
+                      // Top Bar (Back + Title)
-                       Positioned(
+                      Positioned(
-                         top: 24,
+                        top: 24,
-                         left: 24,
+                        left: 24,
-                         right: 24,
+                        right: 24,
-                         child: Row(
+                        child: Row(
-                           children: [
+                          children: [
-                             TvFocusableCard(
+                            TvFocusableCard(
-                               onTap: () => Navigator.pop(context),
+                              onTap: () => Navigator.pop(context),
-                               borderRadius: 50,
+                              borderRadius: 50,
-                               child: Container(
+                              child: Container(
-                                 padding: const EdgeInsets.all(12),
+                                padding: const EdgeInsets.all(12),
-                                 decoration: BoxDecoration(
+                                decoration: BoxDecoration(
-                                   color: Colors.white.withOpacity(0.1),
+                                  color: Colors.white.withOpacity(0.1),
-                                   shape: BoxShape.circle,
+                                  shape: BoxShape.circle,
-                                 ),
+                                ),
-                                 child: const Icon(Icons.arrow_back_rounded, color: Colors.white),
+                                child: const Icon(
-                               ),
+                                  Icons.arrow_back_rounded,
-                             ),
+                                  color: Colors.white,
-                             const SizedBox(width: 24),
+                                ),
-                             Column(
+                              ),
-                               crossAxisAlignment: CrossAxisAlignment.start,
+                            ),
-                               mainAxisSize: MainAxisSize.min,
+                            const SizedBox(width: 24),
-                               children: [
+                            Column(
-                                 Text(
+                              crossAxisAlignment: CrossAxisAlignment.start,
-                                   widget.channels != null 
+                              mainAxisSize: MainAxisSize.min,
-                                     ? widget.channels![_currentIndex].name 
+                              children: [
-                                     : widget.title,
+                                Text(
-                                   style: GoogleFonts.inter(
+                                  widget.channels != null
-                                     fontSize: 24,
+                                      ? widget.channels![_currentIndex].name
-                                     fontWeight: FontWeight.w700,
+                                      : widget.title,
-                                     color: Colors.white,
+                                  style: GoogleFonts.inter(
-                                   ),
+                                    fontSize: 24,
-                                 ),
+                                    fontWeight: FontWeight.w700,
-                                 if (widget.streamType == StreamType.live && widget.channels != null)
+                                    color: Colors.white,
-                                    Text(
+                                  ),
-                                       'Live TV', 
+                                ),
-                                       style: GoogleFonts.inter(fontSize: 14, color: AppColors.live, fontWeight: FontWeight.bold)
+                                if (widget.streamType == StreamType.live &&
+                                    widget.channels != null)
+                                  Text(
+                                    'Live TV',
+                                    style: GoogleFonts.inter(
+                                      fontSize: 14,
+                                      color: AppColors.live,
+                                      fontWeight: FontWeight.bold,
                                     ),
-                               ],
+                                  ),
-                             ),
+                              ],
-                           ],
+                            ),
-                         ),
+                          ],
-                       ),
+                        ),
+                      ),
 
-                       // Center Play/Pause (Animated)
+                      // Center Play/Pause (Animated)
-                       Center(
+                      Center(
-                         child: _isLoading 
+                        child: _isLoading
-                           ? const CircularProgressIndicator(color: Colors.white)
+                            ? const CircularProgressIndicator(
-                           : TvFocusableCard(
+                                color: Colors.white,
-                               onTap: _togglePlayPause,
+                              )
-                               borderRadius: 100,
+                            : TvFocusableCard(
-                               scaleFactor: 1.2,
+                                onTap: _togglePlayPause,
-                               child: Container(
+                                borderRadius: 100,
-                                 width: 80,
+                                scaleFactor: 1.2,
-                                 height: 80,
+                                child: Container(
-                                 decoration: BoxDecoration(
+                                  width: 80,
-                                   color: Colors.white.withOpacity(0.2),
+                                  height: 80,
-                                   shape: BoxShape.circle,
+                                  decoration: BoxDecoration(
-                                   border: Border.all(color: Colors.white.withOpacity(0.3)),
+                                    color: Colors.white.withOpacity(0.2),
-                                 ),
+                                    shape: BoxShape.circle,
-                                 child: Icon(
+                                    border: Border.all(
-                                   _isPlaying ? Icons.pause_rounded : Icons.play_arrow_rounded,
+                                      color: Colors.white.withOpacity(0.3),
-                                   color: Colors.white,
+                                    ),
-                                   size: 48,
+                                  ),
-                                 ),
+                                  child: Icon(
-                               ),
+                                    _isPlaying
-                             ),
+                                        ? Icons.pause_rounded
-                       ),
+                                        : Icons.play_arrow_rounded,
+                                    color: Colors.white,
+                                    size: 48,
+                                  ),
+                                ),
+                              ),
+                      ),
 
-                       // EPG Overlay
+                      // EPG Overlay
-                       if (widget.streamType == StreamType.live)
+                      if (widget.streamType == StreamType.live)
-                         Positioned(
+                        Positioned(
-                           bottom: 140, 
+                          bottom: 140,
-                           left: 40,
+                          left: 40,
-                           child: EpgOverlay(
+                          child: EpgOverlay(
-                             streamId: widget.channels != null 
+                            streamId: widget.channels != null
-                              ? widget.channels![_currentIndex].streamId 
+                                ? widget.channels![_currentIndex].streamId
-                              : widget.streamId,
+                                : widget.streamId,
-                             playlist: widget.playlist,
+                            playlist: widget.playlist,
-                           ),
+                          ),
-                         ),
+                        ),
 
-                       // Bottom Control Bar
+                      // Bottom Control Bar
-                       Positioned(
+                      Positioned(
-                         bottom: 40,
+                        bottom: 40,
-                         left: 40,
+                        left: 40,
-                         right: 40,
+                        right: 40,
-                          child: GlassContainer(
+                        child: GlassContainer(
-                           borderRadius: 24,
+                          borderRadius: 24,
-                           opacity: 0.8,
+                          opacity: 0.8,
-                           padding: const EdgeInsets.all(24),
+                          padding: const EdgeInsets.all(24),
-                           child: Column(
+                          child: Column(
-                             mainAxisSize: MainAxisSize.min,
+                            mainAxisSize: MainAxisSize.min,
-                             children: [
+                            children: [
-                               // Progress Bar (if not live)
+                              // Progress Bar (if not live)
-                               if (widget.streamType != StreamType.live)
+                              if (widget.streamType != StreamType.live)
-                                 Padding(
+                                Padding(
-                                   padding: const EdgeInsets.only(bottom: 16),
+                                  padding: const EdgeInsets.only(bottom: 16),
-                                   child: Row(
+                                  child: Row(
-                                     children: [
+                                    children: [
-                                       Text(_formatDuration(Duration(seconds: _currentPosition.toInt())), style: const TextStyle(color: Colors.white70)),
+                                      Text(
-                                       const SizedBox(width: 16),
+                                        _formatDuration(
-                                       Expanded(
+                                          Duration(
-                                         child: SliderTheme(
+                                            seconds: _currentPosition.toInt(),
-                                           data: SliderThemeData(
+                                          ),
-                                             trackHeight: 4,
+                                        ),
-                                             thumbShape: const RoundSliderThumbShape(enabledThumbRadius: 8),
+                                        style: const TextStyle(
-                                             overlayShape: const RoundSliderOverlayShape(overlayRadius: 16),
+                                          color: Colors.white70,
-                                             activeTrackColor: AppColors.primary,
+                                        ),
-                                             inactiveTrackColor: Colors.white24,
+                                      ),
-                                             thumbColor: Colors.white,
+                                      const SizedBox(width: 16),
-                                           ),
+                                      Expanded(
-                                           child: Slider(
+                                        child: SliderTheme(
-                                             value: _currentPosition,
+                                          data: const SliderThemeData(
-                                             min: 0,
+                                            trackHeight: 4,
-                                             max: _totalDuration,
+                                            thumbShape: RoundSliderThumbShape(
-                                             onChangeStart: (value) {
+                                              enabledThumbRadius: 8,
-                                               setState(() => _isSeeking = true);
+                                            ),
-                                             },
+                                            overlayShape:
-                                             onChanged: (value) {
+                                                RoundSliderOverlayShape(
-                                               // Update UI immediately (optimistic update)
+                                              overlayRadius: 16,
-                                               setState(() => _currentPosition = value);
+                                            ),
-                                             },
+                                            activeTrackColor: AppColors.primary,
-                                             onChangeEnd: (value) {
+                                            inactiveTrackColor: Colors.white24,
-                                               _sendMessage({'type': 'seek', 'value': value});
+                                            thumbColor: Colors.white,
-                                               // Small delay to prevent jitter from incoming messages
+                                          ),
-                                               Future.delayed(const Duration(milliseconds: 500), () {
+                                          child: Slider(
-                                                 if (mounted) setState(() => _isSeeking = false);
+                                            value: _currentPosition,
-                                               });
+                                            min: 0,
-                                             },
+                                            max: _totalDuration,
-                                           ),
+                                            onChangeStart: (value) {
-                                         ),
+                                              setState(() => _isSeeking = true);
-                                       ),
+                                            },
-                                       const SizedBox(width: 16),
+                                            onChanged: (value) {
-                                       Text(_formatDuration(Duration(seconds: _totalDuration.toInt())), style: const TextStyle(color: Colors.white70)),
+                                              // Update UI immediately (optimistic update)
-                                     ],
+                                              setState(
-                                   ),
+                                                () => _currentPosition = value,
-                                 ),
+                                              );
-                               
+                                            },
-                               // Controls Row
+                                            onChangeEnd: (value) {
-                               Row(
+                                              _sendMessage({
-                                 mainAxisAlignment: MainAxisAlignment.center,
+                                                'type': 'seek',
-                                 children: [
+                                                'value': value,
-                                   // Channel Zapping for Live TV
+                                              });
-                                   if (widget.streamType == StreamType.live && widget.channels != null) ...[
+                                              // Small delay to prevent jitter from incoming messages
-                                     _buildTvControl(Icons.navigate_before_rounded, _previousChannel), 
+                                              Future.delayed(
-                                     const SizedBox(width: 32),
+                                                  const Duration(
-                                     _buildTvControl(Icons.navigate_next_rounded, _nextChannel),
+                                                    milliseconds: 500,
-                                   ],
+                                                  ), () {
-                                   
+                                                if (mounted) {
-                                   // Controls for VOD (Keep Skip buttons, they act as Prev/Next track if playlist or maybe seek)
+                                                  setState(
-                                   // The user said: "only for live tv, other buttons skip/prev must allow changing channel"
+                                                    () => _isSeeking = false,
-                                   // This implies for VOD they might want seek? But existing buttons were skip_previous/skip_next. 
+                                                  );
-                                   // We keep them for VOD if channels list is present, or just hide them if not needed.
+                                                }
-                                   // For now, I will restore them for VOD as well if channels > 0 (playlist mode)
+                                              });
-                                   if (widget.streamType != StreamType.live && widget.channels != null && widget.channels!.isNotEmpty) ...[
+                                            },
-                                      _buildTvControl(Icons.skip_previous_rounded, _previousChannel), 
+                                          ),
-                                      const SizedBox(width: 32),
+                                        ),
-                                      _buildTvControl(Icons.skip_next_rounded, _nextChannel),
+                                      ),
-                                   ],
+                                      const SizedBox(width: 16),
-                                   
+                                      Text(
-                                   const Spacer(),
+                                        _formatDuration(
-                                   // Volume/Mute button
+                                          Duration(
-                                   _buildTvControl(
+                                            seconds: _totalDuration.toInt(),
-                                     _isMuted ? Icons.volume_off_rounded : Icons.volume_up_rounded, 
+                                          ),
-                                     _toggleMute
+                                        ),
-                                   ),
+                                        style: const TextStyle(
-                                   const SizedBox(width: 16),
+                                          color: Colors.white70,
-                                    _buildTvControl(Icons.subtitles_rounded, () {}),
+                                        ),
-                                    const SizedBox(width: 16),
+                                      ),
-                                    _buildTvControl(Icons.aspect_ratio_rounded, _toggleFullscreen),
+                                    ],
-                                 ],
+                                  ),
-                               ),
+                                ),
-                             ],
+
-                           ),
+                              // Controls Row
-                         ),
+                              Row(
-                       ),
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                children: [
+                                  // Channel Zapping for Live TV
+                                  if (widget.streamType == StreamType.live &&
+                                      widget.channels != null) ...[
+                                    _buildTvControl(
+                                      Icons.navigate_before_rounded,
+                                      _previousChannel,
+                                    ),
+                                    const SizedBox(width: 32),
+                                    _buildTvControl(
+                                      Icons.navigate_next_rounded,
+                                      _nextChannel,
+                                    ),
+                                  ],
+
+                                  // Controls for VOD (Keep Skip buttons, they act as Prev/Next track if playlist or maybe seek)
+                                  // The user said: "only for live tv, other buttons skip/prev must allow changing channel"
+                                  // This implies for VOD they might want seek? But existing buttons were skip_previous/skip_next.
+                                  // We keep them for VOD if channels list is present, or just hide them if not needed.
+                                  // For now, I will restore them for VOD as well if channels > 0 (playlist mode)
+                                  if (widget.streamType != StreamType.live &&
+                                      widget.channels != null &&
+                                      widget.channels!.isNotEmpty) ...[
+                                    _buildTvControl(
+                                      Icons.skip_previous_rounded,
+                                      _previousChannel,
+                                    ),
+                                    const SizedBox(width: 32),
+                                    _buildTvControl(
+                                      Icons.skip_next_rounded,
+                                      _nextChannel,
+                                    ),
+                                  ],
+
+                                  const Spacer(),
+                                  // Volume/Mute button
+                                  _buildTvControl(
+                                    _isMuted
+                                        ? Icons.volume_off_rounded
+                                        : Icons.volume_up_rounded,
+                                    _toggleMute,
+                                  ),
+                                  const SizedBox(width: 16),
+                                  _buildTvControl(
+                                    Icons.subtitles_rounded,
+                                    () {},
+                                  ),
+                                  const SizedBox(width: 16),
+                                  _buildTvControl(
+                                    Icons.aspect_ratio_rounded,
+                                    _toggleFullscreen,
+                                  ),
+                                ],
+                              ),
+                            ],
+                          ),
+                        ),
+                      ),
                     ],
                   ),
                 ),
@@ -656,7 +747,7 @@ class _PlayerScreenState extends ConsumerState<PlayerScreen> {
       ),
     );
   }
-  
+
   Widget _buildTvControl(IconData icon, VoidCallback onTap) {
     return TvFocusableCard(
       onTap: onTap,

lib/features/iptv/screens/playlist_selection_screen.dart

@@ -26,14 +26,18 @@ class PlaylistSelectionScreen extends ConsumerWidget {
       appBar: AppBar(
         title: Text(
           'Select Playlist',
-          style: GoogleFonts.roboto(fontWeight: FontWeight.w600, color: Colors.white),
+          style: GoogleFonts.roboto(
+            fontWeight: FontWeight.w600,
+            color: Colors.white,
+          ),
         ),
         backgroundColor: Colors.transparent,
         elevation: 0,
         actions: [
           if (currentUser?.isAdmin ?? false)
             IconButton(
-              icon: const Icon(Icons.admin_panel_settings, color: Colors.white70),
+              icon:
+                  const Icon(Icons.admin_panel_settings, color: Colors.white70),
               onPressed: () => context.go('/admin'),
               tooltip: 'Admin Panel',
             ),
@@ -69,7 +73,13 @@ class PlaylistSelectionScreen extends ConsumerWidget {
               children: [
                 Icon(Icons.error_outline, size: 64, color: Colors.red.shade400),
                 const SizedBox(height: 16),
-                Text('Error loading playlists', style: GoogleFonts.roboto(fontSize: 18, color: Colors.white70)),
+                Text(
+                  'Error loading playlists',
+                  style: GoogleFonts.roboto(
+                    fontSize: 18,
+                    color: Colors.white70,
+                  ),
+                ),
                 const SizedBox(height: 8),
                 ElevatedButton(
                   onPressed: () => ref.refresh(playlistsProvider),
@@ -84,7 +94,7 @@ class PlaylistSelectionScreen extends ConsumerWidget {
                 child: Column(
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
-                    Icon(
+                    const Icon(
                       Icons.playlist_remove,
                       size: 64,
                       color: Colors.white24,
@@ -113,7 +123,12 @@ class PlaylistSelectionScreen extends ConsumerWidget {
             }
 
             return GridView.builder(
-              padding: const EdgeInsets.fromLTRB(24, 100, 24, 24), // Top padding for transparent AppBar
+              padding: const EdgeInsets.fromLTRB(
+                24,
+                100,
+                24,
+                24,
+              ), // Top padding for transparent AppBar
               gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
                 crossAxisCount: 3,
                 crossAxisSpacing: 24,
@@ -165,23 +180,25 @@ class _PlaylistCardState extends State<_PlaylistCard> {
         child: AnimatedContainer(
           duration: const Duration(milliseconds: 200),
           decoration: BoxDecoration(
-            color: _isHovered 
+            color: _isHovered
-                ? Colors.white.withOpacity(0.15) 
+                ? Colors.white.withOpacity(0.15)
                 : Colors.white.withOpacity(0.05), // Glass effect
             borderRadius: BorderRadius.circular(16),
             border: Border.all(
-              color: _isHovered 
+              color: _isHovered
-                  ? Colors.white.withOpacity(0.5) 
+                  ? Colors.white.withOpacity(0.5)
                   : Colors.white.withOpacity(0.1),
               width: 1.5,
             ),
-            boxShadow: _isHovered ? [
+            boxShadow: _isHovered
-              BoxShadow(
+                ? [
-                color: Colors.black.withOpacity(0.3),
+                    BoxShadow(
-                blurRadius: 20,
+                      color: Colors.black.withOpacity(0.3),
-                offset: const Offset(0, 10),
+                      blurRadius: 20,
-              ),
+                      offset: const Offset(0, 10),
-            ] : [],
+                    ),
+                  ]
+                : [],
           ),
           padding: const EdgeInsets.all(24),
           child: Column(
@@ -204,7 +221,8 @@ class _PlaylistCardState extends State<_PlaylistCard> {
               const SizedBox(height: 16),
               Text(
                 widget.playlist.name,
-                style: GoogleFonts.outfit( // Using Outfit for modern look
+                style: GoogleFonts.outfit(
+                  // Using Outfit for modern look
                   fontSize: 20,
                   fontWeight: FontWeight.bold,
                   color: Colors.white,
@@ -229,4 +247,3 @@ class _PlaylistCardState extends State<_PlaylistCard> {
     );
   }
 }
-

lib/features/iptv/widgets/category_carousel.dart

@@ -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
+          color: isSelected ? null : colorScheme.surfaceContainerHighest,
-              ? null
-              : colorScheme.surfaceContainerHighest,
           borderRadius: BorderRadius.circular(20),
           border: Border.all(
-            color: isSelected
+            color: isSelected ? Colors.transparent : colorScheme.outlineVariant,
-                ? Colors.transparent
-                : colorScheme.outlineVariant,
           ),
         ),
         child: Row(
@@ -209,9 +205,8 @@ class CategoryChipButton extends StatelessWidget {
               style: TextStyle(
                 fontSize: 13,
                 fontWeight: FontWeight.w600,
-                color: isSelected
+                color:
-                    ? colorScheme.onPrimary
+                    isSelected ? colorScheme.onPrimary : colorScheme.onSurface,
-                    : colorScheme.onSurface,
               ),
             ),
           ],

lib/features/iptv/widgets/epg_overlay.dart

@@ -1,4 +1,3 @@
-import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import '../../../core/models/playlist_config.dart';

lib/features/iptv/widgets/lite_player_view.dart

@@ -122,7 +122,7 @@ class _LitePlayerViewState extends ConsumerState<LitePlayerView> {
                  _initializePlayer();
               },
               child: const Text('Retry'),
-            )
+            ),
           ],
         ),
       );

lib/features/iptv/widgets/live_tv_tab.dart

@@ -8,13 +8,10 @@ import '../screens/player_screen.dart';
 import '../../../core/models/iptv_models.dart';
 import '../../../core/models/playlist_config.dart';
 import '../../../core/theme/app_colors.dart';
-import '../../../core/theme/app_theme.dart';
 import '../../../core/utils/responsive_layout.dart';
-import '../../../core/widgets/components/ui_components.dart';
 import '../../../core/widgets/themed_loading_screen.dart';
 import '../../../core/widgets/glass_container.dart';
 import '../../../core/widgets/tv_focusable_card.dart';
-import 'channel_card.dart';
 
 class LiveTVTab extends ConsumerStatefulWidget {
   final PlaylistConfig playlist;
@@ -27,9 +24,8 @@ class LiveTVTab extends ConsumerStatefulWidget {
 
 class _LiveTVTabState extends ConsumerState<LiveTVTab>
     with AutomaticKeepAliveClientMixin {
-  
   String? _selectedCategory;
-  bool _isGridView = true;
+  final bool _isGridView = true;
   final TextEditingController _searchController = TextEditingController();
   bool _showFavoritesOnly = false;
   String _searchQuery = '';
@@ -57,7 +53,8 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
   Widget build(BuildContext context) {
     super.build(context);
 
-    final channelsAsync = ref.watch(liveChannelsByPlaylistProvider(widget.playlist));
+    final channelsAsync =
+        ref.watch(liveChannelsByPlaylistProvider(widget.playlist));
     final favorites = ref.watch(favoritesProvider);
     final settings = ref.watch(iptvSettingsProvider);
 
@@ -65,30 +62,36 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
       backgroundColor: Colors.transparent,
       body: channelsAsync.when(
         loading: () => const ThemedLoading(),
-        error: (e, s) => Center(child: Text('Error: $e', style: const TextStyle(color: Colors.white))),
+        error: (e, s) => Center(
+          child: Text('Error: $e', style: const TextStyle(color: Colors.white)),
+        ),
         data: (groupedChannels) {
-           var categories = groupedChannels.keys.toList();
+          var categories = groupedChannels.keys.toList();
-           if (settings.liveTvKeywords.isNotEmpty) {
+          if (settings.liveTvKeywords.isNotEmpty) {
-             categories = categories.where((cat) => settings.matchesLiveTvFilter(cat)).toList();
+            categories = categories
-           }
+                .where((cat) => settings.matchesLiveTvFilter(cat))
-           categories.sort();
+                .toList();
-           
+          }
-           List<Channel> displayedChannels = [];
+          categories.sort();
-           bool showingCategoryGrid = false;
+
-           
+          List<Channel> displayedChannels = [];
-           if (_searchQuery.isNotEmpty) {
+          bool showingCategoryGrid = false;
-             displayedChannels = groupedChannels.values.expand((l) => l)
+
-                 .where((c) => c.name.toLowerCase().contains(_searchQuery))
+          if (_searchQuery.isNotEmpty) {
-                 .toList();
+            displayedChannels = groupedChannels.values
-           } else if (_showFavoritesOnly) {
+                .expand((l) => l)
-             displayedChannels = groupedChannels.values.expand((l) => l)
+                .where((c) => c.name.toLowerCase().contains(_searchQuery))
-                 .where((c) => favorites.contains(c.streamId))
+                .toList();
-                 .toList();
+          } else if (_showFavoritesOnly) {
-           } else if (_selectedCategory != null) {
+            displayedChannels = groupedChannels.values
-              displayedChannels = groupedChannels[_selectedCategory] ?? [];
+                .expand((l) => l)
-           } else {
+                .where((c) => favorites.contains(c.streamId))
-             showingCategoryGrid = true;
+                .toList();
-           }
+          } else if (_selectedCategory != null) {
+            displayedChannels = groupedChannels[_selectedCategory] ?? [];
+          } else {
+            showingCategoryGrid = true;
+          }
 
           return Column(
             children: [
@@ -98,16 +101,19 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
                 child: GlassContainer(
                   borderRadius: 16,
                   opacity: 0.6,
-                  padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
+                  padding:
+                      const EdgeInsets.symmetric(horizontal: 20, vertical: 12),
                   child: Row(
                     children: [
-                      if (_selectedCategory != null && _searchQuery.isEmpty && !_showFavoritesOnly) ...[
+                      if (_selectedCategory != null &&
+                          _searchQuery.isEmpty &&
+                          !_showFavoritesOnly) ...[
                         TvFocusableCard(
                           onTap: () {
-                             setState(() {
+                            setState(() {
-                                _selectedCategory = null;
+                              _selectedCategory = null;
-                                _mainScrollController.jumpTo(0);
+                              _mainScrollController.jumpTo(0);
-                             });
+                            });
                           },
                           borderRadius: 50,
                           child: Container(
@@ -116,7 +122,10 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
                               color: Colors.white.withOpacity(0.1),
                               shape: BoxShape.circle,
                             ),
-                            child: const Icon(Icons.arrow_back, color: Colors.white),
+                            child: const Icon(
+                              Icons.arrow_back,
+                              color: Colors.white,
+                            ),
                           ),
                         ),
                         const SizedBox(width: 16),
@@ -124,9 +133,11 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
 
                       Expanded(
                         child: Text(
-                          _searchQuery.isNotEmpty ? 'Search Results' : 
+                          _searchQuery.isNotEmpty
-                          _showFavoritesOnly ? 'Favorites' :
+                              ? 'Search Results'
-                          _selectedCategory ?? 'Live TV',
+                              : _showFavoritesOnly
+                                  ? 'Favorites'
+                                  : _selectedCategory ?? 'Live TV',
                           style: GoogleFonts.inter(
                             fontSize: 24,
                             fontWeight: FontWeight.w700,
@@ -136,7 +147,7 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
                           overflow: TextOverflow.ellipsis,
                         ),
                       ),
-                      
+
                       // Search Bar
                       Container(
                         width: 250,
@@ -151,37 +162,55 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
                           decoration: InputDecoration(
                             hintText: 'Search channels...',
                             hintStyle: GoogleFonts.inter(color: Colors.white54),
-                            prefixIcon: const Icon(Icons.search, color: Colors.white54),
+                            prefixIcon:
+                                const Icon(Icons.search, color: Colors.white54),
                             border: InputBorder.none,
-                            contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
+                            contentPadding: const EdgeInsets.symmetric(
-                            suffixIcon: _searchQuery.isNotEmpty 
+                              horizontal: 16,
-                              ? IconButton(icon: const Icon(Icons.clear, color: Colors.white), onPressed: _searchController.clear)
+                              vertical: 10,
-                              : null,
+                            ),
+                            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(() {
+                          setState(() {
-                             _showFavoritesOnly = !_showFavoritesOnly;
+                            _showFavoritesOnly = !_showFavoritesOnly;
-                             if (_showFavoritesOnly) _searchController.clear();
+                            if (_showFavoritesOnly) _searchController.clear();
-                             _selectedCategory = null;
+                            _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,
+                            _showFavoritesOnly
-                            color: _showFavoritesOnly ? AppColors.live : Colors.white,
+                                ? Icons.favorite
+                                : Icons.favorite_border,
+                            color: _showFavoritesOnly
+                                ? AppColors.live
+                                : Colors.white,
                           ),
                         ),
                       ),
@@ -199,11 +228,18 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
                             child: Column(
                               mainAxisAlignment: MainAxisAlignment.center,
                               children: [
-                                Icon(Icons.tv_off, size: 64, color: Colors.white.withOpacity(0.3)),
+                                Icon(
+                                  Icons.tv_off,
+                                  size: 64,
+                                  color: Colors.white.withOpacity(0.3),
+                                ),
                                 const SizedBox(height: 16),
                                 Text(
                                   'No channels found',
-                                  style: GoogleFonts.inter(color: Colors.white54, fontSize: 18),
+                                  style: GoogleFonts.inter(
+                                    color: Colors.white54,
+                                    fontSize: 18,
+                                  ),
                                 ),
                               ],
                             ),
@@ -218,7 +254,10 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
     );
   }
 
-  Widget _buildCategoryGrid(List<String> categories, Map<String, List<Channel>> groupedChannels) {
+  Widget _buildCategoryGrid(
+    List<String> categories,
+    Map<String, List<Channel>> groupedChannels,
+  ) {
     final columns = ResponsiveLayout.value(
       context,
       mobile: 2,
@@ -239,7 +278,7 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
       itemBuilder: (context, index) {
         final category = categories[index];
         final count = groupedChannels[category]?.length ?? 0;
-        
+
         return TvFocusableCard(
           onTap: () {
             setState(() {
@@ -271,7 +310,11 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
                   child: Column(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: [
-                      Icon(Icons.folder_copy_outlined, color: Colors.white.withOpacity(0.9), size: 32),
+                      Icon(
+                        Icons.folder_copy_outlined,
+                        color: Colors.white.withOpacity(0.9),
+                        size: 32,
+                      ),
                       const SizedBox(height: 12),
                       Padding(
                         padding: const EdgeInsets.symmetric(horizontal: 16),
@@ -290,7 +333,10 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
                       const SizedBox(height: 4),
                       Text(
                         '$count Channels',
-                        style: GoogleFonts.inter(fontSize: 13, color: Colors.white54),
+                        style: GoogleFonts.inter(
+                          fontSize: 13,
+                          color: Colors.white54,
+                        ),
                       ),
                     ],
                   ),
@@ -337,74 +383,116 @@ class _LiveTVTabState extends ConsumerState<LiveTVTab>
                 // Icon Area
                 Expanded(
                   child: Container(
-                    decoration: BoxDecoration(
+                    decoration: const BoxDecoration(
                       color: Colors.white,
-                      borderRadius: const BorderRadius.vertical(top: Radius.circular(12)),
+                      borderRadius:
+                          BorderRadius.vertical(top: Radius.circular(12)),
                     ),
                     padding: const EdgeInsets.all(16),
                     child: Center(
-                      child: channel.streamIcon.isNotEmpty 
+                      child: channel.streamIcon.isNotEmpty
-                        ? Image.network(
+                          ? Image.network(
-                            _getProxiedIconUrl(channel.streamIcon)!,
+                              _getProxiedIconUrl(channel.streamIcon)!,
-                            errorBuilder: (_,__,___) => const Icon(Icons.tv, color: Colors.grey, size: 40),
+                              errorBuilder: (_, __, ___) => const Icon(
-                          )
+                                Icons.tv,
-                        : Text(
+                                color: Colors.grey,
-                            channel.name.characters.first.toUpperCase(),
+                                size: 40,
-                            style: GoogleFonts.inter(fontSize: 40, fontWeight: FontWeight.bold, color: Colors.black12),
+                              ),
-                          ),
+                            )
+                          : 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(
+                          final epgAsync = ref.watch(
-                              EpgRequestKey(playlist: widget.playlist, streamId: channel.streamId)
+                            epgByPlaylistProvider(
-                            ));
+                              EpgRequestKey(
-                            
+                                playlist: widget.playlist,
-                            return epgAsync.when(
+                                streamId: channel.streamId,
-                              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 epgAsync.when(
+                            data: (epgList) {
+                              if (epgList.isEmpty) {
                                 return Text(
-                                  currentProgram.title,
+                                  'No Info',
-                                  style: GoogleFonts.inter(color: const Color(0xFFFFD700), fontSize: 10, fontWeight: FontWeight.w600),
+                                  style: GoogleFonts.inter(
-                                  maxLines: 1,
+                                    color: Colors.white54,
-                                  overflow: TextOverflow.ellipsis,
+                                    fontSize: 10,
+                                  ),
                                 );
-                              },
+                              }
-                              loading: () => Text('...', style: GoogleFonts.inter(color: Colors.white24, fontSize: 10)),
+                              final now = DateTime.now();
-                              error: (_,__) => Text('Err', style: GoogleFonts.inter(color: Colors.red, fontSize: 10)),
+                              final currentProgram = epgList.firstWhere(
-                            );
+                                (entry) {
-                        }
+                                  try {
+                                    final start = DateTime.parse(entry.start);
+                                    final end = DateTime.parse(entry.end);
+                                    return now.isAfter(start) &&
+                                        now.isBefore(end);
+                                  } catch (e) {
+                                    return false;
+                                  }
+                                },
+                                orElse: () => epgList.first,
+                              );
+
+                              return Text(
+                                currentProgram.title,
+                                style: GoogleFonts.inter(
+                                  color: const Color(0xFFFFD700),
+                                  fontSize: 10,
+                                  fontWeight: FontWeight.w600,
+                                ),
+                                maxLines: 1,
+                                overflow: TextOverflow.ellipsis,
+                              );
+                            },
+                            loading: () => Text(
+                              '...',
+                              style: GoogleFonts.inter(
+                                color: Colors.white24,
+                                fontSize: 10,
+                              ),
+                            ),
+                            error: (_, __) => Text(
+                              'Err',
+                              style: GoogleFonts.inter(
+                                color: Colors.red,
+                                fontSize: 10,
+                              ),
+                            ),
+                          );
+                        },
                       ),
                     ],
                   ),

lib/features/iptv/widgets/movies_tab.dart

@@ -4,10 +4,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:google_fonts/google_fonts.dart';
 import '../../../core/models/playlist_config.dart';
 import '../../../core/theme/app_colors.dart';
-import '../../../core/theme/app_theme.dart';
 import '../../../core/utils/responsive_layout.dart';
 import '../../../core/widgets/components/hero_carousel.dart';
-import '../../../core/widgets/themed_loading_screen.dart';
 import '../../../core/widgets/glass_container.dart';
 import '../../../core/widgets/tv_focusable_card.dart';
 import '../providers/watch_history_provider.dart';
@@ -62,7 +60,7 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
 
   void _onSearchChanged(String query) {
     _searchDebounce?.cancel();
-    
+
     setState(() {
       _searchQuery = query;
       if (query.isEmpty) {
@@ -70,7 +68,7 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
         _isSearching = false;
       }
     });
-    
+
     if (query.length >= 2) {
       _searchDebounce = Timer(const Duration(milliseconds: 500), () {
         _performSearch(query);
@@ -80,13 +78,13 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
 
   Future<void> _performSearch(String query) async {
     if (query.isEmpty) return;
-    
+
     setState(() => _isSearching = true);
-    
+
     try {
       final service = ref.read(xtreamServiceProvider(widget.playlist));
       final results = await service.searchMovies(query);
-      
+
       if (mounted && _searchQuery == query) {
         setState(() {
           _searchResults = results;
@@ -151,7 +149,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 +162,9 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
         movieDuration = Duration(seconds: durationSecs);
       }
     }
-    
+
     if (!mounted) return;
-    
+
     Navigator.push(
       context,
       MaterialPageRoute(
@@ -186,17 +184,19 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
   Widget build(BuildContext context) {
     final settings = ref.watch(iptvSettingsProvider);
     final watchHistory = ref.watch(watchHistoryProvider);
-    
+
     List<Movie> displayMovies;
     if (_searchQuery.isNotEmpty && _searchResults != null) {
       displayMovies = _searchResults!;
     } else {
       displayMovies = settings.moviesKeywords.isEmpty
           ? _movies
-          : _movies.where((m) => settings.matchesMoviesFilter(m.categoryName)).toList();
+          : _movies
+              .where((m) => settings.matchesMoviesFilter(m.categoryName))
+              .toList();
     }
 
-    final double gridItemRatio = 0.65;
+    const double gridItemRatio = 0.65;
     final int crossAxisCount = ResponsiveLayout.value(
       context,
       mobile: 3,
@@ -216,7 +216,8 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
               child: GlassContainer(
                 borderRadius: 100,
                 opacity: 0.6,
-                padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 12),
+                padding:
+                    const EdgeInsets.symmetric(horizontal: 24, vertical: 12),
                 child: Row(
                   children: [
                     Text(
@@ -228,7 +229,7 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
                       ),
                     ),
                     const Spacer(),
-                    
+
                     // Search Bar
                     Container(
                       width: 300,
@@ -240,32 +241,52 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
                       padding: const EdgeInsets.symmetric(horizontal: 16),
                       child: Row(
                         children: [
-                          const Icon(Icons.search, size: 20, color: Colors.white54),
+                          const Icon(
+                            Icons.search,
+                            size: 20,
+                            color: Colors.white54,
+                          ),
                           const SizedBox(width: 8),
                           Expanded(
                             child: TextField(
                               controller: _searchController,
-                              style: GoogleFonts.inter(fontSize: 14, color: Colors.white),
+                              style: GoogleFonts.inter(
+                                fontSize: 14,
+                                color: Colors.white,
+                              ),
                               decoration: InputDecoration(
                                 hintText: 'Search movies...',
-                                hintStyle: GoogleFonts.inter(color: Colors.white54),
+                                hintStyle:
+                                    GoogleFonts.inter(color: Colors.white54),
                                 border: InputBorder.none,
                                 isDense: true,
-                                contentPadding: const EdgeInsets.only(bottom: 12),
+                                contentPadding:
+                                    const EdgeInsets.only(bottom: 12),
                               ),
                               onChanged: _onSearchChanged,
                             ),
                           ),
                           if (_isSearching)
-                             const SizedBox(width: 16, height: 16, child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white)),
+                            const SizedBox(
+                              width: 16,
+                              height: 16,
+                              child: CircularProgressIndicator(
+                                strokeWidth: 2,
+                                color: Colors.white,
+                              ),
+                            ),
                           if (_searchQuery.isNotEmpty)
-                             GestureDetector(
+                            GestureDetector(
-                               onTap: () {
+                              onTap: () {
-                                  _searchController.clear();
+                                _searchController.clear();
-                                  _onSearchChanged('');
+                                _onSearchChanged('');
-                               },
+                              },
-                               child: const Icon(Icons.close, size: 16, color: Colors.white),
+                              child: const Icon(
-                             ),
+                                Icons.close,
+                                size: 16,
+                                color: Colors.white,
+                              ),
+                            ),
                         ],
                       ),
                     ),
@@ -281,21 +302,29 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
               child: Padding(
                 padding: const EdgeInsets.only(bottom: 32),
                 child: HeroCarousel(
-                  items: displayMovies.take(5).map((m) => HeroItem(
+                  items: displayMovies
-                    id: m.streamId,
+                      .take(5)
-                    title: m.name,
+                      .map(
-                    imageUrl: _getProxiedImageUrl(m.streamIcon),
+                        (m) => HeroItem(
-                    subtitle: m.rating != null ? '${_formatRating(m.rating)} ★' : null,
+                          id: m.streamId,
-                    onMoreInfo: () => _playMovie(m),
+                          title: m.name,
-                  )).toList(),
+                          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);
+                    final movie = _movies
-                     _playMovie(movie);
+                        .firstWhere((element) => element.streamId == item.id);
+                    _playMovie(movie);
                   },
                 ),
               ),
             ),
-          
+
           // Movies Grid
           SliverPadding(
             padding: const EdgeInsets.symmetric(horizontal: 24),
@@ -311,7 +340,7 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
                   if (index >= displayMovies.length) return null;
                   final movie = displayMovies[index];
                   final isWatched = watchHistory.isMovieWatched(movie.streamId);
-                  
+
                   return TvFocusableCard(
                     onTap: () => _playMovie(movie),
                     borderRadius: 12,
@@ -321,66 +350,99 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
                         // Poster Image
                         ClipRRect(
                           borderRadius: BorderRadius.circular(12),
-                          child: movie.streamIcon != null && movie.streamIcon!.isNotEmpty
+                          child: movie.streamIcon != null &&
-                            ? Image.network(
+                                  movie.streamIcon!.isNotEmpty
-                                _getProxiedImageUrl(movie.streamIcon),
+                              ? Image.network(
-                                fit: BoxFit.cover,
+                                  _getProxiedImageUrl(movie.streamIcon),
-                                errorBuilder: (ctx, err, stack) => Container(
+                                  fit: BoxFit.cover,
+                                  errorBuilder: (ctx, err, stack) => Container(
+                                    color: AppColors.surfaceVariant,
+                                    child: const Center(
+                                      child: Icon(
+                                        Icons.movie,
+                                        size: 48,
+                                        color: Colors.white24,
+                                      ),
+                                    ),
+                                  ),
+                                )
+                              : Container(
                                   color: AppColors.surfaceVariant,
-                                  child: const Center(child: Icon(Icons.movie, size: 48, color: Colors.white24)),
+                                  child: const Center(
+                                    child: Icon(
+                                      Icons.movie,
+                                      size: 48,
+                                      color: Colors.white24,
+                                    ),
+                                  ),
                                 ),
-                              )
-                            : Container(
-                                color: AppColors.surfaceVariant,
-                                child: const Center(child: Icon(Icons.movie, size: 48, color: Colors.white24)),
-                              ),
                         ),
-                        
+
                         // Gradient Overlay
                         Positioned(
-                          left: 0, right: 0, bottom: 0,
+                          left: 0,
+                          right: 0,
+                          bottom: 0,
                           height: 80,
                           child: Container(
                             decoration: BoxDecoration(
                               gradient: LinearGradient(
                                 begin: Alignment.topCenter,
                                 end: Alignment.bottomCenter,
-                                colors: [Colors.transparent, Colors.black.withOpacity(0.9)],
+                                colors: [
+                                  Colors.transparent,
+                                  Colors.black.withOpacity(0.9),
+                                ],
+                              ),
+                              borderRadius: const BorderRadius.vertical(
+                                bottom: Radius.circular(12),
                               ),
-                              borderRadius: const BorderRadius.vertical(bottom: Radius.circular(12)),
-                            ),
-                          ),
-                        ),
-                        
-                        // Rating Badge
-                        if (movie.rating != null && movie.rating!.isNotEmpty)
-                        Positioned(
-                          top: 8,
-                          right: 8,
-                          child: Container(
-                            padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
-                            decoration: BoxDecoration(
-                              color: Colors.black.withOpacity(0.7),
-                              borderRadius: BorderRadius.circular(4),
-                              border: Border.all(color: Colors.white24),
-                            ),
-                            child: Row(
-                              mainAxisSize: MainAxisSize.min,
-                              children: [
-                                const Icon(Icons.star, size: 10, color: Colors.amber),
-                                const SizedBox(width: 4),
-                                Text(
-                                  _formatRating(movie.rating)!,
-                                  style: GoogleFonts.inter(fontSize: 10, fontWeight: FontWeight.bold, color: Colors.white),
-                                ),
-                              ],
                             ),
                           ),
                         ),
 
+                        // Rating Badge
+                        if (movie.rating != null && movie.rating!.isNotEmpty)
+                          Positioned(
+                            top: 8,
+                            right: 8,
+                            child: Container(
+                              padding: const EdgeInsets.symmetric(
+                                horizontal: 6,
+                                vertical: 2,
+                              ),
+                              decoration: BoxDecoration(
+                                color: Colors.black.withOpacity(0.7),
+                                borderRadius: BorderRadius.circular(4),
+                                border: Border.all(color: Colors.white24),
+                              ),
+                              child: Row(
+                                mainAxisSize: MainAxisSize.min,
+                                children: [
+                                  const Icon(
+                                    Icons.star,
+                                    size: 10,
+                                    color: Colors.amber,
+                                  ),
+                                  const SizedBox(width: 4),
+                                  Text(
+                                    _formatRating(movie.rating)!,
+                                    style: GoogleFonts.inter(
+                                      fontSize: 10,
+                                      fontWeight: FontWeight.bold,
+                                      color: Colors.white,
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ),
+                          ),
+
                         // Title
                         Positioned(
-                          left: 12, right: 12, bottom: 12,
+                          left: 12,
+                          right: 12,
+                          bottom: 12,
                           child: Column(
                             crossAxisAlignment: CrossAxisAlignment.start,
                             mainAxisSize: MainAxisSize.min,
@@ -391,7 +453,12 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
                                   color: Colors.white,
                                   fontSize: 13,
                                   fontWeight: FontWeight.w600,
-                                  shadows: [const Shadow(color: Colors.black, blurRadius: 4)],
+                                  shadows: [
+                                    const Shadow(
+                                      color: Colors.black,
+                                      blurRadius: 4,
+                                    ),
+                                  ],
                                 ),
                                 maxLines: 2,
                                 overflow: TextOverflow.ellipsis,
@@ -401,7 +468,11 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
                                   padding: const EdgeInsets.only(top: 4),
                                   child: Text(
                                     'WATCHED',
-                                    style: GoogleFonts.inter(color: AppColors.primary, fontSize: 10, fontWeight: FontWeight.bold),
+                                    style: GoogleFonts.inter(
+                                      color: AppColors.primary,
+                                      fontSize: 10,
+                                      fontWeight: FontWeight.bold,
+                                    ),
                                   ),
                                 ),
                             ],
@@ -415,16 +486,18 @@ class _MoviesTabState extends ConsumerState<MoviesTab> {
               ),
             ),
           ),
-          
+
           // Loader
           if (_isLoading)
             const SliverToBoxAdapter(
               child: Padding(
                 padding: EdgeInsets.all(32),
-                child: Center(child: CircularProgressIndicator(color: Colors.white)),
+                child: Center(
+                  child: CircularProgressIndicator(color: Colors.white),
+                ),
               ),
             ),
-            
+
           const SliverPadding(padding: EdgeInsets.only(bottom: 50)),
         ],
       ),

lib/features/iptv/widgets/series_tab.dart

@@ -62,7 +62,7 @@ class _SeriesTabState extends ConsumerState<SeriesTab> {
 
   void _onSearchChanged(String query) {
     _searchDebounce?.cancel();
-    
+
     setState(() {
       _searchQuery = query;
       if (query.isEmpty) {
@@ -70,7 +70,7 @@ class _SeriesTabState extends ConsumerState<SeriesTab> {
         _isSearching = false;
       }
     });
-    
+
     if (query.length >= 2) {
       _searchDebounce = Timer(const Duration(milliseconds: 500), () {
         _performSearch(query);
@@ -80,13 +80,13 @@ class _SeriesTabState extends ConsumerState<SeriesTab> {
 
   Future<void> _performSearch(String query) async {
     if (query.isEmpty) return;
-    
+
     setState(() => _isSearching = true);
-    
+
     try {
       final service = ref.read(xtreamServiceProvider(widget.playlist));
       final results = await service.searchSeries(query);
-      
+
       if (mounted && _searchQuery == query) {
         setState(() {
           _searchResults = results;
@@ -164,17 +164,19 @@ class _SeriesTabState extends ConsumerState<SeriesTab> {
   @override
   Widget build(BuildContext context) {
     final settings = ref.watch(iptvSettingsProvider);
-    
+
     List<Series> displaySeries;
     if (_searchQuery.isNotEmpty && _searchResults != null) {
       displaySeries = _searchResults!;
     } else {
       displaySeries = settings.seriesKeywords.isEmpty
           ? _series
-          : _series.where((s) => settings.matchesSeriesFilter(s.categoryName)).toList();
+          : _series
+              .where((s) => settings.matchesSeriesFilter(s.categoryName))
+              .toList();
     }
 
-    final double gridItemRatio = 0.65;
+    const double gridItemRatio = 0.65;
     final int crossAxisCount = ResponsiveLayout.value(
       context,
       mobile: 3,
@@ -194,7 +196,8 @@ class _SeriesTabState extends ConsumerState<SeriesTab> {
               child: GlassContainer(
                 borderRadius: 100,
                 opacity: 0.6,
-                padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 12),
+                padding:
+                    const EdgeInsets.symmetric(horizontal: 24, vertical: 12),
                 child: Row(
                   children: [
                     Text(
@@ -216,32 +219,52 @@ class _SeriesTabState extends ConsumerState<SeriesTab> {
                       padding: const EdgeInsets.symmetric(horizontal: 16),
                       child: Row(
                         children: [
-                          const Icon(Icons.search, size: 20, color: Colors.white54),
+                          const Icon(
+                            Icons.search,
+                            size: 20,
+                            color: Colors.white54,
+                          ),
                           const SizedBox(width: 8),
                           Expanded(
                             child: TextField(
                               controller: _searchController,
-                              style: GoogleFonts.inter(fontSize: 14, color: Colors.white),
+                              style: GoogleFonts.inter(
+                                fontSize: 14,
+                                color: Colors.white,
+                              ),
                               decoration: InputDecoration(
                                 hintText: 'Search series...',
-                                hintStyle: GoogleFonts.inter(color: Colors.white54),
+                                hintStyle:
+                                    GoogleFonts.inter(color: Colors.white54),
                                 border: InputBorder.none,
                                 isDense: true,
-                                contentPadding: const EdgeInsets.only(bottom: 12),
+                                contentPadding:
+                                    const EdgeInsets.only(bottom: 12),
                               ),
                               onChanged: _onSearchChanged,
                             ),
                           ),
                           if (_isSearching)
-                             const SizedBox(width: 16, height: 16, child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white)),
+                            const SizedBox(
+                              width: 16,
+                              height: 16,
+                              child: CircularProgressIndicator(
+                                strokeWidth: 2,
+                                color: Colors.white,
+                              ),
+                            ),
                           if (_searchQuery.isNotEmpty)
-                             GestureDetector(
+                            GestureDetector(
-                               onTap: () {
+                              onTap: () {
-                                  _searchController.clear();
+                                _searchController.clear();
-                                  _onSearchChanged('');
+                                _onSearchChanged('');
-                               },
+                              },
-                               child: const Icon(Icons.close, size: 16, color: Colors.white),
+                              child: const Icon(
-                             ),
+                                Icons.close,
+                                size: 16,
+                                color: Colors.white,
+                              ),
+                            ),
                         ],
                       ),
                     ),
@@ -257,24 +280,39 @@ class _SeriesTabState extends ConsumerState<SeriesTab> {
               child: Padding(
                 padding: const EdgeInsets.only(bottom: 32),
                 child: HeroCarousel(
-                  items: displaySeries.take(5).map((s) => HeroItem(
+                  items: displaySeries
-                    id: s.seriesId.toString(),
+                      .take(5)
-                    title: s.name,
+                      .map(
-                    imageUrl: _getProxiedImageUrl(s.cover),
+                        (s) => HeroItem(
-                    subtitle: s.rating != null ? '${_formatRating(s.rating)} ★' : null,
+                          id: s.seriesId.toString(),
-                    onMoreInfo: () {
+                          title: s.name,
-                       final series = _series.firstWhere((element) => element.seriesId.toString() == s.seriesId.toString(), orElse: () => s);
+                          imageUrl: _getProxiedImageUrl(s.cover),
-                       _openSeries(series);
+                          subtitle: s.rating != null
-                    },
+                              ? '${_formatRating(s.rating)} ★'
-                  )).toList(),
+                              : 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]);
+                    final series = _series.firstWhere(
-                     _openSeries(series);
+                      (element) => element.seriesId.toString() == item.id,
+                      orElse: () => _series[0],
+                    );
+                    _openSeries(series);
                   },
                 ),
               ),
             ),
-          
+
           // Grid
           SliverPadding(
             padding: const EdgeInsets.symmetric(horizontal: 24),
@@ -299,77 +337,114 @@ class _SeriesTabState extends ConsumerState<SeriesTab> {
                         ClipRRect(
                           borderRadius: BorderRadius.circular(12),
                           child: serie.cover != null && serie.cover!.isNotEmpty
-                            ? Image.network(
+                              ? Image.network(
-                                _getProxiedImageUrl(serie.cover),
+                                  _getProxiedImageUrl(serie.cover),
-                                fit: BoxFit.cover,
+                                  fit: BoxFit.cover,
-                                errorBuilder: (ctx, err, stack) => Container(
+                                  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(
+                          Positioned(
-                          top: 8,
+                            top: 8,
-                          right: 8,
+                            right: 8,
-                          child: Container(
+                            child: Container(
-                            padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+                              padding: const EdgeInsets.symmetric(
-                            decoration: BoxDecoration(
+                                horizontal: 6,
-                              color: Colors.black.withOpacity(0.7),
+                                vertical: 2,
-                              borderRadius: BorderRadius.circular(4),
+                              ),
-                              border: Border.all(color: Colors.white24),
+                              decoration: BoxDecoration(
-                            ),
+                                color: Colors.black.withOpacity(0.7),
-                            child: Row(
+                                borderRadius: BorderRadius.circular(4),
-                              mainAxisSize: MainAxisSize.min,
+                                border: Border.all(color: Colors.white24),
-                              children: [
+                              ),
-                                const Icon(Icons.star, size: 10, color: Colors.amber),
+                              child: Row(
-                                const SizedBox(width: 4),
+                                mainAxisSize: MainAxisSize.min,
-                                Text(
+                                children: [
-                                  _formatRating(serie.rating)!,
+                                  const Icon(
-                                  style: GoogleFonts.inter(fontSize: 10, fontWeight: FontWeight.bold, color: Colors.white),
+                                    Icons.star,
-                                ),
+                                    size: 10,
-                              ],
+                                    color: Colors.amber,
+                                  ),
+                                  const SizedBox(width: 4),
+                                  Text(
+                                    _formatRating(serie.rating)!,
+                                    style: GoogleFonts.inter(
+                                      fontSize: 10,
+                                      fontWeight: FontWeight.bold,
+                                      color: Colors.white,
+                                    ),
+                                  ),
+                                ],
+                              ),
                             ),
                           ),
-                        ),
                       ],
                     ),
                   );
@@ -378,17 +453,19 @@ class _SeriesTabState extends ConsumerState<SeriesTab> {
               ),
             ),
           ),
-          
+
           // Loader
           if (_isLoading)
             const SliverToBoxAdapter(
               child: Padding(
                 padding: EdgeInsets.all(32),
-                child: Center(child: CircularProgressIndicator(color: Colors.white)),
+                child: Center(
+                  child: CircularProgressIndicator(color: Colors.white),
+                ),
               ),
             ),
-            
+
-           const SliverPadding(padding: EdgeInsets.only(bottom: 50)),
+          const SliverPadding(padding: EdgeInsets.only(bottom: 50)),
         ],
       ),
     );

lib/features/iptv/widgets/settings_tab.dart

@@ -18,7 +18,8 @@ class SettingsTab extends ConsumerStatefulWidget {
   ConsumerState<SettingsTab> createState() => _SettingsTabState();
 }
 
-class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProviderStateMixin {
+class _SettingsTabState extends ConsumerState<SettingsTab>
+    with SingleTickerProviderStateMixin {
   late TabController _tabController;
   late TextEditingController _liveTvController;
   late TextEditingController _moviesController;
@@ -45,13 +46,16 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
   }
 
   void _syncControllers(IptvSettings settings) {
-    if (!_initialized || _liveTvController.text != settings.liveTvCategoryFilter) {
+    if (!_initialized ||
+        _liveTvController.text != settings.liveTvCategoryFilter) {
       _liveTvController.text = settings.liveTvCategoryFilter;
     }
-    if (!_initialized || _moviesController.text != settings.moviesCategoryFilter) {
+    if (!_initialized ||
+        _moviesController.text != settings.moviesCategoryFilter) {
       _moviesController.text = settings.moviesCategoryFilter;
     }
-    if (!_initialized || _seriesController.text != settings.seriesCategoryFilter) {
+    if (!_initialized ||
+        _seriesController.text != settings.seriesCategoryFilter) {
       _seriesController.text = settings.seriesCategoryFilter;
     }
     _initialized = true;
@@ -61,7 +65,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
   Widget build(BuildContext context) {
     final currentUser = ref.watch(authProvider).currentUser;
     final settings = ref.watch(iptvSettingsProvider);
-    
+
     // Sync controllers with persisted state (only on first load)
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (!_initialized) _syncControllers(settings);
@@ -85,17 +89,20 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
             labelColor: Colors.white,
             unselectedLabelColor: Colors.white54,
             dividerColor: Colors.transparent,
-            overlayColor: MaterialStateProperty.all(Colors.transparent),
+            overlayColor: WidgetStateProperty.all(Colors.transparent),
             tabs: [
               const Tab(icon: Icon(Icons.filter_list), text: 'Filtres'),
               const Tab(icon: Icon(Icons.stream), text: 'Streaming'),
               const Tab(icon: Icon(Icons.palette), text: 'Apparence'),
               if (currentUser?.isAdmin ?? false)
-                const Tab(icon: Icon(Icons.admin_panel_settings), text: 'Administration'),
+                const Tab(
+                  icon: Icon(Icons.admin_panel_settings),
+                  text: 'Administration',
+                ),
             ],
           ),
         ),
-        
+
         // TabBarView
         Expanded(
           child: TabBarView(
@@ -103,16 +110,15 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
             children: [
               // Filters Tab
               _buildFiltersTab(context, currentUser, settings),
-              
+
               // Streaming Tab
               const StreamingSettingsTab(),
-              
+
               // Appearance Tab
               _buildAppearanceTab(context),
 
               // Admin Tab
-              if (currentUser?.isAdmin ?? false)
+              if (currentUser?.isAdmin ?? false) const AdminContent(),
-                const AdminContent(),
             ],
           ),
         ),
@@ -125,7 +131,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
     final themeState = ref.watch(themeProvider);
     final themeNotifier = ref.read(themeProvider.notifier);
     final isDark = Theme.of(context).brightness == Brightness.dark;
-    
+
     return ListView(
       padding: const EdgeInsets.all(16),
       children: [
@@ -142,7 +148,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
             children: [
               Row(
                 children: [
-                   Icon(
+                  const Icon(
                     Icons.dark_mode,
                     color: Colors.white,
                   ),
@@ -158,7 +164,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
                 ],
               ),
               const SizedBox(height: 16),
-              
+
               // Theme options
               _buildThemeOption(
                 context: context,
@@ -189,9 +195,9 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
             ],
           ),
         ),
-        
+
         const SizedBox(height: 16),
-        
+
         // Quick toggle card
         Container(
           decoration: BoxDecoration(
@@ -206,20 +212,23 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
             ),
             title: Text(
               'Mode actuel',
-              style: GoogleFonts.inter(fontWeight: FontWeight.w500, color: Colors.white),
+              style: GoogleFonts.inter(
+                fontWeight: FontWeight.w500,
+                color: Colors.white,
+              ),
             ),
             subtitle: Text(
               isDark ? 'Thème sombre actif' : 'Thème clair actif',
-              style: TextStyle(color: Colors.white70),
+              style: const TextStyle(color: Colors.white70),
             ),
             trailing: Switch(
               value: isDark,
               onChanged: (_) => themeNotifier.toggleTheme(),
-              activeColor: AppColors.primary,
+              activeThumbColor: AppColors.primary,
-              trackColor: MaterialStateProperty.resolveWith(
+              trackColor: WidgetStateProperty.resolveWith(
-                (states) => states.contains(MaterialState.selected) 
+                (states) => states.contains(WidgetState.selected)
-                  ? AppColors.primary.withOpacity(0.5) 
+                    ? AppColors.primary.withOpacity(0.5)
-                  : Colors.grey.shade800,
+                    : Colors.grey.shade800,
               ),
             ),
           ),
@@ -238,7 +247,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
   }) {
     final theme = Theme.of(context);
     final colorScheme = theme.colorScheme;
-    
+
     return InkWell(
       onTap: onTap,
       borderRadius: BorderRadius.circular(12),
@@ -298,8 +307,11 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
     );
   }
 
-
+  Widget _buildFiltersTab(
-  Widget _buildFiltersTab(BuildContext context, dynamic currentUser, IptvSettings settings) {
+    BuildContext context,
+    dynamic currentUser,
+    IptvSettings settings,
+  ) {
     return ListView(
       padding: const EdgeInsets.all(16),
       children: [
@@ -319,18 +331,27 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
             ),
             subtitle: Text(
               currentUser?.username ?? 'Unknown',
-              style: GoogleFonts.roboto(fontWeight: FontWeight.w600, color: Colors.white),
+              style: GoogleFonts.roboto(
+                fontWeight: FontWeight.w600,
+                color: Colors.white,
+              ),
             ),
             trailing: currentUser?.isAdmin ?? false
                 ? Chip(
-                    label: Text('Admin', style: GoogleFonts.roboto(fontSize: 11, color: Colors.black)),
+                    label: Text(
+                      'Admin',
+                      style: GoogleFonts.roboto(
+                        fontSize: 11,
+                        color: Colors.black,
+                      ),
+                    ),
                     backgroundColor: Colors.white,
                   )
                 : null,
           ),
         ),
         const SizedBox(height: 16),
-        
+
         // Category filters section
         Text(
           'Filtres de Catégories',
@@ -349,7 +370,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
           ),
         ),
         const SizedBox(height: 12),
-        
+
         // Live TV Filter
         _buildFilterCard(
           title: 'Filtre TV Live',
@@ -365,7 +386,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
           },
         ),
         const SizedBox(height: 8),
-        
+
         // Movies Filter
         _buildFilterCard(
           title: 'Filtre Films',
@@ -381,7 +402,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
           },
         ),
         const SizedBox(height: 8),
-        
+
         // Series Filter
         _buildFilterCard(
           title: 'Filtre Séries',
@@ -397,9 +418,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
           },
         ),
         const SizedBox(height: 16),
-        
 
-        
         // Change playlist
         Container(
           decoration: BoxDecoration(
@@ -409,13 +428,16 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
           ),
           child: ListTile(
             leading: const Icon(Icons.playlist_play, color: Colors.white),
-            title: Text('Changer de Playlist', style: GoogleFonts.roboto(color: Colors.white)),
+            title: Text(
+              'Changer de Playlist',
+              style: GoogleFonts.roboto(color: Colors.white),
+            ),
             trailing: const Icon(Icons.chevron_right, color: Colors.white54),
             onTap: () => context.go('/playlists'),
           ),
         ),
         const SizedBox(height: 8),
-        
+
         // About
         Container(
           decoration: BoxDecoration(
@@ -425,7 +447,10 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
           ),
           child: ListTile(
             leading: const Icon(Icons.info_outline, color: Colors.white),
-            title: Text('À propos', style: GoogleFonts.roboto(color: Colors.white)),
+            title: Text(
+              'À propos',
+              style: GoogleFonts.roboto(color: Colors.white),
+            ),
             subtitle: Text(
               'XtremFlow IPTV v1.0.0',
               style: GoogleFonts.roboto(fontSize: 12, color: Colors.white54),
@@ -433,7 +458,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
           ),
         ),
         const SizedBox(height: 16),
-        
+
         // Maintenance Section
         Container(
           decoration: BoxDecoration(
@@ -443,50 +468,58 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
           ),
           child: ListTile(
             leading: const Icon(Icons.cleaning_services, color: Colors.orange),
-            title: Text('Maintenance', style: GoogleFonts.roboto(color: Colors.white)),
+            title: Text(
+              'Maintenance',
+              style: GoogleFonts.roboto(color: Colors.white),
+            ),
             subtitle: Text(
               'En cas de problèmes d\'affichage ou de mise à jour',
               style: GoogleFonts.roboto(fontSize: 12, color: Colors.white54),
             ),
             trailing: FilledButton.icon(
               onPressed: () {
-                 // Show confirmation dialog
+                // Show confirmation dialog
-                 showDialog(
+                showDialog(
-                   context: context, 
+                  context: context,
-                   builder: (context) => AlertDialog(
+                  builder: (context) => AlertDialog(
-                     backgroundColor: const Color(0xFF1E1E1E),
+                    backgroundColor: const Color(0xFF1E1E1E),
-                     title: const Text('Vider le cache ?', style: TextStyle(color: Colors.white)),
+                    title: const Text(
-                     content: const Text(
+                      'Vider le cache ?',
-                       'Cette action va recharger l\'application et effacer les données temporaires.\n'
+                      style: TextStyle(color: Colors.white),
-                       'Vos réglages et favoris sont sauvegardés sur le serveur.',
+                    ),
-                       style: TextStyle(color: Colors.white70),
+                    content: const Text(
-                     ),
+                      'Cette action va recharger l\'application et effacer les données temporaires.\n'
-                     actions: [
+                      'Vos réglages et favoris sont sauvegardés sur le serveur.',
-                       TextButton(
+                      style: TextStyle(color: Colors.white70),
-                         onPressed: () => Navigator.pop(context),
+                    ),
-                         child: const Text('Annuler'),
+                    actions: [
-                       ),
+                      TextButton(
-                       FilledButton(
+                        onPressed: () => Navigator.pop(context),
-                         style: FilledButton.styleFrom(backgroundColor: Colors.orange),
+                        child: const Text('Annuler'),
-                         onPressed: () {
+                      ),
-                           Navigator.pop(context);
+                      FilledButton(
-                           
+                        style: FilledButton.styleFrom(
-                           // Clear Flutter Image Cache
+                          backgroundColor: Colors.orange,
-                           PaintingBinding.instance.imageCache.clear();
+                        ),
-                           PaintingBinding.instance.imageCache.clearLiveImages();
+                        onPressed: () {
-                           
+                          Navigator.pop(context);
-                           // Clear Browser Local Storage (SharedPreferences backend for Web)
+
-                           html.window.localStorage.clear();
+                          // Clear Flutter Image Cache
-                           html.window.sessionStorage.clear();
+                          PaintingBinding.instance.imageCache.clear();
-                           
+                          PaintingBinding.instance.imageCache.clearLiveImages();
-                           // Reload application
+
-                           html.window.location.reload();
+                          // Clear Browser Local Storage (SharedPreferences backend for Web)
-                         },
+                          html.window.localStorage.clear();
-                         child: const Text('Vider et Recharger'),
+                          html.window.sessionStorage.clear();
-                       ),
+
-                     ],
+                          // Reload application
-                   )
+                          html.window.location.reload();
-                 );
+                        },
+                        child: const Text('Vider et Recharger'),
+                      ),
+                    ],
+                  ),
+                );
               },
               icon: const Icon(Icons.refresh, size: 16),
               label: const Text('Vider le Cache'),
@@ -498,7 +531,7 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
           ),
         ),
         const SizedBox(height: 24),
-        
+
         // Logout button
         FilledButton.icon(
           onPressed: () {
@@ -553,7 +586,8 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
             controller: controller,
             decoration: InputDecoration(
               hintText: 'Ex: FR,FRANCE,HD,SPORT',
-              hintStyle: GoogleFonts.roboto(fontSize: 12, color: Colors.white30),
+              hintStyle:
+                  GoogleFonts.roboto(fontSize: 12, color: Colors.white30),
               filled: true,
               fillColor: Colors.black26,
               border: OutlineInputBorder(
@@ -567,7 +601,11 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
               ),
               suffixIcon: controller.text.isNotEmpty
                   ? IconButton(
-                      icon: const Icon(Icons.clear, size: 16, color: Colors.white54),
+                      icon: const Icon(
+                        Icons.clear,
+                        size: 16,
+                        color: Colors.white54,
+                      ),
                       onPressed: onClear,
                       padding: EdgeInsets.zero,
                       constraints: const BoxConstraints(),
@@ -584,15 +622,18 @@ class _SettingsTabState extends ConsumerState<SettingsTab> with SingleTickerProv
               runSpacing: 6,
               children: keywords.map((keyword) {
                 return Container(
-                  padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 4),
+                  padding:
+                      const EdgeInsets.symmetric(horizontal: 10, vertical: 4),
                   decoration: BoxDecoration(
                     color: Colors.blueAccent.withOpacity(0.2),
                     borderRadius: BorderRadius.circular(50),
-                    border: Border.all(color: Colors.blueAccent.withOpacity(0.5)),
+                    border:
+                        Border.all(color: Colors.blueAccent.withOpacity(0.5)),
                   ),
                   child: Text(
                     keyword,
-                    style: GoogleFonts.roboto(fontSize: 11, color: Colors.white),
+                    style:
+                        GoogleFonts.roboto(fontSize: 11, color: Colors.white),
                   ),
                 );
               }).toList(),

lib/features/iptv/widgets/streaming_settings_tab.dart

@@ -111,7 +111,7 @@ class StreamingSettingsTab extends ConsumerWidget {
                 style: GoogleFonts.roboto(fontSize: 12, color: Colors.white54),
               ),
               value: settings.autoReconnect,
-              activeColor: Colors.blueAccent,
+              activeThumbColor: Colors.blueAccent,
               onChanged: (v) => notifier.setAutoReconnect(v),
             ),
           ],
@@ -147,10 +147,9 @@ class StreamingSettingsTab extends ConsumerWidget {
                 style: GoogleFonts.roboto(fontSize: 12, color: Colors.white54),
               ),
               value: settings.preferDirectPlay,
-              activeColor: Colors.blueAccent,
+              activeThumbColor: Colors.blueAccent,
               onChanged: (v) => notifier.setPreferDirectPlay(v),
             ),
-
           ],
         ),
         const SizedBox(height: 16),
@@ -253,8 +252,14 @@ class StreamingSettingsTab extends ConsumerWidget {
     required String Function(T) labelBuilder,
   }) {
     return ListTile(
-      title: Text(title, style: GoogleFonts.roboto(fontSize: 14, color: Colors.white)),
+      title: Text(
-      subtitle: Text(subtitle, style: GoogleFonts.roboto(fontSize: 12, color: Colors.white54)),
+        title,
+        style: GoogleFonts.roboto(fontSize: 14, color: Colors.white),
+      ),
+      subtitle: Text(
+        subtitle,
+        style: GoogleFonts.roboto(fontSize: 12, color: Colors.white54),
+      ),
       trailing: DropdownButton<T>(
         value: value,
         underline: const SizedBox(),

lib/mobile/features/auth/screens/mobile_login_screen.dart

@@ -193,7 +193,7 @@ class _MobileLoginScreenState extends ConsumerState<MobileLoginScreen> {
                                   shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
                                   elevation: 0,
                                 ).copyWith(
-                                  overlayColor: MaterialStateProperty.all(Colors.black12),
+                                  overlayColor: WidgetStateProperty.all(Colors.black12),
                                 ),
                                 child: authState.isLoading
                                     ? const SizedBox(

lib/mobile/features/iptv/screens/mobile_series_detail_screen.dart

@@ -6,7 +6,7 @@ import '../../../../core/models/playlist_config.dart';
 import '../../../../features/iptv/models/xtream_models.dart';
 import '../../../../features/iptv/providers/xtream_provider.dart';
 import '../../../../features/iptv/providers/watch_history_provider.dart';
-import '../../../../features/iptv/screens/player_screen.dart'; // Explicit import for StreamType
+// Explicit import for StreamType
 import 'mobile_player_screen.dart';
 import '../../../../core/theme/app_colors.dart';
 import '../../../../core/widgets/glass_container.dart';
@@ -22,10 +22,12 @@ class MobileSeriesDetailScreen extends ConsumerStatefulWidget {
   });
 
   @override
-  ConsumerState<MobileSeriesDetailScreen> createState() => _MobileSeriesDetailScreenState();
+  ConsumerState<MobileSeriesDetailScreen> createState() =>
+      _MobileSeriesDetailScreenState();
 }
 
-class _MobileSeriesDetailScreenState extends ConsumerState<MobileSeriesDetailScreen> {
+class _MobileSeriesDetailScreenState
+    extends ConsumerState<MobileSeriesDetailScreen> {
   SeriesInfo? _seriesInfo;
   bool _isLoading = true;
   String? _error;
@@ -83,7 +85,7 @@ class _MobileSeriesDetailScreenState extends ConsumerState<MobileSeriesDetailScr
         fit: StackFit.expand,
         children: [
           // Global Background
-           Container(
+          Container(
             decoration: const BoxDecoration(
               gradient: RadialGradient(
                 center: Alignment.center,
@@ -92,18 +94,28 @@ class _MobileSeriesDetailScreenState extends ConsumerState<MobileSeriesDetailScr
               ),
             ),
           ),
-          
+
           if (_isLoading)
             const Center(child: CircularProgressIndicator(color: Colors.white))
           else if (_error != null)
-             Center(
+            Center(
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
-                  const Icon(Icons.error_outline, size: 48, color: AppColors.error),
+                  const Icon(
+                    Icons.error_outline,
+                    size: 48,
+                    color: AppColors.error,
+                  ),
                   const SizedBox(height: 16),
-                  Text('Error: $_error', style: GoogleFonts.inter(color: Colors.white70)),
+                  Text(
-                  TextButton(onPressed: _loadSeriesInfo, child: const Text('Retry')),
+                    'Error: $_error',
+                    style: GoogleFonts.inter(color: Colors.white70),
+                  ),
+                  TextButton(
+                    onPressed: _loadSeriesInfo,
+                    child: const Text('Retry'),
+                  ),
                 ],
               ),
             )
@@ -145,7 +157,8 @@ class _MobileSeriesDetailScreenState extends ConsumerState<MobileSeriesDetailScr
                   CachedNetworkImage(
                     imageUrl: _seriesInfo!.cover!,
                     fit: BoxFit.cover,
-                    errorWidget: (_, __, ___) => Container(color: Colors.grey.shade900),
+                    errorWidget: (_, __, ___) =>
+                        Container(color: Colors.grey.shade900),
                   ),
                 // Gradient Overlay
                 Container(
@@ -164,7 +177,9 @@ class _MobileSeriesDetailScreenState extends ConsumerState<MobileSeriesDetailScr
                 ),
                 // Info Overlay
                 Positioned(
-                  bottom: 16, left: 16, right: 16,
+                  bottom: 16,
+                  left: 16,
+                  right: 16,
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     mainAxisSize: MainAxisSize.min,
@@ -181,17 +196,27 @@ class _MobileSeriesDetailScreenState extends ConsumerState<MobileSeriesDetailScr
                       Row(
                         children: [
                           if (_seriesInfo!.rating != null) ...[
-                            const Icon(Icons.star, size: 16, color: Colors.amber),
+                            const Icon(
+                              Icons.star,
+                              size: 16,
+                              color: Colors.amber,
+                            ),
                             const SizedBox(width: 4),
                             Text(
                               _formatRating(_seriesInfo!.rating!)!,
-                              style: GoogleFonts.inter(color: Colors.white70, fontSize: 13),
+                              style: GoogleFonts.inter(
+                                color: Colors.white70,
+                                fontSize: 13,
+                              ),
                             ),
                             const SizedBox(width: 16),
                           ],
                           Text(
                             '${_seriesInfo!.episodes.keys.length} Seasons',
-                            style: GoogleFonts.inter(color: Colors.white70, fontSize: 13),
+                            style: GoogleFonts.inter(
+                              color: Colors.white70,
+                              fontSize: 13,
+                            ),
                           ),
                         ],
                       ),
@@ -241,7 +266,9 @@ class _MobileSeriesDetailScreenState extends ConsumerState<MobileSeriesDetailScr
                     color: isSelected ? Colors.white : Colors.white70,
                     fontWeight: isSelected ? FontWeight.w600 : FontWeight.w400,
                   ),
-                  shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
+                  shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(20),
+                  ),
                   showCheckmark: false,
                   side: BorderSide.none,
                 );
@@ -287,7 +314,9 @@ class _MobileSeriesDetailScreenState extends ConsumerState<MobileSeriesDetailScr
       padding: EdgeInsets.zero,
       child: InkWell(
         onTap: () {
-          ref.read(watchHistoryProvider.notifier).markEpisodeWatched(episodeKey);
+          ref
+              .read(watchHistoryProvider.notifier)
+              .markEpisodeWatched(episodeKey);
           Navigator.push(
             context,
             MaterialPageRoute(
@@ -311,7 +340,9 @@ class _MobileSeriesDetailScreenState extends ConsumerState<MobileSeriesDetailScr
                 width: 40,
                 height: 40,
                 decoration: BoxDecoration(
-                  color: isWatched ? AppColors.primary : Colors.white.withOpacity(0.1),
+                  color: isWatched
+                      ? AppColors.primary
+                      : Colors.white.withOpacity(0.1),
                   shape: BoxShape.circle,
                 ),
                 child: Icon(
@@ -335,10 +366,14 @@ class _MobileSeriesDetailScreenState extends ConsumerState<MobileSeriesDetailScr
                       maxLines: 1,
                       overflow: TextOverflow.ellipsis,
                     ),
-                    if (episode.durationSecs != null && episode.durationSecs! > 0)
+                    if (episode.durationSecs != null &&
+                        episode.durationSecs! > 0)
                       Text(
                         _formatDuration(episode.durationSecs!),
-                        style: GoogleFonts.inter(color: Colors.white54, fontSize: 12),
+                        style: GoogleFonts.inter(
+                          color: Colors.white54,
+                          fontSize: 12,
+                        ),
                       ),
                   ],
                 ),

lib/mobile/features/iptv/widgets/mobile_live_tv_tab.dart

@@ -34,7 +34,8 @@ class _MobileLiveTVTabState extends ConsumerState<MobileLiveTVTab> {
 
   @override
   Widget build(BuildContext context) {
-    final channelsAsync = ref.watch(liveChannelsByPlaylistProvider(widget.playlist));
+    final channelsAsync =
+        ref.watch(liveChannelsByPlaylistProvider(widget.playlist));
     final favorites = ref.watch(favoritesProvider);
     final settings = ref.watch(iptvSettingsProvider);
 
@@ -42,26 +43,32 @@ class _MobileLiveTVTabState extends ConsumerState<MobileLiveTVTab> {
       backgroundColor: Colors.transparent, // Handled by MobileScaffold
       body: channelsAsync.when(
         loading: () => const Center(child: CircularProgressIndicator()),
-        error: (e, s) => Center(child: Text('Error: $e', style: const TextStyle(color: Colors.white))),
+        error: (e, s) => Center(
+          child: Text('Error: $e', style: const TextStyle(color: Colors.white)),
+        ),
         data: (groupedChannels) {
           var categories = groupedChannels.keys.toList();
           if (settings.liveTvKeywords.isNotEmpty) {
-            categories = categories.where((cat) => settings.matchesLiveTvFilter(cat)).toList();
+            categories = categories
+                .where((cat) => settings.matchesLiveTvFilter(cat))
+                .toList();
           }
           categories.sort();
 
           List<Channel> displayedChannels = [];
           if (_searchQuery.isNotEmpty) {
-            displayedChannels = groupedChannels.values.expand((l) => l)
+            displayedChannels = groupedChannels.values
+                .expand((l) => l)
                 .where((c) => c.name.toLowerCase().contains(_searchQuery))
                 .toList();
           } else if (_showFavoritesOnly) {
-            displayedChannels = groupedChannels.values.expand((l) => l)
+            displayedChannels = groupedChannels.values
+                .expand((l) => l)
                 .where((c) => favorites.contains(c.streamId))
                 .toList();
           } else {
             if (_selectedCategory == null && categories.isNotEmpty) {
-               _selectedCategory = categories.first;
+              _selectedCategory = categories.first;
             }
             if (_selectedCategory != null) {
               displayedChannels = groupedChannels[_selectedCategory] ?? [];
@@ -78,27 +85,33 @@ class _MobileLiveTVTabState extends ConsumerState<MobileLiveTVTab> {
                   child: GlassContainer(
                     borderRadius: 16,
                     opacity: 0.1,
-                    padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+                    padding:
+                        const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
                     child: Row(
                       children: [
-                         Expanded(
+                        Expanded(
-                           child: TextField(
+                          child: TextField(
-                             controller: _searchController,
+                            controller: _searchController,
-                             style: GoogleFonts.inter(color: Colors.white),
+                            style: GoogleFonts.inter(color: Colors.white),
-                             decoration: InputDecoration(
+                            decoration: InputDecoration(
-                               hintText: 'Search channels...',
+                              hintText: 'Search channels...',
-                               hintStyle: GoogleFonts.inter(color: Colors.white54),
+                              hintStyle:
-                               border: InputBorder.none,
+                                  GoogleFonts.inter(color: Colors.white54),
-                               prefixIcon: const Icon(Icons.search, color: Colors.white54),
+                              border: InputBorder.none,
-                               isDense: true,
+                              prefixIcon: const Icon(
-                             ),
+                                Icons.search,
-                           ),
+                                color: Colors.white54,
-                         ),
+                              ),
-                         if (_searchQuery.isNotEmpty)
+                              isDense: true,
-                           GestureDetector(
+                            ),
-                             onTap: () => _searchController.clear(),
+                          ),
-                             child: const Icon(Icons.close, color: Colors.white54),
+                        ),
-                           ),
+                        if (_searchQuery.isNotEmpty)
+                          GestureDetector(
+                            onTap: () => _searchController.clear(),
+                            child:
+                                const Icon(Icons.close, color: Colors.white54),
+                          ),
                       ],
                     ),
                   ),
@@ -117,19 +130,28 @@ class _MobileLiveTVTabState extends ConsumerState<MobileLiveTVTab> {
                         final category = categories[index];
                         final isSelected = category == _selectedCategory;
                         return GestureDetector(
-                          onTap: () => setState(() => _selectedCategory = category),
+                          onTap: () =>
+                              setState(() => _selectedCategory = category),
                           child: AnimatedContainer(
                             duration: const Duration(milliseconds: 200),
-                            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
+                            padding: const EdgeInsets.symmetric(
+                              horizontal: 16,
+                              vertical: 10,
+                            ),
                             decoration: BoxDecoration(
-                              color: isSelected ? Colors.white : Colors.black.withOpacity(0.4),
+                              color: isSelected
+                                  ? Colors.white
+                                  : Colors.black.withOpacity(0.4),
                               borderRadius: BorderRadius.circular(20),
                             ),
                             child: Text(
                               category,
                               style: GoogleFonts.inter(
-                                color: isSelected ? Colors.black : Colors.white70,
+                                color:
-                                fontWeight: isSelected ? FontWeight.w600 : FontWeight.w500,
+                                    isSelected ? Colors.black : Colors.white70,
+                                fontWeight: isSelected
+                                    ? FontWeight.w600
+                                    : FontWeight.w500,
                                 fontSize: 13,
                               ),
                             ),
@@ -145,28 +167,40 @@ class _MobileLiveTVTabState extends ConsumerState<MobileLiveTVTab> {
                   child: Row(
                     children: [
                       Text(
-                        _searchQuery.isNotEmpty ? 'Results' : 
+                        _searchQuery.isNotEmpty
-                        _showFavoritesOnly ? 'Favorites' : 
+                            ? 'Results'
-                        _selectedCategory ?? 'Channels',
+                            : _showFavoritesOnly
+                                ? 'Favorites'
+                                : _selectedCategory ?? 'Channels',
                         style: GoogleFonts.inter(
-                          color: Colors.white, 
+                          color: Colors.white,
                           fontWeight: FontWeight.bold,
                           fontSize: 18,
                         ),
                       ),
                       const Spacer(),
                       GestureDetector(
-                        onTap: () => setState(() => _showFavoritesOnly = !_showFavoritesOnly),
+                        onTap: () => setState(
+                          () => _showFavoritesOnly = !_showFavoritesOnly,
+                        ),
                         child: Container(
                           padding: const EdgeInsets.all(8),
                           decoration: BoxDecoration(
-                            color: _showFavoritesOnly ? AppColors.live.withOpacity(0.2) : Colors.white.withOpacity(0.1),
+                            color: _showFavoritesOnly
+                                ? AppColors.live.withOpacity(0.2)
+                                : Colors.white.withOpacity(0.1),
                             borderRadius: BorderRadius.circular(8),
-                            border: _showFavoritesOnly ? Border.all(color: AppColors.live) : null,
+                            border: _showFavoritesOnly
+                                ? Border.all(color: AppColors.live)
+                                : null,
                           ),
                           child: Icon(
-                            _showFavoritesOnly ? Icons.favorite : Icons.favorite_border,
+                            _showFavoritesOnly
-                            color: _showFavoritesOnly ? AppColors.live : Colors.white,
+                                ? Icons.favorite
+                                : Icons.favorite_border,
+                            color: _showFavoritesOnly
+                                ? AppColors.live
+                                : Colors.white,
                             size: 20,
                           ),
                         ),
@@ -182,7 +216,11 @@ class _MobileLiveTVTabState extends ConsumerState<MobileLiveTVTab> {
                           child: Column(
                             mainAxisAlignment: MainAxisAlignment.center,
                             children: [
-                              const Icon(Icons.tv_off, color: Colors.white24, size: 48),
+                              const Icon(
+                                Icons.tv_off,
+                                color: Colors.white24,
+                                size: 48,
+                              ),
                               const SizedBox(height: 16),
                               Text(
                                 'No channels found',
@@ -194,7 +232,8 @@ class _MobileLiveTVTabState extends ConsumerState<MobileLiveTVTab> {
                       : ListView.separated(
                           padding: const EdgeInsets.fromLTRB(16, 0, 16, 100),
                           itemCount: displayedChannels.length,
-                          separatorBuilder: (_, __) => const SizedBox(height: 8),
+                          separatorBuilder: (_, __) =>
+                              const SizedBox(height: 8),
                           itemBuilder: (context, index) {
                             final channel = displayedChannels[index];
                             return _MobileChannelTile(
@@ -240,14 +279,17 @@ class _MobileChannelTile extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final iconUrl = channel.streamIcon.isNotEmpty && channel.streamIcon.startsWith('http') 
+    final iconUrl =
-        ? '/api/xtream/${channel.streamIcon}' 
+        channel.streamIcon.isNotEmpty && channel.streamIcon.startsWith('http')
-        : null;
+            ? '/api/xtream/${channel.streamIcon}'
+            : null;
 
     // Fetch EPG
-    final epgAsync = ref.watch(epgByPlaylistProvider(
+    final epgAsync = ref.watch(
-      EpgRequestKey(playlist: playlist, streamId: channel.streamId)
+      epgByPlaylistProvider(
-    ));
+        EpgRequestKey(playlist: playlist, streamId: channel.streamId),
+      ),
+    );
 
     return GlassContainer(
       borderRadius: 12,
@@ -270,9 +312,10 @@ class _MobileChannelTile extends ConsumerWidget {
                 padding: const EdgeInsets.all(4),
                 child: iconUrl != null
                     ? Image.network(
-                        iconUrl, 
+                        iconUrl,
                         fit: BoxFit.contain,
-                        errorBuilder: (_, __, ___) => const Icon(Icons.tv, color: Colors.white24),
+                        errorBuilder: (_, __, ___) =>
+                            const Icon(Icons.tv, color: Colors.white24),
                       )
                     : const Icon(Icons.tv, color: Colors.white24),
               ),
@@ -291,7 +334,7 @@ class _MobileChannelTile extends ConsumerWidget {
                       maxLines: 1,
                       overflow: TextOverflow.ellipsis,
                     ),
-                    
+
                     // EPG Only (Replaces Channel Number)
                     epgAsync.when(
                       data: (epgList) {
@@ -308,7 +351,9 @@ class _MobileChannelTile extends ConsumerWidget {
                         return Text(
                           current.title,
                           style: GoogleFonts.inter(
-                            color: const Color(0xFFFFD700), // Gold/Amber for visibility check
+                            color: const Color(
+                              0xFFFFD700,
+                            ), // Gold/Amber for visibility check
                             fontSize: 12,
                             fontWeight: FontWeight.w500,
                           ),
@@ -316,8 +361,14 @@ class _MobileChannelTile extends ConsumerWidget {
                           overflow: TextOverflow.ellipsis,
                         );
                       },
-                      loading: () => Text('...', style: TextStyle(color: Colors.white38, fontSize: 12)),
+                      loading: () => const Text(
-                      error: (err, stack) => Text('Err', style: TextStyle(color: Colors.red, fontSize: 10)),
+                        '...',
+                        style: TextStyle(color: Colors.white38, fontSize: 12),
+                      ),
+                      error: (err, stack) => const Text(
+                        'Err',
+                        style: TextStyle(color: Colors.red, fontSize: 10),
+                      ),
                     ),
                   ],
                 ),
@@ -328,7 +379,11 @@ class _MobileChannelTile extends ConsumerWidget {
                   color: Colors.white.withOpacity(0.1),
                   shape: BoxShape.circle,
                 ),
-                child: const Icon(Icons.play_arrow_rounded, color: Colors.white, size: 16),
+                child: const Icon(
+                  Icons.play_arrow_rounded,
+                  color: Colors.white,
+                  size: 16,
+                ),
               ),
             ],
           ),

lib/mobile/features/iptv/widgets/mobile_movies_tab.dart

@@ -49,9 +49,10 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
   }
 
   void _onScroll() {
-    if (!_isLoading && _hasMore &&
+    if (!_isLoading &&
+        _hasMore &&
         _scrollController.position.pixels >=
-        _scrollController.position.maxScrollExtent * 0.8) {
+            _scrollController.position.maxScrollExtent * 0.8) {
       _loadMoreMovies();
     }
   }
@@ -65,7 +66,7 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
         _isSearching = false;
       }
     });
-    
+
     if (query.length >= 2) {
       _searchDebounce = Timer(const Duration(milliseconds: 500), () {
         _performSearch(query);
@@ -76,11 +77,11 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
   Future<void> _performSearch(String query) async {
     if (query.isEmpty) return;
     setState(() => _isSearching = true);
-    
+
     try {
       final service = ref.read(xtreamServiceProvider(widget.playlist));
       final results = await service.searchMovies(query);
-      
+
       if (mounted && _searchQuery == query) {
         setState(() {
           _searchResults = results;
@@ -138,7 +139,7 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
 
   void _playMovie(Movie movie) {
     ref.read(watchHistoryProvider.notifier).markMovieWatched(movie.streamId);
-    
+
     Navigator.push(
       context,
       MaterialPageRoute(
@@ -157,23 +158,30 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
   Widget build(BuildContext context) {
     final settings = ref.watch(iptvSettingsProvider);
     final watchHistory = ref.watch(watchHistoryProvider);
-    
+
     List<Movie> displayMovies;
     if (_searchQuery.isNotEmpty && _searchResults != null) {
       displayMovies = _searchResults!;
     } else {
       displayMovies = settings.moviesKeywords.isEmpty
           ? _movies
-          : _movies.where((m) => settings.matchesMoviesFilter(m.categoryName)).toList();
+          : _movies
+              .where((m) => settings.matchesMoviesFilter(m.categoryName))
+              .toList();
     }
 
-    final heroItems = displayMovies.take(3).map((m) => HeroItem(
+    final heroItems = displayMovies
-      id: m.streamId,
+        .take(3)
-      title: m.name,
+        .map(
-      imageUrl: _getProxiedImageUrl(m.streamIcon),
+          (m) => HeroItem(
-      subtitle: m.rating != null ? '${_formatRating(m.rating)} ★' : null,
+            id: m.streamId,
-      onMoreInfo: () => _playMovie(m),
+            title: m.name,
-    )).toList();
+            imageUrl: _getProxiedImageUrl(m.streamIcon),
+            subtitle: m.rating != null ? '${_formatRating(m.rating)} ★' : null,
+            onMoreInfo: () => _playMovie(m),
+          ),
+        )
+        .toList();
 
     return SafeArea(
       bottom: false,
@@ -187,7 +195,8 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
               child: GlassContainer(
                 borderRadius: 100,
                 opacity: 0.1, // Glass
-                padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+                padding:
+                    const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
                 child: Row(
                   children: [
                     const Icon(Icons.search, size: 20, color: Colors.white54),
@@ -195,7 +204,10 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
                     Expanded(
                       child: TextField(
                         controller: _searchController,
-                        style: GoogleFonts.inter(fontSize: 14, color: Colors.white),
+                        style: GoogleFonts.inter(
+                          fontSize: 14,
+                          color: Colors.white,
+                        ),
                         decoration: InputDecoration(
                           hintText: 'Search Movies...',
                           hintStyle: GoogleFonts.inter(color: Colors.white54),
@@ -207,14 +219,25 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
                       ),
                     ),
                     if (_isSearching)
-                      const SizedBox(width: 12, height: 12, child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white)),
+                      const SizedBox(
+                        width: 12,
+                        height: 12,
+                        child: CircularProgressIndicator(
+                          strokeWidth: 2,
+                          color: Colors.white,
+                        ),
+                      ),
                     if (_searchQuery.isNotEmpty)
                       GestureDetector(
                         onTap: () {
-                           _searchController.clear();
+                          _searchController.clear();
-                           _onSearchChanged('');
+                          _onSearchChanged('');
                         },
-                        child: const Icon(Icons.close, size: 16, color: Colors.white),
+                        child: const Icon(
+                          Icons.close,
+                          size: 16,
+                          color: Colors.white,
+                        ),
                       ),
                   ],
                 ),
@@ -228,18 +251,19 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
               child: Padding(
                 padding: const EdgeInsets.only(bottom: 24),
                 child: SizedBox(
-                   height: 250,
+                  height: 250,
-                   child: HeroCarousel(
+                  child: HeroCarousel(
-                     items: heroItems,
+                    items: heroItems,
-                     onTap: (item) {
+                    onTap: (item) {
-                       final movie = _movies.firstWhere((element) => element.streamId == item.id);
+                      final movie = _movies
-                       _playMovie(movie);
+                          .firstWhere((element) => element.streamId == item.id);
-                     },
+                      _playMovie(movie);
-                   ),
+                    },
+                  ),
                 ),
               ),
             ),
-          
+
           // Grid
           SliverPadding(
             padding: const EdgeInsets.fromLTRB(16, 0, 16, 80),
@@ -255,11 +279,13 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
                   if (index >= displayMovies.length) return null;
                   final movie = displayMovies[index];
                   final isWatched = watchHistory.isMovieWatched(movie.streamId);
-                  
+
                   return GestureDetector(
                     onTap: () => _playMovie(movie),
                     onLongPress: () {
-                       ref.read(watchHistoryProvider.notifier).toggleMovieWatched(movie.streamId);
+                      ref
+                          .read(watchHistoryProvider.notifier)
+                          .toggleMovieWatched(movie.streamId);
                     },
                     child: Stack(
                       fit: StackFit.expand,
@@ -267,46 +293,74 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
                         // Poster
                         ClipRRect(
                           borderRadius: BorderRadius.circular(16),
-                          child: movie.streamIcon != null && movie.streamIcon!.isNotEmpty
+                          child: movie.streamIcon != null &&
-                            ? Image.network(
+                                  movie.streamIcon!.isNotEmpty
-                                _getProxiedImageUrl(movie.streamIcon),
+                              ? Image.network(
-                                fit: BoxFit.cover,
+                                  _getProxiedImageUrl(movie.streamIcon),
-                                errorBuilder: (_, __, ___) => Container(color: Colors.white10),
+                                  fit: BoxFit.cover,
-                              )
+                                  errorBuilder: (_, __, ___) =>
-                            : Container(color: Colors.white10, child: const Icon(Icons.movie, color: Colors.white24)),
+                                      Container(color: Colors.white10),
+                                )
+                              : Container(
+                                  color: Colors.white10,
+                                  child: const Icon(
+                                    Icons.movie,
+                                    color: Colors.white24,
+                                  ),
+                                ),
                         ),
-                        
+
                         // Gradient Overlay
                         Positioned(
-                          bottom: 0, left: 0, right: 0,
+                          bottom: 0,
+                          left: 0,
+                          right: 0,
                           height: 80,
                           child: Container(
                             decoration: BoxDecoration(
                               gradient: LinearGradient(
                                 begin: Alignment.topCenter,
                                 end: Alignment.bottomCenter,
-                                colors: [Colors.transparent, Colors.black.withOpacity(0.9)],
+                                colors: [
+                                  Colors.transparent,
+                                  Colors.black.withOpacity(0.9),
+                                ],
+                              ),
+                              borderRadius: const BorderRadius.vertical(
+                                bottom: Radius.circular(16),
                               ),
-                              borderRadius: const BorderRadius.vertical(bottom: Radius.circular(16)),
                             ),
                           ),
                         ),
 
                         // Title
                         Positioned(
-                          bottom: 12, left: 12, right: 12,
+                          bottom: 12,
+                          left: 12,
+                          right: 12,
                           child: Column(
                             crossAxisAlignment: CrossAxisAlignment.start,
                             mainAxisSize: MainAxisSize.min,
                             children: [
                               Text(
                                 movie.name,
-                                style: GoogleFonts.inter(color: Colors.white, fontSize: 13, fontWeight: FontWeight.w600),
+                                style: GoogleFonts.inter(
+                                  color: Colors.white,
+                                  fontSize: 13,
+                                  fontWeight: FontWeight.w600,
+                                ),
                                 maxLines: 2,
                                 overflow: TextOverflow.ellipsis,
                               ),
                               if (isWatched)
-                                Text('WATCHED', style: GoogleFonts.inter(color: AppColors.primary, fontSize: 10, fontWeight: FontWeight.bold)),
+                                Text(
+                                  'WATCHED',
+                                  style: GoogleFonts.inter(
+                                    color: AppColors.primary,
+                                    fontSize: 10,
+                                    fontWeight: FontWeight.bold,
+                                  ),
+                                ),
                             ],
                           ),
                         ),
@@ -314,19 +368,31 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
                         // Rating
                         if (movie.rating != null && movie.rating!.isNotEmpty)
                           Positioned(
-                            top: 8, right: 8,
+                            top: 8,
+                            right: 8,
                             child: GlassContainer(
                               borderRadius: 4,
                               opacity: 0.6,
-                              padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+                              padding: const EdgeInsets.symmetric(
+                                horizontal: 6,
+                                vertical: 2,
+                              ),
                               child: Row(
                                 mainAxisSize: MainAxisSize.min,
                                 children: [
-                                  const Icon(Icons.star, size: 10, color: Colors.amber),
+                                  const Icon(
+                                    Icons.star,
+                                    size: 10,
+                                    color: Colors.amber,
+                                  ),
                                   const SizedBox(width: 4),
                                   Text(
                                     _formatRating(movie.rating)!,
-                                    style: GoogleFonts.inter(fontSize: 10, fontWeight: FontWeight.bold, color: Colors.white),
+                                    style: GoogleFonts.inter(
+                                      fontSize: 10,
+                                      fontWeight: FontWeight.bold,
+                                      color: Colors.white,
+                                    ),
                                   ),
                                 ],
                               ),
@@ -340,12 +406,14 @@ class _MobileMoviesTabState extends ConsumerState<MobileMoviesTab> {
               ),
             ),
           ),
-          
+
           if (_isLoading)
             const SliverToBoxAdapter(
               child: Padding(
                 padding: EdgeInsets.all(24),
-                child: Center(child: CircularProgressIndicator(color: Colors.white)),
+                child: Center(
+                  child: CircularProgressIndicator(color: Colors.white),
+                ),
               ),
             ),
         ],

lib/mobile/features/iptv/widgets/mobile_series_tab.dart

@@ -29,7 +29,7 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
   bool _isSearching = false;
   bool _hasMore = true;
   int _currentOffset = 0;
-  static const int _pageSize = 50; 
+  static const int _pageSize = 50;
   Timer? _searchDebounce;
 
   @override
@@ -48,9 +48,10 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
   }
 
   void _onScroll() {
-    if (!_isLoading && _hasMore &&
+    if (!_isLoading &&
+        _hasMore &&
         _scrollController.position.pixels >=
-        _scrollController.position.maxScrollExtent * 0.8) {
+            _scrollController.position.maxScrollExtent * 0.8) {
       _loadMoreSeries();
     }
   }
@@ -64,7 +65,7 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
         _isSearching = false;
       }
     });
-    
+
     if (query.length >= 2) {
       _searchDebounce = Timer(const Duration(milliseconds: 500), () {
         _performSearch(query);
@@ -75,11 +76,11 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
   Future<void> _performSearch(String query) async {
     if (query.isEmpty) return;
     setState(() => _isSearching = true);
-    
+
     try {
       final service = ref.read(xtreamServiceProvider(widget.playlist));
       final results = await service.searchSeries(query);
-      
+
       if (mounted && _searchQuery == query) {
         setState(() {
           _searchResults = results;
@@ -150,23 +151,30 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
   @override
   Widget build(BuildContext context) {
     final settings = ref.watch(iptvSettingsProvider);
-    
+
     List<Series> displaySeries;
     if (_searchQuery.isNotEmpty && _searchResults != null) {
       displaySeries = _searchResults!;
     } else {
       displaySeries = settings.seriesKeywords.isEmpty
           ? _series
-          : _series.where((s) => settings.matchesSeriesFilter(s.categoryName)).toList();
+          : _series
+              .where((s) => settings.matchesSeriesFilter(s.categoryName))
+              .toList();
     }
 
-    final heroItems = displaySeries.take(3).map((s) => HeroItem(
+    final heroItems = displaySeries
-      id: s.seriesId.toString(),
+        .take(3)
-      title: s.name,
+        .map(
-      imageUrl: _getProxiedImageUrl(s.cover),
+          (s) => HeroItem(
-      subtitle: s.rating != null ? '${_formatRating(s.rating)} ★' : null,
+            id: s.seriesId.toString(),
-      onMoreInfo: () => _openSeries(s),
+            title: s.name,
-    )).toList();
+            imageUrl: _getProxiedImageUrl(s.cover),
+            subtitle: s.rating != null ? '${_formatRating(s.rating)} ★' : null,
+            onMoreInfo: () => _openSeries(s),
+          ),
+        )
+        .toList();
 
     return SafeArea(
       bottom: false,
@@ -180,7 +188,8 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
               child: GlassContainer(
                 borderRadius: 100,
                 opacity: 0.1,
-                padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+                padding:
+                    const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
                 child: Row(
                   children: [
                     const Icon(Icons.search, size: 20, color: Colors.white54),
@@ -188,7 +197,10 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
                     Expanded(
                       child: TextField(
                         controller: _searchController,
-                        style: GoogleFonts.inter(fontSize: 14, color: Colors.white),
+                        style: GoogleFonts.inter(
+                          fontSize: 14,
+                          color: Colors.white,
+                        ),
                         decoration: InputDecoration(
                           hintText: 'Search Series...',
                           hintStyle: GoogleFonts.inter(color: Colors.white54),
@@ -200,14 +212,25 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
                       ),
                     ),
                     if (_isSearching)
-                      const SizedBox(width: 12, height: 12, child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white)),
+                      const SizedBox(
+                        width: 12,
+                        height: 12,
+                        child: CircularProgressIndicator(
+                          strokeWidth: 2,
+                          color: Colors.white,
+                        ),
+                      ),
                     if (_searchQuery.isNotEmpty)
                       GestureDetector(
                         onTap: () {
-                           _searchController.clear();
+                          _searchController.clear();
-                           _onSearchChanged('');
+                          _onSearchChanged('');
                         },
-                        child: const Icon(Icons.close, size: 16, color: Colors.white),
+                        child: const Icon(
+                          Icons.close,
+                          size: 16,
+                          color: Colors.white,
+                        ),
                       ),
                   ],
                 ),
@@ -221,22 +244,24 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
               child: Padding(
                 padding: const EdgeInsets.only(bottom: 24),
                 child: SizedBox(
-                   height: 250,
+                  height: 250,
-                   child: HeroCarousel(
+                  child: HeroCarousel(
-                     items: heroItems,
+                    items: heroItems,
-                     onTap: (item) {
+                    onTap: (item) {
-                       try {
+                      try {
-                         final series = _series.firstWhere((s) => s.seriesId.toString() == item.id);
+                        final series = _series.firstWhere(
-                         _openSeries(series);
+                          (s) => s.seriesId.toString() == item.id,
-                       } catch (e) {
+                        );
-                         // Fallback
+                        _openSeries(series);
-                       }
+                      } catch (e) {
-                     },
+                        // Fallback
-                   ),
+                      }
+                    },
+                  ),
                 ),
               ),
             ),
-          
+
           // Grid
           SliverPadding(
             padding: const EdgeInsets.fromLTRB(16, 0, 16, 80),
@@ -251,7 +276,7 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
                 (context, index) {
                   if (index >= displaySeries.length) return null;
                   final series = displaySeries[index];
-                  
+
                   return GestureDetector(
                     onTap: () => _openSeries(series),
                     child: Stack(
@@ -260,37 +285,58 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
                         // Poster
                         ClipRRect(
                           borderRadius: BorderRadius.circular(16),
-                          child: series.cover != null && series.cover!.isNotEmpty
+                          child:
-                            ? Image.network(
+                              series.cover != null && series.cover!.isNotEmpty
-                                _getProxiedImageUrl(series.cover),
+                                  ? Image.network(
-                                fit: BoxFit.cover,
+                                      _getProxiedImageUrl(series.cover),
-                                errorBuilder: (_, __, ___) => Container(color: Colors.white10),
+                                      fit: BoxFit.cover,
-                              )
+                                      errorBuilder: (_, __, ___) =>
-                            : Container(color: Colors.white10, child: const Icon(Icons.tv, color: Colors.white24)),
+                                          Container(color: Colors.white10),
+                                    )
+                                  : Container(
+                                      color: Colors.white10,
+                                      child: const Icon(
+                                        Icons.tv,
+                                        color: Colors.white24,
+                                      ),
+                                    ),
                         ),
-                        
+
                         // Gradient Overlay
                         Positioned(
-                          bottom: 0, left: 0, right: 0,
+                          bottom: 0,
+                          left: 0,
+                          right: 0,
                           height: 80,
                           child: Container(
                             decoration: BoxDecoration(
                               gradient: LinearGradient(
                                 begin: Alignment.topCenter,
                                 end: Alignment.bottomCenter,
-                                colors: [Colors.transparent, Colors.black.withOpacity(0.9)],
+                                colors: [
+                                  Colors.transparent,
+                                  Colors.black.withOpacity(0.9),
+                                ],
+                              ),
+                              borderRadius: const BorderRadius.vertical(
+                                bottom: Radius.circular(16),
                               ),
-                              borderRadius: const BorderRadius.vertical(bottom: Radius.circular(16)),
                             ),
                           ),
                         ),
 
                         // Title
                         Positioned(
-                          bottom: 12, left: 12, right: 12,
+                          bottom: 12,
+                          left: 12,
+                          right: 12,
                           child: Text(
                             series.name,
-                            style: GoogleFonts.inter(color: Colors.white, fontSize: 13, fontWeight: FontWeight.w600),
+                            style: GoogleFonts.inter(
+                              color: Colors.white,
+                              fontSize: 13,
+                              fontWeight: FontWeight.w600,
+                            ),
                             maxLines: 2,
                             overflow: TextOverflow.ellipsis,
                           ),
@@ -299,19 +345,31 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
                         // Rating
                         if (series.rating != null && series.rating!.isNotEmpty)
                           Positioned(
-                            top: 8, right: 8,
+                            top: 8,
+                            right: 8,
                             child: GlassContainer(
                               borderRadius: 4,
                               opacity: 0.6,
-                              padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+                              padding: const EdgeInsets.symmetric(
+                                horizontal: 6,
+                                vertical: 2,
+                              ),
                               child: Row(
                                 mainAxisSize: MainAxisSize.min,
                                 children: [
-                                  const Icon(Icons.star, size: 10, color: Colors.amber),
+                                  const Icon(
+                                    Icons.star,
+                                    size: 10,
+                                    color: Colors.amber,
+                                  ),
                                   const SizedBox(width: 4),
                                   Text(
                                     _formatRating(series.rating)!,
-                                    style: GoogleFonts.inter(fontSize: 10, fontWeight: FontWeight.bold, color: Colors.white),
+                                    style: GoogleFonts.inter(
+                                      fontSize: 10,
+                                      fontWeight: FontWeight.bold,
+                                      color: Colors.white,
+                                    ),
                                   ),
                                 ],
                               ),
@@ -325,12 +383,14 @@ class _MobileSeriesTabState extends ConsumerState<MobileSeriesTab> {
               ),
             ),
           ),
-          
+
           if (_isLoading)
             const SliverToBoxAdapter(
               child: Padding(
                 padding: EdgeInsets.all(24),
-                child: Center(child: CircularProgressIndicator(color: Colors.white)),
+                child: Center(
+                  child: CircularProgressIndicator(color: Colors.white),
+                ),
               ),
             ),
         ],

lib/mobile/features/iptv/widgets/mobile_settings_tab.dart

@@ -37,13 +37,16 @@ class _MobileSettingsTabState extends ConsumerState<MobileSettingsTab> {
   }
 
   void _syncControllers(IptvSettings settings) {
-    if (!_initialized || _liveTvController.text != settings.liveTvCategoryFilter) {
+    if (!_initialized ||
+        _liveTvController.text != settings.liveTvCategoryFilter) {
       _liveTvController.text = settings.liveTvCategoryFilter;
     }
-    if (!_initialized || _moviesController.text != settings.moviesCategoryFilter) {
+    if (!_initialized ||
+        _moviesController.text != settings.moviesCategoryFilter) {
       _moviesController.text = settings.moviesCategoryFilter;
     }
-    if (!_initialized || _seriesController.text != settings.seriesCategoryFilter) {
+    if (!_initialized ||
+        _seriesController.text != settings.seriesCategoryFilter) {
       _seriesController.text = settings.seriesCategoryFilter;
     }
     _initialized = true;
@@ -56,7 +59,7 @@ class _MobileSettingsTabState extends ConsumerState<MobileSettingsTab> {
     final themeState = ref.watch(themeProvider);
     final themeNotifier = ref.read(themeProvider.notifier);
     final isDark = Theme.of(context).brightness == Brightness.dark;
-    
+
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (!_initialized) _syncControllers(settings);
     });
@@ -66,7 +69,7 @@ class _MobileSettingsTabState extends ConsumerState<MobileSettingsTab> {
         padding: const EdgeInsets.all(16),
         children: [
           // Header
-         Padding(
+          Padding(
             padding: const EdgeInsets.only(bottom: 24),
             child: Text(
               'Settings',
@@ -87,7 +90,10 @@ class _MobileSettingsTabState extends ConsumerState<MobileSettingsTab> {
                   backgroundColor: AppColors.primary.withOpacity(0.2),
                   child: Text(
                     currentUser?.username.substring(0, 1).toUpperCase() ?? 'U',
-                    style: const TextStyle(fontWeight: FontWeight.bold, color: AppColors.primary),
+                    style: const TextStyle(
+                      fontWeight: FontWeight.bold,
+                      color: AppColors.primary,
+                    ),
                   ),
                 ),
                 const SizedBox(width: 16),
@@ -106,12 +112,22 @@ class _MobileSettingsTabState extends ConsumerState<MobileSettingsTab> {
                       if (currentUser?.isAdmin ?? false)
                         Container(
                           margin: const EdgeInsets.only(top: 4),
-                          padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: 8,
+                            vertical: 2,
+                          ),
                           decoration: BoxDecoration(
                             color: AppColors.primary.withOpacity(0.2),
                             borderRadius: BorderRadius.circular(4),
                           ),
-                          child: const Text('ADMIN', style: TextStyle(fontSize: 10, color: AppColors.primary, fontWeight: FontWeight.bold)),
+                          child: const Text(
+                            'ADMIN',
+                            style: TextStyle(
+                              fontSize: 10,
+                              color: AppColors.primary,
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ),
                         ),
                     ],
                   ),
@@ -131,19 +147,30 @@ class _MobileSettingsTabState extends ConsumerState<MobileSettingsTab> {
             child: Column(
               children: [
                 SwitchListTile(
-                  title: const Text('Dark Mode', style: TextStyle(color: AppColors.textPrimary)),
+                  title: const Text(
-                  secondary:  Icon(isDark ? Icons.dark_mode : Icons.light_mode, color: AppColors.primary),
+                    'Dark Mode',
+                    style: TextStyle(color: AppColors.textPrimary),
+                  ),
+                  secondary: Icon(
+                    isDark ? Icons.dark_mode : Icons.light_mode,
+                    color: AppColors.primary,
+                  ),
                   value: isDark,
                   onChanged: (_) => themeNotifier.toggleTheme(),
-                  activeColor: AppColors.primary,
+                  activeThumbColor: AppColors.primary,
                 ),
                 const Divider(height: 1),
                 SwitchListTile(
-                  title: const Text('Show Clock', style: TextStyle(color: AppColors.textPrimary)),
+                  title: const Text(
-                  secondary: const Icon(Icons.access_time, color: AppColors.primary),
+                    'Show Clock',
+                    style: TextStyle(color: AppColors.textPrimary),
+                  ),
+                  secondary:
+                      const Icon(Icons.access_time, color: AppColors.primary),
                   value: settings.showClock,
-                  onChanged: (val) => ref.read(iptvSettingsProvider.notifier).setShowClock(val),
+                  onChanged: (val) =>
-                  activeColor: AppColors.primary,
+                      ref.read(iptvSettingsProvider.notifier).setShowClock(val),
+                  activeThumbColor: AppColors.primary,
                 ),
               ],
             ),
@@ -167,7 +194,11 @@ class _MobileSettingsTabState extends ConsumerState<MobileSettingsTab> {
                   items: StreamQuality.values,
                   labelBuilder: (v) => v.name.toUpperCase(),
                   onChanged: (v) {
-                    if (v != null) ref.read(iptvSettingsProvider.notifier).setStreamQuality(v);
+                    if (v != null) {
+                      ref
+                          .read(iptvSettingsProvider.notifier)
+                          .setStreamQuality(v);
+                    }
                   },
                 ),
                 const Divider(height: 1),
@@ -178,19 +209,26 @@ class _MobileSettingsTabState extends ConsumerState<MobileSettingsTab> {
                   items: BufferSize.values,
                   labelBuilder: (v) => v.name.toUpperCase(),
                   onChanged: (v) {
-                    if (v != null) ref.read(iptvSettingsProvider.notifier).setBufferSize(v);
+                    if (v != null) {
+                      ref.read(iptvSettingsProvider.notifier).setBufferSize(v);
+                    }
                   },
                 ),
                 const Divider(height: 1),
                 _DropdownSetting<ConnectionTimeout>(
-                   label: 'Timeout',
+                  label: 'Timeout',
-                   icon: Icons.timer,
+                  icon: Icons.timer,
-                   value: settings.connectionTimeout,
+                  value: settings.connectionTimeout,
-                   items: ConnectionTimeout.values,
+                  items: ConnectionTimeout.values,
-                   labelBuilder: (v) => '${v.name.toUpperCase()} (${ref.read(iptvSettingsProvider).timeoutSeconds}s)',
+                  labelBuilder: (v) =>
-                   onChanged: (v) {
+                      '${v.name.toUpperCase()} (${ref.read(iptvSettingsProvider).timeoutSeconds}s)',
-                     if (v != null) ref.read(iptvSettingsProvider.notifier).setConnectionTimeout(v);
+                  onChanged: (v) {
-                   },
+                    if (v != null) {
+                      ref
+                          .read(iptvSettingsProvider.notifier)
+                          .setConnectionTimeout(v);
+                    }
+                  },
                 ),
                 const Divider(height: 1),
                 _DropdownSetting<TranscodingMode>(
@@ -200,22 +238,35 @@ class _MobileSettingsTabState extends ConsumerState<MobileSettingsTab> {
                   items: TranscodingMode.values,
                   labelBuilder: (v) {
                     switch (v) {
-                      case TranscodingMode.auto: return 'AUTO';
+                      case TranscodingMode.auto:
-                      case TranscodingMode.forced: return 'TRANSCODE';
+                        return 'AUTO';
-                      case TranscodingMode.disabled: return 'DIRECT';
+                      case TranscodingMode.forced:
+                        return 'TRANSCODE';
+                      case TranscodingMode.disabled:
+                        return 'DIRECT';
                     }
                   },
                   onChanged: (v) {
-                    if (v != null) ref.read(iptvSettingsProvider.notifier).setTranscodingMode(v);
+                    if (v != null) {
+                      ref
+                          .read(iptvSettingsProvider.notifier)
+                          .setTranscodingMode(v);
+                    }
                   },
                 ),
                 const Divider(height: 1),
-                 SwitchListTile(
+                SwitchListTile(
-                  title: const Text('Auto Reconnect', style: TextStyle(color: AppColors.textPrimary)),
+                  title: const Text(
-                  secondary: const Icon(Icons.refresh, color: AppColors.primary),
+                    'Auto Reconnect',
+                    style: TextStyle(color: AppColors.textPrimary),
+                  ),
+                  secondary:
+                      const Icon(Icons.refresh, color: AppColors.primary),
                   value: settings.autoReconnect,
-                  onChanged: (val) => ref.read(iptvSettingsProvider.notifier).setAutoReconnect(val),
+                  onChanged: (val) => ref
-                  activeColor: AppColors.primary,
+                      .read(iptvSettingsProvider.notifier)
+                      .setAutoReconnect(val),
+                  activeThumbColor: AppColors.primary,
                 ),
               ],
             ),
@@ -236,21 +287,27 @@ class _MobileSettingsTabState extends ConsumerState<MobileSettingsTab> {
                   label: 'Live TV Keywords',
                   icon: Icons.live_tv,
                   controller: _liveTvController,
-                  onChanged: (val) => ref.read(iptvSettingsProvider.notifier).setLiveTvFilter(val),
+                  onChanged: (val) => ref
+                      .read(iptvSettingsProvider.notifier)
+                      .setLiveTvFilter(val),
                 ),
                 const Divider(height: 24),
                 _FilterInput(
                   label: 'Movies Keywords',
                   icon: Icons.movie,
                   controller: _moviesController,
-                  onChanged: (val) => ref.read(iptvSettingsProvider.notifier).setMoviesFilter(val),
+                  onChanged: (val) => ref
+                      .read(iptvSettingsProvider.notifier)
+                      .setMoviesFilter(val),
                 ),
                 const Divider(height: 24),
                 _FilterInput(
                   label: 'Series Keywords',
                   icon: Icons.tv,
                   controller: _seriesController,
-                  onChanged: (val) => ref.read(iptvSettingsProvider.notifier).setSeriesFilter(val),
+                  onChanged: (val) => ref
+                      .read(iptvSettingsProvider.notifier)
+                      .setSeriesFilter(val),
                 ),
               ],
             ),
@@ -271,19 +328,19 @@ class _MobileSettingsTabState extends ConsumerState<MobileSettingsTab> {
             onTap: () => context.go('/playlists'),
           ),
           const SizedBox(height: 32),
-          
+
           FilledButton.icon(
-             onPressed: () {
+            onPressed: () {
-               ref.read(authProvider.notifier).logout();
+              ref.read(authProvider.notifier).logout();
-               context.go('/login');
+              context.go('/login');
-             },
+            },
-             style: FilledButton.styleFrom(
+            style: FilledButton.styleFrom(
-               backgroundColor: AppColors.error.withOpacity(0.1),
+              backgroundColor: AppColors.error.withOpacity(0.1),
-               foregroundColor: AppColors.error,
+              foregroundColor: AppColors.error,
-               minimumSize: const Size(double.infinity, 50),
+              minimumSize: const Size(double.infinity, 50),
-             ),
+            ),
-             icon: const Icon(Icons.logout),
+            icon: const Icon(Icons.logout),
-             label: const Text('Logout'),
+            label: const Text('Logout'),
           ),
           const SizedBox(height: 100),
         ],
@@ -335,10 +392,17 @@ class _FilterInput extends StatelessWidget {
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              Text(label, style: const TextStyle(fontSize: 12, color: AppColors.textSecondary)),
+              Text(
+                label,
+                style: const TextStyle(
+                  fontSize: 12,
+                  color: AppColors.textSecondary,
+                ),
+              ),
               TextField(
                 controller: controller,
-                style: const TextStyle(fontSize: 14, color: AppColors.textPrimary),
+                style:
+                    const TextStyle(fontSize: 14, color: AppColors.textPrimary),
                 decoration: const InputDecoration(
                   isDense: true,
                   contentPadding: EdgeInsets.symmetric(vertical: 4),
@@ -435,7 +499,10 @@ class _DropdownSetting<T> extends StatelessWidget {
             value: value,
             underline: const SizedBox(),
             dropdownColor: AppColors.surfaceVariant,
-            icon: const Icon(Icons.arrow_drop_down, color: AppColors.textSecondary),
+            icon: const Icon(
+              Icons.arrow_drop_down,
+              color: AppColors.textSecondary,
+            ),
             style: const TextStyle(color: AppColors.textPrimary),
             items: items.map((item) {
               return DropdownMenuItem<T>(

lib/mobile/widgets/mobile_scaffold.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'dart:ui';
-import '../../core/theme/app_colors.dart';
 
 class MobileScaffold extends ConsumerWidget {
   final Widget child;
@@ -25,7 +24,7 @@ class MobileScaffold extends ConsumerWidget {
         fit: StackFit.expand,
         children: [
           // Global Background
-           Container(
+          Container(
             decoration: const BoxDecoration(
               gradient: RadialGradient(
                 center: Alignment.center,
@@ -37,7 +36,7 @@ class MobileScaffold extends ConsumerWidget {
               ),
             ),
           ),
-          
+
           // Content
           child,
         ],
@@ -48,7 +47,12 @@ class MobileScaffold extends ConsumerWidget {
           child: Container(
             decoration: BoxDecoration(
               color: const Color(0xFF1C1C1E).withOpacity(0.85),
-              border: Border(top: BorderSide(color: Colors.white.withOpacity(0.1), width: 0.5)),
+              border: Border(
+                top: BorderSide(
+                  color: Colors.white.withOpacity(0.1),
+                  width: 0.5,
+                ),
+              ),
             ),
             child: BottomNavigationBar(
               currentIndex: currentIndex,
@@ -58,8 +62,10 @@ class MobileScaffold extends ConsumerWidget {
               elevation: 0,
               selectedItemColor: Colors.white,
               unselectedItemColor: Colors.white38,
-              selectedLabelStyle: GoogleFonts.inter(fontWeight: FontWeight.w600, fontSize: 11),
+              selectedLabelStyle:
-              unselectedLabelStyle: GoogleFonts.inter(fontWeight: FontWeight.w500, fontSize: 11),
+                  GoogleFonts.inter(fontWeight: FontWeight.w600, fontSize: 11),
+              unselectedLabelStyle:
+                  GoogleFonts.inter(fontWeight: FontWeight.w500, fontSize: 11),
               items: const [
                 BottomNavigationBarItem(
                   icon: Icon(Icons.live_tv_rounded),

pubspec.yaml

@@ -31,6 +31,7 @@ dependencies:
   video_player: ^2.9.1
   video_player_web: ^2.3.0
   video_player_web_hls: ^1.3.0
+  video_player_win: ^3.2.2
   chewie: ^1.8.3
   
   # UI Components
@@ -46,6 +47,7 @@ dependencies:
   intl: ^0.19.0
   equatable: ^2.0.5
   shared_preferences: ^2.3.2
+
   
 
 

test/widget_test.dart

@@ -0,0 +1,30 @@
+// This is a basic Flutter widget test.
+//
+// To perform an interaction with a widget in your test, use the WidgetTester
+// utility in the flutter_test package. For example, you can send tap and scroll
+// gestures. You can also use WidgetTester to find child widgets in the widget
+// tree, read text, and verify that the values of widget properties are correct.
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:xtremflow/main.dart';
+
+void main() {
+  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
+    // Build our app and trigger a frame.
+    await tester.pumpWidget(const MyApp());
+
+    // Verify that our counter starts at 0.
+    expect(find.text('0'), findsOneWidget);
+    expect(find.text('1'), findsNothing);
+
+    // Tap the '+' icon and trigger a frame.
+    await tester.tap(find.byIcon(Icons.add));
+    await tester.pump();
+
+    // Verify that our counter has incremented.
+    expect(find.text('0'), findsNothing);
+    expect(find.text('1'), findsOneWidget);
+  });
+}

windows/.gitignore

@@ -0,0 +1,17 @@
+flutter/ephemeral/
+
+# Visual Studio user-specific files.
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# Visual Studio build-related files.
+x64/
+x86/
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/

windows/CMakeLists.txt

@@ -0,0 +1,108 @@
+# Project-level configuration.
+cmake_minimum_required(VERSION 3.14)
+project(xtremflow LANGUAGES CXX)
+
+# The name of the executable created for the application. Change this to change
+# the on-disk name of your application.
+set(BINARY_NAME "xtremflow")
+
+# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
+# versions of CMake.
+cmake_policy(VERSION 3.14...3.25)
+
+# Define build configuration option.
+get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+if(IS_MULTICONFIG)
+  set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release"
+    CACHE STRING "" FORCE)
+else()
+  if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+    set(CMAKE_BUILD_TYPE "Debug" CACHE
+      STRING "Flutter build mode" FORCE)
+    set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
+      "Debug" "Profile" "Release")
+  endif()
+endif()
+# Define settings for the Profile build mode.
+set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}")
+set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}")
+set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}")
+set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}")
+
+# Use Unicode for all projects.
+add_definitions(-DUNICODE -D_UNICODE)
+
+# Compilation settings that should be applied to most targets.
+#
+# Be cautious about adding new options here, as plugins use this function by
+# default. In most cases, you should add new options to specific targets instead
+# of modifying this function.
+function(APPLY_STANDARD_SETTINGS TARGET)
+  target_compile_features(${TARGET} PUBLIC cxx_std_17)
+  target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100")
+  target_compile_options(${TARGET} PRIVATE /EHsc)
+  target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0")
+  target_compile_definitions(${TARGET} PRIVATE "$<$<CONFIG:Debug>:_DEBUG>")
+endfunction()
+
+# Flutter library and tool build rules.
+set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
+add_subdirectory(${FLUTTER_MANAGED_DIR})
+
+# Application build; see runner/CMakeLists.txt.
+add_subdirectory("runner")
+
+
+# Generated plugin build rules, which manage building the plugins and adding
+# them to the application.
+include(flutter/generated_plugins.cmake)
+
+
+# === Installation ===
+# Support files are copied into place next to the executable, so that it can
+# run in place. This is done instead of making a separate bundle (as on Linux)
+# so that building and running from within Visual Studio will work.
+set(BUILD_BUNDLE_DIR "$<TARGET_FILE_DIR:${BINARY_NAME}>")
+# Make the "install" step default, as it's required to run.
+set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1)
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+  set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE)
+endif()
+
+set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data")
+set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}")
+
+install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}"
+  COMPONENT Runtime)
+
+install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
+  COMPONENT Runtime)
+
+install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+  COMPONENT Runtime)
+
+if(PLUGIN_BUNDLED_LIBRARIES)
+  install(FILES "${PLUGIN_BUNDLED_LIBRARIES}"
+    DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+    COMPONENT Runtime)
+endif()
+
+# Copy the native assets provided by the build.dart from all packages.
+set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/")
+install(DIRECTORY "${NATIVE_ASSETS_DIR}"
+   DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+   COMPONENT Runtime)
+
+# Fully re-copy the assets directory on each build to avoid having stale files
+# from a previous install.
+set(FLUTTER_ASSET_DIR_NAME "flutter_assets")
+install(CODE "
+  file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\")
+  " COMPONENT Runtime)
+install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}"
+  DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime)
+
+# Install the AOT library on non-Debug builds only.
+install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
+  CONFIGURATIONS Profile;Release
+  COMPONENT Runtime)

windows/flutter/CMakeLists.txt

@@ -0,0 +1,109 @@
+# This file controls Flutter-level build steps. It should not be edited.
+cmake_minimum_required(VERSION 3.14)
+
+set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral")
+
+# Configuration provided via flutter tool.
+include(${EPHEMERAL_DIR}/generated_config.cmake)
+
+# TODO: Move the rest of this into files in ephemeral. See
+# https://github.com/flutter/flutter/issues/57146.
+set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper")
+
+# Set fallback configurations for older versions of the flutter tool.
+if (NOT DEFINED FLUTTER_TARGET_PLATFORM)
+  set(FLUTTER_TARGET_PLATFORM "windows-x64")
+endif()
+
+# === Flutter Library ===
+set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll")
+
+# Published to parent scope for install step.
+set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE)
+set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE)
+set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE)
+set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE)
+
+list(APPEND FLUTTER_LIBRARY_HEADERS
+  "flutter_export.h"
+  "flutter_windows.h"
+  "flutter_messenger.h"
+  "flutter_plugin_registrar.h"
+  "flutter_texture_registrar.h"
+)
+list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/")
+add_library(flutter INTERFACE)
+target_include_directories(flutter INTERFACE
+  "${EPHEMERAL_DIR}"
+)
+target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib")
+add_dependencies(flutter flutter_assemble)
+
+# === Wrapper ===
+list(APPEND CPP_WRAPPER_SOURCES_CORE
+  "core_implementations.cc"
+  "standard_codec.cc"
+)
+list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/")
+list(APPEND CPP_WRAPPER_SOURCES_PLUGIN
+  "plugin_registrar.cc"
+)
+list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/")
+list(APPEND CPP_WRAPPER_SOURCES_APP
+  "flutter_engine.cc"
+  "flutter_view_controller.cc"
+)
+list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/")
+
+# Wrapper sources needed for a plugin.
+add_library(flutter_wrapper_plugin STATIC
+  ${CPP_WRAPPER_SOURCES_CORE}
+  ${CPP_WRAPPER_SOURCES_PLUGIN}
+)
+apply_standard_settings(flutter_wrapper_plugin)
+set_target_properties(flutter_wrapper_plugin PROPERTIES
+  POSITION_INDEPENDENT_CODE ON)
+set_target_properties(flutter_wrapper_plugin PROPERTIES
+  CXX_VISIBILITY_PRESET hidden)
+target_link_libraries(flutter_wrapper_plugin PUBLIC flutter)
+target_include_directories(flutter_wrapper_plugin PUBLIC
+  "${WRAPPER_ROOT}/include"
+)
+add_dependencies(flutter_wrapper_plugin flutter_assemble)
+
+# Wrapper sources needed for the runner.
+add_library(flutter_wrapper_app STATIC
+  ${CPP_WRAPPER_SOURCES_CORE}
+  ${CPP_WRAPPER_SOURCES_APP}
+)
+apply_standard_settings(flutter_wrapper_app)
+target_link_libraries(flutter_wrapper_app PUBLIC flutter)
+target_include_directories(flutter_wrapper_app PUBLIC
+  "${WRAPPER_ROOT}/include"
+)
+add_dependencies(flutter_wrapper_app flutter_assemble)
+
+# === Flutter tool backend ===
+# _phony_ is a non-existent file to force this command to run every time,
+# since currently there's no way to get a full input/output list from the
+# flutter tool.
+set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_")
+set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE)
+add_custom_command(
+  OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS}
+    ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN}
+    ${CPP_WRAPPER_SOURCES_APP}
+    ${PHONY_OUTPUT}
+  COMMAND ${CMAKE_COMMAND} -E env
+    ${FLUTTER_TOOL_ENVIRONMENT}
+    "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat"
+      ${FLUTTER_TARGET_PLATFORM} $<CONFIG>
+  VERBATIM
+)
+add_custom_target(flutter_assemble DEPENDS
+  "${FLUTTER_LIBRARY}"
+  ${FLUTTER_LIBRARY_HEADERS}
+  ${CPP_WRAPPER_SOURCES_CORE}
+  ${CPP_WRAPPER_SOURCES_PLUGIN}
+  ${CPP_WRAPPER_SOURCES_APP}
+)

windows/flutter/generated_plugin_registrant.cc

@@ -0,0 +1,14 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#include "generated_plugin_registrant.h"
+
+#include <video_player_win/video_player_win_plugin_c_api.h>
+
+void RegisterPlugins(flutter::PluginRegistry* registry) {
+  VideoPlayerWinPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("VideoPlayerWinPluginCApi"));
+}

windows/flutter/generated_plugin_registrant.h

@@ -0,0 +1,15 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#ifndef GENERATED_PLUGIN_REGISTRANT_
+#define GENERATED_PLUGIN_REGISTRANT_
+
+#include <flutter/plugin_registry.h>
+
+// Registers Flutter plugins.
+void RegisterPlugins(flutter::PluginRegistry* registry);
+
+#endif  // GENERATED_PLUGIN_REGISTRANT_

windows/flutter/generated_plugins.cmake

@@ -0,0 +1,24 @@
+#
+# Generated file, do not edit.
+#
+
+list(APPEND FLUTTER_PLUGIN_LIST
+  video_player_win
+)
+
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
+set(PLUGIN_BUNDLED_LIBRARIES)
+
+foreach(plugin ${FLUTTER_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin})
+  target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
+endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)

windows/runner/CMakeLists.txt

@@ -0,0 +1,40 @@
+cmake_minimum_required(VERSION 3.14)
+project(runner LANGUAGES CXX)
+
+# Define the application target. To change its name, change BINARY_NAME in the
+# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer
+# work.
+#
+# Any new source files that you add to the application should be added here.
+add_executable(${BINARY_NAME} WIN32
+  "flutter_window.cpp"
+  "main.cpp"
+  "utils.cpp"
+  "win32_window.cpp"
+  "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
+  "Runner.rc"
+  "runner.exe.manifest"
+)
+
+# Apply the standard set of build settings. This can be removed for applications
+# that need different build settings.
+apply_standard_settings(${BINARY_NAME})
+
+# Add preprocessor definitions for the build version.
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}")
+
+# Disable Windows macros that collide with C++ standard library functions.
+target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX")
+
+# Add dependency libraries and include directories. Add any application-specific
+# dependencies here.
+target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app)
+target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib")
+target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}")
+
+# Run the Flutter tool portions of the build. This must not be removed.
+add_dependencies(${BINARY_NAME} flutter_assemble)

windows/runner/Runner.rc

@@ -0,0 +1,121 @@
+// Microsoft Visual C++ generated resource script.
+//
+#pragma code_page(65001)
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_APP_ICON            ICON                    "resources\\app_icon.ico"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD)
+#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD
+#else
+#define VERSION_AS_NUMBER 1,0,0,0
+#endif
+
+#if defined(FLUTTER_VERSION)
+#define VERSION_AS_STRING FLUTTER_VERSION
+#else
+#define VERSION_AS_STRING "1.0.0"
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION VERSION_AS_NUMBER
+ PRODUCTVERSION VERSION_AS_NUMBER
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS VS_FF_DEBUG
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_APP
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904e4"
+        BEGIN
+            VALUE "CompanyName", "com.example" "\0"
+            VALUE "FileDescription", "xtremflow" "\0"
+            VALUE "FileVersion", VERSION_AS_STRING "\0"
+            VALUE "InternalName", "xtremflow" "\0"
+            VALUE "LegalCopyright", "Copyright (C) 2025 com.example. All rights reserved." "\0"
+            VALUE "OriginalFilename", "xtremflow.exe" "\0"
+            VALUE "ProductName", "xtremflow" "\0"
+            VALUE "ProductVersion", VERSION_AS_STRING "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END
+
+#endif    // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED

windows/runner/flutter_window.cpp

@@ -0,0 +1,71 @@
+#include "flutter_window.h"
+
+#include <optional>
+
+#include "flutter/generated_plugin_registrant.h"
+
+FlutterWindow::FlutterWindow(const flutter::DartProject& project)
+    : project_(project) {}
+
+FlutterWindow::~FlutterWindow() {}
+
+bool FlutterWindow::OnCreate() {
+  if (!Win32Window::OnCreate()) {
+    return false;
+  }
+
+  RECT frame = GetClientArea();
+
+  // The size here must match the window dimensions to avoid unnecessary surface
+  // creation / destruction in the startup path.
+  flutter_controller_ = std::make_unique<flutter::FlutterViewController>(
+      frame.right - frame.left, frame.bottom - frame.top, project_);
+  // Ensure that basic setup of the controller was successful.
+  if (!flutter_controller_->engine() || !flutter_controller_->view()) {
+    return false;
+  }
+  RegisterPlugins(flutter_controller_->engine());
+  SetChildContent(flutter_controller_->view()->GetNativeWindow());
+
+  flutter_controller_->engine()->SetNextFrameCallback([&]() {
+    this->Show();
+  });
+
+  // Flutter can complete the first frame before the "show window" callback is
+  // registered. The following call ensures a frame is pending to ensure the
+  // window is shown. It is a no-op if the first frame hasn't completed yet.
+  flutter_controller_->ForceRedraw();
+
+  return true;
+}
+
+void FlutterWindow::OnDestroy() {
+  if (flutter_controller_) {
+    flutter_controller_ = nullptr;
+  }
+
+  Win32Window::OnDestroy();
+}
+
+LRESULT
+FlutterWindow::MessageHandler(HWND hwnd, UINT const message,
+                              WPARAM const wparam,
+                              LPARAM const lparam) noexcept {
+  // Give Flutter, including plugins, an opportunity to handle window messages.
+  if (flutter_controller_) {
+    std::optional<LRESULT> result =
+        flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam,
+                                                      lparam);
+    if (result) {
+      return *result;
+    }
+  }
+
+  switch (message) {
+    case WM_FONTCHANGE:
+      flutter_controller_->engine()->ReloadSystemFonts();
+      break;
+  }
+
+  return Win32Window::MessageHandler(hwnd, message, wparam, lparam);
+}

windows/runner/flutter_window.h

@@ -0,0 +1,33 @@
+#ifndef RUNNER_FLUTTER_WINDOW_H_
+#define RUNNER_FLUTTER_WINDOW_H_
+
+#include <flutter/dart_project.h>
+#include <flutter/flutter_view_controller.h>
+
+#include <memory>
+
+#include "win32_window.h"
+
+// A window that does nothing but host a Flutter view.
+class FlutterWindow : public Win32Window {
+ public:
+  // Creates a new FlutterWindow hosting a Flutter view running |project|.
+  explicit FlutterWindow(const flutter::DartProject& project);
+  virtual ~FlutterWindow();
+
+ protected:
+  // Win32Window:
+  bool OnCreate() override;
+  void OnDestroy() override;
+  LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam,
+                         LPARAM const lparam) noexcept override;
+
+ private:
+  // The project to run.
+  flutter::DartProject project_;
+
+  // The Flutter instance hosted by this window.
+  std::unique_ptr<flutter::FlutterViewController> flutter_controller_;
+};
+
+#endif  // RUNNER_FLUTTER_WINDOW_H_

windows/runner/main.cpp

@@ -0,0 +1,43 @@
+#include <flutter/dart_project.h>
+#include <flutter/flutter_view_controller.h>
+#include <windows.h>
+
+#include "flutter_window.h"
+#include "utils.h"
+
+int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
+                      _In_ wchar_t *command_line, _In_ int show_command) {
+  // Attach to console when present (e.g., 'flutter run') or create a
+  // new console when running with a debugger.
+  if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) {
+    CreateAndAttachConsole();
+  }
+
+  // Initialize COM, so that it is available for use in the library and/or
+  // plugins.
+  ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);
+
+  flutter::DartProject project(L"data");
+
+  std::vector<std::string> command_line_arguments =
+      GetCommandLineArguments();
+
+  project.set_dart_entrypoint_arguments(std::move(command_line_arguments));
+
+  FlutterWindow window(project);
+  Win32Window::Point origin(10, 10);
+  Win32Window::Size size(1280, 720);
+  if (!window.Create(L"xtremflow", origin, size)) {
+    return EXIT_FAILURE;
+  }
+  window.SetQuitOnClose(true);
+
+  ::MSG msg;
+  while (::GetMessage(&msg, nullptr, 0, 0)) {
+    ::TranslateMessage(&msg);
+    ::DispatchMessage(&msg);
+  }
+
+  ::CoUninitialize();
+  return EXIT_SUCCESS;
+}

windows/runner/resource.h

@@ -0,0 +1,16 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Runner.rc
+//
+#define IDI_APP_ICON                    101
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        102
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

windows/runner/runner.exe.manifest

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </windowsSettings>
+  </application>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- Windows 10 and Windows 11 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+    </application>
+  </compatibility>
+</assembly>

windows/runner/utils.cpp

@@ -0,0 +1,65 @@
+#include "utils.h"
+
+#include <flutter_windows.h>
+#include <io.h>
+#include <stdio.h>
+#include <windows.h>
+
+#include <iostream>
+
+void CreateAndAttachConsole() {
+  if (::AllocConsole()) {
+    FILE *unused;
+    if (freopen_s(&unused, "CONOUT$", "w", stdout)) {
+      _dup2(_fileno(stdout), 1);
+    }
+    if (freopen_s(&unused, "CONOUT$", "w", stderr)) {
+      _dup2(_fileno(stdout), 2);
+    }
+    std::ios::sync_with_stdio();
+    FlutterDesktopResyncOutputStreams();
+  }
+}
+
+std::vector<std::string> GetCommandLineArguments() {
+  // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use.
+  int argc;
+  wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc);
+  if (argv == nullptr) {
+    return std::vector<std::string>();
+  }
+
+  std::vector<std::string> command_line_arguments;
+
+  // Skip the first argument as it's the binary name.
+  for (int i = 1; i < argc; i++) {
+    command_line_arguments.push_back(Utf8FromUtf16(argv[i]));
+  }
+
+  ::LocalFree(argv);
+
+  return command_line_arguments;
+}
+
+std::string Utf8FromUtf16(const wchar_t* utf16_string) {
+  if (utf16_string == nullptr) {
+    return std::string();
+  }
+  unsigned int target_length = ::WideCharToMultiByte(
+      CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string,
+      -1, nullptr, 0, nullptr, nullptr)
+    -1; // remove the trailing null character
+  int input_length = (int)wcslen(utf16_string);
+  std::string utf8_string;
+  if (target_length == 0 || target_length > utf8_string.max_size()) {
+    return utf8_string;
+  }
+  utf8_string.resize(target_length);
+  int converted_length = ::WideCharToMultiByte(
+      CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string,
+      input_length, utf8_string.data(), target_length, nullptr, nullptr);
+  if (converted_length == 0) {
+    return std::string();
+  }
+  return utf8_string;
+}

windows/runner/utils.h

@@ -0,0 +1,19 @@
+#ifndef RUNNER_UTILS_H_
+#define RUNNER_UTILS_H_
+
+#include <string>
+#include <vector>
+
+// Creates a console for the process, and redirects stdout and stderr to
+// it for both the runner and the Flutter library.
+void CreateAndAttachConsole();
+
+// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string
+// encoded in UTF-8. Returns an empty std::string on failure.
+std::string Utf8FromUtf16(const wchar_t* utf16_string);
+
+// Gets the command line arguments passed in as a std::vector<std::string>,
+// encoded in UTF-8. Returns an empty std::vector<std::string> on failure.
+std::vector<std::string> GetCommandLineArguments();
+
+#endif  // RUNNER_UTILS_H_

windows/runner/win32_window.cpp

@@ -0,0 +1,288 @@
+#include "win32_window.h"
+
+#include <dwmapi.h>
+#include <flutter_windows.h>
+
+#include "resource.h"
+
+namespace {
+
+/// Window attribute that enables dark mode window decorations.
+///
+/// Redefined in case the developer's machine has a Windows SDK older than
+/// version 10.0.22000.0.
+/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute
+#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE
+#define DWMWA_USE_IMMERSIVE_DARK_MODE 20
+#endif
+
+constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW";
+
+/// Registry key for app theme preference.
+///
+/// A value of 0 indicates apps should use dark mode. A non-zero or missing
+/// value indicates apps should use light mode.
+constexpr const wchar_t kGetPreferredBrightnessRegKey[] =
+  L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize";
+constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme";
+
+// The number of Win32Window objects that currently exist.
+static int g_active_window_count = 0;
+
+using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd);
+
+// Scale helper to convert logical scaler values to physical using passed in
+// scale factor
+int Scale(int source, double scale_factor) {
+  return static_cast<int>(source * scale_factor);
+}
+
+// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module.
+// This API is only needed for PerMonitor V1 awareness mode.
+void EnableFullDpiSupportIfAvailable(HWND hwnd) {
+  HMODULE user32_module = LoadLibraryA("User32.dll");
+  if (!user32_module) {
+    return;
+  }
+  auto enable_non_client_dpi_scaling =
+      reinterpret_cast<EnableNonClientDpiScaling*>(
+          GetProcAddress(user32_module, "EnableNonClientDpiScaling"));
+  if (enable_non_client_dpi_scaling != nullptr) {
+    enable_non_client_dpi_scaling(hwnd);
+  }
+  FreeLibrary(user32_module);
+}
+
+}  // namespace
+
+// Manages the Win32Window's window class registration.
+class WindowClassRegistrar {
+ public:
+  ~WindowClassRegistrar() = default;
+
+  // Returns the singleton registrar instance.
+  static WindowClassRegistrar* GetInstance() {
+    if (!instance_) {
+      instance_ = new WindowClassRegistrar();
+    }
+    return instance_;
+  }
+
+  // Returns the name of the window class, registering the class if it hasn't
+  // previously been registered.
+  const wchar_t* GetWindowClass();
+
+  // Unregisters the window class. Should only be called if there are no
+  // instances of the window.
+  void UnregisterWindowClass();
+
+ private:
+  WindowClassRegistrar() = default;
+
+  static WindowClassRegistrar* instance_;
+
+  bool class_registered_ = false;
+};
+
+WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr;
+
+const wchar_t* WindowClassRegistrar::GetWindowClass() {
+  if (!class_registered_) {
+    WNDCLASS window_class{};
+    window_class.hCursor = LoadCursor(nullptr, IDC_ARROW);
+    window_class.lpszClassName = kWindowClassName;
+    window_class.style = CS_HREDRAW | CS_VREDRAW;
+    window_class.cbClsExtra = 0;
+    window_class.cbWndExtra = 0;
+    window_class.hInstance = GetModuleHandle(nullptr);
+    window_class.hIcon =
+        LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON));
+    window_class.hbrBackground = 0;
+    window_class.lpszMenuName = nullptr;
+    window_class.lpfnWndProc = Win32Window::WndProc;
+    RegisterClass(&window_class);
+    class_registered_ = true;
+  }
+  return kWindowClassName;
+}
+
+void WindowClassRegistrar::UnregisterWindowClass() {
+  UnregisterClass(kWindowClassName, nullptr);
+  class_registered_ = false;
+}
+
+Win32Window::Win32Window() {
+  ++g_active_window_count;
+}
+
+Win32Window::~Win32Window() {
+  --g_active_window_count;
+  Destroy();
+}
+
+bool Win32Window::Create(const std::wstring& title,
+                         const Point& origin,
+                         const Size& size) {
+  Destroy();
+
+  const wchar_t* window_class =
+      WindowClassRegistrar::GetInstance()->GetWindowClass();
+
+  const POINT target_point = {static_cast<LONG>(origin.x),
+                              static_cast<LONG>(origin.y)};
+  HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST);
+  UINT dpi = FlutterDesktopGetDpiForMonitor(monitor);
+  double scale_factor = dpi / 96.0;
+
+  HWND window = CreateWindow(
+      window_class, title.c_str(), WS_OVERLAPPEDWINDOW,
+      Scale(origin.x, scale_factor), Scale(origin.y, scale_factor),
+      Scale(size.width, scale_factor), Scale(size.height, scale_factor),
+      nullptr, nullptr, GetModuleHandle(nullptr), this);
+
+  if (!window) {
+    return false;
+  }
+
+  UpdateTheme(window);
+
+  return OnCreate();
+}
+
+bool Win32Window::Show() {
+  return ShowWindow(window_handle_, SW_SHOWNORMAL);
+}
+
+// static
+LRESULT CALLBACK Win32Window::WndProc(HWND const window,
+                                      UINT const message,
+                                      WPARAM const wparam,
+                                      LPARAM const lparam) noexcept {
+  if (message == WM_NCCREATE) {
+    auto window_struct = reinterpret_cast<CREATESTRUCT*>(lparam);
+    SetWindowLongPtr(window, GWLP_USERDATA,
+                     reinterpret_cast<LONG_PTR>(window_struct->lpCreateParams));
+
+    auto that = static_cast<Win32Window*>(window_struct->lpCreateParams);
+    EnableFullDpiSupportIfAvailable(window);
+    that->window_handle_ = window;
+  } else if (Win32Window* that = GetThisFromHandle(window)) {
+    return that->MessageHandler(window, message, wparam, lparam);
+  }
+
+  return DefWindowProc(window, message, wparam, lparam);
+}
+
+LRESULT
+Win32Window::MessageHandler(HWND hwnd,
+                            UINT const message,
+                            WPARAM const wparam,
+                            LPARAM const lparam) noexcept {
+  switch (message) {
+    case WM_DESTROY:
+      window_handle_ = nullptr;
+      Destroy();
+      if (quit_on_close_) {
+        PostQuitMessage(0);
+      }
+      return 0;
+
+    case WM_DPICHANGED: {
+      auto newRectSize = reinterpret_cast<RECT*>(lparam);
+      LONG newWidth = newRectSize->right - newRectSize->left;
+      LONG newHeight = newRectSize->bottom - newRectSize->top;
+
+      SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth,
+                   newHeight, SWP_NOZORDER | SWP_NOACTIVATE);
+
+      return 0;
+    }
+    case WM_SIZE: {
+      RECT rect = GetClientArea();
+      if (child_content_ != nullptr) {
+        // Size and position the child window.
+        MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left,
+                   rect.bottom - rect.top, TRUE);
+      }
+      return 0;
+    }
+
+    case WM_ACTIVATE:
+      if (child_content_ != nullptr) {
+        SetFocus(child_content_);
+      }
+      return 0;
+
+    case WM_DWMCOLORIZATIONCOLORCHANGED:
+      UpdateTheme(hwnd);
+      return 0;
+  }
+
+  return DefWindowProc(window_handle_, message, wparam, lparam);
+}
+
+void Win32Window::Destroy() {
+  OnDestroy();
+
+  if (window_handle_) {
+    DestroyWindow(window_handle_);
+    window_handle_ = nullptr;
+  }
+  if (g_active_window_count == 0) {
+    WindowClassRegistrar::GetInstance()->UnregisterWindowClass();
+  }
+}
+
+Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept {
+  return reinterpret_cast<Win32Window*>(
+      GetWindowLongPtr(window, GWLP_USERDATA));
+}
+
+void Win32Window::SetChildContent(HWND content) {
+  child_content_ = content;
+  SetParent(content, window_handle_);
+  RECT frame = GetClientArea();
+
+  MoveWindow(content, frame.left, frame.top, frame.right - frame.left,
+             frame.bottom - frame.top, true);
+
+  SetFocus(child_content_);
+}
+
+RECT Win32Window::GetClientArea() {
+  RECT frame;
+  GetClientRect(window_handle_, &frame);
+  return frame;
+}
+
+HWND Win32Window::GetHandle() {
+  return window_handle_;
+}
+
+void Win32Window::SetQuitOnClose(bool quit_on_close) {
+  quit_on_close_ = quit_on_close;
+}
+
+bool Win32Window::OnCreate() {
+  // No-op; provided for subclasses.
+  return true;
+}
+
+void Win32Window::OnDestroy() {
+  // No-op; provided for subclasses.
+}
+
+void Win32Window::UpdateTheme(HWND const window) {
+  DWORD light_mode;
+  DWORD light_mode_size = sizeof(light_mode);
+  LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey,
+                               kGetPreferredBrightnessRegValue,
+                               RRF_RT_REG_DWORD, nullptr, &light_mode,
+                               &light_mode_size);
+
+  if (result == ERROR_SUCCESS) {
+    BOOL enable_dark_mode = light_mode == 0;
+    DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE,
+                          &enable_dark_mode, sizeof(enable_dark_mode));
+  }
+}

windows/runner/win32_window.h

@@ -0,0 +1,102 @@
+#ifndef RUNNER_WIN32_WINDOW_H_
+#define RUNNER_WIN32_WINDOW_H_
+
+#include <windows.h>
+
+#include <functional>
+#include <memory>
+#include <string>
+
+// A class abstraction for a high DPI-aware Win32 Window. Intended to be
+// inherited from by classes that wish to specialize with custom
+// rendering and input handling
+class Win32Window {
+ public:
+  struct Point {
+    unsigned int x;
+    unsigned int y;
+    Point(unsigned int x, unsigned int y) : x(x), y(y) {}
+  };
+
+  struct Size {
+    unsigned int width;
+    unsigned int height;
+    Size(unsigned int width, unsigned int height)
+        : width(width), height(height) {}
+  };
+
+  Win32Window();
+  virtual ~Win32Window();
+
+  // Creates a win32 window with |title| that is positioned and sized using
+  // |origin| and |size|. New windows are created on the default monitor. Window
+  // sizes are specified to the OS in physical pixels, hence to ensure a
+  // consistent size this function will scale the inputted width and height as
+  // as appropriate for the default monitor. The window is invisible until
+  // |Show| is called. Returns true if the window was created successfully.
+  bool Create(const std::wstring& title, const Point& origin, const Size& size);
+
+  // Show the current window. Returns true if the window was successfully shown.
+  bool Show();
+
+  // Release OS resources associated with window.
+  void Destroy();
+
+  // Inserts |content| into the window tree.
+  void SetChildContent(HWND content);
+
+  // Returns the backing Window handle to enable clients to set icon and other
+  // window properties. Returns nullptr if the window has been destroyed.
+  HWND GetHandle();
+
+  // If true, closing this window will quit the application.
+  void SetQuitOnClose(bool quit_on_close);
+
+  // Return a RECT representing the bounds of the current client area.
+  RECT GetClientArea();
+
+ protected:
+  // Processes and route salient window messages for mouse handling,
+  // size change and DPI. Delegates handling of these to member overloads that
+  // inheriting classes can handle.
+  virtual LRESULT MessageHandler(HWND window,
+                                 UINT const message,
+                                 WPARAM const wparam,
+                                 LPARAM const lparam) noexcept;
+
+  // Called when CreateAndShow is called, allowing subclass window-related
+  // setup. Subclasses should return false if setup fails.
+  virtual bool OnCreate();
+
+  // Called when Destroy is called.
+  virtual void OnDestroy();
+
+ private:
+  friend class WindowClassRegistrar;
+
+  // OS callback called by message pump. Handles the WM_NCCREATE message which
+  // is passed when the non-client area is being created and enables automatic
+  // non-client DPI scaling so that the non-client area automatically
+  // responds to changes in DPI. All other messages are handled by
+  // MessageHandler.
+  static LRESULT CALLBACK WndProc(HWND const window,
+                                  UINT const message,
+                                  WPARAM const wparam,
+                                  LPARAM const lparam) noexcept;
+
+  // Retrieves a class instance pointer for |window|
+  static Win32Window* GetThisFromHandle(HWND const window) noexcept;
+
+  // Update the window frame's theme to match the system theme.
+  static void UpdateTheme(HWND const window);
+
+  bool quit_on_close_ = false;
+
+  // window handle for top level window.
+  HWND window_handle_ = nullptr;
+
+  // window handle for hosted content.
+  HWND child_content_ = nullptr;
+};
+
+#endif  // RUNNER_WIN32_WINDOW_H_