From 7179c17f998f34bad5cef9a16d9df4c26c4c56ea Mon Sep 17 00:00:00 2001 From: Mohan Shiwakoti Date: Thu, 25 May 2023 18:19:44 +0545 Subject: [PATCH] new issue fixes ui changes --- .idea/assetWizardSettings.xml | 5 +- .../common/customwidgets/FontCache.java | 2 +- .../BeneficiaryDetailActivity.kt | 79 ++++++++++++++++--- .../features/homeV3/view/HomeActivityV3.kt | 10 +++ .../features/homeV3/view/HomeFragmentV3.kt | 6 +- .../adapters/RecentTransactionsAdapter.kt | 4 +- .../myTransfers/view/MyTransfersFragment.kt | 8 +- .../add/RecipientAddV3ViewModel.java | 6 +- .../edit/RecipientEditV3ViewModel.java | 6 +- .../view/SendMoneyRequestSummaryActivity.java | 1 + .../view/FingerSetUpPasswordFragment.java | 3 +- .../ic_blue_button_with_white_border.xml | 2 +- app/src/main/res/drawable/ic_msg.xml | 23 ++++++ .../drawable/light_blue_border_rounded.xml | 2 +- .../finger_setup_pass_layout_fragment.xml | 4 +- .../res/layout/fragment_my_notice_detail.xml | 12 ++- .../res/layout/fragment_my_notice_listing.xml | 2 +- .../res/layout/my_notice_list_viewholder.xml | 76 ++++++++++-------- .../main/res/layout/toolbar_dashboard_v3.xml | 23 ++++-- 19 files changed, 194 insertions(+), 80 deletions(-) create mode 100644 app/src/main/res/drawable/ic_msg.xml diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml index 68a59654..cf17dbf3 100644 --- a/.idea/assetWizardSettings.xml +++ b/.idea/assetWizardSettings.xml @@ -317,8 +317,9 @@ diff --git a/app/src/main/java/com/remit/jmecustomer/common/customwidgets/FontCache.java b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/FontCache.java index ba9d7783..357d7b11 100644 --- a/app/src/main/java/com/remit/jmecustomer/common/customwidgets/FontCache.java +++ b/app/src/main/java/com/remit/jmecustomer/common/customwidgets/FontCache.java @@ -15,7 +15,7 @@ public class FontCache { SAN_HEAVY = "san_francisco_text_heavy.otf", SAN_LIGHT = "san_francisco_text_light.otf", SAN_MEDIUM = "san_francisco_text_medium.otf", - SAN_REGULAR = "volte_regular.ttf", + SAN_REGULAR = "volte_medium.ttf", SAN_SEMIBOLD = "san_francisco_text_semibold.otf"; diff --git a/app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/BeneficiaryDetailActivity.kt b/app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/BeneficiaryDetailActivity.kt index 86e289fc..6a310ea6 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/BeneficiaryDetailActivity.kt +++ b/app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/BeneficiaryDetailActivity.kt @@ -105,20 +105,41 @@ class BeneficiaryDetailActivity : BaseActivity(), binding.tvLocation.text = receiverInfoModel?.country binding.tvInitial.text = getInitials(receiverInfoModel?.fullName ?: "") binding.tvUpdate.setOnClickListener { - val intent = Intent(applicationContext, RecipientAddEditV3Activity::class.java) - intent.putExtra( - RecipientAddEditV3Activity.RECIPIENT_INFO_BUNDLE_KEY_v3, - receiverInfoModel - ) - startActivityForResult( - intent, - RecipientAddEditV3Activity.RECIPIENT_ACTION_EDIT_REQUEST_CODE_v3 - ) + if (receiverInfoModel?.hasVerifiedOTP == true) { + val intent = Intent(applicationContext, RecipientAddEditV3Activity::class.java) + intent.putExtra( + RecipientAddEditV3Activity.RECIPIENT_INFO_BUNDLE_KEY_v3, + receiverInfoModel + ) + startActivityForResult( + intent, + RecipientAddEditV3Activity.RECIPIENT_ACTION_EDIT_REQUEST_CODE_v3 + ) + } else { + val intent = Intent( + applicationContext, + BeneficiaryAddEditV3TermsActivity::class.java + ) + intent.putExtra( + BeneficiaryAddEditV3TermsActivity.RECIPIENT_TERMS_BUNDLE_KEY_v3, + receiverInfoModel + ) + startActivityForResult( + intent, + RecipientAddEditV3Activity.RECIPIENT_ACTION_EDIT_REQUEST_CODE_v3 + ) + } } binding.agreeButton.setOnClickListener { if (isPaymentSelected) { - if (receiverInfoModel?.hasVerifiedOTP!!) { + if (receiverInfoModel != null) { + if (receiverInfoModel?.paymentMethod == null || receiverInfoModel?.hasPartnerChanged() == true || receiverInfoModel?.isForceUpdate == "Y") { + updateCase(receiverInfoModel!!) + return@setOnClickListener + } + } + if (receiverInfoModel?.hasVerifiedOTP == true) { val intent = Intent( this@BeneficiaryDetailActivity, SendMoneyV2Activity::class.java @@ -194,6 +215,15 @@ class BeneficiaryDetailActivity : BaseActivity(), } override fun proceedToEditRecipient(recipientInfoModel: ReceiverInfoV3Model?) { + val intent = Intent(applicationContext, RecipientAddEditV3Activity::class.java) + intent.putExtra( + RecipientAddEditV3Activity.RECIPIENT_INFO_BUNDLE_KEY_v3, + receiverInfoModel + ) + startActivityForResult( + intent, + RecipientAddEditV3Activity.RECIPIENT_ACTION_EDIT_REQUEST_CODE_v3 + ) } override fun proceedToShowTermsConditions(recipientInfoModel: ReceiverInfoV3Model?) { @@ -203,6 +233,16 @@ class BeneficiaryDetailActivity : BaseActivity(), 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" + ) } private fun showBeneficiaryDeleteConfirmDialog(receiverId: String) { @@ -229,4 +269,23 @@ class BeneficiaryDetailActivity : BaseActivity(), super.finish() setResult(Constants.UPDATE_DELETE_CODE) } + + private fun updateCase(recipientInfoModel: ReceiverInfoV3Model) { + if (recipientInfoModel.paymentMethod == null || recipientInfoModel.hasPartnerChanged() || recipientInfoModel.getIsForceUpdate() == "Y") { + var message: String? = "" + if (recipientInfoModel.getIsForceUpdate() == "Y") { + message = getString(R.string.recipient_force_update_prompt_text) + } else if (recipientInfoModel.getPaymentMethod() != null && recipientInfoModel.getPaymentMethod() + .getId() == null + ) message = + getString(R.string.recipient_profile_update_prompt_text) else message = + getString(R.string.recipient_bank_update_prompt_text) + promptToEditRecipient(object : GenericDialogPromptListener { + override fun onNegativeBtnPressed() {} + override fun onPositiveBtnPressed() { + proceedToEditRecipient(recipientInfoModel) + } + }, message) + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeActivityV3.kt b/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeActivityV3.kt index 8c685225..a609a994 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeActivityV3.kt +++ b/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeActivityV3.kt @@ -36,6 +36,7 @@ import com.remit.jmecustomer.features.cashpickuptowallet.view.CashPickupToWallet import com.remit.jmecustomer.features.changepassNPin.view.ChangePassNPinActivity import com.remit.jmecustomer.features.changepassword.view.UserPasswordChangeV2Activity import com.remit.jmecustomer.features.changetxnpin.view.ChangeTxnPinActivity +import com.remit.jmecustomer.features.customersupport.view.CustomerSupportFragment import com.remit.jmecustomer.features.depositslip.view.DepositSlipActivity import com.remit.jmecustomer.features.exrate.view.ExchangeRateActivity import com.remit.jmecustomer.features.home.HomeParentViewContractV2 @@ -145,7 +146,10 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2, binding.tabLayout.addTab(tab3) if (isTransactionComplete) { + resetTabs() + binding.tabLayout.getTabAt(1)?.setIcon(R.drawable.ic_transfers_selected) binding.vpDashboard.currentItem = 1 + binding.tabLayout.selectTab(binding.tabLayout.getTabAt(1)) } binding.vpDashboard.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { @@ -173,6 +177,7 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2, homeFragmentV3.focusHome(true) } binding.tabLayout.selectTab(binding.tabLayout.getTabAt(position)); + } override fun onPageScrollStateChanged(state: Int) { @@ -217,6 +222,7 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2, binding.toolbarHead.ivProfileImage.setOnClickListener(this) binding.toolbarHead.clNotification.setOnClickListener(this) + binding.toolbarHead.ivMsg.setOnClickListener(this) } @@ -701,6 +707,10 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2, MyNotificationActivity::class.java ) ) + R.id.iv_msg -> { + val newFragment = CustomerSupportFragment.newInstance() + newFragment.show(supportFragmentManager, "dialog") + } } } diff --git a/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt b/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt index 9b2f2fca..674b61bc 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt +++ b/app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt @@ -177,11 +177,7 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener, override fun onResume() { super.onResume() - if (homeViewModel != null) { - if (homeViewModel!!.notificationViewActive) { - homeViewModel?.getRequiredData() - } - } + homeViewModel?.getRequiredData() } fun focusHome(focus: Boolean) { diff --git a/app/src/main/java/com/remit/jmecustomer/features/myTransfers/adapters/RecentTransactionsAdapter.kt b/app/src/main/java/com/remit/jmecustomer/features/myTransfers/adapters/RecentTransactionsAdapter.kt index 9a75c0c8..d7cfebc3 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/myTransfers/adapters/RecentTransactionsAdapter.kt +++ b/app/src/main/java/com/remit/jmecustomer/features/myTransfers/adapters/RecentTransactionsAdapter.kt @@ -64,7 +64,7 @@ class RecentTransactionsAdapter(private var items: MutableList view.exitView()); + view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.logout()); } } @@ -372,7 +372,7 @@ public class RecipientAddV3ViewModel extends RecipientAddEditBaseV3ViewModel { receiverId = null; sendMoneyRequiredDataV3 = null; gateway.clearAllUserData(); - view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.exitView()); + view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.logout()); } } @@ -410,7 +410,7 @@ public class RecipientAddV3ViewModel extends RecipientAddEditBaseV3ViewModel { @Override protected void unauthorizedAccess(String message) { gateway.clearAllUserData(); - view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.exitView()); + view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.logout()); } } diff --git a/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3ViewModel.java b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3ViewModel.java index 9c6d74c1..4309b177 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3ViewModel.java +++ b/app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3ViewModel.java @@ -426,7 +426,7 @@ public class RecipientEditV3ViewModel extends RecipientAddEditBaseV3ViewModel { @Override protected void unauthorizedAccess(String message) { gateway.clearAllUserData(); - view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.exitView()); + view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.logout()); } } @@ -488,7 +488,7 @@ public class RecipientEditV3ViewModel extends RecipientAddEditBaseV3ViewModel { receiverId = null; sendMoneyRequiredDataV3 = null; gateway.clearAllUserData(); - view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, null); + view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.logout()); } } @@ -526,7 +526,7 @@ public class RecipientEditV3ViewModel extends RecipientAddEditBaseV3ViewModel { @Override protected void unauthorizedAccess(String message) { gateway.clearAllUserData(); - view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.exitView()); + view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.logout()); } } } diff --git a/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyRequestSummaryActivity.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyRequestSummaryActivity.java index 505da62a..eb1e4b27 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyRequestSummaryActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyRequestSummaryActivity.java @@ -294,6 +294,7 @@ public class SendMoneyRequestSummaryActivity extends BaseActivity implements Se Intent a = new Intent(this, HomeActivityV3.class); a.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); a.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); + a.putExtra("trans", true); a.putExtra(BUNDLE_ACTION_FETCH_ALL_DATA, true); startActivity(a); finish(); diff --git a/app/src/main/java/com/remit/jmecustomer/features/settings/view/FingerSetUpPasswordFragment.java b/app/src/main/java/com/remit/jmecustomer/features/settings/view/FingerSetUpPasswordFragment.java index df405039..04dfffb4 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/settings/view/FingerSetUpPasswordFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/settings/view/FingerSetUpPasswordFragment.java @@ -6,6 +6,7 @@ import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.AppCompatImageView; @@ -47,7 +48,7 @@ public class FingerSetUpPasswordFragment extends BottomSheetDialogFragment public static final String TAG = "SetUpPasswordFragment"; @BindView(R.id.btnContinue) - MaterialButton btnContinue; + Button btnContinue; @BindView(R.id.edVerifyPassword) TextInputEditText edVerifyPassword; diff --git a/app/src/main/res/drawable/ic_blue_button_with_white_border.xml b/app/src/main/res/drawable/ic_blue_button_with_white_border.xml index 372dcdb0..b20cd07b 100644 --- a/app/src/main/res/drawable/ic_blue_button_with_white_border.xml +++ b/app/src/main/res/drawable/ic_blue_button_with_white_border.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_msg.xml b/app/src/main/res/drawable/ic_msg.xml new file mode 100644 index 00000000..ada8e667 --- /dev/null +++ b/app/src/main/res/drawable/ic_msg.xml @@ -0,0 +1,23 @@ + + + + + + + diff --git a/app/src/main/res/drawable/light_blue_border_rounded.xml b/app/src/main/res/drawable/light_blue_border_rounded.xml index 0b99483a..1cfecc44 100644 --- a/app/src/main/res/drawable/light_blue_border_rounded.xml +++ b/app/src/main/res/drawable/light_blue_border_rounded.xml @@ -9,5 +9,5 @@ android:color="@color/light_blue_40"/> + android:color="@color/light_blue_10" /> \ No newline at end of file diff --git a/app/src/main/res/layout/finger_setup_pass_layout_fragment.xml b/app/src/main/res/layout/finger_setup_pass_layout_fragment.xml index 073b8cae..60055668 100644 --- a/app/src/main/res/layout/finger_setup_pass_layout_fragment.xml +++ b/app/src/main/res/layout/finger_setup_pass_layout_fragment.xml @@ -79,12 +79,14 @@ - - - @@ -74,7 +73,6 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/view16" - app:txtfontName="@string/regular" tools:text="When developed " /> - + + + + + android:paddingVertical="@dimen/_10sdp"> + + - - - - - + + + + diff --git a/app/src/main/res/layout/toolbar_dashboard_v3.xml b/app/src/main/res/layout/toolbar_dashboard_v3.xml index 774f93e0..e5645460 100644 --- a/app/src/main/res/layout/toolbar_dashboard_v3.xml +++ b/app/src/main/res/layout/toolbar_dashboard_v3.xml @@ -17,19 +17,19 @@ + android:layout_height="match_parent"> + + + app:layout_constraintGuide_percent="0.5769231" />