[UPD] MUS-288, Feature, updated add card again

app/src/main/java/uz/mobiuz/mobiservice/dev/ui/auth/verification/VerificationFragment.kt

@@ -29,10 +29,6 @@ import uz.mobiuz.mobiservice.dev.ui.global.ButtonClick
 import uz.mobiuz.mobiservice.dev.ui.global.CONSTANTS
 import uz.mobiuz.mobiservice.dev.ui.global.TextWatcherWrapper
 import uz.mobiuz.mobiservice.dev.utils.Utils
-import uz.mobiuz.mobiservice.dev.utils.extensions.clearText
-import uz.mobiuz.mobiservice.dev.utils.extensions.getColorCompat
-import uz.mobiuz.mobiservice.dev.utils.extensions.isEmpty
-import uz.mobiuz.mobiservice.dev.utils.extensions.isNotEmpty
 import uz.mobiuz.mobiservice.dev.utils.hideKeyboard
 import uz.mobiuz.mobiservice.dev.utils.showKeyboard
 import dagger.hilt.android.AndroidEntryPoint
@@ -40,6 +36,7 @@ import kotlinx.coroutines.flow.collect
 import uz.agr.mobiuz.extension.SmsBroadcastReceiver
 import uz.agr.mobiuz.ui.dialog.MessageDialog
 import uz.agr.sdk.coreui.extension.hideSoftInput
+import uz.mobiuz.mobiservice.dev.utils.extensions.*
 import java.util.regex.Pattern
 import javax.inject.Inject
 
@@ -112,19 +109,20 @@ class VerificationFragment : BaseFragment(R.layout.fragment_verification) {
             btnVerification.setOnClickListener(object : ButtonClick() {
                 override fun onSingleClick(v: View?) {
                     getLinePinCodes()
-                    val auth = UserAuth(phone.filter { it.isDigit() }, null, code)
-                    when (type) {
-                        CONSTANTS.TYPE_FORGET -> {
-                            viewModel.checkResetCode(auth)
-                        }
-                        CONSTANTS.TYPE_ADD_CARD -> {
-                            viewModel.cardConfirm(cardId, getLinePinCodes())
-                        }
-                        else -> {
-                            viewModel.verification(auth)
+                    if (checkInternet()){
+                        val auth = UserAuth(phone.filter { it.isDigit() }, null, code)
+                        when (type) {
+                            CONSTANTS.TYPE_FORGET -> {
+                                viewModel.checkResetCode(auth)
+                            }
+                            CONSTANTS.TYPE_ADD_CARD -> {
+                                viewModel.cardConfirm(cardId, getLinePinCodes())
+                            }
+                            else -> {
+                                viewModel.verification(auth)
+                            }
                         }
                     }
-
                 }
             })
 

app/src/main/java/uz/mobiuz/mobiservice/dev/ui/sdk/card/AddCardFragment.kt

 package uz.mobiuz.mobiservice.dev.ui.sdk.card
 
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.text.method.DigitsKeyListener
-import android.util.Log
 import android.view.View
-import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo
 import androidx.core.os.bundleOf
 import androidx.fragment.app.viewModels
@@ -15,9 +11,8 @@ import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.collect
-import uz.agr.mobiuz.ui.dialog.MessageDialog
 import uz.agr.mobiuz.ui.fast_action.animation.getColorCompat
-import uz.agr.sdk.core.entity.card.CardRegistration
+import uz.agr.sdk.core.entity.card.CardInfo
 import uz.agr.sdk.coreui.extension.hideSoftInput
 import uz.agr.sdk.coreui.extension.showSoftInput
 import uz.agr.sdk.coreui.extension.visible
@@ -25,6 +20,7 @@ import uz.agr.sdk.coreui.ui.ButtonClick
 import uz.agr.sdk.coreui.ui.form.CardDateExpireFormat
 import uz.agr.sdk.coreui.ui.form.CardNumberFormat
 import uz.agr.sdk.pgw_core.mobi.BaseListener
+import uz.agr.sdk.pgw_core.mobi.CardListenerMobi
 import uz.agr.sdk.pgw_core.mobi.MobiUz
 import uz.mobiuz.mobiservice.dev.R
 import uz.mobiuz.mobiservice.dev.databinding.FragmentAddCardBinding
@@ -32,6 +28,8 @@ import uz.mobiuz.mobiservice.dev.model.SharedPref
 import uz.mobiuz.mobiservice.dev.network.model.UiStateObject
 import uz.mobiuz.mobiservice.dev.ui.base.BaseFragment
 import uz.mobiuz.mobiservice.dev.ui.global.CONSTANTS
+import uz.mobiuz.mobiservice.dev.utils.extensions.checkInternet
+import uz.mobiuz.mobiservice.dev.utils.extensions.customLog
 import java.util.*
 import javax.inject.Inject
 
@@ -71,7 +69,24 @@ class AddCardFragment : BaseFragment(R.layout.fragment_add_card) {
                 override fun onSingleClick(v: View?) {
                     if (cardNumberValid != null && cardExpiryValid != null) {
 //                        viewModel.cardRegistration(pref.userPhone.filter { it.isDigit() }, cardNumberValid!!, cardExpiryValid!!)
-                        viewModel.cardRegistration("998949125150", cardNumberValid!!, cardExpiryValid!!)
+
+                        MobiUz.getAllCards(object : CardListenerMobi<CardInfo> {
+                            override fun error(message: String) {}
+                            override fun loading(boolean: Boolean) {
+                                showProgressDialog(boolean)
+                            }
+                            override fun local(localData: List<CardInfo>) {}
+                            override fun server(serverData: List<CardInfo>) {
+                                val hash = MobiUz.getHash(cardNumberValid!!, cardExpiryValid!!)
+                                val filteredCards = serverData.filter { it.cardHash == hash }
+
+                                if (filteredCards.isEmpty()) {
+//                                    viewModel.cardRegistration("998949125150", cardNumberValid!!, cardExpiryValid!!)
+                                } else {
+                                    showToastMessage(getString(uz.agr.mobiuz.R.string.agr_mobi_uz_card_exist))
+                                }
+                            }
+                        })
                     }
                 }
             })
@@ -85,8 +100,8 @@ class AddCardFragment : BaseFragment(R.layout.fragment_add_card) {
                 when (it) {
                     is UiStateObject.SUCCESS -> {
                         showProgressDialog(false)
-                        showToastMessage("success:${it.data.maskedPhoneNumber}")
-                        navController.navigate(R.id.verificationFragment,
+                        navController.navigate(
+                            R.id.verificationFragment,
                             bundleOf(
                                 CONSTANTS.TYPE_VERIFICATION to CONSTANTS.TYPE_ADD_CARD,
                                 CONSTANTS.CARD_ID to it.data.cardId,

app/src/main/java/uz/mobiuz/mobiservice/dev/ui/sdk/card/CardsListFragment.kt

@@ -107,6 +107,7 @@ class CardsListFragment : BaseFragment(R.layout.fragment_cards_list) {
             swipeToRefresh.setOnRefreshListener {
                 MobiUz.refreshCardsInfo(object : BaseListener<List<CardInfo>>{
                     override fun error(message: String) {
+                        swipeToRefresh.isRefreshing = false
                         showToastMessage(message)
                     }
 
@@ -115,6 +116,7 @@ class CardsListFragment : BaseFragment(R.layout.fragment_cards_list) {
                     }
 
                     override fun success(data: List<CardInfo>) {
+                        swipeToRefresh.isRefreshing = false
                         setData(data)
                     }
                 })