IME-LONDON
/
Android_London
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

latest issue fixes

new_design
Mohan Shiwakoti 1 year ago
parent
01d87cf4ab
commit
2e7278cc3d
15 changed files with 339 additions and 198 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/BeneficiaryDetailActivity.kt
  2. 4
      app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeActivityV3.kt
  3. 52
      app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt
  4. 24
      app/src/main/java/com/remit/jmecustomer/features/myTransfers/adapters/RecentTransactionsAdapter.kt
  5. 138
      app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyBeneficiaryAllActivity.kt
  6. 11
      app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransferActivity.kt
  7. 41
      app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransfersFragment.kt
  8. 7
      app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/RecipientRelatedDataModelV3.java
  9. 80
      app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3Presenter.java
  10. 2
      app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3PresenterInterface.java
  11. 5
      app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientListingV3Activity.java
  12. 2
      app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java
  13. 22
      app/src/main/res/layout/fragment_home_new.xml
  14. 146
      app/src/main/res/layout/fragment_profile.xml
  15. 1
      app/src/main/res/layout/row_recent_transactions.xml

2
app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/BeneficiaryDetailActivity.kt
View File

@ -88,7 +88,7 @@ class BeneficiaryDetailActivity : BaseActivity() {
binding.tvName.text = receiverInfoModel?.fullName
binding.tvMobile.text = receiverInfoModel?.mobile
binding.tvRelation.text = receiverInfoModel?.relationship
binding.tvLocation.text = receiverInfoModel?.address
binding.tvLocation.text = receiverInfoModel?.country
binding.tvInitial.text = getInitials(receiverInfoModel?.fullName ?: "")
binding.tvUpdate.setOnClickListener {
val intent = Intent(applicationContext, RecipientAddEditActivity::class.java)

4
app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeActivityV3.kt
View File

@ -341,9 +341,7 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
this.notificationViewBoundry = notificationViewBoundry
isNotificaitonViewActive = action
if (isNotificaitonViewActive()) {
viewModel?.notificationViewActive = true
}
viewModel?.notificationViewActive = isNotificaitonViewActive()
if (viewModel?.notificationViewActive == true) {
homeFragmentV3.focusHome(false)
}

52
app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt
View File

@ -347,36 +347,40 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
formattedExRate: String?,
playAnimation: Boolean
) {
if (playAnimation) {
exchangeRateTxtView!!.visibility = View.INVISIBLE
exchangeRateTxtView!!.text =
makeSpannable(exRate!!, getString(R.string.current_exchange_rate_text))
exchangeRateTxtView!!.translationY = exchangeRateTxtView!!.height.toFloat()
exchangeRateTxtView!!.visibility = View.VISIBLE
ViewCompat.animate(exchangeRateTxtView!!).translationY(0f).setDuration(550)
.setInterpolator(
interpolator
).start()
transferFeeTxtView!!.visibility = View.INVISIBLE
transferFeeTxtView!!.text =
makeSpannable(chargeAmount!!, getString(R.string.transfer_fee_included_text))
transferFeeTxtView!!.translationY = transferFeeTxtView!!.height.toFloat()
transferFeeTxtView!!.visibility = View.VISIBLE
ViewCompat.animate(transferFeeTxtView!!).translationY(0f).setDuration(550)
.setInterpolator(
interpolator
).start()
try {
if (playAnimation) {
exchangeRateTxtView!!.visibility = View.INVISIBLE
exchangeRateTxtView!!.text =
makeSpannable(exRate!!, getString(R.string.current_exchange_rate_text))
exchangeRateTxtView!!.translationY = exchangeRateTxtView!!.height.toFloat()
exchangeRateTxtView!!.visibility = View.VISIBLE
ViewCompat.animate(exchangeRateTxtView!!).translationY(0f).setDuration(550)
.setInterpolator(
interpolator
).start()
transferFeeTxtView!!.visibility = View.INVISIBLE
transferFeeTxtView!!.text =
makeSpannable(chargeAmount!!, getString(R.string.transfer_fee_included_text))
transferFeeTxtView!!.translationY = transferFeeTxtView!!.height.toFloat()
transferFeeTxtView!!.visibility = View.VISIBLE
ViewCompat.animate(transferFeeTxtView!!).translationY(0f).setDuration(550)
.setInterpolator(
interpolator
).start()
// jmeExratePC.setVisibility(View.INVISIBLE)
// jmeExratePC.setAlpha(0f)
// jmeExratePC.setText(formattedExRate)
// jmeExratePC.setVisibility(View.INVISIBLE)
// jmeExratePC.animate().alpha(1f).setDuration(500).withLayer().start()
} else {
transferFeeTxtView!!.text =
makeSpannable(chargeAmount!!, getString(R.string.transfer_fee_included_text))
exchangeRateTxtView!!.text =
makeSpannable(exRate!!, getString(R.string.current_exchange_rate_text))
} else {
transferFeeTxtView!!.text =
makeSpannable(chargeAmount!!, getString(R.string.transfer_fee_included_text))
exchangeRateTxtView!!.text =
makeSpannable(exRate!!, getString(R.string.current_exchange_rate_text))
// jmeExratePC.setText(formattedExRate)
}
} catch (exception: java.lang.Exception) {
exception.printStackTrace()
}
}

24
app/src/main/java/com/remit/jmecustomer/features/myTransfers/adapters/RecentTransactionsAdapter.kt
View File

@ -1,14 +1,13 @@
package com.remit.jmecustomer.features.myTransfers.adapters
import android.content.Context
import android.content.Intent
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
import com.remit.jmecustomer.R
import com.remit.jmecustomer.databinding.RowRecentTransactionsBinding
import com.remit.jmecustomer.features.recipientmanagement.model.recipientModelV5.RecentTransaction
import com.remit.jmecustomer.features.support.view.SupportActivityV2
class RecentTransactionsAdapter(private var items: MutableList<RecentTransaction>) :
RecyclerView.Adapter<RecentTransactionsAdapter.ViewHolder>() {
@ -45,7 +44,7 @@ class RecentTransactionsAdapter(private var items: MutableList<RecentTransaction
listener?.navigateToChangeTransactionScreen(item)
}
if (item.payStatus.equals("Payment")) {
if (item.payStatus.equals("Paid")) {
holder.bindings.tvStatus.text = mContext?.getString(R.string.successful)
holder.bindings.tvStatus.setBackgroundResource(R.drawable.rounded_green)
holder.bindings.tvViewStatus.text = mContext?.getString(R.string.view_status)
@ -53,20 +52,15 @@ class RecentTransactionsAdapter(private var items: MutableList<RecentTransaction
holder.bindings.tvStatus.text = mContext?.getString(R.string.pending)
holder.bindings.tvStatus.setBackgroundResource(R.drawable.rounded_red)
holder.bindings.tvViewStatus.text = mContext?.getString(R.string.edit_details)
holder.bindings.tvResend.visibility = View.GONE
}
holder.bindings.tvViewStatus.setOnClickListener {
if (item.displayActions.contains("AMEND")) {
listener?.navigateToChangeTransactionScreen(item)
} else {
val c = Intent(mContext, SupportActivityV2::class.java)
c.putExtra(
SupportActivityV2.REQUESTED_BUNDLE_KEY,
SupportActivityV2.REQUESTED_FOR_AMMENDMENT
)
c.putExtra(SupportActivityV2.REQUESTED_CONTROL_NO_BUNDLE_KEY, item.controlNo)
c.putExtra(SupportActivityV2.REQUESTED_TRANSACTION_ID_BUNDLE_KEY, item.tranId)
mContext?.startActivity(c)
holder.itemView.setOnClickListener {
if ((item.payStatus
.equals("Paid", ignoreCase = true) || item.payStatus
.equals("Cancel", ignoreCase = true)) && listener != null
) listener!!.navigateToViewTransactionScreen(item) else if (listener != null) {
listener!!.navigateToChangeTransactionScreen(item)
}
}
}

138
app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyBeneficiaryAllActivity.kt
View File

@ -3,19 +3,34 @@ package com.remit.jmecustomer.features.myTransfers.view
import MyBeneficiariesAllAdapter
import android.content.Intent
import android.os.Bundle
import android.os.PersistableBundle
import android.view.View
import androidx.recyclerview.widget.LinearLayoutManager
import com.remit.jmecustomer.R
import com.remit.jmecustomer.base.BaseActivity
import com.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog
import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog
import com.remit.jmecustomer.databinding.FragmentBeneficiaryAllBinding
import com.remit.jmecustomer.features.beneficiaryDetail.BeneficiaryDetailActivity
import com.remit.jmecustomer.features.recipientmanagement.gateway.recipientlistingV3.RecipientListingV3Gateway
import com.remit.jmecustomer.features.recipientmanagement.model.recipientModelV5.Receiver
import com.remit.jmecustomer.features.recipientmanagement.model.recipientModelV5.RecentTransaction
import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model
import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientlistingV3.RecipientListingV3Presenter
import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientlistingV3.RecipientListingV3PresenterInterface
import com.remit.jmecustomer.features.recipientmanagement.view.recepientTermsConditions.BeneficiaryAddEditV3TermsActivity
import com.remit.jmecustomer.features.recipientmanagement.view.recipientaddeditV3.RecipientAddEditV3Activity
import com.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3
import com.remit.jmecustomer.utils.Constants
class MyBeneficiaryAllActivity : BaseActivity(),
MyBeneficiariesAllAdapter.RecipientSelectionListener {
MyBeneficiariesAllAdapter.RecipientSelectionListener,
RecipientListingV3PresenterInterface.RecipientListingV3ContractInterface,
GenericEditTextPromptDialog.GenericEditTextPromptListener {
private lateinit var binding: FragmentBeneficiaryAllBinding
private var adapter: MyBeneficiariesAllAdapter? = null
private var mainList: ArrayList<Receiver>? = ArrayList()
var presenter: RecipientListingV3PresenterInterface? = null
private var genericEditTextPromptDialog: GenericEditTextPromptDialog? = null
override fun onCreate(savedInstanceState: Bundle?) {
@ -31,7 +46,8 @@ class MyBeneficiaryAllActivity : BaseActivity(),
}
fun init() {
mainList = intent?.getParcelableArrayListExtra("receiver")
presenter = RecipientListingV3Presenter(this, RecipientListingV3Gateway())
presenter!!.getAllRecipientListV5(null , Constants.CURRENT_COUNTRY_ID)
var data: ArrayList<Receiver> = ArrayList()
adapter = MyBeneficiariesAllAdapter(data, this)
val layoutManagerVertical = LinearLayoutManager(this)
@ -48,12 +64,124 @@ class MyBeneficiaryAllActivity : BaseActivity(),
startActivity(intent)
}
override fun showAllRecipientToUser(
recipientInfoModelList: MutableList<Receiver>,
changeLayoutBehavior: Boolean
) {
adapter?.setData(recipientInfoModelList);
}
override fun showAllRecipientToUserV5(
recipientInfoModelList: MutableList<Receiver>?,
recentTransactionList: MutableList<RecentTransaction>?,
changeLayoutBehavior: Boolean
) {
adapter?.setData(recipientInfoModelList)
}
override fun onRecipientDeletedSuccessfully(recipientToBeDeleted: String?) {}
override fun showEmailCodePromptDialog() {
genericEditTextPromptDialog = GenericEditTextPromptDialog()
genericEditTextPromptDialog?.setTitleMessage(getString(R.string.enterCodeFromEmail_text))
genericEditTextPromptDialog?.setCancellable(false)
genericEditTextPromptDialog?.setListener(this)
if (!genericEditTextPromptDialog?.isAdded!!) genericEditTextPromptDialog?.show(
supportFragmentManager,
"PROMPTEDITTEXT"
)
}
override fun onEmailCodeNegativeButtonPressed() {}
override fun onEmailCodePositiveBtnPressed(emailCode: String?) {
presenter?.verifyEmailCode(emailCode)
}
override fun showNoRecipientFoundView(action: Boolean) {
// if (action) {
// recipientListRv.setVisibility(View.INVISIBLE)
// noDataFoundTextView.setVisibility(View.VISIBLE)
// } else {
// recipientListRv.setVisibility(View.VISIBLE)
// noDataFoundTextView.setVisibility(View.INVISIBLE)
// }
}
override fun promptToSendMoney(
listener: GenericPromptDialog.GenericDialogPromptListener?,
message: String?
) {
val genericPromptDialog = GenericPromptDialog()
genericPromptDialog.setTitleMessage(getString(R.string.important_text))
genericPromptDialog.setBodyMessage(message)
genericPromptDialog.setIconsRes(-1)
genericPromptDialog.setCancellable(true)
genericPromptDialog.setListener(listener)
if (!genericPromptDialog.isAdded) genericPromptDialog.show(
getSupportFragmentManager(),
"PROMPTSENDMONEY"
)
}
override fun redirectToSendMoney(sendMoneyRequiredDataV3: SendMoneyRequiredDataV3?) {
// val intent = Intent(requireContext(), SendMoneyV2Activity::class.java)
// intent.putExtra(
// RecipientAddEditV3Activity.RECIPIENT_INFO_BUNDLE_KEY_v3,
// sendMoneyRequiredDataV3
// )
// startActivityForResult(
// intent,
// RecipientAddEditV3Activity.RECIPIENT_ACTION_EDIT_REQUEST_CODE_v3
// )
}
override fun proceedToEditRecipient(recipientInfoModel: ReceiverInfoV3Model) {
val intent = Intent(this, RecipientAddEditV3Activity::class.java)
intent.putExtra(RecipientAddEditV3Activity.RECIPIENT_INFO_BUNDLE_KEY_v3, recipientInfoModel)
startActivityForResult(
intent,
RecipientAddEditV3Activity.RECIPIENT_ACTION_EDIT_REQUEST_CODE_v3
)
}
override fun proceedToShowTermsConditions(recipientInfoModel: ReceiverInfoV3Model?) {
val intent = Intent(this, BeneficiaryAddEditV3TermsActivity::class.java)
intent.putExtra(
BeneficiaryAddEditV3TermsActivity.RECIPIENT_TERMS_BUNDLE_KEY_v3,
recipientInfoModel
)
startActivityForResult(
intent,
RecipientAddEditV3Activity.RECIPIENT_ACTION_EDIT_REQUEST_CODE_v3
)
}
override fun promptToEditRecipient(
genericDialogPromptListener: GenericPromptDialog.GenericDialogPromptListener?,
message: String?
) {
val genericPromptDialog = GenericPromptDialog()
genericPromptDialog.setTitleMessage(getString(R.string.important_text))
genericPromptDialog.setBodyMessage(message)
genericPromptDialog.setIconsRes(-1)
genericPromptDialog.setCancellable(true)
genericPromptDialog.setListener(genericDialogPromptListener)
if (!genericPromptDialog.isAdded) genericPromptDialog.show(
getSupportFragmentManager(),
"RECIPIENTEDITPROMPT"
)
}
override fun proceedToDeleteRecipient(receiverInfoV3Model: Receiver) {
// showBeneficiaryDeleteConfirmDialog(receiverInfoV3Model)
}
override fun proceedToEditRecipient(receiverInfoV3Model: Receiver) {
}
override fun onAllRecipientDeleted() {
}
override fun onAllRecipientDeleted() {}
}

11
app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransferActivity.kt
View File

@ -3,28 +3,20 @@ package com.remit.jmecustomer.features.myTransfers.view
import MyBeneficiariesAdapter
import android.content.Intent
import android.os.Bundle
import android.os.Handler
import android.os.Parcelable
import android.text.Editable
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.EditText
import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager
import com.remit.jmecustomer.R
import com.remit.jmecustomer.base.BaseActivity
import com.remit.jmecustomer.base.BaseFragment
import com.remit.jmecustomer.common.customwidgets.TextWatcherAdapter
import com.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog
import com.remit.jmecustomer.common.customwidgets.common.GenericEditTextPromptDialog.GenericEditTextPromptListener
import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog
import com.remit.jmecustomer.common.customwidgets.common.GenericPromptDialog.GenericDialogPromptListener
import com.remit.jmecustomer.databinding.FragmentBeneficiaryAllBinding
import com.remit.jmecustomer.databinding.FragmentMyTransfersBinding
import com.remit.jmecustomer.features.beneficiaryDetail.BeneficiaryDetailActivity
import com.remit.jmecustomer.features.home.presenter.HomeViewModel
import com.remit.jmecustomer.features.homeV3.view.HomeActivityV3
import com.remit.jmecustomer.features.myTransfers.adapters.RecentTransactionsAdapter
import com.remit.jmecustomer.features.recipientmanagement.gateway.recipientlistingV3.RecipientListingV3Gateway
import com.remit.jmecustomer.features.recipientmanagement.model.recipientModelV5.Receiver
@ -38,7 +30,6 @@ import com.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3
import com.remit.jmecustomer.features.sendmoney.view.SendMoneyV2TransactionCompleteActivity
import com.remit.jmecustomer.features.transactionhistory.presenter.TransactionHistoryV2Presenter
import com.remit.jmecustomer.features.transactionhistory.view.RemitTransactionHistoryActivity.TransactionHistoryViewType
import com.remit.jmecustomer.features.transactionhistory.view.international.InternationalTransactionHistoryContainerFragmentV2.SearchEdittextTextChangeListener
import com.remit.jmecustomer.features.transactionhistory.view.international.InternationalTransactionHistoryContainerFragmentV2.SearchableTransactionHistory
import com.remit.jmecustomer.utils.Constants
import java.util.*
@ -128,7 +119,7 @@ class MyTransferActivity : BaseActivity(),
override fun showAllRecipientToUser(
recipientInfoModelList: MutableList<ReceiverInfoV3Model>,
recipientInfoModelList: MutableList<Receiver>,
changeLayoutBehavior: Boolean
) {
}

41
app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransfersFragment.kt
View File

@ -36,7 +36,6 @@ import com.remit.jmecustomer.features.sendmoney.model.SendMoneyRequiredDataV3
import com.remit.jmecustomer.features.sendmoney.view.SendMoneyV2TransactionCompleteActivity
import com.remit.jmecustomer.features.transactionhistory.presenter.TransactionHistoryV2Presenter
import com.remit.jmecustomer.features.transactionhistory.view.RemitTransactionHistoryActivity.TransactionHistoryViewType
import com.remit.jmecustomer.features.transactionhistory.view.international.InternationalTransactionHistoryContainerFragmentV2.SearchEdittextTextChangeListener
import com.remit.jmecustomer.features.transactionhistory.view.international.InternationalTransactionHistoryContainerFragmentV2.SearchableTransactionHistory
import java.util.*
@ -138,7 +137,7 @@ class MyTransfersFragment : BaseFragment(),
override fun showAllRecipientToUser(
recipientInfoModelList: MutableList<ReceiverInfoV3Model>,
recipientInfoModelList: MutableList<Receiver>,
changeLayoutBehavior: Boolean
) {
}
@ -389,29 +388,33 @@ class MyTransfersFragment : BaseFragment(),
override fun searchForText(keyWord: String) {
// if (keyWord.length > 0) {
val searchedData: MutableList<RecentTransaction> =
java.util.ArrayList()
for (item in data!!) {
if (item.user.lowercase(Locale.getDefault())
.contains(keyWord.lowercase(Locale.getDefault()))
) {
searchedData.add(item)
try {
val searchedData: MutableList<RecentTransaction> =
java.util.ArrayList()
for (item in data!!) {
if (item.user.lowercase(Locale.getDefault())
.contains(keyWord.lowercase(Locale.getDefault()))
) {
searchedData.add(item)
}
}
}
if (searchedData.size > 0) {
showTransactionNotFoundView(false)
} else {
showTransactionNotFoundView(
true
)
return
}
recentAdapter?.setData(searchedData)
if (searchedData.size > 0) {
showTransactionNotFoundView(false)
} else {
showTransactionNotFoundView(
true
)
return
}
recentAdapter?.setData(searchedData)
// } else {
// hideKeyBoard()
//// showTransactionNotFoundView(false)
//// recentAdapter?.setData(data!!)
// }
} catch (ex: java.lang.Exception) {
ex.printStackTrace()
}
}
private fun registerTextWatcher(action: Boolean) {

7
app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/model/recipientlistingV3/RecipientRelatedDataModelV3.java
View File

@ -2,6 +2,7 @@ package com.remit.jmecustomer.features.recipientmanagement.model.recipientlistin
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
import com.remit.jmecustomer.features.recipientmanagement.model.recipientModelV5.Receiver;
import java.util.List;
@ -9,16 +10,16 @@ public class RecipientRelatedDataModelV3 {
@SerializedName("Receivers")
@Expose
private List<ReceiverInfoV3Model> recipientList;
private List<Receiver> recipientList;
public List<ReceiverInfoV3Model> getRecipientList() {
public List<Receiver> getRecipientList() {
return recipientList;
}
public void setRecipientList(List<ReceiverInfoV3Model> recipientList) {
public void setRecipientList(List<Receiver> recipientList) {
this.recipientList = recipientList;
}

80
app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3Presenter.java
View File

@ -32,7 +32,7 @@ public class RecipientListingV3Presenter extends BasePresenter implements Recipi
private final RecipientListingV3InteractorInterface.RecipientListingV3GatewayInterface gateway;
CompositeDisposable compositeDisposable;
private ReceiverInfoV3Model selectedRecipient;
private List<ReceiverInfoV3Model> availableRecipientList;
private List<Receiver> availableRecipientList;
private List<Receiver> availableRecipientListV5;
@ -111,26 +111,26 @@ public class RecipientListingV3Presenter extends BasePresenter implements Recipi
@Override
public void searchForReciever(String keyword) {
if (this.availableRecipientList != null) {
if (keyword.length() > 0) {
List<ReceiverInfoV3Model> searchedData = new ArrayList<>();
for (ReceiverInfoV3Model item : availableRecipientList) {
if (item.getFullName().toLowerCase().contains(keyword.toLowerCase())) {
searchedData.add(item);
}
}
if (searchedData.size() > 0)
view.showNoRecipientFoundView(false);
else
view.showNoRecipientFoundView(true);
view.showAllRecipientToUser(searchedData, false);
} else {
view.showNoRecipientFoundView(false);
view.showAllRecipientToUser(availableRecipientList, false);
}
}
// if (this.availableRecipientList != null) {
// if (keyword.length() > 0) {
// List<ReceiverInfoV3Model> searchedData = new ArrayList<>();
// for (ReceiverInfoV3Model item : availableRecipientList) {
// if (item.getFullName().toLowerCase().contains(keyword.toLowerCase())) {
// searchedData.add(item);
// }
// }
// if (searchedData.size() > 0)
// view.showNoRecipientFoundView(false);
// else
// view.showNoRecipientFoundView(true);
//
// view.showAllRecipientToUser(searchedData, false);
//
// } else {
// view.showNoRecipientFoundView(false);
// view.showAllRecipientToUser(availableRecipientList, false);
// }
// }
}
@Override
@ -167,25 +167,25 @@ public class RecipientListingV3Presenter extends BasePresenter implements Recipi
}
private void searchReceiverById(String reciverId) {
if (availableRecipientList != null && availableRecipientList.size() > 0 && reciverId != null)
for (ReceiverInfoV3Model receiverInfoV3Model : availableRecipientList) {
if (reciverId.equalsIgnoreCase(receiverInfoV3Model.getReceiverId())) {
selectedRecipient = receiverInfoV3Model;
String send_money_to_string = getStringfromStringId(R.string.recipient_add_success_message_text).replace("xxx", getReceiverName(receiverInfoV3Model));
view.promptToSendMoney(new GenericPromptDialog.GenericDialogPromptListener() {
@Override
public void onNegativeBtnPressed() {
}
@Override
public void onPositiveBtnPressed() {
view.redirectToSendMoney(getSendMoneyRequiredData());
}
}, send_money_to_string);
return;
}
}
// if (availableRecipientList != null && availableRecipientList.size() > 0 && reciverId != null)
// for (ReceiverInfoV3Model receiverInfoV3Model : availableRecipientList) {
// if (reciverId.equalsIgnoreCase(receiverInfoV3Model.getReceiverId())) {
// selectedRecipient = receiverInfoV3Model;
// String send_money_to_string = getStringfromStringId(R.string.recipient_add_success_message_text).replace("xxx", getReceiverName(receiverInfoV3Model));
// view.promptToSendMoney(new GenericPromptDialog.GenericDialogPromptListener() {
// @Override
// public void onNegativeBtnPressed() {
//
// }
//
// @Override
// public void onPositiveBtnPressed() {
// view.redirectToSendMoney(getSendMoneyRequiredData());
// }
// }, send_money_to_string);
// return;
// }
// }
}
private String getReceiverName(ReceiverInfoV3Model receiverInfoV3Model) {

2
app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientlistingV3/RecipientListingV3PresenterInterface.java
View File

@ -36,7 +36,7 @@ public interface RecipientListingV3PresenterInterface extends BasePresenterInter
interface RecipientListingV3ContractInterface extends BaseContractInterface
{
void showAllRecipientToUser(List<ReceiverInfoV3Model> recipientInfoModelList, boolean changeLayoutBehavior);
void showAllRecipientToUser(List<Receiver> recipientInfoModelList, boolean changeLayoutBehavior);
default void showAllRecipientToUserV5(List<Receiver> recipientInfoModelList, List<RecentTransaction> recentTransactionList, boolean changeLayoutBehavior){};

5
app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/view/recipientlistingV3/RecipientListingV3Activity.java
View File

@ -13,6 +13,7 @@ import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.appbar.CollapsingToolbarLayout;
import com.remit.jmecustomer.features.recipientmanagement.adapter.RecipientListingV3RvAdapter;
import com.remit.jmecustomer.features.recipientmanagement.gateway.recipientlistingV3.RecipientListingV3Gateway;
import com.remit.jmecustomer.features.recipientmanagement.model.recipientModelV5.Receiver;
import com.remit.jmecustomer.features.recipientmanagement.model.recipientlistingV3.ReceiverInfoV3Model;
import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientlistingV3.RecipientListingV3Presenter;
import com.remit.jmecustomer.features.recipientmanagement.presenter.recipientlistingV3.RecipientListingV3PresenterInterface;
@ -134,7 +135,7 @@ public class RecipientListingV3Activity extends BaseActivity
@Override
public void showAllRecipientToUser(List<ReceiverInfoV3Model> recipientInfoModelList, boolean changeLayoutBehavior) {
public void showAllRecipientToUser(List<Receiver> recipientInfoModelList, boolean changeLayoutBehavior) {
if (changeLayoutBehavior) {
if (recipientInfoModelList != null && recipientInfoModelList.size() > 0) {
recipientHintTextViewContainer.setVisibility(View.VISIBLE);
@ -161,7 +162,7 @@ public class RecipientListingV3Activity extends BaseActivity
}
}
recipientListingRvAdapter.setData(recipientInfoModelList);
// recipientListingRvAdapter.setData(recipientInfoModelList);
}
@Override

2
app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/amountdetail/AmountDetailSendMoneyFragment.java
View File

@ -313,7 +313,7 @@ public class AmountDetailSendMoneyFragment extends BaseFragment implements View.
if (selectedCountryCode != null)
flagResId = CountryFlagMapper.getFlagFromCountryCode(selectedCountryCode);
if (flagResId != -1)
this.recepientFlagImageView.setBackgroundResource(flagResId);
this.recepientFlagImageView.setImageResource(flagResId);
else
this.recepientFlagImageView.setBackgroundResource(0);

22
app/src/main/res/layout/fragment_home_new.xml
View File

@ -475,18 +475,18 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<FrameLayout
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:visibility="gone"
android:clickable="true"
android:focusable="true"
android:id="@+id/overlay_layout"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@android:color/transparent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<FrameLayout
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:visibility="gone"
android:clickable="true"
android:focusable="true"
android:id="@+id/overlay_layout"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@android:color/transparent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</com.remit.jmecustomer.common.customwidgets.LockableScrollView>

146
app/src/main/res/layout/fragment_profile.xml
View File

@ -161,6 +161,69 @@
android:text="Account"
android:textColor="#969696" />
<RelativeLayout
android:id="@+id/ll_payment_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:orientation="horizontal"
android:padding="@dimen/_13sdp"
android:visibility="visible">
<ImageView
android:id="@+id/ic_nominee"
android:layout_width="@dimen/_20sdp"
android:layout_height="@dimen/_20sdp"
app:srcCompat="@drawable/round_person_24px" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/_26sdp"
android:layout_marginLeft="@dimen/_26sdp"
android:layout_toEndOf="@+id/ic_nominee"
android:layout_toRightOf="@+id/ic_nominee"
android:orientation="vertical">
<TextView
style="@style/TextStyle.SemiBold16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Payment Information"
android:textColor="@color/black_opacity_87" />
<TextView
android:id="@+id/tv_applockDesc"
style="@style/TextStyle.VolteSemiBold14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/_4sdp"
android:layout_marginRight="@dimen/_2sdp"
android:layout_toEndOf="@+id/ic_lock_app"
android:layout_toRightOf="@+id/ic_lock_app"
android:text="View orupdate linked cards"
android:textColor="@color/black_opacity_60" />
</LinearLayout>
<TextView
android:id="@+id/tv_add_nominee"
style="@style/TextStyle.VolteSemiBold14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:paddingLeft="@dimen/_5sdp"
android:paddingRight="@dimen/_5sdp"
android:textAllCaps="true"
android:textColor="@color/colorPrimary" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -404,69 +467,6 @@
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/ll_payment_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:orientation="horizontal"
android:padding="@dimen/_13sdp"
android:visibility="visible">
<ImageView
android:id="@+id/ic_nominee"
android:layout_width="@dimen/_20sdp"
android:layout_height="@dimen/_20sdp"
app:srcCompat="@drawable/round_person_24px" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/_26sdp"
android:layout_marginLeft="@dimen/_26sdp"
android:layout_toEndOf="@+id/ic_nominee"
android:layout_toRightOf="@+id/ic_nominee"
android:orientation="vertical">
<TextView
style="@style/TextStyle.SemiBold16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Payment Information"
android:textColor="@color/black_opacity_87" />
<TextView
android:id="@+id/tv_applockDesc"
style="@style/TextStyle.VolteSemiBold14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/_4sdp"
android:layout_marginRight="@dimen/_2sdp"
android:layout_toEndOf="@+id/ic_lock_app"
android:layout_toRightOf="@+id/ic_lock_app"
android:text="View orupdate linked cards"
android:textColor="@color/black_opacity_60" />
</LinearLayout>
<TextView
android:id="@+id/tv_add_nominee"
style="@style/TextStyle.VolteSemiBold14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:paddingLeft="@dimen/_5sdp"
android:paddingRight="@dimen/_5sdp"
android:textAllCaps="true"
android:textColor="@color/colorPrimary" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/ll_renew_id"
android:layout_width="match_parent"
@ -538,6 +538,26 @@
</LinearLayout>
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/_6sdp"
android:layout_marginTop="@dimen/_20sdp"
android:background="#F5F5F5"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
style="@style/TextStyle.VolteSemiBold14"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/_12sdp"
android:layout_marginLeft="@dimen/_12sdp"
android:layout_marginTop="@dimen/_6sdp"
android:text="Security Settings"
android:textColor="#969696" />
<RelativeLayout
android:id="@+id/ll_change_pin"
android:layout_width="match_parent"

1
app/src/main/res/layout/row_recent_transactions.xml
View File

@ -100,6 +100,7 @@
android:layout_height="wrap_content"/>
<TextView
android:visibility="gone"
android:layout_marginStart="@dimen/_8sdp"
android:textAlignment="center"
style="@style/TextStyle.VolteSemiBold14"

Write Preview
Loading…
Cancel
Save