fix music navigation back

Author: sh4dowByte

lib/config/routes.dart

@@ -10,6 +10,7 @@ class Routes {
   static const String playOption = '/play_option';
   static const String sleepMusic = '/sleep_music';
   static const String welcome = '/welcome';
+  static const String music = '/music';
 
   static Route<dynamic> generateRoute(RouteSettings settings) {
     switch (settings.name) {
@@ -29,6 +30,8 @@ class Routes {
         return MaterialPageRoute(builder: (_) => const SleepMusic());
       case welcome:
         return MaterialPageRoute(builder: (_) => const WelcomePage());
+      case music:
+        return MaterialPageRoute(builder: (_) => const MusicPage());
       case '/':
       default:
         return MaterialPageRoute(

lib/screen/menu/music.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:flutter_ui_meditation_app/components/app_circle_button.dart';
 
@@ -21,7 +22,10 @@ class _MusicPageState extends State<MusicPage> {
 
   @override
   Widget build(BuildContext context) {
+    final isFirstRoute = Navigator.of(context).canPop() ==
+        false; // True jika halaman ini adalah yang pertama
     bool isDarkMode = Theme.of(context).brightness == Brightness.dark;
+
     return Scaffold(
       backgroundColor: isDarkMode
           ? const Color(0xFF02174C)
@@ -92,15 +96,20 @@ class _MusicPageState extends State<MusicPage> {
               ),
             ),
           ),
-          const Padding(
-            padding: EdgeInsets.symmetric(vertical: 50, horizontal: 20),
+          Padding(
+            padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 20),
             child: Column(
               children: [
                 Row(
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
-                    AppCircleButton(),
-                    Row(
+                    Visibility(
+                      visible: !isFirstRoute,
+                      child: AppCircleButton(
+                        onTap: () => Navigator.pop(context),
+                      ),
+                    ),
+                    const Row(
                       children: [
                         AppCircleButton(
                           isTransparent: true,

lib/screen/play_on.dart

@@ -3,6 +3,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_ui_meditation_app/components/components.dart';
 
+import '../config/routes.dart';
 import 'menu/home/components/app_card_tile.dart';
 
 class PlayOnPage extends StatefulWidget {
@@ -457,37 +458,40 @@ class MusicTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.all(8.0),
-      child: Row(
-        children: [
-          Container(
-            height: 40,
-            width: 40,
-            decoration: BoxDecoration(
-              color: Theme.of(context).primaryColor,
-              borderRadius: BorderRadius.circular(40),
-            ),
-            child: Icon(
-              Icons.play_arrow_rounded,
-              color: Colors.white,
-            ),
-          ),
-          SizedBox(width: 20),
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Text(
-                title,
-                style: Theme.of(context).textTheme.bodyMedium,
+    return GestureDetector(
+      onTap: () => Navigator.of(context).pushNamed(Routes.music),
+      child: Padding(
+        padding: const EdgeInsets.all(8.0),
+        child: Row(
+          children: [
+            Container(
+              height: 40,
+              width: 40,
+              decoration: BoxDecoration(
+                color: Theme.of(context).primaryColor,
+                borderRadius: BorderRadius.circular(40),
               ),
-              Text(
-                duration,
-                style: Theme.of(context).textTheme.bodySmall,
+              child: Icon(
+                Icons.play_arrow_rounded,
+                color: Colors.white,
               ),
-            ],
-          ),
-        ],
+            ),
+            SizedBox(width: 20),
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  title,
+                  style: Theme.of(context).textTheme.bodyMedium,
+                ),
+                Text(
+                  duration,
+                  style: Theme.of(context).textTheme.bodySmall,
+                ),
+              ],
+            ),
+          ],
+        ),
       ),
     );
   }

lib/screen/reminders.dart

@@ -106,12 +106,20 @@ class _RemindersPageState extends State<RemindersPage> {
                 children: [
                   AppButton(
                     'SAVE',
-                    onTap: () => Navigator.pushNamed(context, Routes.menu),
+                    onTap: () => Navigator.pushNamedAndRemoveUntil(
+                      context,
+                      Routes.menu,
+                      (Route<dynamic> route) => false,
+                    ),
                   ),
                   const SizedBox(height: 10),
                   Center(
                     child: GestureDetector(
-                      onTap: () => Navigator.pushNamed(context, Routes.menu),
+                      onTap: () => Navigator.pushNamedAndRemoveUntil(
+                        context,
+                        Routes.menu,
+                        (Route<dynamic> route) => false,
+                      ),
                       child: Text(
                         'NO THANKS',
                         style: Theme.of(context).textTheme.titleSmall,