Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated screen navigation with jetpack navigation library implementation #58

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated screen navigation with jetpack navigation library implementation #58

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 16 additions & 38 deletions shared/src/commonMain/kotlin/com/example/travelapp_kmp/MainView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
package com.example.travelapp_kmp

import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
import com.example.travelapp_kmp.details.DetailScreen
import com.example.travelapp_kmp.details.DetailScreenWeb
import com.example.travelapp_kmp.listing.ListScreenViewModel
Expand All @@ -14,56 +18,30 @@ import com.example.travelapp_kmp.listing.TouristPlace
@Composable
internal fun CommonView(isLargeScreen: Boolean = false) {
val viewMode = remember { ListScreenViewModel() }
// val navController = rememberNavController()
val navController = rememberNavController()
var selectedTouristPlace: TouristPlace? = null
val currentScreen = remember { mutableStateOf(AppScreen.List) }

MaterialTheme {
when (currentScreen.value) {
AppScreen.List -> {
NavHost(
navController = navController,
startDestination = AppScreen.List.name,
modifier = Modifier.fillMaxSize()
) {
composable(AppScreen.List.name) {
MainScreen(navigateToDetails = {
selectedTouristPlace = it
currentScreen.value = AppScreen.Details
// navController.navigate(AppScreen.Details.name)
navController.navigate(AppScreen.Details.name)
}, viewMode = viewMode)
}

AppScreen.Details -> {
composable(AppScreen.Details.name) {
if (isLargeScreen)
DetailScreenWeb(touristPlace = selectedTouristPlace!!,
navigateBack = {
currentScreen.value = AppScreen.List
// navController.popBackStack()
})
navigateBack = { navController.popBackStack() })
else
DetailScreen(touristPlace = selectedTouristPlace!!,
navigateBack = {
currentScreen.value = AppScreen.List
// navController.popBackStack()
})
navigateBack = { navController.popBackStack() })
}
}

// NavHost(
// navController = navController,
// startDestination = AppScreen.List.name,
// modifier = Modifier.fillMaxSize()
// ) {
// composable(AppScreen.List.name) {
// MainScreen(navigateToDetails = {
// selectedTouristPlace = it
// navController.navigate(AppScreen.Details.name)
// }, viewMode = viewMode)
// }
// composable(AppScreen.Details.name) {
// if (isLargeScreen)
// DetailScreenWeb(touristPlace = selectedTouristPlace!!,
// navigateBack = { navController.popBackStack() })
// else
// DetailScreen(touristPlace = selectedTouristPlace!!,
// navigateBack = { navController.popBackStack() })
// }
// }
}
}

Expand Down