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

.idea/misc.xml

@@ -7,6 +7,7 @@
         <entry key="../../.gradle/caches/transforms-3/272c6ad3bc9f3b40802fd3a427796f36/transformed/jetified-agr-sdk-mobi-uz-release-1.0.0/res/layout/agr_layout_empty.xml" value="0.25625" />
         <entry key="../../.gradle/caches/transforms-3/eea77424a90e1e1097be3e7a9314e37d/transformed/jetified-mobi_uz/res/layout/agr_fragment_fast_pay.xml" value="0.25" />
         <entry key="../../.gradle/caches/transforms-3/fd180e2afb980e83e4951f5e21e58af5/transformed/jetified-agr-sdk-coreui-release-1.7.0/res/layout/agr_core_ui_layout_zero.xml" value="0.25625" />
+        <entry key="../../.gradle/caches/transforms-3/fd180e2afb980e83e4951f5e21e58af5/transformed/jetified-agr-sdk-coreui-release-1.7.0/res/layout/agr_item_card.xml" value="0.25625" />
         <entry key="..\:/Users/NEW AGE/StudioProjects/shunchaki/app/src/main/res/layout/fragment_billing.xml" value="0.20520833333333333" />
         <entry key="app/src/main/res/drawable/bgn_avatar.xml" value="0.25069444444444444" />
         <entry key="app/src/main/res/drawable/bgn_lang.xml" value="0.2796296296296296" />
@@ -117,6 +118,7 @@
         <entry key="app/src/main/res/layout/item_ussd.xml" value="0.22" />
         <entry key="app/src/main/res/layout/large.xml" value="0.25625" />
         <entry key="app/src/main/res/layout/layout_ask_create_task.xml" value="0.22643442622950818" />
+        <entry key="app/src/main/res/layout/layout_empty.xml" value="0.25625" />
         <entry key="app/src/main/res/layout/layout_exit.xml" value="0.25625" />
         <entry key="app/src/main/res/layout/layout_home_header.xml" value="0.25625" />
         <entry key="app/src/main/res/layout/layout_offline_bottom_sheet.xml" value="0.266051912568306" />

app/release/output-metadata.json

+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "uz.mobiuz.mobiservice.dev",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "1.0",
+      "outputFile": "app-release.apk"
+    }
+  ],
+  "elementType": "File"
+}
\ No newline at end of file

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

@@ -11,6 +11,10 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.launch
+import uz.agr.sdk.core.entity.card.CardInfo
+import uz.agr.sdk.core.entity.card.CardRegistration
+import uz.agr.sdk.pgw_core.mobi.BaseListener
+import uz.agr.sdk.pgw_core.mobi.MobiUz
 import javax.inject.Inject
 
 @HiltViewModel
@@ -99,4 +103,49 @@ class AuthViewModel @Inject constructor(
     }
 
 
+    private val _cardConfirmUiState = MutableSharedFlow<UiStateObject<CardInfo>>()
+    val cardConfirmUiState: SharedFlow<UiStateObject<CardInfo>> = _cardConfirmUiState
+
+    fun cardConfirm(cardId: String, code: String) = viewModelScope.launch {
+        _cardConfirmUiState.emit(UiStateObject.LOADING)
+        MobiUz.cardConfirmSms(cardId, code, object : BaseListener<CardInfo> {
+            override fun error(message: String) {
+                viewModelScope.launch {
+                    _cardConfirmUiState.emit(UiStateObject.ERROR(message))
+                }
+            }
+
+            override fun loading(boolean: Boolean) {}
+
+            override fun success(data: CardInfo) {
+                viewModelScope.launch {
+                    _cardConfirmUiState.emit(UiStateObject.SUCCESS(data))
+                }
+            }
+        })
+    }
+
+    private val _resendSmsUiState = MutableSharedFlow<UiStateObject<CardRegistration>>()
+    val resendSmsUiState: SharedFlow<UiStateObject<CardRegistration>> = _resendSmsUiState
+
+    fun resendSms(phoneNumber: String, cardNumber: String, cardExpire: String) = viewModelScope.launch {
+        _resendSmsUiState.emit(UiStateObject.LOADING)
+        MobiUz.registerCardResendSms(phoneNumber, cardNumber, cardExpire,object : BaseListener<CardRegistration> {
+            override fun error(message: String) {
+                viewModelScope.launch {
+                    _resendSmsUiState.emit(UiStateObject.ERROR(message))
+                }
+            }
+
+            override fun loading(boolean: Boolean) {}
+
+            override fun success(data: CardRegistration) {
+                viewModelScope.launch {
+                    _resendSmsUiState.emit(UiStateObject.SUCCESS(data))
+                }
+            }
+        })
+    }
+
+
 }
\ No newline at end of file

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

 package uz.mobiuz.mobiservice.dev.ui.auth.verification
 
+import android.app.Activity
+import android.content.Intent
+import android.content.IntentFilter
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.view.KeyEvent
 import android.view.View
+import android.view.ViewGroup
 import android.view.animation.AnimationUtils
 import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
@@ -10,6 +16,7 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
+import com.google.android.gms.auth.api.phone.SmsRetriever
 import com.google.android.material.textfield.TextInputEditText
 import uz.mobiuz.mobiservice.dev.R
 import uz.mobiuz.mobiservice.dev.databinding.FragmentVerificationBinding
@@ -30,6 +37,10 @@ import uz.mobiuz.mobiservice.dev.utils.hideKeyboard
 import uz.mobiuz.mobiservice.dev.utils.showKeyboard
 import dagger.hilt.android.AndroidEntryPoint
 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 java.util.regex.Pattern
 import javax.inject.Inject
 
 
@@ -46,17 +57,25 @@ class VerificationFragment : BaseFragment(R.layout.fragment_verification) {
     private val navController: NavController by lazy(LazyThreadSafetyMode.NONE) { NavHostFragment.findNavController(this) }
     private var verificationCode = ""
     private var code = ""
-
-
     private var phone = ""
     private var type = ""
 
+    private var smsBroadcastReceiver: SmsBroadcastReceiver? = null
+    private var cardNumber = ""
+    private var cardId = ""
+    private var cardExpire = ""
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         arguments?.let {
             phone = it.getString(CONSTANTS.PHONE) ?: ""
             type = it.getString(CONSTANTS.TYPE_VERIFICATION) ?: ""
             verificationCode = it.getString(CONSTANTS.PIN_CODE) ?: ""
+
+            //card
+            cardId = it.getString(CONSTANTS.CARD_ID) ?: ""
+            cardNumber = it.getString(CONSTANTS.CARD_NUMBER) ?: ""
+            cardExpire = it.getString(CONSTANTS.CARD_EXPIRE) ?: ""
         }
     }
 
@@ -64,6 +83,8 @@ class VerificationFragment : BaseFragment(R.layout.fragment_verification) {
         _bn = FragmentVerificationBinding.bind(view)
         setUpUI()
         count(true)
+        startSmsUserConsent()
+        registerBroadcastReceiver()
         collects()
     }
 
@@ -91,18 +112,27 @@ class VerificationFragment : BaseFragment(R.layout.fragment_verification) {
             btnVerification.setOnClickListener(object : ButtonClick() {
                 override fun onSingleClick(v: View?) {
                     getLinePinCodes()
-                    val auth = UserAuth(phone.replace("+", "").replace(" ", ""), null, code)
-                    if (type == CONSTANTS.TYPE_FORGET) {
-                        viewModel.checkResetCode(auth)
-                    } else {
-                        viewModel.verification(auth)
+                    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)
+                        }
                     }
 
                 }
             })
 
             sentCodeAgain.setOnClickListener {
-                viewModel.resetSmsCode(UserAuth(phone.replace("+", "").replace(" ", "")))
+                if(type == CONSTANTS.TYPE_ADD_CARD){
+                    viewModel.resendSms("998949125150", cardNumber, cardExpire)
+                }else
+                viewModel.resetSmsCode(UserAuth(phone.filter { it.isDigit() }))
             }
             coutdownView.setOnCountdownEndListener {
                 count(false)
@@ -111,7 +141,7 @@ class VerificationFragment : BaseFragment(R.layout.fragment_verification) {
         }
     }
 
-    private fun setVerificationCode() {
+    private fun setVerificationCode(code:String) {
         if(verificationCode.length == 6){
             bn.apply {
                 pin1.setText(verificationCode[0].toString())
@@ -126,7 +156,7 @@ class VerificationFragment : BaseFragment(R.layout.fragment_verification) {
         }
     }
 
-    private fun getLinePinCodes() {
+    private fun getLinePinCodes() :String{
         bn.apply {
             code = ""
             code += pin1.text.toString()
@@ -136,6 +166,7 @@ class VerificationFragment : BaseFragment(R.layout.fragment_verification) {
             code += pin5.text.toString()
             code += pin6.text.toString()
         }
+        return code
     }
 
     private fun setColorPins(color: Int) {
@@ -286,6 +317,47 @@ class VerificationFragment : BaseFragment(R.layout.fragment_verification) {
                 }
             }
         }
+
+        viewLifecycleOwner.lifecycleScope.launchWhenStarted {
+            viewModel.cardConfirmUiState.collect {
+                when (it) {
+                    is UiStateObject.SUCCESS -> {
+                        showProgressDialog(false)
+                        showSuccessDialog()
+                    }
+                    is UiStateObject.ERROR -> {
+                        showProgressDialog(false)
+                        setColorPins(getColorCompat(R.color.primary100))
+                        bn.txtErrorCode.isVisible = true
+                        bn.pinView.startAnimation(AnimationUtils.loadAnimation(requireContext(), R.anim.shake))
+                        showToastMessage(it.message)
+                    }
+                    is UiStateObject.LOADING -> {
+                        showProgressDialog(true)
+
+                    }
+                    else -> Unit
+                }
+            }
+        }
+        viewLifecycleOwner.lifecycleScope.launchWhenStarted {
+            viewModel.resendSmsUiState.collect {
+                when (it) {
+                    is UiStateObject.SUCCESS -> {
+                        showProgressDialog(false)
+                        count(true)
+                    }
+                    is UiStateObject.ERROR -> {
+                        showProgressDialog(false)
+
+                    }
+                    is UiStateObject.LOADING -> {
+                        showProgressDialog(true)
+                    }
+                    else -> Unit
+                }
+            }
+        }
     }
 
     private fun count(status: Boolean) {
@@ -297,7 +369,68 @@ class VerificationFragment : BaseFragment(R.layout.fragment_verification) {
         }
     }
 
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        activity?.hideSoftInput(bn.pinView)
+        if (requestCode == 200) {
+            if (resultCode == Activity.RESULT_OK && data != null) { //That gives all message to us.
+                val message = data.getStringExtra(SmsRetriever.EXTRA_SMS_MESSAGE)
+                message?.let {
+                    getOtpFromMessage(message)
+                }
+            }
+        }
+    }
+
+    private fun getOtpFromMessage(message: String) { // This will match any 6 digit number in the message
+        val matcher = Pattern.compile("(|^)\\d{6}").matcher(message)
+        if (matcher.find()) {
+            setVerificationCode(matcher.group(0))
+//            etConfirmCode.setText(matcher.group(0))
+        }
+    }
+
+    private fun showSuccessDialog() {
+        val dialog = MessageDialog(
+            requireContext(),
+            getString(uz.agr.mobiuz.R.string.agr_mobi_uz_card_added),
+            getString(uz.agr.mobiuz.R.string.agr_mobi_uz_close_process)
+        )
+        dialog.window!!.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+        dialog.window!!.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+        dialog.setCanceledOnTouchOutside(true)
+        dialog.setOnOkClickListener(object : MessageDialog.OnClickListener {
+            override fun dialogPositiveClicked() {
+                dialog.dismiss()
+                navController.popBackStack(R.id.cardsListFragment, false)
+            }
+        })
+        dialog.show()
+    }
+    private fun startSmsUserConsent() {
+        val client = SmsRetriever.getClient(requireContext())
+        client.startSmsUserConsent(null)
+            .addOnSuccessListener { /**/ }
+            .addOnFailureListener { /**/ }
+    }
+
+    private fun registerBroadcastReceiver() {
+        smsBroadcastReceiver = SmsBroadcastReceiver()
+        smsBroadcastReceiver!!.smsBroadcastReceiverListener =
+            object : SmsBroadcastReceiver.SmsBroadcastReceiverListener {
+                override fun onSuccess(intent: Intent?) {
+                    startActivityForResult(intent, 200)
+                }
+
+                override fun onFailure() {}
+            }
+        val intentFilter = IntentFilter(SmsRetriever.SMS_RETRIEVED_ACTION)
+        requireActivity().registerReceiver(smsBroadcastReceiver, intentFilter)
+    }
+
     override fun onDestroy() {
+        requireActivity().unregisterReceiver(smsBroadcastReceiver)
         _bn = null
         super.onDestroy()
     }

app/src/main/java/uz/mobiuz/mobiservice/dev/ui/global/CONSTANTS.kt

@@ -3,6 +3,8 @@ package uz.mobiuz.mobiservice.dev.ui.global
 object CONSTANTS {
 
     const val CARD_ID = "CARD_ID"
+    const val CARD_NUMBER = "CARD_NUMBER"
+    const val CARD_EXPIRE = "CARD_EXPIRE"
     const val UNAUTHORIZED = "UNAUTHORIZED"
     const val BASE_URL = "https://mobileapp.mobi.uz/api/v1/"
 
@@ -36,7 +38,7 @@ object CONSTANTS {
     const val PHONE2 = "+998 97 130 09 09"
     const val PHONE3 = "+998 97 203 10 10"
     const val DEFAULT_PHONE = "+998 97 999-99-99"
-    const val RESEND_CODE_TIME = 60000L
+    const val RESEND_CODE_TIME = 6000L
     const val BLOCKED_TIME = 6000
 
 
@@ -46,6 +48,7 @@ object CONSTANTS {
     const val REGISTER = "register"
     const val TYPE_VERIFICATION = "type_verification"
     const val TYPE_FORGET = "type_forget"
+    const val TYPE_ADD_CARD = "TYPE_ADD_CARD"
     const val PIN_CODE = "PIN_CODE"
     const val FIRST = "first"
     const val SERVICE = "service"

app/src/main/java/uz/mobiuz/mobiservice/dev/ui/home/BillingFragment.kt

@@ -43,20 +43,7 @@ class BillingFragment : BaseFragment(R.layout.fragment_billing) {
             savedCards.setOnClickListener {
                 getPhoneNumber(object : LoadPhoneNumber {
                     override fun invoke(phoneNumber: String) {
-//                        navController.navigate(R.id.cardsListFragment, bundleOf(CONSTANTS.PHONE to pref.userPhone.filter { it.isDigit() }))
-                        MobiUz.registerCard("998990552109", "8600312917291250", "0325", object : BaseListener<CardRegistration> {
-                            override fun error(message: String) {
-                                Log.e("TTT", "Error : $message")
-                            }
-
-                            override fun loading(boolean: Boolean) {
-                                Log.d("TTT", "Loading : $boolean")
-                            }
-
-                            override fun success(data: CardRegistration) {
-                                Log.d("TTT", "Data: ${data.maskedPhoneNumber}")
-                            }
-                        })
+                        navController.navigate(R.id.cardsListFragment, bundleOf(CONSTANTS.PHONE to pref.userPhone.filter { it.isDigit() }))
                     }
                 })
             }

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
@@ -12,6 +15,7 @@ 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.coreui.extension.hideSoftInput
@@ -66,12 +70,12 @@ class AddCardFragment : BaseFragment(R.layout.fragment_add_card) {
             btnContinue.setOnClickListener(object : ButtonClick() {
                 override fun onSingleClick(v: View?) {
                     if (cardNumberValid != null && cardExpiryValid != null) {
-                        viewModel.cardRegistration(pref.userPhone.filter { it.isDigit() }, cardNumberValid!!, cardExpiryValid!!)
+//                        viewModel.cardRegistration(pref.userPhone.filter { it.isDigit() }, cardNumberValid!!, cardExpiryValid!!)
+                        viewModel.cardRegistration("998949125150", cardNumberValid!!, cardExpiryValid!!)
                     }
                 }
             })
         }
-
     }
 
 
@@ -82,7 +86,14 @@ class AddCardFragment : BaseFragment(R.layout.fragment_add_card) {
                     is UiStateObject.SUCCESS -> {
                         showProgressDialog(false)
                         showToastMessage("success:${it.data.maskedPhoneNumber}")
-                        navController.navigate(R.id.cardConfirmFragment, bundleOf(CONSTANTS.CARD_ID to it.data.cardId))
+                        navController.navigate(R.id.verificationFragment,
+                            bundleOf(
+                                CONSTANTS.TYPE_VERIFICATION to CONSTANTS.TYPE_ADD_CARD,
+                                CONSTANTS.CARD_ID to it.data.cardId,
+                                CONSTANTS.CARD_NUMBER to cardNumberValid,
+                                CONSTANTS.CARD_EXPIRE to cardExpiryValid,
+                            )
+                        )
 
                     }
                     is UiStateObject.ERROR -> {
@@ -91,7 +102,6 @@ class AddCardFragment : BaseFragment(R.layout.fragment_add_card) {
 
                     }
                     is UiStateObject.LOADING -> {
-
                         showProgressDialog(true)
                     }
                     else -> Unit
@@ -122,7 +132,7 @@ class AddCardFragment : BaseFragment(R.layout.fragment_add_card) {
                     tvErrorMsg.visible(false)
                 } else {
                     etCardNumber.setBackgroundResource(uz.agr.mobiuz.R.drawable.agr_edit_text_error)
-                    etCardNumber.setTextColor(getColorCompat(uz.agr.mobiuz.R.color.primary100))
+                    etCardNumber.setTextColor(getColorCompat(R.color.primary100))
                     tvErrorMsg.visible(true)
                 }
                 checkValidForm()

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

@@ -7,18 +7,19 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.hannesdorfmann.adapterdelegates4.AdapterDelegate
 import kotlinx.android.synthetic.main.mobi_uz_item_card.view.*
-import timber.log.Timber
 import uz.agr.sdk.core.entity.card.CardInfo
 import uz.agr.sdk.coreui.extension.*
 import uz.agr.sdk.coreui.model.storage.Prefs
 import uz.mobiuz.mobiservice.dev.R
-import uz.mobiuz.mobiservice.dev.utils.LayoutContainer
+import uz.mobiuz.mobiservice.dev.utils.extensions.MultiBlock
 
 class CardDelegate(
     private val hideSettingsIcon: (Boolean),
-    private val clickListener: (CardInfo, Int) -> Unit
 ) : AdapterDelegate<MutableList<Any>>() {
 
+    private var listener: MultiBlock<CardInfo, Int>? = null
+
+
     private var amount: Long = 0L
     private var cardsList: List<String> = emptyList()
 
@@ -42,7 +43,7 @@ class CardDelegate(
         return (viewHolder as ViewHolder).bind(items[position] as CardInfo, position)
     }
 
-    private inner class ViewHolder(override val containerView: View) : RecyclerView.ViewHolder(containerView), LayoutContainer {
+    private inner class ViewHolder(val containerView: View) : RecyclerView.ViewHolder(containerView) {
         private lateinit var cardInfo: CardInfo
 
         init {
@@ -60,7 +61,7 @@ class CardDelegate(
             }
             if (!hideSettingsIcon) {
                 containerView.btnSetting.setOnClickListener {
-                    clickListener(cardInfo, adapterPosition)
+                    listener?.invoke(cardInfo, adapterPosition)
                 }
             }
             containerView.btnSetting.visible(!hideSettingsIcon)
@@ -70,12 +71,10 @@ class CardDelegate(
         fun bind(cardInfo: CardInfo, position: Int) {
             this.cardInfo = cardInfo
 
-            containerView.tvCardBalance.text = cardInfo.balance.formattedMoney() + " " + containerView.context.getString(R.string.agr_mobi_uz_curr)
+            containerView.tvCardBalance.text = cardInfo.balance.formattedMoney() + " " + itemView.context.getString(R.string.agr_mobi_uz_curr)
             containerView.tvCardPan.text = cardInfo.pan.formatToMaskedCardPan()
             containerView.tvCardExpire.text = cardInfo.getExpiryFormatted()
             containerView.tvCardHolderName.text = cardInfo.fullName
-            Timber.e("PAN: ${cardInfo.pan}")
-            Timber.e("EXpire: ${cardInfo.expiry}")
             val isUzCard = cardInfo.pan.startsWith("8600")
             val isHumoCard = cardInfo.pan.startsWith("9860")
             if (isHumoCard) {
@@ -89,7 +88,7 @@ class CardDelegate(
 
         private fun itemClicked() {
             if (amount <= cardInfo.balance)
-                clickListener(cardInfo, adapterPosition)
+                listener?.invoke(cardInfo, adapterPosition)
             else showError()
         }
 
@@ -103,4 +102,8 @@ class CardDelegate(
             dialog.show()
         }
     }
+
+    fun setOnClickListener(block: MultiBlock<CardInfo, Int>) {
+        listener = block
+    }
 }
\ No newline at end of file

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

 package uz.mobiuz.mobiservice.dev.ui.sdk.card
 
-import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.launch
+import uz.agr.sdk.core.entity.card.CardInfo
 import uz.agr.sdk.core.entity.card.CardRegistration
 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.network.model.UiStateList
 import uz.mobiuz.mobiservice.dev.network.model.UiStateObject
 import uz.mobiuz.mobiservice.dev.network.repository.MainRepository
 import javax.inject.Inject
@@ -19,29 +21,95 @@ class CardViewModel @Inject constructor(
     private val repository: MainRepository
 ) : ViewModel() {
 
+    private val _cardListUiState = MutableSharedFlow<UiStateList<CardInfo>>()
+    val cardListUiState: SharedFlow<UiStateList<CardInfo>> = _cardListUiState
+
+    fun getAllCards() = viewModelScope.launch {
+        _cardListUiState.emit(UiStateList.LOADING)
+        MobiUz.getAllCards(object : CardListenerMobi<CardInfo> {
+            override fun error(message: String) {
+                viewModelScope.launch {
+                    _cardListUiState.emit(UiStateList.ERROR(message))
+                }
+            }
+
+            override fun loading(boolean: Boolean) {}
+
+            override fun local(localData: List<CardInfo>) {
+                viewModelScope.launch {
+                    _cardListUiState.emit(UiStateList.SUCCESS(localData))
+                }
+            }
+
+            override fun server(serverData: List<CardInfo>) {
+                viewModelScope.launch {
+                    _cardListUiState.emit(UiStateList.SUCCESS(serverData))
+                }
+            }
+        })
+    }
+
     private val _cardRegistrationUiState = MutableSharedFlow<UiStateObject<CardRegistration>>()
     val cardRegistrationUiState: SharedFlow<UiStateObject<CardRegistration>> = _cardRegistrationUiState
 
     fun cardRegistration(phone: String, card: String, expire: String) = viewModelScope.launch {
+        _cardRegistrationUiState.emit(UiStateObject.LOADING)
         MobiUz.registerCard(phone, card, expire, object : BaseListener<CardRegistration> {
             override fun error(message: String) {
-                Log.d("TAG", "error: ")
                 viewModelScope.launch {
                     _cardRegistrationUiState.emit(UiStateObject.ERROR(message))
                 }
             }
 
-            override fun loading(boolean: Boolean) {
-                Log.d("TAG", "loading: $boolean ")
+            override fun loading(boolean: Boolean) {}
+
+            override fun success(data: CardRegistration) {
                 viewModelScope.launch {
-                    _cardRegistrationUiState.emit(UiStateObject.LOADING)
+                    _cardRegistrationUiState.emit(UiStateObject.SUCCESS(data))
                 }
             }
+        })
+    }
+
+    private val _cardConfirmUiState = MutableSharedFlow<UiStateObject<CardInfo>>()
+    val cardConfirmUiState: SharedFlow<UiStateObject<CardInfo>> = _cardConfirmUiState
+
+    fun cardConfirm(cardId: String, code: String) = viewModelScope.launch {
+        _cardConfirmUiState.emit(UiStateObject.LOADING)
+        MobiUz.cardConfirmSms(cardId, code, object : BaseListener<CardInfo> {
+            override fun error(message: String) {
+                viewModelScope.launch {
+                    _cardConfirmUiState.emit(UiStateObject.ERROR(message))
+                }
+            }
+
+            override fun loading(boolean: Boolean) {}
+
+            override fun success(data: CardInfo) {
+                viewModelScope.launch {
+                    _cardConfirmUiState.emit(UiStateObject.SUCCESS(data))
+                }
+            }
+        })
+    }
+
+    private val _resendSmsUiState = MutableSharedFlow<UiStateObject<CardRegistration>>()
+    val resendSmsUiState: SharedFlow<UiStateObject<CardRegistration>> = _resendSmsUiState
+
+    fun resendSms(phoneNumber: String, cardNumber: String, cardExpire: String) = viewModelScope.launch {
+        _resendSmsUiState.emit(UiStateObject.LOADING)
+        MobiUz.registerCardResendSms(phoneNumber, cardNumber, cardExpire,object : BaseListener<CardRegistration> {
+            override fun error(message: String) {
+                viewModelScope.launch {
+                    _resendSmsUiState.emit(UiStateObject.ERROR(message))
+                }
+            }
+
+            override fun loading(boolean: Boolean) {}
 
             override fun success(data: CardRegistration) {
-                Log.d("TAG", "success: ${data.maskedPhoneNumber} ")
                 viewModelScope.launch {
-                    _cardRegistrationUiState.emit(UiStateObject.SUCCESS(data))
+                    _resendSmsUiState.emit(UiStateObject.SUCCESS(data))
                 }
             }
         })

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

@@ -2,27 +2,25 @@ package uz.mobiuz.mobiservice.dev.ui.sdk.card
 
 import androidx.recyclerview.widget.DiffUtil
 import com.hannesdorfmann.adapterdelegates4.ListDelegationAdapter
-import uz.agr.mobiuz.ui.card.select.CardDelegate
 import uz.agr.sdk.core.entity.card.CardInfo
 import uz.agr.sdk.coreui.ui.list.ProgressAdapterDelegate
 import uz.agr.sdk.coreui.ui.list.ProgressItem
 import uz.mobiuz.mobiservice.dev.utils.extensions.MultiBlock
-import uz.mobiuz.mobiservice.dev.utils.extensions.SingleBlock
 
 
 class CardsListAdapter(
-    hideSettingsIcon: (Boolean),
-    clickListener: (CardInfo, Int) -> Unit
+    private val hideSettingsIcon: Boolean,
 ) : ListDelegationAdapter<MutableList<Any>>() {
-//    private var listener: MultiBlock<CardInfo,Int>? = null
-//
-//    fun setOnClickListener(block: MultiBlock<CardInfo,Int>){
-//        listener = block
-//    }
+
+    private var listener: MultiBlock<CardInfo, Int>? = null
 
     init {
         items = mutableListOf()
-        delegatesManager.addDelegate(CardDelegate(hideSettingsIcon, clickListener))
+        val delegateAdapter = CardDelegate(hideSettingsIcon)
+        delegateAdapter.setOnClickListener { cardInfo, i ->
+            listener?.invoke(cardInfo,i)
+        }
+        delegatesManager.addDelegate(delegateAdapter)
         delegatesManager.addDelegate(ProgressAdapterDelegate())
     }
 
@@ -86,4 +84,8 @@ class CardsListAdapter(
             }
         }
     }
+
+    fun setOnClickListener(block: MultiBlock<CardInfo, Int>) {
+        listener = block
+    }
 }
\ No newline at end of file

app/src/main/res/layout/fragment_add_card.xml

@@ -126,7 +126,7 @@
         android:layout_gravity="bottom"
         android:layout_marginHorizontal="16dp"
         android:layout_marginBottom="40dp"
-        android:enabled="false"
+        android:enabled="true"
         android:text="@string/agr_mobi_uz_add_card"
         android:textStyle="bold" />
 </LinearLayout>

app/src/main/res/layout/fragment_card_confirm.xml

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    android:fitsSystemWindows="true"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
@@ -130,45 +131,85 @@
         android:visibility="gone"
         tools:ignore="Autofill,LabelFor" />
 
-
-    <TextView
-        android:id="@+id/tvTimeOut"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="32dp"
-        android:layout_marginTop="64dp"
-        android:layout_marginRight="32dp"
-        android:gravity="center"
-        android:textColor="@color/agr_grey110"
-        android:textSize="14sp"
-        tools:text="@string/agr_mobi_uz_sms_time_out_info" />
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="28dp"
+        android:layout_gravity="center"
+        android:layout_marginTop="@dimen/_34sdp"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/pin_view_group">
+
+        <TextView
+            android:id="@+id/countWaitText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:text="@string/sent_code_again"
+            android:textColor="@color/grey110"
+            android:textSize="16sp" />
+
+        <cn.iwgang.countdownview.CountdownView
+            android:id="@+id/coutdown_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/_4sdp"
+            android:layout_marginTop="2dp"
+            app:isHideTimeBackground="false"
+            app:isShowDay="false"
+            app:isShowHour="false"
+            app:isShowMillisecond="false"
+            app:isShowMinute="true"
+            app:isShowSecond="true"
+            app:isShowTimeBgBorder="false"
+            app:isShowTimeBgDivisionLine="false"
+            app:suffixDay="days"
+            app:suffixGravity="center"
+            app:suffixHour=":"
+            app:suffixMillisecond="ss"
+            app:suffixMinute=":"
+            app:suffixSecond=""
+            app:suffixTextColor="@color/grey100"
+            app:suffixTextSize="14sp"
+            app:timeBgColor="@color/white100"
+            app:timeBgRadius="3dp"
+            app:timeBgSize="14dp"
+            app:timeTextSize="14sp" />
+
+        <TextView
+            android:id="@+id/coutdown_view_helper_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/_4sdp"
+            android:text="00:00"
+            android:textColor="@color/primary100"
+            android:textSize="16sp"
+            android:visibility="gone" />
+    </LinearLayout>
 
     <Button
         android:id="@+id/btnConfirm"
         android:layout_width="match_parent"
-        android:layout_height="56dp"
-        android:layout_gravity="bottom"
+        android:layout_height="wrap_content"
         android:layout_marginHorizontal="16dp"
         android:layout_marginTop="51dp"
-        android:background="@drawable/button_selector"
         android:enabled="false"
-        android:text="@string/agr_mobi_uz_next"
-        android:textAllCaps="false"
-        android:textColor="@color/agr_white"
-        android:textSize="15sp"
-        android:textStyle="bold" />
+        android:text="@string/agr_mobi_uz_next" />
 
-    <Button
+    <TextView
         android:id="@+id/btnResend"
-        style="@style/Widget.AppCompat.Button.Borderless.Colored"
+        android:background="?android:selectableItemBackground"
         android:layout_width="match_parent"
-        android:layout_height="56dp"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingVertical="16dp"
         android:layout_gravity="center_horizontal"
-        android:layout_marginStart="16dp"
+        android:layout_marginHorizontal="16dp"
         android:layout_marginTop="8dp"
-        android:layout_marginEnd="16dp"
         android:text="@string/agr_mobi_uz_sms_resend"
-        android:textAllCaps="false"
         android:textColor="@color/primary100"
         android:textSize="14sp"
         android:textStyle="bold"

app/src/main/res/layout/fragment_cards_list.xml

@@ -33,13 +33,15 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recyclerView"
                 android:layout_width="match_parent"
+                android:visibility="visible"
                 android:layout_height="match_parent"
-                tools:listitem="@layout/agr_item_card"
+                tools:listitem="@layout/mobi_uz_item_card"
                 tools:paddingTop="@dimen/agr_card_list_start_offset" />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         <include
-            layout="@layout/agr_layout_empty"
+            android:id="@+id/layout_empty"
+            layout="@layout/layout_empty"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="gone" />

app/src/main/res/layout/fragment_verification.xml

@@ -4,6 +4,7 @@
     android:id="@+id/view_group"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.MaterialToolbar

app/src/main/res/layout/layout_empty.xml

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/emptyLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/agr_white">
+
+    <Space
+        android:id="@+id/spaceTop"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@color/agr_white"
+        app:layout_constraintBottom_toTopOf="@id/ivNoCard"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintVertical_weight="1" />
+
+    <ImageView
+        android:id="@+id/ivNoCard"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/_25sdp"
+        android:contentDescription="@null"
+        app:layout_constraintBottom_toTopOf="@id/tvNoCard"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:srcCompat="@drawable/ic_agr_no_cards" />
+
+    <TextView
+        android:id="@+id/tvNoCard"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:letterSpacing="0.05"
+        android:lineSpacingExtra="2dp"
+        android:layout_marginHorizontal="@dimen/_30sdp"
+        android:text="@string/agr_mobi_uz_no_card"
+        android:textColor="@color/agr_grey80"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Space
+        android:id="@+id/spaceBottom"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvNoCard"
+        app:layout_constraintVertical_weight="1.3" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/mobi_uz_item_card.xml

@@ -4,8 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="180dp"
-    android:layout_marginStart="16dp"
-    android:layout_marginEnd="16dp"
+    android:layout_marginHorizontal="16dp"
     android:layout_marginBottom="@dimen/_8sdp"
     app:cardCornerRadius="@dimen/_6sdp">
 
@@ -143,5 +142,9 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/tvCardBalance"
             app:srcCompat="@drawable/ic_mobi_uz_delete" />
+        <View
+            android:layout_width="match_parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_height="1dp"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file

app/src/main/res/navigation/nav_graph_home.xml

@@ -82,8 +82,13 @@
         android:label="AddCardFragment" />
     <fragment
         android:id="@+id/cardConfirmFragment"
-        tools:layout=""
+        tools:layout="@layout/fragment_card_confirm"
         android:name="uz.mobiuz.mobiservice.dev.ui.sdk.card.CardConfirmFragment"
         android:label="CardConfirmFragment" />
 
+    <fragment
+        android:id="@+id/verificationFragment"
+        android:name="uz.mobiuz.mobiservice.dev.ui.auth.verification.VerificationFragment"
+        android:label="MyVerificationFragment" />
+
 </navigation>
\ No newline at end of file