Penny test api integration done

app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrivilegedGateway.java

@@ -74,4 +74,9 @@ public abstract class PrivilegedGateway implements PrivilegedGatewayInterface {
         return GmeApplication.getStorage().getString(PrefKeys.USER_DOB,"");
 
     }
+
+    @Override
+    public String getIdNumber() {
+        return GmeApplication.getStorage().getString(PrefKeys.USER_DOCUMENT_ID_NUMBER,"");
+    }
 }

app/src/main/java/com/gmeremit/online/gmeremittance_native/base/PrivilegedGatewayInterface.java

@@ -27,6 +27,8 @@ public interface PrivilegedGatewayInterface extends BaseGatewayInterface {
 
    String getUserDob();
 
+   String getIdNumber();
+
    boolean isUserKYCVerified();
 
    boolean hasUserSubmittedKYC();

app/src/main/java/com/gmeremit/online/gmeremittance_native/customwidgets/genderdialog/GenderListingRvAdapter.java

@@ -6,8 +6,6 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.gmeremit.online.gmeremittance_native.R;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Province;
-import com.gmeremit.online.gmeremittance_native.kycV2.view.view1.ProvinceListingDialog;
 import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientProvinceListRvViewHolder;
 
 import java.util.ArrayList;

app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2InteractorInterface.java

@@ -4,11 +4,6 @@ import com.gmeremit.online.gmeremittance_native.base.BaseInteractorInterface;
 import com.gmeremit.online.gmeremittance_native.base.PrivilegedGatewayInterface;
 import com.gmeremit.online.gmeremittance_native.homeV2.model.UserInfoModelV2;
 import com.gmeremit.online.gmeremittance_native.homeV2.model.UserInfoV2DataApiResponse;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.KYCRegistrationDataResponse;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.KYCRelatedDataResponse;
-import com.gmeremit.online.gmeremittance_native.loginV2.model.LoginModelV2;
-
-import java.io.File;
 
 import io.reactivex.Observable;
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/presenter/HomeV2Presenter.java

@@ -86,8 +86,8 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
     public void manullyUpdateKYCToSubmittedAndShowPennyTest() {
         gateway.updateSubmittedKycInCache(true);
         gateway.updateVerifiedUserInCache(false);
-        String pennyTestTitle = "Continue with registration process";
-        String pennyTestMessage = "Please verify your primary bank account to complete registration.";
+        String pennyTestTitle = "Continue the registration process";
+        String pennyTestMessage = "Please verify your primary bank account to complete the registration.";
         view.showKYCVerifiedIfRequired(false,"","",true);
         view.showPennyTestViewIfRequired(true,pennyTestTitle,pennyTestMessage);
 
@@ -170,6 +170,7 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
             boolean disableKYCViewClick = userInfoModelV2.getKyc() && !userInfoModelV2.isVerified();
             boolean shouldShowKYCView = false;
             //TODO populate data related to pennyTest Here
+
             boolean isPennyTestPending = true&&userInfoModelV2.getKyc();
             boolean hasRequestedPennyTest = false;
 
@@ -183,7 +184,7 @@ public class HomeV2Presenter extends BasePresenter implements HomeV2PresenterInt
                 kycMessage = "Your registration request is in approval process. You will soon be able to use GME services.";
             }
 
-            String pennyTestTitle = "Verify your Bank Account";
+            String pennyTestTitle = "Continue the registration process";
             String pennyTestMessage = "Please complete your primary bank account verification process.";
 
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeFragmentV2.java

@@ -36,6 +36,7 @@ import static com.gmeremit.online.gmeremittance_native.kycV2.view.KYCFormV2Activ
 public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.HomeMenuClickListenerV2, View.OnClickListener {
 
     private static final int KYC_FORM_REQUEST_FROM_HOME = 45432;
+    private static final int PENNY_REQUEST_FROM_HOME = 45433;
     @BindView(R.id.menuRecyclerView)
     RecyclerView menuRecyclerView;
 
@@ -228,7 +229,7 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.
     private void showPennyTestView(boolean hasRequestedPennyTestEarlier) {
         Intent startPennyTestIntent = new Intent(getActivity(), PennyTestActivity.class);
         startPennyTestIntent.putExtra(PennyTestActivity.HAS_REQUESTED_FOR_PENNY_TEST, hasRequestedPennyTestEarlier);
-        startActivity(startPennyTestIntent);
+        startActivityForResult(startPennyTestIntent,PENNY_REQUEST_FROM_HOME);
     }
 
     @Override
@@ -241,10 +242,31 @@ public class HomeFragmentV2 extends BaseFragment implements HomeMenuRvAdapterV2.
                     HomeParentViewContractV2 parentView = ((HomeParentViewContractV2) getActivity());
                     if (parentView != null)
                         parentView.getPresenter().manullyUpdateKYCToSubmittedAndShowPennyTest();
-//                    new Handler().postDelayed(() -> showPennyTestView(false), 250);
-                    showPennyTestView(false);
+                    new Handler().postDelayed(() -> showPennyTestView(false), 250);
+//                    showPennyTestView(false);
                 }
-
+            }
+        }
+        else if (requestCode == PENNY_REQUEST_FROM_HOME) {
+            if (resultCode == Activity.RESULT_OK) {
+                boolean requestResult = data.getBooleanExtra(PennyTestActivity.PENNY_TEST_REQUEST_PERFORMED_STATUS_BUNDLE_KEY, false);
+                boolean pennTestCompletedResult = data.getBooleanExtra(PennyTestActivity.PENNY_TEST_COMPLETED_PERFORMED_STATUS_BUNDLE_KEY, false);
+                HomeParentViewContractV2 parentView = ((HomeParentViewContractV2) getActivity());
+                if (parentView!=null) {
+                        if(pennTestCompletedResult)
+                        {
+                            showPennyTestViewIfRequired(false,"","");
+                        }
+                        else if(requestResult)
+                        {
+                            hasRequestedPennyTestEarlier=requestResult;
+                        }
+                        parentView.getPresenter().getRequiredData();
+                }
+            }
+            else
+            {
+                //User navigated away from penny test
             }
 
         }

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/KYCV2ActionListener.java

@@ -1,8 +1,6 @@
 package com.gmeremit.online.gmeremittance_native.kycV2;
 
-import com.gmeremit.online.gmeremittance_native.kycV2.presenter.KYCV2PresenterInterface;
-import com.gmeremit.online.gmeremittance_native.sendmoneyV2.presenter.SendMoneyV2PresenterInterface;
-import com.gmeremit.online.gmeremittance_native.sendmoneyV2.view.SendMoneyActionListener;
+import com.gmeremit.online.gmeremittance_native.kycV2.presenter.kyc.KYCV2PresenterInterface;
 
 /**
  * Created by Preyea

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/adapter/view1/NativeCountryListingRvAdapter.java

@@ -6,12 +6,9 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.gmeremit.online.gmeremittance_native.R;
-import com.gmeremit.online.gmeremittance_native.customwidgets.exchangecountrylistingdialog.CountryFlagMapper;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.NativeCountry;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.NativeCountry;
 import com.gmeremit.online.gmeremittance_native.kycV2.view.view1.NativeCountryListingDialog;
-import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.CountryDetailModel;
 import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientCountryListRvViewHolder;
-import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientCountryListingDialog;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/adapter/view1/OccupationListingRvAdapter.java

@@ -6,10 +6,8 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.gmeremit.online.gmeremittance_native.R;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Occupation;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Province;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.Occupation;
 import com.gmeremit.online.gmeremittance_native.kycV2.view.view1.OccupationListingDialog;
-import com.gmeremit.online.gmeremittance_native.kycV2.view.view1.ProvinceListingDialog;
 import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientProvinceListRvViewHolder;
 
 import java.util.ArrayList;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/adapter/view1/ProvinceListingRvAdapter.java

@@ -6,11 +6,9 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.gmeremit.online.gmeremittance_native.R;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Province;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.Province;
 import com.gmeremit.online.gmeremittance_native.kycV2.view.view1.ProvinceListingDialog;
-import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.TransferDetailModel;
 import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientProvinceListRvViewHolder;
-import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientTransferListingDialog;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/adapter/view2/IDListingRvAdapter.java

@@ -6,9 +6,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.gmeremit.online.gmeremittance_native.R;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.IdType;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Province;
-import com.gmeremit.online.gmeremittance_native.kycV2.view.view1.ProvinceListingDialog;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.IdType;
 import com.gmeremit.online.gmeremittance_native.kycV2.view.view2.IDListingDialog;
 import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientProvinceListRvViewHolder;
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/adapter/view2/PrimaryBankListingRvAdapter.java

@@ -6,7 +6,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.gmeremit.online.gmeremittance_native.R;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Bank;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.Bank;
 import com.gmeremit.online.gmeremittance_native.kycV2.view.view2.PrimaryBankListingDialog;
 import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientProvinceListRvViewHolder;
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/adapter/view2/SourceOfFundListingRvAdapter.java

@@ -6,9 +6,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.gmeremit.online.gmeremittance_native.R;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Province;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.SourceOfFund;
-import com.gmeremit.online.gmeremittance_native.kycV2.view.view1.ProvinceListingDialog;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.SourceOfFund;
 import com.gmeremit.online.gmeremittance_native.kycV2.view.view2.SourceOfFundListingDialog;
 import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientProvinceListRvViewHolder;
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/gateway/KYCV2Gateway.java

@@ -3,15 +3,9 @@ package com.gmeremit.online.gmeremittance_native.kycV2.gateway;
 import com.gmeremit.online.gmeremittance_native.GmeApplication;
 import com.gmeremit.online.gmeremittance_native.base.PrefKeys;
 import com.gmeremit.online.gmeremittance_native.base.PrivilegedGateway;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.KYCRegistrationDataResponse;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.KYCRelatedDataResponse;
-import com.gmeremit.online.gmeremittance_native.kycV2.presenter.KYCV2InteractorInterface;
-import com.gmeremit.online.gmeremittance_native.loginV2.presenter.LoginV2InteractorInterface;
-import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.AddRecipientApiResponse;
-import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientlisting.GetAllRecipientApiResponse;
-import com.gmeremit.online.gmeremittance_native.recipientV2.presenter.recipientlisting.RecipientListingV2InteractorInterface;
-import com.gmeremit.online.gmeremittance_native.registerV2.presenter.RegisterV2InteractorInterface;
-import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponse;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.KYCRegistrationDataResponse;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.KYCRelatedDataResponse;
+import com.gmeremit.online.gmeremittance_native.kycV2.presenter.kyc.KYCV2InteractorInterface;
 import com.gmeremit.online.gmeremittance_native.utils.https.HttpClientV2;
 
 import java.io.File;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/gateway/PennyTestGateway.java

@@ -0,0 +1,37 @@
+package com.gmeremit.online.gmeremittance_native.kycV2.gateway;
+
+import com.gmeremit.online.gmeremittance_native.base.PrivilegedGateway;
+import com.gmeremit.online.gmeremittance_native.kycV2.presenter.pennytest.PennyTestInteractorInterface;
+import com.gmeremit.online.gmeremittance_native.utils.https.HttpClientV2;
+import com.google.gson.JsonObject;
+
+import io.reactivex.Observable;
+import okhttp3.ResponseBody;
+
+public class PennyTestGateway extends PrivilegedGateway implements PennyTestInteractorInterface.PennyGatewayInterface {
+
+
+    public PennyTestGateway()
+    {
+
+    }
+
+
+    @Override
+    public Observable<ResponseBody> requestForPennyTest(String auth, String userId, String idNumber) {
+        JsonObject jsonObject=new JsonObject();
+        jsonObject.addProperty("UserId",userId);
+        jsonObject.addProperty("IdNumber",idNumber);
+
+        return HttpClientV2.getInstance().requestForPennyTest(auth,jsonObject);
+    }
+
+    @Override
+    public Observable<ResponseBody> postDataForPennyTest(String auth, String accountNo, String certNumber) {
+        JsonObject jsonObject=new JsonObject();
+        jsonObject.addProperty("CertId",certNumber);
+        jsonObject.addProperty("Accound",accountNo);
+
+        return HttpClientV2.getInstance().submitPennyTest(auth,jsonObject);
+    }
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/Bank.java → app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/kyc/Bank.java

@@ -1,5 +1,5 @@
 
-package com.gmeremit.online.gmeremittance_native.kycV2.model;
+package com.gmeremit.online.gmeremittance_native.kycV2.model.kyc;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/IdType.java → app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/kyc/IdType.java

@@ -1,5 +1,5 @@
 
-package com.gmeremit.online.gmeremittance_native.kycV2.model;
+package com.gmeremit.online.gmeremittance_native.kycV2.model.kyc;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/KYCRegistrationDataModel.java → app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/kyc/KYCRegistrationDataModel.java

@@ -1,4 +1,4 @@
-package com.gmeremit.online.gmeremittance_native.kycV2.model;
+package com.gmeremit.online.gmeremittance_native.kycV2.model.kyc;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/KYCRegistrationDataResponse.java → app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/kyc/KYCRegistrationDataResponse.java

@@ -1,5 +1,5 @@
 
-package com.gmeremit.online.gmeremittance_native.kycV2.model;
+package com.gmeremit.online.gmeremittance_native.kycV2.model.kyc;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/KYCRelatedDataModel.java → app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/kyc/KYCRelatedDataModel.java

@@ -1,5 +1,5 @@
 
-package com.gmeremit.online.gmeremittance_native.kycV2.model;
+package com.gmeremit.online.gmeremittance_native.kycV2.model.kyc;
 
 import java.util.List;
 import com.google.gson.annotations.Expose;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/KYCRelatedDataResponse.java → app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/kyc/KYCRelatedDataResponse.java

@@ -1,5 +1,5 @@
 
-package com.gmeremit.online.gmeremittance_native.kycV2.model;
+package com.gmeremit.online.gmeremittance_native.kycV2.model.kyc;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/NativeCountry.java → app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/kyc/NativeCountry.java

@@ -1,5 +1,5 @@
 
-package com.gmeremit.online.gmeremittance_native.kycV2.model;
+package com.gmeremit.online.gmeremittance_native.kycV2.model.kyc;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/Occupation.java → app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/kyc/Occupation.java

@@ -1,5 +1,5 @@
 
-package com.gmeremit.online.gmeremittance_native.kycV2.model;
+package com.gmeremit.online.gmeremittance_native.kycV2.model.kyc;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/Province.java → app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/kyc/Province.java

@@ -1,5 +1,5 @@
 
-package com.gmeremit.online.gmeremittance_native.kycV2.model;
+package com.gmeremit.online.gmeremittance_native.kycV2.model.kyc;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/SourceOfFund.java → app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/model/kyc/SourceOfFund.java

@@ -1,4 +1,4 @@
-package com.gmeremit.online.gmeremittance_native.kycV2.model;
+package com.gmeremit.online.gmeremittance_native.kycV2.model.kyc;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/KYCV2InteractorInterface.java → app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/kyc/KYCV2InteractorInterface.java

@@ -1,12 +1,9 @@
-package com.gmeremit.online.gmeremittance_native.kycV2.presenter;
+package com.gmeremit.online.gmeremittance_native.kycV2.presenter.kyc;
 
 import com.gmeremit.online.gmeremittance_native.base.BaseInteractorInterface;
 import com.gmeremit.online.gmeremittance_native.base.PrivilegedGatewayInterface;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.KYCRegistrationDataResponse;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.KYCRelatedDataResponse;
-import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.AddRecipientApiResponse;
-import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.RecipientRelatedDataApiResponse;
-import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponse;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.KYCRegistrationDataResponse;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.KYCRelatedDataResponse;
 
 import java.io.File;
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/KYCV2Presenter.java → app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/kyc/KYCV2Presenter.java

@@ -1,14 +1,14 @@
-package com.gmeremit.online.gmeremittance_native.kycV2.presenter;
+package com.gmeremit.online.gmeremittance_native.kycV2.presenter.kyc;
 
 import android.graphics.Bitmap;
 
 import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
 import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
 import com.gmeremit.online.gmeremittance_native.kycV2.gateway.KYCV2Gateway;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.IdType;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.KYCRegistrationDataResponse;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.KYCRelatedDataModel;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.KYCRelatedDataResponse;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.IdType;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.KYCRegistrationDataResponse;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.KYCRelatedDataModel;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.KYCRelatedDataResponse;
 import com.gmeremit.online.gmeremittance_native.kycV2.view.view1.KYCView1VModel;
 import com.gmeremit.online.gmeremittance_native.kycV2.view.view2.KYCView2VModel;
 import com.gmeremit.online.gmeremittance_native.kycV2.view.view3.KYCView3Fragment;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/KYCV2PresenterInterface.java → app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/kyc/KYCV2PresenterInterface.java

@@ -1,25 +1,22 @@
-package com.gmeremit.online.gmeremittance_native.kycV2.presenter;
+package com.gmeremit.online.gmeremittance_native.kycV2.presenter.kyc;
 
 import android.content.Context;
-import android.content.Intent;
 import android.graphics.Bitmap;
 
 import com.gmeremit.online.gmeremittance_native.base.BaseContractInterface;
 import com.gmeremit.online.gmeremittance_native.base.BasePresenterInterface;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Bank;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.IdType;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.NativeCountry;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Occupation;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Province;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.SourceOfFund;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.Bank;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.IdType;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.NativeCountry;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.Occupation;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.Province;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.SourceOfFund;
 import com.gmeremit.online.gmeremittance_native.kycV2.view.view1.KYCView1VModel;
 import com.gmeremit.online.gmeremittance_native.kycV2.view.view2.KYCView2VModel;
 import com.gmeremit.online.gmeremittance_native.kycV2.view.view3.KYCView3VModel;
 
 import java.util.List;
 
-import io.reactivex.Observable;
-
 /** Created by Preyea R Regmi, September 10th, 2018
  * Data is delegated by view to the presenter, so presenter is responsbile for Business Login, Consuming Services to gather data and overall module wise flow.
  * The presenter interface is exposed to all views for now, will be isolated later until kyc module becomes complex to handle.

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/pennytest/PennyTestInteractorInterface.java

@@ -0,0 +1,21 @@
+package com.gmeremit.online.gmeremittance_native.kycV2.presenter.pennytest;
+
+import com.gmeremit.online.gmeremittance_native.base.BaseGatewayInterface;
+import com.gmeremit.online.gmeremittance_native.base.BaseInteractorInterface;
+import com.gmeremit.online.gmeremittance_native.base.PrivilegedGatewayInterface;
+
+import io.reactivex.Observable;
+import okhttp3.ResponseBody;
+
+/** Created by Preyea R Regmi, September 10th, 2018
+
+ */
+public interface PennyTestInteractorInterface extends BaseInteractorInterface {
+
+        interface PennyGatewayInterface extends PrivilegedGatewayInterface
+        {
+                        Observable<ResponseBody> requestForPennyTest(String auth,String userId,String idNumber);
+
+                        Observable<ResponseBody> postDataForPennyTest(String auth, String accountNo, String certNumber);
+        }
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/pennytest/PennyTestPresenter.java

@@ -0,0 +1,135 @@
+package com.gmeremit.online.gmeremittance_native.kycV2.presenter.pennytest;
+
+import com.gmeremit.online.gmeremittance_native.base.BasePresenter;
+import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog;
+import com.gmeremit.online.gmeremittance_native.kycV2.gateway.PennyTestGateway;
+import com.gmeremit.online.gmeremittance_native.utils.Constants;
+import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponseV2;
+import com.gmeremit.online.gmeremittance_native.utils.https.GenericResponseDataModel;
+import com.gmeremit.online.gmeremittance_native.utils.https.MessageResponseDataModel;
+import com.gmeremit.online.gmeremittance_native.withdrawV2.model.RefundRelatedMetaDataModel;
+import com.gmeremit.online.gmeremittance_native.withdrawV2.model.RefundRelatedMetaDataResponse;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
+
+import io.reactivex.Scheduler;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.schedulers.Schedulers;
+
+public class PennyTestPresenter extends BasePresenter implements PennyTestInteractorInterface, PennyTestPresenterInterface {
+
+    private final PennyTestContractInterface view;
+    private final PennyTestInteractorInterface.PennyGatewayInterface gateway;
+    private CompositeDisposable compositeDisposable;
+
+    public PennyTestPresenter(PennyTestContractInterface view) {
+        this.view = view;
+        this.gateway = new PennyTestGateway();
+        this.compositeDisposable = new CompositeDisposable();
+    }
+
+    @Override
+    public void requestForPennyTest() {
+        compositeDisposable.add(
+                this.gateway.requestForPennyTest(this.gateway.getAuth(), this.gateway.getUserID(), this.gateway.getIdNumber())
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribeWith(new PennyTestRequestObserver())
+        );
+    }
+
+    @Override
+    public void performPennyTest(String cerNumber) {
+        compositeDisposable.add(
+                this.gateway.postDataForPennyTest(this.gateway.getAuth(), "Dummy Acc no", cerNumber)
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribeWith(new PennyTestResultObserver())
+        );
+    }
+
+    private void updateFlagOnPennyTestSuccess() {
+    }
+
+    private void updateFlagOnPennyTestAfterRequest() {
+
+    }
+
+
+    public class PennyTestRequestObserver extends GenericApiObserverResponseV2<MessageResponseDataModel> {
+
+        @Override
+        protected Type setType() {
+            return TypeToken.getParameterized(GenericResponseDataModel.class, MessageResponseDataModel.class).getType();
+        }
+
+        @Override
+        protected void onSuccess(GenericResponseDataModel<MessageResponseDataModel> t) {
+            if(t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2))
+            {
+                view.morphProgressBarIntoButton(()->{
+                    updateFlagOnPennyTestAfterRequest();
+                    view.navigateToPennyTestConfirmView();
+                });
+
+            }
+            else
+            {
+                view.morphProgressBarIntoButton(()->view.showPopUpMessage(t.getData().getMsg(),CustomAlertDialog.AlertType.FAILED,null));
+            }
+        }
+
+        @Override
+        public void onFailed(String message) {
+            view.morphProgressBarIntoButton(()->  view.showPopUpMessage(message,CustomAlertDialog.AlertType.FAILED,null));
+        }
+
+        @Override
+        protected void onConnectionNotEstablished(String message) {
+            view.morphProgressBarIntoButton(()->  view.showPopUpMessage(message,CustomAlertDialog.AlertType.NO_INTERNET,null));
+        }
+    }
+
+
+
+    public class PennyTestResultObserver extends GenericApiObserverResponseV2<MessageResponseDataModel> {
+
+        @Override
+        protected Type setType() {
+            return TypeToken.getParameterized(GenericResponseDataModel.class, MessageResponseDataModel.class).getType();
+        }
+
+        @Override
+        protected void onSuccess(GenericResponseDataModel<MessageResponseDataModel> t) {
+            if(t.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2))
+            {
+                view.morphProgressBarIntoButton(()->{
+                    updateFlagOnPennyTestSuccess();
+                    view.onPennyTestSuccess();
+                });
+
+            }
+            else
+            {
+                view.morphProgressBarIntoButton(()->{
+                    view.showPopUpMessage(t.getData().getMsg(),CustomAlertDialog.AlertType.FAILED,null);
+                });
+            }
+        }
+
+        @Override
+        public void onFailed(String message) {
+            view.morphProgressBarIntoButton(()->  view.showPopUpMessage(message,CustomAlertDialog.AlertType.FAILED,null));
+
+        }
+
+        @Override
+        protected void onConnectionNotEstablished(String message) {
+            view.morphProgressBarIntoButton(()->  view.showPopUpMessage(message,CustomAlertDialog.AlertType.NO_INTERNET,null));
+        }
+    }
+
+
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/presenter/pennytest/PennyTestPresenterInterface.java

@@ -0,0 +1,28 @@
+package com.gmeremit.online.gmeremittance_native.kycV2.presenter.pennytest;
+
+import com.gmeremit.online.gmeremittance_native.base.BaseContractInterface;
+import com.gmeremit.online.gmeremittance_native.base.BasePresenterInterface;
+
+public interface PennyTestPresenterInterface extends BasePresenterInterface {
+
+    void requestForPennyTest();
+
+    void performPennyTest(String cerNumber);
+
+    interface PennyTestContractInterface extends BaseContractInterface {
+
+
+        void navigateToPennyTestConfirmView();
+
+        void onPennyTestSuccess();
+
+
+        void morphProgressBarIntoButton(Runnable callback);
+
+
+    }
+
+
+
+
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/KYCFormV2Activity.java

@@ -18,8 +18,8 @@ import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BaseActivity;
 import com.gmeremit.online.gmeremittance_native.kycV2.KYCV2ActionListener;
 import com.gmeremit.online.gmeremittance_native.kycV2.adapter.KycViewPagerAdapter;
-import com.gmeremit.online.gmeremittance_native.kycV2.presenter.KYCV2Presenter;
-import com.gmeremit.online.gmeremittance_native.kycV2.presenter.KYCV2PresenterInterface;
+import com.gmeremit.online.gmeremittance_native.kycV2.presenter.kyc.KYCV2Presenter;
+import com.gmeremit.online.gmeremittance_native.kycV2.presenter.kyc.KYCV2PresenterInterface;
 import com.gmeremit.online.gmeremittance_native.kycV2.view.view1.KYCView1Fragment;
 import com.gmeremit.online.gmeremittance_native.kycV2.view.view2.KYCView2Fragment;
 import com.gmeremit.online.gmeremittance_native.kycV2.view.view3.KYCView3Fragment;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestActivity.java

@@ -5,6 +5,8 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
+import android.app.Activity;
+import android.content.Intent;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Handler;
 import android.support.v4.app.Fragment;
@@ -13,6 +15,7 @@ import android.support.v4.view.ViewCompat;
 import android.support.v4.view.ViewPager;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
@@ -24,9 +27,10 @@ import android.widget.ProgressBar;
 
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BaseActivity;
-import com.gmeremit.online.gmeremittance_native.customwidgets.DepthTransformation;
-import com.gmeremit.online.gmeremittance_native.customwidgets.ZoomOutTransformation;
 import com.gmeremit.online.gmeremittance_native.kycV2.adapter.PennyTestViewPagerAdapter;
+import com.gmeremit.online.gmeremittance_native.kycV2.gateway.PennyTestGateway;
+import com.gmeremit.online.gmeremittance_native.kycV2.presenter.pennytest.PennyTestPresenter;
+import com.gmeremit.online.gmeremittance_native.kycV2.presenter.pennytest.PennyTestPresenterInterface;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,7 +38,7 @@ import java.util.List;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class PennyTestActivity extends BaseActivity implements View.OnClickListener, ViewPager.OnPageChangeListener {
+public class PennyTestActivity extends BaseActivity implements View.OnClickListener, ViewPager.OnPageChangeListener, PennyTestPresenterInterface.PennyTestContractInterface {
 
     @BindView(R.id.progressbar_login)
     ProgressBar progressbar_login;
@@ -42,8 +46,8 @@ public class PennyTestActivity extends BaseActivity implements View.OnClickListe
     @BindView(R.id.btn_submit)
     Button submitBtn;
 
-    @BindView(R.id.iv_back)
-    View iv_back;
+//    @BindView(R.id.iv_back)
+//    View iv_back;
 
     @BindView(R.id.penny_test_view_pager)
     ViewPager penntTestViewPager;
@@ -52,16 +56,22 @@ public class PennyTestActivity extends BaseActivity implements View.OnClickListe
     public String buttonText;
 
 
-    private AnimatorSet mMorphingAnimatorSet=null;
-    private boolean mIsMorphingInProgress=false;
-    private Interpolator interpolator=new AccelerateDecelerateInterpolator();
+    private AnimatorSet mMorphingAnimatorSet = null;
+    private Interpolator interpolator = new AccelerateDecelerateInterpolator();
     private int originalButtonWidth;
-    private boolean isLoadingInProgress=false;
+    private boolean isLoadingInProgress = false;
     private static float DEFAULT_CORNER_RADIUS;
-    private List<Fragment> fragments=new ArrayList<>();
+    private List<Fragment> fragments = new ArrayList<>();
     private PennyTestViewPagerAdapter viewPagerAdapter;
-    public static String HAS_REQUESTED_FOR_PENNY_TEST="bundleKeyPennyTestRequest";
-    private boolean hasRequestedPennyTest=false;
+    public static String HAS_REQUESTED_FOR_PENNY_TEST = "bundleKeyPennyTestRequest";
+    public static final String PENNY_TEST_REQUEST_PERFORMED_STATUS_BUNDLE_KEY = "pennyRequestedBundleKey";
+    public static final String PENNY_TEST_COMPLETED_PERFORMED_STATUS_BUNDLE_KEY = "pennyCompletedBundleKey";
+
+    private boolean hasRequestedPennyTest = false;
+    private boolean mIsMorphingInProgress;
+    private boolean isViewNotClickable =false;
+    private PennyTestPresenterInterface presenter;
+    private Fragment currentFragment=null;
 
 
     @Override
@@ -77,22 +87,21 @@ public class PennyTestActivity extends BaseActivity implements View.OnClickListe
             window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING);
 
 
-
         }
 
-        if(savedInstanceState==null)
-            hasRequestedPennyTest=getIntent().getBooleanExtra(HAS_REQUESTED_FOR_PENNY_TEST,false);
+        if (savedInstanceState == null)
+            hasRequestedPennyTest = getIntent().getBooleanExtra(HAS_REQUESTED_FOR_PENNY_TEST, false);
 
         initialize();
         setupViewPager();
     }
 
     private void setupViewPager() {
-        if(!hasRequestedPennyTest)
+        if (!hasRequestedPennyTest)
             fragments.add(new PennyTestPromptFragment());
         fragments.add(new PennyTestOperationFragment());
 
-        viewPagerAdapter=new PennyTestViewPagerAdapter(getSupportFragmentManager());
+        viewPagerAdapter = new PennyTestViewPagerAdapter(getSupportFragmentManager());
         viewPagerAdapter.addFragments(fragments);
 
 //        penntTestViewPager.setPageTransformer(true,new ZoomOutTransformation());
@@ -105,11 +114,13 @@ public class PennyTestActivity extends BaseActivity implements View.OnClickListe
 
 
     private void initialize() {
-        DEFAULT_CORNER_RADIUS=35*getResources().getDisplayMetrics().density;
-        progressbar_login.getIndeterminateDrawable().setColorFilter(ContextCompat.getColor(this,android.R.color.white), android.graphics.PorterDuff.Mode.MULTIPLY);
+        DEFAULT_CORNER_RADIUS = 35 * getResources().getDisplayMetrics().density;
+        progressbar_login.getIndeterminateDrawable().setColorFilter(ContextCompat.getColor(this, android.R.color.white), android.graphics.PorterDuff.Mode.MULTIPLY);
         ViewCompat.setTranslationZ(progressbar_login, 100);
         progressbar_login.setVisibility(View.GONE);
 
+        this.presenter=new PennyTestPresenter(this);
+
     }
 
 
@@ -117,19 +128,18 @@ public class PennyTestActivity extends BaseActivity implements View.OnClickListe
     protected void onStart() {
         super.onStart();
         submitBtn.setOnClickListener(this);
-        iv_back.setOnClickListener(this);
+//        iv_back.setOnClickListener(this);
     }
 
     @Override
     protected void onStop() {
         super.onStop();
         submitBtn.setOnClickListener(null);
-        iv_back.setOnClickListener(null);
+//        iv_back.setOnClickListener(null);
 
     }
 
-    private void morphButtonIntoProgressBar()
-    {
+    private void morphButtonIntoProgressBar(Runnable callback) {
         GradientDrawable mGradientDrawable = (GradientDrawable) submitBtn.getBackground();
 
         buttonText = submitBtn.getText().toString();
@@ -140,7 +150,7 @@ public class PennyTestActivity extends BaseActivity implements View.OnClickListe
                         DEFAULT_CORNER_RADIUS,
                         submitBtn.getHeight());
 
-        originalButtonWidth= submitBtn.getWidth();
+        originalButtonWidth = submitBtn.getWidth();
         ValueAnimator widthAnimation = ValueAnimator.ofInt(submitBtn.getWidth(), submitBtn.getHeight());
         widthAnimation.addUpdateListener(valueAnimator -> {
             int val = (Integer) valueAnimator.getAnimatedValue();
@@ -159,7 +169,7 @@ public class PennyTestActivity extends BaseActivity implements View.OnClickListe
             public void onAnimationStart(Animator animation) {
                 super.onAnimationStart(animation);
                 mIsMorphingInProgress = true;
-                isLoadingInProgress=true;
+                isLoadingInProgress = true;
                 submitBtn.setText("");
             }
 
@@ -168,13 +178,15 @@ public class PennyTestActivity extends BaseActivity implements View.OnClickListe
                 mIsMorphingInProgress = false;
 //                ViewCompat.setTranslationZ(progressbar_login, 100);
                 progressbar_login.setVisibility(View.VISIBLE);
+                if(callback!=null)
+                    callback.run();
             }
         });
         mMorphingAnimatorSet.start();
     }
 
-    public void morphProgressBarIntoButton(Runnable callback)
-    {
+    @Override
+    public void morphProgressBarIntoButton(Runnable callback) {
         GradientDrawable mGradientDrawable = (GradientDrawable) submitBtn.getBackground();
 
 
@@ -211,8 +223,8 @@ public class PennyTestActivity extends BaseActivity implements View.OnClickListe
             public void onAnimationEnd(Animator animation) {
                 mIsMorphingInProgress = false;
                 submitBtn.setText(buttonText);
-                isLoadingInProgress=false;
-                if(callback!=null)
+                isLoadingInProgress = false;
+                if (callback != null)
                     callback.run();
 
 
@@ -224,11 +236,12 @@ public class PennyTestActivity extends BaseActivity implements View.OnClickListe
 
     @Override
     public void onClick(View v) {
-        switch(v.getId())
-        {
+        switch (v.getId()) {
             case R.id.btn_submit:
-                morphButtonIntoProgressBar();
-                new Handler().postDelayed(()->morphProgressBarIntoButton(()->penntTestViewPager.setCurrentItem(1,true)),3000);
+                if( currentFragment instanceof PennyTestPromptFragment)
+                      morphButtonIntoProgressBar(()->this.presenter.requestForPennyTest());
+                    else if(currentFragment instanceof PennyTestOperationFragment)
+                        morphButtonIntoProgressBar(()->this.presenter.performPennyTest(((PennyTestOperationFragment)currentFragment).getCertNumber()));
                 break;
 
             case R.id.iv_back:
@@ -245,31 +258,67 @@ public class PennyTestActivity extends BaseActivity implements View.OnClickListe
     @Override
     public void onPageSelected(int i) {
 
-        Fragment currentFragment=fragments.get(i);
-        if(currentFragment instanceof PennyTestPromptFragment)
-        {
+         currentFragment = fragments.get(i);
+        if (currentFragment instanceof PennyTestPromptFragment) {
             onPennyTestPromptPageSelected();
-        }
-        else
-        {
+        } else {
             onPennyTestOperationPageSelected();
         }
 
     }
 
+    public void closeViewWithPennyTestCompleted() {
+        Intent returnIntent = new Intent();
+        returnIntent.putExtra(PENNY_TEST_COMPLETED_PERFORMED_STATUS_BUNDLE_KEY, true);
+        setResult(Activity.RESULT_OK, returnIntent);
+        finish();
+    }
+
+    public void closeViewWithPennyTestRequested() {
+        Intent returnIntent = new Intent();
+        returnIntent.putExtra(PENNY_TEST_REQUEST_PERFORMED_STATUS_BUNDLE_KEY, true);
+        setResult(Activity.RESULT_OK, returnIntent);
+        finish();
+    }
+
+    @Override
+    public void onBackPressed() {
+        if(!isLoadingInProgress)
+            super.onBackPressed();
+    }
+
     private void onPennyTestPromptPageSelected() {
-        Log.d("PennyTestViewPager","Page: Prompt Page Displayed");
+        Log.d("PennyTestViewPager", "Page: Prompt Page Displayed");
         submitBtn.setText("Proceed");
     }
 
     private void onPennyTestOperationPageSelected() {
-        Log.d("PennyTestViewPager","Page: Operation Page Displayed");
+        Log.d("PennyTestViewPager", "Page: Operation Page Displayed");
         submitBtn.setText("Submit");
 
     }
 
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (!isLoadingInProgress)
+            return super.onTouchEvent(event);
+        else
+            return true;
+    }
+
     @Override
     public void onPageScrollStateChanged(int i) {
 
     }
+
+    @Override
+    public void navigateToPennyTestConfirmView() {
+
+    }
+
+    @Override
+    public void onPennyTestSuccess() {
+
+    }
+
 }

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/pennytest/PennyTestOperationFragment.java

@@ -36,4 +36,7 @@ public class PennyTestOperationFragment extends BaseFragment {
     }
 
 
+    public String getCertNumber() {
+        return "";
+    }
 }

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view1/KYCView1Fragment.java

@@ -12,18 +12,15 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 
-import com.crashlytics.android.Crashlytics;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
 import com.gmeremit.online.gmeremittance_native.customwidgets.genderdialog.Gender;
 import com.gmeremit.online.gmeremittance_native.customwidgets.genderdialog.GenderListingDialog;
 import com.gmeremit.online.gmeremittance_native.kycV2.KYCV2ActionListener;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Bank;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.NativeCountry;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Occupation;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Province;
-import com.gmeremit.online.gmeremittance_native.kycV2.presenter.KYCV2PresenterInterface;
-import com.gmeremit.online.gmeremittance_native.kycV2.view.view2.PrimaryBankListingDialog;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.NativeCountry;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.Occupation;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.Province;
+import com.gmeremit.online.gmeremittance_native.kycV2.presenter.kyc.KYCV2PresenterInterface;
 import com.gmeremit.online.gmeremittance_native.utils.Utils;
 
 import java.text.SimpleDateFormat;
@@ -35,7 +32,6 @@ import java.util.Locale;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import io.reactivex.Observable;
 import io.reactivex.disposables.CompositeDisposable;
 
 public class KYCView1Fragment extends BaseFragment implements View.OnClickListener, KYCV2PresenterInterface.KYCV2ContractInterface.KYCView1ContractInterface {

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view1/KYCView1VModel.java

@@ -1,10 +1,9 @@
 package com.gmeremit.online.gmeremittance_native.kycV2.view.view1;
 
 import com.gmeremit.online.gmeremittance_native.customwidgets.genderdialog.Gender;
-import com.gmeremit.online.gmeremittance_native.customwidgets.genderdialog.GenderListingDialog;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.NativeCountry;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Occupation;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Province;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.NativeCountry;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.Occupation;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.Province;
 
 public class KYCView1VModel {
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view1/NativeCountryListingDialog.java

@@ -19,9 +19,7 @@ import android.widget.EditText;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.customwidgets.LineDividerItemDecoration;
 import com.gmeremit.online.gmeremittance_native.kycV2.adapter.view1.NativeCountryListingRvAdapter;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.NativeCountry;
-import com.gmeremit.online.gmeremittance_native.recipientV2.adapter.RecipientCountryListingRvAdapter;
-import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.CountryDetailModel;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.NativeCountry;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view1/OccupationListingDialog.java

@@ -20,8 +20,7 @@ import android.widget.TextView;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.customwidgets.LineDividerItemDecoration;
 import com.gmeremit.online.gmeremittance_native.kycV2.adapter.view1.OccupationListingRvAdapter;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Occupation;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Province;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.Occupation;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view1/ProvinceListingDialog.java

@@ -20,9 +20,7 @@ import android.widget.TextView;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.customwidgets.LineDividerItemDecoration;
 import com.gmeremit.online.gmeremittance_native.kycV2.adapter.view1.ProvinceListingRvAdapter;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Province;
-import com.gmeremit.online.gmeremittance_native.recipientV2.adapter.RecipientTransferListingRvAdapter;
-import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.TransferDetailModel;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.Province;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/IDListingDialog.java

@@ -20,9 +20,7 @@ import android.widget.TextView;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.customwidgets.LineDividerItemDecoration;
 import com.gmeremit.online.gmeremittance_native.kycV2.adapter.view2.IDListingRvAdapter;
-import com.gmeremit.online.gmeremittance_native.kycV2.adapter.view2.PrimaryBankListingRvAdapter;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Bank;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.IdType;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.IdType;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/KYCView2Fragment.java

@@ -4,7 +4,6 @@ import android.app.DatePickerDialog;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.design.widget.TextInputLayout;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,15 +12,13 @@ import android.widget.EditText;
 
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
-import com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText;
 import com.gmeremit.online.gmeremittance_native.customwidgets.maskedittext.GmeMaskedEditText;
 import com.gmeremit.online.gmeremittance_native.kycV2.KYCV2ActionListener;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Bank;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.IdType;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.SourceOfFund;
-import com.gmeremit.online.gmeremittance_native.kycV2.presenter.KYCV2Presenter;
-import com.gmeremit.online.gmeremittance_native.kycV2.presenter.KYCV2PresenterInterface;
-import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.view.TransactionHistoryActivityV2;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.Bank;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.IdType;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.SourceOfFund;
+import com.gmeremit.online.gmeremittance_native.kycV2.presenter.kyc.KYCV2Presenter;
+import com.gmeremit.online.gmeremittance_native.kycV2.presenter.kyc.KYCV2PresenterInterface;
 import com.gmeremit.online.gmeremittance_native.utils.Utils;
 import com.tsongkha.spinnerdatepicker.DatePicker;
 import com.tsongkha.spinnerdatepicker.SpinnerDatePickerDialogBuilder;
@@ -29,7 +26,6 @@ import com.tsongkha.spinnerdatepicker.SpinnerDatePickerDialogBuilder;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/KYCView2VModel.java

@@ -1,8 +1,8 @@
 package com.gmeremit.online.gmeremittance_native.kycV2.view.view2;
 
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Bank;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.IdType;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.SourceOfFund;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.Bank;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.IdType;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.SourceOfFund;
 
 public class KYCView2VModel {
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/PrimaryBankListingDialog.java

@@ -20,7 +20,7 @@ import android.widget.TextView;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.customwidgets.LineDividerItemDecoration;
 import com.gmeremit.online.gmeremittance_native.kycV2.adapter.view2.PrimaryBankListingRvAdapter;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Bank;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.Bank;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view2/SourceOfFundListingDialog.java

@@ -20,8 +20,7 @@ import android.widget.TextView;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.customwidgets.LineDividerItemDecoration;
 import com.gmeremit.online.gmeremittance_native.kycV2.adapter.view2.SourceOfFundListingRvAdapter;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Bank;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.SourceOfFund;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.SourceOfFund;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/gmeremit/online/gmeremittance_native/kycV2/view/view3/KYCView3Fragment.java

@@ -6,7 +6,6 @@ import android.content.ClipData;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -28,11 +27,10 @@ import android.widget.TextView;
 import com.gmeremit.online.gmeremittance_native.R;
 import com.gmeremit.online.gmeremittance_native.base.BaseFragment;
 import com.gmeremit.online.gmeremittance_native.kycV2.KYCV2ActionListener;
-import com.gmeremit.online.gmeremittance_native.kycV2.presenter.KYCV2PresenterInterface;
+import com.gmeremit.online.gmeremittance_native.kycV2.presenter.kyc.KYCV2PresenterInterface;
 import com.gmeremit.online.gmeremittance_native.utils.other.Utility;
 import com.theartofdev.edmodo.cropper.CropImage;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.text.SimpleDateFormat;

app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/adapter/RecipientTransferListingRvAdapter.java

@@ -6,7 +6,6 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.gmeremit.online.gmeremittance_native.R;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.Province;
 import com.gmeremit.online.gmeremittance_native.recipientV2.model.recipientadd.TransferDetailModel;
 import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientProvinceListRvViewHolder;
 import com.gmeremit.online.gmeremittance_native.recipientV2.view.RecipientTransferListingDialog;

app/src/main/java/com/gmeremit/online/gmeremittance_native/resetpassV2/gateway/ResetPassV2Gateway.java

@@ -1,8 +1,6 @@
 package com.gmeremit.online.gmeremittance_native.resetpassV2.gateway;
 
 import com.gmeremit.online.gmeremittance_native.base.PrivilegedGateway;
-import com.gmeremit.online.gmeremittance_native.kycV2.presenter.KYCV2InteractorInterface;
-import com.gmeremit.online.gmeremittance_native.loginV2.presenter.LoginV2InteractorInterface;
 import com.gmeremit.online.gmeremittance_native.resetpassV2.model.ResetApiResponse;
 import com.gmeremit.online.gmeremittance_native.resetpassV2.presenter.ResetPassV2InteractorInterface;
 import com.gmeremit.online.gmeremittance_native.utils.https.HttpClientV2;

app/src/main/java/com/gmeremit/online/gmeremittance_native/transactionhistoryV2/TransactionHistoryV2ActionListener.java

@@ -1,6 +1,5 @@
 package com.gmeremit.online.gmeremittance_native.transactionhistoryV2;
 
-import com.gmeremit.online.gmeremittance_native.kycV2.presenter.KYCV2PresenterInterface;
 import com.gmeremit.online.gmeremittance_native.transactionhistoryV2.presenter.TransactionHistoryV2PresenterInterface;
 
 /**

app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/API_URL.java

@@ -147,5 +147,7 @@ public class API_URL {
     public static final String GET_REFUND_RELATED_DATA = "refund/{username}";
     public static final String PERFORM_REFUND = "refund/proceed";
 
+    public static final String PENNY_TEST_REQUEST="mobile/pennytest/start";
+    public static final String PENNY_TEST_SUBMIT="mobile/pennytest/getcertified";
 }
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/ApiEndpoints.java

@@ -16,8 +16,8 @@ import com.gmeremit.online.gmeremittance_native.int_notification.model.IntNotifi
 import com.gmeremit.online.gmeremittance_native.invite.model.Invite;
 import com.gmeremit.online.gmeremittance_native.invite.model.InviteInfo;
 import com.gmeremit.online.gmeremittance_native.invite.model.InviteResponse;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.KYCRegistrationDataResponse;
-import com.gmeremit.online.gmeremittance_native.kycV2.model.KYCRelatedDataResponse;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.KYCRegistrationDataResponse;
+import com.gmeremit.online.gmeremittance_native.kycV2.model.kyc.KYCRelatedDataResponse;
 import com.gmeremit.online.gmeremittance_native.kycform.model.data.DocumentRequestBody;
 import com.gmeremit.online.gmeremittance_native.kycform.model.data.DocumentResponseBody;
 import com.gmeremit.online.gmeremittance_native.kycform.model.data.Gender;
@@ -107,7 +107,6 @@ import com.gmeremit.online.gmeremittance_native.wallet_to_wallet.model.WalletUse
 import com.gmeremit.online.gmeremittance_native.walletstatementV2.model.WalletStatementV2APIResponse;
 import com.gmeremit.online.gmeremittance_native.withdraw.model.WithDraw;
 import com.gmeremit.online.gmeremittance_native.withdrawV2.model.RefundOperationResponse;
-import com.gmeremit.online.gmeremittance_native.withdrawV2.model.RefundRelatedMetaDataResponse;
 import com.google.gson.JsonObject;
 
 import java.util.List;
@@ -655,4 +654,12 @@ public interface ApiEndpoints {
     @POST(API_URL.PERFORM_REFUND)
     @Headers("Content-Type: application/json")
     Observable<RefundOperationResponse> performRefundOperation(@Header("Authorization") String token, @Body() JsonObject jsonObject);
+
+    @POST(API_URL.PENNY_TEST_REQUEST)
+    @Headers("Content-Type: application/json")
+    Observable<ResponseBody> requestForPennyTest(@Header("Authorization") String token, @Body() JsonObject jsonObject);
+
+    @POST(API_URL.PENNY_TEST_SUBMIT)
+    @Headers("Content-Type: application/json")
+    Observable<ResponseBody> submitPennyTest(@Header("Authorization") String token, @Body() JsonObject jsonObject);
 }

app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/GenericApiObserverResponseV2.java

@@ -26,7 +26,7 @@ public abstract class GenericApiObserverResponseV2<T> extends DisposableObserver
 
      protected abstract Type setType();
 
-     protected abstract void onSuccess(RefundRelatedMetaDataResponse<T> t);
+     protected abstract void onSuccess(GenericResponseDataModel<T> t);
 
      public abstract void onFailed(String message);
 
@@ -52,7 +52,7 @@ public abstract class GenericApiObserverResponseV2<T> extends DisposableObserver
 //            onFailed(errorMessage);
     }
 
-    private RefundRelatedMetaDataResponse<T> parseResponseBody(ResponseBody body) throws IOException{
+    private GenericResponseDataModel<T> parseResponseBody(ResponseBody body) throws IOException{
         return HttpClientV2.getDeserializer().fromJson(body.string(),this.type);
     }
 

app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/GenericResponseDataModel.java

@@ -0,0 +1,42 @@
+package com.gmeremit.online.gmeremittance_native.utils.https;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class GenericResponseDataModel<T> {
+
+
+    @SerializedName("ErrorCode")
+    @Expose
+    private String errorCode;
+    @SerializedName("Msg")
+    @Expose
+    private String msg;
+    @SerializedName("Data")
+    @Expose
+    private T data;
+
+    public String getErrorCode() {
+        return errorCode;
+    }
+
+    public void setErrorCode(String errorCode) {
+        this.errorCode = errorCode;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/utils/https/MessageResponseDataModel.java

@@ -0,0 +1,19 @@
+package com.gmeremit.online.gmeremittance_native.utils.https;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class MessageResponseDataModel {
+
+    @SerializedName("msg")
+    @Expose
+    private String msg;
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+}

app/src/main/java/com/gmeremit/online/gmeremittance_native/withdrawV2/presenter/WithdrawV2Presenter.java

@@ -6,6 +6,7 @@ import com.gmeremit.online.gmeremittance_native.utils.Constants;
 import com.gmeremit.online.gmeremittance_native.utils.Utils;
 import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponse;
 import com.gmeremit.online.gmeremittance_native.utils.https.GenericApiObserverResponseV2;
+import com.gmeremit.online.gmeremittance_native.utils.https.GenericResponseDataModel;
 import com.gmeremit.online.gmeremittance_native.withdrawV2.gateway.WithdrawV2Gateway;
 import com.gmeremit.online.gmeremittance_native.withdrawV2.model.RefundOperationResponse;
 import com.gmeremit.online.gmeremittance_native.withdrawV2.model.RefundRelatedMetaDataModel;
@@ -111,7 +112,7 @@ public class WithdrawV2Presenter extends BasePresenter implements WithdrawV2Pres
     class WithdrawRelatedDataObserver extends GenericApiObserverResponseV2<RefundRelatedMetaDataModel> {
 
         @Override
-        protected void onSuccess(RefundRelatedMetaDataResponse refundRelatedMetaDataResponse) {
+        protected void onSuccess(GenericResponseDataModel refundRelatedMetaDataResponse) {
             if (refundRelatedMetaDataResponse.getErrorCode().equalsIgnoreCase(Constants.SUCCESS_CODE_V2)) {
 
                 if (refundRelatedMetaDataResponse.getData() != null) {
@@ -128,7 +129,7 @@ public class WithdrawV2Presenter extends BasePresenter implements WithdrawV2Pres
 
         @Override
         protected Type setType() {
-           return  TypeToken.getParameterized(RefundRelatedMetaDataResponse.class,RefundRelatedMetaDataModel.class).getType();
+           return  TypeToken.getParameterized(GenericResponseDataModel.class,RefundRelatedMetaDataModel.class).getType();
         }
 
         @Override

app/src/main/res/layout/activity_penny_test.xml

@@ -7,16 +7,16 @@
     android:background="#fff"
     android:layout_height="match_parent">
 
-    <ImageView
-        android:id="@+id/iv_back"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:padding="10dp"
-        android:src="@drawable/ic_cross"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <!--<ImageView-->
+        <!--android:id="@+id/iv_back"-->
+        <!--android:layout_width="wrap_content"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:layout_marginTop="8dp"-->
+        <!--android:layout_marginEnd="8dp"-->
+        <!--android:padding="10dp"-->
+        <!--android:src="@drawable/ic_cross"-->
+        <!--app:layout_constraintEnd_toEndOf="parent"-->
+        <!--app:layout_constraintTop_toTopOf="parent" />-->
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.SwipeDisabledViewPager
         android:id="@+id/penny_test_view_pager"
@@ -25,10 +25,11 @@
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
+        android:layout_marginTop="8dp"
         app:layout_constraintBottom_toTopOf="@+id/progressbar_login_container"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/iv_back" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <FrameLayout
         android:id="@+id/progressbar_login_container"