next-step · oyj7677 · Aug 31, 2024 · Aug 31, 2024 · Sep 1, 2024 · Sep 1, 2024
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -69,5 +69,4 @@ dependencies {
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
-    implementation(kotlin("script-runtime"))
 }
diff --git a/...rc/androidTest/java/nextstep/payments/screen/card/list/RegisteredCreditCardsScreenTest.kt b/...rc/androidTest/java/nextstep/payments/screen/card/list/RegisteredCreditCardsScreenTest.kt
@@ -51,13 +51,15 @@ class RegisteredCreditCardsScreenTest {
         val registeredCreditCards = RegisteredCreditCards(
             mutableListOf(
                 Card(
+                    id = 1,
                     cardNumber = "1234-5678-1234-5678",
                     ownerName = "홍길동",
                     expiredDate = "12/24",
                     password = "123",
                     bankType = BankType.BC
                 ),
                 Card(
+                    id = 2,
                     cardNumber = "1234-5678-1234-5628",
                     ownerName = "홍길동",
                     expiredDate = "12/24",
@@ -120,6 +122,7 @@ class RegisteredCreditCardsScreenTest {
         // given : 카드 등록이 되어있다.
         PaymentCardsRepository.addCard(
             Card(
+                id = 13,
                 cardNumber = "1234-5678-1234-5628",
                 ownerName = "홍길동",
                 expiredDate = "12/24",
@@ -130,6 +133,7 @@ class RegisteredCreditCardsScreenTest {
         val registeredCreditCards = RegisteredCreditCards(
             mutableListOf(
                 Card(
+                    id = 4,
                     cardNumber = "1234-5678-1234-5628",
                     ownerName = "홍길동",
                     expiredDate = "12/24",

diff --git a/app/src/main/java/nextstep/payments/MainActivity.kt b/app/src/main/java/nextstep/payments/MainActivity.kt
@@ -17,11 +17,11 @@ 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>()
+    private val viewModel: CardListViewModel by viewModels { CardListViewModel.Factory }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         setContent {
             val launcher =
                 rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) {
@@ -52,6 +52,16 @@ class MainActivity : ComponentActivity() {
             }
         }
     }
+
+    override fun onPause() {
+        super.onPause()
+        viewModel.saveCard()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        viewModel.openCard()
+    }
 }
 
 
diff --git a/app/src/main/java/nextstep/payments/data/Card.kt b/app/src/main/java/nextstep/payments/data/Card.kt
@@ -5,7 +5,7 @@ import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class Card(
-    val id: Int,
+    var id: Int = 0,
     val cardNumber: String,
     val expiredDate: String,
     val ownerName: String,

diff --git a/app/src/main/java/nextstep/payments/data/PaymentCardsRepository.kt b/app/src/main/java/nextstep/payments/data/PaymentCardsRepository.kt
@@ -3,22 +3,23 @@ package nextstep.payments.data
 object PaymentCardsRepository {
 
     private val _cards = mutableListOf<Card>()
-    val cards: List<Card> get() = _cards.toList()
+    val cards: List<Card> get() = _cards
 
     fun addCard(card: Card) {
+        if (card.id == 0) card.id = createId()
         _cards.add(card)
     }
 
     fun removeAllCard() {
         _cards.clear()
     }
 
-    fun editCard(oldCard: Card?, newCard: Card) {
-        val index = _cards.indexOfFirst { it.id == oldCard!!.id }
+    fun editCard(newCard: Card) {
+        val index = _cards.indexOfFirst { it.id == newCard.id }
         _cards[index] = newCard
     }
 
-    fun createId(): Int {
+    private fun createId(): Int {
         return _cards.maxOfOrNull { it.id }?.plus(1) ?: 1
     }
 }
diff --git a/app/src/main/java/nextstep/payments/data/RegisteredCreditCards.kt b/app/src/main/java/nextstep/payments/data/RegisteredCreditCards.kt
@@ -1,8 +1,11 @@
 package nextstep.payments.data
 
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
 import nextstep.payments.ui.card.CreditCardUiState
 
-data class RegisteredCreditCards(val cardList: List<Card>) {
+@Parcelize
+data class RegisteredCreditCards(val cardList: List<Card>) : Parcelable {
 
     fun getState(): CreditCardUiState {
         return when (cardList.size) {

diff --git a/app/src/main/java/nextstep/payments/ui/PaymentCard.kt b/app/src/main/java/nextstep/payments/ui/PaymentCard.kt
@@ -60,6 +60,7 @@ fun PaymentCard(
 @Composable
 fun PaymentCardContents(
     card: Card,
+    modifier: Modifier = Modifier,
     onClick: (Card) -> Unit = {}
 ) {
     Box(

diff --git a/app/src/main/java/nextstep/payments/ui/card/list/CardListViewModel.kt b/app/src/main/java/nextstep/payments/ui/card/list/CardListViewModel.kt
@@ -1,13 +1,20 @@
 package nextstep.payments.ui.card.list
 
+import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.createSavedStateHandle
+import androidx.lifecycle.viewmodel.initializer
+import androidx.lifecycle.viewmodel.viewModelFactory
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import nextstep.payments.data.PaymentCardsRepository
 import nextstep.payments.data.RegisteredCreditCards
 
-class CardListViewModel : ViewModel() {
+class CardListViewModel(
+    val savedStateHandle: SavedStateHandle,
+) : ViewModel() {
 
     private val _registeredCreditCards = MutableStateFlow(RegisteredCreditCards(emptyList()))
     val registeredCreditCards: StateFlow<RegisteredCreditCards> =
@@ -16,4 +23,25 @@ class CardListViewModel : ViewModel() {
     fun fetchCards() {
         _registeredCreditCards.value = RegisteredCreditCards(PaymentCardsRepository.cards)
     }
+
+    fun saveCard() {
+        savedStateHandle[KEY_REGISTERED_CREDIT_CARDS] = _registeredCreditCards.value
+    }
+
+    fun openCard() {
+        _registeredCreditCards.value =
+            savedStateHandle[KEY_REGISTERED_CREDIT_CARDS] ?: RegisteredCreditCards(emptyList())
+    }
+
+    companion object {
+        private const val KEY_REGISTERED_CREDIT_CARDS = "registeredCreditCards"
+        val Factory: ViewModelProvider.Factory = viewModelFactory {
+            initializer {
+                val savedStateHandle = createSavedStateHandle()
+                CardListViewModel(
+                    savedStateHandle = savedStateHandle
+                )
+            }
+        }
+    }
 }
diff --git a/app/src/main/java/nextstep/payments/ui/card/registration/NewCardActivity.kt b/app/src/main/java/nextstep/payments/ui/card/registration/NewCardActivity.kt
@@ -9,17 +9,15 @@ import nextstep.payments.ui.theme.PaymentsTheme
 
 class NewCardActivity : ComponentActivity() {
 
-    private var card: Card? = null
+    private val viewModel: NewCardViewModel by viewModels { NewCardViewModel.Factory }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        val viewModel by viewModels<NewCardViewModel>()
         super.onCreate(savedInstanceState)
 
         (intent?.getParcelableExtra("card") as Card?)?.let {
             viewModel.setOldCard(it)
             viewModel.setUiState(RegistrationUiState.EditCard)
         }
-
         setContent {
             PaymentsTheme {
                 NewCardScreen(
@@ -35,6 +33,16 @@ class NewCardActivity : ComponentActivity() {
             }
         }
     }
+
+    override fun onResume() {
+        super.onResume()
+        viewModel.openCardData()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        viewModel.saveCardData()
+    }
 }
 
 
diff --git a/app/src/main/java/nextstep/payments/ui/card/registration/NewCardScreen.kt b/app/src/main/java/nextstep/payments/ui/card/registration/NewCardScreen.kt
@@ -1,5 +1,6 @@
 package nextstep.payments.ui.card.registration
 
+import android.annotation.SuppressLint
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -25,6 +26,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
 import nextstep.payments.R
@@ -33,9 +35,9 @@ import nextstep.payments.ui.PaymentCard
 import nextstep.payments.ui.card.registration.component.BankSelectRow
 import nextstep.payments.ui.card.registration.component.NewCardTopBar
 import nextstep.payments.ui.theme.PaymentsTheme
-import kotlin.reflect.KFunction0
 
 // Stateful
+@SuppressLint("StateFlowValueCalledInComposition")
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun NewCardScreen(
@@ -52,7 +54,7 @@ fun NewCardScreen(
     val selectedBankType by viewModel.selectedBankType.collectAsStateWithLifecycle()
     var showCardCompanyBottomSheet by rememberSaveable { mutableStateOf(true) }
     val modalBottomSheetState = rememberModalBottomSheetState(confirmValueChange = { false })
-    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+
 
     LaunchedEffect(cardAdded) {
         if (cardAdded) navigateToCardList()
@@ -77,15 +79,6 @@ fun NewCardScreen(
             )
         }
     }
-    val saveFunction: KFunction0<Unit> = when (uiState) {
-        RegistrationUiState.NewCard -> {
-            viewModel::addCard
-        }
-
-        RegistrationUiState.EditCard -> {
-            viewModel::editCard
-        }
-    }
 
     NewCardScreen(
         modifier = modifier,
@@ -99,7 +92,7 @@ fun NewCardScreen(
         setOwnerNamedNumber = viewModel::setOwnerName,
         setPasswordNumber = viewModel::setPassword,
         onBackClick = onBackClick,
-        onSaveClick = saveFunction,
+        onSaveClick = viewModel::saveCard,
     )
 }
 
@@ -181,10 +174,13 @@ private fun NewCardScreen(
 @Preview
 @Composable
 private fun NewCardScreenPreview() {
+    val savedState = SavedStateHandle(mapOf("someIdArg" to 1))
     PaymentsTheme {
         NewCardScreen(modifier = Modifier,
             navigateToCardList = {},
-            viewModel = NewCardViewModel().apply {
+            viewModel = NewCardViewModel(
+                savedStateHandle = savedState
+            ).apply {
                 setCardNumber("0000 - 0000 - 0000 -0000")
                 setExpiredDate("02/26")
                 setOwnerName("김수현")