Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,16 @@ import androidx.compose.runtime.Composable
import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import com.debatetimer.app.ui.home.HomePage

@Composable
fun MainNavHost(navController: NavHostController) {
NavHost(
navController = navController,
startDestination = NavItem.Login.route
startDestination = MainNavRoute.Home.value
) {
composable(route = MainNavRoute.Home.value) {
HomePage()
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.debatetimer.app.navigation

sealed class MainNavRoute(
val value: String,
) {
object Home : MainNavRoute("/home")
object Login : MainNavRoute("/login")
}
8 changes: 0 additions & 8 deletions app/src/main/java/com/debatetimer/app/navigation/NavItem.kt

This file was deleted.

47 changes: 47 additions & 0 deletions app/src/main/java/com/debatetimer/app/ui/home/HomePage.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package com.debatetimer.app.ui.home

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.hilt.navigation.compose.hiltViewModel
import androidx.navigation.NavGraph.Companion.findStartDestination
import androidx.navigation.compose.currentBackStackEntryAsState
import androidx.navigation.compose.rememberNavController
import com.debatetimer.app.ui.home.component.BottomNavBar
import com.debatetimer.app.ui.home.component.BottomNavRoute
import com.debatetimer.app.ui.home.component.HomeNavHost

@Composable
fun HomePage(
modifier: Modifier = Modifier,
viewModel: HomeViewModel = hiltViewModel()
) {
val navController = rememberNavController()
val navBackStackEntry by navController.currentBackStackEntryAsState()
val currentRoute = navBackStackEntry?.destination?.route ?: BottomNavRoute.Tables.value

Scaffold(
modifier = modifier,
bottomBar = {
BottomNavBar(
currentNavRoute = currentRoute,
onChangeNavRoute = { route ->
navController.navigate(route) {
popUpTo(navController.graph.findStartDestination().id) {
saveState = true
}
launchSingleTop = true
restoreState = true
}
}
)
}
) { innerPadding ->
HomeNavHost(
navController = navController,
modifier = Modifier.padding(innerPadding)
)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.debatetimer.app.ui.home

import androidx.lifecycle.ViewModel
import dagger.hilt.android.lifecycle.HiltViewModel
import javax.inject.Inject

@HiltViewModel
class HomeViewModel @Inject constructor() : ViewModel()
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.debatetimer.app.ui.home.component

import androidx.compose.material3.Icon
import androidx.compose.material3.NavigationBar
import androidx.compose.material3.NavigationBarItem
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource

@Composable
fun BottomNavBar(
currentNavRoute: String?,
onChangeNavRoute: (String) -> Unit,
modifier: Modifier = Modifier
) {
NavigationBar(modifier = modifier) {
bottomNavItems.forEach { item ->
val isSelected = item.route.value == currentNavRoute

NavigationBarItem(
icon = {
Icon(
imageVector = if (isSelected) item.selectedIcon else item.unselectedIcon,
contentDescription = stringResource(item.labelId)
)
},
label = { Text(stringResource(item.labelId)) },
selected = isSelected,
onClick = { if (!isSelected) onChangeNavRoute(item.route.value) }
)
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package com.debatetimer.app.ui.home.component

import androidx.annotation.StringRes
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.AccessTimeFilled
import androidx.compose.material.icons.filled.Settings
import androidx.compose.material.icons.outlined.AccessTime
import androidx.compose.material.icons.outlined.Settings
import androidx.compose.ui.graphics.vector.ImageVector
import com.debatetimer.app.R

data class BottomNavItem(
val route: BottomNavRoute,
val selectedIcon: ImageVector,
val unselectedIcon: ImageVector,
@StringRes val labelId: Int
)

val bottomNavItems = listOf(
BottomNavItem(
BottomNavRoute.Tables,
Icons.Filled.AccessTimeFilled,
Icons.Outlined.AccessTime,
R.string.table
),
BottomNavItem(
BottomNavRoute.Settings,
Icons.Filled.Settings,
Icons.Outlined.Settings,
R.string.setting
)

)
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.debatetimer.app.ui.home.component

sealed class BottomNavRoute(
val value: String
) {
object Tables : BottomNavRoute("/tables")
object Settings : BottomNavRoute("/settings")
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package com.debatetimer.app.ui.home.component

import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable

@Composable
fun HomeNavHost(
navController: NavHostController,
modifier: Modifier = Modifier
) {
NavHost(
navController = navController,
startDestination = BottomNavRoute.Tables.value,
modifier = modifier
) {
composable(BottomNavRoute.Tables.value) {
// TODO: Need to replaced with actual view
Text("Tables")
}

composable(BottomNavRoute.Settings.value) {
// TODO: Need to replaced with actual view
Text("Settings")
}
}
}
4 changes: 4 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
<resources>
<string name="app_name">Debate Timer</string>

<string name="home">홈</string>
<string name="setting">설정</string>
<string name="table">시간표</string>
</resources>