fix: Stop player when hiding the window

Author: G-Ray

app/lib/main.dart

@@ -116,40 +116,9 @@ class PikaTorrent extends StatelessWidget {
   }
 }
 
-class PikaTorrentApp extends StatefulWidget {
+class PikaTorrentApp extends StatelessWidget {
   const PikaTorrentApp({super.key});
 
-  @override
-  State<PikaTorrentApp> createState() => _PikaTorrentAppState();
-}
-
-class _PikaTorrentAppState extends State<PikaTorrentApp> with WindowListener {
-  @override
-  void initState() {
-    super.initState();
-    windowManager.addListener(this);
-    _init();
-  }
-
-  @override
-  void dispose() {
-    windowManager.removeListener(this);
-    super.dispose();
-  }
-
-  void _init() async {
-    if (isDesktop()) {
-      // Add this line to override the default close handler
-      await windowManager.setPreventClose(true);
-      setState(() {});
-    }
-  }
-
-  @override
-  void onWindowClose() async {
-    windowManager.hide();
-  }
-
   // App root
   @override
   Widget build(BuildContext context) {

app/lib/navigation/app_shell_route.dart

@@ -12,8 +12,10 @@ import 'package:pikatorrent/navigation/navigation.dart';
 import 'package:pikatorrent/platforms/desktop/tray.dart';
 import 'package:pikatorrent/utils/app_links.dart';
 import 'package:pikatorrent/utils/connectivity.dart';
+import 'package:pikatorrent/utils/device.dart';
 import 'package:pikatorrent/utils/update.dart';
 import 'package:provider/provider.dart';
+import 'package:window_manager/window_manager.dart';
 
 class AppShellRoute extends StatefulWidget {
   final Widget child;
@@ -24,7 +26,7 @@ class AppShellRoute extends StatefulWidget {
   State<AppShellRoute> createState() => _AppShellRouteState();
 }
 
-class _AppShellRouteState extends State<AppShellRoute> {
+class _AppShellRouteState extends State<AppShellRoute> with WindowListener {
   late AppLinks _appLinks;
   bool isTermsOfUseDialogDisplayed = false;
   bool hasShownUpdateDialog = false;
@@ -36,14 +38,35 @@ class _AppShellRouteState extends State<AppShellRoute> {
     startConnectivityCheck(context);
     initTray(context);
     _initAppLinks();
+    windowManager.addListener(this);
+    _initWindowManager();
   }
 
   @override
   void dispose() {
     stopConnectivityCheck();
+    windowManager.removeListener(this);
     super.dispose();
   }
 
+  @override
+  void onWindowClose() async {
+    // Pop video player if it's the current route
+    if (ModalRoute.of(context)?.settings.name == 'player') {
+      Navigator.pop(context);
+    }
+
+    windowManager.hide();
+  }
+
+  _initWindowManager() async {
+    if (isDesktop()) {
+      // Add this line to override the default close handler
+      await windowManager.setPreventClose(true);
+      setState(() {});
+    }
+  }
+
   _initAppLinks() {
     _appLinks = AppLinks();
     _appLinks.uriLinkStream.listen((uri) async {

app/lib/screens/torrents/sheets/torrent_details/tabs/files.dart

@@ -40,10 +40,12 @@ class FilesTab extends StatelessWidget {
   _handlePlayClick(BuildContext context, File file) {
     String filePath = path.join(location, file.name);
 
-    Navigator.of(context, rootNavigator: true)
-        .push(MaterialPageRoute(builder: (BuildContext context) {
-      return TorrentPlayer(filePath: filePath, torrent: torrent, file: file);
-    }));
+    Navigator.of(context, rootNavigator: true).push(MaterialPageRoute(
+        settings: const RouteSettings(name: 'player'),
+        builder: (BuildContext context) {
+          return TorrentPlayer(
+              filePath: filePath, torrent: torrent, file: file);
+        }));
   }
 
   @override

app/lib/widgets/torrent_player/torrent_player.dart

@@ -66,6 +66,7 @@ class TorrentPlayerState extends State<TorrentPlayer> {
   @override
   void dispose() {
     widget.torrent.stopStreaming();
+    player.stop();
     player.dispose();
     server.stop();
     subsServer.stop();
@@ -164,7 +165,6 @@ class TorrentPlayerState extends State<TorrentPlayer> {
     return IconButton(
       icon: const Icon(Icons.arrow_back, color: Colors.white),
       onPressed: () {
-        player.stop();
         Navigator.pop(context);
       },
     );
@@ -203,7 +203,9 @@ class TorrentPlayerState extends State<TorrentPlayer> {
                           seekBarThumbColor: Colors.blue,
                           seekBarPositionColor: Colors.blue,
                           padding: const EdgeInsets.only(bottom: 64),
-                          topButtonBar: [_buildBackButton()],
+                          topButtonBar: [
+                            _buildBackButton()
+                          ],
                           bottomButtonBar: [
                             const MaterialPositionIndicator(),
                             const Spacer(),