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

Account Validation fixes for WING wallet

master
Preyea Regmi 5 years ago
parent
358240b562
commit
cf6801133a
10 changed files with 583 additions and 6 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. BIN
      .idea/caches/build_file_checksums.ser
  2. 11
      app/src/main/AndroidManifest.xml
  3. 5
      app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardlisting/RewardListingV2Presenter.java
  4. 15
      app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/view/rewardorderdetail/RewardOrderDetailActivity.java
  5. 9
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/gateway/SendMoneyV2Gateway.java
  6. 4
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/SendMoneyAPIRequestBody.java
  7. 5
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2InteractorInterface.java
  8. 6
      app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java
  9. 528
      app/src/main/res/layout/activity_reward_order_detail.xml
  10. 6
      app/src/main/res/values/strings.xml

BIN
.idea/caches/build_file_checksums.ser
View File

11
app/src/main/AndroidManifest.xml
View File

@ -25,6 +25,7 @@
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:replace="android:allowBackup">
<activity android:name=".rewardV2.view.rewardorderdetail.RewardOrderDetailActivity"></activity>
<activity
android:name=".resendV2.view.TransactionListingV2Activity"
android:screenOrientation="portrait"
@ -353,12 +354,16 @@
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity android:name=".rewardV2.view.rewardlisting.RewardListingV2Activity" android:screenOrientation="portrait"
<activity
android:name=".rewardV2.view.rewardlisting.RewardListingV2Activity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="stateAlwaysHidden" />
<activity android:name=".rewardV2.view.rewardredeem.RewardRedeemV2Activity" android:screenOrientation="portrait"
<activity
android:name=".rewardV2.view.rewardredeem.RewardRedeemV2Activity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="stateAlwaysHidden"/>
android:windowSoftInputMode="stateAlwaysHidden" />
</application>
</manifest>

5
app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/presenter/rewardlisting/RewardListingV2Presenter.java
View File

@ -12,4 +12,9 @@ public class RewardListingV2Presenter extends BasePresenter implements RewardLis
this.view = view;
this.gateway=new RewardListingV2Gateway(this);
}
@Override
public void fetchRewards() {
}
}

15
app/src/main/java/com/gmeremit/online/gmeremittance_native/rewardV2/view/rewardorderdetail/RewardOrderDetailActivity.java
View File

@ -0,0 +1,15 @@
package com.gmeremit.online.gmeremittance_native.rewardV2.view.rewardorderdetail;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import com.gmeremit.online.gmeremittance_native.R;
public class RewardOrderDetailActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_reward_order_detail);
}
}

9
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/gateway/SendMoneyV2Gateway.java
View File

@ -57,7 +57,8 @@ public class SendMoneyV2Gateway extends PrivilegedGateway implements SendMoneyV2
public Observable<AccountValidationApiResponse> validateAccountFromServer(String auth, String idType, String idNumber, String customerFirstName,
String customerLastName, String receiverFirstName, String receiverLastName,
String country, String accountType, String issuerCode, String accountNo,
String amount, String bankCode, String payoutPartner, String processId) {
String amount, String bankCode, String payoutPartner, String processId,String bankId,String receiverCountryID,
String deliveryMethodID ) {
JsonObject jsonObject=new JsonObject();
jsonObject.addProperty("idType",idType);
@ -76,6 +77,12 @@ public class SendMoneyV2Gateway extends PrivilegedGateway implements SendMoneyV2
jsonObject.addProperty("payoutPartner",payoutPartner);
jsonObject.addProperty("processId",processId);
jsonObject.addProperty("bankId",bankId);
jsonObject.addProperty("receiverCountryId",receiverCountryID);
jsonObject.addProperty("deliveryMethodId",deliveryMethodID);
return HttpClientV2.getInstance().accountValidationV2(auth,jsonObject);
}

4
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/model/SendMoneyAPIRequestBody.java
View File

@ -105,6 +105,10 @@ public class SendMoneyAPIRequestBody {
@Expose
private boolean isUseBiometric;
@SerializedName("schemeId")
@Expose
private String schemeId;
public String getUser() {
return user;

5
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2InteractorInterface.java
View File

@ -42,7 +42,10 @@ public interface SendMoneyV2InteractorInterface extends BaseInteractorInterface
String amount,
String bankCode,
String payoutPartner,
String processId);
String processId,
String bankID,
String receiverCountryID,
String deliveryMethodID);
Observable<SendMoneyTransactionResponseBody> performSendMoneyTransaction(String auth, SendMoneyAPIRequestBody requestBody);

6
app/src/main/java/com/gmeremit/online/gmeremittance_native/sendmoneyV2/presenter/SendMoneyV2Presenter.java
View File

@ -345,8 +345,12 @@ public class SendMoneyV2Presenter extends BasePresenter implements SendMoneyV2Pr
String payoutPartner = selectedPaymentModeData.getPayoutPartner();
String processId = "";
String bankId=selectedBankData.getId();
String receiverCountryId=selectedRecipient.getCountryId();
String deliveryMethodID=selectedPaymentModeData.getId();
return gateway.validateAccountFromServer(gateway.getAuth(), idType, idNumber, customerFirstName, customerLastName, receiverFirstName, receiverLastName, country,
accountType, issuerCode, accountNo, amount, bankCode, payoutPartner, processId);
accountType, issuerCode, accountNo, amount, bankCode, payoutPartner, processId,bankId,receiverCountryId,deliveryMethodID);
}

528
app/src/main/res/layout/activity_reward_order_detail.xml
View File

@ -0,0 +1,528 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background_gray"
android:orientation="vertical"
>
<include layout="@layout/layout_sendmoney_toolbar" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background_gray"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:background="@drawable/ic_recharge_share_background">
<ImageView
android:id="@+id/logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="14dp"
android:src="@drawable/ic_gme_logo_white" />
<ImageView
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="2dp"
android:layout_marginTop="4dp"
android:padding="14dp"
android:src="@drawable/ic_share_image" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/transfer_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/logo"
android:layout_centerHorizontal="true"
android:padding="6dp"
android:text="@string/transfer_success_text"
android:textColor="@color/white"
android:textSize="19sp"
app:txtfontName="@string/semibold" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/receiver_info"
android:layout_width="match_parent"
android:gravity="center_horizontal"
android:layout_height="wrap_content"
android:layout_below="@id/transfer_label"
android:layout_centerHorizontal="true"
android:padding="2dp"
android:text="@string/transfer_success_info_text"
android:textColor="@color/white"
android:textSize="15sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/tv_receiver_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/receiver_info"
android:layout_centerHorizontal="true"
android:gravity="center_horizontal"
android:padding="2dp"
android:textColor="@color/white"
android:textSize="15sp"
app:txtfontName="@string/semibold" />
<LinearLayout
android:id="@+id/payoutLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tv_receiver_name"
android:layout_centerHorizontal="true"
android:orientation="horizontal">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:padding="2dp"
android:text="@string/total_payout_amount_text"
android:textColor="@color/white"
android:textSize="15sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/tv_payout_amount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tv_receiver_name"
android:layout_centerHorizontal="true"
android:padding="2dp"
android:textColor="@color/white"
android:textSize="15sp"
app:txtfontName="@string/semibold" />
</LinearLayout>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/tv_gme_control_no"
android:layout_width="match_parent"
android:gravity="center_horizontal"
android:layout_height="wrap_content"
android:layout_below="@id/payoutLayout"
android:layout_centerHorizontal="true"
android:padding="2dp"
android:textColor="@color/white"
android:textSize="17sp"
app:txtfontName="@string/heavy" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:paddingBottom="5dp"
android:id="@+id/tv_note"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tv_gme_control_no"
android:layout_centerHorizontal="true"
android:gravity="center"
android:paddingLeft="2dp"
android:paddingTop="4dp"
android:text="@string/gme_control_security_text"
android:textColor="@color/white"
android:textSize="12sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tv_gme_control_no"
android:layout_toLeftOf="@id/tv_note"
android:paddingTop="7dp"
android:src="@drawable/ic_secure_lock" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:background="@drawable/ic_rectangle_white_extra_corners">
<LinearLayout
android:id="@+id/nameContainer"
android:layout_width="match_parent"
android:weightSum="1"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:text="@string/receiver_text"
android:textColor="@color/darkgray"
android:textSize="14sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/tv_receiver"
android:layout_width="0dp"
android:layout_weight="1"
android:gravity="end"
android:layout_height="wrap_content"
android:padding="10dp"
android:textColor="@color/darkgray"
android:textSize="14sp"
app:txtfontName="@string/semibold" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@id/nameContainer"
android:background="@color/gray" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/address_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/nameContainer"
android:padding="10dp"
android:text="@string/address_text"
android:textColor="@color/darkgray"
android:textSize="14sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/tv_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_below="@id/nameContainer"
android:maxLength="25"
android:padding="10dp"
android:singleLine="true"
android:textColor="@color/darkgray"
android:textSize="14sp"
app:txtfontName="@string/semibold" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@id/address_label"
android:background="@color/gray" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/mobile_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/address_label"
android:padding="10dp"
android:text="@string/mobile_text"
android:textColor="@color/darkgray"
android:textSize="14sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/tv_mobile_no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_below="@id/tv_address"
android:padding="10dp"
android:textColor="@color/darkgray"
android:textSize="14sp"
app:txtfontName="@string/semibold" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@id/mobile_label"
android:background="@color/gray" />
<LinearLayout
android:id="@+id/notForHome"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/mobile_label"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/gray" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:gravity="left"
android:text="@string/product_name_text"
android:textColor="@color/darkgray"
android:textSize="14sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/tv_product_name"
android:layout_width="0dp"
android:layout_weight="1"
android:gravity="right"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:padding="10dp"
android:singleLine="false"
android:text=""
android:textColor="@color/darkgray"
android:textSize="14sp"
app:txtfontName="@string/semibold"
/>
</LinearLayout>
</LinearLayout>
<View
android:id="@+id/total_sent_amount_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@id/notForHome"
android:background="@color/gray" />
<RelativeLayout
android:id="@+id/total_sent_amount_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/total_sent_amount_divider">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:text="@string/product_point_text"
android:textColor="@color/darkgray"
android:textSize="14sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/tv_product_point"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:padding="10dp"
android:text=""
android:textColor="@color/darkgray"
android:textSize="14sp"
app:txtfontName="@string/semibold" />
</RelativeLayout>
<!---->
<View
android:id="@+id/service_fee_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@id/total_sent_amount_layout"
android:background="@color/gray" />
<RelativeLayout
android:id="@+id/service_fee_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/service_fee_divider">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/tv_order_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:text="@string/order_date_text"
android:textColor="@color/darkgray"
android:textSize="14sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/tv_service_fee"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:padding="10dp"
android:textColor="@color/darkgray"
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:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:text="@string/order_receive_date_text"
android:textColor="@color/darkgray"
android:textSize="14sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/tv_order_receive_date_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:padding="10dp"
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/exrate_layout"
android:background="@color/gray" />
<RelativeLayout
android:id="@+id/order_no_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/total_amount_divider">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:text="@string/order_no_text"
android:textColor="@color/darkgray"
android:textSize="14sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/tv_order_no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:padding="10dp"
android:textColor="@color/darkgray"
android:textSize="14sp"
app:txtfontName="@string/semibold" />
</RelativeLayout>
<View
android:id="@+id/order_no_text_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@id/order_no_text"
android:background="@color/gray" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/order_no_text_divider">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:text="@string/order_type_text"
android:textColor="@color/darkgray"
android:textSize="14sp" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/tv_order_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:padding="10dp"
android:textColor="@color/darkgray"
android:textSize="14sp"
app:txtfontName="@string/semibold" />
</RelativeLayout>
</RelativeLayout>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
android:id="@+id/btn_submit"
android:layout_width="200dp"
android:layout_height="45dp"
android:layout_centerInParent="true"
android:layout_gravity="center"
android:layout_marginBottom="30dp"
android:layout_marginTop="20dp"
android:background="@drawable/ic_rounded_background_coloured"
android:text="@string/done_text"
android:textAllCaps="false"
android:textColor="@color/white"
android:textSize="16sp" />
<LinearLayout
android:id="@+id/ammendmentOperationViewContainer"
android:layout_marginBottom="30dp"
android:layout_marginTop="20dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:weightSum="1"
android:orientation="horizontal">
<FrameLayout
android:layout_width="0dp"
android:layout_weight=".5"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:layout_height="wrap_content">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
android:id="@+id/btn_cancel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="45dp"
android:padding="5dp"
android:inputType="textMultiLine"
android:layout_gravity="center"
android:layout_marginBottom="30dp"
android:layout_marginTop="20dp"
android:background="@drawable/ic_rounded_background_coloured"
android:text="@string/request_to_cancel_text"
android:textAllCaps="false"
android:textColor="@color/white"
android:textSize="16sp" />
</FrameLayout>
<FrameLayout
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:layout_width="0dp"
android:layout_weight=".5"
android:layout_height="wrap_content">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
android:padding="5dp"
android:id="@+id/btn_change"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="45dp"
android:layout_gravity="center"
android:layout_marginBottom="30dp"
android:layout_marginTop="20dp"
android:background="@drawable/ic_rounded_background_coloured"
android:text="@string/request_to_change_text"
android:textAllCaps="false"
android:textColor="@color/white"
android:textSize="16sp" />
</FrameLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>

6
app/src/main/res/values/strings.xml
View File

@ -471,6 +471,12 @@
<string name="touch_fingerprint_text">Please place your finger on the fingerprint sensor to continue.</string>
<string name="fingerprint_changed_externally">For your safety concerns, you need to login again to validate your fingerprint.</string>
<string name="loading_text">Loading...</string>
<string name="product_name_text">Product Name</string>
<string name="product_point_text">Product Point</string>
<string name="order_date_text">Order Date</string>
<string name="order_receive_date_text">Order Receive Date</string>
<string name="order_no_text">Order No</string>
<string name="order_type_text">Order Type</string>
</resources>
Write Preview
Loading…
Cancel
Save