fix
This commit is contained in:
@@ -39,13 +39,17 @@ class MainActivity : ComponentActivity() {
|
|||||||
val navController = rememberNavController()
|
val navController = rememberNavController()
|
||||||
val snackbarHostState = remember { SnackbarHostState() }
|
val snackbarHostState = remember { SnackbarHostState() }
|
||||||
val scope = rememberCoroutineScope()
|
val scope = rememberCoroutineScope()
|
||||||
Scaffold(modifier = Modifier.fillMaxSize(),
|
AppNavGraph(
|
||||||
) { innerPadding ->
|
|
||||||
AppNavGraph(
|
|
||||||
// navController = navController,
|
// navController = navController,
|
||||||
// modifier = Modifier.padding(innerPadding)
|
// modifier = Modifier.padding(innerPadding)
|
||||||
)
|
)
|
||||||
}
|
// Scaffold(modifier = Modifier.fillMaxSize(),
|
||||||
|
// ) { innerPadding ->
|
||||||
|
// AppNavGraph(
|
||||||
|
//// navController = navController,
|
||||||
|
//// modifier = Modifier.padding(innerPadding)
|
||||||
|
// )
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,8 +3,10 @@ package com.approagency.drug.navigation
|
|||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.material3.Scaffold
|
import androidx.compose.material3.Scaffold
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.runtime.getValue
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.navigation.compose.NavHost
|
import androidx.navigation.compose.NavHost
|
||||||
|
import androidx.navigation.compose.currentBackStackEntryAsState
|
||||||
import androidx.navigation.compose.rememberNavController
|
import androidx.navigation.compose.rememberNavController
|
||||||
import com.approagency.drug.navigation.graphs.homeGraph
|
import com.approagency.drug.navigation.graphs.homeGraph
|
||||||
import com.approagency.drug.navigation.graphs.labGraph
|
import com.approagency.drug.navigation.graphs.labGraph
|
||||||
@@ -14,17 +16,29 @@ import com.approagency.drug.navigation.graphs.searchGraph
|
|||||||
fun MainContainer() {
|
fun MainContainer() {
|
||||||
|
|
||||||
val navController = rememberNavController()
|
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(
|
Scaffold(
|
||||||
bottomBar = {
|
bottomBar = {
|
||||||
BottomBar(navController)
|
if (showBottomBar) {
|
||||||
|
BottomBar(navController)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
) { padding ->
|
) { padding ->
|
||||||
|
|
||||||
NavHost(
|
NavHost(
|
||||||
navController = navController,
|
navController = navController,
|
||||||
startDestination = MainRoute.HomeGraph.route,
|
startDestination = MainRoute.HomeGraph.route,
|
||||||
modifier = Modifier.padding(padding)
|
modifier =if (showBottomBar ) Modifier.padding(padding) else Modifier
|
||||||
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
homeGraph(navController)
|
homeGraph(navController)
|
||||||
|
|||||||
Reference in New Issue
Block a user