diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b4bbf2e0..b08721ca 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -27,11 +27,12 @@ android:usesCleartextTraffic="true" tools:ignore="GoogleAppIndexingWarning" tools:replace="android:allowBackup,android:supportsRtl"> - + + android:windowSoftInputMode="stateAlwaysHidden" /> - - - + android:windowSoftInputMode="stateAlwaysHidden"> + android:windowSoftInputMode="stateAlwaysHidden" /> - - + android:windowSoftInputMode="stateAlwaysHidden"> - - - 0) { + tv_acc_no.setText(accounNo); + account_no_container.setVisibility(View.VISIBLE); + } + + } + + @Override + public void showPartnerInfo(boolean action, String partnerText, String partnerLogoUrl, String note) { + if (note != null && note.length() > 0) + txv_note.setText(note); + + if (action) { + txt_partner_info.setText(partnerText); + progressbar_partner_info.setVisibility(View.VISIBLE); + container_partner_info.setVisibility(View.VISIBLE); + Glide.with(img_partner_info.getContext()).asBitmap().load(partnerLogoUrl).dontTransform().diskCacheStrategy(DiskCacheStrategy.NONE).into(new CustomTarget() { + @Override + public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition transition) { + Log.d(TAG, "Resource load success"); + progressbar_partner_info.setVisibility(View.GONE); + img_partner_info.setVisibility(View.VISIBLE); + img_partner_info.setImageBitmap(resource); + } + + @Override + public void onLoadCleared(@Nullable Drawable placeholder) { + Log.d(TAG, "Resource load failed"); + progressbar_partner_info.setVisibility(View.GONE); + img_partner_info.setVisibility(View.GONE); + } + }); + + + } else { + container_partner_info.setVisibility(View.GONE); + + } + } + + + @Override + public void onClick(View v) { + switch (v.getId()) { + case R.id.iv_back: + onBackPressed(); + break; + + case R.id.btn_submit: + Intent a = new Intent(this, HomeActivityV2.class); + a.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + a.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); + a.putExtra(BUNDLE_ACTION_FETCH_ALL_DATA, true); + startActivity(a); + finish(); + break; + + case R.id.btn_cancel: + Intent b = new Intent(this, SupportActivityV2.class); + b.putExtra(SupportActivityV2.REQUESTED_BUNDLE_KEY, SupportActivityV2.REQUESTED_FOR_CANCEL); + b.putExtra(SupportActivityV2.REQUESTED_CONTROL_NO_BUNDLE_KEY, controlId); + b.putExtra(SupportActivityV2.REQUESTED_TRANSACTION_ID_BUNDLE_KEY, transactionId); + startActivity(b); + finish(); + break; + + case R.id.btn_change: + Intent c = new Intent(this, SupportActivityV2.class); + c.putExtra(SupportActivityV2.REQUESTED_BUNDLE_KEY, SupportActivityV2.REQUESTED_FOR_AMMENDMENT); + c.putExtra(SupportActivityV2.REQUESTED_CONTROL_NO_BUNDLE_KEY, controlId); + c.putExtra(SupportActivityV2.REQUESTED_TRANSACTION_ID_BUNDLE_KEY, transactionId); + startActivity(c); + finish(); + break; + + + } + } + + +} \ No newline at end of file diff --git a/app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/SendMoneyV2Activity.java b/app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/SendMoneyV2Activity.java index 03c5327f..0863cc9c 100644 --- a/app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/SendMoneyV2Activity.java +++ b/app/src/main/java/com/swifttech/remit/android/features/sendmoney/view/SendMoneyV2Activity.java @@ -240,11 +240,11 @@ public class SendMoneyV2Activity extends BaseActivity implements SendMoneyAction @Override public void showReceiptOnTransactionComplete(String transactionId) { - Intent startReceiptActivity = new Intent(this, SendMoneyV2TransactionCompleteActivity.class); + Intent startReceiptActivity = new Intent(this, SendMoneyRequestSummaryActivity.class); startReceiptActivity.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); - startReceiptActivity.putExtra(SendMoneyV2TransactionCompleteActivity.SEND_MONEY_TID_BUNDLE_KEY, transactionId); - startReceiptActivity.putExtra(SendMoneyV2TransactionCompleteActivity.IS_TRANSACTION_DETAIL_REQUEST_FROM_SEND_MONEY_BUNDLE_KEY, true); - startReceiptActivity.putExtra(SendMoneyV2TransactionCompleteActivity.SHOULD_UPDATE_BALANCE_UPON_RETURN, true); + startReceiptActivity.putExtra(SendMoneyRequestSummaryActivity.SEND_MONEY_TID_BUNDLE_KEY, transactionId); + startReceiptActivity.putExtra(SendMoneyRequestSummaryActivity.IS_TRANSACTION_DETAIL_REQUEST_FROM_SEND_MONEY_BUNDLE_KEY, true); + startReceiptActivity.putExtra(SendMoneyRequestSummaryActivity.SHOULD_UPDATE_BALANCE_UPON_RETURN, true); startActivity(startReceiptActivity); } diff --git a/app/src/main/res/layout/send_money_request_summary_layout.xml b/app/src/main/res/layout/send_money_request_summary_layout.xml new file mode 100644 index 00000000..ef579b00 --- /dev/null +++ b/app/src/main/res/layout/send_money_request_summary_layout.xml @@ -0,0 +1,609 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 147f8fa4..7085fded 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - - Japan Money Express + + Japan Money Express Home Invite Send Money @@ -1014,5 +1014,9 @@ All the configurations are done from backend web application system which allows Invalid Purpose of Registration Agree and Submit 1. JME Terms And Conditions - + We have received your remittance request for + Please make payment of + to JME within next working day to transmit this request.\nAfter payment please check notices to get JME Number for this transfer. + REQUEST SUMMARY + Payout Agent/Bank