Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
2f371af
♻️ Refactor: `action_sting` 리소스명을 `action_poke`로 변경
chanho0908 Feb 26, 2026
94b36e3
✨ Feat: 인증 상세 화면 '찌르기' 기능 구현
chanho0908 Feb 26, 2026
a380558
Merge branch 'feat/#110-stats-detail-api' into feat/#112-task-certifi…
chanho0908 Feb 26, 2026
758cbd9
Merge branch 'feat/#104-photolog-interaction' into feat/#112-task-cer…
chanho0908 Feb 26, 2026
73c72a7
✨ Feat: 인증샷 화면용 찌르기 액션 아이콘 추가
chanho0908 Feb 26, 2026
85c3dad
✨ Feat: 종료된 목표 인증/찌르기 비활성화 기능 추가
chanho0908 Feb 26, 2026
9179402
Merge branch 'feat/#110-stats-detail-api' into feat/#112-task-certifi…
chanho0908 Feb 26, 2026
8f7c4d2
Merge branch 'feat/#110-stats-detail-api' into feat/#112-task-certifi…
chanho0908 Feb 26, 2026
55939d6
♻️ Refactor: `BackgroundCard` 컴포넌트 불필요한 레이아웃 속성 제거
chanho0908 Feb 26, 2026
dd00550
🔥 Style: `ic_keepi_sting.xml` 리소스 삭제
chanho0908 Feb 26, 2026
86d3d4c
Merge branch 'feat/#110-stats-detail-api' into feat/#112-task-certifi…
chanho0908 Feb 26, 2026
2ccbe30
🎨 Style: `StatsDetailViewModel` 코드 포맷팅 수정
chanho0908 Feb 26, 2026
19574aa
Merge branch 'feat/#110-stats-detail-api' into feat/#112-task-certifi…
chanho0908 Feb 26, 2026
f0adc61
♻️ Refactor: `TaskCertificationDetailViewModel` 내 `showToast` 함수 susp…
chanho0908 Feb 26, 2026
aad26b1
✨ Feat: `ReactionEffect` 애니메이션 종료 콜백 추가
chanho0908 Feb 27, 2026
47dba7c
✨ Feat: 인증 상세 내 리액션 인터렉션 추가
chanho0908 Feb 27, 2026
c3bb17c
🔥 Chore: 중복 리액션 아이콘 에셋 삭제
chanho0908 Feb 27, 2026
3e4896a
🎨 Style: 로그인 화면 아이콘 리소스 변경
chanho0908 Feb 27, 2026
8da390b
♻️ Refactor: `ReactionUiModel` 리소스 네이밍 수정
chanho0908 Feb 27, 2026
6fab102
✨ Feat: 내 인증샷 반응 표시 기능 및 배지 UI 추가
chanho0908 Feb 27, 2026
14a99c3
✨ Docs: `TaskCertificationDetailUiState` KDoc 주석 추가
chanho0908 Feb 27, 2026
62dcd1f
✨ Feat: 내 인증샷 노출 시에만 리액션 효과가 나타나도록 수정
chanho0908 Feb 27, 2026
8ff18ab
✨ Feat: 인증샷 반응 시 목표 리스트 갱신 로직 추가
chanho0908 Feb 27, 2026
4c25f8f
📝 Docs: `TaskCertificationDetailUiState` 내 용어 정정
chanho0908 Feb 27, 2026
063fc40
✨ Feat: 내 인증샷 리액션 뱃지 표시 로직 수정 및 변수명 변경
chanho0908 Feb 27, 2026
9511772
✨ Feat: 리액션 효과 수치 조정
chanho0908 Feb 27, 2026
b7cb02d
🎨 Style: 리액션 아이콘 리소스 업데이트
chanho0908 Feb 27, 2026
938031c
✨ Style: `ic_hug` 아이콘 리소스 수정
chanho0908 Feb 27, 2026
2ce71e0
Revert "✨ Style: `ic_hug` 아이콘 리소스 수정"
chanho0908 Feb 27, 2026
33abbc7
Revert "🎨 Style: 로그인 화면 아이콘 리소스 변경"
chanho0908 Feb 27, 2026
2a1e6af
Revert "🎨 Style: 로그인 화면 아이콘 리소스 변경"
chanho0908 Feb 27, 2026
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 @@ -27,19 +27,19 @@ import com.twix.ui.extension.noRippleClickable

@Composable
fun BackgroundCard(
isCertificated: Boolean,
uploadedAt: String,
buttonTitle: String,
onClick: () -> Unit,
actionLabel: String,
rotation: Float,
onClickAction: () -> Unit,
showActionButton: Boolean,
) {
Column {
PhotologCard(
background = GrayColor.C200,
borderColor = GrayColor.C500,
rotation = rotation,
)
if (isCertificated) {
if (!showActionButton) {
AppText(
text = uploadedAt,
style = AppTextStyle.B4,
Expand All @@ -60,19 +60,19 @@ fun BackgroundCard(
Modifier
.width(150.dp)
.height(74.dp)
.noRippleClickable { onClick() },
text = buttonTitle,
.noRippleClickable { onClickAction() },
text = actionLabel,
textColor = GrayColor.C500,
backgroundColor = CommonColor.White,
)
}

Image(
imageVector = ImageVector.vectorResource(R.drawable.ic_keepi_sting),
imageVector = ImageVector.vectorResource(R.drawable.ic_photolog_action_poke),
contentDescription = null,
modifier =
Modifier
.padding(end = 24.dp, top = 15.dp)
.padding(end = 16.dp, top = 15.dp)
.align(Alignment.TopEnd),
)
}
Expand All @@ -85,10 +85,10 @@ fun BackgroundCard(
fun PreviewBackgroundCard() {
TwixTheme {
BackgroundCard(
buttonTitle = stringResource(R.string.word_sting),
actionLabel = stringResource(R.string.word_sting),
uploadedAt = "2023.10.31 23:59",
onClick = {},
isCertificated = true,
onClickAction = {},
showActionButton = true,
rotation = -8f,
)
}
Expand Down
136 changes: 59 additions & 77 deletions core/design-system/src/main/res/drawable/ic_doubt.xml

Large diffs are not rendered by default.

84 changes: 42 additions & 42 deletions core/design-system/src/main/res/drawable/ic_fuck.xml

Large diffs are not rendered by default.

89 changes: 52 additions & 37 deletions core/design-system/src/main/res/drawable/ic_happy.xml

Large diffs are not rendered by default.

69 changes: 0 additions & 69 deletions core/design-system/src/main/res/drawable/ic_keepi_angry.xml

This file was deleted.

Loading