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 @@ -57,6 +57,7 @@ fun CollectionListRoute(
modifier = Modifier.padding(paddingValues),
title = uiState.appbarTitle,
routeType = uiState.routeType,
isMyProfile = uiState.userId == null,
onBackClick = navigateUp,
onCollectionItemClick = navigateToCollectionDetail,
onBookmarkClick = viewModel::toggleCollectionBookmark,
Expand Down Expand Up @@ -111,6 +112,7 @@ private fun CollectionListScreen(
onBackClick: () -> Unit,
title: String,
routeType: CollectionListRouteType,
isMyProfile: Boolean,
collectionList: UiState<CollectionListModel>,
onCollectionItemClick: (collectionId: String) -> Unit,
onBookmarkClick: (collectionId: String) -> Unit,
Expand Down Expand Up @@ -147,7 +149,7 @@ private fun CollectionListScreen(
) {
Spacer(Modifier.height(12.dp))

val displayCount = if (routeType == CollectionListRouteType.SAVED) {
val displayCount = if (routeType == CollectionListRouteType.SAVED && isMyProfile) {
collections.count { it.isBookmarked }
Comment thread
coderabbitai[bot] marked this conversation as resolved.
} else {
collections.size
Expand Down Expand Up @@ -216,6 +218,7 @@ private fun CollectionListScreenPreview() {
onBackClick = {},
title = "전체 컬렉션",
routeType = CollectionListRouteType.CREATED,
isMyProfile = true,
collectionList = UiState.Success(CollectionListModel.FakeList),
onCollectionItemClick = {},
onBookmarkClick = {},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ class CollectionListViewModel @Inject constructor(
init {
val routeReceiveData = savedStateHandle.toRoute<Route.CollectionList>()
setAppBarTitle(routeReceiveData.routeType.title)
_uiState.update { it.copy(routeType = routeReceiveData.routeType) }
_uiState.update {
it.copy(routeType = routeReceiveData.routeType, userId = routeReceiveData.userId)
}
getCollectionList(routeReceiveData)
observeCollectionDeletions()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ import com.flint.android.domain.model.collection.CollectionListModel
data class CollectionListUiState(
val appbarTitle: String = "",
val routeType: CollectionListRouteType = CollectionListRouteType.CREATED,
val userId: String? = null,
val collectionList: UiState<CollectionListModel> = UiState.Loading
)
Loading