Step2: 페미먼츠(카드목록) #44
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package nextstep.payments.domain | ||
|
|
||
| import nextstep.payments.ui.model.PaymentCardModel | ||
|
|
||
| object PaymentCardsRepository { | ||
|
|
||
| private val _cards = mutableListOf<PaymentCardModel>() | ||
| val cards: List<PaymentCardModel> get() = _cards.toList() | ||
|
|
||
| fun addCard(card: PaymentCardModel) { | ||
| _cards.add(card) | ||
| } | ||
| } |
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,39 +1,157 @@ | ||
| package nextstep.payments.ui.component | ||
|
|
||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.clickable | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Row | ||
| 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.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.material.icons.Icons | ||
| import androidx.compose.material.icons.filled.Add | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.draw.shadow | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.compose.ui.unit.sp | ||
|
|
||
| @Composable | ||
| fun AddPaymentCard( | ||
| modifier: Modifier = Modifier, | ||
| onClick: () -> Unit = {} | ||
| ) { | ||
| DefaultCard( | ||
| modifier = modifier, | ||
| color =Color(0xFFE5E5E5), | ||
| content = { | ||
| Box( | ||
| modifier = Modifier | ||
| .fillMaxSize() | ||
| .clickable { onClick() }, | ||
| contentAlignment = Alignment.Center | ||
| ) { | ||
| Icon( | ||
| imageVector = Icons.Default.Add, | ||
| contentDescription = "Add", | ||
| tint = Color.Black, | ||
| ) | ||
| } | ||
| } | ||
| ) | ||
| } | ||
|
|
||
| @Composable | ||
| fun DefaultPaymentCard( | ||
| modifier: Modifier = Modifier, | ||
| ) { | ||
| DefaultCard( | ||
| modifier = modifier, | ||
| content = { | ||
| CardIcChip(Modifier.padding(start = 14.dp, bottom = 10.dp)) | ||
| } | ||
| ) | ||
| } | ||
|
|
||
| @Composable | ||
| fun RegisteredPaymentCard( | ||
| modifier: Modifier = Modifier, | ||
| ) { | ||
|
Comment on lines
+64
to
+67
|
||
| DefaultCard( | ||
| modifier = modifier, | ||
| content = { | ||
|
|
||
| Column( | ||
| Modifier | ||
| .fillMaxSize() | ||
| .padding(start = 14.dp, end = 14.dp, top = 44.dp, bottom = 16.dp), | ||
| verticalArrangement = Arrangement.SpaceBetween | ||
| ) { | ||
| CardIcChip() | ||
| Text( | ||
| modifier = modifier.fillMaxWidth(), | ||
| text = "1234-5678-1234-5678", | ||
| fontSize = 12.sp, | ||
| color = Color.White, | ||
| maxLines = 1 | ||
| ) | ||
| Row( | ||
| modifier = Modifier.fillMaxWidth(), | ||
| horizontalArrangement = Arrangement.SpaceBetween | ||
| ) { | ||
| Text( | ||
| text = "JINHYUK JANG", | ||
| color = Color.White, | ||
| fontSize = 12.sp | ||
| ) | ||
| Text( | ||
| modifier = modifier, | ||
| text = "00/00", | ||
| fontSize = 12.sp, | ||
| color = Color.White, | ||
|
There was a problem hiding this comment. 색상이 반복된다면, ContentColor를 이용하여 제공하는 방법도 좋습니다. CompositionLocalProvider(
LocalContentColor provides Color.White
) { ... }https://developer.android.com/develop/ui/compose/compositionlocal?hl=ko |
||
| ) | ||
| } | ||
| } | ||
| } | ||
| ) | ||
| } | ||
|
|
||
| @Composable | ||
| fun DefaultCard( | ||
| modifier: Modifier = Modifier, | ||
| color:Color = Color(0xFF333333), | ||
| content: @Composable () -> Unit = {} | ||
| ) { | ||
| Box( | ||
| contentAlignment = Alignment.CenterStart, | ||
| modifier = modifier | ||
| .shadow(8.dp) | ||
| .size(width = 208.dp, height = 124.dp) | ||
| .background( | ||
| color = color, | ||
| shape = RoundedCornerShape(5.dp), | ||
| ) | ||
| ) { | ||
| content() | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| fun CardIcChip( | ||
| modifier: Modifier = Modifier, | ||
| ) { | ||
| Box( | ||
| modifier = modifier | ||
| .size(width = 40.dp, height = 26.dp) | ||
| .background( | ||
| color = Color(0xFFCBBA64), | ||
| shape = RoundedCornerShape(4.dp), | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| @Preview(showBackground = true) | ||
| @Composable | ||
| private fun AddPaymentCardPreview() { | ||
| AddPaymentCard() | ||
| } | ||
|
|
||
| @Preview(showBackground = true) | ||
| @Composable | ||
| private fun DefaultPaymentCardPreview() { | ||
| DefaultPaymentCard() | ||
| } | ||
|
|
||
| @Preview(showBackground = true) | ||
| @Composable | ||
| private fun RegisteredPaymentCardPreview() { | ||
| RegisteredPaymentCard() | ||
| } | ||
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,8 @@ | ||
| package nextstep.payments.ui.model | ||
|
|
||
| data class PaymentCardModel( | ||
| val cardNumber: String, | ||
| val ownerName: String, | ||
| val expiredDate: String, | ||
| val password: String | ||
| ) |
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,6 @@ | ||
| package nextstep.payments.ui.navigation | ||
|
|
||
| sealed class NavigationModel(val route: String) { | ||
| data object AddPaymentCard : NavigationModel("AddCard") | ||
| data object PaymentCards : NavigationModel("PaymentCards") | ||
| } |
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,30 @@ | ||
| package nextstep.payments.ui.navigation | ||
|
|
||
| import androidx.compose.runtime.Composable | ||
| import androidx.navigation.NavHostController | ||
| import androidx.navigation.compose.NavHost | ||
| import androidx.navigation.compose.composable | ||
| import nextstep.payments.ui.screen.NewCardScreenRoute | ||
| import nextstep.payments.ui.screen.PaymentCardsScreenRoute | ||
|
|
||
| @Composable | ||
| fun PaymentsNavigationHost( | ||
| navHostController: NavHostController | ||
| ) { | ||
| NavHost( | ||
| navController = navHostController, | ||
| startDestination = NavigationModel.PaymentCards.route | ||
| ) { | ||
| composable(NavigationModel.PaymentCards.route) { navBackResult -> | ||
| PaymentCardsScreenRoute( | ||
| onAddCardClick = { navHostController.navigate(NavigationModel.AddPaymentCard.route) }, | ||
| ) | ||
|
Comment on lines
+19
to
+21
There was a problem hiding this comment.
카드를 추가하더라도 항상 더미 데이터로 출력을 하고 있어요. |
||
| } | ||
| composable(NavigationModel.AddPaymentCard.route) { | ||
| NewCardScreenRoute( | ||
| onBackClick = { navHostController.popBackStack() }, | ||
| onAddComplete = { navHostController.popBackStack() } | ||
| ) | ||
| } | ||
| } | ||
| } | ||
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
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.
클릭 효과가 도형의 모양과 일치하지 않고 직사각형으로 잡히고 있어요.
눌렀을 때 ripple 효과가 어떻게 보이는지 확인하면 됩니다.
Surface 컴포넌트와 같은 곳에서 제공하는 shape 파라미터가 어떻게 동작하는지 살펴볼 수 있습니다.
https://developer.android.com/develop/ui/compose/modifiers?hl=ko#order-modifier-matters