Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,13 @@ import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
import androidx.navigation.NavType
import androidx.navigation.navArgument
import com.khigh.seniormap.ui.screens.HomeScreen
import com.khigh.seniormap.ui.screens.LoadingScreen
import com.khigh.seniormap.ui.screens.LoginScreen
import com.khigh.seniormap.ui.screens.guardian.GuardianHomeScreen
import com.khigh.seniormap.ui.screens.guardian.EditGuardianScreen
import com.khigh.seniormap.viewmodel.AuthViewModel
import androidx.hilt.navigation.compose.hiltViewModel

Expand Down Expand Up @@ -56,20 +60,65 @@ fun AppNavigation(
Log.d("com.khigh.seniormap", "[AppNavigation] isAuthenticated: $isAuthenticated, authState: $authState")
NavHost(
navController = navController,
startDestination = if (isAuthenticated) "home" else "login"
startDestination = if (isAuthenticated) "guardian_home" else "login"
) {
// 로그인 화면
composable("login") {
LoginScreen(
onNavigateToHome = {
navController.navigate("home") {
navController.navigate("guardian_home") {
popUpTo("login") { inclusive = true }
}
}
)
}

// 홈 화면
// 보호인 홈 화면
composable("guardian_home") {
GuardianHomeScreen(
onNavigateToLogin = {
navController.navigate("login") {
popUpTo("guardian_home") { inclusive = true }
}
},
onNavigateToEdit = { guardianData ->
navController.navigate("edit_guardian/${guardianData.id}") {
// 뒤로 가기 시 홈 화면으로 돌아감
}
}
)
}

// 피보호인 수정 화면
composable(
route = "edit_guardian/{guardianId}",
arguments = listOf(
navArgument("guardianId") { type = NavType.StringType }
)
) { backStackEntry ->
val guardianId = backStackEntry.arguments?.getString("guardianId") ?: ""
// TODO: 실제로는 ViewModel에서 guardianId로 데이터를 가져와야 함
val guardianData = com.khigh.seniormap.ui.screens.guardian.components.GuardianData(
id = guardianId,
name = "임시 피보호인",
location = "임시 위치",
isAtHome = true
)

EditGuardianScreen(
guardianData = guardianData,
onNavigateBack = {
navController.popBackStack()
},
onSave = { updatedGuardian ->
// TODO: 실제로는 ViewModel을 통해 데이터를 저장해야 함
Log.d("AppNavigation", "Guardian updated: $updatedGuardian")
navController.popBackStack()
}
)
}

// 기존 홈 화면 (필요시 유지)
composable("home") {
HomeScreen(
onNavigateToLogin = {
Expand Down
18 changes: 18 additions & 0 deletions app/src/main/java/com/khigh/seniormap/ui/screens/LoginScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,10 @@ fun LoginScreen(
onGoogleLogin = {
Log.d("com.khigh.seniormap", "[LoginScreen] Google login clicked")
authViewModel.loginWithOAuth(Google)
},
onTemporaryGuardianHome = {
Log.d("com.khigh.seniormap", "[LoginScreen] Temporary guardian home clicked")
onNavigateToHome()
}
)
}
Expand Down Expand Up @@ -163,6 +167,7 @@ fun LoginScreen(
private fun LoginButtonsSection(
onKakaoLogin: () -> Unit,
onGoogleLogin: () -> Unit,
onTemporaryGuardianHome: () -> Unit,
modifier: Modifier = Modifier
) {
Column(
Expand Down Expand Up @@ -214,5 +219,18 @@ private fun LoginButtonsSection(
fontWeight = FontWeight.Medium
)
}

// 임시 보호인 홈 이동 버튼
Spacer(modifier = Modifier.height(24.dp))
TextButton(
onClick = onTemporaryGuardianHome,
modifier = Modifier.fillMaxWidth()
) {
Text(
text = "(임시) 보호인 홈 넘어가기",
style = MaterialTheme.typography.labelMedium,
color = MaterialTheme.colorScheme.primary
)
}
}
}
Loading