-
Notifications
You must be signed in to change notification settings - Fork 1
목표 컴포넌트 구현 #64
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
목표 컴포넌트 구현 #64
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
cb763df
🍱 Chore: 리소스 추가
dogmania 2be0263
✨ Feat: coil-network 의존성 추가
dogmania f46fe31
✨ Feat: 목표 카드 공통 프레임 구현
dogmania b435ac3
✨ Feat: 목표 리액션 타입 정의
dogmania f73cf20
✨ Feat: 목표 완료 상태 정의
dogmania 58d4b5d
✨ Feat: 목표 리액션 타입 정의
dogmania 34d8535
✨ Feat: 홈 화면 목표 인증 상태 컴포넌트 구현
dogmania 10a9798
✨ Feat: GoalCheckState 계산 메서드 구현
dogmania 69c8f1b
✨ Feat: reaction -> GoalReactionType 변환 로직 추가
dogmania a680958
🔥 Remove: 불필요한 임포트 제거
dogmania 25e15d1
✨ Feat: 홈 화면 목표 렌더링 로직 구현
dogmania 29ae945
♻️ Refactor: interface -> sealed interface로 변경
dogmania a4647c0
Merge branch 'develop' of github.com:YAPP-Github/Twix-Android into fe…
dogmania File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
81 changes: 81 additions & 0 deletions
81
core/design-system/src/main/java/com/twix/designsystem/components/goal/GoalCardFrame.kt
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 |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| package com.twix.designsystem.components.goal | ||
|
|
||
| import androidx.compose.foundation.Image | ||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.border | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.ColumnScope | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.RowScope | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.foundation.layout.width | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.draw.clip | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.text.style.TextOverflow | ||
| import androidx.compose.ui.unit.dp | ||
| import com.twix.designsystem.components.text.AppText | ||
| import com.twix.designsystem.extension.toRes | ||
| import com.twix.designsystem.theme.CommonColor | ||
| import com.twix.designsystem.theme.GrayColor | ||
| import com.twix.domain.model.enums.AppTextStyle | ||
| import com.twix.domain.model.enums.GoalIconType | ||
|
|
||
| @Composable | ||
| fun GoalCardFrame( | ||
| modifier: Modifier = Modifier, | ||
| goalName: String, | ||
| goalIcon: GoalIconType, | ||
| right: @Composable RowScope.() -> Unit, | ||
| content: @Composable ColumnScope.() -> Unit, | ||
| ) { | ||
| val shape = RoundedCornerShape(16.dp) | ||
|
|
||
| Column( | ||
| modifier = | ||
| modifier | ||
| .fillMaxWidth() | ||
| .clip(shape) | ||
| .border(1.dp, GrayColor.C500, shape) | ||
| .background(CommonColor.White), | ||
dogmania marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ) { | ||
| // Header | ||
| Row( | ||
| modifier = | ||
| Modifier | ||
| .fillMaxWidth() | ||
| .padding(16.dp), | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| ) { | ||
| Image( | ||
| painter = painterResource(goalIcon.toRes()), | ||
| contentDescription = null, | ||
| modifier = Modifier.size(22.dp), | ||
| ) | ||
|
|
||
| Spacer(Modifier.width(10.dp)) | ||
|
|
||
| AppText( | ||
| text = goalName, | ||
| maxLines = 1, | ||
| overflow = TextOverflow.Ellipsis, | ||
| style = AppTextStyle.T2, | ||
| color = GrayColor.C500, | ||
| modifier = Modifier.weight(1f), | ||
| ) | ||
|
|
||
| Spacer(Modifier.width(10.dp)) | ||
|
|
||
| // 헤더의 오른쪽 아이콘 홈이면 체크, 수정이면 점 세개 | ||
| right() | ||
| } | ||
|
|
||
| content() | ||
| } | ||
| } | ||
62 changes: 62 additions & 0 deletions
62
core/design-system/src/main/java/com/twix/designsystem/components/goal/GoalCheckIndicator.kt
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 |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| package com.twix.designsystem.components.goal | ||
|
|
||
| import androidx.compose.foundation.Image | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.offset | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.unit.dp | ||
| import com.twix.designsystem.R | ||
| import com.twix.domain.model.enums.GoalCheckState | ||
| import com.twix.ui.extension.noRippleClickable | ||
|
|
||
| @Composable | ||
| fun GoalCheckIndicator( | ||
| state: GoalCheckState, | ||
| modifier: Modifier = Modifier, | ||
| onClick: () -> Unit, | ||
| ) { | ||
| val meChecked = state == GoalCheckState.ONLY_ME || state == GoalCheckState.BOTH | ||
| val partnerChecked = state == GoalCheckState.ONLY_PARTNER || state == GoalCheckState.BOTH | ||
|
|
||
| Box(modifier = modifier) { | ||
| CheckDot( | ||
| checked = partnerChecked, | ||
| isPartner = true, | ||
| onClick = onClick, | ||
| ) | ||
|
|
||
| CheckDot( | ||
| checked = meChecked, | ||
| isPartner = false, | ||
| modifier = Modifier.offset(x = (-17).dp), | ||
| onClick = onClick, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| private fun CheckDot( | ||
| modifier: Modifier = Modifier, | ||
| checked: Boolean, | ||
| isPartner: Boolean = false, | ||
| onClick: () -> Unit, | ||
| ) { | ||
| val res = | ||
| if (isPartner) { | ||
| if (checked) R.drawable.ic_checked_you else R.drawable.ic_unchecked_you | ||
| } else { | ||
| if (checked) R.drawable.ic_checked_me else R.drawable.ic_unchecked_me | ||
| } | ||
|
|
||
| Image( | ||
| painter = painterResource(res), | ||
| contentDescription = null, | ||
| modifier = | ||
| modifier | ||
| .size(28.dp) | ||
| .noRippleClickable(onClick = onClick), | ||
| ) | ||
dogmania marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
74 changes: 74 additions & 0 deletions
74
...design-system/src/main/java/com/twix/designsystem/components/goal/GoalVerificationCell.kt
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 |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| package com.twix.designsystem.components.goal | ||
|
|
||
| import androidx.compose.foundation.Image | ||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.aspectRatio | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.size | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.layout.ContentScale | ||
| import androidx.compose.ui.platform.LocalContext | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.unit.dp | ||
| import coil3.compose.AsyncImage | ||
| import coil3.request.ImageRequest | ||
| import coil3.request.crossfade | ||
| import com.twix.designsystem.extension.toRes | ||
| import com.twix.designsystem.theme.GrayColor | ||
| import com.twix.domain.model.goal.GoalVerification | ||
| import com.twix.ui.extension.noRippleClickable | ||
|
|
||
| @Composable | ||
| fun GoalVerificationCell( | ||
| modifier: Modifier = Modifier, | ||
| verification: GoalVerification?, | ||
| emptyContent: @Composable () -> Unit, | ||
| onClick: (() -> Unit)? = null, | ||
| ) { | ||
| Box( | ||
| modifier = | ||
| modifier | ||
| .aspectRatio(174f / 136f) | ||
| .background(GrayColor.C050) | ||
| .let { if (onClick != null) it.noRippleClickable { onClick() } else it }, | ||
| contentAlignment = Alignment.Center, | ||
| ) { | ||
| if (verification == null) { | ||
| emptyContent() | ||
| } else { | ||
| AsyncImage( | ||
| model = | ||
| ImageRequest | ||
| .Builder(LocalContext.current) | ||
| .data(verification.imageUrl) | ||
| .crossfade(true) | ||
| .build(), | ||
| contentDescription = null, | ||
| contentScale = ContentScale.Crop, | ||
| modifier = Modifier.fillMaxSize(), | ||
| ) | ||
|
|
||
| Box( | ||
| modifier = | ||
| Modifier | ||
| .fillMaxWidth() | ||
| .align(Alignment.BottomEnd) | ||
| .padding(6.dp), | ||
| contentAlignment = Alignment.BottomEnd, | ||
| ) { | ||
| verification.reaction?.let { | ||
| Image( | ||
| painter = painterResource(it.toRes()), | ||
| contentDescription = null, | ||
| modifier = Modifier.size(32.dp), | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
13 changes: 13 additions & 0 deletions
13
core/design-system/src/main/java/com/twix/designsystem/extension/GoalReactionType.kt
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 |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package com.twix.designsystem.extension | ||
|
|
||
| import com.twix.designsystem.R | ||
| import com.twix.domain.model.enums.GoalReactionType | ||
|
|
||
| fun GoalReactionType.toRes(): Int = | ||
| when (this) { | ||
| GoalReactionType.HAPPY -> R.drawable.ic_happy | ||
| GoalReactionType.TROUBLE -> R.drawable.ic_trouble | ||
| GoalReactionType.LOVE -> R.drawable.ic_love | ||
| GoalReactionType.DOUBT -> R.drawable.ic_doubt | ||
| GoalReactionType.FUCK -> R.drawable.ic_fuck | ||
| } |
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
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.
디자인 시스템에 있는 컴포넌트들은 함께 사용하는 컴포넌트기도 하고
코드 리뷰를 할 때도 좀 더 편하게 할 수 있도록 프리뷰를 남겨두는건 어떨까 ?