From 151e860030a56aebff7d8ef55e275640a0c0cd97 Mon Sep 17 00:00:00 2001 From: Hemant Khadase Date: Fri, 6 Jan 2023 12:57:42 +0530 Subject: [PATCH] added missing code --- .../bajajfd/adapter/BankListAdapter.kt | 29 ++-------- .../ui/activity/BajajFdMainActivity.kt | 53 +++++++++---------- .../ui/fragment/StepTwoBajajFDFragment.kt | 48 +++++++++++------ 3 files changed, 61 insertions(+), 69 deletions(-) diff --git a/app/src/main/java/com/nivesh/production/bajajfd/adapter/BankListAdapter.kt b/app/src/main/java/com/nivesh/production/bajajfd/adapter/BankListAdapter.kt index 45a053f..814139f 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/adapter/BankListAdapter.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/adapter/BankListAdapter.kt @@ -23,28 +23,14 @@ class BankListAdapter( } private var checkedPosition: Int = -2 - override fun onCreateViewHolder( parent: ViewGroup, viewType: Int ): BankListViewHolder { -// return BankListViewHolder( -// LayoutInflater.from(parent.context).inflate( -// R.layout.item_bank_list_preview, -// parent, -// false -// ) -// ) - - - val view = LayoutInflater.from(parent.context).inflate(R.layout.item_bank_list_preview, parent, false); view.layoutParams = width?.div(1.35) ?.let { ViewGroup.LayoutParams(it.toInt(),ViewGroup.LayoutParams.WRAP_CONTENT) } return BankListViewHolder(view) - - - } override fun onBindViewHolder(holder: BankListViewHolder, position: Int) { @@ -55,20 +41,14 @@ class BankListAdapter( holder.tvBankIFSC.text = bankList.IFSCCode holder.tvBankAccountNumber.text = bankList.AccountNumber - if (selectedAccount == bankList.AccountNumber && (checkedPosition == -2)) - { + if (selectedAccount == bankList.AccountNumber && (checkedPosition == -2)) { holder.bankSelector.setBackgroundResource(R.drawable.ic_select_green) checkedPosition = holder.adapterPosition - - } - else if (checkedPosition == -1) { + } else if (checkedPosition == -1) { holder.bankSelector.setBackgroundResource(R.drawable.ic_select_outline) - } - else if (checkedPosition == holder.adapterPosition) { + } else if (checkedPosition == holder.adapterPosition) { holder.bankSelector.setBackgroundResource(R.drawable.ic_select_green) - } - - else { + } else { holder.bankSelector.setBackgroundResource(R.drawable.ic_select_outline) } @@ -93,7 +73,6 @@ class BankListAdapter( onItemClickListener = listener } - fun getSelected(): ClientBanklist? { return if (checkedPosition != -1) { bankList?.get(checkedPosition) diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt index 01f1eab..fa7b4da 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt @@ -226,7 +226,7 @@ class BajajFdMainActivity : BaseActivity() { // set viewPager sectionsPagerAdapter = SectionsPagerAdapter(supportFragmentManager, fragments, stepsCount) val viewPager: DisableAdapter = binding.viewPager - // viewPager.setPagingEnabled(false) + viewPager.setPagingEnabled(false) viewPager.adapter = sectionsPagerAdapter viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrolled( @@ -392,35 +392,34 @@ class BajajFdMainActivity : BaseActivity() { fun paymentDialog(payUrl: String, value: String) { Log.e("payUrl", "-->$payUrl") Log.e("value", "-->$value") - val dialogWebView = Dialog(this@BajajFdMainActivity) - dialogWebView.setContentView(R.layout.row_fd_pay) - dialogWebView.setCancelable(true) - - val tvCancel = dialogWebView.findViewById(R.id.tvCancel) - tvCancel.setOnClickListener { - dialogWebView.dismiss() - } +// val dialogWebView = Dialog(this@BajajFdMainActivity) +// dialogWebView.setContentView(R.layout.row_fd_pay) +// dialogWebView.setCancelable(true) +// +// val tvCancel = dialogWebView.findViewById(R.id.tvCancel) +// tvCancel.setOnClickListener { +// dialogWebView.dismiss() +// } +// +// val lp = WindowManager.LayoutParams() +// lp.copyFrom(dialogWebView.window?.attributes) +// lp.width = WindowManager.LayoutParams.MATCH_PARENT +// lp.height = WindowManager.LayoutParams.MATCH_PARENT +// dialogWebView.window?.attributes = lp +// val wVPay = dialogWebView.findViewById(R.id.wVPay) +// wVPay.webViewClient = MyWebViewClient() +// wVPay.settings.javaScriptEnabled = true +// wVPay.settings.domStorageEnabled = true +// val postData = "name=${URLEncoder.encode("msg", "UTF-8")}" + +// "&value=${URLEncoder.encode(value, "UTF-8")}" +// wVPay.postUrl(payUrl, postData.toByteArray()) +// dialogWebView.show() - val lp = WindowManager.LayoutParams() - lp.copyFrom(dialogWebView.window?.attributes) - lp.width = WindowManager.LayoutParams.MATCH_PARENT - lp.height = WindowManager.LayoutParams.MATCH_PARENT - dialogWebView.window?.attributes = lp - val wVPay = dialogWebView.findViewById(R.id.wVPay) - wVPay.webViewClient = MyWebViewClient() - wVPay.settings.javaScriptEnabled = true - wVPay.settings.domStorageEnabled = true - // wVPay.loadUrl(payUrl) + val webView = WebView(this@BajajFdMainActivity) + setContentView(webView) val postData = "name=${URLEncoder.encode("msg", "UTF-8")}" + "&value=${URLEncoder.encode(value, "UTF-8")}" - wVPay.postUrl(payUrl, postData.toByteArray()) - dialogWebView.show() - -// val webView = WebView(this@BajajFdMainActivity) -// val postData = "type=${URLEncoder.encode("hidden", "UTF-8")}" + -// "name=${URLEncoder.encode("msg", "UTF-8")}" + -// "&value=${URLEncoder.encode(value, "UTF-8")}" -// webView.postUrl(payUrl, postData.toByteArray()) + webView.postUrl(payUrl, postData.toByteArray()) } class MyWebViewClient : WebViewClient() { diff --git a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt index cd7f568..0d8bb05 100644 --- a/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt +++ b/app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt @@ -44,6 +44,7 @@ import com.nivesh.production.bajajfd.util.Common.Companion.isValidEmail import com.nivesh.production.bajajfd.util.Common.Companion.isValidName import com.nivesh.production.bajajfd.util.Common.Companion.isValidPan import com.nivesh.production.bajajfd.util.Common.Companion.removeError +import com.nivesh.production.bajajfd.util.Common.Companion.showDialogValidation import com.nivesh.production.bajajfd.util.Constants.Companion.token import com.nivesh.production.bajajfd.util.Resource import com.nivesh.production.bajajfd.viewModel.StepTwoBajajFDViewModel @@ -548,23 +549,12 @@ class StepTwoBajajFDFragment : BaseFragment() { } binding.addBankDetail.setOnClickListener { - if (binding.llBankDetails.visibility == View.GONE) { - binding.llBankDetails.visibility = View.VISIBLE - binding.addBankDetail.setCompoundDrawablesWithIntrinsicBounds( - 0, - 0, - R.drawable.ic_minus, - 0 - ) - + if (bankListAdapter.itemCount == 5) { + showDialogValidation(mActivity, "You Can Not Add More Than Five Account") } else { binding.llBankDetails.visibility = View.GONE - binding.addBankDetail.setCompoundDrawablesWithIntrinsicBounds( - 0, - 0, - R.drawable.ic_add_icon, - 0 - ) + binding.addBankDetail.setCompoundDrawablesWithIntrinsicBounds(0,0,R.drawable.ic_add_icon,0) + showHideBankDetail() } } @@ -943,18 +933,21 @@ class StepTwoBajajFDFragment : BaseFragment() { listOfBanks, clientBankList.AccountNumber.toString() ) + showHideBankDetail() } else { - Common.showDialogValidation( + showDialogValidation( activity as BajajFdMainActivity, getBankValidationApiResponse.Message ) + showHideBankDetail() } } else -> { - Common.showDialogValidation( + showDialogValidation( activity as BajajFdMainActivity, getBankValidationApiResponse.Message ) + showHideBankDetail() } } } @@ -1985,6 +1978,27 @@ class StepTwoBajajFDFragment : BaseFragment() { } } + private fun showHideBankDetail() { + if (binding.llBankDetails.visibility == View.GONE) { + binding.llBankDetails.visibility = View.VISIBLE + binding.addBankDetail.setCompoundDrawablesWithIntrinsicBounds( + 0, + 0, + R.drawable.ic_minus, + 0 + ) + + } else { + binding.llBankDetails.visibility = View.GONE + binding.addBankDetail.setCompoundDrawablesWithIntrinsicBounds( + 0, + 0, + R.drawable.ic_add_icon, + 0 + ) + } + } + override fun onDestroyView() { super.onDestroyView() _binding = null