From 8c3a143f46e19a9bd373f4b2999e1fbacd769af2 Mon Sep 17 00:00:00 2001 From: Michael SCHAL Date: Tue, 16 Dec 2025 07:41:08 +0100 Subject: [PATCH] feat: add initial Windows desktop platform support files and configuration. --- .metadata | 30 ++ bin/database/database.dart | 9 +- build_windows.ps1 | 29 ++ lib/features/admin/screens/admin_panel.dart | 384 +++++++++++------- lib/features/auth/screens/login_screen.dart | 5 +- lib/features/iptv/screens/player_screen.dart | 131 ++++-- .../screens/playlist_selection_screen.dart | 20 +- lib/features/iptv/widgets/live_tv_tab.dart | 113 ++++-- lib/features/iptv/widgets/movies_tab.dart | 82 ++-- lib/features/iptv/widgets/series_tab.dart | 88 ++-- lib/features/iptv/widgets/settings_tab.dart | 62 ++- .../iptv/widgets/streaming_settings_tab.dart | 12 +- .../screens/mobile_series_detail_screen.dart | 39 +- .../iptv/widgets/mobile_live_tv_tab.dart | 47 ++- .../iptv/widgets/mobile_movies_tab.dart | 75 ++-- .../iptv/widgets/mobile_series_tab.dart | 147 ++++--- .../iptv/widgets/mobile_settings_tab.dart | 146 ++++--- lib/mobile/widgets/mobile_scaffold.dart | 15 +- pubspec.yaml | 2 + test/widget_test.dart | 30 ++ windows/.gitignore | 17 + windows/CMakeLists.txt | 108 +++++ windows/flutter/CMakeLists.txt | 109 +++++ .../flutter/generated_plugin_registrant.cc | 14 + windows/flutter/generated_plugin_registrant.h | 15 + windows/flutter/generated_plugins.cmake | 24 ++ windows/runner/CMakeLists.txt | 40 ++ windows/runner/Runner.rc | 121 ++++++ windows/runner/flutter_window.cpp | 71 ++++ windows/runner/flutter_window.h | 33 ++ windows/runner/main.cpp | 43 ++ windows/runner/resource.h | 16 + windows/runner/resources/app_icon.ico | Bin 0 -> 33772 bytes windows/runner/runner.exe.manifest | 14 + windows/runner/utils.cpp | 65 +++ windows/runner/utils.h | 19 + windows/runner/win32_window.cpp | 288 +++++++++++++ windows/runner/win32_window.h | 102 +++++ 38 files changed, 2084 insertions(+), 481 deletions(-) create mode 100644 .metadata create mode 100644 build_windows.ps1 create mode 100644 test/widget_test.dart create mode 100644 windows/.gitignore create mode 100644 windows/CMakeLists.txt create mode 100644 windows/flutter/CMakeLists.txt create mode 100644 windows/flutter/generated_plugin_registrant.cc create mode 100644 windows/flutter/generated_plugin_registrant.h create mode 100644 windows/flutter/generated_plugins.cmake create mode 100644 windows/runner/CMakeLists.txt create mode 100644 windows/runner/Runner.rc create mode 100644 windows/runner/flutter_window.cpp create mode 100644 windows/runner/flutter_window.h create mode 100644 windows/runner/main.cpp create mode 100644 windows/runner/resource.h create mode 100644 windows/runner/resources/app_icon.ico create mode 100644 windows/runner/runner.exe.manifest create mode 100644 windows/runner/utils.cpp create mode 100644 windows/runner/utils.h create mode 100644 windows/runner/win32_window.cpp create mode 100644 windows/runner/win32_window.h diff --git a/.metadata b/.metadata new file mode 100644 index 0000000..3d2d7d1 --- /dev/null +++ b/.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' diff --git a/bin/database/database.dart b/bin/database/database.dart index d0b5f74..c65dd19 100644 --- a/bin/database/database.dart +++ b/bin/database/database.dart @@ -80,11 +80,14 @@ class AppDatabase { // Indexes _db.execute( - 'CREATE INDEX IF NOT EXISTS idx_sessions_token ON sessions(token)'); + 'CREATE INDEX IF NOT EXISTS idx_sessions_token ON sessions(token)', + ); _db.execute( - 'CREATE INDEX IF NOT EXISTS idx_sessions_expires ON sessions(expires_at)'); + '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)'); + 'CREATE INDEX IF NOT EXISTS idx_playlists_user ON playlists(user_id)', + ); } /// Seed default admin user if no users exist diff --git a/build_windows.ps1 b/build_windows.ps1 new file mode 100644 index 0000000..f570224 --- /dev/null +++ b/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/" diff --git a/lib/features/admin/screens/admin_panel.dart b/lib/features/admin/screens/admin_panel.dart index b493095..da7418a 100644 --- a/lib/features/admin/screens/admin_panel.dart +++ b/lib/features/admin/screens/admin_panel.dart @@ -183,11 +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, @@ -200,20 +202,27 @@ class _PlaylistsTab extends ConsumerWidget { child: playlistsAsync.when( loading: () => const Center(child: CircularProgressIndicator()), error: (error, stack) => Center( - child: Text('Error: $error', - style: const TextStyle(color: AppColors.error))), + 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), @@ -242,25 +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), + ), ], ), ), @@ -294,8 +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); @@ -307,41 +325,44 @@ 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')), + 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')), + 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')), + controller: usernameController, + decoration: const InputDecoration(labelText: 'Utilisateur'), + ), const SizedBox(height: 12), TextField( - controller: passwordController, - decoration: - const InputDecoration(labelText: 'Mot de passe'), - obscureText: true), + controller: passwordController, + decoration: const InputDecoration(labelText: 'Mot de passe'), + obscureText: true, + ), ], ), ), actions: [ TextButton( - onPressed: - isLoading ? null : () => Navigator.pop(dialogContext), - child: const Text('Annuler')), + onPressed: isLoading ? null : () => Navigator.pop(dialogContext), + child: const Text('Annuler'), + ), FilledButton( onPressed: isLoading ? null @@ -349,8 +370,10 @@ class _PlaylistsTab extends ConsumerWidget { if (nameController.text.isEmpty || dnsController.text.isEmpty) { ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( - content: Text('Tous les champs sont requis'))); + const SnackBar( + content: Text('Tous les champs sont requis'), + ), + ); return; } setState(() => isLoading = true); @@ -359,17 +382,19 @@ class _PlaylistsTab extends ConsumerWidget { .replaceAll(RegExp(r'/$'), ''); if (playlist == null) { await service.createPlaylist( - name: nameController.text.trim(), - dns: dns, - username: usernameController.text.trim(), - password: passwordController.text); + 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); + 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); @@ -378,7 +403,8 @@ class _PlaylistsTab extends ConsumerWidget { ? const SizedBox( width: 20, height: 20, - child: CircularProgressIndicator(strokeWidth: 2)) + child: CircularProgressIndicator(strokeWidth: 2), + ) : const Text('Sauvegarder'), ), ], @@ -388,7 +414,10 @@ class _PlaylistsTab extends ConsumerWidget { } void _deletePlaylist( - BuildContext context, WidgetRef ref, PlaylistConfig playlist) { + BuildContext context, + WidgetRef ref, + PlaylistConfig playlist, + ) { showDialog( context: context, builder: (dialogContext) => AlertDialog( @@ -396,8 +425,9 @@ class _PlaylistsTab extends ConsumerWidget { content: Text('Supprimer "${playlist.name}" ?'), actions: [ TextButton( - onPressed: () => Navigator.pop(dialogContext), - child: const Text('Annuler')), + onPressed: () => Navigator.pop(dialogContext), + child: const Text('Annuler'), + ), FilledButton( onPressed: () async { Navigator.pop(dialogContext); @@ -428,11 +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, @@ -445,20 +477,27 @@ class _UsersTab extends ConsumerWidget { child: usersAsync.when( loading: () => const Center(child: CircularProgressIndicator()), error: (error, stack) => Center( - child: Text('Error: $error', - style: const TextStyle(color: AppColors.error))), + 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, + ), ], ), ); @@ -501,45 +540,57 @@ 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), + horizontal: 8, + vertical: 2, + ), decoration: BoxDecoration( 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( - 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)), + borderRadius: BorderRadius.circular(12), + ), onSelected: (value) { switch (value) { case 'password': @@ -552,21 +603,32 @@ class _UsersTab extends ConsumerWidget { }, itemBuilder: (context) => [ const PopupMenuItem( - value: 'password', - child: Row(children: [ + value: 'password', + child: Row( + children: [ Icon(Icons.lock_reset, size: 18), SizedBox(width: 8), - Text('Change Password') - ])), + Text('Change Password'), + ], + ), + ), const PopupMenuItem( - value: 'delete', - child: Row(children: [ - Icon(Icons.delete, - color: AppColors.error, size: 18), + value: 'delete', + child: Row( + children: [ + Icon( + Icons.delete, + color: AppColors.error, + size: 18, + ), SizedBox(width: 8), - Text('Delete', - style: TextStyle(color: AppColors.error)) - ])), + Text( + 'Delete', + style: TextStyle(color: AppColors.error), + ), + ], + ), + ), ], ), ], @@ -596,17 +658,21 @@ class _UsersTab extends ConsumerWidget { mainAxisSize: MainAxisSize.min, children: [ TextField( - controller: usernameController, - decoration: const InputDecoration( - labelText: 'Nom d\'utilisateur', - prefixIcon: Icon(Icons.person_outline))), + 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), + 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'), @@ -618,9 +684,9 @@ class _UsersTab extends ConsumerWidget { ), actions: [ TextButton( - onPressed: - isLoading ? null : () => Navigator.pop(dialogContext), - child: const Text('Annuler')), + onPressed: isLoading ? null : () => Navigator.pop(dialogContext), + child: const Text('Annuler'), + ), FilledButton( onPressed: isLoading ? null @@ -628,28 +694,35 @@ class _UsersTab extends ConsumerWidget { if (usernameController.text.isEmpty || passwordController.text.isEmpty) { ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( - content: Text('Tous les champs sont requis'))); + const SnackBar( + content: Text('Tous les champs sont requis'), + ), + ); return; } setState(() => isLoading = true); final result = await UserApiService().createUser( - username: usernameController.text.trim(), - password: passwordController.text, - isAdmin: isAdmin); + 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( + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( content: Text(result.error ?? 'Erreur'), - backgroundColor: AppColors.error)); + backgroundColor: AppColors.error, + ), + ); } }, child: isLoading ? const SizedBox( width: 20, height: 20, - child: CircularProgressIndicator(strokeWidth: 2)) + child: CircularProgressIndicator(strokeWidth: 2), + ) : const Text('Créer'), ), ], @@ -659,7 +732,10 @@ class _UsersTab extends ConsumerWidget { } void _showChangePasswordDialog( - BuildContext context, WidgetRef ref, AppUser user) { + BuildContext context, + WidgetRef ref, + AppUser user, + ) { final passwordController = TextEditingController(); bool isLoading = false; @@ -669,47 +745,58 @@ class _UsersTab extends ConsumerWidget { 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), + 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')), + onPressed: isLoading ? null : () => Navigator.pop(dialogContext), + child: const Text('Annuler'), + ), FilledButton( onPressed: isLoading ? null : () async { if (passwordController.text.isEmpty) { ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( - content: Text('Mot de passe requis'))); + const SnackBar( + content: Text('Mot de passe requis'), + ), + ); return; } setState(() => isLoading = true); final result = await UserApiService().updatePassword( - userId: user.id, - newPassword: passwordController.text); + userId: user.id, + newPassword: passwordController.text, + ); if (dialogContext.mounted) Navigator.pop(dialogContext); if (result.success && context.mounted) { ScaffoldMessenger.of(context).showSnackBar( - const SnackBar( - content: Text('Mot de passe modifié'), - backgroundColor: AppColors.success)); + const SnackBar( + content: Text('Mot de passe modifié'), + backgroundColor: AppColors.success, + ), + ); } else if (context.mounted) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar( + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( content: Text(result.error ?? 'Erreur'), - backgroundColor: AppColors.error)); + backgroundColor: AppColors.error, + ), + ); } }, child: isLoading ? const SizedBox( width: 20, height: 20, - child: CircularProgressIndicator(strokeWidth: 2)) + child: CircularProgressIndicator(strokeWidth: 2), + ) : const Text('Changer'), ), ], @@ -724,20 +811,25 @@ class _UsersTab extends ConsumerWidget { builder: (dialogContext) => AlertDialog( title: const Text('Supprimer l\'utilisateur'), content: Text( - 'Supprimer "${user.username}" ? Cette action est irréversible.'), + 'Supprimer "${user.username}" ? Cette action est irréversible.', + ), actions: [ TextButton( - onPressed: () => Navigator.pop(dialogContext), - child: const Text('Annuler')), + 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( + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( content: Text(result.error ?? 'Erreur'), - backgroundColor: AppColors.error)); + backgroundColor: AppColors.error, + ), + ); } }, style: FilledButton.styleFrom(backgroundColor: AppColors.error), diff --git a/lib/features/auth/screens/login_screen.dart b/lib/features/auth/screens/login_screen.dart index f0f7b0e..3a8334e 100644 --- a/lib/features/auth/screens/login_screen.dart +++ b/lib/features/auth/screens/login_screen.dart @@ -261,8 +261,9 @@ class _LoginScreenState extends ConsumerState { width: 24, height: 24, child: CircularProgressIndicator( - strokeWidth: 2.5, - color: Colors.black), + strokeWidth: 2.5, + color: Colors.black, + ), ) : Text( 'Sign In', diff --git a/lib/features/iptv/screens/player_screen.dart b/lib/features/iptv/screens/player_screen.dart index 99133c3..1e46985 100644 --- a/lib/features/iptv/screens/player_screen.dart +++ b/lib/features/iptv/screens/player_screen.dart @@ -88,8 +88,10 @@ class _PlayerScreenState extends ConsumerState { super.dispose(); } - Future _initializePlayer( - {double? startTimeOverride, bool isChannelSwitch = false}) async { + Future _initializePlayer({ + double? startTimeOverride, + bool isChannelSwitch = false, + }) async { setState(() { _isLoading = true; _statusMessage = 'Loading...'; @@ -116,7 +118,9 @@ class _PlayerScreenState extends ConsumerState { service.getVodStreamUrl(currentStreamId, widget.containerExtension); } else if (widget.streamType == StreamType.series) { streamUrl = service.getSeriesStreamUrl( - currentStreamId, widget.containerExtension); + currentStreamId, + widget.containerExtension, + ); } // Store URL for Lite Player @@ -330,8 +334,10 @@ class _PlayerScreenState extends ConsumerState { 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, + ), ), ), ), @@ -346,7 +352,7 @@ class _PlayerScreenState extends ConsumerState { fontSize: 18, fontWeight: FontWeight.bold, shadows: [ - Shadow(blurRadius: 4, color: Colors.black) + Shadow(blurRadius: 4, color: Colors.black), ], ), overflow: TextOverflow.ellipsis, @@ -394,8 +400,11 @@ class _PlayerScreenState extends ConsumerState { 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, + ), ), ), ), @@ -409,8 +418,11 @@ class _PlayerScreenState extends ConsumerState { 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, + ), ), ), ), @@ -495,8 +507,10 @@ class _PlayerScreenState extends ConsumerState { color: Colors.white.withOpacity(0.1), 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), @@ -519,9 +533,10 @@ class _PlayerScreenState extends ConsumerState { Text( 'Live TV', style: GoogleFonts.inter( - fontSize: 14, - color: AppColors.live, - fontWeight: FontWeight.bold), + fontSize: 14, + color: AppColors.live, + fontWeight: FontWeight.bold, + ), ), ], ), @@ -533,7 +548,8 @@ class _PlayerScreenState extends ConsumerState { Center( child: _isLoading ? const CircularProgressIndicator( - color: Colors.white) + color: Colors.white, + ) : TvFocusableCard( onTap: _togglePlayPause, borderRadius: 100, @@ -545,7 +561,8 @@ class _PlayerScreenState extends ConsumerState { color: Colors.white.withOpacity(0.2), shape: BoxShape.circle, border: Border.all( - color: Colors.white.withOpacity(0.3)), + color: Colors.white.withOpacity(0.3), + ), ), child: Icon( _isPlaying @@ -590,21 +607,27 @@ class _PlayerScreenState extends ConsumerState { child: Row( children: [ Text( - _formatDuration(Duration( - seconds: - _currentPosition.toInt())), - style: const TextStyle( - color: Colors.white70)), + _formatDuration( + Duration( + seconds: _currentPosition.toInt(), + ), + ), + style: const TextStyle( + color: Colors.white70, + ), + ), const SizedBox(width: 16), Expanded( child: SliderTheme( data: const SliderThemeData( trackHeight: 4, thumbShape: RoundSliderThumbShape( - enabledThumbRadius: 8), + enabledThumbRadius: 8, + ), overlayShape: RoundSliderOverlayShape( - overlayRadius: 16), + overlayRadius: 16, + ), activeTrackColor: AppColors.primary, inactiveTrackColor: Colors.white24, thumbColor: Colors.white, @@ -618,21 +641,25 @@ class _PlayerScreenState extends ConsumerState { }, onChanged: (value) { // Update UI immediately (optimistic update) - setState(() => - _currentPosition = value); + setState( + () => _currentPosition = value, + ); }, onChangeEnd: (value) { _sendMessage({ 'type': 'seek', - 'value': value + 'value': value, }); // Small delay to prevent jitter from incoming messages Future.delayed( const Duration( - milliseconds: 500), () { - if (mounted) + milliseconds: 500, + ), () { + if (mounted) { setState( - () => _isSeeking = false); + () => _isSeeking = false, + ); + } }); }, ), @@ -640,10 +667,15 @@ class _PlayerScreenState extends ConsumerState { ), const SizedBox(width: 16), Text( - _formatDuration(Duration( - seconds: _totalDuration.toInt())), - style: const TextStyle( - color: Colors.white70)), + _formatDuration( + Duration( + seconds: _totalDuration.toInt(), + ), + ), + style: const TextStyle( + color: Colors.white70, + ), + ), ], ), ), @@ -656,11 +688,14 @@ class _PlayerScreenState extends ConsumerState { if (widget.streamType == StreamType.live && widget.channels != null) ...[ _buildTvControl( - Icons.navigate_before_rounded, - _previousChannel), + Icons.navigate_before_rounded, + _previousChannel, + ), const SizedBox(width: 32), - _buildTvControl(Icons.navigate_next_rounded, - _nextChannel), + _buildTvControl( + Icons.navigate_next_rounded, + _nextChannel, + ), ], // Controls for VOD (Keep Skip buttons, they act as Prev/Next track if playlist or maybe seek) @@ -671,11 +706,15 @@ class _PlayerScreenState extends ConsumerState { if (widget.streamType != StreamType.live && widget.channels != null && widget.channels!.isNotEmpty) ...[ - _buildTvControl(Icons.skip_previous_rounded, - _previousChannel), + _buildTvControl( + Icons.skip_previous_rounded, + _previousChannel, + ), const SizedBox(width: 32), _buildTvControl( - Icons.skip_next_rounded, _nextChannel), + Icons.skip_next_rounded, + _nextChannel, + ), ], const Spacer(), @@ -688,10 +727,14 @@ class _PlayerScreenState extends ConsumerState { ), const SizedBox(width: 16), _buildTvControl( - Icons.subtitles_rounded, () {}), + Icons.subtitles_rounded, + () {}, + ), const SizedBox(width: 16), - _buildTvControl(Icons.aspect_ratio_rounded, - _toggleFullscreen), + _buildTvControl( + Icons.aspect_ratio_rounded, + _toggleFullscreen, + ), ], ), ], diff --git a/lib/features/iptv/screens/playlist_selection_screen.dart b/lib/features/iptv/screens/playlist_selection_screen.dart index 8d325eb..608d76d 100644 --- a/lib/features/iptv/screens/playlist_selection_screen.dart +++ b/lib/features/iptv/screens/playlist_selection_screen.dart @@ -27,7 +27,9 @@ class PlaylistSelectionScreen extends ConsumerWidget { title: Text( 'Select Playlist', style: GoogleFonts.roboto( - fontWeight: FontWeight.w600, color: Colors.white), + fontWeight: FontWeight.w600, + color: Colors.white, + ), ), backgroundColor: Colors.transparent, elevation: 0, @@ -71,9 +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), @@ -118,7 +124,11 @@ class PlaylistSelectionScreen extends ConsumerWidget { return GridView.builder( padding: const EdgeInsets.fromLTRB( - 24, 100, 24, 24), // Top padding for transparent AppBar + 24, + 100, + 24, + 24, + ), // Top padding for transparent AppBar gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 3, crossAxisSpacing: 24, diff --git a/lib/features/iptv/widgets/live_tv_tab.dart b/lib/features/iptv/widgets/live_tv_tab.dart index f86eb25..0d3874b 100644 --- a/lib/features/iptv/widgets/live_tv_tab.dart +++ b/lib/features/iptv/widgets/live_tv_tab.dart @@ -66,8 +66,8 @@ class _LiveTVTabState extends ConsumerState body: channelsAsync.when( loading: () => const ThemedLoading(), error: (e, s) => Center( - child: - Text('Error: $e', style: const TextStyle(color: Colors.white))), + child: Text('Error: $e', style: const TextStyle(color: Colors.white)), + ), data: (groupedChannels) { var categories = groupedChannels.keys.toList(); if (settings.liveTvKeywords.isNotEmpty) { @@ -125,8 +125,10 @@ class _LiveTVTabState extends ConsumerState 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), @@ -167,12 +169,17 @@ class _LiveTVTabState extends ConsumerState const Icon(Icons.search, color: Colors.white54), border: InputBorder.none, contentPadding: const EdgeInsets.symmetric( - horizontal: 16, vertical: 10), + horizontal: 16, + vertical: 10, + ), suffixIcon: _searchQuery.isNotEmpty ? IconButton( - icon: const Icon(Icons.clear, - color: Colors.white), - onPressed: _searchController.clear) + icon: const Icon( + Icons.clear, + color: Colors.white, + ), + onPressed: _searchController.clear, + ) : null, ), ), @@ -224,14 +231,18 @@ class _LiveTVTabState extends ConsumerState 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), + color: Colors.white54, + fontSize: 18, + ), ), ], ), @@ -247,7 +258,9 @@ class _LiveTVTabState extends ConsumerState } Widget _buildCategoryGrid( - List categories, Map> groupedChannels) { + List categories, + Map> groupedChannels, + ) { final columns = ResponsiveLayout.value( context, mobile: 2, @@ -300,8 +313,11 @@ class _LiveTVTabState extends ConsumerState 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), @@ -321,7 +337,9 @@ class _LiveTVTabState extends ConsumerState Text( '$count Channels', style: GoogleFonts.inter( - fontSize: 13, color: Colors.white54), + fontSize: 13, + color: Colors.white54, + ), ), ], ), @@ -378,15 +396,19 @@ class _LiveTVTabState extends ConsumerState child: channel.streamIcon.isNotEmpty ? Image.network( _getProxiedIconUrl(channel.streamIcon)!, - errorBuilder: (_, __, ___) => const Icon(Icons.tv, - color: Colors.grey, size: 40), + errorBuilder: (_, __, ___) => const Icon( + Icons.tv, + color: Colors.grey, + size: 40, + ), ) : Text( channel.name.characters.first.toUpperCase(), style: GoogleFonts.inter( - fontSize: 40, - fontWeight: FontWeight.bold, - color: Colors.black12), + fontSize: 40, + fontWeight: FontWeight.bold, + color: Colors.black12, + ), ), ), ), @@ -402,9 +424,10 @@ class _LiveTVTabState extends ConsumerState Text( channel.name, style: GoogleFonts.inter( - color: Colors.white, - fontSize: 13, - fontWeight: FontWeight.w500), + color: Colors.white, + fontSize: 13, + fontWeight: FontWeight.w500, + ), maxLines: 1, overflow: TextOverflow.ellipsis, ), @@ -414,17 +437,22 @@ class _LiveTVTabState extends ConsumerState final epgAsync = ref.watch( epgByPlaylistProvider( EpgRequestKey( - playlist: widget.playlist, - streamId: channel.streamId), + playlist: widget.playlist, + streamId: channel.streamId, + ), ), ); return epgAsync.when( data: (epgList) { if (epgList.isEmpty) { - return Text('No Info', - style: GoogleFonts.inter( - color: Colors.white54, fontSize: 10)); + return Text( + 'No Info', + style: GoogleFonts.inter( + color: Colors.white54, + fontSize: 10, + ), + ); } final now = DateTime.now(); final currentProgram = epgList.firstWhere( @@ -444,19 +472,28 @@ class _LiveTVTabState extends ConsumerState return Text( currentProgram.title, style: GoogleFonts.inter( - color: const Color(0xFFFFD700), - fontSize: 10, - fontWeight: FontWeight.w600), + 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)), + loading: () => Text( + '...', + style: GoogleFonts.inter( + color: Colors.white24, + fontSize: 10, + ), + ), + error: (_, __) => Text( + 'Err', + style: GoogleFonts.inter( + color: Colors.red, + fontSize: 10, + ), + ), ); }, ), diff --git a/lib/features/iptv/widgets/movies_tab.dart b/lib/features/iptv/widgets/movies_tab.dart index 9f26a5d..800337f 100644 --- a/lib/features/iptv/widgets/movies_tab.dart +++ b/lib/features/iptv/widgets/movies_tab.dart @@ -243,14 +243,19 @@ class _MoviesTabState extends ConsumerState { 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), + fontSize: 14, + color: Colors.white, + ), decoration: InputDecoration( hintText: 'Search movies...', hintStyle: @@ -265,18 +270,24 @@ class _MoviesTabState extends ConsumerState { ), if (_isSearching) const SizedBox( - width: 16, - height: 16, - child: CircularProgressIndicator( - strokeWidth: 2, color: Colors.white)), + width: 16, + height: 16, + child: CircularProgressIndicator( + strokeWidth: 2, + color: Colors.white, + ), + ), if (_searchQuery.isNotEmpty) GestureDetector( onTap: () { _searchController.clear(); _onSearchChanged(''); }, - child: const Icon(Icons.close, - size: 16, color: Colors.white), + child: const Icon( + Icons.close, + size: 16, + color: Colors.white, + ), ), ], ), @@ -349,15 +360,23 @@ class _MoviesTabState extends ConsumerState { errorBuilder: (ctx, err, stack) => Container( color: AppColors.surfaceVariant, child: const Center( - child: Icon(Icons.movie, - size: 48, color: Colors.white24)), + 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: Icon( + Icons.movie, + size: 48, + color: Colors.white24, + ), + ), ), ), @@ -374,11 +393,12 @@ class _MoviesTabState extends ConsumerState { end: Alignment.bottomCenter, colors: [ Colors.transparent, - Colors.black.withOpacity(0.9) + Colors.black.withOpacity(0.9), ], ), borderRadius: const BorderRadius.vertical( - bottom: Radius.circular(12)), + bottom: Radius.circular(12), + ), ), ), ), @@ -390,7 +410,9 @@ class _MoviesTabState extends ConsumerState { right: 8, child: Container( padding: const EdgeInsets.symmetric( - horizontal: 6, vertical: 2), + horizontal: 6, + vertical: 2, + ), decoration: BoxDecoration( color: Colors.black.withOpacity(0.7), borderRadius: BorderRadius.circular(4), @@ -399,15 +421,19 @@ class _MoviesTabState extends ConsumerState { 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), + fontSize: 10, + fontWeight: FontWeight.bold, + color: Colors.white, + ), ), ], ), @@ -431,7 +457,9 @@ class _MoviesTabState extends ConsumerState { fontWeight: FontWeight.w600, shadows: [ const Shadow( - color: Colors.black, blurRadius: 4) + color: Colors.black, + blurRadius: 4, + ), ], ), maxLines: 2, @@ -443,9 +471,10 @@ class _MoviesTabState extends ConsumerState { child: Text( 'WATCHED', style: GoogleFonts.inter( - color: AppColors.primary, - fontSize: 10, - fontWeight: FontWeight.bold), + color: AppColors.primary, + fontSize: 10, + fontWeight: FontWeight.bold, + ), ), ), ], @@ -466,7 +495,8 @@ class _MoviesTabState extends ConsumerState { child: Padding( padding: EdgeInsets.all(32), child: Center( - child: CircularProgressIndicator(color: Colors.white)), + child: CircularProgressIndicator(color: Colors.white), + ), ), ), diff --git a/lib/features/iptv/widgets/series_tab.dart b/lib/features/iptv/widgets/series_tab.dart index c0c998a..975d7f5 100644 --- a/lib/features/iptv/widgets/series_tab.dart +++ b/lib/features/iptv/widgets/series_tab.dart @@ -219,14 +219,19 @@ class _SeriesTabState extends ConsumerState { 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), + fontSize: 14, + color: Colors.white, + ), decoration: InputDecoration( hintText: 'Search series...', hintStyle: @@ -241,18 +246,24 @@ class _SeriesTabState extends ConsumerState { ), if (_isSearching) const SizedBox( - width: 16, - height: 16, - child: CircularProgressIndicator( - strokeWidth: 2, color: Colors.white)), + width: 16, + height: 16, + child: CircularProgressIndicator( + strokeWidth: 2, + color: Colors.white, + ), + ), if (_searchQuery.isNotEmpty) GestureDetector( onTap: () { _searchController.clear(); _onSearchChanged(''); }, - child: const Icon(Icons.close, - size: 16, color: Colors.white), + child: const Icon( + Icons.close, + size: 16, + color: Colors.white, + ), ), ], ), @@ -281,10 +292,11 @@ class _SeriesTabState extends ConsumerState { : null, onMoreInfo: () { final series = _series.firstWhere( - (element) => - element.seriesId.toString() == - s.seriesId.toString(), - orElse: () => s); + (element) => + element.seriesId.toString() == + s.seriesId.toString(), + orElse: () => s, + ); _openSeries(series); }, ), @@ -292,8 +304,9 @@ class _SeriesTabState extends ConsumerState { .toList(), onTap: (item) { final series = _series.firstWhere( - (element) => element.seriesId.toString() == item.id, - orElse: () => _series[0]); + (element) => element.seriesId.toString() == item.id, + orElse: () => _series[0], + ); _openSeries(series); }, ), @@ -330,15 +343,23 @@ class _SeriesTabState extends ConsumerState { errorBuilder: (ctx, err, stack) => Container( color: AppColors.surfaceVariant, child: const Center( - child: Icon(Icons.tv, - size: 48, color: Colors.white24)), + 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: Icon( + Icons.tv, + size: 48, + color: Colors.white24, + ), + ), ), ), @@ -355,11 +376,12 @@ class _SeriesTabState extends ConsumerState { end: Alignment.bottomCenter, colors: [ Colors.transparent, - Colors.black.withOpacity(0.9) + Colors.black.withOpacity(0.9), ], ), borderRadius: const BorderRadius.vertical( - bottom: Radius.circular(12)), + bottom: Radius.circular(12), + ), ), ), ), @@ -376,7 +398,8 @@ class _SeriesTabState extends ConsumerState { fontSize: 13, fontWeight: FontWeight.w600, shadows: [ - const Shadow(color: Colors.black, blurRadius: 4) + const Shadow( + color: Colors.black, blurRadius: 4), ], ), maxLines: 2, @@ -391,7 +414,9 @@ class _SeriesTabState extends ConsumerState { right: 8, child: Container( padding: const EdgeInsets.symmetric( - horizontal: 6, vertical: 2), + horizontal: 6, + vertical: 2, + ), decoration: BoxDecoration( color: Colors.black.withOpacity(0.7), borderRadius: BorderRadius.circular(4), @@ -400,15 +425,19 @@ class _SeriesTabState extends ConsumerState { 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(serie.rating)!, style: GoogleFonts.inter( - fontSize: 10, - fontWeight: FontWeight.bold, - color: Colors.white), + fontSize: 10, + fontWeight: FontWeight.bold, + color: Colors.white, + ), ), ], ), @@ -429,7 +458,8 @@ class _SeriesTabState extends ConsumerState { child: Padding( padding: EdgeInsets.all(32), child: Center( - child: CircularProgressIndicator(color: Colors.white)), + child: CircularProgressIndicator(color: Colors.white), + ), ), ), diff --git a/lib/features/iptv/widgets/settings_tab.dart b/lib/features/iptv/widgets/settings_tab.dart index 977e60b..54d984b 100644 --- a/lib/features/iptv/widgets/settings_tab.dart +++ b/lib/features/iptv/widgets/settings_tab.dart @@ -96,8 +96,9 @@ class _SettingsTabState extends ConsumerState const Tab(icon: Icon(Icons.palette), text: 'Apparence'), if (currentUser?.isAdmin ?? false) const Tab( - icon: Icon(Icons.admin_panel_settings), - text: 'Administration'), + icon: Icon(Icons.admin_panel_settings), + text: 'Administration', + ), ], ), ), @@ -212,7 +213,9 @@ class _SettingsTabState extends ConsumerState title: Text( 'Mode actuel', style: GoogleFonts.inter( - fontWeight: FontWeight.w500, color: Colors.white), + fontWeight: FontWeight.w500, + color: Colors.white, + ), ), subtitle: Text( isDark ? 'Thème sombre actif' : 'Thème clair actif', @@ -305,7 +308,10 @@ class _SettingsTabState extends ConsumerState } Widget _buildFiltersTab( - BuildContext context, dynamic currentUser, IptvSettings settings) { + BuildContext context, + dynamic currentUser, + IptvSettings settings, + ) { return ListView( padding: const EdgeInsets.all(16), children: [ @@ -326,13 +332,19 @@ class _SettingsTabState extends ConsumerState subtitle: Text( currentUser?.username ?? 'Unknown', style: GoogleFonts.roboto( - fontWeight: FontWeight.w600, color: Colors.white), + 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, @@ -416,8 +428,10 @@ class _SettingsTabState extends ConsumerState ), 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'), ), @@ -433,8 +447,10 @@ class _SettingsTabState extends ConsumerState ), 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), @@ -452,8 +468,10 @@ class _SettingsTabState extends ConsumerState ), 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), @@ -465,8 +483,10 @@ class _SettingsTabState extends ConsumerState context: context, builder: (context) => AlertDialog( backgroundColor: const Color(0xFF1E1E1E), - title: const Text('Vider le cache ?', - style: TextStyle(color: Colors.white)), + title: const Text( + 'Vider le cache ?', + style: TextStyle(color: Colors.white), + ), content: const Text( 'Cette action va recharger l\'application et effacer les données temporaires.\n' 'Vos réglages et favoris sont sauvegardés sur le serveur.', @@ -479,7 +499,8 @@ class _SettingsTabState extends ConsumerState ), FilledButton( style: FilledButton.styleFrom( - backgroundColor: Colors.orange), + backgroundColor: Colors.orange, + ), onPressed: () { Navigator.pop(context); @@ -580,8 +601,11 @@ class _SettingsTabState extends ConsumerState ), 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(), diff --git a/lib/features/iptv/widgets/streaming_settings_tab.dart b/lib/features/iptv/widgets/streaming_settings_tab.dart index 314e604..0036ed3 100644 --- a/lib/features/iptv/widgets/streaming_settings_tab.dart +++ b/lib/features/iptv/widgets/streaming_settings_tab.dart @@ -252,10 +252,14 @@ class StreamingSettingsTab extends ConsumerWidget { required String Function(T) labelBuilder, }) { return ListTile( - title: Text(title, - style: GoogleFonts.roboto(fontSize: 14, color: Colors.white)), - subtitle: Text(subtitle, - style: GoogleFonts.roboto(fontSize: 12, color: Colors.white54)), + title: Text( + title, + style: GoogleFonts.roboto(fontSize: 14, color: Colors.white), + ), + subtitle: Text( + subtitle, + style: GoogleFonts.roboto(fontSize: 12, color: Colors.white54), + ), trailing: DropdownButton( value: value, underline: const SizedBox(), diff --git a/lib/mobile/features/iptv/screens/mobile_series_detail_screen.dart b/lib/mobile/features/iptv/screens/mobile_series_detail_screen.dart index 8b4e737..a94eade 100644 --- a/lib/mobile/features/iptv/screens/mobile_series_detail_screen.dart +++ b/lib/mobile/features/iptv/screens/mobile_series_detail_screen.dart @@ -102,13 +102,20 @@ class _MobileSeriesDetailScreenState 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( + 'Error: $_error', + style: GoogleFonts.inter(color: Colors.white70), + ), TextButton( - onPressed: _loadSeriesInfo, child: const Text('Retry')), + onPressed: _loadSeriesInfo, + child: const Text('Retry'), + ), ], ), ) @@ -189,20 +196,27 @@ class _MobileSeriesDetailScreenState 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), + color: Colors.white70, + fontSize: 13, + ), ), const SizedBox(width: 16), ], Text( '${_seriesInfo!.episodes.keys.length} Seasons', style: GoogleFonts.inter( - color: Colors.white70, fontSize: 13), + color: Colors.white70, + fontSize: 13, + ), ), ], ), @@ -253,7 +267,8 @@ class _MobileSeriesDetailScreenState fontWeight: isSelected ? FontWeight.w600 : FontWeight.w400, ), shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(20)), + borderRadius: BorderRadius.circular(20), + ), showCheckmark: false, side: BorderSide.none, ); @@ -356,7 +371,9 @@ class _MobileSeriesDetailScreenState Text( _formatDuration(episode.durationSecs!), style: GoogleFonts.inter( - color: Colors.white54, fontSize: 12), + color: Colors.white54, + fontSize: 12, + ), ), ], ), diff --git a/lib/mobile/features/iptv/widgets/mobile_live_tv_tab.dart b/lib/mobile/features/iptv/widgets/mobile_live_tv_tab.dart index 2cdf420..ff89bc8 100644 --- a/lib/mobile/features/iptv/widgets/mobile_live_tv_tab.dart +++ b/lib/mobile/features/iptv/widgets/mobile_live_tv_tab.dart @@ -44,8 +44,8 @@ class _MobileLiveTVTabState extends ConsumerState { body: channelsAsync.when( loading: () => const Center(child: CircularProgressIndicator()), error: (e, s) => Center( - child: - Text('Error: $e', style: const TextStyle(color: Colors.white))), + child: Text('Error: $e', style: const TextStyle(color: Colors.white)), + ), data: (groupedChannels) { var categories = groupedChannels.keys.toList(); if (settings.liveTvKeywords.isNotEmpty) { @@ -98,8 +98,10 @@ class _MobileLiveTVTabState extends ConsumerState { hintStyle: GoogleFonts.inter(color: Colors.white54), border: InputBorder.none, - prefixIcon: const Icon(Icons.search, - color: Colors.white54), + prefixIcon: const Icon( + Icons.search, + color: Colors.white54, + ), isDense: true, ), ), @@ -133,7 +135,9 @@ class _MobileLiveTVTabState extends ConsumerState { child: AnimatedContainer( duration: const Duration(milliseconds: 200), padding: const EdgeInsets.symmetric( - horizontal: 16, vertical: 10), + horizontal: 16, + vertical: 10, + ), decoration: BoxDecoration( color: isSelected ? Colors.white @@ -177,7 +181,8 @@ class _MobileLiveTVTabState extends ConsumerState { const Spacer(), GestureDetector( onTap: () => setState( - () => _showFavoritesOnly = !_showFavoritesOnly), + () => _showFavoritesOnly = !_showFavoritesOnly, + ), child: Container( padding: const EdgeInsets.all(8), decoration: BoxDecoration( @@ -211,8 +216,11 @@ class _MobileLiveTVTabState extends ConsumerState { 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', @@ -344,7 +352,8 @@ class _MobileChannelTile extends ConsumerWidget { current.title, style: GoogleFonts.inter( color: const Color( - 0xFFFFD700), // Gold/Amber for visibility check + 0xFFFFD700, + ), // Gold/Amber for visibility check fontSize: 12, fontWeight: FontWeight.w500, ), @@ -352,11 +361,14 @@ class _MobileChannelTile extends ConsumerWidget { overflow: TextOverflow.ellipsis, ); }, - loading: () => const Text('...', - style: - TextStyle(color: Colors.white38, fontSize: 12)), - error: (err, stack) => const Text('Err', - style: TextStyle(color: Colors.red, fontSize: 10)), + loading: () => const Text( + '...', + style: TextStyle(color: Colors.white38, fontSize: 12), + ), + error: (err, stack) => const Text( + 'Err', + style: TextStyle(color: Colors.red, fontSize: 10), + ), ), ], ), @@ -367,8 +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, + ), ), ], ), diff --git a/lib/mobile/features/iptv/widgets/mobile_movies_tab.dart b/lib/mobile/features/iptv/widgets/mobile_movies_tab.dart index c2f44f2..d0e9715 100644 --- a/lib/mobile/features/iptv/widgets/mobile_movies_tab.dart +++ b/lib/mobile/features/iptv/widgets/mobile_movies_tab.dart @@ -205,7 +205,9 @@ class _MobileMoviesTabState extends ConsumerState { child: TextField( controller: _searchController, style: GoogleFonts.inter( - fontSize: 14, color: Colors.white), + fontSize: 14, + color: Colors.white, + ), decoration: InputDecoration( hintText: 'Search Movies...', hintStyle: GoogleFonts.inter(color: Colors.white54), @@ -218,18 +220,24 @@ class _MobileMoviesTabState extends ConsumerState { ), if (_isSearching) const SizedBox( - width: 12, - height: 12, - child: CircularProgressIndicator( - strokeWidth: 2, color: Colors.white)), + width: 12, + height: 12, + child: CircularProgressIndicator( + strokeWidth: 2, + color: Colors.white, + ), + ), if (_searchQuery.isNotEmpty) GestureDetector( onTap: () { _searchController.clear(); _onSearchChanged(''); }, - child: const Icon(Icons.close, - size: 16, color: Colors.white), + child: const Icon( + Icons.close, + size: 16, + color: Colors.white, + ), ), ], ), @@ -295,8 +303,11 @@ class _MobileMoviesTabState extends ConsumerState { ) : Container( color: Colors.white10, - child: const Icon(Icons.movie, - color: Colors.white24)), + child: const Icon( + Icons.movie, + color: Colors.white24, + ), + ), ), // Gradient Overlay @@ -312,11 +323,12 @@ class _MobileMoviesTabState extends ConsumerState { end: Alignment.bottomCenter, colors: [ Colors.transparent, - Colors.black.withOpacity(0.9) + Colors.black.withOpacity(0.9), ], ), borderRadius: const BorderRadius.vertical( - bottom: Radius.circular(16)), + bottom: Radius.circular(16), + ), ), ), ), @@ -333,18 +345,22 @@ class _MobileMoviesTabState extends ConsumerState { Text( movie.name, style: GoogleFonts.inter( - color: Colors.white, - fontSize: 13, - fontWeight: FontWeight.w600), + 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, + ), + ), ], ), ), @@ -358,19 +374,25 @@ class _MobileMoviesTabState extends ConsumerState { borderRadius: 4, opacity: 0.6, padding: const EdgeInsets.symmetric( - horizontal: 6, vertical: 2), + 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), + fontSize: 10, + fontWeight: FontWeight.bold, + color: Colors.white, + ), ), ], ), @@ -390,7 +412,8 @@ class _MobileMoviesTabState extends ConsumerState { child: Padding( padding: EdgeInsets.all(24), child: Center( - child: CircularProgressIndicator(color: Colors.white)), + child: CircularProgressIndicator(color: Colors.white), + ), ), ), ], diff --git a/lib/mobile/features/iptv/widgets/mobile_series_tab.dart b/lib/mobile/features/iptv/widgets/mobile_series_tab.dart index 307fb10..7693389 100644 --- a/lib/mobile/features/iptv/widgets/mobile_series_tab.dart +++ b/lib/mobile/features/iptv/widgets/mobile_series_tab.dart @@ -29,7 +29,7 @@ class _MobileSeriesTabState extends ConsumerState { 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 { } 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 { _isSearching = false; } }); - + if (query.length >= 2) { _searchDebounce = Timer(const Duration(milliseconds: 500), () { _performSearch(query); @@ -75,11 +76,11 @@ class _MobileSeriesTabState extends ConsumerState { Future _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 { @override Widget build(BuildContext context) { final settings = ref.watch(iptvSettingsProvider); - + List displaySeries; if (_searchQuery.isNotEmpty && _searchResults != null) { displaySeries = _searchResults!; } else { displaySeries = settings.seriesKeywords.isEmpty ? _series - : _series.where((s) => settings.matchesSeriesFilter(s.categoryName)).toList(); + : _series + .where((s) => settings.matchesSeriesFilter(s.categoryName)) + .toList(); } - final heroItems = displaySeries.take(3).map((s) => HeroItem( - id: s.seriesId.toString(), - title: s.name, - imageUrl: _getProxiedImageUrl(s.cover), - subtitle: s.rating != null ? '${_formatRating(s.rating)} ★' : null, - onMoreInfo: () => _openSeries(s), - )).toList(); + final heroItems = displaySeries + .take(3) + .map( + (s) => HeroItem( + id: s.seriesId.toString(), + title: s.name, + imageUrl: _getProxiedImageUrl(s.cover), + subtitle: s.rating != null ? '${_formatRating(s.rating)} ★' : null, + onMoreInfo: () => _openSeries(s), + ), + ) + .toList(); return SafeArea( bottom: false, @@ -180,7 +188,8 @@ class _MobileSeriesTabState extends ConsumerState { 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,8 @@ class _MobileSeriesTabState extends ConsumerState { 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 +210,19 @@ class _MobileSeriesTabState extends ConsumerState { ), ), if (_isSearching) - const SizedBox(width: 12, height: 12, child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white)), + const SizedBox( + width: 12, + height: 12, + child: CircularProgressIndicator( + strokeWidth: 2, color: Colors.white)), if (_searchQuery.isNotEmpty) GestureDetector( onTap: () { - _searchController.clear(); - _onSearchChanged(''); + _searchController.clear(); + _onSearchChanged(''); }, - child: const Icon(Icons.close, size: 16, color: Colors.white), + child: const Icon(Icons.close, + size: 16, color: Colors.white), ), ], ), @@ -221,22 +236,23 @@ class _MobileSeriesTabState extends ConsumerState { child: Padding( padding: const EdgeInsets.only(bottom: 24), child: SizedBox( - height: 250, - child: HeroCarousel( - items: heroItems, - onTap: (item) { - try { - final series = _series.firstWhere((s) => s.seriesId.toString() == item.id); - _openSeries(series); - } catch (e) { - // Fallback - } - }, - ), + height: 250, + child: HeroCarousel( + items: heroItems, + onTap: (item) { + try { + final series = _series.firstWhere( + (s) => s.seriesId.toString() == item.id); + _openSeries(series); + } catch (e) { + // Fallback + } + }, + ), ), ), ), - + // Grid SliverPadding( padding: const EdgeInsets.fromLTRB(16, 0, 16, 80), @@ -251,7 +267,7 @@ class _MobileSeriesTabState extends ConsumerState { (context, index) { if (index >= displaySeries.length) return null; final series = displaySeries[index]; - + return GestureDetector( onTap: () => _openSeries(series), child: Stack( @@ -260,37 +276,53 @@ class _MobileSeriesTabState extends ConsumerState { // Poster ClipRRect( borderRadius: BorderRadius.circular(16), - child: series.cover != null && series.cover!.isNotEmpty - ? Image.network( - _getProxiedImageUrl(series.cover), - fit: BoxFit.cover, - errorBuilder: (_, __, ___) => Container(color: Colors.white10), - ) - : Container(color: Colors.white10, child: const Icon(Icons.tv, color: Colors.white24)), + child: + series.cover != null && series.cover!.isNotEmpty + ? Image.network( + _getProxiedImageUrl(series.cover), + fit: BoxFit.cover, + errorBuilder: (_, __, ___) => + Container(color: Colors.white10), + ) + : Container( + color: Colors.white10, + child: const Icon(Icons.tv, + color: Colors.white24)), ), - + // Gradient Overlay Positioned( - bottom: 0, left: 0, right: 0, + bottom: 0, + left: 0, + right: 0, height: 80, child: Container( decoration: BoxDecoration( gradient: LinearGradient( begin: Alignment.topCenter, end: Alignment.bottomCenter, - colors: [Colors.transparent, Colors.black.withOpacity(0.9)], + colors: [ + Colors.transparent, + Colors.black.withOpacity(0.9) + ], ), - borderRadius: const BorderRadius.vertical(bottom: Radius.circular(16)), + borderRadius: const BorderRadius.vertical( + bottom: Radius.circular(16)), ), ), ), // Title Positioned( - bottom: 12, left: 12, right: 12, + bottom: 12, + left: 12, + right: 12, child: Text( series.name, - style: GoogleFonts.inter(color: Colors.white, fontSize: 13, fontWeight: FontWeight.w600), + style: GoogleFonts.inter( + color: Colors.white, + fontSize: 13, + fontWeight: FontWeight.w600), maxLines: 2, overflow: TextOverflow.ellipsis, ), @@ -299,19 +331,25 @@ class _MobileSeriesTabState extends ConsumerState { // 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 +363,13 @@ class _MobileSeriesTabState extends ConsumerState { ), ), ), - + if (_isLoading) const SliverToBoxAdapter( child: Padding( padding: EdgeInsets.all(24), - child: Center(child: CircularProgressIndicator(color: Colors.white)), + child: Center( + child: CircularProgressIndicator(color: Colors.white)), ), ), ], diff --git a/lib/mobile/features/iptv/widgets/mobile_settings_tab.dart b/lib/mobile/features/iptv/widgets/mobile_settings_tab.dart index 17d4347..6000015 100644 --- a/lib/mobile/features/iptv/widgets/mobile_settings_tab.dart +++ b/lib/mobile/features/iptv/widgets/mobile_settings_tab.dart @@ -37,13 +37,16 @@ class _MobileSettingsTabState extends ConsumerState { } 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 { 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 { padding: const EdgeInsets.all(16), children: [ // Header - Padding( + Padding( padding: const EdgeInsets.only(bottom: 24), child: Text( 'Settings', @@ -87,7 +90,8 @@ class _MobileSettingsTabState extends ConsumerState { 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 +110,17 @@ class _MobileSettingsTabState extends ConsumerState { 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 +140,24 @@ class _MobileSettingsTabState extends ConsumerState { child: Column( children: [ SwitchListTile( - title: const Text('Dark Mode', style: TextStyle(color: AppColors.textPrimary)), - secondary: Icon(isDark ? Icons.dark_mode : Icons.light_mode, color: AppColors.primary), + title: const Text('Dark Mode', + style: TextStyle(color: AppColors.textPrimary)), + secondary: Icon(isDark ? Icons.dark_mode : Icons.light_mode, + color: AppColors.primary), value: isDark, onChanged: (_) => themeNotifier.toggleTheme(), - activeColor: AppColors.primary, + activeThumbColor: AppColors.primary, ), const Divider(height: 1), SwitchListTile( - title: const Text('Show Clock', style: TextStyle(color: AppColors.textPrimary)), - secondary: const Icon(Icons.access_time, color: AppColors.primary), + title: const Text('Show Clock', + style: TextStyle(color: AppColors.textPrimary)), + secondary: + const Icon(Icons.access_time, color: AppColors.primary), value: settings.showClock, - onChanged: (val) => ref.read(iptvSettingsProvider.notifier).setShowClock(val), - activeColor: AppColors.primary, + onChanged: (val) => + ref.read(iptvSettingsProvider.notifier).setShowClock(val), + activeThumbColor: AppColors.primary, ), ], ), @@ -167,7 +181,10 @@ class _MobileSettingsTabState extends ConsumerState { 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 +195,24 @@ class _MobileSettingsTabState extends ConsumerState { 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( - label: 'Timeout', - icon: Icons.timer, - value: settings.connectionTimeout, - items: ConnectionTimeout.values, - labelBuilder: (v) => '${v.name.toUpperCase()} (${ref.read(iptvSettingsProvider).timeoutSeconds}s)', - onChanged: (v) { - if (v != null) ref.read(iptvSettingsProvider.notifier).setConnectionTimeout(v); - }, + label: 'Timeout', + icon: Icons.timer, + value: settings.connectionTimeout, + items: ConnectionTimeout.values, + labelBuilder: (v) => + '${v.name.toUpperCase()} (${ref.read(iptvSettingsProvider).timeoutSeconds}s)', + onChanged: (v) { + if (v != null) + ref + .read(iptvSettingsProvider.notifier) + .setConnectionTimeout(v); + }, ), const Divider(height: 1), _DropdownSetting( @@ -200,22 +222,32 @@ class _MobileSettingsTabState extends ConsumerState { items: TranscodingMode.values, labelBuilder: (v) { switch (v) { - case TranscodingMode.auto: return 'AUTO'; - case TranscodingMode.forced: return 'TRANSCODE'; - case TranscodingMode.disabled: return 'DIRECT'; + case TranscodingMode.auto: + return 'AUTO'; + case TranscodingMode.forced: + return 'TRANSCODE'; + case TranscodingMode.disabled: + return 'DIRECT'; } }, onChanged: (v) { - if (v != null) ref.read(iptvSettingsProvider.notifier).setTranscodingMode(v); + if (v != null) + ref + .read(iptvSettingsProvider.notifier) + .setTranscodingMode(v); }, ), const Divider(height: 1), - SwitchListTile( - title: const Text('Auto Reconnect', style: TextStyle(color: AppColors.textPrimary)), - secondary: const Icon(Icons.refresh, color: AppColors.primary), + SwitchListTile( + title: const Text('Auto Reconnect', + style: TextStyle(color: AppColors.textPrimary)), + secondary: + const Icon(Icons.refresh, color: AppColors.primary), value: settings.autoReconnect, - onChanged: (val) => ref.read(iptvSettingsProvider.notifier).setAutoReconnect(val), - activeColor: AppColors.primary, + onChanged: (val) => ref + .read(iptvSettingsProvider.notifier) + .setAutoReconnect(val), + activeThumbColor: AppColors.primary, ), ], ), @@ -236,21 +268,27 @@ class _MobileSettingsTabState extends ConsumerState { 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 +309,19 @@ class _MobileSettingsTabState extends ConsumerState { onTap: () => context.go('/playlists'), ), const SizedBox(height: 32), - + FilledButton.icon( - onPressed: () { - ref.read(authProvider.notifier).logout(); - context.go('/login'); - }, - style: FilledButton.styleFrom( - backgroundColor: AppColors.error.withOpacity(0.1), - foregroundColor: AppColors.error, - minimumSize: const Size(double.infinity, 50), - ), - icon: const Icon(Icons.logout), - label: const Text('Logout'), + onPressed: () { + ref.read(authProvider.notifier).logout(); + context.go('/login'); + }, + style: FilledButton.styleFrom( + backgroundColor: AppColors.error.withOpacity(0.1), + foregroundColor: AppColors.error, + minimumSize: const Size(double.infinity, 50), + ), + icon: const Icon(Icons.logout), + label: const Text('Logout'), ), const SizedBox(height: 100), ], @@ -335,10 +373,13 @@ 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 +476,8 @@ class _DropdownSetting 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( diff --git a/lib/mobile/widgets/mobile_scaffold.dart b/lib/mobile/widgets/mobile_scaffold.dart index 2d6fda7..bfa8c28 100644 --- a/lib/mobile/widgets/mobile_scaffold.dart +++ b/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,9 @@ 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 +59,10 @@ class MobileScaffold extends ConsumerWidget { elevation: 0, selectedItemColor: Colors.white, unselectedItemColor: Colors.white38, - selectedLabelStyle: GoogleFonts.inter(fontWeight: FontWeight.w600, fontSize: 11), - unselectedLabelStyle: GoogleFonts.inter(fontWeight: FontWeight.w500, fontSize: 11), + selectedLabelStyle: + GoogleFonts.inter(fontWeight: FontWeight.w600, fontSize: 11), + unselectedLabelStyle: + GoogleFonts.inter(fontWeight: FontWeight.w500, fontSize: 11), items: const [ BottomNavigationBarItem( icon: Icon(Icons.live_tv_rounded), diff --git a/pubspec.yaml b/pubspec.yaml index 6ab3db5..c39c149 100644 --- a/pubspec.yaml +++ b/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 + video_player_win: ^3.2.2 diff --git a/test/widget_test.dart b/test/widget_test.dart new file mode 100644 index 0000000..0d72d83 --- /dev/null +++ b/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); + }); +} diff --git a/windows/.gitignore b/windows/.gitignore new file mode 100644 index 0000000..d492d0d --- /dev/null +++ b/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/ diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt new file mode 100644 index 0000000..6d06d11 --- /dev/null +++ b/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 "$<$:_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 "$") +# 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) diff --git a/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt new file mode 100644 index 0000000..903f489 --- /dev/null +++ b/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} $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..22fd8d3 --- /dev/null +++ b/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,14 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include + +void RegisterPlugins(flutter::PluginRegistry* registry) { + VideoPlayerWinPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("VideoPlayerWinPluginCApi")); +} diff --git a/windows/flutter/generated_plugin_registrant.h b/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..dc139d8 --- /dev/null +++ b/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 + +// Registers Flutter plugins. +void RegisterPlugins(flutter::PluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake new file mode 100644 index 0000000..72d13e2 --- /dev/null +++ b/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 $) + 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) diff --git a/windows/runner/CMakeLists.txt b/windows/runner/CMakeLists.txt new file mode 100644 index 0000000..394917c --- /dev/null +++ b/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) diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc new file mode 100644 index 0000000..604b1c4 --- /dev/null +++ b/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 diff --git a/windows/runner/flutter_window.cpp b/windows/runner/flutter_window.cpp new file mode 100644 index 0000000..955ee30 --- /dev/null +++ b/windows/runner/flutter_window.cpp @@ -0,0 +1,71 @@ +#include "flutter_window.h" + +#include + +#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( + 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 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); +} diff --git a/windows/runner/flutter_window.h b/windows/runner/flutter_window.h new file mode 100644 index 0000000..6da0652 --- /dev/null +++ b/windows/runner/flutter_window.h @@ -0,0 +1,33 @@ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#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_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp new file mode 100644 index 0000000..0cadaf5 --- /dev/null +++ b/windows/runner/main.cpp @@ -0,0 +1,43 @@ +#include +#include +#include + +#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 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; +} diff --git a/windows/runner/resource.h b/windows/runner/resource.h new file mode 100644 index 0000000..66a65d1 --- /dev/null +++ b/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 diff --git a/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c04e20caf6370ebb9253ad831cc31de4a9c965f6 GIT binary patch literal 33772 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 literal 0 HcmV?d00001 diff --git a/windows/runner/runner.exe.manifest b/windows/runner/runner.exe.manifest new file mode 100644 index 0000000..153653e --- /dev/null +++ b/windows/runner/runner.exe.manifest @@ -0,0 +1,14 @@ + + + + + PerMonitorV2 + + + + + + + + + diff --git a/windows/runner/utils.cpp b/windows/runner/utils.cpp new file mode 100644 index 0000000..3a0b465 --- /dev/null +++ b/windows/runner/utils.cpp @@ -0,0 +1,65 @@ +#include "utils.h" + +#include +#include +#include +#include + +#include + +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 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::vector 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; +} diff --git a/windows/runner/utils.h b/windows/runner/utils.h new file mode 100644 index 0000000..3879d54 --- /dev/null +++ b/windows/runner/utils.h @@ -0,0 +1,19 @@ +#ifndef RUNNER_UTILS_H_ +#define RUNNER_UTILS_H_ + +#include +#include + +// 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, +// encoded in UTF-8. Returns an empty std::vector on failure. +std::vector GetCommandLineArguments(); + +#endif // RUNNER_UTILS_H_ diff --git a/windows/runner/win32_window.cpp b/windows/runner/win32_window.cpp new file mode 100644 index 0000000..60608d0 --- /dev/null +++ b/windows/runner/win32_window.cpp @@ -0,0 +1,288 @@ +#include "win32_window.h" + +#include +#include + +#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(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( + 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(origin.x), + static_cast(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(lparam); + SetWindowLongPtr(window, GWLP_USERDATA, + reinterpret_cast(window_struct->lpCreateParams)); + + auto that = static_cast(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(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( + 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)); + } +} diff --git a/windows/runner/win32_window.h b/windows/runner/win32_window.h new file mode 100644 index 0000000..e901dde --- /dev/null +++ b/windows/runner/win32_window.h @@ -0,0 +1,102 @@ +#ifndef RUNNER_WIN32_WINDOW_H_ +#define RUNNER_WIN32_WINDOW_H_ + +#include + +#include +#include +#include + +// 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_