From e1a318b7307878e89df4f1517815282c6e3dec81 Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Tue, 7 Apr 2026 22:02:39 +0900 Subject: [PATCH 1/2] #1049 [QA] Fix entire thumbnail card clickable --- .../daily/dayo/presentation/screen/bookmark/BookmarkScreen.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/bookmark/BookmarkScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/bookmark/BookmarkScreen.kt index 57079a5f..3560d5df 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/bookmark/BookmarkScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/bookmark/BookmarkScreen.kt @@ -224,7 +224,9 @@ private fun BookmarkPostItem( isSelected: Boolean, onBookmarkClick: () -> Unit ) { - Box { + Box( + modifier = Modifier.clickableSingle(onClick = { onBookmarkClick() }) + ) { RoundImageView( context = LocalContext.current, imageUrl = "${BuildConfig.BASE_URL}/images/${post.thumbnailImage}", From 63089575815bb998a1f63d6e4d4415ff20f744e6 Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Wed, 8 Apr 2026 21:35:46 +0900 Subject: [PATCH 2/2] [feature] Add navigate to bookmark post --- .../screen/bookmark/BookmarkScreen.kt | 20 +++++++++++++------ .../screen/mypage/MypageNavigation.kt | 1 + 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/bookmark/BookmarkScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/bookmark/BookmarkScreen.kt index 3560d5df..bfbcdddb 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/bookmark/BookmarkScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/bookmark/BookmarkScreen.kt @@ -50,6 +50,7 @@ import java.text.DecimalFormat @Composable fun BookmarkScreen( + onPostClick: (Long) -> Unit, onBackClick: () -> Unit, bookmarkViewModel: BookmarkViewModel = hiltViewModel() ) { @@ -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) } ) } } @@ -222,11 +224,10 @@ private fun BookmarkPostItem( post: BookmarkPost, isEditMode: Boolean, isSelected: Boolean, - onBookmarkClick: () -> Unit + onBookmarkPostClick: (BookmarkPost) -> Unit, + onBookmarkEditClick: () -> Unit ) { - Box( - modifier = Modifier.clickableSingle(onClick = { onBookmarkClick() }) - ) { + Box { RoundImageView( context = LocalContext.current, imageUrl = "${BuildConfig.BASE_URL}/images/${post.thumbnailImage}", @@ -234,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) ) } diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/mypage/MypageNavigation.kt b/presentation/src/main/java/daily/dayo/presentation/screen/mypage/MypageNavigation.kt index 130a9208..04d9134e 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/mypage/MypageNavigation.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/mypage/MypageNavigation.kt @@ -125,6 +125,7 @@ fun NavGraphBuilder.myPageNavGraph( composable(MyPageRoute.bookmark()) { BookmarkScreen( + onPostClick = onPostClick, onBackClick = onBackClick ) }