-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #33 from Nexters/feature/implement-board
Feature/implement board
- Loading branch information
Showing
45 changed files
with
1,354 additions
and
263 deletions.
There are no files selected for viewing
This file contains 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
24 changes: 24 additions & 0 deletions
24
...ystem/src/main/java/com/goalpanzi/mission_mate/core/designsystem/component/LottieImage.kt
This file contains 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,24 @@ | ||
| package com.goalpanzi.mission_mate.core.designsystem.component | ||
|
|
||
| import androidx.annotation.RawRes | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.ui.Modifier | ||
| import com.airbnb.lottie.compose.LottieAnimation | ||
| import com.airbnb.lottie.compose.LottieCompositionSpec | ||
| import com.airbnb.lottie.compose.animateLottieCompositionAsState | ||
| import com.airbnb.lottie.compose.rememberLottieComposition | ||
|
|
||
| @Composable | ||
| fun LottieImage( | ||
| @RawRes lottieRes : Int, | ||
| modifier: Modifier = Modifier | ||
| ) { | ||
| val composition by rememberLottieComposition(LottieCompositionSpec.RawRes(lottieRes)) | ||
| val progress by animateLottieCompositionAsState(composition) | ||
| LottieAnimation( | ||
| modifier = modifier, | ||
| composition = composition, | ||
| progress = { progress }, | ||
| ) | ||
| } |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains 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 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 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 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 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
235 changes: 235 additions & 0 deletions
235
feature/board/src/main/java/com/goalpanzi/mission_mate/feature/board/component/Board.kt
This file contains 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,235 @@ | ||
| package com.goalpanzi.mission_mate.feature.board.component | ||
|
|
||
| import android.annotation.SuppressLint | ||
| import androidx.compose.foundation.ScrollState | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.BoxWithConstraints | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.ColumnScope | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.WindowInsets | ||
| import androidx.compose.foundation.layout.aspectRatio | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.navigationBars | ||
| import androidx.compose.foundation.layout.navigationBarsPadding | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.layout.statusBars | ||
| import androidx.compose.foundation.layout.statusBarsPadding | ||
| import androidx.compose.foundation.verticalScroll | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.remember | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.draw.blur | ||
| import androidx.compose.ui.draw.drawWithContent | ||
| import androidx.compose.ui.graphics.drawscope.clipRect | ||
| import androidx.compose.ui.platform.LocalDensity | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.unit.dp | ||
| import com.goalpanzi.mission_mate.core.designsystem.theme.ColorGray1_FF404249 | ||
| import com.goalpanzi.mission_mate.core.designsystem.theme.ColorGray2_FF4F505C | ||
| import com.goalpanzi.mission_mate.core.designsystem.theme.MissionMateTypography | ||
| import com.goalpanzi.mission_mate.feature.board.R | ||
| import com.goalpanzi.mission_mate.feature.board.model.BoardEventItem | ||
| import com.goalpanzi.mission_mate.feature.board.model.MissionState | ||
| import com.goalpanzi.mission_mate.feature.board.model.toCharacter | ||
| import com.goalpanzi.mission_mate.feature.board.model.toEventType | ||
| import com.goalpanzi.mission_mate.feature.board.util.BoardGenerator | ||
| import com.luckyoct.core.model.response.MissionBoardsResponse | ||
| import com.luckyoct.core.model.response.MissionVerificationResponse | ||
| import kotlin.math.absoluteValue | ||
|
|
||
|
|
||
| @Composable | ||
| fun Board( | ||
| scrollState: ScrollState, | ||
| boardCount: Int, | ||
| passedCount: Int, | ||
| startDateText: String, | ||
| missionBoards: MissionBoardsResponse, | ||
| numberOfColumns: Int, | ||
| profile: MissionVerificationResponse, | ||
| missionState: MissionState, | ||
| modifier: Modifier = Modifier, | ||
| ) { | ||
| val statusBar = WindowInsets.statusBars | ||
| val navigationBar = WindowInsets.navigationBars | ||
| val localDensity = LocalDensity.current | ||
| val statusBarHeight = remember { (statusBar.getTop(localDensity) - statusBar.getBottom(localDensity)).absoluteValue } | ||
| val navigationBarHeight = remember { (navigationBar.getTop(localDensity) - navigationBar.getBottom(localDensity)).absoluteValue } | ||
| Box( | ||
| modifier = modifier | ||
| .fillMaxSize() | ||
| ) { | ||
| Column( | ||
| modifier = modifier.modifierWithClipRect( | ||
| scrollState = scrollState, | ||
| missionState = missionState, | ||
| innerModifier = Modifier | ||
| .drawWithContent { | ||
| clipRect(bottom = statusBarHeight + 178.dp.toPx()) { | ||
| this@drawWithContent.drawContent() | ||
| } | ||
| } | ||
| .blur(10.dp, 10.dp), | ||
| ) | ||
| ) { | ||
| BoardContent( | ||
| boardCount, | ||
| passedCount, | ||
| startDateText, | ||
| missionBoards, | ||
| numberOfColumns, | ||
| profile, | ||
| missionState, | ||
| modifier | ||
| ) | ||
| } | ||
| Column( | ||
| modifier = modifier.modifierWithClipRect( | ||
| scrollState = scrollState, | ||
| missionState = missionState, | ||
| innerModifier = Modifier | ||
| .drawWithContent { | ||
| clipRect( | ||
| top = statusBarHeight + 178.dp.toPx() - 1, | ||
| bottom = size.height + navigationBarHeight - (if (missionState.isVisiblePiece()) 188.dp else 46.dp).toPx() | ||
| ) { | ||
| this@drawWithContent.drawContent() | ||
| } | ||
| } | ||
| ) | ||
| ) { | ||
| BoardContent( | ||
| boardCount, | ||
| passedCount, | ||
| startDateText, | ||
| missionBoards, | ||
| numberOfColumns, | ||
| profile, | ||
| missionState, | ||
| modifier | ||
| ) | ||
| } | ||
|
|
||
| Column( | ||
| modifier = modifier.modifierWithClipRect( | ||
| scrollState = scrollState, | ||
| missionState = missionState, | ||
| innerModifier = Modifier | ||
| .drawWithContent { | ||
| clipRect(top = (size.height + navigationBarHeight - (if (missionState.isVisiblePiece()) 188.dp else 46.dp).toPx())) { | ||
| this@drawWithContent.drawContent() | ||
| } | ||
| }.blur(10.dp,10.dp) | ||
| ) | ||
| ) { | ||
| BoardContent( | ||
| boardCount, | ||
| passedCount, | ||
| startDateText, | ||
| missionBoards, | ||
| numberOfColumns, | ||
| profile, | ||
| missionState, | ||
| modifier | ||
| ) | ||
| } | ||
|
|
||
|
|
||
| } | ||
|
|
||
| } | ||
|
|
||
| @Composable | ||
| fun ColumnScope.BoardContent( | ||
| boardCount: Int, | ||
| passedCount: Int, | ||
| startDateText: String, | ||
| missionBoards: MissionBoardsResponse, | ||
| numberOfColumns: Int, | ||
| profile: MissionVerificationResponse, | ||
| missionState: MissionState, | ||
| modifier: Modifier = Modifier, | ||
| ) { | ||
| Text( | ||
| modifier = Modifier.padding(top = 28.dp), | ||
| text = startDateText, | ||
| style = MissionMateTypography.heading_md_bold, | ||
| color = ColorGray1_FF404249 | ||
| ) | ||
| Text( | ||
| modifier = Modifier.padding(top = 2.dp, bottom = 20.dp), | ||
| text = stringResource(id = R.string.board_before_start_description), | ||
| style = MissionMateTypography.body_lg_bold, | ||
| color = ColorGray2_FF4F505C | ||
| ) | ||
| BoxWithConstraints { | ||
| val width = maxWidth | ||
| Column { | ||
| BoardGenerator.getBlockListByBoardCount( | ||
| boardCount, | ||
| numberOfColumns, | ||
| passedCount, | ||
| missionBoards.boardRewardList.map { | ||
| BoardEventItem( | ||
| index = it.number, | ||
| eventType = it.reward.toEventType() | ||
| ) | ||
| } | ||
| ).chunked(numberOfColumns).forEach { | ||
| Row() { | ||
| it.forEach { | ||
| Block( | ||
| index = it.index, | ||
| eventType = it.blockEventType, | ||
| type = it.blockType, modifier = Modifier | ||
| .weight(1f) | ||
| .aspectRatio(1f), | ||
| numberOfColumns = numberOfColumns, | ||
| isPassed = it.isPassed, | ||
| isStartedMission = missionState.isVisiblePiece() | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| if (missionState.isVisiblePiece()) { | ||
| missionBoards.missionBoards.forEach { block -> | ||
| if (block.missionBoardMembers.isNotEmpty()) { | ||
| Piece( | ||
| index = block.number, | ||
| count = block.missionBoardMembers.size, | ||
| nickname = if (block.isMyPosition) profile.nickname else block.missionBoardMembers.first().nickname, | ||
| sizePerBlock = width / numberOfColumns, | ||
| numberOfColumn = numberOfColumns, | ||
| isMe = block.isMyPosition, | ||
| imageId = if (block.isMyPosition) profile.characterType.toCharacter().imageId else block.missionBoardMembers.first().characterType.toCharacter().imageId, | ||
| imageIdForCount = if (block.isMyPosition) profile.characterType.toCharacter().imageId else block.missionBoardMembers.first().characterType.toCharacter().imageId | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @SuppressLint("ModifierFactoryUnreferencedReceiver") | ||
| fun Modifier.modifierWithClipRect( | ||
| scrollState: ScrollState, | ||
| missionState: MissionState, | ||
| innerModifier: Modifier, | ||
| modifier: Modifier = Modifier, | ||
| ): Modifier { | ||
| return modifier | ||
| .fillMaxSize() | ||
| .navigationBarsPadding() | ||
| .then(innerModifier) | ||
| .verticalScroll(scrollState) | ||
| .statusBarsPadding() | ||
| .padding( | ||
| top = 180.dp, | ||
| start = 24.dp, | ||
| end = 24.dp, | ||
| bottom = if (missionState.isVisiblePiece()) 188.dp else 46.dp | ||
| ) | ||
| } |
Oops, something went wrong.