Skip to content

Commit

Permalink
[FEAT/#183] 탐색 코드 호이스팅
Browse files Browse the repository at this point in the history
  • Loading branch information
boiledeggg committed Aug 25, 2024
1 parent 7f8f1c3 commit b629157
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ import java.time.YearMonth

@Composable
fun CalendarRoute(
navController: NavController,
navigateUp: () -> Unit,
navigateToAnnouncement: (Long) -> Unit,
viewModel: CalendarViewModel = hiltViewModel()
) {
val lifecycleOwner = LocalLifecycleOwner.current
Expand All @@ -60,15 +61,13 @@ fun CalendarRoute(
} else if (calendarUiState.isListEnabled) {
viewModel.updateListVisibility(false)
} else {
navController.navigateUp()
navigateUp()
}
}

CalendarScreen(
calendarUiState = calendarUiState,
navigateToAnnouncement = { announcementId ->
navController.navigateIntern(announcementId = announcementId)
},
navigateToAnnouncement = navigateToAnnouncement,
viewModel = viewModel
)
}
Expand All @@ -86,9 +85,7 @@ private fun CalendarScreen(
initialFirstVisibleItemIndex = calendarModel.initialPage
)

var currentDate by rememberSaveable { mutableStateOf(YearMonth.now()) }
var currentPage by rememberSaveable { mutableIntStateOf(listState.firstVisibleItemIndex) }

LaunchedEffect(key1 = listState) {
snapshotFlow { listState.firstVisibleItemIndex }
.distinctUntilChanged()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ import androidx.compose.animation.EnterTransition
import androidx.compose.animation.ExitTransition
import androidx.navigation.NavController
import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavHostController
import androidx.navigation.NavOptions
import androidx.navigation.compose.composable
import com.terning.core.navigation.MainTabRoute
import com.terning.feature.calendar.calendar.CalendarRoute
import com.terning.feature.intern.navigation.navigateIntern
import kotlinx.serialization.Serializable


Expand Down Expand Up @@ -36,7 +38,8 @@ fun NavGraphBuilder.calendarNavGraph(
}
) {
CalendarRoute(
navController = navHostController
navigateUp = navHostController::navigateUp,
navigateToAnnouncement = navHostController::navigateIntern
)
}
}
Expand Down

0 comments on commit b629157

Please sign in to comment.