Destinations from Navigation Compose updated

cristiangranero90 · cristiangranero90 · Jul 4, 2023 · Jul 4, 2023 · Nov 23, 2023 · Nov 23, 2023
commit 1233bbaa1bc24b1486ad92501c79017d54e1e606
diff --git a/app/src/main/java/com/juntas/juntas_app/home_screen/HomeScreen.kt b/app/src/main/java/com/juntas/juntas_app/home_screen/HomeScreen.kt
@@ -0,0 1,16 @@
 package com.juntas.juntas_app.home_screen
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 
 @Composable
 fun HomeScreen(){
  Box(
  modifier = Modifier.fillMaxSize()
  ) {
  Text(text = "Home")
  }
 }
diff --git a/app/src/main/java/com/juntas/juntas_app/shared_components/BottomBar.kt b/app/src/main/java/com/juntas/juntas_app/shared_components/BottomBar.kt
@@ -14,10 14,16 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavDestination
 import androidx.navigation.NavDestination.Companion.hierarchy
 import com.juntas.juntas_app.R
 
 @Composable
 fun BottomBar(
  currentDestination: NavDestination?,
  onHomeClicked: () -> Unit,
  onPassengerClicked: () -> Unit,
  onDriverClicked: () -> Unit,
  modifier: Modifier = Modifier,
 ) {
  val iconsColor = MaterialTheme.colorScheme.onSurface
@@ -27,21 33,22 @@ fun BottomBar(
  containerColor = MaterialTheme.colorScheme.background,
  tonalElevation = 1.dp
  ) {
  NavigationBarItem(
  selected = currentDestination?.hierarchy?.any { it.route == "home_screen" } == true,
  onClick = { onHomeClicked() },
  icon = {
  Icon(
  imageVector = Icons.Default.Home,
  contentDescription = stringResource(R.string.go_to_home),
  tint = iconsColor
  )},
  alwaysShowLabel = true,
  label = { Text(text = stringResource(R.string.home))}
  )
 
  NavigationBarItem(
- selected = true,
- onClick = { /*TODO*/ },
- icon = {
- Icon(
- imageVector = Icons.Default.Home,
- contentDescription = stringResource(R.string.go_to_home),
- tint = iconsColor
- )},
- alwaysShowLabel = true,
- label = { Text(text = stringResource(R.string.home))}
- )
- NavigationBarItem(
- selected = false,
- onClick = { /*TODO*/ },
  selected = currentDestination?.hierarchy?.any { it.route == "journey_screen" } == true,
  onClick = { onPassengerClicked() },
  icon = {
  Icon(
  painterResource(id = R.drawable.world_pink),
@@ -51,9 58,10 @@ fun BottomBar(
  alwaysShowLabel = true,
  label = { Text(text = stringResource(R.string.passenger))}
  )
 
  NavigationBarItem(
- selected = false,
- onClick = { /*TODO*/ },
  selected = currentDestination?.hierarchy?.any { it.route == "journey_create_screen" } == true,
  onClick = { onDriverClicked() },
  icon = {
  Icon(
  painterResource(id = R.drawable.car_pink),
@@ -70,5 78,5 @@ fun BottomBar(
 @Composable
 @Preview(showSystemUi = true, showBackground = true)
 fun BottomBarPreview() {
- BottomBar()
  BottomBar( NavDestination(""), {},{},{})
 }
diff --git a/app/src/main/java/com/juntas/juntas_app/shared_components/Navigation.kt b/app/src/main/java/com/juntas/juntas_app/shared_components/Navigation.kt
@@ -3,21 3,32 @@ package com.juntas.juntas_app.shared_components
 import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import com.juntas.juntas_app.home_screen.HomeScreen
 import com.juntas.juntas_app.journey_create_first.domain.JourneyCreate
 import com.juntas.juntas_app.journey_screen.presentation.JourneyScreen
 import com.juntas.juntas_app.preference_screen.presentation.PreferenceScreen
 import com.juntas.juntas_app.trip_screen.presentation.TripScreen
 
 @RequiresApi(Build.VERSION_CODES.N)
 @Composable
 fun Navigation() {
 
  val navController = rememberNavController()
- //val navBackStackEntry by navController.currentBackStackEntryAsState()
- //val currentDestination = navBackStackEntry?.destination
  val navBackStackEntry by navController.currentBackStackEntryAsState()
  val currentDestination = navBackStackEntry?.destination
 
  val bottomBar: @Composable () -> Unit = {
- BottomBar()
  BottomBar(
  currentDestination = currentDestination,
  onHomeClicked = { navController.navigate("home_screen") },
  onPassengerClicked = { navController.navigate("journey_screen") },
  onDriverClicked = { navController.navigate("journey_create_screen") }
  )
  }
  val topBar: @Composable () -> Unit = {
  TopBar(
@@ -47,5 58,25 @@ fun Navigation() {
  bottomBar = bottomBar
  )
  }
 
  composable("journey_create_screen") {
  JourneyCreate(
  topBar = topBar,
  bottomBar = bottomBar
  )
  }
  composable("home_screen") {
  HomeScreen()
  }
 
  composable("trip_screen") {
  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
  TripScreen(
  onBackClicked = { /*TODO*/ },
  bottomBar = bottomBar,
  topBar = topBar
  )
  }
  }
  }
 }
diff --git a/app/src/main/java/com/juntas/juntas_app/trip_screen/presentation/TripScreen.kt b/app/src/main/java/com/juntas/juntas_app/trip_screen/presentation/TripScreen.kt
@@ -26,8 26,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.juntas.juntas_app.R
-import com.juntas.juntas_app.shared_components.BottomBar
-import com.juntas.juntas_app.shared_components.TopBar
 import com.juntas.juntas_app.trip_screen.presentation.components.TripCard
 import java.time.LocalDate
 import java.time.LocalTime
@@ -36,16 34,14 @@ import java.time.LocalTime
 @Composable
 fun TripScreen(
  onBackClicked: () -> Unit,
  topBar: @Composable () -> Unit,
  bottomBar: @Composable () -> Unit,
  modifier: Modifier = Modifier,
 ) {
  Scaffold(
  modifier = modifier.fillMaxSize(),
- topBar = { TopBar(
- onProfileClicked = { /*TODO*/ } ,
- onNotificationsClicked = { /*TODO*/ } ,
- imageUrl = ""
- )},
- bottomBar = { BottomBar() }
  topBar = topBar,
  bottomBar = bottomBar
 
  ){ paddingValues ->
  //Top info
@@ -116,5 112,5 @@ fun TripScreen(
 @Composable
 @Preview(showBackground = true)
 fun TripScreenPreview() {
- TripScreen( {})
  TripScreen( {},{},{})
 }