Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
42636e4
[refactor]: userPercentage Int로 수정 (#101)
Nico1eKim Aug 20, 2025
f560e69
[refactor]: mypage save screen에서 피드, 책 클릭하면 화면 이동하도록 수정 (#101)
Nico1eKim Aug 20, 2025
b3a7f7a
[refactor]: bottom bar padding 수정 (#101)
Nico1eKim Aug 20, 2025
7600a36
[refactor]: toast bar 애니메이션 추가 (#101)
Nico1eKim Aug 20, 2025
af0ca7f
[refactor]: 글 없을 때 padding 수정 (#101)
Nico1eKim Aug 20, 2025
4c31381
[refactor]: 피드 신고했을 때 토스트 제대로 없어지게 수정 (#101)
Nico1eKim Aug 20, 2025
53446a8
[refactor]: 사진 자세히 볼 때 백그라운드에 검은색 흐리게 추가 (#101)
Nico1eKim Aug 20, 2025
fd06031
[refactor]: 피드 댓글 삭제/신고 바텀시트로 수정 (#101)
Nico1eKim Aug 20, 2025
3a652ff
[refactor]: 피드, 댓글일 때 신고 멘트 다르게 하기 (#101)
Nico1eKim Aug 20, 2025
a4434f9
[refactor]: isMyself response 추가 (#101)
Nico1eKim Aug 20, 2025
3d151ee
[feat]: 내 프로필 화면 추가 (#101)
Nico1eKim Aug 20, 2025
08bdd77
[feat]: 유저 프로필 누르면 올바른 프로필 화면을 이동하게 구현 (#101)
Nico1eKim Aug 20, 2025
43c87f8
[refactor]: 페이지 필터 열려있으면 다른 버튼 안눌리게 수정 (#101)
Nico1eKim Aug 20, 2025
2166ffe
[refactor]: 투표, 기록 생성 페이지 스크롤 가능하게 수정 (#101)
Nico1eKim Aug 20, 2025
815314e
[refactor]: 글 작성 시 책 검색 바텀시트 높이 수정 (#101)
Nico1eKim Aug 20, 2025
1998cee
[refactor]: 글 작성 시 칩 5개 다 클릭하면 비활성화 되게 수정 (#101)
Nico1eKim Aug 20, 2025
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 @@ -20,7 +20,7 @@ data class RoomsPlayingResponse(
val bookTitle: String,
val authorName: String,
val currentPage: Int,
val userPercentage: Double,
val userPercentage: Int,
val currentVotes: List<CurrentVote>
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ data class FollowerList(
@SerializedName("profileImageUrl") val profileImageUrl: String?,
@SerializedName("aliasName") val aliasName: String,
@SerializedName("aliasColor") val aliasColor: String,
@SerializedName("followerCount") val followerCount: Int
@SerializedName("followerCount") val followerCount: Int,
@SerializedName("isMyself") val isMyself: Boolean
)

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ fun OptionChipButton(
val checked = isSelected ?: isClicked

val textColor = when {
!enabled && isFilled -> colors.Grey02
!enabled -> colors.DarkGrey
isFilled -> colors.White
checked -> colors.Purple
else -> colors.Grey01
Expand All @@ -54,6 +54,7 @@ fun OptionChipButton(
else -> Color.Transparent
}
val borderColor = when {
!enabled -> colors.DarkGrey02
!isFilled && checked -> colors.Purple
!isFilled -> colors.Grey02
else -> Color.Transparent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,17 @@ fun SubGenreChipGrid(
horizontalArrangement = Arrangement.spacedBy(8.dp, horizontalAlignment),
verticalArrangement = Arrangement.spacedBy(8.dp)
) {
val isLimitReached = selectedGenres.size >= 5

subGenres.forEach { genre ->
val isSelected = selectedGenres.contains(genre)
val isEnabled = isSelected || !isLimitReached

OptionChipButton(
text = genre,
isSelected = selectedGenres.contains(genre),
isSelected = isSelected,
isFilled = false,
enabled = isEnabled,
onClick = { onGenreToggle(genre) }
)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.texthip.thip.ui.common.cards

import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
Expand Down Expand Up @@ -40,12 +41,14 @@ fun CardBookList(
imageUrl: String? = null, // API에서 받은 이미지 URL
showBookmark: Boolean = false,
isBookmarked: Boolean = false,
onBookmarkClick: () -> Unit = {}
onBookmarkClick: () -> Unit = {},
onClick: () -> Unit = {},
) {
Row(
modifier = modifier
.fillMaxWidth()
.background(Color.Transparent),
.background(Color.Transparent)
.clickable { onClick() },
) {
// 책 이미지
AsyncImage(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ fun ImageViewerModal(
Box(
modifier = Modifier
.fillMaxSize()
.background(colors.Black80)
.clickable { onDismiss() }
) {
// 이전 버튼
Expand All @@ -66,7 +67,8 @@ fun ImageViewerModal(
.clickable { /* HorizontalPager 내부 클릭 시 모달 닫기 방지 */ }
) { page ->
Box(
modifier = Modifier.fillMaxSize(),
modifier = Modifier
.fillMaxSize(),
contentAlignment = Alignment.Center
) {
AsyncImage(
Expand Down Expand Up @@ -103,7 +105,11 @@ fun ImageViewerModal(
// 이미지 카운터 (예: 1/3)
if (imageUrls.size > 1) {
Text(
text = stringResource(id = R.string.tag_count, pagerState.currentPage + 1, imageUrls.size),
text = stringResource(
id = R.string.tag_count,
pagerState.currentPage + 1,
imageUrls.size
),
style = typography.copy_r400_s14,
color = colors.White,
modifier = Modifier
Expand Down
Loading