fixed bottom nav bar routing

ManuelSena19 · Oct 16, 2023 · c66bf9b · c66bf9b
1 parent 4c0c0bc
commit c66bf9b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -2,17 +2,13 @@ import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:health_watch/constants/logic.dart';
-import 'package:health_watch/screens/apppointment_screen.dart';
 import 'package:health_watch/screens/booking_screen.dart';
 import 'package:health_watch/screens/calendar_screen.dart';
-import 'package:health_watch/screens/chat_screen.dart';
 import 'package:health_watch/screens/edit_profile_screen.dart';
 import 'package:health_watch/screens/home_screen.dart';
 import 'package:health_watch/screens/login_screen.dart';
-import 'package:health_watch/screens/profile_screen.dart';
 import 'package:health_watch/screens/register_screen.dart';
 import 'package:health_watch/screens/reset_password_screen.dart';
-import 'package:health_watch/screens/search_screen.dart';
 import 'package:health_watch/screens/settings_screen.dart';
 import 'package:health_watch/screens/successful_booking_screen.dart';
 import 'package:health_watch/screens/verify_email_screen.dart';
@@ -47,16 +43,16 @@ class MyApp extends StatelessWidget {
  registerRoute: (context) => const RegisterScreen(),
  verifyEmailRoute: (context) => const VerifyEmailScreen(),
  resetPasswordRoute: (context) => const ResetPasswordScreen(),
- homescreenRoute: (context) => const MainNavigationScreen(),
- profileRoute: (context) => const ProfileScreen(),
+ homescreenRoute: (context) => MainNavigationScreen(index: 0),
+ profileRoute: (context) => MainNavigationScreen(index: 4),
  editProfileRoute: (context) => const EditProfileScreen(),
- appointmentRoute: (context) => const AppointmentScreen(),
+ appointmentRoute: (context) => MainNavigationScreen(index: 2),
  successRoute: (context) => const AppointmentBooked(),
- chatRoute: (context) => const ChatScreen(),
+ chatRoute: (context) => MainNavigationScreen(index: 3),
  settingsRoute: (context) => const SettingsScreen(),
  calendarRoute: (context) => const CalendarScreen(),
  bookingRoute: (context) => const BookingScreen(),
- searchRoute: (context) => const SearchScreen(),
+ searchRoute: (context) => MainNavigationScreen(index: 1),
  },
  );
  }

diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
@@ -18,8 +18,10 @@ final List<Widget> _screens = [
  const ProfileScreen(),
 ];
 
-class MainNavigationScreen extends StatefulWidget {
- const MainNavigationScreen({super.key});
+class MainNavigationScreen extends StatefulWidget{
+ MainNavigationScreen({Key? key, this.index}) : super(key: key);
+
+ int? index;
 
  @override
  State<MainNavigationScreen> createState() => _MainNavigationScreenState();
@@ -31,11 +33,12 @@ class _MainNavigationScreenState extends State<MainNavigationScreen> {
  @override
  Widget build(BuildContext context) {
  return Scaffold(
- body: _screens[_currentIndex],
+ body: _screens[widget.index ?? _currentIndex],
  bottomNavigationBar: BottomNavigationBar(
- currentIndex: _currentIndex,
+ currentIndex: widget.index ?? _currentIndex,
  onTap: (index){
  setState(() {
+ widget.index = null;
  _currentIndex = index;
  });
  },

diff --git a/lib/screens/verify_email_screen.dart b/lib/screens/verify_email_screen.dart
@@ -59,7 +59,7 @@ class _VerifyEmailScreenState extends State<VerifyEmailScreen> {
 
  @override
  Widget build(BuildContext context) => isEmailVerified
- ? const MainNavigationScreen()
+ ? MainNavigationScreen()
  : Scaffold(
  appBar: AppBar(
  title: const Text('Verify Email'),