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

Before modifying verification page

master
preyearegmi 6 years ago
parent
2c24bbfd5a
commit
6ad848512b
2 changed files with 278 additions and 283 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. 50
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeSendMoneyFragment.java
  2. 511
      app/src/main/res/layout/fragment_verification_send_money_v2.xml

50
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/payoutmode/PayoutModeSendMoneyFragment.java
View File

@ -278,14 +278,11 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
this.selectedBank,
this.selectedBranch,
this.ed_account.getText().toString());
if (errorMessage == null)
{
if (errorMessage == null) {
compositeDisposable.add(
((SendMoneyActionListener) getActivity()).getPresenter().validateAccountIfRequired().subscribeWith(new AccountValidationObserver())
((SendMoneyActionListener) getActivity()).getPresenter().validateAccountIfRequired().subscribeWith(new AccountValidationObserver())
);
}
else
} else
showToastMessage(errorMessage);
break;
@ -300,8 +297,7 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
}
private void showBranchListInDialog() {
if(this.selectedBank==null)
{
if (this.selectedBank == null) {
showToastMessage("Please select a bank first.");
return;
}
@ -393,18 +389,21 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
}
public class AccountValidationObserver extends GenericApiObserverResponse<AccountValidationApiResponse>
{
public class AccountValidationObserver extends GenericApiObserverResponse<AccountValidationApiResponse> {
@Override
protected void onSuccess(AccountValidationApiResponse accountValidationApiResponse) {
if (isUIReady()) {
((SendMoneyActionListener) getActivity()).showAmountDetailPage();
}
else
{
scheduleTaskLater(()->{
if (accountValidationApiResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2))
((SendMoneyActionListener) getActivity()).showAmountDetailPage();
else
showToastMessage(accountValidationApiResponse.getMsg());
} else {
scheduleTaskLater(() -> {
if (accountValidationApiResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2))
((SendMoneyActionListener) getActivity()).showAmountDetailPage();
else
showToastMessage(accountValidationApiResponse.getMsg());
});
}
}
@ -412,12 +411,11 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
@Override
public void onFailed(String message) {
if (isUIReady()) {
showToastMessage(message);
}
else
{
scheduleTaskLater(()->{
} else {
scheduleTaskLater(() -> {
showToastMessage(message);
});
}
}
@ -425,12 +423,10 @@ public class PayoutModeSendMoneyFragment extends BaseFragment implements SendMon
@Override
protected void onConnectionNotEstablished(String message) {
if (isUIReady()) {
}
else
{
scheduleTaskLater(()->{
showToastMessage(message);
} else {
scheduleTaskLater(() -> {
showToastMessage(message);
});
}
}

511
app/src/main/res/layout/fragment_verification_send_money_v2.xml
View File

@ -1,287 +1,286 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:clickable="true"
android:focusable="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/send_money_bg_grey"
android:layout_height="match_parent">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:paddingTop="30dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:layout_height="wrap_content">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:paddingTop="10dp"
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:text="Reciever Details"
android:textColor="@color/colorPrimary"
android:textSize="17sp"
/>
android:clickable="true"
android:focusable="true">
<LinearLayout
android:paddingStart="10dp"
android:paddingLeft="10dp"
android:paddingEnd="10dp"
android:paddingRight="10dp"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="vertical"
android:paddingEnd="20dp"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:paddingStart="20dp"
android:paddingTop="30dp">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:paddingTop="10dp"
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:text="Full Name"
android:textColor="@color/dark_gray"
android:textSize="13sp"
android:layout_gravity="center"
/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:text="Preyea R. Regmi"
app:txtfontName="@string/semibold"
android:textColor="@color/black"
android:textSize="13sp"
android:layout_gravity="center"
/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:paddingTop="10dp"
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:text="Address"
android:textColor="@color/dark_gray"
android:textSize="13sp"
android:layout_gravity="center"
/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:text="Jorpati"
app:txtfontName="@string/semibold"
android:textColor="@color/black"
android:textSize="13sp"
android:layout_gravity="center"
/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:paddingTop="10dp"
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:text="Country"
android:textColor="@color/dark_gray"
android:textSize="13sp"
android:layout_gravity="center"
/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:text="Nepal"
app:txtfontName="@string/semibold"
android:textColor="@color/black"
android:textSize="13sp"
android:layout_gravity="center"
/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:paddingTop="10dp"
android:text="Reciever Details"
android:textColor="@color/colorPrimary"
android:textSize="17sp" />
<LinearLayout
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:text="Mobile"
android:textColor="@color/dark_gray"
android:textSize="13sp"
android:layout_gravity="center"
/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:text="+9779908018028"
app:txtfontName="@string/semibold"
android:textColor="@color/black"
android:textSize="13sp"
android:layout_gravity="center"
/>
android:orientation="vertical"
android:paddingEnd="10dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingStart="10dp">
</LinearLayout>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:paddingTop="20dp"
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:text="Transaction Details"
android:textColor="@color/colorPrimary"
android:textSize="17sp"
/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_vertical"
android:paddingTop="10dp"
android:text="Full Name"
android:textColor="@color/dark_gray"
android:textSize="13sp" />
<LinearLayout
android:paddingStart="10dp"
android:paddingLeft="10dp"
android:paddingEnd="10dp"
android:paddingRight="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_vertical"
android:text="Preyea R. Regmi"
android:textColor="@color/black"
android:textSize="13sp"
app:txtfontName="@string/semibold" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_vertical"
android:paddingTop="10dp"
android:text="Address"
android:textColor="@color/dark_gray"
android:textSize="13sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_vertical"
android:text="Jorpati"
android:textColor="@color/black"
android:textSize="13sp"
app:txtfontName="@string/semibold" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_vertical"
android:paddingTop="10dp"
android:text="Country"
android:textColor="@color/dark_gray"
android:textSize="13sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_vertical"
android:text="Nepal"
android:textColor="@color/black"
android:textSize="13sp"
app:txtfontName="@string/semibold" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_vertical"
android:paddingTop="10dp"
android:text="Mobile"
android:textColor="@color/dark_gray"
android:textSize="13sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_vertical"
android:text="+9779908018028"
android:textColor="@color/black"
android:textSize="13sp"
app:txtfontName="@string/semibold" />
</LinearLayout>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:paddingTop="10dp"
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:text="Payout Country"
android:textColor="@color/dark_gray"
android:textSize="13sp"
/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:text="Nepal"
app:txtfontName="@string/semibold"
android:textColor="@color/black"
android:textSize="13sp"
/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:paddingTop="10dp"
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:text="Payout Mode"
android:textColor="@color/dark_gray"
android:textSize="13sp"
/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:text="CASH Payment"
app:txtfontName="@string/semibold"
android:textColor="@color/black"
android:textSize="13sp"
/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:paddingTop="10dp"
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:text="Paying Amount"
android:textColor="@color/dark_gray"
android:textSize="13sp"
/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:text="50,000.00 KRW"
app:txtfontName="@string/semibold"
android:textColor="@color/black"
android:textSize="13sp"
android:textStyle="bold"
/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:paddingTop="10dp"
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:text="Exchange Rate"
android:textColor="@color/dark_gray"
android:textSize="13sp"
/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:text="0.00977"
app:txtfontName="@string/semibold"
android:textColor="@color/black"
android:textSize="13sp"
android:textStyle="bold"
/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:paddingTop="10dp"
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:text="Service Charge"
android:textColor="@color/dark_gray"
android:textSize="13sp"
/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:text="5000 KRW"
app:txtfontName="@string/semibold"
android:textColor="@color/black"
android:textSize="13sp"
android:textStyle="bold"
/>
android:paddingTop="20dp"
android:text="Transaction Details"
android:textColor="@color/colorPrimary"
android:textSize="17sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:paddingTop="10dp"
<LinearLayout
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:text="Payout Agent/Bank"
android:textColor="@color/dark_gray"
android:textSize="13sp"
/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:orientation="vertical"
android:paddingEnd="10dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingStart="10dp">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingTop="10dp"
android:text="Payout Country"
android:textColor="@color/dark_gray"
android:textSize="13sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="Nepal"
android:textColor="@color/black"
android:textSize="13sp"
app:txtfontName="@string/semibold" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingTop="10dp"
android:text="Payout Mode"
android:textColor="@color/dark_gray"
android:textSize="13sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="CASH Payment"
android:textColor="@color/black"
android:textSize="13sp"
app:txtfontName="@string/semibold" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingTop="10dp"
android:text="Paying Amount"
android:textColor="@color/dark_gray"
android:textSize="13sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="50,000.00 KRW"
android:textColor="@color/black"
android:textSize="13sp"
android:textStyle="bold"
app:txtfontName="@string/semibold" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingTop="10dp"
android:text="Exchange Rate"
android:textColor="@color/dark_gray"
android:textSize="13sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="0.00977"
android:textColor="@color/black"
android:textSize="13sp"
android:textStyle="bold"
app:txtfontName="@string/semibold" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingTop="10dp"
android:text="Service Charge"
android:textColor="@color/dark_gray"
android:textSize="13sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="5000 KRW"
android:textColor="@color/black"
android:textSize="13sp"
android:textStyle="bold"
app:txtfontName="@string/semibold" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingTop="10dp"
android:text="Payout Agent/Bank"
android:textColor="@color/dark_gray"
android:textSize="13sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="[Any Where]"
android:textColor="@color/black"
android:textSize="13sp"
android:textStyle="bold"
app:txtfontName="@string/semibold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:text="[Any Where]"
android:textStyle="bold"
app:txtfontName="@string/semibold"
android:textColor="@color/black"
android:textSize="13sp"
/>
android:orientation="horizontal"
android:paddingTop="20dp">
</LinearLayout>
<CheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="match_parent"
android:paddingTop="20dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
<CheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:gravity="start|top"
android:layout_height="match_parent"
android:singleLine="false"
android:maxLines="2"
android:text="I have read and agree to the term and conditions of GME Remittance User Agreement."
android:textColor="@color/dark_gray"
android:textSize="13sp"
/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="start|top"
android:maxLines="2"
android:singleLine="false"
android:text="I have read and agree to the term and conditions of GME Remittance User Agreement."
android:textColor="@color/dark_gray"
android:textSize="13sp" />
</LinearLayout>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
android:id="@+id/exRateCalculateButton"
android:layout_width="200dp"
android:layout_height="50dp"
android:layout_gravity="center"
android:layout_marginBottom="20dp"
android:layout_marginTop="20dp"
android:background="@drawable/ic_rounded_background_coloured"
android:text="Send"
android:textAllCaps="false"
android:textColor="@color/white"
android:textSize="18sp" />
</LinearLayout>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
android:id="@+id/exRateCalculateButton"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"
android:layout_width="200dp"
android:layout_height="50dp"
android:layout_gravity="center"
android:background="@drawable/ic_rounded_background_coloured"
android:text="Send"
android:textAllCaps="false"
android:textColor="@color/white"
android:textSize="18sp" />
</LinearLayout>
</ScrollView>
Write Preview
Loading…
Cancel
Save