From 6417a5afb1a8ba9118344630981fc4d23ab7a9bc Mon Sep 17 00:00:00 2001 From: Mukesh Dhungana Date: Mon, 18 Apr 2022 14:37:14 +0545 Subject: [PATCH] fix feedback issues --- .../view/ChangePassNPinActivity.java | 2 +- .../documents/ExistingKYCIDTypeFragment.java | 4 +++- .../view/documents/KYCIDTypeFragment.java | 18 +++++++++++++----- .../features/notice/model/NoticeDTO.java | 12 +++++++++++- .../notice/view/NoticeListingFragment.java | 1 + app/src/main/res/values-bn/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-ne/strings.xml | 2 +- app/src/main/res/values/colors.xml | 1 + 9 files changed, 33 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/remit/jmecustomer/features/changepassNPin/view/ChangePassNPinActivity.java b/app/src/main/java/com/remit/jmecustomer/features/changepassNPin/view/ChangePassNPinActivity.java index 2f6cf3ad..c047dfd7 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/changepassNPin/view/ChangePassNPinActivity.java +++ b/app/src/main/java/com/remit/jmecustomer/features/changepassNPin/view/ChangePassNPinActivity.java @@ -215,7 +215,7 @@ public class ChangePassNPinActivity extends BaseActivity implements ChangePassNP private void performDefaultAction(Bundle savedInstanceState) { if(savedInstanceState==null) { - toolbarTitle.setText(R.string.changePassNPin_text); + toolbarTitle.setText(R.string.change_pin_password_title_text); iv_cancel.setVisibility(View.INVISIBLE); } } diff --git a/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCIDTypeFragment.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCIDTypeFragment.java index e3a5e79d..dfa1f125 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCIDTypeFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/existingCustomer/view/documents/ExistingKYCIDTypeFragment.java @@ -563,8 +563,10 @@ public class ExistingKYCIDTypeFragment extends BaseFragment { private void requestToCropImage(int currentRequest) { this.currentRequest = currentRequest; CropImage.activity(photoURI) + .setInitialCropWindowPaddingRatio(0.05F) + .setAspectRatio(4,3) .setCropMenuCropButtonTitle(getString(R.string.done_text)) - .start(getActivity(), this); + .start(getContext(), this); } diff --git a/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/documents/KYCIDTypeFragment.java b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/documents/KYCIDTypeFragment.java index 8f306977..8c3fcc0b 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/documents/KYCIDTypeFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/kyc/newCustomer/view/documents/KYCIDTypeFragment.java @@ -764,11 +764,19 @@ public class KYCIDTypeFragment extends BaseFragment implements KYCV3PresenterInt private void requestToCropImage(int currentRequest) { this.currentRequest = currentRequest; - CropImage.activity(photoURI) - .setInitialCropWindowPaddingRatio(0) - .setAspectRatio(16,9) - .setCropMenuCropButtonTitle(getString(R.string.done_text)) - .start(getContext(), this); + if (currentRequest == CAMERA_REQUEST_ADDITIONAL_ID || + currentRequest == CAMERA_REQUEST_ADDITIONAL_ID_BACK || + currentRequest == CAMERA_REQUEST_FACE_PHOTO) + CropImage.activity(photoURI) + .setCropMenuCropButtonTitle(getString(R.string.done_text)) + .start(getContext(), this); + else + CropImage.activity(photoURI) + .setBackgroundColor(getContext().getResources().getColor(R.color.blur)) + .setInitialCropWindowPaddingRatio(0.05F) + .setAspectRatio(4, 3) + .setCropMenuCropButtonTitle(getString(R.string.done_text)) + .start(getContext(), this); } diff --git a/app/src/main/java/com/remit/jmecustomer/features/notice/model/NoticeDTO.java b/app/src/main/java/com/remit/jmecustomer/features/notice/model/NoticeDTO.java index aca25a02..ff40c4a6 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/notice/model/NoticeDTO.java +++ b/app/src/main/java/com/remit/jmecustomer/features/notice/model/NoticeDTO.java @@ -26,7 +26,9 @@ public class NoticeDTO { @Expose private String extra; - + @SerializedName("DisplayActions") + @Expose + private String displayActions; @@ -77,4 +79,12 @@ public class NoticeDTO { public void setExtra(String extra) { this.extra = extra; } + + public String getDisplayActions() { + return displayActions; + } + + public void setDisplayActions(String displayActions) { + this.displayActions = displayActions; + } } diff --git a/app/src/main/java/com/remit/jmecustomer/features/notice/view/NoticeListingFragment.java b/app/src/main/java/com/remit/jmecustomer/features/notice/view/NoticeListingFragment.java index 843c777d..53d419ae 100644 --- a/app/src/main/java/com/remit/jmecustomer/features/notice/view/NoticeListingFragment.java +++ b/app/src/main/java/com/remit/jmecustomer/features/notice/view/NoticeListingFragment.java @@ -91,6 +91,7 @@ public class NoticeListingFragment extends BaseFragment implements NoticeListing NoticeDTO selectedNotice=new ViewModelProvider(getActivity()).get(NoticeViewModel.class).getSelectedNotice(); Intent startReceiptActivity = new Intent(getActivity(), SendMoneyV2TransactionCompleteActivity.class); startReceiptActivity.putExtra(SendMoneyV2TransactionCompleteActivity.SEND_MONEY_TID_BUNDLE_KEY, selectedNotice.getExtra()); + startReceiptActivity.putExtra(SendMoneyV2TransactionCompleteActivity.DISPLAY_ACTIONS_BUNDLE_KEY, selectedNotice.getDisplayActions()); startActivity(startReceiptActivity); } } diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index c6db141e..bff6b102 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -190,7 +190,7 @@ নিব্ধনের উদ্দেশ্য সার্চ করুন নিবন্ধনের উদ্দেশ্য নির্বাচন করুন ব্যক্তিগত তথ্য - নকোম্পানির নাম + কোম্পানির নাম (ঐচ্ছিক) পেশা নির্বাচন করুুন মাসিক আয় মোবাইল নম্বর diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c112459c..4e8f5704 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -187,7 +187,7 @@ ビジネスタイプの選択 登録目的の選択 個人情報 - 会社名（オプション） + 会社名 （オプション） 職業の選択 月収 携帯電話番号 diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index 068a4d2a..8bb1120a 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -188,7 +188,7 @@ दर्ता गर्ने उद्देश्य खोज्नुहोस्‌ दर्ता गर्ने उद्देश्य चयन गर्नुहोस्‌ व्यक्तिगत जानकारी - रोजगारदाताको नाम + कम्पनीको नाम (वैकल्पिक) पेशा चयन गर्नुहोस् मासिक आम्दानी मोबाइल नम्बर diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 3d141c6f..d84bb4c4 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -57,5 +57,6 @@ #2A2A82 #000000FF + #060606bd