From c09d79dbbc7675e66fbd9f5d0eb66368b00519a0 Mon Sep 17 00:00:00 2001 From: Amirmahdi Nourkazemi Date: Wed, 27 May 2026 22:08:59 +0330 Subject: [PATCH] fix --- .../java/com/approagency/drug/MainActivity.kt | 14 +++++++++----- .../drug/navigation/MainContainer.kt | 18 ++++++++++++++++-- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/approagency/drug/MainActivity.kt b/app/src/main/java/com/approagency/drug/MainActivity.kt index 4331143..b00af0d 100644 --- a/app/src/main/java/com/approagency/drug/MainActivity.kt +++ b/app/src/main/java/com/approagency/drug/MainActivity.kt @@ -39,13 +39,17 @@ class MainActivity : ComponentActivity() { val navController = rememberNavController() val snackbarHostState = remember { SnackbarHostState() } val scope = rememberCoroutineScope() - Scaffold(modifier = Modifier.fillMaxSize(), - ) { innerPadding -> - AppNavGraph( + AppNavGraph( // navController = navController, // modifier = Modifier.padding(innerPadding) - ) - } + ) +// Scaffold(modifier = Modifier.fillMaxSize(), +// ) { innerPadding -> +// AppNavGraph( +//// navController = navController, +//// modifier = Modifier.padding(innerPadding) +// ) +// } } } } diff --git a/app/src/main/java/com/approagency/drug/navigation/MainContainer.kt b/app/src/main/java/com/approagency/drug/navigation/MainContainer.kt index e01a36b..9a2fc02 100644 --- a/app/src/main/java/com/approagency/drug/navigation/MainContainer.kt +++ b/app/src/main/java/com/approagency/drug/navigation/MainContainer.kt @@ -3,8 +3,10 @@ package com.approagency.drug.navigation import androidx.compose.foundation.layout.padding import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.navigation.compose.NavHost +import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.rememberNavController import com.approagency.drug.navigation.graphs.homeGraph import com.approagency.drug.navigation.graphs.labGraph @@ -14,17 +16,29 @@ import com.approagency.drug.navigation.graphs.searchGraph fun MainContainer() { val navController = rememberNavController() + val navBackStackEntry by navController.currentBackStackEntryAsState() + val currentRoute = navBackStackEntry?.destination?.route + + val showBottomBar = when (currentRoute) { + Screen.Home.route, + Screen.Search.route, + Screen.Lab.route -> true + else -> false + } Scaffold( bottomBar = { - BottomBar(navController) + if (showBottomBar) { + BottomBar(navController) + } } ) { padding -> NavHost( navController = navController, startDestination = MainRoute.HomeGraph.route, - modifier = Modifier.padding(padding) + modifier =if (showBottomBar ) Modifier.padding(padding) else Modifier + ) { homeGraph(navController)