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

Contact removed from nav_bar

master
preyearegmi 6 years ago
parent
c4bce17b27
commit
bfbe446b80
4 changed files with 55 additions and 11 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/SendMoneyV2TransactionCompleteActivity.java
  2. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/supportV2/gateway/SupportActivityV2Gateway.java
  3. 38
      app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml
  4. 2
      app/src/main/res/layout/fragment_customer_support.xml

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

@ -65,6 +65,8 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme
TextView tvServiceFee;
@BindView(R.id.tv_payout_mode)
TextView tvPayoutMode;
@BindView(R.id.exrate_fee)
TextView exrate_fee;
@BindView(R.id.btn_submit)
@ -107,7 +109,7 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme
isRequestedBySendMoney = getIntent().getBooleanExtra(IS_TRANSACTION_DETAIL_REQUEST_FROM_SEND_MONEY_BUNDLE_KEY, false);
prepareForm();
if (!isRequestedBySendMoney) {
controlId= getIntent().getStringExtra(SEND_MONEY_CONTROL_NO_BUNDLE_KEY);
controlId = getIntent().getStringExtra(SEND_MONEY_CONTROL_NO_BUNDLE_KEY);
}
@ -175,6 +177,9 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme
relationTextView.setText(recieptData.getRelWithSender());
addressTextView.setText(recieptData.getRAddress());
mobileNumberTextView.setText(recieptData.getRContactNo());
if (recieptData.getREmail() == null || recieptData.getREmail().length() < 1)
emailTextView.setText("N/A");
else
emailTextView.setText(recieptData.getREmail());
agentTextView.setText(recieptData.getPAgentBank());
tvBranch.setText(recieptData.getPayoutBankBranch());
@ -185,6 +190,7 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme
deliveryAddressTextView.setText(recieptData.getRAddress());
tvServiceFee.setText(recieptData.getServiceCharge());
totalAmountTextView.setText(recieptData.getPayOutAmount());
exrate_fee.setText(recieptData.getExRate());
}
@ -204,18 +210,18 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme
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);
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);
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;

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/supportV2/gateway/SupportActivityV2Gateway.java
View File

@ -44,6 +44,8 @@ public class SupportActivityV2Gateway extends PrivilegedGateway implements Suppo
@Override
public Observable<SupportActivityV2APIResponse> performNormalRequest(String auth, String body, String subject) {
JsonObject jsonObject=new JsonObject();
jsonObject.addProperty("controlNo","dummy");
jsonObject.addProperty("tranId","dummy");
jsonObject.addProperty("subject",subject);
jsonObject.addProperty("body",body);

38
app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml
View File

@ -336,11 +336,13 @@
android:layout_alignParentRight="true"
android:layout_below="@id/tv_mobile_no"
android:padding="10dp"
android:text="-"
android:text="N/A"
android:textColor="@color/darkgray"
android:textSize="14sp"
app:txtfontName="@string/semibold" />
<LinearLayout
android:id="@+id/notForHome"
android:layout_width="match_parent"
@ -628,12 +630,44 @@
android:textSize="14sp"
app:txtfontName="@string/semibold" />
</RelativeLayout>
<View
android:id="@+id/exrate_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@id/service_fee_layout"
android:background="@color/gray" />
<RelativeLayout
android:id="@+id/exrate_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/exrate_divider">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/exrate_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:text="Ex Rate"
android:textColor="@color/darkgray"
android:textSize="14sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/exrate_fee"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:padding="10dp"
android:text="7000 KRW"
android:textColor="@color/darkgray"
android:textSize="14sp"
app:txtfontName="@string/semibold" />
</RelativeLayout>
<View
android:id="@+id/total_amount_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@id/service_fee_layout"
android:layout_below="@id/exrate_layout"
android:background="@color/gray" />
<RelativeLayout

2
app/src/main/res/layout/fragment_customer_support.xml
View File

@ -95,11 +95,13 @@
</LinearLayout>
<View
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/divider" />
<LinearLayout
android:visibility="gone"
android:id="@+id/viewEmail"
android:layout_width="match_parent"
android:layout_height="56dp"

Write Preview
Loading…
Cancel
Save