Skip to content

Commit

Permalink
fix: 미션 진행 중인 경우에만 alpha 적용하도록 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
eshc123 committed Dec 10, 2024
1 parent 7413a2e commit 4197fc1
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,15 @@ import com.goalpanzi.mission_mate.core.designsystem.theme.MissionMateTypography
import com.goalpanzi.mission_mate.core.designsystem.theme.MissionmateTheme
import com.goalpanzi.mission_mate.core.designsystem.theme.OrangeGradient_FFFF5F3C_FFFFAE50
import com.goalpanzi.mission_mate.feature.board.model.CharacterUiModel
import com.goalpanzi.mission_mate.feature.board.model.MissionState
import com.goalpanzi.mission_mate.feature.board.model.UserStory

@Composable
fun BoardTopStory(
userList: List<UserStory>,
modifier: Modifier = Modifier,
missionState : MissionState,
onClickStory: (UserStory) -> Unit,
modifier: Modifier = Modifier,
) {
LazyRow(
modifier = modifier,
Expand All @@ -57,6 +59,7 @@ fun BoardTopStory(
items(userList) { userStory ->
UserStoryItem(
userStory = userStory,
isProgressMission = missionState.isVisiblePiece(),
onClickStory = onClickStory
)
}
Expand All @@ -77,13 +80,14 @@ fun BoardTopStory(
fun UserStoryItem(
userStory: UserStory,
onClickStory: (UserStory) -> Unit,
isProgressMission: Boolean,
modifier: Modifier = Modifier,
) {
Box(
modifier = modifier
.height(98.dp)
.widthIn(min = 70.dp)
.alpha(userStory.userStoryAlpha),
.alpha(if(!isProgressMission && userStory.isMe) 1f else userStory.userStoryAlpha),
contentAlignment = Alignment.TopCenter
) {
StableImage(
Expand Down Expand Up @@ -168,6 +172,7 @@ private fun VerifiedUserStoryItemPreview() {
viewedAt = "",
missionVerificationId = 0
),
isProgressMission = true,
onClickStory = {

}
Expand All @@ -190,6 +195,7 @@ private fun VerifiedViewedUserStoryItemPreview() {
viewedAt = "2024-10-31T09:48:18.399Z",
missionVerificationId = 0
),
isProgressMission = true,
onClickStory = {

}
Expand All @@ -211,6 +217,7 @@ private fun NotVerifiedUserStoryItemPreview() {
viewedAt = "",
missionVerificationId = 0
),
isProgressMission = true,
onClickStory = {

}
Expand All @@ -234,6 +241,7 @@ private fun MyVerifiedUserStoryItemPreview() {
viewedAt = "",
missionVerificationId = 0
),
isProgressMission = true,
onClickStory = {

}
Expand All @@ -256,6 +264,7 @@ private fun MyVerifiedViewedUserStoryItemPreview() {
viewedAt = "2024-10-31T09:48:18.399Z",
missionVerificationId = 0
),
isProgressMission = true,
onClickStory = {

}
Expand All @@ -278,6 +287,7 @@ private fun MyNotVerifiedUserStoryItemPreview() {
viewedAt = "",
missionVerificationId = 0
),
isProgressMission = true,
onClickStory = {

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ fun BoardTopView(
BoardTopStory(
modifier = Modifier.padding(top = 56.dp),
userList = userList,
onClickStory = onClickStory
missionState = missionState,
onClickStory = onClickStory,
)
if(!viewedTooltip){
if (isAddingUserEnabled) {
Expand Down

0 comments on commit 4197fc1

Please sign in to comment.