[REFACTOR] QA 반영 3차 #120
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,14 @@ | ||
| package com.texthip.thip.ui.common.cards | ||
|
|
||
| import androidx.compose.foundation.Image | ||
| import androidx.compose.foundation.border | ||
| import androidx.compose.foundation.clickable | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.padding | ||
|
|
@@ -41,6 +44,7 @@ fun CardItemRoom( | |
| endDate: String? = null, | ||
| imageUrl: String? = null, | ||
| hasBorder: Boolean = false, | ||
| isSecret: Boolean? = null, | ||
| onClick: () -> Unit = {} | ||
| ) { | ||
| Card( | ||
|
|
@@ -71,12 +75,23 @@ fun CardItemRoom( | |
| modifier = Modifier.fillMaxWidth() | ||
| ) { | ||
| // 이미지 | ||
| Box( | ||
| modifier = Modifier.size(width = 80.dp, height = 107.dp) | ||
| ) { | ||
| AsyncImage( | ||
| model = imageUrl ?: R.drawable.img_book_cover_sample, | ||
| contentDescription = "책 이미지", | ||
| modifier = Modifier.fillMaxSize(), | ||
| contentScale = ContentScale.Crop | ||
| ) | ||
| if (isSecret == true) { | ||
| Image( | ||
| painter = painterResource(id = R.drawable.ic_secret_cover), | ||
| contentDescription = "비밀방", | ||
| modifier = Modifier.fillMaxSize() | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| Spacer(modifier = Modifier.width(12.dp)) | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,5 +7,6 @@ data class FeedStateUpdateResult( | |
| val feedId: Long, | ||
| val isLiked: Boolean, | ||
| val likeCount: Int, | ||
| val isSaved: Boolean, | ||
| val commentCount: Int | ||
| ) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -96,6 +96,7 @@ fun FeedCommentScreen( | |
| handle.set("updated_feed_isLiked", detail.isLiked) | ||
| handle.set("updated_feed_likeCount", detail.likeCount) | ||
| handle.set("updated_feed_isSaved", detail.isSaved) | ||
| handle.set("updated_feed_commentCount", detail.commentCount) | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -114,6 +115,14 @@ fun FeedCommentScreen( | |
| commentsViewModel.initialize(postId = feedId.toLong(), postType = "FEED") | ||
| } | ||
|
|
||
| // 댓글이 생성되면 피드 상세 정보를 다시 로드 | ||
| LaunchedEffect(commentsUiState.isCommentCreated) { | ||
| if (commentsUiState.isCommentCreated) { | ||
| feedDetailViewModel.loadFeedDetail(feedId) | ||
| commentsViewModel.resetCommentCreatedState() | ||
| } | ||
| } | ||
|
|
||
| // 로딩 상태 처리 | ||
| if (feedDetailUiState.isLoading) { | ||
| Box( | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -83,9 +83,9 @@ fun FeedMyContent( | |
| likeCount = this.likeCount, | ||
| commentCount = this.commentCount, | ||
| isPublic = this.isPublic, | ||
| isSaved = this.isSaved, | ||
| isLiked = this.isLiked, | ||
| isWriter = this.isWriter | ||
| ) | ||
| } | ||
|
|
||
|
|
@@ -203,8 +203,8 @@ private fun FeedMyScreenPreview() { | |
| bookTitle = "나의 책 제목 ${it + 1}", bookAuthor = "나", | ||
| contentBody = "내가 작성한 피드 내용입니다. 내용은 여기에 표시됩니다.", | ||
| contentUrls = emptyList(), likeCount = 15, commentCount = 3, | ||
| isPublic = true, isSaved = false, isLiked = it % 2 == 0, | ||
| isWriter = true | ||
| ) | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,8 +16,8 @@ import androidx.compose.foundation.layout.height | |
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.foundation.lazy.LazyColumn | ||
| import androidx.compose.foundation.lazy.LazyListState | ||
| import androidx.compose.foundation.lazy.itemsIndexed | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.material3.CircularProgressIndicator | ||
| import androidx.compose.material3.ExperimentalMaterial3Api | ||
|
|
@@ -32,6 +32,7 @@ import androidx.compose.runtime.getValue | |
| import androidx.compose.runtime.mutableStateOf | ||
| import androidx.compose.runtime.remember | ||
| import androidx.compose.runtime.rememberCoroutineScope | ||
| import androidx.compose.runtime.saveable.rememberSaveable | ||
| import androidx.compose.runtime.setValue | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
|
|
@@ -85,20 +86,28 @@ fun FeedScreen( | |
| val scope = rememberCoroutineScope() | ||
| var showProgressBar by remember { mutableStateOf(false) } | ||
| val progress = remember { Animatable(0f) } | ||
|
|
||
| val feedTabTitles = listOf(stringResource(R.string.feed), stringResource(R.string.my_feed)) | ||
|
|
||
| // 탭별로 별도의 스크롤 상태 관리 | ||
| val allFeedListState = rememberSaveable(saver = LazyListState.Saver) { | ||
| LazyListState() | ||
| } | ||
| val myFeedListState = rememberSaveable(saver = LazyListState.Saver) { | ||
| LazyListState() | ||
| } | ||
| val currentListState = when (feedUiState.selectedTabIndex) { | ||
| 0 -> allFeedListState | ||
| 1 -> myFeedListState | ||
| else -> allFeedListState | ||
| } | ||
|
|
||
| // 무한 스크롤 로직 | ||
| val shouldLoadMore by remember( | ||
| feedUiState.canLoadMoreCurrentTab, | ||
| feedUiState.isLoadingMore, | ||
| feedUiState.selectedTabIndex | ||
| ) { | ||
| derivedStateOf { | ||
| val layoutInfo = currentListState.layoutInfo | ||
| val totalItems = layoutInfo.totalItemsCount | ||
|
|
@@ -127,14 +136,27 @@ fun FeedScreen( | |
| feedViewModel.loadMoreFeeds() | ||
| } | ||
| } | ||
|
|
||
| var isUserTabChange by remember { mutableStateOf(false) } | ||
|
|
||
| LaunchedEffect(Unit) { | ||
| // 최초 진입시에만 데이터 로딩 | ||
| if (feedUiState.allFeeds.isEmpty() && feedUiState.myFeeds.isEmpty()) { | ||
| feedViewModel.refreshData() | ||
| } | ||
| val hasUpdatedFeedData = | ||
| navController.currentBackStackEntry?.savedStateHandle?.get<Long>("updated_feed_id") != null | ||
|
|
||
| if (!hasUpdatedFeedData) { | ||
| allFeedListState.scrollToItem(0) | ||
| } | ||
| } | ||
|
|
||
| LaunchedEffect(feedUiState.selectedTabIndex) { | ||
| if (isUserTabChange) { | ||
| currentListState.scrollToItem(0) | ||
| isUserTabChange = false | ||
| } | ||
| } | ||
|
|
||
| LaunchedEffect(resultFeedId) { | ||
|
|
@@ -156,12 +178,13 @@ fun FeedScreen( | |
| } | ||
| } | ||
| } | ||
|
|
||
| LaunchedEffect(refreshFeed) { | ||
| if (refreshFeed == true) { | ||
| onRefreshConsumed() | ||
| if (resultFeedId == null) { | ||
| feedViewModel.refreshData() | ||
| currentListState.scrollToItem(0) | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -172,12 +195,14 @@ fun FeedScreen( | |
| val isLiked = handle.get<Boolean>("updated_feed_isLiked") ?: false | ||
| val likeCount = handle.get<Int>("updated_feed_likeCount") ?: 0 | ||
| val isSaved = handle.get<Boolean>("updated_feed_isSaved") ?: false | ||
| val commentCount = handle.get<Int>("updated_feed_commentCount") ?: 0 | ||
|
|
||
| val result = FeedStateUpdateResult( | ||
| feedId = feedId, | ||
| isLiked = isLiked, | ||
| likeCount = likeCount, | ||
| isSaved = isSaved, | ||
| commentCount = commentCount | ||
| ) | ||
|
|
||
| feedViewModel.updateFeedStateFromResult(result) | ||
|
|
@@ -186,6 +211,7 @@ fun FeedScreen( | |
| handle.remove<Boolean>("updated_feed_isLiked") | ||
| handle.remove<Int>("updated_feed_likeCount") | ||
| handle.remove<Boolean>("updated_feed_isSaved") | ||
| handle.remove<Int>("updated_feed_commentCount") | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -222,7 +248,10 @@ fun FeedScreen( | |
| HeaderMenuBarTab( | ||
| titles = feedTabTitles, | ||
| selectedTabIndex = feedUiState.selectedTabIndex, | ||
| onTabSelected = { index -> | ||
| isUserTabChange = true | ||
| feedViewModel.onTabSelected(index) | ||
| } | ||
| ) | ||
|
|
||
| // 스크롤 영역 전체 | ||
|
|
@@ -269,7 +298,7 @@ fun FeedScreen( | |
| } | ||
| } | ||
| } | ||
|
|
||
| if (feedUiState.selectedTabIndex == 1) { | ||
| // 내 피드 | ||
| item { | ||
|
|
@@ -280,15 +309,17 @@ fun FeedScreen( | |
| profileImage = myFeedInfo?.profileImageUrl, | ||
| nickname = myFeedInfo?.nickname ?: "", | ||
| badgeText = myFeedInfo?.aliasName ?: "", | ||
| badgeTextColor = myFeedInfo?.aliasColor?.let { hexToColor(it) } | ||
| ?: colors.NeonGreen, | ||
| buttonText = "", | ||
| buttonWidth = 60.dp, | ||
| showButton = false | ||
| ) | ||
| Spacer(modifier = Modifier.height(16.dp)) | ||
| FeedSubscribeBarlist( | ||
| modifier = Modifier.padding(horizontal = 20.dp), | ||
| followerProfileImageUrls = myFeedInfo?.latestFollowerProfileImageUrls | ||
| ?: emptyList(), | ||
| onClick = { | ||
| myFeedInfo?.creatorId?.let { creatorId -> | ||
| onNavigateToOthersSubscription(creatorId) | ||
|
|
@@ -297,7 +328,10 @@ fun FeedScreen( | |
| ) | ||
| Spacer(modifier = Modifier.height(40.dp)) | ||
| Text( | ||
| text = stringResource( | ||
| R.string.whole_num, | ||
| myFeedInfo?.totalFeedCount ?: 0 | ||
| ), | ||
| style = typography.menu_m500_s14_h24, | ||
| color = colors.Grey, | ||
| modifier = Modifier | ||
|
|
@@ -327,7 +361,9 @@ fun FeedScreen( | |
| } | ||
| } | ||
| } else { | ||
| itemsIndexed( | ||
| feedUiState.myFeeds, | ||
| key = { _, item -> item.feedId }) { index, myFeed -> | ||
| Spacer(modifier = Modifier.height(if (index == 0) 20.dp else 40.dp)) | ||
|
|
||
| // MyFeedItem을 FeedItem으로 변환 | ||
|
|
@@ -342,16 +378,16 @@ fun FeedScreen( | |
| content = myFeed.contentBody, | ||
| likeCount = myFeed.likeCount, | ||
| commentCount = myFeed.commentCount, | ||
| isLiked = myFeed.isLiked, | ||
| isSaved = myFeed.isSaved, | ||
| isLocked = !myFeed.isPublic, // isPublic의 반대값 | ||
| tags = emptyList(), | ||
| imageUrls = myFeed.contentUrls | ||
| ) | ||
|
|
||
| MyFeedCard( | ||
| feedItem = feedItem, | ||
| onLikeClick = { feedViewModel.changeFeedLike(feedItem.id) }, | ||
| onContentClick = { | ||
| onNavigateToFeedComment(feedItem.id) | ||
| }, | ||
|
|
@@ -378,7 +414,9 @@ fun FeedScreen( | |
| onClick = onNavigateToMySubscription | ||
| ) | ||
| } | ||
| itemsIndexed( | ||
| feedUiState.allFeeds, | ||
| key = { _, item -> item.feedId }) { index, allFeed -> | ||
| // AllFeedItem을 FeedItem으로 변환 | ||
| val feedItem = FeedItem( | ||
| id = allFeed.feedId.toLong(), | ||
|
|
@@ -454,7 +492,7 @@ fun FeedScreen( | |
| icon = painterResource(id = R.drawable.ic_write), | ||
| onClick = onNavigateToFeedWrite | ||
| ) | ||
|
|
||
| // 탭 전환 시 화면 가운데 로딩 인디케이터 | ||
| if (feedUiState.isRefreshing) { | ||
| Box( | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Verification agent
🧩 Analysis chain
MyFeedItem에 isSaved/isLiked 추가: 서버 누락 시 크래시 가능
신규 불린 필드를 비-옵셔널로 추가하면, 구버전 서버/캐시된 응답/실험 플래그 미적용 환경에서 역직렬화가 실패할 수 있습니다. 기본값을 지정해 하위 호환성을 확보하세요.
또한, 새 필드가 누락되더라도 UI/도메인 매핑이 자연스럽게 동작하는지(예: 기본 false로 표시) 확인 바랍니다.
디코딩 회귀 테스트 추가 제안:
기본값 누락 여부 확인을 위해 아래 스크립트를 실행합니다.
🏁 Script executed:
Length of output: 1031
MyFeedResponse.kt의 isSaved/isLiked에 기본값(false) 지정 필수
검증 결과,
app/src/main/java/com/texthip/thip/data/model/feed/response/MyFeedResponse.kt파일의 26–27행에 선언된 두 Boolean 필드에 기본값이 없어, 서버에서 해당 필드가 누락될 경우 역직렬화 실패로 앱이 크래시될 수 있습니다.수정 제안:
app/src/main/java/com/texthip/thip/data/model/feed/response/MyFeedResponse.kt추가 확인 및 작업:
false로 자연스럽게 처리되는지 확인isSaved/isLiked누락 기존 JSON → 기본값 적용 후 정상 디코딩📝 Committable suggestion
🤖 Prompt for AI Agents