Skip to content

Commit cf40ad0

Browse files
committed
[refactor]: PR리뷰 반영 (#127)
1 parent 6e9195b commit cf40ad0

File tree

3 files changed

+8
-21
lines changed

3 files changed

+8
-21
lines changed

app/src/main/java/com/texthip/thip/ui/feed/component/MyFeedCard.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,9 @@ fun MyFeedCard(
4545
) {
4646
val hasImages = feedItem.imageUrls.isNotEmpty()
4747
val maxTextLines = if (hasImages) 3 else 8
48-
var isTextTruncated by remember { mutableStateOf(false) }
4948

5049
// 실제 텍스트 줄 수를 기준으로 표시할 텍스트 계산
51-
val processedText = remember(feedItem.content) {
50+
val processedText = remember(feedItem.content, hasImages) {
5251
val lines = feedItem.content.split("\n")
5352
val nonEmptyLines = mutableListOf<Int>() // 실제 텍스트가 있는 줄의 인덱스
5453

@@ -67,6 +66,9 @@ fun MyFeedCard(
6766
lines.take(lastAllowedLineIndex + 1).joinToString("\n")
6867
}
6968
}
69+
70+
// 잘림 여부는 파생 값으로 계산
71+
val isTextTruncated = processedText != feedItem.content
7072

7173
Column(
7274
modifier = modifier
@@ -126,10 +128,6 @@ fun MyFeedCard(
126128
modifier = Modifier
127129
.fillMaxWidth()
128130
.padding(top = 16.dp),
129-
onTextLayout = { textLayoutResult ->
130-
// 원본 텍스트와 처리된 텍스트가 다르면 잘렸다고 판단
131-
isTextTruncated = processedText != feedItem.content
132-
}
133131
)
134132

135133
// 텍스트가 잘린 경우에만 "...더보기" 표시

app/src/main/java/com/texthip/thip/ui/group/makeroom/viewmodel/GroupMakeRoomViewModel.kt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -210,15 +210,6 @@ class GroupMakeRoomViewModel @Inject constructor(
210210
)
211211
}
212212

213-
private fun BookUserSaveList.toBookDataFromSaved(): BookData {
214-
return BookData(
215-
title = this.bookTitle,
216-
imageUrl = this.bookImageUrl,
217-
author = this.authorName,
218-
isbn = this.isbn
219-
)
220-
}
221-
222213
private fun BookSearchItem.toBookData(): BookData {
223214
return BookData(
224215
title = this.title,

app/src/main/java/com/texthip/thip/ui/mypage/component/SavedFeedCard.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,9 @@ fun SavedFeedCard(
4949
) {
5050
val hasImages = feedItem.imageUrls.isNotEmpty()
5151
val maxTextLines = if (hasImages) 3 else 8
52-
var isTextTruncated by remember { mutableStateOf(false) }
5352

5453
// 실제 텍스트 줄 수를 기준으로 표시할 텍스트 계산
55-
val processedText = remember(feedItem.content) {
54+
val processedText = remember(feedItem.content, hasImages) {
5655
val lines = feedItem.content.split("\n")
5756
val nonEmptyLines = mutableListOf<Int>() // 실제 텍스트가 있는 줄의 인덱스
5857

@@ -71,6 +70,9 @@ fun SavedFeedCard(
7170
lines.take(lastAllowedLineIndex + 1).joinToString("\n")
7271
}
7372
}
73+
74+
// 잘림 여부는 파생 값으로 계산
75+
val isTextTruncated = processedText != feedItem.content
7476

7577
Column(
7678
modifier = modifier
@@ -110,10 +112,6 @@ fun SavedFeedCard(
110112
style = typography.feedcopy_r400_s14_h20,
111113
color = colors.White,
112114
modifier = Modifier.fillMaxWidth(),
113-
onTextLayout = { textLayoutResult ->
114-
// 원본 텍스트와 처리된 텍스트가 다르면 잘렸다고 판단
115-
isTextTruncated = processedText != feedItem.content
116-
}
117115
)
118116

119117
// 텍스트가 잘린 경우에만 "...더보기" 표시

0 commit comments

Comments
 (0)