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 @@ -50,6 +50,7 @@ import java.text.DecimalFormat

@Composable
fun BookmarkScreen(
onPostClick: (Long) -> Unit,
onBackClick: () -> Unit,
bookmarkViewModel: BookmarkViewModel = hiltViewModel()
) {
Expand Down Expand Up @@ -105,7 +106,8 @@ fun BookmarkScreen(
post = post,
isEditMode = bookmarkUiState.isEditMode,
isSelected = bookmarkUiState.selectedBookmarks.contains(post.postId),
onBookmarkClick = { bookmarkViewModel.toggleSelection(post.postId) }
onBookmarkPostClick = { onPostClick(post.postId) },
onBookmarkEditClick = { bookmarkViewModel.toggleSelection(post.postId) }
)
}
}
Expand Down Expand Up @@ -222,7 +224,8 @@ private fun BookmarkPostItem(
post: BookmarkPost,
isEditMode: Boolean,
isSelected: Boolean,
onBookmarkClick: () -> Unit
onBookmarkPostClick: (BookmarkPost) -> Unit,
onBookmarkEditClick: () -> Unit
) {
Box {
RoundImageView(
Expand All @@ -232,12 +235,19 @@ private fun BookmarkPostItem(
modifier = Modifier
.fillMaxWidth()
.aspectRatio(1f)
.clickableSingle(onClick = {
if (isEditMode) {
onBookmarkEditClick()
} else {
onBookmarkPostClick(post)
}
})
)

if (isEditMode) {
DayoCheckbox(
checked = isSelected,
onCheckedChange = { onBookmarkClick() },
onCheckedChange = { onBookmarkEditClick() },
modifier = Modifier.align(Alignment.TopEnd)
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ fun NavGraphBuilder.myPageNavGraph(

composable(MyPageRoute.bookmark()) {
BookmarkScreen(
onPostClick = onPostClick,
onBackClick = onBackClick
)
}
Expand Down
Loading