Step2 - 페이먼츠(카드 목록)

README.md

@@ -1 +1,10 @@
-# android-payments
+# Step 2 - 페이먼츠(카드 목록)
+
+## 기능 목록
+- [O] 카드 목록 화면 구현
+- [O] 카드 목록 화면 -> 카드 추가 화면 연결 
+- [] 새로운 카드가 추가되었을 때 카드 목록이 업데이트 되어야 한다.
+- [O] 카드 목록이 비어있다면 카드 등록 코멘트 Text 노출
+- [] 카드 목록에 카드가 한 개 있을 경우 카드 추가 UI는 목록 하단에 노출한다
+- [] 카드 목록에 카드가 두 개 이상 있을 경우 카드 추가 UI는 상단바에 노출된다.
+- [] 카드 목록 데이터를 보관하기 위해 ViewModel과 StateFlow를 활용한다

app/src/androidTest/java/nextstep/payments/screen/card/list/RegisteredCreditCardsScreenTest.kt

@@ -0,0 +1,150 @@
+package nextstep.payments.screen.card.list
+
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onAllNodesWithTag
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.onNodeWithText
+import nextstep.payments.data.BcCard
+import nextstep.payments.data.Card
+import nextstep.payments.data.PaymentCardsRepository
+import nextstep.payments.data.RegisteredCreditCards
+import nextstep.payments.ui.card.list.CardListScreen
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+class RegisteredCreditCardsScreenTest {
+
+    @get:Rule
+    val composeRule = createComposeRule()
+
+    @Before
+    fun setUp() {
+        PaymentCardsRepository.removeAllCard()
+    }
+
+    @Test
+    fun 스크린_상단에_Payments_타이틀이_노출된다() {
+        // when : cardListScreen을 setContent 한다.
+        composeRule
+            .setContent {
+                CardListScreen(
+                    registeredCreditCards =  RegisteredCreditCards(mutableListOf()),
+                    onAddCard = {}
+                )
+            }
+
+        // then : Payments 타이틀에 노출되어야한다.
+        composeRule
+            .onNodeWithText("Payments")
+            .assertExists()
+    }
+
+    @Test
+    fun 등록된_카드가_존재할_경우_해당_카드_수만큼_카드_이미지를_노출시키다() {
+        // given : 두 개의 카드를 등록한다
+        val registeredCreditCards = RegisteredCreditCards(
+            mutableListOf(
+                Card(
+                    cardNumber = "1234-5678-1234-5678",
+                    ownerName = "홍길동",
+                    expiredDate = "12/24",
+                    password = "123",
+                    cardCompany = BcCard
+                ),
+                Card(
+                    cardNumber = "1234-5678-1234-5628",
+                    ownerName = "홍길동",
+                    expiredDate = "12/24",
+                    password = "123",
+                    cardCompany = BcCard
+                )
+            )
+        )
+
+        // when : 화면을 렌더링한다.
+        composeRule.setContent {
+            CardListScreen(
+                registeredCreditCards = registeredCreditCards
+            )
+        }
+        val actual = composeRule
+            .onAllNodesWithTag("cardImage")
+            .fetchSemanticsNodes().size
+
+        // then : 카드 이미지 두개가 노출되어야 한다.
+        assert(actual == 2)
+    }
+
+    @Test
+    fun 등록된_카드가_존재하지_않을_경우_해당_카드_이미지를_노출하지_않는다() {
+        // when : 화면을 렌더링한다.
+        composeRule.setContent {
+            CardListScreen(
+                registeredCreditCards = RegisteredCreditCards(mutableListOf())
+            )
+        }
+
+        // then : 카드 이미지가 노출되지 않는다.
+        composeRule
+            .onNodeWithTag("cardImage")
+            .assertDoesNotExist()
+    }
+
+    @Test
+    fun 등록된_카드가_존재하지_않을_경우_카드_추가_멘트가_노출된다() {
+        // given : 카드 등록이 되어있지 않다.
+
+
+        // when : 화면을 렌더링한다.
+//        cardImage
+        composeRule.setContent {
+            CardListScreen(
+                registeredCreditCards = RegisteredCreditCards(mutableListOf())
+            )
+        }
+
+        // then : 카드 추가 멘트가 노출된다.
+        composeRule
+            .onNodeWithTag("textComment")
+            .assertExists()
+    }
+
+    @Test
+    fun 등록된_카드가_존재할_경우_카드_추가_멘트가_노출되자_않는다() {
+        // given : 카드 등록이 되어있다.
+        PaymentCardsRepository.addCard(
+            Card(
+                cardNumber = "1234-5678-1234-5628",
+                ownerName = "홍길동",
+                expiredDate = "12/24",
+                password = "123",
+                cardCompany = BcCard
+            )
+        )
+        val registeredCreditCards = RegisteredCreditCards(
+            mutableListOf(
+                Card(
+                    cardNumber = "1234-5678-1234-5628",
+                    ownerName = "홍길동",
+                    expiredDate = "12/24",
+                    password = "123",
+                    cardCompany = BcCard
+                )
+            )
+        )
+
+
+        // when : 화면을 렌더링한다.
+        composeRule.setContent {
+            CardListScreen(
+                registeredCreditCards = registeredCreditCards
+            )
+        }
+
+        // then : 카드 추가 멘트가 노출되지 않는다
+        composeRule
+            .onNodeWithTag("textComment")
+            .assertDoesNotExist()
+    }
+}

app/src/main/AndroidManifest.xml

@@ -23,6 +23,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".ui.card.registration.NewCardActivity"/>
     </application>
 
 </manifest>

app/src/main/java/nextstep/payments/MainActivity.kt

@@ -1,29 +1,47 @@
 package nextstep.payments
 
+import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.activity.viewModels
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
-import nextstep.payments.ui.NewCardScreen
+import nextstep.payments.ui.card.list.CardListScreen
+import nextstep.payments.ui.card.list.CardListViewModel
+import nextstep.payments.ui.card.registration.NewCardActivity
 import nextstep.payments.ui.theme.PaymentsTheme
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        val viewModel by viewModels<CardListViewModel>()
+
         setContent {
+            val launcher =
+                rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+                    if (it.resultCode == RESULT_OK) {
+                        viewModel.fetchCards()
+                    }
+                }
+
             PaymentsTheme {
-                // A surface container using the 'background' color from the theme
                 Surface(
                     modifier = Modifier.fillMaxSize(),
                     color = MaterialTheme.colorScheme.background
                 ) {
-                    NewCardScreen()
+                    CardListScreen(
+                        viewModel = viewModel,
+                        onAddCard = {
+                            val intent = Intent(this, NewCardActivity::class.java)
+                            launcher.launch(intent)
+                        }
+                    )
                 }
             }
         }

app/src/main/java/nextstep/payments/NewCardViewModel.kt

@@ -4,8 +4,12 @@ import androidx.lifecycle.ViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import nextstep.payments.data.Card
+import nextstep.payments.data.PaymentCardsRepository
 
-class NewCardViewModel : ViewModel() {
+class NewCardViewModel(
+    private val repository: PaymentCardsRepository = PaymentCardsRepository
+) : ViewModel() {
 
     private val _cardNumber = MutableStateFlow("")
     val cardNumber: StateFlow<String> = _cardNumber.asStateFlow()
@@ -19,6 +23,10 @@ class NewCardViewModel : ViewModel() {
     private val _password = MutableStateFlow("")
     val password: StateFlow<String> = _password.asStateFlow()
 
+    private val _cardAdded = MutableStateFlow<Boolean>(false)
+    val cardAdded: StateFlow<Boolean> = _cardAdded.asStateFlow()
+
+
     fun setCardNumber(cardNumber: String) {
         _cardNumber.value = cardNumber
     }
@@ -34,4 +42,9 @@ class NewCardViewModel : ViewModel() {
     fun setPassword(password: String) {
         _password.value = password
     }
-}
+
+    fun addCard(card: Card) {
+        repository.addCard(card)
+        _cardAdded.value = true
+    }
+}

app/src/main/java/nextstep/payments/data/Card.kt

@@ -0,0 +1,9 @@
+package nextstep.payments.data
+
+data class Card(
+    val cardNumber: String,
+    val expiredDate: String,
+    val ownerName: String,
+    val password: String,
+    val cardCompany: CardCompany = BcCard
+)

app/src/main/java/nextstep/payments/data/CardCompany.kt

@@ -0,0 +1,5 @@
+package nextstep.payments.data
+
+sealed class CardCompany
+
+data object BcCard : CardCompany()

app/src/main/java/nextstep/payments/data/PaymentCardsRepository.kt

@@ -0,0 +1,15 @@
+package nextstep.payments.data
+
+object PaymentCardsRepository {
+
+    private val _cards = mutableListOf<Card>()
+    val cards: List<Card> get() = _cards.toList()
+
+    fun addCard(card: Card) {
+        _cards.add(card)
+    }
+
+    fun removeAllCard() {
+        _cards.clear()
+    }
+}

app/src/main/java/nextstep/payments/data/RegisteredCreditCards.kt

@@ -0,0 +1,14 @@
+package nextstep.payments.data
+
+import nextstep.payments.ui.card.CreditCardUiState
+
+data class RegisteredCreditCards(val cardList: List<Card>) {
+
+    fun getState(): CreditCardUiState {
+        return when (cardList.size) {
+            0 -> CreditCardUiState.Empty
+            1 -> CreditCardUiState.One(cardList[0])
+            else -> CreditCardUiState.Many(cardList)
+        }
+    }
+}