Fix: Fixed the issue of disappearing navbar and getting stuck after e…

…diting playlist details
gokadzev · Dec 10, 2023 · f312a10 · f312a10
1 parent feb4325
commit f312a10
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/lib/screens/playlist_page.dart b/lib/screens/playlist_page.dart
@@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:musify/API/musify.dart';
 import 'package:musify/extensions/l10n.dart';
 import 'package:musify/extensions/screen_size.dart';
-import 'package:musify/screens/user_added_playlists_page.dart';
 import 'package:musify/services/data_manager.dart';
 import 'package:musify/services/download_manager.dart';
 import 'package:musify/style/app_themes.dart';
@@ -87,6 +86,11 @@ class _PlaylistPageState extends State<PlaylistPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back),
+          onPressed: () =>
+              Navigator.pop(context, widget.playlistData == _playlist),
+        ),
         actions: [
           if (widget.playlistId != null) ...[
             _buildLikeButton(),
@@ -314,16 +318,6 @@ class _PlaylistPageState extends State<PlaylistPage> {
                     }
 
                     Navigator.pop(context);
-                    Navigator.pushAndRemoveUntil(
-                      context,
-                      MaterialPageRoute(
-                        builder: (context) => UserPlaylistsPage(),
-                      ),
-                      (route) =>
-                          route.isCurrent &&
-                          route is MaterialPageRoute &&
-                          route.settings.name == null,
-                    );
                   });
                 },
               ),

diff --git a/lib/screens/user_added_playlists_page.dart b/lib/screens/user_added_playlists_page.dart
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:musify/API/musify.dart';
 import 'package:musify/extensions/l10n.dart';
 import 'package:musify/main.dart';
+import 'package:musify/screens/playlist_page.dart';
 import 'package:musify/style/app_themes.dart';
 import 'package:musify/utilities/flutter_toast.dart';
 import 'package:musify/widgets/playlist_cube.dart';
@@ -160,6 +161,21 @@ class _UserPlaylistsPageState extends State<UserPlaylistsPage> {
                     final ytid = playlist['ytid'];
 
                     return GestureDetector(
+                      onTap:
+                          playlist['isCustom'] != null && playlist['isCustom']
+                              ? () async {
+                                  final result = await Navigator.push(
+                                    context,
+                                    MaterialPageRoute(
+                                      builder: (context) =>
+                                          PlaylistPage(playlistData: playlist),
+                                    ),
+                                  );
+                                  if (result == false) {
+                                    setState(() {});
+                                  }
+                                }
+                              : null,
                       onLongPress: () {
                         showDialog(
                           context: context,
@@ -203,6 +219,7 @@ class _UserPlaylistsPageState extends State<UserPlaylistsPage> {
                             playlist['isCustom'] != null && playlist['isCustom']
                                 ? playlist
                                 : null,
+                        onClickOpen: playlist['isCustom'] == null,
                       ),
                     );
                   },