Browse Source

added missing code

PankajBranch
Hemant Khadase 2 years ago
parent
commit
151e860030
3 changed files with 61 additions and 69 deletions
  1. +4
    -25
      app/src/main/java/com/nivesh/production/bajajfd/adapter/BankListAdapter.kt
  2. +26
    -27
      app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt
  3. +31
    -17
      app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt

+ 4
- 25
app/src/main/java/com/nivesh/production/bajajfd/adapter/BankListAdapter.kt View File

@ -23,28 +23,14 @@ class BankListAdapter(
} }
private var checkedPosition: Int = -2 private var checkedPosition: Int = -2
override fun onCreateViewHolder( override fun onCreateViewHolder(
parent: ViewGroup, parent: ViewGroup,
viewType: Int viewType: Int
): BankListViewHolder { ): 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); val view = LayoutInflater.from(parent.context).inflate(R.layout.item_bank_list_preview, parent, false);
view.layoutParams = width?.div(1.35) view.layoutParams = width?.div(1.35)
?.let { ViewGroup.LayoutParams(it.toInt(),ViewGroup.LayoutParams.WRAP_CONTENT) } ?.let { ViewGroup.LayoutParams(it.toInt(),ViewGroup.LayoutParams.WRAP_CONTENT) }
return BankListViewHolder(view) return BankListViewHolder(view)
} }
override fun onBindViewHolder(holder: BankListViewHolder, position: Int) { override fun onBindViewHolder(holder: BankListViewHolder, position: Int) {
@ -55,20 +41,14 @@ class BankListAdapter(
holder.tvBankIFSC.text = bankList.IFSCCode holder.tvBankIFSC.text = bankList.IFSCCode
holder.tvBankAccountNumber.text = bankList.AccountNumber 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) holder.bankSelector.setBackgroundResource(R.drawable.ic_select_green)
checkedPosition = holder.adapterPosition checkedPosition = holder.adapterPosition
}
else if (checkedPosition == -1) {
} else if (checkedPosition == -1) {
holder.bankSelector.setBackgroundResource(R.drawable.ic_select_outline) 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) holder.bankSelector.setBackgroundResource(R.drawable.ic_select_green)
}
else {
} else {
holder.bankSelector.setBackgroundResource(R.drawable.ic_select_outline) holder.bankSelector.setBackgroundResource(R.drawable.ic_select_outline)
} }
@ -93,7 +73,6 @@ class BankListAdapter(
onItemClickListener = listener onItemClickListener = listener
} }
fun getSelected(): ClientBanklist? { fun getSelected(): ClientBanklist? {
return if (checkedPosition != -1) { return if (checkedPosition != -1) {
bankList?.get(checkedPosition) bankList?.get(checkedPosition)


+ 26
- 27
app/src/main/java/com/nivesh/production/bajajfd/ui/activity/BajajFdMainActivity.kt View File

@ -226,7 +226,7 @@ class BajajFdMainActivity : BaseActivity() {
// set viewPager // set viewPager
sectionsPagerAdapter = SectionsPagerAdapter(supportFragmentManager, fragments, stepsCount) sectionsPagerAdapter = SectionsPagerAdapter(supportFragmentManager, fragments, stepsCount)
val viewPager: DisableAdapter = binding.viewPager val viewPager: DisableAdapter = binding.viewPager
// viewPager.setPagingEnabled(false)
viewPager.setPagingEnabled(false)
viewPager.adapter = sectionsPagerAdapter viewPager.adapter = sectionsPagerAdapter
viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
override fun onPageScrolled( override fun onPageScrolled(
@ -392,35 +392,34 @@ class BajajFdMainActivity : BaseActivity() {
fun paymentDialog(payUrl: String, value: String) { fun paymentDialog(payUrl: String, value: String) {
Log.e("payUrl", "-->$payUrl") Log.e("payUrl", "-->$payUrl")
Log.e("value", "-->$value") Log.e("value", "-->$value")
val dialogWebView = Dialog(this@BajajFdMainActivity)
dialogWebView.setContentView(R.layout.row_fd_pay)
dialogWebView.setCancelable(true)
val tvCancel = dialogWebView.findViewById<TextView>(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<TextView>(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<WebView>(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<WebView>(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")}" + val postData = "name=${URLEncoder.encode("msg", "UTF-8")}" +
"&value=${URLEncoder.encode(value, "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() { class MyWebViewClient : WebViewClient() {


+ 31
- 17
app/src/main/java/com/nivesh/production/bajajfd/ui/fragment/StepTwoBajajFDFragment.kt View File

@ -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.isValidName
import com.nivesh.production.bajajfd.util.Common.Companion.isValidPan 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.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.Constants.Companion.token
import com.nivesh.production.bajajfd.util.Resource import com.nivesh.production.bajajfd.util.Resource
import com.nivesh.production.bajajfd.viewModel.StepTwoBajajFDViewModel import com.nivesh.production.bajajfd.viewModel.StepTwoBajajFDViewModel
@ -548,23 +549,12 @@ class StepTwoBajajFDFragment : BaseFragment() {
} }
binding.addBankDetail.setOnClickListener { 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 { } else {
binding.llBankDetails.visibility = View.GONE 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, listOfBanks,
clientBankList.AccountNumber.toString() clientBankList.AccountNumber.toString()
) )
showHideBankDetail()
} else { } else {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
getBankValidationApiResponse.Message getBankValidationApiResponse.Message
) )
showHideBankDetail()
} }
} }
else -> { else -> {
Common.showDialogValidation(
showDialogValidation(
activity as BajajFdMainActivity, activity as BajajFdMainActivity,
getBankValidationApiResponse.Message 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() { override fun onDestroyView() {
super.onDestroyView() super.onDestroyView()
_binding = null _binding = null


Loading…
Cancel
Save

Powered by TurnKey Linux.