Browse Source

minor issue fixes in recent transaction

new_design
Mohan Shiwakoti 1 year ago
parent
commit
548e0292e8
  1. 30
      app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransfersFragment.kt

30
app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransfersFragment.kt

@ -47,6 +47,7 @@ import com.tsongkha.spinnerdatepicker.DatePicker
import com.tsongkha.spinnerdatepicker.DateRangePickerDialog.OnRangeDateSetListener import com.tsongkha.spinnerdatepicker.DateRangePickerDialog.OnRangeDateSetListener
import com.tsongkha.spinnerdatepicker.SpinnerDateRangePickerDialogBuilder import com.tsongkha.spinnerdatepicker.SpinnerDateRangePickerDialogBuilder
import java.util.* import java.util.*
import kotlin.collections.ArrayList
class MyTransfersFragment : BaseFragment(), class MyTransfersFragment : BaseFragment(),
RecipientListingV3PresenterInterface.RecipientListingV3ContractInterface, RecipientListingV3PresenterInterface.RecipientListingV3ContractInterface,
@ -66,7 +67,7 @@ class MyTransfersFragment : BaseFragment(),
var noTransactionFoundTextView: EditText? = null var noTransactionFoundTextView: EditText? = null
private var searchTextChangeListener: SearchEdittextTextChangeListener? = null private var searchTextChangeListener: SearchEdittextTextChangeListener? = null
private val type: TransactionHistoryViewType? = null private val type: TransactionHistoryViewType? = null
private var data: MutableList<RecentTransaction>? = null
private var data: MutableList<RecentTransaction>? = ArrayList()
private var presenterTransaction: TransactionHistoryV2Presenter? = null private var presenterTransaction: TransactionHistoryV2Presenter? = null
private var genericEditTextPromptDialog: GenericEditTextPromptDialog? = null private var genericEditTextPromptDialog: GenericEditTextPromptDialog? = null
private var homeViewModel: HomeViewModel? = null private var homeViewModel: HomeViewModel? = null
@ -219,7 +220,7 @@ class MyTransfersFragment : BaseFragment(),
isRecentEmpty = false isRecentEmpty = false
} }
currentPage = 1 currentPage = 1
presenter!!.getAllRecipientListV5(null, countryId, "", "", "")
presenter!!.getAllRecipientListV5(null, countryId, startDate, endDate, "")
} }
@ -243,19 +244,16 @@ class MyTransfersFragment : BaseFragment(),
binding.swiperefresh.isRefreshing = false binding.swiperefresh.isRefreshing = false
} }
adapter?.setData(recipientInfoModelList) adapter?.setData(recipientInfoModelList)
if (data == null) {
if (binding.swiperefresh.isRefreshing) {
binding.swiperefresh.isRefreshing = false
}
if (!recentTransactionList.isNullOrEmpty()) {
data?.addAll(recentTransactionList)
currentPage++
} else {
if (currentPage > 1) { if (currentPage > 1) {
isRecentEmpty = true isRecentEmpty = true
} }
data = recentTransactionList
} else {
if (recentTransactionList != null && recentTransactionList.isEmpty()) {
isFirstCall = false
if (currentPage > 1) {
isRecentEmpty = true
}
}
data?.addAll(recentTransactionList!!)
} }
recentAdapter?.setData(data) recentAdapter?.setData(data)
recentAdapter?.setTransactionClickListener(object : recentAdapter?.setTransactionClickListener(object :
@ -631,13 +629,7 @@ class MyTransfersFragment : BaseFragment(),
) )
this@MyTransfersFragment.startDate = startDate this@MyTransfersFragment.startDate = startDate
this@MyTransfersFragment.endDate = endDate this@MyTransfersFragment.endDate = endDate
presenter!!.getAllRecipientListV5(
null,
"",
startDate,
endDate,
"1"
)
performDefaultAction("", true)
} }
}) })
.build() .build()

Loading…
Cancel
Save