From 7413a2e5fc035b9c06fbe96e5a44f51ab654a163 Mon Sep 17 00:00:00 2001 From: eshc123 <> Date: Tue, 10 Dec 2024 22:54:56 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20'=EB=82=98'=EC=9D=BC=20=EB=95=8C=20?= =?UTF-8?q?=EC=9D=B8=EC=A6=9D=ED=95=98=EC=A7=80=20=EC=95=8A=EC=95=98?= =?UTF-8?q?=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20alpha=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mission_mate/feature/board/component/BoardTopStory.kt | 4 ++-- .../goalpanzi/mission_mate/feature/board/model/UserStory.kt | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/feature/board/src/main/java/com/goalpanzi/mission_mate/feature/board/component/BoardTopStory.kt b/feature/board/src/main/java/com/goalpanzi/mission_mate/feature/board/component/BoardTopStory.kt index 92d6573..c48c4b3 100644 --- a/feature/board/src/main/java/com/goalpanzi/mission_mate/feature/board/component/BoardTopStory.kt +++ b/feature/board/src/main/java/com/goalpanzi/mission_mate/feature/board/component/BoardTopStory.kt @@ -82,7 +82,8 @@ fun UserStoryItem( Box( modifier = modifier .height(98.dp) - .widthIn(min = 70.dp), + .widthIn(min = 70.dp) + .alpha(userStory.userStoryAlpha), contentAlignment = Alignment.TopCenter ) { StableImage( @@ -106,7 +107,6 @@ fun UserStoryItem( ) } else { Modifier - .alpha(userStory.userStoryAlpha) .border(3.dp, ColorWhite_FFFFFFFF, CircleShape) } diff --git a/feature/board/src/main/java/com/goalpanzi/mission_mate/feature/board/model/UserStory.kt b/feature/board/src/main/java/com/goalpanzi/mission_mate/feature/board/model/UserStory.kt index 540cf21..b1bfcdf 100644 --- a/feature/board/src/main/java/com/goalpanzi/mission_mate/feature/board/model/UserStory.kt +++ b/feature/board/src/main/java/com/goalpanzi/mission_mate/feature/board/model/UserStory.kt @@ -27,11 +27,7 @@ data class UserStory( UserStoryType.COLORED } } else { - if (isMe) { - UserStoryType.NORMAL - } else { - UserStoryType.TRANSPARENT - } + UserStoryType.TRANSPARENT } val userStoryAlpha = when (userStoryType) { From 4197fc1e7582ef39a70d205ea9cba0cbaac791c3 Mon Sep 17 00:00:00 2001 From: eshc123 <> Date: Tue, 10 Dec 2024 23:12:54 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EB=AF=B8=EC=85=98=20=EC=A7=84?= =?UTF-8?q?=ED=96=89=20=EC=A4=91=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=EC=97=90?= =?UTF-8?q?=EB=A7=8C=20alpha=20=EC=A0=81=EC=9A=A9=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feature/board/component/BoardTopStory.kt | 14 ++++++++++++-- .../feature/board/component/BoardTopView.kt | 3 ++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/feature/board/src/main/java/com/goalpanzi/mission_mate/feature/board/component/BoardTopStory.kt b/feature/board/src/main/java/com/goalpanzi/mission_mate/feature/board/component/BoardTopStory.kt index c48c4b3..512aa41 100644 --- a/feature/board/src/main/java/com/goalpanzi/mission_mate/feature/board/component/BoardTopStory.kt +++ b/feature/board/src/main/java/com/goalpanzi/mission_mate/feature/board/component/BoardTopStory.kt @@ -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, - modifier: Modifier = Modifier, + missionState : MissionState, onClickStory: (UserStory) -> Unit, + modifier: Modifier = Modifier, ) { LazyRow( modifier = modifier, @@ -57,6 +59,7 @@ fun BoardTopStory( items(userList) { userStory -> UserStoryItem( userStory = userStory, + isProgressMission = missionState.isVisiblePiece(), onClickStory = onClickStory ) } @@ -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( @@ -168,6 +172,7 @@ private fun VerifiedUserStoryItemPreview() { viewedAt = "", missionVerificationId = 0 ), + isProgressMission = true, onClickStory = { } @@ -190,6 +195,7 @@ private fun VerifiedViewedUserStoryItemPreview() { viewedAt = "2024-10-31T09:48:18.399Z", missionVerificationId = 0 ), + isProgressMission = true, onClickStory = { } @@ -211,6 +217,7 @@ private fun NotVerifiedUserStoryItemPreview() { viewedAt = "", missionVerificationId = 0 ), + isProgressMission = true, onClickStory = { } @@ -234,6 +241,7 @@ private fun MyVerifiedUserStoryItemPreview() { viewedAt = "", missionVerificationId = 0 ), + isProgressMission = true, onClickStory = { } @@ -256,6 +264,7 @@ private fun MyVerifiedViewedUserStoryItemPreview() { viewedAt = "2024-10-31T09:48:18.399Z", missionVerificationId = 0 ), + isProgressMission = true, onClickStory = { } @@ -278,6 +287,7 @@ private fun MyNotVerifiedUserStoryItemPreview() { viewedAt = "", missionVerificationId = 0 ), + isProgressMission = true, onClickStory = { } diff --git a/feature/board/src/main/java/com/goalpanzi/mission_mate/feature/board/component/BoardTopView.kt b/feature/board/src/main/java/com/goalpanzi/mission_mate/feature/board/component/BoardTopView.kt index da5f151..20c74fe 100644 --- a/feature/board/src/main/java/com/goalpanzi/mission_mate/feature/board/component/BoardTopView.kt +++ b/feature/board/src/main/java/com/goalpanzi/mission_mate/feature/board/component/BoardTopView.kt @@ -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) {