merged

lib/presentation/routes/drawer_routes/Drawer Items/bookmark.dart

@@ -378,7 +378,13 @@ class _BookMarkState extends ConsumerState<BookMark> {
     // print( 'filtered one :${filteredBookmarks['main_topic']}    , Tabs : ${tabs[selectedTabIndex]["title"]}');
     List<Map<String, dynamic>> transformedList = groupedMap.values.toList();
     // print('filtered $filteredBookmarks');
-    return BaseScaffold(
+    return PopScope(
+      canPop: false,
+      onPopInvokedWithResult: (didPop, result) {
+        if (didPop) return;
+        context.go('/myhomepage');
+      },
+      child: BaseScaffold(
         title: Text(
           AppLocalizations.of(context)!.bookmarks,
         ),
@@ -556,6 +562,7 @@ class _BookMarkState extends ConsumerState<BookMark> {
                   ),
                 ],
               ),
+      ),
     );
   }
 

lib/presentation/routes/drawer_routes/Drawer Items/contactUs.dart

@@ -41,7 +41,13 @@ class _ContactState extends ConsumerState<Contact> {
       await _userService.updateLanguage(localeCode);
     });
 
-    return BaseScaffold(
+    return PopScope(
+      canPop: false,
+      onPopInvokedWithResult: (didPop, result) {
+        if (didPop) return;
+        context.go('/myhomepage');
+      },
+      child: BaseScaffold(
         body: Container(
           color: Colors.grey[200],
           width: screenWidth,
@@ -182,6 +188,7 @@ class _ContactState extends ConsumerState<Contact> {
           ),
         ),
         title: Text(context.translate('Contact Us', 'اتصل بنا')),
+      ),
     );
   }
 

lib/presentation/routes/drawer_routes/Drawer Items/edit_profile.dart

@@ -4,6 +4,7 @@ import 'dart:io';
 import 'package:external_repos/external_repos.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/scheduler.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
@@ -404,9 +405,9 @@ class _EditProfileState extends ConsumerState<EditProfile> {
         print('ShowConfirmationuser response - $response ');
         // Handle response
         if (response.statusCode == 200) {
-          ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+          // ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-              content: Text(
+          //     content: Text(
-                  AppLocalizations.of(context)!.profile_updated_successfully)));
+          //         AppLocalizations.of(context)!.profile_updated_successfully)));
           if (changedPreferredLanguage == 1) {
             print(_selectedLanguage);
             preferredLang = _selectedLanguage == 'English' ? 'en' : 'ar';
@@ -421,6 +422,12 @@ class _EditProfileState extends ConsumerState<EditProfile> {
             isLoader = false;
           });
 
+          SchedulerBinding.instance.addPostFrameCallback((_) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(content: Text(AppLocalizations.of(context)!.profile_updated_successfully)),
+            );
+          });
+
           // print('ShowConfirmation userData - $userData ');
           context.go('/myhomepage');
         } else {

lib/presentation/routes/drawer_routes/custom_drawer_routes.dart

@@ -989,10 +989,8 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
                   ),
                   ListTile(
                     leading: Icon(Icons.mail_outlined),
-                    title: Text(
+                    title: Text(context.translate('Contact Us', 'اتصل بنا'),),
-                      context.translate('Contact Us', 'اتصل بنا'),
+                    onTap: () => context.go('/contact'),
-                    ),
-                    onTap: () => context.push('/contact'),
                   ),
                   if (userId != 'guest')
                     ListTile(