-
Notifications
You must be signed in to change notification settings - Fork 1
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 Team-Walkie/feat/challenge_item_color
챌린지 화면 변경된 스팩에 따라 수정
- Loading branch information
Showing
7 changed files
with
142 additions
and
68 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
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
81 changes: 44 additions & 37 deletions
81
presentation/src/main/java/com/whyranoid/presentation/component/ChallengingItem.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 |
|---|---|---|
| @@ -1,74 +1,81 @@ | ||
| package com.whyranoid.presentation.component | ||
|
|
||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.border | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.PaddingValues | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.fillMaxHeight | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.material.LinearProgressIndicator | ||
| import androidx.compose.material.Text | ||
| 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.graphics.Color | ||
| import androidx.compose.ui.unit.dp | ||
| import com.whyranoid.presentation.reusable.TextWithImageSpaceBetween | ||
| import com.whyranoid.presentation.theme.ChallengeColor | ||
| import com.whyranoid.presentation.util.bouncingClickable | ||
| import com.whyranoid.presentation.util.conditional | ||
|
|
||
| // TODO: set Color System | ||
| @Composable | ||
| fun ChallengingItem( | ||
| text: String, | ||
| progress: Float, | ||
| imageUrl: String, | ||
| challengeColor: ChallengeColor.ChallengeColorInterface, | ||
| onClicked: () -> Unit = {} | ||
| ) { | ||
| Column( | ||
| Box( | ||
| modifier = Modifier | ||
| .bouncingClickable { | ||
| onClicked() | ||
| } | ||
| .fillMaxWidth() | ||
| .height(105.dp) | ||
| .clip(shape = RoundedCornerShape(20.dp)) | ||
| .background(color = Color(0xFFECECEC)) | ||
| .conditional(progress == 1f) { | ||
| border( | ||
| 3.dp, | ||
| Color(0xFFFB8947), | ||
| shape = RoundedCornerShape(20.dp) | ||
| ) | ||
| }, | ||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| verticalArrangement = Arrangement.Center | ||
| .background(color = challengeColor.backgroundColor) | ||
| , | ||
| ) { | ||
|
|
||
| TextWithImageSpaceBetween( | ||
| Box( | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .padding(horizontal = 26.dp, vertical = 20.dp), | ||
| text = text, | ||
| imageUrl = imageUrl, | ||
| imageSize = 50.dp, | ||
| paddingValues = PaddingValues(end = 10.dp) | ||
| ) | ||
| .fillMaxSize() | ||
| .padding(start = 26.dp), | ||
| contentAlignment = Alignment.CenterStart | ||
| ) { | ||
| Text(text) | ||
| } | ||
|
|
||
|
|
||
| LinearProgressIndicator( | ||
| Box( | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .height(6.dp) | ||
| .padding(horizontal = 26.dp) | ||
| .clip(RoundedCornerShape(15.dp)), | ||
| progress = progress, | ||
| color = Color(0xFFFFB763), | ||
| ) | ||
| .fillMaxHeight() | ||
| .height(7.dp), | ||
| contentAlignment = Alignment.BottomStart | ||
| ) { | ||
|
|
||
|
|
||
| Box( | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .height(7.dp) | ||
| .background(color = challengeColor.progressBackgroundColor), | ||
| contentAlignment = Alignment.BottomCenter | ||
| ) { | ||
|
|
||
| } | ||
|
|
||
| Box( | ||
| modifier = Modifier | ||
| .fillMaxWidth(progress) | ||
| .height(7.dp) | ||
| .background(color = challengeColor.progressBarColor), | ||
| contentAlignment = Alignment.BottomCenter | ||
| ) { | ||
|
|
||
| } | ||
| } | ||
|
|
||
| Spacer(modifier = Modifier.height(12.dp)) | ||
| } | ||
| } |
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
Oops, something went wrong.