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

Partner info added in receipt and fixes

master
Preyea Regmi 4 years ago
parent
36db91ec79
commit
3c73b2061e
2 changed files with 124 additions and 123 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. 22
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/verification/VerificationSendMoneyFragment.java
  2. 225
      app/src/main/res/layout/fragment_verification_send_money_v2.xml

22
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/view/verification/VerificationSendMoneyFragment.java
View File

@ -132,25 +132,25 @@ public class VerificationSendMoneyFragment extends BaseFragment implements View
private void performDefaultAction(Bundle savedInstance) {
VerificationViewModel verificationViewModel= ((SendMoneyActionListener)getActivity()).getPresenter().getVerificationRelatedData();
txt_address.setText(" : "+verificationViewModel.getAddress());
txt_country.setText(" : "+verificationViewModel.getCountry());
txt_exrate.setText(" : "+verificationViewModel.getExRate());
txt_firstName.setText(" : "+verificationViewModel.getFirstName());
txt_mobile.setText(" : "+verificationViewModel.getMobile());
txt_pamount.setText(" : "+verificationViewModel.getpAmount());
txt_pcountry.setText(" : "+verificationViewModel.getpCountry());
txt_pmode.setText(" : "+verificationViewModel.getpMode());
txt_servicechargeAmount.setText(" : "+verificationViewModel.getServiceCharge());
txt_address.setText(verificationViewModel.getAddress());
txt_country.setText(verificationViewModel.getCountry());
txt_exrate.setText(verificationViewModel.getExRate());
txt_firstName.setText(verificationViewModel.getFirstName());
txt_mobile.setText(verificationViewModel.getMobile());
txt_pamount.setText(verificationViewModel.getpAmount());
txt_pcountry.setText(verificationViewModel.getpCountry());
txt_pmode.setText(verificationViewModel.getpMode());
txt_servicechargeAmount.setText(verificationViewModel.getServiceCharge());
if(verificationViewModel.getBankAcNo()!=null&&verificationViewModel.getBankAcNo().length()>1)
{
bankAcNoContainer.setVisibility(View.VISIBLE);
txt_bankAcNo.setText(" : "+verificationViewModel.getBankAcNo());
txt_bankAcNo.setText(verificationViewModel.getBankAcNo());
}
String pAgent=verificationViewModel.getpAgent();
if(pAgent!=null&&pAgent.trim().length()>0) {
hideAgentLocation(false);
txt_pagent.setText(" : "+verificationViewModel.getpAgent());
txt_pagent.setText(verificationViewModel.getpAgent());
}
else
hideAgentLocation(true);

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

@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/background_gray"
android:clickable="true"
android:scrollbars="none"
@ -30,10 +31,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="@string/reciever_details_text"
android:textColor="@color/colorPrimary"
android:textSize="@dimen/_14ssp" />
tools:text="@string/reciever_details_text"
tools:textColor="@color/colorPrimary"
tools:textSize="@dimen/_14ssp" />
<LinearLayout
android:paddingTop="@dimen/_8sdp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -42,21 +44,20 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingTop="@dimen/_8sdp"
android:text="@string/full_name_text"
android:textColor="@color/dark_gray"
android:textSize="@dimen/_11ssp" />
android:gravity="start"
tools:text="@string/full_name_text"
tools:textColor="@color/dark_gray"
tools:textSize="@dimen/_11ssp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/txt_firstName"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="Preyea R. Regmi"
android:textColor="@color/black"
android:textSize="@dimen/_11ssp"
android:gravity="end"
tools:text="Preyea R. Regmi la;skjdhfljasdf lkahsdf"
tools:textColor="@color/black"
tools:textSize="@dimen/_11ssp"
app:txtfontName="@string/semibold" />
</LinearLayout>
@ -68,21 +69,21 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:gravity="start"
android:paddingTop="@dimen/_8sdp"
android:text="@string/address_text"
android:textColor="@color/dark_gray"
android:textSize="@dimen/_11ssp" />
tools:text="@string/address_text"
tools:textColor="@color/dark_gray"
tools:textSize="@dimen/_11ssp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/txt_address"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="Jorpati"
android:textColor="@color/black"
android:textSize="@dimen/_11ssp"
android:gravity="end"
tools:text="Jorpati"
tools:textColor="@color/black"
tools:textSize="@dimen/_11ssp"
app:txtfontName="@string/semibold" />
</LinearLayout>
@ -94,21 +95,21 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:gravity="start"
android:paddingTop="@dimen/_8sdp"
android:text="@string/country_text"
android:textColor="@color/dark_gray"
android:textSize="@dimen/_11ssp" />
tools:text="@string/country_text"
tools:textColor="@color/dark_gray"
tools:textSize="@dimen/_11ssp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/txt_country"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="Nepal"
android:textColor="@color/black"
android:textSize="@dimen/_11ssp"
android:gravity="end"
tools:text="Nepal"
tools:textColor="@color/black"
tools:textSize="@dimen/_11ssp"
app:txtfontName="@string/semibold" />
</LinearLayout>
@ -120,20 +121,20 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:gravity="start"
android:paddingTop="@dimen/_8sdp"
android:text="@string/mobile_text"
android:textColor="@color/dark_gray"
android:textSize="@dimen/_11ssp" />
tools:text="@string/mobile_text"
tools:textColor="@color/dark_gray"
tools:textSize="@dimen/_11ssp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/txt_mobile"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:textColor="@color/black"
android:textSize="@dimen/_11ssp"
android:gravity="end"
tools:textColor="@color/black"
tools:textSize="@dimen/_11ssp"
app:txtfontName="@string/semibold" />
</LinearLayout>
@ -151,10 +152,10 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="@string/transaction_detail_text"
android:textColor="@color/colorPrimary"
android:textSize="@dimen/_14ssp" />
android:gravity="start"
tools:text="@string/transaction_detail_text"
tools:textColor="@color/colorPrimary"
tools:textSize="@dimen/_14ssp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -163,21 +164,21 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:gravity="end"
android:paddingTop="@dimen/_8sdp"
android:text="@string/payout_country_text"
android:textColor="@color/dark_gray"
android:textSize="@dimen/_11ssp" />
tools:text="@string/payout_country_text"
tools:textColor="@color/dark_gray"
tools:textSize="@dimen/_11ssp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/txt_pcountry"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="Nepal"
android:textColor="@color/black"
android:textSize="@dimen/_11ssp"
android:gravity="end"
tools:text="Nepal"
tools:textColor="@color/black"
tools:textSize="@dimen/_11ssp"
app:txtfontName="@string/semibold" />
</LinearLayout>
@ -189,11 +190,11 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:gravity="start"
android:paddingTop="@dimen/_8sdp"
android:text="@string/payout_mode_text"
android:textColor="@color/dark_gray"
android:textSize="@dimen/_11ssp" />
tools:text="@string/payout_mode_text"
tools:textColor="@color/dark_gray"
tools:textSize="@dimen/_11ssp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/txt_pmode"
@ -201,10 +202,10 @@
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="CASH Payment"
android:textColor="@color/black"
android:textSize="@dimen/_11ssp"
android:gravity="end"
tools:text="CASH Payment"
tools:textColor="@color/black"
tools:textSize="@dimen/_11ssp"
app:txtfontName="@string/semibold" />
</LinearLayout>
@ -216,22 +217,22 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:gravity="start"
android:paddingTop="@dimen/_8sdp"
android:text="@string/paying_amount_text"
android:textColor="@color/dark_gray"
android:textSize="@dimen/_11ssp" />
tools:text="@string/paying_amount_text"
tools:textColor="@color/dark_gray"
tools:textSize="@dimen/_11ssp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/txt_pamount"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="50,000.00 KRW"
android:textColor="@color/black"
android:textSize="@dimen/_11ssp"
android:textStyle="bold"
android:gravity="end"
tools:text="50,000.00 KRW"
tools:textColor="@color/black"
tools:textSize="@dimen/_11ssp"
tools:textStyle="bold"
app:txtfontName="@string/semibold" />
</LinearLayout>
@ -243,22 +244,22 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:gravity="start"
android:paddingTop="@dimen/_8sdp"
android:text="@string/exchange_rate_text"
android:textColor="@color/dark_gray"
android:textSize="@dimen/_11ssp" />
tools:text="@string/exchange_rate_text"
tools:textColor="@color/dark_gray"
tools:textSize="@dimen/_11ssp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/txt_exrate"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="0.00977"
android:textColor="@color/black"
android:textSize="@dimen/_11ssp"
android:textStyle="bold"
android:gravity="end"
tools:text="0.00977"
tools:textColor="@color/black"
tools:textSize="@dimen/_11ssp"
tools:textStyle="bold"
app:txtfontName="@string/semibold" />
</LinearLayout>
@ -270,22 +271,22 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:gravity="start"
android:paddingTop="@dimen/_8sdp"
android:text="@string/service_charge_text"
android:textColor="@color/dark_gray"
android:textSize="@dimen/_11ssp" />
tools:text="@string/service_charge_text"
tools:textColor="@color/dark_gray"
tools:textSize="@dimen/_11ssp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/txt_servicechargeAmount"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="5000 KRW"
android:textColor="@color/black"
android:textSize="@dimen/_11ssp"
android:textStyle="bold"
android:gravity="end"
tools:text="5000 KRW"
tools:textColor="@color/black"
tools:textSize="@dimen/_11ssp"
tools:textStyle="bold"
app:txtfontName="@string/semibold" />
</LinearLayout>
@ -300,21 +301,21 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="top"
android:text="@string/payout_agent_text"
android:textColor="@color/dark_gray"
android:textSize="@dimen/_11ssp" />
android:gravity="start"
tools:text="@string/payout_agent_text"
tools:textColor="@color/dark_gray"
tools:textSize="@dimen/_11ssp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/txt_pagent"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="[Any Where] lasjdkflasjdfklkasdhfksjdfhl"
android:textColor="@color/black"
android:textSize="@dimen/_11ssp"
android:textStyle="bold"
android:gravity="end"
tools:text="[Any Where] lasjdkflasjdfklkasdhfksjdfhl"
tools:textColor="@color/black"
tools:textSize="@dimen/_11ssp"
tools:textStyle="bold"
android:singleLine="false"
android:inputType="textMultiLine"
app:txtfontName="@string/semibold" />
@ -330,22 +331,22 @@
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:gravity="start"
android:paddingTop="@dimen/_8sdp"
android:text="@string/bank_ac_text"
android:textColor="@color/dark_gray"
android:textSize="@dimen/_11ssp" />
tools:text="@string/bank_ac_text"
tools:textColor="@color/dark_gray"
tools:textSize="@dimen/_11ssp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/txt_bankAcNo"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:gravity="end"
android:textColor="@color/black"
android:textSize="@dimen/_11ssp"
android:textStyle="bold"
tools:textColor="@color/black"
tools:textSize="@dimen/_11ssp"
tools:textStyle="bold"
app:txtfontName="@string/semibold" />
</LinearLayout>
@ -360,9 +361,9 @@
android:gravity="center"
android:maxLines="2"
android:layout_height="wrap_content"
android:text="@string/i_have_read_to_text"
android:textColor="@color/dark_gray"
android:textSize="@dimen/_11ssp" />
tools:text="@string/i_have_read_to_text"
tools:textColor="@color/dark_gray"
tools:textSize="@dimen/_11ssp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_marginTop="@dimen/_5sdp"
android:id="@+id/txt_user_aggreement"
@ -371,9 +372,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/gme_user_aggreement_text"
android:textColor="@color/colorPrimary"
android:textSize="@dimen/_11ssp" />
tools:text="@string/gme_user_aggreement_text"
tools:textColor="@color/colorPrimary"
tools:textSize="@dimen/_11ssp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_marginBottom="@dimen/_16sdp"
@ -383,9 +384,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/gme_fraud_warning_text"
android:textColor="@color/colorPrimary"
android:textSize="@dimen/_11ssp" />
tools:text="@string/gme_fraud_warning_text"
tools:textColor="@color/colorPrimary"
tools:textSize="@dimen/_11ssp" />
@ -396,9 +397,9 @@
android:layout_marginBottom="20dp"
android:layout_marginTop="20dp"
android:background="@drawable/ic_rounded_background_red_coloured"
android:text="@string/agree_and_send_text"
android:textAllCaps="false"
android:textColor="@color/white"
android:textSize="@dimen/_14ssp" />
tools:text="@string/agree_and_send_text"
tools:textAllCaps="false"
tools:textColor="@color/white"
tools:textSize="@dimen/_14ssp" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
Write Preview
Loading…
Cancel
Save