Merge pull request #121 from SayedZeeshanHyder/main

Drawer Navigation Correction Done
TSEC-MAD-Club · Jun 12, 2024 · f15dfa5 · f15dfa5
2 parents 55c916d + 796876d
commit f15dfa5
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/lib/new_ui/screens/main_screen/main_screen.dart b/lib/new_ui/screens/main_screen/main_screen.dart
@@ -340,11 +340,8 @@ class _MainScreenState extends ConsumerState<MainScreen> {
                               ),
                         ),
                         onTap: () {
-                          setState(() {
-                            currentPage = 5;
-                          });
-
                           Navigator.pop(context);
+                          Navigator.push(context, MaterialPageRoute(builder: (context) => TPCScreen(),),);
                         },
                       ),
                       ListTile(
@@ -362,10 +359,11 @@ class _MainScreenState extends ConsumerState<MainScreen> {
                               ),
                         ),
                         onTap: () {
-                          setState(() {
+                          /*setState(() {
                             currentPage = 6;
-                          });
+                          });*/
                           Navigator.pop(context);
+                          Navigator.push(context, MaterialPageRoute(builder: (context)=> CommitteesScreen(),),);
                         },
                       ),
                       ListTile(
@@ -383,10 +381,8 @@ class _MainScreenState extends ConsumerState<MainScreen> {
                               ),
                         ),
                         onTap: () {
-                          setState(() {
-                            currentPage = 7;
-                          });
                           Navigator.pop(context);
+                          Navigator.push(context,MaterialPageRoute(builder: (context)=> DepartmentListScreen(),),);
                         },
                       ),
                       Link(