Skip to content

Commit 46e3fa5

Browse files
authored
Merge pull request #743 from Team-WSS/feat/742
fix: 서재소소 최종 QA 사항 반영
2 parents ae015ff + b4004f0 commit 46e3fa5

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

app/src/main/java/com/into/websoso/ui/novelRating/NovelRatingViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,8 @@ class NovelRatingViewModel
307307
novelRatingEntity = NovelRatingEntity(
308308
userNovelId = novel?.userNovel?.userNovelId,
309309
novelId = novel?.novel?.novelId ?: 0,
310-
userNovelRating = novel?.userRating?.novelRating ?: 0.0f,
311-
novelRating = novelRating,
310+
userNovelRating = novelRating,
311+
novelRating = novel?.userRating?.novelRating ?: 0.0f,
312312
novelTitle = novel?.novel?.novelTitle,
313313
novelImage = novel?.novel?.novelImage,
314314
startDate = ratingModel

domain/library/src/main/java/com/into/websoso/domain/library/model/ReadStatus.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ enum class ReadStatus(
66
) {
77
WATCHING("WATCHING", "보는중"),
88
WATCHED("WATCHED", "봤어요"),
9-
QUIT("QUIT", "하차함"),
9+
QUIT("QUIT", "하차"),
1010
;
1111

1212
companion object {

feature/library/src/main/java/com/into/websoso/feature/library/component/LibraryFilterEmptyView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ internal fun LibraryFilterEmptyView() {
4040
Spacer(modifier = Modifier.height(8.dp))
4141
Text(
4242
text = "해당하는 작품이 없어요\n" +
43-
"다른 검색어를 시도해보세요",
43+
"검색의 범위를 더 넓혀보세요",
4444
style = WebsosoTheme.typography.body1,
4545
color = Gray200,
4646
textAlign = TextAlign.Center,

feature/library/src/main/java/com/into/websoso/feature/library/component/LibraryGridListItem.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.fillMaxSize
1111
import androidx.compose.foundation.layout.padding
1212
import androidx.compose.foundation.layout.size
1313
import androidx.compose.foundation.layout.width
14+
import androidx.compose.foundation.layout.widthIn
1415
import androidx.compose.foundation.layout.wrapContentHeight
1516
import androidx.compose.foundation.shape.RoundedCornerShape
1617
import androidx.compose.material3.Text
@@ -134,7 +135,7 @@ private fun ReadStatusBadge(
134135
) {
135136
Box(
136137
modifier = modifier
137-
.width(48.dp)
138+
.widthIn(48.dp)
138139
.background(
139140
color = readStatusUiModel.backgroundColor,
140141
shape = RoundedCornerShape(4.dp),
@@ -145,6 +146,7 @@ private fun ReadStatusBadge(
145146
text = readStatusUiModel.readStatus.label,
146147
color = White,
147148
style = WebsosoTheme.typography.label2,
149+
maxLines = 1,
148150
)
149151
}
150152
}

feature/library/src/main/java/com/into/websoso/feature/library/component/LibrayFilterTopBar.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,21 +101,22 @@ private fun NovelFilterChipSection(
101101
.height(32.dp)
102102
.background(color = Gray70),
103103
)
104+
104105
NovelFilterChip(
105106
text = libraryFilterUiModel.readStatusLabelText,
106107
isSelected = libraryFilterUiModel.readStatuses.isSelected,
107108
onClick = onFilterClick,
108109
)
109110

110111
NovelFilterChip(
111-
text = libraryFilterUiModel.ratingText,
112-
isSelected = libraryFilterUiModel.novelRating.isSelected,
112+
text = libraryFilterUiModel.attractivePointLabelText,
113+
isSelected = libraryFilterUiModel.attractivePoints.isSelected,
113114
onClick = onFilterClick,
114115
)
115116

116117
NovelFilterChip(
117-
text = libraryFilterUiModel.attractivePointLabelText,
118-
isSelected = libraryFilterUiModel.attractivePoints.isSelected,
118+
text = libraryFilterUiModel.ratingText,
119+
isSelected = libraryFilterUiModel.novelRating.isSelected,
119120
onClick = onFilterClick,
120121
)
121122
}

0 commit comments

Comments
 (0)